Analysis of [T] at [T.x],[T.y],[T.z]
", "Queue occurrences: [T.z_queued]", - "Above space: Apparent [T.z_eventually_space ? "Yes" : "No"], Actual [is_above_space ? "Yes" : "No"] - [T.z_eventually_space == is_above_space ? "OK" : "MISMATCH"]", + "Above space: Apparent [T.z_eventually_space ? "Yes" : "No"], Actual [is_above_space ? "Yes" : "No"] - [FMT_OK(T.z_eventually_space == is_above_space)]", "Z Flags: [english_list(bitfield2list(T.mz_flags, global.mimic_defines), "(none)")]", "Has Shadower: [T.shadower ? "Yes" : "No"]", "Has turf proxy: [T.mimic_proxy ? "Yes" : "No"]", @@ -682,20 +780,20 @@ var/list/zmimic_fixed_planes = list( "Below: [!T.below ? "(nothing)" : "[T.below] at [T.below.x],[T.below.y],[T.below.z]"]", "Depth: [FMT_DEPTH(T.z_depth)] [T.z_depth == OPENTURF_MAX_DEPTH ? "(max)" : ""]", "Generation: [T.z_generation]", - "Update count: Claimed [claimed_update_count], Actual [real_update_count] - [claimed_update_count == real_update_count ? "OK" : "MISMATCH"]", + "Update count: Claimed [claimed_update_count], Actual [real_update_count] - [FMT_OK(claimed_update_count == real_update_count)]", "- "
)
if (!T.below)
out += "
- [fmt_label("Mimic", A)] plane [A.plane], layer [A.layer], depth [FMT_DEPTH(OO.depth)], fixup [OO.have_performed_fixup ? "Y" : "N"]" + var/base = "
- [fmt_label("Mimic", A)] plane [A.plane], layer [A.layer], depth [FMT_DEPTH(OO.depth)]"
if (QDELETED(OO.associated_atom)) // This shouldn't happen, but can if the deletion hook is not working.
return "[base] - [OO.type] copying
([OO.mimiced_type]) - ORPHANED "
@@ -793,7 +891,7 @@ var/list/zmimic_fixed_planes = list(
else if (A.type == /atom/movable/openspace/debug/turf)
var/atom/movable/openspace/debug/turf/VTO = A
- return " - [fmt_label("VTO", VTO.parent)] plane [VTO.plane], layer [VTO.layer], computed depth [FMT_DEPTH(VTO.computed_depth)] - [VTO.parent] ([VTO.parent.type]) - FOREIGN" + return "
- [fmt_label("VTO", VTO.parent)] plane [VTO.plane], layer [VTO.layer], computed depth [FMT_DEPTH(VTO.computed_depth)] - [VTO.parent] ([VTO.parent.type]) - FOREIGN" else if (A.type == /atom/movable/openspace/turf_proxy) return "
- [fmt_label("Turf Proxy", A)] plane [A.plane], layer [A.layer], Z-level [A.z] - [A] ([A.type]) " @@ -801,12 +899,12 @@ var/list/zmimic_fixed_planes = list( else return "
- [fmt_label("?", A)] plane [A.plane], layer [A.layer], Z-level [A.z] - [A] ([A.type]) " -/datum/controller/subsystem/zmimic/proc/fmt_label(label, atom/target, vv = TRUE) +/datum/controller/subsystem/zcopy/proc/fmt_label(label, atom/target, vv = TRUE) . = "\icon[target] \[[label]\] " if (vv) . += "(VV) " -/datum/controller/subsystem/zmimic/proc/debug_fmt_planelist(list/things, list/out, turf/original) +/datum/controller/subsystem/zcopy/proc/debug_fmt_planelist(list/things, list/out, turf/original) if (things) out += "
Using synthetic rendering (Not Z)."
- else if (T.mz_flags & MZ_MIMIC_BASETURF)
- out += "Using synthetic rendering (BASETURF).
"
+ else if (T.mz_flags & MZ_OVERRIDE)
+ out += "Using synthetic rendering (OVERRIDE) — override is [T.z_appearance ? "MANUAL" : "BASETURF (resolved to [READ_BASETURF(T)])"].
"
var/list/found_oo = list(T)
var/turf/Tbelow = T
while ((Tbelow = Tbelow.below))
var/atom/movable/openspace/debug/turf/VTO = new
- VTO.computed_depth = SSzmimic.zlev_maximums[Tbelow.z] - Tbelow.z
+ VTO.computed_depth = SSzcopy.zlev_maximums[Tbelow.z] - Tbelow.z
VTO.appearance = Tbelow
VTO.parent = Tbelow
VTO.plane = OPENTURF_MAX_PLANE - VTO.computed_depth
@@ -726,7 +824,7 @@ var/list/zmimic_fixed_planes = list(
for (var/plane_str in zmimic_fixed_planes)
if (atoms_list_list[plane_str])
out += "[zmimic_fixed_planes[plane_str]]"
- SSzmimic.debug_fmt_planelist(atoms_list_list[plane_str], out, T)
+ SSzcopy.debug_fmt_planelist(atoms_list_list[plane_str], out, T)
atoms_list_list -= plane_str
@@ -737,20 +835,20 @@ var/list/zmimic_fixed_planes = list(
continue
out += "Depth [d], plane [pl]"
- SSzmimic.debug_fmt_planelist(atoms_list_list["[pl]"], out, T)
+ SSzcopy.debug_fmt_planelist(atoms_list_list["[pl]"], out, T)
// Flush the list so we can find orphans.
atoms_list_list -= "[pl]"
if (atoms_list_list["[SPACE_PLANE]"]) // Space parallax plane
out += "Space parallax plane ([SPACE_PLANE])"
- SSzmimic.debug_fmt_planelist(atoms_list_list["[SPACE_PLANE]"], out, T)
+ SSzcopy.debug_fmt_planelist(atoms_list_list["[SPACE_PLANE]"], out, T)
atoms_list_list -= "[SPACE_PLANE]"
log_debug("atoms_list_list => [json_encode(atoms_list_list)]")
for (var/key in atoms_list_list)
out += "Unknown plane: [key]"
- SSzmimic.debug_fmt_planelist(atoms_list_list[key], out, T)
+ SSzcopy.debug_fmt_planelist(atoms_list_list[key], out, T)
out += "
"
@@ -762,10 +860,10 @@ var/list/zmimic_fixed_planes = list(
qdel(item)
// Yes, I know this proc is a bit of a mess. Feel free to clean it up.
-/datum/controller/subsystem/zmimic/proc/debug_fmt_thing(atom/A, list/out, turf/original)
+/datum/controller/subsystem/zcopy/proc/debug_fmt_thing(atom/A, list/out, turf/original)
if (istype(A, /atom/movable/openspace/mimic))
var/atom/movable/openspace/mimic/OO = A
- var/base = "
Using synthetic rendering (BASETURF).
" + else if (T.mz_flags & MZ_OVERRIDE) + out += "Using synthetic rendering (OVERRIDE) — override is [T.z_appearance ? "MANUAL" : "BASETURF (resolved to [READ_BASETURF(T)])"].
" var/list/found_oo = list(T) var/turf/Tbelow = T while ((Tbelow = Tbelow.below)) var/atom/movable/openspace/debug/turf/VTO = new - VTO.computed_depth = SSzmimic.zlev_maximums[Tbelow.z] - Tbelow.z + VTO.computed_depth = SSzcopy.zlev_maximums[Tbelow.z] - Tbelow.z VTO.appearance = Tbelow VTO.parent = Tbelow VTO.plane = OPENTURF_MAX_PLANE - VTO.computed_depth @@ -726,7 +824,7 @@ var/list/zmimic_fixed_planes = list( for (var/plane_str in zmimic_fixed_planes) if (atoms_list_list[plane_str]) out += "[zmimic_fixed_planes[plane_str]]" - SSzmimic.debug_fmt_planelist(atoms_list_list[plane_str], out, T) + SSzcopy.debug_fmt_planelist(atoms_list_list[plane_str], out, T) atoms_list_list -= plane_str @@ -737,20 +835,20 @@ var/list/zmimic_fixed_planes = list( continue out += "Depth [d], plane [pl]" - SSzmimic.debug_fmt_planelist(atoms_list_list["[pl]"], out, T) + SSzcopy.debug_fmt_planelist(atoms_list_list["[pl]"], out, T) // Flush the list so we can find orphans. atoms_list_list -= "[pl]" if (atoms_list_list["[SPACE_PLANE]"]) // Space parallax plane out += "Space parallax plane ([SPACE_PLANE])" - SSzmimic.debug_fmt_planelist(atoms_list_list["[SPACE_PLANE]"], out, T) + SSzcopy.debug_fmt_planelist(atoms_list_list["[SPACE_PLANE]"], out, T) atoms_list_list -= "[SPACE_PLANE]" log_debug("atoms_list_list => [json_encode(atoms_list_list)]") for (var/key in atoms_list_list) out += "Unknown plane: [key]" - SSzmimic.debug_fmt_planelist(atoms_list_list[key], out, T) + SSzcopy.debug_fmt_planelist(atoms_list_list[key], out, T) out += "" @@ -762,10 +860,10 @@ var/list/zmimic_fixed_planes = list( qdel(item) // Yes, I know this proc is a bit of a mess. Feel free to clean it up. -/datum/controller/subsystem/zmimic/proc/debug_fmt_thing(atom/A, list/out, turf/original) +/datum/controller/subsystem/zcopy/proc/debug_fmt_thing(atom/A, list/out, turf/original) if (istype(A, /atom/movable/openspace/mimic)) var/atom/movable/openspace/mimic/OO = A - var/base = "
- "
for (var/thing in things)
@@ -816,4 +914,49 @@ var/list/zmimic_fixed_planes = list(
out += "No atoms."
#undef FMT_DEPTH
-#undef READ_BASETURF
+#undef FMT_OK
+#undef ZM_RECORD_START
+#undef ZM_RECORD_STOP
+#undef ZM_RECORD_WRITE
+
+#ifdef ZM_RECORD_STATS
+/client/proc/zms_display_turf()
+ set name = "ZM Stats - 1Turf"
+ set category = "Debug"
+
+ if(!check_rights(R_DEBUG))
+ return
+
+ if (!length(SSzcopy.turf_stats))
+ alert("No stats.")
+ return
+
+ render_stats(SSzcopy.turf_stats, src)
+
+/client/proc/zms_display_discovery()
+ set name = "ZM Stats - 2Discovery"
+ set category = "Debug"
+
+ if(!check_rights(R_DEBUG))
+ return
+
+ if (!length(SSzcopy.discovery_stats))
+ alert("No stats.")
+ return
+
+ render_stats(SSzcopy.discovery_stats, src)
+
+/client/proc/zms_display_mimic()
+ set name = "ZM Stats - 3Mimic"
+ set category = "Debug"
+
+ if(!check_rights(R_DEBUG))
+ return
+
+ if (!length(SSzcopy.mimic_stats))
+ alert("No stats.")
+ return
+
+ render_stats(SSzcopy.mimic_stats, src)
+
+#endif
diff --git a/code/datums/browser/_browser.dm b/code/datums/browser/_browser.dm
index 634e2f572cb2..e06f9902c92a 100644
--- a/code/datums/browser/_browser.dm
+++ b/code/datums/browser/_browser.dm
@@ -12,8 +12,7 @@
var/body_elements
var/head_content = ""
var/content = ""
- var/static/datum/asset/simple/namespaced/common/common_asset = get_asset_datum(/datum/asset/simple/namespaced/common)
-
+ var/datum/asset_pack/simple/common/common_asset
/datum/browser/New(nuser, nwindow_id, ntitle = 0, nwidth = 0, nheight = 0, atom/nref = null)
@@ -28,6 +27,8 @@
if (nref)
ref = nref
+ common_asset = SSassets.ready_asset_pack(/datum/asset_pack/simple/common)
+
/datum/browser/proc/add_head_content(nhead_content)
head_content = nhead_content
@@ -38,20 +39,14 @@
//title_image = ntitle_image
/datum/browser/proc/add_stylesheet(name, file)
- if(istype(name, /datum/asset/spritesheet))
- var/datum/asset/spritesheet/sheet = name
- stylesheets["spritesheet_[sheet.name].css"] = "data/spritesheets/[sheet.name]"
- else
- var/asset_name = "[name].css"
-
- stylesheets[asset_name] = file
-
- if (!SSassets.cache[asset_name])
- SSassets.transport.register_asset(asset_name, file)
+ name = "[sanitize_filename(name)].css"
+ stylesheets |= name
+ SSassets.register_dynamic_item_by_name(file, name)
/datum/browser/proc/add_script(name, file)
- scripts["[ckey(name)].js"] = file
- SSassets.transport.register_asset("[ckey(name)].js", file)
+ name = "[sanitize_filename(name)].js"
+ scripts |= "[name]"
+ SSassets.register_dynamic_item_by_name("[name]", name)
/datum/browser/proc/set_content(ncontent)
content = ncontent
@@ -61,13 +56,13 @@
/datum/browser/proc/get_header()
var/file
- head_content += ""
+ head_content += ""
for (file in stylesheets)
- head_content += ""
+ head_content += ""
for (file in scripts)
- head_content += ""
+ head_content += ""
return {"
@@ -105,11 +100,9 @@
var/window_size = ""
if(width && height)
window_size = "size=[width]x[height];"
- common_asset.send(user)
- if(stylesheets.len)
- SSassets.transport.send_assets(user, stylesheets)
- if(scripts.len)
- SSassets.transport.send_assets(user, scripts)
+ SSassets.send_asset_pack(user, common_asset)
+ SSassets.send_dynamic_item_by_name(user, stylesheets)
+ SSassets.send_dynamic_item_by_name(user, scripts)
user << browse(get_content(), "window=[window_id];[window_size][window_options]")
if(use_onclose)
setup_onclose()
diff --git a/code/datums/changelog.dm b/code/datums/changelog.dm
index 910c72186f2d..b2929b6368ba 100644
--- a/code/datums/changelog.dm
+++ b/code/datums/changelog.dm
@@ -15,11 +15,12 @@
if(.)
return
if(action == "get_month")
- var/datum/asset/changelog_item/changelog_item = changelog_items[params["date"]]
+ var/datum/asset_pack/changelog_item/changelog_item = changelog_items[params["date"]]
if (!changelog_item)
- changelog_item = new /datum/asset/changelog_item(params["date"])
+ changelog_item = new /datum/asset_pack/changelog_item(params["date"])
changelog_items[params["date"]] = changelog_item
- return ui.send_asset(changelog_item)
+ ui.send_asset(changelog_item)
+ return TRUE
/datum/changelog/ui_static_data(mob/user, datum/tgui/ui)
var/list/data = list( "dates" = list() )
diff --git a/code/datums/components/_component.dm b/code/datums/components/_component.dm
index d46b995f7577..77b96d1f00bc 100644
--- a/code/datums/components/_component.dm
+++ b/code/datums/components/_component.dm
@@ -208,6 +208,19 @@
for (var/signal_type in signal_types)
RegisterSignal(target, signal_type, proctype, override)
+/**
+ * RegisterSignal on SSdcs to listen to global signals.
+ */
+/datum/proc/RegisterGlobalSignal(signal_type, proctype, override = FALSE)
+ RegisterSignal(SSdcs, signal_type, proctype, override)
+
+/**
+ * RegisterSignal on SSdcs to listen to global signals.
+ */
+/datum/proc/RegisterGlobalSignals(list/signal_types, proctype, override = FALSE)
+ for (var/signal_type in signal_types)
+ RegisterGlobalSignal(SSdcs, signal_type, proctype, override)
+
/**
* Stop listening to a given signal from target
*
@@ -254,6 +267,12 @@
if(!signal_procs[target].len)
signal_procs -= target
+/**
+ * RegisterSignal on SSdcs to listen to global signals.
+ */
+/datum/proc/UnregisterGlobalSignal(sig_type_or_types)
+ UnregisterSignal(SSdcs, sig_type_or_types)
+
/**
* Called on a component when a component of the same type was added to the same parent
*
diff --git a/code/datums/design/designs/medical/chemistry.dm b/code/datums/design/designs/medical/chemistry.dm
index 29b9abe6440f..9a95e95a553b 100644
--- a/code/datums/design/designs/medical/chemistry.dm
+++ b/code/datums/design/designs/medical/chemistry.dm
@@ -31,18 +31,8 @@
design_unlock = DESIGN_UNLOCK_INTRINSIC
build_path = /obj/item/reagent_containers/glass/hypovial/large
-/datum/design/medical/chemistry/syringe
- id = "ChemistrySyringe"
+/datum/design/medical/pillbottle
+ id = "ChemistryPillbottle"
lathe_type = LATHE_TYPE_AUTOLATHE
design_unlock = DESIGN_UNLOCK_INTRINSIC
- build_path = /obj/item/reagent_containers/syringe
-
-/datum/design/medical/chemistry/autoinjector
- id = "ChemistryAutoinjector"
- lathe_type = LATHE_TYPE_AUTOLATHE
- design_unlock = DESIGN_UNLOCK_INTRINSIC
- build_path = /obj/item/reagent_containers/hypospray/autoinjector/empty
- materials_base = list(
- MAT_STEEL = 250,
- MAT_GLASS = 250,
- )
+ build_path = /obj/item/storage/pill_bottle
diff --git a/code/datums/design/designs/medical/consumables.dm b/code/datums/design/designs/medical/consumables.dm
new file mode 100644
index 000000000000..32a565efcc2e
--- /dev/null
+++ b/code/datums/design/designs/medical/consumables.dm
@@ -0,0 +1,11 @@
+/datum/design/medical/chemistry/syringe
+ id = "MedicalSyringe"
+ lathe_type = LATHE_TYPE_AUTOLATHE
+ design_unlock = DESIGN_UNLOCK_INTRINSIC
+ build_path = /obj/item/reagent_containers/syringe
+
+/datum/design/medical/chemistry/autoinjector
+ id = "MedicalAutoinjector"
+ lathe_type = LATHE_TYPE_AUTOLATHE
+ design_unlock = DESIGN_UNLOCK_INTRINSIC
+ build_path = /obj/item/reagent_containers/hypospray/autoinjector/empty
diff --git a/code/datums/design/designs/medical/sterile_wear.dm b/code/datums/design/designs/medical/sterile_wear.dm
new file mode 100644
index 000000000000..7b608f722f01
--- /dev/null
+++ b/code/datums/design/designs/medical/sterile_wear.dm
@@ -0,0 +1,17 @@
+/datum/design/medical/latexgloves
+ id = "MedicalLatexGloves"
+ lathe_type = LATHE_TYPE_AUTOLATHE
+ design_unlock = DESIGN_UNLOCK_INTRINSIC
+ build_path = /obj/item/clothing/gloves/sterile/latex
+
+/datum/design/medical/nitrilgloves
+ id = "MedicalNitrilGloves"
+ lathe_type = LATHE_TYPE_AUTOLATHE
+ design_unlock = DESIGN_UNLOCK_INTRINSIC
+ build_path = /obj/item/clothing/gloves/sterile/nitrile
+
+/datum/design/medical/facemask
+ id = "MedicalFaceMask"
+ lathe_type = LATHE_TYPE_AUTOLATHE
+ design_unlock = DESIGN_UNLOCK_INTRINSIC
+ build_path = /obj/item/clothing/mask/surgical
diff --git a/code/datums/elements/items/hud_granter.dm b/code/datums/elements/items/hud_granter.dm
index 3782bc758600..fd2c0c9d66e1 100644
--- a/code/datums/elements/items/hud_granter.dm
+++ b/code/datums/elements/items/hud_granter.dm
@@ -28,12 +28,10 @@
if(!(slot in slots))
return
for(var/hud in huds)
- var/datum/atom_hud/H = GLOB.huds[hud]
- H.add_hud_to(M)
+ M.self_perspective.add_atom_hud(hud, ATOM_HUD_SOURCE_FOR_HUD_GRANTER_ON_EQUIPMENT_SLOT(slot))
/datum/element/hud_granter/proc/on_unequip(datum/source, mob/M, slot)
if(!(slot in slots))
return
for(var/hud in huds)
- var/datum/atom_hud/H = GLOB.huds[hud]
- H.remove_hud_from(M)
+ M.self_perspective.remove_atom_hud(hud, ATOM_HUD_SOURCE_FOR_HUD_GRANTER_ON_EQUIPMENT_SLOT(slot))
diff --git a/code/datums/event_args/actor.dm b/code/datums/event_args/actor.dm
index c5186ef2ed96..38f5117d96be 100644
--- a/code/datums/event_args/actor.dm
+++ b/code/datums/event_args/actor.dm
@@ -11,6 +11,11 @@
src.performer = performer
src.initiator = isnull(initiator)? performer : initiator
+/datum/event_args/actor/clone(include_contents)
+ return new /datum/event_args/actor(performer, initiator)
+
+// todo: reowrk these awful ass feedback/message procs wtf
+
/datum/event_args/actor/proc/chat_feedback(msg, atom/target)
performer.action_feedback(msg, target)
if(performer != initiator)
diff --git a/code/datums/event_args/clickchain.dm b/code/datums/event_args/clickchain.dm
index 4f350e9cae3c..93510a6352a1 100644
--- a/code/datums/event_args/clickchain.dm
+++ b/code/datums/event_args/clickchain.dm
@@ -1,12 +1,14 @@
/**
- * used to hold data about a click action
+ * used to hold data about a click (melee/ranged/other) action
+ *
+ * the click may be real or fake.
*/
/datum/event_args/actor/clickchain
- /// a_intent
+ /// optional: a_intent
var/intent
- /// click params
+ /// optional: click params
var/list/params
- /// target atom
+ /// optional: target atom
var/atom/target
/datum/event_args/actor/clickchain/New(mob/performer, mob/initiator, atom/target, intent, list/params)
@@ -14,3 +16,6 @@
src.target = target
src.intent = isnull(intent)? performer.a_intent : intent
src.params = isnull(params)? list() : params
+
+/datum/event_args/actor/clickchain/clone()
+ return new /datum/event_args/actor/clickchain(performer, initiator, target, intent, params)
diff --git a/code/datums/outfits/horror_killers.dm b/code/datums/outfits/horror_killers.dm
index 54f0fb68ace1..d28dfa48ff33 100644
--- a/code/datums/outfits/horror_killers.dm
+++ b/code/datums/outfits/horror_killers.dm
@@ -59,7 +59,7 @@
sec_briefcase.contents += new /obj/item/gun/ballistic/revolver/mateba
sec_briefcase.contents += new /obj/item/ammo_magazine/s357
sec_briefcase.contents += new /obj/item/plastique
- H.equip_to_slot_or_del(sec_briefcase, /datum/inventory_slot_meta/abstract/hand/left)
+ H.equip_to_slot_or_del(sec_briefcase, /datum/inventory_slot/abstract/hand/left)
/datum/outfit/samurai
name = "Vengeful Samurai"
diff --git a/code/datums/outfits/outfit.dm b/code/datums/outfits/outfit.dm
index 616f8af012c8..8b8ab2b73edb 100644
--- a/code/datums/outfits/outfit.dm
+++ b/code/datums/outfits/outfit.dm
@@ -32,7 +32,7 @@
var/r_hand = null
var/l_hand = null
// In the list(path=count,otherpath=count) format
- var/list/uniform_accessories = list() // webbing, armbands etc - fits in /datum/inventory_slot_meta/abstract/attach_as_accessory
+ var/list/uniform_accessories = list() // webbing, armbands etc - fits in /datum/inventory_slot/abstract/attach_as_accessory
var/list/backpack_contents = list()
var/id_type
@@ -88,7 +88,7 @@
for(var/path in backpack_contents)
var/number = backpack_contents[path]
for(var/i=0,i
\nTimer System: [d2]
\nTime Left: [(minute ? "[minute]:" : null)][second] - - + +\n" - - user << browse(dat, "window=partyalarm") - onclose(user, "partyalarm") - else - if(A.fire) - d1 = "[stars("No Party :(")]" - else - d1 = "[stars("PARTY!!!")]" - if(timing) - d2 = "[stars("Stop Time Lock")]" - else - d2 = "[stars("Initiate Time Lock")]" - var/second = time % 60 - var/minute = (time - second) / 60 - var/dat = "[stars("Party Button")] [d1]\n
\nTimer System: [d2]
\nTime Left: [(minute ? "[minute]:" : null)][second] - - + +\n" - - user << browse(dat, "window=partyalarm") - onclose(user, "partyalarm") - return - -/obj/machinery/partyalarm/proc/reset() - if(!(working)) - return - var/area/A = get_area(src) - ASSERT(isarea(A)) - A.partyreset() - return - -/obj/machinery/partyalarm/proc/alarm() - if(!(working)) - return - var/area/A = get_area(src) - ASSERT(isarea(A)) - A.partyalert() - return - -/obj/machinery/partyalarm/Topic(href, href_list) - ..() - if(usr.stat || machine_stat & (BROKEN|NOPOWER)) - return - if((usr.contents.Find(src) || ((get_dist(src, usr) <= 1) && istype(loc, /turf))) || (istype(usr, /mob/living/silicon/ai))) - usr.machine = src - if(href_list["reset"]) - reset() - else if(href_list["alarm"]) - alarm() - else if(href_list["time"]) - timing = text2num(href_list["time"]) - else if(href_list["tp"]) - var/tp = text2num(href_list["tp"]) - time += tp - time = min(max(round(time), 0), 120) - updateUsrDialog() - - add_fingerprint(usr) - else - usr << browse(null, "window=partyalarm") - return - return diff --git a/code/game/machinery/lathes/medical_lathe.dm b/code/game/machinery/lathes/medical_lathe.dm new file mode 100644 index 000000000000..42a0ca11f675 --- /dev/null +++ b/code/game/machinery/lathes/medical_lathe.dm @@ -0,0 +1,32 @@ +/obj/item/circuitboard/machine/lathe/medi_mini + name = T_BOARD("medical MiniLathe") + build_path = /obj/machinery/lathe/medical + +/obj/machinery/lathe/medical + name = "medical MiniLathe" + desc = "A standard minilathe, this one seems to print medical consumables." + lathe_type = LATHE_TYPE_AUTOLATHE + + has_interface = TRUE + + icon = 'icons/machinery/lathe/microlathe.dmi' + active_icon_state = "active" + print_icon_state = "print" + paused_icon_state = "pause" + + idle_power_usage = POWER_USAGE_LATHE_IDLE / 2 + active_power_usage = POWER_USAGE_LATHE_ACTIVE_SCALE(1) / 2 + circuit = /obj/item/circuitboard/machine/lathe/medi_mini + design_holder = /datum/design_holder/lathe/medi_mini_lathe + +/datum/design_holder/lathe/medi_mini_lathe/available_ids() + return SSresearch.medical_mini_design_ids | ..() + +/obj/machinery/lathe/medical/stocked/Initialize(mapload) + . = ..() + LAZYINITLIST(stored_materials.stored) + stored_materials.stored[MAT_STEEL] = 5 * SHEET_MATERIAL_AMOUNT + stored_materials.stored[MAT_GLASS] = 5 * SHEET_MATERIAL_AMOUNT + stored_materials.stored[MAT_PLASTIC] = 1 * SHEET_MATERIAL_AMOUNT + stored_materials.stored[MAT_WOOD] = 1 * SHEET_MATERIAL_AMOUNT + diff --git a/code/game/machinery/pipe/pipe_dispenser.dm b/code/game/machinery/pipe/pipe_dispenser.dm index d9adc6922ebc..5677ee85cd0a 100644 --- a/code/game/machinery/pipe/pipe_dispenser.dm +++ b/code/game/machinery/pipe/pipe_dispenser.dm @@ -16,10 +16,9 @@ return ui_interact(user) -/obj/machinery/pipedispenser/ui_assets(mob/user) - return list( - get_asset_datum(/datum/asset/spritesheet/pipes), - ) +/obj/machinery/pipedispenser/ui_asset_injection(datum/tgui/ui, list/immediate, list/deferred) + immediate += /datum/asset_pack/spritesheet/pipes + return ..() /obj/machinery/pipedispenser/ui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) diff --git a/code/game/machinery/suit_storage/suit_storage_prepared.dm b/code/game/machinery/suit_storage/suit_storage_prepared.dm index 4c91db73c271..00cb8bcafc18 100644 --- a/code/game/machinery/suit_storage/suit_storage_prepared.dm +++ b/code/game/machinery/suit_storage/suit_storage_prepared.dm @@ -24,8 +24,8 @@ boots_stored_TYPE = /obj/item/clothing/shoes/magboots /obj/machinery/suit_storage_unit/search_and_rescue - suit_stored_TYPE = /obj/item/clothing/suit/space/void/medical - helmet_stored_TYPE = /obj/item/clothing/head/helmet/space/void/medical + suit_stored_TYPE = /obj/item/clothing/suit/space/void/exploration/alt + helmet_stored_TYPE = /obj/item/clothing/head/helmet/space/void/exploration/alt mask_stored_TYPE = /obj/item/clothing/mask/breath boots_stored_TYPE = /obj/item/clothing/shoes/magboots diff --git a/code/game/machinery/vending/loadout.dm b/code/game/machinery/vending/loadout.dm index b80c1f89bac5..03debaedc09c 100644 --- a/code/game/machinery/vending/loadout.dm +++ b/code/game/machinery/vending/loadout.dm @@ -171,6 +171,8 @@ /obj/item/clothing/accessory/sweater/flowersweater = 5, /obj/item/clothing/accessory/sweater/redneck = 5, /obj/item/clothing/accessory/sweater/virgin = 5, + /obj/item/clothing/accessory/sweater/milk = 5, + /obj/item/clothing/accessory/sweater/milk/male = 5, /obj/item/clothing/accessory/tie = 5, /obj/item/clothing/accessory/tie/horrible = 5, /obj/item/clothing/accessory/tie/white = 5, @@ -224,6 +226,7 @@ /obj/item/clothing/mask/bandana/green = 5, /obj/item/clothing/mask/bandana/red = 5, /obj/item/clothing/mask/surgical = 5, + /obj/item/clothing/mask/warmer = 5, ) premium = list(/obj/item/bedsheet/rainbow = 1) contraband = list(/obj/item/clothing/mask/gas/clown_hat = 1) diff --git a/code/game/machinery/vending/vending.dm b/code/game/machinery/vending/vending.dm index f7506da156bd..a47f2cf8da65 100644 --- a/code/game/machinery/vending/vending.dm +++ b/code/game/machinery/vending/vending.dm @@ -11,18 +11,18 @@ // todo: temporary, as this is unbuildable integrity_flags = INTEGRITY_INDESTRUCTIBLE -//! ## Icons + //* Icons *// /// Icon_state when vending. var/icon_vend /// Icon_state when denying access. var/icon_deny -//! ## Power + //* Power *// use_power = USE_POWER_IDLE idle_power_usage = 10 var/vend_power_usage = 150 //actuators and stuff -//! ## Vending-related + //* Vending *// /// No sales pitches if off! var/active = TRUE /// Are we ready to vend?? Is it time?? diff --git a/code/game/mecha/combat/combat.dm b/code/game/mecha/combat/combat.dm index 7159c35fef70..a9e84b974790 100644 --- a/code/game/mecha/combat/combat.dm +++ b/code/game/mecha/combat/combat.dm @@ -82,7 +82,7 @@ H.stun_effect_act(1, force / 2, BP_TORSO, src) else return - if(update) H.UpdateDamageIcon() + if(update) H.update_damage_overlay() H.update_health() else diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index 8d2e3af026bd..1a6fe4513e80 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -478,10 +478,9 @@ /obj/machinery/mecha_part_fabricator/proc/get_construction_time_w_coeff(construction_time, roundto = 1) //aran return round(construction_time * time_coeff, roundto) -/obj/machinery/mecha_part_fabricator/ui_assets(mob/user) - return list( - get_asset_datum(/datum/asset/spritesheet/materials) - ) +/obj/machinery/mecha_part_fabricator/ui_asset_injection(datum/tgui/ui, list/immediate, list/deferred) + immediate += /datum/asset_pack/spritesheet/materials + return ..() /obj/machinery/mecha_part_fabricator/attack_hand(mob/user, list/params) if(..()) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 0b274a4ae479..4706b69b485b 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -171,7 +171,7 @@ var/static/image/radial_image_lighttoggle = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_light") var/static/image/radial_image_statpanel = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_examine2") -//! Mech actions + //* Legacy - Actions *// var/datum/mini_hud/mech/minihud /// re we strafing or not? var/strafing = 0 diff --git a/code/game/mecha/micro/micro.dm b/code/game/mecha/micro/micro.dm index d2f478a8b86b..6399d7cac31f 100644 --- a/code/game/mecha/micro/micro.dm +++ b/code/game/mecha/micro/micro.dm @@ -66,7 +66,7 @@ H.reagents.add_reagent("cryptobiolin", force) else return - if(update) H.UpdateDamageIcon() + if(update) H.update_damage_overlay() H.update_health() else diff --git a/code/game/objects/effects/debris/cleanable/blood.dm b/code/game/objects/effects/debris/cleanable/blood.dm index f87cbc9d5348..095f46374693 100644 --- a/code/game/objects/effects/debris/cleanable/blood.dm +++ b/code/game/objects/effects/debris/cleanable/blood.dm @@ -184,9 +184,8 @@ var/global/list/image/splatter_cache=list() if(random_icon_states.len) for(var/obj/effect/debris/cleanable/blood/writing/W in loc) random_icon_states.Remove(W.icon_state) - if(!LAZYLEN(random_icon_states))//If all iconstates are already in used by someone else on our tile, delete yourself - qdel(src) - return + if(!length(random_icon_states)) + return INITIALIZE_HINT_QDEL icon_state = pick(random_icon_states) else icon_state = "writing1" diff --git a/code/game/objects/effects/decals/posters/citadel.dm b/code/game/objects/effects/decals/posters/citadel.dm new file mode 100644 index 000000000000..172d40c47e5d --- /dev/null +++ b/code/game/objects/effects/decals/posters/citadel.dm @@ -0,0 +1,4 @@ +/datum/poster/cit_1 + icon_state="citposter1" + name = "I Blame Kynde" + desc = "A poster blaming the corporation Kynde Group Pharmaceuticals for something. It doesn't specify what." diff --git a/code/game/objects/effects/particles/_particles.dm b/code/game/objects/effects/particles/_particles.dm index 3f63047e3c81..fff2fa9a9c90 100644 --- a/code/game/objects/effects/particles/_particles.dm +++ b/code/game/objects/effects/particles/_particles.dm @@ -18,7 +18,7 @@ * After the datum is created, it can be assigned to an obj or mob using their particles var. The particles will appear on the map wherever that obj or mob appears. */ /particles -//! ## Particle vars that affect the entire set (generators are not allowed for these) + //* Particle vars that affect the entire set (generators are not allowed for these) *// /** * Width size of the particle image in pixels. @@ -74,7 +74,7 @@ */ transform = null -//! ## Vars that apply when a particle spawns + //* Vars that apply when a particle spawns *// /** * Maximum life of the particle, in ticks. @@ -94,8 +94,8 @@ */ fadein = 0 -//? The icon and icon_state values are special in that they can't be assigned a generator, but they -//? can be assigned a constant icon or string, respectively, or a list of possible values to choose from. + //? The icon and icon_state values are special in that they can't be assigned a generator, but they + //? can be assigned a constant icon or string, respectively, or a list of possible values to choose from. /** * Icon to use, if any; no icon means this particle will be a dot. @@ -165,7 +165,7 @@ */ friction = null -//! ## Vars that are evalulated every tick. + //* Vars that are evalulated every tick. *// /** * Added acceleration every tick; e.g. a circle or sphere generator can be applied to produce snow or ember effects. diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 8f96673b39a5..94bf8beecc7c 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -931,7 +931,7 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out. if(!isnull(obj_storage) && obj_storage.allow_quick_empty && obj_storage.allow_quick_empty_via_attack_self) var/turf/turf = get_turf(e_args.performer) obj_storage.auto_handle_interacted_mass_dumping(e_args, turf) - return CLICKCHAIN_DO_NOT_PROPAGATE + return TRUE return FALSE /** diff --git a/code/game/objects/items/apc_frame.dm b/code/game/objects/items/apc_frame.dm deleted file mode 100644 index a906bc6ddec0..000000000000 --- a/code/game/objects/items/apc_frame.dm +++ /dev/null @@ -1,44 +0,0 @@ -// APC HULL - -/obj/item/frame/apc - name = "\improper APC frame" - desc = "Used for repairing or building APCs" - icon = 'icons/obj/apc_repair.dmi' - icon_state = "apc_frame" - refund_amt = 2 - refund_type = /obj/item/stack/material/steel - -/obj/item/frame/apc/attackby(obj/item/W as obj, mob/user as mob) - ..() - if (W.is_wrench()) - new /obj/item/stack/material/steel( get_turf(src.loc), 2 ) - qdel(src) - -/obj/item/frame/apc/try_build(turf/on_wall, mob/user as mob) - if (get_dist(on_wall, user)>1) - return - var/ndir = get_dir(user, on_wall) - if (!(ndir in GLOB.cardinal)) - return - var/turf/loc = get_turf(user) - var/area/A = loc.loc - if (!istype(loc, /turf/simulated/floor)) - to_chat(user, "APC cannot be placed on this spot.") - return - if (A.requires_power == 0 || istype(A, /area/space)) - to_chat(user, "APC cannot be placed in this area.") - return - if (A.get_apc()) - to_chat(user, "This area already has an APC.") - return //only one APC per area - for(var/obj/machinery/power/terminal/T in loc) - if (T.master) - to_chat(user, "There is another network terminal here.") - return - else - var/obj/item/stack/cable_coil/C = new /obj/item/stack/cable_coil(loc) - C.amount = 10 - to_chat(user, "You cut the cables and disassemble the unused power terminal.") - qdel(T) - new /obj/machinery/power/apc(loc, ndir, 1) - qdel(src) diff --git a/code/game/objects/items/circuitboards/circuitboard.dm b/code/game/objects/items/circuitboards/circuitboard.dm index ce82992e42f9..c18140f7309d 100644 --- a/code/game/objects/items/circuitboards/circuitboard.dm +++ b/code/game/objects/items/circuitboards/circuitboard.dm @@ -14,11 +14,9 @@ MAT_GLASS = 250, ) origin_tech = list(TECH_DATA = 2) - density = FALSE - anchored = FALSE w_class = WEIGHT_CLASS_SMALL - damage_force = 5.0 - throw_force = 5.0 + damage_force = 5 + throw_force = 5 throw_speed = 3 throw_range = 15 var/build_path = null @@ -35,8 +33,6 @@ */ var/list/def_components - var/contain_parts = TRUE - /** * called when we are used to construct something. * diff --git a/code/game/objects/items/circuitboards/frame.dm b/code/game/objects/items/circuitboards/frame.dm index 87b2cc6b2140..b473bcc0d1e6 100644 --- a/code/game/objects/items/circuitboards/frame.dm +++ b/code/game/objects/items/circuitboards/frame.dm @@ -46,7 +46,7 @@ /obj/item/circuitboard/firealarm name = T_BOARD("fire alarm") - build_path = /obj/machinery/firealarm + build_path = /obj/machinery/fire_alarm board_type = new /datum/frame/frame_types/fire_alarm materials_base = list(MAT_STEEL = 50, MAT_GLASS = 50) diff --git a/code/game/objects/items/id_cards/cards.dm b/code/game/objects/items/id_cards/cards.dm index 62997abe8a8f..e6bd11dd4d72 100644 --- a/code/game/objects/items/id_cards/cards.dm +++ b/code/game/objects/items/id_cards/cards.dm @@ -75,3 +75,114 @@ desc = "This card contains coordinates to the fabled Clown Planet. Handle with care." function = "teleporter" data = "Clown Land" + + +/// FLUFF PERMIT + +/obj/item/card_fluff + name = "fluff card" + desc = "A tiny plaque of plastic. Purely decorative?" + description_fluff = "This permit was not issued by any branch of NanoTrasen, and as such it is not formally recognized at any NanoTrasen-operated installations. The bearer is not - under any circumstances - entitled to ownership of any items or allowed to perform any acts that would normally be restricted or illegal for their current position, regardless of what they or this permit may claim." + icon = 'icons/obj/card_fluff.dmi' + item_state = "card-id" + item_state_slots = list( + SLOT_ID_WORN_ID = "id" + ) + w_class = WEIGHT_CLASS_TINY + slot_flags = SLOT_EARS + + var/list/initial_sprite_stack = list("") + var/base_icon = 'icons/obj/card_fluff.dmi' + var/list/sprite_stack = list("") + + drop_sound = 'sound/items/drop/card.ogg' + pickup_sound = 'sound/items/pickup/card.ogg' + +/obj/item/card_fluff/proc/reset_icon() + sprite_stack = list("") + update_icon() + +/obj/item/card_fluff/update_icon() + if(!sprite_stack || !istype(sprite_stack) || sprite_stack == list("")) + icon = base_icon + icon_state = initial(icon_state) + + var/icon/I = null + for(var/iconstate in sprite_stack) + if(!iconstate) + iconstate = icon_state + if(I) + var/icon/IC = new(base_icon, iconstate) + I.Blend(IC, ICON_OVERLAY) + else + I = new/icon(base_icon, iconstate) + if(I) + icon = I + +/obj/item/card_fluff/attack_self() + + var/choice = tgui_input_list(usr, "What element would you like to customize?", "Customize Card", list("Band","Stamp","Reset")) + if(!choice) return + + if(choice == "Band") + var/bandchoice = tgui_input_list(usr, "Select colour", "Band colour", list("red","orange","green","dark green","medical blue","dark blue","purple","tan","pink","gold","white","black")) + if(!bandchoice) return + + if(bandchoice == "red") + sprite_stack.Add("bar-red") + else if(bandchoice == "orange") + sprite_stack.Add("bar-orange") + else if(bandchoice == "green") + sprite_stack.Add("bar-green") + else if(bandchoice == "dark green") + sprite_stack.Add("bar-darkgreen") + else if(bandchoice == "medical blue") + sprite_stack.Add("bar-medblue") + else if(bandchoice == "dark blue") + sprite_stack.Add("bar-blue") + else if(bandchoice == "purple") + sprite_stack.Add("bar-purple") + else if(bandchoice == "ran") + sprite_stack.Add("bar-tan") + else if(bandchoice == "pink") + sprite_stack.Add("bar-pink") + else if(bandchoice == "gold") + sprite_stack.Add("bar-gold") + else if(bandchoice == "white") + sprite_stack.Add("bar-white") + else if(bandchoice == "black") + sprite_stack.Add("bar-black") + + update_icon() + return + else if(choice == "Stamp") + var/stampchoice = tgui_input_list(usr, "Select image", "Stamp image", list("ship","cross","big ears","shield","circle-cross","target","smile","frown","peace","exclamation")) + if(!stampchoice) return + + if(stampchoice == "ship") + sprite_stack.Add("stamp-starship") + else if(stampchoice == "cross") + sprite_stack.Add("stamp-cross") + else if(stampchoice == "big ears") + sprite_stack.Add("stamp-bigears") //get 'em outta the caption, wiseguy!! + else if(stampchoice == "shield") + sprite_stack.Add("stamp-shield") + else if(stampchoice == "circle-cross") + sprite_stack.Add("stamp-circlecross") + else if(stampchoice == "target") + sprite_stack.Add("stamp-target") + else if(stampchoice == "smile") + sprite_stack.Add("stamp-smile") + else if(stampchoice == "frown") + sprite_stack.Add("stamp-frown") + else if(stampchoice == "peace") + sprite_stack.Add("stamp-peace") + else if(stampchoice == "exclamation") + sprite_stack.Add("stamp-exclaim") + + update_icon() + return + else if(choice == "Reset") + reset_icon() + return + return diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index 6c93e5816e05..e39b4b3fb6c8 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -56,7 +56,7 @@ to_chat(user, "You apply the [src], but it seems to have no effect...") use(1) return FALSE - H.UpdateDamageIcon() + H.update_damage_overlay() else C.heal_organ_damage((src.heal_brute/2), (src.heal_burn/2)) user.visible_message( \ diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index 6b5652a0277d..0ad96126f933 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -590,29 +590,29 @@ if(!.) return FALSE var/mob/living/carbon/human/H = M - var/datum/sprite_accessory/tail/taur/TT = H.tail_style - if(istype(H) && istype(TT, /datum/sprite_accessory/tail/taur/horse)) + var/datum/sprite_accessory/tail/legacy_taur/TT = H.tail_style + if(istype(H) && istype(TT, /datum/sprite_accessory/tail/legacy_taur/horse)) item_state = "[icon_base]_horse" return 1 - if(istype(H) && istype(TT, /datum/sprite_accessory/tail/taur/wolf)) + if(istype(H) && istype(TT, /datum/sprite_accessory/tail/legacy_taur/wolf)) item_state = "[icon_base]_wolf" return 1 - if(istype(H) && istype(TT, /datum/sprite_accessory/tail/taur/cow)) + if(istype(H) && istype(TT, /datum/sprite_accessory/tail/legacy_taur/cow)) item_state = "[icon_base]_cow" return 1 - if(istype(H) && istype(TT, /datum/sprite_accessory/tail/taur/lizard)) + if(istype(H) && istype(TT, /datum/sprite_accessory/tail/legacy_taur/lizard)) item_state = "[icon_base]_lizard" return 1 - if(istype(H) && istype(TT, /datum/sprite_accessory/tail/taur/feline)) + if(istype(H) && istype(TT, /datum/sprite_accessory/tail/legacy_taur/feline)) item_state = "[icon_base]_feline" return 1 - if(istype(H) && istype(TT, /datum/sprite_accessory/tail/taur/drake)) + if(istype(H) && istype(TT, /datum/sprite_accessory/tail/legacy_taur/drake)) item_state = "[icon_base]_drake" return 1 - if(istype(H) && istype(TT, /datum/sprite_accessory/tail/taur/otie)) + if(istype(H) && istype(TT, /datum/sprite_accessory/tail/legacy_taur/otie)) item_state = "[icon_base]_otie" return 1 - if(istype(H) && istype(TT, /datum/sprite_accessory/tail/taur/deer)) + if(istype(H) && istype(TT, /datum/sprite_accessory/tail/legacy_taur/deer)) item_state = "[icon_base]_deer" return 1 else diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 37aa58512548..3c11d0611c8b 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -25,7 +25,7 @@ update_icon() // todo: this bad lol -/obj/item/storage/belt/render_apply_overlays(mutable_appearance/MA, bodytype, inhands, datum/inventory_slot_meta/slot_meta, icon_used) +/obj/item/storage/belt/render_apply_overlays(mutable_appearance/MA, bodytype, inhands, datum/inventory_slot/slot_meta, icon_used) . = ..() var/static/icon/funny_belt_icon = 'icons/mob/clothing/belt.dmi' for(var/obj/item/I in contents) diff --git a/code/game/objects/items/storage/medical/firstaid.dm b/code/game/objects/items/storage/medical/firstaid.dm index 74be1b9dc196..7196fb1ea805 100644 --- a/code/game/objects/items/storage/medical/firstaid.dm +++ b/code/game/objects/items/storage/medical/firstaid.dm @@ -172,6 +172,8 @@ sfx_open = null max_combined_volume = WEIGHT_VOLUME_TINY * 14 max_single_weight_class = WEIGHT_CLASS_TINY + materials_base = list(MAT_PLASTIC = 80) + item_flags = ITEM_CAREFUL_BLUDGEON | ITEM_ENCUMBERS_WHILE_HELD | ITEM_EASY_LATHE_DECONSTRUCT var/label_text = "" var/labeled = 0 diff --git a/code/game/objects/items/weapons/RPD.dm b/code/game/objects/items/weapons/RPD.dm index 1ac9261686b7..816efe7b5867 100644 --- a/code/game/objects/items/weapons/RPD.dm +++ b/code/game/objects/items/weapons/RPD.dm @@ -112,10 +112,9 @@ return ui_interact(user) -/obj/item/pipe_dispenser/ui_assets(mob/user) - return list( - get_asset_datum(/datum/asset/spritesheet/pipes), - ) +/obj/item/pipe_dispenser/ui_asset_injection(datum/tgui/ui, list/immediate, list/deferred) + immediate += /datum/asset_pack/spritesheet/pipes + return ..() /obj/item/pipe_dispenser/ui_state() return GLOB.inventory_state diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index 96578cddd247..8faf835e2a90 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -128,7 +128,7 @@ var/last_chew = 0 add_attack_logs(H,H,"chewed own [O.name]") if(O.take_damage(3,0,1,1,"teeth marks")) - H:UpdateDamageIcon() + H:update_damage_overlay() last_chew = world.time */ diff --git a/code/game/objects/items/weapons/implants/implantaugment.dm b/code/game/objects/items/weapons/implants/implantaugment.dm index da26f72efa9e..cdbb56e3b955 100644 --- a/code/game/objects/items/weapons/implants/implantaugment.dm +++ b/code/game/objects/items/weapons/implants/implantaugment.dm @@ -118,29 +118,29 @@ if(O_AUG_R_HAND) I.organ_tag = O_AUG_R_HAND I.parent_organ = BP_R_HAND - I.target_slot = /datum/inventory_slot_meta/abstract/hand/right + I.target_slot = /datum/inventory_slot/abstract/hand/right if(O_AUG_L_HAND) I.organ_tag = O_AUG_L_HAND I.parent_organ = BP_L_HAND - I.target_slot = /datum/inventory_slot_meta/abstract/hand/left + I.target_slot = /datum/inventory_slot/abstract/hand/left if(O_AUG_R_FOREARM) I.organ_tag = O_AUG_R_FOREARM I.parent_organ = BP_R_ARM - I.target_slot = /datum/inventory_slot_meta/abstract/hand/right + I.target_slot = /datum/inventory_slot/abstract/hand/right if(O_AUG_L_FOREARM) I.organ_tag = O_AUG_L_FOREARM I.parent_organ = BP_L_ARM - I.target_slot = /datum/inventory_slot_meta/abstract/hand/left + I.target_slot = /datum/inventory_slot/abstract/hand/left if(O_AUG_R_UPPERARM) I.organ_tag = O_AUG_R_UPPERARM I.parent_organ = BP_R_ARM - I.target_slot = /datum/inventory_slot_meta/abstract/hand/right + I.target_slot = /datum/inventory_slot/abstract/hand/right if(O_AUG_L_UPPERARM) I.organ_tag = O_AUG_L_UPPERARM I.parent_organ = BP_L_ARM - I.target_slot = /datum/inventory_slot_meta/abstract/hand/left + I.target_slot = /datum/inventory_slot/abstract/hand/left . = H.get_organ(I.parent_organ) diff --git a/code/game/objects/items/weapons/material/armor.dm b/code/game/objects/items/weapons/material/armor.dm index f6b0c6fe7eb9..fcbfb38b4bc8 100644 --- a/code/game/objects/items/weapons/material/armor.dm +++ b/code/game/objects/items/weapons/material/armor.dm @@ -1,7 +1,7 @@ // todo: this is awful and need to all be refactored // Putting these at /clothing/ level saves a lot of code duplication in armor/helmets/gauntlets/etc /obj/item/clothing - material_parts = MATERIAL_DEFAULT_NONE + material_parts = MATERIAL_DEFAULT_DISABLED material_costs = 4000 material_primary = MATERIAL_PART_DEFAULT diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index dec2d74f8d80..9cc2b6640501 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -111,6 +111,10 @@ /// * this variable is not visible and should not be edited in the map editor. var/tmp/obj_persist_dynamic_status = NONE + //* Rotation + /// rotation behavior flags + var/obj_rotation_flags = NONE + //? Sounds /// volume when breaking out using resist process var/breakout_sound = 'sound/effects/grillehit.ogg' @@ -514,7 +518,7 @@ to_chat(H, "You land heavily!") H.adjustBruteLoss(damage) - H.UpdateDamageIcon() + H.update_damage_overlay() H.update_health() */ @@ -528,6 +532,33 @@ if(obj_storage?.allow_open_via_context_click) var/image/rendered = image(src) .["obj_storage"] = atom_context_tuple("open storage", rendered, mobility = MOBILITY_CAN_STORAGE, defaultable = TRUE) + if(obj_rotation_flags & OBJ_ROTATION_ENABLED) + if(obj_rotation_flags & OBJ_ROTATION_BIDIRECTIONAL) + var/image/rendered = image(src) // todo: sprite + .["rotate_cw"] = atom_context_tuple( + "Rotate Clockwise", + rendered, + 1, + MOBILITY_CAN_USE, + !!(obj_rotation_flags & OBJ_ROTATION_DEFAULTING), + ) + rendered = image(src) // todo: sprite + .["rotate_ccw"] = atom_context_tuple( + "Rotate Counterclockwise", + rendered, + 1, + MOBILITY_CAN_USE, + !!(obj_rotation_flags & OBJ_ROTATION_DEFAULTING), + ) + else + var/image/rendered = image(src) // todo: sprite + .["rotate_[obj_rotation_flags & OBJ_ROTATION_CCW? "ccw" : "cw"]"] = atom_context_tuple( + "Rotate [obj_rotation_flags & OBJ_ROTATION_CCW? "Counterclockwise" : "Clockwise"]", + rendered, + 1, + MOBILITY_CAN_USE, + !!(obj_rotation_flags & OBJ_ROTATION_DEFAULTING), + ) /obj/context_act(datum/event_args/actor/e_args, key) switch(key) @@ -563,6 +594,10 @@ return TRUE obj_storage?.auto_handle_interacted_open(e_args) return TRUE + if("rotate_cw", "rotate_ccw") + var/clockwise = key == "rotate_cw" + handle_rotation(e_args, clockwise) + return TRUE return ..() //* EMP *// @@ -650,6 +685,9 @@ . += "Its [key] is made out of [mat.display_name]" if((obj_persist_dynamic_id || obj_persist_static_id) && !(obj_persist_status & OBJ_PERSIST_STATUS_NO_EXAMINE)) . += SPAN_BOLDNOTICE("This entity is a persistent entity; it may be preserved into future rounds.") + // todo: context + construction (tool) examines at some point need a better system + if(obj_rotation_flags & OBJ_ROTATION_ENABLED) + . += SPAN_NOTICE("This entity can be rotated[(obj_rotation_flags & OBJ_ROTATION_NO_ANCHOR_CHECK)? "" : " while unanchored"] via context menu (alt click while adjacent).") /obj/proc/examine_integrity(mob/user) . = list() @@ -775,9 +813,42 @@ animate(src, transform=turn(matrix(), 8*shake_dir), pixel_x=init_px + 2*shake_dir, time=1) animate(transform=null, pixel_x=init_px, time=6, easing=ELASTIC_EASING) +//* Rotation *// + +/obj/proc/allow_rotation(datum/event_args/actor/actor, clockwise, silent) + if(!(obj_rotation_flags & OBJ_ROTATION_NO_ANCHOR_CHECK) && anchored) + if(!silent) + actor.chat_feedback( + SPAN_WARNING("[src] is anchored to the ground!"), + target = src, + ) + return FALSE + if(!(obj_rotation_flags & OBJ_ROTATION_BIDIRECTIONAL) && (clockwise ^ !(obj_rotation_flags & OBJ_ROTATION_CCW))) + if(!silent) + actor.chat_feedback( + SPAN_WARNING("[src] doesn't rotate in that direction."), + target = src, + ) + return FALSE + return TRUE + +/obj/proc/handle_rotation(datum/event_args/actor/actor, clockwise, silent, suppressed) + if(!allow_rotation(actor, clockwise, silent)) + return FALSE + setDir(turn(dir, clockwise? -90 : 90)) + if(!suppressed) + actor.visible_feedback( + target = src, + range = MESSAGE_RANGE_CONSTRUCTION, + visible = SPAN_NOTICE("[actor.performer] rotates [src]."), + audible = SPAN_NOTICE("You hear something being pivoted."), + visible_self = SPAN_NOTICE("You spin [src] [clockwise? "clockwise" : "counterclockwise"]."), + ) + return TRUE + //* Tool System *// -/obj/dynamic_tool_query(obj/item/I, datum/event_args/actor/clickchain/e_args, list/hint_images = list()) +/obj/dynamic_tool_query(obj/item/I, datum/event_args/actor/clickchain/e_args) if(isnull(obj_cell_slot) || !obj_cell_slot.remove_tool_behavior || !obj_cell_slot.interaction_active(e_args.performer)) return ..() . = list() diff --git a/code/game/objects/random/books.dm b/code/game/objects/random/books.dm new file mode 100644 index 000000000000..e85ef0d1ff39 --- /dev/null +++ b/code/game/objects/random/books.dm @@ -0,0 +1,8 @@ +/obj/random/lore_book + name = "random lore book" + desc = "This is a random book" + icon = 'icons/obj/library.dmi' + icon_state = "book" + +/obj/random/lore_book/item_to_spawn() + return pick(/obj/item/book/lore/xenomorph_castes) diff --git a/code/game/objects/random/guns_and_ammo.dm b/code/game/objects/random/guns_and_ammo.dm index b6e632b7f037..8e41e4311d0a 100644 --- a/code/game/objects/random/guns_and_ammo.dm +++ b/code/game/objects/random/guns_and_ammo.dm @@ -95,6 +95,8 @@ prob(1);/obj/item/gun/ballistic/shotgun/pump/rifle/taj, prob(1);/obj/item/gun/ballistic/shotgun/pump/rifle/lever, prob(1);/obj/item/gun/ballistic/shotgun/pump/rifle/lever/win1895, + prob(1);/obj/item/gun/ballistic/caseless/phoron_spitter, + prob(1);/obj/item/gun/ballistic/caseless/wild_hunt, prob(2);/obj/item/gun/ballistic/silenced) /obj/random/projectile/sec @@ -188,39 +190,43 @@ /obj/random/multiple/gun/projectile/smg/item_to_spawn() return pick( - prob(3);list( + prob(6);list( /obj/item/gun/ballistic/automatic/wt550, /obj/item/ammo_magazine/m9mmt, /obj/item/ammo_magazine/m9mmt ), - prob(3);list( + prob(6);list( /obj/item/gun/ballistic/automatic/wt274, /obj/item/ammo_magazine/m45uzi/wt274, /obj/item/ammo_magazine/m45uzi/wt274 ), - prob(1);list( + prob(2);list( /obj/item/gun/ballistic/automatic/mini_uzi, /obj/item/ammo_magazine/m45uzi, /obj/item/ammo_magazine/m45uzi ), - prob(1);list( + prob(2);list( /obj/item/gun/ballistic/automatic/tommygun, /obj/item/ammo_magazine/m45tommy, /obj/item/ammo_magazine/m45tommy ), - prob(2);list( + prob(4);list( /obj/item/gun/ballistic/automatic/c20r, /obj/item/ammo_magazine/m10mm, /obj/item/ammo_magazine/m10mm ), - prob(1);list( + prob(2);list( /obj/item/gun/ballistic/automatic/p90, /obj/item/ammo_magazine/m57x28mmp90 ), - prob(1);list( + prob(2);list( /obj/item/gun/ballistic/automatic/mini_uzi/taj, /obj/item/ammo_magazine/m45uzi, /obj/item/ammo_magazine/m45uzi + ), + prob(1);list( + /obj/item/gun/ballistic/caseless/phoron_spitter, + /obj/item/ammo_magazine/mphoronshot ) ) @@ -234,36 +240,41 @@ /obj/random/multiple/gun/projectile/rifle/item_to_spawn() return pick( - prob(2);list( + prob(4);list( /obj/item/gun/ballistic/automatic/sts35, /obj/item/ammo_magazine/m556, /obj/item/ammo_magazine/m556 ), - prob(2);list( + prob(4);list( /obj/item/gun/ballistic/automatic/z8, /obj/item/ammo_magazine/m762, /obj/item/ammo_magazine/m762 ), - prob(4);list( + prob(8);list( /obj/item/gun/ballistic/shotgun/pump/rifle, /obj/item/ammo_magazine/clip/c762, /obj/item/ammo_magazine/clip/c762 ), - prob(1);list( + prob(2);list( /obj/item/gun/ballistic/shotgun/pump/rifle/lever/win1895, /obj/item/ammo_magazine/clip/c762, /obj/item/ammo_magazine/clip/c762 ), - prob(1);list( + prob(2);list( /obj/item/gun/ballistic/automatic/bullpup, /obj/item/ammo_magazine/m762, /obj/item/ammo_magazine/m762 ), - prob(4);list( + prob(8);list( /obj/item/gun/ballistic/shotgun/pump/rifle/taj, /obj/item/ammo_magazine/clip/c762, /obj/item/ammo_magazine/clip/c762 - ) + ), + prob(1);list( + /obj/item/gun/ballistic/caseless/wild_hunt, + /obj/item/ammo_magazine/mfiftycalcaseless, + /obj/item/ammo_magazine/mfiftycalcaseless + ), ) /obj/random/multiple/gun/projectile/handgun diff --git a/code/game/objects/random/mapping.dm b/code/game/objects/random/mapping.dm index 02803fa76d91..a173fa671a69 100644 --- a/code/game/objects/random/mapping.dm +++ b/code/game/objects/random/mapping.dm @@ -569,7 +569,7 @@ prob(10);list( /obj/item/module/power_control, /obj/item/stack/cable_coil, - /obj/item/frame/apc, + /obj/item/frame2/apc, /obj/item/cell/high, /obj/structure/closet/crate/corporate/focalpoint //FOCAL APC ), diff --git a/code/game/objects/structures/crates_lockers/__closet.dm b/code/game/objects/structures/crates_lockers/__closet.dm index 8a5aa5a5d508..ec2b2d197dd8 100644 --- a/code/game/objects/structures/crates_lockers/__closet.dm +++ b/code/game/objects/structures/crates_lockers/__closet.dm @@ -170,6 +170,7 @@ playsound(src, open_sound, 15, 1, -3) if(initial(density)) density = !density + update_icon() return 1 /obj/structure/closet/proc/close() @@ -195,6 +196,7 @@ playsound(src, close_sound, 15, 1, -3) if(initial(density)) density = !density + update_icon() return 1 //Cham Projector Exception @@ -250,7 +252,6 @@ if(!(opened ? close() : open())) to_chat(user, "It won't budge!") return - update_icon() // this should probably use dump_contents() /obj/structure/closet/legacy_ex_act(severity) diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index cb54ee6530fd..8c70b3be3e93 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -50,6 +50,7 @@ icon_state = icon_opened src.opened = 1 shake_climbers() + update_icon() return 1 /obj/structure/closet/crate/close() @@ -74,6 +75,7 @@ icon_state = icon_closed src.opened = 0 + update_icon() return 1 /obj/structure/closet/crate/attackby(obj/item/W as obj, mob/user as mob) @@ -351,7 +353,7 @@ //closet_appearance = /singleton/closet_appearance/crate/engineering starts_with = list( - /obj/item/solar_assembly = 21, + /obj/item/frame2/solar_panel = 2, /obj/item/circuitboard/solar_control, /obj/item/tracker_electronics, /obj/item/paper/solar) diff --git a/code/game/rendering/atom_huds/README.md b/code/game/rendering/atom_huds/README.md new file mode 100644 index 000000000000..48aaf2b62d30 --- /dev/null +++ b/code/game/rendering/atom_huds/README.md @@ -0,0 +1,13 @@ +# atom hud system + +atom HUDs are ultimately a way to attach /image's to specific /atom's, and manage showing/hiding them from consumers. + +atom HUDs consist of 2 parts + +## /datum/atom_hud_provider + +provides icons to atom huds. tracks and processes updates. + +## /datum/atom_hud + +this is a hud that draws from a group of providers to provide those images to **perspectives** that use it. diff --git a/code/game/rendering/atom_huds/alternate_appearance.dm b/code/game/rendering/atom_huds/alternate_appearance.dm deleted file mode 100644 index c2232b760757..000000000000 --- a/code/game/rendering/atom_huds/alternate_appearance.dm +++ /dev/null @@ -1,190 +0,0 @@ -GLOBAL_LIST_EMPTY(active_alternate_appearances) - - -/atom/var/list/alternate_appearances - -/atom/proc/remove_alt_appearance(key) - if(alternate_appearances) - for(var/K in alternate_appearances) - var/datum/atom_hud/alternate_appearance/AA = alternate_appearances[K] - if(AA.appearance_key == key) - AA.remove_from_hud(src) - break - -/atom/proc/add_alt_appearance(type, key, ...) - if(!type || !key) - return - if(alternate_appearances && alternate_appearances[key]) - return - var/list/arguments = args.Copy(2) - new type(arglist(arguments)) - -/datum/atom_hud/alternate_appearance - var/appearance_key - var/transfer_overlays = FALSE - -/datum/atom_hud/alternate_appearance/New(key) - ..() - GLOB.active_alternate_appearances += src - appearance_key = key - -/datum/atom_hud/alternate_appearance/Destroy() - GLOB.active_alternate_appearances -= src - return ..() - -/datum/atom_hud/alternate_appearance/proc/onNewMob(mob/M) - if(mobShouldSee(M)) - add_hud_to(M) - -/datum/atom_hud/alternate_appearance/proc/mobShouldSee(mob/M) - return FALSE - -/datum/atom_hud/alternate_appearance/add_to_hud(atom/A, image/I) - . = ..() - if(.) - LAZYINITLIST(A.alternate_appearances) - A.alternate_appearances[appearance_key] = src - -/datum/atom_hud/alternate_appearance/remove_from_hud(atom/A) - . = ..() - if(.) - LAZYREMOVE(A.alternate_appearances, appearance_key) - -/datum/atom_hud/alternate_appearance/proc/copy_overlays(atom/other, cut_old) - return - -//an alternate appearance that attaches a single image to a single atom -/datum/atom_hud/alternate_appearance/basic - var/atom/target - var/image/theImage - var/add_ghost_version = FALSE - var/ghost_appearance - -/datum/atom_hud/alternate_appearance/basic/New(key, image/I, options = AA_TARGET_SEE_APPEARANCE) - ..() - transfer_overlays = options & AA_MATCH_TARGET_OVERLAYS - theImage = I - target = I.loc - if(transfer_overlays) - I.copy_overlays(target) - hud_icons = list(appearance_key) - add_to_hud(target, I) - if((options & AA_TARGET_SEE_APPEARANCE) && ismob(target)) - add_hud_to(target) - if(add_ghost_version) - var/image/ghost_image = image(icon = I.icon , icon_state = I.icon_state, loc = I.loc) - ghost_image.override = FALSE - ghost_image.alpha = 128 - ghost_appearance = new /datum/atom_hud/alternate_appearance/basic/observers(key + "_observer", ghost_image, FALSE) - -/datum/atom_hud/alternate_appearance/basic/Destroy() - . = ..() - if(ghost_appearance) - QDEL_NULL(ghost_appearance) - -/datum/atom_hud/alternate_appearance/basic/add_to_hud(atom/A) - LAZYINITLIST(A.hud_list) - A.hud_list[appearance_key] = theImage - . = ..() - -/datum/atom_hud/alternate_appearance/basic/remove_from_hud(atom/A) - . = ..() - A.hud_list -= appearance_key - if(. && !QDELETED(src)) - qdel(src) - -/datum/atom_hud/alternate_appearance/basic/copy_overlays(atom/other, cut_old) - theImage.copy_overlays(other, cut_old) - -/datum/atom_hud/alternate_appearance/basic/everyone - add_ghost_version = TRUE - -/datum/atom_hud/alternate_appearance/basic/everyone/New() - ..() - for(var/mob in GLOB.mob_list) - if(mobShouldSee(mob)) - add_hud_to(mob) - -/datum/atom_hud/alternate_appearance/basic/everyone/mobShouldSee(mob/M) - return !isobserver(M) - -/datum/atom_hud/alternate_appearance/basic/silicons - -/datum/atom_hud/alternate_appearance/basic/silicons/New() - ..() - for(var/mob in silicon_mob_list) - if(mobShouldSee(mob)) - add_hud_to(mob) - -/datum/atom_hud/alternate_appearance/basic/silicons/mobShouldSee(mob/M) - if(issilicon(M)) - return TRUE - return FALSE - -/datum/atom_hud/alternate_appearance/basic/observers - add_ghost_version = FALSE //just in case, to prevent infinite loops - -/datum/atom_hud/alternate_appearance/basic/observers/New() - ..() - for(var/mob in dead_mob_list) - if(mobShouldSee(mob)) - add_hud_to(mob) - -/datum/atom_hud/alternate_appearance/basic/observers/mobShouldSee(mob/M) - return isobserver(M) - -/datum/atom_hud/alternate_appearance/basic/noncult - -/datum/atom_hud/alternate_appearance/basic/noncult/New() - ..() - for(var/mob in GLOB.player_list) - if(mobShouldSee(mob)) - add_hud_to(mob) - -/datum/atom_hud/alternate_appearance/basic/noncult/mobShouldSee(mob/M) - if(!iscultist(M)) - return TRUE - return FALSE - -/datum/atom_hud/alternate_appearance/basic/cult - -/datum/atom_hud/alternate_appearance/basic/cult/New() - ..() - for(var/mob in GLOB.player_list) - if(mobShouldSee(mob)) - add_hud_to(mob) - -/datum/atom_hud/alternate_appearance/basic/cult/mobShouldSee(mob/M) - if(iscultist(M)) - return TRUE - return FALSE - -/datum/atom_hud/alternate_appearance/basic/blessedAware - -/datum/atom_hud/alternate_appearance/basic/blessedAware/New() - ..() - for(var/mob in GLOB.mob_list) - if(mobShouldSee(mob)) - add_hud_to(mob) - -/datum/atom_hud/alternate_appearance/basic/blessedAware/mobShouldSee(mob/M) - if(M.mind && (M.mind.assigned_role == "Chaplain")) - return TRUE - // if (istype(M, /mob/living/simple_animal/hostile/construct/wraith)) - // return TRUE - // if(isrevenant(M) || iseminence(M) || iswizard(M)) - // return TRUE - return FALSE - -/datum/atom_hud/alternate_appearance/basic/onePerson - var/mob/seer - -/datum/atom_hud/alternate_appearance/basic/onePerson/mobShouldSee(mob/M) - if(M == seer) - return TRUE - return FALSE - -/datum/atom_hud/alternate_appearance/basic/onePerson/New(key, image/I, mob/living/M) - ..(key, I, FALSE) - seer = M - add_hud_to(seer) diff --git a/code/game/rendering/atom_huds/atom_hud.dm b/code/game/rendering/atom_huds/atom_hud.dm index 2a99d4da7794..3afd5ffe95f0 100644 --- a/code/game/rendering/atom_huds/atom_hud.dm +++ b/code/game/rendering/atom_huds/atom_hud.dm @@ -1,114 +1,107 @@ -/* HUD DATUMS */ - -GLOBAL_LIST_EMPTY(all_huds) - -//GLOBAL HUD LIST -GLOBAL_LIST_INIT(huds, list( - DATA_HUD_SECURITY_BASIC = new /datum/atom_hud/data/human/security/basic, - DATA_HUD_SECURITY_ADVANCED = new /datum/atom_hud/data/human/security/advanced, - DATA_HUD_MEDICAL = new /datum/atom_hud/data/human/medical, - DATA_HUD_ID_JOB = new /datum/atom_hud/data/human/job_id, - HUD_ANTAG = new /datum/atom_hud/antag, - WORLD_BENDER_HUD_ANIMALS = new /datum/atom_hud/world_bender/animals, - )) - -/proc/get_atom_hud(id) +//* This file is explicitly licensed under the MIT license. *// +//* Copyright (c) 2024 silicons *// + +GLOBAL_LIST_INIT(atom_huds, initialize_atom_huds()) + +/proc/initialize_atom_huds() + . = list() + for(var/datum/atom_hud/hud_type as anything in subtypesof(/datum/atom_hud)) + if(initial(hud_type.abstract_type) == hud_type) + continue + var/datum/atom_hud/hud = new hud_type + .[hud_type] = hud + if(hud.id != hud_type) + ASSERT(!.[hud.id]) + .[hud.id] = hud + +/** + * instantiate a custom hud + */ +/proc/initialize_atom_hud(path, list/hud_providers, id) + ASSERT(!GLOB.atom_huds[id]) + var/datum/atom_hud/hud = new path(id, hud_providers) + GLOB.atom_huds[id] = hud + +/proc/fetch_atom_hud(datum/atom_hud/hudlike) RETURN_TYPE(/datum/atom_hud) - return GLOB.huds[id] - -// TODO: atom_huds on mob with hud sources -// TODO: /datum/hud_supplier for image metadata/hud list metadata -// TODO: atom huds using hud supplier id lists, more id usage in general for dynamic gen + if(istype(hudlike)) + return hudlike + return GLOB.atom_huds[hudlike] /datum/atom_hud - var/list/atom/hudatoms = list() //list of all atoms which display this hud - var/list/hudusers = list() //list with all mobs who can see the hud - var/list/hud_icons = list() //these will be the indexes for the atom's hud_list - - var/list/next_time_allowed = list() //mobs associated with the next time this hud can be added to them - var/list/queued_to_see = list() //mobs that have triggered the cooldown and are queued to see the hud, but do not yet - -/datum/atom_hud/New() - GLOB.all_huds += src - -/datum/atom_hud/Destroy() - for(var/v in hudusers) - remove_hud_from(v) - for(var/v in hudatoms) - remove_from_hud(v) - GLOB.all_huds -= src - return ..() - -/datum/atom_hud/proc/remove_hud_from(mob/M) - if(!M || !hudusers[M]) - return - if (!--hudusers[M]) - hudusers -= M - if(queued_to_see[M]) - queued_to_see -= M - else - for(var/atom/A in hudatoms) - remove_from_single_hud(M, A) - -/datum/atom_hud/proc/remove_from_hud(atom/A) - if(!A) - return FALSE - for(var/mob/M in hudusers) - remove_from_single_hud(M, A) - hudatoms -= A - return TRUE - -/datum/atom_hud/proc/remove_from_single_hud(mob/M, atom/A) //unsafe, no sanity apart from client - if(!M || !M.client || !A) - return - for(var/i in hud_icons) - M.client.images -= A.hud_list[i] - -/datum/atom_hud/proc/add_hud_to(mob/M) - if(!M) - return - if(!hudusers[M]) - hudusers[M] = 1 - if(next_time_allowed[M] > world.time) - if(!queued_to_see[M]) - addtimer(CALLBACK(src, PROC_REF(show_hud_images_after_cooldown), M), next_time_allowed[M] - world.time) - queued_to_see[M] = TRUE - else - next_time_allowed[M] = world.time + ADD_HUD_TO_COOLDOWN - for(var/atom/A in hudatoms) - add_to_single_hud(M, A) - else - hudusers[M]++ - -/datum/atom_hud/proc/show_hud_images_after_cooldown(M) - if(queued_to_see[M]) - queued_to_see -= M - next_time_allowed[M] = world.time + ADD_HUD_TO_COOLDOWN - for(var/atom/A in hudatoms) - add_to_single_hud(M, A) - -/datum/atom_hud/proc/add_to_hud(atom/A) - if(!A) - return FALSE - hudatoms |= A - for(var/mob/M in hudusers) - if(!queued_to_see[M]) - add_to_single_hud(M, A) - return TRUE - -/datum/atom_hud/proc/add_to_single_hud(mob/M, atom/A) //unsafe, no sanity apart from client - if(!M || !M.client || !A) + /// id; if exists, we register with id too + var/id + /// list of typepaths or ids of providers + var/list/providers = list() + + /// DO NOT CHANGE THIS VALUE IN RUNTIME! + /// If set, we will automatically grant ourselves to mob's self-perspectives + /// if necessary. + var/auto_registration = FALSE + +/datum/atom_hud/New(id, list/hud_providers) + if(!isnull(id)) + src.id = id + ASSERT(src.id) + else if(isnull(src.id)) + src.id = type + if(!isnull(hud_providers)) + src.providers = hud_providers + if(auto_registration) + RegisterGlobalSignal(COMSIG_GLOBAL_MOB_NEW, PROC_REF(on_global_mob_new)) + +/datum/atom_hud/proc/resolve_providers() + . = list() + for(var/id in providers) + . += GLOB.atom_hud_providers[id] + +/datum/atom_hud/proc/on_global_mob_new(mob/source) + if(!should_auto_register_on(source)) return - for(var/i in hud_icons) - if(A.hud_list[i]) - M.client.images |= A.hud_list[i] - -//MOB PROCS -/mob/proc/reload_huds() - for(var/datum/atom_hud/hud in GLOB.all_huds) - if(hud && hud.hudusers[src]) - for(var/atom/A in hud.hudatoms) - hud.add_to_single_hud(src, A) - -/mob/new_player/reload_huds() - return + source.ensure_self_perspective() + source.self_perspective.add_atom_hud(src, ATOM_HUD_SOURCE_AUTOGRANT) + +/** + * if [auto_registration] is set, this is called to determine if we should + * be on a mob's self_perspective. + */ +/datum/atom_hud/proc/should_auto_register_on(mob/target) + return FALSE + +//* Implementations - split off into their other files later. *// + +/datum/atom_hud/data/human/medical + providers = list( + /datum/atom_hud_provider/medical_biology, + /datum/atom_hud_provider/medical_health, + ) + +/datum/atom_hud/data/human/job_id + providers = list( + /datum/atom_hud_provider/security_job, + ) + +/datum/atom_hud/data/human/security + +/datum/atom_hud/data/human/security/basic + providers = list( + /datum/atom_hud_provider/security_job, + /datum/atom_hud_provider/security_status, + ) + +/datum/atom_hud/data/human/security/advanced + providers = list( + /datum/atom_hud_provider/security_job, + /datum/atom_hud_provider/security_status, + /datum/atom_hud_provider/security_implant, + ) + +/datum/atom_hud/antag + providers = list( + /datum/atom_hud_provider/special_role, + ) + +/datum/atom_hud/world_bender + providers = list( + /datum/atom_hud_provider/overriding/world_bender_animals, + ) diff --git a/code/game/rendering/atom_huds/atom_hud_provider.dm b/code/game/rendering/atom_huds/atom_hud_provider.dm new file mode 100644 index 000000000000..c32ed4e3511d --- /dev/null +++ b/code/game/rendering/atom_huds/atom_hud_provider.dm @@ -0,0 +1,290 @@ +//* This file is explicitly licensed under the MIT license. *// +//* Copyright (c) 2024 silicons *// + +GLOBAL_LIST_INIT(atom_hud_providers, initialize_atom_hud_providers()) + +/proc/initialize_atom_hud_providers() + . = list() + for(var/datum/atom_hud_provider/provider_type as anything in subtypesof(/datum/atom_hud_provider)) + if(initial(provider_type.abstract_type) == provider_type) + continue + var/datum/atom_hud_provider/provider = new provider_type + if(.[provider.id]) + stack_trace("dupe id [provider.id] between [.[provider.id]:type] and [provider_type]") + continue + .[provider.id] = provider + +/** + * instantiate a custom hud provider + */ +/proc/initialize_atom_hud_provider(path, icon/icon, id) + ASSERT(!GLOB.atom_hud_providers[id]) + var/datum/atom_hud_provider/provider = new path + provider.icon = icon + provider.id = id + GLOB.atom_hud_providers[id] = provider + +/proc/remove_atom_hud_provider(atom/A, hud_path) + var/datum/atom_hud_provider/provider = GLOB.atom_hud_providers[hud_path] + provider.queue_remove(A) + +/proc/add_atom_hud_provider(atom/A, hud_path) + return update_atom_hud_provider(A, hud_path) + +/proc/update_atom_hud_provider(atom/A, hud_path) + var/datum/atom_hud_provider/provider = GLOB.atom_hud_providers[hud_path] + provider.queue_add_or_update(A) + +#define ATOM_HUD_QUEUED_FOR_UPDATE "update" +#define ATOM_HUD_QUEUED_FOR_REMOVE "remove" + +/datum/atom_hud_provider + /// id; if exists, we register with ID too + var/id + /// our icon file + var/icon + /// layer bias: higher is above. this should not be above 100. + var/layer_bias = 0 + + /// atoms with us on it + var/list/atom/atoms = list() + /// images - this is so things are fast when adding/remove people from/to the hud. + var/list/image/images = list() + /// perspectives with this provider enabled + var/list/datum/perspective/using_perspectives = list() + /// clients with this provider enabled + var/list/client/using_clients = list() + + /// queued to update + var/list/atom/queued_for_update = list() + /// is an update queued? + var/update_queued = FALSE + +/datum/atom_hud_provider/New() + if(isnull(id)) + id = type + ASSERT(layer_bias <= 100 && layer_bias >= 0) + +/datum/atom_hud_provider/proc/add_perspective(datum/perspective/perspective) + using_perspectives += perspective + perspective.add_image(images) + +/datum/atom_hud_provider/proc/remove_perspective(datum/perspective/perspective) + using_perspectives -= perspective + perspective.remove_image(images) + +/datum/atom_hud_provider/proc/add_client(client/user) + using_clients += user + user.images += images + +/datum/atom_hud_provider/proc/remove_client(client/user) + using_clients -= user + user.images -= images + +/datum/atom_hud_provider/proc/remove(atom/A) + var/image/hud_image = A.atom_huds[type] + images -= hud_image + atoms -= A + for(var/datum/perspective/perspective as anything in using_perspectives) + perspective.remove_image(hud_image) + for(var/client/user as anything in using_clients) + user.images -= hud_image + +/datum/atom_hud_provider/proc/add_or_update(atom/A) + LAZYINITLIST(A.atom_huds) + atoms += A + var/image/hud_image = A.atom_huds[type] + if(isnull(hud_image)) + A.atom_huds[type] = hud_image = create_image(A) + images += hud_image + for(var/datum/perspective/perspective as anything in using_perspectives) + perspective.add_image(hud_image) + for(var/client/user as anything in using_clients) + user.images += hud_image + update(A, hud_image) + +/datum/atom_hud_provider/proc/update(atom/A, image/plate) + return + +/datum/atom_hud_provider/proc/queue_remove(atom/A) + if(!update_queued) + queue_update() + queued_for_update[A] = ATOM_HUD_QUEUED_FOR_REMOVE + +/datum/atom_hud_provider/proc/queue_add_or_update(atom/A) + if(!update_queued) + queue_update() + LAZYINITLIST(A.atom_huds) + var/image/hud_image = A.atom_huds[type] + // todo: should we queue the add operations instead of duping them..? + if(isnull(hud_image)) + A.atom_huds[type] = hud_image = create_image(A) + images += hud_image + for(var/datum/perspective/perspective as anything in using_perspectives) + perspective.add_image(hud_image) + queued_for_update[A] = ATOM_HUD_QUEUED_FOR_UPDATE + +/datum/atom_hud_provider/proc/queue_update() + update_queued = TRUE + addtimer(CALLBACK(src, PROC_REF(process_queue)), 0) + +/datum/atom_hud_provider/proc/process_queue() + for(var/atom/A as anything in queued_for_update) + var/opcode = queued_for_update[A] + switch(opcode) + if(ATOM_HUD_QUEUED_FOR_UPDATE) + update(A, A.atom_huds[type]) + if(ATOM_HUD_QUEUED_FOR_REMOVE) + remove(A) + update_queued = FALSE + queued_for_update = list() + +/datum/atom_hud_provider/proc/create_image(atom/target) + var/image/creating = image(icon, target, "") + creating.layer = FLOAT_LAYER + 100 + layer_bias + creating.plane = FLOAT_PLANE + creating.appearance_flags = RESET_COLOR | RESET_TRANSFORM | KEEP_APART + return creating + +/** + * sets up image with override = TRUE + */ +/datum/atom_hud_provider/overriding + abstract_type = /datum/atom_hud_provider/overriding + +/datum/atom_hud_provider/overriding/create_image(atom/target) + var/image/creating = ..() + creating.override = TRUE + return creating + +#undef ATOM_HUD_QUEUED_FOR_UPDATE +#undef ATOM_HUD_QUEUED_FOR_REMOVE + +//* Implementations - split off into their other files later. *// + +/datum/atom_hud_provider/security_status + icon = 'icons/screen/atom_hud/security.dmi' + +/datum/atom_hud_provider/security_status/update(atom/A, image/plate) + if(!ishuman(A)) + return + var/mob/living/carbon/human/H = A + var/image/holder = plate + holder.icon_state = "" + var/perpname = H.name + if( H.wear_id) + var/obj/item/card/id/I = H.wear_id.GetID() + if(I) + perpname = I.registered_name + + for(var/datum/data/record/E in data_core.general) + if(E.fields["name"] == perpname) + for (var/datum/data/record/R in data_core.security) + if((R.fields["id"] == E.fields["id"]) && (R.fields["criminal"] == "*Arrest*")) + holder.icon_state = "hudwanted" + break + else if((R.fields["id"] == E.fields["id"]) && (R.fields["criminal"] == "Incarcerated")) + holder.icon_state = "hudincarcerated" + break + else if((R.fields["id"] == E.fields["id"]) && (R.fields["criminal"] == "Parolled")) + holder.icon_state = "hudparolled" + break + else if((R.fields["id"] == E.fields["id"]) && (R.fields["criminal"] == "Released")) + holder.icon_state = "huddischarged" + break + +/datum/atom_hud_provider/security_job + icon = 'icons/screen/atom_hud/job.dmi' + +/datum/atom_hud_provider/security_job/update(atom/A, image/plate) + if(!ishuman(A)) + return + var/mob/living/carbon/human/H = A + var/image/holder = plate + if(H.wear_id) + var/obj/item/card/id/I = H.wear_id.GetID() + if(I) + holder.icon_state = "[ckey(I.GetJobName())]" // ckey() serves as a formating help, not actually related to the ckey of the mob + else + holder.icon_state = "unknown" + else + holder.icon_state = "unknown" + +/datum/atom_hud_provider/medical_biology + icon = 'icons/screen/atom_hud/biology.dmi' + +/datum/atom_hud_provider/medical_biology/update(atom/A, image/plate) + if(!isliving(A)) + return + var/mob/living/L = A + var/image/holder = plate + var/foundVirus = L.check_viruses() + if(L.isSynthetic()) + holder.icon_state = "robo" + else if(L.stat == DEAD) + holder.icon_state = "dead" + else if(foundVirus) + holder.icon_state = "ill1" + else if(L.has_brain_worms()) + var/mob/living/simple_mob/animal/borer/B = L.has_brain_worms() + holder.icon_state = B.controlling? "brainworm" : "healthy" + else + holder.icon_state = "healthy" + +/datum/atom_hud_provider/medical_health + icon = 'icons/screen/atom_hud/health.dmi' + +/datum/atom_hud_provider/medical_health/update(atom/A, image/plate) + if(!isliving(A)) + return + var/mob/living/M = A + var/image/I = plate + if(M.stat == DEAD) + I.icon_state = "-100" + else + I.icon_state = RoundHealth((M.health-config_legacy.health_threshold_crit)/(M.getMaxHealth()-config_legacy.health_threshold_crit)*100) + +/datum/atom_hud_provider/security_implant + icon = 'icons/screen/atom_hud/implant.dmi' + +/datum/atom_hud_provider/security_implant/update(atom/A, image/plate) + if(!ismob(A)) + return + var/mob/M = A + plate.overlays = list() + for(var/obj/item/implant/I in M) + if(!I.implanted) + continue + if(I.malfunction) + continue + if(istype(I, /obj/item/implant/tracking)) + plate.overlays |= "tracking" + if(istype(I, /obj/item/implant/loyalty)) + plate.overlays |= "loyal" + if(istype(I, /obj/item/implant/chem)) + plate.overlays |= "chem" + +/datum/atom_hud_provider/special_role + icon = 'icons/screen/atom_hud/antag.dmi' + +/datum/atom_hud_provider/special_role/update(atom/A, image/plate) + if(!ismob(A)) + return + var/mob/M = A + var/image/holder = plate + holder.icon_state = "" + if(M.mind?.special_role) + // ANTAG DATUM REFACTOR WHEN AUHGAOUSHGODHGHOAD + if(hud_icon_reference[M.mind.special_role]) + holder.icon_state = hud_icon_reference[M.mind.special_role] + else + holder.icon_state = "syndicate" + +/datum/atom_hud_provider/overriding/world_bender_animals + icon = 'icons/mob/animal.dmi' + +/datum/atom_hud_provider/overriding/world_bender_animals/create_image(atom/target) + var/image/creating = ..() + var/animal = pick("cow","chicken_brown", "chicken_black", "chicken_white", "chick", "mouse_brown", "mouse_gray", "mouse_white", "lizard", "cat2", "goose", "penguin") + creating.icon_state = animal + return creating diff --git a/code/game/rendering/atom_huds/data_huds.dm b/code/game/rendering/atom_huds/data_huds.dm deleted file mode 100644 index f4555ee4e394..000000000000 --- a/code/game/rendering/atom_huds/data_huds.dm +++ /dev/null @@ -1,165 +0,0 @@ -/* - * Data HUDs have been rewritten in a more generic way. - * In short, they now use an observer-listener pattern. - * See code/datum/hud.dm for the generic hud datum. - * Update the HUD icons when needed with the appropriate hook. (see below) - */ - -/* DATA HUD DATUMS */ - -/atom/proc/add_to_all_human_data_huds() - for(var/datum/atom_hud/data/human/hud in GLOB.huds) - hud.add_to_hud(src) - -/atom/proc/remove_from_all_data_huds() - for(var/datum/atom_hud/data/hud in GLOB.huds) - hud.remove_from_hud(src) - -/datum/atom_hud/data - -/datum/atom_hud/data/human/medical - hud_icons = list(BIOLOGY_HUD, LIFE_HUD) - -/datum/atom_hud/data/human/job_id - hud_icons = list(ID_HUD) - -/datum/atom_hud/data/human/security - -/datum/atom_hud/data/human/security/basic - hud_icons = list(ID_HUD, WANTED_HUD) - -/datum/atom_hud/data/human/security/advanced - hud_icons = list(ID_HUD, IMPTRACK_HUD, IMPLOYAL_HUD, IMPCHEM_HUD, WANTED_HUD) - -/datum/atom_hud/antag - hud_icons = list(ANTAG_HUD) - -// one of these days we'll make /datum/hud_supplier -// and we can standardize everything -// today is not that day for i have no patience or motivation left - -/mob/proc/update_hud_med_health() - return - -/mob/living/update_hud_med_health() - . = ..() - var/image/I = hud_list[LIFE_HUD] - if(!I) - return - if(stat == DEAD) - I.icon_state = "-100" - else - I.icon_state = RoundHealth((health-config_legacy.health_threshold_crit)/(getMaxHealth()-config_legacy.health_threshold_crit)*100) - -/mob/proc/update_hud_med_status() - var/image/holder = hud_list[BIOLOGY_HUD] - if(!holder) - return - var/foundVirus = check_viruses() - if(isSynthetic()) - holder.icon_state = "robo" - else if(stat == DEAD) - holder.icon_state = "dead" - else if(foundVirus) - holder.icon_state = "ill1" - else if(has_brain_worms()) - var/mob/living/simple_mob/animal/borer/B = has_brain_worms() - holder.icon_state = B.controlling? "brainworm" : "healthy" - else - holder.icon_state = "healthy" - -/mob/proc/update_hud_med_all() - update_hud_med_health() - update_hud_med_status() - -/mob/proc/update_hud_sec_implants() - var/image/Itrack = hud_list[IMPTRACK_HUD] - var/image/Ichem = hud_list[IMPCHEM_HUD] - var/image/Iloyal = hud_list[IMPLOYAL_HUD] - Itrack?.icon_state = "" - Ichem?.icon_state = "" - Iloyal?.icon_state = "" - for(var/obj/item/implant/I in src) - if(!I.implanted) - continue - if(I.malfunction) - continue - if(istype(I, /obj/item/implant/tracking)) - Itrack?.icon_state = "tracking" - if(istype(I, /obj/item/implant/loyalty)) - Iloyal?.icon_state = "loyal" - if(istype(I, /obj/item/implant/chem)) - Ichem?.icon_state = "chem" - -/mob/proc/update_hud_sec_job() - return - -/mob/living/carbon/human/update_hud_sec_job() - . = ..() - var/image/holder = hud_list[ID_HUD] - if(!holder) - return - if(wear_id) - var/obj/item/card/id/I = wear_id.GetID() - if(I) - holder.icon_state = "[ckey(I.GetJobName())]" - else - holder.icon_state = "unknown" - else - holder.icon_state = "unknown" - -/mob/proc/update_hud_sec_status() - var/image/holder = hud_list[WANTED_HUD] - holder?.icon_state = "" - -/mob/living/carbon/human/update_hud_sec_status() - var/image/holder = hud_list[WANTED_HUD] - if(!holder) - return - holder.icon_state = "" - var/perpname = name - if(wear_id) - var/obj/item/card/id/I = wear_id.GetID() - if(I) - perpname = I.registered_name - - for(var/datum/data/record/E in data_core.general) - if(E.fields["name"] == perpname) - for (var/datum/data/record/R in data_core.security) - if((R.fields["id"] == E.fields["id"]) && (R.fields["criminal"] == "*Arrest*")) - holder.icon_state = "hudwanted" - break - else if((R.fields["id"] == E.fields["id"]) && (R.fields["criminal"] == "Incarcerated")) - holder.icon_state = "hudincarcerated" - break - else if((R.fields["id"] == E.fields["id"]) && (R.fields["criminal"] == "Parolled")) - holder.icon_state = "hudparolled" - break - else if((R.fields["id"] == E.fields["id"]) && (R.fields["criminal"] == "Released")) - holder.icon_state = "huddischarged" - break - -/mob/proc/update_hud_antag() - var/image/holder = hud_list[ANTAG_HUD] - if(!holder) - return - holder.icon_state = "" - if(mind?.special_role) - // ANTAG DATUM REFACTOR WHEN AUHGAOUSHGODHGHOAD - if(hud_icon_reference[mind.special_role]) - holder.icon_state = hud_icon_reference[mind.special_role] - else - holder.icon_state = "syndicate" - -/proc/RoundHealth(health, icon = GLOB.hud_icon_files[LIFE_HUD]) - var/list/icon_states = icon_states(icon) - for(var/icon_state in icon_states) - if(health >= text2num(icon_state)) - return icon_state - return icon_states[icon_states.len] // If we had no match, return the last element - -/mob/proc/check_viruses() - return FALSE - -/mob/living/carbon/human/check_viruses() - return !!length(virus2 & virusDB) diff --git a/code/game/rendering/atom_huds/legacy.dm b/code/game/rendering/atom_huds/legacy.dm new file mode 100644 index 000000000000..daf2f2e71581 --- /dev/null +++ b/code/game/rendering/atom_huds/legacy.dm @@ -0,0 +1,43 @@ +/* + * Data HUDs have been rewritten in a more generic way. + * In short, they now use an observer-listener pattern. + * See code/datum/hud.dm for the generic hud datum. + * Update the HUD icons when needed with the appropriate hook. (see below) + */ + +/* DATA HUD DATUMS */ + +/mob/proc/update_hud_med_health() + update_atom_hud_provider(src, /datum/atom_hud_provider/medical_health) + +/mob/proc/update_hud_med_status() + update_atom_hud_provider(src, /datum/atom_hud_provider/medical_biology) + +/mob/proc/update_hud_med_all() + update_hud_med_health() + update_hud_med_status() + +/mob/proc/update_hud_sec_implants() + update_atom_hud_provider(src, /datum/atom_hud_provider/security_implant) + +/mob/proc/update_hud_sec_job() + update_atom_hud_provider(src, /datum/atom_hud_provider/security_job) + +/mob/proc/update_hud_sec_status() + update_atom_hud_provider(src, /datum/atom_hud_provider/security_status) + +/mob/proc/update_hud_antag() + update_atom_hud_provider(src, /datum/atom_hud_provider/special_role) + +/proc/RoundHealth(health, icon = 'icons/screen/atom_hud/health.dmi') + var/list/icon_states = icon_states(icon) + for(var/icon_state in icon_states) + if(health >= text2num(icon_state)) + return icon_state + return icon_states[icon_states.len] // If we had no match, return the last element + +/mob/proc/check_viruses() + return FALSE + +/mob/living/carbon/human/check_viruses() + return !!length(virus2 & virusDB) diff --git a/code/game/rendering/atom_huds/other_huds.dm b/code/game/rendering/atom_huds/other_huds.dm deleted file mode 100644 index 3f41e5909b84..000000000000 --- a/code/game/rendering/atom_huds/other_huds.dm +++ /dev/null @@ -1,2 +0,0 @@ -/datum/atom_hud/world_bender/animals - hud_icons = list(WORLD_BENDER_ANIMAL_HUD) diff --git a/code/game/rendering/perspectives/README.md b/code/game/rendering/perspectives/README.md new file mode 100644 index 000000000000..32eb117a985c --- /dev/null +++ b/code/game/rendering/perspectives/README.md @@ -0,0 +1,9 @@ +# Perspectives + +The Perspectives system is used to encapsulate graphics, visuals, and rendering 'experienced' by an entity. + +This way, shifting people's view around is easier and more standardized. + +As an example, something like a helmet camera has its own perspective because the perspective of the mob wearing it is what the mob's player sees, and not what someone merely connected to a helmet would see. + +Meanwhile, an observer viewing a mob's perspective can see the world through their eyes, literally. diff --git a/code/game/rendering/perspectives/perspective.dm b/code/game/rendering/perspectives/perspective.dm index 8d2291356e52..a7a18f0020aa 100644 --- a/code/game/rendering/perspectives/perspective.dm +++ b/code/game/rendering/perspectives/perspective.dm @@ -69,6 +69,10 @@ /// see_invisible var/see_invisible = SEE_INVISIBLE_LIVING + //* HUDs *// + /// active atom HUD providers associated to a list of ids or paths of atom huds that's providing it. + var/list/datum/atom_hud_provider/atom_hud_providers + //? planes /// planes var/datum/plane_holder/mob_perspective/planes @@ -124,6 +128,7 @@ /datum/perspective/Destroy() clear_clients() clear_mobs() + clear_atom_hud_providers() QDEL_NULL(darksight_fov_overlay) QDEL_NULL(darksight_occlusion_overlay) images = null @@ -285,7 +290,6 @@ if(!change) images = list() images |= I - change = images.len - change if(images.len != change) for(var/client/C as anything in clients) // |=, not +=, because we don't check dupes. @@ -370,6 +374,77 @@ for(var/mob/M as anything in mobs) M.see_in_dark = clamp(see_in_dark, 0, 255) +//* Atom HUDs *// + +/** + * accepts: + * * path + * * string id + * * instance + * + * currently will runtime if it's not a valid hud! + */ +/datum/perspective/proc/add_atom_hud(datum/atom_hud/hud, source) + ASSERT(istext(source)) + hud = fetch_atom_hud(hud) + if(isnull(atom_hud_providers)) + atom_hud_providers = list() + var/list/datum/atom_hud_provider/providers = hud.resolve_providers() + for(var/datum/atom_hud_provider/provider as anything in providers) + var/already_there = atom_hud_providers[provider] + if(already_there) + atom_hud_providers[provider] |= source + else + atom_hud_providers[provider] = list(source) + provider.add_perspective(src) + +/** + * accepts: + * * path + * * string id + * * instance + * + * currently will runtime if it's not a valid hud! + */ +/datum/perspective/proc/remove_atom_hud(datum/atom_hud/hud, source) + ASSERT(istext(source)) + if(!length(atom_hud_providers)) + return + if(!hud) + // remove all of source + for(var/datum/atom_hud_provider/provider as anything in atom_hud_providers) + if(!(source in atom_hud_providers[provider])) + continue + atom_hud_providers[provider] -= source + if(!length(atom_hud_providers[provider])) + atom_hud_providers -= provider + provider.remove_perspective(src) + return + hud = fetch_atom_hud(hud) + var/list/datum/atom_hud_provider/providers = hud.resolve_providers() + for(var/datum/atom_hud_provider/provider as anything in providers) + if(!length(atom_hud_providers[provider])) + continue + atom_hud_providers[provider] -= source + if(!length(atom_hud_providers[provider])) + atom_hud_providers -= provider + provider.remove_perspective(src) + +// todo: add_atom_hud_provider, remove_atom_hud_provider + +/** + * clears all atom hud providers + * + * * seriously don't use this unless you know what you're doing + * * "why are huds broken" --> 9 / 10 times it's because someone used this when they shouldn't + * * remember that /datum/perspective does NOT state track HUD registration for you; you have to ensure things are added/removed as necessary + * * hint: if it's not on /silicon/robot, /simple_mob, or /dead/observer (or you don't know what those words are), you shouldn't be using this! + */ +/datum/perspective/proc/clear_atom_hud_providers() + for(var/datum/atom_hud_provider/provider as anything in atom_hud_providers) + provider.remove_perspective(src) + atom_hud_providers = null + //? Eye /datum/perspective/proc/set_eye_mode(perspective) diff --git a/code/game/rendering/screen.dm b/code/game/rendering/screen.dm index bfd26030a128..31b02865d09e 100644 --- a/code/game/rendering/screen.dm +++ b/code/game/rendering/screen.dm @@ -285,7 +285,7 @@ if(!istype(tanks[index], /obj/item/tank)) continue C.internal = tanks[index] - to_chat(C, "You are now running on internals from [tanks[index]] on your [locnames[index]]") + to_chat(C, "You are now running on internals from [tanks[index]] [locnames[index]]") if(C.internals) C.internals.icon_state = "internal1" return diff --git a/code/game/sound.dm b/code/game/sound.dm index f05434c775d6..e4c78834f896 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -249,7 +249,7 @@ GLOBAL_VAR_INIT(sound_distance_offscreen, 7) soundin = pick('sound/weapons/hf_machete/hfmachete_throw_hit01.ogg', 'sound/weapons/hf_machete/hfmachete_throw_hit02.ogg', 'sound/weapons/hf_machete/hfmachete_throw_hit03.ogg') -//! ## VORE SOUNDS + // VORE SOUNDS if ("hunger_sounds") soundin = pick('sound/vore/growl1.ogg','sound/vore/growl2.ogg','sound/vore/growl3.ogg','sound/vore/growl4.ogg','sound/vore/growl5.ogg') if("classic_digestion_sounds") soundin = pick( diff --git a/code/game/turfs/initialization/init.dm b/code/game/turfs/initialization/init.dm deleted file mode 100644 index 6c2d8ead2952..000000000000 --- a/code/game/turfs/initialization/init.dm +++ /dev/null @@ -1,11 +0,0 @@ -/datum/turf_initializer/proc/InitializeTurf(var/turf/T) - return - -/area - var/datum/turf_initializer/turf_initializer = null - -/area/LateInitialize() - . = ..() - if(turf_initializer) - for(var/turf/simulated/T in src) - turf_initializer.InitializeTurf(T) diff --git a/code/game/turfs/initialization/maintenance.dm b/code/game/turfs/initialization/maintenance.dm deleted file mode 100644 index 329bb2e97074..000000000000 --- a/code/game/turfs/initialization/maintenance.dm +++ /dev/null @@ -1,64 +0,0 @@ -/datum/turf_initializer/maintenance/InitializeTurf(var/turf/simulated/T) - if(T.density) - return - // Quick and dirty check to avoid placing things inside windows - if(locate(/obj/structure/grille, T)) - return - - var/cardinal_turfs = T.CardinalTurfs() - - T.dirt = rand(10, 50) + rand(0, 50) - // If a neighbor is dirty, then we get dirtier. - var/how_dirty = dirty_neighbors(cardinal_turfs) - for(var/i = 0; i < how_dirty; i++) - T.dirt += rand(0,10) - T.update_dirt() - - if(prob(2)) - var/type = junk() - var/obj/junk = new type(T) - junk.obj_persist_status |= OBJ_PERSIST_STATUS_NO_THANK_YOU - if(prob(2)) - var/obj/effect/debris/cleanable/blood/oil/oil = new(T) - oil.obj_persist_status |= OBJ_PERSIST_STATUS_NO_THANK_YOU - if(prob(25)) // Keep in mind that only "corners" get any sort of web - attempt_web(T, cardinal_turfs) - -var/global/list/random_junk -/datum/turf_initializer/maintenance/proc/junk() - if(prob(25)) - return /obj/effect/debris/cleanable/generic - if(!random_junk) - random_junk = subtypesof(/obj/item/trash) - random_junk += typesof(/obj/item/cigbutt) - random_junk += /obj/effect/debris/cleanable/spiderling_remains - random_junk += /obj/effect/decal/remains/mouse - random_junk += /obj/effect/decal/remains/robot - random_junk -= /obj/item/trash/plate - random_junk -= /obj/item/trash/snack_bowl - random_junk -= /obj/item/trash/syndi_cakes - random_junk -= /obj/item/trash/tray - return pick(random_junk) - -/datum/turf_initializer/maintenance/proc/dirty_neighbors(var/list/cardinal_turfs) - var/how_dirty = 0 - for(var/turf/simulated/T in cardinal_turfs) - // Considered dirty if more than halfway to visible dirt - if(T.dirt > 25) - how_dirty++ - return how_dirty - -/datum/turf_initializer/maintenance/proc/attempt_web(var/turf/simulated/T) - var/turf/north_turf = get_step(T, NORTH) - if(!north_turf || !north_turf.density) - return - - for(var/dir in list(WEST, EAST)) // For the sake of efficiency, west wins over east in the case of 1-tile valid spots, rather than doing pick() - var/turf/neighbour = get_step(T, dir) - if(neighbour && neighbour.density) - if(dir == WEST) - var/obj/effect/debris/cleanable/cobweb/w1 = new(T) - w1.obj_persist_status |= OBJ_PERSIST_STATUS_NO_THANK_YOU - if(dir == EAST) - var/obj/effect/debris/cleanable/cobweb2/w2 = new(T) - w2.obj_persist_status |= OBJ_PERSIST_STATUS_NO_THANK_YOU diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm index bb6ddac50bc4..03bc1efd7a4e 100644 --- a/code/game/turfs/space/space.dm +++ b/code/game/turfs/space/space.dm @@ -30,7 +30,8 @@ SHOULD_CALL_PARENT(FALSE) atom_flags |= ATOM_INITIALIZED - icon_state = SPACE_ICON_STATE(x, y, z) + // we have parallax and don't need this anymore + // icon_state = SPACE_ICON_STATE(x, y, z) // We might be an edge if(y == world.maxy || forced_dirs & NORTH) @@ -46,18 +47,23 @@ if (CONFIG_GET(flag/starlight)) update_starlight() - var/turf/below = below() - if(isnull(below)) - return INITIALIZE_HINT_NORMAL + // todo: audit all this again + // tl;dr given we load maps at runtime now, the maploader will do changeturfing, which means + // we don't need to manually check all this in initialize + return INITIALIZE_HINT_NORMAL - if(isspaceturf(below)) - return INITIALIZE_HINT_NORMAL + // var/turf/below = below() + // if(isnull(below)) + // return INITIALIZE_HINT_NORMAL - var/area/A = below.loc - if(!below.density && (A.area_flags & AREA_FLAG_EXTERNAL)) - return INITIALIZE_HINT_NORMAL + // if(isspaceturf(below)) + // return INITIALIZE_HINT_NORMAL - return INITIALIZE_HINT_NORMAL + // var/area/A = below.loc + // if(!below.density && (A.area_flags & AREA_FLAG_EXTERNAL)) + // return INITIALIZE_HINT_NORMAL + + // return INITIALIZE_HINT_NORMAL // todo: wtf happened there..? // return INITIALIZE_HINT_LATELOAD // oh no! we need to switch to being a different kind of turf! diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index a9cc652653d3..091dad0c4530 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -284,6 +284,10 @@ step(user.pulling, get_dir(user.pulling.loc, src)) return 1 +/turf/attack_ai(mob/user as mob) //this feels like a bad idea ultimately but this is the cheapest way to let cyborgs nudge things they're pulling around + . = ..() + attack_hand(user, list("siliconattack" = TRUE)) + /turf/attackby(obj/item/I, mob/user, list/params, clickchain_flags, damage_multiplier) if(I.obj_storage?.allow_mass_gather && I.obj_storage.allow_mass_gather_via_click) I.obj_storage.auto_handle_interacted_mass_pickup(new /datum/event_args/actor(user), src) diff --git a/code/game/world.dm b/code/game/world.dm index f11f51e3fbb6..e4de216b30f5 100644 --- a/code/game/world.dm +++ b/code/game/world.dm @@ -313,7 +313,7 @@ GLOBAL_LIST(topic_status_cache) /world/Del() var/debug_server = world.GetConfig("env", "AUXTOOLS_DEBUG_DLL") if (debug_server) - call(debug_server, "auxtools_shutdown")() + call_ext(debug_server, "auxtools_shutdown")() . = ..() /hook/startup/proc/loadMode() diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 9090799bf10b..1efda3b08d04 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -223,7 +223,15 @@ var/global/floorIsLava = 0 if (!istype(src,/datum/admins)) to_chat(usr, "Error: you are not an admin!") return - PlayerNotesPage(1) + //PlayerNotesPage(1) + tgui_notes() + +/datum/admins/proc/tgui_notes() + var/savefile/S=new("data/player_notes.sav") + var/list/note_keys + S >> note_keys + var/selected_ckey = tgui_input_list(usr, "Select the ckey you want the notes off:", "Ckey Select",sortList(note_keys)) + show_player_info(selected_ckey) /datum/admins/proc/PlayerNotesPage(page) var/dat = "Player notes
" diff --git a/code/modules/admin/permissionverbs/permissionedit.dm b/code/modules/admin/permissionverbs/permissionedit.dm index 18b7e3aa9025..fad215244819 100644 --- a/code/modules/admin/permissionverbs/permissionedit.dm +++ b/code/modules/admin/permissionverbs/permissionedit.dm @@ -9,14 +9,17 @@ /datum/admins/proc/edit_admin_permissions() if(!check_rights(R_PERMISSIONS)) return - var/datum/asset/asset_cache_datum = get_asset_datum(/datum/asset/group/permissions) - asset_cache_datum.send(usr) + + var/datum/asset_pack/asset_cache_datum = SSassets.ready_asset_pack(/datum/asset_pack/simple/permissions) + SSassets.send_asset_pack(usr, asset_cache_datum) + + SSassets.send_asset_pack(usr, /datum/asset_pack/simple/common) var/output = {"
")
+ to_chat(victim, "
- * In tgui, usually would be clsasName={classes(['sheetmaterials32x32', 'glass-3'])}
- */
-#define SPR_SIZE 1
-#define SPR_IDX 2
-
-#define SPRSZ_COUNT 1
-#define SPRSZ_ICON 2
-#define SPRSZ_STRIPPED 3
-
-/datum/asset/spritesheet
- abstract_type = /datum/asset/spritesheet
- var/name
- /**
- * List of arguments to pass into queuedInsert.
- * Exists so we can queue icon insertion, mostly for stuff like preferences.
- */
- var/list/to_generate = list()
- /// "32x32" -> list(10, icon/normal, icon/stripped)
- var/list/sizes = list()
- /// "foo_bar" -> list("32x32", 5)
- var/list/sprites = list()
- var/list/cached_spritesheets_needed
- var/generating_cache = FALSE
- var/fully_generated = FALSE
- /**
- * If this asset should be fully loaded on new
- * Defaults to false so we can process this stuff nicely
- */
- var/load_immediately = FALSE
-
-/datum/asset/spritesheet/should_refresh()
- if (..())
- return TRUE
-
- /// Static so that the result is the same, even when the files are created, for this run.
- var/static/should_refresh = null
-
- if (isnull(should_refresh))
- // `fexists` seems to always fail on static-time
- should_refresh = !fexists("[ASSET_CROSS_ROUND_CACHE_DIRECTORY]/spritesheet.[name].css")
-
- return should_refresh
-
-/datum/asset/spritesheet/register()
- SHOULD_NOT_OVERRIDE(TRUE)
-
- if (!name)
- CRASH("spritesheet [type] cannot register without a name")
-
- if (!should_refresh() && read_from_cache())
- return
-
- /// If it's cached, may as well load it now, while the loading is cheap
- if(CONFIG_GET(flag/cache_assets) && cross_round_cachable)
- load_immediately = TRUE
-
- create_spritesheets()
- if(load_immediately)
- realize_spritesheets(yield = FALSE)
- else
- SSasset_loading.generate_queue += src
-
-/datum/asset/spritesheet/proc/realize_spritesheets(yield)
- if(fully_generated)
- return
- while(length(to_generate))
- var/list/stored_args = to_generate[to_generate.len]
- to_generate.len--
- queuedInsert(arglist(stored_args))
- if(yield && TICK_CHECK)
- return
-
- ensure_stripped()
- for(var/size_id in sizes)
- var/size = sizes[size_id]
- SSassets.transport.register_asset("[name]_[size_id].png", size[SPRSZ_STRIPPED])
- var/res_name = "spritesheet_[name].css"
- var/fname = "data/spritesheets/[res_name]"
- fdel(fname)
- text2file(generate_css(), fname)
- SSassets.transport.register_asset(res_name, fcopy_rsc(fname))
- fdel(fname)
-
- if (CONFIG_GET(flag/cache_assets) && cross_round_cachable)
- write_to_cache()
-
- fully_generated = TRUE
- // If we were ever in there, remove ourselves
- SSasset_loading.generate_queue -= src
-
-/datum/asset/spritesheet/queued_generation()
- realize_spritesheets(yield = TRUE)
-
-/datum/asset/spritesheet/ensure_ready()
- if(!fully_generated)
- realize_spritesheets(yield = FALSE)
- return ..()
-
-/datum/asset/spritesheet/send(client/client)
- if (!name)
- return
-
- if (!should_refresh())
- return send_from_cache(client)
-
- var/all = list("spritesheet_[name].css")
- for(var/size_id in sizes)
- all += "[name]_[size_id].png"
- . = SSassets.transport.send_assets(client, all)
-
-/datum/asset/spritesheet/get_url_mappings()
- if (!name)
- return
-
- if (!should_refresh())
- return get_cached_url_mappings()
-
- . = list("spritesheet_[name].css" = SSassets.transport.get_asset_url("spritesheet_[name].css"))
- for(var/size_id in sizes)
- .["[name]_[size_id].png"] = SSassets.transport.get_asset_url("[name]_[size_id].png")
-
-/datum/asset/spritesheet/proc/ensure_stripped(sizes_to_strip = sizes)
- for(var/size_id in sizes_to_strip)
- var/size = sizes[size_id]
- if (size[SPRSZ_STRIPPED])
- continue
-
- // save flattened version
- var/fname = "data/spritesheets/[name]_[size_id].png"
- fcopy(size[SPRSZ_ICON], fname)
- var/error = rustg_dmi_strip_metadata(fname)
- if(length(error))
- stack_trace("Failed to strip [name]_[size_id].png: [error]")
- size[SPRSZ_STRIPPED] = icon(fname)
- fdel(fname)
-
-/datum/asset/spritesheet/proc/generate_css()
- var/list/out = list()
-
- for (var/size_id in sizes)
- var/size = sizes[size_id]
- var/icon/tiny = size[SPRSZ_ICON]
- out += ".[name][size_id]{display:inline-block;width:[tiny.Width()]px;height:[tiny.Height()]px;background:url('[get_background_url("[name]_[size_id].png")]') no-repeat;}"
-
- for (var/sprite_id in sprites)
- var/sprite = sprites[sprite_id]
- var/size_id = sprite[SPR_SIZE]
- var/idx = sprite[SPR_IDX]
- var/size = sizes[size_id]
-
- var/icon/tiny = size[SPRSZ_ICON]
- var/icon/big = size[SPRSZ_STRIPPED]
- var/per_line = big.Width() / tiny.Width()
- var/x = (idx % per_line) * tiny.Width()
- var/y = round(idx / per_line) * tiny.Height()
-
- out += ".[name][size_id].[sprite_id]{background-position:-[x]px -[y]px;}"
-
- return out.Join("\n")
-
-/datum/asset/spritesheet/proc/read_from_cache()
- var/replaced_css = file2text("[ASSET_CROSS_ROUND_CACHE_DIRECTORY]/spritesheet.[name].css")
-
- var/regex/find_background_urls = regex(@"background:url\('%(.+?)%'\)", "g")
- while (find_background_urls.Find(replaced_css))
- var/asset_id = find_background_urls.group[1]
- var/asset_cache_item = SSassets.transport.register_asset(asset_id, "[ASSET_CROSS_ROUND_CACHE_DIRECTORY]/spritesheet.[asset_id]")
- var/asset_url = SSassets.transport.get_asset_url(asset_cache_item = asset_cache_item)
- replaced_css = replacetext(replaced_css, find_background_urls.match, "background:url('[asset_url]')")
- LAZYADD(cached_spritesheets_needed, asset_id)
-
- var/replaced_css_filename = "data/spritesheets/spritesheet_[name].css"
- rustg_file_write(replaced_css, replaced_css_filename)
- SSassets.transport.register_asset("spritesheet_[name].css", replaced_css_filename)
-
- fdel(replaced_css_filename)
-
- return TRUE
-
-/datum/asset/spritesheet/proc/send_from_cache(client/client)
- if (isnull(cached_spritesheets_needed))
- stack_trace("cached_spritesheets_needed was null when sending assets from [type] from cache")
- cached_spritesheets_needed = list()
-
- return SSassets.transport.send_assets(client, cached_spritesheets_needed + "spritesheet_[name].css")
-
-/// Returns the URL to put in the background:url of the CSS asset
-/datum/asset/spritesheet/proc/get_background_url(asset)
- if (generating_cache)
- return "%[asset]%"
- else
- return SSassets.transport.get_asset_url(asset)
-
-/datum/asset/spritesheet/proc/write_to_cache()
- for (var/size_id in sizes)
- fcopy(SSassets.cache["[name]_[size_id].png"].resource, "[ASSET_CROSS_ROUND_CACHE_DIRECTORY]/spritesheet.[name]_[size_id].png")
-
- generating_cache = TRUE
- var/mock_css = generate_css()
- generating_cache = FALSE
-
- rustg_file_write(mock_css, "[ASSET_CROSS_ROUND_CACHE_DIRECTORY]/spritesheet.[name].css")
-
-/datum/asset/spritesheet/proc/get_cached_url_mappings()
- var/list/mappings = list()
- mappings["spritesheet_[name].css"] = SSassets.transport.get_asset_url("spritesheet_[name].css")
-
- for (var/asset_name in cached_spritesheets_needed)
- mappings[asset_name] = SSassets.transport.get_asset_url(asset_name)
-
- return mappings
-
-/**
- *! Override this in order to start the creation of the spritehseet.
- *! This is where all your Insert, InsertAll, etc calls should be inside.
- */
-/datum/asset/spritesheet/proc/create_spritesheets()
- SHOULD_CALL_PARENT(FALSE)
- CRASH("create_spritesheets() not implemented for [type]!")
-/**
- * neither prefixes nor states may have spaces!
- */
-/datum/asset/spritesheet/proc/Insert(sprite_name, icon/I, icon_state="", dir=SOUTH, frame=1, moving=FALSE)
- if(load_immediately)
- queuedInsert(sprite_name, I, icon_state, dir, frame, moving)
- else
- to_generate += list(args.Copy())
-
-/**
- * LEMON NOTE
- * A GOON CODER SAYS BAD ICON ERRORS CAN BE THROWN BY THE "ICON CACHE"
- * APPARENTLY IT MAKES ICONS IMMUTABLE
- * LOOK INTO USING THE MUTABLE APPEARANCE PATTERN HERE
- *
- * neither prefixes nor states may have spaces!
- */
-/datum/asset/spritesheet/proc/queuedInsert(sprite_name, icon/I, icon_state="", dir=SOUTH, frame=1, moving=FALSE)
- I = icon(I, icon_state=icon_state, dir=dir, frame=frame, moving=moving)
- if (!I || !length(icon_states(I))) // That direction or state doesn't exist!
- return
- // Any sprite modifications we want to do (aka, coloring a greyscaled asset)
- I = ModifyInserted(I)
- var/size_id = "[I.Width()]x[I.Height()]"
- var/size = sizes[size_id]
-
- if (sprites[sprite_name])
- CRASH("duplicate sprite \"[sprite_name]\" in sheet [name] ([type])")
-
- if (size)
- var/position = size[SPRSZ_COUNT]++
- var/icon/sheet = size[SPRSZ_ICON]
- var/icon/sheet_copy = icon(sheet)
- size[SPRSZ_STRIPPED] = null
- sheet_copy.Insert(I, icon_state=sprite_name)
- size[SPRSZ_ICON] = sheet_copy
- sprites[sprite_name] = list(size_id, position)
- else
- sizes[size_id] = size = list(1, I, null)
- sprites[sprite_name] = list(size_id, 0)
-
-/**
- * A simple proc handing the Icon for you to modify before it gets turned into an asset.
- *
- * Arguments:
- * * I: icon being turned into an asset
- */
-/datum/asset/spritesheet/proc/ModifyInserted(icon/pre_asset)
- return pre_asset
-
-/**
- * neither prefixes nor states may have spaces!
- */
-/datum/asset/spritesheet/proc/InsertAll(prefix, icon/I, list/directions)
- if (length(prefix))
- prefix = "[prefix]-"
-
- if (!directions)
- directions = list(SOUTH)
-
- for (var/icon_state_name in icon_states(I))
- for (var/direction in directions)
- var/prefix2 = (directions.len > 1) ? "[dir2text(direction)]-" : ""
- Insert("[prefix][prefix2][icon_state_name]", I, icon_state=icon_state_name, dir=direction)
-
-/datum/asset/spritesheet/proc/css_tag()
- return {""}
-
-/datum/asset/spritesheet/proc/css_filename()
- return SSassets.transport.get_asset_url("spritesheet_[name].css")
-
-/datum/asset/spritesheet/proc/icon_tag(sprite_name)
- var/sprite = sprites[sprite_name]
- if (!sprite)
- return null
- var/size_id = sprite[SPR_SIZE]
- return {""}
-
-/datum/asset/spritesheet/proc/icon_class_name(sprite_name)
- var/sprite = sprites[sprite_name]
- if (!sprite)
- return null
- var/size_id = sprite[SPR_SIZE]
- return {"[name][size_id] [sprite_name]"}
-
-/**
- * Returns the size class (ex design32x32) for a given sprite's icon
- *
- * Arguments:
- * * sprite_name - The sprite to get the size of
- */
-/datum/asset/spritesheet/proc/icon_size_id(sprite_name)
- var/sprite = sprites[sprite_name]
- if (!sprite)
- return null
- var/size_id = sprite[SPR_SIZE]
- return "[name][size_id]"
-
-#undef SPR_SIZE
-#undef SPR_IDX
-#undef SPRSZ_COUNT
-#undef SPRSZ_ICON
-#undef SPRSZ_STRIPPED
-
-
-/datum/asset/changelog_item
- abstract_type = /datum/asset/changelog_item
- var/item_filename
-
-/datum/asset/changelog_item/New(date)
- item_filename = SANITIZE_FILENAME("[date].yml")
- SSassets.transport.register_asset(item_filename, file("html/changelogs/archive/" + item_filename))
-
-/datum/asset/changelog_item/send(client)
- if (!item_filename)
- return
- . = SSassets.transport.send_assets(client, item_filename)
-
-/datum/asset/changelog_item/get_url_mappings()
- if (!item_filename)
- return
- . = list("[item_filename]" = SSassets.transport.get_asset_url(item_filename))
-
-/datum/asset/spritesheet/simple
- abstract_type = /datum/asset/spritesheet/simple
- var/list/assets
-
-/datum/asset/spritesheet/simple/create_spritesheets()
- for (var/key in assets)
- Insert(key, assets[key])
-
-//Generates assets based on iconstates of a single icon
-/datum/asset/simple/icon_states
- abstract_type = /datum/asset/simple/icon_states
- var/icon
- var/list/directions = list(SOUTH)
- var/frame = 1
- var/movement_states = FALSE
-
- var/prefix = "default" //asset_name = "[prefix].[icon_state_name].png"
- var/generic_icon_names = FALSE //generate icon filenames using generate_asset_name() instead the above format
-
-/datum/asset/simple/icon_states/register(_icon = icon)
- for(var/icon_state_name in icon_states(_icon))
- for(var/direction in directions)
- var/asset = icon(_icon, icon_state_name, direction, frame, movement_states)
- if (!asset)
- continue
- asset = fcopy_rsc(asset) //dedupe
- var/prefix2 = (directions.len > 1) ? "[dir2text(direction)]." : ""
- var/asset_name = SANITIZE_FILENAME("[prefix].[prefix2][icon_state_name].png")
- if (generic_icon_names)
- asset_name = "[generate_asset_name(asset)].png"
-
- SSassets.transport.register_asset(asset_name, asset)
-
-/datum/asset/simple/icon_states/multiple_icons
- abstract_type = /datum/asset/simple/icon_states/multiple_icons
- var/list/icons
-
-/datum/asset/simple/icon_states/multiple_icons/register()
- for(var/i in icons)
- ..(i)
-
-/// Namespace'ed assets (for static css and html files)
-/// When sent over a cdn transport, all assets in the same asset datum will exist in the same folder, as their plain names.
-/// Used to ensure css files can reference files by url() without having to generate the css at runtime, both the css file and the files it depends on must exist in the same namespace asset datum. (Also works for html)
-/// For example `blah.css` with asset `blah.png` will get loaded as `namespaces/a3d..14f/f12..d3c.css` and `namespaces/a3d..14f/blah.png`. allowing the css file to load `blah.png` by a relative url rather then compute the generated url with get_url_mappings().
-/// The namespace folder's name will change if any of the assets change. (excluding parent assets)
-/datum/asset/simple/namespaced
- abstract_type = /datum/asset/simple/namespaced
- /// parents - list of the parent asset or assets (in name = file assoicated format) for this namespace.
- /// parent assets must be referenced by their generated url, but if an update changes a parent asset, it won't change the namespace's identity.
- var/list/parents = list()
-
-/datum/asset/simple/namespaced/register()
- if (legacy)
- assets |= parents
- var/list/hashlist = list()
- var/list/sorted_assets = sortList(assets)
-
- for (var/asset_name in sorted_assets)
- var/datum/asset_cache_item/ACI = new(asset_name, sorted_assets[asset_name])
- if (!ACI?.hash)
- log_asset("ERROR: Invalid asset: [type]:[asset_name]:[ACI]")
- continue
- hashlist += ACI.hash
- sorted_assets[asset_name] = ACI
- var/namespace = md5(hashlist.Join())
-
- for (var/asset_name in parents)
- var/datum/asset_cache_item/ACI = new(asset_name, parents[asset_name])
- if (!ACI?.hash)
- log_asset("ERROR: Invalid asset: [type]:[asset_name]:[ACI]")
- continue
- ACI.namespace_parent = TRUE
- sorted_assets[asset_name] = ACI
-
- for (var/asset_name in sorted_assets)
- var/datum/asset_cache_item/ACI = sorted_assets[asset_name]
- if (!ACI?.hash)
- log_asset("ERROR: Invalid asset: [type]:[asset_name]:[ACI]")
- continue
- ACI.namespace = namespace
-
- assets = sorted_assets
- ..()
-
-/// Get a html string that will load a html asset.
-/// Needed because byond doesn't allow you to browse() to a url.
-/datum/asset/simple/namespaced/proc/get_htmlloader(filename)
- return url2htmlloader(SSassets.transport.get_asset_url(filename, assets[filename]))
-
-/// A subtype to generate a JSON file from a list
-/datum/asset/json
- abstract_type = /datum/asset/json
- /// The filename, will be suffixed with ".json"
- var/name
-
-/datum/asset/json/send(client)
- return SSassets.transport.send_assets(client, "[name].json")
-
-/datum/asset/json/get_url_mappings()
- return list(
- "[name].json" = SSassets.transport.get_asset_url("[name].json"),
- )
-
-/datum/asset/json/register()
- var/filename = "data/[name].json"
- fdel(filename)
- text2file(json_encode(generate()), filename)
- SSassets.transport.register_asset("[name].json", fcopy_rsc(filename))
- fdel(filename)
-
-/// Returns the data that will be JSON encoded
-/datum/asset/json/proc/generate()
- SHOULD_CALL_PARENT(FALSE)
- CRASH("generate() not implemented for [type]!")
-
-#undef ASSET_CROSS_ROUND_CACHE_DIRECTORY
diff --git a/code/modules/asset_cache/asset_pack.dm b/code/modules/asset_cache/asset_pack.dm
new file mode 100644
index 000000000000..daf9a942686a
--- /dev/null
+++ b/code/modules/asset_cache/asset_pack.dm
@@ -0,0 +1,205 @@
+/**
+ * Effectively, a set of files that can be sent to clients.
+ *
+ * Or more specifically, a way to either package (just use /simple),
+ * or generate a set of files that can be sent to clients that
+ * provide specific information (like /spritesheet does).
+ *
+ * Provides inbuilt early and deferred generation capabilities to spread
+ * expensive generation operations across 'idle' ticks.
+ */
+/datum/asset_pack
+ abstract_type = /datum/asset_pack
+
+ /// if set, we are registering by ID instead of by type
+ /// thus, don't set it in a prototype,
+ /// because 99% of assets are hardcoded and shouldn't do that.
+ ///
+ /// ids should be round-unique, but not to prevent collisions.
+ /// our md5'ing system does that.
+ /// what id uniqueness provides is *persistence* collisions.
+ ///
+ /// though honestly, i'd question why assets should ever be persisted in that way
+ /// as opposed to a volatile-append-supported asset datum being added to
+ /// as things load in.
+ var/id
+
+ /// if set, we immediately load via SSassets, rather than being pushed
+ /// onto SSasset_loading for loading during pregame
+ var/load_immediately = FALSE
+ /// if set, we don't load at all until something asks for us
+ var/load_deferred = FALSE
+ /// are we fully loaded / generated?
+ var/loaded = ASSET_NOT_LOADED
+
+ /// /datum/asset_item list
+ var/tmp/list/datum/asset_item/packed_items
+ /// a record of filename = asset_item datums
+ /// these are transport-agnostic.
+ var/tmp/list/item_lookup
+ /// a record of filename = url when we're loaded and pushed to a transport.
+ /// if is null, we are not pushed to the transport
+ var/tmp/list/loaded_urls
+
+ /// having this on will force something to be sent via
+ /// browse_rsc(), ensuring it always exists in the cache folder
+ /// that byond browsers are ran out of
+ ///
+ /// * implies do_not_mangle
+ /// * implies do_not_separate
+ var/absolute = FALSE
+
+ /// do not mutate filenames on the remote side
+ /// used when html pages rely on static bindings / aren't otherwise
+ /// dynamically generated.
+ var/do_not_mangle = FALSE
+ /// do not allow files to be split up between different folders on the remote side
+ /// this means everything in this pack can access each other by a direct, relative link
+ /// and doesn't need to 'find' where the others are through some convoluted process
+ ///
+ /// * this does incur a cost as everything being sent now has to be md5'd with each other.
+ var/do_not_separate = FALSE
+ /// do not preload if determined to be loading via browse_rsc().
+ var/do_not_preload = FALSE
+
+ /// allow caching cross-rounds, if the server is under a singular commit
+ /// requires configuration to be enabled too.
+ var/allow_cached_generation = FALSE
+
+/datum/asset_pack/New(id)
+ if(!isnull(id))
+ src.id = id
+
+/**
+ * ensures we are loaded
+ */
+/datum/asset_pack/proc/ensure_loaded(push_to_transport)
+ switch(loaded)
+ if(ASSET_FULLY_LOADED)
+ // do nothing, we're good
+ if(ASSET_NOT_LOADED)
+ INVOKE_ASYNC(src, PROC_REF(load))
+ UNTIL(loaded != ASSET_IS_LOADING)
+ if(ASSET_IS_LOADING)
+ UNTIL(loaded != ASSET_IS_LOADING)
+ . = loaded == ASSET_FULLY_LOADED
+ if(. && push_to_transport)
+ ensure_ready()
+
+/**
+ * loads / generates whatever is in us
+ *
+ * also pushes us to the transport if necessary.
+ */
+/datum/asset_pack/proc/load()
+ loaded = ASSET_IS_LOADING
+ var/results = generate()
+ var/list/files = register(results)
+ var/list/datum/asset_item/items = pack(files)
+ src.item_lookup = items
+ src.packed_items = list_values(items)
+ loaded = ASSET_FULLY_LOADED
+
+/**
+ * ensures we are pushed to a transport
+ */
+/datum/asset_pack/proc/ensure_ready()
+ if(is_pushed_to_transport())
+ return TRUE
+ ensure_loaded()
+ var/datum/asset_transport/active_transport = SSassets.transport
+ if(isnull(active_transport))
+ return FALSE
+ loaded_urls = active_transport.load_asset_items_from_pack(src)
+
+/**
+ * checks if we're pushed to a transport
+ */
+/datum/asset_pack/proc/is_pushed_to_transport()
+ return !isnull(loaded_urls)
+
+/**
+ * generates whatever needs to be generated
+ *
+ * this must be idempotent and hopefully efficient,
+ * because this is called again if the transport is changed mid-round.
+ *
+ * @return return value is passed to register().
+ */
+/datum/asset_pack/proc/generate()
+ return
+
+/**
+ * packs a list of filename = file's into /datum/asset_item's
+ *
+ * @return filename = /datum/asset_item
+ */
+/datum/asset_pack/proc/pack(list/files)
+ . = list()
+ for(var/filename in files)
+ var/file = files[filename]
+ var/datum/asset_item/item = new(filename, file, do_not_mangle, absolute, FALSE)
+ .[filename] = item
+ if(do_not_separate && !absolute) // if absolute, it's pointless to generate namespace as we'll be in the same folder anyways.
+ // generate their namespace and assign
+ var/namespace = generate_namespace(.)
+ for(var/fname in .)
+ var/datum/asset_item/item = .[fname]
+ item.namespace_id = namespace
+
+/**
+ * things must be packed!
+ */
+/datum/asset_pack/proc/generate_namespace(list/datum/asset_item/items)
+ var/list/joining = list()
+ for(var/fname in items)
+ var/datum/asset_item/item = items[fname]
+ joining += item.hash
+ return md5(jointext(joining, "-"))
+
+/**
+ * registers our content to the asset system's transport
+ *
+ * returns a list of filenames associated to files,
+ * because that's what the asset items / cache is actually dealing with.
+ *
+ * all filenames must be *globally unique*.
+ * while this is technically able to be circumvented on the modern asset loading system
+ * used by tgui windows, it is nonetheless still kept and enforced
+ * to make debugging / development less awful.
+ *
+ * any temporary files should go into ""
+ *
+ * @params
+ * * generation - output of generate().
+ *
+ * @return list("" = file, ...)
+ */
+/datum/asset_pack/proc/register(generation)
+ return list()
+
+/datum/asset_pack/proc/get_url(filename)
+ . = loaded_urls[filename]
+ if(isnull(.))
+ CRASH("failed to get url for [filename] on [type] ([id || "compile-time"]). something is terribly wrong!")
+
+//* below is tg stuff *//
+
+// todo: i honestly don't yet know what this does / why we use custom loaders
+// but when i do i'll probably touch up on it ~silicons
+
+/datum/asset_pack
+
+ var/cached_serialized_url_mappings
+ var/cached_serialized_url_mappings_transport_type
+
+/datum/asset_pack/proc/get_url_mappings()
+ return loaded_urls
+
+/// Returns a cached tgui message of URL mappings
+/datum/asset_pack/proc/get_serialized_url_mappings()
+ if (isnull(cached_serialized_url_mappings) || cached_serialized_url_mappings_transport_type != SSassets.transport.type)
+ cached_serialized_url_mappings = TGUI_CREATE_MESSAGE("asset/mappings", get_url_mappings())
+ cached_serialized_url_mappings_transport_type = SSassets.transport.type
+
+ return cached_serialized_url_mappings
diff --git a/code/modules/asset_cache/asset_transport.dm b/code/modules/asset_cache/asset_transport.dm
new file mode 100644
index 000000000000..c104ca62ae42
--- /dev/null
+++ b/code/modules/asset_cache/asset_transport.dm
@@ -0,0 +1,148 @@
+/**
+ * Pluggable transports used for sending assets to clients.
+ *
+ * todo: if sending too many resources, we need a way to tell the client they're loading. maybe a loading bar graphic?
+ */
+/datum/asset_transport
+ /// name of the transport
+ var/name = "asset-transport: ???"
+
+ /// non-ephemeral items registered; *mangled filename* = instance
+ /// the reason we still use filename assoc list is so filename uniqueness is still enforced
+ /// incase we ever need to go back to native (browse_rsc).
+ var/list/loaded_items = list()
+
+/**
+ * called when we're loaded into SSassets
+ */
+/datum/asset_transport/proc/initialize()
+ return
+
+/datum/asset_transport/proc/load_asset_items_from_pack(datum/asset_pack/pack)
+ var/list/filename_to_url = list()
+ for(var/filename in pack.item_lookup)
+ var/datum/asset_item/item = pack.item_lookup[filename]
+ filename_to_url[filename] = load_asset_item(item)
+ return filename_to_url
+
+/**
+ * @return url to use after a client is sent the asset
+ */
+/datum/asset_transport/proc/load_asset_item(datum/asset_item/item)
+ SHOULD_NOT_OVERRIDE(TRUE)
+ if(item.always_browse_rsc)
+ . = load_item_native(item)
+ else
+ . = load_item(item)
+ if(!.)
+ CRASH("failed to load an item")
+ if(loaded_items[.])
+ var/datum/asset_item/existing = loaded_items[.]
+ if(existing.hash != item.hash)
+ CRASH("collision between [existing] and [item] on [.]")
+ loaded_items[.] = item
+
+/**
+ * this is a blocking proc
+ */
+/datum/asset_transport/proc/send_asset_pack(client/target, datum/asset_pack/pack)
+ SHOULD_NOT_OVERRIDE(TRUE)
+ if(pack.absolute)
+ return send_asset_item_native(target, pack.packed_items)
+ return send_asset_items(target, pack.packed_items)
+
+/**
+ * this is a blocking proc
+ */
+/datum/asset_transport/proc/send_asset_items(client/target, list/datum/asset_item/items)
+ SHOULD_NOT_OVERRIDE(TRUE)
+ if(!islist(items))
+ items = list(items)
+ var/list/datum/asset_item/native_sends = list()
+ for(var/datum/asset_item/item as anything in items)
+ if(!item.always_browse_rsc)
+ continue
+ items -= item
+ native_sends += item
+ if(length(native_sends))
+ send_asset_item_native(target, native_sends)
+ return send_items(target, items)
+
+//* not sure where to put or what to do with these yet
+
+/**
+ * automatically preload all native asset packs to a client, one by one.
+ */
+/datum/asset_transport/proc/perform_native_preload(client/victim, list/datum/asset_pack/native_packs)
+ victim.asset_cache_native_preload(native_packs)
+
+//* Abstraction - Subtypes must override these
+
+/// Check the config is valid to load this transport
+/// Returns TRUE or FALSE
+/datum/asset_transport/proc/validate_config()
+ CRASH("abstract proc unimplemented")
+
+/**
+ * @return URL
+ */
+/datum/asset_transport/proc/send_anonymous_file(list/client/targets, file, ext)
+ CRASH("abstract proc unimplemented")
+
+/**
+ * this proc must be idempotent.
+ *
+ * @return URL to use.
+ */
+/datum/asset_transport/proc/load_item(datum/asset_item/item)
+ CRASH("abstract proc unimplemented")
+
+/datum/asset_transport/proc/send_items(client/target, list/datum/asset_item/items)
+ CRASH("abstract proc unimplemented")
+
+//* Native - common behavior used to allow browse_rsc() usage, either as a fallback or as an alternative loader
+
+/datum/asset_transport/proc/send_anonymous_file_native(list/client/targets, file, ext)
+ SHOULD_NOT_OVERRIDE(TRUE)
+ // we don't even need a hash, just the url
+ // only stuff like webroot cares about hash, for CDN caching purposes
+ var/static/notch = 0
+ // you're not going to send more than a million files a tick, are you now?
+ if(notch >= (1024 * 1024))
+ notch = 0
+ var/mangled_name = "[rand(1, 1000)]-[world.time]-[++notch]"
+ if(ext)
+ mangled_name = "[mangled_name].[ext]"
+ for(var/client/target as anything in targets)
+ target << browse_rsc(file, mangled_name)
+ return mangled_name
+
+/datum/asset_transport/proc/send_asset_item_native(list/client/targets, list/datum/asset_item/items)
+ SHOULD_NOT_OVERRIDE(TRUE)
+ if(!islist(targets))
+ targets = list(targets)
+ if(!islist(items))
+ items = list(items)
+ for(var/client/target as anything in targets)
+ if(ismob(target))
+ target = target:client
+ var/list/datum/asset_item/to_send = list()
+ for(var/datum/asset_item/item as anything in items)
+ var/existing = target.asset_native_received[item.mangled_name]
+ if(existing)
+ if(existing != item.hash)
+ stack_trace("colliding hash when sending a native item to a client [target] <- [item] on mangled name [item.mangled_name].")
+ continue
+ to_send += item
+ for(var/datum/asset_item/sending as anything in to_send)
+ target.asset_native_received[sending.mangled_name] = sending.hash
+ target << browse_rsc(sending.file, sending.mangled_name)
+
+/**
+ * this proc must be idempotent.
+ *
+ * @return URL to use.
+ */
+/datum/asset_transport/proc/load_item_native(datum/asset_item/item)
+ SHOULD_NOT_OVERRIDE(TRUE)
+ return item.mangled_name
diff --git a/code/modules/asset_cache/assets/arcade.dm b/code/modules/asset_cache/assets/arcade.dm
index bcd23919f979..195d00e2b2bb 100644
--- a/code/modules/asset_cache/assets/arcade.dm
+++ b/code/modules/asset_cache/assets/arcade.dm
@@ -1,4 +1,4 @@
-/datum/asset/simple/arcade
+/datum/asset_pack/simple/arcade
assets = list(
"boss1.gif" = 'icons/ui_icons/arcade/boss1.gif',
"boss2.gif" = 'icons/ui_icons/arcade/boss2.gif',
diff --git a/code/modules/asset_cache/assets/artwork/crayons.dm b/code/modules/asset_cache/assets/artwork/crayons.dm
index 0967d5f4a609..317120b89375 100644
--- a/code/modules/asset_cache/assets/artwork/crayons.dm
+++ b/code/modules/asset_cache/assets/artwork/crayons.dm
@@ -1,6 +1,6 @@
-/datum/asset/spritesheet/crayons
+/datum/asset_pack/spritesheet/crayons
name = "crayon-graffiti"
-/datum/asset/spritesheet/crayons/create_spritesheets()
+/datum/asset_pack/spritesheet/crayons/generate()
for(var/datum/crayon_decal_meta/crayon_data in GLOB.crayon_data)
- InsertAll(crayon_data.name, crayon_data.icon_ref)
+ insert_all(crayon_data.name, crayon_data.icon_ref)
diff --git a/code/modules/asset_cache/assets/chat.dm b/code/modules/asset_cache/assets/chat.dm
index f33421e279ca..c587b39430b3 100644
--- a/code/modules/asset_cache/assets/chat.dm
+++ b/code/modules/asset_cache/assets/chat.dm
@@ -1,12 +1,12 @@
-/datum/asset/spritesheet/chat
+/datum/asset_pack/spritesheet/chat
name = "chat"
-/datum/asset/spritesheet/chat/create_spritesheets()
- InsertAll("emoji", EMOJI_SET)
- InsertAll("emoji", EMOJI32_SET)
+/datum/asset_pack/spritesheet/chat/generate()
+ insert_all("emoji", EMOJI_SET)
+ insert_all("emoji", EMOJI32_SET)
/*
// pre-loading all lanugage icons also helps to avoid meta
- InsertAll("language", 'icons/misc/language.dmi')
+ insert_all("language", 'icons/misc/language.dmi')
// catch languages which are pulling icons from another file
for(var/path in typesof(/datum/language))
var/datum/language/L = path
diff --git a/code/modules/asset_cache/assets/chemistry/bottles.dm b/code/modules/asset_cache/assets/chemistry/bottles.dm
index f875dbf8e58f..2597e1c5931d 100644
--- a/code/modules/asset_cache/assets/chemistry/bottles.dm
+++ b/code/modules/asset_cache/assets/chemistry/bottles.dm
@@ -1,4 +1,4 @@
-/datum/asset/spritesheet/simple/bottles
+/datum/asset_pack/spritesheet/simple/bottles
name = "bottles"
assets = list(
"bottle1" = 'icons/runtime/assets/medical/bottles/bottle1.png',
diff --git a/code/modules/asset_cache/assets/chemistry/patches.dm b/code/modules/asset_cache/assets/chemistry/patches.dm
index 4483167c263c..36724a9521cd 100644
--- a/code/modules/asset_cache/assets/chemistry/patches.dm
+++ b/code/modules/asset_cache/assets/chemistry/patches.dm
@@ -1,4 +1,4 @@
-/datum/asset/spritesheet/simple/patches
+/datum/asset_pack/spritesheet/simple/patches
name = "patches"
assets = list(
"patch" = 'icons/runtime/assets/medical/patches/patch.png',
diff --git a/code/modules/asset_cache/assets/chemistry/pills.dm b/code/modules/asset_cache/assets/chemistry/pills.dm
index 9c852b6e31b3..937cbb094ffb 100644
--- a/code/modules/asset_cache/assets/chemistry/pills.dm
+++ b/code/modules/asset_cache/assets/chemistry/pills.dm
@@ -1,4 +1,4 @@
-/datum/asset/spritesheet/simple/pills
+/datum/asset_pack/spritesheet/simple/pills
name = "pills"
assets = list(
"pill1" = 'icons/runtime/assets/medical/pills/pill1.png',
diff --git a/code/modules/asset_cache/assets/circuits.dm b/code/modules/asset_cache/assets/circuits.dm
index df9aa1fa6d89..eb2c46428f80 100644
--- a/code/modules/asset_cache/assets/circuits.dm
+++ b/code/modules/asset_cache/assets/circuits.dm
@@ -1,4 +1,4 @@
-/datum/asset/simple/circuit_assets
+/datum/asset_pack/simple/circuit_assets
assets = list(
"grid_background.png" = 'icons/ui_icons/tgui/grid_background.png'
)
diff --git a/code/modules/asset_cache/assets/common.dm b/code/modules/asset_cache/assets/common.dm
index 1b0fb301a192..8e0e2d1b8434 100644
--- a/code/modules/asset_cache/assets/common.dm
+++ b/code/modules/asset_cache/assets/common.dm
@@ -1,3 +1,8 @@
-/datum/asset/simple/namespaced/common
- assets = list("padlock.png" = 'icons/ui_icons/common/padlock.png')
- parents = list("common.css" = 'html/browser/common.css')
+/datum/asset_pack/simple/common
+ assets = list(
+ "padlock.png" = 'icons/ui_icons/common/padlock.png',
+ "common.css" = 'html/browser/common.css',
+ )
+ do_not_separate = TRUE
+ do_not_mangle = TRUE
+ absolute = TRUE
diff --git a/code/modules/asset_cache/assets/condiments.dm b/code/modules/asset_cache/assets/condiments.dm
index 58a9f2e60727..aea473817a38 100644
--- a/code/modules/asset_cache/assets/condiments.dm
+++ b/code/modules/asset_cache/assets/condiments.dm
@@ -1,4 +1,4 @@
-/datum/asset/spritesheet/simple/condiments
+/datum/asset_pack/spritesheet/simple/condiments
name = "condiments"
assets = list(
CONDIMASTER_STYLE_FALLBACK = 'icons/runtime/assets/condiments/emptycondiment.png',
diff --git a/code/modules/asset_cache/assets/contracts.dm b/code/modules/asset_cache/assets/contracts.dm
index 6ac1a9cb678e..d780f64a9ce9 100644
--- a/code/modules/asset_cache/assets/contracts.dm
+++ b/code/modules/asset_cache/assets/contracts.dm
@@ -1,4 +1,4 @@
-/datum/asset/simple/contracts
+/datum/asset_pack/simple/contracts
assets = list(
"bluespace.png" = 'icons/ui_icons/contracts/bluespace.png',
"destruction.png" = 'icons/ui_icons/contracts/destruction.png',
diff --git a/code/modules/asset_cache/assets/debug/fucky_wucky.dm b/code/modules/asset_cache/assets/debug/fucky_wucky.dm
index 53bdceb56e37..f5350bcb7e31 100644
--- a/code/modules/asset_cache/assets/debug/fucky_wucky.dm
+++ b/code/modules/asset_cache/assets/debug/fucky_wucky.dm
@@ -1,5 +1,5 @@
-/datum/asset/simple/fuckywucky
- keep_local_name = TRUE
+/datum/asset_pack/simple/fuckywucky
+ do_not_mangle = TRUE
assets = list(
"fuckywucky.png" = 'icons/runtime/assets/debug/fuckywucky.png',
)
diff --git a/code/modules/asset_cache/assets/fish.dm b/code/modules/asset_cache/assets/fishing.dm
similarity index 74%
rename from code/modules/asset_cache/assets/fish.dm
rename to code/modules/asset_cache/assets/fishing.dm
index 954690d9b56e..5be596cbafb5 100644
--- a/code/modules/asset_cache/assets/fish.dm
+++ b/code/modules/asset_cache/assets/fishing.dm
@@ -1,6 +1,6 @@
-/datum/asset/spritesheet/fish
+/datum/asset_pack/spritesheet/fish
name = "fish"
-/datum/asset/spritesheet/fish/create_spritesheets()
+/datum/asset_pack/spritesheet/fish/generate()
for (var/path in subtypesof(/obj/item/fish))
var/obj/item/fish/fish_type = path
var/fish_icon = initial(fish_type.icon)
@@ -8,10 +8,10 @@
var/id = sanitize_css_class_name("[fish_icon][fish_icon_state]")
if(sprites[id]) //no dupes
continue
- Insert(id, fish_icon, fish_icon_state)
+ insert(id, fish_icon, fish_icon_state)
-/datum/asset/simple/fishing_minigame
+/datum/asset_pack/simple/fishing_minigame
assets = list(
"fishing_background_default" = 'icons/interface/fishing/default.png',
"fishing_background_lavaland" = 'icons/interface/fishing/lavaland.png'
diff --git a/code/modules/asset_cache/assets/fontawesome.dm b/code/modules/asset_cache/assets/fontawesome.dm
index bc761a35c6d9..04e5f961956a 100644
--- a/code/modules/asset_cache/assets/fontawesome.dm
+++ b/code/modules/asset_cache/assets/fontawesome.dm
@@ -1,9 +1,11 @@
-/datum/asset/simple/namespaced/fontawesome
+/datum/asset_pack/simple/fontawesome
assets = list(
"fa-regular-400.eot" = 'html/font-awesome/webfonts/fa-regular-400.eot',
"fa-regular-400.woff" = 'html/font-awesome/webfonts/fa-regular-400.woff',
"fa-solid-900.eot" = 'html/font-awesome/webfonts/fa-solid-900.eot',
"fa-solid-900.woff" = 'html/font-awesome/webfonts/fa-solid-900.woff',
"v4shim.css" = 'html/font-awesome/css/v4-shims.min.css',
+ "font-awesome.css" = 'html/font-awesome/css/all.min.css',
)
- parents = list("font-awesome.css" = 'html/font-awesome/css/all.min.css')
+ do_not_separate = TRUE
+ do_not_mangle = TRUE
diff --git a/code/modules/asset_cache/assets/genetics.dm b/code/modules/asset_cache/assets/genetics.dm
index d74f10f631bb..e50e3284c02e 100644
--- a/code/modules/asset_cache/assets/genetics.dm
+++ b/code/modules/asset_cache/assets/genetics.dm
@@ -1,4 +1,4 @@
-/datum/asset/simple/genetics
+/datum/asset_pack/simple/genetics
assets = list(
"dna_discovered.gif" = 'icons/ui_icons/dna/dna_discovered.gif',
"dna_undiscovered.gif" = 'icons/ui_icons/dna/dna_undiscovered.gif',
diff --git a/code/modules/asset_cache/assets/headers.dm b/code/modules/asset_cache/assets/headers.dm
index 8ba6b3b51295..e43f0c0c90fc 100644
--- a/code/modules/asset_cache/assets/headers.dm
+++ b/code/modules/asset_cache/assets/headers.dm
@@ -1,4 +1,4 @@
-/datum/asset/simple/headers
+/datum/asset_pack/simple/headers
assets = list(
"alarm_green.gif" = 'icons/program_icons/alarm_green.gif',
"alarm_red.gif" = 'icons/program_icons/alarm_red.gif',
@@ -29,3 +29,4 @@
"borg_mon.gif" = 'icons/program_icons/borg_mon.gif',
"robotact.gif" = 'icons/program_icons/robotact.gif'
)
+ absolute = TRUE
diff --git a/code/modules/asset_cache/assets/inventory.dm b/code/modules/asset_cache/assets/inventory.dm
index a63fc45620f0..9b1cc6bdf3e0 100644
--- a/code/modules/asset_cache/assets/inventory.dm
+++ b/code/modules/asset_cache/assets/inventory.dm
@@ -1,4 +1,4 @@
-/datum/asset/simple/inventory
+/datum/asset_pack/simple/inventory
assets = list(
"inventory-glasses.png" = 'icons/ui_icons/inventory/glasses.png',
"inventory-head.png" = 'icons/ui_icons/inventory/head.png',
diff --git a/code/modules/asset_cache/assets/jquery.dm b/code/modules/asset_cache/assets/jquery.dm
index b7241fdb61d5..a21337fa5776 100644
--- a/code/modules/asset_cache/assets/jquery.dm
+++ b/code/modules/asset_cache/assets/jquery.dm
@@ -1,5 +1,5 @@
-/datum/asset/simple/jquery
- legacy = TRUE
+/datum/asset_pack/simple/jquery
+ absolute = TRUE
assets = list(
"jquery.min.js" = 'html/jquery/jquery.min.js',
)
diff --git a/code/modules/asset_cache/assets/language.dm b/code/modules/asset_cache/assets/language.dm
index 595f753f98f1..33830124c706 100644
--- a/code/modules/asset_cache/assets/language.dm
+++ b/code/modules/asset_cache/assets/language.dm
@@ -1,7 +1,7 @@
//this exists purely to avoid meta by pre-loading all language icons.
-/datum/asset/language
+/datum/asset_pack/language
-/datum/asset/language/register()
+/datum/asset_pack/language/register()
set waitfor = FALSE
for(var/path in typesof(/datum/language))
diff --git a/code/modules/asset_cache/assets/legacy_nanomaps.dm b/code/modules/asset_cache/assets/legacy_nanomaps.dm
index 63bbf58cd8b2..823a3b9fda8b 100644
--- a/code/modules/asset_cache/assets/legacy_nanomaps.dm
+++ b/code/modules/asset_cache/assets/legacy_nanomaps.dm
@@ -1,4 +1,4 @@
-/datum/asset/simple/nanomaps
+/datum/asset_pack/simple/nanomaps
// It REALLY doesnt matter too much if these arent up to date
// They are relatively big
assets = list(
diff --git a/code/modules/asset_cache/assets/legacy_nanoui.dm b/code/modules/asset_cache/assets/legacy_nanoui.dm
index 029e468fac43..27ec5b71d29c 100644
--- a/code/modules/asset_cache/assets/legacy_nanoui.dm
+++ b/code/modules/asset_cache/assets/legacy_nanoui.dm
@@ -1,7 +1,9 @@
-/datum/asset/simple/namespaced/nanoui
- keep_local_name = TRUE
+/datum/asset_pack/simple/nanoui
+ absolute = TRUE
+ do_not_mangle = TRUE
+ do_not_separate = TRUE
-/datum/asset/simple/namespaced/nanoui/register()
+/datum/asset_pack/simple/nanoui/generate()
var/list/dirs = list(
"nano/css/",
"nano/images/",
@@ -22,4 +24,4 @@
for(var/path in directory_walk_exts(dirs, exts, 0))
var/fname = filepath_extract_name(path)
assets[fname] = file(path)
- ..()
+ return ..()
diff --git a/code/modules/asset_cache/assets/legacy_vstation.dm b/code/modules/asset_cache/assets/legacy_vstation.dm
deleted file mode 100644
index 32f2b8a858ae..000000000000
--- a/code/modules/asset_cache/assets/legacy_vstation.dm
+++ /dev/null
@@ -1,29 +0,0 @@
-/datum/asset/simple/vstation_misc
- legacy = TRUE
- assets = list(
- "loading.gif" = 'html/images/loading.gif',
- "ntlogo.png" = 'html/images/ntlogo.png',
- "sglogo.png" = 'html/images/sglogo.png',
- "talisman.png" = 'html/images/talisman.png',
- "paper_bg.png" = 'html/images/paper_bg.png',
- "no_image32.png" = 'html/images/no_image32.png'
- )
-
-/datum/asset/simple/vstation_spideros
- legacy = TRUE
- assets = list(
- "sos_1.png" = 'icons/spideros_icons/sos_1.png',
- "sos_2.png" = 'icons/spideros_icons/sos_2.png',
- "sos_3.png" = 'icons/spideros_icons/sos_3.png',
- "sos_4.png" = 'icons/spideros_icons/sos_4.png',
- "sos_5.png" = 'icons/spideros_icons/sos_5.png',
- "sos_6.png" = 'icons/spideros_icons/sos_6.png',
- "sos_7.png" = 'icons/spideros_icons/sos_7.png',
- "sos_8.png" = 'icons/spideros_icons/sos_8.png',
- "sos_9.png" = 'icons/spideros_icons/sos_9.png',
- "sos_10.png" = 'icons/spideros_icons/sos_10.png',
- "sos_11.png" = 'icons/spideros_icons/sos_11.png',
- "sos_12.png" = 'icons/spideros_icons/sos_12.png',
- "sos_13.png" = 'icons/spideros_icons/sos_13.png',
- "sos_14.png" = 'icons/spideros_icons/sos_14.png'
- )
diff --git a/code/modules/asset_cache/assets/loadout.dm b/code/modules/asset_cache/assets/loadout.dm
index c0fe2af6c178..813d7f989398 100644
--- a/code/modules/asset_cache/assets/loadout.dm
+++ b/code/modules/asset_cache/assets/loadout.dm
@@ -1,7 +1,7 @@
-/datum/asset/spritesheet/loadout
+/datum/asset_pack/spritesheet/loadout
name = "loadout"
-/datum/asset/spritesheet/loadout/create_spritesheets()
+/datum/asset_pack/spritesheet/loadout/generate()
for(var/name in gear_datums)
var/datum/loadout_entry/entry = gear_datums[name]
var/item_id = entry.legacy_get_id()
@@ -13,4 +13,4 @@
var/obj/item/item_casted = item_path
var/item_icon = initial(item_casted.icon)
var/item_icon_state = initial(item_casted.icon_state)
- Insert(item_id, item_icon, item_icon_state)
+ insert(item_id, item_icon, item_icon_state)
diff --git a/code/modules/asset_cache/assets/materials.dm b/code/modules/asset_cache/assets/materials.dm
index 791ead24e31d..7034413302d9 100644
--- a/code/modules/asset_cache/assets/materials.dm
+++ b/code/modules/asset_cache/assets/materials.dm
@@ -1,5 +1,5 @@
-/datum/asset/spritesheet/materials
+/datum/asset_pack/spritesheet/materials
name = "sheetmaterials"
-/datum/asset/spritesheet/materials/create_spritesheets()
- InsertAll("stack", 'icons/interface/materials.dmi')
+/datum/asset_pack/spritesheet/materials/generate()
+ insert_all("stack", 'icons/interface/materials.dmi')
diff --git a/code/modules/asset_cache/assets/moods.dm b/code/modules/asset_cache/assets/moods.dm
index ebe3301c0856..4dcc3c3b8272 100644
--- a/code/modules/asset_cache/assets/moods.dm
+++ b/code/modules/asset_cache/assets/moods.dm
@@ -1,14 +1,15 @@
-/datum/asset/spritesheet/moods
+/datum/asset_pack/spritesheet/moods
name = "moods"
var/iconinserted = 1
-/datum/asset/spritesheet/moods/create_spritesheets()
+/datum/asset_pack/spritesheet/moods/generate()
+ . = ..()
for(var/i in 1 to 9)
var/target_to_insert = "mood"+"[iconinserted]"
- Insert(target_to_insert, 'icons/screen/screen_gen.dmi', target_to_insert)
+ insert(target_to_insert, 'icons/screen/screen_gen.dmi', target_to_insert)
iconinserted++
-/datum/asset/spritesheet/moods/ModifyInserted(icon/pre_asset)
+/datum/asset_pack/spritesheet/moods/modify_inserted(icon/pre_asset)
var/blended_color
switch(iconinserted)
if(1)
diff --git a/code/modules/asset_cache/assets/notes.dm b/code/modules/asset_cache/assets/notes.dm
index aec6838f9679..dfa5d0d791ec 100644
--- a/code/modules/asset_cache/assets/notes.dm
+++ b/code/modules/asset_cache/assets/notes.dm
@@ -1,4 +1,4 @@
-/datum/asset/simple/notes
+/datum/asset_pack/simple/notes
assets = list(
"high_button.png" = 'icons/ui_icons/notes/high_button.png',
"medium_button.png" = 'icons/ui_icons/notes/medium_button.png',
diff --git a/code/modules/asset_cache/assets/orbit.dm b/code/modules/asset_cache/assets/orbit.dm
index 7d0e0d98a0e6..f461db24d5a4 100644
--- a/code/modules/asset_cache/assets/orbit.dm
+++ b/code/modules/asset_cache/assets/orbit.dm
@@ -1,4 +1,4 @@
-/datum/asset/simple/orbit
+/datum/asset_pack/simple/orbit
assets = list(
"ghost.png" = 'icons/ui_icons/orbit/ghost.png'
)
diff --git a/code/modules/asset_cache/assets/paper.dm b/code/modules/asset_cache/assets/paper.dm
index 8cf50b8f3dc0..63d2b9b029ea 100644
--- a/code/modules/asset_cache/assets/paper.dm
+++ b/code/modules/asset_cache/assets/paper.dm
@@ -1,4 +1,4 @@
-/datum/asset/spritesheet/simple/paper
+/datum/asset_pack/spritesheet/simple/paper
name = "paper"
assets = list(
"stamp-clown" = 'icons/stamp_icons/large_stamp-clown.png',
@@ -17,3 +17,6 @@
"stamp-centcom" = 'icons/stamp_icons/large_stamp-centcom.png',
"stamp-syndicate" = 'icons/stamp_icons/large_stamp-syndicate.png'
)
+ do_not_separate = TRUE
+ absolute = TRUE
+ do_not_mangle = TRUE
diff --git a/code/modules/asset_cache/assets/pda.dm b/code/modules/asset_cache/assets/pda.dm
index 8207cef98680..206f34741373 100644
--- a/code/modules/asset_cache/assets/pda.dm
+++ b/code/modules/asset_cache/assets/pda.dm
@@ -1,4 +1,4 @@
-/datum/asset/spritesheet/simple/pda
+/datum/asset_pack/spritesheet/simple/pda
name = "pda"
assets = list(
"atmos" = 'icons/pda_icons/pda_atmos.png',
@@ -32,3 +32,6 @@
"emoji" = 'icons/pda_icons/pda_emoji.png',
"droneblacklist" = 'icons/pda_icons/pda_droneblacklist.png',
)
+ do_not_separate = TRUE
+ absolute = TRUE
+ do_not_mangle = TRUE
diff --git a/code/modules/asset_cache/assets/permission.dm b/code/modules/asset_cache/assets/permission.dm
index 6cc6c0e754bb..da5f1572af17 100644
--- a/code/modules/asset_cache/assets/permission.dm
+++ b/code/modules/asset_cache/assets/permission.dm
@@ -1,11 +1,5 @@
-/datum/asset/simple/permissions
+/datum/asset_pack/simple/permissions
assets = list(
"search.js" = 'html/admin/search.js',
"panels.css" = 'html/admin/panels.css'
)
-
-/datum/asset/group/permissions
- children = list(
- /datum/asset/simple/permissions,
- /datum/asset/simple/namespaced/common
- )
diff --git a/code/modules/asset_cache/assets/pipes.dm b/code/modules/asset_cache/assets/pipes.dm
index 2fe92ccadba4..e3610806f318 100644
--- a/code/modules/asset_cache/assets/pipes.dm
+++ b/code/modules/asset_cache/assets/pipes.dm
@@ -1,7 +1,7 @@
-/datum/asset/spritesheet/pipes
+/datum/asset_pack/spritesheet/pipes
name = "pipes"
-/datum/asset/spritesheet/pipes/create_spritesheets()
+/datum/asset_pack/spritesheet/pipes/generate()
for(var/each in list('icons/obj/pipe-item.dmi', 'icons/obj/pipes/disposal.dmi'))
////for (var/each in list('icons/obj/atmospherics/pipes/pipe_item.dmi', 'icons/obj/atmospherics/pipes/disposal.dmi', 'icons/obj/atmospherics/pipes/transit_tube.dmi', 'icons/obj/plumbing/fluid_ducts.dmi'))
- InsertAll("", each, GLOB.alldirs)
+ insert_all("", each, GLOB.alldirs)
diff --git a/code/modules/asset_cache/assets/portraits.dm b/code/modules/asset_cache/assets/portraits.dm
index 81bb0e058a63..dad5993e4304 100644
--- a/code/modules/asset_cache/assets/portraits.dm
+++ b/code/modules/asset_cache/assets/portraits.dm
@@ -1,7 +1,7 @@
-/datum/asset/simple/portraits
+/datum/asset_pack/simple/portraits
assets = list()
-/datum/asset/simple/portraits/New()
+/datum/asset_pack/simple/portraits/New()
if(!length(SSpersistent_paintings.paintings))
return
for(var/datum/painting/portrait as anything in SSpersistent_paintings.paintings)
diff --git a/code/modules/asset_cache/assets/radar.dm b/code/modules/asset_cache/assets/radar.dm
index cef2679a92dc..06cc1e6056db 100644
--- a/code/modules/asset_cache/assets/radar.dm
+++ b/code/modules/asset_cache/assets/radar.dm
@@ -1,4 +1,4 @@
-/datum/asset/simple/radar_assets
+/datum/asset_pack/simple/radar_assets
assets = list(
"ntosradarbackground.png" = 'icons/ui_icons/tgui/ntosradar_background.png',
"ntosradarpointer.png" = 'icons/ui_icons/tgui/ntosradar_pointer.png',
diff --git a/code/modules/asset_cache/assets/research_designs.dm b/code/modules/asset_cache/assets/research_designs.dm
index c2c26affbb54..88f02da28b54 100644
--- a/code/modules/asset_cache/assets/research_designs.dm
+++ b/code/modules/asset_cache/assets/research_designs.dm
@@ -1,8 +1,8 @@
// Representative icons for each research design
-/datum/asset/spritesheet/research_designs
+/datum/asset_pack/spritesheet/research_designs
name = "design"
-/datum/asset/spritesheet/research_designs/create_spritesheets()
+/datum/asset_pack/spritesheet/research_designs/generate()
for (var/path in subtypesof(/datum/design))
var/datum/design/D = path
diff --git a/code/modules/asset_cache/assets/safe.dm b/code/modules/asset_cache/assets/safe.dm
index b1d6ba9a8aac..60417650a271 100644
--- a/code/modules/asset_cache/assets/safe.dm
+++ b/code/modules/asset_cache/assets/safe.dm
@@ -1,4 +1,4 @@
-/datum/asset/simple/safe
+/datum/asset_pack/simple/safe
assets = list(
"safe_dial.png" = 'icons/ui_icons/safe/safe_dial.png'
)
diff --git a/code/modules/asset_cache/assets/supplypods.dm b/code/modules/asset_cache/assets/supplypods.dm
index fd4c961f103e..eca2766798cd 100644
--- a/code/modules/asset_cache/assets/supplypods.dm
+++ b/code/modules/asset_cache/assets/supplypods.dm
@@ -1,7 +1,7 @@
-/datum/asset/spritesheet/supplypods
+/datum/asset_pack/spritesheet/supplypods
name = "supplypods"
-/datum/asset/spritesheet/supplypods/create_spritesheets()
+/datum/asset_pack/spritesheet/supplypods/generate()
for (var/style in 1 to length(GLOB.podstyles))
if (style == STYLE_SEETHROUGH)
Insert("pod_asset[style]", icon('icons/obj/supplypods.dmi' , "seethrough-icon"))
diff --git a/code/modules/asset_cache/assets/tgfont.dm b/code/modules/asset_cache/assets/tgfont.dm
index efa98e22e2c0..9157e7924324 100644
--- a/code/modules/asset_cache/assets/tgfont.dm
+++ b/code/modules/asset_cache/assets/tgfont.dm
@@ -1,8 +1,7 @@
-/datum/asset/simple/namespaced/tgfont
+/datum/asset_pack/simple/tgfont
assets = list(
"tgfont.eot" = file("tgui/packages/tgfont/static/tgfont.eot"),
"tgfont.woff2" = file("tgui/packages/tgfont/static/tgfont.woff2"),
- )
- parents = list(
"tgfont.css" = file("tgui/packages/tgfont/static/tgfont.css"),
)
+ do_not_separate = TRUE
diff --git a/code/modules/asset_cache/assets/tgui.dm b/code/modules/asset_cache/assets/tgui.dm
index 9c79925602c7..4f89ff984fbb 100644
--- a/code/modules/asset_cache/assets/tgui.dm
+++ b/code/modules/asset_cache/assets/tgui.dm
@@ -1,12 +1,12 @@
-/datum/asset/simple/tgui
- keep_local_name = TRUE
+/datum/asset_pack/simple/tgui
+ // keep_local_name = TRUE
assets = list(
"tgui.bundle.js" = file("tgui/public/tgui.bundle.js"),
"tgui.bundle.css" = file("tgui/public/tgui.bundle.css"),
)
-/datum/asset/simple/tgui_panel
- keep_local_name = TRUE
+/datum/asset_pack/simple/tgui_panel
+ // keep_local_name = TRUE
assets = list(
"tgui-panel.bundle.js" = file("tgui/public/tgui-panel.bundle.js"),
"tgui-panel.bundle.css" = file("tgui/public/tgui-panel.bundle.css"),
diff --git a/code/modules/asset_cache/assets/uplink.dm b/code/modules/asset_cache/assets/uplink.dm
index 24f6e2f49b5a..e8356350c898 100644
--- a/code/modules/asset_cache/assets/uplink.dm
+++ b/code/modules/asset_cache/assets/uplink.dm
@@ -1,8 +1,8 @@
/// Sends information needed for uplinks
-/datum/asset/json/uplink
+/datum/asset_pack/json/uplink
name = "uplink"
-/datum/asset/json/uplink/generate()
+/datum/asset_pack/json/uplink/generate()
var/list/data = list()
var/list/categories = list()
var/list/items = list()
diff --git a/code/modules/asset_cache/assets/vending.dm b/code/modules/asset_cache/assets/vending.dm
index 87fddfc1132c..b21a46090fe2 100644
--- a/code/modules/asset_cache/assets/vending.dm
+++ b/code/modules/asset_cache/assets/vending.dm
@@ -1,7 +1,7 @@
-/datum/asset/spritesheet/vending
+/datum/asset_pack/spritesheet/vending
name = "vending"
-/datum/asset/spritesheet/vending/create_spritesheets()
+/datum/asset_pack/spritesheet/vending/generate()
for (var/k in GLOB.vending_products)
var/atom/item = k
if (!ispath(item, /atom))
diff --git a/code/modules/asset_cache/assets/vv.dm b/code/modules/asset_cache/assets/vv.dm
index 0dd974c7c794..ecfe99c84801 100644
--- a/code/modules/asset_cache/assets/vv.dm
+++ b/code/modules/asset_cache/assets/vv.dm
@@ -1,4 +1,4 @@
-/datum/asset/simple/vv
+/datum/asset_pack/simple/vv
assets = list(
"view_variables.css" = 'html/admin/view_variables.css'
)
diff --git a/code/modules/asset_cache/client.dm b/code/modules/asset_cache/client.dm
new file mode 100644
index 000000000000..c5e7a0d506cd
--- /dev/null
+++ b/code/modules/asset_cache/client.dm
@@ -0,0 +1,90 @@
+/client
+ /// asset cache: filename = md5, for things already sent to the client
+ /// this is only for browse_rsc()'d assets.
+ var/list/asset_native_received = list()
+ /// used for browse_queue_fluhs()
+ var/list/asset_flush_jobs = list()
+ /// last flush job id
+ var/asset_flush_last_id
+
+/client/on_new_hook_stability_checks()
+ // ensure asset cache is there
+ INVOKE_ASYNC(src, PROC_REF(warn_if_no_asset_cache_browser))
+ return ..()
+
+/client/proc/warn_if_no_asset_cache_browser()
+ if(!winexists(src, "asset_cache_browser")) // The client is using a custom skin, tell them.
+ to_chat(src, "Unable to access asset cache browser, if you are using a custom skin file, please allow DS to download the updated version, if you are not, then make a bug report. This is not a critical issue but can cause issues with resource downloading, as it is impossible to know when extra resources arrived to you.")
+
+/client/on_topic_hook(raw_href, list/href_list, raw_src)
+ . = ..()
+ if(.)
+ return
+
+ if(href_list["asset_cache_confirm_arrival"])
+ if(asset_cache_confirm_arrival(href_list["asset_cache_confirm_arrival"]))
+ return TRUE
+ else
+ if(!isnull(asset_flush_jobs))
+ // it's a valid job, it might be byond bug ID:2256651
+ to_chat(src, "An error has been detected in how your client is receiving resources. Attempting to correct.... (If you keep seeing these messages you might want to close byond and reconnect)")
+ src << browse("...", "window=asset_cache_browser")
+ return TRUE
+ else
+ // what the fuck are they doing?
+ security_kick("A fatal issue occurred during asset send, or your client kept spamming receive confirmations \
+ after acknowledgement. Please reconnect after clearing your cache.", TRUE, TRUE)
+ return TRUE
+
+/**
+ * Process asset cache client topic calls for `"asset_cache_confirm_arrival=[INT]"`
+ *
+ * @return TRUE if it was a valid arrival
+ */
+/client/proc/asset_cache_confirm_arrival(job_id)
+ var/asset_cache_job = round(text2num(job_id))
+ //because we skip the limiter, we have to make sure this is a valid arrival and not somebody tricking us into letting them append to a list without limit.
+ if(!isnull(asset_flush_jobs["[asset_cache_job]"]))
+ asset_flush_jobs["[asset_cache_job]"] = TRUE
+ return TRUE
+ return FALSE
+
+/// Blocks until all currently sending browse and browse_rsc assets have been sent.
+/// Due to byond limitations, this proc will sleep for 1 client round trip even if the client has no pending asset sends.
+/// This proc will return an untrue value if it had to return before confirming the send, such as timeout or the client going away.
+/client/proc/asset_cache_flush_browse_queue(timeout = 50)
+ var/job = ++asset_flush_last_id
+ if(asset_flush_last_id >= SHORT_REAL_LIMIT)
+ asset_flush_last_id = 0
+ var/timeout_time = world.time + timeout
+ src << browse({""}, "window=asset_cache_browser&file=asset_cache_send_verify.htm")
+
+ asset_flush_jobs["[job]"] = FALSE
+ while(!asset_flush_jobs["[job]"] && world.time < timeout_time) // Reception is handled in Topic()
+ stoplag(1) // Lock up the caller until this is received.
+
+ return asset_flush_jobs["[job]"]
+
+/**
+ * sends a list of asset packs intelligently without locking up brwose queue
+ *
+ * used for preloading
+ *
+ * this is on client for gc optimizations as src will be set to ourselves
+ *
+ * * do not use unless you know what you're doing
+ */
+/client/proc/asset_cache_native_preload(list/datum/asset_pack/packs, flush_on_how_many_packs = 3)
+ var/datum/asset_transport/cached_transport = SSassets.transport
+ var/packs_before_flush = flush_on_how_many_packs
+ for(var/datum/asset_pack/pack as anything in packs)
+ if(SSassets.transport != cached_transport)
+ return
+ if(!pack.is_pushed_to_transport())
+ continue
+ cached_transport.send_asset_item_native(src, pack.packed_items)
+ stoplag(0) // do not lock up browse queue
+ if(!(--packs_before_flush))
+ packs_before_flush = flush_on_how_many_packs
+ if(!asset_cache_flush_browse_queue(5 SECONDS))
+ stack_trace("aborted native preload for [src] because they timed out on browse queue flush. did something break, or do they just have bad internet?")
diff --git a/code/modules/asset_cache/packs/changelog_item.dm b/code/modules/asset_cache/packs/changelog_item.dm
new file mode 100644
index 000000000000..495434a65fbe
--- /dev/null
+++ b/code/modules/asset_cache/packs/changelog_item.dm
@@ -0,0 +1,12 @@
+
+/datum/asset_pack/changelog_item
+ abstract_type = /datum/asset_pack/changelog_item
+ var/item_filename
+
+/datum/asset_pack/changelog_item/New(date)
+ item_filename = SANITIZE_FILENAME("[date].yml")
+
+/datum/asset_pack/changelog_item/register()
+ return list(
+ item_filename = file("html/changelogs/archive/" + item_filename),
+ )
diff --git a/code/modules/asset_cache/packs/json.dm b/code/modules/asset_cache/packs/json.dm
new file mode 100644
index 000000000000..d849cd8a242f
--- /dev/null
+++ b/code/modules/asset_cache/packs/json.dm
@@ -0,0 +1,14 @@
+
+/// A subtype to generate a JSON file from a list
+/datum/asset_pack/json
+ abstract_type = /datum/asset_pack/json
+ /// The filename, will be suffixed with ".json"
+ var/name
+
+/datum/asset_pack/json/register(generation)
+ var/filename = "tmp/assets/[name].json"
+ fdel(filename)
+ text2file(json_encode(generate()), filename)
+ return list(
+ "[name].json" = file(filename),
+ )
diff --git a/code/modules/asset_cache/packs/simple.dm b/code/modules/asset_cache/packs/simple.dm
new file mode 100644
index 000000000000..fe614c5acb9f
--- /dev/null
+++ b/code/modules/asset_cache/packs/simple.dm
@@ -0,0 +1,24 @@
+
+/// If you don't need anything complicated.
+/datum/asset_pack/simple
+ abstract_type = /datum/asset_pack/simple
+ /**
+ * List of assets for this datum in the form of:
+ * * filename = file
+ * At runtime the asset file will be converted into a asset_item datum.
+ */
+ var/assets = list()
+
+/datum/asset_pack/simple/New(id, list/assets)
+ ..(id)
+ if(!isnull(assets))
+ src.assets = assets.Copy()
+
+/datum/asset_pack/simple/register()
+ . = list()
+ for(var/key in assets)
+ var/value = assets[key]
+ if(isfile(value))
+ .[key] = value
+ else
+ .[key] = file(value)
diff --git a/code/modules/asset_cache/packs/spritesheet.dm b/code/modules/asset_cache/packs/spritesheet.dm
new file mode 100644
index 000000000000..7b83ff7c6a4b
--- /dev/null
+++ b/code/modules/asset_cache/packs/spritesheet.dm
@@ -0,0 +1,198 @@
+
+/**
+ * spritesheet implementation - coalesces various icons into a single .png file
+ * and uses CSS to select icons out of that file - saves on transferring some
+ * 1400-odd individual PNG files
+ *
+ * To use, use classes of "[name][size_key]" and the state name used in insert().
+ * If you used insert_all(), don't forget the prefix.
+ *
+ * Example:
+ * In tgui, usually would be className={classes(['sheetmaterials32x32', 'glass-3'])}
+ */
+#define SPR_SIZE 1
+#define SPR_IDX 2
+
+#define SPRSZ_COUNT 1
+#define SPRSZ_ICON 2
+#define SPRSZ_STRIPPED 3
+
+/datum/asset_pack/spritesheet
+ abstract_type = /datum/asset_pack/spritesheet
+ do_not_separate = TRUE
+ /// so unfortunately we can't mangle it due to the fact that
+ /// * the .css needs to know where the image is
+ /// * we don't know what to name the image until the entire pack is encoded
+ /// * so the easiest way is to set do_not_mangle to TRUE for now, and deal with it later
+ /// todo: completely unnecessarily overengineer some more and fix this in 2025 ~silicons
+ do_not_mangle = TRUE
+ /// the spritesheet's name
+ var/name
+
+ /**
+ * List of arguments to pass into do_insert.
+ * Exists so we can queue icon insertion, mostly for stuff like preferences.
+ */
+ var/list/to_generate = list()
+
+ /// "32x32" -> list(10, icon/normal, icon/stripped)
+ var/list/sizes = list()
+ /// "foo_bar" -> list("32x32", 5)
+ var/list/sprites = list()
+
+/datum/asset_pack/spritesheet/register(generation)
+ return construct()
+
+/datum/asset_pack/spritesheet/proc/get_css_url()
+ return get_url("spritesheet_[name].css")
+
+/datum/asset_pack/spritesheet/proc/construct()
+ . = list()
+
+ while(length(to_generate))
+ var/list/stored_args = to_generate[to_generate.len]
+ to_generate.len--
+ do_insert(arglist(stored_args))
+ CHECK_TICK
+
+ ensure_stripped()
+ for(var/size_id in sizes)
+ var/size = sizes[size_id]
+ .["[name]_[size_id].png"] = size[SPRSZ_STRIPPED]
+
+ var/fname = "tmp/assets/spritesheets/[name].css"
+ fdel(fname)
+ text2file(generate_css(), fname)
+ var/res_name = "spritesheet_[name].css"
+ .[res_name] = fname
+
+/datum/asset_pack/spritesheet/proc/ensure_stripped(sizes_to_strip = sizes)
+ for(var/size_id in sizes_to_strip)
+ var/size = sizes[size_id]
+ if (size[SPRSZ_STRIPPED])
+ continue
+
+ // save flattened version
+ var/fname = "tmp/assets/spritesheets/[name]_[size_id].png"
+ fdel(fname)
+ fcopy(size[SPRSZ_ICON], fname)
+ var/error = rustg_dmi_strip_metadata(fname)
+ if(length(error))
+ stack_trace("Failed to strip [name]_[size_id].png: [error]")
+ size[SPRSZ_STRIPPED] = icon(fname)
+
+/datum/asset_pack/spritesheet/proc/generate_css()
+ var/list/out = list()
+
+ for (var/size_id in sizes)
+ var/size = sizes[size_id]
+ var/icon/tiny = size[SPRSZ_ICON]
+ out += ".[name][size_id]{display:inline-block;width:[tiny.Width()]px;height:[tiny.Height()]px;background:url('[get_background_url("[name]_[size_id].png")]') no-repeat;}"
+
+ for (var/sprite_id in sprites)
+ var/sprite = sprites[sprite_id]
+ var/size_id = sprite[SPR_SIZE]
+ var/idx = sprite[SPR_IDX]
+ var/size = sizes[size_id]
+
+ var/icon/tiny = size[SPRSZ_ICON]
+ var/icon/big = size[SPRSZ_STRIPPED]
+ var/per_line = big.Width() / tiny.Width()
+ var/x = (idx % per_line) * tiny.Width()
+ var/y = round(idx / per_line) * tiny.Height()
+
+ out += ".[name][size_id].[sprite_id]{background-position:-[x]px -[y]px;}"
+
+ return out.Join("\n")
+
+/// Returns the URL to put in the background:url of the CSS asset
+/datum/asset_pack/spritesheet/proc/get_background_url(image_name)
+ return image_name
+
+/**
+ * LEMON NOTE
+ * A GOON CODER SAYS BAD ICON ERRORS CAN BE THROWN BY THE "ICON CACHE"
+ * APPARENTLY IT MAKES ICONS IMMUTABLE
+ * LOOK INTO USING THE MUTABLE APPEARANCE PATTERN HERE
+ *
+ * neither prefixes nor states may have spaces!
+ */
+/datum/asset_pack/spritesheet/proc/do_insert(sprite_name, icon/I, icon_state="", dir=SOUTH, frame=1, moving=FALSE)
+ I = icon(I, icon_state=icon_state, dir=dir, frame=frame, moving=moving)
+ if (!I || !length(icon_states(I))) // That direction or state doesn't exist!
+ return
+ // Any sprite modifications we want to do (aka, coloring a greyscaled asset)
+ I = modify_inserted(I)
+ var/size_id = "[I.Width()]x[I.Height()]"
+ var/size = sizes[size_id]
+
+ if (sprites[sprite_name])
+ CRASH("duplicate sprite \"[sprite_name]\" in sheet [name] ([type])")
+
+ if (size)
+ var/position = size[SPRSZ_COUNT]++
+ var/icon/sheet = size[SPRSZ_ICON]
+ var/icon/sheet_copy = icon(sheet)
+ size[SPRSZ_STRIPPED] = null
+ sheet_copy.Insert(I, icon_state=sprite_name)
+ size[SPRSZ_ICON] = sheet_copy
+ sprites[sprite_name] = list(size_id, position)
+ else
+ sizes[size_id] = size = list(1, I, null)
+ sprites[sprite_name] = list(size_id, 0)
+
+/**
+ * neither prefixes nor states may have spaces!
+ */
+/datum/asset_pack/spritesheet/proc/insert(sprite_name, icon/I, icon_state="", dir=SOUTH, frame=1, moving=FALSE)
+ to_generate += list(args.Copy())
+
+/**
+ * neither prefixes nor states may have spaces!
+ */
+/datum/asset_pack/spritesheet/proc/insert_all(prefix, icon/I, list/directions)
+ if (length(prefix))
+ prefix = "[prefix]-"
+
+ if (!directions)
+ directions = list(SOUTH)
+
+ for (var/icon_state_name in icon_states(I))
+ for (var/direction in directions)
+ var/prefix2 = (directions.len > 1) ? "[dir2text(direction)]-" : ""
+ insert("[prefix][prefix2][icon_state_name]", I, icon_state=icon_state_name, dir=direction)
+
+/**
+ * A simple proc handing the Icon for you to modify before it gets turned into an asset.
+ *
+ * Arguments:
+ * * I: icon being turned into an asset
+ */
+/datum/asset_pack/spritesheet/proc/modify_inserted(icon/pre_asset)
+ return pre_asset
+
+/**
+ * todo: deprecated; logic should be tgui-side.
+ */
+/datum/asset_pack/spritesheet/proc/icon_tag(sprite_name)
+ var/sprite = sprites[sprite_name]
+ if (!sprite)
+ return null
+ var/size_id = sprite[SPR_SIZE]
+ return {""}
+
+/**
+ * todo: deprecated; logic should be tgui-side.
+ */
+/datum/asset_pack/spritesheet/proc/icon_class_name(sprite_name)
+ var/sprite = sprites[sprite_name]
+ if (!sprite)
+ return null
+ var/size_id = sprite[SPR_SIZE]
+ return {"[name][size_id] [sprite_name]"}
+
+#undef SPR_SIZE
+#undef SPR_IDX
+#undef SPRSZ_COUNT
+#undef SPRSZ_ICON
+#undef SPRSZ_STRIPPED
diff --git a/code/modules/asset_cache/packs/spritesheet/simple.dm b/code/modules/asset_cache/packs/spritesheet/simple.dm
new file mode 100644
index 000000000000..18ed7c3fc808
--- /dev/null
+++ b/code/modules/asset_cache/packs/spritesheet/simple.dm
@@ -0,0 +1,15 @@
+/datum/asset_pack/spritesheet/simple
+ abstract_type = /datum/asset_pack/spritesheet/simple
+ /**
+ * key = value list of icon_state = icon
+ *
+ * e.g.
+ * "enzyme" = 'icons/runtime/assets/condiments/enzyme.png'
+ *
+ * keys must be unique, obviously.
+ */
+ var/list/assets
+
+/datum/asset_pack/spritesheet/simple/generate()
+ for (var/key in assets)
+ insert(key, assets[key])
diff --git a/code/modules/asset_cache/transports/asset_transport.dm b/code/modules/asset_cache/transports/asset_transport.dm
deleted file mode 100644
index 82375ce1a6fd..000000000000
--- a/code/modules/asset_cache/transports/asset_transport.dm
+++ /dev/null
@@ -1,154 +0,0 @@
-/// When sending mutiple assets, how many before we give the client a quaint little sending resources message
-#define ASSET_CACHE_TELL_CLIENT_AMOUNT 8
-
-/// Base browse_rsc asset transport
-/datum/asset_transport
- var/name = "Simple browse_rsc asset transport"
- var/static/list/preload
- /// Don't mutate the filename of assets when sending via browse_rsc.
- /// This is to make it easier to debug issues with assets, and allow server operators to bypass issues that make it to production.
- /// If turning this on fixes asset issues, something isn't using get_asset_url and the asset isn't marked legacy, fix one of those.
- var/dont_mutate_filenames = FALSE
-
-/// Called when the transport is loaded by the config controller, not called on the default transport unless it gets loaded by a config change.
-/datum/asset_transport/proc/Load()
- if (CONFIG_GET(flag/asset_simple_preload))
- for(var/client/C in GLOB.clients)
- addtimer(CALLBACK(src, PROC_REF(send_assets_slow), C, preload), 1 SECONDS)
-
-/// Initialize - Called when SSassets initializes.
-/datum/asset_transport/proc/Initialize(list/assets)
- preload = assets.Copy()
- if (!CONFIG_GET(flag/asset_simple_preload))
- return
- for(var/client/C in GLOB.clients)
- addtimer(CALLBACK(src, PROC_REF(send_assets_slow), C, preload), 1 SECONDS)
-
-
-/// Register a browser asset with the asset cache system
-/// asset_name - the identifier of the asset
-/// asset - the actual asset file (or an asset_cache_item datum)
-/// returns a /datum/asset_cache_item.
-/// mutiple calls to register the same asset under the same asset_name return the same datum
-/datum/asset_transport/proc/register_asset(asset_name, asset)
- var/datum/asset_cache_item/ACI = asset
- if (!istype(ACI))
- ACI = new(asset_name, asset)
- if (!ACI || !ACI.hash)
- CRASH("ERROR: Invalid asset: [asset_name]:[asset]:[ACI]")
- if (SSassets.cache[asset_name])
- var/datum/asset_cache_item/OACI = SSassets.cache[asset_name]
- OACI.legacy = ACI.legacy = (ACI.legacy|OACI.legacy)
- OACI.namespace_parent = ACI.namespace_parent = (ACI.namespace_parent | OACI.namespace_parent)
- OACI.namespace = OACI.namespace || ACI.namespace
- if (OACI.hash != ACI.hash)
- var/error_msg = "ERROR: new asset added to the asset cache with the same name as another asset: [asset_name] existing asset hash: [OACI.hash] new asset hash:[ACI.hash]"
- stack_trace(error_msg)
- log_asset(error_msg)
- else
- if (length(ACI.namespace))
- return ACI
- return OACI
-
- SSassets.cache[asset_name] = ACI
- return ACI
-
-
-/// Returns a url for a given asset.
-/// asset_name - Name of the asset.
-/// asset_cache_item - asset cache item datum for the asset, optional, overrides asset_name
-/datum/asset_transport/proc/get_asset_url(asset_name, datum/asset_cache_item/asset_cache_item)
- if (!istype(asset_cache_item))
- asset_cache_item = SSassets.cache[asset_name]
- // To ensure code that breaks on cdns breaks in local testing, we only
- // use the normal filename on legacy assets and name space assets.
- var/keep_local_name = dont_mutate_filenames \
- || asset_cache_item.legacy \
- || asset_cache_item.keep_local_name \
- || (asset_cache_item.namespace && !asset_cache_item.namespace_parent)
- if (keep_local_name)
- return url_encode(asset_cache_item.name)
- return url_encode("asset.[asset_cache_item.hash][asset_cache_item.ext]")
-
-
-/// Sends a list of browser assets to a client
-/// client - a client or mob
-/// asset_list - A list of asset filenames to be sent to the client. Can optionally be assoicated with the asset's asset_cache_item datum.
-/// Returns TRUE if any assets were sent.
-/datum/asset_transport/proc/send_assets(client/client, list/asset_list)
- if (!istype(client))
- if (ismob(client))
- var/mob/M = client
- if (M.client)
- client = M.client
- else //no stacktrace because this will mainly happen because the client went away
- return
- else
- CRASH("Invalid argument: client: `[client]`")
- if (!islist(asset_list))
- asset_list = list(asset_list)
- var/list/unreceived = list()
-
- for (var/asset_name in asset_list)
- var/datum/asset_cache_item/ACI = asset_list[asset_name]
- if (!istype(ACI) && !(ACI = SSassets.cache[asset_name]))
- log_asset("ERROR: can't send asset `[asset_name]`: unregistered or invalid state: `[ACI]`")
- continue
- var/asset_file = ACI.resource
- if (!asset_file)
- log_asset("ERROR: can't send asset `[asset_name]`: invalid registered resource: `[ACI.resource]`")
- continue
-
- var/asset_hash = ACI.hash
- var/new_asset_name = asset_name
- var/keep_local_name = dont_mutate_filenames \
- || ACI.legacy \
- || ACI.keep_local_name \
- || (ACI.namespace && !ACI.namespace_parent)
- if (!keep_local_name)
- new_asset_name = "asset.[ACI.hash][ACI.ext]"
- if (client.sent_assets[new_asset_name] == asset_hash)
- if (GLOB.Debug2)
- log_asset("DEBUG: Skipping send of `[asset_name]` (as `[new_asset_name]`) for `[client]` because it already exists in the client's sent_assets list")
- continue
- unreceived[asset_name] = ACI
-
- if (unreceived.len)
- if (unreceived.len >= ASSET_CACHE_TELL_CLIENT_AMOUNT)
- to_chat(client, SPAN_INFOPLAIN("Sending Resources..."))
-
- for (var/asset_name in unreceived)
- var/new_asset_name = asset_name
- var/datum/asset_cache_item/ACI = unreceived[asset_name]
- var/keep_local_name = dont_mutate_filenames \
- || ACI.legacy \
- || ACI.keep_local_name \
- || (ACI.namespace && !ACI.namespace_parent)
- if (!keep_local_name)
- new_asset_name = "asset.[ACI.hash][ACI.ext]"
- log_asset("Sending asset `[asset_name]` to client `[client]` as `[new_asset_name]`")
- client << browse_rsc(ACI.resource, new_asset_name)
-
- client.sent_assets[new_asset_name] = ACI.hash
-
- addtimer(CALLBACK(client, TYPE_PROC_REF(/client, asset_cache_update_json)), 1 SECONDS, TIMER_UNIQUE|TIMER_OVERRIDE)
- return TRUE
- return FALSE
-
-
-/// Precache files without clogging up the browse() queue, used for passively sending files on connection start.
-/datum/asset_transport/proc/send_assets_slow(client/client, list/files, filerate = 6)
- var/startingfilerate = filerate
- for (var/file in files)
- if (!client)
- break
- if (send_assets(client, file))
- if (!(--filerate))
- filerate = startingfilerate
- client.browse_queue_flush()
- stoplag(0) //queuing calls like this too quickly can cause issues in some client versions
-
-/// Check the config is valid to load this transport
-/// Returns TRUE or FALSE
-/datum/asset_transport/proc/validate_config(log = TRUE)
- return TRUE
diff --git a/code/modules/asset_cache/transports/browse_rsc.dm b/code/modules/asset_cache/transports/browse_rsc.dm
new file mode 100644
index 000000000000..5b4b8d715f31
--- /dev/null
+++ b/code/modules/asset_cache/transports/browse_rsc.dm
@@ -0,0 +1,17 @@
+/**
+ * Basic asset transport, via browse_rsc()
+ */
+/datum/asset_transport/browse_rsc
+ name = "asset-transport: browse_rsc()"
+
+/datum/asset_transport/browse_rsc/validate_config()
+ return TRUE
+
+/datum/asset_transport/browse_rsc/send_anonymous_file(list/client/targets, file)
+ return send_anonymous_file_native(targets, file)
+
+/datum/asset_transport/browse_rsc/load_item(datum/asset_item/item)
+ return load_item_native(item)
+
+/datum/asset_transport/browse_rsc/send_items(client/target, list/datum/asset_item/items)
+ return send_asset_item_native(target, items)
diff --git a/code/modules/asset_cache/transports/webroot.dm b/code/modules/asset_cache/transports/webroot.dm
new file mode 100644
index 000000000000..60f3712aed9e
--- /dev/null
+++ b/code/modules/asset_cache/transports/webroot.dm
@@ -0,0 +1,54 @@
+/// CDN Webroot asset transport.
+/datum/asset_transport/webroot
+ name = "CDN Webroot asset transport"
+
+ var/webroot
+ var/url
+
+/datum/asset_transport/webroot/initialize()
+ . = ..()
+ webroot = CONFIG_GET(string/asset_cdn_webroot)
+ url = CONFIG_GET(string/asset_cdn_url)
+
+/datum/asset_transport/webroot/validate_config()
+ if (!CONFIG_GET(string/asset_cdn_url))
+ log_asset("ERROR: [type]: Invalid Config: ASSET_CDN_URL")
+ return FALSE
+ if (!CONFIG_GET(string/asset_cdn_webroot))
+ log_asset("ERROR: [type]: Invalid Config: ASSET_CDN_WEBROOT")
+ return FALSE
+ return TRUE
+
+/datum/asset_transport/webroot/send_items(client/target, list/datum/asset_item/items)
+ return TRUE
+
+/datum/asset_transport/webroot/send_anonymous_file(list/client/targets, file, ext)
+ return save_anonymous_file_to_webroot(file, ext)
+
+/datum/asset_transport/webroot/load_item(datum/asset_item/item)
+ return save_asset_item_to_webroot(item)
+
+/datum/asset_transport/webroot/proc/save_asset_item_to_webroot(datum/asset_item/item)
+ return save_to_webroot(item.file, item.mangled_name, item.namespace_id, item.hash)
+
+/datum/asset_transport/webroot/proc/save_anonymous_file_to_webroot(file, ext)
+ var/md5_of_file = md5asfile(file)
+ var/filename = "[md5_of_file].[ext]"
+ return save_to_webroot(file, filename, null, md5_of_file)
+
+/datum/asset_transport/webroot/proc/save_to_webroot(file, filename, namespace, hash)
+ var/path
+ if(namespace)
+ path = "namespaces/[copytext(namespace, 1, 3)]/[namespace]/[filename]"
+ else
+ path = "[get_webroot_path(hash, filename)]"
+ var/save_path = "[webroot]/[path]"
+ if(!fexists(save_path) && !fexists("[save_path].gz")) // sometimes web servers auto-compress text files
+ fcopy(file, "[save_path]")
+ return "[url]/[path]"
+
+/datum/asset_transport/webroot/proc/get_webroot_path(hash, filename)
+ return "[copytext(hash, 1, 3)]/[filename]"
+
+/datum/asset_transport/webroot/perform_native_preload(client/victim, list/datum/asset_pack/native_packs)
+ return // preloading? what's that? sounds like something done by sane people who don't use IIS!
diff --git a/code/modules/asset_cache/transports/webroot_transport.dm b/code/modules/asset_cache/transports/webroot_transport.dm
deleted file mode 100644
index e3cb33b8fabf..000000000000
--- a/code/modules/asset_cache/transports/webroot_transport.dm
+++ /dev/null
@@ -1,87 +0,0 @@
-/// CDN Webroot asset transport.
-/datum/asset_transport/webroot
- name = "CDN Webroot asset transport"
-
-/datum/asset_transport/webroot/Load()
- if (validate_config(log = FALSE))
- load_existing_assets()
-
-/// Processes thru any assets that were registered before we were loaded as a transport.
-/datum/asset_transport/webroot/proc/load_existing_assets()
- for (var/asset_name in SSassets.cache)
- var/datum/asset_cache_item/ACI = SSassets.cache[asset_name]
- save_asset_to_webroot(ACI)
-
-/// Register a browser asset with the asset cache system
-/// We also save it to the CDN webroot at this step instead of waiting for send_assets()
-/// asset_name - the identifier of the asset
-/// asset - the actual asset file or an asset_cache_item datum.
-/datum/asset_transport/webroot/register_asset(asset_name, asset)
- . = ..()
- var/datum/asset_cache_item/ACI = .
-
- if (istype(ACI) && ACI.hash)
- save_asset_to_webroot(ACI)
-
-/// Saves the asset to the webroot taking into account namespaces and hashes.
-/datum/asset_transport/webroot/proc/save_asset_to_webroot(datum/asset_cache_item/ACI)
- var/webroot = CONFIG_GET(string/asset_cdn_webroot)
- var/newpath = "[webroot][get_asset_suffex(ACI)]"
- if (fexists(newpath))
- return
- if (fexists("[newpath].gz")) //its a common pattern in webhosting to save gzip'ed versions of text files and let the webserver serve them up as gzip compressed normal files, sometimes without keeping the original version.
- return
- return fcopy(ACI.resource, newpath)
-
-/// Returns a url for a given asset.
-/// asset_name - Name of the asset.
-/// asset_cache_item - asset cache item datum for the asset, optional, overrides asset_name
-/datum/asset_transport/webroot/get_asset_url(asset_name, datum/asset_cache_item/asset_cache_item)
- if (!istype(asset_cache_item))
- asset_cache_item = SSassets.cache[asset_name]
- var/url = CONFIG_GET(string/asset_cdn_url) //config loading will handle making sure this ends in a /
- return "[url][get_asset_suffex(asset_cache_item)]"
-
-/datum/asset_transport/webroot/proc/get_asset_suffex(datum/asset_cache_item/asset_cache_item)
- var/base = "[copytext(asset_cache_item.hash, 1, 3)]/"
- var/filename = "asset.[asset_cache_item.hash][asset_cache_item.ext]"
- if (length(asset_cache_item.namespace))
- base = "namespaces/[copytext(asset_cache_item.namespace, 1, 3)]/[asset_cache_item.namespace]/"
- if (!asset_cache_item.namespace_parent)
- filename = "[asset_cache_item.name]"
- return base + filename
-
-
-/// webroot asset sending - does nothing unless passed legacy assets
-/datum/asset_transport/webroot/send_assets(client/client, list/asset_list)
- . = FALSE
- var/list/legacy_assets = list()
- if (!islist(asset_list))
- asset_list = list(asset_list)
- for (var/asset_name in asset_list)
- var/datum/asset_cache_item/ACI = asset_list[asset_name]
- if (!istype(ACI))
- ACI = SSassets.cache[asset_name]
- if (!ACI)
- legacy_assets += asset_name //pass it on to base send_assets so it can output an error
- continue
- if (ACI.legacy)
- legacy_assets[asset_name] = ACI
- if (length(legacy_assets))
- . = ..(client, legacy_assets)
-
-
-/// webroot slow asset sending - does nothing.
-/datum/asset_transport/webroot/send_assets_slow(client/client, list/files, filerate)
- return FALSE
-
-/datum/asset_transport/webroot/validate_config(log = TRUE)
- if (!CONFIG_GET(string/asset_cdn_url))
- if (log)
- log_asset("ERROR: [type]: Invalid Config: ASSET_CDN_URL")
- return FALSE
- if (!CONFIG_GET(string/asset_cdn_webroot))
- if (log)
- log_asset("ERROR: [type]: Invalid Config: ASSET_CDN_WEBROOT")
- return FALSE
- return TRUE
diff --git a/code/modules/asset_cache/validate_assets.html b/code/modules/asset_cache/validate_assets.html
deleted file mode 100644
index 0338f9514ce2..000000000000
--- a/code/modules/asset_cache/validate_assets.html
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/code/modules/atmospherics/machinery/_atmospherics_helpers.dm b/code/modules/atmospherics/machinery/_atmospherics_helpers.dm
index 4f4fbdb81ba9..7943f831e68d 100644
--- a/code/modules/atmospherics/machinery/_atmospherics_helpers.dm
+++ b/code/modules/atmospherics/machinery/_atmospherics_helpers.dm
@@ -425,3 +425,28 @@
if(connect_types & CONNECT_TYPE_HE)
dat += "HE"
return dat.Join("|")
+
+//Generalized gas pumping proc.
+//Moves gas from one gas_mixture to another and returns the amount of power needed (assuming 1 second), or -1 if no gas was pumped.
+//transfer_moles - Limits the amount of moles to transfer. The actual amount of gas moved may also be limited by available_power, if given.
+//available_power - the maximum amount of power that may be used when moving gas. If null then the transfer is not limited by power.
+/proc/pump_heat(target_temp, datum/gas_mixture/source, datum/gas_mixture/sink, available_power = null)
+ var/efficiency = get_thermal_efficiency(target_temp, source, sink)
+ CACHE_VSC_PROP(atmos_vsc, /atmos/heatpump/performance_factor, performance_factor)
+
+ var/actual_performance_factor = performance_factor*efficiency
+
+ var/max_energy_transfer = actual_performance_factor*available_power
+
+ if(abs(sink.temperature - target_temp) < 0.001) // don't want wild swings and too much power use
+ return
+ //only adds the energy actually removed from air one to air two(- infront of air1 because energy was removed)
+ var/energy_transfered = -source.adjust_thermal_energy(-clamp(sink.get_thermal_energy_change(target_temp),-max_energy_transfer,max_energy_transfer))
+ energy_transfered=abs(sink.adjust_thermal_energy(energy_transfered))
+ return abs(energy_transfered/actual_performance_factor)
+
+/proc/get_thermal_efficiency(target_temp, datum/gas_mixture/source, datum/gas_mixture/sink)
+ if((target_temp < sink.temperature))
+ return clamp((sink.temperature / source.temperature), 0, 1)
+ else if((target_temp > sink.temperature))
+ return clamp((source.temperature / sink.temperature), 0, 1)
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/heat_pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/heat_pump.dm
index c82a1c20ac79..a391234ada30 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/heat_pump.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/heat_pump.dm
@@ -1,9 +1,6 @@
/***
* Heat pumps, binary devices that pump heat between both ends
*/
-#define EFFICIENCY_MULT 1
-#define EFFICIENCY_LIMIT_MULT 1
-
/obj/machinery/atmospherics/component/binary/heat_pump
name = "heat pump"
desc = "A heat pump, used to transfer heat between two pipe systems."
@@ -139,24 +136,9 @@
if((air1.temperature < 1) || (air2.temperature < 1))
return
- //Now we are at the point where we need to actively pump
- efficiency = get_thermal_efficiency()
- CACHE_VSC_PROP(atmos_vsc, /atmos/heatpump/performance_factor, performance_factor)
-
- var/actual_performance_factor = performance_factor*efficiency
-
- var/max_energy_transfer = actual_performance_factor*power_rating
-
- var/datum/gas_mixture/sample_air = air2
- if(length(network2.line_members)==1)
- sample_air=network2.line_members[1].air
+ efficiency = get_thermal_efficiency(target_temp, air1, air2)
+ var/power_draw = pump_heat(target_temp, air1, air2, power_rating)
- if(abs(sample_air.temperature - target_temp) < 0.001) // don't want wild swings and too much power use
- return
- //only adds the energy actually removed from air one to air two(- infront of air1 because energy was removed)
- var/energy_transfered = -air1.adjust_thermal_energy(-clamp(sample_air.get_thermal_energy_change(target_temp),-max_energy_transfer,max_energy_transfer))
- energy_transfered=abs(air2.adjust_thermal_energy(energy_transfered))
- var/power_draw = abs(energy_transfered/actual_performance_factor)
if (power_draw >= 0)
last_power_draw_legacy = power_draw
use_power(power_draw)
@@ -165,12 +147,6 @@
if(network2)
network2.update = 1
-/obj/machinery/atmospherics/component/binary/heat_pump/proc/get_thermal_efficiency()
- if((target_temp < air2.temperature))
- return clamp((air2.temperature / air1.temperature) * EFFICIENCY_MULT, 0, 1 * EFFICIENCY_LIMIT_MULT)
- else if((target_temp > air2.temperature))
- return clamp((air1.temperature / air2.temperature) * EFFICIENCY_MULT, 0, 1 * EFFICIENCY_LIMIT_MULT)
-
/obj/machinery/atmospherics/component/binary/heat_pump/proc/handle_passive_flow()
var/air_heat_capacity = air1.heat_capacity()
var/other_air_heat_capacity = air2.heat_capacity()
@@ -229,7 +205,3 @@
. = TRUE
if(.)
target_temp = max(newValue,lowest_temp)
-
-
-#undef EFFICIENCY_MULT
-#undef EFFICIENCY_LIMIT_MULT
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/massive_heat_pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/massive_heat_pump.dm
index 78d367089246..6704cfe860e7 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/massive_heat_pump.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/massive_heat_pump.dm
@@ -81,16 +81,10 @@
if((air1.temperature < 1) || (air2.temperature < 1))
return
- var/power_draw = -1
- //Now we are at the point where we need to actively pump
- efficiency = get_thermal_efficiency()
- var/energy_transfered = 0
- CACHE_VSC_PROP(atmos_vsc, /atmos/heatpump/performance_factor, performance_factor)
-
- energy_transfered = clamp(air2.get_thermal_energy_change(target_temp),performance_factor*power_rating,-performance_factor*power_rating)
- power_draw = abs(energy_transfered/performance_factor)
- air2.adjust_thermal_energy(-air1.adjust_thermal_energy(-energy_transfered*efficiency))//only adds the energy actually removed from air one to air two(- infront of air1 because energy was removed)
+ //Now we are at the point where we need to actively pump
+ efficiency = get_thermal_efficiency(target_temp, air1, air2)
+ var/power_draw = pump_heat(target_temp, air1, air2, power_rating)
if (power_draw >= 0)
last_power_draw_legacy = power_draw
@@ -104,12 +98,6 @@
return 1
-/obj/machinery/atmospherics/component/binary/massive_heat_pump/proc/get_thermal_efficiency()
- if((target_temp < air2.temperature))
- return clamp((air2.temperature / air1.temperature) * EFFICIENCY_MULT, 0, 1 * EFFICIENCY_LIMIT_MULT)
- else if((target_temp > air2.temperature))
- return clamp((air1.temperature / air2.temperature) * EFFICIENCY_MULT, 0, 1 * EFFICIENCY_LIMIT_MULT)
-
/obj/machinery/atmospherics/component/binary/massive_heat_pump/proc/handle_passive_flow()
var/air_heat_capacity = air1.heat_capacity()
var/other_air_heat_capacity = air2.heat_capacity()
diff --git a/code/modules/atmospherics/machinery/components/unary/env_heat_pump.dm b/code/modules/atmospherics/machinery/components/unary/env_heat_pump.dm
index 464ae92e3270..357985acec34 100644
--- a/code/modules/atmospherics/machinery/components/unary/env_heat_pump.dm
+++ b/code/modules/atmospherics/machinery/components/unary/env_heat_pump.dm
@@ -74,32 +74,13 @@
env_temp = env.temperature
//Now we are at the point where we need to actively pump
- var/efficiency = get_thermal_efficiency(air_contents, env) * efficiency_multiplier
- CACHE_VSC_PROP(atmos_vsc, /atmos/heatpump/performance_factor, performance_factor)
+ var/power_draw = pump_heat(target_temp, air_contents, env, power_rating)
- var/actual_performance_factor = performance_factor*efficiency
-
- var/max_energy_transfer = actual_performance_factor*power_rating
-
- if(abs(env.temperature - target_temp) < 0.001) // don't want wild swings and too much power use
- use_power = USE_POWER_IDLE //We cant operate so we might as well turn off
- return
- //only adds the energy actually removed from air one to air two(- infront of air_contents because energy was removed)
- var/energy_transfered = -air_contents.adjust_thermal_energy(-clamp(env.get_thermal_energy_change(target_temp),-max_energy_transfer,max_energy_transfer))
- energy_transfered=abs(env.adjust_thermal_energy(energy_transfered))
- var/power_draw = abs(energy_transfered/actual_performance_factor)
if (power_draw >= 0)
last_power_draw_legacy = power_draw
use_power(power_draw)
network?.update = 1
-/obj/machinery/atmospherics/component/unary/env_heat_pump/proc/get_thermal_efficiency(var/datum/gas_mixture/air1, var/datum/gas_mixture/air2)
- if((target_temp < air2.temperature))
- return clamp((air2.temperature / air1.temperature), 0, 1)
- else if((target_temp > air2.temperature))
- return clamp((air1.temperature / air2.temperature), 0, 1)
-
-
/obj/machinery/atmospherics/component/unary/env_heat_pump/receive_signal(datum/signal/signal, receive_method, receive_param)
if(machine_stat & (NOPOWER|BROKEN))
return
diff --git a/code/modules/atmospherics/machinery/components/unary/heat_exchanger.dm b/code/modules/atmospherics/machinery/components/unary/heat_exchanger.dm
index e21a782c5cb7..5b0b62bdf6a3 100644
--- a/code/modules/atmospherics/machinery/components/unary/heat_exchanger.dm
+++ b/code/modules/atmospherics/machinery/components/unary/heat_exchanger.dm
@@ -4,7 +4,7 @@
icon = 'icons/obj/atmospherics/heat_exchanger.dmi'
icon_state = "intact"
pipe_state = "heunary"
- density = FALSE
+ density = TRUE
var/obj/machinery/atmospherics/component/unary/heat_exchanger/partner = null
var/update_cycle
diff --git a/code/modules/atmospherics/machinery/components/unary/vent_scrubber.dm b/code/modules/atmospherics/machinery/components/unary/vent_scrubber.dm
index ba665cace6f7..0b39402a8f48 100644
--- a/code/modules/atmospherics/machinery/components/unary/vent_scrubber.dm
+++ b/code/modules/atmospherics/machinery/components/unary/vent_scrubber.dm
@@ -62,6 +62,14 @@
var/radio_filter_out
var/radio_filter_in
+/obj/machinery/atmospherics/component/unary/vent_scrubber/high_power
+ name = "High power air scrubber"
+ power_rating = 15000
+ scrub_volume = 5000
+ expanded_power = 15000
+ expanded_scrub = 5000
+ scrub_boost = 100
+
/obj/machinery/atmospherics/component/unary/vent_scrubber/Initialize(mapload)
. = ..()
if(isnull(siphoning))
diff --git a/code/modules/bodysets/organic/akula.dm b/code/modules/bodysets/organic/akula.dm
new file mode 100644
index 000000000000..5502069cb1c9
--- /dev/null
+++ b/code/modules/bodysets/organic/akula.dm
@@ -0,0 +1,9 @@
+//* This file is explicitly licensed under the MIT license. *//
+//* Copyright (c) 2024 silicons *//
+
+/datum/sprite_accessory/tail/bodyset/akula
+ name = "akula tail"
+ id = "tail-bodyset-akula"
+ icon = 'icons/mob/bodysets/organic/akula/sprite_accessories.dmi'
+ icon_state = "tail"
+ do_colouration = FALSE
diff --git a/code/modules/bodysets/organic/apidean.dm b/code/modules/bodysets/organic/apidean.dm
new file mode 100644
index 000000000000..dbb72dcdb823
--- /dev/null
+++ b/code/modules/bodysets/organic/apidean.dm
@@ -0,0 +1,9 @@
+//* This file is explicitly licensed under the MIT license. *//
+//* Copyright (c) 2024 silicons *//
+
+/datum/sprite_accessory/tail/bodyset/apidean
+ name = "apidean tail"
+ id = "tail-bodyset-apidean"
+ icon = 'icons/mob/bodysets/organic/apidean/sprite_accessories.dmi'
+ icon_state = "tail"
+ do_colouration = FALSE
diff --git a/code/modules/bodysets/organic/krisitik.dm b/code/modules/bodysets/organic/krisitik.dm
new file mode 100644
index 000000000000..2732f48d9fd9
--- /dev/null
+++ b/code/modules/bodysets/organic/krisitik.dm
@@ -0,0 +1,9 @@
+//* This file is explicitly licensed under the MIT license. *//
+//* Copyright (c) 2024 silicons *//
+
+/datum/sprite_accessory/tail/bodyset/krisitik
+ name = "krisitik tail"
+ id = "tail-bodyset-krisitik"
+ icon = 'icons/mob/bodysets/organic/krisitik/sprite_accessories.dmi'
+ icon_state = "tail"
+ do_colouration = FALSE
diff --git a/code/modules/bodysets/organic/monkey.dm b/code/modules/bodysets/organic/monkey.dm
new file mode 100644
index 000000000000..0ce6dd0dc755
--- /dev/null
+++ b/code/modules/bodysets/organic/monkey.dm
@@ -0,0 +1,26 @@
+//* This file is explicitly licensed under the MIT license. *//
+//* Copyright (c) 2024 silicons *//
+
+/datum/sprite_accessory/tail/bodyset/monkey
+ abstract_type = /datum/sprite_accessory/tail/bodyset/monkey
+
+/datum/sprite_accessory/tail/bodyset/monkey/chimp
+ name = "chimpanzee tail"
+ id = "tail-bodyset-chimp"
+ icon = 'icons/mob/bodysets/organic/monkey/sprite_accessories.dmi'
+ icon_state = "tail-chimp"
+ do_colouration = FALSE
+
+/datum/sprite_accessory/tail/bodyset/monkey/stok
+ name = "stok tail"
+ id = "tail-bodyset-stok"
+ icon = 'icons/mob/bodysets/organic/monkey/sprite_accessories.dmi'
+ icon_state = "tail-stok"
+ do_colouration = FALSE
+
+/datum/sprite_accessory/tail/bodyset/monkey/farwa
+ name = "farwa tail"
+ id = "tail-bodyset-farwa"
+ icon = 'icons/mob/bodysets/organic/monkey/sprite_accessories.dmi'
+ icon_state = "tail-farwa"
+ do_colouration = FALSE
diff --git a/code/modules/bodysets/organic/moth.dm b/code/modules/bodysets/organic/moth.dm
new file mode 100644
index 000000000000..11a895fa6341
--- /dev/null
+++ b/code/modules/bodysets/organic/moth.dm
@@ -0,0 +1,16 @@
+//* This file is explicitly licensed under the MIT license. *//
+//* Copyright (c) 2024 silicons *//
+
+/datum/sprite_accessory/wing/bodyset/moth
+ name = "moth wings"
+ id = "wings-bodyset-moth"
+ icon = 'icons/mob/bodysets/organic/moth/sprite_accessories_64x32.dmi'
+ icon_state = "wings"
+ do_colouration = FALSE
+
+/datum/sprite_accessory/ears/bodyset/moth
+ name = "moth fluff & antenna"
+ id = "ears-bodyset-moth"
+ icon = 'icons/mob/bodysets/organic/moth/sprite_accessories.dmi'
+ icon_state = "antenna"
+ do_colouration = FALSE
diff --git a/code/modules/bodysets/organic/naramadi.dm b/code/modules/bodysets/organic/naramadi.dm
new file mode 100644
index 000000000000..cfdee0fe16fc
--- /dev/null
+++ b/code/modules/bodysets/organic/naramadi.dm
@@ -0,0 +1,9 @@
+//* This file is explicitly licensed under the MIT license. *//
+//* Copyright (c) 2024 silicons *//
+
+/datum/sprite_accessory/tail/bodyset/naramadi
+ name = "naramadi tail"
+ icon = 'icons/mob/bodysets/organic/naramadi/sprite_accessories.dmi'
+ icon_state = "tail"
+ id = "tail-bodyset-naramadi"
+ do_colouration = TRUE
diff --git a/code/modules/bodysets/organic/nevrean.dm b/code/modules/bodysets/organic/nevrean.dm
new file mode 100644
index 000000000000..1618a60cf251
--- /dev/null
+++ b/code/modules/bodysets/organic/nevrean.dm
@@ -0,0 +1,9 @@
+//* This file is explicitly licensed under the MIT license. *//
+//* Copyright (c) 2024 silicons *//
+
+/datum/sprite_accessory/tail/bodyset/nevrean
+ name = "nevrean tail"
+ icon = 'icons/mob/bodysets/organic/nevrean/sprite_accessories.dmi'
+ icon_state = "tail"
+ id = "tail-bodyset-nevrean"
+ do_colouration = TRUE
diff --git a/code/modules/bodysets/organic/rapala.dm b/code/modules/bodysets/organic/rapala.dm
new file mode 100644
index 000000000000..df41456b9f76
--- /dev/null
+++ b/code/modules/bodysets/organic/rapala.dm
@@ -0,0 +1,9 @@
+//* This file is explicitly licensed under the MIT license. *//
+//* Copyright (c) 2024 silicons *//
+
+/datum/sprite_accessory/tail/bodyset/rapala
+ name = "rapala tail"
+ icon = 'icons/mob/bodysets/organic/rapala/sprite_accessories.dmi'
+ icon_state = "tail"
+ id = "tail-bodyset-rapala"
+ do_colouration = TRUE
diff --git a/code/modules/bodysets/organic/shadekin.dm b/code/modules/bodysets/organic/shadekin.dm
new file mode 100644
index 000000000000..3203e71c3f31
--- /dev/null
+++ b/code/modules/bodysets/organic/shadekin.dm
@@ -0,0 +1,9 @@
+//* This file is explicitly licensed under the MIT license. *//
+//* Copyright (c) 2024 silicons *//
+
+/datum/sprite_accessory/tail/bodyset/shadekin
+ name = "shadekin tail"
+ icon = 'icons/mob/bodysets/organic/shadekin/sprite_accessories.dmi'
+ icon_state = "tail"
+ id = "tail-bodyset-shadekin"
+ do_colouration = TRUE
diff --git a/code/modules/bodysets/organic/tajaran.dm b/code/modules/bodysets/organic/tajaran.dm
new file mode 100644
index 000000000000..82551aa04635
--- /dev/null
+++ b/code/modules/bodysets/organic/tajaran.dm
@@ -0,0 +1,12 @@
+//* This file is explicitly licensed under the MIT license. *//
+//* Copyright (c) 2024 silicons *//
+
+/datum/sprite_accessory/tail/bodyset/tajaran
+ name = "tajaran tail"
+ icon = 'icons/mob/bodysets/organic/tajaran/sprite_accessories.dmi'
+ icon_state = "tail"
+ variations = list(
+ SPRITE_ACCESSORY_VARIATION_WAGGING = "tail-wag",
+ )
+ id = "tail-bodyset-tajaran"
+ do_colouration = TRUE
diff --git a/code/modules/bodysets/organic/teshari.dm b/code/modules/bodysets/organic/teshari.dm
new file mode 100644
index 000000000000..4879075fd10f
--- /dev/null
+++ b/code/modules/bodysets/organic/teshari.dm
@@ -0,0 +1,19 @@
+//* This file is explicitly licensed under the MIT license. *//
+//* Copyright (c) 2024 silicons *//
+
+/datum/sprite_accessory/tail/bodyset/teshari
+ name = "teshari tail"
+ icon = 'icons/mob/bodysets/organic/teshari/sprite_accessories.dmi'
+ icon_state = "tail"
+ id = "tail-bodyset-teshari"
+ do_colouration = TRUE
+
+/datum/sprite_accessory/tail/bodyset/teshari/render(mob/for_whom, list/colors, layer_front, layer_behind, layer_side, with_base_state, with_variation, flattened)
+ var/list/image/layers = ..()
+ for(var/image/built as anything in layers)
+ var/image/hair = image(icon, "tail-hair")
+ if(ishuman(for_whom))
+ var/mob/living/carbon/human/casted = for_whom
+ hair.color = rgb(casted.r_hair, casted.g_hair, casted.b_hair)
+ built.overlays += hair
+ return layers
diff --git a/code/modules/bodysets/organic/unathi.dm b/code/modules/bodysets/organic/unathi.dm
new file mode 100644
index 000000000000..a6376f58ca01
--- /dev/null
+++ b/code/modules/bodysets/organic/unathi.dm
@@ -0,0 +1,12 @@
+//* This file is explicitly licensed under the MIT license. *//
+//* Copyright (c) 2024 silicons *//
+
+/datum/sprite_accessory/tail/bodyset/unathi
+ name = "unathi tail"
+ icon = 'icons/mob/bodysets/organic/unathi/sprite_accessories.dmi'
+ icon_state = "tail"
+ variations = list(
+ SPRITE_ACCESSORY_VARIATION_WAGGING = "tail-wag",
+ )
+ id = "tail-bodyset-unathi"
+ do_colouration = TRUE
diff --git a/code/modules/bodysets/organic/vasilissan.dm b/code/modules/bodysets/organic/vasilissan.dm
new file mode 100644
index 000000000000..eac8eb089e9f
--- /dev/null
+++ b/code/modules/bodysets/organic/vasilissan.dm
@@ -0,0 +1,9 @@
+//* This file is explicitly licensed under the MIT license. *//
+//* Copyright (c) 2024 silicons *//
+
+/datum/sprite_accessory/tail/bodyset/vasilissan
+ name = "vasilissan tail"
+ icon = 'icons/mob/bodysets/organic/vasilissan/sprite_accessories.dmi'
+ icon_state = "tail"
+ do_colouration = TRUE
+ id = "tail-bodyset-vasilissan"
diff --git a/code/modules/bodysets/organic/vulpkanin.dm b/code/modules/bodysets/organic/vulpkanin.dm
new file mode 100644
index 000000000000..a7dce7edd7cc
--- /dev/null
+++ b/code/modules/bodysets/organic/vulpkanin.dm
@@ -0,0 +1,12 @@
+//* This file is explicitly licensed under the MIT license. *//
+//* Copyright (c) 2024 silicons *//
+
+/datum/sprite_accessory/tail/bodyset/vulpkanin
+ name = "vulpkanin tail"
+ icon = 'icons/mob/bodysets/organic/vulpkanin/sprite_accessories.dmi'
+ icon_state = "tail"
+ variations = list(
+ SPRITE_ACCESSORY_VARIATION_WAGGING = "tail-wag",
+ )
+ do_colouration = TRUE
+ id = "tail-bodyset-vulpkanin"
diff --git a/code/modules/bodysets/organic/xenohybrid.dm b/code/modules/bodysets/organic/xenohybrid.dm
new file mode 100644
index 000000000000..f7e63211c01c
--- /dev/null
+++ b/code/modules/bodysets/organic/xenohybrid.dm
@@ -0,0 +1,12 @@
+//* This file is explicitly licensed under the MIT license. *//
+//* Copyright (c) 2024 silicons *//
+
+/datum/sprite_accessory/tail/bodyset/xenohybrid
+ name = "xenohybrid tail"
+ icon = 'icons/mob/bodysets/organic/xenohybrid/sprite_accessories.dmi'
+ icon_state = "tail"
+ variations = list(
+ SPRITE_ACCESSORY_VARIATION_WAGGING = "tail-wag",
+ )
+ do_colouration = TRUE
+ id = "tail-bodyset-xenohybrid"
diff --git a/code/modules/bodysets/organic/xenomorph.dm b/code/modules/bodysets/organic/xenomorph.dm
new file mode 100644
index 000000000000..a545b5d7cb03
--- /dev/null
+++ b/code/modules/bodysets/organic/xenomorph.dm
@@ -0,0 +1,33 @@
+//* This file is explicitly licensed under the MIT license. *//
+//* Copyright (c) 2024 silicons *//
+
+/datum/sprite_accessory/tail/bodyset/xenomorph
+ abstract_type = /datum/sprite_accessory/tail/bodyset/xenomorph
+
+/datum/sprite_accessory/tail/bodyset/xenomorph/hunter
+ name = "xenomorph hunter tail"
+ icon = 'icons/mob/bodysets/organic/xenomorph/sprite_accessories.dmi'
+ icon_state = "tail-hunter"
+ do_colouration = FALSE
+ id = "tail-bodyset-xenomorph-hunter"
+
+/datum/sprite_accessory/tail/bodyset/xenomorph/drone
+ name = "xenomorph drone tail"
+ icon = 'icons/mob/bodysets/organic/xenomorph/sprite_accessories.dmi'
+ icon_state = "tail-drone"
+ do_colouration = FALSE
+ id = "tail-bodyset-xenomorph-drone"
+
+/datum/sprite_accessory/tail/bodyset/xenomorph/queen
+ name = "xenomorph queen tail"
+ icon = 'icons/mob/bodysets/organic/xenomorph/sprite_accessories.dmi'
+ icon_state = "tail-queen"
+ do_colouration = FALSE
+ id = "tail-bodyset-xenomorph-queen"
+
+/datum/sprite_accessory/tail/bodyset/xenomorph/sentinel
+ name = "xenomorph sentinel tail"
+ icon = 'icons/mob/bodysets/organic/xenomorph/sprite_accessories.dmi'
+ icon_state = "tail-sentinel"
+ do_colouration = FALSE
+ id = "tail-bodyset-xenomorph-sentinel"
diff --git a/code/modules/bodysets/organic/zorren_flatlander.dm b/code/modules/bodysets/organic/zorren_flatlander.dm
new file mode 100644
index 000000000000..6a8149cbce32
--- /dev/null
+++ b/code/modules/bodysets/organic/zorren_flatlander.dm
@@ -0,0 +1,9 @@
+//* This file is explicitly licensed under the MIT license. *//
+//* Copyright (c) 2024 silicons *//
+
+/datum/sprite_accessory/tail/bodyset/zorren_flatlander
+ name = "zorren_flatlander tail"
+ icon = 'icons/mob/bodysets/organic/zorren_flatlander/sprite_accessories.dmi'
+ icon_state = "tail"
+ id = "tail-bodyset-zorren-flatlander"
+ do_colouration = TRUE
diff --git a/code/modules/bodysets/organic/zorren_highlander.dm b/code/modules/bodysets/organic/zorren_highlander.dm
new file mode 100644
index 000000000000..5edd304a2a15
--- /dev/null
+++ b/code/modules/bodysets/organic/zorren_highlander.dm
@@ -0,0 +1,9 @@
+//* This file is explicitly licensed under the MIT license. *//
+//* Copyright (c) 2024 silicons *//
+
+/datum/sprite_accessory/tail/bodyset/zorren_highlander
+ name = "zorren_highlander tail"
+ icon = 'icons/mob/bodysets/organic/zorren_highlander/sprite_accessories.dmi'
+ icon_state = "tail"
+ id = "tail-bodyset-zorren-highlander"
+ do_colouration = TRUE
diff --git a/code/modules/bodysets/sprite_accessories.dm b/code/modules/bodysets/sprite_accessories.dm
new file mode 100644
index 000000000000..b582c9a545b4
--- /dev/null
+++ b/code/modules/bodysets/sprite_accessories.dm
@@ -0,0 +1,22 @@
+//* This file is explicitly licensed under the MIT license. *//
+//* Copyright (c) 2024 silicons *//
+
+/datum/sprite_accessory/hair/bodyset
+ abstract_type = /datum/sprite_accessory/hair/bodyset
+ selectable = FALSE
+
+/datum/sprite_accessory/facial_hair/bodyset
+ abstract_type = /datum/sprite_accessory/facial_hair/bodyset
+ selectable = FALSE
+
+/datum/sprite_accessory/ears/bodyset
+ abstract_type = /datum/sprite_accessory/ears/bodyset
+ selectable = FALSE
+
+/datum/sprite_accessory/tail/bodyset
+ abstract_type = /datum/sprite_accessory/tail/bodyset
+ selectable = FALSE
+
+/datum/sprite_accessory/wing/bodyset
+ abstract_type = /datum/sprite_accessory/wing/bodyset
+ selectable = FALSE
diff --git a/code/modules/bodysets/synthetic/eggnerd.dm b/code/modules/bodysets/synthetic/eggnerd.dm
new file mode 100644
index 000000000000..c98ff6193935
--- /dev/null
+++ b/code/modules/bodysets/synthetic/eggnerd.dm
@@ -0,0 +1,9 @@
+//* This file is explicitly licensed under the MIT license. *//
+//* Copyright (c) 2024 silicons *//
+
+/datum/sprite_accessory/tail/bodyset/eggnerd
+ name = "eggnerd synthetic tail"
+ icon = 'icons/mob/bodysets/synthetic/eggnerd/sprite_accessories.dmi'
+ icon_state = "tail"
+ do_colouration = FALSE
+ id = "tail-bodyset-eggnerd"
diff --git a/code/modules/bodysets/synthetic/eggnerd_red.dm b/code/modules/bodysets/synthetic/eggnerd_red.dm
new file mode 100644
index 000000000000..dc33d369a0b5
--- /dev/null
+++ b/code/modules/bodysets/synthetic/eggnerd_red.dm
@@ -0,0 +1,9 @@
+//* This file is explicitly licensed under the MIT license. *//
+//* Copyright (c) 2024 silicons *//
+
+/datum/sprite_accessory/tail/bodyset/eggnerd_red
+ name = "eggnerd (red) synthetic tail"
+ icon = 'icons/mob/bodysets/synthetic/eggnerd_red/sprite_accessories.dmi'
+ icon_state = "tail"
+ do_colouration = FALSE
+ id = "tail-bodyset-eggnerd_red"
diff --git a/code/modules/bodysets/synthetic/oss_akula.dm b/code/modules/bodysets/synthetic/oss_akula.dm
new file mode 100644
index 000000000000..e3ab5bee7048
--- /dev/null
+++ b/code/modules/bodysets/synthetic/oss_akula.dm
@@ -0,0 +1,9 @@
+//* This file is explicitly licensed under the MIT license. *//
+//* Copyright (c) 2024 silicons *//
+
+/datum/sprite_accessory/tail/bodyset/oss_akula
+ name = "OSS synthetic akula tail"
+ icon = 'icons/mob/bodysets/synthetic/oss_akula/sprite_accessories.dmi'
+ icon_state = "tail"
+ do_colouration = TRUE
+ id = "tail-bodyset-oss_akula"
diff --git a/code/modules/bodysets/synthetic/oss_lizard.dm b/code/modules/bodysets/synthetic/oss_lizard.dm
new file mode 100644
index 000000000000..47eb81ee9c97
--- /dev/null
+++ b/code/modules/bodysets/synthetic/oss_lizard.dm
@@ -0,0 +1,9 @@
+//* This file is explicitly licensed under the MIT license. *//
+//* Copyright (c) 2024 silicons *//
+
+/datum/sprite_accessory/tail/bodyset/oss_lizard
+ name = "OSS synthetic lizard tail"
+ icon = 'icons/mob/bodysets/synthetic/oss_lizard/sprite_accessories.dmi'
+ icon_state = "tail"
+ do_colouration = TRUE
+ id = "tail-bodyset-oss_lizard"
diff --git a/code/modules/bodysets/synthetic/oss_naramadi.dm b/code/modules/bodysets/synthetic/oss_naramadi.dm
new file mode 100644
index 000000000000..a35e29042bf8
--- /dev/null
+++ b/code/modules/bodysets/synthetic/oss_naramadi.dm
@@ -0,0 +1,9 @@
+//* This file is explicitly licensed under the MIT license. *//
+//* Copyright (c) 2024 silicons *//
+
+/datum/sprite_accessory/tail/bodyset/oss_naramadi
+ name = "OSS synthetic naramadi tail"
+ icon = 'icons/mob/bodysets/synthetic/oss_naramadi/sprite_accessories.dmi'
+ icon_state = "tail"
+ do_colouration = TRUE
+ id = "tail-bodyset-oss_naramadi"
diff --git a/code/modules/bodysets/synthetic/oss_nevrean.dm b/code/modules/bodysets/synthetic/oss_nevrean.dm
new file mode 100644
index 000000000000..108beb0f0075
--- /dev/null
+++ b/code/modules/bodysets/synthetic/oss_nevrean.dm
@@ -0,0 +1,9 @@
+//* This file is explicitly licensed under the MIT license. *//
+//* Copyright (c) 2024 silicons *//
+
+/datum/sprite_accessory/tail/bodyset/oss_nevrean
+ name = "OSS synthetic nevrean tail"
+ icon = 'icons/mob/bodysets/synthetic/oss_nevrean/sprite_accessories.dmi'
+ icon_state = "tail"
+ do_colouration = TRUE
+ id = "tail-bodyset-oss_nevrean"
diff --git a/code/modules/bodysets/synthetic/oss_spider.dm b/code/modules/bodysets/synthetic/oss_spider.dm
new file mode 100644
index 000000000000..3ef5d1fdb36c
--- /dev/null
+++ b/code/modules/bodysets/synthetic/oss_spider.dm
@@ -0,0 +1,9 @@
+//* This file is explicitly licensed under the MIT license. *//
+//* Copyright (c) 2024 silicons *//
+
+/datum/sprite_accessory/tail/bodyset/oss_spider
+ name = "OSS synthetic spider tail"
+ icon = 'icons/mob/bodysets/synthetic/oss_spider/sprite_accessories.dmi'
+ icon_state = "tail"
+ do_colouration = TRUE
+ id = "tail-bodyset-oss_spider"
diff --git a/code/modules/bodysets/synthetic/oss_tajaran.dm b/code/modules/bodysets/synthetic/oss_tajaran.dm
new file mode 100644
index 000000000000..3b1202302113
--- /dev/null
+++ b/code/modules/bodysets/synthetic/oss_tajaran.dm
@@ -0,0 +1,9 @@
+//* This file is explicitly licensed under the MIT license. *//
+//* Copyright (c) 2024 silicons *//
+
+/datum/sprite_accessory/tail/bodyset/oss_tajaran
+ name = "OSS synthetic tajaran tail"
+ icon = 'icons/mob/bodysets/synthetic/oss_tajaran/sprite_accessories.dmi'
+ icon_state = "tail"
+ do_colouration = TRUE
+ id = "tail-bodyset-oss_tajaran"
diff --git a/code/modules/bodysets/synthetic/oss_vulpkanin.dm b/code/modules/bodysets/synthetic/oss_vulpkanin.dm
new file mode 100644
index 000000000000..4387887c58b8
--- /dev/null
+++ b/code/modules/bodysets/synthetic/oss_vulpkanin.dm
@@ -0,0 +1,9 @@
+//* This file is explicitly licensed under the MIT license. *//
+//* Copyright (c) 2024 silicons *//
+
+/datum/sprite_accessory/tail/bodyset/oss_vulpkanin
+ name = "OSS synthetic vulpkanin tail"
+ icon = 'icons/mob/bodysets/synthetic/oss_vulpkanin/sprite_accessories.dmi'
+ icon_state = "tail"
+ do_colouration = TRUE
+ id = "tail-bodyset-oss_vulpkanin"
diff --git a/code/modules/cargo/supplypacks/engineering.dm b/code/modules/cargo/supplypacks/engineering.dm
index eecdb6f29222..d5ebeb32a387 100644
--- a/code/modules/cargo/supplypacks/engineering.dm
+++ b/code/modules/cargo/supplypacks/engineering.dm
@@ -78,7 +78,7 @@
/datum/supply_pack/eng/solar
name = "Solar Pack crate"
contains = list(
- /obj/item/solar_assembly = 21,
+ /obj/item/frame2/solar_panel = 21,
/obj/item/circuitboard/solar_control,
/obj/item/tracker_electronics,
/obj/item/paper/solar
diff --git a/code/modules/client/client.dm b/code/modules/client/client.dm
index 3e753a8add94..1c00546b4427 100644
--- a/code/modules/client/client.dm
+++ b/code/modules/client/client.dm
@@ -56,6 +56,10 @@
/// open context menu
var/datum/radial_menu/context_menu/context_menu
+ //* HUDs *//
+ /// active atom HUD providers associated to a list of ids or paths of atom huds that's providing it.
+ var/list/datum/atom_hud_provider/atom_hud_providers
+
//? Rendering
/// Click catcher
var/atom/movable/screen/click_catcher/click_catcher
@@ -187,8 +191,6 @@
////////////////////////////////////
//things that require the database//
////////////////////////////////////
- ///Track hours of leave accured for each department.
- var/list/department_hours = list()
preload_rsc = PRELOAD_RSC
@@ -202,14 +204,6 @@
///Used for limiting the rate of clicks sends by the client to avoid abuse
var/list/clicklimiter
- ///List of all asset filenames sent to this client by the asset cache, along with their assoicated md5s
- var/list/sent_assets = list()
- ///List of all completed blocking send jobs awaiting acknowledgement by send_asset
- var/list/completed_asset_jobs = list()
- ///Last asset send job id.
- var/last_asset_job = 0
- var/last_completed_asset_job = 0
-
///world.time they connected
var/connection_time
///world.realtime they connected
@@ -233,6 +227,9 @@
return TRUE
return ..()
+
+//* Is-rank helpers *//
+
/**
* are we a guest account?
*/
@@ -250,3 +247,49 @@
*/
/client/proc/is_staff()
return !isnull(holder)
+
+//* Atom HUDs *//
+
+/client/proc/add_atom_hud(datum/atom_hud/hud, source)
+ ASSERT(istext(source))
+ if(isnull(atom_hud_providers))
+ atom_hud_providers = list()
+ var/list/datum/atom_hud_provider/providers = hud.resolve_providers()
+ for(var/datum/atom_hud_provider/provider as anything in providers)
+ var/already_there = atom_hud_providers[provider]
+ if(already_there)
+ atom_hud_providers[provider] |= source
+ else
+ atom_hud_providers[provider] = list(source)
+ provider.add_client(src)
+
+/client/proc/remove_atom_hud(datum/atom_hud/hud, source)
+ ASSERT(istext(source))
+ if(!length(atom_hud_providers))
+ return
+ if(!hud)
+ // remove all of source
+ for(var/datum/atom_hud_provider/provider as anything in atom_hud_providers)
+ if(!(source in atom_hud_providers[provider]))
+ continue
+ atom_hud_providers[provider] -= source
+ if(!length(atom_hud_providers[provider]))
+ atom_hud_providers -= provider
+ provider.remove_client(src)
+ return
+ hud = fetch_atom_hud(hud)
+ var/list/datum/atom_hud_provider/providers = hud.resolve_providers()
+ for(var/datum/atom_hud_provider/provider as anything in providers)
+ if(!length(atom_hud_providers[provider]))
+ continue
+ atom_hud_providers[provider] -= source
+ if(!length(atom_hud_providers[provider]))
+ atom_hud_providers -= provider
+ provider.remove_client(src)
+
+// todo: add_atom_hud_provider, remove_atom_hud_provider
+
+/client/proc/clear_atom_hud_providers()
+ for(var/datum/atom_hud_provider/provider as anything in atom_hud_providers)
+ provider.remove_client(src)
+ atom_hud_providers = null
diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index 15e8c0243c7c..66e132b7e2e7 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -12,6 +12,25 @@
#define CURRENT_MINUTE 3
#define MINUTE_COUNT 4
#define ADMINSWARNED_AT 5
+
+/**
+ * A 'hijack' / intercept proc.
+ * Override this and return TRUE if you handled it.
+ * This allows for clients to not have an overloaded Topic().
+ *
+ * The downside is additional overhead is generated due to the proc call overheads.
+ *
+ * * Logging & topic spam prevention is ran before this proc.
+ *
+ * @params
+ * * raw_href - the raw ?querystring that's sent by the client
+ * * href_list - the decoded, key-value query sent by client
+ * * raw_src - the raw src resolved by BYOND.
+ */
+/client/proc/on_topic_hook(raw_href, list/href_list, raw_src)
+ return FALSE
+
+
/*
When somebody clicks a link in game, this Topic is called first.
It does the stuff in this proc and then is redirected to the Topic() proc for the src=[0xWhatever]
@@ -32,13 +51,6 @@
if(!usr || usr != mob) //stops us calling Topic for somebody else's client. Also helps prevent usr=null
return
- // asset_cache
- var/asset_cache_job
- if(href_list["asset_cache_confirm_arrival"])
- asset_cache_job = asset_cache_confirm_arrival(href_list["asset_cache_confirm_arrival"])
- if (!asset_cache_job)
- return
-
// Rate limiting
var/mtl = config_legacy.minute_topic_limit //CONFIG_GET(number/minute_topic_limit)
if (!holder && mtl)
@@ -72,7 +84,6 @@
to_chat(src, "Your previous action was ignored because you've done too many in a second")
return
-
// Tgui Topic middleware
if(tgui_topic(href_list))
if(CONFIG_GET(flag/emergency_tgui_logging))
@@ -84,20 +95,15 @@
// Log
log_href("[src] (usr:[usr]\[[COORD(usr)]\]) : [hsrc ? "[hsrc] " : ""][href]")
+ // Run normal hooks.
+ if(on_topic_hook(href, href_list, hsrc))
+ return
+
// Route statpanel
if(href_list["statpanel"])
_statpanel_act(href_list["statpanel"], href_list)
return
- //byond bug ID:2256651
- if (asset_cache_job && (asset_cache_job in completed_asset_jobs))
- to_chat(src, "An error has been detected in how your client is receiving resources. Attempting to correct.... (If you keep seeing these messages you might want to close byond and reconnect)")
- src << browse("...", "window=asset_cache_browser")
- return
- if (href_list["asset_cache_preload_data"])
- asset_cache_preload_data(href_list["asset_cache_preload_data"])
- return
-
//Admin PM
if(href_list["priv_msg"])
var/client/C = locate(href_list["priv_msg"])
@@ -202,8 +208,6 @@
player.log_connect()
//* Resolve preferences
preferences = SSpreferences.resolve_game_preferences(key, ckey)
- preferences.active = src
- preferences.on_reconnect()
//? WARNING: SHITCODE ALERT ?//
// We allow a client/New sleep because preferences is currently required for
// everything else to work
@@ -212,16 +216,24 @@
security_kick("A fatal error occurred while attempting to load: preferences not initialized. Please notify a coder.")
stack_trace("we just kicked a client due to prefs not loading; something is horribly wrong!")
return
+ // we wait until it inits to do this
+ // todo: is there a better way this is kind of awful
+ preferences.active = src
+ preferences.on_reconnect()
//? END ?//
//* Setup user interface
// todo: move top level menu here, for now it has to be under prefs.
// Instantiate statpanel
- addtimer(CALLBACK(src, PROC_REF(statpanel_boot)), 0)
+ spawn(1)
+ statpanel_boot()
// Instantiate tgui panel
tgui_panel = new(src, "browseroutput")
// Instantiate cutscene system
- addtimer(CALLBACK(src, PROC_REF(init_cutscene_system)), 0)
+ spawn(1)
+ init_cutscene_system()
+ // instantiate tooltips
+ tooltips = new(src)
//* Setup admin tooling
GLOB.ahelp_tickets.ClientLogin(src)
@@ -278,8 +290,6 @@
//* therefore, DO NOT PUT ANYTHING YOU WILL RELY ON LATER IN THIS PROC IN LOGIN!
. = ..() //calls mob.Login()
- handle_legacy_connection_whatevers()
-
//* Connection Security
// start caching it immediately
INVOKE_ASYNC(SSipintel, TYPE_PROC_REF(/datum/controller/subsystem/ipintel, vpn_connection_check), address, ckey)
@@ -347,8 +357,8 @@
// if(config_legacy.aggressive_changelog)
// changelog_async()
- // ensure asset cache is there
- INVOKE_ASYNC(src, PROC_REF(warn_if_no_asset_cache_browser))
+ // run post-init 'lint'-like checks
+ on_new_hook_stability_checks()
// todo: fuck you voreprefs
prefs_vr = new /datum/vore_preferences(src)
@@ -370,6 +380,17 @@
// update our hub label
SSserver_maint.UpdateHubStatus()
+/**
+ * Called in the middle of new, after everything critical
+ * is loaded / initialized.
+ *
+ * This proc should all be async; it is where you hook to ensure things are properly
+ * loaded.
+ */
+/client/proc/on_new_hook_stability_checks()
+ SHOULD_CALL_PARENT(TRUE)
+ SHOULD_NOT_SLEEP(TRUE)
+
//////////////
//DISCONNECT//
//////////////
@@ -415,10 +436,12 @@
active_mousedown_item = null
SSping.currentrun -= src
- //* cleanup mob-side stuff
+ //* cleanup rendering
// clear perspective
if(using_perspective)
set_perspective(null)
+ // clear HUDs
+ clear_atom_hud_providers()
//* cleanup UI
// cleanup statbrowser
@@ -427,6 +450,8 @@
cleanup_cutscene_system()
// cleanup tgui panel
QDEL_NULL(tgui_panel)
+ // cleanup tooltips
+ QDEL_NULL(tooltips)
. = ..() //Even though we're going to be hard deleted there are still some things that want to know the destroy is happening
return QDEL_HINT_HARDDEL_NOW
@@ -545,6 +570,7 @@ GLOBAL_VAR_INIT(log_clicks, FALSE)
//send resources to the client. It's here in its own proc so we can move it around easiliy if need be
/client/proc/send_resources()
+ // force them to download rsc's from configured paths if needed
#if (PRELOAD_RSC == 0)
var/static/next_external_rsc = 0
var/list/external_rsc_urls = CONFIG_GET(keyed_list/external_rsc_urls)
@@ -553,22 +579,8 @@ GLOBAL_VAR_INIT(log_clicks, FALSE)
preload_rsc = external_rsc_urls[next_external_rsc]
#endif
- spawn (10) //removing this spawn causes all clients to not get verbs.
-
- //load info on what assets the client has
- src << browse('code/modules/asset_cache/validate_assets.html', "window=asset_cache_browser")
-
- //Precache the client with all other assets slowly, so as to not block other browse() calls
- if (CONFIG_GET(flag/asset_simple_preload))
- addtimer(CALLBACK(SSassets.transport, TYPE_PROC_REF(/datum/asset_transport, send_assets_slow), src, SSassets.transport.preload), 5 SECONDS)
-/* // We don't have vox_sounds atm
- #if (PRELOAD_RSC == 0)
- for (var/name in GLOB.vox_sounds)
- var/file = GLOB.vox_sounds[name]
- Export("##action=load_rsc", file)
- stoplag()
- #endif
-*/
+ INVOKE_ASYNC(SSassets, TYPE_PROC_REF(/datum/controller/subsystem/assets, preload_client_assets), src)
+
//Hook, override it to run code when dir changes
//Like for /atoms, but clients are their own snowflake FUCK
/client/proc/setDir(newdir)
diff --git a/code/modules/client/legacy.dm b/code/modules/client/legacy.dm
deleted file mode 100644
index 0a5de4780511..000000000000
--- a/code/modules/client/legacy.dm
+++ /dev/null
@@ -1,15 +0,0 @@
-/client/proc/handle_legacy_connection_whatevers()
- if(is_guest())
- return
-
- // Department Hours
- if(config_legacy.time_off)
- var/datum/db_query/query_hours = SSdbcore.RunQuery(
- "SELECT department, hours FROM [format_table_name("vr_player_hours")] WHERE ckey = :ckey",
- list(
- "ckey" = ckey
- )
- )
- while(query_hours.NextRow())
- LAZYINITLIST(department_hours)
- department_hours[query_hours.item[1]] = text2num(query_hours.item[2])
diff --git a/code/modules/clothing/accessories/halo.dm b/code/modules/clothing/accessories/halo.dm
index 926a95291bcb..28646511a0b0 100644
--- a/code/modules/clothing/accessories/halo.dm
+++ b/code/modules/clothing/accessories/halo.dm
@@ -40,7 +40,7 @@
SIGNAL_HANDLER
update_worn_icon()
-/obj/item/clothing/accessory/halo_projector/render_apply_custom(mob/M, mutable_appearance/MA, bodytype, inhands, datum/inventory_slot_meta/slot_meta, icon_used, align_y)
+/obj/item/clothing/accessory/halo_projector/render_apply_custom(mob/M, mutable_appearance/MA, bodytype, inhands, datum/inventory_slot/slot_meta, icon_used, align_y)
. = ..()
if(inhands)
return
@@ -54,7 +54,7 @@
MA.pixel_y -= align_y
MA.transform = tform
-/obj/item/clothing/accessory/halo_projector/render_additional(mob/M, icon/icon_used, state_used, layer_used, dim_x, dim_y, align_y, bodytype, inhands, datum/inventory_slot_meta/slot_meta)
+/obj/item/clothing/accessory/halo_projector/render_additional(mob/M, icon/icon_used, state_used, layer_used, dim_x, dim_y, align_y, bodytype, inhands, datum/inventory_slot/slot_meta)
. = ..()
if(inhands)
return
diff --git a/code/modules/clothing/clothing_accessories.dm b/code/modules/clothing/clothing_accessories.dm
index cab51c659379..40fc520530b5 100644
--- a/code/modules/clothing/clothing_accessories.dm
+++ b/code/modules/clothing/clothing_accessories.dm
@@ -97,7 +97,7 @@
for(var/obj/item/I as anything in accessories)
I.dropped(user, flags | INV_OP_IS_ACCESSORY, newLoc)
-/obj/item/clothing/render_additional(mob/M, icon/icon_used, state_used, layer_used, dim_x, dim_y, align_y, bodytype, inhands, datum/inventory_slot_meta/slot_meta)
+/obj/item/clothing/render_additional(mob/M, icon/icon_used, state_used, layer_used, dim_x, dim_y, align_y, bodytype, inhands, datum/inventory_slot/slot_meta)
. = ..()
var/list/accessory_overlays = render_worn_accessories(M, inhands, slot_meta, layer_used, bodytype)
if(!isnull(accessory_overlays))
@@ -112,7 +112,7 @@
* * slot_meta - slot
* * bodytype - bodytype
*/
-/obj/item/clothing/proc/render_worn_accessories(mob/M, inhands, datum/inventory_slot_meta/slot_meta, layer_used, bodytype)
+/obj/item/clothing/proc/render_worn_accessories(mob/M, inhands, datum/inventory_slot/slot_meta, layer_used, bodytype)
RETURN_TYPE(/list)
if(!length(accessories))
return
@@ -144,16 +144,16 @@
/**
* Renders mob appearance for us as an accessory. Returns an image, or list of images.
*/
-/obj/item/clothing/proc/render_accessory_worn(mob/M, inhands, datum/inventory_slot_meta/slot_meta, layer_used, bodytype)
+/obj/item/clothing/proc/render_accessory_worn(mob/M, inhands, datum/inventory_slot/slot_meta, layer_used, bodytype)
if(accessory_render_legacy)
var/mutable_appearance/old
if(istype(src, /obj/item/clothing/accessory))
var/obj/item/clothing/accessory/A = src
old = A.get_mob_overlay()
if(!isnull(old) && old.plane == FLOAT_PLANE)
- old.layer = layer_used + BODY_LAYER + 0.1
+ old.layer = layer_used + 0.1
return old
- var/list/mutable_appearance/rendered = render_mob_appearance(M, accessory_render_specific? resolve_inventory_slot_meta(/datum/inventory_slot_meta/abstract/use_one_for_accessory) : slot_meta, bodytype)
+ var/list/mutable_appearance/rendered = render_mob_appearance(M, accessory_render_specific? resolve_inventory_slot(/datum/inventory_slot/abstract/use_one_for_accessory) : slot_meta, bodytype)
// sigh, fixup
if(isnull(rendered))
@@ -164,7 +164,7 @@
for(var/mutable_appearance/MA in rendered)
// fixup layer, but only if it's attached to mob; this is shitcode but the auril players have snipers outside my house, i'll refactor this later.
if(MA.plane == FLOAT_PLANE)
- MA.layer = layer_used + BODY_LAYER + 0.1 // ughhh, need way to override later.
+ MA.layer = layer_used + 0.1 // ughhh, need way to override later.
// sigh, legacy shit
if(istype(accessory_host, /obj/item/clothing/suit))
var/obj/item/clothing/suit/S = accessory_host
diff --git a/code/modules/clothing/clothing_icons.dm b/code/modules/clothing/clothing_icons.dm
index 6dafb2857626..22f6df307432 100644
--- a/code/modules/clothing/clothing_icons.dm
+++ b/code/modules/clothing/clothing_icons.dm
@@ -1,4 +1,4 @@
-/obj/item/clothing/render_apply_blood(mutable_appearance/MA, bodytype, inhands, datum/inventory_slot_meta/slot_meta, icon_used)
+/obj/item/clothing/render_apply_blood(mutable_appearance/MA, bodytype, inhands, datum/inventory_slot/slot_meta, icon_used)
. = ..()
if(inhands)
return
@@ -9,7 +9,7 @@
MA.add_overlay(bloodsies)
//HELMET: May have a lighting overlay
-/obj/item/clothing/head/render_apply_overlays(mutable_appearance/MA, bodytype, inhands, datum/inventory_slot_meta/slot_meta, icon_used)
+/obj/item/clothing/head/render_apply_overlays(mutable_appearance/MA, bodytype, inhands, datum/inventory_slot/slot_meta, icon_used)
. = ..()
if(on && (slot_meta.id == SLOT_ID_HEAD))
var/bodytype_str = bodytype_to_string(bodytype)
@@ -18,7 +18,7 @@
MA.add_overlay(I)
//SUIT: Blood state is slightly different
-/obj/item/clothing/suit/render_apply_blood(mutable_appearance/MA, bodytype, inhands, datum/inventory_slot_meta/slot_meta, icon_used)
+/obj/item/clothing/suit/render_apply_blood(mutable_appearance/MA, bodytype, inhands, datum/inventory_slot/slot_meta, icon_used)
. = ..()
if(inhands)
return
diff --git a/code/modules/clothing/glasses/_glasses.dm b/code/modules/clothing/glasses/_glasses.dm
index 44e29ba1ec6c..155685319c68 100644
--- a/code/modules/clothing/glasses/_glasses.dm
+++ b/code/modules/clothing/glasses/_glasses.dm
@@ -524,7 +524,7 @@ BLIND // can't see anything
/obj/item/clothing/glasses/sunglasses/sechud/Initialize(mapload)
. = ..()
- AddElement(/datum/element/hud_granter, list(DATA_HUD_SECURITY_ADVANCED), list(SLOT_ID_GLASSES))
+ AddElement(/datum/element/hud_granter, list(/datum/atom_hud/data/human/security/advanced), list(SLOT_ID_GLASSES))
/obj/item/clothing/glasses/sunglasses/sechud/tactical
name = "tactical HUD"
@@ -582,7 +582,7 @@ BLIND // can't see anything
/obj/item/clothing/glasses/sunglasses/medhud/Initialize(mapload)
. = ..()
- AddElement(/datum/element/hud_granter, list(DATA_HUD_MEDICAL), list(SLOT_ID_GLASSES))
+ AddElement(/datum/element/hud_granter, list(/datum/atom_hud/data/human/medical), list(SLOT_ID_GLASSES))
/obj/item/clothing/glasses/thermal
name = "optical thermal scanner"
diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm
index 0c98a49321e3..da9152b45692 100644
--- a/code/modules/clothing/glasses/hud.dm
+++ b/code/modules/clothing/glasses/hud.dm
@@ -13,7 +13,7 @@
/obj/item/clothing/glasses/hud/health/Initialize(mapload)
. = ..()
- AddElement(/datum/element/hud_granter, list(DATA_HUD_MEDICAL), list(SLOT_ID_GLASSES))
+ AddElement(/datum/element/hud_granter, list(/datum/atom_hud/data/human/medical), list(SLOT_ID_GLASSES))
/obj/item/clothing/glasses/hud/health/prescription
name = "Prescription Health Scanner HUD"
@@ -31,7 +31,7 @@
/obj/item/clothing/glasses/hud/security/Initialize(mapload)
. = ..()
- AddElement(/datum/element/hud_granter, list(DATA_HUD_SECURITY_ADVANCED), list(SLOT_ID_GLASSES))
+ AddElement(/datum/element/hud_granter, list(/datum/atom_hud/data/human/security/advanced), list(SLOT_ID_GLASSES))
/obj/item/clothing/glasses/hud/security/prescription
name = "Prescription Security HUD"
@@ -66,7 +66,7 @@
/obj/item/clothing/glasses/omnihud/Initialize(mapload)
. = ..()
- AddElement(/datum/element/hud_granter, list(DATA_HUD_ID_JOB), list(SLOT_ID_GLASSES))
+ AddElement(/datum/element/hud_granter, list(/datum/atom_hud/data/human/job_id), list(SLOT_ID_GLASSES))
/obj/item/clothing/glasses/omnihud/Initialize(mapload)
. = ..()
@@ -144,7 +144,7 @@
/obj/item/clothing/glasses/omnihud/med/Initialize(mapload)
. = ..()
- AddElement(/datum/element/hud_granter, list(DATA_HUD_ID_JOB, DATA_HUD_MEDICAL), list(SLOT_ID_GLASSES))
+ AddElement(/datum/element/hud_granter, list(/datum/atom_hud/data/human/job_id, /datum/atom_hud/data/human/medical), list(SLOT_ID_GLASSES))
/obj/item/clothing/glasses/omnihud/med/ar_interact(var/mob/living/carbon/human/user)
if(tgarscreen)
@@ -163,7 +163,7 @@
/obj/item/clothing/glasses/omnihud/sec/Initialize(mapload)
. = ..()
- AddElement(/datum/element/hud_granter, list(DATA_HUD_SECURITY_ADVANCED), list(SLOT_ID_GLASSES))
+ AddElement(/datum/element/hud_granter, list(/datum/atom_hud/data/human/security/advanced), list(SLOT_ID_GLASSES))
/obj/item/clothing/glasses/omnihud/sec/ar_interact(var/mob/living/carbon/human/user)
if(arscreen)
@@ -262,7 +262,7 @@
/obj/item/clothing/glasses/omnihud/all/Initialize(mapload)
. = ..()
- AddElement(/datum/element/hud_granter, list(DATA_HUD_SECURITY_ADVANCED, DATA_HUD_MEDICAL), list(SLOT_ID_GLASSES))
+ AddElement(/datum/element/hud_granter, list(/datum/atom_hud/data/human/security/advanced, /datum/atom_hud/data/human/medical), list(SLOT_ID_GLASSES))
/obj/item/clothing/glasses/hud/security/eyepatch
name = "Security Hudpatch"
diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm
index f8acad27a13a..5d528f9f8ec8 100644
--- a/code/modules/clothing/gloves/miscellaneous.dm
+++ b/code/modules/clothing/gloves/miscellaneous.dm
@@ -65,6 +65,7 @@
fingerprint_chance = 25
drop_sound = 'sound/items/drop/rubber.ogg'
pickup_sound = 'sound/items/pickup/rubber.ogg'
+ materials_base = list(MAT_PLASTIC = 100)
// var/balloonPath = /obj/item/latexballon
//TODO: Make inflating gloves a thing
diff --git a/code/modules/clothing/masks/_mask.dm b/code/modules/clothing/masks/_mask.dm
index f897284e5bd8..8dfbc89a2d95 100644
--- a/code/modules/clothing/masks/_mask.dm
+++ b/code/modules/clothing/masks/_mask.dm
@@ -12,5 +12,14 @@
var/list/say_messages
var/list/say_verbs
-/obj/item/clothing/mask/proc/filter_air(datum/gas_mixture/air)
+// gets one gas_mixture
+// that mixture is modified (and then used for breathing)
+// additionally removed gases can be returned to be passed to atmos
+/obj/item/clothing/mask/proc/process_air(datum/gas_mixture/air)
return
+
+//gets one gas_mixture (the exhale)
+//returns what should be passed to the environment
+/obj/item/clothing/mask/proc/process_exhale(datum/gas_mixture/air)
+ return
+
diff --git a/code/modules/clothing/masks/breath_warmer.dm b/code/modules/clothing/masks/breath_warmer.dm
new file mode 100644
index 000000000000..4b4c27f9bb7d
--- /dev/null
+++ b/code/modules/clothing/masks/breath_warmer.dm
@@ -0,0 +1,18 @@
+/obj/item/clothing/mask/warmer
+ name = "warming mask"
+ desc = "A mask that warms your breath, making the cold more bearable."
+ icon = 'icons/obj/clothing/ties.dmi'
+ icon_state = "gaiter_snow_up"
+ item_state_slots = list(SLOT_ID_RIGHT_HAND = "sterile", SLOT_ID_LEFT_HAND = "sterile")
+ w_class = WEIGHT_CLASS_SMALL
+ body_cover_flags = FACE
+ clothing_flags = FLEXIBLEMATERIAL
+
+//Warms with 1000 watts
+/obj/item/clothing/mask/warmer/process_air(datum/gas_mixture/air)
+ var/mob/living/carbon/wearer = src.loc
+ if(istype(wearer))
+ var/energy_to_warm = air.get_thermal_energy_change(wearer.bodytemperature)
+ air.adjust_thermal_energy(clamp(energy_to_warm, 0, 1000))
+
+
diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm
index 672a584a7648..05f1ea8c2a4b 100644
--- a/code/modules/clothing/masks/gasmask.dm
+++ b/code/modules/clothing/masks/gasmask.dm
@@ -14,7 +14,7 @@
var/gas_filter_strength = 1 //For gas mask filters
var/list/filtered_gases = list(GAS_ID_PHORON, GAS_ID_NITROUS_OXIDE)
-/obj/item/clothing/mask/gas/filter_air(datum/gas_mixture/air)
+/obj/item/clothing/mask/gas/process_air(datum/gas_mixture/air)
var/datum/gas_mixture/gas_filtered = new
for(var/g in filtered_gases)
diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm
index a2eb72240e5f..fa2f3fdbdd92 100644
--- a/code/modules/clothing/masks/miscellaneous.dm
+++ b/code/modules/clothing/masks/miscellaneous.dm
@@ -36,6 +36,7 @@
gas_transfer_coefficient = 0.90
permeability_coefficient = 0.01
armor_type = /datum/armor/mask/surgical
+ materials_base = list(MAT_PLASTIC = 100, MAT_WOOD = 20)
var/hanging = 0
/obj/item/clothing/mask/surgical/proc/adjust_mask(mob_user)
diff --git a/code/modules/clothing/suits/_suit.dm b/code/modules/clothing/suits/_suit.dm
index 621a3809bb3d..9bd314644efb 100644
--- a/code/modules/clothing/suits/_suit.dm
+++ b/code/modules/clothing/suits/_suit.dm
@@ -27,8 +27,8 @@
if(!taurized && slot == SLOT_ID_SUIT && ishuman(user))
var/mob/living/carbon/human/H = user
if(isTaurTail(H.tail_style))
- var/datum/sprite_accessory/tail/taur/taurtail = H.tail_style
- var/list/resolved = resolve_worn_assets(user, resolve_inventory_slot_meta(/datum/inventory_slot_meta/inventory/suit), FALSE, H.species.get_effective_bodytype(user, src, SLOT_ID_SUIT))
+ var/datum/sprite_accessory/tail/legacy_taur/taurtail = H.tail_style
+ var/list/resolved = resolve_worn_assets(user, resolve_inventory_slot(/datum/inventory_slot/inventory/suit), FALSE, H.species.get_effective_bodytype(user, src, SLOT_ID_SUIT))
if(taurtail.suit_sprites && (resolved[2] in icon_states(taurtail.suit_sprites)))
icon_override = taurtail.suit_sprites
normalize = FALSE
@@ -39,8 +39,8 @@
icon_override = initial(icon_override)
taurized = FALSE
-/obj/item/clothing/suit/render_apply_custom(mob/M, mutable_appearance/MA, bodytype, inhands, datum/inventory_slot_meta/slot_meta, icon_used, align_y)
+/obj/item/clothing/suit/render_apply_custom(mob/M, mutable_appearance/MA, bodytype, inhands, datum/inventory_slot/slot_meta, icon_used, align_y)
. = ..()
if(taurized)
MA.pixel_x = -16
- MA.layer = TAIL_LAYER + 1 // kick it over tail
+ MA.layer = HUMAN_LAYER_SPRITEACC_TAIL_FRONT + 1 // kick it over tail
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index 8fbd9cf8d92b..1b2129eb61c8 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -814,7 +814,7 @@
if(!.)
return FALSE
var/mob/living/carbon/human/H
- if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/wolf))
+ if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/legacy_taur/wolf))
return
else
to_chat(H,"You need to have a wolf-taur half to wear this.")
diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm
index 53c0abab1e92..e25c4624379e 100644
--- a/code/modules/clothing/suits/labcoat.dm
+++ b/code/modules/clothing/suits/labcoat.dm
@@ -115,7 +115,7 @@
/obj/item/clothing/suit/storage/toggle/labcoat/blue
name = "blue-edged labcoat"
desc = "A suit that protects against minor chemical spills. This one has blue trim."
- icon_state = "blue_edge_labcoat"
+ icon_state = "labcoat_gen"
/obj/item/clothing/suit/storage/toggle/labcoat/ossnecro
name = "OSS&NECRO Labcoat"
diff --git a/code/modules/clothing/under/_under.dm b/code/modules/clothing/under/_under.dm
index 092bf13f18dc..72aae1fd7516 100644
--- a/code/modules/clothing/under/_under.dm
+++ b/code/modules/clothing/under/_under.dm
@@ -151,7 +151,7 @@
//! Rendering
// todo : NUKE THIS SHIT FROM ORBIT ~silicons
//UNIFORM: Always appends "_s" to iconstate, stupidly.
-/obj/item/clothing/under/resolve_legacy_state(mob/M, datum/inventory_slot_meta/slot_meta, inhands, bodytype)
+/obj/item/clothing/under/resolve_legacy_state(mob/M, datum/inventory_slot/slot_meta, inhands, bodytype)
if(snowflake_worn_state && (slot_meta.id == SLOT_ID_UNIFORM))
return snowflake_worn_state + "_s"
return ..()
@@ -212,11 +212,11 @@
update_worn_icon()
/obj/item/clothing/under/proc/autodetect_rolldown(bodytype)
- var/datum/inventory_slot_meta/inventory/uniform/wow_this_sucks = resolve_inventory_slot_meta(SLOT_ID_UNIFORM)
+ var/datum/inventory_slot/inventory/uniform/wow_this_sucks = resolve_inventory_slot(SLOT_ID_UNIFORM)
return wow_this_sucks.check_rolldown_cache(bodytype, resolve_legacy_state(null, wow_this_sucks, FALSE, bodytype))
/obj/item/clothing/under/proc/autodetect_rollsleeve(bodytype)
- var/datum/inventory_slot_meta/inventory/uniform/wow_this_sucks = resolve_inventory_slot_meta(SLOT_ID_UNIFORM)
+ var/datum/inventory_slot/inventory/uniform/wow_this_sucks = resolve_inventory_slot(SLOT_ID_UNIFORM)
return wow_this_sucks.check_rollsleeve_cache(bodytype, resolve_legacy_state(null, wow_this_sucks, FALSE, bodytype))
//! Examine
diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm
index 88bd2fcfd6a2..bb7aa1ecff1b 100644
--- a/code/modules/clothing/under/accessories/accessory.dm
+++ b/code/modules/clothing/under/accessories/accessory.dm
@@ -406,6 +406,30 @@
name = "neck gaiter (gray)"
icon_state = "gaiter_gray"
+/obj/item/clothing/accessory/gaiter/green
+ name = "neck gaiter (green)"
+ icon_state = "gaiter_green"
+
+/obj/item/clothing/accessory/gaiter/blue
+ name = "neck gaiter (blue)"
+ icon_state = "gaiter_blue"
+
+/obj/item/clothing/accessory/gaiter/purple
+ name = "neck gaiter (purple)"
+ icon_state = "gaiter_purple"
+
+/obj/item/clothing/accessory/gaiter/orange
+ name = "neck gaiter (orange)"
+ icon_state = "gaiter_orange"
+
+/obj/item/clothing/accessory/gaiter/charcoal
+ name = "neck gaiter (charcoal)"
+ icon_state = "gaiter_charcoal"
+
+/obj/item/clothing/accessory/gaiter/snow
+ name = "neck gaiter (white)"
+ icon_state = "gaiter_snow"
+
/obj/item/clothing/accessory/halfcape
name = "half cape"
desc = "A tasteful half-cape, suitible for European nobles and retro anime protagonists."
diff --git a/code/modules/clothing/under/accessories/clothing.dm b/code/modules/clothing/under/accessories/clothing.dm
index bbfad157117a..06220e3b8476 100644
--- a/code/modules/clothing/under/accessories/clothing.dm
+++ b/code/modules/clothing/under/accessories/clothing.dm
@@ -553,6 +553,16 @@
desc = "A white long sweater with a modest string to keep the otherwise immodest front piece from falling off. Compatible with a variety of chest sizes. It seems like it's made of a soft material."
icon_state = "virgin_sweater"
+/obj/item/clothing/accessory/sweater/milk
+ name = "Mega Milk sweater (f)"
+ desc = "A white shirt with blue sleeves. The words 'Mega Milk' have been written in black around the chest area. The shirt itself is quite well-fitting, accentuating the curves, with additional material to fit the wearer's chest."
+ icon_state = "milk_sweater_f"
+
+/obj/item/clothing/accessory/sweater/milk/male
+ name = "Mega Milk sweater (m)"
+ desc = "A white shirt with blue sleeves. The words 'Mega Milk' have been written in black around the chest area. The shirt itself is quite well-fitting, accentuating the curves."
+ icon_state = "milk_sweater_m"
+
//***
// End of sweaters
//***
@@ -685,3 +695,51 @@
name = "antediluvian armband"
desc = "A small, fake blue gem placed neatly into an otherwise cloth armband with thin metal outlines."
icon_state = "ante_armband"
+
+// ranger ponchos
+
+/obj/item/clothing/accessory/poncho/roles/ranger
+ name = "red ranger poncho"
+ desc = "A rugged all-weather poncho, perfectly coloured to match a popular line of neck gaiters. You could probably use it as a tent in a pinch!"
+ icon_state = "rangerponcho_red"
+ item_state = "rangerponcho_red"
+
+/obj/item/clothing/accessory/poncho/roles/ranger/tan
+ name = "tan ranger poncho"
+ icon_state = "rangerponcho_tan"
+ item_state = "rangerponcho_tan"
+
+/obj/item/clothing/accessory/poncho/roles/ranger/gray
+ name = "gray ranger poncho"
+ icon_state = "rangerponcho_gray"
+ item_state = "rangerponcho_gray"
+
+/obj/item/clothing/accessory/poncho/roles/ranger/green
+ name = "green ranger poncho"
+ icon_state = "rangerponcho_green"
+ item_state = "rangerponcho_green"
+
+/obj/item/clothing/accessory/poncho/roles/ranger/blue
+ name = "blue ranger poncho"
+ icon_state = "rangerponcho_blue"
+ item_state = "rangerponcho_blue"
+
+/obj/item/clothing/accessory/poncho/roles/ranger/purple
+ name = "purple ranger poncho"
+ icon_state = "rangerponcho_purple"
+ item_state = "rangerponcho_purple"
+
+/obj/item/clothing/accessory/poncho/roles/ranger/orange
+ name = "orange ranger poncho"
+ icon_state = "rangerponcho_orange"
+ item_state = "rangerponcho_orange"
+
+/obj/item/clothing/accessory/poncho/roles/ranger/charcoal
+ name = "charcoal ranger poncho"
+ icon_state = "rangerponcho_charcoal"
+ item_state = "rangerponcho_charcoal"
+
+/obj/item/clothing/accessory/poncho/roles/ranger/snow
+ name = "white ranger poncho"
+ icon_state = "rangerponcho_snow"
+ item_state = "rangerponcho_snow"
diff --git a/code/modules/customitems/item_spawning.dm b/code/modules/customitems/item_spawning.dm
index 2b26a723ec91..7e863ee7afb5 100644
--- a/code/modules/customitems/item_spawning.dm
+++ b/code/modules/customitems/item_spawning.dm
@@ -232,7 +232,7 @@
if(M.equip_to_appropriate_slot(newitem, INV_OP_SILENT))
return newitem
- if(M.equip_to_slot_if_possible(newitem, /datum/inventory_slot_meta/abstract/put_in_storage, INV_OP_SILENT))
+ if(M.equip_to_slot_if_possible(newitem, /datum/inventory_slot/abstract/put_in_storage, INV_OP_SILENT))
return newitem
newitem.forceMove(M.drop_location())
diff --git a/code/modules/detectivework/tools/rag.dm b/code/modules/detectivework/tools/rag.dm
index 95562c440abc..4b2741e467bf 100644
--- a/code/modules/detectivework/tools/rag.dm
+++ b/code/modules/detectivework/tools/rag.dm
@@ -13,6 +13,22 @@
/obj/item/clothing/shoes/
var/track_blood = 0
+/obj/item/reagent_containers/glass/rag/sponge
+ name = "sponge"
+ desc = "Scrub scrub scrub!"
+ icon = 'icons/obj/sponge.dmi'
+ icon_state = "sponge"
+
+/obj/item/reagent_containers/glass/rag/sponge/update_icon()
+ if(on_fire)
+ icon_state = "spongelit"
+ else
+ icon_state = "sponge"
+
+ var/obj/item/reagent_containers/food/drinks/bottle/B = loc
+ if(istype(B))
+ B.update_icon()
+
/obj/item/reagent_containers/glass/rag
name = "rag"
desc = "For cleaning up messes, you suppose."
diff --git a/code/modules/emoji/emoji_parse.dm b/code/modules/emoji/emoji_parse.dm
index 5e47e31df08c..2fb8e63b2ce7 100644
--- a/code/modules/emoji/emoji_parse.dm
+++ b/code/modules/emoji/emoji_parse.dm
@@ -1,3 +1,4 @@
+// todo: redo this, it should be tgui-native
/proc/emoji_parse(text) //turns :ai: into an emoji in text.
. = text
if(!CONFIG_GET(flag/emojis))
@@ -15,7 +16,7 @@
if(search)
emoji = lowertext(copytext(text, pos + length(text[pos]), search))
var/isthisapath = (emoji[1] == "/") && text2path(emoji)
- var/datum/asset/spritesheet/sheet = get_asset_datum(/datum/asset/spritesheet/chat)
+ var/datum/asset_pack/spritesheet/sheet = SSassets.ready_asset_pack(/datum/asset_pack/spritesheet/chat)
var/tag = sheet.icon_tag("emoji-[emoji]")
if(tag)
parsed += SPAN_TOOLTIP(":[emoji]:", "[tag]") //evil way of enforcing 16x16
diff --git a/code/modules/fishing/equipment/catalog.dm b/code/modules/fishing/equipment/catalog.dm
index d8ce1d083f77..c74b95e220a6 100644
--- a/code/modules/fishing/equipment/catalog.dm
+++ b/code/modules/fishing/equipment/catalog.dm
@@ -104,7 +104,6 @@
.["traits"] = trait_descriptions
return .
-/obj/item/book/fish_catalog/ui_assets(mob/user)
- return list(
- get_asset_datum(/datum/asset/spritesheet/fish)
- )
+/obj/item/book/fish_catalog/ui_asset_injection(datum/tgui/ui, list/immediate, list/deferred)
+ immediate += /datum/asset_pack/spritesheet/fish
+ return ..()
diff --git a/code/modules/fishing/equipment/rod.dm b/code/modules/fishing/equipment/rod.dm
index 017c8a110f98..627f0e2a50bc 100644
--- a/code/modules/fishing/equipment/rod.dm
+++ b/code/modules/fishing/equipment/rod.dm
@@ -270,7 +270,7 @@
bait_state = real_bait.rod_overlay_icon_state
. += bait_state
-/obj/item/fishing_rod/render_apply_overlays(mutable_appearance/MA, bodytype, inhands, datum/inventory_slot_meta/slot_meta, icon_used)
+/obj/item/fishing_rod/render_apply_overlays(mutable_appearance/MA, bodytype, inhands, datum/inventory_slot/slot_meta, icon_used)
var/slot_key = slot_meta.render_key
var/line_color = line?.line_color || default_line_color
var/mutable_appearance/reel_overlay = mutable_appearance(icon_used, "reel_[slot_key]")
diff --git a/code/modules/fishing/fish_source.dm b/code/modules/fishing/fish_source.dm
index 5ec0e90a9e69..fb1451e3b761 100644
--- a/code/modules/fishing/fish_source.dm
+++ b/code/modules/fishing/fish_source.dm
@@ -31,7 +31,7 @@ GLOBAL_LIST_EMPTY(cached_fish_sources)
var/fishing_difficulty = FISHING_DEFAULT_DIFFICULTY
/// How the spot type is described in fish catalog section about fish sources, will be skipped if null
var/catalog_description
- /// Background image name from /datum/asset/simple/fishing_minigame
+ /// Background image name from /datum/asset_pack/simple/fishing_minigame
var/background = "fishing_background_default"
/// Can we fish in this spot at all. Returns DENIAL_REASON or null if we're good to go
diff --git a/code/modules/fishing/minigame/fishing_minigame.dm b/code/modules/fishing/minigame/fishing_minigame.dm
index 78a914fd5211..ddd907e6728b 100644
--- a/code/modules/fishing/minigame/fishing_minigame.dm
+++ b/code/modules/fishing/minigame/fishing_minigame.dm
@@ -30,7 +30,7 @@
var/obj/item/fishing_rod/used_rod
/// Lure visual
var/obj/effect/fishing_lure/lure
- /// Background image from /datum/asset/simple/fishing_minigame
+ /// Background image from /datum/asset_pack/simple/fishing_minigame
var/background = "default"
/// Max distance we can move from the spot
@@ -171,8 +171,9 @@
.["special_effects"] = special_effects
.["background_image"] = background
-/datum/fishing_challenge/ui_assets(mob/user)
- return list(get_asset_datum(/datum/asset/simple/fishing_minigame)) //preset screens
+/datum/fishing_challenge/ui_asset_injection(datum/tgui/ui, list/immediate, list/deferred)
+ immediate += /datum/asset_pack/simple/fishing_minigame
+ return ..()
/datum/fishing_challenge/ui_status(mob/user, datum/ui_state/state)
return min(
diff --git a/code/modules/frames/frame.dm b/code/modules/frames/frame.dm
new file mode 100644
index 000000000000..395c5beada8c
--- /dev/null
+++ b/code/modules/frames/frame.dm
@@ -0,0 +1,537 @@
+//* This file is explicitly licensed under the MIT license. *//
+//* Copyright (c) 2023 Citadel Station developers. *//
+
+GLOBAL_LIST_INIT(frame_datum_lookup, init_frame_datums())
+
+/proc/init_frame_datums()
+ var/list/constructed = list()
+ for(var/datum/frame2/frame_path as anything in subtypesof(/datum/frame2))
+ if(initial(frame_path.abstract_type) == frame_path)
+ continue
+ var/datum/frame2/made = new frame_path
+ constructed[frame_path] = made
+ return constructed
+
+/proc/fetch_frame_datum(datum/frame2/framelike)
+ if(istype(framelike))
+ else
+ framelike = GLOB.frame_datum_lookup[framelike]
+ return framelike
+
+/**
+ * arbitrary construction framework
+ *
+ * ### how state machines work here
+ *
+ * frames operate off two principles, and are effectively a state machine:
+ * * stage - *usually* linear, 1 to n. stepping back from 1 deconstructs the frame. stepping forwards from n finishes the frame.
+ * * context - arbitrary data storage list
+ *
+ * ### how construction/deconstruction stage lists works:
+ *
+ * * set 'key' = /datum/frame_stage typepath
+ * * you'll probably want anonymous types.
+ * * please see examples.
+ *
+ * ### special things about the stage list
+ * * if there are no stages, we immediately finish() with stage null with no context when someone tries to place the item/structure.
+ *
+ * ### special things in general
+ * * wall frames should face away from the wall. most wall machinery face **away** from the wall.
+ *
+ * todo: no support for multiple 'interact' stages yet
+ * todo: /datum/frame_context so it can hold entities / data inside (e.g. can drop stuff if needed)
+ * todo: similarly, we need a way to store items inserted as part of a step, maybe as a part of context? so it can be dropped later.
+ */
+/datum/frame2
+ /// frame name
+ var/name = "construction frame"
+ /// sheet metal cost
+ var/material_cost = 1
+ // todo: non-steel support
+ /// for future use: set to TRUE to allow all materials
+ var/material_unlocked = FALSE
+ /// can we be built?
+ var/material_buildable = TRUE
+
+ /// deconstructs into item frame, or materials?
+ var/deconstruct_into_item = TRUE
+ /// deconstruct: **if and only if** steps_backwards does not specify a first step,
+ /// default to this tool
+ var/deconstruct_default_tool = TOOL_WRENCH
+ /// default deconstruction time
+ var/deconstruct_default_time = 3 SECONDS
+ /// default deconstruction cost multiplier
+ var/deconstruct_default_cost = 1
+
+ /// construction stages
+ /// see /datum/frame2 readme (so up above in this file) for how to do this
+ var/list/stages = list()
+ /// stage that a new construct starts at
+ /// defaults to stages[1]
+ var/stage_starting
+
+ // todo: implement anchor shit.
+
+ /// is this frame freely un/anchorable?
+ var/freely_anchorable = FALSE
+ /// do we need to be anchored to finish? we will not allow progression past last stage if so.
+ var/requires_anchored_to_finish = TRUE
+ /// requires anchored to do anything
+ var/requires_anchored = TRUE
+ /// starts anchored; null = [requires_anchored]
+ var/starts_anchored
+ /// anchoring time
+ var/anchor_time = 2 SECONDS
+ /// anchoring tool
+ var/anchor_tool = TOOL_WRENCH
+
+ /// are we a dense frame object? if it's a wall mount, the answer should probably be no.
+ var/has_density = FALSE
+
+ /// check for all dense objects on turf if we're dense
+ var/check_turf_content_density_dynamic = TRUE
+ /// still check for any density
+ var/check_turf_content_density_always = TRUE
+ /// check for another frame of this type on turf
+ var/check_turf_frame_duplicate = TRUE
+ /// check for another frame of this class on turf
+ /// * wallframes in same direction
+ /// * other non-wall-frames
+ var/check_turf_frame_collision = TRUE
+
+ /// is this frame a wall-frame?
+ var/wall_frame = FALSE
+ /// does the wall frame.. require a wall? please put yes.
+ var/wall_frame_requires_wall = TRUE
+ /// default pixel x offset for wall-frames; positive if right, negative if left
+ /// can set to list of "[NORTH]" = number, as well.
+ var/wall_pixel_x = 16
+ /// default pixel y offset for wall-frames; positive if up, negative if down
+ /// can set to list of "[NORTH]" = number, as well.
+ var/wall_pixel_y = 16
+
+ /// are we climbable if we're dense?
+ var/climb_allowed = TRUE
+ /// climb delay
+ var/climb_delay = 2 SECONDS
+
+ /// our structure's depth, if not a wall mount
+ var/depth_level = 16
+ /// does our structure project depth?
+ var/depth_projected = TRUE
+
+ /// our icon
+ var/icon
+ /// do we append -stage to structure?
+ /// structure preview state will always be "structure"
+ var/has_structure_stage_states = FALSE
+ /// do we append -stage to items?
+ /// item preview state will always be "item"
+ // todo: currently unused given lack of support for storing state
+ // todo: in the future, we will want this. for now, everything is just 'item'.
+ var/has_item_stage_states = FALSE
+
+ /// weight class of item
+ var/item_weight_class = WEIGHT_CLASS_NORMAL
+ /// weight volume of item
+ var/item_weight_volume = WEIGHT_VOLUME_NORMAL
+ /// what tool, if any to deconstruct item into materials
+ var/item_recycle_tool
+ /// time to decon for tool as item
+ var/item_recycle_time = 0 SECONDS
+ /// cost mult to decon for tool as item
+ var/item_recycle_cost = 1
+ /// what tool, if any, to attempt to set us up in a location
+ var/item_deploy_tool = TOOL_WRENCH
+ /// is tool required for deployment?
+ var/item_deploy_requires_tool = FALSE
+ /// deployment time
+ var/item_deploy_time = 0 SECONDS
+ /// deployment tool cost multiplier
+ var/item_deploy_cost = 1
+
+/datum/frame2/New()
+ for(var/i in 1 to length(stages))
+ var/key = stages[i]
+ var/value = stages[key]
+ if(istype(key, /datum/frame_stage))
+ continue
+ else if(istext(key))
+ stages[key] = new value
+ if(isnull(stage_starting) && length(stages))
+ stage_starting = stages[1]
+
+/datum/frame2/proc/apply_to_frame(obj/structure/frame2/frame)
+ frame.set_density(has_density)
+ frame.icon = icon
+ frame.update_appearance()
+
+ if(wall_frame)
+ // wall frames face away from walls :/
+ if(islist(wall_pixel_y))
+ frame.set_base_pixel_x(wall_pixel_x["[frame.dir]"] || 0)
+ else
+ frame.set_base_pixel_x(frame.dir & EAST? -wall_pixel_x : (frame.dir & WEST? wall_pixel_x : 0))
+ if(islist(wall_pixel_y))
+ frame.set_base_pixel_y(wall_pixel_y["[frame.dir]"] || 0)
+ else
+ frame.set_base_pixel_y(frame.dir & NORTH? -wall_pixel_y : (frame.dir & SOUTH? wall_pixel_y : 0))
+ frame.climb_allowed = FALSE
+ frame.climb_delay = 0
+ frame.depth_level = 0
+ frame.depth_projected = FALSE
+ else
+ frame.climb_allowed = climb_allowed
+ frame.climb_delay = climb_delay
+ frame.depth_level = depth_level
+ frame.depth_projected = depth_projected
+
+/**
+ * @return finished product
+ */
+/datum/frame2/proc/finish_frame(obj/structure/frame2/frame, datum/event_args/actor/actor, destroy_structure = TRUE)
+ ASSERT(isturf(frame.loc))
+ . = instance_product(frame)
+ if(destroy_structure)
+ qdel(frame)
+
+/**
+ * todo: /instance_from_frame()? we certainly can't have this be on /Initialize level at /obj, which sucks.. oh well.
+ *
+ * @return finished product
+ */
+/datum/frame2/proc/instance_product(obj/structure/frame2/frame)
+ CRASH("abstract proc called.")
+
+/**
+ * makes frame structure from item
+ *
+ * @return /obj/structure/frame, **if** we have stages. If not, we just finish it immediately.
+ */
+/datum/frame2/proc/deploy_frame(obj/item/frame2/frame_item, datum/event_args/actor/actor, atom/location, dir, destroy_item = TRUE)
+ var/obj/structure/frame2/creating_frame = new(location, dir, src)
+ creating_frame.set_anchored(isnull(starts_anchored)? requires_anchored : starts_anchored)
+
+ if(destroy_item)
+ qdel(frame_item)
+
+ if(!length(stages))
+ return // return nothing
+ return creating_frame
+
+/**
+ * @params
+ * * frame - the frame
+ * * actor - the person doing it, if any
+ * * put_in_hand_if_possible - put in user's hand instead of put it on the floor if possible
+ * * override_slice_to_parts - if non null, TRUE = deconstruct(), FALSE = collapse to item
+ *
+ * @return frame item dropped, if any.
+ */
+/datum/frame2/proc/deconstruct_frame(obj/structure/frame2/frame, datum/event_args/actor/actor, put_in_hand_if_possible = TRUE, override_slice_to_parts)
+ var/breaking_to_parts = isnull(override_slice_to_parts)? !deconstruct_into_item : override_slice_to_parts
+ if(breaking_to_parts)
+ frame.deconstruct(ATOM_DECONSTRUCT_DISASSEMBLED)
+ else
+ var/obj/item/frame2/collapsed
+ if(actor?.performer && put_in_hand_if_possible)
+ collapsed = new(actor.performer, src)
+ actor.performer.put_in_hand_or_drop(collapsed)
+ else
+ collapsed = new(frame.drop_location(), src)
+ return collapsed
+
+/**
+ * @params
+ * * method - ATOM_DECONSTRUCT_* define
+ * * where - atom to drop stuff at
+ * * stage_key - stage id
+ * * context - context list
+ */
+/datum/frame2/proc/drop_deconstructed_products(method, atom/where, stage_key, list/context)
+ // todo: drop all other stored things from steps!!
+ new /obj/item/stack/material/steel(where, material_cost)
+
+/**
+ * always use this proc, it's guarded against race conditions.
+ *
+ * If trying to deconstruct or finish the frame, you *must* do:
+ * * FRAME_STAGE_DECONSTRUCT
+ * * FRAME_STAGE_FINISH
+ *
+ * @params
+ * * frame - the frame being operated on
+ * * from_stage - move from this stage; if current stage key doesn't match expected, we abort as it might be a race condition.
+ * * to_stage - move to this stage
+ * * actor - actor data
+ *
+ * @return TRUE / FALSE success / fail
+ */
+/datum/frame2/proc/move_frame_to(obj/structure/frame2/frame, from_stage, to_stage, datum/event_args/actor/actor)
+ if(frame.stage != from_stage)
+ return FALSE
+
+ var/not_obliterating = FALSE
+ switch(to_stage)
+ if(FRAME_STAGE_DECONSTRUCT)
+ if(FRAME_STAGE_FINISH)
+ else
+ if(isnull(stages[to_stage]))
+ // check your fucking inputs
+ CRASH("attempted to go to invalid stage!")
+ if(from_stage == to_stage)
+ // check your fucking inputs
+ CRASH("attempted to move from the same state to the same state. why?")
+ not_obliterating = TRUE
+
+ frame.stage = to_stage
+ on_frame_step(frame, from_stage, to_stage)
+
+ if(not_obliterating)
+ frame.update_appearance()
+
+ log_construction(actor, frame, "mov [from_stage] -> [to_stage]")
+
+ switch(to_stage)
+ if(FRAME_STAGE_DECONSTRUCT)
+ deconstruct_frame(frame, actor)
+ if(FRAME_STAGE_FINISH)
+ finish_frame(frame, actor)
+
+/**
+ * Called when we transition stage.
+ * * called before update_icon() / re-renders
+ * * called before deconstruction/finish
+ */
+/datum/frame2/proc/on_frame_step(obj/structure/frame2/frame, from_stage, to_stage)
+ return
+
+/datum/frame2/proc/on_examine(obj/structure/frame2/frame, datum/event_args/actor/actor, list/examine_list, distance)
+ var/datum/frame_stage/stage = stages[frame.stage]
+ examine_list += stage.on_examine(frame, actor, examine_list, distance)
+ examine_list += instruction_steps(frame, actor, distance)
+ examine_list += instruction_special(frame, actor, distance)
+
+/**
+ * @return string or list of strings
+ */
+/datum/frame2/proc/instruction_steps(obj/structure/frame2/frame, datum/event_args/actor/actor, distance)
+ var/datum/frame_stage/stage = stages[frame.stage]
+ if(isnull(stage))
+ return list()
+ var/list/datum/frame_step/steps = stage.steps
+ if(!length(steps))
+ return list()
+ . = list()
+ for(var/datum/frame_step/step as anything in steps)
+ . += step.examine(frame, actor)
+
+/**
+ * @return list(string, ...)
+ */
+/datum/frame2/proc/instruction_special(obj/structure/frame2/frame, datum/event_args/actor/actor, distance)
+ return list()
+
+/**
+ * @return TRUE if handled
+ */
+/datum/frame2/proc/on_item(obj/structure/frame2/frame, obj/item/item, datum/event_args/actor/actor)
+ // todo: support for multiple possible steps
+ var/datum/frame_step/step_to_take
+ var/datum/frame_stage/current_stage = stages[frame.stage]
+ for(var/datum/frame_step/potential_step as anything in current_stage.steps)
+ if(!potential_step.valid_interaction(actor, item, src, frame))
+ continue
+ step_to_take = potential_step
+ break
+ if(!step_to_take)
+ return FALSE
+ var/time_needed = step_to_take.time
+ . = TRUE
+ standard_progress_step(frame, actor, item, step_to_take, time_needed)
+
+/**
+ * @return TRUE if handled
+ */
+/datum/frame2/proc/on_tool(obj/structure/frame2/frame, obj/item/tool, datum/event_args/actor/actor, function, flags, hint)
+ var/datum/frame_step/step_to_take
+ var/datum/frame_stage/current_stage = stages[frame.stage]
+ for(var/datum/frame_step/potential_step as anything in current_stage.steps)
+ if(!potential_step.valid_interaction(actor, tool, src, frame))
+ continue
+ if(hint && (potential_step.name != hint))
+ continue
+ step_to_take = potential_step
+ break
+ if(isnull(step_to_take))
+ return FALSE
+ // tool speed is handled by use_tool
+ var/time_needed = step_to_take.time
+ return standard_progress_step(frame, actor, tool, step_to_take, time_needed)
+
+/**
+ * @return list
+ */
+/datum/frame2/proc/on_tool_query(obj/structure/frame2/frame, obj/item/tool, datum/event_args/actor/clickchain/click)
+ . = list()
+ var/datum/frame_stage/stage = stages[frame.stage]
+ for(var/datum/frame_step/step as anything in stage.steps)
+ if(step.request_type != FRAME_REQUEST_TYPE_TOOL)
+ continue
+ if(isnull(.[step.request]))
+ .[step.request] = list()
+ .[step.request][step.name || "yell at coders"] = step.tool_image()
+
+/**
+ * @return TRUE if handled
+ */
+/datum/frame2/proc/on_interact(obj/structure/frame2/frame, datum/event_args/actor/actor)
+ // todo: support for multiple possible steps
+ var/datum/frame_step/step_to_take
+ var/datum/frame_stage/current_stage = stages[frame.stage]
+ for(var/datum/frame_step/potential_step as anything in current_stage.steps)
+ if(!potential_step.valid_interaction(actor, null, src, frame))
+ continue
+ step_to_take = potential_step
+ break
+ if(isnull(step_to_take))
+ return FALSE
+ var/time_needed = step_to_take.time
+ return standard_progress_step(frame, actor, null, step_to_take, time_needed)
+
+/**
+ * handles the do after, item manipulation, logging, and whatnot
+ *
+ * @return TRUE / FALSE
+ */
+/datum/frame2/proc/standard_progress_step(obj/structure/frame2/frame, datum/event_args/actor/actor, obj/item/using_item, datum/frame_step/frame_step, time_needed)
+ var/stage_we_were_in = frame.stage
+ if(frame_step.stage == FRAME_STAGE_FINISH && !frame.anchored && requires_anchored_to_finish)
+ actor.chat_feedback(SPAN_WARNING("[frame] needs to be anchored to be finished."), frame)
+ return FALSE
+ if((isnull(frame_step.requires_anchored)? requires_anchored : frame_step.requires_anchored) && !frame.anchored)
+ var/rendered = frame_step.action_descriptor || "<[frame_step.name]>"
+ actor.chat_feedback(SPAN_WARNING("[frame] needs to be anchored in order for you to [rendered]."), frame)
+ return FALSE
+ if(!frame_step.check_consumption(actor, using_item, src, frame))
+ return FALSE
+ if(frame_step.stage == FRAME_STAGE_FINISH)
+ if(!completion_checks(frame, frame.loc, frame.dir, actor))
+ return FALSE
+ frame_step.feedback_begin(
+ actor,
+ src,
+ frame,
+ using_item,
+ time_needed,
+ )
+ if(!frame_step.perform_usage(actor, using_item, src, frame, time_needed))
+ return FALSE
+ if(frame.stage != stage_we_were_in)
+ return FALSE
+ if(!frame_step.handle_consumption(actor, using_item, src, frame))
+ return FALSE
+ if(frame_step.stage == FRAME_STAGE_FINISH)
+ if(!completion_checks(frame, frame.loc, frame.dir, actor))
+ return FALSE
+ frame_step.feedback_finish(
+ actor,
+ src,
+ frame,
+ using_item,
+ time_needed,
+ )
+ frame_step.on_finish(src, frame, actor, using_item)
+ move_frame_to(frame, stage_we_were_in, frame_step.stage, actor)
+ return TRUE
+
+/**
+ * ran only on deployment, not completion
+ * * also ran when anchoring a frame down
+ *
+ * regarding direction
+ * * is in direction of machine that will be built if non-wall
+ * * will be in the direction of the wall from the tile if wall
+ *
+ * @return TRUE / FALSE
+ */
+/datum/frame2/proc/deployment_checks(obj/item/frame2/frame, turf/location, dir, datum/event_args/actor/actor, silent)
+ if(wall_frame && wall_frame_requires_wall)
+ var/turf/checking = get_step(location, turn(dir, 180))
+ if(!checking.get_wallmount_anchor())
+ actor.chat_feedback(
+ SPAN_WARNING("[checking] isn't a valid anchor for this wall mount!"),
+ target = frame,
+ )
+ return FALSE
+ if((check_turf_content_density_dynamic && has_density) || check_turf_content_density_always)
+ for(var/obj/thing in location)
+ if(thing.density)
+ return FALSE
+ if(check_turf_frame_collision || check_turf_frame_duplicate)
+ for(var/obj/structure/frame2/other_frame in location)
+ if(other_frame.frame == src && check_turf_frame_duplicate)
+ return FALSE
+ if(!other_frame.frame.wall_frame)
+ if(!wall_frame)
+ return FALSE
+ else
+ if(other_frame.dir == frame.dir)
+ return FALSE
+ return valid_location(frame, location, dir, actor, silent)
+
+/**
+ * ran on deployment as well as completion
+ *
+ * @return FALSE if obstructed
+ */
+/datum/frame2/proc/completion_checks(obj/structure/frame2/frame, turf/location, dir, datum/event_args/actor/actor, silent)
+ return valid_location(location, dir, actor, silent)
+
+/**
+ * checks if we semantically should even be able to be built here at all;
+ * ran during both deployment and completion
+ *
+ * used for stuff like APCs rejecting areas that shouldn't be powerable/etc
+ *
+ * @params
+ * * entity - either the item or structure frame. this is generic, and is only really used for chat feedback object name purposes.
+ * * location - where it's being built/placed
+ * * dir - direction that it's being built/placed in
+ * * actor - (optional) person doing it
+ * * silent - don't emit chat feedback
+ */
+/datum/frame2/proc/valid_location(obj/entity, turf/location, dir, datum/event_args/actor/actor, silent)
+ return TRUE
+
+/**
+ * gets a list of managed overlays to apply to a frame
+ */
+/datum/frame2/proc/get_overlays(obj/structure/frame/frame)
+ return list()
+
+/**
+ * template action text
+ */
+/datum/frame2/proc/template_action_string(list/tokens, mob/performer, obj/structure/frame2/frame, obj/item/tool)
+ if(isnull(tokens))
+ return // null = null
+ // i wish this was typescript so i could just return tokens.map((t) => ...) :confounded:
+ // pov i'm losing my mcfucking mind
+ . = tokens.Copy()
+ for(var/i in 1 to length(.))
+ switch(.[i])
+ if(FRAME_TEXT_TOKEN_PERFORMER)
+ .[i] = "[performer]"
+ if(FRAME_TEXT_TOKEN_FRAME)
+ .[i] = "[frame]"
+ if(FRAME_TEXT_TOKEN_TOOL)
+ .[i] = "[tool]"
+ if(FRAME_TEXT_TOKEN_THEIR)
+ .[i] = "[performer.p_their()]"
+ if(FRAME_TEXT_TOKEN_THEM)
+ .[i] = "[performer.p_them()]"
+ if(FRAME_TEXT_TOKEN_THEYRE)
+ .[i] = "[performer.p_theyre()]"
+ return jointext(., "")
diff --git a/code/modules/frames/frame_stage.dm b/code/modules/frames/frame_stage.dm
new file mode 100644
index 000000000000..cc78fef7f2c3
--- /dev/null
+++ b/code/modules/frames/frame_stage.dm
@@ -0,0 +1,49 @@
+//* This file is explicitly licensed under the MIT license. *//
+//* Copyright (c) 2023 Citadel Station developers. *//
+
+/**
+ * a discrete stage in a construction frame
+ */
+/datum/frame_stage
+ /// name; for vv. defaults to key
+ var/name
+ /// key; autoset from key if associating via frames.
+ var/key
+ /// list of step datums
+ /// set to typepaths to init
+ /// anonymous typepaths are allowed and encouraged.
+ var/list/datum/frame_step/steps = list()
+ /// name prepend; if existing, will be prepended with a space
+ var/name_prepend
+ /// name append; if existing, will be appended with a space
+ /// * the (xyz) format e.g. "(wired)" is recommended, resulting in a render of "frame (wired)"
+ var/name_append
+ /// name override; if existing, will override base name (prepend/append are still used)
+ /// * the bare format e.g. "wired" is recommended, resulting in a render of "wired frame"
+ var/name_override
+ /// "the [name] [descriptor]" on examine
+ var/descriptor
+ /// default require anchor for steps; if null, default to frame
+ /// * this is for steps going from us, not steps going to us!
+ var/requires_anchored
+ /// allow unanchor while in this stage
+ /// if null, defaults to frame not being requires_anchored **or** us being the first stage.
+ var/allow_unanchor
+
+/datum/frame_stage/New(set_key)
+ if(!isnull(set_key))
+ key = set_key
+ if(isnull(name))
+ name = key
+ for(var/i in 1 to length(steps))
+ var/datum/frame_step/step_casted = steps[i]
+ if(istype(step_casted))
+ continue
+ var/datum/frame_step/creating = new step_casted
+ if(isnull(creating.requires_anchored))
+ creating.requires_anchored = src.requires_anchored
+ steps[i] = creating
+
+/datum/frame_stage/proc/on_examine(obj/structure/frame2/frame, datum/event_args/actor/actor, list/examine_list, distance)
+ if(descriptor)
+ examine_list += SPAN_NOTICE("[frame] [descriptor]")
diff --git a/code/modules/frames/frame_step.dm b/code/modules/frames/frame_step.dm
new file mode 100644
index 000000000000..b9d17192dc86
--- /dev/null
+++ b/code/modules/frames/frame_step.dm
@@ -0,0 +1,372 @@
+//* This file is explicitly licensed under the MIT license. *//
+//* Copyright (c) 2023 Citadel Station developers. *//
+
+/**
+ * a transition from one stage to another
+ */
+/datum/frame_step
+ /// step name for tool radials & more
+ var/name
+ /// "use a [whatever] on [frame] to [action_descriptor: "unscrew the panel"]"
+ var/action_descriptor
+ /// "you start [x -> 'unscrewing the panel on'][src] ..."
+ /// add a space after!
+ /// please don't put pronouns in this, it doesn't get interpolated properly.
+ var/action_text_leading
+ /// "you start ... [src][x -> ', removing the screws in the process.']"
+ /// don't forget punctuation at the end.
+ /// please don't put pronouns in this, it doesn't get interpolated properly.
+ var/action_text_trailing
+ /// stage key this moves us to
+ /// * [STAGE_DECONSTRUCT] to deconstruct
+ /// * [STAGE_FINISH] to finish
+ var/stage
+ /// direction: [TOOL_DIRECTION_FORWARDS] or [TOOL_DIRECTION_BACKWARDS] or [TOOL_DIRECTION_NEUTRAL]
+ /// * this is used as a hint for tool graphics
+ /// * this is used as a hint for other visual / textual feedback
+ var/direction = TOOL_DIRECTION_NEUTRAL
+
+ /// FRAME_REQUEST_TYPE_* define
+ var/request_type
+ /// ergo: stack type, item type, tool function, etc. what this is depends on [step_type]
+ /// limited autodetection is allowed.
+ var/request
+ /// * stacks: amount
+ /// * items: amount; if 0, we just apply the item to it
+ /// * rest: unused.
+ var/request_amount
+ /// * tools: this is cost
+ /// * rest: unused
+ var/request_cost
+
+ /// time needed to do this
+ /// note that for tool steps, this might impact the total cost!
+ var/time = 0 SECONDS
+
+ /// requires anchored; if null, defaults to stage.
+ var/requires_anchored
+
+ // todo: request_store: null for default, context key to store under context
+
+ /// what to drop when undertaking this step
+ /// can either be:
+ /// * /obj/item/stack typepath
+ /// * /datum/material typepath
+ /// * /obj/item typepath
+ /// todo: text for 'drop context key'
+ var/drop
+ /// amount to drop
+ var/drop_amount = 1
+
+ /// use custom text?
+ var/use_custom_feedback = FALSE
+ /// list of tokens to concat into a string to display when beginning the step.
+ /// will not be shown if the step is fast enough.
+ /// null for default.
+ ///
+ /// FRAME_TEXT_TOKEN_* defines are allowed, and will be automatically replaced during execution to the relevant text.
+ var/list/visible_text_begin
+ /// list of tokens to concat into a string to display when beginning the step.
+ /// will not be shown if the step is fast enough.
+ /// null for default.
+ ///
+ /// FRAME_TEXT_TOKEN_* defines are allowed, and will be automatically replaced during execution to the relevant text.
+ var/list/audible_text_begin
+ /// list of tokens to concat into a string to display when beginning the step.
+ /// will not be shown if the step is fast enough.
+ /// null for default.
+ ///
+ /// FRAME_TEXT_TOKEN_* defines are allowed, and will be automatically replaced during execution to the relevant text.
+ var/list/self_text_begin
+ /// list of tokens to concat into a string to display when finishing the step.
+ /// null for default.
+ ///
+ /// FRAME_TEXT_TOKEN_* defines are allowed, and will be automatically replaced during execution to the relevant text.
+ var/list/visible_text_end
+ /// list of tokens to concat into a string to display when finishing the step.
+ /// null for default.
+ ///
+ /// FRAME_TEXT_TOKEN_* defines are allowed, and will be automatically replaced during execution to the relevant text.
+ var/list/audible_text_end
+ /// list of tokens to concat into a string to display when finishing the step.
+ /// null for default.
+ ///
+ /// FRAME_TEXT_TOKEN_* defines are allowed, and will be automatically replaced during execution to the relevant text.
+ var/list/self_text_end
+
+/datum/frame_step/New()
+ if(isnull(request_type))
+ // autodetect
+ var/detected
+ if(ispath(request, /datum/material))
+ request_type = FRAME_REQUEST_TYPE_MATERIAL
+ else if(ispath(request, /obj/item/stack))
+ request_type = FRAME_REQUEST_TYPE_STACK
+ else if(ispath(request, /obj/item))
+ request_type = FRAME_REQUEST_TYPE_ITEM
+ else if(istext(request))
+ if(request in global.all_tool_functions)
+ request_type = FRAME_REQUEST_TYPE_TOOL
+ detected = TRUE
+ else if(!detected)
+ CRASH("failed to autodetect request")
+
+/datum/frame_step/proc/examine(obj/structure/frame2/frame, datum/event_args/actor/actor)
+ var/rendered_action = action_descriptor || SPAN_BOLD(name)
+ switch(request_type)
+ if(FRAME_REQUEST_TYPE_INTERACT)
+ . = "Interact with [frame] using an empty hand to [rendered_action]."
+ if(FRAME_REQUEST_TYPE_ITEM)
+ var/rendered_item
+ var/obj/item/casted = request
+ rendered_item = initial(casted.name)
+ // todo: support amounts
+ . = "Use an [rendered_item] on [frame] to [rendered_action]."
+ if(FRAME_REQUEST_TYPE_MATERIAL)
+ var/rendered_material
+ var/rendered_stack_name
+ var/datum/material/resolved = SSmaterials.resolve_material(request)
+ rendered_material = resolved.display_name
+ rendered_stack_name = resolved.sheet_plural_name
+ . = "Apply [request_amount || 0] [rendered_stack_name] of [rendered_material] to [rendered_action]."
+ if(FRAME_REQUEST_TYPE_PROC)
+ if(FRAME_REQUEST_TYPE_STACK)
+ var/rendered_stack
+ var/rendered_stack_name
+ var/obj/item/stack/casted = request
+ rendered_stack = initial(casted.name)
+ rendered_stack_name = initial(casted.name) || "sheets"
+ . = "Use [request_amount || 0] [rendered_stack_name] of [rendered_stack] to [rendered_action]."
+ if(FRAME_REQUEST_TYPE_TOOL)
+ var/rendered_tool = request
+ . = "Use a [rendered_tool] to [rendered_action]."
+ return SPAN_NOTICE(.)
+
+/datum/frame_step/proc/tool_image()
+ switch(direction)
+ if(TOOL_DIRECTION_BACKWARDS)
+ return dyntool_image_backward(request)
+ if(TOOL_DIRECTION_FORWARDS)
+ return dyntool_image_forward(request)
+ if(TOOL_DIRECTION_NEUTRAL)
+ return dyntool_image_neutral(request)
+
+/**
+ * checks if a given person, using a given tool, can undertake this step.
+ */
+/datum/frame_step/proc/valid_interaction(datum/event_args/actor/actor, obj/item/using_tool, datum/frame2/frame_datum, obj/structure/frame2/frame)
+ switch(request_type)
+ if(FRAME_REQUEST_TYPE_INTERACT)
+ return TRUE
+ if(FRAME_REQUEST_TYPE_ITEM)
+ return using_tool?.type == request
+ if(FRAME_REQUEST_TYPE_STACK)
+ return using_tool?.type == request
+ if(FRAME_REQUEST_TYPE_PROC)
+ return FALSE // override this proc
+ if(FRAME_REQUEST_TYPE_TOOL)
+ return using_tool?.tool_check(request, actor, frame, TOOL_OP_SILENT)
+ if(FRAME_REQUEST_TYPE_MATERIAL)
+ var/obj/item/stack/material/material_stack = using_tool
+ return istype(material_stack) && (ispath(request, /datum/material)? material_stack.material.type == request : material_stack.material.id == request)
+ return FALSE
+
+/**
+ * This proc may assume the item is already type filtered to be the valid item / type / stack / whatever.
+ * If it isn't, do not istype(); allow the runtime to happen so we can yell at those responsible.
+ */
+/datum/frame_step/proc/check_consumption(datum/event_args/actor/actor, obj/item/using_tool, datum/frame2/frame_datum, obj/structure/frame2/frame)
+ switch(request_type)
+ if(FRAME_REQUEST_TYPE_STACK)
+ var/obj/item/stack/stack = using_tool
+ if(stack.amount < request_amount)
+ return FALSE
+ return TRUE
+ if(FRAME_REQUEST_TYPE_MATERIAL)
+ var/obj/item/stack/material/material_stack = using_tool
+ if(material_stack.amount < request_amount)
+ return FALSE
+ return TRUE
+ return TRUE
+
+/**
+ * we take in time_needed, as computed by /datum/frame2.
+ *
+ * todo: should we be taking in time needed? this seems like the right option for now.
+ */
+/datum/frame_step/proc/perform_usage(datum/event_args/actor/actor, obj/item/using_tool, datum/frame2/frame_datum, obj/structure/frame2/frame, time_needed)
+ switch(request_type)
+ if(FRAME_REQUEST_TYPE_TOOL)
+ return frame.use_tool(
+ request,
+ using_tool,
+ actor,
+ delay = time_needed,
+ cost = request_cost,
+ )
+ else
+ return do_after(
+ actor.performer,
+ time_needed,
+ frame,
+ mobility_flags = MOBILITY_CAN_USE,
+ max_distance = using_tool?.reach || 1,
+ )
+
+/datum/frame_step/proc/handle_consumption(datum/event_args/actor/actor, obj/item/using_tool, datum/frame2/frame_datum, obj/structure/frame2/frame)
+ switch(request_type)
+ if(FRAME_REQUEST_TYPE_ITEM)
+ if(!actor.performer.attempt_void_item_for_installation(using_tool))
+ actor.chat_feedback(
+ SPAN_WARNING("[using_tool] is stuck to your hand!"),
+ target = frame,
+ )
+ return FALSE
+ qdel(using_tool)
+ return TRUE
+ if(FRAME_REQUEST_TYPE_TOOL)
+ // we do the usage in perform_usainge
+ return TRUE
+ if(FRAME_REQUEST_TYPE_STACK)
+ var/obj/item/stack/stack = using_tool
+ return stack.use(request_amount)
+ if(FRAME_REQUEST_TYPE_MATERIAL)
+ var/obj/item/stack/material/material_stack = using_tool
+ return material_stack.use(request_amount)
+ return TRUE
+
+/**
+ * called before frame is moved to new stage
+ */
+/datum/frame_step/proc/on_finish(datum/frame2/frame_datum, obj/structure/frame2/frame, datum/event_args/actor/actor, obj/item/using_item)
+ if(drop)
+ var/atom/drop_where = frame.drop_location()
+ if(ispath(drop, /obj/item/stack))
+ var/safety = 50
+ var/left = drop_amount
+ var/obj/item/stack/casted_stack = drop
+ do
+ var/dropping = min(left, initial(casted_stack.max_amount))
+ new drop(drop_where, dropping)
+ left -= dropping
+ while(--safety > 0 && left > 0)
+ else if(ispath(drop, /datum/material))
+ var/safety = 50
+ var/left = drop_amount
+ var/datum/material/resolved_material = SSmaterials.resolve_material(drop)
+ do
+ var/dropping = min(left, 50)
+ // todo: /datum/material based max stacks.
+ resolved_material.place_sheet(drop_where, dropping)
+ left -= dropping
+ while(--safety > 0 && left > 0)
+ else if(ispath(drop, /obj/item))
+ for(var/i in 1 to min(50, drop_amount))
+ new drop(drop_where)
+
+/datum/frame_step/proc/feedback_begin(datum/event_args/actor/actor, datum/frame2/frame_datum, obj/structure/frame2/frame, obj/item/tool, time_needed)
+ // don't bother if it's that fast
+ if(time_needed <= 0.5 SECONDS)
+ return
+ if(use_custom_feedback)
+ // custom
+ actor.visible_feedback(
+ target = frame,
+ visible = frame_datum.template_action_string(visible_text_begin, actor.performer, frame, tool),
+ audible = frame_datum.template_action_string(audible_text_begin, actor.performer, frame, tool),
+ otherwise_self = frame_datum.template_action_string(self_text_begin, actor.performer, frame, tool),
+ )
+ else
+ // default
+ standard_feedback_handling(actor, frame_datum, frame, tool, time_needed, TRUE)
+
+/datum/frame_step/proc/feedback_finish(datum/event_args/actor/actor, datum/frame2/frame_datum, obj/structure/frame2/frame, obj/item/tool, time_taken)
+ if(use_custom_feedback)
+ // custom
+ actor.visible_feedback(
+ target = frame,
+ visible = frame_datum.template_action_string(visible_text_end, actor.performer, frame, tool),
+ audible = frame_datum.template_action_string(audible_text_end, actor.performer, frame, tool),
+ otherwise_self = frame_datum.template_action_string(self_text_end, actor.performer, frame, tool),
+ )
+ else
+ // default
+ standard_feedback_handling(actor, frame_datum, frame, tool, time_taken, FALSE)
+
+/datum/frame_step/proc/standard_feedback_handling(datum/event_args/actor/actor, datum/frame2/frame_datum, obj/structure/frame2/frame, obj/item/tool, time, beginning)
+ switch(request_type)
+ if(FRAME_REQUEST_TYPE_INTERACT)
+ if(beginning)
+ actor.visible_feedback(
+ target = frame,
+ range = MESSAGE_RANGE_CONSTRUCTION,
+ visible = "[actor.performer] starts [action_text_leading || "tinkering with "][frame][action_text_trailing || "."]",
+ audible = "You hear something being tinkered with.",
+ otherwise_self = "You start [action_text_leading || "tinkering with "][frame][action_text_trailing || "."]",
+ )
+ else
+ actor.visible_feedback(
+ target = frame,
+ range = MESSAGE_RANGE_CONSTRUCTION,
+ visible = "[actor.performer] finishes [action_text_leading || "tinkering with "][frame][action_text_trailing || "."]",
+ audible = "You hear something being tinkered with.",
+ otherwise_self = "You finish [action_text_leading || "tinkering with "][frame][action_text_trailing || "."]",
+ )
+ if(FRAME_REQUEST_TYPE_ITEM)
+ if(beginning)
+ actor.visible_feedback(
+ target = frame,
+ range = MESSAGE_RANGE_CONSTRUCTION,
+ visible = "[actor.performer] starts [action_text_leading || "tinkering with "][frame][action_text_trailing || " using [tool]."]",
+ audible = "You hear something being tinkered with.",
+ otherwise_self = "You start [action_text_leading || "tinkering with "][frame][action_text_trailing || " using [tool]."]",
+ )
+ else
+ actor.visible_feedback(
+ target = frame,
+ range = MESSAGE_RANGE_CONSTRUCTION,
+ visible = "[actor.performer] finishes [action_text_leading || "tinkering with "][frame][action_text_trailing || " using [tool]."]",
+ audible = "You hear something being tinkered with.",
+ otherwise_self = "You finish [action_text_leading || "tinkering with "][frame][action_text_trailing || " using [tool]."]",
+ )
+ if(FRAME_REQUEST_TYPE_MATERIAL, FRAME_REQUEST_TYPE_STACK)
+ var/name_to_use
+ if(request_type == FRAME_REQUEST_TYPE_MATERIAL)
+ var/datum/material/resolved_material = SSmaterials.resolve_material(request)
+ name_to_use = "[resolved_material.name || resolved_material.display_name] [resolved_material.sheet_plural_name]"
+ else
+ var/obj/item/stack/casted_stack = request
+ name_to_use = casted_stack.name
+ if(beginning)
+ actor.visible_feedback(
+ target = frame,
+ range = MESSAGE_RANGE_CONSTRUCTION,
+ visible = "[actor.performer] starts [action_text_leading || "inserting some [name_to_use] into "][frame][action_text_trailing || "."]",
+ audible = "You hear something being tinkered with.",
+ otherwise_self = "You start [action_text_leading || "inserting some [name_to_use] into "][frame][action_text_trailing || "."]",
+ )
+ else
+ actor.visible_feedback(
+ target = frame,
+ range = MESSAGE_RANGE_CONSTRUCTION,
+ visible = "[actor.performer] finishes [action_text_leading || "inserting some [name_to_use] into "][frame][action_text_trailing || "."]",
+ audible = "You hear something being tinkered with.",
+ otherwise_self = "You finish [action_text_leading || "inserting some [name_to_use] into "][frame][action_text_trailing || "."]",
+ )
+ if(FRAME_REQUEST_TYPE_TOOL)
+ if(beginning)
+ actor.visible_feedback(
+ target = frame,
+ range = MESSAGE_RANGE_CONSTRUCTION,
+ visible = "[actor.performer] starts [action_text_leading || "tinkering with "][frame][action_text_trailing || " with [tool]."]",
+ audible = "You hear something being tinkered with.",
+ otherwise_self = "You start [action_text_leading || "tinkering with "][frame][action_text_trailing || " with [tool]."]",
+ )
+ else
+ actor.visible_feedback(
+ target = frame,
+ range = MESSAGE_RANGE_CONSTRUCTION,
+ visible = "[actor.performer] finishes [action_text_leading || "tinkering with "][frame][action_text_trailing || " with [tool]."]",
+ audible = "You hear something being tinkered with.",
+ otherwise_self = "You finish [action_text_leading || "tinkering with "][frame][action_text_trailing || " with [tool]."]",
+ )
diff --git a/code/modules/frames/item.dm b/code/modules/frames/item.dm
new file mode 100644
index 000000000000..7233ee693f76
--- /dev/null
+++ b/code/modules/frames/item.dm
@@ -0,0 +1,304 @@
+//* This file is explicitly licensed under the MIT license. *//
+//* Copyright (c) 2023 Citadel Station developers. *//
+
+/obj/item/frame2
+ name = "entity frame"
+ desc = "Why do you see this? Contact a coder."
+ icon = 'icons/modules/frames/base.dmi'
+ icon_state = "item"
+
+ item_flags = ITEM_NOBLUDGEON
+ obj_rotation_flags = OBJ_ROTATION_ENABLED | OBJ_ROTATION_DEFAULTING
+
+ /// frame datum - set to typepath for initialization
+ var/datum/frame2/frame
+ /// our cached image for hover
+ var/image/hover_image
+ /// viewing clients
+ var/list/client/viewing
+
+/obj/item/frame2/Initialize(mapload, datum/frame2/frame)
+ . = ..()
+ if(!isnull(frame))
+ src.frame = frame
+ if(ispath(src.frame))
+ src.frame = fetch_frame_datum(src.frame)
+ sync_frame(src.frame)
+
+/obj/item/frame2/Destroy()
+ for(var/client/C as anything in viewing)
+ hide_frame_image(C)
+ return ..()
+
+/obj/item/frame2/proc/sync_frame(datum/frame2/frame)
+ name = "[frame.name]"
+ icon = frame.icon
+ icon_state = "item"
+ w_class = frame.item_weight_class
+ weight_volume = frame.item_weight_volume
+
+/obj/item/frame2/examine(mob/user, dist)
+ . = ..()
+ if(!frame.item_deploy_requires_tool)
+ if(frame.wall_frame)
+ . += SPAN_NOTICE("Use it on a wall, window, or other 'wall-like' object to attach the frame.")
+ else
+ . += SPAN_NOTICE("Use it in hand to deploy it in the direction you are looking at.")
+ if(frame.item_deploy_tool)
+ . += SPAN_NOTICE("Use a [frame.item_deploy_tool] on it to deploy it in its current direction.")
+ if(frame.item_recycle_tool)
+ . += SPAN_NOTICE("Use a [frame.item_recycle_tool] on it to deconstruct it back into material sheets.")
+
+/obj/item/frame2/MouseEntered(location, control, params)
+ ..()
+ if(!usr?.client)
+ return
+ show_frame_image(usr.client)
+
+/obj/item/frame2/MouseExited(location, control, params)
+ ..()
+ if(!usr?.client)
+ return
+ hide_frame_image(usr.client)
+
+/obj/item/frame2/proc/show_frame_image(client/C)
+ LAZYDISTINCTADD(viewing, C)
+ C.images += get_hover_image()
+ RegisterSignal(C, COMSIG_PARENT_QDELETING, PROC_REF(on_client_delete))
+
+/obj/item/frame2/proc/hide_frame_image(client/C)
+ LAZYREMOVE(viewing, C)
+ C.images -= get_hover_image()
+ UnregisterSignal(C, COMSIG_PARENT_QDELETING)
+
+ if(!length(viewing))
+ hover_image = null
+
+/obj/item/frame2/proc/on_client_delete(datum/source)
+ hide_frame_image(source)
+
+/obj/item/frame2/proc/get_hover_image()
+ if(isnull(hover_image))
+ // todo: big/multi-tile frame support
+ hover_image = image('icons/modules/frames/base.dmi', "arrow")
+ hover_image.loc = src
+ hover_image.filters = list(
+ filter(type = "outline", size = 1, color = "#aaffaa77"),
+ )
+ update_hover_image()
+ return hover_image
+
+/obj/item/frame2/proc/update_hover_image()
+ if(isnull(hover_image))
+ return
+ hover_image.pixel_x = 0
+ hover_image.pixel_y = 0
+ switch(dir)
+ if(NORTH)
+ hover_image.pixel_y = 12
+ if(SOUTH)
+ hover_image.pixel_y = -12
+ if(EAST)
+ hover_image.pixel_x = 12
+ if(WEST)
+ hover_image.pixel_x = -12
+
+/obj/item/frame2/setDir(ndir)
+ . = ..()
+ if(!.)
+ return
+ update_hover_image()
+
+/obj/item/frame2/on_attack_self(datum/event_args/actor/e_args)
+ . = ..()
+ if(.)
+ return
+ if(frame.item_deploy_requires_tool)
+ e_args.chat_feedback(SPAN_WARNING("[src] requires the use of a [frame.item_deploy_tool] to be deployed!"), src)
+ return TRUE
+ var/use_dir = e_args.performer.dir
+ //! shitcode for wallmounts
+ if(frame.wall_frame)
+ use_dir = turn(use_dir, 180)
+ //! end
+ if(!can_deploy(e_args, use_dir, e_args.performer.loc))
+ return TRUE
+ if(frame.item_deploy_time)
+ e_args.visible_feedback(
+ target = src,
+ range = MESSAGE_RANGE_CONSTRUCTION,
+ visible = SPAN_WARNING("[e_args.performer] starts to deploy [src]."),
+ audible = SPAN_WARNING("You hear something being assembled."),
+ otherwise_self = SPAN_WARNING("You start to deploy [src]."),
+ )
+ log_construction(e_args, src, "started deploying")
+ if(!do_after(e_args.performer, frame.item_deploy_time, src, mobility_flags = MOBILITY_CAN_USE))
+ return TRUE
+ if(!attempt_deploy(e_args, use_dir = use_dir, use_loc = e_args.performer.loc))
+ return TRUE
+ e_args.visible_feedback(
+ target = src,
+ range = MESSAGE_RANGE_CONSTRUCTION,
+ visible = SPAN_WARNING("[e_args.performer] deploys [src]."),
+ audible = SPAN_WARNING("You hear something finish being assembled."),
+ otherwise_self = SPAN_WARNING("You deploy [src]."),
+ )
+ return TRUE
+
+/obj/item/frame2/afterattack(atom/target, mob/user, clickchain_flags, list/params)
+ if(!frame.wall_frame)
+ return ..()
+ if(!user.Adjacent(target))
+ return ..()
+ var/use_dir = get_dir(user, target)
+ var/datum/event_args/actor/e_args = new(user)
+ if(IS_DIAGONAL(use_dir))
+ e_args.chat_feedback(SPAN_WARNING("You must be standing cardinally to [target] to attempt a deployment there!"), src)
+ return CLICKCHAIN_DO_NOT_PROPAGATE
+ //! shitcode for wallmounts
+ if(frame.wall_frame)
+ use_dir = turn(use_dir, 180)
+ //! end
+ if(frame.item_deploy_requires_tool)
+ e_args.chat_feedback(SPAN_WARNING("[src] requires the use of a [frame.item_deploy_tool] to be deployed!"), src)
+ return CLICKCHAIN_DO_NOT_PROPAGATE
+ if(!can_deploy(e_args, use_dir, e_args.performer.loc))
+ return CLICKCHAIN_DO_NOT_PROPAGATE
+ if(frame.item_deploy_time)
+ e_args.visible_feedback(
+ target = src,
+ range = MESSAGE_RANGE_CONSTRUCTION,
+ visible = SPAN_WARNING("[e_args.performer] starts to deploy [src]."),
+ audible = SPAN_WARNING("You hear something being assembled."),
+ otherwise_self = SPAN_WARNING("You start to deploy [src]."),
+ )
+ log_construction(e_args, src, "started deploying")
+ if(!do_after(e_args.performer, frame.item_deploy_time, src, mobility_flags = MOBILITY_CAN_USE))
+ return CLICKCHAIN_DO_NOT_PROPAGATE
+ if(!attempt_deploy(e_args, use_dir, use_loc = e_args.performer.loc))
+ return CLICKCHAIN_DO_NOT_PROPAGATE
+ e_args.visible_feedback(
+ target = src,
+ range = MESSAGE_RANGE_CONSTRUCTION,
+ visible = SPAN_WARNING("[e_args.performer] deploys [src]."),
+ audible = SPAN_WARNING("You hear something finish being assembled."),
+ otherwise_self = SPAN_WARNING("You deploy [src]."),
+ )
+ return CLICKCHAIN_DO_NOT_PROPAGATE | CLICKCHAIN_DID_SOMETHING
+
+/obj/item/frame2/proc/can_deploy(datum/event_args/actor/e_args, use_dir = src.dir, use_loc = src.loc, silent)
+ if(!isturf(use_loc))
+ if(!silent)
+ e_args?.chat_feedback(SPAN_WARNING("[src] must be on the floor to be deployed!"), src)
+ return FALSE
+ if(!frame.deployment_checks(src, use_loc, use_dir, e_args))
+ return FALSE
+ return TRUE
+
+/obj/item/frame2/proc/attempt_deploy(datum/event_args/actor/e_args, use_dir = src.dir, use_loc = src.loc, silent)
+ if(!can_deploy(e_args, use_dir, use_loc, silent))
+ return FALSE
+ return deploy(e_args, use_dir, use_loc)
+
+/obj/item/frame2/proc/deploy(datum/event_args/actor/e_args, use_dir = src.dir, use_loc = src.loc)
+ if(!isturf(use_loc))
+ CRASH("non turf?")
+ frame.deploy_frame(src, e_args, use_loc, use_dir)
+ log_construction(e_args, src, "deployed")
+
+/obj/item/frame2/context_query(datum/event_args/actor/e_args)
+ . = ..()
+ .["deploy-frame"] = atom_context_tuple("deploy", image(src), 1, MOBILITY_CAN_USE)
+
+/obj/item/frame2/context_act(datum/event_args/actor/e_args, key)
+ . = ..()
+ if(.)
+ return
+ switch(key)
+ if("deploy-frame")
+ if(!e_args.performer.Reachability(src))
+ e_args.chat_feedback(SPAN_WARNING("You can't reach [src] right now!"), src)
+ return TRUE
+ var/use_dir = src.dir
+ //! shitcode for wallmounts
+ if(frame.wall_frame)
+ use_dir = turn(use_dir, 180)
+ //! end
+ if(frame.item_deploy_requires_tool)
+ e_args.chat_feedback(SPAN_WARNING("[src] requires the use of a [frame.item_deploy_tool] to be deployed!"), src)
+ return CLICKCHAIN_DO_NOT_PROPAGATE
+ if(!can_deploy(e_args, use_dir, loc))
+ return CLICKCHAIN_DO_NOT_PROPAGATE
+ if(frame.item_deploy_time)
+ e_args.visible_feedback(
+ target = src,
+ range = MESSAGE_RANGE_CONSTRUCTION,
+ visible = SPAN_WARNING("[e_args.performer] starts to deploy [src]."),
+ audible = SPAN_WARNING("You hear something being assembled."),
+ otherwise_self = SPAN_WARNING("You start to deploy [src]."),
+ )
+ log_construction(e_args, src, "started deploying")
+ if(!do_after(e_args.performer, frame.item_deploy_time, src, mobility_flags = MOBILITY_CAN_USE))
+ return CLICKCHAIN_DO_NOT_PROPAGATE
+ attempt_deploy(e_args, use_dir = use_dir)
+ return TRUE
+
+/obj/item/frame2/drop_products(method, atom/where)
+ . = ..()
+ frame.drop_deconstructed_products(method, where, null, list())
+
+/obj/item/frame2/tool_act(obj/item/I, datum/event_args/actor/clickchain/e_args, function, flags, hint)
+ if(function == frame.item_recycle_tool)
+ if(frame.item_recycle_time)
+ e_args.visible_feedback(
+ target = src,
+ range = MESSAGE_RANGE_CONSTRUCTION,
+ visible = SPAN_WARNING("[e_args.performer] starts to recycle [src]."),
+ audible = SPAN_WARNING("You hear someone starting to disassemble something."),
+ otherwise_self = SPAN_WARNING("You start to recycle [src]."),
+ )
+ log_construction(e_args, src, "started recycling")
+ if(!use_tool(function, I, e_args, flags, frame.item_recycle_time, frame.item_recycle_cost))
+ return CLICKCHAIN_DO_NOT_PROPAGATE
+ e_args.visible_feedback(
+ target = src,
+ range = MESSAGE_RANGE_CONSTRUCTION,
+ visible = SPAN_WARNING("[e_args.performer] disassembles [src] back into raw material."),
+ audible = SPAN_WARNING("You hear something being disassembled back into raw material."),
+ otherwise_self = SPAN_WARNING("You recycle [src] back into raw material."),
+ )
+ log_construction(e_args, src, "recycled")
+ deconstruct(ATOM_DECONSTRUCT_DISASSEMBLED)
+ qdel(src)
+ return CLICKCHAIN_DID_SOMETHING | CLICKCHAIN_DO_NOT_PROPAGATE
+ if(function == frame.item_deploy_tool)
+ if(frame.item_deploy_time)
+ e_args.visible_feedback(
+ target = src,
+ range = MESSAGE_RANGE_CONSTRUCTION,
+ visible = SPAN_WARNING("[e_args.performer] starts to deploy [src]."),
+ audible = SPAN_WARNING("You hear something being assembled."),
+ otherwise_self = SPAN_WARNING("You start to deploy [src]."),
+ )
+ log_construction(e_args, src, "started deploying")
+ if(!use_tool(function, I, e_args, flags, frame.item_deploy_time, frame.item_deploy_cost))
+ return CLICKCHAIN_DO_NOT_PROPAGATE
+ if(!attempt_deploy(e_args))
+ return CLICKCHAIN_DO_NOT_PROPAGATE
+ e_args.visible_feedback(
+ target = src,
+ range = MESSAGE_RANGE_CONSTRUCTION,
+ visible = SPAN_WARNING("[e_args.performer] deploys [src]."),
+ audible = SPAN_WARNING("You hear something finish being assembled."),
+ otherwise_self = SPAN_WARNING("You deploy [src]."),
+ )
+ return CLICKCHAIN_DID_SOMETHING | CLICKCHAIN_DO_NOT_PROPAGATE
+ return ..()
+
+/obj/item/frame2/dynamic_tool_query(obj/item/I, datum/event_args/actor/clickchain/e_args, list/hint_images)
+ . = list()
+ if(frame.item_recycle_tool)
+ LAZYSET(.[frame.item_recycle_tool], "recycle", dyntool_image_neutral(frame.item_recycle_tool))
+ if(frame.item_deploy_tool)
+ LAZYSET(.[frame.item_deploy_tool], "deploy", dyntool_image_neutral(frame.item_deploy_tool))
+ return merge_double_lazy_assoc_list(., ..())
diff --git a/code/modules/frames/structure.dm b/code/modules/frames/structure.dm
new file mode 100644
index 000000000000..342508026769
--- /dev/null
+++ b/code/modules/frames/structure.dm
@@ -0,0 +1,123 @@
+//* This file is explicitly licensed under the MIT license. *//
+//* Copyright (c) 2023 Citadel Station developers. *//
+
+// todo: rename to just 'frame' from 'frame2' after all old frames are converted.
+/obj/structure/frame2
+ name = "construction frame"
+ desc = "if you see this, yell at coders"
+ icon = 'icons/modules/frames/base.dmi'
+ icon_state = "structure"
+
+ climb_knockable = TRUE
+ obj_rotation_flags = OBJ_ROTATION_ENABLED
+
+ /// frame datum; set to typepath to default to that on init
+ var/datum/frame2/frame
+
+ /// current stage
+ var/stage
+ /// current context
+ // todo: frame context system proper?
+ var/list/context
+
+/obj/structure/frame2/Initialize(mapload, dir, datum/frame2/set_frame_to, stage_id, list/context)
+ var/datum/frame2/applying_frame = fetch_frame_datum(set_frame_to || src.frame)
+ src.context = context || list()
+ setDir(dir)
+ if(!length(applying_frame.stages))
+ applying_frame.finish_frame(src)
+ return INITIALIZE_HINT_QDEL
+ src.stage = stage_id || applying_frame.stage_starting || stack_trace("no stage...")
+ src.frame = applying_frame
+ src.frame.apply_to_frame(src)
+ return ..()
+
+/obj/structure/frame2/proc/set_context(key, value)
+ LAZYSET(context, key, value)
+
+/obj/structure/frame2/proc/get_context(key)
+ return context?[key]
+
+/obj/structure/frame2/update_icon_state()
+ icon_state = "structure[frame.has_structure_stage_states? "-[stage]" : ""]"
+ return ..()
+
+/obj/structure/frame2/update_overlays()
+ . = ..()
+ . += frame.get_overlays(src)
+
+/obj/structure/frame2/update_name()
+ var/datum/frame_stage/frame_stage = frame.stages[stage]
+ name = "[frame_stage.name_prepend && "[frame_stage.name_prepend] "][frame_stage.name_override || frame.name][frame_stage.name_append && " [frame_stage.name_append]"]"
+ return ..()
+
+/obj/structure/frame2/drop_products(method, atom/where)
+ . = ..()
+ frame.drop_deconstructed_products(method, where, stage, context)
+
+/obj/structure/frame2/examine(mob/user, dist)
+ . = ..()
+ frame.on_examine(src, new /datum/event_args/actor(user), ., dist)
+
+/obj/structure/frame2/dynamic_tool_query(obj/item/I, datum/event_args/actor/clickchain/e_args)
+ // please don't hurt me lohikar
+ . = list()
+ if(frame.freely_anchorable && frame.anchor_tool)
+ .[frame.anchor_tool] = list(
+ "[anchored? "unanchor" : "anchor"]" = anchored? dyntool_image_backward(frame.anchor_tool) : dyntool_image_forward(frame.anchor_tool),
+ )
+ . = merge_double_lazy_assoc_list(frame.on_tool_query(src, I, e_args), .)
+ . = merge_double_lazy_assoc_list(., ..())
+
+/obj/structure/frame2/proc/still_anchored(anchorvalue)
+ return anchored == anchorvalue
+
+/obj/structure/frame2/tool_act(obj/item/I, datum/event_args/actor/clickchain/e_args, function, flags, hint)
+ if(frame.freely_anchorable && frame.anchor_tool == function)
+ var/datum/frame_stage/current_stage = frame.stages[stage]
+ // if anchored, and either: current stage allow_unanchor is set to FALSE (not null) OR it's to null
+ // and the frame is requiring anchored and the frame's not on its starting stage, do not allow unanchoring.
+ if(anchored && (isnull(current_stage.allow_unanchor)? (frame.requires_anchored? frame.stage_starting != stage : FALSE) : !current_stage.allow_unanchor))
+ e_args.chat_feedback(
+ SPAN_WARNING("[src] cannot be unanchored while in this stage!"),
+ target = src,
+ )
+ return CLICKCHAIN_DO_NOT_PROPAGATE
+ if(frame.anchor_time)
+ e_args.visible_feedback(
+ target = src,
+ range = MESSAGE_RANGE_CONSTRUCTION,
+ visible = SPAN_NOTICE("[e_args.performer] starts to [anchored? "unbolt" : "bolt"] [src] [anchored? "from" : "to"] the floor."),
+ otherwise_self = SPAN_NOTICE("You begin to [anchored? "unbolt" : "bolt"] [src] [anchored? "from" : "to"] the floor."),
+ )
+ log_construction(e_args, src, "started [anchored? "unanchoring" : "anchoring"]")
+ if(!use_tool(function, I, e_args, flags, frame.anchor_time))
+ return CLICKCHAIN_DO_NOT_PROPAGATE | CLICKCHAIN_DID_SOMETHING
+ set_anchored(!anchored)
+ log_construction(e_args, src, "[anchored? "anchored" : "unanchored"]")
+ e_args.visible_feedback(
+ target = src,
+ range = MESSAGE_RANGE_CONSTRUCTION,
+ visible = SPAN_NOTICE("[e_args.performer] [anchored? "bolts" : "unbolts"] [src] [anchored? "to" : "from"] the floor."),
+ audible = SPAN_WARNING("You hear a set of bolts being [anchored? "fastened" : "undone"]."),
+ otherwise_self = SPAN_NOTICE("You [anchored? "bolt" : "unbolt"] [src] [anchored? "to" : "from"] the floor."),
+ )
+ return CLICKCHAIN_DO_NOT_PROPAGATE | CLICKCHAIN_DID_SOMETHING
+ if(frame.on_tool(src, I, e_args, function, flags, hint))
+ // todo: did something might be sent even if we .. didn't do anything successfully.
+ return CLICKCHAIN_DO_NOT_PROPAGATE | CLICKCHAIN_DID_SOMETHING
+ return ..()
+
+/obj/structure/frame2/on_attack_hand(datum/event_args/actor/clickchain/e_args)
+ . = ..()
+ if(.)
+ return
+ if(frame.on_interact(src, e_args))
+ return TRUE
+
+/obj/structure/frame2/attackby(obj/item/I, mob/user, list/params, clickchain_flags, damage_multiplier)
+ if(user.a_intent == INTENT_HARM)
+ return ..()
+ if(frame.on_item(src, I, new /datum/event_args/actor/clickchain(user)))
+ return CLICKCHAIN_DO_NOT_PROPAGATE | CLICKCHAIN_DID_SOMETHING
+ return ..()
diff --git a/code/modules/frames/types/apc.dm b/code/modules/frames/types/apc.dm
new file mode 100644
index 000000000000..f5896d4908e7
--- /dev/null
+++ b/code/modules/frames/types/apc.dm
@@ -0,0 +1,50 @@
+AUTO_FRAME_DATUM(/datum/frame2/apc, apc, 'icons/machinery/power/apc.dmi')
+/datum/frame2/apc
+ name = "APC frame"
+ material_cost = 2
+ // we immediately form the entity on place; no stages
+ stages = list()
+ wall_frame = TRUE
+ wall_pixel_x = 24
+ wall_pixel_y = 24
+
+/datum/frame2/apc/instance_product(obj/structure/frame/frame)
+ return new /obj/machinery/power/apc(frame.loc, frame.dir, TRUE)
+
+/datum/frame2/apc/valid_location(obj/entity, turf/location, dir, datum/event_args/actor/actor, silent)
+ if(!istype(location, /turf/simulated))
+ if(!silent)
+ actor.chat_feedback(
+ SPAN_WARNING("[entity] must be placed on normal flooring."),
+ target = entity,
+ )
+ return FALSE
+ var/area/area = location.loc
+ if(!area)
+ if(!silent)
+ actor.chat_feedback(
+ SPAN_WARNING("Missing area. Report this to coders with a screenshot of your screen. How did you get here?"),
+ target = entity,
+ )
+ return FALSE
+ if(!area.requires_power || area.always_unpowered)
+ if(!silent)
+ actor.chat_feedback(
+ SPAN_WARNING("[location] doesn't require power, or is externally powered."),
+ target = entity,
+ )
+ return FALSE
+ if(area.get_apc())
+ if(!silent)
+ actor.chat_feedback(
+ SPAN_WARNING("[location] is part of an area that already has an APC."),
+ target = entity,
+ )
+ return FALSE
+ for(var/obj/machinery/power/terminal/T in location)
+ actor.chat_feedback(
+ SPAN_WARNING("There is another powernet terminal here."),
+ target = entity,
+ )
+ return FALSE
+ return ..()
diff --git a/code/modules/frames/types/fire_alarm.dm b/code/modules/frames/types/fire_alarm.dm
new file mode 100644
index 000000000000..03f5797e8e8b
--- /dev/null
+++ b/code/modules/frames/types/fire_alarm.dm
@@ -0,0 +1,85 @@
+AUTO_FRAME_DATUM(/datum/frame2/fire_alarm, fire_alarm, 'icons/machinery/fire_alarm.dmi')
+/datum/frame2/fire_alarm
+ name = "fire alarm frame"
+ wall_pixel_y = 24
+ wall_pixel_x = 24
+ wall_frame = TRUE
+ material_cost = 2
+ stages = list(
+ "frame" = /datum/frame_stage{
+ steps = list(
+ /datum/frame_step{
+ request = /obj/item/circuitboard/firealarm;
+ name = "insert circuit";
+ stage = "circuit";
+ direction = TOOL_DIRECTION_FORWARDS;
+ },
+ /datum/frame_step{
+ request = TOOL_WRENCH;
+ time = 1 SECONDS;
+ name = "detach frame";
+ stage = FRAME_STAGE_DECONSTRUCT;
+ direction = TOOL_DIRECTION_BACKWARDS;
+ },
+ );
+ descriptor = "is currently an empty shell.";
+ },
+ "circuit" = /datum/frame_stage{
+ steps = list(
+ /datum/frame_step{
+ request = TOOL_SCREWDRIVER;
+ name = "secure circuit";
+ stage = "secured";
+ direction = TOOL_DIRECTION_FORWARDS;
+ },
+ /datum/frame_step{
+ request_type = FRAME_REQUEST_TYPE_INTERACT;
+ name = "remove circuit";
+ stage = "frame";
+ drop = /obj/item/circuitboard/firealarm;
+ direction = TOOL_DIRECTION_BACKWARDS;
+ },
+ );
+ descriptor = "has the circuit installed";
+ },
+ "secured" = /datum/frame_stage{
+ steps = list(
+ /datum/frame_step{
+ request = /obj/item/stack/cable_coil;
+ name = "unsecure circuit";
+ request_amount = 1;
+ stage = "wired";
+ direction = TOOL_DIRECTION_FORWARDS;
+ },
+ /datum/frame_step{
+ request = TOOL_SCREWDRIVER;
+ name = "unsecure circuit";
+ stage = "circuit";
+ direction = TOOL_DIRECTION_FORWARDS;
+ },
+ );
+ descriptor = "has the circuit secured.";
+ },
+ "wired" = /datum/frame_stage{
+ steps = list(
+ /datum/frame_step{
+ request = TOOL_SCREWDRIVER;
+ name = "secure panel";
+ stage = FRAME_STAGE_FINISH;
+ direction = TOOL_DIRECTION_FORWARDS;
+ },
+ /datum/frame_step{
+ request = TOOL_WIRECUTTER;
+ name = "remove wiring";
+ stage = "secured";
+ direction = TOOL_DIRECTION_BACKWARDS;
+ },
+ );
+ descriptor = "has its wiring installed.";
+ name_append = "(wired)";
+ },
+ )
+
+
+/datum/frame2/fire_alarm/instance_product(obj/structure/frame/frame)
+ return new /obj/machinery/fire_alarm(frame.loc, frame.dir)
diff --git a/code/modules/frames/types/solar_panel.dm b/code/modules/frames/types/solar_panel.dm
new file mode 100644
index 000000000000..f3802813a4f8
--- /dev/null
+++ b/code/modules/frames/types/solar_panel.dm
@@ -0,0 +1,69 @@
+AUTO_FRAME_DATUM(/datum/frame2/solar_panel, solar_panel, 'icons/machinery/power/solar/panel.dmi')
+/datum/frame2/solar_panel
+ name = "solar assembly"
+ material_buildable = FALSE
+ has_density = TRUE
+ freely_anchorable = TRUE
+ stages = list(
+ "frame" = /datum/frame_stage{
+ steps = list(
+ /datum/frame_step{
+ name = "finish panel";
+ request = /datum/material/glass;
+ request_amount = 1;
+ direction = TOOL_DIRECTION_FORWARDS;
+ stage = FRAME_STAGE_FINISH;
+ },
+ );
+ },
+ )
+
+ has_structure_stage_states = FALSE
+
+/datum/frame2/solar_panel/on_item(obj/structure/frame2/frame, obj/item/item, datum/event_args/actor/clickchain/click)
+ . = ..()
+ if(.)
+ return
+ if(istype(item, /obj/item/tracker_electronics))
+ if(frame.get_context("tracker"))
+ click.chat_feedback(
+ SPAN_WARNING("[frame] already has tracker electronics installed."),
+ target = frame,
+ )
+ return TRUE
+ if(!click.performer.attempt_consume_item_for_construction(item))
+ return TRUE
+ click.visible_feedback(
+ target = src,
+ range = MESSAGE_RANGE_CONSTRUCTION,
+ visible = SPAN_NOTICE("[click.performer] inserts [item] into [frame].")
+ )
+ // todo: context system proper?
+ frame.set_context("tracker", TRUE)
+ return TRUE
+
+/datum/frame2/solar_panel/instance_product(obj/structure/frame2/frame)
+ // todo: context system proper?
+ if(frame.get_context("tracker"))
+ return new /obj/machinery/power/tracker(frame.loc)
+ else
+ return new /obj/machinery/power/solar(frame.loc)
+
+/datum/frame2/solar_panel/instruction_special(obj/structure/frame2/frame, datum/event_args/actor/clickchain/click)
+ . = ..()
+ // todo: context system proper?
+ if(!frame.get_context("tracker"))
+ . += SPAN_NOTICE("Add tracker electronics to make this a solar tracker assembly.")
+ else
+ . += SPAN_NOTICE("This assembly is wired to be a solar tracker.")
+
+/obj/structure/frame2/solar_panel/anchored
+ anchored = TRUE
+
+/obj/structure/frame2/solar_panel/tracker
+ context = list(
+ "tracker" = TRUE,
+ )
+
+/obj/structure/frame2/solar_panel/tracker/anchored
+ anchored = TRUE
diff --git a/code/modules/holidays/christmas_loadout.dm b/code/modules/holidays/christmas_loadout.dm
index 3abdbace15d2..4837efc51649 100644
--- a/code/modules/holidays/christmas_loadout.dm
+++ b/code/modules/holidays/christmas_loadout.dm
@@ -101,5 +101,5 @@
/datum/loadout_entry/seasonal/halloween/costumes/accessory
name = "Costume Accessories - Cueball Man"
path = /obj/item/clothing/accessory/wcoat
- slot = /datum/inventory_slot_meta/abstract/attach_as_accessory
+ slot = /datum/inventory_slot/abstract/attach_as_accessory
*/
diff --git a/code/modules/holidays/halloween_loadout.dm b/code/modules/holidays/halloween_loadout.dm
index 9447b646b597..e195efdda4cd 100644
--- a/code/modules/holidays/halloween_loadout.dm
+++ b/code/modules/holidays/halloween_loadout.dm
@@ -472,7 +472,7 @@
/datum/loadout_entry/seasonal/halloween/costumes/accessory
name = "Costume Accessories - Cueball Man"
path = /obj/item/clothing/accessory/wcoat
- slot = /datum/inventory_slot_meta/abstract/attach_as_accessory
+ slot = /datum/inventory_slot/abstract/attach_as_accessory
/datum/loadout_entry/seasonal/halloween/costumes/accessory/broom
name = "Costume Accessories - Witch Broom"
diff --git a/code/modules/hydroponics/seed_datums.dm b/code/modules/hydroponics/seed_datums.dm
index 227313e13da3..f1d8aec35cd8 100644
--- a/code/modules/hydroponics/seed_datums.dm
+++ b/code/modules/hydroponics/seed_datums.dm
@@ -1272,7 +1272,7 @@
seed_name = "grass"
display_name = "grass"
kitchen_tag = "grass"
- mutants = "carpet"
+ mutants = list("carpet")
chems = list("nutriment" = list(1,20))
/datum/seed/grass/New()
diff --git a/code/modules/hydroponics/spreading/spreading_growth.dm b/code/modules/hydroponics/spreading/spreading_growth.dm
index 5a1b38fc86fb..6ca1df00a692 100644
--- a/code/modules/hydroponics/spreading/spreading_growth.dm
+++ b/code/modules/hydroponics/spreading/spreading_growth.dm
@@ -105,7 +105,13 @@
for(var/mob/living/M in neighbor)
if(seed.get_trait(TRAIT_SPREAD) >= 2 && (M.lying || prob(round(seed.get_trait(TRAIT_POTENCY)))))
entangle(M)
-
+ if(is_mature() && seed.get_trait(TRAIT_CARNIVOROUS))
+ for(var/obj/effect/plant/thing in loc)
+ if(thing != src)
+ if(thing.seed != seed)
+ thing.vine_overrun(src,src)
+ else
+ thing.die_off(TRUE) // let's just make sure there's only one
if(is_mature() && neighbors.len && prob(spread_chance))
//spread to 1-3 adjacent turfs depending on yield trait.
var/max_spread = between(1, round(seed.get_trait(TRAIT_YIELD)*3/14), 3)
diff --git a/code/modules/integrated_electronics/core/assemblies.dm b/code/modules/integrated_electronics/core/assemblies.dm
index ce6f8a5c68f5..3f7f21f6d6c3 100644
--- a/code/modules/integrated_electronics/core/assemblies.dm
+++ b/code/modules/integrated_electronics/core/assemblies.dm
@@ -55,7 +55,7 @@
/// Cost set to default during init if unset.
var/cost = 0
-/obj/item/electronic_assembly/GenerateTag()
+/obj/item/electronic_assembly/generate_tag()
tag = "assembly_[next_assembly_id++]"
/obj/item/electronic_assembly/examine(mob/user, dist)
diff --git a/code/modules/jobs/job.dm b/code/modules/jobs/job.dm
index ae99a808d2a8..f7060336faa4 100644
--- a/code/modules/jobs/job.dm
+++ b/code/modules/jobs/job.dm
@@ -23,6 +23,10 @@
/// With minimal access off, this gets added
var/list/additional_access = list()
+ //* Off-Duty
+ /// are we an off duty role?
+ var/is_off_duty = FALSE
+
//? Unsorted
/// Bitflags for the job.
var/flag = NONE
@@ -74,9 +78,6 @@
// Requires a ckey to be whitelisted in jobwhitelist.txt
var/whitelist_only = 0
- // Every hour playing this role gains this much time off. (Can be negative for off duty jobs!)
- var/timeoff_factor = 3
-
// What type of PTO is that job earning?
var/pto_type
@@ -118,8 +119,6 @@
. |= ROLE_UNAVAILABLE_WHITELIST
if(!slots_remaining())
. |= ROLE_UNAVAILABLE_SLOTS_FULL
- if(!player_has_enough_pto(C))
- . |= ROLE_UNAVAILABLE_PTO
if(jobban_isbanned(C.mob, title))
. |= ROLE_UNAVAILABLE_BANNED
if(!player_old_enough(C))
@@ -151,8 +150,6 @@
return ROLE_UNAVAILABLE_WHITELIST
else if(latejoin && !slots_remaining(TRUE))
return ROLE_UNAVAILABLE_SLOTS_FULL
- else if(!player_has_enough_pto(C))
- return ROLE_UNAVAILABLE_PTO
else if(jobban_isbanned(C.mob, title))
return ROLE_UNAVAILABLE_BANNED
else if(!player_old_enough(C))
@@ -431,10 +428,6 @@
if(mannequin.back)
qdel(mannequin.back)
-/// Check client-specific availability rules.
-/datum/role/job/proc/player_has_enough_pto(client/C)
- return timeoff_factor >= 0 || (C && LAZYACCESS(C.department_hours, pto_type) > 0)
-
/datum/role/job/proc/equip_backpack(mob/living/carbon/human/H)
switch(H.backbag)
if(2)
diff --git a/code/modules/jobs/job_types/station/civillian/assistant.dm b/code/modules/jobs/job_types/station/civillian/assistant.dm
index 55e2c25531d7..7537c89fc28d 100644
--- a/code/modules/jobs/job_types/station/civillian/assistant.dm
+++ b/code/modules/jobs/job_types/station/civillian/assistant.dm
@@ -9,7 +9,6 @@
spawn_positions = -1
supervisors = "Nobody! You don't work here."
selection_color = "#515151"
- timeoff_factor = 0
outfit_type = /datum/outfit/job/station/assistant
alt_titles = list(
diff --git a/code/modules/jobs/job_types/station/offduty/_offduty.dm b/code/modules/jobs/job_types/station/offduty/_offduty.dm
index 105212f81f33..638b883713d5 100644
--- a/code/modules/jobs/job_types/station/offduty/_offduty.dm
+++ b/code/modules/jobs/job_types/station/offduty/_offduty.dm
@@ -1,7 +1,7 @@
/datum/role/job/station/off_duty
abstract_type = /datum/role/job/station/off_duty
join_types = JOB_LATEJOIN
- timeoff_factor = -1
total_positions = -1
departments = list(DEPARTMENT_OFFDUTY)
+ is_off_duty = TRUE
supervisors = "nobody! Enjoy your time off"
diff --git a/code/modules/jobs/job_types/station/offduty/command.dm b/code/modules/jobs/job_types/station/offduty/command.dm
index d2da5731b935..fbed3c6df07a 100644
--- a/code/modules/jobs/job_types/station/offduty/command.dm
+++ b/code/modules/jobs/job_types/station/offduty/command.dm
@@ -1,7 +1,6 @@
/datum/role/job/station/off_duty/command
id = JOB_ID_OFFDUTY_COMMAND
title = "Off-duty Command"
- timeoff_factor = -1
total_positions = -1
selection_color = "#9b633e"
minimal_access = list(
diff --git a/code/modules/jobs/job_types/station/science/roboticist.dm b/code/modules/jobs/job_types/station/science/roboticist.dm
index cc625a69f125..9a7e9be4d2e3 100644
--- a/code/modules/jobs/job_types/station/science/roboticist.dm
+++ b/code/modules/jobs/job_types/station/science/roboticist.dm
@@ -27,7 +27,8 @@
alt_titles = list(
"Biomechanical Engineer" = /datum/prototype/struct/alt_title/biomech,
"Mechatronic Engineer" = /datum/prototype/struct/alt_title/mech_tech,
- "Artificer-Biotechnicist" = /datum/prototype/struct/alt_title/artificer_biotechnicist
+ "Artificer-Biotechnicist" = /datum/prototype/struct/alt_title/artificer_biotechnicist,
+ "Junior Roboticist" = /datum/prototype/struct/alt_title/junior_roboticist,
)
/datum/prototype/struct/alt_title/artificer_biotechnicist
@@ -37,6 +38,11 @@
)
background_enforce = TRUE
+/datum/prototype/struct/alt_title/junior_roboticist
+ title = "Junior Roboticist"
+ title_blurb = "A Junior Roboticist is someone still learning the field of robotics and \
+ should seek guidance from other roboticists and the research seniors and lead."
+
/datum/prototype/struct/alt_title/biomech
title = "Biomechanical Engineer"
title_blurb = "A Biomechanical Engineer primarily works on prosthetics, and the organic parts attached to them. They may have some \
diff --git a/code/modules/jobs/job_types/station/supply/shaft_miner.dm b/code/modules/jobs/job_types/station/supply/shaft_miner.dm
index 6dec92615a2f..36d58b582419 100644
--- a/code/modules/jobs/job_types/station/supply/shaft_miner.dm
+++ b/code/modules/jobs/job_types/station/supply/shaft_miner.dm
@@ -27,7 +27,9 @@
alt_titles = list(
"Drill Technician" = /datum/prototype/struct/alt_title/miner/drill_tech,
"Belt Miner" = /datum/prototype/struct/alt_title/miner/belt,
- "Salvage Technician" = /datum/prototype/struct/alt_title/salvage
+ "Salvage Technician" = /datum/prototype/struct/alt_title/salvage,
+ "Apprentice Miner" = /datum/prototype/struct/alt_title/miner/apprenticemine,
+ "Apprentice Salvager" = /datum/prototype/struct/alt_title/miner/apprenticesalv
)
/datum/prototype/struct/alt_title/miner
@@ -40,6 +42,14 @@
/datum/prototype/struct/alt_title/miner/belt
title = "Belt Miner"
+/datum/prototype/struct/alt_title/miner/apprenticemine
+ title = "Apprentice Miner"
+ title_blurb = "An Apprentice Miner is still learning about the typical grind of a miner, and should seek the guidance of other miners and salvagers for direction."
+
+/datum/prototype/struct/alt_title/miner/apprenticesalv
+ title = "Apprentice Salvager"
+ title_blurb = "An Apprentice Salvager is still learning about the typical grind of a salvager, and should seek the guidance of other miners and salvagers for direction."
+
/datum/prototype/struct/alt_title/salvage
title = "Salvage Technician"
title_blurb = "A Salvage Technician specialized in traveling to wrecks and stripping them of useful items and materials."
diff --git a/code/modules/keybindings/keybind/human.dm b/code/modules/keybindings/keybind/human.dm
index 546b33cb4715..4de1ce6a37c3 100644
--- a/code/modules/keybindings/keybind/human.dm
+++ b/code/modules/keybindings/keybind/human.dm
@@ -24,7 +24,7 @@
/datum/keybinding/human/quick_equipbelt/down(client/user)
var/mob/living/carbon/human/H = user.mob
- H.auto_held_insert_or_draw_via_slot(/datum/inventory_slot_meta/inventory/belt)
+ H.auto_held_insert_or_draw_via_slot(/datum/inventory_slot/inventory/belt)
return TRUE
/datum/keybinding/human/bag_equip
@@ -35,5 +35,5 @@
/datum/keybinding/human/bag_equip/down(client/user)
var/mob/living/carbon/human/H = user.mob
- H.auto_held_insert_or_draw_via_slot(/datum/inventory_slot_meta/inventory/back)
+ H.auto_held_insert_or_draw_via_slot(/datum/inventory_slot/inventory/back)
return TRUE
diff --git a/code/modules/keybindings/keybind/mob.dm b/code/modules/keybindings/keybind/mob.dm
index 8472f2d4ef7f..ea741423a499 100644
--- a/code/modules/keybindings/keybind/mob.dm
+++ b/code/modules/keybindings/keybind/mob.dm
@@ -195,7 +195,7 @@
description = "Does a subtle emote that's invisible to ghosts."
/datum/keybinding/mob/subtler/down(client/user)
- user.mob.subtle_wrapper()
+ user.mob.subtler_wrapper()
return TRUE
/datum/keybinding/mob/drop_item
diff --git a/code/modules/library/hardcode_library/reference/xenomorph_facts.dm b/code/modules/library/hardcode_library/reference/xenomorph_facts.dm
new file mode 100644
index 000000000000..4aaa1d638a48
--- /dev/null
+++ b/code/modules/library/hardcode_library/reference/xenomorph_facts.dm
@@ -0,0 +1,117 @@
+/obj/item/book/lore/xenomorph_castes
+ name = "About the life of a xenomorph Part 1"
+ icon_state ="book13"
+ author = "Dr. xbio. Peter Steffans"
+ title = "About the life of a xenomorph Part 1"
+
+
+/obj/item/book/lore/xenomorph_castes/Initialize(mapload)
+ . = ..()
+ dat = {"
+
+
+
+
+
diff --git a/code/modules/maps/overmap/planets/_lythios43c.dm b/code/modules/maps/overmap/planets/_lythios43c.dm
index 96caffd475fb..571be8e583ea 100644
--- a/code/modules/maps/overmap/planets/_lythios43c.dm
+++ b/code/modules/maps/overmap/planets/_lythios43c.dm
@@ -23,6 +23,7 @@
"Courser Scouting Vessel" = list("rift_courser_hangar"),
"Hammerhead Patrol Barge" = list("rift_hammerhead_hangar"),
"Civilian Transport" = list("rift_civvie_pad"),
+ "Civilian Century Shuttle" = list("rift_oldcentury_pad"),
"Dart EMT Shuttle" = list("rift_emt_pad"),
"Beruang Trade Ship" = list("rift_trade_dock"),
"NDV Quicksilver" = list("rift_specops_dock"),
diff --git a/code/modules/maps/overmap/planets/_virgo3b.dm b/code/modules/maps/overmap/planets/_virgo3b.dm
index 543ccd7b8f52..11fa22c6c5b3 100644
--- a/code/modules/maps/overmap/planets/_virgo3b.dm
+++ b/code/modules/maps/overmap/planets/_virgo3b.dm
@@ -1,8 +1,8 @@
/datum/atmosphere/planet/virgo3b
base = list(
- /datum/gas/nitrogen = 0.16,
- /datum/gas/phoron = 0.72,
+ /datum/gas/nitrogen = 0.36,
+ /datum/gas/phoron = 0.52,
/datum/gas/carbon_dioxide = 0.12,
)
pressure_low = 82.4
diff --git a/code/modules/maps/overmap/space/trade_station/trade_station.dm b/code/modules/maps/overmap/space/trade_station/trade_station.dm
index 789889039e68..fa2eacd230a7 100644
--- a/code/modules/maps/overmap/space/trade_station/trade_station.dm
+++ b/code/modules/maps/overmap/space/trade_station/trade_station.dm
@@ -9,22 +9,29 @@
color = "#8F6E4C"
initial_generic_waypoints = list(
- "nebula_pad_1",
- "nebula_pad_2",
- "nebula_space_SW",
- "nebula_pad_3",
+ "nebula_pad_1a",
+ "nebula_pad_1b",
+ "nebula_pad_2a",
+ "nebula_pad_2b",
+ "nebula_pad_3a",
+ "nebula_pad_3b",
+ "nebula_pad_3c",
+ "nebula_pad_3d",
"nebula_pad_4a",
"nebula_pad_4b",
"nebula_pad_4c",
- "nebula_pad_5",
- "nebula_pad_6",
+ "nebula_pad_4d",
+ "nebula_pad_5a",
+ "nebula_pad_5b",
+ "nebula_pad_6a",
+ "nebula_pad_6b",
"nebula_space_SE",
"nebula_space_S",
"nebula_space_SW"
)
initial_restricted_waypoints = list(
- "Beruang Trade Ship" = list("tradeport_hangar"), "Beluga Passenger Liner" = list("nebula_pad_3")
+ "Beruang Trade Ship" = list("tradeport_hangar")
)
/* // Old Restricted list. Leaving commented out for reference - Bloop
initial_restricted_waypoints = list(
diff --git a/code/modules/maps/templates/misc_presets/rift_shuttle_landmarks.dm b/code/modules/maps/templates/misc_presets/rift_shuttle_landmarks.dm
index 774b2cfea978..2507b0199ec5 100644
--- a/code/modules/maps/templates/misc_presets/rift_shuttle_landmarks.dm
+++ b/code/modules/maps/templates/misc_presets/rift_shuttle_landmarks.dm
@@ -25,6 +25,13 @@ Need to turn all of these into proper initializers like this:
base_turf = /turf/simulated/floor/reinforced/lythios43c
base_area = /area/rift/surfacebase/outside/outside3
+/obj/effect/shuttle_landmark/rift/deck3/oldcentury
+ name = "NSB Atlas - Secondary Civilian Transport Pad"
+ landmark_tag = "rift_oldcentury_pad"
+ docking_controller = "rift_oldcentury_dock"
+ base_turf = /turf/simulated/floor/reinforced/lythios43c
+ base_area = /area/rift/surfacebase/outside/outside3
+
/obj/effect/shuttle_landmark/rift/deck3/emt
name = "NSB Atlas - EMT Shuttle Pad"
landmark_tag = "rift_emt_pad"
@@ -129,6 +136,10 @@ Need to turn all of these into proper initializers like this:
name = "In transit"
landmark_tag = "nav_transit_civvie"
+/obj/effect/shuttle_landmark/transit/rift/oldcentury
+ name = "In transit"
+ landmark_tag = "nav_transit_oldcentury"
+
/obj/effect/shuttle_landmark/transit/rift/trade
name = "In transit"
landmark_tag = "nav_transit_trade"
diff --git a/code/modules/materials/definitions/metals/steel.dm b/code/modules/materials/definitions/metals/steel.dm
index e433859ba4f4..ce337ac483f0 100644
--- a/code/modules/materials/definitions/metals/steel.dm
+++ b/code/modules/materials/definitions/metals/steel.dm
@@ -100,6 +100,18 @@
cost = 5,
time = 2 SECONDS,
)
+ for(var/datum/frame2/frame_datum as anything in GLOB.frame_datum_lookup)
+ if(!frame_datum.material_buildable)
+ continue
+ . += create_stack_recipe_datum(
+ category = "frames",
+ cost = frame_datum.material_cost,
+ name = frame_datum.name,
+ recipe_type = /datum/stack_recipe/frame,
+ recipe_args = list(
+ frame_datum.type,
+ ),
+ )
. += new /datum/stack_recipe/railing
. += create_stack_recipe_datum(category = "sofas", cost = 1, name = "sofa middle", product = /obj/structure/bed/chair/sofa, exclusitivity = /obj/structure/bed)
. += create_stack_recipe_datum(category = "sofas", cost = 1, name = "sofa left", product = /obj/structure/bed/chair/sofa/left, exclusitivity = /obj/structure/bed)
@@ -113,13 +125,6 @@
cost = 2,
)
// todo: frame rework
- . += create_stack_recipe_datum(
- category = "frames",
- name = "apc frame",
- product = /obj/item/frame/apc,
- cost = 2,
- )
- // todo: frame rework
. += create_stack_recipe_datum(
category = "frames",
name = "mirror frame",
diff --git a/code/modules/mining/machinery/sheet_silo.dm b/code/modules/mining/machinery/sheet_silo.dm
index a8e964ac6390..2fa0a3fd5cd9 100644
--- a/code/modules/mining/machinery/sheet_silo.dm
+++ b/code/modules/mining/machinery/sheet_silo.dm
@@ -80,9 +80,9 @@
. = ..()
sheets_by_material = data["stored"]
-/obj/machinery/sheet_silo/ui_assets(mob/user)
- . = ..()
- . += get_asset_datum(/datum/asset/spritesheet/materials)
+/obj/machinery/sheet_silo/ui_asset_injection(datum/tgui/ui, list/immediate, list/deferred)
+ immediate += /datum/asset_pack/spritesheet/materials
+ return ..()
/obj/machinery/sheet_silo/ui_data(mob/user, datum/tgui/ui)
. = ..()
diff --git a/code/modules/mining/ore_redemption_machine/equipment_vendor.dm b/code/modules/mining/ore_redemption_machine/equipment_vendor.dm
index f926dd84dab4..2b765fa5120a 100644
--- a/code/modules/mining/ore_redemption_machine/equipment_vendor.dm
+++ b/code/modules/mining/ore_redemption_machine/equipment_vendor.dm
@@ -17,9 +17,12 @@
new /datum/data/mining_equipment("30 Marker Beacons", /obj/item/stack/marker_beacon/thirty, 300),
new /datum/data/mining_equipment("Whiskey", /obj/item/reagent_containers/food/drinks/bottle/whiskey, 125),
new /datum/data/mining_equipment("Absinthe", /obj/item/reagent_containers/food/drinks/bottle/absinthe, 125),
+ new /datum/data/mining_equipment("Hard Root Beer", /obj/item/reagent_containers/food/drinks/bottle/small/alcsassafras, 70),
new /datum/data/mining_equipment("Special Blend Whiskey", /obj/item/reagent_containers/food/drinks/bottle/specialwhiskey, 250),
new /datum/data/mining_equipment("Random Booze", /obj/random/alcohol, 125),
new /datum/data/mining_equipment("Cigar", /obj/item/clothing/mask/smokable/cigarette/cigar/havana, 150),
+ new /datum/data/mining_equipment("Root Beer", /obj/item/reagent_containers/food/drinks/bottle/small/sassafras, 50),
+ new /datum/data/mining_equipment("Sarsaparilla", /obj/item/reagent_containers/food/drinks/bottle/small/sarsaparilla, 50),
new /datum/data/mining_equipment("Soap", /obj/item/soap/nanotrasen, 200),
new /datum/data/mining_equipment("Laser Pointer", /obj/item/laser_pointer, 900),
new /datum/data/mining_equipment("Geiger Counter", /obj/item/geiger_counter, 750),
diff --git a/code/modules/mob/_modifiers/modifiers.dm b/code/modules/mob/_modifiers/modifiers.dm
index f7f3db4dc91b..5a6ff0d75b82 100644
--- a/code/modules/mob/_modifiers/modifiers.dm
+++ b/code/modules/mob/_modifiers/modifiers.dm
@@ -40,8 +40,8 @@
/// If set, the client will have wires replaced by the given replacement list. For colorblindness.
var/wire_colors_replace = null
-//! Now for all the different effects.
-//! Percentage modifiers are expressed as a multipler. (e.g. +25% damage should be written as 1.25)
+ //* Now for all the different effects.
+ //* Percentage modifiers are expressed as a multipler. (e.g. +25% damage should be written as 1.25)
/// Adjusts max health by a flat (e.g. +20) amount. Note this is added to base health.
var/max_health_flat
diff --git a/code/modules/mob/gender.dm b/code/modules/mob/gender.dm
index 10d119bba55c..2bf07e8d9917 100644
--- a/code/modules/mob/gender.dm
+++ b/code/modules/mob/gender.dm
@@ -30,6 +30,7 @@ GLOBAL_LIST_INIT(gender_select_list, gender_selection())
var/himself = "themselves"
var/s = ""
var/hes = "they're"
+ var/Hes = "They're"
/datum/gender/male
key = "male"
@@ -47,6 +48,7 @@ GLOBAL_LIST_INIT(gender_select_list, gender_selection())
himself = "himself"
s = "s"
hes = "he's"
+ Hes = "He's"
/datum/gender/female
key = "female"
@@ -64,6 +66,7 @@ GLOBAL_LIST_INIT(gender_select_list, gender_selection())
himself = "herself"
s = "s"
hes = "she's"
+ Hes = "She's"
/datum/gender/neuter
key = "neuter"
@@ -81,6 +84,7 @@ GLOBAL_LIST_INIT(gender_select_list, gender_selection())
himself = "itself"
s = "s"
hes = "it's"
+ Hes = "It's"
/datum/gender/herm
key = "herm"
@@ -98,6 +102,7 @@ GLOBAL_LIST_INIT(gender_select_list, gender_selection())
himself = "hirself"
s = "s"
hes = "shi's"
+ Hes = "Shi's"
/mob/proc/p_they()
var/datum/gender/G = GLOB.gender_datums[gender]
@@ -122,3 +127,11 @@ GLOBAL_LIST_INIT(gender_select_list, gender_selection())
/mob/proc/p_Their()
var/datum/gender/G = GLOB.gender_datums[gender]
return G.His
+
+/mob/proc/p_theyre()
+ var/datum/gender/G = GLOB.gender_datums[gender]
+ return G.hes
+
+/mob/proc/p_Theyre()
+ var/datum/gender/G = GLOB.gender_datums[gender]
+ return G.Hes
diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm
index 546223655788..13d7a7147657 100644
--- a/code/modules/mob/holder.dm
+++ b/code/modules/mob/holder.dm
@@ -249,7 +249,7 @@
holder_slot_icons[cache_entry] = holder_mob_icon_cache[cache_key]
return ..()
-/obj/item/holder/human/resolve_worn_assets(mob/M, datum/inventory_slot_meta/slot_meta, inhands, bodytype)
+/obj/item/holder/human/resolve_worn_assets(mob/M, datum/inventory_slot/slot_meta, inhands, bodytype)
var/list/generated = list()
generated.len = WORN_DATA_LIST_SIZE
generated[WORN_DATA_ICON] = holder_slot_icons[slot_meta.id]
diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm
index 73d6ca3cf182..de100a4abc1d 100644
--- a/code/modules/mob/inventory.dm
+++ b/code/modules/mob/inventory.dm
@@ -21,7 +21,7 @@
/mob/proc/smart_equip(obj/item/I)
if(equip_to_appropriate_slot(I, INV_OP_SUPPRESS_WARNING))
return TRUE
- if(equip_to_slot_if_possible(I, /datum/inventory_slot_meta/abstract/put_in_storage_try_active, INV_OP_SUPPRESS_WARNING))
+ if(equip_to_slot_if_possible(I, /datum/inventory_slot/abstract/put_in_storage_try_active, INV_OP_SUPPRESS_WARNING))
return TRUE
to_chat(src, SPAN_WARNING("You have nowhere to put [I]!"))
return FALSE
diff --git a/code/modules/mob/inventory/helpers.dm b/code/modules/mob/inventory/helpers.dm
index ef843afeac39..64bd6e13dd10 100644
--- a/code/modules/mob/inventory/helpers.dm
+++ b/code/modules/mob/inventory/helpers.dm
@@ -100,12 +100,12 @@
/**
* Attempt to shove an item being held into a storage in a given slot
*/
-/mob/proc/attempt_put_held_item_into_storage_in_slot(obj/item/inserting, datum/inventory_slot_meta/slot_like, silent, mob/initiator = src)
+/mob/proc/attempt_put_held_item_into_storage_in_slot(obj/item/inserting, datum/inventory_slot/slot_like, silent, mob/initiator = src)
if(isnull(inserting))
inserting = get_active_held_item()
if(!is_holding(inserting))
return
- slot_like = resolve_inventory_slot_meta(slot_like)
+ slot_like = resolve_inventory_slot(slot_like)
var/obj/item/equipped = item_by_slot_id(slot_like.id)
if(isnull(equipped))
if(!silent)
@@ -122,8 +122,8 @@
/**
* Attempt to grab an item from a given slot into hand.
*/
-/mob/proc/attempt_grab_item_out_of_storage_in_slot(datum/inventory_slot_meta/slot_like, silent, mob/initiator = src)
- slot_like = resolve_inventory_slot_meta(slot_like)
+/mob/proc/attempt_grab_item_out_of_storage_in_slot(datum/inventory_slot/slot_like, silent, mob/initiator = src)
+ slot_like = resolve_inventory_slot(slot_like)
var/obj/item/equipped = item_by_slot_id(slot_like.id)
if(isnull(equipped))
if(!silent)
@@ -159,8 +159,8 @@
* Automatically either put in hand object into a storage in a given slot, or
* draw an item from that storage into hand.
*/
-/mob/proc/auto_held_insert_or_draw_via_slot(datum/inventory_slot_meta/slot_like, silent, mob/initiator = src)
- slot_like = resolve_inventory_slot_meta(slot_like)
+/mob/proc/auto_held_insert_or_draw_via_slot(datum/inventory_slot/slot_like, silent, mob/initiator = src)
+ slot_like = resolve_inventory_slot(slot_like)
var/obj/item/holding = get_active_held_item()
var/obj/item/in_slot = item_by_slot_id(slot_like.id)
if(isnull(in_slot) || isnull(in_slot.obj_storage))
diff --git a/code/modules/mob/inventory/inventory.dm b/code/modules/mob/inventory/inventory.dm
index 25e905dca3da..db10b451347d 100644
--- a/code/modules/mob/inventory/inventory.dm
+++ b/code/modules/mob/inventory/inventory.dm
@@ -2,13 +2,18 @@
* mob inventory data goes in here.
*/
/datum/inventory
- //? basics
+ //* Basics *//
/// owning mob
var/mob/owner
- //? slots
+ //* Inventory *//
- //? caches
+ //* Caches *//
+ /// cached overlays by slot id
+ var/list/rendered_normal_overlays = list()
+ /// cached overlays by slot id
+ // todo: emissives
+ // var/list/rendered_emissive_overlays = list()
/datum/inventory/New(mob/M)
if(!istype(M))
@@ -19,6 +24,95 @@
owner = null
return ..()
+//* Rendering *//
+
+/datum/inventory/proc/remove_slot_renders()
+ var/list/transformed = list()
+ for(var/slot_id in rendered_normal_overlays)
+ transformed += rendered_normal_overlays[slot_id]
+ owner.cut_overlay(transformed)
+
+/datum/inventory/proc/reapply_slot_renders()
+ // try not to dupe
+ remove_slot_renders()
+ var/list/transformed = list()
+ for(var/slot_id in rendered_normal_overlays)
+ transformed += rendered_normal_overlays[slot_id]
+ owner.add_overlay(transformed)
+
+/**
+ * just update if a slot is visible
+ */
+/datum/inventory/proc/update_slot_visible(slot_id, cascade = TRUE)
+ // resolve item
+ var/obj/item/target = owner.item_by_slot_id(slot_id)
+
+ // first, cascade incase we early-abort later
+ if(cascade)
+ var/datum/inventory_slot/slot = resolve_inventory_slot(slot_id)
+ slot.cascade_render_visibility(owner, target)
+
+ // check existing
+ if(isnull(rendered_normal_overlays[slot_id]))
+ return
+
+ // remove overlay first incase it's already there
+ owner.cut_overlay(rendered_normal_overlays[slot_id])
+
+ // check if slot should render
+ var/datum/inventory_slot/slot = resolve_inventory_slot(slot_id)
+ if(!slot.should_render(owner, target))
+ return
+
+ // add overlay if it should
+ owner.add_overlay(rendered_normal_overlays[slot_id])
+
+/**
+ * redo a slot's render
+ */
+/datum/inventory/proc/update_slot_render(slot_id, cascade = TRUE)
+ var/datum/inventory_slot/slot = resolve_inventory_slot(slot_id)
+ var/obj/item/target = owner.item_by_slot_id(slot_id)
+
+ // first, cascade incase we early-abort later
+ if(cascade)
+ slot.cascade_render_visibility(owner, target)
+
+ if(!slot.should_render(owner, target))
+ remove_slot_render(slot_id)
+ return
+
+ if(isnull(target))
+ remove_slot_render(slot_id)
+ return
+
+ var/bodytype = BODYTYPE_DEFAULT
+
+ if(ishuman(owner))
+ var/mob/living/carbon/human/casted_human = owner
+ bodytype = casted_human.species.get_effective_bodytype(casted_human, target, slot_id)
+
+ var/rendering_results = slot.render(owner, target, bodytype)
+ if(islist(rendering_results)? !length(rendering_results) : isnull(rendering_results))
+ remove_slot_render(slot_id)
+ return
+
+ set_slot_render(slot_id, rendering_results)
+
+/datum/inventory/proc/remove_slot_render(slot_id)
+ if(isnull(rendered_normal_overlays[slot_id]))
+ return
+ owner.cut_overlay(rendered_normal_overlays[slot_id])
+ rendered_normal_overlays -= slot_id
+
+/datum/inventory/proc/set_slot_render(slot_id, overlay)
+ if(!isnull(rendered_normal_overlays[slot_id]))
+ owner.cut_overlay(rendered_normal_overlays[slot_id])
+ rendered_normal_overlays[slot_id] = overlay
+ owner.add_overlay(overlay)
+
+//* Queries *//
+
/**
* returns list() of items with body_cover_flags
*/
@@ -39,32 +133,32 @@
* @return true/false based on if it worked
*/
/mob/proc/handle_abstract_slot_insertion(obj/item/I, slot, flags)
- if(!ispath(slot, /datum/inventory_slot_meta/abstract))
- slot = resolve_inventory_slot_meta(slot)?.type
- if(!ispath(slot, /datum/inventory_slot_meta/abstract))
+ if(!ispath(slot, /datum/inventory_slot/abstract))
+ slot = resolve_inventory_slot(slot)?.type
+ if(!ispath(slot, /datum/inventory_slot/abstract))
stack_trace("invalid slot: [slot]")
- else if(slot != /datum/inventory_slot_meta/abstract/put_in_hands)
+ else if(slot != /datum/inventory_slot/abstract/put_in_hands)
stack_trace("attempted usage of slot id in abstract insertion converted successfully")
. = FALSE
switch(slot)
- if(/datum/inventory_slot_meta/abstract/hand/left)
+ if(/datum/inventory_slot/abstract/hand/left)
return put_in_left_hand(I, flags)
- if(/datum/inventory_slot_meta/abstract/hand/right)
+ if(/datum/inventory_slot/abstract/hand/right)
return put_in_right_hand(I, flags)
- if(/datum/inventory_slot_meta/abstract/put_in_belt)
+ if(/datum/inventory_slot/abstract/put_in_belt)
var/obj/item/held = item_by_slot_id(SLOT_ID_BELT)
if(flags & INV_OP_FORCE)
return held?.obj_storage?.insert(I, new /datum/event_args/actor(src), flags & INV_OP_SUPPRESS_SOUND)
return held?.obj_storage?.auto_handle_interacted_insertion(I, new /datum/event_args/actor(src), flags & INV_OP_SUPPRESS_WARNING, flags & INV_OP_SUPPRESS_SOUND)
- if(/datum/inventory_slot_meta/abstract/put_in_backpack)
+ if(/datum/inventory_slot/abstract/put_in_backpack)
var/obj/item/held = item_by_slot_id(SLOT_ID_BACK)
if(flags & INV_OP_FORCE)
return held?.obj_storage?.insert(I, new /datum/event_args/actor(src), flags & INV_OP_SUPPRESS_SOUND)
return held?.obj_storage?.auto_handle_interacted_insertion(I, new /datum/event_args/actor(src), flags & INV_OP_SUPPRESS_WARNING, flags & INV_OP_SUPPRESS_SOUND)
- if(/datum/inventory_slot_meta/abstract/put_in_hands)
+ if(/datum/inventory_slot/abstract/put_in_hands)
return put_in_hands(I, flags)
- if(/datum/inventory_slot_meta/abstract/put_in_storage, /datum/inventory_slot_meta/abstract/put_in_storage_try_active)
- if(slot == /datum/inventory_slot_meta/abstract/put_in_storage_try_active)
+ if(/datum/inventory_slot/abstract/put_in_storage, /datum/inventory_slot/abstract/put_in_storage_try_active)
+ if(slot == /datum/inventory_slot/abstract/put_in_storage_try_active)
// todo: redirection
if(flags & INV_OP_FORCE)
if(active_storage?.insert(I, new /datum/event_args/actor(src), flags & INV_OP_SUPPRESS_WARNING))
@@ -86,7 +180,7 @@
return held.obj_storage.insert(I, new /datum/event_args/actor(src), flags & INV_OP_SUPPRESS_SOUND)
return held.obj_storage.auto_handle_interacted_insertion(I, new /datum/event_args/actor(src), flags & INV_OP_SUPPRESS_WARNING, flags & INV_OP_SUPPRESS_SOUND)
return FALSE
- if(/datum/inventory_slot_meta/abstract/attach_as_accessory)
+ if(/datum/inventory_slot/abstract/attach_as_accessory)
for(var/obj/item/clothing/C in get_equipped_items())
if(C.attempt_attach_accessory(I))
return TRUE
@@ -215,7 +309,7 @@
if(!(flags & INV_OP_FORCE) && HAS_TRAIT(I, TRAIT_ITEM_NODROP))
if(!(flags & INV_OP_SUPPRESS_WARNING))
- var/datum/inventory_slot_meta/slot_meta = resolve_inventory_slot_meta(slot)
+ var/datum/inventory_slot/slot_meta = resolve_inventory_slot(slot)
to_chat(user, SPAN_WARNING("[I] is stubbornly stuck [slot_meta.display_preposition] your [slot_meta.display_name]!"))
return FALSE
@@ -254,7 +348,7 @@
to_chat(user, SPAN_DANGER("can_equip will now attempt to prevent the deleted item from being equipped. There should be no glitches."))
return FALSE
- var/datum/inventory_slot_meta/slot_meta = resolve_inventory_slot_meta(slot)
+ var/datum/inventory_slot/slot_meta = resolve_inventory_slot(slot)
var/self_equip = user == src
if(!slot_meta)
. = FALSE
@@ -263,17 +357,17 @@
if(slot_meta.inventory_slot_flags & INV_SLOT_IS_ABSTRACT)
// special handling: make educated guess, defaulting to yes
switch(slot_meta.type)
- if(/datum/inventory_slot_meta/abstract/hand/left)
+ if(/datum/inventory_slot/abstract/hand/left)
return (flags & INV_OP_FORCE) || !get_left_held_item()
- if(/datum/inventory_slot_meta/abstract/hand/right)
+ if(/datum/inventory_slot/abstract/hand/right)
return (flags & INV_OP_FORCE) || !get_right_held_item()
- if(/datum/inventory_slot_meta/abstract/put_in_backpack)
+ if(/datum/inventory_slot/abstract/put_in_backpack)
var/obj/item/thing = item_by_slot_id(SLOT_ID_BACK)
return thing?.obj_storage?.can_be_inserted(I, new /datum/event_args/actor(user), TRUE)
- if(/datum/inventory_slot_meta/abstract/put_in_belt)
+ if(/datum/inventory_slot/abstract/put_in_belt)
var/obj/item/thing = item_by_slot_id(SLOT_ID_BACK)
return thing?.obj_storage?.can_be_inserted(I, new /datum/event_args/actor(user), TRUE)
- if(/datum/inventory_slot_meta/abstract/put_in_hands)
+ if(/datum/inventory_slot/abstract/put_in_hands)
return (flags & INV_OP_FORCE) || !hands_full()
return TRUE
@@ -432,9 +526,9 @@
*
* return TRUE if conflicting, otherwise FALSE
*/
-/mob/proc/inventory_slot_semantic_conflict(obj/item/I, datum/inventory_slot_meta/slot, mob/user)
+/mob/proc/inventory_slot_semantic_conflict(obj/item/I, datum/inventory_slot/slot, mob/user)
. = FALSE
- slot = resolve_inventory_slot_meta(slot)
+ slot = resolve_inventory_slot(slot)
return slot._equip_check(I, src, user)
/**
@@ -455,7 +549,7 @@
return FALSE
// resolve slot
- var/datum/inventory_slot_meta/slot_meta = resolve_inventory_slot_meta(slot)
+ var/datum/inventory_slot/slot_meta = resolve_inventory_slot(slot)
if(slot_meta.inventory_slot_flags & INV_SLOT_IS_ABSTRACT)
// if it's abstract, we go there directly - do not use can_equip as that will just guess.
return handle_abstract_slot_insertion(I, slot, flags)
@@ -579,7 +673,7 @@
* handles adding an item or updating an item to our hud
*/
/mob/proc/_handle_inventory_hud_update(obj/item/I, slot)
- var/datum/inventory_slot_meta/meta = resolve_inventory_slot_meta(slot)
+ var/datum/inventory_slot/meta = resolve_inventory_slot(slot)
I.screen_loc = meta.hud_position
if(client)
client.screen |= I
diff --git a/code/modules/mob/inventory/slot_meta.dm b/code/modules/mob/inventory/inventory_slot.dm
similarity index 75%
rename from code/modules/mob/inventory/slot_meta.dm
rename to code/modules/mob/inventory/inventory_slot.dm
index 13753a7d158c..f465688ef9aa 100644
--- a/code/modules/mob/inventory/slot_meta.dm
+++ b/code/modules/mob/inventory/inventory_slot.dm
@@ -8,8 +8,8 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache)
. = list()
GLOB.inventory_slot_meta = .
GLOB.inventory_slot_type_cache = list()
- for(var/path in subtypesof(/datum/inventory_slot_meta))
- var/datum/inventory_slot_meta/M = path
+ for(var/path in subtypesof(/datum/inventory_slot))
+ var/datum/inventory_slot/M = path
if(initial(M.abstract_type) == path)
continue
M = new path
@@ -27,7 +27,7 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache)
for(var/id in GLOB.inventory_slot_meta)
. += id
-/proc/cmp_inventory_slot_meta_dsc(datum/inventory_slot_meta/a, datum/inventory_slot_meta/b)
+/proc/cmp_inventory_slot_meta_dsc(datum/inventory_slot/a, datum/inventory_slot/b)
return b.sort_order - a.sort_order
/**
@@ -35,8 +35,8 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache)
*
* String IDs are not automatically converted to paths for speed.
*/
-/proc/resolve_inventory_slot_meta(datum/inventory_slot_meta/id)
- RETURN_TYPE(/datum/inventory_slot_meta)
+/proc/resolve_inventory_slot(datum/inventory_slot/id)
+ RETURN_TYPE(/datum/inventory_slot)
if(istype(id))
return id
else if(ispath(id))
@@ -46,8 +46,8 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache)
/**
* returns inventory slot render key for an id
*/
-/proc/resolve_inventory_slot_render_key(datum/inventory_slot_meta/id)
- return resolve_inventory_slot_meta(id)?.render_key
+/proc/resolve_inventory_slot_render_key(datum/inventory_slot/id)
+ return resolve_inventory_slot(id)?.render_key
/**
* get inventory slot meta of a typepath
@@ -57,7 +57,7 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache)
if(.)
return
for(var/id in GLOB.inventory_slot_meta)
- var/datum/inventory_slot_meta/slot = GLOB.inventory_slot_meta[id]
+ var/datum/inventory_slot/slot = GLOB.inventory_slot_meta[id]
if(slot.type != type)
continue
GLOB.inventory_slot_meta[type] = . = slot
@@ -77,11 +77,11 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache)
* They only work on equips - can_equip, and anything unrelating to unequips, cannot check for it well.
* Can equip supports some abstract slots but not others.
*/
-/datum/inventory_slot_meta
+/datum/inventory_slot
/// abstract type
- abstract_type = /datum/inventory_slot_meta
+ abstract_type = /datum/inventory_slot
- //! Intrinsics
+ //* Intrinsics
/// slot name
var/name = "unknown"
/// id
@@ -93,11 +93,11 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache)
/// display order - higher is upper. a
is applied on 0. var/sort_order = 0 - //! HUD + //* HUD /// our screen loc var/hud_position - //! Grammar + //* Grammar /// player friendly name var/display_name = "unknown" /// player friendly preposition @@ -105,7 +105,7 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) /// is this a "plural" slot? var/display_plural = FALSE - //! Equip Checks + //* Equip Checks /// equip checks to use var/slot_equip_checks = NONE /// slot flags required to have if checking @@ -113,13 +113,13 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) /// slot flags forbidden to have if checking var/slot_flags_forbidden = NONE - //! Stripping + //* Stripping /// always show on strip/force equip menu, or only show when full var/always_show_on_strip_menu = TRUE /// default INV_VIEW flags for stripping var/default_strip_inv_view_flags = NONE - //! Rendering + //* Rendering /// rendering slot key var/render_key /// rendering plural slot key - only set on base type of plural slots @@ -136,14 +136,26 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) VAR_PRIVATE/list/render_dim_y_cache /// fallback states; if set for a bodytype, that bodytype converts to this if not in worn_bodytypes, rather than defaulted. VAR_PROTECTED/list/render_fallback + /// cascade renders to these slot ids + // todo: this should be flag-based; for a future refactor via /datum/inventory, not hardcoded! + VAR_PROTECTED/list/legacy_visibility_sensitive_slots = list() -/datum/inventory_slot_meta/New() +/datum/inventory_slot/New() if(!id && (inventory_slot_flags & INV_SLOT_ALLOW_RANDOM_ID)) id = "[++id_next]" + // resolve typepaths to ids + for(var/i in 1 to length(legacy_visibility_sensitive_slots)) + var/what = legacy_visibility_sensitive_slots[i] + if(ispath(what, /datum/inventory_slot)) + var/datum/inventory_slot/resolving = what + if(!initial(resolving.id)) + stack_trace("no id on [resolving]; cascade render slot targets should have hardcoded ids at this point in time") + legacy_visibility_sensitive_slots[i] = initial(resolving.id) + rebuild_rendering_caches() -/datum/inventory_slot_meta/proc/_equip_check(obj/item/I, mob/wearer, mob/user, flags) +/datum/inventory_slot/proc/_equip_check(obj/item/I, mob/wearer, mob/user, flags) if(slot_equip_checks & SLOT_EQUIP_CHECK_USE_FLAGS) if(!(flags & INV_OP_FORCE)) if(!CHECK_MULTIPLE_BITFIELDS(I.slot_flags, slot_flags_required)) @@ -158,16 +170,30 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) /** * checked if slot_equip_checks specifies to use proc */ -/datum/inventory_slot_meta/proc/allow_equip(obj/item/I, mob/wearer, mob/user, force) +/datum/inventory_slot/proc/allow_equip(obj/item/I, mob/wearer, mob/user, force) return TRUE /** * checks for obfuscation when making the strip menu */ -/datum/inventory_slot_meta/proc/strip_obfuscation_check(obj/item/equipped, mob/wearer, mob/user) +/datum/inventory_slot/proc/strip_obfuscation_check(obj/item/equipped, mob/wearer, mob/user) return default_strip_inv_view_flags -/datum/inventory_slot_meta/proc/rebuild_rendering_caches() +//* Rendering *// + +// todo: shouldn't have to specify bodytype +// todo: yes we should? otherwise we can't tell it to render differently against a mob's default bodytype. +/datum/inventory_slot/proc/render(mob/wearer, obj/item/item, bodytype) + return item.render_mob_appearance(wearer, id, bodytype) + +/datum/inventory_slot/proc/should_render(mob/wearer, obj/item/item) + return TRUE + +/datum/inventory_slot/proc/cascade_render_visibility(mob/wearer, obj/item/item) + for(var/slot_id in legacy_visibility_sensitive_slots) + wearer.inventory.update_slot_visible(slot_id, FALSE) + +/datum/inventory_slot/proc/rebuild_rendering_caches() PROTECTED_PROC(TRUE) // if you think you need this outside you should rethink render_state_cache = list() render_dim_x_cache = list() @@ -193,7 +219,7 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) /** * returns (icon, dim_x, dim_y) if found in defaults, null if not */ -/datum/inventory_slot_meta/proc/resolve_default_assets(bodytype, state, mob/wearer, obj/item/equipped, inhand_domain) +/datum/inventory_slot/proc/resolve_default_assets(bodytype, state, mob/wearer, obj/item/equipped, inhand_domain) var/bodytype_str = bodytype_to_string(bodytype) if(!render_state_cache[bodytype_str]?[state]) return @@ -202,7 +228,7 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) /** * returns layer */ -/datum/inventory_slot_meta/proc/resolve_default_layer(bodytype, mob/wearer, obj/item/equipped, inhand_domain) +/datum/inventory_slot/proc/resolve_default_layer(bodytype, mob/wearer, obj/item/equipped, inhand_domain) if(!islist(render_layer)) return render_layer var/index = 1 @@ -214,7 +240,7 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) index = (B.show_above_suit == 1)? 2 : 1 return render_layer[clamp(index, 1, length(render_layer))] -/datum/inventory_slot_meta/proc/handle_worn_fallback(bodytype, list/worn_data) +/datum/inventory_slot/proc/handle_worn_fallback(bodytype, list/worn_data) var/bodytype_str = bodytype_to_string(bodytype) if(!render_fallback[bodytype_str]) return FALSE @@ -224,11 +250,13 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) worn_data[WORN_DATA_STATE] = render_fallback[bodytype_str] return TRUE -/datum/inventory_slot_meta/inventory - abstract_type = /datum/inventory_slot_meta/inventory +//? Implementations ?// + +/datum/inventory_slot/inventory + abstract_type = /datum/inventory_slot/inventory inventory_slot_flags = INV_SLOT_IS_RENDERED | INV_SLOT_IS_INVENTORY | INV_SLOT_IS_STRIPPABLE | INV_SLOT_HUD_REQUIRES_EXPAND | INV_SLOT_CONSIDERED_WORN -/datum/inventory_slot_meta/inventory/back +/datum/inventory_slot/inventory/back name = "back" render_key = "back" id = SLOT_ID_BACK @@ -248,9 +276,9 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) render_fallback = list( BODYTYPE_STRING_TESHARI = "_fallback_" ) - render_layer = BACK_LAYER + render_layer = HUMAN_LAYER_SLOT_BACKPACK -/datum/inventory_slot_meta/inventory/uniform +/datum/inventory_slot/inventory/uniform name = "uniform" render_key = "under" id = SLOT_ID_UNIFORM @@ -272,7 +300,10 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) BODYTYPE_STRING_TESHARI = "_fallback_", BODYTYPE_STRING_VOX = "_fallback_", ) - render_layer = UNIFORM_LAYER + render_layer = HUMAN_LAYER_SLOT_UNIFORM + legacy_visibility_sensitive_slots = list( + SLOT_ID_SHOES, + ) /// list of rolldown icons; must DIRECTLY corrospond to default icons. var/list/render_rolldown_icons = list( @@ -290,7 +321,7 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) /// list of rollsleeve states var/list/render_rollsleeve_states -/datum/inventory_slot_meta/inventory/uniform/rebuild_rendering_caches() +/datum/inventory_slot/inventory/uniform/rebuild_rendering_caches() . = ..() render_rolldown_states = list() for(var/bodytype_str in render_rolldown_icons) @@ -317,7 +348,7 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) for(var/state in render_rollsleeve_states[bodytype_str]) render_rollsleeve_states[bodytype_str][state] = TRUE -/datum/inventory_slot_meta/inventory/uniform/resolve_default_assets(bodytype, state, mob/wearer, obj/item/equipped, inhand_domain) +/datum/inventory_slot/inventory/uniform/resolve_default_assets(bodytype, state, mob/wearer, obj/item/equipped, inhand_domain) if(!istype(equipped, /obj/item/clothing/under)) return ..() var/obj/item/clothing/under/U = equipped @@ -331,13 +362,47 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) else return ..() -/datum/inventory_slot_meta/inventory/uniform/proc/check_rolldown_cache(bodytype, state) +/datum/inventory_slot/inventory/uniform/proc/check_rolldown_cache(bodytype, state) return render_rolldown_states[bodytype_to_string(bodytype)]?[state] -/datum/inventory_slot_meta/inventory/uniform/proc/check_rollsleeve_cache(bodytype, state) +/datum/inventory_slot/inventory/uniform/proc/check_rollsleeve_cache(bodytype, state) return render_rollsleeve_states[bodytype_to_string(bodytype)]?[state] -/datum/inventory_slot_meta/inventory/head +/datum/inventory_slot/inventory/uniform/should_render(mob/wearer, obj/item/item) + if(!ishuman(wearer)) + return ..() + var/mob/living/carbon/human/casted_human = wearer + if((casted_human.wear_suit?.inv_hide_flags) & HIDEJUMPSUIT) + return FALSE + return ..() + + +/datum/inventory_slot/inventory/uniform/render(mob/wearer, obj/item/item, bodytype) + . = ..() + if(!ishuman(wearer)) + return + var/mob/living/carbon/human/human = wearer + var/icon/clipmask = human.tail_style?.clip_mask + if(!clipmask) + return + var/tail_rendered = !!human.standing_overlays[HUMAN_OVERLAY_TAIL] + if(!tail_rendered) + return + if(istype(item, /obj/item/clothing/suit)) + var/obj/item/clothing/suit/suit = item + if(suit.inv_hide_flags & HIDETAIL) + return + if(suit.taurized) + return + var/list/mutating + if(!islist(.)) + mutating = list(.) + else + mutating = . + for(var/image/appearancelike as anything in mutating) + appearancelike.filters += filter(arglist(alpha_mask_filter(icon = clipmask))) + +/datum/inventory_slot/inventory/head name = "head" render_key = "head" id = SLOT_ID_HEAD @@ -367,9 +432,12 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) BODYTYPE_STRING_ZORREN_HIGH = 'icons/mob/clothing/species/fox/helmet.dmi', BODYTYPE_STRING_UNATHI_DIGI = 'icons/mob/clothing/species/unathidigi/head.dmi', ) - render_layer = HEAD_LAYER + render_layer = HUMAN_LAYER_SLOT_HEAD + legacy_visibility_sensitive_slots = list( + SLOT_ID_HEAD, + ) -/datum/inventory_slot_meta/inventory/suit +/datum/inventory_slot/inventory/suit name = "outerwear" render_key = "suit" id = SLOT_ID_SUIT @@ -401,9 +469,44 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) BODYTYPE_STRING_ZADDAT = 'icons/mob/clothing/species/zaddat/suits.dmi', BODYTYPE_STRING_UNATHI_DIGI = 'icons/mob/clothing/species/unathidigi/suits.dmi', ) - render_layer = SUIT_LAYER + render_layer = HUMAN_LAYER_SLOT_OVERSUIT + legacy_visibility_sensitive_slots = list( + SLOT_ID_UNIFORM, + SLOT_ID_SHOES, + ) -/datum/inventory_slot_meta/inventory/belt +/datum/inventory_slot/inventory/suit/render(mob/wearer, obj/item/item, bodytype) + . = ..() + if(!ishuman(wearer)) + return + var/mob/living/carbon/human/human = wearer + var/icon/clipmask = human.tail_style?.clip_mask + if(!clipmask) + return + var/tail_rendered = !!human.standing_overlays[HUMAN_OVERLAY_TAIL] + if(!tail_rendered) + return + if(istype(item, /obj/item/clothing/suit)) + var/obj/item/clothing/suit/suit = item + if(suit.taurized) + return + var/list/mutating + if(!islist(.)) + mutating = list(.) + else + mutating = . + for(var/image/appearancelike as anything in mutating) + appearancelike.filters += filter(arglist(alpha_mask_filter(icon = clipmask))) + +/datum/inventory_slot/inventory/suit/cascade_render_visibility(mob/wearer, obj/item/item) + . = ..() + var/mob/living/carbon/human/casted = wearer + if(!istype(casted)) + return + casted.render_spriteacc_tail() + casted.render_spriteacc_wings() + +/datum/inventory_slot/inventory/belt name = "belt" render_key = "belt" id = SLOT_ID_BELT @@ -420,16 +523,16 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) BODYTYPE_STRING_WEREBEAST = 'icons/mob/clothing/species/werebeast/belt.dmi', BODYTYPE_STRING_UNATHI_DIGI = 'icons/mob/clothing/species/unathidigi/belt.dmi', ) - render_layer = list(BELT_LAYER, BELT_LAYER_ALT) + render_layer = list(HUMAN_LAYER_SLOT_BELT, HUMAN_LAYER_SLOT_BELT_ALT) -/datum/inventory_slot_meta/inventory/pocket - abstract_type = /datum/inventory_slot_meta/inventory/pocket +/datum/inventory_slot/inventory/pocket + abstract_type = /datum/inventory_slot/inventory/pocket sort_order = 2000 inventory_slot_flags = INV_SLOT_IS_INVENTORY | INV_SLOT_IS_STRIPPABLE slot_equip_checks = SLOT_EQUIP_CHECK_USE_PROC default_strip_inv_view_flags = INV_VIEW_OBFUSCATE_HIDE_ITEM_NAME | INV_VIEW_STRIP_FUMBLE_ON_FAILURE | INV_VIEW_STRIP_IS_SILENT -/datum/inventory_slot_meta/inventory/pocket/allow_equip(obj/item/I, mob/wearer, mob/user, force) +/datum/inventory_slot/inventory/pocket/allow_equip(obj/item/I, mob/wearer, mob/user, force) . = ..() if(I.slot_flags & SLOT_DENYPOCKET) return FALSE @@ -437,21 +540,21 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) return TRUE return I.w_class <= WEIGHT_CLASS_SMALL -/datum/inventory_slot_meta/inventory/pocket/left +/datum/inventory_slot/inventory/pocket/left name = "left pocket" id = SLOT_ID_LEFT_POCKET display_name = "left pocket" display_preposition = "in" hud_position = ui_storage1 -/datum/inventory_slot_meta/inventory/pocket/right +/datum/inventory_slot/inventory/pocket/right name = "right pocket" id = SLOT_ID_RIGHT_POCKET display_name = "right pocket" display_preposition = "in" hud_position = ui_storage2 -/datum/inventory_slot_meta/inventory/id +/datum/inventory_slot/inventory/id name = "id" render_key = "id" id = SLOT_ID_WORN_ID @@ -470,9 +573,19 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) render_fallback = list( BODYTYPE_STRING_TESHARI = "_fallback_" ) - render_layer = ID_LAYER + render_layer = HUMAN_LAYER_SLOT_IDSLOT + +/datum/inventory_slot/inventory/id/should_render(mob/wearer, obj/item/item) + if(ishuman(wearer)) + var/mob/living/carbon/human/H = wearer + // todo: this should be a trait system. + if(istype(H.w_uniform, /obj/item/clothing/under)) + var/obj/item/clothing/under/uni = H.w_uniform + if(!uni.displays_id) + return FALSE + return ..() -/datum/inventory_slot_meta/inventory/shoes +/datum/inventory_slot/inventory/shoes name = "shoes" render_key = "shoes" id = SLOT_ID_SHOES @@ -494,9 +607,21 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) render_fallback = list( BODYTYPE_STRING_TESHARI = "_fallback_" // this doesn't actually exist, so item becomes invis ) - render_layer = list(SHOES_LAYER, SHOES_LAYER_ALT) + render_layer = list(HUMAN_LAYER_SLOT_SHOES, HUMAN_LAYER_SLOT_SHOES_ALT) -/datum/inventory_slot_meta/inventory/gloves +/datum/inventory_slot/inventory/shoes/should_render(mob/wearer, obj/item/item) + if(!ishuman(wearer)) + return ..() + var/mob/living/carbon/human/casted_human = wearer + if((casted_human.wear_suit?.inv_hide_flags | casted_human.w_uniform?.inv_hide_flags) & HIDESHOES) + return FALSE + for(var/bodypart in list(BP_L_FOOT, BP_R_FOOT)) + var/obj/item/organ/external/foot/foot = casted_human.get_organ(bodypart) + if(istype(foot) && foot.is_hidden_by_tail()) + return FALSE + return ..() + +/datum/inventory_slot/inventory/gloves name = "gloves" render_key = "gloves" id = SLOT_ID_GLOVES @@ -517,9 +642,9 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) render_fallback = list( BODYTYPE_STRING_TESHARI = "_fallback_" ) - render_layer = GLOVES_LAYER + render_layer = HUMAN_LAYER_SLOT_GLOVES -/datum/inventory_slot_meta/inventory/glasses +/datum/inventory_slot/inventory/glasses name = "glasses" render_key = "glasses" id = SLOT_ID_GLASSES @@ -540,9 +665,9 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) render_fallback = list( BODYTYPE_STRING_TESHARI = "_fallback_" ) - render_layer = GLASSES_LAYER + render_layer = HUMAN_LAYER_SLOT_GLASSES -/datum/inventory_slot_meta/inventory/suit_storage +/datum/inventory_slot/inventory/suit_storage name = "suit storage" render_key = "suit-store" id = SLOT_ID_SUIT_STORAGE @@ -552,9 +677,20 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) hud_position = ui_sstore1 slot_equip_checks = SLOT_EQUIP_CHECK_USE_PROC inventory_slot_flags = INV_SLOT_IS_RENDERED | INV_SLOT_IS_INVENTORY | INV_SLOT_IS_STRIPPABLE - render_layer = SUIT_STORE_LAYER + render_layer = HUMAN_LAYER_SLOT_SUITSTORE -/datum/inventory_slot_meta/inventory/suit_storage/allow_equip(obj/item/I, mob/wearer, mob/user, force) +/datum/inventory_slot/inventory/suit_storage/render(mob/wearer, obj/item/item, bodytype) + var/mob/living/carbon/human/casted_human = wearer + if(!istype(casted_human)) + return + var/datum/species/species = casted_human.species + return image( + icon = species.suit_storage_icon, + icon_state = item.item_state || item.icon_state, + layer = HUMAN_LAYER_SLOT_SUITSTORE, + ) + +/datum/inventory_slot/inventory/suit_storage/allow_equip(obj/item/I, mob/wearer, mob/user, force) . = ..() var/obj/item/suit_item = wearer.item_by_slot_id(SLOT_ID_SUIT) if(!suit_item) @@ -564,9 +700,9 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) return TRUE return FALSE -/datum/inventory_slot_meta/inventory/ears +/datum/inventory_slot/inventory/ears sort_order = 9500 - abstract_type = /datum/inventory_slot_meta/inventory/ears + abstract_type = /datum/inventory_slot/inventory/ears inventory_slot_flags = INV_SLOT_IS_RENDERED | INV_SLOT_IS_INVENTORY | INV_SLOT_IS_STRIPPABLE | INV_SLOT_CONSIDERED_WORN | INV_SLOT_HUD_REQUIRES_EXPAND render_default_icons = list( BODYTYPE_STRING_DEFAULT = 'icons/mob/clothing/ears.dmi', @@ -578,10 +714,10 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) render_fallback = list( BODYTYPE_STRING_TESHARI = "_fallback_" ) - render_layer = EARS_LAYER + render_layer = HUMAN_LAYER_SLOT_EARS render_key_plural = "ears" -/datum/inventory_slot_meta/inventory/ears/left +/datum/inventory_slot/inventory/ears/left name = "left ear" render_key = "ear-l" id = SLOT_ID_LEFT_EAR @@ -591,7 +727,7 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) slot_equip_checks = SLOT_EQUIP_CHECK_USE_FLAGS slot_flags_required = SLOT_EARS -/datum/inventory_slot_meta/inventory/ears/right +/datum/inventory_slot/inventory/ears/right name = "right ear" render_key = "ear-r" id = SLOT_ID_RIGHT_EAR @@ -600,9 +736,9 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) hud_position = ui_r_ear slot_equip_checks = SLOT_EQUIP_CHECK_USE_FLAGS slot_flags_required = SLOT_EARS - render_layer = EARS_LAYER + render_layer = HUMAN_LAYER_SLOT_EARS -/datum/inventory_slot_meta/inventory/mask +/datum/inventory_slot/inventory/mask name = "mask" render_key = "mask" id = SLOT_ID_MASK @@ -631,15 +767,22 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) render_fallback = list( BODYTYPE_STRING_TESHARI = "_fallback_", ) - render_layer = FACEMASK_LAYER + render_layer = HUMAN_LAYER_SLOT_MASK + +/datum/inventory_slot/inventory/mask/should_render(mob/wearer, obj/item/item) + if(ishuman(wearer)) + var/mob/living/carbon/human/casted_human = wearer + if(casted_human.head?.inv_hide_flags & HIDEMASK) + return FALSE + return ..() -/datum/inventory_slot_meta/restraints +/datum/inventory_slot/restraints sort_order = -250 always_show_on_strip_menu = FALSE - abstract_type = /datum/inventory_slot_meta/restraints + abstract_type = /datum/inventory_slot/restraints inventory_slot_flags = INV_SLOT_IS_RENDERED | INV_SLOT_IS_STRIPPABLE | INV_SLOT_STRIP_ONLY_REMOVES | INV_SLOT_STRIP_SIMPLE_LINK -/datum/inventory_slot_meta/restraints/handcuffs +/datum/inventory_slot/restraints/handcuffs name = "handcuffed" render_key = "handcuffs" id = SLOT_ID_HANDCUFFED @@ -651,12 +794,12 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) BODYTYPE_STRING_TESHARI = 'icons/mob/clothing/species/teshari/handcuffs.dmi', BODYTYPE_STRING_UNATHI_DIGI = 'icons/mob/clothing/species/unathidigi/handcuffs.dmi', ) - render_layer = HANDCUFF_LAYER + render_layer = HUMAN_LAYER_SLOT_HANDCUFFED -/datum/inventory_slot_meta/restraints/handcuffs/allow_equip(obj/item/I, mob/wearer, mob/user, force) +/datum/inventory_slot/restraints/handcuffs/allow_equip(obj/item/I, mob/wearer, mob/user, force) return istype(I, /obj/item/handcuffs) && !istype(I, /obj/item/handcuffs/legcuffs) -/datum/inventory_slot_meta/restraints/legcuffs +/datum/inventory_slot/restraints/legcuffs name = "legcuffed" render_key = "legcuffs" id = SLOT_ID_LEGCUFFED @@ -668,42 +811,42 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) BODYTYPE_STRING_TESHARI = 'icons/mob/clothing/species/teshari/handcuffs.dmi', BODYTYPE_STRING_UNATHI_DIGI = 'icons/mob/clothing/species/unathidigi/handcuffs.dmi' ) - render_layer = LEGCUFF_LAYER + render_layer = HUMAN_LAYER_SLOT_LEGCUFFED -/datum/inventory_slot_meta/restraints/legcuffs/allow_equip(obj/item/I, mob/wearer, mob/user, force) +/datum/inventory_slot/restraints/legcuffs/allow_equip(obj/item/I, mob/wearer, mob/user, force) return istype(I, /obj/item/handcuffs/legcuffs) /** * these have no excuse to be accessed by id * they will have randomized ids */ -/datum/inventory_slot_meta/abstract +/datum/inventory_slot/abstract inventory_slot_flags = INV_SLOT_IS_ABSTRACT | INV_SLOT_ALLOW_RANDOM_ID - abstract_type = /datum/inventory_slot_meta/abstract + abstract_type = /datum/inventory_slot/abstract -/datum/inventory_slot_meta/abstract/put_in_hands +/datum/inventory_slot/abstract/put_in_hands name = "put in hands" id = SLOT_ID_HANDS display_name = "hands" display_preposition = "in" display_plural = TRUE -/datum/inventory_slot_meta/abstract/attach_as_accessory +/datum/inventory_slot/abstract/attach_as_accessory name = "attach as accessory" display_name = "clothes" display_preposition = "clipped to" -/datum/inventory_slot_meta/abstract/put_in_backpack +/datum/inventory_slot/abstract/put_in_backpack name = "put in backpack" display_name = "backpack" display_preposition = "in" -/datum/inventory_slot_meta/abstract/put_in_belt +/datum/inventory_slot/abstract/put_in_belt name = "put in belt" display_name = "belt" display_preposition = "in" -/datum/inventory_slot_meta/abstract/put_in_storage +/datum/inventory_slot/abstract/put_in_storage name = "put in storage" display_name = "storage" display_preposition = "in" @@ -711,31 +854,31 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) /** * like put in storage, but prioritizes active, even if it's not on you. */ -/datum/inventory_slot_meta/abstract/put_in_storage_try_active +/datum/inventory_slot/abstract/put_in_storage_try_active name = "put in storage (active storage)" display_name = "storage" display_name = "in" -/datum/inventory_slot_meta/abstract/hand - abstract_type = /datum/inventory_slot_meta/abstract/hand +/datum/inventory_slot/abstract/hand + abstract_type = /datum/inventory_slot/abstract/hand // our render default icons are based on inhand type // this hijacks render_default_icons SO much but i don't care! /** * returns (icon, dim_x, dim_y) if found in defaults, null if not */ -/datum/inventory_slot_meta/abstract/hand/resolve_default_assets(bodytype, state, mob/wearer, obj/item/equipped, inhand_domain) +/datum/inventory_slot/abstract/hand/resolve_default_assets(bodytype, state, mob/wearer, obj/item/equipped, inhand_domain) if(!render_state_cache[inhand_domain]?[state]) return return list(render_default_icons[inhand_domain], render_dim_x_cache[inhand_domain], render_dim_y_cache[inhand_domain]) -/datum/inventory_slot_meta/abstract/hand/left +/datum/inventory_slot/abstract/hand/left name = "put in left hand" display_name = "left hand" display_preposition = "in" id = SLOT_ID_LEFT_HAND render_key = "left" - render_layer = L_HAND_LAYER + render_layer = HUMAN_LAYER_SLOT_LHAND render_default_icons = list( INHAND_DEFAULT_ICON_BALLS = 'icons/mob/items/lefthand_balls.dmi', INHAND_DEFAULT_ICON_BOOKS = 'icons/mob/items/lefthand_books.dmi', @@ -757,13 +900,13 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) INHAND_DEFAULT_ICON_64X64 = 'icons/mob/items/64x64_lefthand.dmi', ) -/datum/inventory_slot_meta/abstract/hand/right +/datum/inventory_slot/abstract/hand/right name = "put in right hand" display_name = "right hand" display_preposition = "in" id = SLOT_ID_RIGHT_HAND render_key = "right" - render_layer = R_HAND_LAYER + render_layer = HUMAN_LAYER_SLOT_RHAND render_default_icons = list( INHAND_DEFAULT_ICON_BALLS = 'icons/mob/items/righthand_balls.dmi', INHAND_DEFAULT_ICON_BOOKS = 'icons/mob/items/righthand_books.dmi', @@ -785,8 +928,8 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) INHAND_DEFAULT_ICON_64X64 = 'icons/mob/items/64x64_righthand.dmi', ) -/datum/inventory_slot_meta/abstract/use_one_for_accessory +/datum/inventory_slot/abstract/use_one_for_accessory render_key = "acc" -/datum/inventory_slot_meta/abstract/use_one_for_all +/datum/inventory_slot/abstract/use_one_for_all render_key = "all" diff --git a/code/modules/mob/inventory/items.dm b/code/modules/mob/inventory/items.dm index c05f784e2137..a63fbf7a26a2 100644 --- a/code/modules/mob/inventory/items.dm +++ b/code/modules/mob/inventory/items.dm @@ -387,7 +387,7 @@ /obj/item/proc/is_being_worn() if(!worn_slot) return FALSE - var/datum/inventory_slot_meta/slot_meta = resolve_inventory_slot_meta(worn_slot) + var/datum/inventory_slot/slot_meta = resolve_inventory_slot(worn_slot) return slot_meta.inventory_slot_flags & INV_SLOT_CONSIDERED_WORN /** diff --git a/code/modules/mob/inventory/rendering.dm b/code/modules/mob/inventory/rendering.dm index 164aa61eb697..25f9983f65ec 100644 --- a/code/modules/mob/inventory/rendering.dm +++ b/code/modules/mob/inventory/rendering.dm @@ -245,24 +245,26 @@ * * @params * * M - the mob we're rendering + * * slot_id_or_hand_index - the slot ID or numerical held index we're in + * * bodytype - the effective bodytype */ /obj/item/proc/render_mob_appearance(mob/M, slot_id_or_hand_index, bodytype = BODYTYPE_DEFAULT) // SHOULD_NOT_OVERRIDE(TRUE) // if you think you need to, rethink. // todo: eh reevaluate later // determine if in hands var/inhands = isnum(slot_id_or_hand_index)? slot_id_or_hand_index : null - var/datum/inventory_slot_meta/slot_meta + var/datum/inventory_slot/slot_meta // resolve slot if(inhands) - slot_meta = resolve_inventory_slot_meta((slot_id_or_hand_index % 2)? /datum/inventory_slot_meta/abstract/hand/left : /datum/inventory_slot_meta/abstract/hand/right) + slot_meta = resolve_inventory_slot((slot_id_or_hand_index % 2)? /datum/inventory_slot/abstract/hand/left : /datum/inventory_slot/abstract/hand/right) else - slot_meta = resolve_inventory_slot_meta(slot_id_or_hand_index) + slot_meta = resolve_inventory_slot(slot_id_or_hand_index) var/list/resolved = resolve_worn_assets(M, slot_meta, inhands, bodytype) return _render_mob_appearance(M, slot_meta, inhands, bodytype, resolved[WORN_DATA_ICON], resolved[WORN_DATA_STATE], resolved[WORN_DATA_LAYER], resolved [WORN_DATA_SIZE_X], resolved[WORN_DATA_SIZE_Y], resolved[WORN_DATA_ALIGN_Y]) -/obj/item/proc/_render_mob_appearance(mob/M, datum/inventory_slot_meta/slot_meta, inhands, bodytype, icon_used, state_used, layer_used, dim_x, dim_y, align_y) +/obj/item/proc/_render_mob_appearance(mob/M, datum/inventory_slot/slot_meta, inhands, bodytype, icon_used, state_used, layer_used, dim_x, dim_y, align_y) SHOULD_NOT_OVERRIDE(TRUE) // if you think you need to, rethink. PRIVATE_PROC(TRUE) // if you think you need to call this, rethink. var/list/additional = render_additional(M, icon_used, state_used, layer_used, dim_x, dim_y, align_y, bodytype, inhands, slot_meta) @@ -273,7 +275,7 @@ // worn_state_guard makes us not render if we'd render the same as in-inventory icon. if(no_render) // don't bother return additional - MA = mutable_appearance(icon_used, state_used, BODY_LAYER + layer_used, FLOAT_PLANE) + MA = mutable_appearance(icon_used, state_used, layer_used, FLOAT_PLANE) // temporary - until coloration MA.color = color MA = center_appearance(MA, dim_x, dim_y) @@ -288,7 +290,7 @@ * * icon/icon state/layer information is included in the mutable appearance */ -/obj/item/proc/render_apply_custom(mob/M, mutable_appearance/MA, bodytype, inhands, datum/inventory_slot_meta/slot_meta, icon_used, align_y) +/obj/item/proc/render_apply_custom(mob/M, mutable_appearance/MA, bodytype, inhands, datum/inventory_slot/slot_meta, icon_used, align_y) return MA /** @@ -296,13 +298,13 @@ * * icon/icon state/layer information is included in the mutable appearance */ -/obj/item/proc/render_apply_blood(mutable_appearance/MA, bodytype, inhands, datum/inventory_slot_meta/slot_meta, icon_used) +/obj/item/proc/render_apply_blood(mutable_appearance/MA, bodytype, inhands, datum/inventory_slot/slot_meta, icon_used) return MA /** * override to apply overlays to our current mutable appearance; called first */ -/obj/item/proc/render_apply_overlays(mutable_appearance/MA, bodytype, inhands, datum/inventory_slot_meta/slot_meta, icon_used) +/obj/item/proc/render_apply_overlays(mutable_appearance/MA, bodytype, inhands, datum/inventory_slot/slot_meta, icon_used) if(addblends) var/mutable_appearance/adding = mutable_appearance(icon = MA.icon, icon_state = addblends) adding.blend_mode = BLEND_ADD @@ -312,7 +314,7 @@ /** * override to include additional appearances while rendering */ -/obj/item/proc/render_additional(mob/M, icon/icon_used, state_used, layer_used, dim_x, dim_y, align_y, bodytype, inhands, datum/inventory_slot_meta/slot_meta) +/obj/item/proc/render_additional(mob/M, icon/icon_used, state_used, layer_used, dim_x, dim_y, align_y, bodytype, inhands, datum/inventory_slot/slot_meta) RETURN_TYPE(/list) return list() @@ -325,9 +327,9 @@ * - inhands - if we're going to inhands * - bodytype - bodytype in question */ -/obj/item/proc/resolve_worn_assets(mob/M, datum/inventory_slot_meta/slot_meta, inhands, bodytype) +/obj/item/proc/resolve_worn_assets(mob/M, datum/inventory_slot/slot_meta, inhands, bodytype) if(istext(slot_meta)) - slot_meta = resolve_inventory_slot_meta(slot_meta) + slot_meta = resolve_inventory_slot(slot_meta) var/list/data = new /list(WORN_DATA_LIST_SIZE) //? state ; item_state_slots --> (worn_state | inhand_state) --> item_state --> icon_state @@ -422,20 +424,20 @@ /obj/item/proc/debug_worn_assets(slot_or_id, mob/M = worn_mob(), bodytype) var/mob/living/carbon/human/H = ishuman(M)? M : null - var/datum/inventory_slot_meta/slot_meta + var/datum/inventory_slot/slot_meta if(isnull(slot_or_id)) slot_or_id = worn_slot if(isnum(slot_or_id)) - slot_meta = resolve_inventory_slot_meta((slot_or_id % 2)? /datum/inventory_slot_meta/abstract/hand/left : /datum/inventory_slot_meta/abstract/hand/right) + slot_meta = resolve_inventory_slot((slot_or_id % 2)? /datum/inventory_slot/abstract/hand/left : /datum/inventory_slot/abstract/hand/right) else - slot_meta = resolve_inventory_slot_meta(slot_or_id) + slot_meta = resolve_inventory_slot(slot_or_id) if(isnull(bodytype) && H) bodytype = H.species.get_effective_bodytype(H, src, slot_meta) . = resolve_worn_assets(M, slot_meta, isnum(slot_or_id), bodytype) .[WORN_DATA_ICON] = "[.[WORN_DATA_ICON]]" // todo: remove, aka get rid of fucking uniform _s state -/obj/item/proc/resolve_legacy_state(mob/M, datum/inventory_slot_meta/slot_meta, inhands, bodytype) +/obj/item/proc/resolve_legacy_state(mob/M, datum/inventory_slot/slot_meta, inhands, bodytype) return (item_state_slots?[slot_meta.id]) || (inhands? inhand_state : worn_state) || item_state || icon_state /obj/item/proc/resolve_worn_state(inhands, slot_key, bodytype) diff --git a/code/modules/mob/inventory/stripping.dm b/code/modules/mob/inventory/stripping.dm index ce9ed20c094b..20691482912a 100644 --- a/code/modules/mob/inventory/stripping.dm +++ b/code/modules/mob/inventory/stripping.dm @@ -33,7 +33,7 @@ var/last_order for(var/id in slot_ids) // todo: optimize - var/datum/inventory_slot_meta/meta = resolve_inventory_slot_meta(id) + var/datum/inventory_slot/meta = resolve_inventory_slot(id) var/remove_only = meta.inventory_slot_flags & INV_SLOT_STRIP_ONLY_REMOVES var/obj/item/I = _item_by_slot(id) if(remove_only && !I) @@ -97,7 +97,7 @@ if(!strip_interaction_prechecks(user)) return FALSE - var/datum/inventory_slot_meta/slot_meta = resolve_inventory_slot_meta(slot_id) + var/datum/inventory_slot/slot_meta = resolve_inventory_slot(slot_id) if(!slot_meta) return FALSE @@ -158,9 +158,9 @@ var/view_flags = NONE - var/datum/inventory_slot_meta/slot_meta = resolve_inventory_slot_meta(slot_id_or_index) + var/datum/inventory_slot/slot_meta = resolve_inventory_slot(slot_id_or_index) if(!isnum(slot_id_or_index)) - slot_meta = resolve_inventory_slot_meta(slot_id_or_index) + slot_meta = resolve_inventory_slot(slot_id_or_index) view_flags = slot_meta.strip_obfuscation_check(ours, src, user) if(view_flags & (INV_VIEW_OBFUSCATE_HIDE_SLOT)) return FALSE // how are you seeing this @@ -252,7 +252,7 @@ return var/slot = I.worn_slot if(slot != SLOT_ID_HANDS) - var/datum/inventory_slot_meta/slot_meta = resolve_inventory_slot_meta(slot) + var/datum/inventory_slot/slot_meta = resolve_inventory_slot(slot) var/view_flags = slot_meta.strip_obfuscation_check(I, src, user) if(view_flags & (INV_VIEW_OBFUSCATE_DISALLOW_INTERACT | INV_VIEW_OBFUSCATE_HIDE_ITEM_EXISTENCE | INV_VIEW_OBFUSCATE_HIDE_SLOT)) return // how tf are you gonna interact with it huh diff --git a/code/modules/mob/living/carbon/breathe.dm b/code/modules/mob/living/carbon/breathe.dm index 5e7ead6578f4..5213fe1a9b7e 100644 --- a/code/modules/mob/living/carbon/breathe.dm +++ b/code/modules/mob/living/carbon/breathe.dm @@ -72,9 +72,9 @@ if(breath) //handle mask filtering - if(istype(wear_mask, /obj/item/clothing/mask) && breath) + if(istype(wear_mask, /obj/item/clothing/mask)) var/obj/item/clothing/mask/M = wear_mask - var/datum/gas_mixture/gas_filtered = M.filter_air(breath) + var/datum/gas_mixture/gas_filtered = M.process_air(breath) loc.assume_air(gas_filtered) return breath return null @@ -96,4 +96,8 @@ /mob/living/carbon/proc/handle_post_breath(datum/gas_mixture/breath) if(breath) - loc?.assume_air(breath) //by default, exhale + if(istype(wear_mask, /obj/item/clothing/mask)) + var/obj/item/clothing/mask/M = wear_mask + loc.assume_air(M.process_exhale(breath)) + else + loc?.assume_air(breath) //by default, exhale diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm index 1eab6fae097d..2db93426db2b 100644 --- a/code/modules/mob/living/carbon/carbon_defense.dm +++ b/code/modules/mob/living/carbon/carbon_defense.dm @@ -4,6 +4,12 @@ return null ..() +/mob/living/carbon/emp_act(severity) + . = ..() + // tODO: REFACTOR THIS DUMB SHIT + for(var/obj/item/organ/organ in organs | internal_organs) + organ.emp_act(severity) + /mob/living/carbon/standard_weapon_hit_effects(obj/item/I, mob/living/user, var/effective_force, var/blocked, var/soaked, var/hit_zone) if(!effective_force || blocked >= 100) return 0 diff --git a/code/modules/mob/living/carbon/carbon_defines.dm b/code/modules/mob/living/carbon/carbon_defines.dm index 8cea5e39817e..d3eb1024b1d8 100644 --- a/code/modules/mob/living/carbon/carbon_defines.dm +++ b/code/modules/mob/living/carbon/carbon_defines.dm @@ -1,13 +1,13 @@ /** * The root type of complex mobs. - * + * * These mobs have: * * organ / bodypart simulation * * reagent metabolism * * species * * virus simulation * * and more. - * + * * todo: this should be carbon.dm at some point */ /mob/living/carbon @@ -18,6 +18,12 @@ /// species - datumized handling of racial intrinsics like health, environmental, breathing, etc. set using set_species() **only** var/datum/species/species + //* Rendering *// + /// keyed overlay storage list + /// must map key to an overlay or a list of overlays + /// the overlay in question must be an image or a mutable appearance + var/list/standing_overlays = list() + var/list/stomach_contents = list() ///var/list/datum/disease2/disease/virus2 = list() var/list/antibodies = list() diff --git a/code/modules/mob/living/carbon/carbon_movement.dm b/code/modules/mob/living/carbon/carbon_movement.dm index a8bbd6f793e2..059deedb94f7 100644 --- a/code/modules/mob/living/carbon/carbon_movement.dm +++ b/code/modules/mob/living/carbon/carbon_movement.dm @@ -5,12 +5,9 @@ if(src.nutrition && src.stat != 2) if(ishuman(src)) var/mob/living/carbon/human/M = src - if(M.stat != 2 && M.nutrition > 0) - M.nutrition -= M.species.hunger_factor/10 - if(M.m_intent == "run") - M.nutrition -= M.species.hunger_factor/10 - if(M.nutrition < 0) - M.nutrition = 0 + if(M.stat != 2 && M.nutrition > 0 && M.m_intent == MOVE_INTENT_RUN) + // Only running takes nutrition now, still as much as before + M.nutrition = max(0, M.nutrition - M.species.hunger_factor/5) else src.nutrition -= DEFAULT_HUNGER_FACTOR/10 if(src.m_intent == "run") diff --git a/code/modules/mob/living/carbon/damage_procs.dm b/code/modules/mob/living/carbon/damage_procs.dm index 0f6d2d9f2c61..3aa39ee701a8 100644 --- a/code/modules/mob/living/carbon/damage_procs.dm +++ b/code/modules/mob/living/carbon/damage_procs.dm @@ -27,7 +27,7 @@ if(!defer_updates && .) update_health() - UpdateDamageIcon() + update_damage_overlay() /mob/living/carbon/take_overall_damage(brute, burn, damage_mode, weapon_descriptor, defer_updates) if(status_flags & STATUS_GODMODE) @@ -43,4 +43,4 @@ if(!defer_updates && .) update_health() - UpdateDamageIcon() + update_damage_overlay() diff --git a/code/modules/mob/living/carbon/health.dm b/code/modules/mob/living/carbon/health.dm index 60324390e38f..90f260a9ffdb 100644 --- a/code/modules/mob/living/carbon/health.dm +++ b/code/modules/mob/living/carbon/health.dm @@ -18,3 +18,5 @@ ingested.clear_reagents() touching.clear_reagents() // todo: organs + // redo graphics + rebuild_standing_overlays() diff --git a/code/modules/mob/living/carbon/human/ai_controlled/ai_controlled.dm b/code/modules/mob/living/carbon/human/ai_controlled/ai_controlled.dm index 51608c1e1e80..c43d9c05500a 100644 --- a/code/modules/mob/living/carbon/human/ai_controlled/ai_controlled.dm +++ b/code/modules/mob/living/carbon/human/ai_controlled/ai_controlled.dm @@ -81,10 +81,10 @@ equip_to_slot_or_del(new to_wear_back(src), SLOT_ID_BACK) if(to_wear_l_hand) - equip_to_slot_or_del(new to_wear_l_hand(src), /datum/inventory_slot_meta/abstract/hand/left) + equip_to_slot_or_del(new to_wear_l_hand(src), /datum/inventory_slot/abstract/hand/left) if(to_wear_r_hand) - equip_to_slot_or_del(new to_wear_r_hand(src), /datum/inventory_slot_meta/abstract/hand/right) + equip_to_slot_or_del(new to_wear_r_hand(src), /datum/inventory_slot/abstract/hand/right) if(to_wear_id_type) var/obj/item/card/id/W = new to_wear_id_type(src) diff --git a/code/modules/mob/living/carbon/human/appearance.dm b/code/modules/mob/living/carbon/human/appearance.dm index c845bd03d641..e213076aa78f 100644 --- a/code/modules/mob/living/carbon/human/appearance.dm +++ b/code/modules/mob/living/carbon/human/appearance.dm @@ -75,7 +75,7 @@ grad_wingstyle = wing_gradient - update_wing_showing() + render_spriteacc_wings() return 1 /mob/living/carbon/human/proc/change_facial_hair(var/facial_hair_style) @@ -212,9 +212,9 @@ var/datum/sprite_accessory/S = GLOB.legacy_hair_lookup[hairstyle] if(check_gender && gender != NEUTER) - if(gender == MALE && S.gender == FEMALE) + if(gender == MALE && S.random_generation_gender == FEMALE) continue - else if(gender == FEMALE && S.gender == MALE) + else if(gender == FEMALE && S.random_generation_gender == MALE) continue if(S.apply_restrictions && !(use_species in S.species_allowed)) @@ -233,11 +233,8 @@ for(var/facialhairstyle in GLOB.legacy_facial_hair_lookup) var/datum/sprite_accessory/S = GLOB.legacy_facial_hair_lookup[facialhairstyle] - if(gender != NEUTER) - if(gender == MALE && S.gender == FEMALE) - continue - else if(gender == FEMALE && S.gender == MALE) - continue + if(!isnull(S.random_generation_gender) && gender != S.random_generation_gender) + continue if(S.apply_restrictions && !(use_species in S.species_allowed)) continue diff --git a/code/modules/mob/living/carbon/human/blood.dm b/code/modules/mob/living/carbon/human/blood.dm index b7b1dbcfd8c7..1e02d8efeafe 100644 --- a/code/modules/mob/living/carbon/human/blood.dm +++ b/code/modules/mob/living/carbon/human/blood.dm @@ -45,6 +45,15 @@ var/const/CE_STABLE_THRESHOLD = 0.5 B.color = B.data["blood_colour"] B.name = B.data["blood_name"] +/mob/living/carbon/human/proc/fixblood_if_broken() + if(species.species_flags & NO_BLOOD) + return + if(!should_have_organ(O_HEART)) + return + if(!vessel.has_reagent("blood")) + vessel.add_reagent("blood", 0.1) + fixblood() + // Takes care blood loss and regeneration /mob/living/carbon/human/handle_blood() if(inStasisNow()) @@ -211,7 +220,7 @@ var/const/CE_STABLE_THRESHOLD = 0.5 if(!amt) return 0 - if(amt > vessel.get_reagent_amount("blood")) + if(amt >= vessel.get_reagent_amount("blood")) amt = vessel.get_reagent_amount("blood") - 1 // Bit of a safety net; it's impossible to add blood if there's not blood already in the vessel. return vessel.remove_reagent("blood",amt * (src.mob_size/MOB_MEDIUM)) @@ -260,6 +269,9 @@ var/const/CE_STABLE_THRESHOLD = 0.5 if(vessel.get_reagent_amount("blood") < amount) return null + if(amount >= vessel.get_reagent_amount("blood")) + amount = vessel.get_reagent_amount("blood") - 1 // Bit of a safety net; it's impossible to add blood if there's not blood already in the vessel. + . = ..() vessel.remove_reagent("blood",amount) // Removes blood if human @@ -286,6 +298,8 @@ var/const/CE_STABLE_THRESHOLD = 0.5 reagents.add_reagent("blood", amount, injected.data) reagents.update_total() return + + fixblood_if_broken() var/datum/reagent/blood/our = get_blood(vessel) diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index dc6a4f7a171a..457416f29466 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -354,13 +354,13 @@ m_type = 1 if("ara") - message = "aras" + message = "aras." var/use_sound use_sound = pick('sound/voice/ara_ara1.ogg','sound/voice/ara_ara2.ogg') playsound(src.loc, use_sound, 50, 0) if("uwu") - message = "lets out a devious noise" + message = "lets out a devious noise." playsound(src.loc, 'sound/voice/uwu.ogg', 50, 0) if ("drool") @@ -444,7 +444,8 @@ robotic = 1 if(!robotic) message = "coughs up a small amount of blood!" - BloodyMouth() + //! disabled for shitcode reasons + // BloodyMouth() if(get_gender() == FEMALE) if(species.female_cough_sounds) playsound(src, pick(species.female_cough_sounds), 120) @@ -961,10 +962,12 @@ src.animate_tail_once() if("wag", "sway") - src.animate_tail_start() + src.toggle_tail_vr() + // src.animate_tail_start() if("qwag", "fastsway") - src.animate_tail_fast() + src.toggle_tail_vr() + // src.animate_tail_fast() if("swag", "stopsway") src.animate_tail_stop() @@ -1035,10 +1038,10 @@ return if ("help") - to_chat(src, "nyaha, awoo, bark, blink, blink_r, blush, bow-(none)/mob, burp, chirp, choke, chuckle, clap, collapse, cough, cry, custom, deathgasp, drool, eyebrow, fastsway/qwag, \ - flip, frown, gasp, giggle, glare-(none)/mob, grin, groan, grumble, handshake, hiss, hug-(none)/mob, laugh, look-(none)/mob, merp, moan, mumble, nod, nya, pale, peep, point-atom, \ + to_chat(src, "nyaha, ara, awoo, bark, bleat, blink, blink_r, blush, bow-(none)/mob, burp, chirp, choke, chuckle, clap, collapse, cough, cry, custom, deathgasp, drool, eyebrow, fastsway/qwag, \ + flip, frown, gasp, giggle, glare-(none)/mob, grin, groan, grumble, handshake, hiss, hug-(none)/mob, laugh, look-(none)/mob, mar, merp, moan, mrrp, mumble, nod, nya, pale, peep, point-atom, prbt, \ raise, roll, salute, fullsalute, scream, sneeze, shake, shiver, shrug, sigh, signal-#1-10, slap-(none)/mob, smile, sneeze, sniff, snore, stare-(none)/mob, stopsway/swag, squeak, sway/wag, swish, tremble, twitch, \ - twitch_v, vomit, weh, whimper, wink, yawn. Moth: mchitter, mlaugh, mscream, msqueak. Synthetics: beep, buzz, buzz2, chime, die, dwoop, error, honk, no, ping, rcough, rsneeze, scary, \ + twitch_v, uwu, vomit, weh, whimper, wink, yawn. Moth: mchitter, mlaugh, mscream, msqueak. Synthetics: beep, buzz, buzz2, chime, die, dwoop, error, honk, no, ping, rcough, rsneeze, scary, \ shutdown, startup, warn, ye, yes. Vox: shriekshort, shriekloud") else @@ -1110,19 +1113,19 @@ if ("vwag") if(toggle_tail_vr(message = 1)) m_type = 1 - message = "[wagging ? "starts" : "stops"] wagging their tail." + message = "[get_sprite_accessory_variation(SPRITE_ACCESSORY_SLOT_TAIL, SPRITE_ACCESSORY_VARIATION_WAGGING) ? "starts" : "stops"] wagging their tail." else return 1 if ("vflap") if(toggle_wing_vr(message = 1)) m_type = 1 - message = "[flapping ? "starts" : "stops"] flapping their wings." + message = "[get_sprite_accessory_variation(SPRITE_ACCESSORY_SLOT_WINGS, SPRITE_ACCESSORY_VARIATION_FLAPPING) ? "starts" : "stops"] flapping their wings." else return 1 if ("vspread") if(toggle_wing_spread(message = 1)) m_type = 1 - message = "[spread ? "extends" : "retracts"] their wings." + message = "[get_sprite_accessory_variation(SPRITE_ACCESSORY_SLOT_WINGS, SPRITE_ACCESSORY_VARIATION_SPREAD) ? "extends" : "retracts"] their wings." else return 1 if ("mlem") @@ -1161,7 +1164,7 @@ playsound(src.loc, 'sound/misc/prbt.ogg', 50, 1, -1) m_type = 2 if ("mrrp") - message = "mrrps" + message = "mrrps." m_type = 2 playsound(src.loc, "sound/voice/mrrp.ogg", 50, 1, -1) if ("weh") @@ -1172,6 +1175,10 @@ message = "lets out a merp." m_type = 2 playsound(loc, 'sound/voice/merp.ogg', 50, 1, -1) + if ("bleat") + message = "bleats!" + m_type = 2 + playsound(loc, pick(list('sound/voice/baa.ogg','sound/voice/baa2.ogg')), 50, 1, -1) if ("bark") message = "lets out a bark." m_type = 2 @@ -1187,7 +1194,7 @@ if("mar") message = "lets out a mar." m_type = 2 - playsound(loc, 'sound/voice/mar.ogg', 50, 1, -1) + playsound(loc, 'sound/voice/mar.ogg', 50, 1, -1) if ("nsay") nsay() return TRUE @@ -1259,51 +1266,6 @@ /mob/living/carbon/human/proc/spam_flag_false() //used for addtimer spam_flag = FALSE -/mob/living/carbon/human/proc/toggle_tail_vr(var/setting,var/message = 0) - if(!tail_style || !tail_style.ani_state) - if(message) - to_chat(src, "You don't have a tail that supports this.") - return 0 - - var/new_wagging = isnull(setting) ? !wagging : setting - if(new_wagging != wagging) - wagging = new_wagging - update_tail_showing() - return 1 - -/mob/living/carbon/human/proc/toggle_wing_vr(var/setting,var/message = 0) - if(!wing_style || !wing_style.ani_state) - if(message) - to_chat(src, "You don't have wings that support this.") - return 0 - - var/new_flapping = isnull(setting) ? !flapping : setting - if(new_flapping != flapping) - flapping = setting - if(flapping) - spread = FALSE - update_wing_showing() - return 1 - -/mob/living/carbon/human/proc/toggle_wing_spread(var/folded,var/message = 0) - if(!wing_style) - if(message) - to_chat(src, "You don't have wings!") - return 0 - - if(!wing_style.spr_state) - if(message) - to_chat(src, "You don't have wings that support this.") - return 0 - - var/new_spread = isnull(folded) ? !spread : folded - if(new_spread != spread) - spread = new_spread - if(spread) - flapping = FALSE - update_wing_showing() - return 1 - /mob/living/carbon/human/verb/toggle_gender_identity_vr() set name = "Set Gender Identity" set desc = "Sets the pronouns when examined and performing an emote." @@ -1313,10 +1275,3 @@ return 0 change_gender_identity(new_gender_identity) return 1 - -/mob/living/carbon/human/verb/switch_tail_layer() - set name = "Switch tail layer" - set category = VERB_CATEGORY_IC - set desc = "Switch tail layer on top." - tail_alt = !tail_alt - update_tail_showing() diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index f8976ba73c60..906f80f456a3 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -290,8 +290,7 @@ if(suiciding) . += SPAN_WARNING("[T.He] appears to have commited suicide... There is no hope of recovery.") - -//! I hate this. Though it's better than what it was before. -Zandario + //* I hate this. Though it's better than what it was before. -Zandario var/message = FALSE var/weight_examine = round(weight) if(show_pudge()) //Some clothing or equipment can hide this. @@ -323,7 +322,7 @@ else message = SPAN_DANGER("[T.He] [T.is] so morbidly obese, you wonder how [T.he] can even stand, let alone waddle around the station.") . += message -//! End of the bs + //* End of the bs if(attempt_vr(src,"examine_bellies",args)) . += attempt_vr(src,"examine_bellies",args) diff --git a/code/modules/mob/living/carbon/human/gradient.dm b/code/modules/mob/living/carbon/human/gradient.dm deleted file mode 100644 index 4b0352fdb3cc..000000000000 --- a/code/modules/mob/living/carbon/human/gradient.dm +++ /dev/null @@ -1,19 +0,0 @@ -GLOBAL_LIST_INIT(hair_gradients, list( - "None" = "none", - "Fade (Up)" = "fadeup", - "Fade Low (Up)" = "fadeup_low", - "Fade (Down)" = "fadedown", - "Fade Low (Down)" = "fadedown_low", - "Fade High (Down)" = "fadedown_high", - "Reflected (Center)"= "reflected", - "Reflected Inverse (Center)"= "reflected_inverse", - "Vertical Split (Back)"= "vsplit_back", - "Vertical Split" = "vsplit", - "Vertical Split (Back, Front Effect)"= "vsplit_dual", - "Bottom (Flat)" = "bottomflat", - "Shoulders (Flat)" = "shouldersflat", - "Wavy" = "wavy", - "Wavy Spiked" = "wavy_spiked", - "Striped" = "striped", - "Striped (Vertical)"= "striped_vertical" - )) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 59c9e65f598f..389205a497bf 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -44,8 +44,6 @@ dna.real_name = real_name sync_organ_dna() - init_world_bender_hud() - if(mapload) return INITIALIZE_HINT_LATELOAD @@ -65,19 +63,8 @@ qdel(organ) QDEL_NULL(nif) QDEL_LIST_NULL(vore_organs) - cleanup_world_bender_hud() return ..() -/mob/living/carbon/human/prepare_data_huds() - //Update med hud images... - . = ..() - //...sec hud images... - update_hud_sec_implants() - update_hud_sec_job() - update_hud_sec_status() - //...and display them. - add_to_all_human_data_huds() - /mob/living/carbon/human/statpanel_data(client/C) . = ..() if(C.statpanel_tab("Status")) @@ -1115,6 +1102,7 @@ return var/datum/species/S + var/datum/species/old_species = species // provided? if so, set // (and hope to god the provider isn't stupid and didn't quantum entangle a datum) @@ -1148,6 +1136,36 @@ reload_rendering() update_vision() + //! FUCK FUCK FUCK FUCK FUCK FUCK FUCK + for(var/key in species.sprite_accessory_defaults) + var/datum/sprite_accessory/accessory = species.sprite_accessory_defaults[key] + var/datum/sprite_accessory/existing = get_sprite_accessory(key) + if(existing && old_species?.sprite_accessory_defaults?[key] != existing) + continue + switch(key) + if(SPRITE_ACCESSORY_SLOT_EARS) + ear_style = accessory + r_ears = r_skin + g_ears = g_skin + b_ears = b_skin + if(SPRITE_ACCESSORY_SLOT_FACEHAIR) + if(SPRITE_ACCESSORY_SLOT_HAIR) + if(SPRITE_ACCESSORY_SLOT_HORNS) + horn_style = accessory + r_horn = r_skin + g_horn = g_skin + b_horn = b_skin + if(SPRITE_ACCESSORY_SLOT_TAIL) + tail_style = accessory + r_tail = r_skin + g_tail = g_skin + b_tail = b_skin + if(SPRITE_ACCESSORY_SLOT_WINGS) + wing_style = accessory + r_wing = r_skin + g_wing = g_skin + b_wing = b_skin + // skip the rest if(skip) return @@ -1260,6 +1278,7 @@ W.add_fingerprint(src) /mob/living/carbon/human/emp_act(severity) + . = ..() if(isSynthetic()) switch(severity) if(1) @@ -1279,8 +1298,6 @@ to_chat(src, "*BZZZT*") to_chat(src, "Warning: Electromagnetic pulse detected.") to_chat(src, "Warning: Navigation systems offline. Restarting...") - ..() - /mob/living/carbon/human/can_inject(var/mob/user, var/error_msg, var/target_zone, var/ignore_thickness = FALSE) . = 1 @@ -1586,21 +1603,6 @@ msg += get_display_species() return msg -//Crazy alternate human stuff -/mob/living/carbon/human/proc/init_world_bender_hud() - var/animal = pick("cow","chicken_brown", "chicken_black", "chicken_white", "chick", "mouse_brown", "mouse_gray", "mouse_white", "lizard", "cat2", "goose", "penguin") - var/image/img = image('icons/mob/animal.dmi', src, animal) - // hud refactor when - img.override = TRUE - LAZYINITLIST(hud_list) - hud_list[WORLD_BENDER_ANIMAL_HUD] = img - var/datum/atom_hud/world_bender/animals/A = GLOB.huds[WORLD_BENDER_HUD_ANIMALS] - A.add_to_hud(src) - -/mob/living/carbon/human/proc/cleanup_world_bender_hud() - var/datum/atom_hud/world_bender/animals/A = GLOB.huds[WORLD_BENDER_HUD_ANIMALS] - A.remove_from_hud(src) - /mob/living/carbon/human/get_mob_riding_slots() return list(back, head, wear_suit) diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm index 7a74efb5c0c0..7e6078e372d8 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/code/modules/mob/living/carbon/human/human_damage.dm @@ -292,7 +292,7 @@ if(!parts.len) return var/obj/item/organ/external/picked = pick(parts) if(picked.heal_damage(brute,burn)) - UpdateDamageIcon() + update_damage_overlay() update_health() @@ -316,7 +316,7 @@ parts -= picked update_health() if(update) - UpdateDamageIcon() + update_damage_overlay() //////////////////////////////////////////// diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index e400818df377..b87a9859e57f 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -33,54 +33,57 @@ /// Throws byond:tm: errors if placed in human/emote, but not here. var/spam_flag = FALSE - hud_possible = list( - LIFE_HUD, - BIOLOGY_HUD, - ID_HUD, - WANTED_HUD, - IMPLOYAL_HUD, - IMPTRACK_HUD, - IMPCHEM_HUD, - ANTAG_HUD, + atom_huds_to_initialize = list( + /datum/atom_hud_provider/medical_biology, + /datum/atom_hud_provider/medical_health, + /datum/atom_hud_provider/security_implant, + /datum/atom_hud_provider/security_job, + /datum/atom_hud_provider/security_status, + /datum/atom_hud_provider/special_role, + /datum/atom_hud_provider/overriding/world_bender_animals, ) //! Buckling - For riding.dm buckle_allowed = TRUE buckle_flags = BUCKLING_NO_DEFAULT_BUCKLE // Custom procs handle that. -//! ## Hair colour and style + //! LEGACY, TODO TO REMOVE + /// current head overlay pixel y offset + var/head_spriteacc_offset = 0 + + //* Hair colour and style var/h_style = "Bald" var/r_hair = 0 var/g_hair = 0 var/b_hair = 0 -//! ## Hair gradients + //* Hair gradients var/grad_style = "None" var/r_grad = 0 var/g_grad = 0 var/b_grad = 0 -//! ## Facial hair colour and style + //* Facial hair colour and style var/f_style = "Shaved" var/r_facial = 0 var/g_facial = 0 var/b_facial = 0 -//! ## Eye colour + //* Eye colour var/r_eyes = 0 var/g_eyes = 0 var/b_eyes = 0 /// Skin tone var/s_tone = 0 -//! ## Skin colour + //* Skin colour /// Skin flag var/skin_state = SKIN_NORMAL var/r_skin = 238 // TODO: Set defaults for other races. var/g_skin = 206 var/b_skin = 179 -//! ## ears, horns, tails, wings and custom species. + //* ears, horns, tails, wings and custom species. var/datum/sprite_accessory/ears/ear_style = null var/r_ears = 30 var/g_ears = 30 @@ -113,12 +116,16 @@ var/r_tail3 = 30 var/g_tail3 = 30 var/b_tail3 = 30 + // pain + var/legacy_tail_variation var/datum/sprite_accessory/wing/wing_style = null var/grad_wingstyle = "None" var/r_gradwing = 0 var/g_gradwing = 0 var/b_gradwing = 0 + // pain + var/legacy_wing_variation var/r_wing = 30 var/g_wing = 30 @@ -130,9 +137,6 @@ var/g_wing3 = 30 var/b_wing3 = 30 - var/wagging = 0 //UGH. - var/flapping = 0 - var/spread = 0 /// What's my status? var/vantag_pref = VANTAG_NONE // todo: REOMVE THIS FOR SPECIES VAR CHANGES @@ -147,7 +151,7 @@ var/custom_species -//! ## Synth colors + //* Synth colors /// Lets normally uncolorable synth parts be colorable. var/synth_color = 0 // Used with synth_color to color synth parts that normaly can't be colored. @@ -183,7 +187,7 @@ /// Which PDA type the player has chosen. var/pdachoice = 1 -//! ## General information + //* General information var/home_system = "" var/citizenship = "" var/personal_faction = "" @@ -191,7 +195,7 @@ var/antag_faction = "" var/antag_vis = "" -//! ## Equipment slots + //* Equipment slots var/obj/item/wear_suit = null var/obj/item/w_uniform = null var/obj/item/shoes = null diff --git a/code/modules/mob/living/carbon/human/human_organs.dm b/code/modules/mob/living/carbon/human/human_organs.dm index 17e661de0b5a..4d9e0db3c5fa 100644 --- a/code/modules/mob/living/carbon/human/human_organs.dm +++ b/code/modules/mob/living/carbon/human/human_organs.dm @@ -105,11 +105,12 @@ // Canes and crutches help you stand (if the latter is ever added) // One cane mitigates a broken leg+foot, or a missing foot. - // Two canes are needed for a lost leg. If you are missing both legs, canes aren't gonna help you. + var/cane_help=4 if (l_hand && istype(l_hand, /obj/item/cane)) - stance_damage -= 2 + stance_damage -= cane_help + cane_help-=1 if (r_hand && istype(r_hand, /obj/item/cane)) - stance_damage -= 2 + stance_damage -= cane_help // standing is poor if(stance_damage >= 4 || (stance_damage >= 2 && prob(5))) diff --git a/code/modules/mob/living/carbon/human/human_powers.dm b/code/modules/mob/living/carbon/human/human_powers.dm index 3eeafaaa6b1f..292a64e66136 100644 --- a/code/modules/mob/living/carbon/human/human_powers.dm +++ b/code/modules/mob/living/carbon/human/human_powers.dm @@ -398,7 +398,7 @@ return hiding_tail = !hiding_tail to_chat(usr, SPAN_SMALLNOTICE("You are now [hiding_tail ? "hiding" : "showing"] your tail.")) - update_tail_showing() + render_spriteacc_tail() /mob/living/carbon/human/proc/hide_wings() set name = "Toggle Hide Wings" @@ -409,7 +409,7 @@ return hiding_wings = !hiding_wings to_chat(usr, SPAN_SMALLNOTICE("You are now [hiding_wings ? "hiding" : "showing"] your wings.")) - update_wing_showing() + render_spriteacc_wings() /mob/living/carbon/human/proc/hide_horns() set name = "Toggle Hide Horns" diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index 32d7e8a521be..8c67c1da4092 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -266,7 +266,7 @@ . = ..() if(!.) return - var/datum/inventory_slot_meta/slot_meta = resolve_inventory_slot_meta(id) + var/datum/inventory_slot/slot_meta = resolve_inventory_slot(id) if(!slot_meta) return FALSE return !(slot_meta.inventory_slot_flags & INV_SLOT_IS_INVENTORY) || !species || (id in species.hud.gear) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 8b77562499d7..e7b3034586a0 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -775,6 +775,9 @@ MOB_BODYTEMP_EQUALIZATION_MAX_UNFAVORABLE \ ) + if(istype(loc, /obj/machinery/atmospherics/component/unary/cryo_cell)) + adjust = min(adjust, 2) // snowflake patch for cryo i fucking hate this aoguhwagoehs8ry0u34ajwioer + if(is_stabilizing) adjust_bodytemperature(adjust) else if(difference < 0) diff --git a/code/modules/mob/living/carbon/human/movement.dm b/code/modules/mob/living/carbon/human/movement.dm index 9ed5dcd925eb..d57738dc5b29 100644 --- a/code/modules/mob/living/carbon/human/movement.dm +++ b/code/modules/mob/living/carbon/human/movement.dm @@ -33,7 +33,7 @@ tally += (halloss / 45) //halloss shouldn't slow you down if you can't even feel it var/hungry = (500 - nutrition)/5 // So overeat would be 100 and default level would be 80 - if (hungry >= 70) + if (m_intent == MOVE_INTENT_RUN && hungry >= 70)//You can walk while hungry, but you cant run so fast while hungry tally += hungry/50 if(reagents.has_reagent("numbenzyme")) diff --git a/code/modules/mob/living/carbon/human/rendering.dm b/code/modules/mob/living/carbon/human/rendering.dm new file mode 100644 index 000000000000..1e601df9b654 --- /dev/null +++ b/code/modules/mob/living/carbon/human/rendering.dm @@ -0,0 +1,862 @@ +/mob/living/carbon/human/flatten_standing_overlays() + . = ..() + render_spriteacc_ears(TRUE) + render_spriteacc_facehair(TRUE) + render_spriteacc_hair(TRUE) + render_spriteacc_tail(TRUE) + render_spriteacc_wings(TRUE) + render_spriteacc_horns(TRUE) + reapply_standing_overlays() + +/mob/living/carbon/human/proc/render_spriteacc_ears(flatten) + if((head?.inv_hide_flags | wear_mask?.inv_hide_flags) & (BLOCKHEADHAIR | BLOCKHAIR)) + remove_standing_overlay(HUMAN_OVERLAY_EARS) + return + var/datum/sprite_accessory/rendering = get_sprite_accessory(SPRITE_ACCESSORY_SLOT_EARS) + if(isnull(rendering)) + remove_standing_overlay(HUMAN_OVERLAY_EARS) + return + var/obj/item/organ/external/head/head_organ = get_organ(BP_HEAD) + if(!head_organ || head_organ.is_stump()) + remove_standing_overlay(HUMAN_OVERLAY_EARS) + return + var/rendered = rendering.render( + src, + list( + rgb(r_ears, g_ears, b_ears), + rgb(r_ears2, g_ears2, b_ears2), + rgb(r_ears3, g_ears3, b_ears3), + ), + HUMAN_LAYER_SPRITEACC_EARS_FRONT, + HUMAN_LAYER_SPRITEACC_EARS_BEHIND, + 0, // TODO + null, + flattened = flatten, + ) + // todo: this is awful + if(islist(rendered)) + for(var/image/I as anything in rendered) + I.pixel_y += head_spriteacc_offset + I.alpha = head_organ.hair_opacity + else + var/image/I = rendered + I.pixel_y += head_spriteacc_offset + I.alpha = head_organ.hair_opacity + + . = rendered + set_standing_overlay(HUMAN_OVERLAY_EARS, rendered) + +/mob/living/carbon/human/proc/render_spriteacc_horns(flatten) + if((head?.inv_hide_flags | wear_mask?.inv_hide_flags) & (BLOCKHEADHAIR | BLOCKHAIR)) + remove_standing_overlay(HUMAN_OVERLAY_HORNS) + return + var/datum/sprite_accessory/rendering = get_sprite_accessory(SPRITE_ACCESSORY_SLOT_HORNS) + if(isnull(rendering)) + remove_standing_overlay(HUMAN_OVERLAY_HORNS) + return + if(hiding_horns && rendering.can_be_hidden) + //! legacy code + remove_standing_overlay(HUMAN_OVERLAY_HORNS) + return + var/obj/item/organ/external/head/head_organ = get_organ(BP_HEAD) + if(!head_organ || head_organ.is_stump()) + remove_standing_overlay(HUMAN_OVERLAY_HORNS) + return + var/rendered = rendering.render( + src, + list( + rgb(r_horn, g_horn, b_horn), + rgb(r_horn2, g_horn2, b_horn2), + rgb(r_horn3, g_horn3, b_horn3), + ), + HUMAN_LAYER_SPRITEACC_HORNS_FRONT, + HUMAN_LAYER_SPRITEACC_HORNS_BEHIND, + 0, // TODO + null, + flattened = flatten, + ) + // todo: this is awful + if(islist(rendered)) + for(var/image/I as anything in rendered) + I.pixel_y += head_spriteacc_offset + I.alpha = head_organ.hair_opacity + else + var/image/I = rendered + I.pixel_y += head_spriteacc_offset + I.alpha = head_organ.hair_opacity + + . = rendered + set_standing_overlay(HUMAN_OVERLAY_HORNS, rendered) + +/mob/living/carbon/human/proc/render_spriteacc_facehair(flatten) + if((head?.inv_hide_flags | wear_mask?.inv_hide_flags) & BLOCKHAIR) + remove_standing_overlay(HUMAN_OVERLAY_FACEHAIR) + return + var/datum/sprite_accessory/rendering = get_sprite_accessory(SPRITE_ACCESSORY_SLOT_FACEHAIR) + if(isnull(rendering)) + remove_standing_overlay(HUMAN_OVERLAY_FACEHAIR) + return + var/obj/item/organ/external/head/head_organ = get_organ(BP_HEAD) + if(!head_organ || head_organ.is_stump()) + remove_standing_overlay(HUMAN_OVERLAY_FACEHAIR) + return + var/rendered = rendering.render( + src, + list( + rgb(r_facial, g_facial, b_facial), + ), + HUMAN_LAYER_SPRITEACC_FACEHAIR_FRONT, + HUMAN_LAYER_SPRITEACC_FACEHAIR_BEHIND, + 0, // TODO + null, + flattened = flatten, + ) + // todo: this is awful + if(islist(rendered)) + for(var/image/I as anything in rendered) + I.pixel_y += head_spriteacc_offset + I.alpha = head_organ.hair_opacity + else + var/image/I = rendered + I.pixel_y += head_spriteacc_offset + I.alpha = head_organ.hair_opacity + + . = rendered + set_standing_overlay(HUMAN_OVERLAY_FACEHAIR, rendered) + +/mob/living/carbon/human/proc/render_spriteacc_hair(flatten) + if((head?.inv_hide_flags | wear_mask?.inv_hide_flags) & (BLOCKHEADHAIR | BLOCKHAIR)) + remove_standing_overlay(HUMAN_OVERLAY_HAIR) + return + var/datum/sprite_accessory/rendering = get_sprite_accessory(SPRITE_ACCESSORY_SLOT_HAIR) + if(isnull(rendering)) + remove_standing_overlay(HUMAN_OVERLAY_HAIR) + return + var/obj/item/organ/external/head/head_organ = get_organ(BP_HEAD) + if(!head_organ || head_organ.is_stump()) + remove_standing_overlay(HUMAN_OVERLAY_HAIR) + return + // todo: what is this for? + // if(head && (head.inv_hide_flags & BLOCKHEADHAIR)) + // if(!(hair_style.hair_flags & HAIR_VERY_SHORT)) + // hair_style = GLOB.legacy_hair_lookup["Short Hair"] + var/rendered = rendering.render( + src, + list( + rgb(r_hair, g_hair, b_hair), + ), + HUMAN_LAYER_SPRITEACC_HAIR_FRONT, + HUMAN_LAYER_SPRITEACC_HAIR_BEHIND, + 0, // TODO + null, + flattened = flatten, + ) + // todo: this is awful + if(islist(rendered)) + for(var/image/I as anything in rendered) + I.pixel_y += head_spriteacc_offset + I.alpha = head_organ.hair_opacity + else + var/image/I = rendered + I.pixel_y += head_spriteacc_offset + I.alpha = head_organ.hair_opacity + + . = rendered + set_standing_overlay(HUMAN_OVERLAY_HAIR, rendered) + +/mob/living/carbon/human/proc/render_spriteacc_wings(flatten) + var/datum/sprite_accessory/wing/rendering = get_sprite_accessory(SPRITE_ACCESSORY_SLOT_WINGS) + if(isnull(rendering)) + remove_standing_overlay(HUMAN_OVERLAY_WINGS) + return + if(hiding_wings && rendering.can_be_hidden) + //! legacy code + remove_standing_overlay(HUMAN_OVERLAY_WINGS) + return + var/rendered = rendering.render( + src, + list( + rgb(r_wing, g_wing, b_wing), + rgb(r_wing2, g_wing2, b_wing2), + rgb(r_wing3, g_wing3, b_wing3), + ), + HUMAN_LAYER_SPRITEACC_WINGS_FRONT, + HUMAN_LAYER_SPRITEACC_WINGS_BEHIND, + 0, // TODO + null, + legacy_wing_variation, + flattened = flatten, + ) + + . = rendered + set_standing_overlay(HUMAN_OVERLAY_WINGS, rendered) + + +/mob/living/carbon/human/proc/render_spriteacc_tail(flatten) + var/datum/sprite_accessory/tail/rendering = get_sprite_accessory(SPRITE_ACCESSORY_SLOT_TAIL) + if(isnull(rendering)) + remove_standing_overlay(HUMAN_OVERLAY_TAIL) + return + if(hiding_tail && rendering.can_be_hidden) + //! legacy code + remove_standing_overlay(HUMAN_OVERLAY_TAIL) + return + var/rendered = rendering.render( + src, + list( + rgb(r_tail, g_tail, b_tail), + rgb(r_tail2, g_tail2, b_tail2), + rgb(r_tail3, g_tail3, b_tail3), + ), + HUMAN_LAYER_SPRITEACC_TAIL_FRONT, + HUMAN_LAYER_SPRITEACC_TAIL_BEHIND, + 0, // TODO, + null, + legacy_tail_variation, + flattened = flatten, + ) + + . = rendered + set_standing_overlay(HUMAN_OVERLAY_TAIL, rendered) + +/mob/living/carbon/human/proc/set_wing_variation(variation) + var/datum/sprite_accessory/wing/rendering = get_sprite_accessory(SPRITE_ACCESSORY_SLOT_WINGS) + if(!rendering?.variations?[variation] && !isnull(variation)) + return + legacy_wing_variation = variation + render_spriteacc_wings() + +/mob/living/carbon/human/proc/set_tail_variation(variation) + var/datum/sprite_accessory/tail/rendering = get_sprite_accessory(SPRITE_ACCESSORY_SLOT_TAIL) + // todo: legacy sihtcode lol + if(istype(rendering) && rendering.ani_state && variation == SPRITE_ACCESSORY_VARIATION_WAGGING) + else + if(!rendering?.variations?[variation] && !isnull(variation)) + return + legacy_tail_variation = variation + render_spriteacc_tail() + +/mob/living/carbon/proc/get_sprite_accessory(slot) + return + +/mob/living/carbon/human/get_sprite_accessory(slot) + switch(slot) + if(SPRITE_ACCESSORY_SLOT_TAIL) + // . = GLOB.sprite_accessory_tails[tail_style] + . = tail_style + if(SPRITE_ACCESSORY_SLOT_HAIR) + . = GLOB.legacy_hair_lookup[h_style] + if(SPRITE_ACCESSORY_SLOT_FACEHAIR) + . = GLOB.legacy_facial_hair_lookup[f_style] + if(SPRITE_ACCESSORY_SLOT_WINGS) + // . = GLOB.sprite_accessory_wings[wing_style] + . = wing_style + if(SPRITE_ACCESSORY_SLOT_HORNS) + // . = GLOB.sprite_accessory_ears[horn_style] + . = horn_style + if(SPRITE_ACCESSORY_SLOT_EARS) + // . = GLOB.sprite_accessory_ears[ear_style] + . = ear_style + if(slot == SPRITE_ACCESSORY_SLOT_TAIL && !.) + var/datum/robolimb/limb = isSynthetic() + if(istype(limb)) + . = limb?.legacy_includes_tail + if(.) + //! :skull_emoji: + // todo: better defaulting system, this is horrible. + r_tail = r_skin + g_tail = g_skin + b_tail = b_skin + +/mob/living/carbon/proc/render_sprite_accessory(slot) + return + +/mob/living/carbon/human/render_sprite_accessory(slot) + switch(slot) + if(SPRITE_ACCESSORY_SLOT_TAIL) + render_spriteacc_tail() + if(SPRITE_ACCESSORY_SLOT_HAIR) + render_spriteacc_hair() + if(SPRITE_ACCESSORY_SLOT_FACEHAIR) + render_spriteacc_facehair() + if(SPRITE_ACCESSORY_SLOT_WINGS) + render_spriteacc_wings() + if(SPRITE_ACCESSORY_SLOT_HORNS) + render_spriteacc_horns() + if(SPRITE_ACCESSORY_SLOT_EARS) + render_spriteacc_ears() + +/mob/living/carbon/proc/set_sprite_accessory_variation(slot, variation) + return + +/mob/living/carbon/human/set_sprite_accessory_variation(slot, variation) + switch(slot) + if(SPRITE_ACCESSORY_SLOT_HAIR) + if(SPRITE_ACCESSORY_SLOT_FACEHAIR) + if(SPRITE_ACCESSORY_SLOT_HORNS) + if(SPRITE_ACCESSORY_SLOT_EARS) + if(SPRITE_ACCESSORY_SLOT_WINGS) + set_wing_variation(variation) + if(SPRITE_ACCESSORY_SLOT_TAIL) + set_tail_variation(variation) + +/mob/living/carbon/proc/has_sprite_accessory_variation(slot, variation) + return + +/mob/living/carbon/human/has_sprite_accessory_variation(slot, variation) + var/datum/sprite_accessory/resolved = get_sprite_accessory(slot) + if(istype(resolved, /datum/sprite_accessory/tail) && variation == SPRITE_ACCESSORY_VARIATION_WAGGING) + var/datum/sprite_accessory/tail/tail = resolved + if(tail.ani_state) + return TRUE + return (resolved?.variations?[variation])? TRUE : FALSE + +/mob/living/carbon/proc/get_sprite_accessory_variation(slot) + return + +/mob/living/carbon/human/get_sprite_accessory_variation(slot) + var/datum/sprite_accessory/resolved = get_sprite_accessory(slot) + var/variation + switch(slot) + if(SPRITE_ACCESSORY_SLOT_HAIR) + if(SPRITE_ACCESSORY_SLOT_FACEHAIR) + if(SPRITE_ACCESSORY_SLOT_HORNS) + if(SPRITE_ACCESSORY_SLOT_EARS) + if(SPRITE_ACCESSORY_SLOT_TAIL) + variation = legacy_tail_variation + if(SPRITE_ACCESSORY_SLOT_WINGS) + variation = legacy_wing_variation + if(istype(resolved, /datum/sprite_accessory/tail) && variation == SPRITE_ACCESSORY_VARIATION_WAGGING) + var/datum/sprite_accessory/tail/tail = resolved + if(tail.ani_state) + return SPRITE_ACCESSORY_VARIATION_WAGGING + return (resolved.variations?[variation])? variation : null + +//! old code below + +//Not really once, since BYOND can't do that. +//Update this if the ability to flick() images or make looping animation start at the first frame is ever added. +//You can sort of flick images now with flick_overlay -Aro +/mob/living/carbon/human/proc/animate_tail_once() + var/datum/sprite_accessory/accessory = get_sprite_accessory(SPRITE_ACCESSORY_SLOT_TAIL) + var/time = accessory.variation_animation_times?[SPRITE_ACCESSORY_VARIATION_WAGGING] || accessory.variation_animation_time + if(!set_sprite_accessory_variation(SPRITE_ACCESSORY_SLOT_TAIL, SPRITE_ACCESSORY_VARIATION_WAGGING)) + return + addtimer(CALLBACK(src, PROC_REF(animate_tail_reset)), time, TIMER_CLIENT_TIME) + +/mob/living/carbon/human/proc/toggle_tail_vr(var/setting,var/message = 0) + if(!has_sprite_accessory_variation(SPRITE_ACCESSORY_SLOT_TAIL, SPRITE_ACCESSORY_VARIATION_WAGGING)) + if(message) + to_chat(src, "You don't have a tail that supports this.") + return 0 + + if(!set_sprite_accessory_variation( + SPRITE_ACCESSORY_SLOT_TAIL, + get_sprite_accessory_variation(SPRITE_ACCESSORY_SLOT_TAIL) == SPRITE_ACCESSORY_VARIATION_WAGGING? null : SPRITE_ACCESSORY_VARIATION_WAGGING, + )) + return 0 + return 1 + +/mob/living/carbon/human/proc/animate_tail_start() + set_sprite_accessory_variation(SPRITE_ACCESSORY_SLOT_TAIL, SPRITE_ACCESSORY_VARIATION_WAGGING) + // set_tail_state("[species.get_tail(src)]_slow[rand(0,9)]") + +/mob/living/carbon/human/proc/animate_tail_fast() + set_sprite_accessory_variation(SPRITE_ACCESSORY_SLOT_TAIL, SPRITE_ACCESSORY_VARIATION_WAGGING) + // set_tail_state("[species.get_tail(src)]_loop[rand(0,9)]") + +/mob/living/carbon/human/proc/animate_tail_reset() + set_sprite_accessory_variation(SPRITE_ACCESSORY_SLOT_TAIL, null) + // if(stat != DEAD) + // set_tail_state("[species.get_tail(src)]_idle[rand(0,9)]") + // else + // set_tail_state("[species.get_tail(src)]_static") + // toggle_tail_vr(FALSE) // So tails stop when someone dies. TODO - Fix this hack ~Leshana + +/mob/living/carbon/human/proc/animate_tail_stop() + set_sprite_accessory_variation(SPRITE_ACCESSORY_SLOT_TAIL, null) + +/mob/living/carbon/human/proc/toggle_wing_vr(var/setting,var/message = 0) + if(!has_sprite_accessory_variation(SPRITE_ACCESSORY_SLOT_WINGS, SPRITE_ACCESSORY_VARIATION_FLAPPING)) + if(message) + to_chat(src, "You don't have wings that support this.") + return 0 + if(!set_sprite_accessory_variation( + SPRITE_ACCESSORY_SLOT_WINGS, + get_sprite_accessory_variation(SPRITE_ACCESSORY_SLOT_WINGS) == SPRITE_ACCESSORY_VARIATION_FLAPPING? null : SPRITE_ACCESSORY_VARIATION_FLAPPING, + )) + return 0 + return 1 + +/mob/living/carbon/human/proc/toggle_wing_spread(var/folded,var/message = 0) + if(!has_sprite_accessory_variation(SPRITE_ACCESSORY_SLOT_WINGS, SPRITE_ACCESSORY_VARIATION_SPREAD)) + if(message) + to_chat(src, "You don't have wings!") + return 0 + if(!set_sprite_accessory_variation( + SPRITE_ACCESSORY_SLOT_WINGS, + get_sprite_accessory_variation(SPRITE_ACCESSORY_SLOT_WINGS) == SPRITE_ACCESSORY_VARIATION_SPREAD? null : SPRITE_ACCESSORY_VARIATION_SPREAD, + )) + return 0 + return 1 + +//? FUCK FUCK FUCK FUCK FUCK- + +/mob/living/carbon/human/update_hair() + update_eyes() //Pirated out of here, for glowing eyes. + + var/obj/item/organ/external/head/head_organ = get_organ(BP_HEAD) + if(istype(head_organ,/obj/item/organ/external/head/vr)) + var/obj/item/organ/external/head/vr/head_organ_vr = head_organ + head_spriteacc_offset = head_organ_vr.head_offset + else + head_spriteacc_offset = 0 + + render_spriteacc_ears() + render_spriteacc_horns() + render_spriteacc_hair() + render_spriteacc_facehair() + +//? Body + +/mob/living/carbon/human/update_damage_overlay() + // first check whether something actually changed about damage appearance + var/damage_appearance = "" + + for(var/obj/item/organ/external/O in organs) + if(isnull(O) || O.is_stump()) + continue + damage_appearance += O.damage_state + + if(damage_appearance == previous_damage_appearance) + // nothing to do here + return + + previous_damage_appearance = damage_appearance + + var/image/standing_image = image(icon = species.damage_overlays, icon_state = "00", layer = HUMAN_LAYER_DAMAGE) + + // blend the individual damage states with our icons + for(var/obj/item/organ/external/O in organs) + if(isnull(O) || O.is_stump()) + continue + + O.update_icon() + if(O.damage_state == "00") continue + var/icon/DI + var/cache_index = "[O.damage_state]/[O.icon_name]/[species.get_blood_colour(src)]/[species.get_bodytype_legacy(src)]" + if(GLOB.damage_icon_parts[cache_index] == null) + DI = icon(species.get_damage_overlays(src), O.damage_state) // the damage icon for whole human + DI.Blend(icon(species.get_damage_mask(src), O.icon_name), ICON_MULTIPLY) // mask with this organ's pixels + DI.Blend(species.get_blood_colour(src), ICON_MULTIPLY) + GLOB.damage_icon_parts[cache_index] = DI + else + DI = GLOB.damage_icon_parts[cache_index] + + standing_image.add_overlay(DI) + + set_standing_overlay(HUMAN_OVERLAY_DAMAGE, standing_image) + +//BASE MOB SPRITE +/mob/living/carbon/human/update_icons_body() + var/husk_color_mod = rgb(96,88,80) + var/hulk_color_mod = rgb(48,224,40) + + var/husk = (MUTATION_HUSK in src.mutations) + var/fat = (MUTATION_FAT in src.mutations) + var/hulk = (MUTATION_HULK in src.mutations) + var/skeleton = (MUTATION_SKELETON in src.mutations) + + robolimb_count = 0 //TODO, here, really tho? + robobody_count = 0 + + //CACHING: Generate an index key from visible bodyparts. + //0 = destroyed, 1 = normal, 2 = robotic, 3 = necrotic. + + //Create a new, blank icon for our mob to use. + var/icon/stand_icon = new(species.icon_template ? species.icon_template : 'icons/mob/human.dmi', icon_state = "blank") + + var/g = gender == FEMALE ? "f" : "m" + /* This was the prior code before the above line. It was faulty and has been commented out. + var/g = "male" + if(gender == FEMALE) + g = "female" + */ + + var/icon_key = "[species.get_race_key(src)][s_base][g][s_tone][r_skin][g_skin][b_skin]" + if(lip_style) + icon_key += "[lip_style]" + else + icon_key += "nolips" + var/obj/item/organ/internal/eyes/eyes = internal_organs_by_name[O_EYES] + if(eyes) + icon_key += "[rgb(eyes.eye_colour[1], eyes.eye_colour[2], eyes.eye_colour[3])]" + else + icon_key += "[r_eyes], [g_eyes], [b_eyes]" + + var/obj/item/organ/external/head/head = organs_by_name[BP_HEAD] + if(head) + if(!istype(head, /obj/item/organ/external/stump)) + icon_key += "[head.eye_icon]" + for(var/organ_tag in species.has_limbs) + var/obj/item/organ/external/part = organs_by_name[organ_tag] + // Allowing tails to prevent bodyparts rendering, granting more spriter freedom for taur/digitigrade stuff. + if(isnull(part) || part.is_stump() || part.is_hidden_by_tail()) + icon_key += "0" + continue + if(part) + icon_key += "[part.name]" + icon_key += "[part.species.get_race_key(part.owner)]" + icon_key += "[part.dna.GetUIState(DNA_UI_GENDER)]" + icon_key += "[part.s_tone]" + if(part.s_col && part.s_col.len >= 3) + icon_key += "[rgb(part.s_col[1],part.s_col[2],part.s_col[3])]" + if(part.body_hair && part.h_col && part.h_col.len >= 3) + icon_key += "[rgb(part.h_col[1],part.h_col[2],part.h_col[3])]" + if(species.color_force_greyscale) + icon_key += "_ags" + if(species.color_mult) + icon_key += "[ICON_MULTIPLY]" + else + icon_key += "[ICON_ADD]" + else + icon_key += "#000000" + for(var/M in part.markings) + icon_key += "[M][part.markings[M]["color"]]" + + if(part.robotic >= ORGAN_ROBOT) + icon_key += "2[part.model ? "-[part.model]": ""]" + robolimb_count++ + if((part.robotic == ORGAN_ROBOT || part.robotic == ORGAN_LIFELIKE || part.robotic == ORGAN_NANOFORM) && (part.organ_tag == BP_HEAD || part.organ_tag == BP_TORSO || part.organ_tag == BP_GROIN)) + robobody_count ++ + else if(part.status & ORGAN_DEAD) + icon_key += "3" + else + icon_key += "1" + if(part.transparent) + icon_key += "_t" + + icon_key = "[icon_key][husk ? 1 : 0][fat ? 1 : 0][hulk ? 1 : 0][skeleton ? 1 : 0]" + + var/icon/base_icon + if(GLOB.human_icon_cache[icon_key]) + base_icon = GLOB.human_icon_cache[icon_key] + else + //BEGIN CACHED ICON GENERATION. + var/obj/item/organ/external/chest = get_organ(BP_TORSO) + base_icon = chest.get_icon() + + for(var/obj/item/organ/external/part in organs) + if(isnull(part) || part.is_stump() || part.is_hidden_by_tail()) + continue + var/icon/temp = part.get_icon(skeleton) + //That part makes left and right legs drawn topmost and lowermost when human looks WEST or EAST + //And no change in rendering for other parts (they icon_position is 0, so goes to 'else' part) + if(part.icon_position & (LEFT | RIGHT)) + var/icon/temp2 = new(species.icon_template ? species.icon_template : 'icons/mob/human.dmi', icon_state = "blank") + temp2.Insert(new/icon(temp,dir=NORTH),dir=NORTH) + temp2.Insert(new/icon(temp,dir=SOUTH),dir=SOUTH) + if(!(part.icon_position & LEFT)) + temp2.Insert(new/icon(temp,dir=EAST),dir=EAST) + if(!(part.icon_position & RIGHT)) + temp2.Insert(new/icon(temp,dir=WEST),dir=WEST) + base_icon.Blend(temp2, ICON_OVERLAY) + if(part.icon_position & LEFT) + temp2.Insert(new/icon(temp,dir=EAST),dir=EAST) + if(part.icon_position & RIGHT) + temp2.Insert(new/icon(temp,dir=WEST),dir=WEST) + base_icon.Blend(temp2, ICON_UNDERLAY) + else if(part.icon_position & UNDER) + base_icon.Blend(temp, ICON_UNDERLAY) + else + base_icon.Blend(temp, ICON_OVERLAY) + + if(!skeleton) + if(husk) + base_icon.ColorTone(husk_color_mod) + else if(hulk) + var/list/tone = ReadRGB(hulk_color_mod) + base_icon.MapColors(rgb(tone[1],0,0),rgb(0,tone[2],0),rgb(0,0,tone[3])) + + // Handle husk overlay. + if(husk) + var/husk_icon = species.get_husk_icon(src) + if(husk_icon) + var/icon/mask = new(base_icon) + var/icon/husk_over = new(species.husk_icon,"") + mask.MapColors(0,0,0,1, 0,0,0,1, 0,0,0,1, 0,0,0,1, 0,0,0,0) + husk_over.Blend(mask, ICON_ADD) + base_icon.Blend(husk_over, ICON_OVERLAY) + + GLOB.human_icon_cache[icon_key] = base_icon + + //END CACHED ICON GENERATION. + stand_icon.Blend(base_icon,ICON_OVERLAY) + icon = stand_icon + + //tail + render_spriteacc_tail() + //wing + render_spriteacc_wings() + +/mob/living/carbon/human/proc/update_skin() + var/image/skin = species.update_skin(src) + set_standing_overlay(HUMAN_OVERLAY_SKIN, skin) + +/mob/living/carbon/human/proc/update_bloodied() + if(!blood_DNA && !feet_blood_DNA) + remove_standing_overlay(HUMAN_OVERLAY_BLOOD) + return + + var/image/both = image(icon = 'icons/effects/effects.dmi', icon_state = "nothing", layer = HUMAN_LAYER_BLOOD) + + //Bloody hands + if(blood_DNA) + var/image/bloodsies = image(icon = species.get_blood_mask(src), icon_state = "bloodyhands", layer = HUMAN_LAYER_BLOOD) + bloodsies.color = hand_blood_color + both.add_overlay(bloodsies) + + //Bloody feet + if(feet_blood_DNA) + var/image/bloodsies = image(icon = species.get_blood_mask(src), icon_state = "shoeblood", layer = HUMAN_LAYER_BLOOD) + bloodsies.color = feet_blood_color + both.add_overlay(bloodsies) + + set_standing_overlay(HUMAN_OVERLAY_BLOOD, both) + + +//UNDERWEAR OVERLAY +/mob/living/carbon/human/proc/update_underwear() + if(!(species.species_appearance_flags & HAS_UNDERWEAR)) + remove_standing_overlay(HUMAN_OVERLAY_UNDERWEAR) + return + var/list/setting = list() + // SHITCODE WARNING + // MANUAL UNDERWEAR SORT + for(var/key in list( + "Underwear, bottom", + "Socks", + "Underwear, top", + "Undershirt", + )) + var/existing = all_underwear[key] + all_underwear -= key + if(existing) + all_underwear[key] = existing + // END + + for(var/category in all_underwear) + if(hide_underwear[category]) + continue + var/datum/category_item/underwear/UWI = all_underwear[category] + var/image/wear = UWI.generate_image(all_underwear_metadata[category], layer = HUMAN_LAYER_UNDERWEAR) + setting += wear + set_standing_overlay(HUMAN_OVERLAY_UNDERWEAR, setting) + +/mob/living/carbon/human/update_eyes() + var/obj/item/organ/internal/eyes/eyes = internal_organs_by_name[O_EYES] + if(eyes) + eyes.update_colour() + update_icons_body() + + //TODO: Probably redo this. I know I wrote it, but... + + //This is ONLY for glowing eyes for now. Boring flat eyes are done by the head's own proc. + if(!species.has_glowing_eyes) + remove_standing_overlay(HUMAN_OVERLAY_EYES) + return + + //Our glowy eyes should be hidden if some equipment hides them. + if(!should_have_organ(O_EYES) || (head && (head.inv_hide_flags & BLOCKHAIR)) || (wear_mask && (wear_mask.inv_hide_flags & BLOCKHAIR))) + remove_standing_overlay(HUMAN_OVERLAY_EYES) + return + + //Get the head, we'll need it later. + var/obj/item/organ/external/head/head_organ = get_organ(BP_HEAD) + if(!head_organ || head_organ.is_stump() ) + remove_standing_overlay(HUMAN_OVERLAY_EYES) + return + + //The eyes store the color themselves, funny enough. + if(!head_organ.eye_icon) + remove_standing_overlay(HUMAN_OVERLAY_EYES) + return + + var/icon/eyes_icon = new/icon(head_organ.eye_icon_location, head_organ.eye_icon) + if(eyes) + eyes_icon.Blend(rgb(eyes.eye_colour[1], eyes.eye_colour[2], eyes.eye_colour[3]), ICON_ADD) + else + eyes_icon.Blend(rgb(128,0,0), ICON_ADD) + + var/image/eyes_image = image(eyes_icon) + eyes_image.plane = ABOVE_LIGHTING_PLANE + + set_standing_overlay(HUMAN_OVERLAY_EYES, eyes_image) + +/mob/living/carbon/human/update_mutations() + if(!LAZYLEN(mutations)) + remove_standing_overlay(HUMAN_OVERLAY_MUTATIONS) + return //No mutations, no icons. + + //TODO: THIS PROC??? + var/fat + if(MUTATION_FAT in mutations) + fat = "fat" + + var/image/standing = image(icon = 'icons/effects/genetics.dmi', layer = HUMAN_LAYER_MUTATIONS) + var/g = gender == FEMALE ? "f" : "m" + + for(var/datum/gene/gene in dna_genes) + if(!gene.block) + continue + if(gene.is_active(src)) + var/underlay = gene.OnDrawUnderlays(src,g,fat) + if(underlay) + standing.underlays += underlay + + for(var/mut in mutations) + if(mut == MUTATION_LASER) + standing.overlays += "lasereyes_s" //TODO + + set_standing_overlay(HUMAN_OVERLAY_MUTATIONS, standing) + +//? Misc + +/mob/living/carbon/human/update_modifier_visuals() + if(!LAZYLEN(modifiers)) + remove_standing_overlay(HUMAN_OVERLAY_MODIFIERS) + return //No modifiers, no effects. + + var/image/effects = new() + for(var/datum/modifier/M in modifiers) + if(M.mob_overlay_state) + var/image/I = image(icon = 'icons/mob/modifier_effects.dmi', icon_state = M.mob_overlay_state) + effects.add_overlay(I) //TODO, this compositing is annoying. + + set_standing_overlay(HUMAN_OVERLAY_MODIFIERS, effects) + +/mob/living/carbon/human/update_fire() + if(!on_fire) + remove_standing_overlay(HUMAN_OVERLAY_FIRE) + return + set_standing_overlay( + HUMAN_OVERLAY_FIRE, + image(icon = 'icons/mob/OnFire.dmi', icon_state = get_fire_icon_state(), layer = HUMAN_LAYER_FIRE), + ) + +/mob/living/carbon/human/update_water() + var/depth = check_submerged() + if(!depth || lying) + remove_standing_overlay(HUMAN_OVERLAY_LIQUID) + return + var/image/applying + if(depth < 3) + applying = image(icon = 'icons/mob/submerged.dmi', icon_state = "human_swimming_[depth]", layer = HUMAN_LAYER_LIQUID) //TODO: Improve + if(depth == 4) + applying = image(icon = 'icons/mob/submerged.dmi', icon_state = "hacid_1", layer = HUMAN_LAYER_LIQUID) + if(depth == 5) + applying = image(icon = 'icons/mob/submerged.dmi', icon_state = "hacid_2", layer = HUMAN_LAYER_LIQUID) + if(depth == 6) + applying = image(icon = 'icons/mob/submerged.dmi', icon_state = "hblood_1", layer = HUMAN_LAYER_LIQUID) + if(depth == 7) + applying = image(icon = 'icons/mob/submerged.dmi', icon_state = "hblood_2", layer = HUMAN_LAYER_LIQUID) + set_standing_overlay(HUMAN_OVERLAY_LIQUID, applying) + +// todo: burn with fire +/mob/living/carbon/human/update_acidsub() + var/depth = check_submerged() + if(!depth || lying) + remove_standing_overlay(HUMAN_OVERLAY_LIQUID) + return + + set_standing_overlay( + HUMAN_OVERLAY_LIQUID, + image(icon = 'icons/mob/submerged.dmi', icon_state = "hacid_[depth]", layer = HUMAN_LAYER_LIQUID), + ) + +// todo: burn with fire +/mob/living/carbon/human/update_bloodsub() + var/depth = check_submerged() + if(!depth || lying) + remove_standing_overlay(HUMAN_OVERLAY_LIQUID) + return + + set_standing_overlay( + HUMAN_OVERLAY_LIQUID, + image(icon = 'icons/mob/submerged.dmi', icon_state = "hblood_[depth]", layer = HUMAN_LAYER_LIQUID), + ) + +/mob/living/carbon/human/proc/update_surgery() + var/image/total = new + for(var/obj/item/organ/external/E in organs) + if(E.open) + var/image/I = image(icon = 'icons/mob/surgery.dmi', icon_state = "[E.icon_name][round(E.open)]", layer = HUMAN_LAYER_SURGERY) + total.add_overlay(I) //TODO: This compositing is annoying + + if(length(total.overlays)) + set_standing_overlay(HUMAN_OVERLAY_SURGERY, total) + else + remove_standing_overlay(HUMAN_OVERLAY_SURGERY) + +//? Inventory + +/mob/living/carbon/human/update_inv_w_uniform() + inventory.update_slot_render(SLOT_ID_UNIFORM) + +/mob/living/carbon/human/update_inv_wear_id() + inventory.update_slot_render(SLOT_ID_WORN_ID) + +/mob/living/carbon/human/update_inv_gloves() + inventory.update_slot_render(SLOT_ID_GLOVES) + +/mob/living/carbon/human/update_inv_glasses() + inventory.update_slot_render(SLOT_ID_GLASSES) + +/mob/living/carbon/human/update_inv_ears() + inventory.update_slot_render(SLOT_ID_LEFT_EAR) + inventory.update_slot_render(SLOT_ID_RIGHT_EAR) + +/mob/living/carbon/human/update_inv_shoes() + inventory.update_slot_render(SLOT_ID_SHOES) + +/mob/living/carbon/human/update_inv_s_store() + inventory.update_slot_render(SLOT_ID_SUIT_STORAGE) + +/mob/living/carbon/human/update_inv_head() + inventory.update_slot_render(SLOT_ID_HEAD) + +/mob/living/carbon/human/update_inv_belt() + inventory.update_slot_render(SLOT_ID_BELT) + +/mob/living/carbon/human/update_inv_wear_suit() + inventory.update_slot_render(SLOT_ID_SUIT) + +/mob/living/carbon/human/update_inv_wear_mask() + inventory.update_slot_render(SLOT_ID_MASK) + +/mob/living/carbon/human/update_inv_back() + inventory.update_slot_render(SLOT_ID_BACK) + +/mob/living/carbon/human/update_inv_handcuffed() + inventory.update_slot_render(SLOT_ID_HANDCUFFED) + +/mob/living/carbon/human/update_inv_legcuffed() + inventory.update_slot_render(SLOT_ID_LEGCUFFED) + +/mob/living/carbon/human/update_inv_r_hand() + if(isnull(r_hand)) + remove_standing_overlay(HUMAN_OVERLAY_RHAND) + return + set_standing_overlay( + HUMAN_OVERLAY_RHAND, + r_hand.render_mob_appearance(src, 2, BODYTYPE_DEFAULT), + ) + +/mob/living/carbon/human/update_inv_l_hand() + if(isnull(l_hand)) + remove_standing_overlay(HUMAN_OVERLAY_LHAND) + return + set_standing_overlay( + HUMAN_OVERLAY_LHAND, + l_hand.render_mob_appearance(src, 1, BODYTYPE_DEFAULT), + ) diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index dad9fe7f973d..7f5ab6620904 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -7,57 +7,7 @@ GLOBAL_LIST_EMPTY(tail_icon_cache) GLOBAL_LIST_EMPTY(light_overlay_cache) GLOBAL_LIST_EMPTY(damage_icon_parts) -//////////////////////////////////////////////////////////////////////////////////////////////// -// # Human Icon Updating System -// -// This system takes care of the "icon" for human mobs. Of course humans don't just have a single -// icon+icon_state, but a combination of dozens of little sprites including including the body, -// clothing, equipment, in-universe HUD images, etc. -// -// # Basic Operation -// Whenever you do something that should update the on-mob appearance of a worn or held item, You -// will need to call the relevant update_inv_* proc. All of these are named after the variable they -// update from. They are defined at the /mob level so you don't even need to cast to carbon/human. -// -// The new system leverages SSoverlays to actually add/remove the overlays from mob.overlays -// Since SSoverlays already manages batching updates to reduce apperance churn etc, we don't need -// to worry about that. (In short, you can call add/cut overlay as many times as you want, it will -// only get assigned to the mob once per tick.) -// As a corrolary, this means users of this system do NOT need to tell the system when you're done -// making changes. -// -// There are also these special cases: -// update_icons_body() //Handles updating your mob's icon to reflect their gender/race/complexion etc -// UpdateDamageIcon() //Handles damage overlays for brute/burn damage //(will rename this when I geta round to it) ~Carn -// update_skin() //Handles updating skin for species that have a skin overlay. -// update_bloodied() //Handles adding/clearing the blood overlays for hands & feet. Call when bloodied or cleaned. -// update_underwear() //Handles updating the sprite for underwear. -// update_hair() //Handles updating your hair and eyes overlay -// update_mutations() //Handles updating your appearance for certain mutations. e.g MUTATION_TELEKINESIS head-glows -// update_fire() //Handles overlay from being on fire. -// update_water() //Handles overlay from being submerged. -// update_surgery() //Handles overlays from open external organs. -// -// # History (i.e. I'm used to the old way, what is different?) -// You used to have to call update_icons(FALSE) if you planned to make more changes, and call update_icons(TRUE) -// on the final update. All that is gone, just call update_inv_whatever() and it handles the rest. -// -//////////////////////////////////////////////////////////////////////////////////////////////// - -//Add an entry to overlays, assuming it exists -/mob/living/carbon/human/proc/apply_layer(cache_index) - if((. = overlays_standing[cache_index])) - add_overlay(.) - -//Remove an entry from overlays, and from the list -/mob/living/carbon/human/proc/remove_layer(cache_index) - var/I = overlays_standing[cache_index] - if(I) - cut_overlay(I) - overlays_standing[cache_index] = null - /mob/living/carbon/human - var/list/overlays_standing[TOTAL_LAYERS] var/previous_damage_appearance // store what the body last looked like, so we only have to update it if something changed //UPDATES OVERLAYS FROM OVERLAYS_LYING/OVERLAYS_STANDING @@ -79,6 +29,23 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) /mob/living/carbon/human/update_icons_huds() stack_trace("CANARY: Old human update_icons_huds was called.") +//TODO: Carbon procs in my human update_icons?? +/mob/living/carbon/human/update_hud() //TODO: do away with this if possible + // todo: this is utterly shitcode and fucking stupid ~silicons + // todo: the rest of hud code here ain't much better LOL + var/list/obj/item/relevant = get_equipped_items(TRUE, TRUE) + if(hud_used) + for(var/obj/item/I as anything in relevant) + position_hud_item(I, slot_id_by_item(I)) + if(client) + client.screen |= relevant + +//update whether handcuffs appears on our hud. +/mob/living/carbon/proc/update_hud_handcuffed() + if(hud_used && hud_used.l_hand_hud_object && hud_used.r_hand_hud_object) + hud_used.l_hand_hud_object.update_icon() + hud_used.r_hand_hud_object.update_icon() + /mob/living/carbon/human/update_transform() var/matrix/old_matrix = transform var/matrix/M = matrix() @@ -93,6 +60,16 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) M.Scale(desired_scale_x, desired_scale_y) M.Translate(0, 16 * (desired_scale_y - 1)) + // Mark atom as wide/long for ZM. + if (desired_scale_x > 1) + zmm_flags |= ZMM_LOOKAHEAD + else + zmm_flags &= ~ZMM_LOOKAHEAD + if (desired_scale_y > 1) + zmm_flags |= ZMM_LOOKBESIDE + else + zmm_flags &= ~ZMM_LOOKBESIDE + // handle turning M.Turn(lying) // extremely lazy heuristic to see if we should shift down to appear to be, well, down. @@ -108,422 +85,6 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) update_icon_special() //May contain transform-altering things update_ssd_overlay() -//DAMAGE OVERLAYS -//constructs damage icon for each organ from mask * damage field and saves it in our overlays_ lists -/mob/living/carbon/human/UpdateDamageIcon() - if(QDESTROYING(src)) - return - - remove_layer(DAMAGE_LAYER) - - // first check whether something actually changed about damage appearance - var/damage_appearance = "" - - for(var/obj/item/organ/external/O in organs) - if(isnull(O) || O.is_stump()) - continue - damage_appearance += O.damage_state - - if(damage_appearance == previous_damage_appearance) - // nothing to do here - return - - previous_damage_appearance = damage_appearance - - var/image/standing_image = image(icon = species.damage_overlays, icon_state = "00", layer = BODY_LAYER+DAMAGE_LAYER) - - // blend the individual damage states with our icons - for(var/obj/item/organ/external/O in organs) - if(isnull(O) || O.is_stump()) - continue - - O.update_icon() - if(O.damage_state == "00") continue - var/icon/DI - var/cache_index = "[O.damage_state]/[O.icon_name]/[species.get_blood_colour(src)]/[species.get_bodytype_legacy(src)]" - if(GLOB.damage_icon_parts[cache_index] == null) - DI = icon(species.get_damage_overlays(src), O.damage_state) // the damage icon for whole human - DI.Blend(icon(species.get_damage_mask(src), O.icon_name), ICON_MULTIPLY) // mask with this organ's pixels - DI.Blend(species.get_blood_colour(src), ICON_MULTIPLY) - GLOB.damage_icon_parts[cache_index] = DI - else - DI = GLOB.damage_icon_parts[cache_index] - - standing_image.add_overlay(DI) - - overlays_standing[DAMAGE_LAYER] = standing_image - apply_layer(DAMAGE_LAYER) - -//BASE MOB SPRITE -/mob/living/carbon/human/update_icons_body() - if(QDESTROYING(src) || !(atom_flags & ATOM_INITIALIZED)) - return - - var/husk_color_mod = rgb(96,88,80) - var/hulk_color_mod = rgb(48,224,40) - - var/husk = (MUTATION_HUSK in src.mutations) - var/fat = (MUTATION_FAT in src.mutations) - var/hulk = (MUTATION_HULK in src.mutations) - var/skeleton = (MUTATION_SKELETON in src.mutations) - - robolimb_count = 0 //TODO, here, really tho? - robobody_count = 0 - - //CACHING: Generate an index key from visible bodyparts. - //0 = destroyed, 1 = normal, 2 = robotic, 3 = necrotic. - - //Create a new, blank icon for our mob to use. - var/icon/stand_icon = new(species.icon_template ? species.icon_template : 'icons/mob/human.dmi', icon_state = "blank") - - var/g = gender == FEMALE ? "f" : "m" - /* This was the prior code before the above line. It was faulty and has been commented out. - var/g = "male" - if(gender == FEMALE) - g = "female" - */ - - var/icon_key = "[species.get_race_key(src)][s_base][g][s_tone][r_skin][g_skin][b_skin]" - if(lip_style) - icon_key += "[lip_style]" - else - icon_key += "nolips" - var/obj/item/organ/internal/eyes/eyes = internal_organs_by_name[O_EYES] - if(eyes) - icon_key += "[rgb(eyes.eye_colour[1], eyes.eye_colour[2], eyes.eye_colour[3])]" - else - icon_key += "[r_eyes], [g_eyes], [b_eyes]" - - var/obj/item/organ/external/head/head = organs_by_name[BP_HEAD] - if(head) - if(!istype(head, /obj/item/organ/external/stump)) - icon_key += "[head.eye_icon]" - for(var/organ_tag in species.has_limbs) - var/obj/item/organ/external/part = organs_by_name[organ_tag] - // Allowing tails to prevent bodyparts rendering, granting more spriter freedom for taur/digitigrade stuff. - if(isnull(part) || part.is_stump() || part.is_hidden_by_tail()) - icon_key += "0" - continue - if(part) - icon_key += "[part.name]" - icon_key += "[part.species.get_race_key(part.owner)]" - icon_key += "[part.dna.GetUIState(DNA_UI_GENDER)]" - icon_key += "[part.s_tone]" - if(part.s_col && part.s_col.len >= 3) - icon_key += "[rgb(part.s_col[1],part.s_col[2],part.s_col[3])]" - if(part.body_hair && part.h_col && part.h_col.len >= 3) - icon_key += "[rgb(part.h_col[1],part.h_col[2],part.h_col[3])]" - if(species.color_force_greyscale) - icon_key += "_ags" - if(species.color_mult) - icon_key += "[ICON_MULTIPLY]" - else - icon_key += "[ICON_ADD]" - else - icon_key += "#000000" - for(var/M in part.markings) - icon_key += "[M][part.markings[M]["color"]]" - - if(part.robotic >= ORGAN_ROBOT) - icon_key += "2[part.model ? "-[part.model]": ""]" - robolimb_count++ - if((part.robotic == ORGAN_ROBOT || part.robotic == ORGAN_LIFELIKE || part.robotic == ORGAN_NANOFORM) && (part.organ_tag == BP_HEAD || part.organ_tag == BP_TORSO || part.organ_tag == BP_GROIN)) - robobody_count ++ - else if(part.status & ORGAN_DEAD) - icon_key += "3" - else - icon_key += "1" - if(part.transparent) - icon_key += "_t" - - icon_key = "[icon_key][husk ? 1 : 0][fat ? 1 : 0][hulk ? 1 : 0][skeleton ? 1 : 0]" - - var/icon/base_icon - if(GLOB.human_icon_cache[icon_key]) - base_icon = GLOB.human_icon_cache[icon_key] - else - //BEGIN CACHED ICON GENERATION. - var/obj/item/organ/external/chest = get_organ(BP_TORSO) - base_icon = chest.get_icon() - - for(var/obj/item/organ/external/part in organs) - if(isnull(part) || part.is_stump() || part.is_hidden_by_tail()) - continue - var/icon/temp = part.get_icon(skeleton) - //That part makes left and right legs drawn topmost and lowermost when human looks WEST or EAST - //And no change in rendering for other parts (they icon_position is 0, so goes to 'else' part) - if(part.icon_position & (LEFT | RIGHT)) - var/icon/temp2 = new(species.icon_template ? species.icon_template : 'icons/mob/human.dmi', icon_state = "blank") - temp2.Insert(new/icon(temp,dir=NORTH),dir=NORTH) - temp2.Insert(new/icon(temp,dir=SOUTH),dir=SOUTH) - if(!(part.icon_position & LEFT)) - temp2.Insert(new/icon(temp,dir=EAST),dir=EAST) - if(!(part.icon_position & RIGHT)) - temp2.Insert(new/icon(temp,dir=WEST),dir=WEST) - base_icon.Blend(temp2, ICON_OVERLAY) - if(part.icon_position & LEFT) - temp2.Insert(new/icon(temp,dir=EAST),dir=EAST) - if(part.icon_position & RIGHT) - temp2.Insert(new/icon(temp,dir=WEST),dir=WEST) - base_icon.Blend(temp2, ICON_UNDERLAY) - else if(part.icon_position & UNDER) - base_icon.Blend(temp, ICON_UNDERLAY) - else - base_icon.Blend(temp, ICON_OVERLAY) - - if(!skeleton) - if(husk) - base_icon.ColorTone(husk_color_mod) - else if(hulk) - var/list/tone = ReadRGB(hulk_color_mod) - base_icon.MapColors(rgb(tone[1],0,0),rgb(0,tone[2],0),rgb(0,0,tone[3])) - - // Handle husk overlay. - if(husk) - var/husk_icon = species.get_husk_icon(src) - if(husk_icon) - var/icon/mask = new(base_icon) - var/icon/husk_over = new(species.husk_icon,"") - mask.MapColors(0,0,0,1, 0,0,0,1, 0,0,0,1, 0,0,0,1, 0,0,0,0) - husk_over.Blend(mask, ICON_ADD) - base_icon.Blend(husk_over, ICON_OVERLAY) - - GLOB.human_icon_cache[icon_key] = base_icon - - //END CACHED ICON GENERATION. - stand_icon.Blend(base_icon,ICON_OVERLAY) - icon = stand_icon - - //tail - update_tail_showing() - //wing - update_wing_showing() - -/mob/living/carbon/human/proc/update_skin() - if(QDESTROYING(src)) - return - - remove_layer(SKIN_LAYER) - - var/image/skin = species.update_skin(src) - if(skin) - skin.layer = BODY_LAYER+SKIN_LAYER - overlays_standing[SKIN_LAYER] = skin - apply_layer(SKIN_LAYER) - -/mob/living/carbon/human/proc/update_bloodied() - if(QDESTROYING(src)) - return - - remove_layer(BLOOD_LAYER) - if(!blood_DNA && !feet_blood_DNA) - return - - var/image/both = image(icon = 'icons/effects/effects.dmi', icon_state = "nothing", layer = BODY_LAYER+BLOOD_LAYER) - - //Bloody hands - if(blood_DNA) - var/image/bloodsies = image(icon = species.get_blood_mask(src), icon_state = "bloodyhands", layer = BODY_LAYER+BLOOD_LAYER) - bloodsies.color = hand_blood_color - both.add_overlay(bloodsies) - - //Bloody feet - if(feet_blood_DNA) - var/image/bloodsies = image(icon = species.get_blood_mask(src), icon_state = "shoeblood", layer = BODY_LAYER+BLOOD_LAYER) - bloodsies.color = feet_blood_color - both.add_overlay(bloodsies) - - overlays_standing[BLOOD_LAYER] = both - - apply_layer(BLOOD_LAYER) - -/mob/living/carbon/human/proc/BloodyMouth() - - var/image/both = image(icon = 'icons/effects/effects.dmi', icon_state = "nothing", layer = BODY_LAYER+BLOOD_LAYER) - - //"lol", said the scorpion, "lmao" - var/image/bloodsies = image(icon = species.get_blood_mask(src), icon_state = "redwings", layer = BODY_LAYER+BLOOD_LAYER) - bloodsies.color = src.species.blood_color - both.add_overlay(bloodsies) - - overlays_standing[BLOOD_LAYER] = both - - apply_layer(BLOOD_LAYER) - - -//UNDERWEAR OVERLAY -/mob/living/carbon/human/proc/update_underwear() - if(QDESTROYING(src)) - return - - remove_layer(UNDERWEAR_LAYER) - - if(species.species_appearance_flags & HAS_UNDERWEAR) - overlays_standing[UNDERWEAR_LAYER] = list() - for(var/category in all_underwear) - if(hide_underwear[category]) - continue - var/datum/category_item/underwear/UWI = all_underwear[category] - var/image/wear = UWI.generate_image(all_underwear_metadata[category], layer = BODY_LAYER+UNDERWEAR_LAYER) - overlays_standing[UNDERWEAR_LAYER] += wear - - apply_layer(UNDERWEAR_LAYER) - -//HAIR OVERLAY -/mob/living/carbon/human/update_hair() - if(QDESTROYING(src)) - return - - //Reset our hair - remove_layer(HAIR_LAYER) - update_eyes() //Pirated out of here, for glowing eyes. - - var/obj/item/organ/external/head/head_organ = get_organ(BP_HEAD) - if(!head_organ || head_organ.is_stump() ) - return - - //masks and helmets can obscure our hair. - if( (head && (head.inv_hide_flags & BLOCKHAIR)) || (wear_mask && (wear_mask.inv_hide_flags & BLOCKHAIR))) - return - - //base icons - var/icon/face_standing = icon(icon = 'icons/mob/human_face.dmi', icon_state = "bald_s") - - if(f_style) - var/datum/sprite_accessory/facial_hair_style = GLOB.legacy_facial_hair_lookup[f_style] - if(facial_hair_style && (!facial_hair_style.apply_restrictions || (src.species.get_bodytype_legacy(src) in facial_hair_style.species_allowed))) - var/icon/facial_s = new/icon("icon" = facial_hair_style.icon, "icon_state" = "[facial_hair_style.icon_state]_s") - if(facial_hair_style.do_colouration) - facial_s.Blend(rgb(r_facial, g_facial, b_facial), facial_hair_style.color_blend_mode) - - face_standing.Blend(facial_s, ICON_OVERLAY) - - if(h_style) - var/datum/sprite_accessory/hair/hair_style = GLOB.legacy_hair_lookup[h_style] - if(head && (head.inv_hide_flags & BLOCKHEADHAIR)) - if(!(hair_style.hair_flags & HAIR_VERY_SHORT)) - hair_style = GLOB.legacy_hair_lookup["Short Hair"] - - if(hair_style && (!hair_style.apply_restrictions || (src.species.get_bodytype_legacy(src) in hair_style.species_allowed))) - var/icon/grad_s - var/icon/hair_s = new/icon("icon" = hair_style.icon, "icon_state" = "[hair_style.icon_state]_s") - var/icon/hair_s_add - if(hair_style.icon_add) - hair_s_add = new/icon("icon" = hair_style.icon_add, "icon_state" = "[hair_style.icon_state]_s") - if(hair_style.do_colouration) - if(grad_style) - grad_s = new/icon("icon" = 'icons/mob/hair_gradients.dmi', "icon_state" = GLOB.hair_gradients[grad_style]) - grad_s.Blend(hair_s, ICON_AND) - grad_s.Blend(rgb(r_grad, g_grad, b_grad), ICON_MULTIPLY) - hair_s.Blend(rgb(r_hair, g_hair, b_hair), ICON_MULTIPLY) - if(hair_s_add) - hair_s.Blend(hair_s_add, ICON_ADD) - if(grad_s) - hair_s.Blend(grad_s, ICON_OVERLAY) - - face_standing.Blend(hair_s, ICON_OVERLAY) - - var/icon/ears_s = get_ears_overlay() - if(ears_s) - if(ears_s.Height() > face_standing.Height()) - face_standing.Crop(1, 1, face_standing.Width(), ears_s.Height()) - face_standing.Blend(ears_s, ICON_OVERLAY) - if(istype(head_organ,/obj/item/organ/external/head/vr)) - var/obj/item/organ/external/head/vr/head_organ_vr = head_organ - overlays_standing[HAIR_LAYER] = image(face_standing, layer = BODY_LAYER+HAIR_LAYER, "pixel_y" = head_organ_vr.head_offset) - apply_layer(HAIR_LAYER) - return - - var/icon/horns_s = get_horns_overlay() - if(horns_s && (!hiding_horns && horn_style.can_be_hidden)) - if(horns_s.Height() > face_standing.Height()) - face_standing.Crop(1, 1, face_standing.Width(), horns_s.Height()) - face_standing.Blend(horns_s, ICON_OVERLAY) - if(istype(head_organ,/obj/item/organ/external/head/vr)) - var/obj/item/organ/external/head/vr/head_organ_vr = head_organ - overlays_standing[HAIR_LAYER] = image(face_standing, layer = BODY_LAYER+HAIR_LAYER, "pixel_y" = head_organ_vr.head_offset) - apply_layer(HAIR_LAYER) - return - - face_standing += rgb(,,,head_organ.hair_opacity) - - overlays_standing[HAIR_LAYER] = image(face_standing, layer = BODY_LAYER+HAIR_LAYER) - apply_layer(HAIR_LAYER) - -/mob/living/carbon/human/update_eyes() - if(QDESTROYING(src)) - return - - var/obj/item/organ/internal/eyes/eyes = internal_organs_by_name[O_EYES] - if(eyes) - eyes.update_colour() - update_icons_body() - - //Reset our eyes - remove_layer(EYES_LAYER) - - //TODO: Probably redo this. I know I wrote it, but... - - //This is ONLY for glowing eyes for now. Boring flat eyes are done by the head's own proc. - if(!species.has_glowing_eyes) - return - - //Our glowy eyes should be hidden if some equipment hides them. - if(!should_have_organ(O_EYES) || (head && (head.inv_hide_flags & BLOCKHAIR)) || (wear_mask && (wear_mask.inv_hide_flags & BLOCKHAIR))) - return - - //Get the head, we'll need it later. - var/obj/item/organ/external/head/head_organ = get_organ(BP_HEAD) - if(!head_organ || head_organ.is_stump() ) - return - - //The eyes store the color themselves, funny enough. - if(!head_organ.eye_icon) - return - - var/icon/eyes_icon = new/icon(head_organ.eye_icon_location, head_organ.eye_icon) - if(eyes) - eyes_icon.Blend(rgb(eyes.eye_colour[1], eyes.eye_colour[2], eyes.eye_colour[3]), ICON_ADD) - else - eyes_icon.Blend(rgb(128,0,0), ICON_ADD) - - var/image/eyes_image = image(eyes_icon) - eyes_image.plane = ABOVE_LIGHTING_PLANE - - overlays_standing[EYES_LAYER] = eyes_image - apply_layer(EYES_LAYER) - -/mob/living/carbon/human/update_mutations() - if(QDESTROYING(src)) - return - - remove_layer(MUTATIONS_LAYER) - - if(!LAZYLEN(mutations)) - return //No mutations, no icons. - - //TODO: THIS PROC??? - var/fat - if(MUTATION_FAT in mutations) - fat = "fat" - - var/image/standing = image(icon = 'icons/effects/genetics.dmi', layer = BODY_LAYER+MUTATIONS_LAYER) - var/g = gender == FEMALE ? "f" : "m" - - for(var/datum/gene/gene in dna_genes) - if(!gene.block) - continue - if(gene.is_active(src)) - var/underlay = gene.OnDrawUnderlays(src,g,fat) - if(underlay) - standing.underlays += underlay - - for(var/mut in mutations) - if(mut == MUTATION_LASER) - standing.overlays += "lasereyes_s" //TODO - - overlays_standing[MUTATIONS_LAYER] = standing - apply_layer(MUTATIONS_LAYER) /* --------------------------------------- */ //Recomputes every icon on the mob. Expensive. @@ -531,11 +92,8 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) //other drastic body-shape change, but otherwise avoid. /mob/living/carbon/human/regenerate_icons() ..() - if(transforming || QDELETED(src)) - return - update_icons_body() - UpdateDamageIcon() + update_damage_overlay() update_mutations() update_skin() update_underwear() @@ -563,630 +121,6 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) update_bloodsub() update_surgery() -/* --------------------------------------- */ -//vvvvvv UPDATE_INV PROCS vvvvvv - -/mob/living/carbon/human/update_inv_w_uniform() - if(QDESTROYING(src)) - return - - remove_layer(UNIFORM_LAYER) - - //Shoes can be affected by uniform being drawn onto them - update_inv_shoes() - - if(!w_uniform) - return - - if(wear_suit && (wear_suit.inv_hide_flags & HIDEJUMPSUIT) && !istype(wear_suit, /obj/item/clothing/suit/space/hardsuit)) - return //Wearing a suit that prevents uniform rendering - - //Build a uniform sprite - var/icon/c_mask = tail_style?.clip_mask - if(c_mask) - var/obj/item/clothing/suit/S = wear_suit - if((wear_suit?.inv_hide_flags & HIDETAIL) || (istype(S) && S.taurized)) // Reasons to not mask: 1. If you're wearing a suit that hides the tail or if you're wearing a taurized suit. - c_mask = null - var/list/MA_or_list = w_uniform.render_mob_appearance(src, SLOT_ID_UNIFORM, species.get_effective_bodytype(src, w_uniform, SLOT_ID_UNIFORM)) - - if(c_mask) - if(islist(MA_or_list)) - for(var/mutable_appearance/MA2 as anything in MA_or_list) - MA2.filters += filter(type = "alpha", icon = c_mask) - else - var/mutable_appearance/MA = MA_or_list - MA.filters += filter(type = "alpha", icon = c_mask) - overlays_standing[UNIFORM_LAYER] = MA_or_list - - apply_layer(UNIFORM_LAYER) - -/mob/living/carbon/human/update_inv_wear_id() - if(QDESTROYING(src)) - return - - remove_layer(ID_LAYER) - - if(!wear_id) - return //Not wearing an ID - - //Only draw the ID on the mob if the uniform allows for it - if(w_uniform && istype(w_uniform, /obj/item/clothing/under)) - var/obj/item/clothing/under/U = w_uniform - if(U.displays_id) - overlays_standing[ID_LAYER] = wear_id.render_mob_appearance(src, SLOT_ID_WORN_ID, species.get_effective_bodytype(src, wear_id, SLOT_ID_WORN_ID)) - - apply_layer(ID_LAYER) - -/mob/living/carbon/human/update_inv_gloves() - if(QDESTROYING(src)) - return - - remove_layer(GLOVES_LAYER) - - if(!gloves) - return //No gloves, no reason to be here. - - overlays_standing[GLOVES_LAYER] = gloves.render_mob_appearance(src, SLOT_ID_GLOVES, species.get_effective_bodytype(src, gloves, SLOT_ID_GLOVES)) - - apply_layer(GLOVES_LAYER) - -/mob/living/carbon/human/update_inv_glasses() - if(QDESTROYING(src)) - return - - remove_layer(GLASSES_LAYER) - - if(!glasses) - return //Not wearing glasses, no need to update anything. - - overlays_standing[GLASSES_LAYER] = glasses.render_mob_appearance(src, SLOT_ID_GLASSES, species.get_effective_bodytype(src, glasses, SLOT_ID_GLASSES)) - - apply_layer(GLASSES_LAYER) - -/mob/living/carbon/human/update_inv_ears() - if(QDESTROYING(src)) - return - - remove_layer(EARS_LAYER) - - if((head && head.inv_hide_flags & (BLOCKHAIR | BLOCKHEADHAIR)) || (wear_mask && wear_mask.inv_hide_flags & (BLOCKHAIR | BLOCKHEADHAIR))) - return //Ears are blocked (by hair being blocked, overloaded) - - if(!l_ear && !r_ear) - return //Why bother, if no ear sprites - - // Blank image upon which to layer left & right overlays. - var/list/mutable_appearance/both = list() - if(l_ear) - both += l_ear.render_mob_appearance(src, SLOT_ID_LEFT_EAR, species.get_effective_bodytype(src, l_ear, SLOT_ID_LEFT_EAR)) - if(r_ear) - both += r_ear.render_mob_appearance(src, SLOT_ID_RIGHT_EAR, species.get_effective_bodytype(src, r_ear, SLOT_ID_RIGHT_EAR)) - - overlays_standing[EARS_LAYER] = both - apply_layer(EARS_LAYER) - -/mob/living/carbon/human/update_inv_shoes() - if(QDESTROYING(src)) - return - - remove_layer(SHOES_LAYER) - remove_layer(SHOES_LAYER_ALT) //Dumb alternate layer for shoes being under the uniform. - - if(!shoes || (wear_suit && wear_suit.inv_hide_flags & HIDESHOES) || (w_uniform && w_uniform.inv_hide_flags & HIDESHOES)) - return //Either nothing to draw, or it'd be hidden. - - for(var/f in list(BP_L_FOOT, BP_R_FOOT)) - var/obj/item/organ/external/foot/foot = get_organ(f) - if(istype(foot) && foot.is_hidden_by_tail()) //If either foot is hidden by the tail, don't render footwear. - return - - //Allow for shoe layer toggle nonsense - var/shoe_layer = SHOES_LAYER - if(istype(shoes, /obj/item/clothing/shoes)) - var/obj/item/clothing/shoes/ushoes = shoes - if(ushoes.shoes_under_pants == 1) - shoe_layer = SHOES_LAYER_ALT - - //NB: the use of a var for the layer on this one - overlays_standing[shoe_layer] = shoes.render_mob_appearance(src, SLOT_ID_SHOES, species.get_effective_bodytype(src, shoes, SLOT_ID_SHOES)) - - apply_layer(SHOES_LAYER) - apply_layer(SHOES_LAYER_ALT) - -/mob/living/carbon/human/update_inv_s_store() - if(QDESTROYING(src)) - return - - remove_layer(SUIT_STORE_LAYER) - - if(!s_store) - return //Why bother, nothing there. - - //TODO, this is unlike the rest of the things - //Basically has no variety in slot icon choices at all. WHY SPECIES ONLY?? - var/t_state = s_store.item_state - if(!t_state) - t_state = s_store.icon_state - overlays_standing[SUIT_STORE_LAYER] = image(icon = species.suit_storage_icon, icon_state = t_state, layer = BODY_LAYER+SUIT_STORE_LAYER) - - apply_layer(SUIT_STORE_LAYER) - -/mob/living/carbon/human/update_inv_head() - if(QDESTROYING(src)) - return - - remove_layer(HEAD_LAYER) - - if(!head) - return //No head item, why bother. - - overlays_standing[HEAD_LAYER] = head.render_mob_appearance(src, SLOT_ID_HEAD, species.get_effective_bodytype(src, head, SLOT_ID_HEAD)) - - apply_layer(HEAD_LAYER) - -/mob/living/carbon/human/update_inv_belt() - if(QDESTROYING(src)) - return - - remove_layer(BELT_LAYER) - remove_layer(BELT_LAYER_ALT) //Because you can toggle belt layer with a verb - - if(!belt) - return //No belt, why bother. - - //Toggle for belt layering with uniform - var/belt_layer = BELT_LAYER - if(istype(belt, /obj/item/storage/belt)) - var/obj/item/storage/belt/ubelt = belt - if(ubelt.show_above_suit) - belt_layer = BELT_LAYER_ALT - - //NB: this uses a var from above - overlays_standing[belt_layer] = belt.render_mob_appearance(src, SLOT_ID_BELT, species.get_effective_bodytype(src, belt, SLOT_ID_BELT)) - - apply_layer(belt_layer) - -/mob/living/carbon/human/update_inv_wear_suit() - if(QDESTROYING(src)) - return - - remove_layer(SUIT_LAYER) - - //Hide/show other layers if necessary - update_inv_w_uniform() - update_inv_shoes() - update_tail_showing() - update_wing_showing() - - if(!wear_suit) - return //No point, no suit. - - // Part of splitting the suit sprites up - - var/icon/c_mask = null - var/tail_is_rendered = (overlays_standing[TAIL_LAYER] || overlays_standing[TAIL_LAYER_ALT]) - var/valid_clip_mask = tail_style?.clip_mask - - var/obj/item/clothing/suit/S = wear_suit - if(tail_is_rendered && valid_clip_mask && !(istype(S) && S.taurized)) //Clip the lower half of the suit off using the tail's clip mask for taurs since taur bodies aren't hidden. - c_mask = valid_clip_mask - var/list/MA_or_list = wear_suit.render_mob_appearance(src, SLOT_ID_SUIT, species.get_effective_bodytype(src, wear_suit, SLOT_ID_SUIT)) - if(c_mask) - if(islist(MA_or_list)) - for(var/mutable_appearance/MA2 as anything in MA_or_list) - MA2.filters += filter(type = "alpha", icon = c_mask) - else - var/mutable_appearance/MA = MA_or_list - MA.filters += filter(type = "alpha", icon = c_mask) - overlays_standing[SUIT_LAYER] = MA_or_list - - apply_layer(SUIT_LAYER) - -/mob/living/carbon/human/update_inv_wear_mask() - if(QDESTROYING(src)) - return - - remove_layer(FACEMASK_LAYER) - - if(!wear_mask || (head && head.inv_hide_flags & HIDEMASK)) - return //Why bother, nothing in mask slot. - - overlays_standing[FACEMASK_LAYER] = wear_mask.render_mob_appearance(src, SLOT_ID_MASK, species.get_effective_bodytype(src, wear_mask, SLOT_ID_MASK)) - - apply_layer(FACEMASK_LAYER) - -/mob/living/carbon/human/update_inv_back() - if(QDESTROYING(src)) - return - - remove_layer(BACK_LAYER) - - if(!back) - return //Why do anything - - overlays_standing[BACK_LAYER] = back.render_mob_appearance(src, SLOT_ID_BACK, species.get_effective_bodytype(src, back, SLOT_ID_BACK)) - - apply_layer(BACK_LAYER) - -//TODO: Carbon procs in my human update_icons?? -/mob/living/carbon/human/update_hud() //TODO: do away with this if possible - if(QDESTROYING(src)) - return - // todo: this is utterly shitcode and fucking stupid ~silicons - // todo: the rest of hud code here ain't much better LOL - var/list/obj/item/relevant = get_equipped_items(TRUE, TRUE) - if(hud_used) - for(var/obj/item/I as anything in relevant) - position_hud_item(I, slot_id_by_item(I)) - if(client) - client.screen |= relevant - -//update whether handcuffs appears on our hud. -/mob/living/carbon/proc/update_hud_handcuffed() - if(QDESTROYING(src)) - return - - if(hud_used && hud_used.l_hand_hud_object && hud_used.r_hand_hud_object) - hud_used.l_hand_hud_object.update_icon() - hud_used.r_hand_hud_object.update_icon() - -/mob/living/carbon/human/update_inv_handcuffed() - if(QDESTROYING(src)) - return - - remove_layer(HANDCUFF_LAYER) - update_hud_handcuffed() //TODO - - if(!handcuffed) - return //Not cuffed, why bother - - overlays_standing[HANDCUFF_LAYER] = handcuffed.render_mob_appearance(src, SLOT_ID_HANDCUFFED, species.get_effective_bodytype(src, handcuffed, SLOT_ID_HANDCUFFED)) - - apply_layer(HANDCUFF_LAYER) - -/mob/living/carbon/human/update_inv_legcuffed() - if(QDESTROYING(src)) - return - - remove_layer(LEGCUFF_LAYER) - - if(!legcuffed) - return //Not legcuffed, why bother. - - overlays_standing[LEGCUFF_LAYER] = legcuffed.render_mob_appearance(src, SLOT_ID_LEGCUFFED, species.get_effective_bodytype(src, legcuffed, SLOT_ID_LEGCUFFED)) - - apply_layer(LEGCUFF_LAYER) - -/mob/living/carbon/human/update_inv_r_hand() - if(QDESTROYING(src)) - return - - remove_layer(R_HAND_LAYER) - - if(!r_hand) - return //No hand, no bother. - - overlays_standing[R_HAND_LAYER] = r_hand.render_mob_appearance(src, 2, BODYTYPE_DEFAULT) - - apply_layer(R_HAND_LAYER) - -/mob/living/carbon/human/update_inv_l_hand() - if(QDESTROYING(src)) - return - - remove_layer(L_HAND_LAYER) - - if(!l_hand) - return //No hand, no bother. - - overlays_standing[L_HAND_LAYER] = l_hand.render_mob_appearance(src, 1, BODYTYPE_DEFAULT) - - apply_layer(L_HAND_LAYER) - -/mob/living/carbon/human/proc/update_tail_showing() - if(QDESTROYING(src)) - return - - remove_layer(TAIL_LAYER) - remove_layer(TAIL_LAYER_ALT) - - if(hiding_tail && tail_style.can_be_hidden) - return - - var/used_tail_layer = tail_alt ? TAIL_LAYER_ALT : TAIL_LAYER - - var/list/image/tail_images = list() - - var/image/rendering - rendering = get_tail_image(TRUE) - if(rendering) - rendering.layer = BODY_LAYER + used_tail_layer - tail_images += rendering - - if(tail_style?.front_behind_system) - rendering = get_tail_image(FALSE) - rendering.layer = BODY_LAYER - used_tail_layer - tail_images += rendering - - if(length(tail_images)) - overlays_standing[used_tail_layer] = tail_images - apply_layer(used_tail_layer) - return - - var/species_tail = species.get_tail(src) // Species tail icon_state prefix. - - //This one is actually not that bad I guess. - if(species_tail && !(wear_suit && wear_suit.inv_hide_flags & HIDETAIL)) - var/icon/tail_s = get_tail_icon() - overlays_standing[used_tail_layer] = image(icon = tail_s, icon_state = "[species_tail]_s", layer = BODY_LAYER+used_tail_layer) - animate_tail_reset() - -//TODO: Is this the appropriate place for this, and not on species...? -/mob/living/carbon/human/proc/get_tail_icon() - var/icon_key = "[species.get_race_key(src)][r_skin][g_skin][b_skin][r_hair][g_hair][b_hair]" - var/icon/tail_icon = GLOB.tail_icon_cache[icon_key] - if(!tail_icon) - //generate a new one - var/species_tail_anim = species.get_tail_animation(src) - if(!species_tail_anim && species.icobase_tail) - species_tail_anim = species.icobase // Allow override of file for non-animated tails - if(!species_tail_anim) - species_tail_anim = 'icons/effects/species.dmi' - tail_icon = new/icon(species_tail_anim) - tail_icon.Blend(rgb(r_skin, g_skin, b_skin), species.color_mult ? ICON_MULTIPLY : ICON_ADD) - // The following will not work with animated tails. - var/use_species_tail = species.get_tail_hair(src) - if(use_species_tail) - var/icon/hair_icon = icon('icons/effects/species.dmi', "[species.get_tail(src)]_[use_species_tail]_s") // Suffix icon state string with '_s' to compensate for diff in .dmi b/w us & Polaris. //TODO: No. - if(species.color_force_greyscale) - hair_icon.MapColors(arglist(color_matrix_greyscale())) - hair_icon.Blend(rgb(r_hair, g_hair, b_hair), species.color_mult ? ICON_MULTIPLY : ICON_ADD) // Check for species color_mult - tail_icon.Blend(hair_icon, ICON_OVERLAY) - GLOB.tail_icon_cache[icon_key] = tail_icon - - return tail_icon - -/mob/living/carbon/human/proc/set_tail_state(var/t_state) - var/used_tail_layer = tail_alt ? TAIL_LAYER_ALT : TAIL_LAYER - var/list/image/tail_overlays = overlays_standing[used_tail_layer] - - remove_layer(TAIL_LAYER) - remove_layer(TAIL_LAYER_ALT) - - if(!tail_overlays || hiding_tail) - return - if(islist(tail_overlays)) - for(var/image/tail_overlay as anything in tail_overlays) - if(species.get_tail_animation(src)) - tail_overlay.icon_state = t_state - overlays_standing[used_tail_layer] = tail_overlays - else - var/image/tail_overlay = tail_overlays - if(species.get_tail_animation(src)) - tail_overlay.icon_state = t_state - . = tail_overlay - overlays_standing[used_tail_layer] = tail_overlay - - apply_layer(used_tail_layer) - -//Not really once, since BYOND can't do that. -//Update this if the ability to flick() images or make looping animation start at the first frame is ever added. -//You can sort of flick images now with flick_overlay -Aro -/mob/living/carbon/human/proc/animate_tail_once() - if(QDESTROYING(src)) - return - - var/t_state = "[species.get_tail(src)]_once" - var/used_tail_layer = tail_alt ? TAIL_LAYER_ALT : TAIL_LAYER - - var/image/tail_overlay = overlays_standing[used_tail_layer] - if(tail_overlay && tail_overlay.icon_state == t_state) - return //let the existing animation finish - - tail_overlay = set_tail_state(t_state) // Calls remove_layer & apply_layer - if(tail_overlay) - spawn(20) - //check that the animation hasn't changed in the meantime - if(overlays_standing[used_tail_layer] == tail_overlay && tail_overlay.icon_state == t_state) - animate_tail_stop() - -/mob/living/carbon/human/proc/animate_tail_start() - if(QDESTROYING(src)) - return - - set_tail_state("[species.get_tail(src)]_slow[rand(0,9)]") - -/mob/living/carbon/human/proc/animate_tail_fast() - if(QDESTROYING(src)) - return - - set_tail_state("[species.get_tail(src)]_loop[rand(0,9)]") - -/mob/living/carbon/human/proc/animate_tail_reset() - if(QDESTROYING(src)) - return - - if(stat != DEAD) - set_tail_state("[species.get_tail(src)]_idle[rand(0,9)]") - else - set_tail_state("[species.get_tail(src)]_static") - toggle_tail_vr(FALSE) // So tails stop when someone dies. TODO - Fix this hack ~Leshana - -/mob/living/carbon/human/proc/animate_tail_stop() - if(QDESTROYING(src)) - return - - set_tail_state("[species.get_tail(src)]_static") - -/// Wings! See update_icons_vr.dm for more wing procs -/mob/living/carbon/human/proc/update_wing_showing() - if(QDESTROYING(src)) - return - - remove_layer(WING_LAYER) - - if(hiding_wings && wing_style.can_be_hidden) - return - - overlays_standing[WING_LAYER] = list() - - var/image/vr_wing_image = get_wing_image(TRUE) - if(vr_wing_image) - vr_wing_image.layer = BODY_LAYER+WING_LAYER - overlays_standing[WING_LAYER] += vr_wing_image - - if(wing_style?.front_behind_system) - var/image/vr_wing_image_2 = get_wing_image(FALSE) - vr_wing_image_2.layer = BODY_LAYER - WING_LAYER - overlays_standing[WING_LAYER] += vr_wing_image_2 - - apply_layer(WING_LAYER) - -/mob/living/carbon/human/update_modifier_visuals() - if(QDESTROYING(src)) - return - - remove_layer(MODIFIER_EFFECTS_LAYER) - - if(!LAZYLEN(modifiers)) - return //No modifiers, no effects. - - var/image/effects = new() - for(var/datum/modifier/M in modifiers) - if(M.mob_overlay_state) - var/image/I = image(icon = 'icons/mob/modifier_effects.dmi', icon_state = M.mob_overlay_state) - effects.add_overlay(I) //TODO, this compositing is annoying. - - overlays_standing[MODIFIER_EFFECTS_LAYER] = effects - - apply_layer(MODIFIER_EFFECTS_LAYER) - -/mob/living/carbon/human/update_fire() - if(QDESTROYING(src)) - return - - remove_layer(FIRE_LAYER) - - if(!on_fire) - return - - overlays_standing[FIRE_LAYER] = image(icon = 'icons/mob/OnFire.dmi', icon_state = get_fire_icon_state(), layer = BODY_LAYER+FIRE_LAYER) - - apply_layer(FIRE_LAYER) - -/mob/living/carbon/human/update_water() - if(QDESTROYING(src)) - return - - remove_layer(MOB_WATER_LAYER) - - var/depth = check_submerged() - if(!depth || lying) - return - if(depth < 3) - overlays_standing[MOB_WATER_LAYER] = image(icon = 'icons/mob/submerged.dmi', icon_state = "human_swimming_[depth]", layer = BODY_LAYER+MOB_WATER_LAYER) //TODO: Improve - apply_layer(MOB_WATER_LAYER) - if(depth == 4) - overlays_standing[MOB_WATER_LAYER] = image(icon = 'icons/mob/submerged.dmi', icon_state = "hacid_1", layer = BODY_LAYER+MOB_WATER_LAYER) - apply_layer(MOB_WATER_LAYER) - if(depth == 5) - overlays_standing[MOB_WATER_LAYER] = image(icon = 'icons/mob/submerged.dmi', icon_state = "hacid_2", layer = BODY_LAYER+MOB_WATER_LAYER) - apply_layer(MOB_WATER_LAYER) - if(depth == 6) - overlays_standing[MOB_WATER_LAYER] = image(icon = 'icons/mob/submerged.dmi', icon_state = "hblood_1", layer = BODY_LAYER+MOB_WATER_LAYER) - apply_layer(MOB_WATER_LAYER) - if(depth == 7) - overlays_standing[MOB_WATER_LAYER] = image(icon = 'icons/mob/submerged.dmi', icon_state = "hblood_2", layer = BODY_LAYER+MOB_WATER_LAYER) - apply_layer(MOB_WATER_LAYER) - -/mob/living/carbon/human/update_acidsub() - if(QDESTROYING(src)) - return - - remove_layer(MOB_WATER_LAYER) - - var/depth = check_submerged() - if(!depth || lying) - return - - overlays_standing[MOB_WATER_LAYER] = image(icon = 'icons/mob/submerged.dmi', icon_state = "hacid_[depth]", layer = BODY_LAYER+MOB_WATER_LAYER) //TODO: Improve - - apply_layer(MOB_WATER_LAYER) - -/mob/living/carbon/human/update_bloodsub() - if(QDESTROYING(src)) - return - - remove_layer(MOB_WATER_LAYER) - - var/depth = check_submerged() - if(!depth || lying) - return - - overlays_standing[MOB_WATER_LAYER] = image(icon = 'icons/mob/submerged.dmi', icon_state = "hblood_[depth]", layer = BODY_LAYER+MOB_WATER_LAYER) //TODO: Improve - - apply_layer(MOB_WATER_LAYER) - -/mob/living/carbon/human/proc/update_surgery() - if(QDESTROYING(src)) - return - - remove_layer(SURGERY_LAYER) - - var/image/total = new - for(var/obj/item/organ/external/E in organs) - if(E.open) - var/image/I = image(icon = 'icons/mob/surgery.dmi', icon_state = "[E.icon_name][round(E.open)]", layer = BODY_LAYER+SURGERY_LAYER) - total.add_overlay(I) //TODO: This compositing is annoying - - if(total.overlays.len) - overlays_standing[SURGERY_LAYER] = total - apply_layer(SURGERY_LAYER) - -/mob/living/carbon/human/proc/get_wing_image(front) //redbull gives you wings - var/icon/grad_swing - if(QDESTROYING(src)) - return - - //If you are FBP with wing style and didn't set a custom one - if(synthetic && synthetic.includes_wing && !wing_style) - var/icon/wing_s = new/icon("icon" = synthetic.icon, "icon_state" = "wing") //I dunno. If synths have some custom wing? - wing_s.Blend(rgb(src.r_skin, src.g_skin, src.b_skin), species.color_mult ? ICON_MULTIPLY : ICON_ADD) - return image(wing_s) - - //If you have custom wings selected - if(wing_style && (!(wear_suit && wear_suit.inv_hide_flags & HIDETAIL) || !wing_style.clothing_can_hide)) - var/icon/wing_s = new/icon("icon" = wing_style.icon, "icon_state" = spread ? wing_style.spr_state : (flapping && wing_style.ani_state ? wing_style.ani_state : (wing_style.front_behind_system? (wing_style.icon_state + (front? "_FRONT" : "_BEHIND")) : wing_style.icon_state))) - if(wing_style.do_colouration) - if(grad_wingstyle) - grad_swing = new/icon("icon" = 'icons/mob/wing_gradients.dmi', "icon_state" = GLOB.hair_gradients[grad_wingstyle]) - grad_swing.Blend(wing_s, ICON_AND) - grad_swing.Blend(rgb(r_gradwing, g_gradwing, b_gradwing), ICON_MULTIPLY) - wing_s.Blend(rgb(src.r_wing, src.g_wing, src.b_wing), wing_style.color_blend_mode) - if(grad_swing) - wing_s.Blend(grad_swing, ICON_OVERLAY) - if(wing_style.extra_overlay) - var/icon/overlay = new/icon("icon" = wing_style.icon, "icon_state" = wing_style.extra_overlay) - overlay.Blend(rgb(src.r_wing2, src.g_wing2, src.b_wing2), wing_style.color_blend_mode) - wing_s.Blend(overlay, ICON_OVERLAY) - qdel(overlay) - - if(wing_style.extra_overlay2) - var/icon/overlay = new/icon("icon" = wing_style.icon, "icon_state" = wing_style.extra_overlay2) - if(wing_style.ani_state) - overlay = new/icon("icon" = wing_style.icon, "icon_state" = wing_style.extra_overlay2_w) - overlay.Blend(rgb(src.r_wing3, src.g_wing3, src.b_wing3), wing_style.color_blend_mode) - wing_s.Blend(overlay, ICON_OVERLAY) - qdel(overlay) - else - overlay.Blend(rgb(src.r_wing3, src.g_wing3, src.b_wing3), wing_style.color_blend_mode) - wing_s.Blend(overlay, ICON_OVERLAY) - qdel(overlay) - - if(wing_style.center) - center_appearance(wing_s, wing_style.dimension_x, wing_style.dimension_y) - return image(wing_s, "pixel_x" = -16) - // TODO - Move this to where it should go ~Leshana /mob/proc/stop_flying() if(QDESTROYING(src)) @@ -1196,7 +130,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) /mob/living/carbon/human/stop_flying() if((. = ..())) - update_wing_showing() + render_spriteacc_wings() //Stolen from bay for shifting equipment by default and not having to resprite it /proc/overlay_image(icon,icon_state,color,flags) diff --git a/code/modules/mob/living/carbon/lick_wounds.dm b/code/modules/mob/living/carbon/lick_wounds.dm index a775613fe514..9b3718c9196d 100644 --- a/code/modules/mob/living/carbon/lick_wounds.dm +++ b/code/modules/mob/living/carbon/lick_wounds.dm @@ -49,7 +49,7 @@ if(affecting.brute_dam > 20 || affecting.burn_dam > 20) to_chat(src, "The wounds on [M]'s [affecting.name] are too severe to treat with just licking.") return - + else visible_message("\The [src] starts licking the wounds on [M]'s [affecting.name] clean.", \ "You start licking the wounds on [M]'s [affecting.name] clean." ) @@ -65,10 +65,10 @@ if(affecting.is_bandaged() && affecting.is_salved()) // We do a second check after the delay, in case it was bandaged after the first check. to_chat(src, "The wounds on [M]'s [affecting.name] have already been treated.") - return + return else - visible_message("\The [src] [pick("slathers \a [W.desc] on [M]'s [affecting.name] with their spit.", + visible_message("\The [src] [pick("slathers \a [W.desc] on [M]'s [affecting.name] with their spit.", "drags their tongue across \a [W.desc] on [M]'s [affecting.name].", "drips saliva onto \a [W.desc] on [M]'s [affecting.name].", "uses their tongue to disinfect \a [W.desc] on [M]'s [affecting.name].", @@ -78,5 +78,5 @@ W.salve() W.bandage() W.disinfect() - H.UpdateDamageIcon() + H.update_damage_overlay() playsound(src.loc, 'sound/effects/ointment.ogg', 25) diff --git a/code/modules/mob/living/carbon/rendering.dm b/code/modules/mob/living/carbon/rendering.dm new file mode 100644 index 000000000000..66d3a9e291e6 --- /dev/null +++ b/code/modules/mob/living/carbon/rendering.dm @@ -0,0 +1,66 @@ +//* This file is explicitly licensed under the MIT license. *// +//* Copyright (c) 2024 silicons *// + +/** + * flatten all keyed overlays + */ +/mob/living/carbon/proc/flatten_standing_overlays() + return + +/** + * rebuild all keyed overlays + */ +/mob/living/carbon/proc/rebuild_standing_overlays(dump_all_overlays = TRUE) + regenerate_icons() + // todo: rebuild inventory + reapply_standing_overlays(dump_all_overlays) + +/** + * reapply all keyed overlays + * + * * inventory overlays *are* included in this + * + * @params + * * dump_all_overlays - drop all non-priority overlays + */ +/mob/living/carbon/proc/reapply_standing_overlays(dump_all_overlays = TRUE) + if(dump_all_overlays) + cut_overlays() + for(var/key in standing_overlays) + add_overlay(standing_overlays[key]) + inventory.reapply_slot_renders() + +/** + * obliterate a keyed overlay or list of keyed overlays from our overlays + * + * * inventory overlays are not handled by this; check /datum/inventory + */ +/mob/living/carbon/proc/remove_standing_overlay(key, do_not_update) + . = standing_overlays[key] + + standing_overlays -= key + + if(!do_not_update) + cut_overlay(.) + +/** + * set a keyed overlay or list of keyed overlays to our overlays + * + * * inventory overlays are not handled by this; check /datum/inventory + */ +/mob/living/carbon/proc/set_standing_overlay(key, list/overlay_or_list, do_not_update) + . = standing_overlays[key] + + if(isnull(overlay_or_list) || (islist(overlay_or_list) && !length(overlay_or_list))) + standing_overlays -= key + // unreference so we don't try to add overlay it + overlay_or_list = null + else + standing_overlays[key] = overlay_or_list + + if(!do_not_update) + if(!isnull(.)) + cut_overlay(.) + if(!isnull(overlay_or_list)) + add_overlay(overlay_or_list) + diff --git a/code/modules/mob/living/health.dm b/code/modules/mob/living/health.dm index edf3f14bf9de..f5bcd9cf190f 100644 --- a/code/modules/mob/living/health.dm +++ b/code/modules/mob/living/health.dm @@ -101,7 +101,7 @@ * set body temperature */ /mob/living/proc/set_bodytemperature(amt) - bodytemperature = amt + bodytemperature = max(TCMB, amt) /** * adjust body temperature */ diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 51241bb0c7e2..88bb83a1dec7 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -5,13 +5,6 @@ selected_image = image(icon = 'icons/mob/screen1.dmi', loc = src, icon_state = "centermarker") -/mob/living/prepare_huds() - ..() - prepare_data_huds() - -/mob/living/proc/prepare_data_huds() - update_hud_med_all() - /mob/living/Destroy() if(nest) //Ew. if(istype(nest, /obj/structure/prop/nest)) @@ -393,7 +386,7 @@ default behaviour is: . += iterating var/list/returned = iterating.return_inventory() . += returned - + /mob/living/proc/can_inject(var/mob/user, var/error_msg, var/target_zone, var/ignore_thickness = FALSE) return 1 @@ -421,9 +414,6 @@ default behaviour is: /mob/living/proc/restore_all_organs() return -/mob/living/proc/UpdateDamageIcon() - return - /mob/living/proc/Examine_OOC() set name = "Examine Meta-Info (OOC)" set category = VERB_CATEGORY_OOC diff --git a/code/modules/mob/living/mobility.dm b/code/modules/mob/living/mobility.dm index 806aff17988d..9f0697f85618 100644 --- a/code/modules/mob/living/mobility.dm +++ b/code/modules/mob/living/mobility.dm @@ -29,6 +29,8 @@ * does not set other mobility flags or update mobility. */ /mob/living/proc/set_resting(value) + if(HAS_TRAIT(src, TRAIT_MOB_FORCED_STANDING)) + value = FALSE if(resting == value) return resting = value diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index fa5eb18cd5c0..03cde2178079 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -85,7 +85,7 @@ var/list/ai_verbs_default = list( /// Used to prevent dummy AIs from spawning with communicators. var/is_dummy = FALSE -//! ## MALF VARIABLES + //* MALF VARIABLES /// Master var that determines if AI is malfunctioning. var/malfunctioning = FALSE /// Installed piece of hardware. diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index f5ea6663dc93..7991a9fba01c 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -75,7 +75,7 @@ var/integrated_light_power = 4.5 var/datum/wires/robot/wires -//! ## Icon stuff + //* Icon stuff /// Persistent icontype tracking allows for cleaner icon updates var/icontype /// Used to store the associations between sprite names and sprite index. @@ -85,7 +85,7 @@ /// Remaining attempts to select icon before a selection is forced. var/icon_selection_tries = 0 -//! ## Hud stuff + //* Hud stuff var/atom/movable/screen/cells = null var/atom/movable/screen/inv1 = null @@ -916,6 +916,7 @@ cut_overlays() if (dogborg) + zmm_flags |= ZMM_LOOKAHEAD // Resting dogborgs don't get overlays. if (stat == CONSCIOUS && resting) if(sitting) @@ -925,6 +926,8 @@ else icon_state = "[module_sprites[icontype]]-rest" return + else + zmm_flags &= ~ZMM_LOOKAHEAD if(stat == CONSCIOUS) if(!shell || deployed) // Shell borgs that are not deployed will have no eyes. diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index 7932630f2010..1d4231208d11 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -267,17 +267,14 @@ var/sensor_type = input("Please select sensor type.", "Sensor Integration", null) as null|anything in list("Security","Medical","Disable") if(isnull(sensor_type)) return - switch(hudmode) - if("Security") - get_atom_hud(DATA_HUD_SECURITY_ADVANCED).remove_hud_from(src) - if("Medical") - get_atom_hud(DATA_HUD_MEDICAL).remove_hud_from(src) + + self_perspective.remove_atom_hud(source = ATOM_HUD_SOURCE_SILICON_SENSOR_AUGMENT) switch(sensor_type) if ("Security") - get_atom_hud(DATA_HUD_SECURITY_ADVANCED).add_hud_to(src) + self_perspective.add_atom_hud(/datum/atom_hud/data/human/security/advanced, ATOM_HUD_SOURCE_SILICON_SENSOR_AUGMENT) to_chat(src,"Security records overlay enabled.") if ("Medical") - get_atom_hud(DATA_HUD_MEDICAL).add_hud_to(src) + self_perspective.add_atom_hud(/datum/atom_hud/data/human/medical, ATOM_HUD_SOURCE_SILICON_SENSOR_AUGMENT) to_chat(src,"Life signs monitor overlay enabled.") if ("Disable") to_chat(src,"Sensor augmentations disabled.") diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm index 3af0ca9ee2b0..092fdf357d27 100644 --- a/code/modules/mob/login.dm +++ b/code/modules/mob/login.dm @@ -64,24 +64,12 @@ update_client_color() - //Reload alternate appearances - for(var/v in GLOB.active_alternate_appearances) - if(!v) - continue - var/datum/atom_hud/alternate_appearance/AA = v - AA.onNewMob(src) - - if(!client.tooltips) - client.tooltips = new(client) - var/turf/T = get_turf(src) if(isturf(T)) update_client_z(T.z) SEND_SIGNAL(src, COMSIG_MOB_CLIENT_LOGIN, client) - reload_huds() - // reset perspective to using reset_perspective(no_optimizations = TRUE) // load rendering onto client's screen diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index cc40541682f3..5360221ecc45 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -23,15 +23,12 @@ // physiology init_physiology() // atom HUDs - set_key_focus(src) prepare_huds() - for(var/v in GLOB.active_alternate_appearances) - if(!v) - continue - var/datum/atom_hud/alternate_appearance/AA = v - AA.onNewMob(src) + set_key_focus(src) // todo: remove hooks hook_vr("mob_new",list(src)) + // signal + SEND_GLOBAL_SIGNAL(COMSIG_GLOBAL_MOB_NEW, src) // abilities init_abilities() // inventory @@ -81,6 +78,8 @@ else // mind is not ours, null it out mind = null + // signal + SEND_GLOBAL_SIGNAL(COMSIG_GLOBAL_MOB_DEL, src) // abilities dispose_abilities() // this kicks out client @@ -127,7 +126,7 @@ * * This is simply "mob_"+ a global incrementing counter that goes up for every mob */ -/mob/GenerateTag() +/mob/generate_tag() tag = "mob_[++next_mob_id]" /** @@ -135,20 +134,15 @@ * * Goes through hud_possible list and adds the images to the hud_list variable (if not already * cached) + * + * todo: this should be atom level but uhh lmao lol */ -/atom/proc/prepare_huds() - hud_list = list() - for(var/hud in hud_possible) - var/hint = hud_possible[hud] - switch(hint) - if(HUD_LIST_LIST) - hud_list[hud] = list() - else - var/image/I = image(GLOB.hud_icon_files[hud] || 'icons/screen/atom_hud/misc.dmi', src, "") - I.plane = FLOAT_PLANE - I.layer = FLOAT_LAYER + 100 + (GLOB.hud_icon_layers[hud] || 0) - I.appearance_flags = RESET_COLOR|RESET_TRANSFORM|KEEP_APART - hud_list[hud] = I +/mob/proc/prepare_huds() + if(!atom_huds_to_initialize) + return + for(var/hud in atom_huds_to_initialize) + update_atom_hud_provider(src, hud) + atom_huds_to_initialize = null /mob/proc/remove_screen_obj_references() hands = null diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index b0512526e191..98bb8ff77031 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -50,8 +50,11 @@ /// Atom we're buckl**ing** to. Used to stop stuff like lava from incinerating those who are mid buckle. var/atom/movable/buckling - //* HUD + //* HUD (Atom) + /// HUDs to initialize, typepaths + var/list/atom_huds_to_initialize + //* HUD /// active, opened storage // todo: doesn't clear from clients properly on logout, relies on login clearing screne. // todo: we'll eventually need a system to handle ckey transfers properly. @@ -246,7 +249,7 @@ var/timeofdeath = 0 //?Living // todo: go to carbon, simple mobs don't need environmental stabilization - var/bodytemperature = 310.055 //98.7 F + var/bodytemperature = 310.055 //98.7 F or 36,905 C var/drowsyness = 0 //?Carbon var/nutrition = 400 //?Carbon diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index ece66f8d706c..de5a862f371e 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -605,7 +605,7 @@ var/list/global/organ_rel_size = list( return // They may have hidden the icons in the bottom left with the hide button. - if(!hud_used.inventory_shown && !held && (resolve_inventory_slot_meta(slot)?.inventory_slot_flags & INV_SLOT_HUD_REQUIRES_EXPAND)) + if(!hud_used.inventory_shown && !held && (resolve_inventory_slot(slot)?.inventory_slot_flags & INV_SLOT_HUD_REQUIRES_EXPAND)) item.screen_loc = null return diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 1627c58d1cb9..ec71b233cd4d 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -478,7 +478,6 @@ // Moving wheelchair if they have one if(character.buckled && istype(character.buckled, /obj/structure/bed/chair/wheelchair)) character.buckled.forceMove(character.loc) - character.buckled.setDir(character.dir) SSticker.mode.latespawn(character) diff --git a/code/modules/mob/observer/dead/dead.dm b/code/modules/mob/observer/dead/dead.dm index f92102db5cd9..8341927ae1de 100644 --- a/code/modules/mob/observer/dead/dead.dm +++ b/code/modules/mob/observer/dead/dead.dm @@ -112,14 +112,15 @@ GLOBAL_LIST_EMPTY(observer_list) var/mob/living/carbon/human/H = body icon = H.icon icon_state = H.icon_state - if(H.overlays_standing) - for(var/i in 1 to length(H.overlays_standing)) - if(!H.overlays_standing[i]) - continue - add_overlay(H.overlays_standing[i]) + // todo: fixup (get rid of other planes) + for(var/key in H.standing_overlays) + add_overlay(H.standing_overlays[key]) + for(var/slot_id in H.inventory.rendered_normal_overlays) + add_overlay(H.inventory.rendered_normal_overlays[slot_id]) else icon = body.icon icon_state = body.icon_state + // todo: fixup (get rid of other planes) add_overlay(body.overlays) gender = body.gender @@ -142,12 +143,6 @@ GLOBAL_LIST_EMPTY(observer_list) T = locate(1,1,1) forceMove(T) - for(var/v in GLOB.active_alternate_appearances) - if(!v) - continue - var/datum/atom_hud/alternate_appearance/AA = v - AA.onNewMob(src) - if(!name) //To prevent nameless ghosts name = capitalize(pick(GLOB.first_names_male)) + " " + capitalize(pick(GLOB.last_names)) real_name = name @@ -305,9 +300,9 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp medHUD = !medHUD if(medHUD) - get_atom_hud(DATA_HUD_MEDICAL).add_hud_to(src) + self_perspective.add_atom_hud(/datum/atom_hud/data/human/medical, ATOM_HUD_SOURCE_OBSERVER) else - get_atom_hud(DATA_HUD_MEDICAL).remove_hud_from(src) + self_perspective.remove_atom_hud(/datum/atom_hud/data/human/medical, ATOM_HUD_SOURCE_OBSERVER) to_chat(src,"Medical HUD [medHUD ? "Enabled" : "Disabled"]") /mob/observer/dead/verb/toggle_antagHUD() @@ -330,11 +325,10 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp has_enabled_antagHUD = TRUE antagHUD = !antagHUD - var/datum/atom_hud/H = GLOB.huds[ANTAG_HUD] if(antagHUD) - H.add_hud_to(src) + self_perspective.add_atom_hud(/datum/atom_hud/antag, ATOM_HUD_SOURCE_OBSERVER) else - H.remove_hud_from(src) + self_perspective.remove_atom_hud(/datum/atom_hud/antag, ATOM_HUD_SOURCE_OBSERVER) to_chat(src,"AntagHUD [antagHUD ? "Enabled" : "Disabled"]") /mob/observer/dead/proc/dead_tele(var/area/A in GLOB.sortedAreas) diff --git a/code/modules/mob/observer/dead/orbit.dm b/code/modules/mob/observer/dead/orbit.dm index e3099ce8591f..804cc45f1b3e 100644 --- a/code/modules/mob/observer/dead/orbit.dm +++ b/code/modules/mob/observer/dead/orbit.dm @@ -97,6 +97,6 @@ return data -/datum/orbit_menu/ui_assets(mob/user) - . = ..() || list() - . += get_asset_datum(/datum/asset/simple/orbit) +/datum/orbit_menu/ui_asset_injection(datum/tgui/ui, list/immediate, list/deferred) + immediate += /datum/asset_pack/simple/orbit + return ..() diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm index 85bc9b61c77c..a9451d4e3046 100644 --- a/code/modules/mob/say.dm +++ b/code/modules/mob/say.dm @@ -12,6 +12,11 @@ if(message) me_verb_subtle(message) +/mob/proc/subtler_wrapper() + var/message = input("","subtler (text)") as message|null + if(message) + subtler_anti_ghost(message) + /mob/verb/whisper(message as text) set name = "Whisper" set category = VERB_CATEGORY_IC diff --git a/code/modules/mob/update_icons.dm b/code/modules/mob/update_icons.dm index adb10c898cdf..a5e110a93bbc 100644 --- a/code/modules/mob/update_icons.dm +++ b/code/modules/mob/update_icons.dm @@ -20,6 +20,9 @@ // End obsolete +/mob/proc/update_damage_overlay() + return + /mob/proc/update_hud() return diff --git a/code/modules/modular_computers/computers/modular_computer/ui.dm b/code/modules/modular_computers/computers/modular_computer/ui.dm index 2ae564ead147..97989cb91a73 100644 --- a/code/modules/modular_computers/computers/modular_computer/ui.dm +++ b/code/modules/modular_computers/computers/modular_computer/ui.dm @@ -1,8 +1,7 @@ // Operates TGUI -/obj/item/modular_computer/ui_assets(mob/user) - return list( - get_asset_datum(/datum/asset/simple/headers) - ) +/obj/item/modular_computer/ui_asset_injection(datum/tgui/ui, list/immediate, list/deferred) + immediate += /datum/asset_pack/simple/headers + return ..() /obj/item/modular_computer/ui_interact(mob/user, datum/tgui/ui) if(!screen_on || !enabled) diff --git a/code/modules/modular_computers/file_system/program.dm b/code/modules/modular_computers/file_system/program.dm index ff1c41b2f6ba..b1e018908fa7 100644 --- a/code/modules/modular_computers/file_system/program.dm +++ b/code/modules/modular_computers/file_system/program.dm @@ -151,10 +151,9 @@ QDEL_NULL(TM) return 1 -/datum/computer_file/program/ui_assets(mob/user) - return list( - get_asset_datum(/datum/asset/simple/headers) - ) +/datum/computer_file/program/ui_asset_injection(datum/tgui/ui, list/immediate, list/deferred) + immediate += /datum/asset_pack/simple/headers + return ..() /datum/computer_file/program/ui_interact(mob/user, datum/tgui/ui) if(program_state != PROGRAM_STATE_ACTIVE) diff --git a/code/modules/modular_computers/file_system/programs/generic/game.dm b/code/modules/modular_computers/file_system/programs/generic/game.dm index 5fe42f33b9d1..f3f5c1cd2d79 100644 --- a/code/modules/modular_computers/file_system/programs/generic/game.dm +++ b/code/modules/modular_computers/file_system/programs/generic/game.dm @@ -82,10 +82,9 @@ * UI assets define a list of asset datums to be sent with the UI. * In this case, it's a bunch of cute enemy sprites. */ -/datum/computer_file/program/game/ui_assets(mob/user) - return list( - get_asset_datum(/datum/asset/simple/arcade), - ) +/datum/computer_file/program/game/ui_asset_injection(datum/tgui/ui, list/immediate, list/deferred) + immediate += /datum/asset_pack/simple/arcade + return ..() /** * This provides all of the relevant data to the UI in a list(). diff --git a/code/modules/multiz/turf.dm b/code/modules/multiz/turf.dm index f3b45acfb6e9..a4261ffa6b4a 100644 --- a/code/modules/multiz/turf.dm +++ b/code/modules/multiz/turf.dm @@ -116,13 +116,6 @@ /turf/check_impact(atom/movable/falling_atom) return TRUE -/turf/smooth_icon() - . = ..() - if(SSzmimic.initialized) - var/turf/simulated/open/above = above() - if(istype(above)) - above.queue() - //* lookups /turf/proc/above() diff --git a/code/modules/multiz/turfs/open.dm b/code/modules/multiz/turfs/open.dm index 33e1ad1d90f5..2a629990ab9e 100644 --- a/code/modules/multiz/turfs/open.dm +++ b/code/modules/multiz/turfs/open.dm @@ -16,7 +16,6 @@ . = ..() icon_state = "" ASSERT(!isnull(below())) - queue() /turf/simulated/open/Entered(atom/movable/mover) ..() @@ -29,11 +28,6 @@ if(AM.movement_type & MOVEMENT_GROUND) AM.fall() -/turf/simulated/open/proc/queue() - if(smoothing_flags & SMOOTH_QUEUED) - return - smoothing_flags |= SMOOTH_QUEUED - //! We hijack smoothing flags. /turf/simulated/open/smooth_icon() return // Nope.amv diff --git a/code/modules/multiz/zmimic/mimic_movable.dm b/code/modules/multiz/zmimic/mimic_movable.dm index 43a9c075e8a6..9c3bf5afb619 100644 --- a/code/modules/multiz/zmimic/mimic_movable.dm +++ b/code/modules/multiz/zmimic/mimic_movable.dm @@ -4,39 +4,18 @@ /// Movable-level Z-Mimic flags. This uses ZMM_* flags, not ZM_* flags. var/zmm_flags = NONE -/atom/movable/doMove(atom/destination) - . = ..(destination) +/atom/movable/doMove(atom/dest) + . = ..(dest) if (. && bound_overlay) // The overlay will handle cleaning itself up on non-openspace turfs. - if (isturf(destination)) - var/turf/current = get_turf(src) - bound_overlay.doMove(current.above) + if (isturf(dest)) + // If you feel a need to change this from get_step(), don't. Any change that would require that is illegal with Z-Mimic's layering model. + bound_overlay.doMove(get_step(src, UP)) if (bound_overlay && dir != bound_overlay.dir) bound_overlay.setDir(dir) else // Not a turf, so we need to destroy immediately instead of waiting for the destruction timer to proc. qdel(bound_overlay) -/atom/movable/Move(...) - . = ..() - if (!.) - return - - if (bound_overlay) - var/turf/current = get_turf(src) - bound_overlay.doMove(current.above) - // forceMove could've deleted our overlay - if (bound_overlay && bound_overlay.dir != dir) - bound_overlay.setDir(dir) - - if (light_source_solo) - light_source_solo.source_atom.update_light() - else if (light_source_multi) - var/datum/light_source/L - var/thing - for (thing in light_source_multi) - L = thing - L.source_atom.update_light() - /atom/movable/setDir(ndir) . = ..() if (. && bound_overlay) @@ -47,10 +26,10 @@ return if (MOVABLE_IS_BELOW_ZTURF(src)) - SSzmimic.queued_overlays += bound_overlay + SSzcopy.queued_overlays += bound_overlay bound_overlay.queued += 1 - else if (bound_overlay && !bound_overlay.destruction_timer) - bound_overlay.destruction_timer = addtimer(CALLBACK(bound_overlay, TYPE_PROC_REF(/datum, qdel_self)), 10 SECONDS, TIMER_STOPPABLE) + else + qdel(bound_overlay) // Grabs a list of every openspace object that's directly or indirectly mimicking this object. Returns an empty list if none found. /atom/movable/proc/get_above_oo() @@ -67,7 +46,7 @@ atom_flags = ATOM_ABSTRACT anchored = TRUE mouse_opacity = FALSE - abstract_type = /atom/movable/openspace // unsure if this is valid, check with Lohi + abstract_type = /atom/movable/openspace /atom/movable/openspace/can_fall() return FALSE @@ -119,34 +98,36 @@ var/turf/myturf = loc if (istype(myturf)) myturf.shadower = null + return ..() -/atom/movable/openspace/multiplier/proc/copy_lighting(atom/movable/lighting_overlay/LO) +/atom/movable/openspace/multiplier/proc/copy_lighting(atom/movable/lighting_overlay/LO, use_shadower_mult = TRUE) appearance = LO layer = MIMICED_LIGHTING_LAYER_MAIN plane = OPENTURF_MAX_PLANE blend_mode = BLEND_MULTIPLY invisibility = 0 - if (icon_state == LIGHTING_BASE_ICON_STATE) - // We're using a color matrix, so just darken the colors across the board. - var/list/c_list = color - c_list[CL_MATRIX_RR] *= SHADOWER_DARKENING_FACTOR - c_list[CL_MATRIX_RG] *= SHADOWER_DARKENING_FACTOR - c_list[CL_MATRIX_RB] *= SHADOWER_DARKENING_FACTOR - c_list[CL_MATRIX_GR] *= SHADOWER_DARKENING_FACTOR - c_list[CL_MATRIX_GG] *= SHADOWER_DARKENING_FACTOR - c_list[CL_MATRIX_GB] *= SHADOWER_DARKENING_FACTOR - c_list[CL_MATRIX_BR] *= SHADOWER_DARKENING_FACTOR - c_list[CL_MATRIX_BG] *= SHADOWER_DARKENING_FACTOR - c_list[CL_MATRIX_BB] *= SHADOWER_DARKENING_FACTOR - c_list[CL_MATRIX_AR] *= SHADOWER_DARKENING_FACTOR - c_list[CL_MATRIX_AG] *= SHADOWER_DARKENING_FACTOR - c_list[CL_MATRIX_AB] *= SHADOWER_DARKENING_FACTOR - color = c_list - else - // Not a color matrix, so we can just use the color var ourselves. - color = SHADOWER_DARKENING_COLOR + if (use_shadower_mult) + if (icon_state == LIGHTING_BASE_ICON_STATE) + // We're using a color matrix, so just darken the colors across the board. + var/list/c_list = color + c_list[CL_MATRIX_RR] *= SHADOWER_DARKENING_FACTOR + c_list[CL_MATRIX_RG] *= SHADOWER_DARKENING_FACTOR + c_list[CL_MATRIX_RB] *= SHADOWER_DARKENING_FACTOR + c_list[CL_MATRIX_GR] *= SHADOWER_DARKENING_FACTOR + c_list[CL_MATRIX_GG] *= SHADOWER_DARKENING_FACTOR + c_list[CL_MATRIX_GB] *= SHADOWER_DARKENING_FACTOR + c_list[CL_MATRIX_BR] *= SHADOWER_DARKENING_FACTOR + c_list[CL_MATRIX_BG] *= SHADOWER_DARKENING_FACTOR + c_list[CL_MATRIX_BB] *= SHADOWER_DARKENING_FACTOR + c_list[CL_MATRIX_AR] *= SHADOWER_DARKENING_FACTOR + c_list[CL_MATRIX_AG] *= SHADOWER_DARKENING_FACTOR + c_list[CL_MATRIX_AB] *= SHADOWER_DARKENING_FACTOR + color = c_list + else + // Not a color matrix, so we can just use the color var ourselves. + color = SHADOWER_DARKENING_COLOR if (our_overlays || priority_overlays) compile_overlays() @@ -154,9 +135,9 @@ // compile_overlays() calls update_above(). update_above() -//! -- OPENSPACE MIMIC -- +// -- OPENSPACE MIMIC -- -/// Object used to hold a mimiced atom's appearance. +// Object used to hold a mimiced atom's appearance. /atom/movable/openspace/mimic plane = OPENTURF_MAX_PLANE var/atom/movable/associated_atom @@ -170,10 +151,10 @@ /atom/movable/openspace/mimic/New() atom_flags |= ATOM_INITIALIZED - SSzmimic.openspace_overlays += 1 + SSzcopy.openspace_overlays += 1 /atom/movable/openspace/mimic/Destroy() - SSzmimic.openspace_overlays -= 1 + SSzcopy.openspace_overlays -= 1 queued = 0 if (associated_atom) @@ -188,26 +169,40 @@ /atom/movable/openspace/mimic/attackby(obj/item/W, mob/user) to_chat(user, SPAN_NOTICE("\The [src] is too far away.")) -/atom/movable/openspace/mimic/attack_hand(mob/user, list/params) +/atom/movable/openspace/mimic/attack_hand(mob/user) to_chat(user, SPAN_NOTICE("You cannot reach \the [src] from here.")) /atom/movable/openspace/mimic/examine(...) SHOULD_CALL_PARENT(FALSE) . = associated_atom.examine(arglist(args)) // just pass all the args to the copied atom -/atom/movable/openspace/mimic/doMove(atom/destination) +/atom/movable/openspace/mimic/doMove(turf/dest) + var/atom/old_loc = loc . = ..() - if (MOVABLE_IS_BELOW_ZTURF(associated_atom)) + if (TURF_IS_MIMICKING(dest)) if (destruction_timer) deltimer(destruction_timer) destruction_timer = null + if (old_loc.z != loc.z) + reset_internal_layering() else if (!destruction_timer) - destruction_timer = addtimer(CALLBACK(src, TYPE_PROC_REF(/datum, qdel_self)), 10 SECONDS, TIMER_STOPPABLE) + destruction_timer = ZM_DESTRUCTION_TIMER(src) // Called when the turf we're on is deleted/changed. /atom/movable/openspace/mimic/proc/owning_turf_changed() if (!destruction_timer) - destruction_timer = addtimer(CALLBACK(src, TYPE_PROC_REF(/datum, qdel_self)), 10 SECONDS, TIMER_STOPPABLE) + destruction_timer = ZM_DESTRUCTION_TIMER(src) + +/atom/movable/openspace/mimic/proc/reset_internal_layering() + if (bound_overlay?.override_depth) + depth = bound_overlay.override_depth + else if (isturf(associated_atom.loc)) + depth = min(SSzcopy.zlev_maximums[associated_atom.z] - associated_atom.z, OPENTURF_MAX_DEPTH) + override_depth = depth + + plane = OPENTURF_MAX_PLANE - depth + + bound_overlay?.reset_internal_layering() // -- TURF PROXY -- diff --git a/code/modules/multiz/zmimic/mimic_turf.dm b/code/modules/multiz/zmimic/mimic_turf.dm index f4a025cac965..adb5472e5f9e 100644 --- a/code/modules/multiz/zmimic/mimic_turf.dm +++ b/code/modules/multiz/zmimic/mimic_turf.dm @@ -1,4 +1,3 @@ - /turf /// The z-turf above us, if present. var/tmp/turf/above @@ -16,8 +15,10 @@ var/tmp/z_queued = 0 /// If this Z-turf leads to space, uninterrupted. var/tmp/z_eventually_space = FALSE + /// Use this appearance for our appearance instead of `appearance`. If MZ_OVERRIDE is set, *only* this will be visible, no movables will be copied. + var/z_appearance - //debug + // debug var/tmp/z_depth var/tmp/z_generation = 0 @@ -29,7 +30,7 @@ if(mz_flags & MZ_MIMIC_BELOW) z_queued += 1 // This adds duplicates for a reason. Do not change this unless you understand how ZM queues work. - SSzmimic.queued_turfs += src + SSzcopy.queued_turfs += src /// Enables Z-mimic for a turf that didn't already have it enabled. /turf/proc/enable_zmimic(additional_flags = 0) @@ -54,7 +55,7 @@ if (shadower) CRASH("Attempt to enable Z-mimic on already-enabled turf!") shadower = new(src) - SSzmimic.openspace_turfs += 1 + SSzcopy.openspace_turfs += 1 var/turf/under = below() if (under) below = under @@ -67,7 +68,7 @@ /// Cleans up Z-mimic objects for this turf. You shouldn't call this directly 99% of the time. /turf/proc/cleanup_zmimic() - SSzmimic.openspace_turfs -= 1 + SSzcopy.openspace_turfs -= 1 // Don't remove ourselves from the queue, the subsystem will explode. We'll naturally fall out of the queue. z_queued = 0 @@ -87,9 +88,3 @@ if (below) below.above = null below = null - -/turf/Entered(atom/movable/thing, atom/oldLoc) - ..() - if (thing.bound_overlay || (thing.zmm_flags & ZMM_IGNORE) || thing.invisibility == INVISIBILITY_ABSTRACT || !TURF_IS_MIMICKING(above)) - return - above.update_mimic() diff --git a/code/modules/nano/nanoui.dm b/code/modules/nano/nanoui.dm index a505448584dc..ce088950e478 100644 --- a/code/modules/nano/nanoui.dm +++ b/code/modules/nano/nanoui.dm @@ -58,8 +58,6 @@ var/list/datum/nanoui/children = list() var/datum/topic_state/state = null - var/static/datum/asset/simple/namespaced/nanoui/nano_asset - /** * Create a new nanoui instance. * @@ -75,8 +73,6 @@ * @return /nanoui new nanoui object */ /datum/nanoui/New(mob/nuser, nsrc_object, nui_key, ntemplate_filename, ntitle, nwidth, nheight, atom/nref, datum/nanoui/master_ui, datum/topic_state/state = default_state) - if(!istype(nano_asset)) - nano_asset = get_asset_datum(/datum/asset/simple/namespaced/nanoui) user = nuser src_object = nsrc_object ui_key = nui_key @@ -100,8 +96,8 @@ ref = nref add_common_assets() - if (nuser?.client) - nano_asset.send(nuser.client) //ship it + + SSassets.send_asset_pack(nuser.client, /datum/asset_pack/simple/nanoui) /** * Use this proc to add assets which are common to (and required by) all nano uis @@ -347,17 +343,19 @@ var/head_content = "" + var/datum/asset_pack/nanoui_pack = SSassets.ready_asset_pack(/datum/asset_pack/simple/nanoui) + for(var/filename in scripts) - head_content += "" + head_content += "" for(var/filename in stylesheets) - head_content += "" + head_content += "" var/template_data_json = "{}" // An empty JSON object if (templates.len > 0) // transform urls for(var/key in templates) - templates[key] = SSassets.transport.get_asset_url(templates[key]) + templates[key] = nanoui_pack.get_url(templates[key]) template_data_json = json_encode(templates) var/list/send_data = get_send_data(initial_data) @@ -420,6 +418,7 @@ if(status == UI_CLOSE) return + SSassets.send_asset_pack(user.client, /datum/asset_pack/simple/nanoui) user << browse(get_html(), "window=[window_id];[window_size][window_options]") winset(user, "mapwindow.map", "focus=true") // return keyboard focus to map on_close_winset() diff --git a/code/modules/nifsoft/software/01_vision.dm b/code/modules/nifsoft/software/01_vision.dm index 9dcaf7c17040..a33feae1eb1a 100644 --- a/code/modules/nifsoft/software/01_vision.dm +++ b/code/modules/nifsoft/software/01_vision.dm @@ -9,15 +9,15 @@ if(.) // i'd refactor nifsofts but i have a personal goddamn vendetta against nifs for(var/i in data_huds) - var/datum/atom_hud/H = GLOB.huds[i] - H.add_hud_to(nif.human) + var/datum/atom_hud/hud = GLOB.atom_huds[i] + nif.human.self_perspective.add_atom_hud(hud, ATOM_HUD_SOURCE_NIF) /datum/nifsoft/hud/deactivate(force) . = ..() if(.) for(var/i in data_huds) - var/datum/atom_hud/H = GLOB.huds[i] - H.remove_hud_from(nif.human) + var/datum/atom_hud/hud = GLOB.atom_huds[i] + nif.human.self_perspective.remove_atom_hud(hud, ATOM_HUD_SOURCE_NIF) /datum/nifsoft/hud/ar_civ name = "AR Overlay (Civ)" @@ -27,7 +27,7 @@ a_drain = 0.01 planes_enabled = list(/atom/movable/screen/plane_master/augmented) vision_flags = (NIF_V_AR_CIVILIAN) - data_huds = list(DATA_HUD_ID_JOB) + data_huds = list(/datum/atom_hud/data/human/job_id) incompatible_with = list(NIF_MEDICAL_AR,NIF_SECURITY_AR,NIF_ENGINE_AR,NIF_SCIENCE_AR,NIF_OMNI_AR) /datum/nifsoft/hud/ar_med @@ -38,7 +38,7 @@ access = ACCESS_MEDICAL_MAIN a_drain = 0.01 planes_enabled = list(/atom/movable/screen/plane_master/augmented) - data_huds = list(DATA_HUD_MEDICAL) + data_huds = list(/datum/atom_hud/data/human/medical) vision_flags = (NIF_V_AR_MEDICAL) incompatible_with = list(NIF_CIVILIAN_AR,NIF_SECURITY_AR,NIF_ENGINE_AR,NIF_SCIENCE_AR,NIF_OMNI_AR) @@ -49,7 +49,7 @@ cost = 150 access = ACCESS_SECURITY_EQUIPMENT a_drain = 0.01 - data_huds = list(DATA_HUD_SECURITY_ADVANCED) + data_huds = list(/datum/atom_hud/data/human/security/advanced) planes_enabled = list(/atom/movable/screen/plane_master/augmented) vision_flags = (NIF_V_AR_SECURITY) incompatible_with = list(NIF_CIVILIAN_AR,NIF_MEDICAL_AR,NIF_ENGINE_AR,NIF_SCIENCE_AR,NIF_OMNI_AR) @@ -61,7 +61,7 @@ cost = 150 access = ACCESS_ENGINEERING_MAIN a_drain = 0.01 - data_huds = list(DATA_HUD_ID_JOB) + data_huds = list(/datum/atom_hud/data/human/job_id) planes_enabled = list(/atom/movable/screen/plane_master/augmented) vision_flags = (NIF_V_AR_ENGINE) incompatible_with = list(NIF_CIVILIAN_AR,NIF_MEDICAL_AR,NIF_SECURITY_AR,NIF_SCIENCE_AR,NIF_OMNI_AR) @@ -73,7 +73,7 @@ cost = 50 access = ACCESS_SCIENCE_MAIN a_drain = 0.01 - data_huds = list(DATA_HUD_ID_JOB) + data_huds = list(/datum/atom_hud/data/human/job_id) planes_enabled = list(/atom/movable/screen/plane_master/augmented) vision_flags = (NIF_V_AR_SCIENCE) incompatible_with = list(NIF_CIVILIAN_AR,NIF_MEDICAL_AR,NIF_SECURITY_AR,NIF_ENGINE_AR,NIF_OMNI_AR) @@ -85,7 +85,7 @@ cost = 250 access = ACCESS_COMMAND_CAPTAIN a_drain = 0.01 - data_huds = list(DATA_HUD_SECURITY_ADVANCED, DATA_HUD_MEDICAL) + data_huds = list(/datum/atom_hud/data/human/security/advanced, /datum/atom_hud/data/human/medical) planes_enabled = list(/atom/movable/screen/plane_master/augmented) vision_flags = (NIF_V_AR_OMNI) incompatible_with = list(NIF_CIVILIAN_AR,NIF_MEDICAL_AR,NIF_SECURITY_AR,NIF_ENGINE_AR,NIF_SCIENCE_AR) diff --git a/code/modules/nifsoft/software/05_health.dm b/code/modules/nifsoft/software/05_health.dm index 86c87cb8c36a..783504558917 100644 --- a/code/modules/nifsoft/software/05_health.dm +++ b/code/modules/nifsoft/software/05_health.dm @@ -114,7 +114,7 @@ W.heal_damage(0.1) EO.update_damages() if(EO.update_icon()) - nif.human.UpdateDamageIcon(1) + nif.human.update_damage_overlay(1) nif.use_charge(0.1) return TRUE //Return entirely, we only heal one at a time. else if(mode == 1) diff --git a/code/modules/nifsoft/software/13_soulcatcher.dm b/code/modules/nifsoft/software/13_soulcatcher.dm index e418080f2800..fa1d267a3bfb 100644 --- a/code/modules/nifsoft/software/13_soulcatcher.dm +++ b/code/modules/nifsoft/software/13_soulcatcher.dm @@ -544,8 +544,6 @@ dummy.compile_overlays() dummy.alpha = 192 - // remove hudlist - dummy.cut_overlay(dummy.hud_list) // appearance clone immediately appearance = dummy.appearance plane = AUGMENTED_PLANE diff --git a/code/modules/nifsoft/software/15_misc.dm b/code/modules/nifsoft/software/15_misc.dm index 3a30b55eef1e..d36438d51420 100644 --- a/code/modules/nifsoft/software/15_misc.dm +++ b/code/modules/nifsoft/software/15_misc.dm @@ -173,13 +173,9 @@ if((. = ..())) if((. = ..())) var/mob/living/carbon/human/H = nif.human - var/datum/atom_hud/world_bender/animals/A = GLOB.huds[WORLD_BENDER_HUD_ANIMALS] - if(A && H) - A.add_hud_to(H) + H.self_perspective.add_atom_hud(/datum/atom_hud/world_bender, ATOM_HUD_SOURCE_NIF) /datum/nifsoft/worldbend/deactivate(var/force = FALSE) if((. = ..())) var/mob/living/carbon/human/H = nif.human - var/datum/atom_hud/world_bender/animals/A = GLOB.huds[WORLD_BENDER_HUD_ANIMALS] - if(A && H) - A.remove_hud_from(H) + H.self_perspective.remove_atom_hud(/datum/atom_hud/world_bender, ATOM_HUD_SOURCE_NIF) diff --git a/code/modules/organs/external/external.dm b/code/modules/organs/external/external.dm index 2c498aea62a7..4b7282d15d9b 100644 --- a/code/modules/organs/external/external.dm +++ b/code/modules/organs/external/external.dm @@ -27,14 +27,14 @@ /// Number of wounds we have - some wounds like bruises will collate into one datum representing all of them. var/wound_tally -//! ## STRINGS + //* ## STRINGS /// Fracture description if any. var/broken_description /// Modifier used for generating the on-mob damage overlay for this limb. var/damage_state = "00" -//! ## DAMAGE VARS + //* ## DAMAGE VARS /// Multiplier for incoming brute damage. var/brute_mod = 1 /// As above for burn. @@ -59,7 +59,7 @@ var/base_miss_chance = 20 -//! ## APPEARANCE VARS + //* ## APPEARANCE VARS /// Snowflake warning, reee. Used for slime limbs. var/nonsolid /// Also for slimes. Used for transparent limbs. @@ -92,7 +92,7 @@ /// Markings (body_markings) to apply to the icon var/list/markings = list() -//! ## STRUCTURAL VARS + //* ## STRUCTURAL VARS /// Master-limb. var/obj/item/organ/external/parent /// Sub-limbs. @@ -105,7 +105,7 @@ var/organ_rel_size = 25 var/atom/movable/splinted -//! ## JOINT/STATE VARS + //* ## JOINT/STATE VARS /// It would be more appropriate if these two were named "affects_grasp" and "affects_stand" at this point var/can_grasp /// Modifies stance tally/ability to stand. @@ -128,7 +128,7 @@ var/encased -//! ## SURGERY VARS + //* ## SURGERY VARS var/open = FALSE var/stage = FALSE var/cavity = FALSE @@ -186,13 +186,13 @@ var/burn_damage = 0 switch(severity) if (1) - burn_damage += rand(10, 16) + burn_damage += rand(10, 14) if (2) - burn_damage += rand(8, 12) + burn_damage += rand(7, 8.5) if(3) burn_damage += rand(4, 8) if(4) - burn_damage += rand(2, 6) + burn_damage += rand(2, 5) if(burn_damage) inflict_bodypart_damage( @@ -357,6 +357,9 @@ // todo: this is awful var/sharp = damage_mode & DAMAGE_MODE_SHARP var/edge = damage_mode & DAMAGE_MODE_EDGE + // cache owner incase we get detached + // todo: this is awful + var/mob/living/carbon/owner = src.owner // todo: lol this is shit // legacy: organ damage on high damage @@ -379,7 +382,7 @@ if(weapon_descriptor) add_autopsy_data(weapon_descriptor, brute + burn) - //! LEGACY BELOW + //* LEGACY BELOW var/can_cut = (sharp) && (robotic < ORGAN_ROBOT) @@ -399,7 +402,10 @@ else if(!(damage_mode & DAMAGE_MODE_NO_OVERFLOW)) var/overflow_brute = brute - can_inflict_brute // keep allowing it, but, diminishing returns - var/damage_anyways_brute = brute * min(1, 1 / ((brute_dam + damage_softcap_intensifier) / (damage_softcap_intensifier + max_damage))) + var/damage_anyways_brute = !(damage_mode & DAMAGE_MODE_NO_OVERFLOW) && ( \ + overflow_brute * min(1, 1 / ((max(brute_dam, max_damage) + damage_softcap_intensifier) / (damage_softcap_intensifier + max_damage))) \ + ) + overflow_brute -= damage_anyways_brute if(can_cut) if(sharp && !edge) create_wound( PIERCE, damage_anyways_brute ) @@ -413,11 +419,13 @@ var/can_inflict_burn = max(0, max_damage - burn_dam) if(can_inflict_burn >= burn) create_wound( BURN, burn ) - else if(!(damage_mode & DAMAGE_MODE_NO_OVERFLOW)) + else var/overflow_burn = burn - can_inflict_burn - // keep allowing it, but, diminishing returns - var/damage_anyways_burn = burn * min(1, 1 / ((burn_dam + damage_softcap_intensifier) / (damage_softcap_intensifier + max_damage))) - create_wound( BURN, damage_anyways_burn ) + var/damage_anyways_burn = !(damage_mode & DAMAGE_MODE_NO_OVERFLOW) && ( \ + overflow_burn * min(1, 1 / ((max(burn_dam, max_damage) + damage_softcap_intensifier) / (damage_softcap_intensifier + max_damage))) \ + ) + overflow_burn -= damage_anyways_burn + create_wound(BURN, damage_anyways_burn + can_inflict_burn) // rest goes into shock owner.shock_stage += overflow_burn * 0.33 @@ -438,8 +446,8 @@ // and the brute damage dealt exceeds the tearoff threshold, the organ is torn off. //Check edge eligibility - //! edge eligibility disabled; organs should optimally not reqiure the item reference and should instead - //! get descriptors (damage, damage mode, etc) of the inbound attack. + //* edge eligibility disabled; organs should optimally not reqiure the item reference and should instead + //* get descriptors (damage, damage mode, etc) of the inbound attack. var/edge_eligible = edge // var/edge_eligible = 0 // if(edge) @@ -462,7 +470,7 @@ droplimb(0, DROPLIMB_BLUNT) else if(brute >= max_damage / DROPLIMB_THRESHOLD_TEAROFF && prob(brute*0.33)) droplimb(0, DROPLIMB_EDGE) - //! damage spreading disabled; the attacking weapon should handle this if necessary. + //* damage spreading disabled; the attacking weapon should handle this if necessary. // else if(spread_dam && owner && parent && (brute_overflow || burn_overflow) && (brute_overflow >= 5 || burn_overflow >= 5) && !permutation) //No infinite damage loops. // var/brute_third = brute_overflow * 0.33 // var/burn_third = burn_overflow * 0.33 @@ -475,7 +483,7 @@ // C.take_damage(brute_on_children, burn_on_children, 0, 0, null, forbidden_limbs, 1) //Splits the damage to each individual 'child', incase multiple exist. // parent.take_damage(brute_third, burn_third, 0, 0, null, forbidden_limbs, 1) - //! LEGACY ABOVE + //* LEGACY ABOVE if(!defer_host_updates) owner?.update_health() @@ -776,7 +784,7 @@ Note that amputating the affected organ does in fact remove the infection from t wounds -= W //TODO: robot wounds for robot limbs src.update_damages() if (update_icon()) - owner.UpdateDamageIcon(1) + owner.update_damage_overlay(1) return for(var/datum/wound/W as anything in wounds) @@ -820,7 +828,7 @@ Note that amputating the affected organ does in fact remove the infection from t // sync the organ's damage with its wounds src.update_damages() if (update_icon()) - owner.UpdateDamageIcon(1) + owner.update_damage_overlay(1) //Updates brute_damn and burn_damn from wound damages. Updates BLEEDING status. /obj/item/organ/external/proc/update_damages() @@ -956,7 +964,7 @@ Note that amputating the affected organ does in fact remove the infection from t spawn(1) if(istype(victim)) victim.update_health() - victim.UpdateDamageIcon() + victim.update_damage_overlay() victim.update_icons_body() else victim.update_icons() @@ -1158,7 +1166,7 @@ Note that amputating the affected organ does in fact remove the infection from t return 0 /obj/item/organ/external/robotize(var/company, var/skip_prosthetics = 0, var/keep_organs = 0, force) - //! SHITCODE ALERT: REFACTOR ORGANS ASAP; FORCE IS JUST SO PREFS WORK. + //* SHITCODE ALERT: REFACTOR ORGANS ASAP; FORCE IS JUST SO PREFS WORK. if(robotic >= ORGAN_ROBOT && !force) return @@ -1212,7 +1220,7 @@ Note that amputating the affected organ does in fact remove the infection from t owner.refresh_modular_limb_verbs() return 1 -//! ## VIRGO HOOK, TODO: Integrate this. + //* ## VIRGO HOOK, TODO: Integrate this. //Sideways override for nanoform limbs (ugh) /obj/item/organ/external/robotize(var/company, var/skip_prosthetics = FALSE, var/keep_organs = FALSE, force) var/original_robotic = robotic diff --git a/code/modules/organs/external/external_icons.dm b/code/modules/organs/external/external_icons.dm index 4358a54f8d34..1af4e4b43306 100644 --- a/code/modules/organs/external/external_icons.dm +++ b/code/modules/organs/external/external_icons.dm @@ -100,7 +100,7 @@ GLOBAL_LIST_EMPTY(limb_icon_cache) for(var/M in markings) var/datum/sprite_accessory/marking/mark_style = markings[M]["datum"] var/icon/mark_s = new/icon("icon" = mark_style.icon, "icon_state" = "[mark_style.icon_state]-[organ_tag]") - mark_s.Blend(markings[M]["color"], mark_style.color_blend_mode) + mark_s.Blend(markings[M]["color"], mark_style.legacy_use_additive_color_matrix? ICON_ADD : ICON_MULTIPLY) add_overlay(mark_s) //So when it's not on your body, it has icons mob_icon.Blend(mark_s, ICON_OVERLAY) //So when it's on your body, it has icons icon_cache_key += "[M][markings[M]["color"]]" @@ -111,38 +111,11 @@ GLOBAL_LIST_EMPTY(limb_icon_cache) mob_icon.Blend(eyecon, ICON_OVERLAY) icon_cache_key += "[eye_icon]" - add_overlay(get_hair_icon()) + add_overlay(owner.render_spriteacc_facehair()) + add_overlay(owner.render_spriteacc_hair()) return mob_icon -/obj/item/organ/external/head/proc/get_hair_icon() - var/image/res = image('icons/mob/human_face.dmi',"bald_s") - //Facial hair - if(owner.f_style) - var/datum/sprite_accessory/facial_hair_style = GLOB.legacy_facial_hair_lookup[owner.f_style] - if(facial_hair_style && (!facial_hair_style.apply_restrictions || (species.get_bodytype_legacy(owner) in facial_hair_style.species_allowed))) - var/icon/facial_s = new/icon("icon" = facial_hair_style.icon, "icon_state" = "[facial_hair_style.icon_state]_s") - if(facial_hair_style.do_colouration) - facial_s.Blend(rgb(owner.r_facial, owner.g_facial, owner.b_facial), facial_hair_style.color_blend_mode) - res.add_overlay(facial_s) - - //Head hair - if(owner.h_style) - var/style = owner.h_style - var/datum/sprite_accessory/hair/hair_style = GLOB.legacy_hair_lookup[style] - if(owner.head && (owner.head.inv_hide_flags & BLOCKHEADHAIR)) - if(!(hair_style.hair_flags & HAIR_VERY_SHORT)) - hair_style = GLOB.legacy_hair_lookup["Short Hair"] - if(hair_style && (!hair_style.apply_restrictions || (species.get_bodytype_legacy(owner) in hair_style.species_allowed))) - var/icon/hair_s = new/icon("icon" = hair_style.icon, "icon_state" = "[hair_style.icon_state]_s") - var/icon/hair_s_add = new/icon("icon" = hair_style.icon_add, "icon_state" = "[hair_style.icon_state]_s") - if(hair_style.do_colouration && islist(h_col) && h_col.len >= 3) - hair_s.Blend(rgb(h_col[1], h_col[2], h_col[3]), ICON_MULTIPLY) - hair_s.Blend(hair_s_add, ICON_ADD) - res.add_overlay(hair_s) - - return res - /obj/item/organ/external/proc/get_icon(var/skeletal) if(owner && ishuman(owner)) @@ -181,7 +154,7 @@ GLOBAL_LIST_EMPTY(limb_icon_cache) for(var/M in markings) var/datum/sprite_accessory/marking/mark_style = markings[M]["datum"] var/icon/mark_s = new/icon("icon" = mark_style.icon, "icon_state" = "[mark_style.icon_state]-[organ_tag]") - mark_s.Blend(markings[M]["color"], mark_style.color_blend_mode) + mark_s.Blend(markings[M]["color"], mark_style.legacy_use_additive_color_matrix? ICON_ADD : ICON_MULTIPLY) add_overlay(mark_s) //So when it's not on your body, it has icons mob_icon.Blend(mark_s, ICON_OVERLAY) //So when it's on your body, it has icons icon_cache_key += "[M][markings[M]["color"]]" @@ -201,7 +174,7 @@ GLOBAL_LIST_EMPTY(limb_icon_cache) for(var/M in markings) var/datum/sprite_accessory/marking/mark_style = markings[M]["datum"] var/icon/mark_s = new/icon("icon" = mark_style.icon, "icon_state" = "[mark_style.icon_state]-[organ_tag]") - mark_s.Blend(markings[M]["color"], mark_style.color_blend_mode) + mark_s.Blend(markings[M]["color"], mark_style.legacy_use_additive_color_matrix? ICON_ADD : ICON_MULTIPLY) add_overlay(mark_s) //So when it's not on your body, it has icons mob_icon.Blend(mark_s, ICON_OVERLAY) //So when it's on your body, it has icons icon_cache_key += "[M][markings[M]["color"]]" diff --git a/code/modules/organs/external/robolimbs.dm b/code/modules/organs/external/robolimbs.dm index 06be0ff2db94..d56ed840b16a 100644 --- a/code/modules/organs/external/robolimbs.dm +++ b/code/modules/organs/external/robolimbs.dm @@ -71,6 +71,10 @@ var/const/cyberbeast_monitor_styles= "blank=cyber_blank;\ if(species_company in GLOB.all_robolimbs) R.species_alternates[species] = GLOB.all_robolimbs[species_company] +/datum/sprite_accessory/tail/legacy_robolimb + do_colouration = FALSE + abstract_type = /datum/sprite_accessory/tail/legacy_robolimb + /datum/robolimb /// Shown when selecting the limb. var/company = "Unbranded" @@ -108,10 +112,6 @@ var/const/cyberbeast_monitor_styles= "blank=cyber_blank;\ var/robo_brute_mod = 1 /// Multiplier for incoming burn damage. var/robo_burn_mod = 1 - /// Cyberlimbs dmi includes a tail sprite to wear. - var/includes_tail - /// Cyberlimbs dmi includes a wing sprite to wear. - var/includes_wing /// If it should make the torso a species var/suggested_species = SPECIES_HUMAN /// Species in this list cannot take these prosthetics. @@ -121,6 +121,16 @@ var/const/cyberbeast_monitor_styles= "blank=cyber_blank;\ /// List of ckeys that are allowed to pick this in charsetup. var/list/whitelisted_to + /// typepath or id of sprite accessory to default for, for tail + var/datum/sprite_accessory/legacy_includes_tail + +/datum/robolimb/New() + if(ispath(legacy_includes_tail)) + var/datum/sprite_accessory/casted = legacy_includes_tail + legacy_includes_tail = initial(casted.id) + if(istext(legacy_includes_tail)) + legacy_includes_tail = GLOB.sprite_accessory_tails[legacy_includes_tail] + /datum/robolimb/unbranded_monitor company = "Unbranded Monitor" desc = "A generic unbranded interpretation of a popular prosthetic head model. It looks rudimentary and cheaply constructed." @@ -622,7 +632,7 @@ var/const/cyberbeast_monitor_styles= "blank=cyber_blank;\ desc = "This limb has a slight salvaged handicraft vibe to it. The CE-marking on it is definitely not the standardized one, it looks more like a hand-written sharpie monogram." icon = 'icons/mob/cyberlimbs/_fluff_vr/rahboop.dmi' blood_color = "#5e280d" - includes_tail = 1 + legacy_includes_tail = /datum/sprite_accessory/tail/bodyset/eggnerd unavailable_to_build = TRUE /obj/item/disk/limb/eggnerdltd @@ -671,7 +681,7 @@ var/const/cyberbeast_monitor_styles= "blank=cyber_blank;\ desc = "A slightly more refined limb variant from Eggnerd Prototyping. Its got red plating instead of orange." icon = 'icons/mob/cyberlimbs/rahboopred/rahboopred.dmi' blood_color = "#5e280d" - includes_tail = 1 + legacy_includes_tail = /datum/sprite_accessory/tail/bodyset/eggnerd_red unavailable_to_build = TRUE /obj/item/disk/limb/eggnerdltdred @@ -688,8 +698,8 @@ var/const/cyberbeast_monitor_styles= "blank=cyber_blank;\ icon = 'icons/mob/cyberlimbs/DSITajaran/dsi_tajaran.dmi' blood_color = "#ffe2ff" lifelike = 1 + legacy_includes_tail = /datum/sprite_accessory/tail/bodyset/oss_tajaran unavailable_to_build = TRUE - includes_tail = 1 skin_tone = 1 suggested_species = SPECIES_TAJ speech_bubble_appearance = "normal" @@ -705,7 +715,7 @@ var/const/cyberbeast_monitor_styles= "blank=cyber_blank;\ blood_color = "#ffe2ff" lifelike = 1 unavailable_to_build = TRUE - includes_tail = 1 + legacy_includes_tail = /datum/sprite_accessory/tail/bodyset/oss_lizard skin_tone = 1 suggested_species = SPECIES_UNATHI speech_bubble_appearance = "normal" @@ -721,7 +731,7 @@ var/const/cyberbeast_monitor_styles= "blank=cyber_blank;\ blood_color = "#ffe2ff" lifelike = 1 unavailable_to_build = TRUE - includes_tail = 1 + legacy_includes_tail = /datum/sprite_accessory/tail/bodyset/oss_naramadi skin_tone = 1 suggested_species = SPECIES_SERGAL speech_bubble_appearance = "normal" @@ -737,7 +747,7 @@ var/const/cyberbeast_monitor_styles= "blank=cyber_blank;\ blood_color = "#ffe2ff" lifelike = 1 unavailable_to_build = TRUE - includes_tail = 1 + legacy_includes_tail = /datum/sprite_accessory/tail/bodyset/oss_nevrean skin_tone = 1 suggested_species = SPECIES_NEVREAN speech_bubble_appearance = "normal" @@ -753,7 +763,7 @@ var/const/cyberbeast_monitor_styles= "blank=cyber_blank;\ blood_color = "#ffe2ff" lifelike = 1 unavailable_to_build = TRUE - includes_tail = 1 + legacy_includes_tail = /datum/sprite_accessory/tail/bodyset/oss_vulpkanin skin_tone = 1 suggested_species = SPECIES_VULPKANIN speech_bubble_appearance = "normal" @@ -768,8 +778,8 @@ var/const/cyberbeast_monitor_styles= "blank=cyber_blank;\ icon = 'icons/mob/cyberlimbs/DSIAkula/dsi_akula.dmi' blood_color = "#ffe2ff" lifelike = 1 + legacy_includes_tail = /datum/sprite_accessory/tail/bodyset/oss_akula unavailable_to_build = TRUE - includes_tail = 1 skin_tone = 1 suggested_species = SPECIES_AKULA speech_bubble_appearance = "normal" @@ -785,7 +795,7 @@ var/const/cyberbeast_monitor_styles= "blank=cyber_blank;\ blood_color = "#ffe2ff" lifelike = 1 unavailable_to_build = TRUE - includes_tail = 1 + legacy_includes_tail = /datum/sprite_accessory/tail/bodyset/oss_spider skin_tone = 1 suggested_species = SPECIES_VASILISSAN speech_bubble_appearance = "normal" diff --git a/code/modules/organs/external/species/slime.dm b/code/modules/organs/external/species/slime.dm index a4ad1b4c5f0f..3afd45779469 100644 --- a/code/modules/organs/external/species/slime.dm +++ b/code/modules/organs/external/species/slime.dm @@ -1,61 +1,61 @@ /obj/item/organ/external/chest/unbreakable/slime nonsolid = 1 - max_damage = 50 + max_damage = 200 encased = 0 spread_dam = 1 transparent = 1 /obj/item/organ/external/groin/unbreakable/slime nonsolid = 1 - max_damage = 30 + max_damage = 75 spread_dam = 1 transparent = 1 /obj/item/organ/external/arm/unbreakable/slime nonsolid = 1 - max_damage = 20 + max_damage = 25 spread_dam = 1 transparent = 1 /obj/item/organ/external/arm/right/unbreakable/slime nonsolid = 1 - max_damage = 20 + max_damage = 25 spread_dam = 1 transparent = 1 /obj/item/organ/external/leg/unbreakable/slime nonsolid = 1 - max_damage = 20 + max_damage = 25 spread_dam = 1 transparent = 1 /obj/item/organ/external/leg/right/unbreakable/slime nonsolid = 1 - max_damage = 20 + max_damage = 25 spread_dam = 1 transparent = 1 /obj/item/organ/external/foot/unbreakable/slime nonsolid = 1 - max_damage = 20 + max_damage = 25 spread_dam = 1 transparent = 1 /obj/item/organ/external/foot/right/unbreakable/slime nonsolid = 1 - max_damage = 20 + max_damage = 25 spread_dam = 1 transparent = 1 /obj/item/organ/external/hand/unbreakable/slime nonsolid = 1 - max_damage = 20 + max_damage = 25 spread_dam = 1 transparent = 1 /obj/item/organ/external/hand/right/unbreakable/slime nonsolid = 1 - max_damage = 20 + max_damage = 25 spread_dam = 1 transparent = 1 @@ -63,7 +63,7 @@ nonsolid = 1 cannot_gib = 0 vital = 0 - max_damage = 30 + max_damage = 25 encased = 0 spread_dam = 1 transparent = 1 diff --git a/code/modules/organs/external/subtypes/standard.dm b/code/modules/organs/external/subtypes/standard.dm index 34dd3b361d97..deab9e72497b 100644 --- a/code/modules/organs/external/subtypes/standard.dm +++ b/code/modules/organs/external/subtypes/standard.dm @@ -276,8 +276,7 @@ if(owner) if(iscarbon(owner)) name = "[owner.real_name]'s head" - spawn(1) - owner.update_hair() + owner.update_hair() get_icon() ..() diff --git a/code/modules/organs/external/subtypes/standard_vr.dm b/code/modules/organs/external/subtypes/standard_vr.dm index cf5323858073..da6c65e433ba 100644 --- a/code/modules/organs/external/subtypes/standard_vr.dm +++ b/code/modules/organs/external/subtypes/standard_vr.dm @@ -12,7 +12,7 @@ for(var/M in markings) var/datum/sprite_accessory/marking/mark_style = markings[M]["datum"] var/icon/mark_s = new/icon("icon" = mark_style.icon, "icon_state" = "[mark_style.icon_state]-[organ_tag]") - mark_s.Blend(markings[M]["color"], mark_style.color_blend_mode) + mark_s.Blend(markings[M]["color"], mark_style.legacy_use_additive_color_matrix? ICON_ADD : ICON_MULTIPLY) overlays_to_add.Add(mark_s) //So when it's not on your body, it has icons mob_icon.Blend(mark_s, ICON_OVERLAY) //So when it's on your body, it has icons icon_cache_key += "[M][markings[M]["color"]]" diff --git a/code/modules/organs/internal/augment/armmounted.dm b/code/modules/organs/internal/augment/armmounted.dm index f76ff37047dd..b6e32224a72a 100644 --- a/code/modules/organs/internal/augment/armmounted.dm +++ b/code/modules/organs/internal/augment/armmounted.dm @@ -9,7 +9,7 @@ w_class = WEIGHT_CLASS_BULKY organ_tag = O_AUG_L_FOREARM parent_organ = BP_L_ARM - target_slot = /datum/inventory_slot_meta/abstract/hand/left + target_slot = /datum/inventory_slot/abstract/hand/left target_parent_classes = list(ORGAN_FLESH, ORGAN_ASSISTED) integrated_object_type = /obj/item/gun/energy/laser/mounted/augment @@ -20,11 +20,11 @@ if(O_AUG_L_FOREARM) organ_tag = O_AUG_R_FOREARM parent_organ = BP_R_ARM - target_slot = /datum/inventory_slot_meta/abstract/hand/left + target_slot = /datum/inventory_slot/abstract/hand/left if(O_AUG_R_FOREARM) organ_tag = O_AUG_L_FOREARM parent_organ = BP_L_ARM - target_slot = /datum/inventory_slot_meta/abstract/hand/right + target_slot = /datum/inventory_slot/abstract/hand/right to_chat(user, "You swap \the [src]'s servos to install neatly into \the lower [parent_organ] mount.") return @@ -58,11 +58,11 @@ if(O_AUG_L_HAND) organ_tag = O_AUG_R_HAND parent_organ = BP_R_HAND - target_slot = /datum/inventory_slot_meta/abstract/hand/left + target_slot = /datum/inventory_slot/abstract/hand/left if(O_AUG_R_HAND) organ_tag = O_AUG_L_HAND parent_organ = BP_L_HAND - target_slot = /datum/inventory_slot_meta/abstract/hand/right + target_slot = /datum/inventory_slot/abstract/hand/right to_chat(user, "You swap \the [src]'s servos to install neatly into \the upper [parent_organ] mount.") return @@ -90,11 +90,11 @@ if(O_AUG_L_UPPERARM) organ_tag = O_AUG_R_UPPERARM parent_organ = BP_R_ARM - target_slot = /datum/inventory_slot_meta/abstract/hand/left + target_slot = /datum/inventory_slot/abstract/hand/left if(O_AUG_R_UPPERARM) organ_tag = O_AUG_L_UPPERARM parent_organ = BP_L_ARM - target_slot = /datum/inventory_slot_meta/abstract/hand/right + target_slot = /datum/inventory_slot/abstract/hand/right to_chat(user, "You swap \the [src]'s servos to install neatly into \the upper [parent_organ] mount.") return diff --git a/code/modules/organs/internal/subtypes/augment.dm b/code/modules/organs/internal/subtypes/augment.dm index 851229b75b91..bbe4e3311c7a 100644 --- a/code/modules/organs/internal/subtypes/augment.dm +++ b/code/modules/organs/internal/subtypes/augment.dm @@ -218,7 +218,7 @@ to_chat(M, SPAN_NOTICE("You cannot use your augments when restrained.")) return FALSE - if((slot == /datum/inventory_slot_meta/abstract/hand/left && l_hand) || (slot == /datum/inventory_slot_meta/abstract/hand/right && r_hand)) + if((slot == /datum/inventory_slot/abstract/hand/left && l_hand) || (slot == /datum/inventory_slot/abstract/hand/right && r_hand)) to_chat(M, SPAN_WARNING("Your hand is full. Drop something first.")) return FALSE diff --git a/code/modules/organs/internal/subtypes/liver.dm b/code/modules/organs/internal/subtypes/liver.dm index 8fa79107371f..e1669431959d 100644 --- a/code/modules/organs/internal/subtypes/liver.dm +++ b/code/modules/organs/internal/subtypes/liver.dm @@ -37,7 +37,7 @@ // Do some reagent processing. if(owner.chem_effects[CE_ALCOHOL_TOXIC]) - take_damage(owner.chem_effects[CE_ALCOHOL_TOXIC] * 0.1 * (dt * 5), prob(1)) // Chance to warn them + take_damage(owner.chem_effects[CE_ALCOHOL_TOXIC] * 0.1 * (dt * 5), prob(99)) // Chance to warn them if(filter_effect < 2) //Liver is badly damaged, you're drinking yourself to death owner.adjustToxLoss(owner.chem_effects[CE_ALCOHOL_TOXIC] * 0.2 * (dt * 5)) if(filter_effect < 3) diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm index 07dcf906ae5e..dc8e7c6d4f13 100644 --- a/code/modules/organs/organ.dm +++ b/code/modules/organs/organ.dm @@ -5,14 +5,14 @@ drop_sound = 'sound/items/drop/flesh.ogg' pickup_sound = 'sound/items/pickup/flesh.ogg' -//! ## STRINGS VARS + //* ## STRINGS VARS /// Unique identifier. var/organ_tag = "organ" /// The organ holding this object. var/parent_organ = BP_TORSO -//! STATUS VARS + //* STATUS VARS /// Various status flags var/status = 0 /** @@ -29,7 +29,7 @@ var/stapled_nerves = FALSE -//! ##REFERENCE VARS + //* ##REFERENCE VARS /// Current mob owning the organ. var/mob/living/carbon/human/owner /// Transplant match data. @@ -45,7 +45,7 @@ var/s_base -//! ## DAMAGE VARS + //* ## DAMAGE VARS /// Damage before considered bruised var/min_bruised_damage = 10 /// Damage before becoming broken @@ -62,12 +62,12 @@ /// decay rate var/decay_rate = ORGAN_DECAY_PER_SECOND_DEFAULT -//! ## LANGUAGE VARS - For organs that assist with certain languages. + //* ## LANGUAGE VARS - For organs that assist with certain languages. var/list/will_assist_languages = list() var/list/datum/language/assists_languages = list() -//! ## VERB VARS + //* ## VERB VARS /// Verbs added by the organ when present in the body. var/list/organ_verbs /// Is the parent supposed to be organic, robotic, assisted? diff --git a/code/modules/organs/subtypes/nano.dm b/code/modules/organs/subtypes/nano.dm index 02cdd22195e2..e466cc56a486 100644 --- a/code/modules/organs/subtypes/nano.dm +++ b/code/modules/organs/subtypes/nano.dm @@ -2,7 +2,7 @@ /obj/item/organ/external/chest/unbreakable/nano robotic = ORGAN_NANOFORM encased = FALSE - max_damage = 100 + max_damage = 200 min_broken_damage = 1000 vital = TRUE emp_mod = 7 diff --git a/code/modules/overmap/legacy/ships/computers/sensors.dm b/code/modules/overmap/legacy/ships/computers/sensors.dm index b8da4f51c558..553ddbf1fb1e 100644 --- a/code/modules/overmap/legacy/ships/computers/sensors.dm +++ b/code/modules/overmap/legacy/ships/computers/sensors.dm @@ -118,9 +118,8 @@ if(istype(O) && !QDELETED(O) && (O in view(7,linked))) var/obj/item/paper/P = new /obj/item/paper(get_turf(src)) P.name = "paper (Sensor Scan - [O])" - P.info = O.get_scan_data(usr) - // TODO: strangle whoever made this, DO NOT MANUALLY CALL INIT - P.Initialize() // has to be called because the scanner desc uses a combination of html and markdown for some reason + P.info = replacetext(html_encode(O.get_scan_data(usr)), "\n", "
") + P.init_parsepencode(P.info) playsound(src, "sound/machines/printer.ogg", 30, 1) . = TRUE diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index e154c1b46026..92209ce67943 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -698,7 +698,7 @@ CREATE_WALL_MOUNTING_TYPES_SHIFTED(/obj/machinery/power/apc, 22) "You disassembled the broken APC frame.",\ "You hear welding.") else - new /obj/item/frame/apc(loc) + new /obj/item/frame2/apc(loc) user.visible_message(\ "[src] has been cut from the wall by [user.name] with the [WT.name].",\ "You cut the APC frame from the wall.",\ @@ -706,7 +706,7 @@ CREATE_WALL_MOUNTING_TYPES_SHIFTED(/obj/machinery/power/apc, 22) qdel(src) return else if (opened && ((machine_stat & BROKEN) || hacker || emagged)) - if (istype(W, /obj/item/frame/apc) && (machine_stat & BROKEN)) + if (istype(W, /obj/item/frame2/apc) && (machine_stat & BROKEN)) if(cell) to_chat(user, "You need to remove the power cell first.") return diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index 980695395cb0..9757c4173c31 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -228,7 +228,7 @@ var/mob/living/silicon/robot/R = loc severity *= R.cell_emp_mult - charge -= charge / severity + charge -= charge / (severity + 1) if (charge < 0) charge = 0 diff --git a/code/modules/power/fusion/core/core_control.dm b/code/modules/power/fusion/core/core_control.dm index 802a509693f7..08f267e39747 100644 --- a/code/modules/power/fusion/core/core_control.dm +++ b/code/modules/power/fusion/core/core_control.dm @@ -50,7 +50,7 @@ Device ident '[cur_viewed_device.id_tag]' [cur_viewed_device.owned_field ? "active" : "inactive"].
Power status: [cur_viewed_device.avail()]/[cur_viewed_device.active_power_usage * 0.001] kW
- Bring field [cur_viewed_device.owned_field ? "offline" : "online"].
+ Bring field [cur_viewed_device.owned_field ? "offline, which will cause it to explode" : "online"].
Field power density (W.m-3):
---- diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm deleted file mode 100644 index ecbf71a212d2..000000000000 --- a/code/modules/power/solar.dm +++ /dev/null @@ -1,548 +0,0 @@ -#define SOLAR_MAX_DIST 40 -/// Will never start itself. -#define SOLAR_AUTO_START_NO 0 -/// Will always start itself. -#define SOLAR_AUTO_START_YES 1 -/// Will start itself if config allows it (default is no). -#define SOLAR_AUTO_START_CONFIG 2 -GLOBAL_VAR_INIT(solar_gen_rate, 1500) -GLOBAL_LIST_EMPTY(solars_list) - -/obj/machinery/power/solar - name = "solar panel" - desc = "A solar electrical generator." - icon = 'icons/obj/power.dmi' - icon_state = "sp_base" - anchored = 1 - density = 1 - use_power = USE_POWER_OFF - idle_power_usage = 0 - active_power_usage = 0 - integrity = 100 - integrity_max = 100 - - var/id = 0 - var/obscured = 0 - var/sunfrac = 0 - var/adir = SOUTH // actual dir - var/ndir = SOUTH // target dir - var/turn_angle = 0 - var/obj/machinery/power/solar_control/control = null - -/obj/machinery/power/solar/can_drain_energy(datum/actor, flags) - return FALSE - -/obj/machinery/power/solar/Initialize(mapload, obj/item/solar_assembly/S) - . = ..() - Make(S) - connect_to_network() - -/obj/machinery/power/solar/Destroy() - unset_control() //remove from control computer - ..() - -//set the control of the panel to a given computer if closer than SOLAR_MAX_DIST -/obj/machinery/power/solar/proc/set_control(var/obj/machinery/power/solar_control/SC) - if(SC && (get_dist(src, SC) > SOLAR_MAX_DIST)) - return 0 - control = SC - return 1 - -//set the control of the panel to null and removes it from the control list of the previous control computer if needed -/obj/machinery/power/solar/proc/unset_control() - if(control) - control.connected_panels.Remove(src) - control = null - -/obj/machinery/power/solar/proc/Make(var/obj/item/solar_assembly/S) - if(!S) - S = new /obj/item/solar_assembly(src) - S.glass_type = /obj/item/stack/material/glass - else - S.forceMove(src) - if(S.glass_type == /obj/item/stack/material/glass/reinforced) //if the panel is in reinforced glass - set_max_integrity(integrity_max * 2) - set_integrity(integrity * 2) - update_icon() - -/obj/machinery/power/solar/attackby(obj/item/I, mob/living/user, list/params, clickchain_flags, damage_multiplier) - // todo: tool act - if(I.is_crowbar()) - playsound(src.loc, 'sound/machines/click.ogg', 50, 1) - user.visible_message("[user] begins to take the glass off the solar panel.") - if(do_after(user, 50)) - var/obj/item/solar_assembly/S = locate() in src - if(S) - S.loc = src.loc - S.give_glass() - playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) - user.visible_message("[user] takes the glass off the solar panel.") - new /obj/item/solar_assembly(get_turf(src)) - qdel(src) - return CLICKCHAIN_DO_NOT_PROPAGATE | CLICKCHAIN_DID_SOMETHING - return CLICKCHAIN_DO_NOT_PROPAGATE - -/obj/machinery/solar/drop_products(method, atom/where) - . = ..() - switch(method) - if(ATOM_DECONSTRUCT_DISASSEMBLED) - new /obj/item/stack/material/glass(where, 2) - else - for(var/i in 1 to 2) - new /obj/item/material/shard(where) - -/obj/machinery/power/solar/update_icon() - ..() - cut_overlays() - if(machine_stat & BROKEN) - add_overlay(image('icons/obj/power.dmi', icon_state = "solar_panel-b", layer = FLY_LAYER)) - else - add_overlay(image('icons/obj/power.dmi', icon_state = "solar_panel", layer = FLY_LAYER)) - setDir(angle2dir(adir)) - return - -//calculates the fraction of the SSsun.sunlight that the panel recieves -/obj/machinery/power/solar/proc/update_solar_exposure() - if(!SSsun.sun) - return - if(obscured) - sunfrac = 0 - return - - //find the smaller angle between the direction the panel is facing and the direction of the SSsun.sun (the sign is not important here) - var/p_angle = min(abs(adir - SSsun.sun.angle), 360 - abs(adir - SSsun.sun.angle)) - - if(p_angle > 90) // if facing more than 90deg from SSsun.sun, zero output - sunfrac = 0 - return - - sunfrac = cos(p_angle) ** 2 - //isn't the power recieved from the incoming light proportionnal to cos(p_angle) (Lambert's cosine law) rather than cos(p_angle)^2 ? - -/obj/machinery/power/solar/process(delta_time)//TODO: remove/add this from machines to save on processing as needed ~Carn PRIORITY - if(machine_stat & BROKEN) - return - if(!SSsun.sun || !control) //if there's no SSsun.sun or the panel is not linked to a solar control computer, no need to proceed - return - - if(powernet) - if(powernet == control.powernet)//check if the panel is still connected to the computer - if(obscured) //get no light from the SSsun.sun, so don't generate power - return - var/sgen = GLOB.solar_gen_rate * sunfrac - add_avail(sgen * 0.001) - control.gen += sgen - else //if we're no longer on the same powernet, remove from control computer - unset_control() - -/obj/machinery/power/solar/atom_break() - . = ..() - machine_stat |= BROKEN - unset_control() - update_icon() - -/obj/machinery/power/solar/atom_fix() - . = ..() - machine_stat &= ~(BROKEN) - update_icon() - -/obj/machinery/power/solar/fake/Initialize(mapload, obj/item/solar_assembly/S) - . = ..(mapload, S, FALSE) - -/obj/machinery/power/solar/fake/process(delta_time) - return PROCESS_KILL - -//trace towards SSsun.sun to see if we're in shadow -/obj/machinery/power/solar/proc/occlusion() - - var/ax = x // start at the solar panel - var/ay = y - var/turf/T = null - - for(var/i = 1 to 20) // 20 steps is enough - ax += SSsun.sun.dx // do step - ay += SSsun.sun.dy - - T = locate( round(ax,0.5),round(ay,0.5),z) - - if(!T || T.x == 1 || T.x==world.maxx || T.y==1 || T.y==world.maxy) // not obscured if we reach the edge - break - - if(T.opacity) // if we hit a solid turf, panel is obscured - obscured = 1 - return - - obscured = 0 // if hit the edge or stepped 20 times, not obscured - update_solar_exposure() - - -// -// Solar Assembly - For construction of solar arrays. -// - -/obj/item/solar_assembly - name = "solar panel assembly" - desc = "A solar panel assembly kit, allows constructions of a solar panel, or with a tracking circuit board, a solar tracker" - icon = 'icons/obj/power.dmi' - icon_state = "sp_base" - item_state = "camera" - w_class = WEIGHT_CLASS_BULKY // Pretty big! - anchored = 0 - var/tracker = 0 - var/glass_type = null - -/obj/item/solar_assembly/attack_hand(mob/user, list/params) - if(!anchored || !isturf(loc)) // You can't pick it up - ..() - -// Give back the glass type we were supplied with -/obj/item/solar_assembly/proc/give_glass() - if(glass_type) - var/obj/item/stack/material/S = new glass_type(src.loc) - S.amount = 2 - glass_type = null - - -/obj/item/solar_assembly/attackby(var/obj/item/W, var/mob/user) - if (!isturf(loc)) - return 0 - if(!anchored) - if(W.is_wrench()) - anchored = 1 - user.visible_message("[user] wrenches the solar assembly into place.") - playsound(src, W.tool_sound, 75, 1) - return 1 - else - if(W.is_wrench()) - anchored = 0 - user.visible_message("[user] unwrenches the solar assembly from it's place.") - playsound(src, W.tool_sound, 75, 1) - return 1 - - // todo: phoronglass solars - if(istype(W, /obj/item/stack/material) && istype(W.get_primary_material(), /datum/material/glass)) - var/obj/item/stack/material/S = W - if(S.use(2)) - glass_type = W.type - playsound(src.loc, 'sound/machines/click.ogg', 50, 1) - user.visible_message("[user] places the glass on the solar assembly.") - if(tracker) - new /obj/machinery/power/tracker(get_turf(src), src) - else - new /obj/machinery/power/solar(get_turf(src), src) - qdel(src) - else - to_chat(user, "You need two sheets of glass to put them into a solar panel.") - return - return 1 - - if(!tracker) - if(istype(W, /obj/item/tracker_electronics)) - if(!user.attempt_consume_item_for_construction(W)) - return - tracker = 1 - user.visible_message("[user] inserts the electronics into the solar assembly.") - return 1 - else - if(W.is_crowbar()) - new /obj/item/tracker_electronics(src.loc) - tracker = 0 - user.visible_message("[user] takes out the electronics from the solar assembly.") - return 1 - ..() - -// -// Solar Control Computer -// - -/obj/machinery/power/solar_control - name = "solar panel control" - desc = "A controller for solar panel arrays." - icon = 'icons/obj/computer.dmi' - icon_state = "solar" - anchored = 1 - density = 1 - use_power = USE_POWER_IDLE - idle_power_usage = 250 - var/id = 0 - var/cdir = 0 - var/targetdir = 0 // target angle in manual tracking (since it updates every game minute) - var/gen = 0 - var/lastgen = 0 - var/track = 0 // 0= off 1=timed 2=auto (tracker) - var/trackrate = 600 // 300-900 seconds - var/nexttime = 0 // time for a panel to rotate of 1� in manual tracking - var/obj/machinery/power/tracker/connected_tracker = null - var/list/connected_panels = list() - var/auto_start = SOLAR_AUTO_START_NO - -// Used for mapping in solar arrays which automatically start itself. -// Generally intended for far away and remote locations, where player intervention is rare. -// In the interest of backwards compatability, this isn't named auto_start, as doing so might break downstream maps. -/obj/machinery/power/solar_control/autostart - auto_start = SOLAR_AUTO_START_YES - -// Similar to above but controlled by the configuration file. -// Intended to be used for the main solar arrays, so individual servers can choose to have them start automatically or require manual intervention. -/obj/machinery/power/solar_control/config_start - auto_start = SOLAR_AUTO_START_CONFIG - -/obj/machinery/power/solar_control/Initialize(mapload) - . = ..() - connect_to_network() - set_panels(cdir) - -/obj/machinery/power/solar_control/Destroy() - for(var/obj/machinery/power/solar/M in connected_panels) - M.unset_control() - if(connected_tracker) - connected_tracker.unset_control() - return ..() - -/obj/machinery/power/solar_control/proc/auto_start(forced = FALSE) - // Automatically sets the solars, if allowed. - if(forced || auto_start == SOLAR_AUTO_START_YES || (auto_start == SOLAR_AUTO_START_CONFIG && config_legacy.autostart_solars) ) - track = 2 // Auto tracking mode. - search_for_connected() - if(connected_tracker) - connected_tracker.set_angle(SSsun.sun.angle) - set_panels(cdir) - -// This would use LateInitialize(), however the powernet does not appear to exist during that time. -/hook/roundstart/proc/auto_start_solars() - for(var/a in GLOB.solars_list) - var/obj/machinery/power/solar_control/SC = a - SC.auto_start() - return TRUE - -/obj/machinery/power/solar_control/can_drain_energy(datum/actor, flags) - return FALSE - -/obj/machinery/power/solar_control/disconnect_from_network() - ..() - GLOB.solars_list.Remove(src) - -/obj/machinery/power/solar_control/connect_to_network() - var/to_return = ..() - if(powernet) //if connected and not already in solar_list... - GLOB.solars_list |= src //... add it - return to_return - -/// Search for unconnected panels and trackers in the computer powernet and connect them -/obj/machinery/power/solar_control/proc/search_for_connected() - if(powernet) - for(var/obj/machinery/power/M in powernet.nodes) - if(istype(M, /obj/machinery/power/solar)) - var/obj/machinery/power/solar/S = M - if(!S.control) //i.e unconnected - S.set_control(src) - connected_panels |= S - else if(istype(M, /obj/machinery/power/tracker)) - if(!connected_tracker) //if there's already a tracker connected to the computer don't add another - var/obj/machinery/power/tracker/T = M - if(!T.control) //i.e unconnected - connected_tracker = T - T.set_control(src) - -/// Called by the SSsun.sun controller, update the facing angle (either manually or via tracking) and rotates the panels accordingly -/obj/machinery/power/solar_control/proc/update() - if(machine_stat & (NOPOWER | BROKEN)) - return - - switch(track) - if(1) - if(trackrate) //we're manual tracking. If we set a rotation speed... - cdir = targetdir //...the current direction is the targetted one (and rotates panels to it) - if(2) // auto-tracking - if(connected_tracker) - connected_tracker.set_angle(SSsun.sun.angle) - - set_panels(cdir) - updateDialog() - -/obj/machinery/power/solar_control/update_icon() - cut_overlays() - if(machine_stat & BROKEN) - icon_state = "broken" - return - if(machine_stat & NOPOWER) - icon_state = "c_unpowered" - return - icon_state = "solar" - if(cdir > -1) - add_overlay(image('icons/obj/computer.dmi', "solcon-o", FLY_LAYER, angle2dir(cdir))) - return - -/obj/machinery/power/solar_control/attack_hand(mob/user, list/params) - if(!..()) - interact(user) - -/obj/machinery/power/solar_control/interact(mob/user) - - var/t = "Generated power : [round(lastgen)] W
" - t += "Star Orientation: [SSsun.sun.angle]° ([angle2text(SSsun.sun.angle)])
" - t += "Array Orientation: [rate_control(src,"cdir","[cdir]°",1,15)] ([angle2text(cdir)])
" - t += "Tracking:
" - - t += "Connected devices:
" - - t += "Close" - - var/datum/browser/popup = new(user, "solar", name) - popup.set_content(t) - popup.open() - - return - -/obj/machinery/power/solar_control/attackby(obj/item/I, user as mob) - if(I.is_screwdriver()) - playsound(src, I.tool_sound, 50, 1) - if(do_after(user, 20)) - if (src.machine_stat & BROKEN) - to_chat(user, "The broken glass falls out.") - var/obj/structure/frame/A = new /obj/structure/frame/computer( src.loc ) - new /obj/item/material/shard( src.loc ) - var/obj/item/circuitboard/solar_control/M = new /obj/item/circuitboard/solar_control( A ) - for (var/obj/C in src) - C.loc = src.loc - A.circuit = M - A.state = 3 - A.icon_state = "computer_3" - A.anchored = 1 - qdel(src) - else - to_chat(user, "You disconnect the monitor.") - var/obj/structure/frame/A = new /obj/structure/frame/computer( src.loc ) - var/obj/item/circuitboard/solar_control/M = new /obj/item/circuitboard/solar_control( A ) - for (var/obj/C in src) - C.loc = src.loc - A.circuit = M - A.state = 4 - A.icon_state = "computer_4" - A.anchored = 1 - qdel(src) - else - src.attack_hand(user) - return - -/obj/machinery/power/solar_control/process(delta_time) - lastgen = gen - gen = 0 - - if(machine_stat & (NOPOWER | BROKEN)) - return - - if(connected_tracker) //NOTE : handled here so that we don't add trackers to the processing list - if(connected_tracker.powernet != powernet) - connected_tracker.unset_control() - - if(track==1 && trackrate) //manual tracking and set a rotation speed - if(nexttime <= world.time) //every time we need to increase/decrease the angle by 1�... - targetdir = (targetdir + trackrate/abs(trackrate) + 360) % 360 //... do it - nexttime += 36000/abs(trackrate) //reset the counter for the next 1� - - updateDialog() - -/obj/machinery/power/solar_control/Topic(href, href_list) - if(..()) - usr << browse(null, "window=solcon") - usr.unset_machine() - return 0 - if(href_list["close"] ) - usr << browse(null, "window=solcon") - usr.unset_machine() - return 0 - - if(href_list["rate control"]) - if(href_list["cdir"]) - src.cdir = clamp((360+src.cdir+text2num(href_list["cdir"]))%360, 0, 359) - src.targetdir = src.cdir - if(track == 2) //manual update, so losing auto-tracking - track = 0 - spawn(1) - set_panels(cdir) - if(href_list["tdir"]) - src.trackrate = clamp(src.trackrate+text2num(href_list["tdir"]), -7200, 7200) - if(src.trackrate) nexttime = world.time + 36000/abs(trackrate) - - if(href_list["track"]) - track = text2num(href_list["track"]) - if(track == 2) - if(connected_tracker) - connected_tracker.set_angle(SSsun.sun.angle) - set_panels(cdir) - else if (track == 1) //begin manual tracking - src.targetdir = src.cdir - if(src.trackrate) nexttime = world.time + 36000/abs(trackrate) - set_panels(targetdir) - - if(href_list["search_connected"]) - src.search_for_connected() - if(connected_tracker && track == 2) - connected_tracker.set_angle(SSsun.sun.angle) - src.set_panels(cdir) - - interact(usr) - return 1 - -//rotates the panel to the passed angle -/obj/machinery/power/solar_control/proc/set_panels(var/cdir) - - for(var/obj/machinery/power/solar/S in connected_panels) - S.adir = cdir //instantly rotates the panel - S.occlusion()//and - S.update_icon() //update it - - update_icon() - - -/obj/machinery/power/solar_control/power_change() - ..() - update_icon() - - -/obj/machinery/power/solar_control/proc/broken() - machine_stat |= BROKEN - update_icon() - - -/obj/machinery/power/solar_control/legacy_ex_act(severity) - switch(severity) - if(1.0) - //SN src = null - qdel(src) - return - if(2.0) - if (prob(50)) - broken() - if(3.0) - if (prob(25)) - broken() - return - -// -// MISC -// - -/obj/item/paper/solar - name = "paper- 'Going green! Setup your own solar array instructions.'" - info = "
" + t += "Star Orientation: [cdir]° ([angle2text(cdir)])
" + t += "Array Orientation: [rate_control(src,"cdir","[cdir]°",1,15)] ([angle2text(cdir)])
" + t += "Tracking:
" + + t += "Connected devices:
" + + t += "Close" + + var/datum/browser/popup = new(user, "solar", name) + popup.set_content(t) + popup.open() + + return + +/obj/machinery/power/solar_control/attackby(obj/item/I, user as mob) + if(I.is_screwdriver()) + playsound(src, I.tool_sound, 50, 1) + if(do_after(user, 20)) + if (src.machine_stat & BROKEN) + to_chat(user, "The broken glass falls out.") + var/obj/structure/frame/A = new /obj/structure/frame/computer( src.loc ) + new /obj/item/material/shard( src.loc ) + var/obj/item/circuitboard/solar_control/M = new /obj/item/circuitboard/solar_control( A ) + for (var/obj/C in src) + C.loc = src.loc + A.circuit = M + A.state = 3 + A.icon_state = "computer_3" + A.anchored = 1 + qdel(src) + else + to_chat(user, "You disconnect the monitor.") + var/obj/structure/frame/A = new /obj/structure/frame/computer( src.loc ) + var/obj/item/circuitboard/solar_control/M = new /obj/item/circuitboard/solar_control( A ) + for (var/obj/C in src) + C.loc = src.loc + A.circuit = M + A.state = 4 + A.icon_state = "computer_4" + A.anchored = 1 + qdel(src) + else + src.attack_hand(user) + return + +/obj/machinery/power/solar_control/process(delta_time) + lastgen = gen + gen = 0 + + if(machine_stat & (NOPOWER | BROKEN)) + return + + if(connected_tracker) //NOTE : handled here so that we don't add trackers to the processing list + if(connected_tracker.powernet != powernet) + connected_tracker.unset_control() + + if(track==1 && trackrate) //manual tracking and set a rotation speed + if(nexttime <= world.time) //every time we need to increase/decrease the angle by 1�... + targetdir = (targetdir + trackrate/abs(trackrate) + 360) % 360 //... do it + nexttime += 36000/abs(trackrate) //reset the counter for the next 1� + + update() + + updateDialog() + +/obj/machinery/power/solar_control/Topic(href, href_list) + if(..()) + usr << browse(null, "window=solcon") + usr.unset_machine() + return 0 + if(href_list["close"] ) + usr << browse(null, "window=solcon") + usr.unset_machine() + return 0 + + if(href_list["rate control"]) + if(href_list["cdir"]) + src.cdir = clamp((360+src.cdir+text2num(href_list["cdir"]))%360, 0, 359) + src.targetdir = src.cdir + if(track == 2) //manual update, so losing auto-tracking + track = 0 + spawn(1) + set_panels(cdir) + if(href_list["tdir"]) + src.trackrate = clamp(src.trackrate+text2num(href_list["tdir"]), -7200, 7200) + if(src.trackrate) nexttime = world.time + 36000/abs(trackrate) + + if(href_list["track"]) + track = text2num(href_list["track"]) + if(track == 2) + if(connected_tracker) + set_tracker_angle() + set_panels(cdir) + else if (track == 1) //begin manual tracking + src.targetdir = src.cdir + if(src.trackrate) nexttime = world.time + 36000/abs(trackrate) + set_panels(targetdir) + + if(href_list["search_connected"]) + src.search_for_connected() + if(connected_tracker && track == 2) + set_tracker_angle() + src.set_panels(cdir) + + interact(usr) + return 1 + +/obj/machinery/power/solar_control/proc/set_tracker_angle() + var/angle = 0 + var/datum/planet/our_planet = null + var/turf/T = get_turf(src) + if(T.z <= SSplanets.z_to_planet.len) + our_planet = SSplanets.z_to_planet[z] + + if(our_planet && istype(our_planet)) + var/time_num = text2num(our_planet.current_time.show_time("hh")) + (text2num(our_planet.current_time.show_time("mm"))/60) + var/day_hours = our_planet.current_time.seconds_in_day / (1 HOURS) + angle = round((time_num / day_hours) * 360) // day as progress from 0 to 1 * 360 + else + angle = SSsun.sun.angle + + connected_tracker.set_angle(angle) + +//rotates the panel to the passed angle +/obj/machinery/power/solar_control/proc/set_panels(var/cdir) + + for(var/obj/machinery/power/solar/S in connected_panels) + S.adir = cdir //instantly rotates the panel + S.update_solar_exposure()//and + S.update_icon() //update it + + update_icon() + + +/obj/machinery/power/solar_control/power_change() + ..() + update_icon() + + +/obj/machinery/power/solar_control/proc/broken() + machine_stat |= BROKEN + update_icon() + + +/obj/machinery/power/solar_control/legacy_ex_act(severity) + switch(severity) + if(1.0) + //SN src = null + qdel(src) + return + if(2.0) + if (prob(50)) + broken() + if(3.0) + if (prob(25)) + broken() + return + +/proc/rate_control(var/S, var/V, var/C, var/Min=1, var/Max=5, var/Limit=null) //How not to name vars + var/href = "-[href]=-[Min]'>- [(C?C : 0)] [href]=[Min]'>+[href]=[Max]'>+" + if(Limit) return "[href]=-[Limit]'>-"+rate+"[href]=[Limit]'>+" + return rate diff --git a/code/modules/power/tracker.dm b/code/modules/power/solar/tracker.dm similarity index 72% rename from code/modules/power/tracker.dm rename to code/modules/power/solar/tracker.dm index 0b0385792441..7263733e874c 100644 --- a/code/modules/power/tracker.dm +++ b/code/modules/power/solar/tracker.dm @@ -8,17 +8,17 @@ desc = "A solar directional tracker." icon = 'icons/obj/power.dmi' icon_state = "tracker" - anchored = 1 - density = 1 + anchored = TRUE + density = TRUE use_power = USE_POWER_OFF var/id = 0 var/sun_angle = 0 // sun angle as set by sun datum var/obj/machinery/power/solar_control/control = null -/obj/machinery/power/tracker/Initialize(mapload, obj/item/solar_assembly/S) +/obj/machinery/power/tracker/Initialize(mapload) . = ..() - Make(S) + update_icon() connect_to_network() /obj/machinery/power/tracker/Destroy() @@ -38,15 +38,6 @@ control.connected_tracker = null control = null -/obj/machinery/power/tracker/proc/Make(var/obj/item/solar_assembly/S) - if(!S) - S = new /obj/item/solar_assembly(src) - S.glass_type = /obj/item/stack/material/glass - S.tracker = 1 - S.anchored = 1 - S.loc = src - update_icon() - //updates the tracker icon and the facing angle for the control computer /obj/machinery/power/tracker/proc/set_angle(var/angle) sun_angle = angle @@ -57,21 +48,20 @@ if(powernet && (powernet == control.powernet)) //update if we're still in the same powernet control.cdir = angle -/obj/machinery/power/tracker/attackby(var/obj/item/W, var/mob/user) +/obj/machinery/power/tracker/drop_products(method, atom/where) + . = ..() + drop_product(method, new /obj/structure/frame2/solar_panel/tracker/anchored, where) - if(W.is_crowbar()) +/obj/machinery/power/tracker/attackby(obj/item/I, mob/living/user, list/params, clickchain_flags, damage_multiplier) + // todo: tool system + if(I.is_crowbar()) playsound(src.loc, 'sound/machines/click.ogg', 50, 1) user.visible_message("[user] begins to take the glass off the solar tracker.") if(do_after(user, 50)) - var/obj/item/solar_assembly/S = locate() in src - if(S) - S.loc = src.loc - S.give_glass() - playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) - user.visible_message("[user] takes the glass off the tracker.") - qdel(src) - return - ..() + deconstruct(ATOM_DECONSTRUCT_DISASSEMBLED) + return CLICKCHAIN_DID_SOMETHING | CLICKCHAIN_DO_NOT_PROPAGATE + return CLICKCHAIN_DO_NOT_PROPAGATE + return ..() // Tracker Electronic diff --git a/code/modules/power/tesla/coil.dm b/code/modules/power/tesla/coil.dm index be531a988a8d..0121fcb4dc42 100644 --- a/code/modules/power/tesla/coil.dm +++ b/code/modules/power/tesla/coil.dm @@ -12,7 +12,7 @@ circuit = /obj/item/circuitboard/tesla_coil - var/power_loss = 2 + var/power_loss = 1.2 var/input_power_multiplier = 1 var/zap_cooldown = 100 var/last_zap = 0 diff --git a/code/modules/preferences/_preferences.dm b/code/modules/preferences/_preferences.dm index 4df40de85b35..0b8120fe2539 100644 --- a/code/modules/preferences/_preferences.dm +++ b/code/modules/preferences/_preferences.dm @@ -29,27 +29,27 @@ GLOBAL_LIST_EMPTY(preferences_datums) return creating /datum/preferences - //! Intrinsics + //* Intrinsics /// did we load yet? var/initialized = FALSE - //! Error Handling + //* Error Handling /// queued error messages to display var/list/io_error_queue -//! ## Doohickeys For Savefiles + //* ## Doohickeys For Savefiles var/path /// Holder so it doesn't default to slot 1, rather the last one used. var/default_slot = 1 var/savefile_version = 0 // todo: kick this out of prefs -//! ## Non-Preference Stuff + //* ## Non-Preference Stuff var/muted = 0 var/last_ip var/last_id -//! ## Cooldowns for saving/loading. + //* ## Cooldowns for saving/loading. //? ## These are four are all separate due to loading code calling these one after another. var/saveprefcooldown var/loadprefcooldown @@ -60,7 +60,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) //? These lists may only ever contain associative key-values, where //? values MUST be string, number, or null. //? Savefiles do not play nice with typepaths. - //! Loaded data + //* Loaded data /// character data var/list/character /// global data @@ -68,13 +68,13 @@ GLOBAL_LIST_EMPTY(preferences_datums) /// data for byond skin - checkboxes and whatnot; this is ENTIRELY synchronized by the skin system. var/list/skin -//! ## Game Preferences + //* ## Game Preferences /// Special role selection. var/be_special = 0 /// Event role prefs flag. var/be_event_role = NONE -//! ## Character Preferences + //* ## Character Preferences /// Our character's name var/real_name /// Whether we are a random name every round @@ -146,7 +146,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) /// Enable/disable markings on synth parts. var/synth_markings = 1 -//! ## Background Preferences + //* ## Background Preferences ///Antag associated faction. var/antag_faction = "None" ///How visible antag association is to others. @@ -163,7 +163,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/uplinklocation = "PDA" -//! ## Mob Preview + //* ## Mob Preview /// Should only be a key-value list of north/south/east/west = atom/movable/screen. var/list/char_render_holders var/static/list/preview_screen_locs = list( @@ -174,13 +174,13 @@ GLOBAL_LIST_EMPTY(preferences_datums) "BG" = "character_preview_map:1,1 to 3,8" ) -//! ## Skills Preferences - Depricated. + //* ## Skills Preferences - Depricated. var/used_skillpoints = 0 var/skill_specialization = null /// Skills can range from 0 to 3. var/list/skills = list() -//! ## Body Preferences + //* ## Body Preferences /// Maps each organ to either null(intact), "cyborg" or "amputated" /// will probably not be able to do this for head and torso ;) var/list/organ_data = list() @@ -195,7 +195,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/list/body_descriptors = list() -//! ## OOC Metadata + //* ## OOC Metadata var/metadata = "" var/headshot_url = "" var/full_ref_url = "" @@ -214,7 +214,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/datum/category_collection/player_setup_collection/player_setup var/datum/browser/panel -//! ## Character Directory Stuff + //* ## Character Directory Stuff /// Should we show in Character Directory. var/show_in_directory = 1 /// Sorting tag to use for vore-prefs. diff --git a/code/modules/preferences/apply.dm b/code/modules/preferences/apply.dm index cf1197513e8e..6c0d997bf087 100644 --- a/code/modules/preferences/apply.dm +++ b/code/modules/preferences/apply.dm @@ -129,7 +129,7 @@ // storage? if(allow_storage_spawn) for(var/obj/item/instance as anything in overflow) - if(character.force_equip_to_slot(instance, /datum/inventory_slot_meta/abstract/put_in_backpack)) + if(character.force_equip_to_slot(instance, /datum/inventory_slot/abstract/put_in_backpack)) overflow -= instance if(!(flags & PREF_COPY_TO_SILENT)) to_chat(character, SPAN_NOTICE("Putting \the [instance] into your backpack.")) @@ -151,7 +151,7 @@ // storage? if(allow_storage_spawn) for(var/obj/item/instance as anything in instances) - if(character.force_equip_to_slot(instance, /datum/inventory_slot_meta/abstract/put_in_backpack, INV_OP_SILENT)) + if(character.force_equip_to_slot(instance, /datum/inventory_slot/abstract/put_in_backpack, INV_OP_SILENT)) instances -= instance if(!(flags & PREF_COPY_TO_SILENT)) to_chat(character, SPAN_NOTICE("Putting \the [instance] into your backpack.")) diff --git a/code/modules/preferences/preference_setup/helpers/species_pick.dm b/code/modules/preferences/preference_setup/helpers/species_pick.dm index 06786ee3474f..178deea1b46a 100644 --- a/code/modules/preferences/preference_setup/helpers/species_pick.dm +++ b/code/modules/preferences/preference_setup/helpers/species_pick.dm @@ -57,10 +57,10 @@ var/datum/sprite_accessory/HS = GLOB.sprite_accessory_hair[h_style_id] var/datum/sprite_accessory/FS = GLOB.sprite_accessory_facial_hair[f_style_id] if(!(HS.name in valid_hair)) - var/datum/sprite_accessory/hair/H = /datum/sprite_accessory/hair/bald + var/datum/sprite_accessory/hair/H = /datum/sprite_accessory/hair/legacy/bald h_style_id = initial(H.id) if(!(FS.name in valid_fhair)) - var/datum/sprite_accessory/facial_hair/FH = /datum/sprite_accessory/facial_hair/shaved + var/datum/sprite_accessory/facial_hair/FH = /datum/sprite_accessory/facial_hair/legacy/shaved f_style_id = initial(FH.id) // limbs/markings reset_limbs() diff --git a/code/modules/preferences/preference_setup/vore/01_ears.dm b/code/modules/preferences/preference_setup/vore/01_ears.dm index d0bfd39a9c79..987b73f7a9f0 100644 --- a/code/modules/preferences/preference_setup/vore/01_ears.dm +++ b/code/modules/preferences/preference_setup/vore/01_ears.dm @@ -210,19 +210,31 @@ if(temp_wing_style_id.apply_restrictions && (!(species_name in temp_wing_style_id.species_allowed))) pref.wing_style_id = initial(pref.wing_style_id) +/datum/category_item/player_setup_item/vore/ears/proc/should_override(datum/sprite_accessory/setting, datum/sprite_accessory/existing, datum/sprite_accessory/species) + if(species && (existing == species)) + // if they're set by species, only override if we're set + return setting != null + // otherwise, override always + return TRUE + /datum/category_item/player_setup_item/vore/ears/copy_to_mob(datum/preferences/prefs, mob/M, data, flags) // todo: this is just a shim if(!ishuman(M)) return TRUE var/mob/living/carbon/human/character = M var/datum/sprite_accessory/S = GLOB.sprite_accessory_ears[pref.ear_style_id] - character.ear_style = S + // todo: this is shitcode + if(should_override(S, character.ear_style, character.species?.sprite_accessory_defaults?[SPRITE_ACCESSORY_SLOT_EARS])) + character.ear_style = S S = GLOB.sprite_accessory_tails[pref.tail_style_id] - character.tail_style = S + if(should_override(S, character.tail_style, character.species?.sprite_accessory_defaults?[SPRITE_ACCESSORY_SLOT_TAIL])) + character.tail_style = S S = GLOB.sprite_accessory_wings[pref.wing_style_id] - character.wing_style = S + if(should_override(S, character.wing_style, character.species?.sprite_accessory_defaults?[SPRITE_ACCESSORY_SLOT_WINGS])) + character.wing_style = S S = GLOB.sprite_accessory_ears[pref.horn_style_id] - character.horn_style = S + if(should_override(S, character.horn_style, character.species?.sprite_accessory_defaults?[SPRITE_ACCESSORY_SLOT_HORNS])) + character.horn_style = S character.r_ears = pref.r_ears character.b_ears = pref.b_ears @@ -362,7 +374,7 @@ var/datum/sprite_accessory/ears/current = pref.ear_style_id && GLOB.sprite_accessory_ears[pref.ear_style_id] for(var/id in GLOB.sprite_accessory_ears) var/datum/sprite_accessory/ears/instance = GLOB.sprite_accessory_ears[id] - if(((!instance.ckeys_allowed) || (usr.ckey in instance.ckeys_allowed)) && ((!instance.apply_restrictions) || (species_name in instance.species_allowed))) + if(((!instance.apply_restrictions) || (species_name in instance.species_allowed))) pretty_ear_styles[instance.name] = id // Present choice to user @@ -405,7 +417,7 @@ var/datum/sprite_accessory/ears/current = pref.horn_style_id && GLOB.sprite_accessory_ears[pref.horn_style_id] for(var/id in GLOB.sprite_accessory_ears) var/datum/sprite_accessory/ears/instance = GLOB.sprite_accessory_ears[id] - if(((!instance.ckeys_allowed) || (usr.ckey in instance.ckeys_allowed)) && ((!instance.apply_restrictions) || (species_name in instance.species_allowed))) + if(((!instance.apply_restrictions) || (species_name in instance.species_allowed))) pretty_horn_styles[instance.name] = id // Present choice to user @@ -448,7 +460,7 @@ var/datum/sprite_accessory/tail/current = pref.tail_style_id && GLOB.sprite_accessory_tails[pref.tail_style_id] for(var/id in GLOB.sprite_accessory_tails) var/datum/sprite_accessory/tail/instance = GLOB.sprite_accessory_tails[id] - if(((!instance.ckeys_allowed) || (usr.ckey in instance.ckeys_allowed)) && ((!instance.apply_restrictions) || (species_name in instance.species_allowed))) + if(((!instance.apply_restrictions) || (species_name in instance.species_allowed))) pretty_tail_styles[instance.name] = id // Present choice to user @@ -491,7 +503,7 @@ var/datum/sprite_accessory/wing/current = pref.wing_style_id && GLOB.sprite_accessory_wings[pref.wing_style_id] for(var/id in GLOB.sprite_accessory_wings) var/datum/sprite_accessory/wing/instance = GLOB.sprite_accessory_wings[id] - if(((!instance.ckeys_allowed) || (usr.ckey in instance.ckeys_allowed)) && ((!instance.apply_restrictions) || (species_name in instance.species_allowed))) + if(((!instance.apply_restrictions) || (species_name in instance.species_allowed))) pretty_wing_styles[instance.name] = id // Present choice to user diff --git a/code/modules/preferences/preferences_setup.dm b/code/modules/preferences/preferences_setup.dm index ef1f401dcd1b..f95ba36cb852 100644 --- a/code/modules/preferences/preferences_setup.dm +++ b/code/modules/preferences/preferences_setup.dm @@ -212,9 +212,7 @@ var/datum/species/RS = real_species_datum() for(var/facialhairstyle in GLOB.legacy_facial_hair_lookup) var/datum/sprite_accessory/S = GLOB.legacy_facial_hair_lookup[facialhairstyle] - if(biological_gender == MALE && S.gender == FEMALE) - continue - if(biological_gender == FEMALE && S.gender == MALE) + if(!isnull(S.random_generation_gender) && biological_gender != S.random_generation_gender) continue if(S.apply_restrictions && !(RS.name in S.species_allowed) && (!custom_base || !(custom_base in S.species_allowed))) //Custom species base species allowance continue diff --git a/code/modules/projectiles/ammunition/rounds.dm b/code/modules/projectiles/ammunition/rounds.dm index 64df58b42bce..6085d7794348 100644 --- a/code/modules/projectiles/ammunition/rounds.dm +++ b/code/modules/projectiles/ammunition/rounds.dm @@ -503,7 +503,7 @@ /obj/item/ammo_casing/a5mmcaseless desc = "A 5mm solid phoron caseless round." caliber = "5mm caseless" - icon_state = "casing" // Placeholder. Should probably be purple. + icon_state = "p-casing" projectile_type = /obj/projectile/bullet/pistol // Close enough to be comparable. materials_base = list(MAT_STEEL = 180) casing_flags = CASING_DELETE @@ -512,10 +512,27 @@ desc = "A 5mm solid phoron caseless stun round." projectile_type = /obj/projectile/energy/electrode // Maybe nerf this considering there's 30 rounds in a mag. + /* * Misc */ +/obj/item/ammo_casing/fiftycalcaseless + name = "caseless phoron round" + desc = "A 12.7mm caseless round." + caliber = "12.7mm caseless" + icon_state = "p-casing" + projectile_type = /obj/projectile/bullet/incendiary/caseless + casing_flags = CASING_DELETE + +/obj/item/ammo_casing/phoron_shrap + name = "phoron shrapnel" + desc = "Should you really be holding this?" + caliber = "phoron shrapnel" + icon_state = "phoronshrap" + projectile_type = /obj/projectile/bullet/incendiary/caseless + casing_flags = CASING_DELETE + /obj/item/ammo_casing/rocket name = "rocket shell" desc = "A high explosive designed to be fired from a launcher." diff --git a/code/modules/projectiles/guns/projectile/caseless.dm b/code/modules/projectiles/guns/projectile/caseless.dm index 6332892d9a7f..752b1ec0defb 100644 --- a/code/modules/projectiles/guns/projectile/caseless.dm +++ b/code/modules/projectiles/guns/projectile/caseless.dm @@ -24,7 +24,7 @@ /obj/item/gun/ballistic/caseless/usmc name = "M41A Pulse Rifle" - desc = "A relic dating back to the Xenomorph Wars and the former primary battle rifle of the United Solar Marine Corps. Loads using 10x24mm caseless Magazines" + desc = "A relic of the Phoron Wars and a more violent age. The former primary battle rifle of the United Terran Marine Corps. It's now discontinued, like most caseless designs, due to cost and lack of need. Still preferred by many. Loads using 10x24mm caseless Magazines." icon_state = "usmc" item_state = "usmc" w_class = WEIGHT_CLASS_BULKY @@ -35,7 +35,72 @@ magazine_type = /obj/item/ammo_magazine/m10x24mm/small allowed_magazines = list(/obj/item/ammo_magazine/m10x24mm/small, /obj/item/ammo_magazine/m10x24mm/med, /obj/item/ammo_magazine/m10x24mm/large) recoil = 0 + auto_eject = 1 + auto_eject_sound = 'sound/weapons/smg_empty_alarm.ogg' firemodes = list( list(mode_name="semiauto", burst=1, fire_delay=0, move_delay=null, burst_accuracy=null, dispersion=null), list(mode_name="4-round bursts", burst=4, fire_delay=null, move_delay=6, burst_accuracy=list(0,-5,-10,-15), dispersion=list(0.0, 0.2, 0.4, 0.6)),//Small damage countered by tight spread. ) + +/obj/item/gun/ballistic/caseless/wild_hunt //extremely powerful and rare rifle - meant to spawn with maybe 2 mags extra, or be for asset protection/ert/solo antags/etc + name = "Gorlex WILD-HUNT 12.7mm Caseless Rifle" + desc = "An ancient rifle of the Phoron Wars. For when you want to kill something with no negotiation. The Wild Hunt is a beast that kicks like a mule and fires experimental caseless phoron rounds. It has, obviously, horrific results, setting targets on fire after giving them a golf-ball sized hole. Now generally disused due to the extreme maintenance cost and impracticality. Nobody makes these, anymore." + icon_state = "wild-hunt" + item_state = "wild-hunt" + caliber = "12.7mm caseless" + w_class = WEIGHT_CLASS_BULKY + slot_flags = SLOT_BACK + load_method = MAGAZINE + magazine_type = /obj/item/ammo_magazine/mfiftycalcaseless + recoil = 1 + accuracy = -10 + allowed_magazines = list(/obj/item/ammo_magazine/mfiftycalcaseless) + one_handed_penalty = 100 //you simply do not + auto_eject = 1 + auto_eject_sound = 'sound/weapons/smg_empty_alarm.ogg' + fire_sound = 'sound/weapons/gunshot/sniper.ogg' + + firemodes = list( + list(mode_name="semiauto", burst=1, fire_delay=0, move_delay=null, burst_accuracy=null, dispersion=null), + list(mode_name="automatic", burst=1, fire_delay=-1, move_delay=null, burst_accuracy=null, dispersion=null, automatic = 1) + ) + +/obj/item/gun/ballistic/caseless/wild_hunt/update_icon_state() + . = ..() + if(ammo_magazine) + icon_state = initial(icon_state) + else + icon_state = "[initial(icon_state)]-empty" + +/obj/item/gun/ballistic/caseless/wild_hunt/Initialize(mapload) + . = ..() + var/fluff_date = rand(2501,2543) + desc += "\n You see a stamp on the side: GORLEX MARAUDERS, MANUFACTURED IN [fluff_date]." + + +/obj/item/gun/ballistic/caseless/phoron_spitter // phoron war SMG that fires phoron shards. + name = "Gorlex 'SHRAPNEL-SPITTER' Phoron SMG" + desc = "A short-barrel SMG from the Phoron Wars that lacks conventional ammo, instead using compressed matter cartridges. Coils accelerate a ferromagnetic, self-oxidizing cloud of alloy. Lack of traditional cycling means it can fire blindingly fast. Like all caseless weapons, it's fallen by the wayside, and is no longer produced." + caliber = "phoron shrapnel" + w_class = WEIGHT_CLASS_BULKY + slot_flags = SLOT_BACK + load_method = MAGAZINE + magazine_type = /obj/item/ammo_magazine/mphoronshot + allowed_magazines = list(/obj/item/ammo_magazine/mphoronshot) + icon_state = "phoron_shredder" + item_state = "ashot" //close enough + recoil = 1.5 + accuracy = -30 + one_handed_penalty = 50 + auto_eject = 1 + auto_eject_sound = 'sound/weapons/smg_empty_alarm.ogg' + + firemodes = list( + list(mode_name="full auto", burst=1, fire_delay=-1, move_delay=null, burst_accuracy=null, dispersion=null, automatic = 1), + list(mode_name="fuller auto", burst=2, fire_delay=-1, move_delay=null, burst_accuracy=null, dispersion=null, automatic = 1) + ) + +/obj/item/gun/ballistic/caseless/phoron_spitter/Initialize(mapload) + . = ..() + var/fluff_date = rand(2501,2543) + desc += "\nYou see a stamp on the side: GORLEX MARAUDERS, MANUFACTURED IN [fluff_date]." diff --git a/code/modules/projectiles/magazines/unsorted.dm b/code/modules/projectiles/magazines/unsorted.dm index 783a94ddcb0d..6f6f3ebe5a0d 100644 --- a/code/modules/projectiles/magazines/unsorted.dm +++ b/code/modules/projectiles/magazines/unsorted.dm @@ -317,6 +317,29 @@ icon_state = "caseless-mag-alt" ammo_type = /obj/item/ammo_casing/a5mmcaseless/stun +/////// 12.7mm / 50 caliber caseless ///////// + +/obj/item/ammo_magazine/mfiftycalcaseless + name = "Wild Hunt magazine (12.7mm caseless)" + ammo_type = /obj/item/ammo_casing/fiftycalcaseless + icon_state = "caseless-127" + caliber = "12.7mm caseless" + mag_type = MAGAZINE + max_ammo = 20 + multiple_sprites = 1 + +/////// phoron shrapnel smg ////// + +/obj/item/ammo_magazine/mphoronshot + name = "compressed phoron matter container" + desc = "A compressed matter container meant for the Gorlex SHRAPNEL-SPITTER SMG. Contains a phoron alloy that self-oxidzes and ignites on contact with air. \n \nThey're in good shape for the shape they're in, \nbut God, I wonder how they think they can win, \nwith phoron rolling down their skin." + max_ammo = 40 + caliber = "phoron shrapnel" + mag_type = MAGAZINE + ammo_type = /obj/item/ammo_casing/phoron_shrap + icon_state = "spitterammo" + multiple_sprites = 1 + ///////// 9mm ///////// /obj/item/ammo_magazine/m9mm diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index e72fec88cb49..b45355d7a2ac 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -496,6 +496,17 @@ damage = 15 range = 6 +/obj/projectile/bullet/incendiary/caseless + name = "caseless phoron slug" + icon_state = "bullet_alt" + damage = 50 + damage_type = BRUTE + incendiary = 1 + flammability = 4 + armor_penetration = 35 + + + /* Practice rounds and blanks */ /obj/projectile/bullet/practice diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm index 961a9031f42c..918337188c10 100644 --- a/code/modules/projectiles/projectile/special.dm +++ b/code/modules/projectiles/projectile/special.dm @@ -18,8 +18,8 @@ var/sev4_range = 1 /obj/projectile/ion/on_hit(var/atom/target, var/blocked = 0) - empulse(target, sev1_range, sev2_range, sev3_range, sev4_range) - return 1 + empulse(target, sev1_range, sev2_range, sev3_range, sev4_range) + return 1 /obj/projectile/ion/small sev1_range = -1 diff --git a/code/modules/reagents/Drink-Recipes.dm b/code/modules/reagents/Drink-Recipes.dm index 26e25d2d813b..f69b422f1d8e 100644 --- a/code/modules/reagents/Drink-Recipes.dm +++ b/code/modules/reagents/Drink-Recipes.dm @@ -1336,7 +1336,7 @@ name = "Gimlet" id = "gimlet" result = "gimlet" - required_reagents = list("gin" = 1, "limejuice" = 1, "sodawater" = 1) + required_reagents = list("gin" = 1, "limejuice" = 1, "sugar" = 1) result_amount = 3 /datum/chemical_reaction/drinks/newsheriff @@ -1452,6 +1452,13 @@ required_reagents = list("whiskey" = 1, "protein" = 1) result_amount = 2 +/datum/chemical_reaction/drinks/drymonstertamer + name = "Dry Monster Tamer" + id = "drymonstertamer" + result = "drymonstertamer" + required_reagents = list("sassafras" = 1, "protein" = 1) + result_amount = 2 + /datum/chemical_reaction/drinks/phobos name = "Phobos" id = "phobos" diff --git a/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Dispenser.dm b/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Dispenser.dm index 563bdd79bfe1..cab571b25cf7 100644 --- a/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Dispenser.dm +++ b/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Dispenser.dm @@ -1,4 +1,4 @@ - +#define ETHANOL_MET_DIVISOR 20 /datum/reagent/ethanol name = "Ethanol" //Parent class for all alcoholic reagents. @@ -8,12 +8,13 @@ reagent_state = REAGENT_LIQUID color = "#404030" - ingest_met = REM * 2 + metabolism = REM/ETHANOL_MET_DIVISOR + + ingest_met = REM * 5 var/nutriment_factor = 0 var/hydration_factor = 0 - // todo: this is awful why is strength lower when higher? - var/strength = 10 // This is, essentially, units between stages - the lower, the stronger. Less fine tuning, more clarity. + var/proof = 200 var/toxicity = 1 var/druggy = 0 @@ -21,6 +22,8 @@ var/targ_temp = 310 var/halluci = 0 + data=0 + glass_name = "ethanol" glass_desc = "A well-known alcohol with a variety of applications." @@ -28,9 +31,10 @@ if(istype(L)) L.adjust_fire_stacks(amount / 15) +#define ABV (proof/200) + /datum/reagent/ethanol/affect_blood(mob/living/carbon/M, alien, removed) //This used to do just toxin. That's boring. Let's make this FUN. - if(issmall(M)) removed *= 2 - var/strength_mod = 3 //Alcohol is 3x stronger when injected into the veins. + var/strength_mod = 1 //Alcohol is 3x stronger when injected into the veins. if(alien == IS_SKRELL) strength_mod *= 5 if(alien == IS_TAJARA) @@ -46,85 +50,83 @@ to_chat(M, "You feel your leaves start to wilt.") strength_mod *=5 //cit change - alcohol ain't good for plants - var/effective_dose = dose * strength_mod * (1 + volume/60) //drinking a LOT will make you go down faster + var/effective_dose = volume * strength_mod * ABV * min(1,dose*(ETHANOL_MET_DIVISOR/10)) // give it 50 ticks to ramp up M.add_chemical_effect(CE_ALCOHOL, 1) if(HAS_TRAIT(M, TRAIT_ALCOHOL_INTOLERANT)) - var/intolerant_dose = 100*strength_mod*removed/strength - if(prob((intolerant_dose))) - M.add_chemical_effect(CE_ALCOHOL_TOXIC, 1) - M.adjustToxLoss(intolerant_dose) // 10 strength = 10 tox per u, so 10u deathbell = 100, 10u vodka = 6.6666..., 10u beer = 20 + if(proof > 0) + var/intolerant_dose = strength_mod*removed*ABV*10 + if(prob((intolerant_dose))) + M.add_chemical_effect(CE_ALCOHOL_TOXIC, 1) + M.adjustToxLoss(intolerant_dose) return 0 - if(effective_dose >= strength) // Early warning - M.make_dizzy(18) // It is decreased at the speed of 3 per tick - if(effective_dose >= strength * 2) // Slurring - M.slurring = max(M.slurring, 90) - if(effective_dose >= strength * 3) // Confusion - walking in random directions + #define DOSE_LEVEL 6 + var/effect_level=round(effective_dose/DOSE_LEVEL) + if(effect_level != data) + var/lowering=(data>effect_level) + data=effect_level + if(lowering) + switch(effect_level) + if(0) + to_chat(M,SPAN_NOTICE("You no longer feel under the influence.")) + if(1) + to_chat(M,SPAN_DANGER("You are no longer slurring your words as much.")) + if(2) + to_chat(M,SPAN_DANGER("You can walk straight again.")) + if(3) + to_chat(M,SPAN_DANGER("You're not seeing double anymore.")) + if(4) + to_chat(M,SPAN_DANGER("You no longer feel like you're going to puke.")) + if(5) + to_chat(M,SPAN_DANGER("You don't feel like you're going to pass out anymore.")) + if(6) + to_chat(M,SPAN_DANGER("You feel like you're out of the danger zone.")) + else + var/hydration_str="" + if(M.hydration<250) + hydration_str=" You're feeling a little dehydrated, too." + switch(effect_level) + if(1) + to_chat(M,SPAN_DANGER("You're starting to feel a little tipsy.[hydration_str]")) + M.dizziness=max(M.dizziness,150) + if(2) + to_chat(M,SPAN_DANGER("You're starting to slur your words.[hydration_str]")) + if(3) + to_chat(M,SPAN_DANGER("You can barely walk straight![hydration_str]")) + if(4) + to_chat(M,SPAN_DANGER("You're seeing double!.[hydration_str]")) + M.eye_blurry=max(M.eye_blurry,30) + if(5) + to_chat(M,SPAN_USERDANGER("You feel like you might puke...[hydration_str]")) + if(6) + to_chat(M,SPAN_USERDANGER("Your eyelids feel heavy![hydration_str]")) + if(7) + to_chat(M,SPAN_USERDANGER("You are getting dangerously drunk![hydration_str]")) + var/hydration_removal=(clamp((M.hydration-150)/300,0,1)*effect_level) + max(0,(M.hydration-450)/300) + if(hydration_removal>0) + M.adjust_hydration(-hydration_removal) + volume-=removed*hydration_removal*3 + if(effect_level>=2) + M.slurring=max(M.slurring,10) + if(effect_level>=3 && prob(effect_level-2)) M.Confuse(60) - if(effective_dose >= strength * 4) // Blurry vision - M.eye_blurry = max(M.eye_blurry, 30) - if(effective_dose >= strength * 5) // Drowsyness - periodically falling asleep - M.drowsyness = max(M.drowsyness, 60) - if(effective_dose >= strength * 6) // Toxic dose - M.add_chemical_effect(CE_ALCOHOL_TOXIC, toxicity*3) - if(effective_dose >= strength * 7) // Pass out - M.afflict_unconscious(20 * 60) - M.afflict_sleeping(20 * 90) - - if(druggy != 0) - M.druggy = max(M.druggy, druggy*3) - - if(adj_temp > 0 && M.bodytemperature < targ_temp) // 310 is the normal bodytemp. 310.055 - M.bodytemperature = min(targ_temp, M.bodytemperature + (adj_temp * TEMPERATURE_DAMAGE_COEFFICIENT)) - if(adj_temp < 0 && M.bodytemperature > targ_temp) - M.bodytemperature = min(targ_temp, M.bodytemperature - (adj_temp * TEMPERATURE_DAMAGE_COEFFICIENT)) - - if(halluci) - M.hallucination = max(M.hallucination, halluci*3) - return effective_dose + if(effect_level>=5 && prob(effect_level-4) && !M.lastpuke) + M.vomit(1,0) + if(M.nutrition>=100) + volume-=DOSE_LEVEL/4 + if(effect_level>=6 && prob(effect_level-5)) + M.drowsyness=max(M.drowsyness,60) + if(effect_level>=7) + M.add_chemical_effect(CE_ALCOHOL_TOXIC, toxicity*strength_mod) + if(volume>DOSE_LEVEL*7) + volume-=REM // liver working overtime, or whatever (mostly to prevent people from always just dying from this) + #undef DOSE_LEVEL + return /datum/reagent/ethanol/affect_ingest(mob/living/carbon/M, alien, removed) if(issmall(M)) removed *= 2 M.adjust_nutrition(nutriment_factor * removed) M.adjust_hydration(hydration_factor * removed) - var/strength_mod = 1 - if(alien == IS_SKRELL) - strength_mod *= 5 - if(alien == IS_TAJARA) - strength_mod *= 1.25 - if(alien == IS_UNATHI) - strength_mod *= 0.75 - if(alien == IS_DIONA) - strength_mod = 0 - if(alien == IS_SLIME) - strength_mod *= 2 - var/is_vampire = M.species.is_vampire - if(is_vampire) - handle_vampire(M, alien, removed, is_vampire) - - if(HAS_TRAIT(M, TRAIT_ALCOHOL_INTOLERANT)) - var/intolerant_dose = 50*strength_mod*removed/strength - if(prob((intolerant_dose))) - M.add_chemical_effect(CE_ALCOHOL_TOXIC, 1) - M.adjustToxLoss(intolerant_dose) // 10 strength = 5 tox per u, so 10u deathbell = 50, 10u vodka = 3.3333..., 10u beer = 10 - return 0 - var/effective_dose = strength_mod * dose // this was being recalculated a bunch before--why? - M.add_chemical_effect(CE_ALCOHOL, 1) - if(effective_dose >= strength) // Early warning - M.make_dizzy(6) // It is decreased at the speed of 3 per tick - if(effective_dose >= strength * 2) // Slurring - M.slurring = max(M.slurring, 30) - if(effective_dose >= strength * 3) // Confusion - walking in random directions - M.Confuse(20) - if(effective_dose >= strength * 4) // Blurry vision - M.eye_blurry = max(M.eye_blurry, 10) - if(effective_dose >= strength * 5) // Drowsyness - periodically falling asleep - M.drowsyness = max(M.drowsyness, 20) - if(effective_dose >= strength * 6) // Toxic dose - M.add_chemical_effect(CE_ALCOHOL_TOXIC, toxicity) - if(effective_dose >= strength * 7) // Pass out - M.afflict_unconscious(20 * 20) - M.afflict_sleeping(20 * 30) - + M.bloodstr.add_reagent("ethanol", removed * ABV) if(druggy != 0) M.druggy = max(M.druggy, druggy) @@ -135,7 +137,7 @@ if(halluci) M.hallucination = max(M.hallucination, halluci) - return effective_dose + return /datum/reagent/ethanol/touch_obj(obj/O) if(istype(O, /obj/item/paper)) @@ -154,6 +156,7 @@ to_chat(usr, "The solution dissolves the ink on the book.") return +#undef ABV /datum/reagent/acid name = "Sulphuric acid" diff --git a/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Food-Drinks.dm index 2a855375787d..6dd52a4462f1 100644 --- a/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Food-Drinks.dm @@ -1998,6 +1998,7 @@ reagent_state = REAGENT_SOLID color = "#619494" adj_temp = -5 + hydration = 9 glass_name = "Ice" glass_desc = "Generally, you're supposed to put something else in there too..." @@ -2333,6 +2334,8 @@ // Basic +#define ABSINTHE 130 + /datum/reagent/ethanol/absinthe name = "Absinthe" id = "absinthe" @@ -2340,18 +2343,21 @@ taste_description = "licorice" taste_mult = 1.5 color = "#33EE00" - strength = 12 + proof = ABSINTHE glass_name = "Absinthe" glass_desc = "Wormwood, anise, oh my." +#define BEER 10 + /datum/reagent/ethanol/ale name = "Ale" id = "ale" description = "A dark alchoholic beverage made by malted barley and yeast." taste_description = "hearty barley ale" color = "#4C3100" - strength = 50 + proof = BEER + nutriment_factor=5 glass_name = "Ale" glass_desc = "A freezing pint of delicious ale." @@ -2362,8 +2368,8 @@ description = "An alcoholic beverage made from malted grains, hops, yeast, and water." taste_description = "beer" color = "#FFD300" - strength = 50 - nutriment_factor = 1 + proof = BEER + nutriment_factor = 5 glass_name = "Beer" glass_desc = "A freezing pint of beer" @@ -2373,6 +2379,8 @@ if(.) M.jitteriness = max(M.jitteriness - 3, 0) +#define CURACAO 60 + /datum/reagent/ethanol/bluecuracao name = "Blue Curacao" id = "bluecuracao" @@ -2380,11 +2388,13 @@ taste_description = "oranges" taste_mult = 1.1 color = "#0000CD" - strength = 15 + proof = CURACAO glass_name = "Blue Curacao" glass_desc = "Exotically blue, fruity drink, distilled from oranges." +#define COGNAC 80 + /datum/reagent/ethanol/cognac name = "Cognac" id = "cognac" @@ -2392,7 +2402,7 @@ taste_description = "rich and smooth alcohol" taste_mult = 1.1 color = "#AB3C05" - strength = 15 + proof = 80 glass_name = "Cognac" glass_desc = "Damn, you feel like some kind of French aristocrat just by holding this." @@ -2404,7 +2414,7 @@ taste_description = "butterscotch and salt" taste_mult = 1.1 color = "#ECB633" - strength = 50 + proof = 10 glass_name = "Rum" glass_desc = "Now you want to Pray for a pirate suit, don't you?" @@ -2414,24 +2424,28 @@ if(.) M.dizziness += 5 +#define GIN 100 + /datum/reagent/ethanol/gin name = "Gin" id = "gin" description = "It's gin. In space. I say, good sir." taste_description = "an alcoholic christmas tree" color = "#0064C6" - strength = 15 + proof = GIN glass_name = "Gin" glass_desc = "A crystal clear glass of Griffeater gin." +#define VICTORY_GIN 70 + /datum/reagent/ethanol/victory_gin name = "Victory Gin" id = "victory_gin" description = "An oily grain alcohol brewed on Adhomai. Notably weaker than regular gin." taste_description = "oily gin" color = "#0064C6" - strength = 20 + proof = VICTORY_GIN glass_name = "Victory Gin" glass_desc = "An oily grain alcohol brewed on Adhomai. Notably weaker than regular gin." @@ -2457,6 +2471,8 @@ return M.make_jittery(5) +#define KAHLUA 40 + /datum/reagent/ethanol/coffee/kahlua name = "Kahlua" id = "kahlua" @@ -2464,34 +2480,26 @@ taste_description = "spiked latte" taste_mult = 1.1 color = "#4C3100" - strength = 15 + proof = KAHLUA glass_name = "RR Coffee Liquor" glass_desc = "A widely known, Mexican coffee-flavored liqueur. In production since 1936!" // glass_desc = "DAMN, THIS THING LOOKS ROBUST" //If this isn't what our players should talk like, it isn't what our game should say to them. +#define MELON_LIQUOR 46 + /datum/reagent/ethanol/melonliquor name = "Melon Liquor" id = "melonliquor" description = "A relatively sweet and fruity 46 proof liquor." taste_description = "fruity alcohol" color = "#138808" // rgb: 19, 136, 8 - strength = 50 + proof = MELON_LIQUOR glass_name = "Melon Liquor" glass_desc = "A relatively sweet and fruity 46 proof liquor." -/datum/reagent/ethanol/melonspritzer - name = "Melon Spritzer" - id = "melonspritzer" - description = "Melons: Citrus style." - taste_description = "sour melon" - color = "#934D5D" - strength = 10 - - glass_name = "Melon Spritzer" - glass_desc = "Melons: Citrus style." - glass_special = list(DRINK_FIZZ) +#define RUM 120 /datum/reagent/ethanol/rum name = "Rum" @@ -2500,7 +2508,7 @@ taste_description = "spiked butterscotch" taste_mult = 1.1 color = "#ECB633" - strength = 15 + proof = RUM glass_name = "Rum" glass_desc = "Makes you want to buy a ship and just go pillaging." @@ -2512,40 +2520,31 @@ taste_description = "milky coconut" taste_mult = 1.1 color = "#e0e0e0" - strength = 20 + proof = 90 glass_name = "White Rum" glass_desc = "Makes you want to buy a ship and just go pillaging." +#define SAKE 40 + /datum/reagent/ethanol/sake name = "Sake" id = "sake" description = "Anime's favorite drink." taste_description = "dry alcohol" color = "#DDDDDD" - strength = 25 + proof = SAKE glass_name = "Sake" glass_desc = "A glass of sake." -/datum/reagent/ethanol/sexonthebeach - name = "Sex On The Beach" - id = "sexonthebeach" - description = "A concoction of vodka and a secret combination of orange juice and pomegranate." - taste_description = "sand, you don't like sand, it's coarse and rough and irritating and it gets everywhere" - color = "#FF0033" - strength = 90 // it is one SIXTH vodka - - glass_name = "Sex on the Beach" - glass_desc = "A concoction of vodka and a secret combination of orange juice and pomegranate." - /datum/reagent/ethanol/thirteenloko name = "Thirteen Loko" id = "thirteenloko" description = "A potent mixture of caffeine and alcohol." taste_description = "battery acid" color = "#102000" - strength = 25 + proof = 40 nutriment_factor = 1 glass_name = "Thirteen Loko" @@ -2560,6 +2559,8 @@ M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) M.make_jittery(5) +#define VERMOUTH 35 + /datum/reagent/ethanol/vermouth name = "Vermouth" id = "vermouth" @@ -2567,18 +2568,20 @@ taste_description = "dry alcohol" taste_mult = 1.3 color = "#91FF91" // rgb: 145, 255, 145 - strength = 15 + proof = VERMOUTH glass_name = "Vermouth" glass_desc = "You wonder why you're even drinking this straight." +#define VODKA 80 + /datum/reagent/ethanol/vodka name = "Vodka" id = "vodka" description = "Number one drink AND fueling choice for Russians worldwide." taste_description = "potato alcohol" color = "#0064C8" // rgb: 0, 100, 200 - strength = 15 + proof = VODKA glass_name = "Vodka" glass_desc = "The glass contain wodka. Xynta." @@ -2587,24 +2590,28 @@ . = ..() M.cure_radiation(RAD_MOB_CURE_STRENGTH_VODKA(removed)) +#define WHISKEY 80 + /datum/reagent/ethanol/whiskey name = "Whiskey" id = "whiskey" description = "A superb and well-aged single-malt whiskey. Damn." taste_description = "molasses" color = "#4C3100" - strength = 15 + proof = WHISKEY glass_name = "Whiskey" glass_desc = "The silky, smokey whiskey goodness inside the glass makes the drink look very classy." +#define WINE 20 + /datum/reagent/ethanol/wine name = "Red Wine" id = "wine" description = "A premium alchoholic beverage made from distilled grape juice. This one's red!" taste_description = "bitter sweetness" color = "#7E4043" // rgb: 126, 64, 67 - strength = 30 + proof = WINE glass_name = "Wine" glass_desc = "A very classy looking drink." @@ -2615,17 +2622,19 @@ description = "A premium alchoholic beverage made from distilled grape juice. This one's white!" taste_description = "bitter sweetness" color = "#FCF1D2" - strength = 30 + proof = WINE glass_name = "White Wine" glass_desc = "A very classy looking drink. Now in white!" +#define SCHNAPPS 60 + /datum/reagent/ethanol/peppermintschnapps name = "Peppermint Schnapps" id = "schnapps_pep" description = "A flavoured grain liqueur with a fresh, minty taste." taste_description = "minty" - strength = 90 + proof = SCHNAPPS glass_name = "Peppermint Schnapps" glass_desc = "A flavoured grain liqueur with a fresh, minty taste." @@ -2635,7 +2644,7 @@ id = "schnapps_pea" description = "A flavoured grain liqueur with a fresh, peachy taste." taste_description = "peachy" - strength = 90 + proof = SCHNAPPS glass_name = "Peach Schnapps" glass_desc = "A flavoured grain liqueur with a fresh, peachy taste." @@ -2645,7 +2654,7 @@ id = "schnapps_lem" description = "A flavoured grain liqueur with a fresh, lemony taste." taste_description = "lemony" - strength = 90 + proof = SCHNAPPS glass_name = "Lemonade Schnapps" glass_desc = "A flavoured grain liqueur with a fresh, lemony taste." @@ -2660,20 +2669,150 @@ glass_name = "Champagne" glass_desc = "An even classier looking drink." +#define CIDER 10 + /datum/reagent/ethanol/cider name = "Cider" id = "cider" description = "An alcoholic drink made from apple juice. Erratum on earlier recipe books: this is definitely hard." taste_description = "tartness" color = "#CE9C00" // rgb: 206, 156, 0 - strength = 40 + proof = CIDER glass_name = "Cider" glass_desc = "The second most Irish drink." glass_special = list(DRINK_FIZZ) +#define MEAD 10 + +/datum/reagent/ethanol/mead + name = "Mead" + id = "mead" + description = "A Viking's drink, though a cheap one." + taste_description = "sweet yet alcoholic" + reagent_state = REAGENT_LIQUID + color = "#FFBB00" + proof = MEAD + nutriment_factor = 2 + + glass_name = "Mead" + glass_desc = "A Viking's beverage, though a cheap one." + +#define MESSA_MEAD 100 + +/datum/reagent/ethanol/messa_mead + name = "Messa's Mead" + id = "messa_mead" + description = "A sweet tajaran liquor. Produced from the frementation of honey and earthen roots." + taste_description = "chilled honey" + reagent_state = REAGENT_LIQUID + color = "#FFBB00" + proof = MESSA_MEAD + nutriment_factor = 2 + + glass_name = "Messa's Mead" + glass_desc = "A sweet tajaran liquor. Produced from the fermentation of honey and earthen roots native to Adhomai." + +/datum/reagent/ethanol/moonshine + name = "Moonshine" + id = "moonshine" + description = "You've really hit rock bottom now... your liver packed its bags and left last night." + taste_description = "bitterness" + taste_mult = 2.5 + color = "#0064C8" + proof = 150 + + glass_name = "Moonshine" + glass_desc = "You've really hit rock bottom now... your liver packed its bags and left last night." + +#define TEQUILA 80 + +/datum/reagent/ethanol/tequila + name = "Tequila" + id = "tequila" + description = "A drink made for fighting." + taste_description = "paint thinner" + color = "#cccac5" + proof = TEQUILA + + glass_name = "Tequila" + glass_desc = "Is that guy making fun of you? You should show him what's what." + +#define BITTERS 40 + +/datum/reagent/ethanol/bitters + name = "Bitters" + id = "bitters" + description = "A blend of fermented fruits and herbs, commonly used in cocktails." + taste_description = "sharp bitterness" + color = "#9b6241" // rgb(155, 98, 65) + proof = BITTERS + + glass_name = "Bitters" + glass_desc = "A blend of fermented fruits and herbs, commonly used in cocktails." + +#define BRANDY 100 + +/datum/reagent/ethanol/winebrandy + name = "Wine Brandy" + id = "winebrandy" + description = "A premium spirit made from distilled wine." + taste_description = "very sweet dried fruit with many elegant notes" + color = "#4C130B" // rgb(76,19,11) + proof = BRANDY + + glass_name = "Wine Brandy" + glass_desc = "A very classy looking after-dinner drink." + +/datum/reagent/ethanol/alcsassafras + name = "Hard Rootbeer" + id = "alcsassafras" + description = "Doesn't matter if you're drunk when you have a horse to take you home!" + taste_description = "bitter vanilla with a sharp burn" + proof = 50 + + glass_name = "CC's Hard Rootbeer" + glass_desc = "You'd better carry two guns if you're gonna keep drinking these!" + glass_icon = DRINK_ICON_NOISY + glass_special = list(DRINK_FIZZ) + // Cocktails +#define SCREWDRIVERCOCKTAIL (VODKA/3) + +/datum/reagent/ethanol/screwdrivercocktail + name = "Screwdriver" + id = "screwdrivercocktail" + description = "Vodka, mixed with plain ol' orange juice. The result is surprisingly delicious." + taste_description = "oranges" + color = "#A68310" + proof = SCREWDRIVERCOCKTAIL + + glass_name = "Screwdriver" + glass_desc = "A simple, yet superb mixture of Vodka and orange juice. Just the thing for the tired engineer." + +/datum/reagent/ethanol/sexonthebeach + name = "Sex On The Beach" + id = "sexonthebeach" + description = "A concoction of vodka and a secret combination of orange juice and pomegranate." + taste_description = "sand, you don't like sand, it's coarse and rough and irritating and it gets everywhere" + color = "#FF0033" + proof = SCREWDRIVERCOCKTAIL/2 + + glass_name = "Sex on the Beach" + glass_desc = "A concoction of vodka and a secret combination of orange juice and pomegranate." + +/datum/reagent/ethanol/melonspritzer + name = "Melon Spritzer" + id = "melonspritzer" + description = "Melons: Citrus style." + taste_description = "sour melon" + color = "#934D5D" + proof = WINE/3 + + glass_name = "Melon Spritzer" + glass_desc = "Melons: Citrus style." + glass_special = list(DRINK_FIZZ) /datum/reagent/ethanol/acid_spit name = "Acid Spit" @@ -2682,18 +2821,31 @@ taste_description = "bitter tang" reagent_state = REAGENT_LIQUID color = "#365000" - strength = 30 + proof = WINE*5/6 glass_name = "Acid Spit" glass_desc = "A drink from the company archives. Made from live aliens." +#define MARTINI (2*VERMOUTH+GIN)/3 + +/datum/reagent/ethanol/martini + name = "Classic Martini" + id = "martini" + description = "Vermouth with Gin. Not quite how 007 enjoyed it, but still delicious." + taste_description = "dry class" + color = "#0064C8" + proof = MARTINI + + glass_name = "classic martini" + glass_desc = "Damn, the bartender even stirred it, not shook it." + /datum/reagent/ethanol/alliescocktail name = "Allies Cocktail" id = "alliescocktail" description = "A drink made from your allies, not as sweet as when made from your enemies." taste_description = "bitter sweetness" color = "#D8AC45" - strength = 20 // bit of vodka makes it stronger + proof = (MARTINI+VODKA)/2 glass_name = "Allies cocktail" glass_desc = "A drink made from your allies." @@ -2704,7 +2856,7 @@ description = "So very, very, very good." taste_description = "sweet and creamy" color = "#B7EA75" - strength = 45 // it is 1/3 whiskey, come on + proof = WHISKEY/3 glass_name = "Aloe" glass_desc = "Very, very, very good." @@ -2716,7 +2868,7 @@ taste_description = "dark and metallic" reagent_state = REAGENT_LIQUID color = "#FF975D" - strength = 25 + proof = (WINE+VODKA)/2 glass_name = "Amasec" glass_desc = "Always handy before combat!" @@ -2724,39 +2876,41 @@ /datum/reagent/ethanol/andalusia name = "Andalusia" id = "andalusia" - description = "A nice, strangely named drink." + description = "A nice, strangely named drink." // it's the southern tip of spain you cretin taste_description = "lemons" color = "#F4EA4A" - strength = 15 + proof = (RUM+WHISKEY)/3 glass_name = "Andalusia" glass_desc = "A nice, strange named drink." +#define ANTIFREEZE (VODKA/3) + /datum/reagent/ethanol/antifreeze name = "Anti-freeze" id = "antifreeze" description = "Ultimate refreshment." taste_description = "ice cold vodka" color = "#56DEEA" - strength = 45 // i'm sorry, it's 1/3 vodka, it should not be stronger than it somehow + proof = ANTIFREEZE adj_temp = 20 targ_temp = 330 glass_name = "Anti-freeze" glass_desc = "The ultimate refreshment." -/datum/reagent/ethanol/atomicbomb - name = "Atomic Bomb" - id = "atomicbomb" - description = "Nuclear proliferation never tasted so good." - taste_description = "coffee, almonds, and whiskey, with a kick" - reagent_state = REAGENT_LIQUID - color = "#666300" - strength = 10 // it's sweet sciency magic, i'll allow it - druggy = 50 +#define IRISH_CREAM (WHISKEY*2/3) - glass_name = "Atomic Bomb" - glass_desc = "We cannot take legal responsibility for your actions after imbibing." +/datum/reagent/ethanol/irish_cream + name = "Irish Cream" + id = "irishcream" + description = "Whiskey-imbued cream, what else would you expect from the Irish." + taste_description = "creamy alcohol" + color = "#DDD9A3" + proof = IRISH_CREAM + + glass_name = "Irish cream" + glass_desc = "It's cream, mixed with whiskey. What else would you expect from the Irish?" /datum/reagent/ethanol/coffee/b52 name = "B-52" @@ -2765,18 +2919,31 @@ taste_description = "coffee, almonds, and whiskey" taste_mult = 1.3 color = "#997650" - strength = 12 + proof = (IRISH_CREAM+KAHLUA+COGNAC)/3 glass_name = "B-52" glass_desc = "Kahlua, Irish cream, and cognac. You will get bombed." +/datum/reagent/ethanol/atomicbomb + name = "Atomic Bomb" + id = "atomicbomb" + description = "Nuclear proliferation never tasted so good." + taste_description = "coffee, almonds, and whiskey, with a kick" + reagent_state = REAGENT_LIQUID + color = "#666300" + proof = 200 // don't question it + druggy = 50 + + glass_name = "Atomic Bomb" + glass_desc = "We cannot take legal responsibility for your actions after imbibing." + /datum/reagent/ethanol/bahama_mama name = "Bahama mama" id = "bahama_mama" description = "Tropical cocktail." taste_description = "lime and orange" color = "#FF7F3B" - strength = 90 // 1/6th rum + proof = RUM/6 glass_name = "Bahama Mama" glass_desc = "Tropical cocktail." @@ -2798,7 +2965,7 @@ description = "Barefoot and pregnant." taste_description = "creamy berries" color = "#FFCDEA" - strength = 45 // 1/3 vermouth + proof = VERMOUTH/3 glass_name = "Barefoot" glass_desc = "Barefoot and pregnant." @@ -2811,7 +2978,7 @@ taste_mult = 2 reagent_state = REAGENT_LIQUID color = "#404040" - strength = 12 + proof = WHISKEY/2 glass_name = "Beepsky Smash" glass_desc = "Heavy, hot and strong. Just like the Iron fist of the LAW." @@ -2826,19 +2993,21 @@ description = "This appears to be beer mixed with milk. Odd." taste_description = "sour milk" color = "#895C4C" - strength = 100 // 50% beer - nutriment_factor = 2 + proof = BEER/2 + nutriment_factor = 5 glass_name = "Bilk" glass_desc = "A brew of milk and beer. For those alcoholics who fear osteoporosis." +#define BLACK_RUSSIAN ((2*VODKA+KAHLUA)/3) + /datum/reagent/ethanol/black_russian name = "Black Russian" id = "blackrussian" description = "For the lactose-intolerant. Still as classy as a White Russian." taste_description = "coffee" color = "#360000" - strength = 15 + proof = BLACK_RUSSIAN glass_name = "Black Russian" glass_desc = "For the lactose-intolerant. Still as classy as a White Russian." @@ -2849,7 +3018,7 @@ description = "A strange yet pleasurable mixture made of vodka, tomato and lime juice. Or at least you THINK the red stuff is tomato juice." taste_description = "tomatoes with a hint of lime" color = "#B40000" - strength = 90 // 1/6 vodka + proof = VODKA/6 glass_name = "Bloody Mary" glass_desc = "Tomato juice, mixed with Vodka and a lil' bit of lime. Tastes like liquid murder." @@ -2860,7 +3029,7 @@ description = "Ewww..." taste_description = "sweet 'n creamy" color = "#8CFF8C" - strength = 75 // 1/5 rum + proof = RUM/5 glass_name = "Booger" glass_desc = "Ewww..." @@ -2872,7 +3041,7 @@ taste_description = "coffee and paint thinner" taste_mult = 1.1 color = "#4C3100" - strength = 15 + proof = (2*TEQUILA+KAHLUA)/3 glass_name = "Brave Bull" glass_desc = "Tequila and coffee liquor, brought together in a mouthwatering mixture. Drink up." @@ -2883,29 +3052,18 @@ description = "You take a tiny sip and feel a burning sensation..." taste_description = "constantly changing flavors" color = "#2E6671" - strength = 90 // 1/9 vodka (this used to be 10! 10!! why so strong!) + proof = SCREWDRIVERCOCKTAIL/3 glass_name = "Changeling Sting" glass_desc = "A stingy drink." -/datum/reagent/ethanol/martini - name = "Classic Martini" - id = "martini" - description = "Vermouth with Gin. Not quite how 007 enjoyed it, but still delicious." - taste_description = "dry class" - color = "#0064C8" - strength = 25 - - glass_name = "classic martini" - glass_desc = "Damn, the bartender even stirred it, not shook it." - /datum/reagent/ethanol/cuba_libre name = "Cuba Libre" id = "cubalibre" description = "Rum, mixed with cola. Viva la revolucion." taste_description = "cola" color = "#3E1B00" - strength = 30 + proof = RUM/3 glass_name = "Cuba Libre" glass_desc = "A classic mix of rum and cola." @@ -2917,7 +3075,7 @@ taste_description = "a beach" nutriment_factor = 1 color = "#2E6671" - strength = 12 + proof = GIN*1.5 // it's 50% nothing, which strengthens it somehow. go with it glass_name = "Driest Martini" glass_desc = "Only for the experienced. You think you see sand floating in the glass." @@ -2928,7 +3086,7 @@ description = "Refreshingly lemony, deliciously dry." taste_description = "dry, tart lemons" color = "#FFFFAE" - strength = 45 // 1/3 gin + proof = GIN/3 glass_name = "Gin Fizz" glass_desc = "Refreshingly lemony, deliciously dry." @@ -2950,7 +3108,7 @@ taste_description = "a poor excuse for alcohol" reagent_state = REAGENT_LIQUID color = "#FFBB00" - strength = 30 + proof = RUM/2 glass_name = "Grog" @@ -2962,7 +3120,7 @@ description = "The surprise is, it's green!" taste_description = "tartness and bananas" color = "#2E6671" - strength = 50 // should be ~96, but probably not + proof = (2*BEER+WHISKEY)/3 glass_name = "Erika Surprise" glass_desc = "The surprise is, it's green!" @@ -2975,7 +3133,7 @@ taste_mult = 5 reagent_state = REAGENT_LIQUID color = "#7F00FF" - strength = 8 // 10 seems week for the joke + proof = (2*VODKA+GIN+WHISKEY+COGNAC)/3 // stronger than it should be on purpose druggy = 15 glass_name = "Pan-Galactic Gargle Blaster" @@ -2987,7 +3145,7 @@ description = "An all time classic, mild cocktail." taste_description = "mild and tart" color = "#0064C8" - strength = 50 + proof = GIN/3 glass_name = "Gin and Tonic" glass_desc = "A mild but still great cocktail. Drink up, like a true Englishman." @@ -2999,7 +3157,7 @@ taste_description = "burning cinnamon" taste_mult = 1.3 color = "#F4E46D" - strength = 15 + proof = VODKA glass_name = "Goldschlager" glass_desc = "100 proof that teen girls will drink anything with gold in it." @@ -3011,7 +3169,7 @@ taste_description = "giving peace a chance" reagent_state = REAGENT_LIQUID color = "#FF88FF" - strength = 15 + proof = 100 druggy = 50 glass_name = "Hippie's Delight" @@ -3023,7 +3181,7 @@ description = "Either someone's failure at cocktail making or attempt in alchohol production. In any case, do you really want to drink that?" taste_description = "pure alcohol" color = "#4C3100" - strength = 20 + proof = 100 toxicity = 2 glass_name = "Hooch" @@ -3035,7 +3193,7 @@ description = "A beer which is so cold the air around it freezes." taste_description = "refreshingly cold" color = "#FFD300" - strength = 50 + proof = BEER adj_temp = -20 targ_temp = 280 @@ -3049,7 +3207,7 @@ description = "Mmm, tastes like chocolate cake..." taste_description = "delicious anger" color = "#2E6671" - strength = 30 + proof = (BEER+IRISH_CREAM)/2 glass_name = "Irish Car Bomb" glass_desc = "An irish car bomb." @@ -3060,29 +3218,18 @@ description = "Coffee, and alcohol. More fun than a Mimosa to drink in the morning." taste_description = "giving up on the day" color = "#4C3100" - strength = 50 + proof = IRISH_CREAM/2 glass_name = "Irish coffee" glass_desc = "Coffee and alcohol. More fun than a Mimosa to drink in the morning." -/datum/reagent/ethanol/irish_cream - name = "Irish Cream" - id = "irishcream" - description = "Whiskey-imbued cream, what else would you expect from the Irish." - taste_description = "creamy alcohol" - color = "#DDD9A3" - strength = 25 - - glass_name = "Irish cream" - glass_desc = "It's cream, mixed with whiskey. What else would you expect from the Irish?" - /datum/reagent/ethanol/longislandicedtea name = "Long Island Iced Tea" id = "longislandicedtea" description = "The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only." taste_description = "sweet tea, with a kick" color = "#895B1F" - strength = 20 + proof = (VODKA+GIN+TEQUILA+RUM)/4 glass_name = "Long Island iced tea" glass_desc = "The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only." @@ -3093,7 +3240,7 @@ description = "The Detective's undercover drink of choice. He never could stomach gin..." taste_description = "mild dryness" color = "#C13600" - strength = 15 + proof = (2*WHISKEY+VERMOUTH)/3 glass_name = "Manhattan" glass_desc = "The Detective's undercover drink of choice. He never could stomach gin..." @@ -3104,7 +3251,7 @@ description = "A scientist's drink of choice, for pondering ways to blow up the station." taste_description = "death, the destroyer of worlds" color = "#C15D00" - strength = 10 + proof = 200 // don't question it druggy = 30 glass_name = "Manhattan Project" @@ -3116,7 +3263,7 @@ description = "Beer and Ale, brought together in a delicious mix. Intended for true men only." taste_description = "hair on your chest and your chin" color = "#4C3100" - strength = 25 + proof = BEER glass_name = "The Manly Dorf" glass_desc = "A manly concotion made from Ale and Beer. Intended for true men only." @@ -3127,49 +3274,11 @@ description = "On the rocks with salt on the rim. Arriba~!" taste_description = "dry and salty" color = "#8CFF8C" - strength = 15 + proof = TEQUILA/3 glass_name = "Margarita" glass_desc = "On the rocks with salt on the rim. Arriba~!" -/datum/reagent/ethanol/mead - name = "Mead" - id = "mead" - description = "A Viking's drink, though a cheap one." - taste_description = "sweet yet alcoholic" - reagent_state = REAGENT_LIQUID - color = "#FFBB00" - strength = 50 - nutriment_factor = 1 - - glass_name = "Mead" - glass_desc = "A Viking's beverage, though a cheap one." - -/datum/reagent/ethanol/messa_mead - name = "Messa's Mead" - id = "messa_mead" - description = "A sweet tajaran liquor. Produced from the frementation of honey and earthen roots." - taste_description = "chilled honey" - reagent_state = REAGENT_LIQUID - color = "#FFBB00" - strength = 30 - nutriment_factor = 1 - - glass_name = "Messa's Mead" - glass_desc = "A sweet tajaran liquor. Produced from the fermentation of honey and earthen roots native to Adhomai." - -/datum/reagent/ethanol/moonshine - name = "Moonshine" - id = "moonshine" - description = "You've really hit rock bottom now... your liver packed its bags and left last night." - taste_description = "bitterness" - taste_mult = 2.5 - color = "#0064C8" - strength = 12 - - glass_name = "Moonshine" - glass_desc = "You've really hit rock bottom now... your liver packed its bags and left last night." - /datum/reagent/ethanol/neurotoxin name = "Neurotoxin" id = "neurotoxin" @@ -3177,7 +3286,7 @@ taste_description = "a numbing sensation" reagent_state = REAGENT_LIQUID color = "#2E2E61" - strength = 10 + proof = 200 glass_name = "Neurotoxin" glass_desc = "A drink that is guaranteed to knock you silly." @@ -3194,7 +3303,7 @@ description = "Tequila with silver in it, a favorite of alcoholic women in the club scene." taste_description = "metallic paint thinner" color = "#585840" - strength = 30 + proof = TEQUILA glass_name = "Patron" glass_desc = "Drinking patron in the bar, with all the subpar ladies." @@ -3204,7 +3313,7 @@ id = "pwine" description = "Is this even wine? Toxic! Hallucinogenic! Probably consumed in boatloads by your superiors!" color = "#000000" - strength = 10 + proof = WINE druggy = 50 halluci = 10 @@ -3230,7 +3339,7 @@ description = "The true Viking's drink! Even though it has a strange red color." taste_description = "sweet and salty alcohol" color = "#C73C00" - strength = 50 + proof = MEAD/2 blood_content = 0.5 glass_name = "Red Mead" @@ -3242,24 +3351,13 @@ description = "A spicy Vodka! Might be a bit hot for the little guys!" taste_description = "hot and spice" color = "#FFA371" - strength = 15 + proof = VODKA adj_temp = 50 targ_temp = 360 glass_name = "Sbiten" glass_desc = "A spicy mix of Vodka and Spice. Very hot." -/datum/reagent/ethanol/screwdrivercocktail - name = "Screwdriver" - id = "screwdrivercocktail" - description = "Vodka, mixed with plain ol' orange juice. The result is surprisingly delicious." - taste_description = "oranges" - color = "#A68310" - strength = 45 // 1/3 vodka - - glass_name = "Screwdriver" - glass_desc = "A simple, yet superb mixture of Vodka and orange juice. Just the thing for the tired engineer." - /datum/reagent/drink/silencer name = "Silencer" id = "silencer" @@ -3278,7 +3376,7 @@ description = "A blue-space beverage!" taste_description = "concentrated matter" color = "#2E6671" - strength = 10 + proof = 200 // one of those things you just shouldn't question glass_name = "Singulo" glass_desc = "A blue-space beverage." @@ -3289,7 +3387,7 @@ description = "A cold refreshment" taste_description = "refreshing cold" color = "#FFFFFF" - strength = 100 //50% beer + proof = BEER/2 glass_name = "Snow White" glass_desc = "A cold refreshment." @@ -3300,40 +3398,40 @@ description = "Comprised of: White soda, blue curacao, melon liquor." taste_description = "fruit" color = "#00A86B" - strength = 100 + proof = (MELON_LIQUOR+CURACAO)/3 glass_name = "Sui Dream" glass_desc = "A froofy, fruity, and sweet mixed drink. Understanding the name only brings shame." +/datum/reagent/ethanol/whiskey_cola + name = "Whiskey Cola" + id = "whiskeycola" + description = "Whiskey, mixed with cola. Surprisingly refreshing." + taste_description = "cola with an alcoholic undertone" + color = "#3E1B00" + proof = WHISKEY/3 + + glass_name = "Whiskey Cola" + glass_desc = "An innocent-looking mixture of cola and Whiskey. Delicious." + /datum/reagent/ethanol/syndicatebomb name = "Syndicate Bomb" id = "syndicatebomb" description = "Tastes like terrorism!" - taste_description = "strong alcohol" + taste_description = "terrorism" color = "#2E6671" - strength = 30 + proof = ((WHISKEY/3)+BEER)/2 glass_name = "Syndicate Bomb" glass_desc = "Tastes like terrorism!" -/datum/reagent/ethanol/tequila - name = "Tequila" - id = "tequila" - description = "A drink made for fighting." - taste_description = "paint thinner" - color = "#cccac5" - strength = 25 - - glass_name = "Tequila" - glass_desc = "Is that guy making fun of you? You should show him what's what." - /datum/reagent/ethanol/tequila_sunrise name = "Tequila Sunrise" id = "tequilasunrise" description = "Tequila and orange juice. Much like a Screwdriver, only Mexican~." taste_description = "oranges" color = "#FFE48C" - strength = 25 + proof = TEQUILA/3 glass_name = "Tequila Sunrise" glass_desc = "Oh great, now you feel nostalgic about sunrises back on Earth..." @@ -3344,7 +3442,7 @@ description = "Made for a woman, strong enough for a man." taste_description = "dry" color = "#666340" - strength = 10 + proof = 200 druggy = 50 glass_name = "Three Mile Island iced tea" @@ -3357,7 +3455,7 @@ taste_description = "spicy toxins" reagent_state = REAGENT_LIQUID color = "#7F00FF" - strength = 10 + proof = 200 adj_temp = 15 targ_temp = 330 @@ -3370,7 +3468,7 @@ description = "Vodka with Gin. Not quite how 007 enjoyed it, but still delicious." taste_description = "shaken, not stirred" color = "#0064C8" - strength = 15 + proof = (2*VODKA+VERMOUTH)/3 glass_name = "Vodka Martini" glass_desc ="A bastardization of the classic martini. Still great." @@ -3382,7 +3480,7 @@ description = "For when a gin and tonic isn't russian enough." taste_description = "tart bitterness" color = "#0064C8" // rgb: 0, 100, 200 - strength = 30 + proof = VODKA/3 glass_name = "Vodka and Tonic" glass_desc = "For when a gin and tonic isn't Russian enough." @@ -3394,42 +3492,32 @@ description = "That's just, like, your opinion, man..." taste_description = "coffee icecream" color = "#A68340" - strength = 20 + proof = BLACK_RUSSIAN*2/3 glass_name = "White Russian" glass_desc = "A very nice looking drink. But that's just, like, your opinion, man." -/datum/reagent/ethanol/whiskey_cola - name = "Whiskey Cola" - id = "whiskeycola" - description = "Whiskey, mixed with cola. Surprisingly refreshing." - taste_description = "cola with an alcoholic undertone" - color = "#3E1B00" - strength = 45 - - glass_name = "Whiskey Cola" - glass_desc = "An innocent-looking mixture of cola and Whiskey. Delicious." - - /datum/reagent/ethanol/whiskeysoda name = "Whiskey Soda" id = "whiskeysoda" description = "Ultimate refreshment." taste_description = "carbonated whiskey" color = "#EAB300" - strength = 45 + proof = WHISKEY/3 glass_name = "Whiskey Soda" glass_desc = "Ultimate refreshment." +#define WHISKEY_SPECIAL_BLEND 160 + /datum/reagent/ethanol/specialwhiskey // I have no idea what this is and where it comes from name = "Special Blend Whiskey" id = "specialwhiskey" description = "Just when you thought regular station whiskey was good... This silky, amber goodness has to come along and ruin everything. The smell of it singes your nostrils." taste_description = "unspeakable whiskey bliss" color = "#523600" - strength = 10 + proof = WHISKEY_SPECIAL_BLEND glass_name = "special blend whiskey" glass_desc = "Just when you thought regular station whiskey was good... This silky, amber goodness has to come along and ruin everything." @@ -3440,7 +3528,7 @@ description = "This barely qualifies as a drink, and could give jet fuel a run for its money. Also known to cause feelings of euphoria and numbness." taste_description = "spiced numbness" color = "#242424" - strength = 5 + proof = 300 // unathi have unlocked secrets unknown to others glass_name = "Redeemer's Brew" glass_desc = "This barely qualifies as a drink, and may cause euphoria and numbness. Imbiber beware!" @@ -3479,7 +3567,7 @@ description = "Alcohol in more alcohol." taste_description = "thick, dry alcohol" color = "#FFFF7F" - strength = 12 + proof = (2*BEER+SAKE)/3 nutriment_factor = 1 glass_name = "Sake Bomb" @@ -3491,7 +3579,7 @@ description = "Sake, egg, and sugar. A disgusting folk cure." taste_description = "eggy booze" color = "#E8C477" - strength = 30 + proof = SAKE*10/5 nutriment_factor = 3 glass_name = "Tamagozake" @@ -3503,7 +3591,7 @@ description = "An alcoholic drink made with vodka, sake, and juices." taste_description = "spicy tomato sake" color = "#FF3232" - strength = 25 + proof = (SAKE+VODKA)/3 glass_name = "Ginza Mary" glass_desc = "Tomato juice, vodka, and sake make something not quite completely unlike a Bloody Mary." @@ -3514,7 +3602,7 @@ description = "A pale pink cocktail made with sake and berry juice." taste_description = "fruity booze" color = "#FA8072" - strength = 35 + proof = SAKE/2 glass_name = "Tokyo Rose" glass_desc = "It's kinda pretty!" @@ -3525,7 +3613,7 @@ description = "For when you're too weeb for a real martini." taste_description = "dry alcohol" color = "#0064C8" - strength = 30 + proof = (SAKE+GIN)/2 glass_name = "Saketini" glass_desc = "What are you doing drinking this outside of New Kyoto?" @@ -3536,7 +3624,7 @@ description = "A loathsome cocktail favored by Heaven's skeleton shift workers." taste_description = "sour coffee" color = "#8f7729" - strength = 20 + proof = KAHLUA/2 glass_name = "Elysium Facepunch" glass_desc = "A loathsome cocktail favored by Heaven's skeleton shift workers." @@ -3547,7 +3635,7 @@ description = "A deeply alcoholic mix, popular in Nyx." taste_description = "hard alcohol" color = "#947459" - strength = 10 + proof = (WHISKEY+VODKA+TEQUILA)/3 glass_name = "Erebus Moonrise" glass_desc = "A deeply alcoholic mix, popular in Nyx." @@ -3558,7 +3646,7 @@ description = "A strange drink invented in the aerostats of Venus." taste_description = "strange alcohol" color = "#FAEBD7" - strength = 66 + proof = CURACAO/2 glass_name = "Balloon" glass_desc = "A strange drink invented in the aerostats of Venus." @@ -3569,7 +3657,7 @@ description = "On Natuna, they do the best with what they have." taste_description = "watered-down beer" color = "#FFFFCC" - strength = 80 + proof = BEER/3 glass_name = "Natuna Brandy" glass_desc = "On Natuna, they do the best with what they have." @@ -3581,7 +3669,7 @@ description = "Invented by a Eutopian marketing team, this is one of the most expensive cocktails in existence." taste_description = "impossibly rich alcohol" color = "#614126" - strength = 15 + proof = (2*COGNAC+WHISKEY_SPECIAL_BLEND)/3 glass_name = "Euphoria" glass_desc = "Invented by a Eutopian marketing team, this is one of the most expensive cocktails in existence." @@ -3592,7 +3680,7 @@ description = "Common in the entertainment districts of Titan." taste_description = "sweet alcohol" color = "#614126" - strength = 100 + proof = BEER/2 glass_name = "Xanadu Cannon" glass_desc = "Common in the entertainment districts of Titan." @@ -3603,7 +3691,7 @@ description = "From Shelf. Not for human consumption." taste_description = "oily bitterness" color = "#d3d3d3" - strength = 32 + proof = 60 // it's magic glass_name = "Debugger" glass_desc = "From Shelf. Not for human consumption." @@ -3614,7 +3702,7 @@ description = "Ethanol and orange soda. A common emergency drink on frontier colonies." taste_description = "bitter oranges" color = "#ffc04c" - strength = 43 + proof = 40 // literally 4 parts something else to 1 part ethanol glass_name = "Spacer's Brew" glass_desc = "Ethanol and orange soda. A common emergency drink on frontier colonies." @@ -3625,7 +3713,7 @@ description = "A dry cocktail popular on Binma." taste_description = "very dry alcohol" color = "#c3c3c3" - strength = 24 + proof = (SAKE+TEQUILA)/2 glass_name = "Binman Bliss" glass_desc = "A dry cocktail popular on Binma." @@ -3636,29 +3724,18 @@ description = "An exotic cocktail from New Kyoto." taste_description = "fruity liquor" color = "#9999FF" - strength = 35 + proof = (SAKE+MELON_LIQUOR)/2 glass_name = "Chrysanthemum" glass_desc = "An exotic cocktail from New Kyoto." -/datum/reagent/ethanol/bitters - name = "Bitters" - id = "bitters" - description = "A blend of fermented fruits and herbs, commonly used in cocktails." - taste_description = "sharp bitterness" - color = "#9b6241" // rgb(155, 98, 65) - strength = 100 - - glass_name = "Bitters" - glass_desc = "A blend of fermented fruits and herbs, commonly used in cocktails." - /datum/reagent/ethanol/soemmerfire name = "Soemmer Fire" id = "soemmerfire" description = "A painfully hot mixed drink, for when you absolutely need to hurt right now." taste_description = "pure fire" color = "#d13b21" // rgb(209, 59, 33) - strength = 25 + proof = (2*WHISKEY+VERMOUTH)/3*2/3 glass_name = "Soemmer Fire" glass_desc = "A painfully hot mixed drink, for when you absolutely need to hurt right now." @@ -3669,24 +3746,13 @@ return M.bodytemperature += 10 * TEMPERATURE_DAMAGE_COEFFICIENT -/datum/reagent/ethanol/winebrandy - name = "Wine Brandy" - id = "winebrandy" - description = "A premium spirit made from distilled wine." - taste_description = "very sweet dried fruit with many elegant notes" - color = "#4C130B" // rgb(76,19,11) - strength = 20 - - glass_name = "Wine Brandy" - glass_desc = "A very classy looking after-dinner drink." - /datum/reagent/ethanol/morningafter name = "Morning After" id = "morningafter" description = "The finest hair of the dog, coming up!" taste_description = "bitter regrets" color = "#482000" // rgb(72, 32, 0) - strength = 60 + proof = VODKA/6 glass_name = "Morning After" glass_desc = "The finest hair of the dog, coming up!" @@ -3697,7 +3763,7 @@ description = "A dry martini, ice cold and well shaken." taste_description = "lemony class" color = "#cca01c" // rgb(204, 160, 28) - strength = 20 + proof = (GIN*3+VODKA+WINE)/5 glass_name = "Vesper" glass_desc = "A dry martini, ice cold and well shaken." @@ -3708,7 +3774,7 @@ description = "A heinous combination of clashing flavors." taste_description = "plague and coldsweats" color = "#3a6617" // rgb(58, 102, 23) - strength = 10 + proof = (VODKA*3+RUM+WHISKEY)/8 glass_name = "Rotgut Fever Dream" glass_desc = "Why are you doing this to yourself?" @@ -3719,7 +3785,7 @@ description = "A dangerous combination of all things flammable. Why would you drink this?" taste_description = "corrosive death" color = "#7c003a" // rgb(124, 0, 58) - strength = 10 + proof = 150 glass_name = "Vox's Delight" glass_desc = "Not recommended if you enjoy having organs." @@ -3740,7 +3806,7 @@ description = "A boozy, citrus-packed brew." taste_description = "the bartender's frustration" color = "#c6c603" // rgb(198, 198, 3) - strength = 9 + proof = (MARTINI*2+VODKA/3+RUM)/6 glass_name = "Screaming Viking" glass_desc = "A boozy, citrus-packed brew." @@ -3751,7 +3817,7 @@ description = "A bootleg brew of all the worst things on station." taste_description = "cough syrup and fire" color = "#6b0145" // rgb(107, 1, 69) - strength = 10 + proof = 150 glass_name = "Robustin" glass_desc = "A bootleg brew of all the worst things on station." @@ -3762,7 +3828,7 @@ description = "A perfect martini, watered down and ruined." taste_description = "emasculation and failure" color = "#2E6671" // rgb(46, 102, 113) - strength = 60 + proof = GIN*0.75 glass_name = "Virgin Sip" glass_desc = "A perfect martini, watered down and ruined." @@ -3773,7 +3839,7 @@ description = "A thick and vibrant alcoholic gel, perfect for the night life." taste_description = "thick, alcoholic cherry gel" color = "#e00b0b" // rgb(224, 11, 11) - strength = 10 + proof = VODKA/5 glass_name = "Jelly Shot" glass_desc = "A thick and vibrant alcoholic gel, perfect for the night life." @@ -3784,7 +3850,7 @@ description = "A thick and toxic slime jelly shot." taste_description = "liquified organs" color = "#6fa300" // rgb(111, 163, 0) - strength = 10 + proof = VODKA*2 glass_name = "Named Bullet" glass_desc = "A thick slime jelly shot. You can feel your death approaching." @@ -3801,7 +3867,7 @@ description = "A light and refreshing rasberry cocktail." taste_description = "sweet raspberry" color = "#dd00a6" // rgb(221, 0, 166) - strength = 30 + proof = GIN/5 glass_name = "Clover Club" glass_desc = "A light and refreshing rasberry cocktail." @@ -3812,7 +3878,7 @@ description = "A dark, complicated mix of gin and campari... classy." taste_description = "summer nights and wood smoke" color = "#77000d" // rgb(119, 0, 13) - strength = 25 + proof = (GIN+BITTERS+VERMOUTH)/3 glass_name = "Negroni" glass_desc = "A dark, complicated blend, perfect for relaxing nights by the fire." @@ -3823,7 +3889,7 @@ description = "A smokey, refreshing lemoned whiskey." taste_description = "smoke and citrus" color = "#a0692e" // rgb(160, 105, 46) - strength = 20 + proof = WHISKEY/2 glass_name = "Whiskey Sour" glass_desc = "A smokey, refreshing lemoned whiskey." @@ -3834,7 +3900,7 @@ description = "A classic mix of whiskey and sugar... simple and direct." taste_description = "smokey, divine whiskey" color = "#774410" // rgb(119, 68, 16) - strength = 40 + proof = (WHISKEY+BITTERS)/3 glass_name = "Old Fashioned" glass_desc = "A classic mix of whiskey and sugar... simple and direct." @@ -3845,7 +3911,7 @@ description = "Refeshing rum and citrus. Time for a tropical get away." taste_description = "refreshing citrus and rum" color = "#d1ff49" // rgb(209, 255, 73 - strength = 40 + proof = RUM*3/5 glass_name = "Daiquiri" glass_desc = "Refeshing rum and citrus. Time for a tropical get away." @@ -3856,7 +3922,7 @@ description = "Minty rum and citrus, made for sailing." taste_description = "minty rum and lime" color = "#d1ff49" // rgb(209, 255, 73 - strength = 75 // 1/5 rum + proof = RUM/5 glass_name = "Mojito" glass_desc = "Minty rum and citrus, made for sailing." @@ -3868,7 +3934,7 @@ description = "Tequila and citrus, iced just right..." taste_description = "grapefruit and cold fire" color = "#ffb070" // rgb(255, 176, 112) - strength = 75 // 1/3 tequila + proof = TEQUILA/3 glass_name = "Paloma" glass_desc = "Tequila and citrus, iced just right..." @@ -3880,7 +3946,7 @@ description = "Wine Brandy, Lemon, and a dream. A South American classic" taste_description = "light sweetness" color = "#f9f96b" // rgb(249, 249, 107) - strength = 60 // 1/3 brandy + proof = BRANDY/3 glass_name = "Pisco Sour" glass_desc = "South American bliss, served ice cold." @@ -3891,7 +3957,7 @@ description = "Minty, rich, and painfully cold. It's a blizzard in a cup." taste_description = "biting cold" color = "#ffe8c4" // rgb(255, 232, 196) - strength = 45 // 1/3 whiskey + proof = WHISKEY/3 adj_temp = -20 targ_temp = 220 //Dangerous to certain races. Drink in moderation. @@ -3904,7 +3970,7 @@ description = "Minty and refreshing, perfect for a hot day." taste_description = "refreshing mint" color = "#bbfc8a" // rgb(187, 252, 138) - strength = 45 + proof = WHISKEY/3 adj_temp = -5 glass_name = "Mint Julep" @@ -3916,7 +3982,7 @@ description = "Anime's favorite drink." taste_description = "the power of god and anime" color = "#DDDDDD" - strength = 25 + proof = SAKE glass_name = "God's Sake" glass_desc = "A glass of sake." @@ -3927,7 +3993,7 @@ description = "Number one drink AND fueling choice for Russians multiverse-wide." taste_description = "russian steel and a hint of grain" color = "#0064C8" - strength = 10 + proof = 200 glass_name = "Godka" glass_desc = "The glass is barely able to contain the wodka. Xynta." @@ -3949,13 +4015,15 @@ var/adjust_tox = rand(-4, 2) M.adjustToxLoss(adjust_tox * removed) +#define HOLYWINE 100 + /datum/reagent/ethanol/holywine name = "Angel Ichor" id = "holywine" description = "A premium alchoholic beverage made from distilled angel blood." taste_description = "wings in a glass, and a hint of grape" color = "#C4921E" - strength = 20 + proof = HOLYWINE glass_name = "Angel Ichor" glass_desc = "A very pious looking drink." @@ -3967,7 +4035,7 @@ description = "A strange yet pleasurable mixture made of vodka, angel's ichor and lime juice. Or at least you THINK the yellow stuff is angel's ichor." taste_description = "grapes with a hint of lime" color = "#DCAE12" - strength = 20 + proof = (2*VODKA+3*HOLYWINE)/6 glass_name = "Holy Mary" glass_desc = "Angel's Ichor, mixed with Vodka and a lil' bit of lime. Tastes like liquid ascension." @@ -3979,7 +4047,7 @@ taste_description = "sweet victory and sour iron" taste_mult = 1.5 color = "#F3C906" - strength = 30 + proof = (RUM+HOLYWINE)/6 glass_name = "Angels' Wrath" glass_desc = "Just looking at this thing makes you sweat." @@ -3992,7 +4060,7 @@ description = "Miracle time!" taste_description = "sweet forgiveness and bitter iron" color = "#AD772B" - strength = 25 + proof = (HOLYWINE+KAHLUA+RUM)/3 glass_name = "Angel's Kiss" glass_desc = "Miracle time!" @@ -4003,7 +4071,7 @@ description = "A trip to Valhalla." taste_description = "valhalla" color = "#955B37" - strength = 30 + proof = (HOLYWINE+MEAD)/2 glass_name = "Ichor Mead" glass_desc = "A trip to Valhalla." @@ -4023,7 +4091,7 @@ description = "A refreshing drink for the aspiring botanist." taste_description = "happy plants" color = "#F07800" - strength = 85 + proof = RUM/5 glass_name = "Planters Punch" glass_desc = "A refreshing drink for the aspiring botanist." @@ -4033,7 +4101,7 @@ id = "olympusmons" description = "For those that need the extra kick." taste_description = "stronge coffee infused booze" - strength = 25 + proof = (BLACK_RUSSIAN+WHISKEY+RUM)/3 glass_name = "Olympus Mons" glass_desc = "For those that need the extra kick." @@ -4043,7 +4111,7 @@ id = "sazerac" description = "When a regular whiskey cocktail isn't enough." taste_description = "a strong bite of flavor" - strength = 20 + proof = (2*COGNAC+ABSINTHE+BITTERS)/3 glass_name = "Sazerac" glass_desc = "When a regular whiskey cocktail isn't enough." @@ -4053,7 +4121,7 @@ id = "junglejuice" description = "An overload of sweetness and sugary goodness." taste_description = "fruits and bad decisions" - strength = 40 + proof = (VODKA+RUM)/5 glass_name = "Jungle Juice" glass_desc = "An overload of sweetness and sugary goodness." @@ -4063,7 +4131,7 @@ id = "gimlet" description = "For those who want to look fancy with their gin." taste_description = "lime infused tree" - strength = 45 // 1/3 gin + proof = GIN/3 glass_name = "Gimlet" glass_desc = "For those who want to look fancy with their gin." @@ -4073,30 +4141,18 @@ id = "firepunch" description = "A spicy take on a summer classic." taste_description = "rum and sugar" - strength = 45 + proof = RUM/3 targ_temp = 300 glass_name = "Fire Punch" glass_desc = "A spicy take on a summer classic." -/datum/reagent/ethanol/alcsassafras - name = "Hard Rootbeer" - id = "alcsassafras" - description = "Doesn't matter if you're drunk when you have a horse to take you home!" - taste_description = "bitter vanilla with a sharp burn" - strength = 20 - - glass_name = "CC's Hard Rootbeer" - glass_desc = "You'd better carry two guns if you're gonna keep drinking these!" - glass_icon = DRINK_ICON_NOISY - glass_special = list(DRINK_FIZZ) - /datum/reagent/ethanol/newsheriff name = "New Sheriff" id = "newsheriff" description = "A drink to make your saddles blaze!" taste_description = "an earthy kick with a lingering burn" - strength = 35 + proof = (WHISKEY+COGNAC)/3 glass_name = "New Sheriff" glass_desc = "A drink to make your saddles blaze!" @@ -4106,7 +4162,7 @@ id = "thehuckleberry" description = "If I thought you weren't my best customer, I just don't think I could bear it." taste_description = "sweet fruits masking barrel-aged wit" - strength = 20 + proof = WHISKEY/3 adj_temp = -10 glass_name = "The Huckleberry" @@ -4117,7 +4173,7 @@ id = "quickdraw" description = "Nobody was faster than Beauregard. Nobody could outdraw him. Nobody could aim as true as old Jack. If he died, Nobody saw him." taste_description = "aged herbs and gunsmoke" - strength = 35 + proof = (RUM+BITTERS)/3 glass_name = "Quickdraw" glass_desc = "Nobody was faster than Beauregard. Nobody could outdraw him. Nobody could aim as true as old Jack. If he died, Nobody saw him." @@ -4127,7 +4183,7 @@ id = "dmhand" description = "If you find yourself drinking this during a game of poker, keep your back to the wall." taste_description = "a pair of classics and a licorice surprise" - strength = 35 + proof = (WHISKEY+RUM)/3 glass_name = "Dead Man's Hand" glass_desc = "If you find yourself drinking this during a game of poker, keep your back to the wall." @@ -4137,7 +4193,7 @@ id = "snakeoil" description = "A 'healthy' potion with a bite! Now with 56% less Arsenic." taste_description = "sour alcohol and something metallic" - strength = 75 + proof = ABSINTHE/3 druggy = 15 toxicity = 2 adj_temp = 5 @@ -4150,7 +4206,7 @@ id = "highnoon" description = "There's two kinds of people here on the Frontier, partner. Those with guns, and those who drink. You drink." taste_description = "aged whiskey and earthy metals" - strength = 30 + proof = WHISKEY/5 adj_temp = 2 glass_name = "High Noon" @@ -4161,7 +4217,7 @@ id = "bloodmeridian" description = "The perfect drink for when you want to dance and fiddle all night. Does it work? You be The Judge." taste_description = "lingering regret, gunpowder, and blood" - strength = 50 + proof = 40 blood_content = 0.4 glass_name = "Blood Meridian" @@ -4172,7 +4228,7 @@ id = "theoutlaw" description = "If you're planning to cheat or rob 'em, you gotta be quick. Either on the draw, or on your horse." taste_description = "a violent life on the run" - strength = 50 + proof = (VODKA+BITTERS)/3 glass_name = "The Outlaw" glass_desc = "If you're planning to cheat or rob 'em, you gotta be quick. Either on the draw, or on your horse." @@ -4182,7 +4238,7 @@ id = "thelawman" description = "They ran out five men before I took up the badge. Since then I've hung twenty." taste_description = "robust coffee and an open campfire" - strength = 65 + proof = WHISKEY/5 adj_temp = 25 glass_name = "The Lawman" @@ -4193,7 +4249,7 @@ id = "hangmansnoose" description = "To some looking at their final days in a cell, this drink is a better mercy than the gallows. Doesn't make it go down any easier." taste_description = "a dusty rope and blood in the nostrils" - strength = 60 + proof = 100 toxicity = 10 glass_name = "Hangman's Noose" @@ -4204,7 +4260,7 @@ id = "bigiron" description = "Have this one, partner. Then have nineteen more." taste_description = "a mysterious visit and the red Texas sky" - strength = 30 // 2/3 rum, rounded up to 30 (was 45) + proof = RUM*2/3 glass_name = "Big Iron" glass_desc = "Have this one, partner. Then have nineteen more." @@ -4214,7 +4270,7 @@ id = "lastcactus" description = "If you can get past its spines, it's filled with cool, clear water." taste_description = "refreshing sweetness and a cold burn" - strength = 30 + proof = VODKA/5 adj_temp = -10 glass_name = "Last Cactus" @@ -4225,7 +4281,7 @@ id = "thebestboy" description = "An eternal tribute to the best crewmember to ever work on Space Station 13. Keep away from washing machines." taste_description = "cool cream, refreshing orange, and strong alcohol" - strength = 50 + proof = SCREWDRIVERCOCKTAIL*3/5 adj_temp = -5 glass_name = "The Best Boy" @@ -4236,7 +4292,7 @@ id = "phobos" description = "A drink invented by Tyrmalin Moonshiners to cope with the harsh Martian climate." taste_description = "grain alcohol" - strength = 15 + proof = 150 glass_name = "Phobos" glass_desc = "A drink invented by Tyrmalin Moonshiners to cope with the harsh Martian climate." @@ -4246,7 +4302,7 @@ id = "greenstuff" description = "Tyrmalin grog aggressively blended with unfiltered absinthe." taste_description = "black licorice and thick malt" - strength = 5 + proof = 300 // again: how do they do it? glass_name = "Green Stuff" glass_desc = "Tyrmalin grog aggressively blended with unfiltered absinthe." @@ -4257,7 +4313,7 @@ description = "This warm, thick drink has a subtle, tangy sweetness to it. Although visually reminiscent of lava, it's actually very hydrating!" taste_description = "faint, tangy sweetness" color = "#CCCC99" - strength = 50 + proof = (WHISKEY+CIDER)/5 adj_temp = -5 glass_name = "Goliath Spit" @@ -4269,7 +4325,7 @@ description = "Not just another Bloody Mary. Mary on a cross." taste_description = "copper, tomatoes, and heretical sweetness" color = "#B40000" - strength = 30 + proof = (VODKA/3+VODKA)/5 blood_content = 0.2 glass_name = "Mary On a Cross" @@ -4281,18 +4337,31 @@ description = "A drink usually enjoyed by only the highest castes of Apinae society. Incredibly sweet, it is said to have enormous health benefits." taste_description = "honey and royalty" color = "#f0d76b" - strength = 50 + proof = (2*BRANDY)/5 glass_name = "Royal Jelly" glass_desc = "A drink usually enjoyed by only the highest castes of Apinae society. Incredibly sweet, it is said to have enormous health benefits." +//This functions the same as Doctor's Delight, except it gets you drunk too. +/datum/reagent/ethanol/royaljelly/affect_ingest(mob/living/carbon/M, alien, removed) + . = ..() + if(alien == IS_DIONA) + return + M.adjustOxyLoss(-4 * removed) + M.heal_organ_damage(2 * removed, 2 * removed) + M.adjustToxLoss(-2 * removed) + if(M.dizziness) + M.dizziness = max(0, M.dizziness - 15) + if(M.confused) + M.Confuse(-5) + /datum/reagent/ethanol/coquito name = "Coquito" id = "coquito" description = "A holiday beverage akin to eggnog, made with coconut milk." taste_description = "creamy spiced coconut" color = "#ffffff" - strength = 50 + proof = RUM/3*2/5 glass_name = "Coquito" glass_desc = "It's a little coconut!" @@ -4303,7 +4372,7 @@ description = "Rum, pineapple, and coconut plended up with ice." taste_description = "coconuts and pineapple soaked in rum" color = "#fdf49e" - strength = 45 // 1/3 rum + proof = RUM/3 glass_name = "Piña Colada" glass_desc = "For those not into yoga." @@ -4314,7 +4383,7 @@ description = "An airy blend of champagne and orange juice, often drunk as a morning refreshment." taste_description = "orange juice and a dry, bubbly wine" color = "#daa411" - strength = 60 // 1/2 champagne + proof = WINE/2 glass_name = "Mimosa" glass_desc = "A bubbly and tangy refreshment." @@ -4326,7 +4395,7 @@ description = "Old fashioned, beer, and chili. A drink for an angry, angry soul." taste_description = "an old-world classic with a firey finish" color = "#8d5b28" // rgb(119, 68, 16) - strength = 20 + proof = (((WHISKEY+BITTERS)/3)+BEER)/3 glass_name = "Johnny Silverhand" glass_desc = "...at the end of it all, it's the code you live by that defines who you are." @@ -4337,7 +4406,7 @@ description = "An updated take on a Moscow Mule, for those trying to make a fresh mark on the world." taste_description = "vodka and lime with a burst of fizzy ginger" color = "#db7878" // rgb(119, 68, 16) - strength = 20 + proof = VODKA/9 glass_name = "Jackie Welles" glass_desc = "But that's done after tomorrow. Afterlife, here we come, baby!" @@ -4348,26 +4417,15 @@ description = "Vodka and cola with a splash of sakura. A drink for those who shoot for the moon." taste_description = "vodka, cola, and sakura flower" color = "#206cc4" // rgb(119, 68, 16) - strength = 20 + proof = VODKA/3 glass_name = "David Martinez" glass_desc = "You still have a dream to stick around for. Need you to see it through. That's my dream." -//This functions the same as Doctor's Delight, except it gets you drunk too. -/datum/reagent/ethanol/royaljelly/affect_ingest(mob/living/carbon/M, alien, removed) - . = ..() - if(alien == IS_DIONA) - return - M.adjustOxyLoss(-4 * removed) - M.heal_organ_damage(2 * removed, 2 * removed) - M.adjustToxLoss(-2 * removed) - if(M.dizziness) - M.dizziness = max(0, M.dizziness - 15) - if(M.confused) - M.Confuse(-5) - //Blood-based Cocktails +#define DEMONSBLOOD 100 + /datum/reagent/ethanol/demonsblood name = "Demons Blood" id = "demonsblood" @@ -4375,7 +4433,7 @@ taste_description = "sweet tasting iron" taste_mult = 1.5 color = "#820000" - strength = 15 + proof = DEMONSBLOOD blood_content = 1 glass_name = "Demons' Blood" @@ -4387,7 +4445,7 @@ description = "Creepy time!" taste_description = "bitter iron" color = "#A68310" - strength = 15 + proof = DEMONSBLOOD blood_content = 1 glass_name = "Devil's Kiss" @@ -4399,7 +4457,7 @@ description = "When the tang of blood and citrus hits, your tongue just might finally be able to pronounce some of the scrawls seen in the tunnels..." taste_description = "bitter iron and citrus" color = "#7D1717" - strength = 50 + proof = DEMONSBLOOD/3 blood_content = 1 glass_name = "Nar'Sour" @@ -4411,7 +4469,7 @@ description = "Nanotrasen's 2518 Pet of The Year has been swept up in the Geometer's brilliant crimson tide! Yap!" taste_description = "bloody orange creamsicle with a bite (and a bark!)" color = "#7D1717" - strength = 50 + proof = ((DEMONSBLOOD/3)+(SCREWDRIVERCOCKTAIL*3/5))/2 blood_content = 1 glass_name = "Nar'Sian" @@ -4422,7 +4480,7 @@ description = "A nighttime vigilante and a bloodsucking parasite could bond over a drink like this." taste_description = "iron, a dash of whiskey, and a hint of molasses" color = "#990033" - strength = 20 + proof = (WHISKEY_SPECIAL_BLEND+ABSINTHE)/3 blood_content = 2 glass_name = "Night's Delight" @@ -4434,7 +4492,7 @@ description = "A delectable cocktail for a classy vampire." taste_description = "metallic, citrusy fizz" color = "#CC0000" - strength = 20 + proof = WINE/3 blood_content = 1 glass_name = "Blud's Fizz" @@ -4445,7 +4503,7 @@ description = "The chaplain might've put on the wrong hat this morning..." taste_description = "some really sinful grapes" color = "#660000" - strength = 20 + proof = WINE/2 blood_content = 1 glass_name = "Wrong Hat" @@ -4457,7 +4515,7 @@ description = "It's like someone took a straw to your brain and just went wild." taste_description = "grey matter" color = "#575e49" - strength = 20 + proof = (VODKA+KAHLUA)/3 blood_content = 1 glass_name = "Brain Drain" @@ -4471,7 +4529,7 @@ description = "The secret reason a bishop's hat is so tall." taste_description = "some really pious grapes" color = "#330033" - strength = 20 + proof = 100 // oops! unused! glass_name = "Holy Grail" glass_desc = "The secret reason a bishop's hat is so tall." @@ -4726,38 +4784,14 @@ taste_description = "your brains smashed out by a smooth brick of hard, ice cold alcohol" color = "#9f6aff" taste_mult = 5 - strength = 10 + proof = 500 adj_temp = 10 targ_temp = 330 glass_name = "Deathbell" glass_desc = "The perfect blend of the most alcoholic things a bartender can get their hands on." -/datum/reagent/ethanol/deathbell/affect_ingest(mob/living/carbon/M, alien, removed) - . = ..() - - if(. >= strength) // Early warning - M.make_dizzy(24) // Intentionally higher than normal to compensate for it's previous effects. - if(. >= strength * 2.5) // Slurring takes longer. Again, intentional. - M.slurring = max(M.slurring, 30) - -/datum/reagent/ethanol/monstertamer - name = "Monster Tamer" - id = "monstertamer" - description = "A questionably-delicious blend of a carnivore's favorite food and a potent neural depressant." - taste_description = "the gross yet satisfying combination of chewing on a raw steak while downing a shot of whiskey" - strength = 50 - color = "#d3785d" - metabolism = REM * 2.5 // about right for mixing nutriment and ethanol. - var/alt_nutriment_factor = 5 //half as much as protein since it's half protein. - //using a new variable instead of nutriment_factor so we can call ..() without that adding nutrition for us without taking factors for protein into account - - glass_name = "Monster Tamer" - glass_desc = "This looks like a vaguely-alcoholic slurry of meat. Gross." - -/datum/reagent/ethanol/monstertamer/affect_ingest(mob/living/carbon/M, alien, removed) - ..() - +/proc/monster_tamer(mob/living/carbon/M, alien, removed, alt_nutriment_factor) if(!M.species.is_vampire) //it's still food! switch(alien) if(IS_DIONA) //Diona don't get any nutrition from nutriment or protein. @@ -4780,6 +4814,25 @@ to_chat(H, "Your mind starts to clear, soothed into a state of clarity as your senses return.") log_and_message_admins("is no longer feral.", H) +/datum/reagent/ethanol/monstertamer + name = "Monster Tamer" + id = "monstertamer" + description = "A questionably-delicious blend of a carnivore's favorite food and a potent neural depressant." + taste_description = "the gross yet satisfying combination of chewing on a raw steak while downing a shot of whiskey" + proof = WHISKEY/2 + color = "#d3785d" + metabolism = REM * 2.5 // about right for mixing nutriment and ethanol. + var/alt_nutriment_factor = 5 //half as much as protein since it's half protein. + //using a new variable instead of nutriment_factor so we can call ..() without that adding nutrition for us without taking factors for protein into account + + glass_name = "Monster Tamer" + glass_desc = "This looks like an alcoholic slurry of meat. Gross." + +/datum/reagent/ethanol/monstertamer/affect_ingest(mob/living/carbon/M, alien, removed) + ..() + + monster_tamer(M,alien, removed, alt_nutriment_factor) + /datum/reagent/ethanol/monstertamer/affect_blood(mob/living/carbon/M, alien, removed) ..() if(alien == IS_SKRELL) @@ -4788,12 +4841,38 @@ if(alien == IS_SLIME || alien == IS_CHIMERA) //slimes and chimera can get nutrition from injected nutriment and protein M.nutrition += (alt_nutriment_factor * removed) +/datum/reagent/drink/drymonstertamer + name = "Dry Monster Tamer" + id = "drymonstertamer" + description = "A questionably-delicious blend of a carnivore's favorite food and, it turns out, certain oligosaccharides common to certain plants." + taste_description = "the gross yet satisfying combination of chewing on a raw steak while gulping a bunch of root beer" + color = "#d3785d" + metabolism = REM * 2.5 // not actually right for the mix, but required to make it mechanically equivalent for feralness purposes + var/alt_nutriment_factor = 5 //half as much as protein since it's half protein. + //using a new variable instead of nutriment_factor so we can call ..() without that adding nutrition for us without taking factors for protein into account + + glass_name = "Dry Monster Tamer" + glass_desc = "This looks like a fizzy slurry of meat. Gross." + +/datum/reagent/drink/drymonstertamer/affect_ingest(mob/living/carbon/M, alien, removed) + ..() + + monster_tamer(M,alien, removed, alt_nutriment_factor) + +/datum/reagent/drink/drymonstertamer/affect_blood(mob/living/carbon/M, alien, removed) + ..() + if(alien == IS_SKRELL) + M.adjustToxLoss(removed) //Equivalent to half as much protein, since it's half protein. + if(!M.species.is_vampire) + if(alien == IS_SLIME || alien == IS_CHIMERA) //slimes and chimera can get nutrition from injected nutriment and protein + M.nutrition += (alt_nutriment_factor * removed) + /datum/reagent/ethanol/galacticpanic name = "Galactic Panic Attack" id = "galacticpanic" description = "The absolute worst thing you could ever put in your body." taste_description = "an entire galaxy collasping in on itself." - strength = 10 + proof = 300 druggy = 50 halluci = 30 var/adj_dizzy = 10 @@ -4806,17 +4885,13 @@ . = ..() M.afflict_stun(20 * 2) - if(. >= strength) // Early warning - M.make_dizzy(24) // Intentionally higher than normal to compensate for it's previous effects. - if(. >= strength * 2.5) // Slurring takes longer. Again, intentional. - M.slurring = max(M.slurring, 30) /datum/reagent/ethanol/lotus name = "Lotus" id = "lotus" description = "The result of making one mistake after another and trying to cover it up with sugar." taste_description = "rich, sweet fruit and even more sugar." - strength = 25 + proof = (WINE+VERMOUTH)/6 color = "#d3785d" glass_name = "Lotus" @@ -4827,7 +4902,7 @@ id = "sbagliato" description = "A drink invented because a bartender was too drunk." taste_description = "sweet bubbly wine and vermouth." - strength = 30 + proof = (WINE+VERMOUTH)/3 color = "#d3785d" glass_name = "Negroni Sbagliato" @@ -4836,13 +4911,13 @@ /datum/reagent/ethanol/fusionnaire name = "Fusionnaire" id = "fusionnaire" - description = "The one true ellusive, some even consider it never existed!" + description = "The one true elusive, some even consider it never existed!" taste_description = "strong currents of fresh zesty winds" color = "#E6E2AA" - strength = 65 + proof = (VODKA*2+SCHNAPPS*2+RUM)/9 glass_name = "Fusionnaire" - glass_desc = "The one true ellusive, lighter than air, harder than the mountains!" + glass_desc = "The one true elusive, lighter than air, harder than the mountains!" /datum/reagent/ethanol/originalsin name = "Original Sin" @@ -4850,7 +4925,7 @@ description = "Angel Ichor, entirely transformed by one drop of apple juice" taste_description = "the apple Eve gave to Adam" color = "#99CC35" - strength = 17 + proof = HOLYWINE*1.5 glass_name = "Original Sin" glass_desc = "A drink so fine, you may just risk eternal damnation!" @@ -4860,7 +4935,7 @@ id = "bulldog" description = "An inventive kahlua recipe." taste_description = "fizzy, creamy, soda and coffee hell." - strength = 30 + proof = BLACK_RUSSIAN*2/3*4/5 color = "#d3785d" glass_name = "Space Bulldog" @@ -4871,7 +4946,7 @@ id = "italiancrisis" description = "This drink was concocted by a madwoman, causing the Italian Crisis of 2123." taste_description = "cola, fruit, fizz, coffee, and cream swirled together in an old boot." - strength = 20 + proof = (((WINE+VERMOUTH)/3)+(BLACK_RUSSIAN*2/3*4/5))/2 // the things we do for code color = "#d3785d" glass_name = "Italian Crisis" @@ -4930,8 +5005,7 @@ id = "honeyshot" description = "The perfect drink for bees." taste_description = "sweet tart grenadine flavored with honey." - strength = 40 - var/adj_dizzy = 10 + proof = VODKA/3 color = "#d3785d" glass_name = "Honey shot" @@ -4942,7 +5016,7 @@ id = "scsatw" description = "The screwdriver's bigger cousin." taste_description = "smooth, savory booze and tangy orange juice." - strength = 30 + proof = (3*SCREWDRIVERCOCKTAIL+RUM+WHISKEY+GIN)/6 color = "#d3785d" glass_name = "Slow Comfortable Screw Against the Wall" @@ -4963,7 +5037,7 @@ id = "unsweettea" description = "A sick experiment to take the sweetness out of tea after sugar has been added resulted in this." taste_description = "bland, slightly bitter, discount black tea." - strength = 80 + proof = 25 druggy = 10 color = "#d3785d" @@ -4975,8 +5049,7 @@ id = "lovemaker" description = "A drink said to help one find true love." taste_description = "sweet fruit and honey." - strength = 30 - var/adj_dizzy = 30 + proof = SCREWDRIVERCOCKTAIL/2*5/6 adj_temp = 10 targ_temp = 360 color = "#d3785d" @@ -4989,7 +5062,7 @@ id = "peacetreaty" description = "A Tajaran cocktail named (somewhat in jest) of the peace treaty that ended the civil war on Adhomai." color = "#DFDF93" - strength = 21 + proof = (VICTORY_GIN+MESSA_MEAD)/3 taste_description = "tart, oily honey" glass_icon_state = "peacetreatyglass" @@ -5001,7 +5074,7 @@ id = "winter_offensive" description = "The Tajaran equivalent of Gin 'On the Rocks', named after the famous People Republic of Adhomai military campaign." color = "#664300" - strength = 15 + proof = VICTORY_GIN/2 taste_description = "oily gin" adj_temp = 10 targ_temp = 270 @@ -5015,7 +5088,7 @@ id = "internationale" description = "A cocktail mixing Tajaran gin and Pan-Slavic Vodka. A symbol of unity between Human and Tajaran leftists." color = "#D9CCAA" - strength = 28 + proof = (VICTORY_GIN+VODKA)/2 taste_description = "earthy, oily unity" glass_icon_state = "internationaleglass" @@ -5030,7 +5103,7 @@ description = "A White Russian gone awry." taste_description = "milky grain alcohol" color = "#9fbbd8" - strength = 30 + proof = VODKA/2 glass_name = "Russian Bastard" glass_desc = "A White Russian gone awry." @@ -5041,7 +5114,7 @@ description = "Often lost and now found." taste_description = "the strength to go on" color = "#9ce454" - strength = 30 + proof = (COGNAC+KAHLUA*3+MELON_LIQUOR*3)/9 glass_name = "A Will to Live" glass_desc = "Often lost and now found." @@ -5052,7 +5125,7 @@ description = "A horrid concoction of deathbell and nuclear waste. Is this really necessary?" taste_description = "radioactivity and alcohol poisoning" color = "#6c3c94" - strength = 10 + proof = 400 glass_name = "A Desire to Die" glass_desc = "Deathbell and nuclear waste. The bane of your liver." @@ -5085,7 +5158,7 @@ description = "The daiquiri's dry cousin." taste_description = "sickly sweetness" color = "#be5227" - strength = 10 + proof = COGNAC*5/9 glass_name = "Sidecar" glass_desc = "The daiquiri's dry cousin." @@ -5096,7 +5169,7 @@ description = "Named after a field artillery gun. Enough said." taste_description = "the impact of a 75mm shell" color = "#d8d4ad" - strength = 35 + proof = (GIN+2*WINE)/4 glass_name = "French 75" glass_desc = "Named after a field artillery gun. Enough said." @@ -5107,7 +5180,7 @@ description = "A French 75 with the gin substituted for vodka." taste_description = "the impact of a harder 75mm shell" color = "#d8d4ad" - strength = 25 + proof = (VODKA+2*WINE)/4 glass_name = "French 76" glass_desc = "A French 75 with the gin substituted for vodka." @@ -5118,7 +5191,7 @@ description = "Made on Terra when and where alcohol was illegal. How defiant." taste_description = "sweet and sour defiance" color = "#f1e362" - strength = 30 + proof = GIN/4 glass_name = "Last Word" glass_desc = "Made on Terra when and where alcohol was illegal. How defiant." @@ -5295,7 +5368,7 @@ description = "A drink made from the venom of the Yuum." taste_description = "harsh and stinging sweetness" color = "#550000" - strength = 10 + proof = 200 glass_name = "Mumbak sting" glass_desc = "A drink made from the venom of the Yuum." @@ -5305,7 +5378,7 @@ description = "Wine made from various fruits from the swamps of Moghes." taste_description = "swampy fruit" color = "#6b596b" - strength = 15 + proof = 150 glass_name = "wasgaelhi" glass_desc = "Wine made from various fruits from the swamps of Moghes." diff --git a/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Medicine.dm b/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Medicine.dm index 168a979eef48..b9d658ac15f2 100644 --- a/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Medicine.dm +++ b/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Medicine.dm @@ -552,7 +552,7 @@ H.losebreath = 10 H.adjustOxyLoss(5) if(prob(2)) - to_chat(H,"You feel a dull pain behind your eyes and at thee back of your head...") + to_chat(H,"You feel a dull pain behind your eyes and at the back of your head...") H.hallucination += 20 //It messes with your mind for some reason. H.eye_blurry += 20 //Groggy vision for a small bit. if(prob(3)) @@ -1421,11 +1421,11 @@ else if(world.time > data + ANTIDEPRESSANT_MESSAGE_DELAY) data = world.time - if(prob(90)) - to_chat(M, "Your mind feels much more stable.") - else + if(prob(1)) to_chat(M, "Your mind breaks apart...") M.hallucination += 200 + else + to_chat(M, "Your mind feels much more stable.") /datum/reagent/adranol//Moved from Chemistry-Reagents-Medicine_vr.dm name = "Adranol" diff --git a/code/modules/reagents/items/hypovial.dm b/code/modules/reagents/items/hypovial.dm index dac6865d58a2..2326605f29ee 100644 --- a/code/modules/reagents/items/hypovial.dm +++ b/code/modules/reagents/items/hypovial.dm @@ -13,6 +13,7 @@ start_rename = TRUE /// how many [state][#] overlays we have for reagents remaining var/overlay_count = 3 + item_flags = ITEM_CAREFUL_BLUDGEON | ITEM_ENCUMBERS_WHILE_HELD | ITEM_EASY_LATHE_DECONSTRUCT /obj/item/reagent_containers/glass/hypovial/update_icon(updates) cut_overlays() diff --git a/code/modules/reagents/machinery/chem_master.dm b/code/modules/reagents/machinery/chem_master.dm index e4f0cd7fd7bf..691d9a521137 100644 --- a/code/modules/reagents/machinery/chem_master.dm +++ b/code/modules/reagents/machinery/chem_master.dm @@ -1,5 +1,6 @@ //TODO: We don't have check_reactions or something like it, so we can't prevent idiot transfers. @Zandario // todo: this is horrifying and needs refactored. ESPECIALLY ITS TGUI. ~silicons +// todo: it's been like 9 months and i worked on asset cache please kill this shit with fire and rewirte it all oh my god ~silicons /obj/machinery/chem_master name = "ChemMaster 3000" desc = "Used to seperate and package chemicals in to autoinjectors, patches, pills, or bottles. Warranty void if used to create Space Drugs." @@ -177,7 +178,7 @@ /obj/machinery/chem_master/proc/load_styles() /// Calculate the span tags and ids fo all the available pill icons. - var/datum/asset/spritesheet/simple/pill_assets = get_asset_datum(/datum/asset/spritesheet/simple/pills) + var/datum/asset_pack/spritesheet/simple/pill_assets = SSassets.ready_asset_pack(/datum/asset_pack/spritesheet/simple/pills) pill_styles = list() for (var/x in 1 to PILL_STYLE_COUNT) var/list/pill_style_list = list() @@ -185,7 +186,7 @@ pill_style_list["className"] = pill_assets.icon_class_name("pill[x]") pill_styles += list(pill_style_list) - var/datum/asset/spritesheet/simple/bottle_assets = get_asset_datum(/datum/asset/spritesheet/simple/bottles) + var/datum/asset_pack/spritesheet/simple/bottle_assets = SSassets.ready_asset_pack(/datum/asset_pack/spritesheet/simple/bottles) bottle_styles = list() for (var/x in 1 to BOTTLE_STYLE_COUNT) var/list/bottle_style_list = list() @@ -193,7 +194,7 @@ bottle_style_list["className"] = bottle_assets.icon_class_name("bottle[x]") bottle_styles += list(bottle_style_list) - var/datum/asset/spritesheet/simple/patches_assets = get_asset_datum(/datum/asset/spritesheet/simple/patches) + var/datum/asset_pack/spritesheet/simple/patches_assets = SSassets.ready_asset_pack(/datum/asset_pack/spritesheet/simple/patches) patch_styles = list() for (var/raw_patch_style in PATCH_STYLE_LIST) //adding className for use in UI @@ -204,12 +205,11 @@ condi_styles = strip_condi_styles_to_icons(get_condi_styles()) -/obj/machinery/chem_master/ui_assets(mob/user) - return list( - get_asset_datum(/datum/asset/spritesheet/simple/pills), - get_asset_datum(/datum/asset/spritesheet/simple/bottles), - get_asset_datum(/datum/asset/spritesheet/simple/patches), - ) +/obj/machinery/chem_master/ui_asset_injection(datum/tgui/ui, list/immediate, list/deferred) + immediate += /datum/asset_pack/spritesheet/simple/bottles + immediate += /datum/asset_pack/spritesheet/simple/patches + immediate += /datum/asset_pack/spritesheet/simple/pills + return ..() /obj/machinery/chem_master/ui_interact(mob/user, datum/tgui/ui = null) ui = SStgui.try_update_ui(user, src, ui) @@ -759,7 +759,7 @@ if (style_reagent in styles) styles[style_reagent] += carton_in_hand - var/datum/asset/spritesheet/simple/assets = get_asset_datum(/datum/asset/spritesheet/simple/condiments) + var/datum/asset_pack/spritesheet/simple/assets = SSassets.ready_asset_pack(/datum/asset_pack/spritesheet/simple/condiments) for (var/reagent in styles) styles[reagent]["className"] = assets.icon_class_name(reagent) return styles diff --git a/code/modules/reagents/machinery/dispenser/dispenser.dm b/code/modules/reagents/machinery/dispenser/dispenser.dm index cb9703c76ef9..2bbf1d68c28d 100644 --- a/code/modules/reagents/machinery/dispenser/dispenser.dm +++ b/code/modules/reagents/machinery/dispenser/dispenser.dm @@ -20,6 +20,7 @@ use_power = USE_POWER_IDLE idle_power_usage = 50 anchored = TRUE + obj_rotation_flags = OBJ_ROTATION_ENABLED | OBJ_ROTATION_DEFAULTING default_unanchor = 3 SECONDS default_deconstruct = 0 SECONDS default_panel = 0 SECONDS diff --git a/code/modules/reagents/machinery/dispenser/synthesizer.dm b/code/modules/reagents/machinery/dispenser/synthesizer.dm index b6cb49b102bc..1ce6bcb44d00 100644 --- a/code/modules/reagents/machinery/dispenser/synthesizer.dm +++ b/code/modules/reagents/machinery/dispenser/synthesizer.dm @@ -84,6 +84,7 @@ /obj/item/reagent_synth/cafe name = "reagent synthesis module (Cafe)" reagents_provided = list( + /datum/reagent/water, /datum/reagent/drink/coffee, /datum/reagent/drink/coffee/cafe_latte, /datum/reagent/drink/coffee/soy_latte, @@ -92,7 +93,9 @@ /datum/reagent/drink/milk/cream, /datum/reagent/drink/tea, /datum/reagent/drink/ice, + /datum/reagent/drink/tea/icetea, /datum/reagent/nutriment/mint, + /datum/reagent/sugar, /datum/reagent/drink/juice/orange, /datum/reagent/drink/juice/lemon, /datum/reagent/drink/juice/lime, diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index 7941d2b5e0c0..0a25404d2358 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -157,6 +157,8 @@ pickup_sound = 'sound/items/pickup/glass.ogg' /// rped rating var/rped_rating = 0 + item_flags = ITEM_CAREFUL_BLUDGEON | ITEM_ENCUMBERS_WHILE_HELD | ITEM_EASY_LATHE_DECONSTRUCT + /obj/item/reagent_containers/glass/beaker/Initialize(mapload) . = ..() diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index e35d79f58399..57af42c64645 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -142,6 +142,12 @@ filled_reagents = list("inaprovaline" = 5) preserve_item = 0 hyposound = 'sound/effects/hypospray.ogg' + materials_base = list( + MAT_STEEL = 250, + MAT_GLASS = 250, + ) + item_flags = ITEM_CAREFUL_BLUDGEON | ITEM_ENCUMBERS_WHILE_HELD | ITEM_EASY_LATHE_DECONSTRUCT + /obj/item/reagent_containers/hypospray/autoinjector/on_reagent_change() ..() @@ -187,6 +193,7 @@ icon_state = "autoinjector" amount_per_transfer_from_this = 15 volume = 15 + materials_base = list(MAT_STEEL = 500, MAT_GLASS = 500,) origin_tech = list(TECH_BIO = 4) filled_reagents = list("inaprovaline" = 15) diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index f77a78961997..07a18cc86494 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -8,7 +8,7 @@ icon = 'icons/obj/medical/syringe.dmi' item_state = "syringe_0" icon_state = "0" - materials_base = list(MAT_GLASS = 150) + materials_base = list(MAT_GLASS = 150, MAT_STEEL = 250) amount_per_transfer_from_this = 5 possible_transfer_amounts = null volume = 15 @@ -17,7 +17,7 @@ sharp = 1 integrity_flags = INTEGRITY_ACIDPROOF rad_flags = RAD_NO_CONTAMINATE - item_flags = ITEM_NOBLUDGEON | ITEM_ENCUMBERS_WHILE_HELD + item_flags = ITEM_NOBLUDGEON | ITEM_ENCUMBERS_WHILE_HELD | ITEM_EASY_LATHE_DECONSTRUCT var/mode = SYRINGE_DRAW var/image/filling //holds a reference to the current filling overlay var/visible_name = "a syringe" diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index 0b95e65ddb78..c9ebcae5d921 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -760,18 +760,6 @@ return P - -// update the icon_state to reflect hidden status -/obj/structure/disposalpipe/proc/update() - var/turf/T = src.loc - hide(!T.is_plating() && !istype(T,/turf/space)) // space never hides pipes - -// hide called by levelupdate if turf intact status changes -// change visibility status and force update of icon -/obj/structure/disposalpipe/hide(var/intact) - invisibility = intact ? 101: 0 // hide if floor is intact - updateicon() - // update actual icon_state depending on visibility // if invisible, append "f" to icon_state to show faded version // this will be revealed if a T-scanner is used @@ -980,8 +968,6 @@ dpdir = dir | turn(dir, 180) else dpdir = dir | turn(dir, -90) - - update() return ///// Z-Level stuff @@ -991,7 +977,6 @@ /obj/structure/disposalpipe/up/New() ..() dpdir = dir - update() return /obj/structure/disposalpipe/up/nextdir(fromdir) @@ -1041,7 +1026,6 @@ /obj/structure/disposalpipe/down/New() ..() dpdir = dir - update() return /obj/structure/disposalpipe/down/nextdir(fromdir) @@ -1101,7 +1085,6 @@ dpdir = dir | turn(dir, 90) | turn(dir,180) else // pipe-y dpdir = dir | turn(dir,90) | turn(dir, -90) - update() return @@ -1158,7 +1141,6 @@ if(sort_tag) GLOB.tagger_locations |= sort_tag updatename() updatedesc() - update() /obj/structure/disposalpipe/tagger/attackby(obj/item/I, mob/user) if(..()) @@ -1226,7 +1208,6 @@ updatedir() updatename() updatedesc() - update() /obj/structure/disposalpipe/sortjunction/attackby(obj/item/I, mob/user) if(..()) @@ -1318,8 +1299,6 @@ /obj/structure/disposalpipe/trunk/LateInitialize() . = ..() getlinked() - update() - /obj/structure/disposalpipe/trunk/proc/getlinked() linked = null var/obj/machinery/disposal/D = locate() in src.loc @@ -1331,8 +1310,6 @@ var/obj/structure/disposaloutlet/O = locate() in src.loc if(O) linked = O - - update() return // Override attackby so we disallow trunkremoval when somethings ontop @@ -1416,11 +1393,6 @@ // i.e. will be treated as an empty turf desc = "A broken piece of disposal pipe." -/obj/structure/disposalpipe/broken/New() - ..() - update() - return - // called when welded // for broken pipe, remove and turn into scrap /obj/structure/disposalpipe/broken/welded() diff --git a/code/modules/species/inventory.dm b/code/modules/species/inventory.dm index 2871a3880fde..e6040e63be06 100644 --- a/code/modules/species/inventory.dm +++ b/code/modules/species/inventory.dm @@ -9,7 +9,7 @@ * get equip offsets for a given inhand * * @params - * - slot - /datum/inventory_slot_meta/abstract/hand/left or right_hand + * - slot - /datum/inventory_slot/abstract/hand/left or right_hand * - index - index of the held item in held items */ /datum/species/proc/get_inhand_offsets(slot, index) diff --git a/code/modules/species/outsider/vox.dm b/code/modules/species/outsider/vox.dm index 3a5938eabc55..c309a1a07484 100644 --- a/code/modules/species/outsider/vox.dm +++ b/code/modules/species/outsider/vox.dm @@ -126,7 +126,7 @@ H.equip_to_slot_or_del(new /obj/item/tank/vox(H), SLOT_ID_BACK, INV_OP_SILENT | INV_OP_FLUFFLESS) H.internal = H.back else - H.equip_to_slot_or_del(new /obj/item/tank/vox(H), /datum/inventory_slot_meta/abstract/hand/right, INV_OP_SILENT | INV_OP_FLUFFLESS) + H.equip_to_slot_or_del(new /obj/item/tank/vox(H), /datum/inventory_slot/abstract/hand/right, INV_OP_SILENT | INV_OP_FLUFFLESS) H.internal = H.r_hand H.internal = locate(/obj/item/tank) in H.contents if(istype(H.internal,/obj/item/tank) && H.internals) diff --git a/code/modules/species/promethean/promethean.dm b/code/modules/species/promethean/promethean.dm index fa199a27a6e6..2087aa8c3715 100644 --- a/code/modules/species/promethean/promethean.dm +++ b/code/modules/species/promethean/promethean.dm @@ -58,15 +58,12 @@ var/datum/species/shapeshifter/promethean/prometheans max_age = 80 - gluttonous = 0 virus_immune = TRUE - slowdown = -0.2 - brute_mod = 0.5 - burn_mod = 2 + brute_mod = 0.9 + burn_mod = 1.1 oxy_mod = 0 flash_mod = 0.5 //No centralized, lensed eyes. - item_slowdown_mod = 0.66 cloning_modifier = /datum/modifier/cloning_sickness/promethean @@ -171,9 +168,9 @@ var/datum/species/shapeshifter/promethean/prometheans new /obj/item/reagent_containers/food/snacks/wrapped/proteinbar(L) new /obj/item/tool/prybar/red(L) if(H.backbag == 1) - H.equip_to_slot_or_del(L, /datum/inventory_slot_meta/abstract/hand/right) + H.equip_to_slot_or_del(L, /datum/inventory_slot/abstract/hand/right) else - H.equip_to_slot_or_del(L, /datum/inventory_slot_meta/abstract/put_in_backpack) + H.equip_to_slot_or_del(L, /datum/inventory_slot/abstract/put_in_backpack) /datum/species/shapeshifter/promethean/hug(mob/living/carbon/human/H, mob/living/target) diff --git a/code/modules/species/promethean/promethean_blob.dm b/code/modules/species/promethean/promethean_blob.dm index ad39f64e1d4f..7ae94ae2dec0 100644 --- a/code/modules/species/promethean/promethean_blob.dm +++ b/code/modules/species/promethean/promethean_blob.dm @@ -472,8 +472,8 @@ if(!isnull(blob.mob_radio)) if(!equip_to_slots_if_possible(blob.mob_radio, list( - /datum/inventory_slot_meta/inventory/ears/left, - /datum/inventory_slot_meta/inventory/ears/right, + /datum/inventory_slot/inventory/ears/left, + /datum/inventory_slot/inventory/ears/right, ))) blob.mob_radio.forceMove(reform_spot) blob.mob_radio = null diff --git a/code/modules/species/protean/protean.dm b/code/modules/species/protean/protean.dm index 575e350d9beb..4d979be9cd21 100644 --- a/code/modules/species/protean/protean.dm +++ b/code/modules/species/protean/protean.dm @@ -181,9 +181,9 @@ permit.set_name(H.real_name) if(H.backbag == 1) //Somewhat misleading, 1 == no bag (not boolean) - H.equip_to_slot_or_del(box, /datum/inventory_slot_meta/abstract/hand/left) + H.equip_to_slot_or_del(box, /datum/inventory_slot/abstract/hand/left) else - H.equip_to_slot_or_del(box, /datum/inventory_slot_meta/abstract/put_in_backpack) + H.equip_to_slot_or_del(box, /datum/inventory_slot/abstract/put_in_backpack) /datum/species/protean/get_blood_colour(var/mob/living/carbon/human/H) return rgb(80,80,80,230) @@ -307,8 +307,7 @@ holder.adjustBruteLoss(-brute_heal_left, include_robo = TRUE) holder.adjustFireLoss(-burn_heal_left, include_robo = TRUE) holder.adjustToxLoss(-3.6) // With them now having tox immunity, this is redundant, along with the rad regen, but I'm keeping it in, in case they do somehow get some system instability - holder.radiation = max(RAD_MOB_CURE_PROTEAN_REGEN) - + holder.cure_radiation(RAD_MOB_CURE_PROTEAN_REGEN) /proc/protean_requires_healing(mob/living/carbon/human/H) if(!istype(H)) @@ -359,7 +358,7 @@ return for(var/obj/item/hardsuit/protean/suit in contents) - force_equip_to_slot(suit, /datum/inventory_slot_meta/inventory/back) + force_equip_to_slot(suit, /datum/inventory_slot/inventory/back) to_chat(src, SPAN_WARNING("You deploy your nanosuit.")) suit.toggle_seals(src, TRUE) return diff --git a/code/modules/species/protean/protean_blob.dm b/code/modules/species/protean/protean_blob.dm index 70bd8bae23ae..c1d05cc26ef3 100644 --- a/code/modules/species/protean/protean_blob.dm +++ b/code/modules/species/protean/protean_blob.dm @@ -109,8 +109,7 @@ var/obj/item/organ/external/E = humanform.get_organ(BP_TORSO) //Set us to their health, but, human health ignores robolimbs so we do it 'the hard way' health = maxHealth - E.brute_dam - E.burn_dam - movement_cooldown = 0.5 + max(0, (maxHealth - health) - 100) / 35 - base_attack_cooldown = 10 + max(0, (maxHealth - health) - 100) / 15 + movement_cooldown = 0.5 + max(0, (maxHealth - health) - 100) / 50 //Alive, becoming dead if((stat < DEAD) && (health <= 0)) @@ -492,8 +491,8 @@ if(!isnull(blob.mob_radio)) if(!equip_to_slots_if_possible(blob.mob_radio, list( - /datum/inventory_slot_meta/inventory/ears/left, - /datum/inventory_slot_meta/inventory/ears/right, + /datum/inventory_slot/inventory/ears/left, + /datum/inventory_slot/inventory/ears/right, ))) blob.mob_radio.forceMove(reform_spot) blob.mob_radio = null @@ -663,7 +662,7 @@ if("headsets") chosen_list = GLOB.clothing_headsets icon_file = 'icons/mob/clothing/ears.dmi' - + var/picked = input(src,"What clothing would you like to mimic?","Mimic Clothes") as null|anything in chosen_list if(!ispath(chosen_list[picked])) @@ -673,7 +672,7 @@ if(isnull(H.icon_override)) H.icon_override = icon_file H.update_worn_icon() //so our overlays update. - + if (ismob(H.loc)) var/mob/M = H.loc M.update_inv_belt() //so our overlays @@ -717,7 +716,7 @@ chosenpart = H.boots chosen_list = GLOB.clothing_shoes - + var/picked = input(src,"What clothing would you like to mimic?","Mimic Clothes") as null|anything in chosen_list if(!ispath(chosen_list[picked])) @@ -738,7 +737,7 @@ var/obj/item/holder/H = loc var/color_in = input("Pick a color. Cancelling sets it to default.","Color", H.color) as null|color - + if(color_in) H.color = color_in else diff --git a/code/modules/species/shadekin/shadekin.dm b/code/modules/species/shadekin/shadekin.dm index bcfc62668bcd..e23e436f9b21 100644 --- a/code/modules/species/shadekin/shadekin.dm +++ b/code/modules/species/shadekin/shadekin.dm @@ -8,8 +8,10 @@ deform = 'icons/mob/species/shadekin/body.dmi' preview_icon = 'icons/mob/species/shadekin/preview.dmi' husk_icon = 'icons/mob/species/shadekin/husk.dmi' - tail = "tail" - icobase_tail = TRUE + + sprite_accessory_defaults = list( + SPRITE_ACCESSORY_SLOT_TAIL = /datum/sprite_accessory/tail/bodyset/shadekin, + ) //TODO: Something that's not wiki copypaste blurb = {" diff --git a/code/modules/species/shadekin/shadekin_blackeyed.dm b/code/modules/species/shadekin/shadekin_blackeyed.dm index 4509b9199aad..fede97d8c4a5 100644 --- a/code/modules/species/shadekin/shadekin_blackeyed.dm +++ b/code/modules/species/shadekin/shadekin_blackeyed.dm @@ -9,7 +9,10 @@ deform = 'icons/mob/species/shadekin/body.dmi' preview_icon = 'icons/mob/species/shadekin/preview_blackeyed.dmi' husk_icon = 'icons/mob/species/shadekin/husk.dmi' - tail = "tail" + + sprite_accessory_defaults = list( + SPRITE_ACCESSORY_SLOT_TAIL = /datum/sprite_accessory/tail/bodyset/shadekin, + ) //TODO: Something more fitting for black-eyes //TODO: CIT ADDENDUM: since we're not really on the tether anymore we'll need a bullshit reason as to why they're around wherever we are. diff --git a/code/modules/species/species.dm b/code/modules/species/species.dm index 483aa2255e5d..3fc6aa0378aa 100644 --- a/code/modules/species/species.dm +++ b/code/modules/species/species.dm @@ -4,6 +4,8 @@ * They are **not** singletons, however, they are globally cached as a static set * for use in preferences to determine default properties/whatever * + * todo: make them singletons + * * ? Someday we'll rework this. Someday. I believe. * * Mob set_species supports either a datum or a typepath. Mobs, upon receiving a typepath, will make their own copy for modification. @@ -40,12 +42,19 @@ ///Used for metabolizing reagents. var/reagent_tag - //? Traits / Physiology + //* Traits / Physiology *// /// Intrinsic datum traits to apply to the mob var/list/mob_traits /// physiology modifier to add - path or instance var/datum/physiology_modifier/mob_physiology_modifier + //* Sprite Accessories *// + /// default sprite accessories for each slot; will render onto mobs if they don't have one specifically set. + /// set to id/typepath to have it resolved during init. + var/list/sprite_accessory_defaults = list() + + // todo: old code below + //? Additional info /// what you see on tooltip/examine var/examine_name @@ -114,20 +123,6 @@ /// The basic skin colours this species uses. var/list/base_skin_colours - //? Tail - /// Name of tail state in species effects icon file. - var/tail - /// If set, the icon to obtain tail animation states from. - var/tail_animation - var/tail_hair - /// This is for overriding tail rendering with a specific icon in icobase, for static tails only, since tails would wag when dead if you used this. - var/icobase_tail = 0 - - //? Wing - var/wing_hair - var/wing - var/wing_animation - var/icobase_wing //? Organs /// Determines the organs that the species spawns with and which required-organ checks are conducted. @@ -510,6 +505,8 @@ built += new path abilities = built + sprite_accessory_defaults = resolve_sprite_accessory_key_list_inplace(sprite_accessory_defaults) + /** * called when we apply to a mob * @@ -625,9 +622,9 @@ GLOBAL_LIST_INIT(species_oxygen_tank_by_gas, list( box.obj_storage.fit_to_contents(no_shrink = TRUE) if(H.backbag == 1) - H.equip_to_slot_or_del(box, /datum/inventory_slot_meta/abstract/hand/right, INV_OP_SILENT | INV_OP_FLUFFLESS) + H.equip_to_slot_or_del(box, /datum/inventory_slot/abstract/hand/right, INV_OP_SILENT | INV_OP_FLUFFLESS) else - H.equip_to_slot_or_del(box, /datum/inventory_slot_meta/abstract/put_in_backpack, INV_OP_FORCE | INV_OP_SILENT) + H.equip_to_slot_or_del(box, /datum/inventory_slot/abstract/put_in_backpack, INV_OP_FORCE | INV_OP_SILENT) /** * called to ensure organs are consistent with our species's @@ -900,9 +897,7 @@ GLOBAL_LIST_INIT(species_oxygen_tank_by_gas, list( base_species = to_copy.name icobase = to_copy.icobase deform = to_copy.deform - tail = to_copy.tail - tail_animation = to_copy.tail_animation - icobase_tail = to_copy.icobase_tail + sprite_accessory_defaults = to_copy.sprite_accessory_defaults.Copy() color_mult = to_copy.color_mult primitive_form = to_copy.primitive_form species_appearance_flags = to_copy.species_appearance_flags diff --git a/code/modules/species/species_getters.dm b/code/modules/species/species_getters.dm index fec59dd8c1ba..fc3a8c44bb6b 100644 --- a/code/modules/species/species_getters.dm +++ b/code/modules/species/species_getters.dm @@ -64,15 +64,6 @@ /datum/species/proc/get_additional_examine_text(mob/living/carbon/human/H) return -/datum/species/proc/get_tail(mob/living/carbon/human/H) - return tail - -/datum/species/proc/get_tail_animation(mob/living/carbon/human/H) - return tail_animation - -/datum/species/proc/get_tail_hair(mob/living/carbon/human/H) - return tail_hair - /datum/species/proc/get_blood_mask(mob/living/carbon/human/H) return blood_mask @@ -181,14 +172,8 @@ /datum/species/proc/get_vision_flags(mob/living/carbon/human/H) return vision_flags -/datum/species/proc/get_wing_hair(mob/living/carbon/human/H) //I have no idea what this is even used for other than teshari, but putting it in just in case. - return wing_hair //Since the tail has it. - -/datum/species/proc/get_wing(mob/living/carbon/human/H) - return wing - -/datum/species/proc/get_wing_animation(mob/living/carbon/human/H) - return wing_animation +/datum/species/proc/get_default_sprite_accessory(mob/living/carbon/human/character, slot) + return sprite_accessory_defaults[slot] //! ## Names /datum/species/proc/get_true_name(mob/living/carbon/human/H) diff --git a/code/modules/species/species_shapeshift.dm b/code/modules/species/species_shapeshift.dm index 418338c7b3f0..eeec0317d9e7 100644 --- a/code/modules/species/species_shapeshift.dm +++ b/code/modules/species/species_shapeshift.dm @@ -58,20 +58,11 @@ var/list/wrapped_species_by_ref = list() var/datum/species/S = SScharacters.resolve_species_name(wrapped_species_by_ref["\ref[H]"]) return S.get_damage_overlays(H) -/datum/species/shapeshifter/get_tail(mob/living/carbon/human/H) - if(!H) return ..() - var/datum/species/S = SScharacters.resolve_species_name(wrapped_species_by_ref["\ref[H]"]) - return S.get_tail(H) - -/datum/species/shapeshifter/get_tail_animation(mob/living/carbon/human/H) - if(!H) return ..() - var/datum/species/S = SScharacters.resolve_species_name(wrapped_species_by_ref["\ref[H]"]) - return S.get_tail_animation(H) - -/datum/species/shapeshifter/get_tail_hair(mob/living/carbon/human/H) - if(!H) return ..() - var/datum/species/S = SScharacters.resolve_species_name(wrapped_species_by_ref["\ref[H]"]) - return S.get_tail_hair(H) +/datum/species/shapeshifter/get_default_sprite_accessory(mob/living/carbon/human/character, slot) + if(!character) + return ..() + var/datum/species/S = SScharacters.resolve_species_name(wrapped_species_by_ref["\ref[character]"]) + return S.get_default_sprite_accessory(arglist(args)) /datum/species/shapeshifter/get_husk_icon(mob/living/carbon/human/H) if(H) @@ -110,18 +101,16 @@ var/list/wrapped_species_by_ref = list() var/list/valid_gradstyles = GLOB.hair_gradients for(var/hairstyle in GLOB.legacy_hair_lookup) var/datum/sprite_accessory/S = GLOB.legacy_hair_lookup[hairstyle] - if(gender == MALE && S.gender == FEMALE) + if(gender == MALE && S.random_generation_gender == FEMALE) continue - if(gender == FEMALE && S.gender == MALE) + if(gender == FEMALE && S.random_generation_gender == MALE) continue if(S.apply_restrictions && !(species.get_bodytype_legacy(src) in S.species_allowed)) continue valid_hairstyles += hairstyle for(var/facialhairstyle in GLOB.legacy_facial_hair_lookup) var/datum/sprite_accessory/S = GLOB.legacy_facial_hair_lookup[facialhairstyle] - if(gender == MALE && S.gender == FEMALE) - continue - if(gender == FEMALE && S.gender == MALE) + if(!isnull(S.random_generation_gender) && gender != S.random_generation_gender) continue if(S.apply_restrictions && !(species.get_bodytype_legacy(src) in S.species_allowed)) continue @@ -305,8 +294,7 @@ var/list/wrapped_species_by_ref = list() var/list/pretty_ear_styles = list("Normal" = null) for(var/path in GLOB.legacy_ears_lookup) var/datum/sprite_accessory/ears/instance = GLOB.legacy_ears_lookup[path] - if((!instance.ckeys_allowed) || (ckey in instance.ckeys_allowed)) - pretty_ear_styles[instance.name] = path + pretty_ear_styles[instance.name] = path // Present choice to user var/new_ear_style = tgui_input_list(src, "Pick some ears!", "Character Preference", pretty_ear_styles) @@ -345,7 +333,7 @@ var/list/wrapped_species_by_ref = list() g_ears3 = new_color_rgb_list[2] b_ears3 = new_color_rgb_list[3] - update_hair() //Includes Virgo ears + render_spriteacc_ears() //Includes Virgo ears /mob/living/carbon/human/proc/shapeshifter_select_horns() set name = "Select Secondary Ears" @@ -359,8 +347,7 @@ var/list/wrapped_species_by_ref = list() var/list/pretty_horn_styles = list("Normal" = null) for(var/path in GLOB.legacy_ears_lookup) var/datum/sprite_accessory/ears/instance = GLOB.legacy_ears_lookup[path] - if((!instance.ckeys_allowed) || (ckey in instance.ckeys_allowed)) - pretty_horn_styles[instance.name] = path + pretty_horn_styles[instance.name] = path // Present choice to user var/new_horn_style = tgui_input_list(src, "Pick some secondary ears!", "Character Preference", pretty_horn_styles) @@ -399,7 +386,7 @@ var/list/wrapped_species_by_ref = list() g_horn3 = new_color_rgb_list[2] b_horn3 = new_color_rgb_list[3] - update_hair() //Includes Virgo ears + render_spriteacc_ears() //Includes Virgo ears /mob/living/carbon/human/proc/shapeshifter_select_tail() set name = "Select Tail" @@ -413,8 +400,7 @@ var/list/wrapped_species_by_ref = list() var/list/pretty_tail_styles = list("Normal" = null) for(var/path in GLOB.legacy_tail_lookup) var/datum/sprite_accessory/tail/instance = GLOB.legacy_tail_lookup[path] - if((!instance.ckeys_allowed) || (ckey in instance.ckeys_allowed)) - pretty_tail_styles[instance.name] = path + pretty_tail_styles[instance.name] = path // Present choice to user var/new_tail_style = tgui_input_list(src, "Pick a tail!", "Character Preference", pretty_tail_styles) @@ -453,7 +439,7 @@ var/list/wrapped_species_by_ref = list() g_tail3 = new_color_rgb_list[2] b_tail3 = new_color_rgb_list[3] - update_tail_showing() + render_spriteacc_tail() /mob/living/carbon/human/proc/shapeshifter_select_wings() set name = "Select Wings" @@ -467,8 +453,7 @@ var/list/wrapped_species_by_ref = list() var/list/pretty_wing_styles = list("None" = null) for(var/path in GLOB.legacy_wing_lookup) var/datum/sprite_accessory/wing/instance = GLOB.legacy_wing_lookup[path] - if((!instance.ckeys_allowed) || (ckey in instance.ckeys_allowed)) - pretty_wing_styles[instance.name] = path + pretty_wing_styles[instance.name] = path // Present choice to user var/new_wing_style = tgui_input_list(src, "Pick some wings!", "Character Preference", pretty_wing_styles) @@ -507,7 +492,7 @@ var/list/wrapped_species_by_ref = list() g_wing3 = new_color_rgb_list[2] b_wing3 = new_color_rgb_list[3] - update_wing_showing() + render_spriteacc_wings() /mob/living/carbon/human/proc/promethean_toggle_body_transparency() diff --git a/code/modules/species/station/adherent.dm b/code/modules/species/station/adherent.dm index e7f226da246e..81f4a8470fab 100644 --- a/code/modules/species/station/adherent.dm +++ b/code/modules/species/station/adherent.dm @@ -132,7 +132,7 @@ wikilink = "N/A" /datum/species/adherent/equip_survival_gear(mob/living/carbon/human/H, extendedtank = FALSE, comprehensive = FALSE) - H.equip_to_slot_or_del(new /obj/item/storage/belt/utility/crystal, /datum/inventory_slot_meta/abstract/put_in_backpack) + H.equip_to_slot_or_del(new /obj/item/storage/belt/utility/crystal, /datum/inventory_slot/abstract/put_in_backpack) /datum/species/adherent/New() /*equip_adjust = list( @@ -164,8 +164,8 @@ return slowdown */ /datum/species/adherent/handle_environment_special(mob/living/carbon/human/H, datum/gas_mixture/environment, dt) - for(var/i in H.overlays_standing) - H.cut_overlay(i) + for(var/key in H.standing_overlays) + H.cut_overlay(H.standing_overlays[key]) //Todo: find a better way to adjust clothing, than to wipe all overlays /datum/species/adherent/handle_fall_special(mob/living/carbon/human/H, turf/landing) diff --git a/code/modules/species/station/apidaen.dm b/code/modules/species/station/apidaen.dm index 8936204ce60d..e9f592dfe8e5 100644 --- a/code/modules/species/station/apidaen.dm +++ b/code/modules/species/station/apidaen.dm @@ -1,3 +1,4 @@ + /datum/species/apidaen uid = SPECIES_ID_APIDAEN id = SPECIES_ID_APIDAEN @@ -8,8 +9,10 @@ deform = 'icons/mob/species/apidaen/body.dmi' // No deformed set has been made yet. preview_icon = 'icons/mob/species/apidaen/preview.dmi' husk_icon = 'icons/mob/species/apidaen/husk.dmi' - tail = "tail" //Bee tail. I've desaturated it for the sprite sheet. - icobase_tail = 1 + + sprite_accessory_defaults = list( + SPRITE_ACCESSORY_SLOT_TAIL = /datum/sprite_accessory/tail/bodyset/apidean, + ) vision_innate = /datum/vision/baseline/species_tier_2 diff --git a/code/modules/species/station/custom_species.dm b/code/modules/species/station/custom_species.dm index 9f8b5d83a4f6..8a3cf1198e46 100644 --- a/code/modules/species/station/custom_species.dm +++ b/code/modules/species/station/custom_species.dm @@ -84,11 +84,11 @@ H.equip_to_slot_or_del(new /obj/item/clothing/mask/breath(H), SLOT_ID_MASK) if(H.backbag == 1) H.equip_to_slot_or_del(new /obj/item/tank/vox(H), SLOT_ID_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/vox(H), /datum/inventory_slot_meta/abstract/hand/right) + H.equip_to_slot_or_del(new /obj/item/storage/box/vox(H), /datum/inventory_slot/abstract/hand/right) H.internal = H.back else - H.equip_to_slot_or_del(new /obj/item/tank/vox(H), /datum/inventory_slot_meta/abstract/hand/right) - H.equip_to_slot_or_del(new /obj/item/storage/box/vox(H.back), /datum/inventory_slot_meta/abstract/put_in_backpack) + H.equip_to_slot_or_del(new /obj/item/tank/vox(H), /datum/inventory_slot/abstract/hand/right) + H.equip_to_slot_or_del(new /obj/item/storage/box/vox(H.back), /datum/inventory_slot/abstract/put_in_backpack) H.internal = H.r_hand H.internal = locate(/obj/item/tank) in H.contents if(istype(H.internal,/obj/item/tank) && H.internals) diff --git a/code/modules/species/station/diona.dm b/code/modules/species/station/diona.dm index 8439b7435c08..6c72a3d1bbd6 100644 --- a/code/modules/species/station/diona.dm +++ b/code/modules/species/station/diona.dm @@ -118,9 +118,9 @@ /datum/species/diona/equip_survival_gear(mob/living/carbon/human/H) if(H.backbag == 1) - H.equip_to_slot_or_del(new /obj/item/flashlight/flare(H), /datum/inventory_slot_meta/abstract/hand/right) + H.equip_to_slot_or_del(new /obj/item/flashlight/flare(H), /datum/inventory_slot/abstract/hand/right) else - H.equip_to_slot_or_del(new /obj/item/flashlight/flare(H.back), /datum/inventory_slot_meta/abstract/put_in_backpack) + H.equip_to_slot_or_del(new /obj/item/flashlight/flare(H.back), /datum/inventory_slot/abstract/put_in_backpack) /datum/species/diona/handle_death(mob/living/carbon/human/H) diff --git a/code/modules/species/station/monkey.dm b/code/modules/species/station/monkey.dm index 7c198c538089..d4ca2e39ec71 100644 --- a/code/modules/species/station/monkey.dm +++ b/code/modules/species/station/monkey.dm @@ -23,7 +23,11 @@ gibbed_anim = "gibbed-m" dusted_anim = "dust-m" death_message = "lets out a faint chimper as it collapses and stops moving..." - tail = "chimptail" + + sprite_accessory_defaults = list( + SPRITE_ACCESSORY_SLOT_TAIL = /datum/sprite_accessory/tail/bodyset/monkey/chimp, + ) + fire_icon_state = "monkey" unarmed_types = list(/datum/unarmed_attack/bite, /datum/unarmed_attack/claws) @@ -84,7 +88,10 @@ intrinsic_languages = LANGUAGE_ID_FARWA flesh_color = "#AFA59E" base_color = "#333333" - tail = "farwatail" + + sprite_accessory_defaults = list( + SPRITE_ACCESSORY_SLOT_TAIL = /datum/sprite_accessory/tail/bodyset/monkey/farwa, + ) /datum/species/monkey/skrell name = SPECIES_MONKEY_SKRELL @@ -100,7 +107,8 @@ flesh_color = "#8CD7A3" blood_color = "#1D2CBF" reagent_tag = IS_SKRELL - tail = null + + sprite_accessory_defaults = list() /datum/species/monkey/unathi name = SPECIES_MONKEY_UNATHI @@ -110,7 +118,10 @@ icobase = 'icons/mob/species/monkey/body_stok.dmi' deform = 'icons/mob/species/monkey/body_stok.dmi' - tail = "stoktail" + sprite_accessory_defaults = list( + SPRITE_ACCESSORY_SLOT_TAIL = /datum/sprite_accessory/tail/bodyset/monkey/stok, + ) + greater_form = SPECIES_UNATHI default_language = LANGUAGE_ID_STOK intrinsic_languages = LANGUAGE_ID_STOK @@ -125,7 +136,9 @@ icobase = 'icons/mob/species/monkey/body_sobaka.dmi' deform = 'icons/mob/species/monkey/body_sobaka.dmi' - tail = null //The tail is part of its body due to tail using the "icons/effects/species.dmi" file. It must be null, or they'll have a chimp tail. + + sprite_accessory_defaults = list() + greater_form = SPECIES_AKULA default_language = LANGUAGE_ID_SKRELL //Closest we have. intrinsic_languages = LANGUAGE_ID_SKRELL @@ -137,7 +150,9 @@ icobase = 'icons/mob/species/monkey/body_sergaling.dmi' deform = 'icons/mob/species/monkey/body_sergaling.dmi' - tail = null + + sprite_accessory_defaults = list() + default_language = LANGUAGE_ID_NARAMADI intrinsic_languages = LANGUAGE_ID_NARAMADI @@ -148,7 +163,9 @@ greater_form = SPECIES_NEVREAN icobase = 'icons/mob/species/monkey/body_sparra.dmi' deform = 'icons/mob/species/monkey/body_sparra.dmi' - tail = null + + sprite_accessory_defaults = list() + default_language = LANGUAGE_ID_BIRDSONG intrinsic_languages = LANGUAGE_ID_BIRDSONG @@ -181,7 +198,8 @@ intrinsic_languages = LANGUAGE_ID_VULPKANIN flesh_color = "#966464" base_color = "#000000" - tail = null + + sprite_accessory_defaults = list() //INSERT CODE HERE SO MONKEYS CAN BE SPAWNED. //Also, M was added to the end of the spawn names to signify that it's a monkey, since some names were conflicting. diff --git a/code/modules/species/station/rapala.dm b/code/modules/species/station/rapala.dm index ec9d2fcea5c0..d1bf832f5dfe 100644 --- a/code/modules/species/station/rapala.dm +++ b/code/modules/species/station/rapala.dm @@ -8,8 +8,10 @@ deform = 'icons/mob/species/rapala/deformed_body.dmi' preview_icon = 'icons/mob/species/rapala/preview.dmi' husk_icon = 'icons/mob/species/rapala/husk.dmi' - tail = "tail" - icobase_tail = 1 + + sprite_accessory_defaults = list( + SPRITE_ACCESSORY_SLOT_TAIL = /datum/sprite_accessory/tail/bodyset/rapala, + ) max_additional_languages = 3 name_language = null diff --git a/code/modules/species/station/standard/akula.dm b/code/modules/species/station/standard/akula.dm index 843f3bca5c84..3abeba3b9cbe 100644 --- a/code/modules/species/station/standard/akula.dm +++ b/code/modules/species/station/standard/akula.dm @@ -10,8 +10,10 @@ preview_icon = 'icons/mob/species/akula/preview.dmi' husk_icon = 'icons/mob/species/akula/husk.dmi' default_bodytype = BODYTYPE_AKULA - tail = "tail" - icobase_tail = 1 + + sprite_accessory_defaults = list( + SPRITE_ACCESSORY_SLOT_TAIL = /datum/sprite_accessory/tail/bodyset/akula, + ) blurb = {" The Akula are a species of amphibious humanoids like the Skrell, but have an appearance very similar to that of a shark. diff --git a/code/modules/species/station/standard/krisitik.dm b/code/modules/species/station/standard/krisitik.dm index 5db3ae728093..1cf0c620b287 100644 --- a/code/modules/species/station/standard/krisitik.dm +++ b/code/modules/species/station/standard/krisitik.dm @@ -10,8 +10,9 @@ preview_icon = 'icons/mob/species/krisitik/preview.dmi' husk_icon = 'icons/mob/species/krisitik/husk.dmi' - tail = "tail" - icobase_tail = 1 + sprite_accessory_defaults = list( + SPRITE_ACCESSORY_SLOT_TAIL = /datum/sprite_accessory/tail/bodyset/krisitik, + ) max_additional_languages = 3 name_language = LANGUAGE_ID_SQUEAKISH diff --git a/code/modules/species/station/standard/moth.dm b/code/modules/species/station/standard/moth.dm index 9e416179ea4d..312bcadda85b 100644 --- a/code/modules/species/station/standard/moth.dm +++ b/code/modules/species/station/standard/moth.dm @@ -21,7 +21,11 @@ GLOBAL_LIST_INIT(moth_lore_data, init_moth_lore()) icobase = 'icons/mob/species/moth/body.dmi' deform = 'icons/mob/species/moth/body.dmi' - wing = "moth_plain" + sprite_accessory_defaults = list( + SPRITE_ACCESSORY_SLOT_EARS = /datum/sprite_accessory/ears/bodyset/moth, + SPRITE_ACCESSORY_SLOT_WINGS = /datum/sprite_accessory/wing/bodyset/moth, + ) + unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws, /datum/unarmed_attack/bite/sharp) vision_innate = /datum/vision/baseline/species_tier_2 diff --git a/code/modules/species/station/standard/naramadi.dm b/code/modules/species/station/standard/naramadi.dm index 3695b7a170df..8ea4b78c40b0 100644 --- a/code/modules/species/station/standard/naramadi.dm +++ b/code/modules/species/station/standard/naramadi.dm @@ -7,9 +7,11 @@ default_bodytype = BODYTYPE_SERGAL icobase = 'icons/mob/species/naramadi/body.dmi' deform = 'icons/mob/species/naramadi/deformed_body.dmi' - tail = "tail" - icobase_tail = 1 + sprite_accessory_defaults = list( + SPRITE_ACCESSORY_SLOT_TAIL = /datum/sprite_accessory/tail/bodyset/naramadi, + ) + slowdown = -0.25 snow_movement = -1 // Ignores light snow //darksight = 8 diff --git a/code/modules/species/station/standard/nevrean.dm b/code/modules/species/station/standard/nevrean.dm index 5c1b981cef88..60d21842909a 100644 --- a/code/modules/species/station/standard/nevrean.dm +++ b/code/modules/species/station/standard/nevrean.dm @@ -10,8 +10,10 @@ deform = 'icons/mob/species/nevrean/deformed_body.dmi' preview_icon = 'icons/mob/species/nevrean/preview.dmi' husk_icon = 'icons/mob/species/nevrean/husk.dmi' - tail = "tail" - icobase_tail = 1 + + sprite_accessory_defaults = list( + SPRITE_ACCESSORY_SLOT_TAIL = /datum/sprite_accessory/tail/bodyset/nevrean, + ) blurb = {" Nevreans are a race of avian and dinosaur-like creatures living on Tal. They belong to a group of races that hails from Eltus, diff --git a/code/modules/species/station/standard/tajaran.dm b/code/modules/species/station/standard/tajaran.dm index 288b1ab0a030..1f12598f48ad 100644 --- a/code/modules/species/station/standard/tajaran.dm +++ b/code/modules/species/station/standard/tajaran.dm @@ -15,8 +15,10 @@ deform = 'icons/mob/species/tajaran/deformed_body_greyscale.dmi' preview_icon = 'icons/mob/species/tajaran/preview.dmi' husk_icon = 'icons/mob/species/tajaran/husk.dmi' - tail = "tajtail" - tail_animation = 'icons/mob/species/tajaran/tail_greyscale.dmi' + + sprite_accessory_defaults = list( + SPRITE_ACCESSORY_SLOT_TAIL = /datum/sprite_accessory/tail/bodyset/tajaran, + ) max_additional_languages = 3 name_language = /datum/language/tajaran diff --git a/code/modules/species/station/standard/teshari.dm b/code/modules/species/station/standard/teshari.dm index 2ba15cae12be..269ce2ff490a 100644 --- a/code/modules/species/station/standard/teshari.dm +++ b/code/modules/species/station/standard/teshari.dm @@ -27,16 +27,16 @@ suit_storage_icon = 'icons/mob/clothing/species/teshari/belt_mirror.dmi' fire_icon_state = "generic" // Humanoid is too big for them and spriting a new one is really annoying. - tail = "teshtail" - tail_hair = "feathers" - icobase_tail = 1 + sprite_accessory_defaults = list( + SPRITE_ACCESSORY_SLOT_TAIL = /datum/sprite_accessory/tail/bodyset/teshari, + ) max_additional_languages = 3 name_language = LANGUAGE_ID_TESHARI intrinsic_languages = LANGUAGE_ID_TESHARI whitelist_languages = list( LANGUAGE_ID_TESHARI, - LANGUAGE_ID_SKRELL + LANGUAGE_ID_SKRELL, ) male_cough_sounds = list('sound/effects/mob_effects/tesharicougha.ogg', 'sound/effects/mob_effects/tesharicoughb.ogg') diff --git a/code/modules/species/station/standard/unathi.dm b/code/modules/species/station/standard/unathi.dm index 51b906ec8009..06175054ae6d 100644 --- a/code/modules/species/station/standard/unathi.dm +++ b/code/modules/species/station/standard/unathi.dm @@ -18,8 +18,10 @@ deform = 'icons/mob/species/unathi/deformed_body_greyscale.dmi' husk_icon = 'icons/mob/species/unathi/husk.dmi' preview_icon = 'icons/mob/species/unathi/preview.dmi' - tail = "sogtail" - tail_animation = 'icons/mob/species/unathi/tail_greyscale.dmi' + + sprite_accessory_defaults = list( + SPRITE_ACCESSORY_SLOT_TAIL = /datum/sprite_accessory/tail/bodyset/unathi, + ) blurb = {" A heavily reptillian species, Unathi hail from the Uuosa-Eso system, which roughly translates to 'burning mother'. diff --git a/code/modules/species/station/standard/unathidigi.dm b/code/modules/species/station/standard/unathidigi.dm index ed5f2d739819..91567adb686f 100644 --- a/code/modules/species/station/standard/unathidigi.dm +++ b/code/modules/species/station/standard/unathidigi.dm @@ -8,8 +8,10 @@ deform = 'icons/mob/species/unathidigi/deformed_body.dmi' husk_icon = 'icons/mob/species/unathidigi/husk.dmi' preview_icon = 'icons/mob/species/unathidigi/preview.dmi' - tail = "sogtail" - tail_animation = 'icons/mob/species/unathidigi/tail.dmi' + + sprite_accessory_defaults = list( + SPRITE_ACCESSORY_SLOT_TAIL = /datum/sprite_accessory/tail/bodyset/unathi, + ) blurb = {" As a result of the many challenges of living on Moghes and other worlds, Unathi have become morphologically diverse. diff --git a/code/modules/species/station/standard/vulpkanin.dm b/code/modules/species/station/standard/vulpkanin.dm index 63d3c4b43572..0c4341bba4bb 100644 --- a/code/modules/species/station/standard/vulpkanin.dm +++ b/code/modules/species/station/standard/vulpkanin.dm @@ -11,8 +11,9 @@ preview_icon = 'icons/mob/species/vulpkanin/preview.dmi' husk_icon = 'icons/mob/species/vulpkanin/husk.dmi' - tail = "vulptail" - tail_animation = 'icons/mob/clothing/species/vulpkanin/tail.dmi' // probably need more than just one of each, but w/e + sprite_accessory_defaults = list( + SPRITE_ACCESSORY_SLOT_TAIL = /datum/sprite_accessory/tail/bodyset/vulpkanin, + ) max_additional_languages = 3 name_language = LANGUAGE_ID_VULPKANIN diff --git a/code/modules/species/station/standard/zaddat.dm b/code/modules/species/station/standard/zaddat.dm index 14cfb58db951..83680c9daf29 100644 --- a/code/modules/species/station/standard/zaddat.dm +++ b/code/modules/species/station/standard/zaddat.dm @@ -118,7 +118,7 @@ if(H.backbag == 1) H.put_in_hands_or_del(L) else - H.equip_to_slot_or_del(L, /datum/inventory_slot_meta/abstract/put_in_backpack) + H.equip_to_slot_or_del(L, /datum/inventory_slot/abstract/put_in_backpack) /datum/species/zaddat/handle_environment_special(mob/living/carbon/human/H, datum/gas_mixture/environment, dt) diff --git a/code/modules/species/station/standard/zorren.dm b/code/modules/species/station/standard/zorren.dm index f85fef1614ce..b4030ab65585 100644 --- a/code/modules/species/station/standard/zorren.dm +++ b/code/modules/species/station/standard/zorren.dm @@ -9,8 +9,10 @@ icobase = 'icons/mob/species/zorren_hi/body_greyscale.dmi' deform = 'icons/mob/species/zorren_hi/deformed_body.dmi' - tail = "tail" - icobase_tail = 1 + + sprite_accessory_defaults = list( + SPRITE_ACCESSORY_SLOT_TAIL = /datum/sprite_accessory/tail/bodyset/zorren_highlander, + ) max_additional_languages = 3 intrinsic_languages = LANGUAGE_ID_TERMINUS @@ -75,8 +77,10 @@ icobase = 'icons/mob/species/zorren_fl/body_greyscale.dmi' deform = 'icons/mob/species/zorren_fl/deformed_body.dmi' - tail = "tail" - icobase_tail = 1 + + sprite_accessory_defaults = list( + SPRITE_ACCESSORY_SLOT_TAIL = /datum/sprite_accessory/tail/bodyset/zorren_flatlander, + ) max_additional_languages = 3 intrinsic_languages = LANGUAGE_ID_TERMINUS diff --git a/code/modules/species/station/vasilissan.dm b/code/modules/species/station/vasilissan.dm index 1d511efa7348..aa81d3fd530e 100644 --- a/code/modules/species/station/vasilissan.dm +++ b/code/modules/species/station/vasilissan.dm @@ -8,8 +8,10 @@ deform = 'icons/mob/species/vasilissan/deformed_body.dmi' preview_icon = 'icons/mob/species/vasilissan/preview.dmi' husk_icon = 'icons/mob/species/vasilissan/husk.dmi' - tail = "tail" // Spider tail. - icobase_tail = 1 + + sprite_accessory_defaults = list( + SPRITE_ACCESSORY_SLOT_TAIL = /datum/sprite_accessory/tail/bodyset/vasilissan, + ) vision_innate = /datum/vision/baseline/species_tier_2 slowdown = -0.15 // Small speedboost, as they've got a bunch of legs. Or something. I dunno. diff --git a/code/modules/species/station/werebeast.dm b/code/modules/species/station/werebeast.dm index 684835482631..398e3d24d99d 100644 --- a/code/modules/species/station/werebeast.dm +++ b/code/modules/species/station/werebeast.dm @@ -10,7 +10,6 @@ icobase = 'icons/mob/species/werebeast/body.dmi' deform = 'icons/mob/species/werebeast/deformed_body.dmi' preview_icon = 'icons/mob/species/werebeast/preview.dmi' - tail = "tail" max_additional_languages = 3 intrinsic_languages = LANGUAGE_ID_VULPKANIN diff --git a/code/modules/species/station/xenochimera.dm b/code/modules/species/station/xenochimera.dm index 16b54032d5ba..c82cf52a1892 100644 --- a/code/modules/species/station/xenochimera.dm +++ b/code/modules/species/station/xenochimera.dm @@ -17,8 +17,6 @@ deform = 'icons/mob/species/xenochimera/deformed_body.dmi' preview_icon = 'icons/mob/species/xenochimera/preview.dmi' husk_icon = 'icons/mob/species/xenochimera/husk.dmi' - tail = "tail" //Scree's tail. Can be disabled in the Species Customization tab by choosing "hide species specific tail sprite" - icobase_tail = 1 max_additional_languages = 5 @@ -526,13 +524,17 @@ switch(atmos_biomorph) if("flexible") target.species.warning_low_pressure = WARNING_LOW_PRESSURE - target.species.hazard_low_pressure = -1 + target.species.hazard_low_pressure = HAZARD_LOW_PRESSURE target.species.warning_high_pressure = WARNING_HIGH_PRESSURE target.species.hazard_high_pressure = HAZARD_HIGH_PRESSURE if("compact") target.species.warning_low_pressure = 50 - target.species.hazard_low_pressure = -1 + target.species.hazard_low_pressure = 0 + target.species.warning_high_pressure = WARNING_HIGH_PRESSURE + target.species.hazard_high_pressure = HAZARD_HIGH_PRESSURE if("elastic") + target.species.warning_low_pressure = WARNING_LOW_PRESSURE + target.species.hazard_low_pressure = HAZARD_LOW_PRESSURE target.species.warning_high_pressure = WARNING_HIGH_PRESSURE + 200 target.species.hazard_high_pressure = HAZARD_HIGH_PRESSURE + 400 diff --git a/code/modules/species/station/xenomorph_hybrids/xeno_hybrids.dm b/code/modules/species/station/xenomorph_hybrids/xeno_hybrids.dm index e9b3287f2401..4f807228f546 100644 --- a/code/modules/species/station/xenomorph_hybrids/xeno_hybrids.dm +++ b/code/modules/species/station/xenomorph_hybrids/xeno_hybrids.dm @@ -18,8 +18,10 @@ "Alternate" = "alt", ) - tail = "tail" - icobase_tail = 1 + sprite_accessory_defaults = list( + SPRITE_ACCESSORY_SLOT_TAIL = /datum/sprite_accessory/tail/bodyset/xenohybrid, + ) + unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws, /datum/unarmed_attack/bite/sharp) max_additional_languages = 2 diff --git a/code/modules/species/virtual_reality/opaque_form.dm b/code/modules/species/virtual_reality/opaque_form.dm index 6dd3b09165a2..485005bee4a6 100644 --- a/code/modules/species/virtual_reality/opaque_form.dm +++ b/code/modules/species/virtual_reality/opaque_form.dm @@ -28,8 +28,11 @@ name = SPECIES_VR_UNATHI icobase = 'icons/mob/species/unathi/body_greyscale.dmi' deform = 'icons/mob/species/unathi/deformed_body_greyscale.dmi' - tail = "sogtail" - tail_animation = 'icons/mob/species/unathi/tail_greyscale.dmi' + + sprite_accessory_defaults = list( + SPRITE_ACCESSORY_SLOT_TAIL = /datum/sprite_accessory/tail/bodyset/unathi, + ) + species_appearance_flags = HAS_HAIR_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_EYE_COLOR has_limbs = list( BP_TORSO = list("path" = /obj/item/organ/external/chest/unathi), @@ -51,8 +54,11 @@ name = "Virtual Reality Tajaran" icobase = 'icons/mob/species/tajaran/body_greyscale.dmi' deform = 'icons/mob/species/tajaran/deformed_body_greyscale.dmi' - tail = "tajtail" - tail_animation = 'icons/mob/species/tajaran/tail_greyscale.dmi' + + sprite_accessory_defaults = list( + SPRITE_ACCESSORY_SLOT_TAIL = /datum/sprite_accessory/tail/bodyset/tajaran, + ) + species_appearance_flags = HAS_HAIR_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_EYE_COLOR has_limbs = list( BP_TORSO = list("path" = /obj/item/organ/external/chest), diff --git a/code/modules/species/xenomorphs/alien_species.dm b/code/modules/species/xenomorphs/alien_species.dm index dea33584e26f..972c372e55c5 100644 --- a/code/modules/species/xenomorphs/alien_species.dm +++ b/code/modules/species/xenomorphs/alien_species.dm @@ -173,8 +173,10 @@ caste_name = "drone" weeds_plasma_rate = 15 slowdown = 1 - tail = "xenos_drone_tail" - //rarity_value = 5 + + sprite_accessory_defaults = list( + SPRITE_ACCESSORY_SLOT_TAIL = /datum/sprite_accessory/tail/bodyset/xenomorph/drone, + ) icobase = 'icons/mob/species/xenomorph/drone.dmi' deform = 'icons/mob/species/xenomorph/drone.dmi' @@ -213,7 +215,10 @@ caste_name = "hunter" slowdown = -2 total_health = 150 - tail = "xenos_hunter_tail" + + sprite_accessory_defaults = list( + SPRITE_ACCESSORY_SLOT_TAIL = /datum/sprite_accessory/tail/bodyset/xenomorph/hunter, + ) icobase = 'icons/mob/species/xenomorph/hunter.dmi' deform = 'icons/mob/species/xenomorph/hunter.dmi' @@ -244,7 +249,10 @@ caste_name = "sentinel" slowdown = 0 total_health = 200 - tail = "xenos_sentinel_tail" + + sprite_accessory_defaults = list( + SPRITE_ACCESSORY_SLOT_TAIL = /datum/sprite_accessory/tail/bodyset/xenomorph/sentinel, + ) icobase = 'icons/mob/species/xenomorph/sentinel.dmi' deform = 'icons/mob/species/xenomorph/sentinel.dmi' @@ -278,8 +286,10 @@ weeds_plasma_rate = 20 caste_name = "queen" slowdown = 4 - tail = "xenos_queen_tail" - //rarity_value = 10 + + sprite_accessory_defaults = list( + SPRITE_ACCESSORY_SLOT_TAIL = /datum/sprite_accessory/tail/bodyset/xenomorph/queen, + ) icobase = 'icons/mob/species/xenomorph/queen.dmi' deform = 'icons/mob/species/xenomorph/queen.dmi' diff --git a/code/modules/sprite_accessories/README.md b/code/modules/sprite_accessories/README.md new file mode 100644 index 000000000000..33c1d5adfd06 --- /dev/null +++ b/code/modules/sprite_accessories/README.md @@ -0,0 +1,3 @@ +# Sprite Accessories + +The sprite accessory system is used to make renderable mob-addons that, as its name implies, is a sprite accessory and does not otherwise impact the mob's function. diff --git a/code/modules/sprite_accessories/ears/_ears.dm b/code/modules/sprite_accessories/ears.dm similarity index 85% rename from code/modules/sprite_accessories/ears/_ears.dm rename to code/modules/sprite_accessories/ears.dm index 6f62acd2bedf..c8d0e44825e8 100644 --- a/code/modules/sprite_accessories/ears/_ears.dm +++ b/code/modules/sprite_accessories/ears.dm @@ -4,7 +4,7 @@ icon = 'icons/mob/sprite_accessories/ears.dmi' do_colouration = 0 // Set to 1 to blend (ICON_ADD) hair color - color_blend_mode = ICON_ADD // Only appliciable if do_coloration = 1 + legacy_use_additive_color_matrix = TRUE // Only appliciable if do_coloration = 1 var/desc = "You should not see this..." // todo: sort ears by something that makes sense diff --git a/code/modules/sprite_accessories/ears/animal/bovine.dm b/code/modules/sprite_accessories/ears/animal/bovine.dm index 1f1011f58844..9de2ffaa6b35 100644 --- a/code/modules/sprite_accessories/ears/animal/bovine.dm +++ b/code/modules/sprite_accessories/ears/animal/bovine.dm @@ -9,14 +9,14 @@ id = "ears_cow_colorable" icon_state = "cow-c" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/cow_nohorns name = "cow, no horns" id = "ears_cow_nohorns" icon_state = "cow-nohorns" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE //? sheep /datum/sprite_accessory/ears/ram @@ -24,4 +24,4 @@ id = "ears_ram" icon_state = "ram" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/ears/animal/canid.dm b/code/modules/sprite_accessories/ears/animal/canid.dm index 31faf4f2e74d..c3c54b2e3b32 100644 --- a/code/modules/sprite_accessories/ears/animal/canid.dm +++ b/code/modules/sprite_accessories/ears/animal/canid.dm @@ -10,7 +10,7 @@ icon_state = "fenearshc" extra_overlay = "fenears-inner" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/foxears name = "highlander zorren ears" @@ -22,7 +22,7 @@ id = "ears_zorren_high_color" icon_state = "foxearshc" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/sandfox name = "Sandfox Ears" @@ -31,7 +31,7 @@ icon_state = "sandfox" extra_overlay = "sandfox-inner" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE //? vulp /datum/sprite_accessory/ears/vulp @@ -39,7 +39,7 @@ id = "ears_vulp_dual" icon_state = "vulp" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "vulp-inner" /datum/sprite_accessory/ears/vulp_jackal @@ -47,7 +47,7 @@ id = "ears_vulp_thin_dual" icon_state = "vulp_jackal" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "vulp_jackal-inner" /datum/sprite_accessory/ears/vulp_short @@ -55,14 +55,14 @@ id = "ears_vulp_short" icon_state = "vulp_terrier" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/vulp_short_dc name = "vulpkanin short, dual-color" id = "ears_vulp_short_dual" icon_state = "vulp_terrier" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "vulp_terrier-inner" //? wolf @@ -76,7 +76,7 @@ id = "ears_wolf_color" icon_state = "wolf" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "wolfinner" /datum/sprite_accessory/ears/wolf_green @@ -94,4 +94,4 @@ id = "lab_ears" icon_state = "lab" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/ears/animal/cervid.dm b/code/modules/sprite_accessories/ears/animal/cervid.dm index 519ca41609a3..3ce56b68b7d2 100644 --- a/code/modules/sprite_accessories/ears/animal/cervid.dm +++ b/code/modules/sprite_accessories/ears/animal/cervid.dm @@ -4,21 +4,21 @@ id = "ears_antlers_crown" icon_state = "antlercrown" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/antlers name = "antlers" id = "ears_antlers" icon_state = "antlers" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/antlers_e name = "antlers with ears" id = "ears_antlers_nohorns" icon_state = "cow-nohorns" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "antlers_mark" /datum/sprite_accessory/ears/antlers_large @@ -27,21 +27,21 @@ icon = 'icons/mob/sprite_accessories/ears_32x64.dmi' icon_state = "antlers_large" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/smallantlers name = "small antlers" id = "ears_antlers_small" icon_state = "smallantlers" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/smallantlers_e name = "small antlers with ears" id = "ears_antlers_small_ear" icon_state = "smallantlers" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "deer" //? deer @@ -50,4 +50,4 @@ id = "ears_deer" icon_state = "deer" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/ears/animal/equine.dm b/code/modules/sprite_accessories/ears/animal/equine.dm index 0cff4f18bae2..9ce0a57c1aca 100644 --- a/code/modules/sprite_accessories/ears/animal/equine.dm +++ b/code/modules/sprite_accessories/ears/animal/equine.dm @@ -4,5 +4,5 @@ id = "ears_donkey" icon_state = "donkey" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "otie-inner" diff --git a/code/modules/sprite_accessories/ears/animal/feline.dm b/code/modules/sprite_accessories/ears/animal/feline.dm index 69c2cf40c9e7..8801297eaa2a 100644 --- a/code/modules/sprite_accessories/ears/animal/feline.dm +++ b/code/modules/sprite_accessories/ears/animal/feline.dm @@ -4,7 +4,7 @@ id = "ears_kitty_color" icon_state = "kitty" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "kittyinner" /datum/sprite_accessory/ears/kittyr @@ -13,6 +13,6 @@ icon = 'icons/mob/sprite_accessories/ears_uneven.dmi' icon_state = "kittyrinner" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "kittyr" diff --git a/code/modules/sprite_accessories/ears/animal/leporid.dm b/code/modules/sprite_accessories/ears/animal/leporid.dm index 569023d9c8a3..b454b9c196a8 100644 --- a/code/modules/sprite_accessories/ears/animal/leporid.dm +++ b/code/modules/sprite_accessories/ears/animal/leporid.dm @@ -7,7 +7,7 @@ extra_overlay = "bnnuy-inner" extra_overlay2 = "bnnuy-tips" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/bnnuy2 name = "Bnnuy Ears 2" @@ -17,7 +17,7 @@ extra_overlay = "bnnuy-inner" extra_overlay2 = "bnnuy-tips2" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/bunnyalt name = "bunny 2, dual-color" @@ -25,21 +25,21 @@ icon_state = "bunny-alt" extra_overlay = "bunny-alt-inner" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/bunnyhc name = "bunny, colorable" id = "ears_bunny_colorable" icon_state = "bunny" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/bunny_floppy name = "floppy bunny ears (colorable)" id = "ears_bunny_floppy" icon_state = "floppy_bun" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/bunny_tall name = "Bunny Tall Ears" @@ -48,7 +48,7 @@ icon_state = "bunny-tall" extra_overlay = "bunny-tall-inner" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/bunny_white name = "bunny, white" @@ -61,11 +61,11 @@ icon = 'icons/mob/sprite_accessories/ears_32x64.dmi' icon_state = "rabbit-swept" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/swooped_bunny name = "Swooped bunny ears (colorable)" id = "ears_bunny_swoop" icon_state = "swooped_bunny" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/ears/animal/murid.dm b/code/modules/sprite_accessories/ears/animal/murid.dm index 69bc7e472c55..d6ff55fac90a 100644 --- a/code/modules/sprite_accessories/ears/animal/murid.dm +++ b/code/modules/sprite_accessories/ears/animal/murid.dm @@ -4,7 +4,7 @@ id = "ears_mouse" icon_state = "mouse" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "mouseinner" /datum/sprite_accessory/ears/mousehcno @@ -12,7 +12,7 @@ id = "ears_mouse_outer" icon_state = "mouse" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/mouse_grey name = "mouse, grey" diff --git a/code/modules/sprite_accessories/ears/animal/sciurid.dm b/code/modules/sprite_accessories/ears/animal/sciurid.dm index 19c2691fd254..ccf44f53c983 100644 --- a/code/modules/sprite_accessories/ears/animal/sciurid.dm +++ b/code/modules/sprite_accessories/ears/animal/sciurid.dm @@ -4,7 +4,7 @@ id = "ears_squirrel_color" icon_state = "squirrel" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/squirrel_orange name = "squirel, orange" diff --git a/code/modules/sprite_accessories/ears/animal/shark.dm b/code/modules/sprite_accessories/ears/animal/shark.dm index af1f41c6c5ea..b5e042057265 100644 --- a/code/modules/sprite_accessories/ears/animal/shark.dm +++ b/code/modules/sprite_accessories/ears/animal/shark.dm @@ -3,7 +3,7 @@ id = "shark_ears" icon_state = "shark_ears" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/sharkears/upper name = "shark ears upper" @@ -20,7 +20,7 @@ id = "shark_fin" icon_state = "shark_fin" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/sharkfinalt name = "shark fin alt" diff --git a/code/modules/sprite_accessories/ears/animal/ursid.dm b/code/modules/sprite_accessories/ears/animal/ursid.dm index b808873fd15f..4c60373c7aeb 100644 --- a/code/modules/sprite_accessories/ears/animal/ursid.dm +++ b/code/modules/sprite_accessories/ears/animal/ursid.dm @@ -14,11 +14,11 @@ id = "ears_bear_colorable" icon_state = "bear" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/smallbear name = "small bear" id = "ears_bear_small" icon_state = "smallbear" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/ears/antenna.dm b/code/modules/sprite_accessories/ears/antenna.dm index 1d7624df62bb..955af54f9516 100644 --- a/code/modules/sprite_accessories/ears/antenna.dm +++ b/code/modules/sprite_accessories/ears/antenna.dm @@ -3,32 +3,32 @@ id = "ears_antenna" icon_state = "antennae" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/curly_bug name = "curly antennae, colorable" id = "ears_antenna_curly" icon_state = "curly_bug" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/dual_robot name = "synth antennae, colorable" id = "ears_antenna_synth_dual" icon_state = "dual_robot_antennae" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/left_robot name = "left synth, colorable" id = "ears_antenna_synth_left" icon_state = "left_robot_antennae" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/right_robot name = "right synth, colorable" id = "ears_antenna_synth_right" icon_state = "right_robot_antennae" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/ears/fictional/demon.dm b/code/modules/sprite_accessories/ears/fictional/demon.dm index 841ec4656c0e..0a2139c1258a 100644 --- a/code/modules/sprite_accessories/ears/fictional/demon.dm +++ b/code/modules/sprite_accessories/ears/fictional/demon.dm @@ -8,28 +8,28 @@ id = "ears_demon_colorable" icon_state = "demon-horns1_c" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/demon_horns2 name = "demon horns, colorable(outward)" id = "ears_demon_colorable_out" icon_state = "demon-horns2" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/demon_horns3 name = "demon horns, colorable(upward)" id = "ears_demon_colorable_up" icon_state = "demon-horns3" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/demon_horns4 name = "demon horns, colorable ring(upward)" id = "ears_demon_colorable_up2" icon_state = "demon-horns4" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "demon-horns4-ring" /datum/sprite_accessory/ears/demon_horns5 @@ -37,4 +37,4 @@ id = "ears_demon_colorable_stub" icon_state = "demon-horns5" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/ears/fictional/draconic.dm b/code/modules/sprite_accessories/ears/fictional/draconic.dm index 830649977213..c08c31ccf393 100644 --- a/code/modules/sprite_accessories/ears/fictional/draconic.dm +++ b/code/modules/sprite_accessories/ears/fictional/draconic.dm @@ -3,18 +3,18 @@ id = "ears_dragon" icon_state = "dragon-horns" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/drake name = "drake frills" id = "ears_drake" icon_state = "drake" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/large_dragon name = "vary large dragon horns" id = "ears_dragon_verybig" icon_state = "big_liz" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/ears/fictional/elf.dm b/code/modules/sprite_accessories/ears/fictional/elf.dm index e4f0c670cc7b..064152d0c839 100644 --- a/code/modules/sprite_accessories/ears/fictional/elf.dm +++ b/code/modules/sprite_accessories/ears/fictional/elf.dm @@ -3,18 +3,18 @@ id = "ears_elf" icon_state = "elfs" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/elfshort name = "elven ears (short)" id = "ears_elf_short" icon_state = "elfshort" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/floppyelf name = "floppy elven ears" id = "ears_elf_floppy" icon_state = "floppy-elf" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/ears/fictional/halo.dm b/code/modules/sprite_accessories/ears/fictional/halo.dm index 41a7035f0785..4eead50aa4a1 100644 --- a/code/modules/sprite_accessories/ears/fictional/halo.dm +++ b/code/modules/sprite_accessories/ears/fictional/halo.dm @@ -6,25 +6,25 @@ id = "halo_simple" icon_state = "halosimple" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/halosimpleshatter name = "halo - simple shattered" id = "halo_simple_shatter" icon_state = "halosimpleshatter" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/halobasicangel name = "halo - basic" id = "halo_basic_angel" icon_state = "halobasic" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/halobasicshatter name = "halo - basic shattered" id = "halo_basic_shatter" icon_state = "halobasicshatter" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/ears/fictional/jackalope.dm b/code/modules/sprite_accessories/ears/fictional/jackalope.dm index 3b964e5b4215..aae93584f16f 100644 --- a/code/modules/sprite_accessories/ears/fictional/jackalope.dm +++ b/code/modules/sprite_accessories/ears/fictional/jackalope.dm @@ -5,4 +5,4 @@ icon_state = "jackalope" extra_overlay = "jackalope-antlers" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/ears/fictional/oni.dm b/code/modules/sprite_accessories/ears/fictional/oni.dm index 9e4d2639083f..78d642acaaa2 100644 --- a/code/modules/sprite_accessories/ears/fictional/oni.dm +++ b/code/modules/sprite_accessories/ears/fictional/oni.dm @@ -7,5 +7,5 @@ name = "oni horns, colorable" id = "ears_oni_color" icon_state = "oni-h1_c" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + do_colouration = TRUE + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/ears/fictional/otie.dm b/code/modules/sprite_accessories/ears/fictional/otie.dm index e5b6e55f23ad..6ee1be34ecd0 100644 --- a/code/modules/sprite_accessories/ears/fictional/otie.dm +++ b/code/modules/sprite_accessories/ears/fictional/otie.dm @@ -3,5 +3,5 @@ id = "ears_otie" icon_state = "otie" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "otie-inner" diff --git a/code/modules/sprite_accessories/ears/fictional/sergal.dm b/code/modules/sprite_accessories/ears/fictional/sergal.dm index bc241a3f1a2b..3446a6f2cb27 100644 --- a/code/modules/sprite_accessories/ears/fictional/sergal.dm +++ b/code/modules/sprite_accessories/ears/fictional/sergal.dm @@ -8,4 +8,4 @@ id = "ears_sergal_color" icon_state = "serg_plain_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/ears/fictional/shadekin.dm b/code/modules/sprite_accessories/ears/fictional/shadekin.dm index 603ed6152f15..f98560895a9b 100644 --- a/code/modules/sprite_accessories/ears/fictional/shadekin.dm +++ b/code/modules/sprite_accessories/ears/fictional/shadekin.dm @@ -3,6 +3,6 @@ id = "ears_shadekin" icon_state = "shadekin" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE apply_restrictions = TRUE species_allowed = list(SPECIES_SHADEKIN, SPECIES_SHADEKIN_CREW) diff --git a/code/modules/sprite_accessories/ears/fictional/teshari.dm b/code/modules/sprite_accessories/ears/fictional/teshari.dm index 757a09632bf9..cd25419d6630 100644 --- a/code/modules/sprite_accessories/ears/fictional/teshari.dm +++ b/code/modules/sprite_accessories/ears/fictional/teshari.dm @@ -3,7 +3,7 @@ id = "ears_teshari" icon_state = "teshari" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "teshariinner" /datum/sprite_accessory/ears/tesharihigh @@ -11,7 +11,7 @@ id = "ears_teshari_upper" icon_state = "tesharihigh" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "tesharihighinner" /datum/sprite_accessory/ears/tesharilow @@ -19,14 +19,14 @@ id = "ears_teshari_lower" icon_state = "tesharilow" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "tesharilowinner" /datum/sprite_accessory/ears/tesh_pattern_ear_male name = "Teshari male ear pattern (colorable)" id = "ears_teshari_male" icon_state = "teshari" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE do_colouration = 1 extra_overlay = "teshari_male_pattern" @@ -34,6 +34,6 @@ name = "Teshari female ear pattern (colorable)" id = "ears_teshari_female" icon_state = "teshari" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE do_colouration = 1 extra_overlay = "teshari_female_pattern" diff --git a/code/modules/sprite_accessories/ears/horns.dm b/code/modules/sprite_accessories/ears/horns.dm index c783e074f020..ad5d70f3f1b3 100644 --- a/code/modules/sprite_accessories/ears/horns.dm +++ b/code/modules/sprite_accessories/ears/horns.dm @@ -3,14 +3,14 @@ id = "ears_horns_synth_curly" icon_state = "synthhorns_curled" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/synthhorns_plain name = "Synth horns, plain" id = "ears_horns_synth_plain" icon_state = "synthhorns_plain" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "synthhorns_plain_light" /datum/sprite_accessory/ears/synthhorns_thick @@ -18,5 +18,82 @@ id = "ears_horns_synth_thick" icon_state = "synthhorns_thick" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "synthhorns_thick_light" + +/datum/sprite_accessory/ears/horns + abstract_type = /datum/sprite_accessory/ears/horns + +// todo: someone sort this shit alphabetically + +/datum/sprite_accessory/ears/horns/crippled_bull + name = "Crippled Bull Horns" + id = "horn-crippled-bull" + icon = 'icons/mob/sprite_accessory/horns/horns.dmi' + icon_state = "crippledbull" + icon_sidedness = SPRITE_ACCESSORY_SIDEDNESS_FRONT_BEHIND + do_colouration = TRUE + legacy_use_additive_color_matrix = FALSE + +/datum/sprite_accessory/ears/horns/ticketrack + name = "Ticket Rack Horns" + id = "horn-ticket-rack" + icon = 'icons/mob/sprite_accessory/horns/horns.dmi' + icon_state = "ticketrack" + do_colouration = TRUE + icon_sidedness = SPRITE_ACCESSORY_SIDEDNESS_FRONT_BEHIND + legacy_use_additive_color_matrix = FALSE + +/datum/sprite_accessory/ears/horns/hopeful_horns + name = "Hopeful Horns" + id = "horn-hopeful" + icon = 'icons/mob/sprite_accessory/horns/horns.dmi' + icon_state = "crippledbull" + icon_sidedness = SPRITE_ACCESSORY_SIDEDNESS_FRONT_BEHIND + do_colouration = TRUE + legacy_use_additive_color_matrix = FALSE + +/datum/sprite_accessory/ears/horns/broad_curls + name = "Broad Curls Horns" + id = "horn-broad-curls" + icon = 'icons/mob/sprite_accessory/horns/horns.dmi' + icon_state = "broadcurls" + icon_sidedness = SPRITE_ACCESSORY_SIDEDNESS_FRONT_BEHIND + do_colouration = TRUE + legacy_use_additive_color_matrix = FALSE + +/datum/sprite_accessory/ears/horns/painted_points + name = "Painted Points Horns" + id = "horn-painted-points" + icon = 'icons/mob/sprite_accessory/horns/horns_32x48_bottom_aligned.dmi' + icon_state = "paintedpoints" + icon_dimension_x = 32 + icon_dimension_y = 48 + icon_sidedness = SPRITE_ACCESSORY_SIDEDNESS_FRONT_BEHIND + icon_alignment = SPRITE_ACCESSORY_ALIGNMENT_BOTTOM + do_colouration = TRUE + legacy_use_additive_color_matrix = FALSE + +/datum/sprite_accessory/ears/horns/whos_horns + name = "Who's Horns" + id = "horn-whos_horns" + icon = 'icons/mob/sprite_accessory/horns/horns_32x48_bottom_aligned.dmi' + icon_state = "whoshorns" + icon_dimension_x = 32 + icon_dimension_y = 48 + icon_sidedness = SPRITE_ACCESSORY_SIDEDNESS_FRONT_BEHIND + icon_alignment = SPRITE_ACCESSORY_ALIGNMENT_BOTTOM + do_colouration = TRUE + legacy_use_additive_color_matrix = FALSE + +/datum/sprite_accessory/ears/horns/highrise + name = "High Rise Horns" + id = "horn-high-rise" + icon = 'icons/mob/sprite_accessory/horns/horns_32x48_bottom_aligned.dmi' + icon_state = "highrise" + icon_dimension_x = 32 + icon_dimension_y = 48 + icon_sidedness = SPRITE_ACCESSORY_SIDEDNESS_FRONT_BEHIND + icon_alignment = SPRITE_ACCESSORY_ALIGNMENT_BOTTOM + do_colouration = TRUE + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/ears/misc.dm b/code/modules/sprite_accessories/ears/misc.dm index 66825b1b97de..61b4723f725d 100644 --- a/code/modules/sprite_accessories/ears/misc.dm +++ b/code/modules/sprite_accessories/ears/misc.dm @@ -3,7 +3,7 @@ id = "ears_capra_horns" icon_state = "caprahorns" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/inkling name = "colorable mature inkling tentacles" @@ -11,21 +11,21 @@ icon = 'icons/mob/human_face_vr.dmi' icon_state = "inkling-colorable" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/peekinghuman name = "peeking ears" id = "ears_peeking" icon_state = "earpeek" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/sleek name = "sleek ears" id = "ears_sleek" icon_state = "sleek" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/teppiears name = "Teppi Ears" @@ -34,7 +34,7 @@ icon_state = "teppi_ears" extra_overlay = "teppi_ears_inner" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/teppihorns name = "Teppi Horns" @@ -42,7 +42,7 @@ icon = 'icons/mob/sprite_accessories/ears_32x64.dmi' icon_state = "teppi_horns" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/teppiearshorns name = "Teppi Ears and Horns" @@ -52,11 +52,11 @@ extra_overlay = "teppi_ears_inner" extra_overlay2 = "teppi_horns" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/zears name = "jagged ears" id = "ears_jagged" icon_state = "zears" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/ears/xenomorph.dm b/code/modules/sprite_accessories/ears/xenomorph.dm index aadc5076cc50..bc2bdec00515 100644 --- a/code/modules/sprite_accessories/ears/xenomorph.dm +++ b/code/modules/sprite_accessories/ears/xenomorph.dm @@ -4,7 +4,7 @@ icon = "icons/mob/sprite_accessories/xeno_parts.dmi" icon_state = "xenohead_standard" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/xenohead/royal name = "Xenomorph Royal dome" diff --git a/code/modules/sprite_accessories/facial_hair/_facial_hair.dm b/code/modules/sprite_accessories/facial_hair/_facial_hair.dm index a3a56feadd56..275d9e8db949 100644 --- a/code/modules/sprite_accessories/facial_hair/_facial_hair.dm +++ b/code/modules/sprite_accessories/facial_hair/_facial_hair.dm @@ -9,174 +9,187 @@ /datum/sprite_accessory/facial_hair abstract_type = /datum/sprite_accessory/facial_hair icon = 'icons/mob/human_face_or_vr.dmi' - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE apply_restrictions = FALSE -/datum/sprite_accessory/facial_hair/shaved + /// without this, we don't put the _s at the end of the state + /// added to allow legacy hairs to work. + var/append_s_at_end = FALSE + +/datum/sprite_accessory/facial_hair/New() + ..() + if(append_s_at_end) + icon_state = "[icon_state]_s" + +/datum/sprite_accessory/facial_hair/legacy + abstract_type = /datum/sprite_accessory/facial_hair/legacy + append_s_at_end = TRUE + +/datum/sprite_accessory/facial_hair/legacy/shaved name = "Shaved" id = "fhair_shaved" icon_state = "bald" - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/facial_hair/neck_fluff +/datum/sprite_accessory/facial_hair/legacy/neck_fluff name = "Neck Fluff" id = "fhair_neckfluff" icon = 'icons/mob/human_face_or_vr.dmi' icon_state = "facial_neckfluff" - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/facial_hair/watson +/datum/sprite_accessory/facial_hair/legacy/watson name = "Watson Mustache" id = "fhair_watson" icon_state = "facial_watson" -/datum/sprite_accessory/facial_hair/hogan +/datum/sprite_accessory/facial_hair/legacy/hogan name = "Hulk Hogan Mustache" id = "fhair_hogan" icon_state = "facial_hogan" //-Neek -/datum/sprite_accessory/facial_hair/vandyke +/datum/sprite_accessory/facial_hair/legacy/vandyke name = "Van Dyke Mustache" id = "fhair_vandyke" icon_state = "facial_vandyke" -/datum/sprite_accessory/facial_hair/chaplin +/datum/sprite_accessory/facial_hair/legacy/chaplin name = "Square Mustache" id = "fhair_square" icon_state = "facial_chaplin" -/datum/sprite_accessory/facial_hair/selleck +/datum/sprite_accessory/facial_hair/legacy/selleck name = "Selleck Mustache" id = "fhair_selleck" icon_state = "facial_selleck" -/datum/sprite_accessory/facial_hair/neckbeard +/datum/sprite_accessory/facial_hair/legacy/neckbeard name = "Neckbeard" id = "fhair_neck" icon_state = "facial_neckbeard" -/datum/sprite_accessory/facial_hair/fullbeard +/datum/sprite_accessory/facial_hair/legacy/fullbeard name = "Full Beard" id = "fhair_full" icon_state = "facial_fullbeard" -/datum/sprite_accessory/facial_hair/longbeard +/datum/sprite_accessory/facial_hair/legacy/longbeard name = "Long Beard" id = "fhair_long" icon_state = "facial_longbeard" -/datum/sprite_accessory/facial_hair/vlongbeard +/datum/sprite_accessory/facial_hair/legacy/vlongbeard name = "Very Long Beard" id = "fhair_verylong" icon_state = "facial_wise" -/datum/sprite_accessory/facial_hair/elvis +/datum/sprite_accessory/facial_hair/legacy/elvis name = "Elvis Sideburns" id = "fhair_elvis" icon_state = "facial_elvis" //Fuck it, everyone is Elvis. species_allowed = list(SPECIES_HUMAN,SPECIES_PROMETHEAN,SPECIES_HUMAN_VATBORN,SPECIES_UNATHI) -/datum/sprite_accessory/facial_hair/abe +/datum/sprite_accessory/facial_hair/legacy/abe name = "Abraham Lincoln Beard" id = "fhair_lincoln" icon_state = "facial_abe" -/datum/sprite_accessory/facial_hair/chinstrap +/datum/sprite_accessory/facial_hair/legacy/chinstrap name = "Chinstrap" id = "fhair_chinstrap" icon_state = "facial_chin" -/datum/sprite_accessory/facial_hair/hip +/datum/sprite_accessory/facial_hair/legacy/hip name = "Hipster Beard" id = "fhair_hipster" icon_state = "facial_hip" -/datum/sprite_accessory/facial_hair/gt +/datum/sprite_accessory/facial_hair/legacy/gt name = "Goatee" id = "fhair_goatee" icon_state = "facial_gt" -/datum/sprite_accessory/facial_hair/jensen +/datum/sprite_accessory/facial_hair/legacy/jensen name = "Adam Jensen Beard" id = "fhair_jensen" icon_state = "facial_jensen" -/datum/sprite_accessory/facial_hair/volaju +/datum/sprite_accessory/facial_hair/legacy/volaju name = "Volaju" id = "fhair_volaju" icon_state = "facial_volaju" -/datum/sprite_accessory/facial_hair/dwarf +/datum/sprite_accessory/facial_hair/legacy/dwarf name = "Dwarf Beard" id = "fhair_dwarf" icon_state = "facial_dwarf" -/datum/sprite_accessory/facial_hair/threeOclock +/datum/sprite_accessory/facial_hair/legacy/threeOclock name = "3 O'clock Shadow" id = "fhair_3oclock" icon_state = "facial_3oclock" -/datum/sprite_accessory/facial_hair/threeOclockstache +/datum/sprite_accessory/facial_hair/legacy/threeOclockstache name = "3 O'clock Shadow and Moustache" id = "fhair_3oclock_mous" icon_state = "facial_3oclockmoustache" -/datum/sprite_accessory/facial_hair/fiveOclock +/datum/sprite_accessory/facial_hair/legacy/fiveOclock name = "5 O'clock Shadow" id = "fhair_5oclock" icon_state = "facial_5oclock" -/datum/sprite_accessory/facial_hair/fiveOclockstache +/datum/sprite_accessory/facial_hair/legacy/fiveOclockstache name = "5 O'clock Shadow and Moustache" id = "fhair_5oclock_mous" icon_state = "facial_5oclockmoustache" -/datum/sprite_accessory/facial_hair/sevenOclock +/datum/sprite_accessory/facial_hair/legacy/sevenOclock name = "7 O'clock Shadow" id = "fhair_7oclock" icon_state = "facial_7oclock" -/datum/sprite_accessory/facial_hair/sevenOclockstache +/datum/sprite_accessory/facial_hair/legacy/sevenOclockstache name = "7 O'clock Shadow and Moustache" id = "fhair_7oclock_mous" icon_state = "facial_7oclockmoustache" -/datum/sprite_accessory/facial_hair/mutton +/datum/sprite_accessory/facial_hair/legacy/mutton name = "Mutton Chops" id = "fhair_mutton" icon_state = "facial_mutton" -/datum/sprite_accessory/facial_hair/muttonstache +/datum/sprite_accessory/facial_hair/legacy/muttonstache name = "Mutton Chops and Moustache" id = "fhair_mutton_mous" icon_state = "facial_muttonmus" -/datum/sprite_accessory/facial_hair/walrus +/datum/sprite_accessory/facial_hair/legacy/walrus name = "Walrus Moustache" id = "fhair_walrus" icon_state = "facial_walrus" -/datum/sprite_accessory/facial_hair/croppedbeard +/datum/sprite_accessory/facial_hair/legacy/croppedbeard name = "Full Cropped Beard" id = "fhair_fullcrop" icon_state = "facial_croppedfullbeard" -/datum/sprite_accessory/facial_hair/chinless +/datum/sprite_accessory/facial_hair/legacy/chinless name = "Chinless Beard" id = "fhair_chinless" icon_state = "facial_chinlessbeard" -/datum/sprite_accessory/facial_hair/tribeard +/datum/sprite_accessory/facial_hair/legacy/tribeard name = "Tribeard" id = "fhair_tribeard" icon_state = "facial_tribeard" -/datum/sprite_accessory/facial_hair/moonshiner +/datum/sprite_accessory/facial_hair/legacy/moonshiner name = "Moonshiner" id = "fhair_moonshiner" icon_state = "facial_moonshiner" -/datum/sprite_accessory/facial_hair/martial +/datum/sprite_accessory/facial_hair/legacy/martial name = "Martial Artist" id = "fhair_martial" icon_state = "facial_martialartist" diff --git a/code/modules/sprite_accessories/facial_hair/tajaran.dm b/code/modules/sprite_accessories/facial_hair/tajaran.dm index f5b70e434a86..b67d0af0f564 100644 --- a/code/modules/sprite_accessories/facial_hair/tajaran.dm +++ b/code/modules/sprite_accessories/facial_hair/tajaran.dm @@ -1,39 +1,39 @@ -/datum/sprite_accessory/facial_hair/taj_sideburns +/datum/sprite_accessory/facial_hair/legacy/taj_sideburns name = "Tajaran Sideburns" id = "fhair_tajaran_sideburns" icon_state = "facial_sideburns" species_allowed = list(SPECIES_TAJ) apply_restrictions = TRUE -/datum/sprite_accessory/facial_hair/taj_mutton +/datum/sprite_accessory/facial_hair/legacy/taj_mutton name = "Tajaran Mutton" id = "fhair_tajaran_mutton" icon_state = "facial_mutton" species_allowed = list(SPECIES_TAJ) apply_restrictions = TRUE -/datum/sprite_accessory/facial_hair/taj_pencilstache +/datum/sprite_accessory/facial_hair/legacy/taj_pencilstache name = "Tajaran Pencilstache" id = "fhair_tajaran_pencilstache" icon_state = "facial_pencilstache" species_allowed = list(SPECIES_TAJ) apply_restrictions = TRUE -/datum/sprite_accessory/facial_hair/taj_moustache +/datum/sprite_accessory/facial_hair/legacy/taj_moustache name = "Tajaran Moustache" id = "fhair_tajaran_moustache" icon_state = "facial_moustache" species_allowed = list(SPECIES_TAJ) apply_restrictions = TRUE -/datum/sprite_accessory/facial_hair/taj_goatee +/datum/sprite_accessory/facial_hair/legacy/taj_goatee name = "Tajaran Goatee" id = "fhair_tajaran_goatee" icon_state = "facial_goatee" species_allowed = list(SPECIES_TAJ) apply_restrictions = TRUE -/datum/sprite_accessory/facial_hair/taj_smallstache +/datum/sprite_accessory/facial_hair/legacy/taj_smallstache name = "Tajaran Smallsatche" id = "fhair_tajaran_smallstache" icon_state = "facial_smallstache" diff --git a/code/modules/sprite_accessories/facial_hair/teshari.dm b/code/modules/sprite_accessories/facial_hair/teshari.dm index fdba2cc9fa9f..5b47a11d4968 100644 --- a/code/modules/sprite_accessories/facial_hair/teshari.dm +++ b/code/modules/sprite_accessories/facial_hair/teshari.dm @@ -1,25 +1,25 @@ //Teshari things -/datum/sprite_accessory/facial_hair/teshari_beard +/datum/sprite_accessory/facial_hair/legacy/teshari_beard name = "Teshari Beard" id = "fhair_teshari_chin" icon_state = "teshari_chin" species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/facial_hair/teshari_scraggly +/datum/sprite_accessory/facial_hair/legacy/teshari_scraggly name = "Teshari Scraggly" id = "fhair_teshari_scraggly" icon_state = "teshari_scraggly" species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/facial_hair/teshari_chops +/datum/sprite_accessory/facial_hair/legacy/teshari_chops name = "Teshari Chops" id = "fhair_teshari_chops" icon_state = "teshari_gap" species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE - gender = NEUTER + random_generation_gender = null diff --git a/code/modules/sprite_accessories/facial_hair/unathi.dm b/code/modules/sprite_accessories/facial_hair/unathi.dm index f05b1dbff7ff..4c73626c0ae4 100644 --- a/code/modules/sprite_accessories/facial_hair/unathi.dm +++ b/code/modules/sprite_accessories/facial_hair/unathi.dm @@ -1,24 +1,24 @@ //unathi horn beards and the like -/datum/sprite_accessory/facial_hair/una_chinhorn +/datum/sprite_accessory/facial_hair/legacy/una_chinhorn name = "Unathi Chin Horn" id = "fhair_unathi_chin" icon_state = "facial_chinhorns" species_allowed = list(SPECIES_UNATHI) -/datum/sprite_accessory/facial_hair/una_hornadorns +/datum/sprite_accessory/facial_hair/legacy/una_hornadorns name = "Unathi Horn Adorns" id = "fhair_unathi_adorns" icon_state = "facial_hornadorns" species_allowed = list(SPECIES_UNATHI) -/datum/sprite_accessory/facial_hair/una_spinespikes +/datum/sprite_accessory/facial_hair/legacy/una_spinespikes name = "Unathi Spine Spikes" id = "fhair_unathi_spikes" icon_state = "facial_spikes" species_allowed = list(SPECIES_UNATHI) -/datum/sprite_accessory/facial_hair/una_dorsalfrill +/datum/sprite_accessory/facial_hair/legacy/una_dorsalfrill name = "Unathi Dorsal Frill" id = "fhair_unathi_dorsalfrill" icon_state = "facial_dorsalfrill" diff --git a/code/modules/sprite_accessories/facial_hair/vox.dm b/code/modules/sprite_accessories/facial_hair/vox.dm index 647f26246970..4ba8ff4ba36a 100644 --- a/code/modules/sprite_accessories/facial_hair/vox.dm +++ b/code/modules/sprite_accessories/facial_hair/vox.dm @@ -1,41 +1,41 @@ // More Vox things -/datum/sprite_accessory/facial_hair/vox_face_colonel +/datum/sprite_accessory/facial_hair/legacy/vox_face_colonel name = "Vox Colonel" id = "fhair_vox_colonel" icon_state = "vox_colonel" species_allowed = list(SPECIES_VOX) apply_restrictions = TRUE -/datum/sprite_accessory/facial_hair/vox_face_fu +/datum/sprite_accessory/facial_hair/legacy/vox_face_fu name = "Quill Fu" id = "fhair_vox_quillfu" icon_state = "vox_fu" species_allowed = list(SPECIES_VOX) apply_restrictions = TRUE -/datum/sprite_accessory/facial_hair/vox_face_neck +/datum/sprite_accessory/facial_hair/legacy/vox_face_neck name = "Neck Quills" id = "fhair_vox_neck" icon_state = "vox_neck" species_allowed = list(SPECIES_VOX) apply_restrictions = TRUE -/datum/sprite_accessory/facial_hair/vox_face_beard +/datum/sprite_accessory/facial_hair/legacy/vox_face_beard name = "Quill Beard" id = "fhair_vox_beard" icon_state = "vox_beard" species_allowed = list(SPECIES_VOX) apply_restrictions = TRUE -/datum/sprite_accessory/facial_hair/vox_ruff_beard +/datum/sprite_accessory/facial_hair/legacy/vox_ruff_beard name = "Ruff Beard" id = "fhair_vox_ruff" icon_state = "vox_ruff_beard" species_allowed = list(SPECIES_VOX) apply_restrictions = TRUE -/datum/sprite_accessory/facial_hair/vox_shaved_beard +/datum/sprite_accessory/facial_hair/legacy/vox_shaved_beard name = "Vox Shaved" id = "fhair_vox_shaved" icon_state = "vox_bald" diff --git a/code/modules/sprite_accessories/facial_hair/vulpkanin.dm b/code/modules/sprite_accessories/facial_hair/vulpkanin.dm index 3ec4b24b299d..2d6835766c64 100644 --- a/code/modules/sprite_accessories/facial_hair/vulpkanin.dm +++ b/code/modules/sprite_accessories/facial_hair/vulpkanin.dm @@ -1,80 +1,80 @@ -/datum/sprite_accessory/facial_hair/vulp_none +/datum/sprite_accessory/facial_hair/legacy/vulp_none name = "None" id = "fhair_vulp_none" icon = 'icons/mob/human_face_vr.dmi' icon_state = "none" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) apply_restrictions = TRUE - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/facial_hair/vulp_blaze +/datum/sprite_accessory/facial_hair/legacy/vulp_blaze name = "Blaze" id = "fhair_vulp_blaze" icon = 'icons/mob/human_face_vr.dmi' icon_state = "vulp_facial_blaze" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) apply_restrictions = TRUE - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/facial_hair/vulp_vulpine +/datum/sprite_accessory/facial_hair/legacy/vulp_vulpine name = "Vulpine" id = "fhair_vulp_vulpine" icon = 'icons/mob/human_face_vr.dmi' icon_state = "vulp_facial_vulpine" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) apply_restrictions = TRUE - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/facial_hair/vulp_earfluff +/datum/sprite_accessory/facial_hair/legacy/vulp_earfluff name = "Earfluff" id = "fhair_vulp_earfluff" icon = 'icons/mob/human_face_vr.dmi' icon_state = "vulp_facial_earfluff" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) apply_restrictions = TRUE - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/facial_hair/vulp_mask +/datum/sprite_accessory/facial_hair/legacy/vulp_mask name = "Mask" id = "fhair_vulp_mask" icon = 'icons/mob/human_face_vr.dmi' icon_state = "vulp_facial_mask" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) apply_restrictions = TRUE - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/facial_hair/vulp_patch +/datum/sprite_accessory/facial_hair/legacy/vulp_patch name = "Patch" id = "fhair_vulp_patch" icon = 'icons/mob/human_face_vr.dmi' icon_state = "vulp_facial_patch" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) apply_restrictions = TRUE - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/facial_hair/vulp_ruff +/datum/sprite_accessory/facial_hair/legacy/vulp_ruff name = "Ruff" id = "fhair_vulp_ruff" icon = 'icons/mob/human_face_vr.dmi' icon_state = "vulp_facial_ruff" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) apply_restrictions = TRUE - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/facial_hair/vulp_kita +/datum/sprite_accessory/facial_hair/legacy/vulp_kita name = "Kita" id = "fhair_vulp_kita" icon = 'icons/mob/human_face_vr.dmi' icon_state = "vulp_facial_kita" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) apply_restrictions = TRUE - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/facial_hair/vulp_swift +/datum/sprite_accessory/facial_hair/legacy/vulp_swift name = "Swift" id = "fhair_vulp_swift" icon = 'icons/mob/human_face_vr.dmi' icon_state = "vulp_facial_swift" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) apply_restrictions = TRUE - gender = NEUTER + random_generation_gender = null diff --git a/code/modules/sprite_accessories/hair.dm b/code/modules/sprite_accessories/hair.dm new file mode 100644 index 000000000000..bc278dfe33bf --- /dev/null +++ b/code/modules/sprite_accessories/hair.dm @@ -0,0 +1,109 @@ +GLOBAL_LIST_INIT(hair_gradients, list( + "None" = "none", + "Fade (Up)" = "fadeup", + "Fade Low (Up)" = "fadeup_low", + "Fade (Down)" = "fadedown", + "Fade Low (Down)" = "fadedown_low", + "Fade High (Down)" = "fadedown_high", + "Reflected (Center)"= "reflected", + "Reflected Inverse (Center)"= "reflected_inverse", + "Vertical Split (Back)"= "vsplit_back", + "Vertical Split" = "vsplit", + "Vertical Split (Back, Front Effect)"= "vsplit_dual", + "Bottom (Flat)" = "bottomflat", + "Shoulders (Flat)" = "shouldersflat", + "Wavy" = "wavy", + "Wavy Sharp Spikes" = "wavy_spiked", + "Wavy Smooth Spikes" = "wavy_smooth", + "Wavy Smoothish Spikes" = "wavy_smooth2", + "Striped" = "striped", + "Striped (Vertical)"= "striped_vertical" + )) + +GLOBAL_LIST_EMPTY(hair_gradient_icon_cache) + +// todo: should we really be doing this? +/proc/hair_gradient_icon(id, list/image/layers_or_singular, gradient, width = WORLD_ICON_SIZE) + var/image/casted_single = layers_or_singular + var/cache_key = "[gradient]-[width]-[id]-[islist(layers_or_singular)? "combined" : casted_single.icon_state]" + if(isnull(GLOB.hair_gradient_icon_cache[cache_key])) + var/icon/combined + if(islist(layers_or_singular)) + combined = icon('icons/system/blank_32x32.dmi', "4-dir") + // gather all layers + for(var/image/layer as anything in layers_or_singular) + combined.Blend(icon(layer.icon, layer.icon_state, frame = 1), ICON_OVERLAY) + else + combined = icon(casted_single.icon, casted_single.icon_state) + // gather gradient + var/icon/cutting = icon('icons/mob/hair_gradients.dmi', GLOB.hair_gradients[gradient]) + // we can't make it any taller but we can make it wider.. + cutting.Scale(width, cutting.Height()) + // and them together + cutting.Blend(combined, ICON_AND) + // set; gradient should just be a grayscale (or otherwise) part of the hair where the gradient covers now. + GLOB.hair_gradient_icon_cache[cache_key] = cutting + return GLOB.hair_gradient_icon_cache[cache_key] + +/datum/sprite_accessory/hair + abstract_type = /datum/sprite_accessory/hair + icon = 'icons/mob/human_face_m.dmi' // default icon for all hairs + //Enhanced colours and hair for all + legacy_use_additive_color_matrix = FALSE + apply_restrictions = FALSE + + /// ignored if new has_add_state is specified + var/icon_add_legacy = 'icons/mob/human_face.dmi' + var/hair_flags + /// without this, we don't put the _s at the end of the state + /// added to allow legacy hairs to work. + var/append_s_at_end = FALSE + +/datum/sprite_accessory/hair/New() + ..() + if(append_s_at_end) + icon_state = "[icon_state]_s" + +/datum/sprite_accessory/hair/render(mob/for_whom, list/colors, layer_front, layer_behind, layer_side, with_base_state, with_variation, flattened) + var/list/image/layers = ..() + + if(flattened) + return layers + + for(var/image/rendered as anything in layers) + // first add the add state + if(has_add_state) + // if we have that don't do legacy behavior + else if(icon_add_legacy) + var/image/adding = image(icon_add_legacy, icon_state = icon_state) + adding.blend_mode = BLEND_ADD + adding.appearance_flags = RESET_COLOR + rendered.overlays += adding + + // then deal with gradient if we have to + if(do_colouration && ishuman(for_whom)) + var/mob/living/carbon/human/casted_human = for_whom + if(casted_human.grad_style && casted_human.grad_style != "None") + var/image/gradient_icon = image(hair_gradient_icon(id, rendered, casted_human.grad_style, icon_dimension_x)) + gradient_icon.color = rgb( + casted_human.r_grad, + casted_human.g_grad, + casted_human.b_grad, + ) + gradient_icon.blend_mode = BLEND_OVERLAY + gradient_icon.appearance_flags = RESET_COLOR + rendered.overlays += gradient_icon + + return layers + +/datum/sprite_accessory/hair/flat_cache_keys(mob/for_whom, list/colors, layer_front, layer_behind, layer_side, with_base_state = icon_state, with_variation, flattened) + . = ..() + if(!ishuman(for_whom)) + return + var/mob/living/carbon/human/casted_human = for_whom + . += casted_human.grad_style + . += rgb(casted_human.r_grad, casted_human.g_grad, casted_human.b_grad) + +/datum/sprite_accessory/hair/legacy + abstract_type = /datum/sprite_accessory/hair/legacy + append_s_at_end = TRUE diff --git a/code/modules/sprite_accessories/hair/hair.dm b/code/modules/sprite_accessories/hair/hair.dm new file mode 100644 index 000000000000..f7ff7b5e0be0 --- /dev/null +++ b/code/modules/sprite_accessories/hair/hair.dm @@ -0,0 +1,177 @@ +//* This file is explicitly licensed under the MIT license. *// +//* Copyright (c) 2024 silicons *// + +/* +ATTENTION! This file is dedicated to all "modern hair sprites"; that only require white/ +greyscaling sprites to be added and rendered and do NOT need their darkscale counterparts. +If you're looking to add or port hair sprites, this is the place to add them. + +"Where should I add the sprite?" +> These sprites are located in icons/mob/sprite_accessory/hair/hair.dmi + +"How do I know if the name I came up for my hair sprite isn't taken?" +> Check both hair.dm (this very file) and legacy.dm (the neighbouring file) and ctrl + F. All +hairstyles should be in either of these files. How am I sure? I don't fucking know. I hope +they are. This code is a mess. +*/ + +/datum/sprite_accessory/hair/simple + name = "Simple (Normal)" + id = "hair-normal-simple" + icon = 'icons/mob/sprite_accessory/hair/hair.dmi' + icon_state = "simple" + icon_add_legacy = null + hair_flags = HAIR_TIEABLE + +/datum/sprite_accessory/hair/simple_long + name = "Simple (Long)" + id = "hair-long-simple" + icon = 'icons/mob/sprite_accessory/hair/hair.dmi' + icon_state = "simple_long" + icon_add_legacy = null + hair_flags = HAIR_TIEABLE + +/datum/sprite_accessory/hair/simple_short + name = "Simple (Short)" + id = "hair-short-simple" + icon = 'icons/mob/sprite_accessory/hair/hair.dmi' + icon_state = "simple_short" + icon_add_legacy = null + hair_flags = HAIR_TIEABLE + +/datum/sprite_accessory/hair/strict + name = "Strict" + id = "hair-strict" + icon = 'icons/mob/sprite_accessory/hair/hair.dmi' + icon_state = "strict" + icon_add_legacy = null + hair_flags = HAIR_TIEABLE + +/datum/sprite_accessory/hair/strict_long + name = "Strict (Long)" + id = "hair-strict-long" + icon = 'icons/mob/sprite_accessory/hair/hair.dmi' + icon_state = "strict_long" + icon_add_legacy = null + hair_flags = HAIR_TIEABLE + +/datum/sprite_accessory/hair/strict_short + name = "Strict (Short)" + id = "hair-strict-short" + icon = 'icons/mob/sprite_accessory/hair/hair.dmi' + icon_state = "strict_short" + icon_add_legacy = null + hair_flags = HAIR_TIEABLE + +/datum/sprite_accessory/hair/bonnie + name = "Bonnie" + id = "hair-bonnie" + icon = 'icons/mob/sprite_accessory/hair/hair.dmi' + icon_state = "bonnie" + icon_add_legacy = null + hair_flags = HAIR_TIEABLE + +/datum/sprite_accessory/hair/bonnie_short + name = "Bonnie (Short)" + id = "hair-bonnie-short" + icon = 'icons/mob/sprite_accessory/hair/hair.dmi' + icon_state = "bonnie_short" + icon_add_legacy = null + hair_flags = HAIR_TIEABLE + +/datum/sprite_accessory/hair/bonnie_long + name = "Bonnie (Long)" + id = "hair-bonnie-long" + icon = 'icons/mob/sprite_accessory/hair/hair.dmi' + icon_state = "bonnie_long" + icon_add_legacy = null + hair_flags = HAIR_TIEABLE + +/datum/sprite_accessory/hair/bonnie_alt + name = "Bonnie (Alt)" + id = "hair-bonnie-alt" + icon = 'icons/mob/sprite_accessory/hair/hair.dmi' + icon_state = "bonnie_alt" + icon_add_legacy = null + hair_flags = HAIR_TIEABLE + +/datum/sprite_accessory/hair/bonnie_alt_long + name = "Bonnie (Alt, Long)" + id = "hair-bonnie-alt-long" + icon = 'icons/mob/sprite_accessory/hair/hair.dmi' + icon_state = "bonnie_alt_long" + icon_add_legacy = null + hair_flags = HAIR_TIEABLE + +/datum/sprite_accessory/hair/bonnie_alt_short + name = "Bonnie (Alt, Short)" + id = "hair-bonnie-alt-short" + icon = 'icons/mob/sprite_accessory/hair/hair.dmi' + icon_state = "bonnie_alt_short" + icon_add_legacy = null + hair_flags = HAIR_TIEABLE + +/datum/sprite_accessory/hair/dawn + name = "Dawn" + id = "hair-dawn" + icon = 'icons/mob/sprite_accessory/hair/hair.dmi' + icon_state = "dawn" + icon_add_legacy = null + hair_flags = HAIR_TIEABLE + +// the short version of this hair is in legacy.dm +/datum/sprite_accessory/hair/fluffy_long + name = "Fluffy Long" + id = "hair-fluffy-long" + icon = 'icons/mob/sprite_accessory/hair/hair.dmi' + icon_state = "hair_fluffy_long" + icon_add_legacy = null + hair_flags = HAIR_TIEABLE + +/datum/sprite_accessory/hair/khmuro + name = "Khmuro" + id = "hair-khmuro" + icon = 'icons/mob/sprite_accessory/hair/hair.dmi' + icon_state = "khmuro" + icon_add_legacy = null + hair_flags = HAIR_TIEABLE + +/datum/sprite_accessory/hair/kobeni_right + name = "Kobeni (Right)" + id = "hair-kobeni-right" + icon = 'icons/mob/sprite_accessory/hair/hair.dmi' + icon_state = "kobeni_r" + icon_add_legacy = null + hair_flags = HAIR_TIEABLE + +/datum/sprite_accessory/hair/kobeni_left + name = "Kobeni (Left)" + id = "hair-kobeni-left" + icon = 'icons/mob/sprite_accessory/hair/hair.dmi' + icon_state = "kobeni_l" + icon_add_legacy = null + hair_flags = HAIR_TIEABLE + +/datum/sprite_accessory/hair/morning + name = "Morning" + id = "hair-morning" + icon = 'icons/mob/sprite_accessory/hair/hair.dmi' + icon_state = "morning" + icon_add_legacy = null + hair_flags = HAIR_TIEABLE + +/datum/sprite_accessory/hair/upward + name = "Upward" + id = "hair-upward" + icon = 'icons/mob/sprite_accessory/hair/hair.dmi' + icon_state = "upward" + icon_add_legacy = null + hair_flags = HAIR_TIEABLE + +/datum/sprite_accessory/hair/highlander + name = "Highlander" + id = "hair-highlander" + icon = 'icons/mob/sprite_accessory/hair/hair.dmi' + icon_state = "highlander" + icon_add_legacy = null + hair_flags = HAIR_TIEABLE diff --git a/code/modules/sprite_accessories/hair/_hair.dm b/code/modules/sprite_accessories/hair/legacy.dm similarity index 62% rename from code/modules/sprite_accessories/hair/_hair.dm rename to code/modules/sprite_accessories/hair/legacy.dm index 68b460887f04..69ad9e425585 100644 --- a/code/modules/sprite_accessories/hair/_hair.dm +++ b/code/modules/sprite_accessories/hair/legacy.dm @@ -1,1700 +1,1696 @@ /* -//////////////////////////// -/ =--------------------= / -/ == Hair Definitions == / -/ =--------------------= / -//////////////////////////// -*/ +You probably shouldn't be messing with this file anymore. Use hair.dm + +ATTENTION! Hair sprites NOT contained in icons/mob/sprite_accessory/hair/hair.dm go here and +are considered "legacy hair sprites"; that use darkscaling (a-k-a obsolete scaling) instead +of white/greyscaling. In other words, these are all the hairstyles added BEFORE April 2024. +Hopefully, no one will ever wanna touch this file ever again in the history of Citadel:RP. -/datum/sprite_accessory/hair - abstract_type = /datum/sprite_accessory/hair - icon = 'icons/mob/human_face_m.dmi' // default icon for all hairs - var/icon_add = 'icons/mob/human_face.dmi' - //Enhanced colours and hair for all - color_blend_mode = ICON_MULTIPLY - apply_restrictions = FALSE - var/hair_flags +These sprites are scattered around icons/mob/human_face.dmi, human_face_vr.dmi (and the +many other .dmi files that start with "human_face".) +*/ -/datum/sprite_accessory/hair/eighties +/datum/sprite_accessory/hair/legacy/eighties name = "80's" id = "hair_80s" icon_state = "hair_80s" -/datum/sprite_accessory/hair/eighties_alt +/datum/sprite_accessory/hair/legacy/eighties_alt name = "80's (Alternative)" id = "hair_80s_alt" icon_state = "hair_80s_alt" -/datum/sprite_accessory/hair/afro +/datum/sprite_accessory/hair/legacy/afro name = "Afro" id = "hair_afro" icon_state = "hair_afro" -/datum/sprite_accessory/hair/afro2 +/datum/sprite_accessory/hair/legacy/afro2 name = "Afro 2" id = "hair_afro2" icon_state = "hair_afro2" -/datum/sprite_accessory/hair/afro_large +/datum/sprite_accessory/hair/legacy/afro_large name = "Big Afro" id = "hair_afro_big" icon_state = "hair_bigafro" -/datum/sprite_accessory/hair/ahoge +/datum/sprite_accessory/hair/legacy/ahoge name = "Ahoge" id = "hair_ahoge" icon_state = "hair_ahoge" icon = 'icons/mob/human_face_vr.dmi' - icon_add = null + icon_add_legacy = null -/datum/sprite_accessory/hair/bald //Everyone goes bald. +/datum/sprite_accessory/hair/legacy/bald //Everyone goes bald. name = "Bald" id = "hair_bald" icon_state = "bald" - gender = MALE + random_generation_gender = MALE hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/baldfade +/datum/sprite_accessory/hair/legacy/baldfade name = "Balding Fade" id = "hair_balding_fade" icon_state = "hair_baldfade" - gender = MALE + random_generation_gender = MALE hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/balding +/datum/sprite_accessory/hair/legacy/balding name = "Balding Hair" id = "hair_balding" icon_state = "hair_e" - gender = MALE + random_generation_gender = MALE hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/bedhead +/datum/sprite_accessory/hair/legacy/bedhead name = "Bedhead" id = "hair_bedhead" icon_state = "hair_bedhead" -/datum/sprite_accessory/hair/bedhead2 +/datum/sprite_accessory/hair/legacy/bedhead2 name = "Bedhead 2" id = "hair_bedhead2" icon_state = "hair_bedheadv2" -/datum/sprite_accessory/hair/bedhead3 +/datum/sprite_accessory/hair/legacy/bedhead3 name = "Bedhead 3" id = "hair_bedhead3" icon_state = "hair_bedheadv3" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/bedheadlong +/datum/sprite_accessory/hair/legacy/bedheadlong name = "Bedhead Long" id = "hair_bedhead_long" icon_state = "hair_long_bedhead" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/bedheadlongest +/datum/sprite_accessory/hair/legacy/bedheadlongest name = "Bedhead Concerning" id = "hair_bedhead_longest" icon_state = "hair_longest_bedhead" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/beehive +/datum/sprite_accessory/hair/legacy/beehive name = "Beehive" id = "hair_beehive" icon_state = "hair_beehive" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/beehive2 +/datum/sprite_accessory/hair/legacy/beehive2 name = "Beehive 2" id = "hair_beehive2" icon_state = "hair_beehive2" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/belenko +/datum/sprite_accessory/hair/legacy/belenko name = "Belenko" id = "hair_balenko" icon_state = "hair_belenko" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/belenkotied +/datum/sprite_accessory/hair/legacy/belenkotied name = "Belenko Tied" id = "hair_balenko_tied" icon_state = "hair_belenkotied" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/bob +/datum/sprite_accessory/hair/legacy/bob name = "Bob" id = "hair_bob" icon_state = "hair_bobcut" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/bobcutalt +/datum/sprite_accessory/hair/legacy/bobcutalt name = "Bob Chin Length" id = "hair_bob_chin" icon_state = "hair_bobcutalt" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/bobcurl +/datum/sprite_accessory/hair/legacy/bobcurl name = "Bobcurl" id = "hair_bob_curl" icon_state = "hair_bobcurl" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/bowl +/datum/sprite_accessory/hair/legacy/bowl name = "Bowl" id = "hair_bowlcut" icon_state = "hair_bowlcut" -/datum/sprite_accessory/hair/bowlcut2 +/datum/sprite_accessory/hair/legacy/bowlcut2 name = "Bowl 2" id = "hair_bowlcut2" icon_state = "hair_bowlcut2" -/datum/sprite_accessory/hair/grandebraid +/datum/sprite_accessory/hair/legacy/grandebraid name = "Braid Grande" id = "hair_braid_grande" icon_state = "hair_grande" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/braid2 +/datum/sprite_accessory/hair/legacy/braid2 name = "Braid Long" id = "hair_braid_long" icon_state = "hair_hbraid" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/braid_medium +/datum/sprite_accessory/hair/legacy/braid_medium name = "Braid Medium" id = "hair_braid_medium" icon_state = "hair_mediumbraid" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/braid_short +/datum/sprite_accessory/hair/legacy/braid_short name = "Braid Short" id = "hair_braid_short" icon_state = "hair_shortbraid" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/braid +/datum/sprite_accessory/hair/legacy/braid name = "Floorlength Braid" id = "hair_braid_floorlength" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "hair_braid" -/datum/sprite_accessory/hair/bun +/datum/sprite_accessory/hair/legacy/bun name = "Bun" id = "hair_bun" icon_state = "hair_bun" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/bun2 +/datum/sprite_accessory/hair/legacy/bun2 name = "Bun 2" id = "hair_bun2" icon_state = "hair_bun2" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/bun3 +/datum/sprite_accessory/hair/legacy/bun3 name = "Bun 3" id = "hair_bun3" icon_state = "hair_bun3" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/bun +/datum/sprite_accessory/hair/legacy/bun name = "Bun Casual" id = "hair_bun_casual" icon_state = "hair_bun" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/doublebun +/datum/sprite_accessory/hair/legacy/doublebun name = "Bun Double" id = "hair_bun_double" icon_state = "hair_doublebun" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/tightbun +/datum/sprite_accessory/hair/legacy/tightbun name = "Bun Tight" id = "hair_bun_tight" icon_state = "hair_tightbun" - gender = FEMALE + random_generation_gender = FEMALE hair_flags = HAIR_VERY_SHORT | HAIR_TIEABLE -/datum/sprite_accessory/hair/buzz +/datum/sprite_accessory/hair/legacy/buzz name = "Buzzcut" id = "hair_buzzcut" icon_state = "hair_buzzcut" hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/crono +/datum/sprite_accessory/hair/legacy/crono name = "Chrono" id = "hair_chrono" icon_state = "hair_toriyama" -/datum/sprite_accessory/hair/cia +/datum/sprite_accessory/hair/legacy/cia name = "CIA" id = "hair_cia" icon_state = "hair_cia" -/datum/sprite_accessory/hair/coffeehouse +/datum/sprite_accessory/hair/legacy/coffeehouse name = "Coffee House Cut" id = "hair_coffeehouse" icon_state = "hair_coffeehouse" - gender = MALE + random_generation_gender = MALE hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/combover +/datum/sprite_accessory/hair/legacy/combover name = "Combover" id = "hair_combover" icon_state = "hair_combover" -/datum/sprite_accessory/hair/country +/datum/sprite_accessory/hair/legacy/country name = "Country" id = "hair_country" icon_state = "hair_country" -/datum/sprite_accessory/hair/crew +/datum/sprite_accessory/hair/legacy/crew name = "Crewcut" id = "hair_crewcut" icon_state = "hair_crewcut" hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/curls +/datum/sprite_accessory/hair/legacy/curls name = "Curls" id = "hair_curls" icon_state = "hair_curls" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/cut +/datum/sprite_accessory/hair/legacy/cut name = "Cut Hair" id = "hair_cut" icon_state = "hair_c" hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/damsel +/datum/sprite_accessory/hair/legacy/damsel name = "Damsel" id = "hair_damsel" icon_state = "hair_damsel" -/datum/sprite_accessory/hair/dave +/datum/sprite_accessory/hair/legacy/dave name = "Dave" id = "hair_dave" icon_state = "hair_dave" -/datum/sprite_accessory/hair/devillock +/datum/sprite_accessory/hair/legacy/devillock name = "Devil Lock" id = "hair_devillock" icon_state = "hair_devilock" -/datum/sprite_accessory/hair/diagonal_bangs +/datum/sprite_accessory/hair/legacy/diagonal_bangs name = "Diagonal Bangs" id = "hair_diagonalbangs" icon_state = "hair_diagonal_bangs" -/datum/sprite_accessory/hair/dreadlocks +/datum/sprite_accessory/hair/legacy/dreadlocks name = "Dreadlocks" id = "hair_dreadlocks" icon_state = "hair_dreads" -/datum/sprite_accessory/hair/mahdrills +/datum/sprite_accessory/hair/legacy/mahdrills name = "Drillruru" id = "hair_drillruru" icon_state = "hair_drillruru" -/datum/sprite_accessory/hair/emo +/datum/sprite_accessory/hair/legacy/emo name = "Emo" id = "hair_emo" icon_state = "hair_emo" -/datum/sprite_accessory/hair/emo2 +/datum/sprite_accessory/hair/legacy/emo2 name = "Emo Alt" id = "hair_emo_alt" icon_state = "hair_emo2" -/datum/sprite_accessory/hair/fringeemo +/datum/sprite_accessory/hair/legacy/fringeemo name = "Emo Fringe" id = "hair_emo_fringe" icon_state = "hair_emofringe" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/halfshaved +/datum/sprite_accessory/hair/legacy/halfshaved name = "Emo Half-Shaved" id = "hair_emo_halfshave" icon_state = "hair_halfshaved" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/longemo +/datum/sprite_accessory/hair/legacy/longemo name = "Emo Long" id = "hair_emo_long" icon_state = "hair_emolong" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/highfade +/datum/sprite_accessory/hair/legacy/highfade name = "Fade High" id = "hair_fade_high" icon_state = "hair_highfade" - gender = MALE + random_generation_gender = MALE hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/medfade +/datum/sprite_accessory/hair/legacy/medfade name = "Fade Medium" id = "hair_fade_medium" icon_state = "hair_medfade" hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/lowfade +/datum/sprite_accessory/hair/legacy/lowfade name = "Fade Low" id = "hair_fade_low" icon_state = "hair_lowfade" - gender = MALE + random_generation_gender = MALE hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/partfade +/datum/sprite_accessory/hair/legacy/partfade name = "Fade Parted" id = "hair_fade_parted" icon_state = "hair_shavedpart" - gender = MALE + random_generation_gender = MALE hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/familyman +/datum/sprite_accessory/hair/legacy/familyman name = "Family Man" id = "hair_familyman" icon_state = "hair_thefamilyman" -/datum/sprite_accessory/hair/father +/datum/sprite_accessory/hair/legacy/father name = "Father" id = "hair_father" icon_state = "hair_father" -/datum/sprite_accessory/hair/feather +/datum/sprite_accessory/hair/legacy/feather name = "Feather" id = "hair_feather" icon_state = "hair_feather" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/flair +/datum/sprite_accessory/hair/legacy/flair name = "Flaired Hair" id = "hair_flair" icon_state = "hair_flair" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/sargeant +/datum/sprite_accessory/hair/legacy/sargeant name = "Flat Top" id = "hair_sargeant" icon_state = "hair_sargeant" hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/flowhair +/datum/sprite_accessory/hair/legacy/flowhair name = "Flow Hair" id = "hair_flow" icon_state = "hair_f" -/datum/sprite_accessory/hair/fluffy_short +// the long version of this hairstyle is in hair.dm +/datum/sprite_accessory/hair/legacy/fluffy_short name = "Fluffy Short" id = "hair_fluffy_short" icon_state = "hair_fluffy_short" -/datum/sprite_accessory/hair/longfringe +/datum/sprite_accessory/hair/legacy/longfringe name = "Fringe Long" id = "hair_fringe_long" icon_state = "hair_longfringe" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/longestalt +/datum/sprite_accessory/hair/legacy/longestalt name = "Fringe Longer" id = "hair_fringe_verylong" icon_state = "hair_vlongfringe" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/fringetail +/datum/sprite_accessory/hair/legacy/fringetail name = "Fringetail" id = "hair_fringe_tail" icon_state = "hair_fringetail" hair_flags = HAIR_TIEABLE|HAIR_VERY_SHORT -/datum/sprite_accessory/hair/gelled +/datum/sprite_accessory/hair/legacy/gelled name = "Gelled Back" id = "hair_gelled" icon_state = "hair_gelled" -/datum/sprite_accessory/hair/gentle +/datum/sprite_accessory/hair/legacy/gentle name = "Gentle" id = "hair_gentle" icon_state = "hair_gentle" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/glamour +/datum/sprite_accessory/hair/legacy/glamour name = "Glamour" id = "hair_glamour" icon_state = "hair_glamour" -/datum/sprite_accessory/hair/glossy +/datum/sprite_accessory/hair/legacy/glossy name = "Glossy" id = "hair_glossy" icon_state = "hair_glossy" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/hairfre +/datum/sprite_accessory/hair/legacy/hairfre name = "Hairfre" id = "hair_hairfre" icon_state = "hair_hairfre" -/datum/sprite_accessory/hair/halfbang +/datum/sprite_accessory/hair/legacy/halfbang name = "Half-banged Hair" id = "hair_halfbang" icon_state = "hair_halfbang" -/datum/sprite_accessory/hair/halfbangalt +/datum/sprite_accessory/hair/legacy/halfbangalt name = "Half-banged Hair Alt" id = "hair_halfbang_alt" icon_state = "hair_halfbang_alt" -/datum/sprite_accessory/hair/hedgehog +/datum/sprite_accessory/hair/legacy/hedgehog name = "Hedgehog Hair" id = "hair_hedgehog" icon_state = "hair_hedgehog" - icon_add = null + icon_add_legacy = null -/datum/sprite_accessory/hair/hightight +/datum/sprite_accessory/hair/legacy/hightight name = "High and Tight" id = "hair_hightight" icon_state = "hair_hightight" hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/himecut +/datum/sprite_accessory/hair/legacy/himecut name = "Hime Cut" id = "hair_hime" icon_state = "hair_himecut" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/shorthime +/datum/sprite_accessory/hair/legacy/shorthime name = "Hime Cut Short" id = "hair_hime_short" icon_state = "hair_shorthime" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/hitop +/datum/sprite_accessory/hair/legacy/hitop name = "Hitop" id = "hair_hitop" icon_state = "hair_hitop" -/datum/sprite_accessory/hair/jade +/datum/sprite_accessory/hair/legacy/jade name = "Jade" id = "hair_jade" icon_state = "hair_jade" -/datum/sprite_accessory/hair/jay +/datum/sprite_accessory/hair/legacy/jay name = "Jay" id = "hair_jay" icon_state = "hair_jay" -/datum/sprite_accessory/hair/jensen +/datum/sprite_accessory/hair/legacy/jensen name = "Jensen" id = "hair_jensen" icon_state = "hair_jensen" -/datum/sprite_accessory/hair/joestar +/datum/sprite_accessory/hair/legacy/joestar name = "Joestar" id = "hair_joestar" icon_state = "hair_joestar" -/datum/sprite_accessory/hair/kagami +/datum/sprite_accessory/hair/legacy/kagami name = "Kagami" id = "hair_kagami" icon_state = "hair_kagami" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/kusangi +/datum/sprite_accessory/hair/legacy/kusangi name = "Kusanagi Hair" id = "hair_kusanagi" icon_state = "hair_kusanagi" -/datum/sprite_accessory/hair/long +/datum/sprite_accessory/hair/legacy/long name = "Long Hair Shoulder-length" id = "hair_long_shoulder" icon_state = "hair_b" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/longer +/datum/sprite_accessory/hair/legacy/longer name = "Long Hair" id = "hair_long" icon_state = "hair_vlong" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/longeralt2 +/datum/sprite_accessory/hair/legacy/longeralt2 name = "Long Hair Alt 2" id = "hair_long_alt" icon_state = "hair_longeralt2" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/longest +/datum/sprite_accessory/hair/legacy/longest name = "Very Long Hair" id = "hair_verylong" icon_state = "hair_longest" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/manbun +/datum/sprite_accessory/hair/legacy/manbun name = "Manbun" id = "hair_manbun" icon_state = "hair_manbun" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/modern +/datum/sprite_accessory/hair/legacy/modern name = "Modern" id = "hair_modern" icon_state = "hair_modern" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/mohawk +/datum/sprite_accessory/hair/legacy/mohawk name = "Mohawk" id = "hair_mohawk" icon_state = "hair_d" -/datum/sprite_accessory/hair/regulationmohawk +/datum/sprite_accessory/hair/legacy/regulationmohawk name = "Mohawk Regulation" id = "hair_mohawk_regulation" icon_state = "hair_shavedmohawk" hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/reversemohawk +/datum/sprite_accessory/hair/legacy/reversemohawk name = "Mohawk Reverse" id = "hair_mohawk_reverse" icon_state = "hair_reversemohawk" -/datum/sprite_accessory/hair/messy +/datum/sprite_accessory/hair/legacy/messy name = "Messy" id = "hair_messy" icon_state = "hair_messy_tg" - icon_add = null + icon_add_legacy = null -/datum/sprite_accessory/hair/mohawkunshaven +/datum/sprite_accessory/hair/legacy/mohawkunshaven name = "Mohawk Unshaven" id = "hair_mohawk_unshaven" icon_state = "hair_unshaven_mohawk" -/datum/sprite_accessory/hair/mulder +/datum/sprite_accessory/hair/legacy/mulder name = "Mulder" id = "hair_mulder" icon_state = "hair_mulder" -/datum/sprite_accessory/hair/newyou +/datum/sprite_accessory/hair/legacy/newyou name = "New You" id = "hair_newyou" icon_state = "hair_newyou" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/nia +/datum/sprite_accessory/hair/legacy/nia name = "Nia" id = "hair_nia" icon_state = "hair_nia" -/datum/sprite_accessory/hair/nitori +/datum/sprite_accessory/hair/legacy/nitori name = "Nitori" id = "hair_nitori" icon_state = "hair_nitori" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/odango +/datum/sprite_accessory/hair/legacy/odango name = "Odango" id = "hair_odango" icon_state = "hair_odango" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/ombre +/datum/sprite_accessory/hair/legacy/ombre name = "Ombre" id = "hair_ombre" icon_state = "hair_ombre" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/oxton +/datum/sprite_accessory/hair/legacy/oxton name = "Oxton" id = "hair_oxton" icon_state = "hair_oxton" -/datum/sprite_accessory/hair/longovereye +/datum/sprite_accessory/hair/legacy/longovereye name = "Overeye Long" id = "hair_overeye_long" icon_state = "hair_longovereye" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/shortovereye +/datum/sprite_accessory/hair/legacy/shortovereye name = "Overeye Short" id = "hair_overeye_short" icon_state = "hair_shortovereye" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/veryshortovereyealternate +/datum/sprite_accessory/hair/legacy/veryshortovereyealternate name = "Overeye Very Short, Alternate" id = "hair_overeye_veryshort_alt" icon_state = "hair_veryshortovereyealternate" -/datum/sprite_accessory/hair/veryshortovereye +/datum/sprite_accessory/hair/legacy/veryshortovereye name = "Overeye Very Short" id = "hair_overeye_veryshort" icon_state = "hair_veryshortovereye" -/datum/sprite_accessory/hair/parted +/datum/sprite_accessory/hair/legacy/parted name = "Parted" id = "hair_parted" icon_state = "hair_parted" -/datum/sprite_accessory/hair/partedalt +/datum/sprite_accessory/hair/legacy/partedalt name = "Parted Alt" id = "hair_parted_alt" icon_state = "hair_partedalt" -/datum/sprite_accessory/hair/pixie +/datum/sprite_accessory/hair/legacy/pixie name = "Pixie" id = "hair_pixie" icon_state = "hair_pixie" -/datum/sprite_accessory/hair/pompadour +/datum/sprite_accessory/hair/legacy/pompadour name = "Pompadour" id = "hair_pompadour" icon_state = "hair_pompadour" -/datum/sprite_accessory/hair/dandypomp +/datum/sprite_accessory/hair/legacy/dandypomp name = "Pompadour Dandy" id = "hair_pompadour_dandy" icon_state = "hair_dandypompadour" -/datum/sprite_accessory/hair/ponytail1 +/datum/sprite_accessory/hair/legacy/ponytail1 name = "Ponytail 1" id = "hair_ponytail" icon_state = "hair_ponytail" hair_flags = HAIR_TIEABLE|HAIR_VERY_SHORT -/datum/sprite_accessory/hair/ponytail2 +/datum/sprite_accessory/hair/legacy/ponytail2 name = "Ponytail 2" id = "hair_ponytail2" icon_state = "hair_pa" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/ponytail3 +/datum/sprite_accessory/hair/legacy/ponytail3 name = "Ponytail 3" id = "hair_ponytail3" icon_state = "hair_ponytail3" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/ponytail4 +/datum/sprite_accessory/hair/legacy/ponytail4 name = "Ponytail 4" id = "hair_ponytail4" icon_state = "hair_ponytail4" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/ponytail5 +/datum/sprite_accessory/hair/legacy/ponytail5 name = "Ponytail 5" id = "hair_ponytail5" icon_state = "hair_ponytail5" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/ponytail6 +/datum/sprite_accessory/hair/legacy/ponytail6 name = "Ponytail 6" id = "hair_ponytail6" icon_state = "hair_ponytail6" hair_flags = HAIR_TIEABLE|HAIR_VERY_SHORT -/datum/sprite_accessory/hair/ponytail6_fixed //Eggnerd's done with waiting for upstream fixes lmao. +/datum/sprite_accessory/hair/legacy/ponytail6_fixed //Eggnerd's done with waiting for upstream fixes lmao. name = "Ponytail 6 but fixed" id = "hair_ponytail6_alt" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "hair_ponytail6" -/datum/sprite_accessory/hair/sharpponytail +/datum/sprite_accessory/hair/legacy/sharpponytail name = "Ponytail Sharp" id = "hair_ponytail_sharp" icon_state = "hair_sharpponytail" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/simple_ponytail +/datum/sprite_accessory/hair/legacy/simple_ponytail name = "Ponytail Simple" id = "hair_simple_ponytail" icon_state = "hair_simple_ponytail" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/spikyponytail +/datum/sprite_accessory/hair/legacy/spikyponytail name = "Ponytail Spiky" id = "hair_ponytail_spiky" icon_state = "hair_spikyponytail" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/highponytail +/datum/sprite_accessory/hair/legacy/highponytail name = "High Ponytail" id = "hair_ponytail_high" icon_state = "hair_highponytail" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/poofy +/datum/sprite_accessory/hair/legacy/poofy name = "Poofy" id = "hair_poofy" icon_state = "hair_poofy" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/poofy2 +/datum/sprite_accessory/hair/legacy/poofy2 name = "Poofy 2" id = "hair_poofy2" icon_state = "hair_poofy2" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/quiff +/datum/sprite_accessory/hair/legacy/quiff name = "Quiff" id = "hair_quiff" icon_state = "hair_quiff" -/datum/sprite_accessory/hair/nofade +/datum/sprite_accessory/hair/legacy/nofade name = "Regulation Cut" id = "hair_regulation" icon_state = "hair_nofade" - gender = MALE + random_generation_gender = MALE hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/ronin +/datum/sprite_accessory/hair/legacy/ronin name = "Ronin" id = "hair_ronin" icon_state = "hair_ronin" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/rosa +/datum/sprite_accessory/hair/legacy/rosa name = "Rosa" id = "hair_rosa" icon_state = "hair_rosa" -/datum/sprite_accessory/hair/rows +/datum/sprite_accessory/hair/legacy/rows name = "Rows" id = "hair_row" icon_state = "hair_rows1" hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/rows2 +/datum/sprite_accessory/hair/legacy/rows2 name = "Rows 2" id = "hair_row2" icon_state = "hair_rows2" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/rowbun +/datum/sprite_accessory/hair/legacy/rowbun name = "Row Bun" id = "hair_row_bun" icon_state = "hair_rowbun" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/rowdualbraid +/datum/sprite_accessory/hair/legacy/rowdualbraid name = "Row Dual Braid" id = "hair_row_braid_dual" icon_state = "hair_rowdualtail" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/rowbraid +/datum/sprite_accessory/hair/legacy/rowbraid name = "Row Braid" id = "hair_row_braid" icon_state = "hair_rowbraid" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/royal_curls +/datum/sprite_accessory/hair/legacy/royal_curls name = "Royal Curls" id = "hair_royal_curls" icon_state = "hair_royal_curls" -/datum/sprite_accessory/hair/runner +/datum/sprite_accessory/hair/legacy/runner name = "Runner" id = "hair_runner" icon_state = "hair_runner" -/datum/sprite_accessory/hair/sabitsuki +/datum/sprite_accessory/hair/legacy/sabitsuki name = "Sabitsuki" id = "hair_sabitsuki" icon_state = "hair_sabitsuki" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/scully +/datum/sprite_accessory/hair/legacy/scully name = "Scully" id = "hair_scully" icon_state = "hair_scully" -/datum/sprite_accessory/hair/shavehair +/datum/sprite_accessory/hair/legacy/shavehair name = "Shaved Hair" id = "hair_shaved" icon_state = "hair_shaved" hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/shortbangs +/datum/sprite_accessory/hair/legacy/shortbangs name = "Short Bangs" id = "hair_bangs_short" icon_state = "hair_shortbangs" -/datum/sprite_accessory/hair/short +/datum/sprite_accessory/hair/legacy/short name = "Short Hair" // try to capatilize the names please~ id = "hair_short" icon_state = "hair_a" // you do not need to define _s or _l sub-states, game automatically does this for you hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/short2 +/datum/sprite_accessory/hair/legacy/short2 name = "Short Hair 2" id = "hair_short2" icon_state = "hair_shorthair3" hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/shortalt2 +/datum/sprite_accessory/hair/legacy/shortalt2 name = "Short Hair 2 Alt" id = "hair_short2_alt" icon_state = "shorthair3a" hair_flags = HAIR_VERY_SHORT icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' -/datum/sprite_accessory/hair/short3 +/datum/sprite_accessory/hair/legacy/short3 name = "Short Hair 3" id = "hair_short3" icon_state = "hair_shorthair4" hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/shy +/datum/sprite_accessory/hair/legacy/shy name = "Shy" id = "hair_fluttershy" // let's be brutally honest about what htis is icon_state = "hair_shy" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/sideponytail +/datum/sprite_accessory/hair/legacy/sideponytail name = "Side Ponytail" id = "hair_ponytail_side" icon_state = "hair_stail" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/sideponytail4 //Not happy about this... but it's for the save files. +/datum/sprite_accessory/hair/legacy/sideponytail4 //Not happy about this... but it's for the save files. name = "Side Ponytail 2" id = "hair_ponytail_side2" icon_state = "hair_ponytailf" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/sideponytail2 +/datum/sprite_accessory/hair/legacy/sideponytail2 name = "Shoulder One" id = "hair_shoulder_one" icon_state = "hair_oneshoulder" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/sideponytail3 +/datum/sprite_accessory/hair/legacy/sideponytail3 name = "Shoulder Tress" id = "hair_shoulder_tress" icon_state = "hair_tressshoulder" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/skinhead +/datum/sprite_accessory/hair/legacy/skinhead name = "Skinhead" id = "hair_skinhead" icon_state = "hair_skinhead" hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/sleeze +/datum/sprite_accessory/hair/legacy/sleeze name = "Sleeze" id = "hair_sleaze" icon_state = "hair_sleeze" hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/spiky +/datum/sprite_accessory/hair/legacy/spiky name = "Spiky" id = "hair_spiky" icon_state = "hair_spikey" -/datum/sprite_accessory/hair/thinning +/datum/sprite_accessory/hair/legacy/thinning name = "Thinning" id = "hair_thinning" icon_state = "hair_thinning" hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/thinningfront +/datum/sprite_accessory/hair/legacy/thinningfront name = "Thinning Front" id = "hair_thinning_front" icon_state = "hair_thinningfront" hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/thinningback +/datum/sprite_accessory/hair/legacy/thinningback name = "Thinning Back" id = "hair_thinning_back" icon_state = "hair_thinningrear" hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/topknot +/datum/sprite_accessory/hair/legacy/topknot name = "Topknot" id = "hair_topknot" icon_state = "hair_topknot" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/trimflat +/datum/sprite_accessory/hair/legacy/trimflat name = "Trimmed Flat Top" id = "hair_trimmed_flat" icon_state = "hair_trimflat" - gender = MALE + random_generation_gender = MALE hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/jade +/datum/sprite_accessory/hair/legacy/jade name = "Jade" id = "hair_jade" icon_state = "hair_jade" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/trimmed +/datum/sprite_accessory/hair/legacy/trimmed name = "Trimmed" id = "hair_trimmed" icon_state = "hair_trimmed" - gender = MALE + random_generation_gender = MALE hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/twintai1 +/datum/sprite_accessory/hair/legacy/twintai1 name = "Twintail" id = "hair_twintails" icon_state = "hair_twintail" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/twintail2 +/datum/sprite_accessory/hair/legacy/twintail2 name = "Twintail Short" id = "hair_twintails_short" icon_state = "hair_twintailshort" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/undercut1 +/datum/sprite_accessory/hair/legacy/undercut1 name = "Undercut" id = "hair_undercut" icon_state = "hair_undercut1" - gender = MALE + random_generation_gender = MALE hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/undercut2 +/datum/sprite_accessory/hair/legacy/undercut2 name = "Undercut Swept Right" id = "hair_undercut_right" icon_state = "hair_undercut2" - gender = MALE + random_generation_gender = MALE hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/undercut3 +/datum/sprite_accessory/hair/legacy/undercut3 name = "Undercut Swept Left" id = "hair_undercut_left" icon_state = "hair_undercut3" - gender = MALE + random_generation_gender = MALE hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/undercutlong +/datum/sprite_accessory/hair/legacy/undercutlong name = "Undercut Long" id = "hair_undercut_long" icon_state = "hair_undercutlong" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/unkept +/datum/sprite_accessory/hair/legacy/unkept name = "Unkept" id = "hair_upkept" icon_state = "hair_unkept" -/datum/sprite_accessory/hair/updo +/datum/sprite_accessory/hair/legacy/updo name = "Updo" id = "hair_updo" icon_state = "hair_updo" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/vegeta +/datum/sprite_accessory/hair/legacy/vegeta name = "Vegeta" id = "hair_vegeta" icon_state = "hair_toriyama2" -/datum/sprite_accessory/hair/volaju +/datum/sprite_accessory/hair/legacy/volaju name = "Volaju" id = "hair_volaju" icon_state = "hair_volaju" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/wavy +/datum/sprite_accessory/hair/legacy/wavy name = "Wavy" id = "hair_wavy" icon_state = "hair_wavy" -/datum/sprite_accessory/hair/wisp +/datum/sprite_accessory/hair/legacy/wisp name = "Wisp" id = "hair_wisp" icon_state = "hair_wisp" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/zieglertail +/datum/sprite_accessory/hair/legacy/zieglertail name = "Zieglertail" id = "hair_ziegler" icon_state = "hair_ziegler" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/glossy +/datum/sprite_accessory/hair/legacy/glossy name = "Glossy" id = "hair_glossy" icon_state = "hair_glossy" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/sharpponytail +/datum/sprite_accessory/hair/legacy/sharpponytail name = "Ponytail Sharp" id = "hair_ponytail_sharp" icon_state = "hair_sharpponytail" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/partedalt +/datum/sprite_accessory/hair/legacy/partedalt name = "Parted Alt" id = "hair_parted2" icon_state = "hair_partedalt" -/datum/sprite_accessory/hair/amazon +/datum/sprite_accessory/hair/legacy/amazon name = "Amazon" id = "hair_amazon" icon_state = "hair_amazon" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/straightlong +/datum/sprite_accessory/hair/legacy/straightlong name = "Straight Long" id = "hair_long_straight" icon_state = "hair_straightlong" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/marysue +/datum/sprite_accessory/hair/legacy/marysue name = "Mary Sue" id = "hair_marysue" icon_state = "hair_marysue" -/datum/sprite_accessory/hair/sideundercut +/datum/sprite_accessory/hair/legacy/sideundercut name = "Side Undercut" id = "hair_undercut_side" icon_state = "hair_sideundercut" hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/donutbun +/datum/sprite_accessory/hair/legacy/donutbun name = "Donut Bun" id = "hair_bun_donut" icon_state = "hair_donutbun" -/datum/sprite_accessory/hair/gentle2 +/datum/sprite_accessory/hair/legacy/gentle2 name = "Gentle 2, Long" id = "hair_gentle2" icon_state = "hair_gentle2long" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/sweepshave +/datum/sprite_accessory/hair/legacy/sweepshave name = "Sweep Shave" id = "hair_sweepshave" icon_state = "hair_sweepshave" -/datum/sprite_accessory/hair/beachwave +/datum/sprite_accessory/hair/legacy/beachwave name = "Beach Waves" id = "hair_beachwave" icon_state = "hair_beachwave" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/celebcurls +/datum/sprite_accessory/hair/legacy/celebcurls name = "Celeb Curls" id = "hair_curls_celeb" icon_state = "hair_celebcurls" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/bigcurls +/datum/sprite_accessory/hair/legacy/bigcurls name = "Big Curls" id = "hair_curls_big" icon_state = "hair_bigcurls" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/jessica +/datum/sprite_accessory/hair/legacy/jessica name = "Jessica" id = "hair_jessica" icon_state = "hair_jessica" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/proper +/datum/sprite_accessory/hair/legacy/proper name = "Proper" id = "hair_proper" icon_state = "hair_proper" -/datum/sprite_accessory/hair/himeup +/datum/sprite_accessory/hair/legacy/himeup name = "Hime Updo" id = "hair_hime_updo" icon_state = "hair_himeup" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/front_braid +/datum/sprite_accessory/hair/legacy/front_braid name = "Braided front" id = "hair_braid_front" icon_state = "hair_braidfront" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/antenna +/datum/sprite_accessory/hair/legacy/antenna name = "Antenna" id = "hair_antenna" icon_state = "hair_antenna" -/datum/sprite_accessory/hair/protagonist +/datum/sprite_accessory/hair/legacy/protagonist name = "Slightly Long" id = "hair_protagonist" icon_state = "hair_protagonist" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/braidtail +/datum/sprite_accessory/hair/legacy/braidtail name = "Braided Tail" id = "hair_braid_tail" icon_state = "hair_braidtail" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/business +/datum/sprite_accessory/hair/legacy/business name = "Business Hair" id = "hair_business" icon_state = "hair_business" hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/business3 +/datum/sprite_accessory/hair/legacy/business3 name = "Business Hair 3" id = "hair_business3" icon_state = "hair_business3" hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/business4 +/datum/sprite_accessory/hair/legacy/business4 name = "Business Hair 4" id = "hair_business4" icon_state = "hair_business4" hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/sidepartlongalt +/datum/sprite_accessory/hair/legacy/sidepartlongalt name = "Long Side Part" id = "hair_sidepart_long" icon_state = "hair_longsidepart" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/miles +/datum/sprite_accessory/hair/legacy/miles name = "Miles Hair" id = "hair_miles" icon_state = "hair_miles" -/datum/sprite_accessory/hair/vivi +/datum/sprite_accessory/hair/legacy/vivi name = "Vivi" id = "hair_vivi" icon_state = "hair_vivi" -/datum/sprite_accessory/hair/taro +/datum/sprite_accessory/hair/legacy/taro name = "Taro" id = "hair_taro" icon_state = "hair_taro" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/judge +/datum/sprite_accessory/hair/legacy/judge name = "Judge" id = "hair_judge" icon_state = "hair_judge" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/mia +/datum/sprite_accessory/hair/legacy/mia name = "Mia" id = "hair_mia" icon_state = "hair_mia" -/datum/sprite_accessory/hair/elize +/datum/sprite_accessory/hair/legacy/elize name = "Elize" id = "hair_elize" icon_state = "hair_elize" -/datum/sprite_accessory/hair/longbraid +/datum/sprite_accessory/hair/legacy/longbraid name = "Long Braid" id = "hair_longbraid" icon_state = "hair_longbraid" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/emoright +/datum/sprite_accessory/hair/legacy/emoright name = "Emo Right" id = "hair_emoright" icon_state = "hair_emoright" -/datum/sprite_accessory/hair/aradia +/datum/sprite_accessory/hair/legacy/aradia name = "Aradia" id = "hair_aradia" icon_state = "hair_aradia" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/dirk +/datum/sprite_accessory/hair/legacy/dirk name = "Dirk" id = "hair_dirk" icon_state = "hair_dirk" -/datum/sprite_accessory/hair/equius +/datum/sprite_accessory/hair/legacy/equius name = "Equius" id = "hair_equius" icon_state = "hair_equius" -/datum/sprite_accessory/hair/feferi +/datum/sprite_accessory/hair/legacy/feferi name = "Feferi" id = "hair_feferi" icon_state = "hair_feferi" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/gamzee +/datum/sprite_accessory/hair/legacy/gamzee name = "Gamzee" id = "hair_gamzee" icon_state = "hair_gamzee" -/datum/sprite_accessory/hair/kanaya +/datum/sprite_accessory/hair/legacy/kanaya name = "Kanaya" id = "hair_kanaya" icon_state = "hair_kanaya" -/datum/sprite_accessory/hair/nepeta +/datum/sprite_accessory/hair/legacy/nepeta name = "Nepeta" id = "hair_nepeta" icon_state = "hair_nepeta" -/datum/sprite_accessory/hair/rose +/datum/sprite_accessory/hair/legacy/rose name = "Rose" id = "hair_rose" icon_state = "hair_rose" -/datum/sprite_accessory/hair/roxy +/datum/sprite_accessory/hair/legacy/roxy name = "Roxy" id = "hair_roxy" icon_state = "hair_roxy" -/datum/sprite_accessory/hair/terezi +/datum/sprite_accessory/hair/legacy/terezi name = "Terezi" id = "hair_terezi" icon_state = "hair_terezi" -/datum/sprite_accessory/hair/vriska +/datum/sprite_accessory/hair/legacy/vriska name = "Vriska" id = "hair_vriska" icon_state = "hair_vriska" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/flipped +/datum/sprite_accessory/hair/legacy/flipped name = "Flipped" id = "hair_flipped" icon_state = "hair_flipped" -/datum/sprite_accessory/hair/darcy +/datum/sprite_accessory/hair/legacy/darcy name = "Darcy" id = "hair_darcy" icon_state = "hair_darcy" -/datum/sprite_accessory/hair/antonio +/datum/sprite_accessory/hair/legacy/antonio name = "Antonio" id = "hair_antonio" icon_state = "hair_antonio" -/datum/sprite_accessory/hair/sweptfringe +/datum/sprite_accessory/hair/legacy/sweptfringe name = "Swept Fringe" id = "hair_sweptfringe" icon_state = "hair_sweptfringe" -/datum/sprite_accessory/hair/mialong +/datum/sprite_accessory/hair/legacy/mialong name = "Mia Long" id = "hair_mialong" icon_state = "hair_mialong" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/dreadslong +/datum/sprite_accessory/hair/legacy/dreadslong name = "Long Dreadlocks" id = "hair_dreadslong" icon_state = "hair_dreadslong" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/jeanponytail +/datum/sprite_accessory/hair/legacy/jeanponytail name = "Jean Ponytail" id = "hair_jeanponytail" icon_state = "hair_jeanponytail" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/shouldersweep +/datum/sprite_accessory/hair/legacy/shouldersweep name = "Shoulder Swept" id = "hair_shouldersweep" icon_state = "hair_shouldersweep" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/afropuffdouble +/datum/sprite_accessory/hair/legacy/afropuffdouble name = "Afropuff" id = "hair_afropuffdouble" icon_state = "hair_afropuffdouble" -/datum/sprite_accessory/hair/afropuffleft +/datum/sprite_accessory/hair/legacy/afropuffleft name = "Afropuff Left" id = "hair_afropuffleft" icon_state = "hair_afropuffleft" -/datum/sprite_accessory/hair/afropuffright +/datum/sprite_accessory/hair/legacy/afropuffright name = "Afropuff Right" id = "hair_afropuffright" icon_state = "hair_afropuffright" -/datum/sprite_accessory/hair/suave +/datum/sprite_accessory/hair/legacy/suave name = "Suave" id = "hair_suave" icon_state = "hair_suave" -/datum/sprite_accessory/hair/suave2 +/datum/sprite_accessory/hair/legacy/suave2 name = "Suave Alt" id ="hair_suave2" icon_state = "hair_suave2" -/datum/sprite_accessory/hair/jane +/datum/sprite_accessory/hair/legacy/jane name = "Jane" id = "hair_jane" icon_state = "hair_jane" -/datum/sprite_accessory/hair/rockstarcurls +/datum/sprite_accessory/hair/legacy/rockstarcurls name = "Rockstar Curls" id = "hair_rockstarcurls" icon_state = "hair_rockstarcurls" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/band +/datum/sprite_accessory/hair/legacy/band name = "Banded Long" id = "hair_band" icon_state = "hair_band" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/bieb +/datum/sprite_accessory/hair/legacy/bieb name = "Beaver" id = "hair_bieb" icon_state = "hair_bieb" -/datum/sprite_accessory/hair/fabio +/datum/sprite_accessory/hair/legacy/fabio name = "Fabio" id = "hair_fabio" icon_state = "hair_fabio" -/datum/sprite_accessory/hair/froofylong +/datum/sprite_accessory/hair/legacy/froofylong name = "Froofy Long" id = "hair_froofy_long" icon_state = "hair_froofy_long" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/glammetal +/datum/sprite_accessory/hair/legacy/glammetal name = "Glammetal" id = "hair_glammetal" icon_state = "hair_glammetal" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/midb +/datum/sprite_accessory/hair/legacy/midb name = "Mid-length hair" id = "hair_midb" icon_state = "hair_midb" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/halfshavedL +/datum/sprite_accessory/hair/legacy/halfshavedL name = "Half Shaved Left" id = "hair_halfshavedL" icon_state = "hair_halfshavedL" -/datum/sprite_accessory/hair/rockandroll +/datum/sprite_accessory/hair/legacy/rockandroll name = "Rock and Roll" id = "hair_rockandroll" icon_state = "hair_rockandroll" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/shortflip +/datum/sprite_accessory/hair/legacy/shortflip name = "Flip Short" id = "hair_shortflip" icon_state = "hair_shortflip" -/datum/sprite_accessory/hair/dreadlongalt +/datum/sprite_accessory/hair/legacy/dreadlongalt name = "Long Dreadlocks Alt" id = "hair_dreadlongalt" icon_state = "hair_dreadlongalt" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/keanu +/datum/sprite_accessory/hair/legacy/keanu name = "Keanu" id = "hair_keanu" icon_state = "hair_keanu" -/datum/sprite_accessory/hair/long3 +/datum/sprite_accessory/hair/legacy/long3 name = "Long Hair Alt 3" id = "hair_long3" icon_state = "hair_long3" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/supernova +/datum/sprite_accessory/hair/legacy/supernova name = "Supernova" id = "hair_supernova" icon_state = "hair_supernova" -/datum/sprite_accessory/hair/astolfo +/datum/sprite_accessory/hair/legacy/astolfo name = "Astolfo" id = "hair_astolfo" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "hair_astolfo" -/datum/sprite_accessory/hair/awoohair +/datum/sprite_accessory/hair/legacy/awoohair name = "Shoulder-length Messy" id = "hair_messy_shoulder" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "momijihair" -/datum/sprite_accessory/hair/citheronia_colorable +/datum/sprite_accessory/hair/legacy/citheronia_colorable name = "Citheronia Hair" id = "hair_citheronia" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "citheronia_hair_c" do_colouration = 1 -/datum/sprite_accessory/hair/twindrills +/datum/sprite_accessory/hair/legacy/twindrills name = "Twin Drills" id = "hair_twindrills" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "hair_twincurl" -/datum/sprite_accessory/hair/myopia +/datum/sprite_accessory/hair/legacy/myopia name = "Myopia" id = "hair_myopia" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "myopia" hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/shortish +/datum/sprite_accessory/hair/legacy/shortish name = "Shortish" id = "hair_shortish" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "bshort-1" -/datum/sprite_accessory/hair/shortmess +/datum/sprite_accessory/hair/legacy/shortmess name = "Short Mess" id = "hair_short_mess" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "bshort-2" -/datum/sprite_accessory/hair/peaked +/datum/sprite_accessory/hair/legacy/peaked name = "Peaked" id = "hair_peaked" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "bshort-3" -/datum/sprite_accessory/hair/blindbangs +/datum/sprite_accessory/hair/legacy/blindbangs name = "Blind Bangs" id = "hair_bangs_blind" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "blindbangs" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/reallyblindbangs +/datum/sprite_accessory/hair/legacy/reallyblindbangs name = "Grudge" id = "hair_grudge" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "grudge" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/zone +/datum/sprite_accessory/hair/legacy/zone name = "Zone" id = "hair_zone" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "zone" -/datum/sprite_accessory/hair/halfcut +/datum/sprite_accessory/hair/legacy/halfcut name = "Halfcut" id = "hair_halfcut" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "halfcut" -/datum/sprite_accessory/hair/halfcut_smooth +/datum/sprite_accessory/hair/legacy/halfcut_smooth name = "Halfcut Smooth" id = "hair_halfcutsmooth" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "halfcut_smooth" -/datum/sprite_accessory/hair/halfcut_rough +/datum/sprite_accessory/hair/legacy/halfcut_rough name = "Halfcut Rough" id = "hair_halfcutrough" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "halfcut_rough" -/datum/sprite_accessory/hair/braided_sidetail +/datum/sprite_accessory/hair/legacy/braided_sidetail name = "Braided Sidetail" id = "hair_braidedsidetail" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "braided_sidetail" -/datum/sprite_accessory/hair/baum +/datum/sprite_accessory/hair/legacy/baum name = "Baum" id = "hair_baum" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "baum" -/datum/sprite_accessory/hair/bluntbangs +/datum/sprite_accessory/hair/legacy/bluntbangs name = "Blunt Bangs" id = "hair_bluntbangs" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "bluntbangs" -/datum/sprite_accessory/hair/bluntbangsalt +/datum/sprite_accessory/hair/legacy/bluntbangsalt name = "Blunt Bangs 2" id = "hair_bluntbangsalt" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "bluntbangsalt" -/datum/sprite_accessory/hair/slightlymessy +/datum/sprite_accessory/hair/legacy/slightlymessy name = "Slightly Messy Long" id = "hair_slightlymessy" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "slightlymessy" -/datum/sprite_accessory/hair/kisaragi +/datum/sprite_accessory/hair/legacy/kisaragi name = "Kisaragi" id = "hair_kisaragi" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "kisaragi" -/datum/sprite_accessory/hair/fortuneteller +/datum/sprite_accessory/hair/legacy/fortuneteller name = "Fortune Teller" id = "hair_fortuneteller" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "fortuneteller" -/datum/sprite_accessory/hair/hajime +/datum/sprite_accessory/hair/legacy/hajime name = "Hajime" id = "hair_hajime" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "hajime" -/datum/sprite_accessory/hair/hajimeshort +/datum/sprite_accessory/hair/legacy/hajimeshort name = "Hajime Short" id = "hair_hajimealt" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "hajimealt" -/datum/sprite_accessory/hair/quadcurls +/datum/sprite_accessory/hair/legacy/quadcurls name = "Quad Curls" id = "hair_quadcurls" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "quadcurls" -/datum/sprite_accessory/hair/combedback +/datum/sprite_accessory/hair/legacy/combedback name = "Combed Back" id = "hair_combedback" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "combedback" -/datum/sprite_accessory/hair/combedbob +/datum/sprite_accessory/hair/legacy/combedbob name = "Combed Bob" id = "hair_combedbob" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "combedbob" -/datum/sprite_accessory/hair/geisha +/datum/sprite_accessory/hair/legacy/geisha name = "Geisha" id = "hair_geisha" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "geisha" -/datum/sprite_accessory/hair/cotton +/datum/sprite_accessory/hair/legacy/cotton name = "Cotton" id = "hair_cotton" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "cotton" -/datum/sprite_accessory/hair/cottonalt +/datum/sprite_accessory/hair/legacy/cottonalt name = "Cotton Short" id = "hair_cottonalt" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "cottonalt" -/datum/sprite_accessory/hair/africanpigtails +/datum/sprite_accessory/hair/legacy/africanpigtails name = "African Pigtails" id = "hair_africanpigtails" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "africanpigtails" -/datum/sprite_accessory/hair/inari +/datum/sprite_accessory/hair/legacy/inari name = "Inari" id = "hair_inari" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "inari" -/datum/sprite_accessory/hair/rocksatr +/datum/sprite_accessory/hair/legacy/rocksatr name = "Rockstar" id = "hair_rockstar" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "rockstar" -/datum/sprite_accessory/hair/ornateponytail +/datum/sprite_accessory/hair/legacy/ornateponytail name = "Ornate Ponytail" id = "hair_ornate_ponytail" icon_state = "hair_ornate_ponytail" -/datum/sprite_accessory/hair/eagle +/datum/sprite_accessory/hair/legacy/eagle name = "Eagle" id = "hair_eagle" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "eagle" -/datum/sprite_accessory/hair/macaw +/datum/sprite_accessory/hair/legacy/macaw name = "Macaw" id = "hair_macaw" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "macaw" -/datum/sprite_accessory/hair/owl +/datum/sprite_accessory/hair/legacy/owl name = "Owl" id = "hair_owl" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "owl" -/datum/sprite_accessory/hair/falcon +/datum/sprite_accessory/hair/legacy/falcon name = "Falcon" id = "hair_falcon" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "falcon" -/datum/sprite_accessory/hair/hummingbird +/datum/sprite_accessory/hair/legacy/hummingbird name = "Hummingbird" id = "hair_hummingbird" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "hummingbird" -/datum/sprite_accessory/hair/magpie +/datum/sprite_accessory/hair/legacy/magpie name = "Magpie" id = "hair_magpie" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "magpie" -/datum/sprite_accessory/hair/starling +/datum/sprite_accessory/hair/legacy/starling name = "Starling" id = "hair_starling" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "starling" -/datum/sprite_accessory/hair/stork +/datum/sprite_accessory/hair/legacy/stork name = "Stork" id = "hair_stork" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "stork" -/datum/sprite_accessory/hair/princess +/datum/sprite_accessory/hair/legacy/princess name = "Princess" id = "hair_princess" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "princess" diff --git a/code/modules/sprite_accessories/hair/sergal.dm b/code/modules/sprite_accessories/hair/species/sergal.dm similarity index 65% rename from code/modules/sprite_accessories/hair/sergal.dm rename to code/modules/sprite_accessories/hair/species/sergal.dm index c1efc05b4c4d..0735b9af1589 100644 --- a/code/modules/sprite_accessories/hair/sergal.dm +++ b/code/modules/sprite_accessories/hair/species/sergal.dm @@ -1,37 +1,37 @@ //Cheesewedge things -/datum/sprite_accessory/hair/ergal_plain +/datum/sprite_accessory/hair/legacy/ergal_plain name = "Sergal Plain" id = "hair_sergal_plain" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "serg_plain" species_allowed = list(SPECIES_SERGAL) apply_restrictions = TRUE -/datum/sprite_accessory/hair/sergal_medicore +/datum/sprite_accessory/hair/legacy/sergal_medicore name = "Sergal Medicore" id = "hair_sergal_medicore" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "serg_medicore" species_allowed = list(SPECIES_SERGAL) apply_restrictions = TRUE -/datum/sprite_accessory/hair/sergal_tapered +/datum/sprite_accessory/hair/legacy/sergal_tapered name = "Sergal Tapered" id = "hair_sergal_tapered" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "serg_tapered" species_allowed = list(SPECIES_SERGAL) apply_restrictions = TRUE -/datum/sprite_accessory/hair/sergal_fairytail +/datum/sprite_accessory/hair/legacy/sergal_fairytail name = "Sergal Fairytail" id = "hair_sergal_fairytail" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "serg_fairytail" species_allowed = list(SPECIES_SERGAL) apply_restrictions = TRUE diff --git a/code/modules/sprite_accessories/hair/shadekin.dm b/code/modules/sprite_accessories/hair/species/shadekin.dm similarity index 61% rename from code/modules/sprite_accessories/hair/shadekin.dm rename to code/modules/sprite_accessories/hair/species/shadekin.dm index 7b64c9be2cc4..f86f4ad5f070 100644 --- a/code/modules/sprite_accessories/hair/shadekin.dm +++ b/code/modules/sprite_accessories/hair/species/shadekin.dm @@ -1,31 +1,31 @@ // Shadekin stuffs -/datum/sprite_accessory/hair/shadekin_hair_short +/datum/sprite_accessory/hair/legacy/shadekin_hair_short name = "Shadekin Short Hair" id = "hair_shadekin_short" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "shadekin_short" species_allowed = list(SPECIES_SHADEKIN, SPECIES_SHADEKIN_CREW) apply_restrictions = TRUE - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/hair/shadekin_hair_poofy +/datum/sprite_accessory/hair/legacy/shadekin_hair_poofy name = "Shadekin Poofy Hair" id = "hair_shadekin_poofy" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "shadekin_poofy" species_allowed = list(SPECIES_SHADEKIN, SPECIES_SHADEKIN_CREW) apply_restrictions = TRUE - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/hair/shadekin_hair_long +/datum/sprite_accessory/hair/legacy/shadekin_hair_long name = "Shadekin Long Hair" id = "hair_shadekin_long" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "shadekin_long" species_allowed = list(SPECIES_SHADEKIN, SPECIES_SHADEKIN_CREW) apply_restrictions = TRUE - gender = NEUTER + random_generation_gender = null diff --git a/code/modules/sprite_accessories/hair/skrell.dm b/code/modules/sprite_accessories/hair/species/skrell.dm similarity index 71% rename from code/modules/sprite_accessories/hair/skrell.dm rename to code/modules/sprite_accessories/hair/species/skrell.dm index b96200999f39..5cddc4bd7b95 100644 --- a/code/modules/sprite_accessories/hair/skrell.dm +++ b/code/modules/sprite_accessories/hair/species/skrell.dm @@ -1,21 +1,21 @@ //Skrell stuff -/datum/sprite_accessory/hair/skr_tentacle_veryshort +/datum/sprite_accessory/hair/legacy/skr_tentacle_veryshort name = "Skrell Very Short Tentacles" id = "hair_skrell_tentacles_veryshort" icon_state = "skrell_hair_veryshort" -/datum/sprite_accessory/hair/skr_tentacle_short +/datum/sprite_accessory/hair/legacy/skr_tentacle_short name = "Skrell Short Tentacles" id = "hair_skrell_tentacles_short" icon_state = "skrell_hair_short" species_allowed = list(SPECIES_SKRELL, SPECIES_XENOCHIMERA, SPECIES_PROTEAN, SPECIES_CUSTOM, SPECIES_PROMETHEAN) -/datum/sprite_accessory/hair/skr_tentacle_average +/datum/sprite_accessory/hair/legacy/skr_tentacle_average name = "Skrell Average Tentacles" id = "hair_skrell_tentacles_average" icon_state = "skrell_hair_average" -/datum/sprite_accessory/hair/skr_tentacle_verylong +/datum/sprite_accessory/hair/legacy/skr_tentacle_verylong name = "Skrell Long Tentacles" id = "hair_skrell_tentacles_long" icon_state = "skrell_hair_verylong" diff --git a/code/modules/sprite_accessories/hair/tajaran.dm b/code/modules/sprite_accessories/hair/species/tajaran.dm similarity index 84% rename from code/modules/sprite_accessories/hair/tajaran.dm rename to code/modules/sprite_accessories/hair/species/tajaran.dm index 655670b22c6b..d79213bb13fe 100644 --- a/code/modules/sprite_accessories/hair/tajaran.dm +++ b/code/modules/sprite_accessories/hair/species/tajaran.dm @@ -1,117 +1,117 @@ //Tajaran hairstyles -/datum/sprite_accessory/hair/taj_ears +/datum/sprite_accessory/hair/legacy/taj_ears name = "Tajaran Ears" id = "hair_tajaran_ears" icon_state = "ears_plain" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN, SPECIES_CUSTOM) apply_restrictions = TRUE -/datum/sprite_accessory/hair/taj_ears_clean +/datum/sprite_accessory/hair/legacy/taj_ears_clean name = "Tajara Clean" id = "hair_tajaran_clean" icon_state = "hair_clean" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN, SPECIES_CUSTOM) apply_restrictions = TRUE -/datum/sprite_accessory/hair/taj_ears_bangs +/datum/sprite_accessory/hair/legacy/taj_ears_bangs name = "Tajara Bangs" id = "hair_tajaran_bangs" icon_state = "hair_bangs" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN, SPECIES_CUSTOM) apply_restrictions = TRUE -/datum/sprite_accessory/hair/taj_ears_braid +/datum/sprite_accessory/hair/legacy/taj_ears_braid name = "Tajara Braid" id = "hair_tajaran_braid" icon_state = "hair_tbraid" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN, SPECIES_CUSTOM) apply_restrictions = TRUE -/datum/sprite_accessory/hair/taj_ears_shaggy +/datum/sprite_accessory/hair/legacy/taj_ears_shaggy name = "Tajara Shaggy" id = "hair_tajaran_shaggy" icon_state = "hair_shaggy" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN, SPECIES_CUSTOM) apply_restrictions = TRUE -/datum/sprite_accessory/hair/taj_ears_mohawk +/datum/sprite_accessory/hair/legacy/taj_ears_mohawk name = "Tajaran Mohawk" id = "hair_tajaran_mohawk" icon_state = "hair_mohawk" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN, SPECIES_CUSTOM) apply_restrictions = TRUE -/datum/sprite_accessory/hair/taj_ears_plait +/datum/sprite_accessory/hair/legacy/taj_ears_plait name = "Tajara Plait" id = "hair_tajaran_plait" icon_state = "hair_plait" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN, SPECIES_CUSTOM) apply_restrictions = TRUE -/datum/sprite_accessory/hair/taj_ears_straight +/datum/sprite_accessory/hair/legacy/taj_ears_straight name = "Tajara Straight" id = "hair_tajaran_straight" icon_state = "hair_straight" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN, SPECIES_CUSTOM) apply_restrictions = TRUE -/datum/sprite_accessory/hair/taj_ears_long +/datum/sprite_accessory/hair/legacy/taj_ears_long name = "Tajara Long" id = "hair_tajaran_long" icon_state = "hair_long" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN, SPECIES_CUSTOM) apply_restrictions = TRUE -/datum/sprite_accessory/hair/taj_ears_rattail +/datum/sprite_accessory/hair/legacy/taj_ears_rattail name = "Tajara Rat Tail" id = "hair_tajaran_tail_rat" icon_state = "hair_rattail" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN, SPECIES_CUSTOM) apply_restrictions = TRUE -/datum/sprite_accessory/hair/taj_ears_spiky +/datum/sprite_accessory/hair/legacy/taj_ears_spiky name = "Tajara Spiky" id = "hair_tajaran_spiky" icon_state = "hair_tajspiky" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN, SPECIES_CUSTOM) apply_restrictions = TRUE -/datum/sprite_accessory/hair/taj_ears_messy +/datum/sprite_accessory/hair/legacy/taj_ears_messy name = "Tajara Messy" id = "hair_tajaran_messy" icon_state = "hair_messy" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN, SPECIES_CUSTOM) apply_restrictions = TRUE -/datum/sprite_accessory/hair/taj_ears_curls +/datum/sprite_accessory/hair/legacy/taj_ears_curls name = "Tajaran Curly" id = "hair_tajaran_curly" icon_state = "hair_curly" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN, SPECIES_CUSTOM) apply_restrictions = TRUE -/datum/sprite_accessory/hair/taj_ears_wife +/datum/sprite_accessory/hair/legacy/taj_ears_wife name = "Tajaran Housewife" id = "hair_tajaran_wife" icon_state = "hair_wife" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN, SPECIES_CUSTOM) apply_restrictions = TRUE -/datum/sprite_accessory/hair/taj_ears_victory +/datum/sprite_accessory/hair/legacy/taj_ears_victory name = "Tajaran Victory Curls" id = "hair_tajaran_victory" icon_state = "hair_victory" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN, SPECIES_CUSTOM) apply_restrictions = TRUE -/datum/sprite_accessory/hair/taj_ears_bob +/datum/sprite_accessory/hair/legacy/taj_ears_bob name = "Tajaran Bob" id = "hair_tajaran_bob" icon_state = "hair_tbob" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN, SPECIES_CUSTOM) apply_restrictions = TRUE -/datum/sprite_accessory/hair/taj_ears_fingercurl +/datum/sprite_accessory/hair/legacy/taj_ears_fingercurl name = "Tajaran Finger Curls" id = "hair_tajaran_fingerwave" icon_state = "hair_fingerwave" diff --git a/code/modules/sprite_accessories/hair/teshari.dm b/code/modules/sprite_accessories/hair/species/teshari.dm similarity index 61% rename from code/modules/sprite_accessories/hair/teshari.dm rename to code/modules/sprite_accessories/hair/species/teshari.dm index cd2aab525d9b..8b63a11c19f2 100644 --- a/code/modules/sprite_accessories/hair/teshari.dm +++ b/code/modules/sprite_accessories/hair/species/teshari.dm @@ -1,249 +1,249 @@ //Teshari things -/datum/sprite_accessory/hair/teshari +/datum/sprite_accessory/hair/legacy/teshari name = "Teshari Default" id = "hair_teshari_default" icon_state = "teshari_default" - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE -/datum/sprite_accessory/hair/teshari_altdefault +/datum/sprite_accessory/hair/legacy/teshari_altdefault name = "Teshari Alt. Default" id = "hair_teshari_default_alt" icon_state = "teshari_ears" - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE -/datum/sprite_accessory/hair/teshari_tight +/datum/sprite_accessory/hair/legacy/teshari_tight name = "Teshari Tight" id = "hair_teshari_tight" icon_state = "teshari_tight" - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE -/datum/sprite_accessory/hair/teshari_excited +/datum/sprite_accessory/hair/legacy/teshari_excited name = "Teshari Spiky" id = "hair_teshari_spiky" icon_state = "teshari_spiky" - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE -/datum/sprite_accessory/hair/teshari_spike +/datum/sprite_accessory/hair/legacy/teshari_spike name = "Teshari Spike" id = "hair_teshari_spike" icon_state = "teshari_spike" - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE -/datum/sprite_accessory/hair/teshari_long +/datum/sprite_accessory/hair/legacy/teshari_long name = "Teshari Overgrown" id = "hair_teshari_long" icon_state = "teshari_long" - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE -/datum/sprite_accessory/hair/teshari_burst +/datum/sprite_accessory/hair/legacy/teshari_burst name = "Teshari Starburst" id = "hair_teshari_burst" icon_state = "teshari_burst" - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE -/datum/sprite_accessory/hair/teshari_shortburst +/datum/sprite_accessory/hair/legacy/teshari_shortburst name = "Teshari Short Starburst" id = "hair_teshari_burst_short" icon_state = "teshari_burst_short" - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE -/datum/sprite_accessory/hair/teshari_mohawk +/datum/sprite_accessory/hair/legacy/teshari_mohawk name = "Teshari Mohawk" id = "hair_teshari_mohawk" icon_state = "teshari_mohawk" - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE -/datum/sprite_accessory/hair/teshari_pointy +/datum/sprite_accessory/hair/legacy/teshari_pointy name = "Teshari Pointy" id = "hair_teshari_pointy" icon_state = "teshari_pointy" - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE -/datum/sprite_accessory/hair/teshari_upright +/datum/sprite_accessory/hair/legacy/teshari_upright name = "Teshari Upright" id = "hair_teshari_upright" icon_state = "teshari_upright" - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE -/datum/sprite_accessory/hair/teshari_mane +/datum/sprite_accessory/hair/legacy/teshari_mane name = "Teshari Mane" id = "hair_teshari_mane" icon_state = "teshari_mane" - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE -/datum/sprite_accessory/hair/teshari_droopy +/datum/sprite_accessory/hair/legacy/teshari_droopy name = "Teshari Droopy" id = "hair_teshari_droopy" icon_state = "teshari_droopy" - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE -/datum/sprite_accessory/hair/teshari_mushroom +/datum/sprite_accessory/hair/legacy/teshari_mushroom name = "Teshari Mushroom" id = "hair_teshari_mushroom" icon_state = "teshari_mushroom" - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE -/datum/sprite_accessory/hair/teshari_twies +/datum/sprite_accessory/hair/legacy/teshari_twies name = "Teshari Twies" id = "hair_teshari_twies" icon_state = "teshari_twies" - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE -/datum/sprite_accessory/hair/teshari_backstrafe +/datum/sprite_accessory/hair/legacy/teshari_backstrafe name = "Teshari Backstrafe" id = "hair_teshari_backstrafe" icon_state = "teshari_backstrafe" - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE -/datum/sprite_accessory/hair/teshari_longway +/datum/sprite_accessory/hair/legacy/teshari_longway name = "Teshari Long way" id = "hair_teshari_longway" icon_state = "teshari_longway" - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE -/datum/sprite_accessory/hair/teshari_tree +/datum/sprite_accessory/hair/legacy/teshari_tree name = "Teshari Tree" id = "hair_teshari_tree" icon_state = "teshari_tree" - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE -/datum/sprite_accessory/hair/teshari_fluffymohawk +/datum/sprite_accessory/hair/legacy/teshari_fluffymohawk name = "Teshari Fluffy Mohawk" id = "hair_teshari_mohawk_fluffy" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "teshari_fluffymohawk" species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE -/datum/sprite_accessory/hair/teshari_sleek +/datum/sprite_accessory/hair/legacy/teshari_sleek name = "Teshari Sleek" id = "hair_teshari_sleek" icon_state = "teshari_sleek" - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE -/datum/sprite_accessory/hair/teshari_thepeel +/datum/sprite_accessory/hair/legacy/teshari_thepeel name = "Teshari 'The Peel'" id = "hair_teshari_peel" icon_state = "teshari_peel" - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE -/datum/sprite_accessory/hair/teshari_sweptup +/datum/sprite_accessory/hair/legacy/teshari_sweptup name = "Teshari Swept Up" id = "hair_teshari_swept_up" icon_state = "teshari_sweep" - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE -/datum/sprite_accessory/hair/teshari_aerodynamic +/datum/sprite_accessory/hair/legacy/teshari_aerodynamic name = "Teshari Aerodynamic" id = "hair_teshari_aerodynamic" icon_state = "teshari_aerodynamic" - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE -/datum/sprite_accessory/hair/teshari_tallmohawk +/datum/sprite_accessory/hair/legacy/teshari_tallmohawk name = "Teshari Tall Mohawk" id = "hair_teshari_mohawk_tall" icon_state = "teshari_tallmohawk" - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE -/datum/sprite_accessory/hair/teshari_cowlick +/datum/sprite_accessory/hair/legacy/teshari_cowlick name = "Teshari Cow-lick" id = "hair_teshari_cowlick" icon_state = "teshari_cowlick" - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE -/datum/sprite_accessory/hair/teshari_spikyalt +/datum/sprite_accessory/hair/legacy/teshari_spikyalt name = "Teshari Spiky alt" id = "hair_teshari_spiky_alt" icon_state = "teshari_spiky2" - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE -/datum/sprite_accessory/hair/teshari_soap +/datum/sprite_accessory/hair/legacy/teshari_soap name = "Teshari Soap" id = "hair_teshari_soap" icon_state = "teshari_soap" - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE -/datum/sprite_accessory/hair/teshari_crowned +/datum/sprite_accessory/hair/legacy/teshari_crowned name = "Teshari Crowned" id = "hair_teshari_crowned" icon_state = "teshari_crowned" - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE -/datum/sprite_accessory/hair/teshari_crest +/datum/sprite_accessory/hair/legacy/teshari_crest name = "Teshari Crest" id = "hair_teshari_crest" icon_state = "teshari_crest" - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE -/datum/sprite_accessory/hair/teshari_ponytail +/datum/sprite_accessory/hair/legacy/teshari_ponytail name = "Teshari Feather Ponytail" id = "hair_teshari_ponytail" icon_state = "teshari_ponytail" - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE -/datum/sprite_accessory/hair/teshari_bun +/datum/sprite_accessory/hair/legacy/teshari_bun name = "Teshari Feather Bun" id = "hair_teshari_bun" icon_state = "teshari_bun" - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE diff --git a/code/modules/sprite_accessories/hair/unathi.dm b/code/modules/sprite_accessories/hair/species/unathi.dm similarity index 77% rename from code/modules/sprite_accessories/hair/unathi.dm rename to code/modules/sprite_accessories/hair/species/unathi.dm index d54c17ac800c..0323982b6184 100644 --- a/code/modules/sprite_accessories/hair/unathi.dm +++ b/code/modules/sprite_accessories/hair/species/unathi.dm @@ -1,20 +1,20 @@ //Unathi stuff -/datum/sprite_accessory/hair/una_hood +/datum/sprite_accessory/hair/legacy/una_hood name = "Cobra Hood" id = "hair_unathi_hood" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "soghun_hood" -/datum/sprite_accessory/hair/una_spines_long +/datum/sprite_accessory/hair/legacy/una_spines_long name = "Long Unathi Spines" id = "hair_unathi_spines_long" icon_state = "soghun_longspines" species_allowed = list(SPECIES_UNATHI, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) //Xenochimera get most hairstyles since they're abominations. apply_restrictions = TRUE -/datum/sprite_accessory/hair/una_spines_short +/datum/sprite_accessory/hair/legacy/una_spines_short name = "Short Unathi Spines" id = "hair_unathi_spines_short" icon_state = "soghun_shortspines" @@ -22,60 +22,60 @@ apply_restrictions = TRUE -/datum/sprite_accessory/hair/una_frills_long +/datum/sprite_accessory/hair/legacy/una_frills_long name = "Long Unathi Frills" id = "hair_unathi_frills_long" icon_state = "soghun_longfrills" species_allowed = list(SPECIES_UNATHI, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) apply_restrictions = TRUE -/datum/sprite_accessory/hair/una_frills_short +/datum/sprite_accessory/hair/legacy/una_frills_short name = "Short Unathi Frills" id = "hair_unathi_frills_short" icon_state = "soghun_shortfrills" species_allowed = list(SPECIES_UNATHI, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) apply_restrictions = TRUE -/datum/sprite_accessory/hair/una_horns +/datum/sprite_accessory/hair/legacy/una_horns name = "Unathi Horns" id = "hair_unathi_horns" icon_state = "soghun_horns" species_allowed = list(SPECIES_UNATHI, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) apply_restrictions = TRUE -/datum/sprite_accessory/hair/una_bighorns +/datum/sprite_accessory/hair/legacy/una_bighorns name = "Unathi Big Horns" id = "hair_unathi_horns_big" icon_state = "unathi_bighorn" species_allowed = list(SPECIES_UNATHI, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) apply_restrictions = TRUE -/datum/sprite_accessory/hair/una_smallhorns +/datum/sprite_accessory/hair/legacy/una_smallhorns name = "Unathi Small Horns" id = "hair_unathi_horns_small" icon_state = "unathi_smallhorn" species_allowed = list(SPECIES_UNATHI, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) apply_restrictions = TRUE -/datum/sprite_accessory/hair/una_ramhorns +/datum/sprite_accessory/hair/legacy/una_ramhorns name = "Unathi Ram Horns" id = "hair_unathi_horns_ram" icon_state = "unathi_ramhorn" species_allowed = list(SPECIES_UNATHI, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) apply_restrictions = TRUE -/datum/sprite_accessory/hair/una_sidefrills +/datum/sprite_accessory/hair/legacy/una_sidefrills name = "Unathi Side Frills" id = "hair_unathi_frills_side" icon_state = "unathi_sidefrills" species_allowed = list(SPECIES_UNATHI, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) apply_restrictions = TRUE -/datum/sprite_accessory/hair/una_doublehorns +/datum/sprite_accessory/hair/legacy/una_doublehorns name = "Double Unathi Horns" id = "hair_unathi_horns_double" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "soghun_dubhorns" species_allowed = list(SPECIES_UNATHI, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) apply_restrictions = TRUE diff --git a/code/modules/sprite_accessories/hair/unathi_digitigrade.dm b/code/modules/sprite_accessories/hair/species/unathi_digitigrade.dm similarity index 77% rename from code/modules/sprite_accessories/hair/unathi_digitigrade.dm rename to code/modules/sprite_accessories/hair/species/unathi_digitigrade.dm index 515ea5be3625..173739cb5bce 100644 --- a/code/modules/sprite_accessories/hair/unathi_digitigrade.dm +++ b/code/modules/sprite_accessories/hair/species/unathi_digitigrade.dm @@ -1,91 +1,91 @@ //Normal and digitigrade unathi get different hair because of their different head shape. -/datum/sprite_accessory/hair/una_digi_spines_short +/datum/sprite_accessory/hair/legacy/una_digi_spines_short name = "Short Digitigrade Unathi Spines" id = "hair_flatunathi_spines_short" icon_state = "soghun_shortspines_digi" icon = 'icons/mob/species/unathidigi/hair.dmi' - icon_add = null + icon_add_legacy = null species_allowed = list(SPECIES_UNATHI_DIGI, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) apply_restrictions = TRUE -/datum/sprite_accessory/hair/una_digi_spines_long +/datum/sprite_accessory/hair/legacy/una_digi_spines_long name = "Long Digitigrade Unathi Spines" id = "hair_flatunathi_spines_long" icon_state = "soghun_longspines_digi" icon = 'icons/mob/species/unathidigi/hair.dmi' - icon_add = null + icon_add_legacy = null species_allowed = list(SPECIES_UNATHI_DIGI, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) apply_restrictions = TRUE -/datum/sprite_accessory/hair/una_digi_finhawk +/datum/sprite_accessory/hair/legacy/una_digi_finhawk name = "Digitigrade Unathi Finhawk" id = "hair_flatunathi_finhawk" icon_state = "fin_hawk_digi" icon = 'icons/mob/species/unathidigi/hair.dmi' - icon_add = null + icon_add_legacy = null species_allowed = list(SPECIES_UNATHI_DIGI, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) apply_restrictions = TRUE -/datum/sprite_accessory/hair/una_digi_demonhorns +/datum/sprite_accessory/hair/legacy/una_digi_demonhorns name = "Digitigrade Unathi Demon Horns" id = "hair_flatunathi_horns_demon" icon_state = "demon_horn_digi" icon = 'icons/mob/species/unathidigi/hair.dmi' - icon_add = null + icon_add_legacy = null species_allowed = list(SPECIES_UNATHI_DIGI, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) apply_restrictions = TRUE -/datum/sprite_accessory/hair/una_digi_swepthorns +/datum/sprite_accessory/hair/legacy/una_digi_swepthorns name = "Digitigrade Unathi Swept Horns" id = "hair_flatunathi_horns_swept" icon_state = "swept_horn_digi" icon = 'icons/mob/species/unathidigi/hair.dmi' - icon_add = null + icon_add_legacy = null species_allowed = list(SPECIES_UNATHI_DIGI, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) apply_restrictions = TRUE -/datum/sprite_accessory/hair/una_digi_ramhorns +/datum/sprite_accessory/hair/legacy/una_digi_ramhorns name = "Digitigrade Unathi Ram Horns" id = "hair_flatunathi_horns_ram" icon_state = "ram_horn_digi" icon = 'icons/mob/species/unathidigi/hair.dmi' - icon_add = null + icon_add_legacy = null species_allowed = list(SPECIES_UNATHI_DIGI, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) apply_restrictions = TRUE -/datum/sprite_accessory/hair/una_digi_frills_long +/datum/sprite_accessory/hair/legacy/una_digi_frills_long name = "Long Digitigrade Unathi Frills" id = "hair_flatunathi_frills_long" icon_state = "soghun_longfrills_digi" icon = 'icons/mob/species/unathidigi/hair.dmi' - icon_add = null + icon_add_legacy = null species_allowed = list(SPECIES_UNATHI_DIGI, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) apply_restrictions = TRUE -/datum/sprite_accessory/hair/una_digi_frills_short +/datum/sprite_accessory/hair/legacy/una_digi_frills_short name = "Short Digitigrade Unathi Frills" id = "hair_flatunathi_frills_short" icon_state = "soghun_shortfrills_digi" icon = 'icons/mob/species/unathidigi/hair.dmi' - icon_add = null + icon_add_legacy = null species_allowed = list(SPECIES_UNATHI_DIGI, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) apply_restrictions = TRUE -/datum/sprite_accessory/hair/una_digi_horns +/datum/sprite_accessory/hair/legacy/una_digi_horns name = "Digitigrade Unathi Horns" id = "hair_flatunathi_horns" icon_state = "soghun_horns_digi" icon = 'icons/mob/species/unathidigi/hair.dmi' - icon_add = null + icon_add_legacy = null species_allowed = list(SPECIES_UNATHI_DIGI, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) apply_restrictions = TRUE -/datum/sprite_accessory/hair/una_digi_frills_big +/datum/sprite_accessory/hair/legacy/una_digi_frills_big name = "Big Digitigrade Unathi Frills" id = "hair_flatunathi_frills_big" icon_state = "big_frills_digi" icon = 'icons/mob/species/unathidigi/hair.dmi' - icon_add = null + icon_add_legacy = null species_allowed = list(SPECIES_UNATHI_DIGI, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) apply_restrictions = TRUE diff --git a/code/modules/sprite_accessories/hair/vox.dm b/code/modules/sprite_accessories/hair/species/vox.dm similarity index 72% rename from code/modules/sprite_accessories/hair/vox.dm rename to code/modules/sprite_accessories/hair/species/vox.dm index cdfb3e9b402b..c5056dbe654a 100644 --- a/code/modules/sprite_accessories/hair/vox.dm +++ b/code/modules/sprite_accessories/hair/species/vox.dm @@ -1,116 +1,116 @@ -/datum/sprite_accessory/hair/vox_braid_long +/datum/sprite_accessory/hair/legacy/vox_braid_long name = "Long Vox braid" id = "hair_vox_braid_long" icon_state = "vox_longbraid" species_allowed = list(SPECIES_VOX) apply_restrictions = TRUE -/datum/sprite_accessory/hair/vox_braid_short +/datum/sprite_accessory/hair/legacy/vox_braid_short name = "Short Vox Braid" id = "hair_vox_braid_short" icon_state = "vox_shortbraid" species_allowed = list(SPECIES_VOX) apply_restrictions = TRUE -/datum/sprite_accessory/hair/vox_quills_short +/datum/sprite_accessory/hair/legacy/vox_quills_short name = "Short Vox Quills" id = "hair_vox_quills_short" icon_state = "vox_shortquills" species_allowed = list(SPECIES_VOX) apply_restrictions = TRUE -/datum/sprite_accessory/hair/vox_quills_kingly +/datum/sprite_accessory/hair/legacy/vox_quills_kingly name = "Kingly Vox Quills" id = "hair_vox_quills_kingly" icon_state = "vox_kingly" species_allowed = list(SPECIES_VOX) apply_restrictions = TRUE -/datum/sprite_accessory/hair/vox_quills_mohawk +/datum/sprite_accessory/hair/legacy/vox_quills_mohawk name = "Quill Mohawk" id = "hair_vox_quill_mohawk" icon_state = "vox_mohawk" species_allowed = list(SPECIES_VOX) apply_restrictions = TRUE -/datum/sprite_accessory/hair/vox_quills_afro +/datum/sprite_accessory/hair/legacy/vox_quills_afro name = "Vox Afro" id = "hair_vox_afro" icon_state = "vox_afro" species_allowed = list(SPECIES_VOX) apply_restrictions = TRUE -/datum/sprite_accessory/hair/vox_quills_mohawk +/datum/sprite_accessory/hair/legacy/vox_quills_mohawk name = "Vox Mohawk" id = "hair_vox_mohawk" icon_state = "vox_mohawk" species_allowed = list(SPECIES_VOX) apply_restrictions = TRUE -/datum/sprite_accessory/hair/vox_quills_yasu +/datum/sprite_accessory/hair/legacy/vox_quills_yasu name = "Vox Yasuhiro" id = "hair_vox_yasuhiro" icon_state = "vox_yasu" species_allowed = list(SPECIES_VOX) apply_restrictions = TRUE -/datum/sprite_accessory/hair/vox_quills_horns +/datum/sprite_accessory/hair/legacy/vox_quills_horns name = "Vox Quorns" id = "hair_vox_horns" icon_state = "vox_horns" species_allowed = list(SPECIES_VOX) apply_restrictions = TRUE -/datum/sprite_accessory/hair/vox_quills_nights +/datum/sprite_accessory/hair/legacy/vox_quills_nights name = "Vox Nights" id = "hair_vox_nights" icon_state = "vox_nights" species_allowed = list(SPECIES_VOX) apply_restrictions = TRUE -/datum/sprite_accessory/hair/vox_quills_surf +/datum/sprite_accessory/hair/legacy/vox_quills_surf name = "Vox Surf" id = "hair_vox_surf" icon_state = "vox_surf" species_allowed = list(SPECIES_VOX) apply_restrictions = TRUE -/datum/sprite_accessory/hair/vox_quills_cropped +/datum/sprite_accessory/hair/legacy/vox_quills_cropped name = "Vox Cropped" id = "hair_vox_cropped" icon_state = "vox_cropped" species_allowed = list(SPECIES_VOX) apply_restrictions = TRUE -/datum/sprite_accessory/hair/vox_quills_bald +/datum/sprite_accessory/hair/legacy/vox_quills_bald name = "Vox Bald" id = "hair_vox_bald" icon_state = "vox_bald" species_allowed = list(SPECIES_VOX) apply_restrictions = TRUE -/datum/sprite_accessory/hair/vox_quills_ruffhawk +/datum/sprite_accessory/hair/legacy/vox_quills_ruffhawk name = "Vox Ruffhawk" id = "hair_vox_ruff_hawk" icon_state = "vox_ruff_hawk" species_allowed = list(SPECIES_VOX) apply_restrictions = TRUE -/datum/sprite_accessory/hair/vox_quills_rows +/datum/sprite_accessory/hair/legacy/vox_quills_rows name = "Vox Rows" id = "hair_vox_rows" icon_state = "vox_rows" species_allowed = list(SPECIES_VOX) apply_restrictions = TRUE -/datum/sprite_accessory/hair/vox_quills_mange +/datum/sprite_accessory/hair/legacy/vox_quills_mange name = "Vox Mange" id = "hair_vox_mange" icon_state = "vox_mange" species_allowed = list(SPECIES_VOX) apply_restrictions = TRUE -/datum/sprite_accessory/hair/vox_quills_pony +/datum/sprite_accessory/hair/legacy/vox_quills_pony name = "Vox Pony" id = "hair_vox_pony" icon_state = "vox_pony" diff --git a/code/modules/sprite_accessories/hair/vulpkanin.dm b/code/modules/sprite_accessories/hair/species/vulpkanin.dm similarity index 66% rename from code/modules/sprite_accessories/hair/vulpkanin.dm rename to code/modules/sprite_accessories/hair/species/vulpkanin.dm index c08ae2e2648e..87142be7ea89 100644 --- a/code/modules/sprite_accessories/hair/vulpkanin.dm +++ b/code/modules/sprite_accessories/hair/species/vulpkanin.dm @@ -1,149 +1,149 @@ // Vulpa stuffs -/datum/sprite_accessory/hair/vulp_hair_none +/datum/sprite_accessory/hair/legacy/vulp_hair_none name = "None" id = "hair_vulp_none" icon_state = "bald" species_allowed = list(SPECIES_VULPKANIN) apply_restrictions = TRUE - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/hair/vulp_hair_kajam +/datum/sprite_accessory/hair/legacy/vulp_hair_kajam name = "Kajam" id = "hair_vulp_kajam" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "kajam" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN) apply_restrictions = TRUE - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/hair/vulp_hair_keid +/datum/sprite_accessory/hair/legacy/vulp_hair_keid name = "Keid" id = "hair_vulp_keid" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "keid" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN) apply_restrictions = TRUE - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/hair/vulp_hair_adhara +/datum/sprite_accessory/hair/legacy/vulp_hair_adhara name = "Adhara" id = "hair_vulp_adhara" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "adhara" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN) apply_restrictions = TRUE - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/hair/vulp_hair_kleeia +/datum/sprite_accessory/hair/legacy/vulp_hair_kleeia name = "Kleeia" id = "hair_vulp_kleeia" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "kleeia" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN) apply_restrictions = TRUE - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/hair/vulp_hair_mizar +/datum/sprite_accessory/hair/legacy/vulp_hair_mizar name = "Mizar" id = "hair_vulp_mizar" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "mizar" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN) apply_restrictions = TRUE - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/hair/vulp_hair_apollo +/datum/sprite_accessory/hair/legacy/vulp_hair_apollo name = "Apollo" id = "hair_vulp_apollo" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "apollo" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN) apply_restrictions = TRUE - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/hair/vulp_hair_belle +/datum/sprite_accessory/hair/legacy/vulp_hair_belle name = "Belle" id = "hair_vulp_belle" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "belle" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN) apply_restrictions = TRUE - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/hair/vulp_hair_bun +/datum/sprite_accessory/hair/legacy/vulp_hair_bun name = "Bun" id = "hair_vulp_bun" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "bun" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN) apply_restrictions = TRUE - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/hair/vulp_hair_jagged +/datum/sprite_accessory/hair/legacy/vulp_hair_jagged name = "Jagged" id = "hair_vulp_jagged" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "jagged" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN) apply_restrictions = TRUE - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/hair/vulp_hair_curl +/datum/sprite_accessory/hair/legacy/vulp_hair_curl name = "Curl" id = "hair_vulp_curl" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "curl" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN) apply_restrictions = TRUE - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/hair/vulp_hair_hawk +/datum/sprite_accessory/hair/legacy/vulp_hair_hawk name = "Hawk" id = "hair_vulp_hawk" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "hawk" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN) apply_restrictions = TRUE - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/hair/vulp_hair_anita +/datum/sprite_accessory/hair/legacy/vulp_hair_anita name = "Anita" id = "hair_vulp_anita" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "anita" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN) apply_restrictions = TRUE - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/hair/vulp_hair_short +/datum/sprite_accessory/hair/legacy/vulp_hair_short name = "Short" id = "hair_vulp_short" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "short" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN) apply_restrictions = TRUE - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/hair/vulp_hair_spike +/datum/sprite_accessory/hair/legacy/vulp_hair_spike name = "Spike" id = "hair_vulp_spike" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "spike" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN) apply_restrictions = TRUE - gender = NEUTER + random_generation_gender = null diff --git a/code/modules/sprite_accessories/hair/xenomorph.dm b/code/modules/sprite_accessories/hair/species/xenomorph.dm similarity index 54% rename from code/modules/sprite_accessories/hair/xenomorph.dm rename to code/modules/sprite_accessories/hair/species/xenomorph.dm index c689578aa941..78f3c71cf7a3 100644 --- a/code/modules/sprite_accessories/hair/xenomorph.dm +++ b/code/modules/sprite_accessories/hair/species/xenomorph.dm @@ -1,58 +1,58 @@ //xeno stuffs -/datum/sprite_accessory/hair/xeno_head_drone_color +/datum/sprite_accessory/hair/legacy/xeno_head_drone_color name = "Drone dome" id = "hair_xeno_drone" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "cxeno_drone" species_allowed = list(SPECIES_XENOHYBRID) - gender = NEUTER + random_generation_gender = null // figure this one out for better coloring -/datum/sprite_accessory/hair/xeno_head_sentinel_color +/datum/sprite_accessory/hair/legacy/xeno_head_sentinel_color name = "Sentinal dome" id = "hair_xeno_sentinel" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "cxeno_sentinel" species_allowed = list(SPECIES_XENOHYBRID) - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/hair/xeno_head_queen_color +/datum/sprite_accessory/hair/legacy/xeno_head_queen_color name = "Queen dome" id = "hair_xeno_queen" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "cxeno_queen" species_allowed = list(SPECIES_XENOHYBRID) - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/hair/xeno_head_hunter_color +/datum/sprite_accessory/hair/legacy/xeno_head_hunter_color name = "Hunter dome" id = "hair_xeno_hunter" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "cxeno_hunter" species_allowed = list(SPECIES_XENOHYBRID) - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/hair/xeno_head_praetorian_color +/datum/sprite_accessory/hair/legacy/xeno_head_praetorian_color name = "Praetorian dome" id = "hair_xeno_praetorian" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "cxeno_praetorian" species_allowed = list(SPECIES_XENOHYBRID) - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/hair/xeno_head_hybrid_color1 +/datum/sprite_accessory/hair/legacy/xeno_head_hybrid_color1 name = "Xenohybrid dome 1" id = "hair_xeno_hybrid" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "cxeno_hybrid1" species_allowed = list(SPECIES_XENOHYBRID) - gender = NEUTER + random_generation_gender = null diff --git a/code/modules/sprite_accessories/markings/_markings.dm b/code/modules/sprite_accessories/markings/_markings.dm index eeac62d1bde7..9db9bd5dc8bd 100644 --- a/code/modules/sprite_accessories/markings/_markings.dm +++ b/code/modules/sprite_accessories/markings/_markings.dm @@ -1,8 +1,10 @@ +// todo: this shouldn't be a /sprite_accessory. + /datum/sprite_accessory/marking abstract_type = /datum/sprite_accessory/marking icon = "icons/mob/sprite_accessories/markings.dmi" do_colouration = 1 //Almost all of them have it, COLOR_ADD - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE ///Empty list is unrestricted. Should only restrict the ones that make NO SENSE on other species, //like Tajaran inner-ear coloring overlay stuff. @@ -41,14 +43,14 @@ name = "Abomination" id = "marking_abomination" icon_state = "abomination" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/abomination_alt name = "Abomination Alternate" id = "marking_abomination2" icon_state = "abomination2" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/nevrean_female @@ -56,16 +58,16 @@ id = "marking_nevrean_f" icon_state = "nevrean_f" body_parts = list(BP_HEAD) - color_blend_mode = ICON_MULTIPLY - gender = FEMALE + legacy_use_additive_color_matrix = FALSE + random_generation_gender = FEMALE /datum/sprite_accessory/marking/nevrean_male name = "Male Nevrean beak" id = "marking_nevrean_m" icon_state = "nevrean_m" body_parts = list(BP_HEAD) - color_blend_mode = ICON_MULTIPLY - gender = MALE + legacy_use_additive_color_matrix = FALSE + random_generation_gender = MALE /datum/sprite_accessory/marking/spots name = "Spots" @@ -77,7 +79,7 @@ name = "Shaggy mane/feathers" id = "marking_shaggy" icon_state = "shaggy" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_TORSO) /datum/sprite_accessory/marking/jagged_teeth @@ -90,7 +92,7 @@ name = "Blank round face (use with monster mouth)" id = "marking_face_blank" icon_state = "blankface" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/monster_mouth @@ -121,154 +123,154 @@ name = "Otie face" id = "marking_face_otie" icon_state = "otieface" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/otie_nose name = "Otie nose" id = "marking_nose_otie" icon_state = "otie_nose" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/otienose_lite name = "Short otie nose" id = "marking_nose_otie_short" icon_state = "otienose_lite" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/backstripes name = "Back stripes" id = "marking_stripes_otie" icon_state = "otiestripes" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_TORSO,BP_HEAD) /datum/sprite_accessory/marking/belly_butt name = "Belly and butt" id = "marking_bellybutt" icon_state = "bellyandbutt" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_GROIN,BP_TORSO) /datum/sprite_accessory/marking/fingers_toes name = "Fingers and toes" id = "marking_fingerstoes" icon_state = "fingerstoes" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_HAND,BP_R_HAND) /datum/sprite_accessory/marking/otie_socks name = "Fingerless socks" id = "marking_socks_otie" icon_state = "otiesocks" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND) /datum/sprite_accessory/marking/corvid_beak name = "Corvid beak" id = "marking_beak_corvid" icon_state = "corvidbeak" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/corvid_belly name = "Corvid belly" id = "marking_belly_corvid" icon_state = "corvidbelly" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_GROIN,BP_TORSO,BP_HEAD) /datum/sprite_accessory/marking/cow_body name = "Cow markings" id = "marking_body_cow" icon_state = "cowbody" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_GROIN,BP_TORSO,BP_HEAD) /datum/sprite_accessory/marking/cow_nose name = "Cow nose" id = "marking_nose_cow" icon_state = "cownose" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/zbody name = "Thick jagged stripes" id = "marking_jaggedstripes" icon_state = "zbody" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_LEG,BP_R_LEG,BP_GROIN,BP_TORSO) /datum/sprite_accessory/marking/znose name = "Jagged snout" id = "marking_nose_jagged" icon_state = "znose" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/otter_nose name = "Otter nose" id = "marking_nose_otter" icon_state = "otternose" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/otter_face name = "Otter face" id = "marking_face_otter" icon_state = "otterface" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/deer_face name = "Deer face" id = "marking_face_deer" icon_state = "deerface" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/sharkface name = "Akula snout" id = "marking_face_akula" icon_state = "sharkface" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/sheppy_face name = "Shepherd snout" id = "marking_face_shepherd" icon_state = "shepface" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/sheppy_back name = "Shepherd back" id = "marking_back_shepherd" icon_state = "shepback" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_TORSO,BP_GROIN) /datum/sprite_accessory/marking/harpy_feathers name = "Rapala leg Feather" id = "marking_leg_rapala" icon_state = "harpy-feathers" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_LEG,BP_R_LEG) /datum/sprite_accessory/marking/harpy_legs name = "Rapala leg coloring" id = "marking_leg_harpy" icon_state = "harpy-leg" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG) /datum/sprite_accessory/marking/chooves name = "Cloven hooves" id = "marking_hooves_cloven" icon_state = "chooves" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_FOOT,BP_R_FOOT) /datum/sprite_accessory/marking/alurane @@ -293,98 +295,98 @@ name = "Skrell Highlight" id = "marking_hightlight_skrell" icon_state = "skrellhighlight" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_HAND,BP_R_HAND,BP_GROIN,BP_TORSO,BP_HEAD) /datum/sprite_accessory/marking/skrell_chest name = "Skrell Chest" id = "marking_chest_skrell" icon_state = "skrellchest" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_TORSO) /datum/sprite_accessory/marking/skrell_leg name = "Skrell Leg Marking" id = "marking_leg_skrell" icon_state = "skrellleg" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG) /datum/sprite_accessory/marking/gloss name = "Full body gloss" id = "marking_body_gloss" icon_state = "gloss" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_GROIN,BP_TORSO,BP_HEAD) /datum/sprite_accessory/marking/osocks_rarm name = "Modular Longsock (right arm)" id = "marking_sock_rarm" icon_state = "osocks" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_R_ARM,BP_R_HAND) /datum/sprite_accessory/marking/osocks_larm name = "Modular Longsock (left arm)" id = "marking_sock_larm" icon_state = "osocks" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_ARM,BP_L_HAND) /datum/sprite_accessory/marking/osocks_rleg name = "Modular Longsock (right leg)" id = "marking_sock_rleg" icon_state = "osocks" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_R_FOOT,BP_R_LEG) /datum/sprite_accessory/marking/osocks_lleg name = "Modular Longsock (left leg)" id = "marking_sock_lleg" icon_state = "osocks" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_FOOT,BP_L_LEG) /datum/sprite_accessory/marking/catwomantorso name = "Catwoman chest stripes" id = "marking_chest_catwoman" icon_state = "catwomanchest" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_TORSO) /datum/sprite_accessory/marking/catwomangroin name = "Catwoman groin stripes" id = "marking_groin_catwoman" icon_state = "catwomangroin" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_GROIN) /datum/sprite_accessory/marking/catwoman_rleg name = "Catwoman right leg stripes" id = "marking_catwoman_rleg" icon_state = "catwomanright" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_R_LEG) /datum/sprite_accessory/marking/catwoman_lleg name = "Catwoman left leg stripes" id = "marking_catwoman_lleg" icon_state = "catwomanleft" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_LEG) /datum/sprite_accessory/marking/tentacle_head name = "Squid Head" id = "marking_head_squid" icon_state = "tentaclehead" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/tentacle_mouth name = "Tentacle Mouth" id = "marking_mouth_tentacles" icon_state = "tentaclemouth" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/rosette @@ -397,7 +399,7 @@ name = "Shadekin Snoot" id = "marking_face_shadekin" icon_state = "shadekin-snoot" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) species_allowed = list(SPECIES_SHADEKIN, SPECIES_SHADEKIN_CREW) apply_restrictions = TRUE @@ -406,56 +408,56 @@ name = "Talons" id = "marking_talons" icon_state = "talons" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG) /datum/sprite_accessory/marking/claws name = "Claws" id = "marking_claws" icon_state = "claws" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_HAND,BP_R_HAND) /datum/sprite_accessory/marking/equine_snout //Why the long face? Works best with sergal bodytype. name = "Equine Snout" id = "marking_face_donkey" icon_state = "donkey" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/equine_nose name = "Equine Nose" id = "marking_nose_equine" icon_state = "dnose" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/short_snoot name = "Short Snout" id = "marking_snout_short" icon_state = "shortsnoot" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/short_snoot_nose name = "Short Snout Nose" id = "marking_snout_short_nose" icon_state = "snootnose" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/fullhead name = "Full Head Color" id = "marking_head_full" icon_state = "fullhead" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/nosehuman name = "Human Nose Color" id = "marking_nose" icon_state = "nose" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/lipcolorhuman @@ -468,12 +470,12 @@ name = "Jackal Backpattern" id = "marking_back_jackal" icon_state = "jackal_backpattern" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_ARM,BP_R_ARM,BP_TORSO) /datum/sprite_accessory/marking/jackal_bareback name = "Jackal Bareback" id = "marking_back_jackal2" icon_state = "jackal_bareback" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_ARM,BP_R_ARM,BP_GROIN,BP_TORSO) diff --git a/code/modules/sprite_accessories/markings/diona_stuff.dm b/code/modules/sprite_accessories/markings/diona_stuff.dm index 4c498988943b..79fb6f8c9c3a 100644 --- a/code/modules/sprite_accessories/markings/diona_stuff.dm +++ b/code/modules/sprite_accessories/markings/diona_stuff.dm @@ -7,7 +7,7 @@ name = "Diona Leaves" id = "marking_diona_leaves" icon_state = "diona_leaves" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_GROIN,BP_TORSO,BP_HEAD) apply_restrictions = TRUE @@ -15,7 +15,7 @@ name = "Diona Thorns" id = "marking_diona_thorns" icon_state = "diona_thorns" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_TORSO,BP_HEAD) apply_restrictions = TRUE @@ -23,7 +23,7 @@ name = "Diona Flowers" id = "marking_diona_flowers" icon_state = "diona_flowers" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_TORSO,BP_HEAD) apply_restrictions = TRUE @@ -31,6 +31,6 @@ name = "Diona moss" id = "marking_diona_moss" icon_state = "diona_moss" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_TORSO) apply_restrictions = TRUE diff --git a/code/modules/sprite_accessories/markings/eye_stuff.dm b/code/modules/sprite_accessories/markings/eye_stuff.dm index 8f1c66e2d15c..4951dc901bc8 100644 --- a/code/modules/sprite_accessories/markings/eye_stuff.dm +++ b/code/modules/sprite_accessories/markings/eye_stuff.dm @@ -18,28 +18,28 @@ name = "Eyebrows" id = "marking_eye_brow" icon_state = "brows" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/eye_stuff/tridot name = "Tri-Dot" id = "marking_eye_tridot" icon_state = "tridot" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/eye_stuff/tridotflipped name = "Tri-Dot Flipped" id = "marking_eye_tridotflipped" icon_state = "tridotflipped" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/eye_stuff/zmask name = "Eye mask" id = "marking_eye_mask" icon_state = "zmask" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/eye_stuff/motheyes diff --git a/code/modules/sprite_accessories/markings/panda.dm b/code/modules/sprite_accessories/markings/panda.dm index 0e7331eb29d7..dfb501059a5b 100644 --- a/code/modules/sprite_accessories/markings/panda.dm +++ b/code/modules/sprite_accessories/markings/panda.dm @@ -14,4 +14,4 @@ id = "marking_panda_full" icon_state = "panda" body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND) - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE diff --git a/code/modules/sprite_accessories/markings/sergal.dm b/code/modules/sprite_accessories/markings/sergal.dm index 4ed063cee27b..b4259509d54b 100644 --- a/code/modules/sprite_accessories/markings/sergal.dm +++ b/code/modules/sprite_accessories/markings/sergal.dm @@ -6,7 +6,7 @@ name = "Sergal Markings" id = "marking_sergal_full_m" icon_state = "sergal_full" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_GROIN,BP_TORSO,BP_HEAD) species_allowed = list(SPECIES_SERGAL) apply_restrictions = TRUE @@ -15,7 +15,7 @@ name = "Sergal Markings (Female)" id = "marking_sergal_full_f" icon_state = "sergal_full_female" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_GROIN,BP_TORSO,BP_HEAD) species_allowed = list(SPECIES_SERGAL) apply_restrictions = TRUE diff --git a/code/modules/sprite_accessories/markings/synth_stuff.dm b/code/modules/sprite_accessories/markings/synth_stuff.dm index ac2e584fbb9f..80912c3c764b 100644 --- a/code/modules/sprite_accessories/markings/synth_stuff.dm +++ b/code/modules/sprite_accessories/markings/synth_stuff.dm @@ -6,112 +6,112 @@ name = "Ward - Spirit FBP Lights" id = "marking_synth_spirit" icon_state = "lights" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_TORSO,BP_HEAD) /datum/sprite_accessory/marking/synth/spirit_lights_body name = "Ward - Spirit FBP Lights (body)" id = "marking_synth_spirit_body" icon_state = "lights" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_TORSO) /datum/sprite_accessory/marking/synth/spirit_lights_torso name = "Ward - Spirit FBP Lights (torso)" id = "marking_synth_spirit_torso" icon_state = "lights" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_TORSO) /datum/sprite_accessory/marking/synth/spirit_lights_head name = "Ward - Spirit FBP Lights (head)" id = "marking_synth_spirit_head" icon_state = "lights" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/synth/spirit_panels name = "Ward - Spirit FBP Panels" id = "marking_synth_spirit_panel" icon_state = "panels" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_GROIN,BP_TORSO,BP_HEAD) /datum/sprite_accessory/marking/synth/spirit_panels_body name = "Ward - Spirit FBP Panels (body)" id = "marking_synth_spirit_panel_body" icon_state = "panels" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_GROIN,BP_TORSO) /datum/sprite_accessory/marking/synth/spirit_panels_torso name = "Ward - Spirit FBP Panels (torso)" id = "marking_synth_spirit_panel_torso" icon_state = "panels" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_GROIN,BP_TORSO) /datum/sprite_accessory/marking/synth/spirit_panels_feet name = "Ward - Spirit FBP Panels (feet)" id = "marking_synth_spirit_panel_feet" icon_state = "panels" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_FOOT,BP_R_FOOT) /datum/sprite_accessory/marking/synth/spirit_panels_head name = "Ward - Spirit FBP Panels (head)" id = "marking_synth_spirit_panel_head" icon_state = "panels" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/synth/c_beast_body name = "Cyber Body" id = "marking_synth_cyber_body" icon_state = "c_beast_body" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_TORSO,BP_GROIN) /datum/sprite_accessory/marking/synth/c_beast_plating name = "Cyber Plating (Use with Cyber Body)" id = "marking_synth_cyber_plating" icon_state = "c_beast_plating" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM) /datum/sprite_accessory/marking/synth/c_beast_band name = "Cyber Band (Use with Cybertech head)" id = "marking_synth_cyber_band" icon_state = "c_beast_band" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/synth/c_beast_cheek_a name = "Cyber Beast Cheeks A (Use A, B and C)" id = "marking_synth_cyber_cheek1" icon_state = "c_beast_a" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/synth/c_beast_cheek_b name = "Cyber Beast Cheeks B (Use A, B and C)" id = "marking_synth_cyber_cheek2" icon_state = "c_beast_b" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/synth/c_beast_cheek_c name = "Cyber Beast Cheeks c (Use A, B and C)" id = "marking_synth_cyber_cheek3" icon_state = "c_beast_c" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/synth/eboop_panels name = "Eggnerd FBP panels" id = "marking_synth_eggnerd_panel" icon_state = "eboop" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_GROIN,BP_TORSO,BP_HEAD) // synth antennae @@ -119,7 +119,7 @@ name = "Synthlizard Antennae" id = "marking_synth_antennae" icon_state = "normal_antenna" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/synth/antennae/curled @@ -151,7 +151,7 @@ name = "Synthlizard Snout 1" id = "marking_synth_snout_1" icon_state = "synthliz_snout1" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/synth/snout/alt @@ -168,7 +168,7 @@ name = "Synthlizard Eyes" id = "marking_synthliz_eyes" icon_state = "synthliz_eyes" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) // Replika @@ -177,40 +177,40 @@ name = "Replikant Stripe - Right Thigh" id = "marking_replika_r_thigh" icon_state = "replika" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_R_LEG) /datum/sprite_accessory/marking/synth/replika_r_knee name = "Replikant Stripe - Right Knee" id = "marking_replika_r_knee" icon_state = "replika" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_R_FOOT) /datum/sprite_accessory/marking/synth/replika_l_thigh name = "Replikant Stripe - Left Thigh" id = "marking_replika_l_thigh" icon_state = "replika" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_LEG) /datum/sprite_accessory/marking/synth/replika_l_knee name = "Replikant Stripe - Left Knee" id = "marking_replika_l_knee" icon_state = "replika" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_FOOT) /datum/sprite_accessory/marking/synth/replika_panels_body name = "Replikant Paneling - SynthFlesh (body)" id = "marking_replika_panel_body" icon_state = "replika" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_TORSO) /datum/sprite_accessory/marking/synth/replika_panels_groin name = "Replikant Paneling - SynthFlesh (groin)" id = "marking_replika_panel_groin" icon_state = "replika" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_GROIN) diff --git a/code/modules/sprite_accessories/markings/taj.dm b/code/modules/sprite_accessories/markings/taj.dm index 177f3f911061..ac272c1ca412 100644 --- a/code/modules/sprite_accessories/markings/taj.dm +++ b/code/modules/sprite_accessories/markings/taj.dm @@ -146,7 +146,7 @@ name = "Nose Color, alt. (Taj)" id = "marking_tajaran_nose_alt" icon_state = "taj_nosealt" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/taj/tigerface diff --git a/code/modules/sprite_accessories/markings/tesh.dm b/code/modules/sprite_accessories/markings/tesh.dm index 7251e584023d..b6aa4baac171 100644 --- a/code/modules/sprite_accessories/markings/tesh.dm +++ b/code/modules/sprite_accessories/markings/tesh.dm @@ -14,40 +14,40 @@ name = "Teshari Feathers" id = "marking_teshari_feathers" icon_state = "teshi_feathers" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_FOOT, BP_R_FOOT, BP_L_HAND, BP_R_HAND) /datum/sprite_accessory/marking/tesh/teshi_fluff name = "Teshari underfluff" id = "marking_teshari_fluff" icon_state = "teshi_fluff" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_LEG, BP_R_LEG, BP_GROIN, BP_TORSO, BP_HEAD) /datum/sprite_accessory/marking/tesh/teshi_small_feathers name = "Teshari small wingfeathers" id = "marking_teshari_wingfeathers_small" icon_state = "teshi_sf" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_FOOT, BP_R_FOOT, BP_L_HAND, BP_R_HAND, BP_TORSO) /datum/sprite_accessory/marking/tesh/teshari_coat name = "Teshari coat" id = "marking_teshari_coat" icon_state = "teshi_coat" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_LEG, BP_R_LEG, BP_L_ARM, BP_R_ARM, BP_TORSO, BP_HEAD) /datum/sprite_accessory/marking/tesh/teshari_pattern_male name = "Teshari male pattern" id = "marking_teshari_pattern_m" icon_state = "teshi_pattern_male" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_LEG, BP_R_LEG, BP_L_ARM, BP_R_ARM, BP_L_HAND, BP_R_HAND, BP_TORSO, BP_GROIN, BP_HEAD) /datum/sprite_accessory/marking/tesh/teshari_pattern_female name = "Teshari female pattern" id = "marking_teshari_pattern_f" icon_state = "teshi_pattern_fem" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_LEG, BP_R_LEG, BP_L_HAND, BP_R_HAND, BP_TORSO, BP_GROIN, BP_HEAD) diff --git a/code/modules/sprite_accessories/markings/unathi.dm b/code/modules/sprite_accessories/markings/unathi.dm index fe2df63e76bc..7bb672c237d3 100644 --- a/code/modules/sprite_accessories/markings/unathi.dm +++ b/code/modules/sprite_accessories/markings/unathi.dm @@ -34,61 +34,61 @@ name = "Cobra Hood" id = "marking_unathi_hood" icon_state = "unathihood" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/unathi/unathihood_inner name = "Cobra Hood (Inner)" id = "marking_unathi_hood_inner" icon_state = "unathihood_inner" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/unathi/unathidoublehorns name = "Double Unathi Horns" id = "marking_unathi_horns_double" icon_state = "unathidoublehorns" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/unathi/unathihorns name = "Unathi Horns" id = "marking_unathi_horns" icon_state = "unathihorns" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/unathi/unathiramhorns name = "Unathi Ram Horns" id = "marking_unathi_horns_ram" icon_state = "unathiramhorns" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/unathi/unathishortspines name = "Unathi Short Spines" id = "marking_unathi_spines_short" icon_state = "unathishortspines" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/unathi/unathilongspines name = "Unathi Long Spines" id = "marking_unathi_spines_lnog" icon_state = "unathilongspines" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/unathi/unathishortfrills name = "Unathi Short Frills" id = "marking_unathi_frills_short" icon_state = "unathishortfrills" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/unathi/unathilongfrills name = "Unathi Long Frills" id = "marking_unathi_frills_long" icon_state = "unathilongfrills" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) diff --git a/code/modules/sprite_accessories/markings/vox.dm b/code/modules/sprite_accessories/markings/vox.dm index 0d432e4b7cd4..5d1246cd95a1 100644 --- a/code/modules/sprite_accessories/markings/vox.dm +++ b/code/modules/sprite_accessories/markings/vox.dm @@ -33,19 +33,19 @@ name = "Vox Scales" id = "marking_vox_scales" icon_state = "Voxscales" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_HEAD) /datum/sprite_accessory/marking/vox/voxclaws name = "Vox Claws" icon_state = "Voxclaws" id = "marking_vox_claws" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_HAND,BP_R_HAND) /datum/sprite_accessory/marking/vox/voxbeak name = "Vox Beak" id = "marking_vox_beak" icon_state = "Voxscales" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) diff --git a/code/modules/sprite_accessories/markings/vulpkanin.dm b/code/modules/sprite_accessories/markings/vulpkanin.dm index 822f59f4e9a6..0874af6aee64 100644 --- a/code/modules/sprite_accessories/markings/vulpkanin.dm +++ b/code/modules/sprite_accessories/markings/vulpkanin.dm @@ -6,68 +6,68 @@ name = "belly fur (Vulp)" id = "marking_vulp_belly" icon_state = "vulp_belly" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_TORSO,BP_GROIN) /datum/sprite_accessory/marking/vulp/vulp_fullbelly name = "full belly fur (Vulp)" id = "marking_vulp_fullbelly" icon_state = "vulp_fullbelly" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_TORSO,BP_GROIN) /datum/sprite_accessory/marking/vulp/vulp_crest name = "belly crest (Vulp)" id = "marking_vulp_crest" icon_state = "vulp_crest" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_TORSO,BP_GROIN) /datum/sprite_accessory/marking/vulp/vulp_nose name = "nose (Vulp)" id = "marking_vulp_nose" icon_state = "vulp_nose" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/vulp/vulp_short_nose name = "nose, short (Vulp)" id = "marking_vulp_nose_short" icon_state = "vulp_short_nose" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/vulp/snoutstripe name = "snout stripe (Vulp)" id = "marking_vulp_snoutstripe" icon_state = "snoutstripe" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/vulp/vulp_face name = "face (Vulp)" id = "marking_vulp_face" icon_state = "vulp_face" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/vulp/vulp_facealt name = "face, alt. (Vulp)" id = "marking_vulp_facealt" icon_state = "vulp_facealt" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/vulp/vulp_earsface name = "ears and face (Vulp)" id = "marking_vulp_earsface" icon_state = "vulp_earsface" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/vulp/vulp_all id = "marking_vulp_all" name = "all head highlights (Vulp)" icon_state = "vulp_all" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) diff --git a/code/modules/sprite_accessories/markings/werebeast.dm b/code/modules/sprite_accessories/markings/werebeast.dm index ff3ddbe893be..af2c0f758732 100644 --- a/code/modules/sprite_accessories/markings/werebeast.dm +++ b/code/modules/sprite_accessories/markings/werebeast.dm @@ -1,7 +1,7 @@ /datum/sprite_accessory/marking/werebeast abstract_type = /datum/sprite_accessory/marking/werebeast icon = 'icons/mob/clothing/species/werebeast/werebeast_markings.dmi' - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE species_allowed = list(SPECIES_WEREBEAST) apply_restrictions = TRUE diff --git a/code/modules/sprite_accessories/markings/zorren.dm b/code/modules/sprite_accessories/markings/zorren.dm index bd11fdaafe76..34bf24bc23d1 100644 --- a/code/modules/sprite_accessories/markings/zorren.dm +++ b/code/modules/sprite_accessories/markings/zorren.dm @@ -6,65 +6,65 @@ name = "Zorren Male Torso" id = "marking_zorren_belly_m" icon_state = "zorren_belly" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_TORSO,BP_GROIN) /datum/sprite_accessory/marking/zorren/zorren_belly_female name = "Zorren Female Torso" id = "marking_zorren_belly_f" icon_state = "zorren_belly_female" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_TORSO,BP_GROIN) /datum/sprite_accessory/marking/zorren/zorren_back_patch name = "Zorren Back Patch" id = "marking_zorren_backpatch" icon_state = "zorren_backpatch" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_TORSO) /datum/sprite_accessory/marking/zorren/zorren_face_male name = "Zorren Male Face" id = "marking_zorren_face_m" icon_state = "zorren_face" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) - gender = MALE + random_generation_gender = MALE /datum/sprite_accessory/marking/zorren/zorren_face_female name = "Zorren Female Face" id = "marking_zorren_face_f" icon_state = "zorren_face_female" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) - gender = FEMALE + random_generation_gender = FEMALE /datum/sprite_accessory/marking/zorren/zorren_muzzle_male name = "Zorren Male Muzzle" id = "marking_zorren_muzzle_m" icon_state = "zorren_muzzle" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) - gender = MALE + random_generation_gender = MALE /datum/sprite_accessory/marking/zorren/zorren_muzzle_female name = "Zorren Female Muzzle" id = "marking_zorren_muzzle_f" icon_state = "zorren_muzzle_female" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) - gender = FEMALE + random_generation_gender = FEMALE /datum/sprite_accessory/marking/zorren/zorren_socks name = "Zorren Socks" id = "marking_zorren_socks" icon_state = "zorren_socks" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND) /datum/sprite_accessory/marking/zorren/zorren_longsocks name = "Zorren Longsocks" id = "marking_zorren_socks_long" icon_state = "zorren_longsocks" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND) diff --git a/code/modules/sprite_accessories/sprite_accessories.dm b/code/modules/sprite_accessories/sprite_accessories.dm deleted file mode 100644 index 884a75625330..000000000000 --- a/code/modules/sprite_accessories/sprite_accessories.dm +++ /dev/null @@ -1,60 +0,0 @@ -/** - * - * Hello and welcome to sprite_accessories: For sprite accessories, such as hair, - * facial hair, and possibly tattoos and stuff somewhere along the line. This file is - * intended to be friendly for people with little to no actual coding experience. - * The process of adding in new hairstyles has been made pain-free and easy to do. - * Enjoy! - Doohl - * - * - * Notice: This all gets automatically compiled in a list in dna2.dm, so you do not - * have to define any UI values for sprite accessories manually for hair and facial - * hair. Just add in new hair types and the game will naturally adapt. - * - * !!WARNING!!: changing existing hair information can be VERY hazardous to savefiles, - * to the point where you may completely corrupt a server's savefiles. Please refrain - * from doing this unless you absolutely know what you are doing, and have defined a - * conversion in savefile.dm - */ - -// TODO: actual better way to do these -// TODO: actual better way to do "can we use this" checks because one whitelist list and a var is fucking horrible to maintain what the fuck - -/datum/sprite_accessory - - /// The icon file the accessory is located in. - var/icon - /// The icon_state of the accessory. - var/icon_state - /// A custom preview state for whatever reason. - var/preview_state - - /// The preview name of the accessory. - var/name - - /// Determines if the accessory will be skipped or included in random hair generations. - var/gender = NEUTER - - /// Restrict some styles to specific species. - var/list/species_allowed = list(SPECIES_HUMAN,SPECIES_PROMETHEAN,SPECIES_HUMAN_VATBORN) - - /// Whether or not the accessory can be affected by colouration. - var/do_colouration = 1 - - var/color_blend_mode = ICON_MULTIPLY // If checked. - - /// use front/behind, citadel snowflake for now; only usable on wings/tails - var/front_behind_system = FALSE - - // Ckey of person allowed to use this, if defined. - var/list/ckeys_allowed = null - var/apply_restrictions = FALSE //whether to apply restrictions for specific tails/ears/wings - var/center = FALSE - var/dimension_x = 32 - var/dimension_y = 32 - /// id - var/id - // these two are moved up for now - var/extra_overlay // Icon state of an additional overlay to blend in. - var/extra_overlay2 - var/can_be_hidden = TRUE diff --git a/code/modules/sprite_accessories/sprite_accessory.dm b/code/modules/sprite_accessories/sprite_accessory.dm new file mode 100644 index 000000000000..9c151d4cf69c --- /dev/null +++ b/code/modules/sprite_accessories/sprite_accessory.dm @@ -0,0 +1,424 @@ +// TODO: actual better way to do these +// TODO: actual better way to do "can we use this" checks because one whitelist list and a var is fucking horrible to maintain what the fuck + +// todo: ouch at this list +GLOBAL_LIST_EMPTY(sprite_accessory_icon_cache) + +/datum/sprite_accessory + abstract_type = /datum/sprite_accessory + + //* basics *// + /// The preview name of the accessory. + var/name + /// id; must be unique globally amongst /datum/sprite_accessory's! + var/id + + //* character setup *// + /// Determines if the accessory will be skipped or included in random hair generations. + /// if set, someone must be this gender to receive it + var/random_generation_gender + /// can be selected + var/selectable = TRUE + + //* coloration *// + /// coloration mode + // todo: rigsuit update first, this is a placeholder + var/coloration_mode + /// color amount when in overlays mode; other colors will be rendered in _2, _3, etc; + /// _add will go ontop. + // todo: rigsuit update first, this is a placeholder + var/coloration_amount = 1 + + //* icon location & base state *// + /// The icon file the accessory is located in. + var/icon + /// The icon_state of the accessory. + var/icon_state + /// default variation is called 'Normal' + /// assoc list; name to state. + var/list/variations + /// time required for one 'cycle' of a variation animation by variation + var/list/variation_animation_times + /// time required for one 'cycle' of a variation animation, defaulting + var/variation_animation_time = 2 SECONDS + /// sidedness; how many more states we need to inject for it to work + var/icon_sidedness = SPRITE_ACCESSORY_SIDEDNESS_NONE + + //* icon dimensions & alignment *// + var/icon_dimension_x = 32 + var/icon_dimension_y = 32 + /// alignment; how we should align the sprite to the mob + /// we will always be able to be re-aligned by the mob for obvious reasons, especially if their + /// bodyparts are misaligned when the bodyparts in question are considered our anchors. + var/icon_alignment = SPRITE_ACCESSORY_ALIGNMENT_IGNORE + + //* rendering *// + /// overlay/blend this in with ADD mode, rather than overlay mode. + /// used for making stuff not look flat and other effects. + /// a state with [icon_state]-add will be added. + /// -front, -back, -side will be specified as needed too if this is the case. + var/has_add_state = FALSE + + //* legacy below + + /// Restrict some styles to specific species. + var/list/species_allowed = list(SPECIES_HUMAN,SPECIES_PROMETHEAN,SPECIES_HUMAN_VATBORN) + + /// Whether or not the accessory can be affected by colouration. + var/do_colouration = 1 + + /// use additive color matrix on the main overlay, rather than multiply + /// this is slow, please stop using it and do proper greyscales. + var/legacy_use_additive_color_matrix = FALSE + + var/apply_restrictions = FALSE //whether to apply restrictions for specific tails/ears/wings + // these two are moved up for now + // if this is set, we will also apply sidedness (front/behind/side enum) to it! + var/extra_overlay // Icon state of an additional overlay to blend in. + // if this is set, we will also apply sidedness (front/behind/side enum) to it! + var/extra_overlay2 + var/can_be_hidden = TRUE + +/** + * todo: with_base_state completely tramples extra_overlay, extra_overlay2 + * we need to redo this at some point. + */ +/datum/sprite_accessory/proc/render(mob/for_whom, list/colors, layer_front, layer_behind, layer_side, with_base_state = icon_state, with_variation, flattened) + if(flattened) + if(!length(GLOB.clients)) + // lol, lmao + return + var/list/image/layers_flat = flattened(arglist(args)) + return align_layers(layers_flat) + if(variations?[with_variation]) + with_base_state = variations[with_variation] + if(legacy_use_additive_color_matrix && colors) + // clone list to not mutate original + colors = colors.Copy() + // transform colors into additive color matrices + for(var/i in 1 to length(colors)) + if(islist(colors[i])) + stack_trace("attempted to use a color matrix with legacy additive; this is not supported.") + continue + if(!istext(colors[i])) + stack_trace("attempted to use non-text color string with legacy additive; this is not supported.") + var/list/decoded = ReadRGB(colors[i]) + var/list/computed = list( + 1, 0, 0, + 0, 1, 0, + 0, 0, 1, + decoded[1] / 255, decoded[2] / 255, decoded[3] / 255, + ) + colors[i] = computed + + // todo: refactor so we don't need to manually build + var/list/icon_states = list(with_base_state) + if(extra_overlay) + icon_states += extra_overlay + if(extra_overlay2) + icon_states += extra_overlay2 + + var/list/layers = list() + var/index = 0 + // process base layers + for(var/state in icon_states) + ++index + var/image/rendering + // front + rendering = image(icon, icon_sidedness > SPRITE_ACCESSORY_SIDEDNESS_NONE? "[state]-front" : "[state]", layer_front) + if(do_colouration && length(colors) >= index) + rendering.color = colors[index] + // process add layer if needed + if(has_add_state) + var/image/adding + adding = image(icon, icon_sidedness > SPRITE_ACCESSORY_SIDEDNESS_NONE? "[with_base_state]-add-front" : "[with_base_state]-add", layer_front) + adding.blend_mode = BLEND_ADD + rendering.overlays += adding + // add + layers += rendering + + if(icon_sidedness >= SPRITE_ACCESSORY_SIDEDNESS_FRONT_BEHIND) + // behind + rendering = image(icon, "[state]-behind", layer_behind) + if(do_colouration && length(colors) >= index) + rendering.color = colors[index] + // process add layer if needed + if(has_add_state) + var/image/adding + adding = image(icon, "[with_base_state]-add-behind", layer_behind) + adding.blend_mode = BLEND_ADD + rendering.overlays += adding + // add + layers += rendering + + return align_layers(layers) + +/datum/sprite_accessory/proc/align_layers(list/image/layers) + for(var/image/patching as anything in layers) + // patching.appearance_flags = KEEP_TOGETHER + switch(icon_alignment) + if(SPRITE_ACCESSORY_ALIGNMENT_IGNORE) + if(SPRITE_ACCESSORY_ALIGNMENT_BOTTOM) + patching.pixel_x = round((WORLD_ICON_SIZE - icon_dimension_x) * 0.5) + if(SPRITE_ACCESSORY_ALIGNMENT_CENTER) + patching.pixel_x = round((WORLD_ICON_SIZE - icon_dimension_x) * 0.5) + patching.pixel_y = round((WORLD_ICON_SIZE - icon_dimension_y) * 0.5) + return layers + +/** + * order **must** be deterministic! + */ +/datum/sprite_accessory/proc/flat_cache_keys(mob/for_whom, list/colors, layer_front, layer_behind, layer_side, with_base_state = icon_state, with_variation, flattened) + . = list( + id, + with_base_state, + ) + . += jointext(colors, ":") + +/datum/sprite_accessory/proc/flattened(mob/for_whom, list/colors, layer_front, layer_behind, layer_side, with_base_state = icon_state, with_variation, flattened) + var/list/cache_keys = flat_cache_keys(arglist(args)) + var/cache_key = jointext(cache_keys, "-") + // check the main cache key only, icon_sidedness shouldn't check at runtime + if(isnull(GLOB.sprite_accessory_icon_cache[cache_key])) + // for new coders: args is just a list like any other, and it's *sort of* mutable. + // set args.flattened to FALSE + flattened = FALSE + // pass in args + var/list/layers = render(arglist(args)) + // behavior past this point assumes layers cuont is always the same as sidedness. + // as well as the sidedness being the same index as the layer + // at time of writing, + // 1 = front + // 2 = behind + // 3 = side (unimplemented) + ASSERT(length(layers) == icon_sidedness) + // so i yelled 'it's rendering time' + var/client/designated_victim = pick(GLOB.clients) + if(!designated_victim?.initialized) + STACK_TRACE("somehow we got an uninitialized client. ouch!") + return layers + for(var/i in 1 to length(layers)) + var/image/casted = layers[i] + var/icon/rendered = render_compound_icon_with_client(casted, designated_victim) + if(!rendered) + STACK_TRACE("something went horribly wrong ):") + return layers + layers[i] = rendered + // cache things + GLOB.sprite_accessory_icon_cache[cache_key] = layers[1] + switch(icon_sidedness) + if(SPRITE_ACCESSORY_SIDEDNESS_NONE) + GLOB.sprite_accessory_icon_cache[cache_key] = layers[1] + if(SPRITE_ACCESSORY_SIDEDNESS_FRONT_BEHIND) + GLOB.sprite_accessory_icon_cache[cache_key] = layers[1] + GLOB.sprite_accessory_icon_cache["[cache_key]-behind"] = layers[2] + switch(icon_sidedness) + if(SPRITE_ACCESSORY_SIDEDNESS_NONE) + return list( + image( + GLOB.sprite_accessory_icon_cache[cache_key], + layer = layer_front, + ), + ) + if(SPRITE_ACCESSORY_SIDEDNESS_FRONT_BEHIND) + return list( + image( + GLOB.sprite_accessory_icon_cache[cache_key], + layer = layer_front, + ), + image( + GLOB.sprite_accessory_icon_cache["[cache_key]-behind"], + layer = layer_behind, + ), + ) + +//* Resolution *// + +/** + * turns a list of SPRITE_ACCESSORY_SLOT_X = accessory into the cached global accessory instances. + * + * accessory may be an accessory, path, or id string. + */ +/proc/resolve_sprite_accessory_key_list_inplace(list/accessories) + for(var/key in accessories) + var/value = accessories[key] + if(ispath(value)) + var/datum/sprite_accessory/casted = value + value = initial(casted.id) + if(istext(value)) + switch(key) + if(SPRITE_ACCESSORY_SLOT_EARS) + value = GLOB.sprite_accessory_ears[value] + if(SPRITE_ACCESSORY_SLOT_FACEHAIR) + value = GLOB.sprite_accessory_facial_hair[value] + if(SPRITE_ACCESSORY_SLOT_HAIR) + value = GLOB.sprite_accessory_hair[value] + if(SPRITE_ACCESSORY_SLOT_HORNS) + value = GLOB.sprite_accessory_ears[value] + if(SPRITE_ACCESSORY_SLOT_TAIL) + value = GLOB.sprite_accessory_tails[value] + if(SPRITE_ACCESSORY_SLOT_WINGS) + value = GLOB.sprite_accessory_wings[value] + accessories[key] = value + return accessories + +/// by id +GLOBAL_LIST_INIT(sprite_accessory_hair, all_hair_styles()) +/// by id +GLOBAL_LIST_INIT(sprite_accessory_ears, all_ear_styles()) +/// by id +GLOBAL_LIST_INIT(sprite_accessory_tails, all_tail_styles()) +/// by id +GLOBAL_LIST_INIT(sprite_accessory_wings, all_wing_styles()) +/// by id +GLOBAL_LIST_INIT(sprite_accessory_facial_hair, all_facial_hair_styles()) +/// by id +GLOBAL_LIST_INIT(sprite_accessory_markings, all_marking_styles()) + +// todo: most uses of these should either be a direct ref under new marking system or +// todo: an id to ref. +// todo: however, there are some legitimate cases of needing fast name lookup, +// todo: like non-tgui interfaces that let you choose markings +// todo: do not blindly kill these lists, we'll deal with everything as we go. + +// by name +GLOBAL_LIST(legacy_hair_lookup) +// by id +GLOBAL_LIST(legacy_ears_lookup) +// by id +GLOBAL_LIST(legacy_wing_lookup) +// by id +GLOBAL_LIST(legacy_tail_lookup) +// by name +GLOBAL_LIST(legacy_facial_hair_lookup) +// by name +GLOBAL_LIST(legacy_marking_lookup) + +/proc/all_hair_styles() + . = list() + var/list/by_name = list() + for(var/path in subtypesof(/datum/sprite_accessory/hair)) + var/datum/sprite_accessory/S = path + if(initial(S.abstract_type) == path) + continue + S = new path + if(!S.id) + stack_trace("no id on [path]") + continue + if(.[S.id]) + stack_trace("duplicate id [S.id] on [path] and [.[S.id]]") + continue + if(by_name[S.name]) + stack_trace("duplicate name [S.name] on [path]") + continue + .[S.id] = S + by_name[S.name] = S + tim_sort(by_name, GLOBAL_PROC_REF(cmp_text_asc), associative = FALSE) + GLOB.legacy_hair_lookup = by_name + tim_sort(., GLOBAL_PROC_REF(cmp_name_asc), associative = TRUE) + +/proc/all_ear_styles() + . = list() + var/list/by_type = list() + for(var/path in subtypesof(/datum/sprite_accessory/ears)) + var/datum/sprite_accessory/S = path + if(initial(S.abstract_type) == path) + continue + S = new path + if(!S.id) + stack_trace("no id on [path]") + continue + if(.[S.id]) + stack_trace("duplicate id [S.id] on [path] and [.[S.id]]") + continue + .[S.id] = S + by_type[S.type] = S + tim_sort(by_type, GLOBAL_PROC_REF(cmp_name_asc), associative = TRUE) + GLOB.legacy_ears_lookup = by_type + tim_sort(., GLOBAL_PROC_REF(cmp_name_asc), associative = TRUE) + +/proc/all_wing_styles() + . = list() + var/list/by_type = list() + for(var/path in subtypesof(/datum/sprite_accessory/wing)) + var/datum/sprite_accessory/S = path + if(initial(S.abstract_type) == path) + continue + S = new path + if(!S.id) + stack_trace("no id on [path]") + continue + if(.[S.id]) + stack_trace("duplicate id [S.id] on [path] and [.[S.id]]") + continue + .[S.id] = S + by_type[S.type] = S + tim_sort(by_type, GLOBAL_PROC_REF(cmp_name_asc), associative = TRUE) + GLOB.legacy_wing_lookup = by_type + tim_sort(., GLOBAL_PROC_REF(cmp_name_asc), associative = TRUE) + +/proc/all_tail_styles() + . = list() + var/list/by_type = list() + for(var/path in subtypesof(/datum/sprite_accessory/tail)) + var/datum/sprite_accessory/S = path + if(initial(S.abstract_type) == path) + continue + S = new path + if(!S.id) + stack_trace("no id on [path]") + continue + if(.[S.id]) + stack_trace("duplicate id [S.id] on [path] and [.[S.id]]") + continue + .[S.id] = S + by_type[S.type] = S + tim_sort(by_type, GLOBAL_PROC_REF(cmp_name_asc), associative = TRUE) + GLOB.legacy_tail_lookup = by_type + tim_sort(., GLOBAL_PROC_REF(cmp_name_asc), associative = TRUE) + +/proc/all_facial_hair_styles() + . = list() + var/list/by_name = list() + for(var/path in subtypesof(/datum/sprite_accessory/facial_hair)) + var/datum/sprite_accessory/S = path + if(initial(S.abstract_type) == path) + continue + S = new path + if(!S.id) + stack_trace("no id on [path]") + continue + if(.[S.id]) + stack_trace("duplicate id [S.id] on [path] and [.[S.id]]") + continue + if(by_name[S.name]) + stack_trace("duplicate name [S.name] on [path]") + continue + .[S.id] = S + by_name[S.name] = S + tim_sort(by_name, GLOBAL_PROC_REF(cmp_text_asc), associative = FALSE) + GLOB.legacy_facial_hair_lookup = by_name + tim_sort(., GLOBAL_PROC_REF(cmp_name_asc), associative = TRUE) + +/proc/all_marking_styles() + . = list() + var/list/by_name = list() + for(var/path in subtypesof(/datum/sprite_accessory/marking)) + var/datum/sprite_accessory/S = path + if(initial(S.abstract_type) == path) + continue + S = new path + if(!S.id) + stack_trace("no id on [path]") + continue + if(.[S.id]) + stack_trace("duplicate id [S.id] on [path] and [.[S.id]]") + continue + if(by_name[S.name]) + stack_trace("duplicate name [S.name] on [path]") + continue + .[S.id] = S + by_name[S.name] = S + tim_sort(by_name, GLOBAL_PROC_REF(cmp_text_asc), associative = FALSE) + GLOB.legacy_marking_lookup = by_name + tim_sort(., GLOBAL_PROC_REF(cmp_name_asc), associative = TRUE) diff --git a/code/modules/sprite_accessories/tail/_tail.dm b/code/modules/sprite_accessories/tail.dm similarity index 76% rename from code/modules/sprite_accessories/tail/_tail.dm rename to code/modules/sprite_accessories/tail.dm index e78a779f79fd..abc18957d78f 100644 --- a/code/modules/sprite_accessories/tail/_tail.dm +++ b/code/modules/sprite_accessories/tail.dm @@ -4,12 +4,15 @@ icon = 'icons/mob/sprite_accessories/tails.dmi' do_colouration = 0 //Set to 1 to enable coloration using the tail color. - color_blend_mode = ICON_ADD // Only appliciable if do_coloration = 1 + legacy_use_additive_color_matrix = TRUE // Only appliciable if do_coloration = 1 var/show_species_tail = 0 // If false, do not render species' tail. var/clothing_can_hide = 1 // If true, clothing with HIDETAIL hides it var/desc = "You should not see this..." + //! legacy var/ani_state // State when wagging/animated + //! legacy var/extra_overlay_w // Wagging state for extra overlay + //! legacy var/extra_overlay2_w // Tertiary wagging. var/list/hide_body_parts = list() //Uses organ tag defines. Bodyparts in this list do not have their icons rendered, allowing for more spriter freedom when doing taur/digitigrade stuff. var/icon/clip_mask_icon = null //Icon file used for clip mask. @@ -21,6 +24,23 @@ if(clip_mask_icon && clip_mask_state) clip_mask = icon(icon = clip_mask_icon, icon_state = clip_mask_state) +/datum/sprite_accessory/tail/render(mob/for_whom, list/colors, layer_front, layer_behind, layer_side, with_base_state, with_variation, flattened) + // awful? yes. :skull: + // please don't ever copy this pattern anywhere else. + if(with_variation == SPRITE_ACCESSORY_VARIATION_WAGGING && ani_state) + var/old1 = icon_state + var/old2 = extra_overlay + var/old3 = extra_overlay2 + icon_state = ani_state + extra_overlay = extra_overlay_w + extra_overlay2 = extra_overlay2_w + . = ..() + icon_state = old1 + extra_overlay = old2 + extra_overlay2 = old3 + else + return ..() + //For all species tails. Includes haircolored tails. /datum/sprite_accessory/tail/special abstract_type = /datum/sprite_accessory/tail/special diff --git a/code/modules/sprite_accessories/tail/bearlike.dm b/code/modules/sprite_accessories/tail/bearlike.dm index b5e6c1123399..b6cad0dc120e 100644 --- a/code/modules/sprite_accessories/tail/bearlike.dm +++ b/code/modules/sprite_accessories/tail/bearlike.dm @@ -3,7 +3,7 @@ id = "tail_bear" icon_state = "bear" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/bear_brown name = "bear, brown" diff --git a/code/modules/sprite_accessories/tail/bird.dm b/code/modules/sprite_accessories/tail/bird.dm index 2e3140a8a97b..044552dd3f5c 100644 --- a/code/modules/sprite_accessories/tail/bird.dm +++ b/code/modules/sprite_accessories/tail/bird.dm @@ -3,4 +3,4 @@ id = "tail_avian_fantail" icon_state = "fantail" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/tail/bovine.dm b/code/modules/sprite_accessories/tail/bovine.dm index 8c0b6e5cd61d..a5ee09a7c86c 100644 --- a/code/modules/sprite_accessories/tail/bovine.dm +++ b/code/modules/sprite_accessories/tail/bovine.dm @@ -3,13 +3,13 @@ id = "tail_cow" icon_state = "cow" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/satyr name = "goat legs, colorable" id = "tail_satyr_legs" icon_state = "satyr" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE do_colouration = 1 hide_body_parts = list(BP_L_LEG, BP_L_FOOT, BP_R_LEG, BP_R_FOOT) //Exclude pelvis just in case. clip_mask_icon = 'icons/mob/sprite_accessories/taurs.dmi' @@ -19,7 +19,7 @@ name = "horse legs, colorable" id = "tail_satyr_horse_legs" icon_state = "satyr_horse" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE do_colouration = 1 hide_body_parts = list(BP_L_LEG, BP_L_FOOT, BP_R_LEG, BP_R_FOOT) //Exclude pelvis just in case. clip_mask_icon = 'icons/mob/sprite_accessories/taurs.dmi' diff --git a/code/modules/sprite_accessories/tail/canid.dm b/code/modules/sprite_accessories/tail/canid.dm index d5405aff56d5..410a886925d9 100644 --- a/code/modules/sprite_accessories/tail/canid.dm +++ b/code/modules/sprite_accessories/tail/canid.dm @@ -18,7 +18,7 @@ id = "tail_wolf" icon_state = "wolf" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "wolfinner" /datum/sprite_accessory/tail/blackwolf @@ -36,28 +36,28 @@ id = "tail_kitsune_dual" icon_state = "doublekitsune" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/fennec_tail name = "Fennec tail" id = "tail_fox_fennec" icon_state = "fennec_tail_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/fox_tail name = "Fox tail" id = "tail_fox" icon_state = "fox_tail_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/fox_tail_plain name = "Fox tail 2" id = "tail_fox2" icon_state = "fox_tail_plain_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/foxtail name = "Fox" @@ -66,7 +66,7 @@ icon_state = "foxtail_but_good" extra_overlay = "foxtail_but_good-tips" do_colouration = TRUE - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE ani_state = "foxtail_but_good_w" extra_overlay_w = "foxtail_but_good-tips_w" @@ -75,7 +75,7 @@ id = "tail_jackal" icon_state = "jackal_bicolor" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "jackal_bicolor_extra" /datum/sprite_accessory/tail/otietail @@ -84,7 +84,7 @@ icon_state = "otie" ani_state = "otie_w" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/takahiro_kitsune name = "Takahiro Kitsune Tails" //takahiro had five tails i just wanted to follow the 'T' naming convention vs. tamamo and triple @@ -92,7 +92,7 @@ icon_state = "takahiro-kitsunetails" extra_overlay = "takahiro-kitsunetails-tips" do_colouration = TRUE - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/tamamo_kitsune name = "Tamamo Kitsune Tails" //Tamamo-no-Tiro, let it be known! @@ -100,7 +100,7 @@ icon_state = "tamamo-kitsunetails" extra_overlay = "tamamo-kitsunetails-tips" do_colouration = TRUE - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/triple_kitsune name = "Triple Kitsune Tails" @@ -108,7 +108,7 @@ icon_state = "triple-kitsunetails" extra_overlay = "triple-kitsunetails-tips" do_colouration = TRUE - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/ketrai_wag name = "fennix tail (vwag)" @@ -122,4 +122,4 @@ icon_state = "wolf_citmain" ani_state = "wolf_citmain_w" do_colouration = TRUE - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/tail/equine.dm b/code/modules/sprite_accessories/tail/equine.dm index 870c47d7b905..f23aee2e23e4 100644 --- a/code/modules/sprite_accessories/tail/equine.dm +++ b/code/modules/sprite_accessories/tail/equine.dm @@ -3,4 +3,4 @@ id = "tail_horse" icon_state = "horse" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/tail/feline.dm b/code/modules/sprite_accessories/tail/feline.dm index 38f8608f4023..99a587dae0ef 100644 --- a/code/modules/sprite_accessories/tail/feline.dm +++ b/code/modules/sprite_accessories/tail/feline.dm @@ -4,7 +4,7 @@ icon_state = "tigertail" ani_state = "tigertail_w" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "tigertail_mark" extra_overlay_w = "tigertail_mark_w" @@ -13,17 +13,20 @@ id = "tail_tiger" icon_state = "tiger" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "tigerinnerwhite" /datum/sprite_accessory/tail/cat_big name = "kitty (big), colorable" id = "tail_cat_big" + icon = 'icons/mob/sprite_accessory/tails/feline.dmi' icon_state = "catbig" - ani_state = "catbig_wag" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - front_behind_system = TRUE + variations = list( + SPRITE_ACCESSORY_VARIATION_WAGGING = "catbig_wag", + ) + do_colouration = TRUE + legacy_use_additive_color_matrix = FALSE + icon_sidedness = SPRITE_ACCESSORY_SIDEDNESS_FRONT_BEHIND /datum/sprite_accessory/tail/kitty name = "kitty, colorable, downwards" @@ -31,7 +34,7 @@ icon_state = "kittydown" ani_state = "kittydown_wag" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /*/datum/sprite_accessory/tail/kitty_tg name = "kitty, colorable, main" @@ -39,7 +42,7 @@ icon_state = "kittytg" ani_state = "kittytg_wag" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE Currently fucked - Tail renders ontop of the player even if it should be invisible. TODO: Find time to fix this.*/ /datum/sprite_accessory/tail/kittyup @@ -48,7 +51,7 @@ icon_state = "kittyup" ani_state = "kittyup_wag" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/liontail name = "Lion Tail (vwag)" @@ -56,7 +59,7 @@ icon_state = "liontail" ani_state = "liontail_w" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "liontail_markings" extra_overlay_w = "liontail_markings_w" @@ -66,6 +69,6 @@ icon_state = "sneptail" ani_state = "sneptail_w" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "sneptail_mark" extra_overlay_w = "sneptail_mark_w" diff --git a/code/modules/sprite_accessories/tail/insects.dm b/code/modules/sprite_accessories/tail/insects.dm index 1d395816c1cd..9966740b6c97 100644 --- a/code/modules/sprite_accessories/tail/insects.dm +++ b/code/modules/sprite_accessories/tail/insects.dm @@ -8,7 +8,7 @@ id = "tail_bug_abdomen" icon_state = "buggo_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/buggowag name = "Bug abdomen, colorable, vwag change" @@ -16,14 +16,14 @@ icon_state = "buggo_s" ani_state = "buggofat_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/buggo_bee name = "Bug abdomen, bee top, dual-colorable" id = "tail_bug_abdomen_bee" icon_state = "buggo_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "buggobee_markings" /datum/sprite_accessory/tail/buggo_beefull @@ -31,7 +31,7 @@ id = "tail_bug_abdomen_bee2" icon_state = "buggo_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "buggobeefull_markings" /datum/sprite_accessory/tail/buggo_beefullwag @@ -40,7 +40,7 @@ icon_state = "buggo_s" ani_state = "buggofat_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "buggobeefull_markings" extra_overlay_w = "buggofatbeefull_markings" @@ -50,7 +50,7 @@ icon_state = "buggo_s" ani_state = "buggofat_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "buggobee_markings" extra_overlay_w = "buggofatbee_markings" @@ -59,7 +59,7 @@ id = "tail_bug_abdomen_firefly" icon_state = "buggo_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "buggofirefly_markings" /datum/sprite_accessory/tail/buggo_fireflywag @@ -68,7 +68,7 @@ icon_state = "buggo_s" ani_state = "buggofat_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "buggofirefly_markings" extra_overlay_w = "buggofatfirefly_markings" @@ -77,7 +77,7 @@ id = "tail_bug_abdomen_under" icon_state = "buggo_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "buggounder_markings" /datum/sprite_accessory/tail/buggo_underwag @@ -86,7 +86,7 @@ icon_state = "buggo_s" ani_state = "buggofat_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "buggounder_markings" extra_overlay_w = "buggofatunder_markings" @@ -95,14 +95,14 @@ id = "tail_bug_abdomen_fat" icon_state = "buggofat_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/buggofat_bee name = "Fat bug abdomen, bee top, dual-colorable" id = "tail_bug_abdomen_fat_bee" icon_state = "buggofat_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "buggofatbee_markings" /datum/sprite_accessory/tail/buggofat_beefull @@ -110,7 +110,7 @@ id = "tail_bug_abdomen_fat_bee2" icon_state = "buggofat_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "buggofatbeefull_markings" /datum/sprite_accessory/tail/buggofat_firefly @@ -118,7 +118,7 @@ id = "tail_bug_abdomen_fat_firefly" icon_state = "buggofat_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "buggofatfirefly_markings" /datum/sprite_accessory/tail/buggofat_under @@ -126,7 +126,7 @@ id = "tail_bug_abdomen_fat_under" icon_state = "buggofat_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "buggofatunder_markings" /datum/sprite_accessory/tail/buggovass @@ -134,7 +134,7 @@ id = "tail_bug_vass" icon_state = "buggo_vass_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/buggovass_wag name = "Bug abdomen, vass, colorable, vwag change" @@ -142,14 +142,14 @@ icon_state = "buggo_vass_s" ani_state = "buggofat_vass_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/buggovass_bee name = "Bug abdomen, bee top, dc, vass" id = "tail_bug_vass_bee" icon_state = "buggo_vass_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "buggobee_vass_markings" /datum/sprite_accessory/tail/buggovass_beewag @@ -158,7 +158,7 @@ icon_state = "buggo_vass_s" ani_state = "buggofat_vass_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "buggobee_vass_markings" extra_overlay_w = "buggofatbee_vass_markings" @@ -167,7 +167,7 @@ id = "tail_bug_vass_bee3" icon_state = "buggo_vass_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "buggobeefull_vass_markings" /datum/sprite_accessory/tail/buggovass_beefullwag @@ -176,7 +176,7 @@ icon_state = "buggo_vass_s" ani_state = "buggofat_vass_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "buggobeefull_vass_markings" extra_overlay_w = "buggofatbeefull_vass_markings" @@ -185,7 +185,7 @@ id = "tail_bug_vass_firefly" icon_state = "buggo_vass_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "buggofirefly_vass_markings" /datum/sprite_accessory/tail/buggovass_fireflywag @@ -194,7 +194,7 @@ icon_state = "buggo_vass_s" ani_state = "buggofat_vass_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "buggofirefly_vass_markings" extra_overlay_w = "buggofatfirefly_vass_markings" @@ -203,7 +203,7 @@ id = "tail_bug_vass_under" icon_state = "buggo_vass_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "buggounder_vass_markings" /datum/sprite_accessory/tail/buggovass_underwag @@ -212,7 +212,7 @@ icon_state = "buggo_vass_s" ani_state = "buggofat_vass_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "buggounder_vass_markings" extra_overlay_w = "buggofatunder_vass_markings" @@ -221,14 +221,14 @@ id = "tail_bug_vass_fat" icon_state = "buggofat_vass_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/buggovassfat_bee name = "Fat bug abdomen, bee top, dc, vass" id = "tail_bug_vass_fat_bee" icon_state = "buggofat_vass_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "buggofatbee_vass_markings" /datum/sprite_accessory/tail/buggovassfat_beefull @@ -236,7 +236,7 @@ id = "tail_bug_vass_fat_bee2" icon_state = "buggofat_vass_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "buggofatbeefull_vass_markings" /datum/sprite_accessory/tail/buggovassfat_firefly @@ -244,7 +244,7 @@ id = "tail_bug_vass_fat_firefly" icon_state = "buggofat_vass_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "buggofatfirefly_vass_markings" /datum/sprite_accessory/tail/buggovassfat_under @@ -252,5 +252,5 @@ id = "tail_bug_vass_fat_under" icon_state = "buggofat_vass_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "buggofatunder_vass_markings" diff --git a/code/modules/sprite_accessories/tail/misc.dm b/code/modules/sprite_accessories/tail/misc.dm index ac11543247ec..b0272970da29 100644 --- a/code/modules/sprite_accessories/tail/misc.dm +++ b/code/modules/sprite_accessories/tail/misc.dm @@ -3,7 +3,7 @@ id = "tail_jagged_flufftail" icon_state = "ztail" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/curltail name = "curltail (vwag)" @@ -11,7 +11,7 @@ icon_state = "curltail" ani_state = "curltail_w" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "curltail_mark" extra_overlay_w = "curltail_mark_w" @@ -20,14 +20,14 @@ id = "tail_avian_wagtail" icon_state = "wagtail" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/deertail name = "deer tail, dual-color" id = "tail_deer" icon_state = "deertail" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "deertail_mark" /datum/sprite_accessory/tail/Segmentedtail @@ -35,7 +35,7 @@ id = "tail_segmented" icon_state = "Segmentedtail" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "Segmentedtailmarking" ani_state = "Segmentedtail_w" extra_overlay_w = "Segmentedtailmarking_w" @@ -46,4 +46,4 @@ icon_state = "straighttail" ani_state = "straighttail_w" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/tail/rodents_and_adjacent.dm b/code/modules/sprite_accessories/tail/rodents_and_adjacent.dm index 8744e0819021..9b82ed656a83 100644 --- a/code/modules/sprite_accessories/tail/rodents_and_adjacent.dm +++ b/code/modules/sprite_accessories/tail/rodents_and_adjacent.dm @@ -3,7 +3,7 @@ id = "tail_beaver" icon_state = "beaver" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/redpanda name = "red panda" @@ -15,7 +15,7 @@ id = "tail_ringtail" icon_state = "ringtail" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "ringtail_mark" /datum/sprite_accessory/tail/mouse @@ -23,7 +23,7 @@ id = "tail_mouse" icon_state = "mouse" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/mouse_pink name = "mouse, pink" @@ -35,7 +35,7 @@ id = "tail_skunk" icon_state = "skunktail" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "skunktail_mark" /datum/sprite_accessory/tail/squirrel @@ -43,7 +43,7 @@ id = "tail_squirrel" icon_state = "squirrel" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/squirrel_orange name = "squirel, orange" diff --git a/code/modules/sprite_accessories/tail/scalies.dm b/code/modules/sprite_accessories/tail/scalies.dm index c60c1bacacb8..f59d8e797d09 100644 --- a/code/modules/sprite_accessories/tail/scalies.dm +++ b/code/modules/sprite_accessories/tail/scalies.dm @@ -3,21 +3,21 @@ id = "tail_chameleon" icon_state = "chameleon" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/dragon name = "dragon, colorable" id = "tail_dragon" icon_state = "dragon" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/Easterntail name = "Eastern Dragon (Animated)" id = "tail_dragon_eastern" icon_state = "Easterntail" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "EasterntailColorTip" ani_state = "Easterntail_w" extra_overlay_w = "EasterntailColorTip_w" @@ -27,42 +27,42 @@ id = "tail_lizard_darktiger" icon_state = "lizard_tail_dark_tiger" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/lizard_tail_light_tiger name = "Lizard Tail (Light Tiger)" id = "tail_lizard_lighttiger" icon_state = "lizard_tail_light_tiger" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/lizard_tail_smooth name = "Lizard Tail (Smooth)" id = "tail_lizard_smooth" icon_state = "lizard_tail_smooth" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/lizard_tail_spiked name = "Lizard Tail (Spiked)" id = "tail_lizard_spiked" icon_state = "lizard_tail_spiked" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/lizard_tail_smooth_digitigrade name = "Digitigrade Lizard Tail (Smooth)" id = "tail_lizard_smooth_digitigrade" icon_state = "lizard_tail_smooth_digitigrade" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/lizard_tail_spiked_digitigrade name = "Digitigrade Lizard Tail (Spiked)" id = "tail_lizard_spiked_digitigrade" icon_state = "lizard_tail_spiked_digitigrade" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/tail_smooth name = "Smooth Lizard Tail, Colorable" @@ -76,7 +76,7 @@ id = "tail_bigsnake" icon_state = "bigsnaketail" do_colouration = TRUE - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE ani_state = "bigsnaketail_w" /datum/sprite_accessory/tail/bigsnaketailstripes @@ -85,7 +85,7 @@ icon_state = "bigsnaketailstripes" extra_overlay = "bigsnaketailstripes-tips" do_colouration = TRUE - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE ani_state = "bigsnaketailstripes_w" extra_overlay_w = "bigsnaketailstripes-tips_w" @@ -95,7 +95,7 @@ icon_state = "bigsnaketaildual" extra_overlay = "bigsnaketaildual-tips" do_colouration = TRUE - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE ani_state = "bigsnaketaildual_w" extra_overlay_w = "bigsnaketaildual-tips_w" @@ -105,7 +105,7 @@ icon_state = "bigsnaketailstripesalt" extra_overlay = "bigsnaketailstripesalt-tips" do_colouration = TRUE - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE ani_state = "bigsnaketailstripesalt_w" extra_overlay_w = "bigsnaketailstripesalt-tips_w" @@ -115,6 +115,6 @@ icon_state = "bigsnaketailunder" extra_overlay = "bigsnaketailunder-tips" do_colouration = TRUE - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE ani_state = "bigsnaketailunder_w" extra_overlay_w = "bigsnaketailunder-tips_w" diff --git a/code/modules/sprite_accessories/tail/snake.dm b/code/modules/sprite_accessories/tail/snake.dm index 60d5b5866564..fa2fd80837b3 100644 --- a/code/modules/sprite_accessories/tail/snake.dm +++ b/code/modules/sprite_accessories/tail/snake.dm @@ -3,4 +3,4 @@ id = "tail_snake" icon_state = "snaketail" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/tail/species/akula.dm b/code/modules/sprite_accessories/tail/species/akula.dm index 348e3a3e3cb3..5e008967286a 100644 --- a/code/modules/sprite_accessories/tail/species/akula.dm +++ b/code/modules/sprite_accessories/tail/species/akula.dm @@ -3,7 +3,7 @@ id = "tail_akula" icon_state = "sharktail_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/special/akula_anim name = "akula tail, animated" @@ -11,4 +11,4 @@ icon_state = "sharktail_s" ani_state = "sharktail_w" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/tail/species/naramadi.dm b/code/modules/sprite_accessories/tail/species/naramadi.dm index f1fa75be65ad..1c34aa7e046e 100644 --- a/code/modules/sprite_accessories/tail/species/naramadi.dm +++ b/code/modules/sprite_accessories/tail/species/naramadi.dm @@ -3,19 +3,19 @@ id = "tail_naramadi" icon_state = "sergtail_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/special/sergalhc name = "sergal tail, colorable" id = "tail_naramadi_color" icon_state = "sergtail_hc_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/sergaltaildc name = "sergal, dual-color" id = "tail_sergal" icon_state = "sergal" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "sergal_mark" diff --git a/code/modules/sprite_accessories/tail/species/nevrean.dm b/code/modules/sprite_accessories/tail/species/nevrean.dm index 60e68f17e3a8..7f9b048d0970 100644 --- a/code/modules/sprite_accessories/tail/species/nevrean.dm +++ b/code/modules/sprite_accessories/tail/species/nevrean.dm @@ -3,14 +3,14 @@ id = "tail_nevrean_color" icon_state = "nevreantail_hc_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/special/nevrean name = "nevrean tail" id = "tail_nevrean" icon_state = "nevreantail_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/nevreandc name = "nevrean tail, dual-color" @@ -18,7 +18,7 @@ icon_state = "nevreantail_dc" extra_overlay = "nevreantail_dc_tail" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/nevreanwagdc name = "nevrean wagtail, dual-color" @@ -26,7 +26,7 @@ icon_state = "wagtail" extra_overlay = "wagtail_dc_tail" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/nevreanwagdc_alt name = "nevrean wagtail, marked, dual-color" @@ -34,4 +34,4 @@ icon_state = "wagtail2_dc" extra_overlay = "wagtail2_dc_mark" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/tail/species/shadekin.dm b/code/modules/sprite_accessories/tail/species/shadekin.dm index 9707bd2f1096..69624c10de46 100644 --- a/code/modules/sprite_accessories/tail/species/shadekin.dm +++ b/code/modules/sprite_accessories/tail/species/shadekin.dm @@ -3,6 +3,6 @@ id = "tail_shadekin_short" icon_state = "shadekin-short" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE apply_restrictions = TRUE species_allowed = list(SPECIES_SHADEKIN) diff --git a/code/modules/sprite_accessories/tail/species/tajaran.dm b/code/modules/sprite_accessories/tail/species/tajaran.dm index 38de2bb4269a..9b2ed52153b4 100644 --- a/code/modules/sprite_accessories/tail/species/tajaran.dm +++ b/code/modules/sprite_accessories/tail/species/tajaran.dm @@ -3,7 +3,7 @@ id = "tail_tajaran" icon_state = "tajtail_a" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/special/tajaran_anim name = "tajaran tail, Animated" @@ -11,28 +11,28 @@ icon_state = "tajtail_s" ani_state = "tajtail_w" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/special/tajaran_damaged name = "tajaran tail, damaged/short" id = "tail_tajaran_short" icon_state = "tajtail_damaged_s" species_allowed = list(SPECIES_TAJ) - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE /datum/sprite_accessory/tail/special/tajaran_stubby name = "tajaran tail, stubby" id = "tail_tajarna_stubby" icon_state = "tajtail_stubby_s" species_allowed = list(SPECIES_TAJ) - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE /datum/sprite_accessory/tail/stripey name = "stripey taj, colorable" id = "tail_tajaran_stripey" icon_state = "stripeytail" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "stripeytail_mark" /datum/sprite_accessory/tail/stripeytail_brown diff --git a/code/modules/sprite_accessories/tail/species/teshari.dm b/code/modules/sprite_accessories/tail/species/teshari.dm index 10e51baa13d9..590c3221e0e6 100644 --- a/code/modules/sprite_accessories/tail/species/teshari.dm +++ b/code/modules/sprite_accessories/tail/species/teshari.dm @@ -3,7 +3,7 @@ id = "tail_teshari_pattern_f" icon_state = "teshtail_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "teshpattern_fem_tail" /datum/sprite_accessory/tail/tesh_pattern_fem_alt @@ -11,7 +11,7 @@ id = "tail_teshari_pattern_f2" icon_state = "teshtail_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "teshpattern_fem_alt" /datum/sprite_accessory/tail/tesh_pattern_male @@ -19,7 +19,7 @@ id = "tail_teshari_pattern_m" icon_state = "teshtail_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "teshpattern_male_tail" /datum/sprite_accessory/tail/tesh_pattern_male_alt @@ -27,17 +27,18 @@ id = "tail_teshari_pattern_m2" icon_state = "teshtail_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "teshpattern_male_alt" /datum/sprite_accessory/tail/teshari_fluffytail name = "Teshari tail" id = "tail_teshari_fluffy" - icon_state = "teshari_fluffytail" - extra_overlay = "teshari_fluffytail_mark" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - front_behind_system = TRUE + icon = 'icons/mob/sprite_accessory/tails/teshari.dmi' + icon_state = "fluffy" + extra_overlay = "fluffy_2" + do_colouration = TRUE + legacy_use_additive_color_matrix = FALSE + icon_sidedness = SPRITE_ACCESSORY_SIDEDNESS_FRONT_BEHIND /datum/sprite_accessory/tail/special/teshtailfeathered name = "Teshari tail alt" @@ -45,14 +46,14 @@ icon_state = "teshtail_s" extra_overlay = "teshtail_feathers_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/special/tesharitail_noplume name = "teshari tail, no plumage" id = "tail_teshari3" icon_state = "teshtail_noplume_s" species_allowed = list(SPECIES_TESHARI) - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE /datum/sprite_accessory/tail/special/tesharitail_noplume_feathered name = "teshari tail, no plumage w/feathers" @@ -60,14 +61,14 @@ icon_state = "teshtail_noplume_s" extra_overlay = "teshtail_noplume_feathers_s" species_allowed = list(SPECIES_TESHARI) - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE /datum/sprite_accessory/tail/special/tesharitail_damaged name = "teshari tail, damaged" id = "tail_teshari5" icon_state = "teshtail_damaged_s" species_allowed = list(SPECIES_TESHARI) - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE /datum/sprite_accessory/tail/special/tesharitail_damaged_feathered name = "teshari tail, damaged w/feathers" @@ -75,7 +76,7 @@ icon_state = "teshtail_damaged_s" extra_overlay = "teshtail_damaged_feathers_s" species_allowed = list(SPECIES_TESHARI) - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE /datum/sprite_accessory/tail/special/tesharitail_damaged_unbranded name = "teshari tail, damaged w/ unbranded prosthetic" @@ -83,7 +84,7 @@ icon_state = "teshtail_damaged_s" extra_overlay = "teshtail_damaged_prosthetic_unbranded_s" species_allowed = list(SPECIES_TESHARI) - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE /datum/sprite_accessory/tail/special/tesharitail_damaged_unbranded_feathered name = "teshari tail, damaged w/feathers + unbranded prosthetic" @@ -92,7 +93,7 @@ extra_overlay = "teshtail_damaged_feathers_s" extra_overlay2 = "teshtail_damaged_prosthetic_unbranded_s" species_allowed = list(SPECIES_TESHARI) - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE /datum/sprite_accessory/tail/special/tesharitail_damaged_cenilimi name = "teshari tail, damaged w/ Cenilimi Cybernetics prosthetic" @@ -100,7 +101,7 @@ icon_state = "teshtail_damaged_s" extra_overlay = "teshtail_damaged_prosthetic_cenilimi_s" species_allowed = list(SPECIES_TESHARI) - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE /datum/sprite_accessory/tail/special/tesharitail_damaged_cenilimi_feathered name = "teshari tail, damaged w/feathers + Cenilimi Cybernetics prosthetic" @@ -109,7 +110,7 @@ extra_overlay = "teshtail_damaged_feathers_s" extra_overlay2 = "teshtail_damaged_prosthetic_cenilimi_s" species_allowed = list(SPECIES_TESHARI) - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE /datum/sprite_accessory/tail/special/tesharitail_damaged_wood id = "tail_teshari11" @@ -117,7 +118,7 @@ icon_state = "teshtail_damaged_s" extra_overlay = "teshtail_damaged_prosthetic_wood_s" species_allowed = list(SPECIES_TESHARI) - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE /datum/sprite_accessory/tail/special/tesharitail_damaged_wood_feathered name = "teshari tail, damaged w/feathers + wooden prosthetic" @@ -126,7 +127,7 @@ extra_overlay = "teshtail_damaged_feathers_s" extra_overlay2 = "teshtail_damaged_prosthetic_wood_s" species_allowed = list(SPECIES_TESHARI) - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE /datum/sprite_accessory/tail/special/tesharitail_damaged_sifwood name = "teshari tail, damaged w/ Sivian wooden prosthetic" @@ -134,7 +135,7 @@ icon_state = "teshtail_damaged_s" extra_overlay = "teshtail_damaged_prosthetic_wood_sif_s" species_allowed = list(SPECIES_TESHARI) - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE /datum/sprite_accessory/tail/special/tesharitail_damaged_sifwood_feathered name = "teshari tail, damaged w/feathers + Sivian wooden prosthetic" @@ -143,14 +144,14 @@ extra_overlay = "teshtail_damaged_feathers_s" extra_overlay2 = "teshtail_damaged_prosthetic_wood_sif_s" species_allowed = list(SPECIES_TESHARI) - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE /datum/sprite_accessory/tail/special/tesharitail_stubby name = "teshari tail, stubby" id = "tail_teshari15" icon_state = "teshtail_stubby_s" species_allowed = list(SPECIES_TESHARI) - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE /datum/sprite_accessory/tail/special/tesharitail_stubby_feathered name = "teshari tail, stubby w/feathers" @@ -158,7 +159,7 @@ icon_state = "teshtail_stubby_s" extra_overlay = "teshtail_stubby_feathers_s" species_allowed = list(SPECIES_TESHARI) - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE /datum/sprite_accessory/tail/special/tesharitail_stubby_unbranded name = "teshari tail, stubby w/ unbranded prosthetic" @@ -166,7 +167,7 @@ icon_state = "teshtail_stubby_s" extra_overlay = "teshtail_stubby_prosthetic_unbranded_s" species_allowed = list(SPECIES_TESHARI) - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE /datum/sprite_accessory/tail/special/tesharitail_stubby_unbranded_feathered name = "teshari tail, stubby w/ feathers + unbranded prosthetic" @@ -175,7 +176,7 @@ extra_overlay = "teshtail_stubby_feathers_s" extra_overlay2 = "teshtail_stubby_prosthetic_unbranded_s" species_allowed = list(SPECIES_TESHARI) - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE /datum/sprite_accessory/tail/special/tesharitail_stubby_cenilimi name = "teshari tail, stubby w/ Cenilimi Cybernetics prosthetic" @@ -183,7 +184,7 @@ icon_state = "teshtail_stubby_s" extra_overlay = "teshtail_stubby_prosthetic_cenilimi_s" species_allowed = list(SPECIES_TESHARI) - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE /datum/sprite_accessory/tail/special/tesharitail_stubby_cenilimi_feathered name = "teshari tail, stubby w/ feathers + Cenilimi Cybernetics prosthetic" @@ -192,7 +193,7 @@ extra_overlay = "teshtail_stubby_feathers_s" extra_overlay2 = "teshtail_stubby_prosthetic_cenilimi_s" species_allowed = list(SPECIES_TESHARI) - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE /datum/sprite_accessory/tail/special/tesharitail_stubby_wood name = "teshari tail, stubby w/ wooden prosthetic" @@ -200,7 +201,7 @@ icon_state = "teshtail_stubby_s" extra_overlay = "teshtail_stubby_prosthetic_wood_s" species_allowed = list(SPECIES_TESHARI) - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE /datum/sprite_accessory/tail/special/tesharitail_stubby_wood_feathered name = "teshari tail, stubby w/feathers + wooden prosthetic" @@ -209,7 +210,7 @@ extra_overlay = "teshtail_stubby_feathers_s" extra_overlay2 = "teshtail_stubby_prosthetic_wood_s" species_allowed = list(SPECIES_TESHARI) - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE /datum/sprite_accessory/tail/special/tesharitail_stubby_sifwood name = "teshari tail, stubby w/ Sivian wooden prosthetic" @@ -217,7 +218,7 @@ icon_state = "teshtail_stubby_s" extra_overlay = "teshtail_stubby_prosthetic_wood_sif_s" species_allowed = list(SPECIES_TESHARI) - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE /datum/sprite_accessory/tail/special/tesharitail_stubby_sifwood_feathered name = "teshari tail, stubby w/feathers + Sivian wooden prosthetic" @@ -226,7 +227,7 @@ extra_overlay = "teshtail_stubby_feathers_s" extra_overlay2 = "teshtail_stubby_prosthetic_wood_sif_s" species_allowed = list(SPECIES_TESHARI) - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE /datum/sprite_accessory/tail/special/tesharitail_prosthetic_unbranded name = "teshari tail, unbranded prosthetic" diff --git a/code/modules/sprite_accessories/tail/species/unathi.dm b/code/modules/sprite_accessories/tail/species/unathi.dm index 5c14d72f82af..f8d6161e5962 100644 --- a/code/modules/sprite_accessories/tail/species/unathi.dm +++ b/code/modules/sprite_accessories/tail/species/unathi.dm @@ -3,25 +3,25 @@ id = "tail_unathi" icon_state = "sogtail_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/special/unathihc name = "unathi tail, colorable" id = "tail_unathi_color" icon_state = "sogtail_hc_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/special/unathi_damaged name = "unathi tail, damaged" id = "tail_unathi_damaged" icon_state = "unathitail_damaged_s" species_allowed = list(SPECIES_UNATHI) - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE /datum/sprite_accessory/tail/special/unathi_stubby name = "unathi tail, stubby" id = "tail_unathi_stubby" icon_state = "unathitail_stubby_s" species_allowed = list(SPECIES_UNATHI) - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE diff --git a/code/modules/sprite_accessories/tail/species/vulpkanin.dm b/code/modules/sprite_accessories/tail/species/vulpkanin.dm index 2c498e46aad4..2b0a622cf94c 100644 --- a/code/modules/sprite_accessories/tail/species/vulpkanin.dm +++ b/code/modules/sprite_accessories/tail/species/vulpkanin.dm @@ -3,7 +3,7 @@ id = "tail_vulp" icon_state = "vulptail_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/vulp_new name = "new vulp tail (vwag)" @@ -11,7 +11,7 @@ icon_state = "vulptail" ani_state = "vulptail_w" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "vulptail_mark" extra_overlay_w = "vulptail_mark_w" @@ -20,4 +20,4 @@ id = "tail_vulp3" icon_state = "vulptail_alt" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/tail/species/xenomorph.dm b/code/modules/sprite_accessories/tail/species/xenomorph.dm index 1000e6d68996..494f52cc3a18 100644 --- a/code/modules/sprite_accessories/tail/species/xenomorph.dm +++ b/code/modules/sprite_accessories/tail/species/xenomorph.dm @@ -13,14 +13,14 @@ id = "tail_xenomorph3" icon_state = "xenotail_fullcolour" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/xenotailalt_fullcolour name = "xenomorph tail alt. (fully colourable)" id = "tail_xenomorph4" icon_state = "xenotailalt_fullcolour" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/special/xenodrone name = "xenomorph drone tail" @@ -32,7 +32,7 @@ id = "tail_xeno_drone_color" icon_state = "xenos_drone_tail_hc_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/special/xenohunter name = "xenomorph hunter tail" @@ -44,7 +44,7 @@ id = "tail_xeno_hunter_color" icon_state = "xenos_hunter_tail_hc_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/special/xenoqueen name = "xenomorph queen tail" @@ -56,7 +56,7 @@ id = "tail_xeno_queen_color" icon_state = "xenos_queen_tail_hc_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/special/xenosentinel name = "xenomorph sentinel tail" @@ -68,13 +68,13 @@ id = "tail_xeno_sentinel_color" icon_state = "xenos_sentinel_tail_hc_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/special/xenotail_wag name = "Xenomorph tail (Waggable)" id = "tail_xeno_wag" - icon = "icons/mob/sprite_accessories/xeno_parts.dmi" + icon = 'icons/mob/sprite_accessories/xeno_parts.dmi' icon_state = "xenotail" ani_state = "xenotail_w" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/tail/species/zorren.dm b/code/modules/sprite_accessories/tail/species/zorren.dm index 61dca3ba082e..5e425c712568 100644 --- a/code/modules/sprite_accessories/tail/species/zorren.dm +++ b/code/modules/sprite_accessories/tail/species/zorren.dm @@ -3,11 +3,11 @@ id = "tail_zorren_flat" icon_state = "fentail_hc_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/special/foxhc name = "highlander zorren tail, colorable" id = "tail_zorren_high" icon_state = "foxtail_hc_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/tail/synthetic.dm b/code/modules/sprite_accessories/tail/synthetic.dm index 2c8962a8b6fd..61224f37376a 100644 --- a/code/modules/sprite_accessories/tail/synthetic.dm +++ b/code/modules/sprite_accessories/tail/synthetic.dm @@ -3,14 +3,14 @@ id = "tail_synth_wardtakashi" icon_state = "wardtakahashi_vulp" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/wartacosushi_tail_dc name = "Ward-Takahashi Tail, dual-color" id = "tail_synth_wardtakashi2" icon_state = "wardtakahashi_vulp_dc" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "wardtakahashi_vulp_dc_mark" /datum/sprite_accessory/tail/zenghu_taj @@ -23,7 +23,7 @@ id = "tail_synth_egn" icon_state = "eboop" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "eboop_mark" /datum/sprite_accessory/tail/Plugtail @@ -31,7 +31,7 @@ id = "tail_synth_plug" icon_state = "Plugtail" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "PlugtailMarking" extra_overlay2 = "PlugtailMarking2" @@ -40,7 +40,7 @@ id = "tail_synth_dragon" icon_state = "robo_dragon" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "robodragon_b" /datum/sprite_accessory/tail/Segmentedlights @@ -48,7 +48,7 @@ id = "tail_synth_segmented" icon_state = "Segmentedtail" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "Segmentedlights" ani_state = "Segmentedtail_w" extra_overlay_w = "Segmentedlights_w" @@ -58,7 +58,7 @@ id = "tail_synth_lizard" icon_state = "synthtail" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/synthtail_vwag name = "Synthetic lizard tail (vwag)" @@ -66,4 +66,4 @@ icon_state = "synthtail" ani_state = "synthtail_w" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/tail/taurs.dm b/code/modules/sprite_accessories/tail/taurs.dm index 97895ea640e5..cdb71ad7e4ba 100644 --- a/code/modules/sprite_accessories/tail/taurs.dm +++ b/code/modules/sprite_accessories/tail/taurs.dm @@ -1,9 +1,9 @@ -/datum/sprite_accessory/tail/taur - abstract_type = /datum/sprite_accessory/tail/taur +/datum/sprite_accessory/tail/legacy_taur + abstract_type = /datum/sprite_accessory/tail/legacy_taur name = "You should not see this..." icon = 'icons/mob/sprite_accessories/taurs.dmi' do_colouration = 1 // Yes color, using tail color - color_blend_mode = ICON_MULTIPLY // The sprites for taurs are designed for ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE // The sprites for taurs are designed for ICON_MULTIPLY can_be_hidden = FALSE var/icon/suit_sprites = null //File for suit sprites, if any. @@ -42,7 +42,13 @@ // Species-unique long tails/taurhalves -/datum/sprite_accessory/tail/taur/shadekin_tail +/datum/sprite_accessory/tail/legacy_taur/render(mob/for_whom, list/colors, layer_front, layer_behind, layer_side, with_base_state, with_variation, flattened) + var/list/image/layers = ..() + for(var/image/rendered as anything in layers) + rendered.pixel_x -= 16 + return layers + +/datum/sprite_accessory/tail/legacy_taur/shadekin_tail name = "Shadekin Tail" id = "tail_taur_shadekin" icon_state = "shadekin_s" @@ -53,61 +59,61 @@ apply_restrictions = TRUE species_allowed = list(SPECIES_SHADEKIN, SPECIES_SHADEKIN_CREW) -/datum/sprite_accessory/tail/taur/shadekin_tail/shadekin_tail_2c +/datum/sprite_accessory/tail/legacy_taur/shadekin_tail/shadekin_tail_2c name = "Shadekin Tail dual-color" id = "tail_taur_shadekin_colorable" extra_overlay = "shadekin_markings" -/datum/sprite_accessory/tail/taur/shadekin_tail/shadekin_tail_long +/datum/sprite_accessory/tail/legacy_taur/shadekin_tail/shadekin_tail_long name = "Shadekin Long Tail" id = "tail_taur_shadekin_long" icon_state = "shadekin_long_s" -/datum/sprite_accessory/tail/taur/shadekin_tail/shadekin_tail_long_2 +/datum/sprite_accessory/tail/legacy_taur/shadekin_tail/shadekin_tail_long_2 name = "Shadekin Striped Long Tail" id = "tail_taur_shadekin_long_stripes" icon_state = "shadekin_long_2" extra_overlay = "shadekin_long_marking_2" -/datum/sprite_accessory/tail/taur/shadekin_tail/shadekin_tail_small +/datum/sprite_accessory/tail/legacy_taur/shadekin_tail/shadekin_tail_small name = "Shadekin Small Tail" id = "tail_taur_shadekin_small" icon_state = "shadekin_s2" // Tails/taurhalves for everyone -/datum/sprite_accessory/tail/taur/wolf +/datum/sprite_accessory/tail/legacy_taur/wolf name = "Wolf (Taur)" id = "tail_taur_wolf" icon_state = "wolf_s" suit_sprites = 'icons/mob/clothing/taursuits_wolf.dmi' //TFF 22/11/19 - CHOMPStation port of fat taur sprites -/datum/sprite_accessory/tail/taur/fatwolf +/datum/sprite_accessory/tail/legacy_taur/fatwolf name = "Fat Wolf (Taur)" id = "tail_taur_wolf_fat" icon_state = "fatwolf_s" -/datum/sprite_accessory/tail/taur/wolf/wolf_2c +/datum/sprite_accessory/tail/legacy_taur/wolf/wolf_2c name = "Wolf dual-color (Taur)" id = "tail_taur_wolf_colorable" icon_state = "wolf_s" extra_overlay = "wolf_markings" //TFF 22/11/19 - CHOMPStation port of fat taur sprites -/datum/sprite_accessory/tail/taur/wolf/fatwolf_2c +/datum/sprite_accessory/tail/legacy_taur/wolf/fatwolf_2c name = "Fat Wolf dual-color (Taur)" id = "tail_taur_wolf_fat_colorable" icon_state = "fatwolf_s" extra_overlay = "fatwolf_markings" -/datum/sprite_accessory/tail/taur/wolf/synthwolf +/datum/sprite_accessory/tail/legacy_taur/wolf/synthwolf name = "SynthWolf dual-color (Taur)" id = "tail_taur_wolf_synth_colorable" icon_state = "synthwolf_s" extra_overlay = "synthwolf_markings" -/datum/sprite_accessory/tail/taur/naga +/datum/sprite_accessory/tail/legacy_taur/naga name = "Naga (Taur)" id = "tail_taur_naga" icon_state = "naga_s" @@ -140,19 +146,19 @@ msg_prey_stepunder = "You jump over %prey's thick tail." msg_owner_stepunder = "%owner bounds over your tail." -/datum/sprite_accessory/tail/taur/naga/naga_2c +/datum/sprite_accessory/tail/legacy_taur/naga/naga_2c name = "Naga dual-color (Taur)" id = "tail_taur_naga_colorable" icon_state = "naga_s" extra_overlay = "naga_markings" -/datum/sprite_accessory/tail/taur/naga/naga_2c_alt +/datum/sprite_accessory/tail/legacy_taur/naga/naga_2c_alt name = "Naga dual-color alt (Taur)" id = "tail_taur_naga_colorable_alt" icon_state = "altnaga_s" extra_overlay = "altnaga_markings" -/datum/sprite_accessory/tail/taur/naga/naga_tailmaw +/datum/sprite_accessory/tail/legacy_taur/naga/naga_tailmaw name = "Naga Tailmaw (Taur)" id = "tail_taur_naga_tailmaw" icon_state = "altnagatailmaw_s" @@ -160,20 +166,20 @@ extra_overlay2 = "altnagatailmaw_eyes" // yes, a mermaid is not a naga, i'm just lazy so it's using the same messages because it's still a tail okay -/datum/sprite_accessory/tail/taur/naga/mermaid +/datum/sprite_accessory/tail/legacy_taur/naga/mermaid name = "Mermaid (Taur)" id = "tail_taur_mermaid" icon_state = "mermaid_s" suit_sprites = null -/datum/sprite_accessory/tail/taur/naga/mermaid/alt +/datum/sprite_accessory/tail/legacy_taur/naga/mermaid/alt name = "Mermaid Alt (Taur)" id = "tail_taur_mermaid_alt" icon_state = "altmermaid_s" extra_overlay = "altmermaid_markings" extra_overlay2 = "altmermaid_markings2" -/datum/sprite_accessory/tail/taur/horse +/datum/sprite_accessory/tail/legacy_taur/horse name = "Horse (Taur)" id = "tail_taur_horse" icon_state = "horse_s" @@ -194,13 +200,13 @@ msg_owner_grab_fail = "You step down onto %prey, squishing them and forcing them down to the ground!" msg_prey_grab_fail = "%owner steps down and squishes you with their hoof, forcing you down to the ground!" -/datum/sprite_accessory/tail/taur/horse/synthhorse +/datum/sprite_accessory/tail/legacy_taur/horse/synthhorse name = "SynthHorse dual-color (Taur)" id = "tail_taur_horse_synth_colorable" icon_state = "synthhorse_s" extra_overlay = "synthhorse_markings" -/datum/sprite_accessory/tail/taur/cow +/datum/sprite_accessory/tail/legacy_taur/cow name = "Cow (Taur)" id = "tail_taur_cow" icon_state = "cow_s" @@ -221,7 +227,7 @@ msg_owner_grab_fail = "You step down onto %prey, squishing them and forcing them down to the ground!" msg_prey_grab_fail = "%owner steps down and squishes you with their hoof, forcing you down to the ground!" -/datum/sprite_accessory/tail/taur/deer +/datum/sprite_accessory/tail/legacy_taur/deer name = "Deer dual-color (Taur)" id = "tail_taur_deer_colorable" icon_state = "deer_s" @@ -243,25 +249,25 @@ msg_owner_grab_fail = "You step down onto %prey, squishing them and forcing them down to the ground!" msg_prey_grab_fail = "%owner steps down and squishes you with their hoof, forcing you down to the ground!" -/datum/sprite_accessory/tail/taur/lizard +/datum/sprite_accessory/tail/legacy_taur/lizard name = "Lizard (Taur)" id = "tail_taur_lizard" icon_state = "lizard_s" suit_sprites = 'icons/mob/clothing/taursuits_lizard.dmi' -/datum/sprite_accessory/tail/taur/lizard/lizard_2c +/datum/sprite_accessory/tail/legacy_taur/lizard/lizard_2c name = "Lizard dual-color (Taur)" id = "tail_taur_lizard_colorable" icon_state = "lizard_s" extra_overlay = "lizard_markings" -/datum/sprite_accessory/tail/taur/lizard/synthlizard +/datum/sprite_accessory/tail/legacy_taur/lizard/synthlizard name = "SynthLizard dual-color (Taur)" id = "tail_taur_lizard_synth" icon_state = "synthlizard_s" extra_overlay = "synthlizard_markings" -/datum/sprite_accessory/tail/taur/spider +/datum/sprite_accessory/tail/legacy_taur/spider name = "Spider (Taur)" id = "tail_taur_spider" icon_state = "spider_s" @@ -282,7 +288,7 @@ msg_owner_grab_fail = "You step down onto %prey, squishing them and forcing them down to the ground!" msg_prey_grab_fail = "%owner steps down and squishes you with their leg, forcing you down to the ground!" -/datum/sprite_accessory/tail/taur/tents +/datum/sprite_accessory/tail/legacy_taur/tents name = "Tentacles (Taur)" id = "tail_taur_tentacles" icon_state = "tent_s" @@ -309,42 +315,42 @@ msg_owner_grab_fail = "You step down onto %prey with one of your tentacles, forcing them onto the ground!" msg_prey_grab_fail = "%owner steps down onto you with one of their tentacles, squishing you and forcing you onto the ground!" -/datum/sprite_accessory/tail/taur/feline +/datum/sprite_accessory/tail/legacy_taur/feline name = "Feline (Taur)" id = "tail_taur_feline" icon_state = "feline_s" suit_sprites = 'icons/mob/clothing/taursuits_feline.dmi' -/datum/sprite_accessory/tail/taur/fatfeline +/datum/sprite_accessory/tail/legacy_taur/fatfeline name = "Fat Feline (Taur)" id = "tail_taur_feline_fat" icon_state = "fatfeline_s" -/datum/sprite_accessory/tail/taur/fatfeline_wag +/datum/sprite_accessory/tail/legacy_taur/fatfeline_wag name = "Fat Feline (Taur) (vwag)" id = "tail_taur_feline_fat_waggable" icon_state = "fatfeline_s" ani_state = "fatfeline_w" -/datum/sprite_accessory/tail/taur/feline/feline_2c +/datum/sprite_accessory/tail/legacy_taur/feline/feline_2c name = "Feline dual-color (Taur)" id = "tail_taur_feline_colorable" icon_state = "feline_s" extra_overlay = "feline_markings" -/datum/sprite_accessory/tail/taur/feline/fatfeline_2c +/datum/sprite_accessory/tail/legacy_taur/feline/fatfeline_2c name = "Fat Feline dual-color (Taur)" id = "tail_taur_feline_fat_colorable" icon_state = "fatfeline_s" extra_overlay = "fatfeline_markings" -/datum/sprite_accessory/tail/taur/feline/synthfeline +/datum/sprite_accessory/tail/legacy_taur/feline/synthfeline name = "SynthFeline dual-color (Taur)" id = "tail_taur_feline_synth_colorable" icon_state = "synthfeline_s" extra_overlay = "synthfeline_markings" -/datum/sprite_accessory/tail/taur/slug +/datum/sprite_accessory/tail/legacy_taur/slug name = "Slug (Taur)" id = "tail_taur_slug" icon_state = "slug_s" @@ -377,26 +383,26 @@ msg_prey_stepunder = "You jump over %prey's thick tail." msg_owner_stepunder = "%owner bounds over your tail." -/datum/sprite_accessory/tail/taur/frog +/datum/sprite_accessory/tail/legacy_taur/frog name = "Frog (Taur)" id = "tail_taur_frog" icon_state = "frog_s" -/datum/sprite_accessory/tail/taur/drake //Enabling on request, no suit compatibility but then again see 2 above. +/datum/sprite_accessory/tail/legacy_taur/drake //Enabling on request, no suit compatibility but then again see 2 above. name = "Drake (Taur)" id = "tail_taur_drake" icon_state = "drake_s" extra_overlay = "drake_markings" suit_sprites = 'icons/mob/clothing/taursuits_drake.dmi' -/datum/sprite_accessory/tail/taur/otie +/datum/sprite_accessory/tail/legacy_taur/otie name = "Otie (Taur)" id = "tail_taur_otie" icon_state = "otie_s" extra_overlay = "otie_markings" suit_sprites = 'icons/mob/clothing/taursuits_otie.dmi' -/datum/sprite_accessory/tail/taur/wasp +/datum/sprite_accessory/tail/legacy_taur/wasp name = "Wasp (dual color)" id = "tail_taur_wasp" icon_state = "wasp_s" @@ -418,7 +424,7 @@ msg_owner_grab_fail = "You step down onto %prey, squishing them and forcing them down to the ground!" msg_prey_grab_fail = "%owner steps down and squishes you with their leg, forcing you down to the ground!" -/datum/sprite_accessory/tail/taur/mantis +/datum/sprite_accessory/tail/legacy_taur/mantis name = "Mantis (Taur)" id = "tail_taur_mantis" icon_state = "mantis_s" @@ -442,12 +448,11 @@ // Special snowflake tails/taurhalves // todo: remove -/datum/sprite_accessory/tail/taur/alraune - abstract_type = /datum/sprite_accessory/tail/taur/alraune +/datum/sprite_accessory/tail/legacy_taur/alraune + abstract_type = /datum/sprite_accessory/tail/legacy_taur/alraune name = "Alraune (natje) (Taur)" icon_state = "alraune_s" ani_state = "alraune_closed_s" - ckeys_allowed = list("natje") do_colouration = 0 can_ride = 0 clip_mask_state = "taur_clip_mask_alraune" @@ -474,18 +479,17 @@ msg_owner_grab_fail = "You step down onto %prey with one of your vines, forcing them onto the ground!" msg_prey_grab_fail = "%owner steps down onto you with one of their vines, squishing you and forcing you onto the ground!" -/datum/sprite_accessory/tail/taur/alraune/alraune_2c +/datum/sprite_accessory/tail/legacy_taur/alraune/alraune_2c name = "Alraune (dual color)" id = "tail_taur_alraune_colorable" icon_state = "alraunecolor_s" ani_state = "alraunecolor_closed_s" - ckeys_allowed = null do_colouration = 1 extra_overlay = "alraunecolor_markings" extra_overlay_w = "alraunecolor_closed_markings" clip_mask_state = "taur_clip_mask_alraune" -/datum/sprite_accessory/tail/taur/long_lizard +/datum/sprite_accessory/tail/legacy_taur/long_lizard name = "Large Dragon Tail" id = "tail_taur_dragon_large" icon_state = "big_liz" @@ -494,7 +498,7 @@ clip_mask_icon = null clip_mask_state = null -/datum/sprite_accessory/tail/taur/long_lizard/scaled +/datum/sprite_accessory/tail/legacy_taur/long_lizard/scaled name = "Large Dragon Tail/W scales" id = "tail_taur_dragon_large_scales" extra_overlay = "big_liz_mark" diff --git a/code/modules/sprite_accessories/tail/weird_shadow_creature_ocs.dm b/code/modules/sprite_accessories/tail/weird_shadow_creature_ocs.dm index ab6c66827631..935accb7d76f 100644 --- a/code/modules/sprite_accessories/tail/weird_shadow_creature_ocs.dm +++ b/code/modules/sprite_accessories/tail/weird_shadow_creature_ocs.dm @@ -4,13 +4,13 @@ icon_state = "newtailmaw" ani_state = "newtailmaw_w" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/tailmaw name = "tailmaw, colorable" id = "tail_tailmaw2" icon_state = "tailmaw" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE do_colouration = 1 /datum/sprite_accessory/tail/tentacles @@ -18,7 +18,7 @@ id = "tail_tentacles" icon_state = "tentacles" do_colouration = TRUE - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE ani_state = "tentacles_wag" /datum/sprite_accessory/tail/spade_color diff --git a/code/modules/sprite_accessories/wings.dm b/code/modules/sprite_accessories/wings.dm new file mode 100644 index 000000000000..99a83e442b0b --- /dev/null +++ b/code/modules/sprite_accessories/wings.dm @@ -0,0 +1,61 @@ +/datum/sprite_accessory/wing + abstract_type = /datum/sprite_accessory/wing + name = "You should not see this..." + icon = 'icons/mob/sprite_accessories/wings.dmi' + icon_dimension_x = 64 + icon_alignment = SPRITE_ACCESSORY_ALIGNMENT_BOTTOM + do_colouration = 0 //Set to 1 to enable coloration using the tail color. + + legacy_use_additive_color_matrix = TRUE // Only appliciable if do_coloration = 1 + +/datum/sprite_accessory/wing/render(mob/for_whom, list/colors, layer_front, layer_behind, layer_side, with_base_state, with_variation, flattened) + var/list/image/layers = ..() + + if(flattened) + return layers + + for(var/image/rendered as anything in layers) + if(do_colouration && ishuman(for_whom)) + var/mob/living/carbon/human/casted_human = for_whom + if(casted_human.grad_wingstyle && casted_human.grad_wingstyle != "None") + var/image/gradient_icon = image(hair_gradient_icon(id, rendered, casted_human.grad_wingstyle, icon_dimension_x)) + gradient_icon.color = rgb( + casted_human.r_gradwing, + casted_human.g_gradwing, + casted_human.b_gradwing, + ) + gradient_icon.blend_mode = BLEND_OVERLAY + rendered.overlays += gradient_icon + + return layers + +/datum/sprite_accessory/wing/flat_cache_keys(mob/for_whom, list/colors, layer_front, layer_behind, layer_side, with_base_state = icon_state, with_variation, flattened) + . = ..() + if(!ishuman(for_whom)) + return + var/mob/living/carbon/human/casted_human = for_whom + . += casted_human.grad_wingstyle + . += rgb( + casted_human.r_gradwing, + casted_human.g_gradwing, + casted_human.b_gradwing, + ) + +// todo: sort ears by something that makes sense +// todo: tgui choice menu should be modular +// todo: and include way to do categories +//! right now the categories are way too sparse, we'll combine them later. + +//? AND YES, I AM SHITPOSTING WITH THE CATEGORY .DM NAMES +//? Deal with it, I'll deal with this in the emissives PR +//? Seriously I'm not categorizing our 500 kinds of wings. + +//? If anyone wants to sort it, obviously, PLEASE, be my guest, but I just don't have the energy to do the stuff I did +//? in /ears. It just isn't working out for me, sorry. + +//? Potential nomenclatures: +//? - by animal (real or fakefurrysona) type +//? - "Animal", "Species", "Robotic", "Misc" +//? etc + +//? PLEASE HELP WITH THIS. diff --git a/code/modules/sprite_accessories/wings/_wings.dm b/code/modules/sprite_accessories/wings/_wings.dm deleted file mode 100644 index 3ae01264afcc..000000000000 --- a/code/modules/sprite_accessories/wings/_wings.dm +++ /dev/null @@ -1,35 +0,0 @@ -/datum/sprite_accessory/wing - abstract_type = /datum/sprite_accessory/wing - name = "You should not see this..." - icon = 'icons/mob/sprite_accessories/wings.dmi' - dimension_x = 64 - do_colouration = 0 //Set to 1 to enable coloration using the tail color. - - color_blend_mode = ICON_ADD // Only appliciable if do_coloration = 1 - var/clothing_can_hide = 1 // If true, clothing with HIDETAIL hides it. If the clothing is bulky enough to hide a tail, it should also hide wings. - // var/show_species_tail = 1 // Just so // TODO - Seems not needed ~Leshana - var/desc = "You should not see this..." - var/ani_state // State when flapping/animated - var/spr_state // State when spreading wings w/o anim - var/extra_overlay_w // Flapping state for extra overlay - var/extra_overlay2_w - - -// todo: sort ears by something that makes sense -// todo: tgui choice menu should be modular -// todo: and include way to do categories -//! right now the categories are way too sparse, we'll combine them later. - -//? AND YES, I AM SHITPOSTING WITH THE CATEGORY .DM NAMES -//? Deal with it, I'll deal with this in the emissives PR -//? Seriously I'm not categorizing our 500 kinds of wings. - -//? If anyone wants to sort it, obviously, PLEASE, be my guest, but I just don't have the energy to do the stuff I did -//? in /ears. It just isn't working out for me, sorry. - -//? Potential nomenclatures: -//? - by animal (real or fakefurrysona) type -//? - "Animal", "Species", "Robotic", "Misc" -//? etc - -//? PLEASE HELP WITH THIS. diff --git a/code/modules/sprite_accessories/wings/draconic_furries.dm b/code/modules/sprite_accessories/wings/draconic_furries.dm index 93a9746f23bf..9cb1b0ec5f33 100644 --- a/code/modules/sprite_accessories/wings/draconic_furries.dm +++ b/code/modules/sprite_accessories/wings/draconic_furries.dm @@ -3,7 +3,7 @@ id = "wing_cyberdragon" icon_state = "cyberdragon_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/wing/cyberdragon_red name = "Cyber dragon wing (red)" @@ -16,7 +16,7 @@ id = "wing_cyberdragon2" icon_state = "drago_wing" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "drago_wing_2" /datum/sprite_accessory/wing/drake_wing @@ -24,4 +24,4 @@ id = "wing_drake" icon_state = "drake_wing" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/wings/feathered-angel.dm b/code/modules/sprite_accessories/wings/feathered-angel.dm new file mode 100644 index 000000000000..7afd2e6246f3 --- /dev/null +++ b/code/modules/sprite_accessories/wings/feathered-angel.dm @@ -0,0 +1,31 @@ +/datum/sprite_accessory/wing/angel + name = "angel wings" + id = "angelwings" + icon = 'icons/mob/sprite_accessory/wings/feathered-angel.dmi' + icon_state = "angel" + do_colouration = TRUE + legacy_use_additive_color_matrix = FALSE + icon_sidedness = SPRITE_ACCESSORY_SIDEDNESS_FRONT_BEHIND + +//64x48 Wings +/datum/sprite_accessory/wing/seraph + name = "seraphim wings (colorable)" + id = "wing_seraph" + icon = 'icons/mob/sprite_accessory/wings/feathered-angel-64x48.dmi' + icon_state = "seraph" + variations = list( + SPRITE_ACCESSORY_VARIATION_SPREAD = "seraph-spr" + ) + do_colouration = 1 + legacy_use_additive_color_matrix = FALSE + +/datum/sprite_accessory/wing/seraph_eyes + name = "seraphim wings (colorable, eyes)" + id = "wing_serapheye" + icon = 'icons/mob/sprite_accessory/wings/feathered-angel-64x48.dmi' + icon_state = "seraph_eye" + variations = list( + SPRITE_ACCESSORY_VARIATION_SPREAD = "seraph_eye-spr" + ) + //do_colouration = 1 //Maybe some day we'll allow multi-coloration and I'll make this colorable again too so the eyes can get colors. + //legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/wings/feathered-generic.dm b/code/modules/sprite_accessories/wings/feathered-generic.dm new file mode 100644 index 000000000000..43af9e848a15 --- /dev/null +++ b/code/modules/sprite_accessories/wings/feathered-generic.dm @@ -0,0 +1,26 @@ +/datum/sprite_accessory/wing/feathered + name = "feathered wings (colorable)" + id = "wing_feather" + icon = 'icons/mob/sprite_accessory/wings/feathered-generic.dmi' + icon_state = "feathered" + do_colouration = 1 + legacy_use_additive_color_matrix = FALSE + +/datum/sprite_accessory/wing/feathered_medium + name = "medium feathered wings (colorable)" // Keekenox made these feathery things with a little bit more shape to them than the other wings. They are medium sized wing boys. + id = "wing_feather_medium" + icon = 'icons/mob/sprite_accessory/wings/feathered-generic.dmi' + icon_state = "feathered2" + variations = list( + SPRITE_ACCESSORY_VARIATION_SPREAD = "feathered2-spr" + ) + do_colouration = 1 + legacy_use_additive_color_matrix = FALSE + +/datum/sprite_accessory/wing/feathered_large //Made by Natje! + name = "large feathered wings (colorable)" + id = "wing_feather_large" + icon = 'icons/mob/sprite_accessory/wings/feathered-generic.dmi' + icon_state = "feathered3" + do_colouration = 1 + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/wings/feathered.dm b/code/modules/sprite_accessories/wings/feathered.dm index bdf6915e4e4d..49f477a10763 100644 --- a/code/modules/sprite_accessories/wings/feathered.dm +++ b/code/modules/sprite_accessories/wings/feathered.dm @@ -1,31 +1,10 @@ -/datum/sprite_accessory/wing/feathered - name = "feathered wings (colorable)" - id = "wing_feather" - icon_state = "feathered" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - -/datum/sprite_accessory/wing/feathered_medium - name = "medium feathered wings (colorable)" // Keekenox made these feathery things with a little bit more shape to them than the other wings. They are medium sized wing boys. - id = "wing_feather_medium" - icon_state = "feathered2" - spr_state = "feathered2_spr" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - -/datum/sprite_accessory/wing/feathered_large //Made by Natje! - name = "large feathered wings (colorable)" - id = "wing_feather_large" - icon_state = "feathered3" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY /datum/sprite_accessory/wing/harpywings name = "harpy wings (colorable)" id = "wing_harpy" icon_state = "harpywings" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE // the below two weren't my doing // check blame, it wasn't me ~silicons @@ -36,7 +15,7 @@ id = "wing_harpy_archeopterx" icon_state = "Harpywings_alt" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "Neckfur" extra_overlay2 = "Harpywings_altmarkings" @@ -45,7 +24,7 @@ id = "wing_harpy_archeopteryx2" icon_state = "harpywings_alt" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "harpywings_altmarkings" /datum/sprite_accessory/wing/harpywings_alt_neckfur @@ -53,7 +32,7 @@ id = "wing_harpy_archeopteryx3" icon_state = "harpywings_alt" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "harpywings_altmarkings" extra_overlay2 = "neckfur" @@ -62,7 +41,7 @@ id = "wing_harpy_bat2" icon_state = "harpywings_bat" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "harpywings_batmarkings" /datum/sprite_accessory/wing/harpywings_bat_neckfur @@ -70,33 +49,6 @@ id = "wing_harpy_bat_neckfur" icon_state = "harpywings_bat" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "harpywings_batmarkings" extra_overlay2 = "neckfur" - -/datum/sprite_accessory/wing/angel - name = "angel wings" - id = "angelwings" - icon_state = "angelwings" - do_colouration = TRUE - color_blend_mode = ICON_MULTIPLY - front_behind_system = TRUE - -//64x48 Wings -/datum/sprite_accessory/wing/seraph - name = "seraphim wings (colorable)" - id = "wing_seraph" - icon = 'icons/mob/sprite_accessories/wings_64x48.dmi' - icon_state = "seraph" - spr_state = "seraph_spr" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - -/datum/sprite_accessory/wing/seraph_eyes - name = "seraphim wings (colorable, eyes)" - id = "wing_serapheye" - icon = 'icons/mob/sprite_accessories/wings_64x48.dmi' - icon_state = "seraph_eye" - spr_state = "seraph_eye_spr" - //do_colouration = 1 //Maybe some day we'll allow multi-coloration and I'll make this colorable again too so the eyes can get colors. - //color_blend_mode = ICON_MULTIPLY diff --git a/code/modules/sprite_accessories/wings/insect_not_really_wings.dm b/code/modules/sprite_accessories/wings/insect_not_really_wings.dm index eb0e28cf59ec..feea047dd6b8 100644 --- a/code/modules/sprite_accessories/wings/insect_not_really_wings.dm +++ b/code/modules/sprite_accessories/wings/insect_not_really_wings.dm @@ -3,18 +3,18 @@ id = "wing_mantis_arms" icon_state = "mantis-arms" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/wing/mantis_arms_saturated name = "mantis arms (saturated)" id = "wing_mantis_arms2" icon_state = "mantis-arms_saturated" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/wing/spider_legs //Not really /WINGS/ but they protrude from the back, kinda. Might as well have them here. name = "spider legs" id = "wing_spider_legs" icon_state = "spider-legs" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/wings/misc.dm b/code/modules/sprite_accessories/wings/misc.dm index de8ffdfcd7c7..7f7d35f777bb 100644 --- a/code/modules/sprite_accessories/wings/misc.dm +++ b/code/modules/sprite_accessories/wings/misc.dm @@ -3,14 +3,14 @@ id = "wing_neckfur" icon_state = "neckfur" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/wing/nevrean name = "nevrean wings/fantail" id = "wing_nevrean_wtail" icon_state = "nevrean_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/wing/sepulchre_c_yw name = "demon wings (colorable)" diff --git a/code/modules/sprite_accessories/wings/moth.dm b/code/modules/sprite_accessories/wings/moth.dm index fb47aae413f0..5d6525018a93 100644 --- a/code/modules/sprite_accessories/wings/moth.dm +++ b/code/modules/sprite_accessories/wings/moth.dm @@ -2,14 +2,13 @@ name = "moth wings" id = "wing_moth" icon_state = "moth" - clothing_can_hide = FALSE /datum/sprite_accessory/wing/mothc name = "moth wings (colorable)" id = "wing_moth_color" icon_state = "moth" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/wing/moth_atlas name = "atlas moth wings" @@ -29,8 +28,9 @@ /datum/sprite_accessory/wing/moth_firewatch name = "firewatch moth wings" id = "wing_moth_firewatch" - icon_state = "moth_firewatch" - front_behind_system = TRUE + icon = 'icons/mob/sprite_accessory/wings/moth.dmi' + icon_state = "firewatch" + icon_sidedness = SPRITE_ACCESSORY_SIDEDNESS_FRONT_BEHIND /datum/sprite_accessory/wing/moth_full name = "moth antenna and wings" diff --git a/code/modules/sprite_accessories/wings/non_moth_insects.dm b/code/modules/sprite_accessories/wings/non_moth_insects.dm index f6ed116c6fc7..a74d7296b7ae 100644 --- a/code/modules/sprite_accessories/wings/non_moth_insects.dm +++ b/code/modules/sprite_accessories/wings/non_moth_insects.dm @@ -7,4 +7,4 @@ name = "dragonfly" id = "wing_dragonfly" icon_state = "dragonfly" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/wings/synthetic.dm b/code/modules/sprite_accessories/wings/synthetic.dm index 4157f9adbe5f..052e4e6c6458 100644 --- a/code/modules/sprite_accessories/wings/synthetic.dm +++ b/code/modules/sprite_accessories/wings/synthetic.dm @@ -3,7 +3,7 @@ id = "wing_robot1" icon_state = "Drago_wing" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE //? synth furries count diff --git a/code/modules/sprite_accessories/wings/xenomorph.dm b/code/modules/sprite_accessories/wings/xenomorph.dm index b43d2e1acc17..69069ea8822c 100644 --- a/code/modules/sprite_accessories/wings/xenomorph.dm +++ b/code/modules/sprite_accessories/wings/xenomorph.dm @@ -8,18 +8,18 @@ id = "wing_dorsal_stand" icon_state = "xenodorsal_standard" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/wing/xeno_dorsal_royal name = "Royal Dorsal tubes" id = "wing_dorsal_royal" icon_state = "xenodorsal_royal" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/wing/xeno_dorsal_down name = "Downward Dorsal tubes" id = "wing_dorsal_down" icon_state = "xenodorsal_down" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/surgery/limb_reattach.dm b/code/modules/surgery/limb_reattach.dm index ebeeec188c67..be6cf7cde02d 100644 --- a/code/modules/surgery/limb_reattach.dm +++ b/code/modules/surgery/limb_reattach.dm @@ -60,7 +60,7 @@ E.replaced(target) target.update_icons_body(FALSE) target.update_health() - target.UpdateDamageIcon() + target.update_damage_overlay() /datum/surgery_step/limb/attach/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/E = tool @@ -100,7 +100,7 @@ E.status &= ~ORGAN_CUT_AWAY target.update_icons_body() target.update_health() - target.UpdateDamageIcon() + target.update_damage_overlay() /datum/surgery_step/limb/connect/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/E = tool @@ -150,7 +150,7 @@ target.update_icons_body(FALSE) target.update_health() - target.UpdateDamageIcon() + target.update_damage_overlay() qdel(tool) diff --git a/code/modules/tgui/datum.dm b/code/modules/tgui/datum.dm index fa0530b5093c..96a04797227b 100644 --- a/code/modules/tgui/datum.dm +++ b/code/modules/tgui/datum.dm @@ -21,14 +21,20 @@ * Called on an object when a tgui object is being created, allowing you to * push various assets to tgui, for examples spritesheets. * - * todo: support typepaths * todo: support file paths * todo: this should be sent to embedding interfaces * - * return list List of asset datum instances (must be /datum/asset instance, not path) + * assets may be: + * * a /datum/asset_pack + * * typepath of a /datum/asset_pack + * + * @params + * * ui - the UI instance that's being opened + * * immediate - what assets to load before the window is opened + * * deferred - what assets to load after the window is opened */ -/datum/proc/ui_assets(mob/user) - return list() +/datum/proc/ui_asset_injection(datum/tgui/ui, list/immediate, list/deferred) + return /** * public diff --git a/code/modules/tgui/modules/atmos_control.dm b/code/modules/tgui/modules/atmos_control.dm index cb3685a6eaff..5cf3767927a4 100644 --- a/code/modules/tgui/modules/atmos_control.dm +++ b/code/modules/tgui/modules/atmos_control.dm @@ -31,10 +31,9 @@ alarm.ui_interact(usr, parent_ui = ui_ref, state = TS) return 1 -/datum/tgui_module_old/atmos_control/ui_assets(mob/user) - return list( - get_asset_datum(/datum/asset/simple/nanomaps), - ) +/datum/tgui_module_old/atmos_control/ui_asset_injection(datum/tgui/ui, list/immediate, list/deferred) + immediate += /datum/asset_pack/simple/nanomaps + return ..() /datum/tgui_module_old/atmos_control/ui_interact(mob/user, datum/tgui/ui) . = ..() diff --git a/code/modules/tgui/modules/crew_monitor.dm b/code/modules/tgui/modules/crew_monitor.dm index c7877af28a64..43188d7f96a0 100644 --- a/code/modules/tgui/modules/crew_monitor.dm +++ b/code/modules/tgui/modules/crew_monitor.dm @@ -2,10 +2,9 @@ name = "Crew monitor" tgui_id = "CrewMonitor" -/datum/tgui_module_old/crew_monitor/ui_assets(mob/user) - return list( - get_asset_datum(/datum/asset/simple/nanomaps), - ) +/datum/tgui_module_old/crew_monitor/ui_asset_injection(datum/tgui/ui, list/immediate, list/deferred) + immediate += /datum/asset_pack/simple/nanomaps + return ..() /datum/tgui_module_old/crew_monitor/ui_act(action, list/params, datum/tgui/ui) if(..()) diff --git a/code/modules/tgui/modules/specific/lathe_control.dm b/code/modules/tgui/modules/specific/lathe_control.dm index 11bac06b7df4..5b78413cb8c9 100644 --- a/code/modules/tgui/modules/specific/lathe_control.dm +++ b/code/modules/tgui/modules/specific/lathe_control.dm @@ -121,9 +121,9 @@ ui_custom_update() return TRUE -/datum/tgui_module/lathe_control/ui_assets(mob/user) - . = ..() - . += get_asset_datum(/datum/asset/spritesheet/materials) +/datum/tgui_module/lathe_control/ui_asset_injection(datum/tgui/ui, list/immediate, list/deferred) + immediate += /datum/asset_pack/spritesheet/materials + return ..() /datum/tgui_module/lathe_control/proc/ui_design_data(datum/design/design) var/list/datum/design/designs = islist(design)? design : list(design) diff --git a/code/modules/tgui/tgui.dm b/code/modules/tgui/tgui.dm index e3c594ae0e52..698529d3954d 100644 --- a/code/modules/tgui/tgui.dm +++ b/code/modules/tgui/tgui.dm @@ -117,18 +117,25 @@ // fancy = user.client.prefs.tgui_fancy, fancy = TRUE, assets = list( - get_asset_datum(/datum/asset/simple/tgui), - )) + /datum/asset_pack/simple/tgui, + ), + ) else window.send_message("ping") - var/flush_queue = window.send_asset(get_asset_datum( - /datum/asset/simple/namespaced/fontawesome)) - flush_queue |= window.send_asset(get_asset_datum( - /datum/asset/simple/namespaced/tgfont)) - for(var/datum/asset/asset in src_object.ui_assets(user)) - flush_queue |= window.send_asset(asset) + var/flush_queue = FALSE + flush_queue |= window.send_asset(/datum/asset_pack/simple/fontawesome) + flush_queue |= window.send_asset(/datum/asset_pack/simple/tgfont) + // prep assets + var/list/assets_immediate = list() + var/list/assets_deferred = list() + // fetch wanted assets + src_object.ui_asset_injection(src, assets_immediate, assets_deferred) + // send all immediate assets + for(var/datum/asset_pack/assetlike as anything in assets_immediate) + flush_queue |= window.send_asset(assetlike) + // ensure all assets are loaded before continuing if (flush_queue) - user.client.browse_queue_flush() + user.client.asset_cache_flush_browse_queue() window.send_message("update", get_payload( with_data = TRUE, with_static_data = TRUE, @@ -142,6 +149,9 @@ src_object.on_ui_open(user, src) for(var/datum/module as anything in modules_registered) module.on_ui_open(user, src, TRUE) + // now send deferred asets + for(var/datum/asset_pack/assetlike as anything in assets_deferred) + window.send_asset(assetlike) return TRUE /** @@ -216,7 +226,7 @@ * * return bool - true if an asset was actually sent */ -/datum/tgui/proc/send_asset(datum/asset/asset) +/datum/tgui/proc/send_asset(datum/asset_pack/asset) if(!window) CRASH("send_asset() was called either without calling open() first or when open() did not return TRUE.") return window.send_asset(asset) diff --git a/code/modules/tgui/tgui_window.dm b/code/modules/tgui/tgui_window.dm index 46c4750d1feb..97d3ac216487 100644 --- a/code/modules/tgui/tgui_window.dm +++ b/code/modules/tgui/tgui_window.dm @@ -16,7 +16,10 @@ var/subscriber_delegate var/fatally_errored = FALSE var/message_queue - var/sent_assets = list() + /** + * sent asset packs + */ + var/list/datum/asset_pack/sent_assets = list() // Vars passed to initialize proc (and saved for later) var/initial_strict_mode var/initial_fancy @@ -88,7 +91,8 @@ html = replacetextEx(html, "\[tgui:strictMode]", strict_mode) // Inject assets var/inline_assets_str = "" - for(var/datum/asset/asset in assets) + for(var/datum/asset_pack/asset as anything in assets) + asset = SSassets.ready_asset_pack(asset) var/mappings = asset.get_url_mappings() for(var/name in mappings) var/url = mappings[name] @@ -97,7 +101,14 @@ inline_assets_str += "Byond.loadCss('[url]', true);\n" else if(copytext(name, -3) == ".js") inline_assets_str += "Byond.loadJs('[url]', true);\n" - asset.send(client) + SSassets.send_asset_pack(client, asset) + // incase they logged out + if(!client) + return + client.asset_cache_flush_browse_queue() // flush their assets + // incase they logged out + if(!client) + return if(length(inline_assets_str)) inline_assets_str = "\n" html = replacetextEx(html, "\n", inline_assets_str) @@ -114,6 +125,9 @@ html = replacetextEx(html, "", inline_css) // Open the window client << browse(html, "window=[id];[options]") + // incase they logged out + if(!client) + return // Detect whether the control is a browser is_browser = winexists(client, id) == "BROWSER" // Instruct the client to signal UI when the window is closed. @@ -290,14 +304,15 @@ * * return bool - TRUE if any assets had to be sent to the client */ -/datum/tgui_window/proc/send_asset(datum/asset/asset) +/datum/tgui_window/proc/send_asset(datum/asset_pack/asset) + asset = SSassets.ready_asset_pack(asset) if(!client || !asset) return - sent_assets |= list(asset) - . = asset.send(client) - if(istype(asset, /datum/asset/spritesheet)) - var/datum/asset/spritesheet/spritesheet = asset - send_message("asset/stylesheet", spritesheet.css_filename()) + sent_assets |= asset + . = SSassets.send_asset_pack(client, asset) + if(istype(asset, /datum/asset_pack/spritesheet)) + var/datum/asset_pack/spritesheet/spritesheet = asset + send_message("asset/stylesheet", spritesheet.get_css_url()) send_raw_message(asset.get_serialized_url_mappings()) /** diff --git a/code/modules/tgui_panel/tgui_panel.dm b/code/modules/tgui_panel/tgui_panel.dm index adb201c618ea..806b5e6b0523 100644 --- a/code/modules/tgui_panel/tgui_panel.dm +++ b/code/modules/tgui_panel/tgui_panel.dm @@ -46,12 +46,11 @@ // Perform a clean initialization window.initialize( strict_mode = TRUE, - assets = list( - get_asset_datum(/datum/asset/simple/tgui_panel), - )) - window.send_asset(get_asset_datum(/datum/asset/simple/namespaced/fontawesome)) - window.send_asset(get_asset_datum(/datum/asset/simple/namespaced/tgfont)) - window.send_asset(get_asset_datum(/datum/asset/spritesheet/chat)) + assets = list(/datum/asset_pack/simple/tgui_panel), + ) + window.send_asset(/datum/asset_pack/simple/fontawesome) + window.send_asset(/datum/asset_pack/simple/tgfont) + window.send_asset(/datum/asset_pack/spritesheet/chat) // Other setup request_telemetry() addtimer(CALLBACK(src, PROC_REF(on_initialize_timed_out)), 5 SECONDS) diff --git a/code/modules/tooltip/tooltip.dm b/code/modules/tooltip/tooltip.dm index ece092bb29bc..17d69a956648 100644 --- a/code/modules/tooltip/tooltip.dm +++ b/code/modules/tooltip/tooltip.dm @@ -40,14 +40,15 @@ Notes: /datum/tooltip/New(client/C) - if (C) - owner = C - var/datum/asset/stuff = get_asset_datum(/datum/asset/simple/jquery) - stuff.send(owner) - owner << browse(file2text('code/modules/tooltip/tooltip.html'), "window=[control]") - - ..() + if(!C) + return + owner = C + addtimer(CALLBACK(src, PROC_REF(init)), 0) +/datum/tooltip/proc/init() + var/datum/asset_pack/stuff = SSassets.ready_asset_pack(/datum/asset_pack/simple/jquery) + SSassets.send_asset_pack(owner, stuff) + owner << browse(file2text('code/modules/tooltip/tooltip.html'), "window=[control]") /datum/tooltip/proc/show(atom/movable/thing, params = null, title = null, content = null, theme = "default", special = "none") if (!thing || !params || (!title && !content) || !owner || !isnum(world.icon_size)) @@ -84,7 +85,6 @@ Notes: return TRUE - /datum/tooltip/proc/hide() queueHide = showing ? TRUE : FALSE diff --git a/code/modules/unit_tests/mob/inventory.dm b/code/modules/unit_tests/mob/inventory.dm index 633a8de4f5bc..0406845779f4 100644 --- a/code/modules/unit_tests/mob/inventory.dm +++ b/code/modules/unit_tests/mob/inventory.dm @@ -1,7 +1,7 @@ /datum/unit_test/inventory_slot_meta_uniqueness/Run() var/list/found = list() - for(var/path in subtypesof(/datum/inventory_slot_meta)) - var/datum/inventory_slot_meta/meta = path + for(var/path in subtypesof(/datum/inventory_slot)) + var/datum/inventory_slot/meta = path if(initial(meta.abstract_type) == path) continue if(initial(meta.inventory_slot_flags) & INV_SLOT_ALLOW_RANDOM_ID) diff --git a/code/modules/unit_tests/mob/sprite_accessories.dm b/code/modules/unit_tests/mob/sprite_accessories.dm index ba2b7edd4dab..9501931fe0ee 100644 --- a/code/modules/unit_tests/mob/sprite_accessories.dm +++ b/code/modules/unit_tests/mob/sprite_accessories.dm @@ -2,9 +2,6 @@ var/list/ids = list() var/list/names_hair = list() var/list/names_beard = list() - var/list/names_tail = list() - var/list/names_wing = list() - var/list/names_ear = list() var/list/names_marking = list() for(var/path in subtypesof(/datum/sprite_accessory)) var/datum/sprite_accessory/S = path @@ -29,21 +26,6 @@ Fail("duplciate name [S.name] on [path] against [names_beard[S.name]:type]") else names_beard[S.name] = S - else if(istype(S, /datum/sprite_accessory/wing)) - if(names_wing[S.name]) - Fail("duplciate name [S.name] on [path] against [names_wing[S.name]:type]") - else - names_wing[S.name] = S - else if(istype(S, /datum/sprite_accessory/ears)) - if(names_ear[S.name]) - Fail("duplciate name [S.name] on [path] against [names_ear[S.name]:type]") - else - names_ear[S.name] = S - else if(istype(S, /datum/sprite_accessory/tail)) - if(names_tail[S.name]) - Fail("duplciate name [S.name] on [path] against [names_tail[S.name]:type]") - else - names_tail[S.name] = S else if(istype(S, /datum/sprite_accessory/marking)) if(names_marking[S.name]) Fail("duplciate name [S.name] on [path] against [names_marking[S.name]:type]") diff --git a/code/modules/unit_tests/wallmounted_obj_dirs/cameras.dm b/code/modules/unit_tests/wallmounted_obj_dirs/cameras.dm deleted file mode 100644 index cf510ae99e53..000000000000 --- a/code/modules/unit_tests/wallmounted_obj_dirs/cameras.dm +++ /dev/null @@ -1,10 +0,0 @@ -/datum/unit_test/camera_direction/Run() - var/list/bad_cameras - for(var/obj/machinery/camera/C in world) - if((C.dir == NORTHWEST || SOUTHWEST || NORTHEAST || NORTHWEST) || (C.dir != NORTH||SOUTH||EAST||WEST)) //specifically checking for non NESW dirs.. - bad_cameras[C] = list("X"=C.x, "Y"=C.y, "Z"=C.z, "A"=C.loc.loc) // loc.loc is a lazy way of getting an area. - if(length(bad_cameras)) - TEST_FAIL("One or more cameras had a non-cardinal direction!") - for(var/obj/I in bad_cameras) - TEST_FAIL("[I] at X [bad_cameras[I]["X"]] Y [bad_cameras[I]["Y"]] Z [bad_cameras[I]["Z"]] in area [bad_cameras[I]["A"]]") - Fail("There were [length(bad_cameras)] cameras with non-cardinal directions.") diff --git a/code/modules/unit_tests/wallmounted_obj_dirs/fire_alarms.dm b/code/modules/unit_tests/wallmounted_obj_dirs/fire_alarms.dm deleted file mode 100644 index 5e17b8d2e28a..000000000000 --- a/code/modules/unit_tests/wallmounted_obj_dirs/fire_alarms.dm +++ /dev/null @@ -1,10 +0,0 @@ -/datum/unit_test/fire_alarm_direction/proc/Run() - var/list/bad_alarms - for(var/obj/machinery/firealarm/C in world) - if((C.dir == NORTHWEST || SOUTHWEST || NORTHEAST || NORTHWEST) || (C.dir != NORTH||SOUTH||EAST||WEST)) //specifically checking for non NESW dirs.. - bad_alarms[C] = list("X"=C.x, "Y"=C.y, "Z"=C.z, "A"=C.loc.loc) // loc.loc is a lazy way of getting an area. - if(length(bad_alarms)) - TEST_FAIL("One or more alarms had a non-cardinal direction!") - for(var/obj/I in bad_alarms) - TEST_FAIL("[I] at X [bad_alarms[I]["X"]] Y [bad_alarms[I]["Y"]] Z [bad_alarms[I]["Z"]] in area [bad_alarms[I]["A"]]") - Fail("There were [length(bad_alarms)] alarms with non-cardinal directions.") diff --git a/code/modules/vehicles_legacy/vehicle.dm b/code/modules/vehicles_legacy/vehicle.dm index 407517dfe821..8e5b29152079 100644 --- a/code/modules/vehicles_legacy/vehicle.dm +++ b/code/modules/vehicles_legacy/vehicle.dm @@ -173,10 +173,6 @@ /obj/vehicle_old/attack_ai(mob/user as mob) return -// For downstream compatibility (in particular Paradise) -/obj/vehicle_old/proc/handle_rotation() - return - //------------------------------------------- // Vehicle procs //------------------------------------------- diff --git a/code/modules/vore/appearance/update_icons_vr.dm b/code/modules/vore/appearance/update_icons_vr.dm deleted file mode 100644 index d68d6c63ca59..000000000000 --- a/code/modules/vore/appearance/update_icons_vr.dm +++ /dev/null @@ -1,92 +0,0 @@ -var/global/list/wing_icon_cache = list() - -/mob/living/carbon/human/proc/get_ears_overlay() - if(ear_style && !(head && (head.inv_hide_flags & BLOCKHEADHAIR))) - var/icon/ears_s = new/icon("icon" = ear_style.icon, "icon_state" = ear_style.icon_state) - if(ear_style.do_colouration) - ears_s.Blend(rgb(src.r_ears, src.g_ears, src.b_ears), ear_style.color_blend_mode) - - if(ear_style.extra_overlay) - var/icon/overlay = new/icon("icon" = ear_style.icon, "icon_state" = ear_style.extra_overlay) - overlay.Blend(rgb(src.r_ears2, src.g_ears2, src.b_ears2), ear_style.color_blend_mode) - ears_s.Blend(overlay, ICON_OVERLAY) - qdel(overlay) - - if(ear_style.extra_overlay2) //MORE COLOURS IS BETTERER - var/icon/overlay = new/icon("icon" = ear_style.icon, "icon_state" = ear_style.extra_overlay2) - overlay.Blend(rgb(src.r_ears3, src.g_ears3, src.b_ears3), ear_style.color_blend_mode) - ears_s.Blend(overlay, ICON_OVERLAY) - qdel(overlay) - - return ears_s - return null - -/mob/living/carbon/human/proc/get_horns_overlay() - if(horn_style && !(head && (head.inv_hide_flags & BLOCKHEADHAIR))) - var/icon/horn_s = new/icon("icon" = horn_style.icon, "icon_state" = horn_style.icon_state) - if(horn_style.do_colouration) - horn_s.Blend(rgb(src.r_horn, src.g_horn, src.b_horn), horn_style.color_blend_mode) - - if(horn_style.extra_overlay) - var/icon/overlay = new/icon("icon" = horn_style.icon, "icon_state" = horn_style.extra_overlay) - overlay.Blend(rgb(src.r_horn2, src.g_horn2, src.b_horn2), horn_style.color_blend_mode) - horn_s.Blend(overlay, ICON_OVERLAY) - qdel(overlay) - - if(horn_style.extra_overlay2) - var/icon/overlay = new/icon("icon" = horn_style.icon, "icon_state" = horn_style.extra_overlay2) - overlay.Blend(rgb(src.r_horn3, src.g_horn3, src.b_horn3), horn_style.color_blend_mode) - horn_s.Blend(overlay, ICON_OVERLAY) - qdel(overlay) - - return horn_s - return null - -/mob/living/carbon/human/proc/get_tail_image(front) - //If you are FBP with tail style and didn't set a custom one - var/datum/robolimb/model = isSynthetic() - if(istype(model) && model.includes_tail && !tail_style) - var/icon/tail_s = new/icon("icon" = synthetic.icon, "icon_state" = "tail") - if(species.color_force_greyscale) - tail_s.MapColors(arglist(color_matrix_greyscale())) - tail_s.Blend(rgb(src.r_skin, src.g_skin, src.b_skin), species.color_mult ? ICON_MULTIPLY : ICON_ADD) - return image(tail_s) - - //If you have a custom tail selected - if(tail_style && !(wear_suit && wear_suit.inv_hide_flags & HIDETAIL && !isTaurTail(tail_style))) - var/base_state = wagging && tail_style.ani_state ? tail_style.ani_state : tail_style.icon_state - if(tail_style.front_behind_system) - base_state += front? "_FRONT" : "_BEHIND" - var/icon/tail_s = new/icon("icon" = tail_style.icon, "icon_state" = base_state) - if(tail_style.do_colouration) - tail_s.Blend(rgb(src.r_tail, src.g_tail, src.b_tail), tail_style.color_blend_mode) - if(tail_style.extra_overlay) - var/extra_overlay_state = tail_style.front_behind_system ? "[tail_style.extra_overlay][front ? "_FRONT" : "_BEHIND"]" : tail_style.extra_overlay - var/icon/overlay = new/icon("icon" = tail_style.icon, "icon_state" = extra_overlay_state) - if(wagging && tail_style.ani_state) - overlay = new/icon("icon" = tail_style.icon, "icon_state" = tail_style.extra_overlay_w) - overlay.Blend(rgb(src.r_tail2, src.g_tail2, src.b_tail2), tail_style.color_blend_mode) - tail_s.Blend(overlay, ICON_OVERLAY) - qdel(overlay) - else - overlay.Blend(rgb(src.r_tail2, src.g_tail2, src.b_tail2), tail_style.color_blend_mode) - tail_s.Blend(overlay, ICON_OVERLAY) - qdel(overlay) - - if(tail_style.extra_overlay2) - var/icon/overlay = new/icon("icon" = tail_style.icon, "icon_state" = tail_style.extra_overlay2) - if(wagging && tail_style.ani_state) - overlay = new/icon("icon" = tail_style.icon, "icon_state" = tail_style.extra_overlay2_w) - overlay.Blend(rgb(src.r_tail3, src.g_tail3, src.b_tail3), tail_style.color_blend_mode) - tail_s.Blend(overlay, ICON_OVERLAY) - qdel(overlay) - else - overlay.Blend(rgb(src.r_tail3, src.g_tail3, src.b_tail3), tail_style.color_blend_mode) - tail_s.Blend(overlay, ICON_OVERLAY) - qdel(overlay) - - if(isTaurTail(tail_style)) - return image(tail_s, "pixel_x" = -16) - else - return image(tail_s) - return null diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm index 73bc3e8c5c53..76b11ed93417 100644 --- a/code/modules/vore/eating/living_vr.dm +++ b/code/modules/vore/eating/living_vr.dm @@ -23,7 +23,6 @@ var/absorbing_prey = 0 // Determines if the person is using the succubus drain or not. See station_special_abilities_vr. var/drain_finalized = 0 // Determines if the succubus drain will be KO'd/absorbed. Can be toggled on at any time. var/fuzzy = 1 // Preference toggle for sharp/fuzzy icon. - var/tail_alt = 0 // Tail layer toggle. var/permit_healbelly = TRUE var/can_be_drop_prey = FALSE var/can_be_drop_pred = TRUE // Mobs are pred by default. diff --git a/code/modules/vore/eating/transforming_vr.dm b/code/modules/vore/eating/transforming_vr.dm index e2e9cf614c08..2519eceb39e4 100644 --- a/code/modules/vore/eating/transforming_vr.dm +++ b/code/modules/vore/eating/transforming_vr.dm @@ -119,7 +119,7 @@ M.g_tail = O.g_tail M.b_tail = O.b_tail M.tail_style = O.tail_style - M.update_tail_showing() + M.render_spriteacc_tail() if(message) to_chat(M, "Your body tingles all over...") to_chat(O, "You tingle as you make noticeable changes to your captive's body.") @@ -137,7 +137,7 @@ return M.tail_style = O.tail_style - M.update_tail_showing() + M.render_spriteacc_tail() if(message) to_chat(M, "Your body tingles all over...") to_chat(O, "You tingle as you make noticeable changes to your captive's body.") @@ -162,7 +162,7 @@ M.g_wing = O.g_wing M.b_wing = O.b_wing M.wing_style = O.wing_style - M.update_wing_showing() + M.render_spriteacc_wings() if(message) to_chat(M, "Your body tingles all over...") to_chat(O, "You tingle as you make noticeable changes to your captive's body.") @@ -180,7 +180,7 @@ return M.wing_style = O.wing_style - M.update_wing_showing() + M.render_spriteacc_wings() if(message) to_chat(M, "Your body tingles all over...") to_chat(O, "You tingle as you make noticeable changes to your captive's body.") @@ -232,7 +232,7 @@ M.custom_species = O.custom_species M.update_icons_body() - M.update_tail_showing() + M.render_spriteacc_tail() if(backup_implants.len) var/obj/item/organ/external/torso = M.get_organ(BP_TORSO) diff --git a/code/modules/vore/fluffstuff/custom_guns.dm b/code/modules/vore/fluffstuff/custom_guns.dm index c954adbe360e..a95627f6da8e 100644 --- a/code/modules/vore/fluffstuff/custom_guns.dm +++ b/code/modules/vore/fluffstuff/custom_guns.dm @@ -55,6 +55,17 @@ slot_flags = SLOT_BACK one_handed_penalty = 60 // The weapon itself is heavy +/obj/item/gun/ballistic/automatic/battlerifle/update_icon() + . = ..() + update_held_icon() + +/obj/item/gun/ballistic/automatic/battlerifle/update_icon_state() + . = ..() + if(istype(ammo_magazine,/obj/item/ammo_magazine/m95)) + icon_state = "battlerifle" + else + icon_state = (ammo_magazine)? "battlerifle" : "battlerifle_empty" + // For general use /obj/item/gun/ballistic/shotgun/pump/JSDF name = "\improper JSDF tactical shotgun" diff --git a/code/modules/vore/fluffstuff/life_crystals.dm b/code/modules/vore/fluffstuff/life_crystals.dm index 1dcb4b135d94..3e2c78e853e7 100644 --- a/code/modules/vore/fluffstuff/life_crystals.dm +++ b/code/modules/vore/fluffstuff/life_crystals.dm @@ -41,8 +41,8 @@ to_chat(user, "The [name] doesn't do anything.") return 0 - owner = user //We're paired to this guy - owner_c = user.client //This is his client + owner = user //We're paired to this person + owner_c = user.client //This is their client update_state(1) to_chat(user, "The [name] glows pleasantly blue.") START_PROCESSING(SSobj, src) @@ -51,9 +51,10 @@ //He's dead, jim if(state < 1) return - if(!owner)//How did we get here? + if(!owner && !owner_c) //How did we get here? + //It's likely because the owner got gibbed. But if it truly bugged out, there'd be no client. return - if((owner.stat == DEAD) || (get_turf(owner) != get_turf(src))) + if((!owner && owner_c) || (owner.stat == DEAD) || (get_turf(owner) != get_turf(src))) if(state == 1) become_alert() if((state == 2) && (last_vitals < world.time - 1 MINUTE)) diff --git a/code/modules/vore/lick_wounds.dm b/code/modules/vore/lick_wounds.dm index b2baf7cd2338..78625be23ef3 100644 --- a/code/modules/vore/lick_wounds.dm +++ b/code/modules/vore/lick_wounds.dm @@ -74,5 +74,5 @@ W.salve() W.bandage() W.disinfect() - H.UpdateDamageIcon() + H.update_damage_overlay() playsound(src, 'sound/effects/ointment.ogg', 25) diff --git a/code/modules/vore/resizing/resize_vr.dm b/code/modules/vore/resizing/resize_vr.dm index f68b066ad1df..c41814e56572 100644 --- a/code/modules/vore/resizing/resize_vr.dm +++ b/code/modules/vore/resizing/resize_vr.dm @@ -82,12 +82,12 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2 /mob/living/carbon/human/resize(var/new_size, var/animate = TRUE) . = ..() - if(LAZYLEN(hud_list)) - var/new_y_offset = (size_multiplier < 1 ? 27 : 32) * (size_multiplier - 1) + if(atom_huds) //it lowers lesser than it raises when it comes to micros v. macros else the medHUD would bury the micro - for(var/key in hud_list) - var/image/HI = hud_list[key] - HI.pixel_y = new_y_offset + var/new_y_offset = (size_multiplier < 1 ? 27 : 32) * (size_multiplier - 1) + for(var/id in atom_huds) + var/image/image = atom_huds[id] + image.pixel_y = new_y_offset // Optimize mannequins - never a point to animating or doing HUDs on these. /mob/living/carbon/human/dummy/mannequin/resize(var/new_size, var/animate = TRUE) @@ -200,14 +200,14 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2 /mob/living/proc/inform_someone_you_just_stepped_over_them(mob/living/micro) var/mob/living/carbon/human/H - var/datum/sprite_accessory/tail/taur/tail + var/datum/sprite_accessory/tail/legacy_taur/tail tail = ishuman(src)? ((H = src) && isTaurTail(H.tail_style) && H.tail_style) : null to_chat(src, tail? STEP_TEXT_OWNER_NON_SHITCODE(tail.msg_owner_help_run, micro) : "You carefully step over [micro].") to_chat(micro, tail? STEP_TEXT_PREY_NON_SHITCODE(tail.msg_prey_help_run, src) : "[src] carefully steps over you.") /mob/living/proc/inform_someone_they_just_ran_under_you(mob/living/micro) var/mob/living/carbon/human/H - var/datum/sprite_accessory/tail/taur/tail + var/datum/sprite_accessory/tail/legacy_taur/tail tail = ishuman(src)? ((H = src) && isTaurTail(H.tail_style) && H.tail_style) : null to_chat(micro, tail? STEP_TEXT_OWNER_NON_SHITCODE(tail.msg_prey_stepunder, src) : "You run between [src]'s legs.") to_chat(src, tail? STEP_TEXT_PREY_NON_SHITCODE(tail.msg_owner_stepunder, micro) : "[micro] runs between your legs.") @@ -226,7 +226,7 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2 if(isliving(AM)) var/fetish_content_check = stupid_fucking_micro_canpass_fetish_check(mover) var/mob/living/carbon/human/H - var/datum/sprite_accessory/tail/taur/tail + var/datum/sprite_accessory/tail/legacy_taur/tail switch(fetish_content_check) if(NEITHER_OF_US_ARE_FETISH_CONTENT, WE_ARE_BOTH_MICROS) return @@ -329,7 +329,7 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2 //Human with taur tail, special messages are sent else - var/datum/sprite_accessory/tail/taur/tail = H.tail_style + var/datum/sprite_accessory/tail/legacy_taur/tail = H.tail_style to_chat(src,STEP_TEXT_OWNER("[tail.msg_owner_disarm_run]")) to_chat(tmob,STEP_TEXT_PREY("[tail.msg_prey_disarm_run]")) @@ -351,7 +351,7 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2 //Human with taur tail, special messages are sent else - var/datum/sprite_accessory/tail/taur/tail = H.tail_style + var/datum/sprite_accessory/tail/legacy_taur/tail = H.tail_style to_chat(src,STEP_TEXT_OWNER("[tail.msg_owner_disarm_walk]")) to_chat(tmob,STEP_TEXT_PREY("[tail.msg_prey_disarm_walk]")) @@ -383,7 +383,7 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2 //Human with taur tail, special messages are sent else - var/datum/sprite_accessory/tail/taur/tail = H.tail_style + var/datum/sprite_accessory/tail/legacy_taur/tail = H.tail_style to_chat(src,STEP_TEXT_OWNER("[tail.msg_owner_harm_run]")) to_chat(tmob,STEP_TEXT_PREY("[tail.msg_prey_harm_run]")) @@ -417,7 +417,7 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2 //Human with taur tail, special messages are sent else - var/datum/sprite_accessory/tail/taur/tail = H.tail_style + var/datum/sprite_accessory/tail/legacy_taur/tail = H.tail_style to_chat(src,STEP_TEXT_OWNER("[tail.msg_owner_harm_walk]")) to_chat(tmob,STEP_TEXT_PREY("[tail.msg_prey_harm_walk]")) @@ -450,14 +450,14 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2 //Human, taur, shoes = no grab, special message else if(H.shoes) - var/datum/sprite_accessory/tail/taur/tail = H.tail_style + var/datum/sprite_accessory/tail/legacy_taur/tail = H.tail_style to_chat(src,STEP_TEXT_OWNER("[tail.msg_owner_grab_fail]")) to_chat(tmob,STEP_TEXT_PREY("[tail.msg_prey_grab_fail]")) add_attack_logs(src,tmob,"Grabbed underfoot (taur, shoes)") //Human, taur, no shoes = yes grab, special message else - var/datum/sprite_accessory/tail/taur/tail = H.tail_style + var/datum/sprite_accessory/tail/legacy_taur/tail = H.tail_style to_chat(src,STEP_TEXT_OWNER("[tail.msg_owner_grab_success]")) to_chat(tmob,STEP_TEXT_PREY("[tail.msg_prey_grab_success]")) equip_to_slot_if_possible(tmob.get_scooped(H), SLOT_ID_SHOES, INV_OP_SILENT) diff --git a/config/entries/general.txt b/config/entries/general.txt index 087eb4531a45..eccbea9f051c 100644 --- a/config/entries/general.txt +++ b/config/entries/general.txt @@ -30,13 +30,6 @@ CLIENT_ERROR_MESSAGE Your version of byond is not supported. Please upgrade. ## The minimum build needed for joining the server, if using 512, a good minimum build would be 1421 as that disables the Middle Mouse Button exploit. CLIENT_ERROR_BUILD 1421 -## Assets can opt-in to caching their results into `tmp`. -## This is important, as preferences assets take upwards of 30 seconds (without sleeps) to collect. -## The cache is assumed to be cleared by TGS recompiling, which deletes `tmp`. -## This should be disabled (through `CACHE_ASSETS 0`) on development, -## but enabled on production (the default). -CACHE_ASSETS 0 - ## Set to 0 to disable admins being able to have snowflake OOC colors ALLOW_ADMIN_OOCCOLOR diff --git a/config/entries/resources.txt b/config/entries/resources.txt index 909bef0809db..62d860863a43 100644 --- a/config/entries/resources.txt +++ b/config/entries/resources.txt @@ -3,8 +3,7 @@ # If you set this mutiple times, the server will rotate between the links. # To use this, the compile option PRELOAD_RSC must be set to 0 to keep byond from preloading resources -EXTERNAL_RSC_URLS http://tgstation13.download/byond/tgstationv2.zip - +#EXTERNAL_RSC_URLS http://tgstation13.download/byond/tgstationv2.zip ######################## # Browser Asset Config # @@ -16,23 +15,27 @@ EXTERNAL_RSC_URLS http://tgstation13.download/byond/tgstationv2.zip # The normal way of getting assets to clients is to use the internal byond system. This can be slow and delay the opening of interface windows. It also doesn't allow the internal IE windows byond uses to cache anything. # You can instead have the server save them to a website via a folder within the game server that the web server can read. This could be a simple webserver or something backed by a CDN. # Valid values: simple, webroot. Simple is the default. -#ASSET_TRANSPORT webroot +#ASSET_TRANSPORT webroot -# Simple asset transport configurable values. +## Simple asset transport configurable values. ## # Uncomment this to have the server passively send all browser assets to each client in the background. (instead of waiting for them to be needed) # This should be uncommented in production and commented in development -#ASSET_SIMPLE_PRELOAD +#ASSET_SIMPLE_PRELOAD -# Webroot asset transport configurable values. +## Webroot asset transport configurable values. ## # Local folder to save assets to. # Assets will be saved in the format of asset.MD5HASH.EXT or in namespaces/hash/ as ASSET_FILE_NAME or asset.MD5HASH.EXT -#ASSET_CDN_WEBROOT data/asset-store/ +# Do not add a / at the end. + +#ASSET_CDN_WEBROOT data/asset-store # URL the folder from above can be accessed from. # for best results the webserver powering this should return a long cache validity time, as all assets sent via this transport use hash based urls # if you want to test this locally, you simpily run the `localhost-asset-webroot-server.py` python3 script to host assets stored in `data/asset-store/` via http://localhost:58715/ -#ASSET_CDN_URL http://localhost:58715/ +# Do not add a / at the end. + +#ASSET_CDN_URL http://localhost:58715 diff --git a/dependencies.sh b/dependencies.sh index bb4090709ee1..10a3db7a4105 100755 --- a/dependencies.sh +++ b/dependencies.sh @@ -7,8 +7,8 @@ #Final authority on what's required to fully build the project # byond version -export BYOND_MAJOR=514 -export BYOND_MINOR=1588 +export BYOND_MAJOR=515 +export BYOND_MINOR=1636 #rust_g git tag export RUST_G_VERSION=3.0.0-experimental-graph-ops diff --git a/donator/djkouta/donator_cloak.dm b/fluff/donator/djkouta/donator_cloak.dm similarity index 82% rename from donator/djkouta/donator_cloak.dm rename to fluff/donator/djkouta/donator_cloak.dm index 768267498092..3a16b7620e24 100644 --- a/donator/djkouta/donator_cloak.dm +++ b/fluff/donator/djkouta/donator_cloak.dm @@ -5,5 +5,5 @@ ckeywhitelist = list("djkouta") /obj/item/clothing/accessory/kouta_cloak - icon = 'donator/djkouta/donator_cloak.dmi' + icon = 'fluff/donator/djkouta/donator_cloak.dmi' icon_state = "slimecloak" diff --git a/donator/djkouta/donator_cloak.dmi b/fluff/donator/djkouta/donator_cloak.dmi similarity index 100% rename from donator/djkouta/donator_cloak.dmi rename to fluff/donator/djkouta/donator_cloak.dmi diff --git a/donator/legacy.dm b/fluff/donator/legacy.dm similarity index 99% rename from donator/legacy.dm rename to fluff/donator/legacy.dm index 00caf02bcda5..d3e3bd967982 100644 --- a/donator/legacy.dm +++ b/fluff/donator/legacy.dm @@ -44,7 +44,7 @@ /datum/loadout_entry/donator/stripedcollar name = "Striped collar" - slot = /datum/inventory_slot_meta/abstract/attach_as_accessory + slot = /datum/inventory_slot/abstract/attach_as_accessory path = /obj/item/clothing/accessory/collar/donator/striped ckeywhitelist = list("jademanique") diff --git a/donator/timothytea/donator_bedsheet.dm b/fluff/donator/timothytea/donator_bedsheet.dm similarity index 79% rename from donator/timothytea/donator_bedsheet.dm rename to fluff/donator/timothytea/donator_bedsheet.dm index 44fae7fd3410..1faac7b9674a 100644 --- a/donator/timothytea/donator_bedsheet.dm +++ b/fluff/donator/timothytea/donator_bedsheet.dm @@ -1,5 +1,5 @@ /obj/item/bedsheet/donator_teak - icon = 'donator/timothytea/donator_bedsheet.dmi' + icon = 'fluff/donator/timothytea/donator_bedsheet.dmi' icon_state = "teaksheet" /datum/loadout_entry/donator/teak_bedsheet diff --git a/donator/timothytea/donator_bedsheet.dmi b/fluff/donator/timothytea/donator_bedsheet.dmi similarity index 100% rename from donator/timothytea/donator_bedsheet.dmi rename to fluff/donator/timothytea/donator_bedsheet.dmi diff --git a/donator/unclebourbon/pmc_mask.dm b/fluff/donator/unclebourbon/pmc_mask.dm similarity index 90% rename from donator/unclebourbon/pmc_mask.dm rename to fluff/donator/unclebourbon/pmc_mask.dm index 1cb54e2ce0e9..e006fd07b261 100644 --- a/donator/unclebourbon/pmc_mask.dm +++ b/fluff/donator/unclebourbon/pmc_mask.dm @@ -1,7 +1,7 @@ /obj/item/clothing/mask/gas/clear/donator_pmc name = "\improper PMC gas mask" desc = "A rugged black gas mask with red lenses." - icon = 'donator/unclebourbon/pmc_mask.dmi' + icon = 'fluff/donator/unclebourbon/pmc_mask.dmi' icon_state = "pmc" worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL | WORN_RENDER_INHAND_ALLOW_DEFAULT inhand_default_type = INHAND_DEFAULT_ICON_MASKS diff --git a/donator/unclebourbon/pmc_mask.dmi b/fluff/donator/unclebourbon/pmc_mask.dmi similarity index 100% rename from donator/unclebourbon/pmc_mask.dmi rename to fluff/donator/unclebourbon/pmc_mask.dmi diff --git a/fluff/plushies/plushies.dm b/fluff/plushies/plushies.dm new file mode 100644 index 000000000000..af4b01a86278 --- /dev/null +++ b/fluff/plushies/plushies.dm @@ -0,0 +1,74 @@ +/obj/item/toy/plushie/snowflake + icon = 'fluff/plushies/plushies.dmi' + /// Name of the player the plushie resembles + var/player_name + +/obj/item/toy/plushie/snowflake/catharsis + name = "red lizard plushie" + desc = "A red lizard plushie! Something seems strangely off about this lizard, though." + icon_state = "catharsis" + pokephrase = "Hiss!" + player_name = "Catharsis" + +/obj/item/toy/plushie/snowflake/evanne + name = "tajaran plushie" + desc = "A pirate tajaran plushie! This one has a lot of wires sticking out." + icon_state = "evanne" + pokephrase = "Mrowl!" + player_name = "Evanne" + +/obj/item/toy/plushie/snowflake/kadence + name = "human plushie" + desc = "A human plushie. This one resembles a scientist." + icon_state = "kadence" + pokephrase = "Human Noise!" + player_name = "Kadence" + +/obj/item/toy/plushie/snowflake/habiki + name = "green synth plushie" + desc = "A green synth plushie. It makes a happy beep when hugged." + icon_state = "habiki" + pokephrase = "Beep!" + player_name = "Habiki" + +/obj/item/toy/plushie/snowflake/eden + name = "wolf plushie" + desc = "A cute wolf plushie. It doesn't bite, right?" + icon_state = "eden" + pokephrase = "Awoo!" + player_name = "Eden" + +/obj/item/toy/plushie/snowflake/wisk + name = "saguar plushie" + desc = "A cute saguar plushie. It looks incredibly squishable." + icon_state = "wisk" + pokephrase = "Yippee!" + player_name = "Wisk" + +/obj/item/toy/plushie/snowflake/kari + name = "wolf plushie" + desc = "A wolf plushie. This one looks like it could beat you up." + icon_state = "kari" + pokephrase = "Gecker!" + player_name = "Kari" + +/obj/item/toy/plushie/snowflake/trubus + name = "blue dragon plushie" + desc = "A blue dragon plushie. It radiates an aura of justice." + icon_state = "trubus" + pokephrase = "Roar!" + player_name = "Trubus" + +/obj/item/toy/plushie/snowflake/charlotte + name = "pathfinder plushie" + desc = "A pathfinder plushie. This one has holographic wings on its back! Batteries not included." + icon_state = "charlotte" + pokephrase = "" // "what noise do humans make" puzzled me for 5 minutes then i gave up + player_name = "Charlotte" + +/obj/item/toy/plushie/snowflake/leas + name = "teshari plushie" + desc = "A teshari plushie. It doesn't look happy about being picked up." + icon_state = "tesh" + pokephrase = "Prbt!" + player_name = "Leas" diff --git a/fluff/plushies/plushies.dmi b/fluff/plushies/plushies.dmi new file mode 100644 index 000000000000..245252aaff20 Binary files /dev/null and b/fluff/plushies/plushies.dmi differ diff --git a/html/images/loading.gif b/html/images/loading.gif deleted file mode 100644 index 6ec34d41709c..000000000000 Binary files a/html/images/loading.gif and /dev/null differ diff --git a/html/images/ntlogo.png b/html/images/ntlogo.png deleted file mode 100644 index d5614a964eef..000000000000 Binary files a/html/images/ntlogo.png and /dev/null differ diff --git a/html/images/paper_bg.png b/html/images/paper_bg.png deleted file mode 100644 index b5e68f35abd9..000000000000 Binary files a/html/images/paper_bg.png and /dev/null differ diff --git a/html/images/sglogo.png b/html/images/sglogo.png deleted file mode 100644 index 930a0c4a5e0a..000000000000 Binary files a/html/images/sglogo.png and /dev/null differ diff --git a/html/images/talisman.png b/html/images/talisman.png deleted file mode 100644 index 0ece637314a0..000000000000 Binary files a/html/images/talisman.png and /dev/null differ diff --git a/icons/README.md b/icons/README.md index f03be528e5ba..29507811d3e8 100644 --- a/icons/README.md +++ b/icons/README.md @@ -28,6 +28,12 @@ Yes, this currently includes all turfs, mobs, objs, and misc things. Sorry. We'l - /helpers - mapping helpers like autopipe/autocable/baseturf replacers go here - /landmarks - landmark icons - /spawners - things like window spawners + - /mob - mob sprites + - /bodysets - limbs and their corrosponding sprite accessories & markings & miscellaneous. + used in the abstraction of limb sprite from limb definition. + - /sprite_accessories - unconverted sprite accessories + - /sprite_accessory - modern sprite accessory system + - /modules - used for specific departments / content packs / logical bundles - /{modulename} - the examples before are just that, examples. some modules will require different styles of icon organization. - /items - items @@ -37,7 +43,8 @@ Yes, this currently includes all turfs, mobs, objs, and misc things. Sorry. We'l - /objects - miscellaneous objects that are not items, machinery, or structures - /overmaps - **All** overmap sprites, whether or not it's screen rendering, goes in here - /runtime - follow similar structure inside this, treat it as a sub-copy. icons in this are copied over for use during runtime - - **Warning!** - everything not in this folder cannot be accessed by "filename" and must be compiled in with 'filename'. + - currently being deprecated; we have chosen to instead copy over all icons/sounds, so the runtime + server can access them. - /screen - all screen objects, like hud icons, buttons, inventory interface, parallax, etc - /actions - all action button sprites go in here - /atom_hud - the /image huds that atoms can have has their icons in here diff --git a/icons/effects/ULIcons.dmi b/icons/effects/ULIcons.dmi deleted file mode 100644 index 3104e6ea6688..000000000000 Binary files a/icons/effects/ULIcons.dmi and /dev/null differ diff --git a/icons/effects/species.dmi b/icons/effects/species.dmi deleted file mode 100644 index a5c5a7d17958..000000000000 Binary files a/icons/effects/species.dmi and /dev/null differ diff --git a/icons/effects/species_tails.dmi b/icons/effects/species_tails.dmi deleted file mode 100644 index 5fea0671c652..000000000000 Binary files a/icons/effects/species_tails.dmi and /dev/null differ diff --git a/icons/effects/species_tails_vr.dmi b/icons/effects/species_tails_vr.dmi index dc52df4660c7..d5ab4d682692 100644 Binary files a/icons/effects/species_tails_vr.dmi and b/icons/effects/species_tails_vr.dmi differ diff --git a/icons/effects/ss13_dark_alpha6.dmi b/icons/effects/ss13_dark_alpha6.dmi deleted file mode 100644 index 742337358daa..000000000000 Binary files a/icons/effects/ss13_dark_alpha6.dmi and /dev/null differ diff --git a/icons/effects/ss13_dark_alpha7.dmi b/icons/effects/ss13_dark_alpha7.dmi deleted file mode 100644 index b270621719ac..000000000000 Binary files a/icons/effects/ss13_dark_alpha7.dmi and /dev/null differ diff --git a/icons/effects/ss13_dark_alpha7_DEBUG.dmi b/icons/effects/ss13_dark_alpha7_DEBUG.dmi deleted file mode 100644 index 91beaddd0894..000000000000 Binary files a/icons/effects/ss13_dark_alpha7_DEBUG.dmi and /dev/null differ diff --git a/icons/effects/ss13_dark_alpha7_old.dmi b/icons/effects/ss13_dark_alpha7_old.dmi deleted file mode 100644 index 85178c4e46f5..000000000000 Binary files a/icons/effects/ss13_dark_alpha7_old.dmi and /dev/null differ diff --git a/icons/machinery/fire_alarm.dmi b/icons/machinery/fire_alarm.dmi new file mode 100644 index 000000000000..258e923c0e9d Binary files /dev/null and b/icons/machinery/fire_alarm.dmi differ diff --git a/icons/machinery/lathe/microlathe.dmi b/icons/machinery/lathe/microlathe.dmi new file mode 100644 index 000000000000..bdfe6e6a15e4 Binary files /dev/null and b/icons/machinery/lathe/microlathe.dmi differ diff --git a/icons/machinery/power/apc.dmi b/icons/machinery/power/apc.dmi new file mode 100644 index 000000000000..ffef6e4e2fee Binary files /dev/null and b/icons/machinery/power/apc.dmi differ diff --git a/icons/machinery/power/solar/panel.dmi b/icons/machinery/power/solar/panel.dmi new file mode 100644 index 000000000000..8eae3405ba13 Binary files /dev/null and b/icons/machinery/power/solar/panel.dmi differ diff --git a/icons/mapping/helpers/access_helpers.dmi b/icons/mapping/helpers/access_helpers.dmi new file mode 100644 index 000000000000..bcec34a58c45 Binary files /dev/null and b/icons/mapping/helpers/access_helpers.dmi differ diff --git a/icons/mob/bodysets/organic/akula/sprite_accessories.dmi b/icons/mob/bodysets/organic/akula/sprite_accessories.dmi new file mode 100644 index 000000000000..c94637d75cf9 Binary files /dev/null and b/icons/mob/bodysets/organic/akula/sprite_accessories.dmi differ diff --git a/icons/mob/bodysets/organic/apidean/sprite_accessories.dmi b/icons/mob/bodysets/organic/apidean/sprite_accessories.dmi new file mode 100644 index 000000000000..3cb8ca531045 Binary files /dev/null and b/icons/mob/bodysets/organic/apidean/sprite_accessories.dmi differ diff --git a/icons/mob/bodysets/organic/krisitik/sprite_accessories.dmi b/icons/mob/bodysets/organic/krisitik/sprite_accessories.dmi new file mode 100644 index 000000000000..407710e27496 Binary files /dev/null and b/icons/mob/bodysets/organic/krisitik/sprite_accessories.dmi differ diff --git a/icons/mob/bodysets/organic/monkey/sprite_accessories.dmi b/icons/mob/bodysets/organic/monkey/sprite_accessories.dmi new file mode 100644 index 000000000000..fa3443897f4d Binary files /dev/null and b/icons/mob/bodysets/organic/monkey/sprite_accessories.dmi differ diff --git a/icons/mob/bodysets/organic/moth/sprite_accessories.dmi b/icons/mob/bodysets/organic/moth/sprite_accessories.dmi new file mode 100644 index 000000000000..729c8b03da0d Binary files /dev/null and b/icons/mob/bodysets/organic/moth/sprite_accessories.dmi differ diff --git a/icons/mob/bodysets/organic/moth/sprite_accessories_64x32.dmi b/icons/mob/bodysets/organic/moth/sprite_accessories_64x32.dmi new file mode 100644 index 000000000000..1f39ee4f09b3 Binary files /dev/null and b/icons/mob/bodysets/organic/moth/sprite_accessories_64x32.dmi differ diff --git a/icons/mob/bodysets/organic/naramadi/sprite_accessories.dmi b/icons/mob/bodysets/organic/naramadi/sprite_accessories.dmi new file mode 100644 index 000000000000..7691df9e0d9e Binary files /dev/null and b/icons/mob/bodysets/organic/naramadi/sprite_accessories.dmi differ diff --git a/icons/mob/bodysets/organic/nevrean/sprite_accessories.dmi b/icons/mob/bodysets/organic/nevrean/sprite_accessories.dmi new file mode 100644 index 000000000000..1e9fecc37e3e Binary files /dev/null and b/icons/mob/bodysets/organic/nevrean/sprite_accessories.dmi differ diff --git a/icons/mob/bodysets/organic/rapala/sprite_accessories.dmi b/icons/mob/bodysets/organic/rapala/sprite_accessories.dmi new file mode 100644 index 000000000000..fbf75c0b23bd Binary files /dev/null and b/icons/mob/bodysets/organic/rapala/sprite_accessories.dmi differ diff --git a/icons/mob/bodysets/organic/shadekin/sprite_accessories.dmi b/icons/mob/bodysets/organic/shadekin/sprite_accessories.dmi new file mode 100644 index 000000000000..989d37c34d99 Binary files /dev/null and b/icons/mob/bodysets/organic/shadekin/sprite_accessories.dmi differ diff --git a/icons/mob/bodysets/organic/tajaran/sprite_accessories.dmi b/icons/mob/bodysets/organic/tajaran/sprite_accessories.dmi new file mode 100644 index 000000000000..fbd0154aecd1 Binary files /dev/null and b/icons/mob/bodysets/organic/tajaran/sprite_accessories.dmi differ diff --git a/icons/mob/bodysets/organic/teshari/sprite_accessories.dmi b/icons/mob/bodysets/organic/teshari/sprite_accessories.dmi new file mode 100644 index 000000000000..685830933ed2 Binary files /dev/null and b/icons/mob/bodysets/organic/teshari/sprite_accessories.dmi differ diff --git a/icons/mob/bodysets/organic/unathi/sprite_accessories.dmi b/icons/mob/bodysets/organic/unathi/sprite_accessories.dmi new file mode 100644 index 000000000000..0fd5cf090742 Binary files /dev/null and b/icons/mob/bodysets/organic/unathi/sprite_accessories.dmi differ diff --git a/icons/mob/bodysets/organic/vasilissan/sprite_accessories.dmi b/icons/mob/bodysets/organic/vasilissan/sprite_accessories.dmi new file mode 100644 index 000000000000..8159922e0183 Binary files /dev/null and b/icons/mob/bodysets/organic/vasilissan/sprite_accessories.dmi differ diff --git a/icons/mob/bodysets/organic/vulpkanin/sprite_accessories.dmi b/icons/mob/bodysets/organic/vulpkanin/sprite_accessories.dmi new file mode 100644 index 000000000000..8cd0fa8ed56c Binary files /dev/null and b/icons/mob/bodysets/organic/vulpkanin/sprite_accessories.dmi differ diff --git a/icons/mob/bodysets/organic/xenohybrid/sprite_accessories.dmi b/icons/mob/bodysets/organic/xenohybrid/sprite_accessories.dmi new file mode 100644 index 000000000000..ef357715c527 Binary files /dev/null and b/icons/mob/bodysets/organic/xenohybrid/sprite_accessories.dmi differ diff --git a/icons/mob/bodysets/organic/xenomorph/sprite_accessories.dmi b/icons/mob/bodysets/organic/xenomorph/sprite_accessories.dmi new file mode 100644 index 000000000000..594966115018 Binary files /dev/null and b/icons/mob/bodysets/organic/xenomorph/sprite_accessories.dmi differ diff --git a/icons/mob/bodysets/organic/zorren_flatlander/sprite_accessories.dmi b/icons/mob/bodysets/organic/zorren_flatlander/sprite_accessories.dmi new file mode 100644 index 000000000000..de8fdb37e79e Binary files /dev/null and b/icons/mob/bodysets/organic/zorren_flatlander/sprite_accessories.dmi differ diff --git a/icons/mob/bodysets/organic/zorren_highlander/sprite_accessories.dmi b/icons/mob/bodysets/organic/zorren_highlander/sprite_accessories.dmi new file mode 100644 index 000000000000..4fd576508e5c Binary files /dev/null and b/icons/mob/bodysets/organic/zorren_highlander/sprite_accessories.dmi differ diff --git a/icons/mob/bodysets/synthetic/eggnerd/sprite_accessories.dmi b/icons/mob/bodysets/synthetic/eggnerd/sprite_accessories.dmi new file mode 100644 index 000000000000..19e8e025231f Binary files /dev/null and b/icons/mob/bodysets/synthetic/eggnerd/sprite_accessories.dmi differ diff --git a/icons/mob/bodysets/synthetic/eggnerd_red/sprite_accessories.dmi b/icons/mob/bodysets/synthetic/eggnerd_red/sprite_accessories.dmi new file mode 100644 index 000000000000..ad3634a384de Binary files /dev/null and b/icons/mob/bodysets/synthetic/eggnerd_red/sprite_accessories.dmi differ diff --git a/icons/mob/bodysets/synthetic/oss_akula/sprite_accessories.dmi b/icons/mob/bodysets/synthetic/oss_akula/sprite_accessories.dmi new file mode 100644 index 000000000000..d049d8bdd02b Binary files /dev/null and b/icons/mob/bodysets/synthetic/oss_akula/sprite_accessories.dmi differ diff --git a/icons/mob/bodysets/synthetic/oss_lizard/sprite_accessories.dmi b/icons/mob/bodysets/synthetic/oss_lizard/sprite_accessories.dmi new file mode 100644 index 000000000000..45793e65f9bf Binary files /dev/null and b/icons/mob/bodysets/synthetic/oss_lizard/sprite_accessories.dmi differ diff --git a/icons/mob/bodysets/synthetic/oss_naramadi/sprite_accessories.dmi b/icons/mob/bodysets/synthetic/oss_naramadi/sprite_accessories.dmi new file mode 100644 index 000000000000..d8abaef50b0f Binary files /dev/null and b/icons/mob/bodysets/synthetic/oss_naramadi/sprite_accessories.dmi differ diff --git a/icons/mob/bodysets/synthetic/oss_nevrean/sprite_accessories.dmi b/icons/mob/bodysets/synthetic/oss_nevrean/sprite_accessories.dmi new file mode 100644 index 000000000000..130c03bc23bc Binary files /dev/null and b/icons/mob/bodysets/synthetic/oss_nevrean/sprite_accessories.dmi differ diff --git a/icons/mob/bodysets/synthetic/oss_spider/sprite_accessories.dmi b/icons/mob/bodysets/synthetic/oss_spider/sprite_accessories.dmi new file mode 100644 index 000000000000..d06647254248 Binary files /dev/null and b/icons/mob/bodysets/synthetic/oss_spider/sprite_accessories.dmi differ diff --git a/icons/mob/bodysets/synthetic/oss_tajaran/sprite_accessories.dmi b/icons/mob/bodysets/synthetic/oss_tajaran/sprite_accessories.dmi new file mode 100644 index 000000000000..a47802667847 Binary files /dev/null and b/icons/mob/bodysets/synthetic/oss_tajaran/sprite_accessories.dmi differ diff --git a/icons/mob/bodysets/synthetic/oss_vulpkanin/sprite_accessories.dmi b/icons/mob/bodysets/synthetic/oss_vulpkanin/sprite_accessories.dmi new file mode 100644 index 000000000000..d5d17403084e Binary files /dev/null and b/icons/mob/bodysets/synthetic/oss_vulpkanin/sprite_accessories.dmi differ diff --git a/icons/mob/clothing/mask.dmi b/icons/mob/clothing/mask.dmi index b683678146e2..f9326f09d6d5 100644 Binary files a/icons/mob/clothing/mask.dmi and b/icons/mob/clothing/mask.dmi differ diff --git a/icons/mob/clothing/ties.dmi b/icons/mob/clothing/ties.dmi index 3d41974b5bc6..6d452683f985 100644 Binary files a/icons/mob/clothing/ties.dmi and b/icons/mob/clothing/ties.dmi differ diff --git a/icons/mob/cyberlimbs/DSIAkula/dsi_akula.dmi b/icons/mob/cyberlimbs/DSIAkula/dsi_akula.dmi index e19538082991..9a362a9eac50 100644 Binary files a/icons/mob/cyberlimbs/DSIAkula/dsi_akula.dmi and b/icons/mob/cyberlimbs/DSIAkula/dsi_akula.dmi differ diff --git a/icons/mob/cyberlimbs/DSILizard/dsi_lizard.dmi b/icons/mob/cyberlimbs/DSILizard/dsi_lizard.dmi index ce86dcadfdc9..ff1df7975e5c 100644 Binary files a/icons/mob/cyberlimbs/DSILizard/dsi_lizard.dmi and b/icons/mob/cyberlimbs/DSILizard/dsi_lizard.dmi differ diff --git a/icons/mob/cyberlimbs/DSINevrean/dsi_nevrean.dmi b/icons/mob/cyberlimbs/DSINevrean/dsi_nevrean.dmi index 5424d46b780d..5fb58421cdf5 100644 Binary files a/icons/mob/cyberlimbs/DSINevrean/dsi_nevrean.dmi and b/icons/mob/cyberlimbs/DSINevrean/dsi_nevrean.dmi differ diff --git a/icons/mob/cyberlimbs/DSISergal/dsi_sergal.dmi b/icons/mob/cyberlimbs/DSISergal/dsi_sergal.dmi index 4ba00625e114..e0f8f34c8da3 100644 Binary files a/icons/mob/cyberlimbs/DSISergal/dsi_sergal.dmi and b/icons/mob/cyberlimbs/DSISergal/dsi_sergal.dmi differ diff --git a/icons/mob/cyberlimbs/DSISpider/dsi_spider.dmi b/icons/mob/cyberlimbs/DSISpider/dsi_spider.dmi index a9ffd20a6dd1..309a2e3e593d 100644 Binary files a/icons/mob/cyberlimbs/DSISpider/dsi_spider.dmi and b/icons/mob/cyberlimbs/DSISpider/dsi_spider.dmi differ diff --git a/icons/mob/cyberlimbs/DSITajaran/dsi_tajaran.dmi b/icons/mob/cyberlimbs/DSITajaran/dsi_tajaran.dmi index 6fbb54ece4e4..deb703f2716f 100644 Binary files a/icons/mob/cyberlimbs/DSITajaran/dsi_tajaran.dmi and b/icons/mob/cyberlimbs/DSITajaran/dsi_tajaran.dmi differ diff --git a/icons/mob/cyberlimbs/DSIVulpkanin/dsi_vulpkanin.dmi b/icons/mob/cyberlimbs/DSIVulpkanin/dsi_vulpkanin.dmi index 79943fa9e917..f753507eadba 100644 Binary files a/icons/mob/cyberlimbs/DSIVulpkanin/dsi_vulpkanin.dmi and b/icons/mob/cyberlimbs/DSIVulpkanin/dsi_vulpkanin.dmi differ diff --git a/icons/mob/cyberlimbs/_fluff_vr/Frosty.dmi b/icons/mob/cyberlimbs/_fluff_vr/Frosty.dmi deleted file mode 100644 index 6ff7e9051779..000000000000 Binary files a/icons/mob/cyberlimbs/_fluff_vr/Frosty.dmi and /dev/null differ diff --git a/icons/mob/cyberlimbs/_fluff_vr/aronai.dmi b/icons/mob/cyberlimbs/_fluff_vr/aronai.dmi deleted file mode 100644 index 4d533fc8d31d..000000000000 Binary files a/icons/mob/cyberlimbs/_fluff_vr/aronai.dmi and /dev/null differ diff --git a/icons/mob/cyberlimbs/_fluff_vr/rahboop.dmi b/icons/mob/cyberlimbs/_fluff_vr/rahboop.dmi index ea30fe3b1a57..8cdac844f923 100644 Binary files a/icons/mob/cyberlimbs/_fluff_vr/rahboop.dmi and b/icons/mob/cyberlimbs/_fluff_vr/rahboop.dmi differ diff --git a/icons/mob/cyberlimbs/_fluff_vr/serdykov.dmi b/icons/mob/cyberlimbs/_fluff_vr/serdykov.dmi deleted file mode 100644 index 10c26a170506..000000000000 Binary files a/icons/mob/cyberlimbs/_fluff_vr/serdykov.dmi and /dev/null differ diff --git a/icons/mob/cyberlimbs/rahboopred/rahboopred.dmi b/icons/mob/cyberlimbs/rahboopred/rahboopred.dmi index f0d9dc8cab59..c5f66c00ab0f 100644 Binary files a/icons/mob/cyberlimbs/rahboopred/rahboopred.dmi and b/icons/mob/cyberlimbs/rahboopred/rahboopred.dmi differ diff --git a/icons/mob/hair_gradients.dmi b/icons/mob/hair_gradients.dmi index 4996755db159..0c6cae388c7a 100644 Binary files a/icons/mob/hair_gradients.dmi and b/icons/mob/hair_gradients.dmi differ diff --git a/icons/mob/human.dmi b/icons/mob/human.dmi index 985a5b96dafa..bdfe87fb6509 100644 Binary files a/icons/mob/human.dmi and b/icons/mob/human.dmi differ diff --git a/icons/mob/items/lefthand_guns.dmi b/icons/mob/items/lefthand_guns.dmi index aeb7c090d58c..1bd3902dd412 100644 Binary files a/icons/mob/items/lefthand_guns.dmi and b/icons/mob/items/lefthand_guns.dmi differ diff --git a/icons/mob/items/righthand_guns.dmi b/icons/mob/items/righthand_guns.dmi index 85ad50c790a7..603ec2ecedd9 100644 Binary files a/icons/mob/items/righthand_guns.dmi and b/icons/mob/items/righthand_guns.dmi differ diff --git a/icons/mob/species/akula/body.dmi b/icons/mob/species/akula/body.dmi index ebbcf4087d04..cff1bb552808 100644 Binary files a/icons/mob/species/akula/body.dmi and b/icons/mob/species/akula/body.dmi differ diff --git a/icons/mob/species/apidaen/body.dmi b/icons/mob/species/apidaen/body.dmi index d243ab745f22..ca3427ab667b 100644 Binary files a/icons/mob/species/apidaen/body.dmi and b/icons/mob/species/apidaen/body.dmi differ diff --git a/icons/mob/species/krisitik/body.dmi b/icons/mob/species/krisitik/body.dmi index 3e64b0e768d4..28b62d7c84f1 100644 Binary files a/icons/mob/species/krisitik/body.dmi and b/icons/mob/species/krisitik/body.dmi differ diff --git a/icons/mob/species/naramadi/body.dmi b/icons/mob/species/naramadi/body.dmi index 130c54a43065..83f1e468249e 100644 Binary files a/icons/mob/species/naramadi/body.dmi and b/icons/mob/species/naramadi/body.dmi differ diff --git a/icons/mob/species/nevrean/body.dmi b/icons/mob/species/nevrean/body.dmi index 431f1ee8d0aa..95518cb75e01 100644 Binary files a/icons/mob/species/nevrean/body.dmi and b/icons/mob/species/nevrean/body.dmi differ diff --git a/icons/mob/species/rapala/body.dmi b/icons/mob/species/rapala/body.dmi index bec334b97c55..287d9f8b0f8a 100644 Binary files a/icons/mob/species/rapala/body.dmi and b/icons/mob/species/rapala/body.dmi differ diff --git a/icons/mob/species/teshari/body.dmi b/icons/mob/species/teshari/body.dmi index 3f8845a64c92..c5fc8b916410 100644 Binary files a/icons/mob/species/teshari/body.dmi and b/icons/mob/species/teshari/body.dmi differ diff --git a/icons/mob/species/vasilissan/body.dmi b/icons/mob/species/vasilissan/body.dmi index 6b77bf293895..79d1caefbb9a 100644 Binary files a/icons/mob/species/vasilissan/body.dmi and b/icons/mob/species/vasilissan/body.dmi differ diff --git a/icons/mob/species/vulpkanin/body.dmi b/icons/mob/species/vulpkanin/body.dmi index 58d39f7f1912..3edc390cd8bb 100644 Binary files a/icons/mob/species/vulpkanin/body.dmi and b/icons/mob/species/vulpkanin/body.dmi differ diff --git a/icons/mob/species/zorren_fl/body_greyscale.dmi b/icons/mob/species/zorren_fl/body_greyscale.dmi index e7d644ca7ab2..914dfcc34c1b 100644 Binary files a/icons/mob/species/zorren_fl/body_greyscale.dmi and b/icons/mob/species/zorren_fl/body_greyscale.dmi differ diff --git a/icons/mob/species/zorren_hi/body_greyscale.dmi b/icons/mob/species/zorren_hi/body_greyscale.dmi index 0784df6f297d..495b7da19b1a 100644 Binary files a/icons/mob/species/zorren_hi/body_greyscale.dmi and b/icons/mob/species/zorren_hi/body_greyscale.dmi differ diff --git a/icons/mob/sprite_accessories/tails.dmi b/icons/mob/sprite_accessories/tails.dmi index 608ffc4f998c..d9d068f17342 100644 Binary files a/icons/mob/sprite_accessories/tails.dmi and b/icons/mob/sprite_accessories/tails.dmi differ diff --git a/icons/mob/sprite_accessories/wings.dmi b/icons/mob/sprite_accessories/wings.dmi index 23bfdf453c8b..a88d95df1b92 100644 Binary files a/icons/mob/sprite_accessories/wings.dmi and b/icons/mob/sprite_accessories/wings.dmi differ diff --git a/icons/mob/sprite_accessory/hair/hair.dmi b/icons/mob/sprite_accessory/hair/hair.dmi new file mode 100644 index 000000000000..4d20734ce2df Binary files /dev/null and b/icons/mob/sprite_accessory/hair/hair.dmi differ diff --git a/icons/mob/sprite_accessory/hair/simple.dmi b/icons/mob/sprite_accessory/hair/simple.dmi new file mode 100644 index 000000000000..b4ddf84de8a2 Binary files /dev/null and b/icons/mob/sprite_accessory/hair/simple.dmi differ diff --git a/icons/mob/sprite_accessory/horns/horns.dmi b/icons/mob/sprite_accessory/horns/horns.dmi new file mode 100644 index 000000000000..ac2d3950c4cb Binary files /dev/null and b/icons/mob/sprite_accessory/horns/horns.dmi differ diff --git a/icons/mob/sprite_accessory/horns/horns_32x48_bottom_aligned.dmi b/icons/mob/sprite_accessory/horns/horns_32x48_bottom_aligned.dmi new file mode 100644 index 000000000000..ea48698152e8 Binary files /dev/null and b/icons/mob/sprite_accessory/horns/horns_32x48_bottom_aligned.dmi differ diff --git a/icons/mob/sprite_accessory/tails/feline.dmi b/icons/mob/sprite_accessory/tails/feline.dmi new file mode 100644 index 000000000000..8bc58d9f9876 Binary files /dev/null and b/icons/mob/sprite_accessory/tails/feline.dmi differ diff --git a/icons/mob/sprite_accessory/tails/teshari.dmi b/icons/mob/sprite_accessory/tails/teshari.dmi new file mode 100644 index 000000000000..eb9966f8a093 Binary files /dev/null and b/icons/mob/sprite_accessory/tails/teshari.dmi differ diff --git a/icons/mob/sprite_accessories/wings_64x48.dmi b/icons/mob/sprite_accessory/wings/feathered-angel-64x48.dmi similarity index 84% rename from icons/mob/sprite_accessories/wings_64x48.dmi rename to icons/mob/sprite_accessory/wings/feathered-angel-64x48.dmi index c16b52d34105..e807c7934b2c 100644 Binary files a/icons/mob/sprite_accessories/wings_64x48.dmi and b/icons/mob/sprite_accessory/wings/feathered-angel-64x48.dmi differ diff --git a/icons/mob/sprite_accessory/wings/feathered-angel.dmi b/icons/mob/sprite_accessory/wings/feathered-angel.dmi new file mode 100644 index 000000000000..55b53b87263f Binary files /dev/null and b/icons/mob/sprite_accessory/wings/feathered-angel.dmi differ diff --git a/icons/mob/sprite_accessory/wings/feathered-generic.dmi b/icons/mob/sprite_accessory/wings/feathered-generic.dmi new file mode 100644 index 000000000000..26d94f73c333 Binary files /dev/null and b/icons/mob/sprite_accessory/wings/feathered-generic.dmi differ diff --git a/icons/mob/sprite_accessory/wings/moth.dmi b/icons/mob/sprite_accessory/wings/moth.dmi new file mode 100644 index 000000000000..8b6d2338393d Binary files /dev/null and b/icons/mob/sprite_accessory/wings/moth.dmi differ diff --git a/icons/modules/frames/base.dmi b/icons/modules/frames/base.dmi new file mode 100644 index 000000000000..e74dd2c57912 Binary files /dev/null and b/icons/modules/frames/base.dmi differ diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi index 500665b42cb8..97caca3b4b97 100644 Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ diff --git a/icons/obj/atmos.dmi b/icons/obj/atmos.dmi index a0b7de563be0..564b6b3262ac 100644 Binary files a/icons/obj/atmos.dmi and b/icons/obj/atmos.dmi differ diff --git a/icons/obj/card_fluff.dmi b/icons/obj/card_fluff.dmi new file mode 100644 index 000000000000..93c2282db6b2 Binary files /dev/null and b/icons/obj/card_fluff.dmi differ diff --git a/icons/obj/clothing/ties.dmi b/icons/obj/clothing/ties.dmi index 9a0319869284..24948c5b7455 100644 Binary files a/icons/obj/clothing/ties.dmi and b/icons/obj/clothing/ties.dmi differ diff --git a/icons/obj/contraband.dmi b/icons/obj/contraband.dmi index a8f92bfd1781..0f17b153573d 100644 Binary files a/icons/obj/contraband.dmi and b/icons/obj/contraband.dmi differ diff --git a/icons/obj/doors/Dooralien.dmi b/icons/obj/doors/alien/LEGACY_Dooralien.dmi similarity index 100% rename from icons/obj/doors/Dooralien.dmi rename to icons/obj/doors/alien/LEGACY_Dooralien.dmi diff --git a/icons/obj/doors/Dooralien_blue.dmi b/icons/obj/doors/alien/LEGACY_Dooralien_blue.dmi similarity index 100% rename from icons/obj/doors/Dooralien_blue.dmi rename to icons/obj/doors/alien/LEGACY_Dooralien_blue.dmi diff --git a/icons/obj/doors/alien/door.dmi b/icons/obj/doors/alien/door.dmi new file mode 100644 index 000000000000..9b3d026d3b8a Binary files /dev/null and b/icons/obj/doors/alien/door.dmi differ diff --git a/icons/obj/doors/alien/door_blue.dmi b/icons/obj/doors/alien/door_blue.dmi new file mode 100644 index 000000000000..34b72e0d58d5 Binary files /dev/null and b/icons/obj/doors/alien/door_blue.dmi differ diff --git a/icons/obj/doors/alien/lights_bolts.dmi b/icons/obj/doors/alien/lights_bolts.dmi new file mode 100644 index 000000000000..970564790d98 Binary files /dev/null and b/icons/obj/doors/alien/lights_bolts.dmi differ diff --git a/icons/obj/doors/alien/lights_bolts_blue.dmi b/icons/obj/doors/alien/lights_bolts_blue.dmi new file mode 100644 index 000000000000..ffbc7726f899 Binary files /dev/null and b/icons/obj/doors/alien/lights_bolts_blue.dmi differ diff --git a/icons/obj/doors/alien/lights_green.dmi b/icons/obj/doors/alien/lights_green.dmi new file mode 100644 index 000000000000..a90504a22072 Binary files /dev/null and b/icons/obj/doors/alien/lights_green.dmi differ diff --git a/icons/obj/doors/alien/lights_green_blue.dmi b/icons/obj/doors/alien/lights_green_blue.dmi new file mode 100644 index 000000000000..8d3edd1f8019 Binary files /dev/null and b/icons/obj/doors/alien/lights_green_blue.dmi differ diff --git a/icons/obj/doors/alien/panel.dmi b/icons/obj/doors/alien/panel.dmi new file mode 100644 index 000000000000..5bc49cb72765 Binary files /dev/null and b/icons/obj/doors/alien/panel.dmi differ diff --git a/icons/obj/doors/alien/sparks_broken.dmi b/icons/obj/doors/alien/sparks_broken.dmi new file mode 100644 index 000000000000..59f7acff5694 Binary files /dev/null and b/icons/obj/doors/alien/sparks_broken.dmi differ diff --git a/icons/obj/doors/alien/sparks_damaged.dmi b/icons/obj/doors/alien/sparks_damaged.dmi new file mode 100644 index 000000000000..a31014faf92f Binary files /dev/null and b/icons/obj/doors/alien/sparks_damaged.dmi differ diff --git a/icons/obj/doors/alien/welded.dmi b/icons/obj/doors/alien/welded.dmi new file mode 100644 index 000000000000..908f6438a342 Binary files /dev/null and b/icons/obj/doors/alien/welded.dmi differ diff --git a/icons/obj/gun/ballistic.dmi b/icons/obj/gun/ballistic.dmi index e7fa9abdc797..30257b6709b0 100644 Binary files a/icons/obj/gun/ballistic.dmi and b/icons/obj/gun/ballistic.dmi differ diff --git a/icons/obj/sponge.dmi b/icons/obj/sponge.dmi new file mode 100644 index 000000000000..d4f3997786e0 Binary files /dev/null and b/icons/obj/sponge.dmi differ diff --git a/icons/obj/wheelchair.dmi b/icons/obj/wheelchair.dmi index e58bf4e09b6e..f3a84b08820c 100644 Binary files a/icons/obj/wheelchair.dmi and b/icons/obj/wheelchair.dmi differ diff --git a/icons/screen/atom_hud/job.dmi b/icons/screen/atom_hud/job.dmi index 1910d170f0aa..3bddacae14be 100644 Binary files a/icons/screen/atom_hud/job.dmi and b/icons/screen/atom_hud/job.dmi differ diff --git a/icons/spideros_icons/sos_1.png b/icons/spideros_icons/sos_1.png deleted file mode 100644 index 079f548fde12..000000000000 Binary files a/icons/spideros_icons/sos_1.png and /dev/null differ diff --git a/icons/spideros_icons/sos_10.png b/icons/spideros_icons/sos_10.png deleted file mode 100644 index 5f962d60f457..000000000000 Binary files a/icons/spideros_icons/sos_10.png and /dev/null differ diff --git a/icons/spideros_icons/sos_11.png b/icons/spideros_icons/sos_11.png deleted file mode 100644 index fd68c8a4ac22..000000000000 Binary files a/icons/spideros_icons/sos_11.png and /dev/null differ diff --git a/icons/spideros_icons/sos_12.png b/icons/spideros_icons/sos_12.png deleted file mode 100644 index ff3a064c0360..000000000000 Binary files a/icons/spideros_icons/sos_12.png and /dev/null differ diff --git a/icons/spideros_icons/sos_13.png b/icons/spideros_icons/sos_13.png deleted file mode 100644 index c396182cfedd..000000000000 Binary files a/icons/spideros_icons/sos_13.png and /dev/null differ diff --git a/icons/spideros_icons/sos_14.png b/icons/spideros_icons/sos_14.png deleted file mode 100644 index 9d90684d8c61..000000000000 Binary files a/icons/spideros_icons/sos_14.png and /dev/null differ diff --git a/icons/spideros_icons/sos_2.png b/icons/spideros_icons/sos_2.png deleted file mode 100644 index 40009fe5622f..000000000000 Binary files a/icons/spideros_icons/sos_2.png and /dev/null differ diff --git a/icons/spideros_icons/sos_3.png b/icons/spideros_icons/sos_3.png deleted file mode 100644 index 138b110b0255..000000000000 Binary files a/icons/spideros_icons/sos_3.png and /dev/null differ diff --git a/icons/spideros_icons/sos_4.png b/icons/spideros_icons/sos_4.png deleted file mode 100644 index 4d5d23149c06..000000000000 Binary files a/icons/spideros_icons/sos_4.png and /dev/null differ diff --git a/icons/spideros_icons/sos_5.png b/icons/spideros_icons/sos_5.png deleted file mode 100644 index 7e43c9d8a460..000000000000 Binary files a/icons/spideros_icons/sos_5.png and /dev/null differ diff --git a/icons/spideros_icons/sos_6.png b/icons/spideros_icons/sos_6.png deleted file mode 100644 index ea6494a91285..000000000000 Binary files a/icons/spideros_icons/sos_6.png and /dev/null differ diff --git a/icons/spideros_icons/sos_7.png b/icons/spideros_icons/sos_7.png deleted file mode 100644 index d93d2b13fec4..000000000000 Binary files a/icons/spideros_icons/sos_7.png and /dev/null differ diff --git a/icons/spideros_icons/sos_8.png b/icons/spideros_icons/sos_8.png deleted file mode 100644 index fd540cb3a82b..000000000000 Binary files a/icons/spideros_icons/sos_8.png and /dev/null differ diff --git a/icons/spideros_icons/sos_9.png b/icons/spideros_icons/sos_9.png deleted file mode 100644 index 05d36c3e6fc0..000000000000 Binary files a/icons/spideros_icons/sos_9.png and /dev/null differ diff --git a/icons/system/blank_32x32.dmi b/icons/system/blank_32x32.dmi index 4f5867e07e72..7a017674044f 100644 Binary files a/icons/system/blank_32x32.dmi and b/icons/system/blank_32x32.dmi differ diff --git a/icons/vending_icons/vendingslot_bg.png b/icons/vending_icons/vendingslot_bg.png deleted file mode 100644 index 6fb6fdcf8b9b..000000000000 Binary files a/icons/vending_icons/vendingslot_bg.png and /dev/null differ diff --git a/maps/away_missions/140x140/snow_outpost.dmm b/maps/away_missions/140x140/snow_outpost.dmm index 9eb53929a4d0..8c7ae8e8ffde 100644 --- a/maps/away_missions/140x140/snow_outpost.dmm +++ b/maps/away_missions/140x140/snow_outpost.dmm @@ -662,7 +662,7 @@ /turf/simulated/wall, /area/awaymission/snow_outpost/dark) "cw" = ( -/obj/item/frame/apc, +/obj/item/frame2/apc, /obj/item/module/power_control, /turf/simulated/floor/plating/external, /area/awaymission/snow_outpost/dark) diff --git a/maps/away_missions/140x140/zoo.dmm b/maps/away_missions/140x140/zoo.dmm index c18ec430314f..21cd0d63ed61 100644 --- a/maps/away_missions/140x140/zoo.dmm +++ b/maps/away_missions/140x140/zoo.dmm @@ -8545,7 +8545,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/solar/fake, +/obj/machinery/power/solar, /turf/simulated/floor/airless{ icon_state = "solarpanel" }, @@ -8630,7 +8630,7 @@ /area/awaymission/zoo/solars) "xt" = ( /obj/structure/cable, -/obj/machinery/power/solar/fake, +/obj/machinery/power/solar, /turf/simulated/floor/airless{ icon_state = "solarpanel" }, diff --git a/maps/away_missions/archive/blackmarketpackers.dmm b/maps/away_missions/archive/blackmarketpackers.dmm index dcd9d3d2f1d1..d3d8cb18dd8f 100644 --- a/maps/away_missions/archive/blackmarketpackers.dmm +++ b/maps/away_missions/archive/blackmarketpackers.dmm @@ -1855,7 +1855,7 @@ /turf/simulated/floor/plating, /area/awaymission) "hK" = ( -/obj/item/frame/apc, +/obj/item/frame2/apc, /turf/simulated/floor/airless, /area/awaymission) "hL" = ( diff --git a/maps/away_missions/archive/stationCollision.dmm b/maps/away_missions/archive/stationCollision.dmm index 3438b17126f2..14eb7f5c755b 100644 --- a/maps/away_missions/archive/stationCollision.dmm +++ b/maps/away_missions/archive/stationCollision.dmm @@ -11,7 +11,7 @@ /turf/simulated/floor/plating, /area/awaymission/northblock) "ad" = ( -/obj/machinery/power/solar/fake, +/obj/machinery/power/solar, /turf/simulated/floor/airless{ icon_state = "solarpanel" }, @@ -29,7 +29,7 @@ }, /area/awaymission/northblock) "ai" = ( -/obj/machinery/power/solar/fake, +/obj/machinery/power/solar, /turf/space, /area/awaymission/northblock) "aj" = ( diff --git a/maps/away_missions/archive/zresearchlabs.dmm b/maps/away_missions/archive/zresearchlabs.dmm index 3a7a99ef376b..89c7035ba635 100644 --- a/maps/away_missions/archive/zresearchlabs.dmm +++ b/maps/away_missions/archive/zresearchlabs.dmm @@ -240,7 +240,7 @@ }, /area/awaymission/labs/cave) "bb" = ( -/obj/item/frame/apc, +/obj/item/frame2/apc, /turf/simulated/floor{ icon_state = "white" }, diff --git a/maps/euthenia/levels/deck4.dmm b/maps/euthenia/levels/deck4.dmm index e604b9aa9605..a5094153ae06 100644 --- a/maps/euthenia/levels/deck4.dmm +++ b/maps/euthenia/levels/deck4.dmm @@ -11007,7 +11007,7 @@ /turf/simulated/floor/tiled, /area/rnd/secure_storage/critical) "Ql" = ( -/obj/item/frame/apc, +/obj/item/frame2/apc, /turf/simulated/floor/airless, /area/main_map/maintenance/deck_four/starboard) "Qm" = ( diff --git a/maps/generic/misc.dm b/maps/generic/misc.dm index df4cfe92d063..3af8d819c540 100644 --- a/maps/generic/misc.dm +++ b/maps/generic/misc.dm @@ -161,8 +161,6 @@ layer = ABOVE_WINDOW_LAYER /obj/machinery/embedded_controller layer = ABOVE_WINDOW_LAYER -/obj/machinery/firealarm - layer = ABOVE_WINDOW_LAYER /obj/machinery/flasher layer = ABOVE_WINDOW_LAYER /obj/machinery/keycard_auth @@ -216,8 +214,6 @@ layer = ABOVE_WINDOW_LAYER /obj/machinery/embedded_controller layer = ABOVE_WINDOW_LAYER -/obj/machinery/firealarm - layer = ABOVE_WINDOW_LAYER /obj/machinery/flasher layer = ABOVE_WINDOW_LAYER /obj/machinery/keycard_auth diff --git a/maps/rift/engines.dm b/maps/rift/engines.dm new file mode 100644 index 000000000000..449067353e34 --- /dev/null +++ b/maps/rift/engines.dm @@ -0,0 +1,22 @@ +/datum/map_template/engine/rift + abstract_type = /datum/map_template/engine/rift + prefix = "maps/rift/engines/" + for_map = /datum/map/station/rift + +/datum/map_template/engine/rift/rust + name = "ProcEngine_Rift_Rust" + desc = "R-UST Fusion Tokamak Engine" + suffix = "rust.dmm" + display_name = list("Budget Star", "Bane of Synthetics", "Glowy Field", "Funny Spinny EM Field", "Protean Rarity Enforcement") + +/datum/map_template/engine/rift/supermatter + name = "ProcEngine_Rift_Supermatter" + desc = "Old Faithful Supermatter" + suffix = "sme.dmm" + display_name = list("Angry Rock", "The Forbidden Rock Candy", "Death Crystal", "Spicy Crystal", "Hypnotizing Stone") + +/datum/map_template/engine/rift/burnchamber + name = "ProcEngine_Rift_Burn" + desc = "Burn Chamber Engine" + suffix = "burn.dmm" + display_name = list("Toxins Lab", "Build a Campfire", "100 Solarmoths", "Teshari's Bane", "Casting Fireball!") diff --git a/maps/rift/engines/burn.dmm b/maps/rift/engines/burn.dmm new file mode 100644 index 000000000000..73151002ff04 --- /dev/null +++ b/maps/rift/engines/burn.dmm @@ -0,0 +1,1891 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aF" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"aT" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"bc" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ + dir = 1 + }, +/obj/machinery/meter, +/turf/simulated/floor, +/area/engineering/engine_room) +"bj" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/effect/floor_decal/industrial/outline, +/turf/simulated/floor, +/area/engineering/engine_room) +"bO" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 9 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"bV" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 10 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"bZ" = ( +/obj/machinery/computer/general_air_control/supermatter_core{ + dir = 1; + frequency = 1438; + input_tag = "cooling_in"; + name = "Engine Pressure Control"; + output_tag = "cooling_out"; + pressure_setting = 100; + sensors = list("engine_sensor"="Engine Core") + }, +/turf/template_noop, +/area/template_noop) +"cm" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 9 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"cG" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 6 + }, +/turf/template_noop, +/area/rift/surfacebase/underground/under2) +"cR" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"da" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/black{ + dir = 8 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"dH" = ( +/obj/machinery/atmospherics/component/binary/pump{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"dI" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 9 + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"dT" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ + dir = 1; + frequency = 1438; + id_tag = "cooling_out"; + pump_direction = 0; + on = 1 + }, +/obj/structure/window/phoronreinforced{ + dir = 1 + }, +/obj/structure/window/phoronreinforced{ + dir = 4 + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"eB" = ( +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"eH" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red, +/turf/simulated/floor, +/area/engineering/engine_room) +"eO" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber{ + tag = null; + dir = 1; + id_tag = "engine_out"; + frequency = 1437 + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"eU" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/yellow, +/obj/machinery/meter, +/turf/simulated/floor, +/area/engineering/engine_room) +"fU" = ( +/obj/machinery/atmospherics/component/binary/pump/high_power{ + dir = 1 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"gB" = ( +/obj/structure/window/phoronreinforced/full{ + dir = 1 + }, +/obj/structure/grille, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"gF" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/turf/simulated/floor, +/turf/simulated/floor, +/area/template_noop) +"gK" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 4 + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"gL" = ( +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/visible/supply{ + dir = 4 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"hg" = ( +/obj/machinery/fire_alarm/south_mount{ + pixel_y = 23; + dir = 2 + }, +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"hi" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ + dir = 8 + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"ho" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 + }, +/obj/machinery/meter, +/turf/simulated/floor, +/area/engineering/engine_room) +"hp" = ( +/obj/machinery/atmospherics/pipe/simple/visible/purple{ + dir = 5 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"hZ" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ + dir = 8 + }, +/turf/template_noop, +/area/rift/surfacebase/underground/under2) +"iv" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan, +/turf/simulated/floor, +/area/engineering/engine_room) +"iV" = ( +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"iY" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 10 + }, +/turf/template_noop, +/area/rift/surfacebase/underground/under2) +"jR" = ( +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/manifold/visible/red{ + dir = 8 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"kh" = ( +/obj/machinery/computer/power_monitor{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/template_noop) +"kY" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 9 + }, +/obj/structure/window/phoronreinforced/full{ + dir = 4 + }, +/obj/structure/grille, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"lf" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/turf/simulated/floor, +/area/engineering/engine_room) +"mb" = ( +/obj/machinery/atmospherics/pipe/simple/visible/purple{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/purple{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"mv" = ( +/obj/structure/cable/cyan{ + icon_state = "1-4" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"nn" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 5 + }, +/turf/template_noop, +/area/rift/surfacebase/underground/under2) +"nA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/turf/simulated/floor, +/turf/simulated/floor, +/area/template_noop) +"nL" = ( +/obj/machinery/atmospherics/pipe/simple/visible/purple{ + dir = 6 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"nP" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/obj/machinery/atmospherics/component/unary/outlet_injector{ + frequency = 1438; + id = "cooling_in"; + use_power = 1 + }, +/obj/structure/window/phoronreinforced, +/obj/structure/window/phoronreinforced{ + dir = 8 + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"oe" = ( +/turf/template_noop, +/area/rift/surfacebase/underground/under2) +"oz" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"pg" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 9 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"pt" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 6 + }, +/obj/structure/window/phoronreinforced/full{ + dir = 4 + }, +/obj/structure/grille, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"pM" = ( +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"pX" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/red{ + dir = 8 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"pY" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"qL" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"rg" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/visible/black{ + dir = 1 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"rW" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/cyan, +/turf/simulated/floor, +/area/engineering/engine_room) +"sq" = ( +/obj/machinery/atmospherics/pipe/simple/visible/black, +/obj/structure/window/phoronreinforced/full{ + dir = 1 + }, +/obj/structure/grille, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"sH" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 10 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"ta" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"to" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/obj/machinery/atmospherics/portables_connector, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"tz" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 5 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"tB" = ( +/obj/machinery/fire_alarm/south_mount{ + pixel_y = -24 + }, +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"ug" = ( +/obj/machinery/atmospherics/component/binary/pump{ + dir = 8 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"um" = ( +/obj/machinery/atmospherics/component/unary/heat_exchanger{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"uE" = ( +/obj/machinery/atmospherics/pipe/simple/visible/purple{ + dir = 9 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"vn" = ( +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 9 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"vK" = ( +/obj/machinery/air_alarm{ + dir = 1; + pixel_y = -25 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"vO" = ( +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"wp" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green{ + dir = 10 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"wB" = ( +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 5 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"xE" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, +/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ + dir = 1; + frequency = 1438; + id_tag = "cooling_out"; + pump_direction = 0; + on = 1 + }, +/obj/structure/window/phoronreinforced{ + dir = 8 + }, +/obj/structure/window/phoronreinforced{ + dir = 1 + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"xI" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/black, +/obj/machinery/meter, +/turf/simulated/floor, +/area/engineering/engine_room) +"xM" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 5 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"xQ" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green{ + dir = 4 + }, +/obj/machinery/meter, +/turf/simulated/floor, +/area/engineering/engine_room) +"zl" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"zE" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Ab" = ( +/turf/simulated/floor, +/turf/simulated/floor, +/area/template_noop) +"Ao" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor, +/turf/simulated/floor, +/area/template_noop) +"AP" = ( +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"Bu" = ( +/turf/simulated/floor, +/area/engineering/engine_room) +"Bz" = ( +/obj/machinery/light, +/turf/simulated/floor, +/area/engineering/engine_room) +"BR" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber{ + id_tag = "engine_out"; + tag = null; + dir = 1; + frequency = 1437 + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"BU" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/black, +/turf/simulated/floor, +/area/engineering/engine_room) +"Cw" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ + dir = 8 + }, +/obj/machinery/air_sensor{ + frequency = 1438; + id_tag = "engine_sensor"; + output = 63 + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"Cy" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 6 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Dj" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Eh" = ( +/obj/structure/cable/cyan{ + icon_state = "2-4" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"EH" = ( +/obj/machinery/atmospherics/pipe/tank/oxygen, +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"ET" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/power/sensor{ + name = "Powernet Sensor - Engine Output"; + name_tag = "Engine Output" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Fi" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/obj/structure/window/phoronreinforced/full{ + dir = 4 + }, +/obj/structure/grille, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"Fw" = ( +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"FP" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, +/obj/machinery/atmospherics/component/unary/outlet_injector{ + frequency = 1438; + id = "cooling_in"; + use_power = 1 + }, +/obj/structure/window/phoronreinforced, +/obj/structure/window/phoronreinforced{ + dir = 4 + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"FW" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Gg" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/cyan, +/turf/simulated/floor, +/area/engineering/engine_room) +"Hh" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/visible/purple{ + dir = 6 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Ho" = ( +/obj/machinery/atmospherics/pipe/tank/nitrous_oxide, +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"HF" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"HN" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/machinery/power/sensor{ + name = "Powernet Sensor - Engine Power"; + name_tag = "Engine Power" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"HU" = ( +/obj/machinery/atmospherics/component/binary/passive_gate, +/turf/simulated/floor, +/area/engineering/engine_room) +"It" = ( +/obj/machinery/computer/atmos_alert{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/template_noop) +"Iz" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green{ + dir = 9 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"IR" = ( +/obj/machinery/atmospherics/component/unary/outlet_injector{ + dir = 1; + frequency = 1437; + id = "engine_in"; + volume_rate = 100 + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"Ji" = ( +/obj/structure/window/phoronreinforced/full{ + dir = 8 + }, +/obj/structure/grille, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"JK" = ( +/obj/machinery/atmospherics/pipe/simple/visible/purple{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"JM" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 6 + }, +/obj/structure/window/phoronreinforced/full{ + dir = 4 + }, +/obj/structure/grille, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"JS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"JZ" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Kh" = ( +/obj/machinery/atmospherics/component/unary/heat_exchanger, +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"Kr" = ( +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Kv" = ( +/obj/machinery/button/ignition{ + id = "engine_igniter"; + pixel_x = -32 + }, +/obj/machinery/computer/general_air_control/supermatter_core{ + frequency = 1437; + name = "Burn Chamber Control"; + sensors = list("engine_sensor"="Burn Chamber"); + dir = 4; + input_tag = "engine_in"; + output_tag = "engine_out" + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"KE" = ( +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 6 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"KF" = ( +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 10 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"KI" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline/blue, +/turf/simulated/floor, +/area/engineering/engine_room) +"Lf" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline/red, +/turf/simulated/floor, +/area/engineering/engine_room) +"Lj" = ( +/obj/machinery/power/generator{ + anchored = 1; + dir = 4 + }, +/obj/structure/cable/yellow, +/obj/machinery/atmospherics/pipe/simple/visible/red, +/turf/simulated/floor, +/area/engineering/engine_room) +"Ma" = ( +/obj/machinery/atmospherics/pipe/tank, +/turf/simulated/floor, +/area/engineering/engine_room) +"Mk" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green{ + dir = 6 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"MH" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 10 + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"MK" = ( +/obj/machinery/igniter{ + id = "engine_igniter"; + on = 0 + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"MZ" = ( +/obj/machinery/atmospherics/component/unary/heat_exchanger, +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"Ng" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green, +/turf/simulated/floor, +/area/engineering/engine_room) +"Nz" = ( +/obj/machinery/atmospherics/pipe/manifold4w/visible/purple, +/obj/machinery/meter, +/turf/simulated/floor, +/area/engineering/engine_room) +"Od" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline, +/turf/simulated/floor, +/area/engineering/engine_room) +"Ok" = ( +/obj/machinery/atmospherics/pipe/simple/visible/black, +/turf/simulated/floor, +/area/engineering/engine_room) +"Ov" = ( +/obj/machinery/atmospherics/component/binary/circulator{ + anchored = 1; + dir = 1 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"OK" = ( +/obj/machinery/atmospherics/pipe/manifold4w/visible/black, +/turf/simulated/floor, +/area/engineering/engine_room) +"Pa" = ( +/obj/machinery/atmospherics/pipe/simple/visible/purple, +/obj/structure/window/phoronreinforced/full{ + dir = 1 + }, +/obj/structure/grille, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"Pz" = ( +/obj/machinery/atmospherics/component/unary/heat_exchanger{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"PW" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 9 + }, +/turf/template_noop, +/area/rift/surfacebase/underground/under2) +"QG" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/obj/machinery/atmospherics/tvalve/digital/mirrored, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"QX" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 4 + }, +/turf/template_noop, +/area/rift/surfacebase/underground/under2) +"Sh" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/red, +/turf/simulated/floor, +/area/engineering/engine_room) +"SK" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/power/apc/south_mount{ + dir = 8; + pixel_y = 0; + pixel_x = 17 + }, +/obj/structure/cable/cyan{ + icon_state = "0-2" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Tb" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 5 + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"Tl" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging, +/turf/template_noop, +/area/rift/surfacebase/underground/under2) +"TA" = ( +/obj/machinery/atmospherics/component/binary/circulator{ + anchored = 1 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"TV" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/black{ + dir = 1 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"UM" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 10 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Vi" = ( +/obj/structure/window/phoronreinforced/full, +/obj/structure/grille, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"Vl" = ( +/obj/effect/floor_decal/industrial/warning/corner, +/turf/simulated/floor, +/area/engineering/engine_room) +"Vn" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 6 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"VK" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/purple{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"VN" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/green, +/turf/simulated/floor, +/area/engineering/engine_room) +"VW" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 6 + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"VX" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 9 + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"Wv" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"WA" = ( +/obj/machinery/computer/security/engineering{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/template_noop) +"WR" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 4 + }, +/obj/machinery/meter, +/turf/simulated/floor, +/area/engineering/engine_room) +"Yg" = ( +/turf/simulated/wall/r_wall/prepainted/engineering, +/area/engineering/engine_room) +"Yi" = ( +/obj/machinery/light, +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"YK" = ( +/obj/machinery/air_alarm{ + pixel_y = 22 + }, +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"YP" = ( +/obj/machinery/atmospherics/pipe/tank/phoron, +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"Zn" = ( +/turf/template_noop, +/area/template_noop) +"Zw" = ( +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/structure/cable/cyan{ + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"ZG" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"ZN" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ + dir = 8 + }, +/turf/simulated/floor, +/area/engineering/engine_room) + +(1,1,1) = {" +Zn +oe +Zn +Zn +oe +oe +oe +oe +oe +oe +oe +oe +oe +oe +oe +oe +Zn +Zn +Zn +Zn +Zn +Zn +Zn +"} +(2,1,1) = {" +Zn +oe +cG +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +nn +Zn +Zn +Zn +Zn +Zn +"} +(3,1,1) = {" +Zn +oe +QX +cG +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +PW +oe +oe +oe +Zn +Zn +"} +(4,1,1) = {" +Zn +oe +QX +iY +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +nn +Zn +"} +(5,1,1) = {" +Zn +oe +iY +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +nn +QX +Zn +"} +(6,1,1) = {" +Zn +Zn +cG +nn +cG +nn +cG +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +PW +QX +Zn +"} +(7,1,1) = {" +Zn +Zn +QX +QX +QX +QX +iY +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +PW +Zn +"} +(8,1,1) = {" +Zn +Zn +QX +QX +QX +QX +cG +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +nn +Zn +"} +(9,1,1) = {" +Zn +Zn +QX +QX +QX +QX +iY +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +nn +QX +Zn +"} +(10,1,1) = {" +Zn +cG +PW +QX +QX +QX +Yg +Yg +Yg +Yg +Yg +Yg +Yg +Yg +Yg +Yg +Yg +cG +Tl +Tl +PW +QX +Zn +"} +(11,1,1) = {" +Zn +hZ +oe +iY +PW +hZ +Yg +Bu +Yg +Ji +Ji +Ji +Ji +Ji +Yg +Bu +Yg +QX +cG +Tl +Tl +PW +Zn +"} +(12,1,1) = {" +Zn +TV +Ok +Ok +Ok +vn +Yg +nL +Pa +IR +VW +Tb +VW +Tb +Vi +Bu +Yg +QX +iY +Tl +Tl +nn +Zn +"} +(13,1,1) = {" +Zn +iV +Bu +Bu +Bu +Bu +Hh +VK +Pa +IR +gK +gK +gK +gK +Vi +Bu +Yg +iY +nn +oe +oe +QX +Zn +"} +(14,1,1) = {" +Zn +iV +EH +QG +HU +hp +JK +KE +sq +BR +gK +gK +gK +gK +Vi +Bu +Yg +oe +hZ +oe +oe +hZ +Zn +"} +(15,1,1) = {" +Zn +iV +to +VX +Bu +JK +JK +TV +sq +eO +gK +gK +gK +gK +Vi +Bu +Yg +Bu +pY +Bu +Bu +HF +Zn +"} +(16,1,1) = {" +Zn +iV +Bu +Bu +Bu +mb +JK +dH +gB +MK +Cw +MH +dI +hi +Vi +Bu +ta +Bu +pY +Bu +Bu +HF +Zn +"} +(17,1,1) = {" +Zn +aF +YP +QG +HU +Nz +uE +iV +Yg +pt +JM +Fi +Fi +kY +Yg +Bu +Bu +Bu +xQ +Bu +Bu +ho +Zn +"} +(18,1,1) = {" +Zn +iV +to +VX +Bu +JK +Ma +xI +Kv +WR +bc +xE +nP +tz +ta +Bu +Bu +Bu +pY +Bu +Bu +HF +Zn +"} +(19,1,1) = {" +Zn +hg +Bu +Bu +Bu +JK +KE +vn +Vn +pg +bV +dT +FP +eU +Bu +Bu +Bu +Bu +pY +Bu +Bu +Yi +Zn +"} +(20,1,1) = {" +Zn +iV +Ho +QG +HU +uE +iV +Bu +zE +Mk +Ng +Ng +Ng +VN +Ng +Ng +Ng +Ng +Iz +Bu +Bu +tB +Zn +"} +(21,1,1) = {" +Zn +YK +to +VX +Bu +KE +OK +wB +zE +wp +Ng +Ov +iv +rW +iv +iv +iv +iv +fU +ZN +iv +cm +Zn +"} +(22,1,1) = {" +Zn +rg +da +um +MZ +BU +dH +dH +UM +eH +jR +Lj +eH +Sh +eH +eH +pX +xM +Cy +Gg +Bu +vK +Zn +"} +(23,1,1) = {" +Zn +ug +KF +Pz +Kh +vn +bj +bj +Bu +Bu +sH +TA +lf +bO +Bu +Bu +dH +ug +dH +ug +Bu +Bz +Zn +"} +(24,1,1) = {" +Zn +Od +eB +FW +ET +FW +FW +FW +FW +FW +Kr +Bu +Bu +Bu +Bu +Bu +Lf +Lf +KI +KI +Bu +Bu +Zn +"} +(25,1,1) = {" +Zn +Vl +JZ +Eh +HN +Wv +Dj +zl +zl +zl +zl +ZG +zl +zl +zl +zl +Dj +Wv +mv +qL +oz +Bu +Zn +"} +(26,1,1) = {" +Zn +SK +cR +Zw +vO +gL +JS +vO +vO +vO +vO +vO +pM +vO +vO +vO +JS +gL +AP +Fw +aT +Bu +Zn +"} +(27,1,1) = {" +Zn +Zn +Ao +gF +Zn +Zn +Ab +Ab +Ab +Ab +Ab +Zn +Zn +Ab +Zn +Zn +Zn +Zn +nA +Ab +Zn +Zn +Zn +"} +(28,1,1) = {" +Zn +Zn +Zn +Zn +Zn +Zn +Zn +WA +kh +It +Zn +Zn +Zn +Zn +Zn +Zn +Zn +Zn +Zn +Zn +Zn +Zn +Zn +"} +(29,1,1) = {" +Zn +Zn +Zn +Zn +Zn +Zn +Zn +Zn +Zn +Zn +bZ +Zn +Zn +Zn +Zn +Zn +Zn +Zn +Zn +Zn +Zn +Zn +Zn +"} diff --git a/maps/rift/engines/rust.dmm b/maps/rift/engines/rust.dmm new file mode 100644 index 000000000000..5a37b38e2396 --- /dev/null +++ b/maps/rift/engines/rust.dmm @@ -0,0 +1,1850 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"ah" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 6 + }, +/obj/machinery/meter, +/turf/simulated/floor, +/area/engineering/engine_room) +"am" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/red{ + dir = 8 + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"aQ" = ( +/obj/machinery/air_alarm{ + dir = 1; + pixel_y = -25 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"bt" = ( +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"cn" = ( +/turf/simulated/floor, +/area/engineering/engine_room) +"cY" = ( +/obj/machinery/fusion_fuel_injector/mapped{ + dir = 8; + id_tag = "engine-i" + }, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"cZ" = ( +/obj/machinery/computer/general_air_control/supermatter_core{ + dir = 1; + frequency = 1438; + input_tag = "cooling_in"; + name = "Engine Cooling Control"; + output_tag = "cooling_out"; + pressure_setting = 100; + sensors = list("engine_sensor"="Engine Core") + }, +/turf/template_noop, +/area/template_noop) +"dc" = ( +/obj/machinery/light, +/turf/simulated/floor, +/area/engineering/engine_room) +"dt" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"dY" = ( +/obj/machinery/air_sensor{ + frequency = 1438; + id_tag = "engine_sensor"; + output = 63 + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"ea" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 5 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"ey" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"eB" = ( +/obj/structure/cable/cyan{ + icon_state = "1-4" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"fe" = ( +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/structure/cable/cyan{ + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"fK" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/machinery/power/sensor{ + name = "Powernet Sensor - Engine Power"; + name_tag = "Engine Power" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"gu" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 + }, +/obj/machinery/light, +/turf/simulated/floor, +/area/engineering/engine_room) +"gx" = ( +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/machinery/power/generator{ + anchored = 1 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"gD" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green, +/obj/machinery/meter, +/turf/simulated/floor, +/area/engineering/engine_room) +"hh" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging, +/turf/template_noop, +/area/rift/surfacebase/underground/under2) +"if" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/red{ + dir = 8 + }, +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"iH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/turf/simulated/floor, +/turf/simulated/floor, +/area/template_noop) +"iJ" = ( +/turf/simulated/floor, +/turf/simulated/floor, +/area/template_noop) +"iN" = ( +/obj/fiftyspawner/tritium, +/obj/structure/table/reinforced, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/fiftyspawner/tritium, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"jB" = ( +/obj/machinery/atmospherics/component/binary/circulator{ + anchored = 1; + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"jT" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green, +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"kk" = ( +/obj/machinery/fire_alarm/south_mount{ + pixel_y = 23; + dir = 2 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"ky" = ( +/obj/machinery/power/emitter/gyrotron/anchored{ + dir = 1; + id_tag = "engine-g" + }, +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/structure/cable/cyan{ + icon_state = "0-4" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"kz" = ( +/obj/machinery/computer/fusion_core_control{ + id_tag = "engine" + }, +/turf/simulated/floor/tiled/monotile, +/area/template_noop) +"kE" = ( +/obj/machinery/atmospherics/component/binary/pump{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"kJ" = ( +/obj/machinery/power/fusion_core{ + id_tag = "engine"; + anchored = 1 + }, +/obj/structure/cable/cyan{ + icon_state = "0-4" + }, +/turf/simulated/floor/greengrid/nitrogen, +/area/engineering/engine_room) +"kN" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 9 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"lc" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 10 + }, +/turf/template_noop, +/area/rift/surfacebase/underground/under2) +"lv" = ( +/obj/structure/cable/cyan{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 6 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"lC" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 + }, +/obj/machinery/fire_alarm/south_mount{ + pixel_y = -24 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"lS" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ + dir = 8 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"ma" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline/blue, +/turf/simulated/floor, +/area/engineering/engine_room) +"mf" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ + dir = 8 + }, +/turf/template_noop, +/area/rift/surfacebase/underground/under2) +"mi" = ( +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/structure/grille, +/obj/structure/window/phoronreinforced/full{ + icon_state = "phoronwindow0" + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"mo" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"nB" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red, +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"ob" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 6 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"oi" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green, +/turf/simulated/floor, +/area/engineering/engine_room) +"oP" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, +/obj/structure/cable/cyan{ + icon_state = "1-4" + }, +/obj/structure/cable/cyan{ + icon_state = "2-4" + }, +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"pj" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red, +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"pt" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ + dir = 8 + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"qc" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"qh" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"qn" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"rr" = ( +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"rs" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"rx" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"rG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"rH" = ( +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"sW" = ( +/turf/simulated/wall/r_wall/prepainted/engineering, +/area/engineering/engine_room) +"tv" = ( +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/machinery/button/remote/airlock{ + id = "engine_access_hatch"; + name = "Door Bolt Control"; + pixel_x = -5; + pixel_y = 31; + req_access = list(10); + specialfunctions = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"tD" = ( +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"tR" = ( +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"vi" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"vq" = ( +/obj/fiftyspawner/deuterium, +/obj/structure/table/reinforced, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/fiftyspawner/deuterium, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"vx" = ( +/obj/structure/cable/cyan{ + icon_state = "2-4" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"vS" = ( +/obj/machinery/fusion_fuel_injector/mapped{ + dir = 8; + id_tag = "engine-i" + }, +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"vZ" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green{ + dir = 9 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"wg" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 10 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"wh" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red, +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"xW" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 4 + }, +/obj/structure/grille, +/obj/structure/window/phoronreinforced/full{ + icon_state = "phoronwindow0" + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"yB" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 5 + }, +/turf/template_noop, +/area/rift/surfacebase/underground/under2) +"yS" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/power/apc/south_mount{ + dir = 8; + pixel_y = 0; + pixel_x = 17 + }, +/obj/structure/cable/cyan{ + icon_state = "0-2" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"yV" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 + }, +/obj/machinery/meter, +/turf/simulated/floor, +/area/engineering/engine_room) +"zc" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/red, +/turf/simulated/floor, +/area/engineering/engine_room) +"zu" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 9 + }, +/turf/template_noop, +/area/rift/surfacebase/underground/under2) +"zF" = ( +/obj/machinery/computer/fusion_fuel_control{ + id_tag = "engine-i" + }, +/turf/simulated/floor/tiled/monotile, +/area/template_noop) +"zS" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ + frequency = 1438; + id_tag = "cooling_out"; + pump_direction = 0; + on = 1 + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"Al" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/power/sensor{ + name = "Powernet Sensor - Engine Output"; + name_tag = "Engine Output" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Am" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Az" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"AB" = ( +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"AD" = ( +/obj/machinery/power/emitter/gyrotron/anchored{ + id_tag = "engine-g" + }, +/obj/structure/cable/cyan{ + icon_state = "0-4" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"Be" = ( +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/component/unary/outlet_injector{ + frequency = 1438; + id = "cooling_in"; + use_power = 1 + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"Bg" = ( +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor, +/area/engineering/engine_room) +"BK" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, +/obj/structure/grille, +/obj/structure/window/phoronreinforced/full{ + icon_state = "phoronwindow0" + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"BP" = ( +/obj/machinery/door/airlock/hatch{ + icon_state = "door_locked"; + id_tag = "engine_access_hatch"; + locked = 1; + name = "Fusion Core Access"; + req_access = list(11) + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"Ci" = ( +/obj/machinery/fusion_fuel_compressor, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"Cu" = ( +/obj/machinery/computer/gyrotron_control{ + id_tag = "engine-g" + }, +/turf/simulated/floor/tiled/monotile, +/area/template_noop) +"Cx" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 4 + }, +/turf/template_noop, +/area/rift/surfacebase/underground/under2) +"Dl" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Dq" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ + dir = 4 + }, +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/machinery/meter, +/turf/simulated/floor, +/area/engineering/engine_room) +"Dy" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan, +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"DK" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/green, +/turf/simulated/floor, +/area/engineering/engine_room) +"DY" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 6 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"EU" = ( +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"Fy" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 9 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Gj" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan, +/turf/simulated/floor, +/area/engineering/engine_room) +"Gn" = ( +/obj/machinery/air_alarm{ + pixel_y = 22 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"HM" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 5 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"HP" = ( +/obj/machinery/power/emitter/gyrotron/anchored{ + id_tag = "engine-g" + }, +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/structure/cable/cyan{ + icon_state = "0-4" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"HS" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"In" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan, +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"IO" = ( +/obj/machinery/atmospherics/component/binary/circulator{ + anchored = 1; + dir = 8 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"IY" = ( +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/visible/supply{ + dir = 4 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"Jb" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Ji" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"JU" = ( +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"KL" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red, +/obj/structure/cable/cyan{ + icon_state = "1-8" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"KR" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"LJ" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ + dir = 1; + frequency = 1438; + id_tag = "cooling_out"; + pump_direction = 0; + on = 1 + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"LL" = ( +/turf/template_noop, +/area/rift/surfacebase/underground/under2) +"LN" = ( +/obj/machinery/atmospherics/component/binary/pump/high_power{ + dir = 1 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Mb" = ( +/obj/structure/grille, +/obj/structure/window/phoronreinforced/full{ + icon_state = "phoronwindow0" + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"Mf" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"MB" = ( +/obj/machinery/fusion_fuel_injector/mapped{ + dir = 8; + id_tag = "engine-i" + }, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 6 + }, +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"MC" = ( +/obj/machinery/atmospherics/valve/digital{ + dir = 4; + name = "Emergency Cooling Valve 2" + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor, +/area/engineering/engine_room) +"ME" = ( +/obj/machinery/atmospherics/component/binary/pump{ + dir = 8 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"MF" = ( +/obj/machinery/atmospherics/pipe/manifold4w/visible/red, +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/machinery/meter, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"MQ" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"Nc" = ( +/obj/machinery/atmospherics/component/unary/outlet_injector{ + dir = 1; + frequency = 1438; + id = "cooling_in"; + use_power = 1 + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"NN" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 9 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Ob" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"ON" = ( +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Pf" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/turf/simulated/floor, +/turf/simulated/floor, +/area/template_noop) +"Pm" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Qm" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 10 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Qt" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/green{ + dir = 8 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"QV" = ( +/obj/effect/floor_decal/industrial/warning/corner, +/turf/simulated/floor, +/area/engineering/engine_room) +"Re" = ( +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"Ru" = ( +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"RT" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green{ + dir = 6 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Sf" = ( +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"SR" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 6 + }, +/turf/template_noop, +/area/rift/surfacebase/underground/under2) +"ST" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor, +/turf/simulated/floor, +/area/template_noop) +"Ta" = ( +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"Th" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red, +/turf/simulated/floor, +/area/engineering/engine_room) +"TX" = ( +/obj/machinery/atmospherics/valve/digital{ + name = "Emergency Cooling Valve 1"; + dir = 8 + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor, +/area/engineering/engine_room) +"Vn" = ( +/obj/machinery/power/emitter/gyrotron/anchored{ + dir = 1; + id_tag = "engine-g" + }, +/obj/structure/cable/cyan{ + icon_state = "0-4" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"Wh" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 4 + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"WC" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"WF" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline/red, +/turf/simulated/floor, +/area/engineering/engine_room) +"Yd" = ( +/obj/structure/cable/cyan{ + icon_state = "1-8" + }, +/obj/structure/cable/cyan{ + icon_state = "2-8" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Yh" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ + dir = 1 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Ym" = ( +/obj/item/book/manual/rust_engine, +/turf/template_noop, +/area/template_noop) +"ZO" = ( +/turf/template_noop, +/area/template_noop) + +(1,1,1) = {" +ZO +LL +ZO +ZO +LL +LL +LL +LL +LL +LL +LL +LL +LL +LL +LL +LL +ZO +ZO +ZO +ZO +ZO +ZO +ZO +"} +(2,1,1) = {" +ZO +LL +SR +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +yB +ZO +ZO +ZO +ZO +ZO +"} +(3,1,1) = {" +ZO +LL +Cx +SR +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +zu +LL +LL +LL +ZO +ZO +"} +(4,1,1) = {" +ZO +LL +Cx +lc +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +yB +ZO +"} +(5,1,1) = {" +ZO +LL +lc +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +yB +Cx +ZO +"} +(6,1,1) = {" +ZO +ZO +SR +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +zu +Cx +ZO +"} +(7,1,1) = {" +ZO +ZO +Cx +SR +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +zu +ZO +"} +(8,1,1) = {" +ZO +ZO +Cx +lc +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +yB +ZO +"} +(9,1,1) = {" +ZO +ZO +lc +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +yB +Cx +ZO +"} +(10,1,1) = {" +ZO +LL +LL +LL +LL +LL +sW +sW +sW +sW +sW +sW +sW +sW +sW +sW +sW +SR +hh +hh +zu +Cx +ZO +"} +(11,1,1) = {" +ZO +LL +LL +LL +LL +LL +sW +cn +sW +Mb +Mb +Mb +Mb +Mb +sW +cn +sW +Cx +SR +hh +hh +zu +ZO +"} +(12,1,1) = {" +ZO +cn +cn +cn +cn +cn +sW +cn +Mb +zS +am +LJ +Ta +Ta +Mb +cn +sW +Cx +lc +hh +hh +yB +ZO +"} +(13,1,1) = {" +ZO +cn +cn +cn +cn +cn +qn +AD +Mb +Ta +Wh +Ta +Ta +Ta +Mb +Vn +sW +lc +yB +LL +LL +Cx +ZO +"} +(14,1,1) = {" +ZO +cn +cn +cn +cn +cn +cn +Re +Mb +Ta +Wh +kJ +dY +Ta +Mb +rr +sW +LL +mf +LL +LL +mf +ZO +"} +(15,1,1) = {" +ZO +cn +cn +cn +cn +cn +cn +HP +Mb +Ta +Wh +tD +Ta +Ta +Mb +ky +sW +cn +Am +cn +cn +Az +ZO +"} +(16,1,1) = {" +ZO +cn +cn +cn +cn +cn +cn +rH +Mb +Ta +Wh +Be +pt +Nc +BP +rH +qn +cn +Am +cn +cn +Az +ZO +"} +(17,1,1) = {" +ZO +Pm +cn +cn +cn +cn +cn +rH +sW +Mb +xW +mi +BK +Mb +sW +tv +cn +cn +Am +cn +cn +yV +ZO +"} +(18,1,1) = {" +ZO +cn +cn +cn +cn +cn +cn +rH +qn +Bg +vS +MB +cY +dt +qn +rH +cn +cn +Am +cn +cn +Az +ZO +"} +(19,1,1) = {" +ZO +kk +cn +cn +cn +cn +cn +lv +nB +wh +MF +oP +pj +if +nB +KL +Th +ea +Am +cn +cn +gu +ZO +"} +(20,1,1) = {" +ZO +cn +cn +cn +cn +cn +cn +KR +cn +RT +jT +Mf +Qt +DK +oi +Qt +gD +jT +vZ +cn +cn +lC +ZO +"} +(21,1,1) = {" +ZO +Gn +iN +dt +cn +cn +cn +jB +gx +IO +TX +HS +MC +jB +gx +IO +ah +Dy +lS +LN +Gj +kN +ZO +"} +(22,1,1) = {" +ZO +Pm +Ci +dt +cn +cn +cn +wg +Ob +qc +qc +Dq +mo +Fy +DY +vi +ob +zc +Yh +HM +cn +aQ +ZO +"} +(23,1,1) = {" +ZO +cn +vq +dt +cn +cn +cn +cn +Ji +Qm +vi +In +Gj +Gj +NN +cn +kE +ME +ME +kE +cn +dc +ZO +"} +(24,1,1) = {" +ZO +cn +tR +rs +Al +rs +rs +rs +Sf +rs +rs +ON +rs +rs +Ru +cn +WF +WF +ma +ma +cn +cn +ZO +"} +(25,1,1) = {" +ZO +QV +qh +vx +fK +Dl +Jb +WC +WC +WC +WC +Yd +WC +WC +WC +WC +Jb +Dl +eB +ey +rx +cn +ZO +"} +(26,1,1) = {" +ZO +yS +MQ +fe +JU +IY +rG +JU +JU +JU +JU +JU +EU +JU +JU +JU +rG +IY +bt +AB +dt +cn +ZO +"} +(27,1,1) = {" +ZO +ZO +ST +iH +ZO +ZO +iJ +iJ +iJ +iJ +iJ +ZO +ZO +iJ +ZO +ZO +ZO +ZO +Pf +iJ +ZO +ZO +ZO +"} +(28,1,1) = {" +ZO +ZO +ZO +ZO +ZO +ZO +Ym +kz +zF +Cu +ZO +ZO +ZO +ZO +ZO +ZO +ZO +ZO +ZO +ZO +ZO +ZO +ZO +"} +(29,1,1) = {" +ZO +ZO +ZO +ZO +ZO +ZO +ZO +ZO +ZO +ZO +cZ +ZO +ZO +ZO +ZO +ZO +ZO +ZO +ZO +ZO +ZO +ZO +ZO +"} diff --git a/maps/rift/engines/sme.dmm b/maps/rift/engines/sme.dmm new file mode 100644 index 000000000000..2d01e1dd6f2d --- /dev/null +++ b/maps/rift/engines/sme.dmm @@ -0,0 +1,1876 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"ah" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"bo" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green, +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"bw" = ( +/turf/simulated/floor, +/area/template_noop) +"bA" = ( +/obj/machinery/atmospherics/component/quaternary/atmos_filter, +/turf/simulated/floor, +/area/engineering/engine_room) +"bV" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"ck" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red, +/obj/machinery/atmospherics/pipe/simple/visible/green{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"cz" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, +/obj/machinery/meter, +/turf/simulated/floor, +/area/engineering/engine_room) +"cM" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 10 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"cN" = ( +/obj/machinery/air_alarm{ + dir = 1; + pixel_y = -25 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"dj" = ( +/obj/machinery/atmospherics/valve/digital{ + name = "Emergency Cooling Valve 1"; + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor, +/area/engineering/engine_room) +"dN" = ( +/obj/machinery/atmospherics/component/unary/outlet_injector{ + frequency = 1438; + id = "cooling_in"; + name = "Coolant Injector"; + pixel_y = 1; + power_rating = 30000; + use_power = 1; + volume_rate = 700 + }, +/turf/simulated/floor/greengrid/nitrogen, +/area/engineering/engine_room) +"eD" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"eE" = ( +/obj/machinery/door/blast/regular{ + dir = 2; + id = "SupermatterPort"; + name = "Reactor Blast Door" + }, +/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/obj/structure/grille, +/obj/structure/window/phoronreinforced/full{ + icon_state = "phoronwindow0" + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"eH" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"eN" = ( +/obj/machinery/atmospherics/component/unary/heat_exchanger{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"eZ" = ( +/obj/machinery/atmospherics/component/binary/pump/high_power{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"fm" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"fC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers{ + dir = 4 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"fS" = ( +/turf/template_noop, +/area/template_noop) +"gs" = ( +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"gY" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/red{ + dir = 8 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"hk" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 9 + }, +/obj/machinery/light, +/turf/simulated/floor, +/area/engineering/engine_room) +"hD" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"id" = ( +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/structure/cable/cyan{ + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"iU" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, +/turf/simulated/floor/tiled/monotile, +/area/engineering/engine_room) +"ju" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"jN" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/black{ + dir = 1 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"jQ" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 9 + }, +/turf/template_noop, +/area/rift/surfacebase/underground/under2) +"kb" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/turf/simulated/floor, +/area/template_noop) +"kD" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"lf" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 6 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"ls" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/machinery/power/sensor{ + name = "Powernet Sensor - Engine Power"; + name_tag = "Engine Power" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"lT" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/cyan, +/turf/simulated/floor, +/area/engineering/engine_room) +"lY" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline, +/turf/simulated/floor, +/area/engineering/engine_room) +"me" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/power/sensor{ + name = "Powernet Sensor - Engine Output"; + name_tag = "Engine Output" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"mz" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"mD" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ + dir = 4 + }, +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"ni" = ( +/obj/machinery/computer/general_air_control/supermatter_core{ + dir = 1; + frequency = 1438; + input_tag = "cooling_in"; + name = "Engine Cooling Control"; + output_tag = "cooling_out"; + pressure_setting = 100; + sensors = list("engine_sensor"="Engine Core") + }, +/turf/template_noop, +/area/template_noop) +"nG" = ( +/obj/machinery/atmospherics/pipe/tank{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"nL" = ( +/obj/machinery/computer/power_monitor{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/template_noop) +"nM" = ( +/obj/machinery/power/supermatter, +/turf/simulated/floor/greengrid/nitrogen, +/area/engineering/engine_room) +"oc" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 6 + }, +/turf/template_noop, +/area/rift/surfacebase/underground/under2) +"og" = ( +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"qy" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"ri" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"rr" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/machinery/power/generator{ + anchored = 1 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"rs" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 10 + }, +/turf/template_noop, +/area/rift/surfacebase/underground/under2) +"sj" = ( +/obj/machinery/atmospherics/pipe/simple/visible/black, +/turf/simulated/floor, +/area/engineering/engine_room) +"sm" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/power/apc/south_mount{ + dir = 8; + pixel_y = 0; + pixel_x = 24 + }, +/obj/structure/cable/cyan{ + icon_state = "0-2" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"sq" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 5 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"sy" = ( +/obj/structure/cable/cyan{ + icon_state = "1-4" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"tm" = ( +/turf/simulated/wall/r_wall/prepainted/engineering, +/area/engineering/engine_room) +"tt" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green, +/turf/simulated/floor, +/area/engineering/engine_room) +"tC" = ( +/turf/template_noop, +/area/rift/surfacebase/underground/under2) +"us" = ( +/obj/machinery/computer/sm_monitor{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/template_noop) +"uA" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/black{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor, +/area/engineering/engine_room) +"uU" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, +/obj/machinery/button/remote/airlock{ + id = "engine_access_hatch"; + name = "Door Bolt Control"; + pixel_y = 39; + req_access = list(10); + specialfunctions = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"uV" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ + dir = 8 + }, +/turf/template_noop, +/area/rift/surfacebase/underground/under2) +"ve" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging, +/turf/template_noop, +/area/rift/surfacebase/underground/under2) +"vk" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/red, +/turf/simulated/floor, +/area/engineering/engine_room) +"vp" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/engine{ + dir = 1; + external_pressure_bound = 100; + external_pressure_bound_default = 0; + frequency = 1438; + icon_state = "map_vent_in"; + id_tag = "cooling_out"; + initialize_directions = 4; + pump_direction = 0; + on = 1 + }, +/turf/simulated/floor/greengrid/nitrogen, +/area/engineering/engine_room) +"vr" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor, +/area/template_noop) +"vZ" = ( +/obj/machinery/atmospherics/component/binary/pump{ + dir = 8 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"wf" = ( +/obj/machinery/light, +/turf/simulated/floor, +/area/engineering/engine_room) +"wz" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"wF" = ( +/obj/machinery/atmospherics/component/binary/pump{ + dir = 4; + name = "Scrubbers to Filter" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"wS" = ( +/obj/machinery/atmospherics/component/binary/pump{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"xf" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 5 + }, +/turf/template_noop, +/area/rift/surfacebase/underground/under2) +"xl" = ( +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/machinery/power/generator{ + anchored = 1 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"yA" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"yO" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline/red, +/turf/simulated/floor, +/area/engineering/engine_room) +"yP" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/black, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"zw" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"zD" = ( +/obj/machinery/atmospherics/valve/digital{ + dir = 4; + name = "Emergency Cooling Valve 2" + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"zI" = ( +/obj/machinery/fire_alarm/south_mount{ + pixel_y = 23; + dir = 2 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"zJ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/turf/simulated/floor, +/area/template_noop) +"Aj" = ( +/obj/machinery/computer/security/engineering{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/template_noop) +"Ak" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/green{ + dir = 8 + }, +/obj/machinery/meter, +/turf/simulated/floor, +/area/engineering/engine_room) +"Am" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"AA" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/green, +/turf/simulated/floor, +/area/engineering/engine_room) +"AG" = ( +/obj/machinery/door/blast/regular{ + dir = 4; + id = "SupermatterPort"; + name = "Reactor Blast Door" + }, +/obj/structure/grille, +/obj/structure/window/phoronreinforced/full{ + icon_state = "phoronwindow0" + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"AR" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 4 + }, +/obj/machinery/meter, +/turf/simulated/floor, +/area/engineering/engine_room) +"Bd" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green{ + dir = 6 + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Br" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 6 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Bx" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/red, +/turf/simulated/floor, +/area/engineering/engine_room) +"Ce" = ( +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Cw" = ( +/obj/effect/floor_decal/steeldecal/steel_decals_central4{ + dir = 8 + }, +/turf/simulated/floor/tiled/monotile, +/area/engineering/engine_room) +"Dc" = ( +/obj/machinery/air_sensor{ + frequency = 1438; + id_tag = "engine_sensor"; + output = 63 + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"DK" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"DO" = ( +/obj/item/book/manual/supermatter_engine, +/turf/template_noop, +/area/template_noop) +"Ea" = ( +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning/corner, +/turf/simulated/floor, +/area/engineering/engine_room) +"El" = ( +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Ew" = ( +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"ES" = ( +/obj/effect/floor_decal/industrial/warning/corner, +/turf/simulated/floor, +/area/engineering/engine_room) +"FG" = ( +/obj/machinery/button/remote/emitter{ + desc = "A remote control-switch for the engine emitter."; + id = "EngineEmitter"; + name = "Engine Emitter"; + pixel_y = -3; + req_access = list(10); + pixel_x = -7 + }, +/obj/machinery/button/remote/blast_door{ + desc = "A remote control-switch for the engine charging port."; + id = "SupermatterPort"; + name = "Reactor Blast Doors"; + pixel_x = 6; + pixel_y = -3; + req_access = list(10) + }, +/turf/template_noop, +/area/template_noop) +"FW" = ( +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"Go" = ( +/obj/machinery/atmospherics/component/binary/circulator{ + anchored = 1; + dir = 8 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Gw" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan, +/obj/machinery/meter, +/turf/simulated/floor, +/area/engineering/engine_room) +"Ho" = ( +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"HF" = ( +/obj/machinery/fire_alarm/south_mount{ + pixel_y = -24 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"HM" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/black{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Ia" = ( +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 9 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Ih" = ( +/obj/machinery/air_alarm{ + pixel_y = 22 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"IE" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan, +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"JK" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 9 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"JM" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/black, +/turf/simulated/floor, +/area/engineering/engine_room) +"JS" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/turf/simulated/floor/tiled/monotile, +/area/engineering/engine_room) +"JZ" = ( +/obj/structure/grille, +/obj/machinery/door/blast/regular{ + dir = 2; + id = "SupermatterPort"; + name = "Reactor Blast Door" + }, +/obj/structure/window/phoronreinforced/full{ + icon_state = "phoronwindow0" + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"Kr" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"KT" = ( +/turf/simulated/wall/r_wall/prepainted/engineering, +/area/template_noop) +"KW" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"LK" = ( +/obj/machinery/atmospherics/component/binary/pump{ + dir = 1 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"LL" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 5 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"LR" = ( +/obj/machinery/atmospherics/component/binary/circulator{ + anchored = 1; + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"LS" = ( +/obj/machinery/power/emitter{ + anchored = 1; + dir = 8; + id = "EngineEmitter"; + pixel_y = 8; + state = 2 + }, +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 5 + }, +/obj/structure/cable/cyan{ + icon_state = "0-4" + }, +/turf/simulated/floor/tiled/monotile, +/area/engineering/engine_room) +"LV" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan, +/turf/simulated/floor, +/area/engineering/engine_room) +"LX" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/red{ + dir = 8 + }, +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Me" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 10 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Mr" = ( +/turf/simulated/floor, +/area/engineering/engine_room) +"Ms" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green{ + dir = 9 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Mw" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 4 + }, +/turf/template_noop, +/area/rift/surfacebase/underground/under2) +"MN" = ( +/obj/machinery/door/blast/regular{ + dir = 2; + id = "SupermatterPort"; + name = "Reactor Blast Door" + }, +/obj/structure/grille, +/obj/structure/window/phoronreinforced/full{ + icon_state = "phoronwindow0" + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"Nd" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/red{ + dir = 1 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Nh" = ( +/obj/structure/cable/cyan{ + icon_state = "2-4" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Od" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"OU" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 + }, +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Pd" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ + dir = 1 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"PA" = ( +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 5 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"PL" = ( +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"QB" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red, +/turf/simulated/floor, +/area/engineering/engine_room) +"QE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"QG" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red, +/obj/machinery/door/blast/regular{ + dir = 2; + id = "SupermatterPort"; + name = "Reactor Blast Door" + }, +/obj/structure/grille, +/obj/structure/window/phoronreinforced/full{ + icon_state = "phoronwindow0" + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"QO" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 5 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"QQ" = ( +/turf/simulated/floor/greengrid/nitrogen, +/area/engineering/engine_room) +"Rf" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 10 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"RK" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Sp" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Su" = ( +/obj/machinery/atmospherics/component/binary/pump{ + dir = 8 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Sw" = ( +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/visible/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"SQ" = ( +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"Uh" = ( +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Vh" = ( +/obj/machinery/atmospherics/component/unary/heat_exchanger, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"VA" = ( +/obj/machinery/button/remote/blast_door{ + desc = "A remote control-switch for the engine charging port."; + id = "SupermatterPort"; + name = "Reactor Blast Doors"; + pixel_x = -32; + pixel_y = -5; + req_access = list(10) + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Wa" = ( +/obj/structure/cable/cyan{ + icon_state = "1-8" + }, +/obj/structure/cable/cyan{ + icon_state = "2-8" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Wd" = ( +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor, +/area/engineering/engine_room) +"Wp" = ( +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/manifold/visible/black{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Xt" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 9 + }, +/obj/machinery/meter, +/turf/simulated/floor, +/area/engineering/engine_room) +"Xx" = ( +/obj/machinery/door/airlock/hatch{ + icon_state = "door_locked"; + id_tag = "engine_access_hatch"; + locked = 1; + name = "Supermatter Core Access"; + req_access = list(11) + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"XP" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline/blue, +/turf/simulated/floor, +/area/engineering/engine_room) +"Ys" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/green{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Zb" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/red, +/turf/simulated/floor, +/area/engineering/engine_room) +"ZS" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) + +(1,1,1) = {" +fS +fS +fS +fS +tC +tC +tC +tC +tC +tC +tC +tC +tC +tC +tC +tC +fS +fS +fS +fS +fS +fS +fS +"} +(2,1,1) = {" +fS +tC +oc +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +xf +fS +fS +fS +fS +fS +"} +(3,1,1) = {" +fS +tC +Mw +oc +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +jQ +tC +tC +tC +fS +fS +"} +(4,1,1) = {" +fS +tC +Mw +rs +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +xf +fS +"} +(5,1,1) = {" +fS +tC +rs +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +xf +Mw +fS +"} +(6,1,1) = {" +fS +fS +oc +xf +oc +xf +oc +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +jQ +Mw +fS +"} +(7,1,1) = {" +fS +fS +Mw +Mw +Mw +Mw +Mw +oc +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +jQ +fS +"} +(8,1,1) = {" +fS +fS +Mw +Mw +Mw +Mw +Mw +rs +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +xf +fS +"} +(9,1,1) = {" +fS +fS +Mw +Mw +Mw +Mw +rs +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +xf +Mw +fS +"} +(10,1,1) = {" +fS +oc +jQ +Mw +Mw +Mw +tm +tm +tm +tm +tm +tm +tm +tm +tm +tm +tm +oc +ve +ve +jQ +Mw +fS +"} +(11,1,1) = {" +fS +uV +tC +rs +jQ +uV +tm +Mr +Mr +tm +AG +AG +AG +tm +Mr +Mr +tm +Mw +oc +ve +ve +jQ +fS +"} +(12,1,1) = {" +fS +jN +sj +sj +sj +Ia +tm +Mr +Mr +JZ +SQ +QQ +SQ +MN +Mr +Mr +tm +Mw +rs +ve +ve +xf +fS +"} +(13,1,1) = {" +fS +Ea +Am +Am +nG +Mr +hD +lf +QB +QG +vp +nM +dN +eE +QO +Mr +tm +rs +xf +tC +tC +Mw +fS +"} +(14,1,1) = {" +fS +uA +eN +Vh +yP +Mr +lf +Zb +Mr +JZ +Dc +QQ +SQ +MN +qy +Mr +tm +tC +uV +tC +tC +uV +fS +"} +(15,1,1) = {" +fS +uA +eN +Vh +yP +Mr +bA +Zb +Mr +tm +AG +AG +Xx +tm +uU +Mr +tm +Mr +wz +Mr +Mr +Kr +KT +"} +(16,1,1) = {" +fS +HM +PA +KW +Wp +LK +JM +AR +Mr +hD +JS +Cw +iU +VA +cz +Mr +hD +Mr +wz +Mr +Mr +Kr +KT +"} +(17,1,1) = {" +fS +Su +wF +Mr +wF +Mr +bA +Zb +Mr +Mr +Wd +LS +ju +Mr +qy +Mr +Mr +Mr +wz +Mr +Mr +Kr +KT +"} +(18,1,1) = {" +fS +lY +lY +Mr +lY +Mr +Me +Zb +Mr +Mr +Bd +bo +Ys +tt +AA +Ak +tt +tt +Ms +Mr +Mr +Kr +KT +"} +(19,1,1) = {" +fS +zI +Mr +Mr +Mr +Mr +Mr +Me +gY +QB +ck +LX +ck +gY +vk +Bx +LL +Mr +Br +LV +Gw +hk +KT +"} +(20,1,1) = {" +fS +Mr +Mr +Mr +Mr +Mr +Mr +Mr +LR +xl +Go +zD +dj +LR +rr +Go +RK +Mr +eZ +Mr +Mr +HF +KT +"} +(21,1,1) = {" +fS +Ih +Mr +Mr +Mr +Mr +Mr +Mr +Rf +eH +ZS +OU +yA +yA +JK +Pd +IE +LV +lT +Mr +Mr +Mr +KT +"} +(22,1,1) = {" +fS +Sp +Mr +Mr +Mr +Mr +Mr +Mr +Mr +fm +cM +mD +LV +LV +DK +Xt +Nd +LL +Pd +sq +Mr +cN +KT +"} +(23,1,1) = {" +fS +Mr +Mr +Mr +Mr +Mr +Mr +Mr +Mr +fm +Mr +Uh +Mr +Mr +fm +Mr +vZ +wS +vZ +wS +Mr +wf +KT +"} +(24,1,1) = {" +fS +Mr +og +eD +me +eD +eD +eD +eD +Ew +eD +Ce +eD +eD +El +Mr +yO +yO +XP +XP +Mr +Mr +KT +"} +(25,1,1) = {" +fS +ES +ah +Nh +ls +zw +Od +mz +mz +mz +mz +Wa +mz +mz +mz +mz +Od +zw +sy +Am +bV +Mr +KT +"} +(26,1,1) = {" +fS +sm +kD +id +PL +Sw +QE +FW +FW +FW +FW +FW +PL +FW +FW +FW +fC +Sw +gs +Ho +ri +Mr +KT +"} +(27,1,1) = {" +fS +fS +vr +kb +fS +fS +bw +bw +bw +bw +bw +fS +fS +bw +fS +fS +fS +fS +zJ +bw +fS +fS +fS +"} +(28,1,1) = {" +fS +fS +fS +fS +fS +fS +DO +Aj +nL +us +fS +fS +fS +fS +fS +fS +fS +fS +fS +fS +fS +fS +fS +"} +(29,1,1) = {" +fS +fS +fS +fS +fS +fS +FG +fS +fS +fS +ni +fS +fS +fS +fS +fS +fS +fS +fS +fS +fS +fS +fS +"} diff --git a/maps/rift/levels/rift-02-underground2.dmm b/maps/rift/levels/rift-02-underground2.dmm index ef3d3d91bed4..bc54efe72c3a 100644 --- a/maps/rift/levels/rift-02-underground2.dmm +++ b/maps/rift/levels/rift-02-underground2.dmm @@ -24,22 +24,6 @@ /obj/turbolift_map_holder/rift, /turf/simulated/floor/holofloor/tiled/dark, /area/turbolift/runder/level2) -"ah" = ( -/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ - dir = 4 - }, -/turf/simulated/floor/outdoors/snow/noblend/indoors/lythios43c{ - special_temperature = 233 - }, -/area/engineering/engine_room) -"ai" = ( -/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ - dir = 5 - }, -/turf/simulated/floor/outdoors/snow/noblend/indoors/lythios43c{ - special_temperature = 233 - }, -/area/engineering/engine_room) "aj" = ( /obj/effect/floor_decal/techfloor{ dir = 6 @@ -52,25 +36,9 @@ }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/public_bunker) -"ak" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/green{ - dir = 4 - }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint/sun, -/turf/simulated/floor, -/area/engineering/engine_room) -"al" = ( -/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ - dir = 9 - }, -/turf/simulated/floor/outdoors/snow/noblend/indoors/lythios43c{ - special_temperature = 233 - }, -/area/engineering/engine_room) "am" = ( -/turf/simulated/floor/outdoors/snow/noblend/indoors/lythios43c{ - special_temperature = 233 +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" }, /area/engineering/engine_room) "an" = ( @@ -94,14 +62,6 @@ /obj/structure/closet/secure_closet/atmos_personal, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos/locker_room) -"aq" = ( -/obj/machinery/atmospherics/pipe/simple/visible/black{ - dir = 9 - }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint/sun, -/turf/simulated/floor/plating, -/area/engineering/engine_room) "ar" = ( /turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_room) @@ -135,23 +95,6 @@ /obj/item/clothing/glasses/welding, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/public_bunker) -"av" = ( -/obj/effect/floor_decal/rust, -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint/sun, -/turf/simulated/floor/plating/lythios43c{ - outdoors = 0 - }, -/area/engineering/engine_core) -"aw" = ( -/obj/effect/floor_decal/rust, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/turf/simulated/floor/plating/lythios43c{ - outdoors = 0 - }, -/area/engineering/engine_core) "ax" = ( /obj/effect/floor_decal/techfloor{ dir = 4 @@ -169,22 +112,6 @@ "aA" = ( /turf/simulated/wall/r_wall/prepainted/engineering, /area/crew_quarters/heads/chief) -"aC" = ( -/obj/machinery/air_alarm{ - dir = 1; - pixel_y = -25 - }, -/obj/structure/catwalk, -/obj/machinery/light, -/turf/simulated/floor, -/area/engineering/engine_room) -"aD" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/black{ - dir = 1 - }, -/obj/machinery/meter, -/turf/simulated/floor, -/area/engineering/engine_room) "aE" = ( /obj/spawner/window/low_wall/full/nogrille/firelocks, /obj/effect/paint/sun, @@ -266,14 +193,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/atmos) -"aQ" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/black{ - dir = 1 - }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint/sun, -/turf/simulated/floor/plating, -/area/engineering/engine_room) "aR" = ( /obj/structure/bed/chair/sofa/black/right, /turf/simulated/floor/plating, @@ -491,26 +410,6 @@ /obj/item/storage/single_use/med_pouch/trauma, /turf/simulated/floor/tiled, /area/engineering/foyer) -"bs" = ( -/obj/machinery/atmospherics/component/unary/heat_exchanger, -/obj/structure/window/phoronreinforced, -/obj/structure/window/phoronreinforced{ - dir = 8 - }, -/turf/simulated/floor, -/area/engineering/engine_room) -"bu" = ( -/obj/machinery/atmospherics/component/unary/heat_exchanger{ - dir = 1 - }, -/obj/structure/window/phoronreinforced{ - dir = 1 - }, -/obj/structure/window/phoronreinforced{ - dir = 8 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "by" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -551,23 +450,13 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/atmos) -"bI" = ( -/obj/machinery/atmospherics/pipe/tank{ - dir = 4 - }, -/turf/simulated/floor, -/area/engineering/engine_room) -"bJ" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green{ +"bK" = ( +/obj/structure/railing{ dir = 4 }, -/turf/simulated/floor, -/area/engineering/engine_room) -"bK" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/black, -/obj/machinery/meter, -/turf/simulated/floor, -/area/engineering/engine_room) +/obj/effect/overlay/snow/floor, +/turf/simulated/floor/plating, +/area/maintenance/atmos) "bL" = ( /obj/structure/table/woodentable, /obj/structure/flora/pottedplant/small{ @@ -583,44 +472,12 @@ "bO" = ( /turf/simulated/wall/prepainted, /area/maintenance/chapel) -"bQ" = ( -/turf/simulated/wall/r_wall/prepainted/engineering, -/area/engineering/engine_core) "bT" = ( -/obj/structure/table/steel_reinforced, -/obj/item/paper_bin, /obj/machinery/requests_console/preset/engineering{ pixel_y = -30 }, /turf/simulated/floor/tiled/monotile, -/area/engineering/engine_room) -"bU" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 6 - }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 - }, -/obj/machinery/atmospherics/component/unary/outlet_injector{ - dir = 4; - frequency = 1438; - id = "cooling_in"; - name = "Coolant Injector"; - pixel_y = 1; - power_rating = 30000; - use_power = 1; - volume_rate = 700 - }, -/turf/simulated/floor/reinforced/nitrogen{ - initial_gas_mix = "n2=82.1472;TEMP=293.15" - }, -/area/engineering/engine_core) -"bV" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/green, -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint/sun, -/turf/simulated/floor, -/area/engineering/engine_room) +/area/engineering/engine_monitoring) "bW" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -667,21 +524,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel_grid, /area/engineering/hallway) -"cd" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green{ - dir = 10 - }, -/obj/structure/catwalk, -/turf/simulated/floor, -/area/engineering/engine_room) "ce" = ( /obj/effect/floor_decal/borderfloor, /turf/simulated/floor/tiled/steel_grid, /area/engineering/hallway) -"cg" = ( -/obj/machinery/atmospherics/portables_connector, -/turf/simulated/floor, -/area/engineering/engine_room) "ch" = ( /obj/structure/table/bench/padded, /obj/machinery/light{ @@ -722,12 +568,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/secure_storage/critical) -"cp" = ( -/obj/machinery/atmospherics/component/binary/pump{ - dir = 8 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "cq" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -753,9 +593,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel_grid, /area/engineering/hallway) -"cr" = ( -/turf/simulated/floor/lythios43c/indoors, -/area/engineering/engine_room) "ct" = ( /obj/machinery/suit_storage_unit/atmos, /turf/simulated/floor/tiled, @@ -793,16 +630,12 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/heads/chief) -"cF" = ( -/obj/machinery/atmospherics/component/binary/circulator{ - anchored = 1; - dir = 1 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "cG" = ( -/turf/simulated/floor/greengrid/nitrogen, -/area/engineering/engine_core) +/obj/machinery/camera/network/engine{ + dir = 8 + }, +/turf/simulated/mineral/floor/icerock/lythios43c/indoors/ignore_cavegen, +/area/rift/surfacebase/underground/under2) "cK" = ( /obj/effect/floor_decal/techfloor{ dir = 6 @@ -827,14 +660,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/public_bunker) -"cM" = ( -/obj/machinery/power/generator{ - anchored = 1; - dir = 4 - }, -/obj/structure/cable/yellow, -/turf/simulated/floor, -/area/engineering/engine_room) "cN" = ( /obj/structure/catwalk, /obj/structure/cable/green{ @@ -843,20 +668,12 @@ /turf/simulated/floor/plating, /area/maintenance/lower/atmos) "cO" = ( -/obj/structure/window/reinforced{ - dir = 8 +/obj/machinery/portable_atmospherics/canister/empty, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 }, -/obj/structure/closet/radiation, -/obj/item/clothing/glasses/meson, -/obj/item/clothing/glasses/meson, -/turf/simulated/floor, +/turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_gas) -"cQ" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 9 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "cR" = ( /obj/effect/floor_decal/borderfloor, /obj/machinery/door/firedoor/glass{ @@ -899,13 +716,6 @@ "da" = ( /turf/simulated/wall/prepainted/engineering, /area/engineering/engine_smes) -"db" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/green{ - dir = 4 - }, -/obj/machinery/meter, -/turf/simulated/floor, -/area/engineering/engine_room) "dc" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -920,39 +730,7 @@ dir = 8 }, /turf/simulated/floor/tiled/steel_grid, -/area/engineering/engine_room) -"dg" = ( -/obj/machinery/computer/general_air_control/supermatter_core{ - dir = 4; - input_tag = "cooling_in"; - name = "Engine Cooling Control"; - output_tag = "cooling_out"; - sensors = list("engine_sensor"="Engine Core") - }, -/turf/simulated/floor/tiled/monotile, -/area/engineering/engine_room) -"dh" = ( -/obj/machinery/button/remote/blast_door{ - desc = "A remote control-switch for the engine charging port."; - id = "SupermatterPort"; - name = "Reactor Blast Doors"; - pixel_x = -25; - pixel_y = -5; - req_access = list(10) - }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 - }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/obj/machinery/button/remote/airlock{ - id = "engine_access_hatch"; - name = "Access Hatch bolts"; - pixel_x = -25; - pixel_y = 7; - specialfunctions = 4 - }, -/turf/simulated/floor, -/area/engineering/engine_room) +/area/engineering/engine_monitoring) "di" = ( /turf/simulated/floor/tiled/monotile, /area/engineering/engineering_monitoring) @@ -972,25 +750,6 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/engineering/hallway) -"dm" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/cyan, -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint/sun, -/turf/simulated/floor, -/area/engineering/engine_room) -"do" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/cyan{ - icon_state = "1-2" - }, -/turf/simulated/floor, -/area/engineering/engine_room) "dp" = ( /obj/machinery/door/airlock/engineeringatmos{ name = "Bunk Room" @@ -1000,10 +759,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/wood, /area/engineering/break_room) -"dq" = ( -/obj/machinery/atmospherics/component/quaternary/atmos_filter, -/turf/simulated/floor, -/area/engineering/engine_room) "dt" = ( /obj/structure/catwalk, /obj/structure/cable/green{ @@ -1014,10 +769,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/atmos) -"du" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green, -/turf/simulated/floor, -/area/engineering/engine_room) "dv" = ( /obj/effect/floor_decal/rust, /obj/structure/railing{ @@ -1028,27 +779,26 @@ "dw" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/maintenance/research/xenobio) -"dx" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/red, -/obj/machinery/meter, -/obj/effect/floor_decal/industrial/warning{ - dir = 10 - }, -/turf/simulated/floor, -/area/engineering/engine_room) -"dA" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/red, -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor, -/area/engineering/engine_room) "dD" = ( -/obj/structure/table/steel_reinforced, -/obj/machinery/fire_alarm/north_mount, -/obj/machinery/light{ - dir = 1 +/obj/machinery/button/remote/blast_door{ + desc = "A remote control-switch for the engine control room blast doors."; + id = "engine_monitor_blast"; + name = "Monitoring Room Blast Doors"; + pixel_y = 9; + req_access = list(10); + pixel_x = 6 }, +/obj/machinery/button/remote/blast_door{ + desc = "A remote control-switch for the engine charging port."; + id = "engine_room_blast"; + name = "Engine Room Window Blast Doors"; + pixel_x = -7; + pixel_y = 9; + req_access = list(10) + }, +/obj/structure/table/marble, /turf/simulated/floor/tiled/monotile, -/area/engineering/engine_room) +/area/engineering/engine_monitoring) "dE" = ( /obj/machinery/light, /turf/simulated/floor/lino, @@ -1112,23 +862,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/mining) -"dP" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/black{ - dir = 4 - }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint/sun, -/turf/simulated/floor/plating, -/area/engineering/engine_room) -"dQ" = ( -/obj/machinery/shield_diffuser, -/obj/machinery/door/blast/regular{ - dir = 4; - id = "EngineVent"; - name = "Reactor Vent" - }, -/turf/simulated/floor/greengrid/nitrogen, -/area/engineering/engine_core) "dR" = ( /obj/effect/floor_decal/borderfloor, /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -1152,10 +885,6 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/plating, /area/engineering/storage) -"dX" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red, -/turf/simulated/floor, -/area/engineering/engine_room) "dY" = ( /obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ @@ -1481,44 +1210,6 @@ "eK" = ( /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/engi_wash) -"eL" = ( -/obj/structure/grille, -/obj/structure/window/phoronreinforced, -/obj/structure/window/phoronreinforced{ - dir = 1 - }, -/obj/structure/window/phoronreinforced{ - dir = 8 - }, -/obj/structure/window/phoronreinforced{ - dir = 4 - }, -/obj/machinery/door/blast/regular{ - dir = 4; - id = "SupermatterPort"; - name = "Reactor Blast Door" - }, -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 4 - }, -/turf/simulated/floor, -/area/engineering/engine_core) -"eM" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/machinery/air_sensor{ - frequency = 1438; - id_tag = "engine_sensor"; - output = 63 - }, -/turf/simulated/floor/reinforced/nitrogen{ - initial_gas_mix = "n2=82.1472;TEMP=293.15" - }, -/area/engineering/engine_core) "eN" = ( /obj/structure/catwalk, /obj/structure/cable/green{ @@ -1526,13 +1217,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/atmos) -"eQ" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/green, -/turf/simulated/floor, -/area/engineering/engine_room) "eT" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 1 @@ -1559,6 +1243,10 @@ }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/public_bunker) +"eW" = ( +/obj/machinery/light, +/turf/simulated/floor/tiled, +/area/engineering/engine_eva) "eX" = ( /obj/machinery/fire_alarm/east_mount, /obj/structure/cable{ @@ -1578,7 +1266,7 @@ icon_state = "1-2" }, /turf/simulated/floor/tiled/steel_grid, -/area/engineering/engine_room) +/area/engineering/engine_monitoring) "fa" = ( /obj/machinery/door/firedoor/glass, /obj/structure/cable{ @@ -1587,12 +1275,6 @@ /obj/structure/cable, /turf/simulated/floor/plating, /area/maintenance/substation/atmos) -"fb" = ( -/obj/machinery/atmospherics/pipe/simple/heat_exchanging, -/turf/simulated/floor/outdoors/snow/noblend/indoors/lythios43c{ - special_temperature = 233 - }, -/area/engineering/engine_room) "ff" = ( /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/chief) @@ -1610,20 +1292,10 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/public_bunker) -"fh" = ( -/obj/machinery/atmospherics/component/binary/circulator{ - anchored = 1 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "fi" = ( /obj/landmark/spawnpoint/job/station_engineer, /turf/simulated/floor/tiled/steel, /area/engineering/locker_room) -"fj" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/black, -/turf/simulated/floor, -/area/engineering/engine_room) "fk" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 @@ -1636,18 +1308,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/hallway/primary/undertwo) -"fm" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 10 - }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 - }, -/obj/structure/cable/cyan{ - icon_state = "1-2" - }, -/turf/simulated/floor, -/area/engineering/engine_room) "fn" = ( /obj/landmark/spawnpoint/job/atmospheric_technician, /turf/simulated/floor/tiled/steel, @@ -1718,8 +1378,14 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/engineering/hallway) +"fD" = ( +/obj/machinery/portable_atmospherics/canister/nitrous_oxide, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_gas) "fE" = ( -/obj/machinery/power/smes/buildable/engine, /obj/structure/sign/securearea{ desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; @@ -1727,16 +1393,9 @@ pixel_x = -32 }, /obj/structure/cable/cyan, +/obj/machinery/power/smes/buildable/engine/rust, /turf/simulated/floor, /area/engineering/engine_smes) -"fF" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ - dir = 8 - }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint/sun, -/turf/simulated/floor, -/area/engineering/engine_room) "fG" = ( /obj/structure/catwalk, /obj/structure/cable/cyan{ @@ -1866,23 +1525,12 @@ /obj/effect/floor_decal/borderfloor, /turf/simulated/floor/tiled/steel, /area/hallway/primary/undertwo) -"ga" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor, -/area/engineering/engine_room) -"gc" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ - dir = 1 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "gd" = ( /obj/structure/table/steel_reinforced, /obj/item/storage/firstaid/toxin, +/obj/item/storage/single_use/med_pouch/radiation, /turf/simulated/floor/tiled/monotile, -/area/engineering/engine_room) +/area/engineering/engine_monitoring) "ge" = ( /obj/effect/floor_decal/borderfloor, /obj/machinery/light, @@ -1904,11 +1552,6 @@ }, /turf/simulated/floor/tiled/steel, /area/rift/station/stairs_one) -"gg" = ( -/turf/simulated/floor/outdoors/snow/noblend/indoors/lythios43c{ - special_temperature = 233 - }, -/area/rift/surfacebase/underground/under2) "gk" = ( /obj/effect/floor_decal/borderfloor, /obj/machinery/light, @@ -1930,13 +1573,6 @@ }, /turf/simulated/floor/tiled/steel, /area/rift/station/stairs_one) -"gn" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/red{ - dir = 8 - }, -/obj/structure/catwalk, -/turf/simulated/floor, -/area/engineering/engine_room) "go" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -1963,14 +1599,6 @@ dir = 8 }, /area/engineering/foyer) -"gr" = ( -/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ - dir = 1 - }, -/turf/simulated/floor/outdoors/snow/noblend/lythios43c{ - special_temperature = 233 - }, -/area/engineering/engine_room) "gs" = ( /obj/structure/table/reinforced, /obj/random/tool, @@ -2013,42 +1641,8 @@ /turf/simulated/floor/tiled/steel, /area/rift/station/stairs_one) "gy" = ( -/obj/structure/table/steel_reinforced, -/obj/machinery/button/remote/blast_door{ - desc = "A remote control-switch for the engine control room blast doors."; - id = "sm_monitor_blast"; - name = "Engine Monitoring Room Blast Doors"; - pixel_y = -3; - req_access = list(10) - }, -/obj/machinery/button/remote/blast_door{ - desc = "A remote control-switch for the engine charging port."; - id = "SupermatterPort"; - name = "Reactor Blast Doors"; - pixel_x = -6; - pixel_y = 7; - req_access = list(10) - }, -/obj/machinery/button/remote/emitter{ - desc = "A remote control-switch for the engine emitter."; - id = "EngineEmitter"; - name = "Engine Emitter"; - pixel_x = 6; - pixel_y = 7; - req_access = list(10) - }, /turf/simulated/floor/tiled/steel_grid, -/area/engineering/engine_room) -"gz" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/black{ - dir = 1 - }, -/obj/machinery/meter, -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor, -/area/engineering/engine_room) +/area/engineering/engine_monitoring) "gC" = ( /obj/structure/curtain/open/bed{ name = "brown curtain" @@ -2058,15 +1652,15 @@ }, /turf/simulated/floor/wood, /area/engineering/break_room) -"gD" = ( -/obj/machinery/atmospherics/component/binary/pump/high_power, -/turf/simulated/floor, -/area/engineering/engine_room) "gF" = ( /obj/machinery/vending/engivend, /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/steel, /area/engineering/locker_room) +"gG" = ( +/obj/map_helper/engine_loader, +/turf/simulated/mineral/icerock/lythios43c, +/area/rift/surfacebase/underground/under2) "gH" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced{ @@ -2170,14 +1764,6 @@ /obj/machinery/computer/skills, /turf/simulated/floor/carpet/oracarpet, /area/crew_quarters/heads/chief) -"gT" = ( -/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ - dir = 5 - }, -/turf/simulated/floor/outdoors/snow/noblend/lythios43c{ - special_temperature = 233 - }, -/area/engineering/engine_room) "gU" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -2340,27 +1926,10 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel_grid, /area/engineering/hallway) -"hz" = ( -/obj/structure/catwalk, -/obj/machinery/air_alarm{ - dir = 8; - pixel_x = 24 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/camera/network/engine{ - dir = 8 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "hA" = ( /obj/structure/table/steel_reinforced, /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/critical) -"hC" = ( -/obj/machinery/shield_diffuser, -/turf/simulated/wall/r_wall/prepainted/engineering, -/area/engineering/engine_core) "hE" = ( /obj/structure/bed/chair/comfy/beige{ dir = 1 @@ -2414,24 +1983,11 @@ /obj/landmark/spawnpoint/job/chief_engineer, /turf/simulated/floor/carpet/oracarpet, /area/crew_quarters/heads/chief) -"hN" = ( -/obj/machinery/computer/security/engineering{ - dir = 4 - }, -/turf/simulated/floor/tiled/monotile, -/area/engineering/engine_room) "hQ" = ( -/obj/machinery/computer/sm_monitor{ - dir = 4 - }, -/turf/simulated/floor/tiled/monotile, -/area/engineering/engine_room) -"hR" = ( -/obj/machinery/atmospherics/pipe/simple/visible/black{ - dir = 4 - }, -/turf/simulated/floor, -/area/engineering/engine_room) +/obj/structure/catwalk, +/obj/structure/railing, +/turf/simulated/floor/plating, +/area/maintenance/atmos) "hS" = ( /obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ @@ -2439,18 +1995,6 @@ }, /turf/simulated/floor/tiled/steel, /area/engineering/atmos/locker_room) -"hT" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/green{ - dir = 8 - }, -/turf/simulated/floor, -/area/engineering/engine_room) -"hU" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ - dir = 4 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "hV" = ( /obj/effect/floor_decal/borderfloor/corner, /obj/effect/floor_decal/steeldecal/steel_decals5{ @@ -2492,23 +2036,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/secure_storage/lower) -"ij" = ( -/obj/effect/floor_decal/industrial/warning/cee{ - dir = 8 - }, -/turf/simulated/floor/reinforced/nitrogen{ - initial_gas_mix = "n2=82.1472;TEMP=293.15" - }, -/area/engineering/engine_core) -"ik" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/reinforced/nitrogen{ - initial_gas_mix = "n2=82.1472;TEMP=293.15" - }, -/area/engineering/engine_core) "io" = ( /obj/structure/railing, /obj/random/trash_pile, @@ -2522,36 +2049,6 @@ /obj/machinery/floodlight, /turf/simulated/floor/plating, /area/maintenance/lower/mining) -"ir" = ( -/obj/machinery/mass_driver{ - dir = 8; - id = "enginecore" - }, -/obj/machinery/power/supermatter{ - layer = 4 - }, -/obj/effect/engine_setup/core, -/turf/simulated/floor/greengrid/nitrogen, -/area/engineering/engine_core) -"is" = ( -/obj/structure/grille, -/obj/structure/window/phoronreinforced, -/obj/structure/window/phoronreinforced{ - dir = 1 - }, -/obj/structure/window/phoronreinforced{ - dir = 8 - }, -/obj/structure/window/phoronreinforced{ - dir = 4 - }, -/obj/machinery/door/blast/regular{ - dir = 4; - id = "SupermatterPort"; - name = "Reactor Blast Door" - }, -/turf/simulated/floor, -/area/engineering/engine_core) "it" = ( /obj/structure/girder/reinforced, /obj/structure/foamedmetal, @@ -2604,12 +2101,7 @@ /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 9 }, -/obj/machinery/camera/network/engine{ - dir = 8 - }, -/turf/simulated/floor/outdoors/snow/noblend/lythios43c{ - special_temperature = 233 - }, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_room) "iA" = ( /obj/machinery/door/airlock/maintenance/rnd, @@ -2632,33 +2124,11 @@ }, /turf/simulated/floor/wood, /area/engineering/break_room) -"iE" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ - dir = 8 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "iF" = ( /obj/item/storage/box/monkeycubes, /obj/structure/table/rack/shelf, /turf/simulated/floor/plating, /area/maintenance/research/xenobio) -"iG" = ( -/obj/structure/foamedmetal, -/turf/simulated/floor, -/area/rift/surfacebase/underground/under2) -"iH" = ( -/obj/structure/cable/cyan{ - icon_state = "2-4" - }, -/turf/simulated/floor, -/area/engineering/engine_room) -"iI" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 6 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "iJ" = ( /obj/machinery/atmospherics/pipe/tank/air{ dir = 1 @@ -2677,12 +2147,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/secure_storage/critical) -"iM" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 4 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "iN" = ( /obj/machinery/light/small{ dir = 4 @@ -2710,10 +2174,6 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/engineering/hallway) -"iQ" = ( -/obj/machinery/atmospherics/valve/digital, -/turf/simulated/floor, -/area/engineering/engine_room) "iU" = ( /obj/structure/bed/chair{ dir = 1 @@ -2726,7 +2186,7 @@ "iW" = ( /obj/machinery/recharge_station, /turf/simulated/floor/tiled/monotile, -/area/engineering/engine_room) +/area/engineering/engine_monitoring) "iX" = ( /obj/structure/table/reinforced, /obj/machinery/microwave, @@ -2746,8 +2206,9 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos/locker_room) "jc" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint/sun, +/obj/machinery/camera/network/engine{ + dir = 4 + }, /turf/simulated/floor, /area/engineering/engine_room) "jd" = ( @@ -2828,7 +2289,7 @@ /obj/structure/sign/securearea{ pixel_y = 32 }, -/turf/simulated/floor/outdoors/snow/lythios43c, +/turf/simulated/mineral/floor/icerock/lythios43c/indoors/ignore_cavegen, /area/rift/surfacebase/underground/under2) "jo" = ( /turf/simulated/wall/r_wall/prepainted, @@ -2905,24 +2366,10 @@ }, /turf/simulated/floor/tiled/steel, /area/quartermaster/miningdock) -"jy" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 4 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "jz" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/structure/cable/cyan{ - icon_state = "1-8" - }, -/obj/structure/cable/cyan{ - icon_state = "1-2" - }, +/obj/structure/foamedmetal, /turf/simulated/floor, -/area/engineering/engine_room) +/area/maintenance/atmos) "jA" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -2961,7 +2408,10 @@ /area/engineering/engine_airlock) "jC" = ( /obj/machinery/portable_atmospherics/canister/carbon_dioxide, -/turf/simulated/floor, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_gas) "jD" = ( /turf/simulated/wall/r_wall/prepainted/engineering, @@ -3420,7 +2870,7 @@ dir = 8 }, /obj/effect/overlay/snow/floor, -/turf/simulated/floor/plating, +/turf/simulated/wall/r_wall/prepainted, /area/maintenance/atmos) "kD" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -3519,13 +2969,7 @@ /turf/simulated/floor/wood, /area/engineering/break_room) "kW" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/black{ - dir = 1 - }, -/obj/machinery/air_alarm{ - desc = " "; - pixel_y = 24 - }, +/obj/machinery/camera/network/engine, /turf/simulated/floor, /area/engineering/engine_room) "kX" = ( @@ -3549,12 +2993,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/secure_storage/critical) -"kY" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green{ - dir = 6 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "kZ" = ( /obj/structure/cable{ icon_state = "4-8" @@ -3610,10 +3048,9 @@ /turf/simulated/floor/tiled/monotile, /area/hallway/primary/undertwo) "lk" = ( -/turf/simulated/open/lythios43c{ - outdoors = 0 - }, -/area/engineering/engine_core) +/obj/structure/foamedmetal, +/turf/simulated/floor, +/area/rift/surfacebase/underground/under2) "ll" = ( /turf/simulated/floor/tiled/monotile, /area/hallway/primary/undertwo) @@ -3655,18 +3092,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/engineering/engineering_monitoring) -"lt" = ( -/obj/machinery/atmospherics/component/unary/heat_exchanger{ - dir = 1 - }, -/obj/structure/window/phoronreinforced{ - dir = 1 - }, -/obj/structure/window/phoronreinforced{ - dir = 4 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "lu" = ( /obj/machinery/photocopier, /turf/simulated/floor/lino, @@ -3698,32 +3123,25 @@ /obj/machinery/light, /turf/simulated/floor/tiled/white, /area/rnd/secure_storage/lower) +"ly" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor, +/area/rnd/secure_storage/lower) "lz" = ( /obj/structure/table/steel, /obj/item/storage/fancy/candle_box, /obj/item/flame/lighter, /turf/simulated/floor/plating, /area/maintenance/chapel) -"lA" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 6 - }, -/turf/simulated/floor, -/area/engineering/engine_room) -"lB" = ( -/obj/machinery/air_alarm{ - desc = " "; - pixel_y = 24 - }, -/turf/simulated/floor, -/area/engineering/engine_room) -"lC" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 10 - }, -/obj/structure/catwalk, -/turf/simulated/floor, -/area/engineering/engine_room) "lD" = ( /obj/machinery/camera/network/engineering{ dir = 4 @@ -3737,12 +3155,6 @@ }, /turf/simulated/floor/tiled/steel, /area/engineering/atmos/locker_room) -"lF" = ( -/obj/machinery/atmospherics/portables_connector{ - dir = 1 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "lG" = ( /obj/structure/undies_wardrobe, /obj/machinery/light/small{ @@ -3795,9 +3207,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/engine_airlock) -"lS" = ( -/turf/simulated/mineral/icerock/lythios43c, -/area/engineering/engine_room) "lT" = ( /obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ @@ -3805,10 +3214,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/critical/vault1) -"lU" = ( -/obj/machinery/atmospherics/component/binary/pump, -/turf/simulated/floor, -/area/engineering/engine_room) "lV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -3867,18 +3272,6 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/undertwo) -"mc" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 6 - }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 - }, -/obj/machinery/camera/network/engine{ - dir = 4 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "md" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 4 @@ -3905,13 +3298,8 @@ /turf/simulated/floor/plating, /area/maintenance/lower/atmos) "mg" = ( -/obj/structure/closet/radiation, -/obj/item/clothing/glasses/meson, -/obj/item/clothing/glasses/meson, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor, +/obj/machinery/portable_atmospherics/canister/empty, +/turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_gas) "mh" = ( /obj/effect/floor_decal/borderfloor{ @@ -3957,16 +3345,6 @@ /obj/structure/catwalk, /turf/simulated/floor, /area/engineering/engine_gas) -"mk" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 4 - }, -/obj/machinery/meter, -/obj/effect/floor_decal/industrial/warning{ - dir = 9 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "ml" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -4072,12 +3450,6 @@ "mA" = ( /turf/simulated/floor, /area/engineering/engine_room) -"mB" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 5 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "mC" = ( /obj/effect/floor_decal/rust, /turf/simulated/floor/lythios43c/indoors, @@ -4631,17 +4003,11 @@ }, /turf/simulated/floor/tiled/steel, /area/rift/station/stairs_one) -"nX" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 5 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "oa" = ( /obj/structure/fence/door{ dir = 4 }, -/turf/simulated/floor/outdoors/snow/lythios43c, +/turf/simulated/mineral/floor/icerock/lythios43c/indoors/ignore_cavegen, /area/rift/surfacebase/underground/under2) "ob" = ( /obj/structure/table/steel_reinforced, @@ -4801,7 +4167,7 @@ "ov" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/steel_grid, -/area/engineering/engine_room) +/area/engineering/engine_monitoring) "ox" = ( /obj/effect/floor_decal/techfloor{ dir = 5 @@ -4843,18 +4209,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/workshop) -"oG" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 4 - }, -/obj/machinery/door/airlock/hatch{ - icon_state = "door_locked"; - id_tag = "engine_access_hatch"; - locked = 1; - req_access = list(11) - }, -/turf/simulated/floor, -/area/engineering/engine_core) "oI" = ( /obj/effect/floor_decal/borderfloor, /obj/structure/cable/green{ @@ -4878,12 +4232,6 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, /area/maintenance/atmos) -"oM" = ( -/obj/machinery/atmospherics/component/binary/pump{ - dir = 1 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "oN" = ( /obj/structure/bed/chair{ dir = 8 @@ -5354,19 +4702,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/atmos) -"pW" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ - dir = 8 - }, -/obj/machinery/meter, -/turf/simulated/floor, -/area/engineering/engine_room) -"pX" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green{ - dir = 5 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "pZ" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/steel, @@ -5375,7 +4710,7 @@ /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, /turf/simulated/floor/tiled/monotile, -/area/engineering/engine_room) +/area/engineering/engine_monitoring) "qc" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -5443,13 +4778,6 @@ /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled, /area/quartermaster/miningdock) -"qo" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/red{ - dir = 4 - }, -/obj/machinery/meter, -/turf/simulated/floor, -/area/engineering/engine_room) "qp" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 @@ -5457,6 +4785,15 @@ /obj/machinery/light, /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/critical/vault2) +"qq" = ( +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'RADIOACTIVE AREA'"; + icon_state = "radiation"; + name = "RADIOACTIVE AREA"; + pixel_x = 32 + }, +/turf/simulated/floor/outdoors/snow/noblend/indoors/lythios43c, +/area/rift/surfacebase/underground/under2) "qr" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 @@ -5478,17 +4815,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techfloor, /area/engineering/locker_room) -"qu" = ( -/obj/effect/floor_decal/industrial/warning/cee{ - dir = 8 - }, -/obj/machinery/camera/network/engine{ - dir = 4 - }, -/turf/simulated/floor/reinforced/nitrogen{ - initial_gas_mix = "n2=82.1472;TEMP=293.15" - }, -/area/engineering/engine_core) "qx" = ( /obj/structure/curtain/open/bed{ name = "brown curtain" @@ -5527,34 +4853,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/engine_eva) -"qI" = ( -/obj/machinery/camera/network/engine{ - dir = 8 - }, -/turf/simulated/floor/outdoors/snow/noblend/indoors/lythios43c{ - special_temperature = 233 - }, -/area/engineering/engine_room) -"qN" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green, -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/camera/network/engine{ - dir = 4 - }, -/turf/simulated/floor, -/area/engineering/engine_room) -"qP" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 9 - }, -/obj/structure/cable/cyan{ - icon_state = "1-2" - }, -/turf/simulated/floor, -/area/engineering/engine_room) "qR" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -5728,12 +5026,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/cryo) -"rB" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 4 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "rC" = ( /obj/structure/catwalk, /obj/structure/cable/green{ @@ -5806,7 +5098,7 @@ icon_state = "1-2" }, /turf/simulated/floor/tiled/monotile, -/area/engineering/engine_room) +/area/engineering/engine_monitoring) "rI" = ( /obj/structure/catwalk, /obj/structure/cable/green{ @@ -5899,6 +5191,10 @@ /obj/structure/cable, /turf/simulated/floor, /area/engineering/engine_smes) +"rY" = ( +/obj/machinery/portable_atmospherics/canister/nitrous_oxide, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_gas) "rZ" = ( /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel, @@ -6098,15 +5394,6 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/undertwo) -"sN" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "sO" = ( /obj/structure/table/rack/shelf, /obj/item/extinguisher, @@ -6153,14 +5440,6 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, /area/maintenance/atmos) -"sX" = ( -/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ - dir = 10 - }, -/turf/simulated/floor/outdoors/snow/noblend/indoors/lythios43c{ - special_temperature = 233 - }, -/area/engineering/engine_room) "sZ" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -6183,7 +5462,7 @@ icon_state = "1-2" }, /turf/simulated/floor/tiled/steel_grid, -/area/engineering/engine_room) +/area/engineering/engine_monitoring) "tf" = ( /obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/techfloor{ @@ -6344,6 +5623,12 @@ }, /turf/simulated/floor/tiled/techmaint, /area/quartermaster/miningdock) +"tL" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/heads/chief) "tN" = ( /obj/machinery/conveyor{ id = "miningops" @@ -6414,11 +5699,12 @@ "ui" = ( /obj/machinery/portable_atmospherics/canister/phoron, /obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/turf/simulated/floor, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_gas) "uj" = ( /turf/simulated/wall/r_wall/prepainted, -/area/engineering/engine_room) +/area/maintenance/atmos) "uk" = ( /obj/structure/catwalk, /obj/machinery/door/airlock/maintenance/common, @@ -6531,8 +5817,7 @@ /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/secure_storage/critical/vault2) "uD" = ( -/obj/structure/foamedmetal, -/turf/simulated/floor, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/storage) "uG" = ( /turf/simulated/wall/prepainted, @@ -6873,14 +6158,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/critical/records) -"vY" = ( -/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ - dir = 10 - }, -/turf/simulated/floor/outdoors/snow/noblend/lythios43c{ - special_temperature = 233 - }, -/area/engineering/engine_room) "vZ" = ( /obj/machinery/mineral/input, /obj/machinery/conveyor{ @@ -7263,19 +6540,9 @@ }, /turf/simulated/floor/plating, /area/maintenance/chapel) -"xn" = ( -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/structure/cable/cyan{ - icon_state = "4-8" - }, -/turf/simulated/floor, -/area/engineering/engine_room) +"xp" = ( +/turf/simulated/floor/outdoors/snow/noblend/indoors/lythios43c, +/area/rift/surfacebase/underground/under2) "xq" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 @@ -7503,7 +6770,7 @@ dir = 1 }, /turf/simulated/floor/tiled/monotile, -/area/engineering/engine_room) +/area/engineering/engine_monitoring) "xV" = ( /obj/effect/floor_decal/techfloor{ dir = 1 @@ -7642,12 +6909,6 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/refinery) -"yD" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 10 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "yG" = ( /obj/effect/floor_decal/techfloor{ dir = 1 @@ -7738,16 +6999,6 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/engineering/hallway) -"yV" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/yellow, -/obj/structure/cable/cyan{ - icon_state = "1-2" - }, -/turf/simulated/floor, -/area/engineering/engine_room) "yZ" = ( /obj/machinery/button/remote/driver{ id = "enginecore"; @@ -7902,7 +7153,7 @@ /area/engineering/hallway) "zG" = ( /turf/simulated/floor/tiled/monotile, -/area/engineering/engine_room) +/area/engineering/engine_monitoring) "zJ" = ( /turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_airlock) @@ -7966,7 +7217,7 @@ }, /mob/living/simple_mob/animal/passive/bird/parrot/polly, /turf/simulated/floor/tiled/steel_grid, -/area/engineering/engine_room) +/area/engineering/engine_monitoring) "Aa" = ( /obj/machinery/light_switch{ dir = 8; @@ -7982,14 +7233,6 @@ }, /turf/simulated/floor/lino, /area/chapel/office) -"Ac" = ( -/obj/machinery/atmospherics/component/unary/heat_exchanger, -/obj/structure/window/phoronreinforced, -/obj/structure/window/phoronreinforced{ - dir = 4 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "Ad" = ( /obj/effect/floor_decal/borderfloor/corner, /obj/effect/floor_decal/borderfloor/corner{ @@ -8010,7 +7253,8 @@ /obj/structure/cable/cyan{ icon_state = "0-2" }, -/turf/simulated/floor, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_gas) "Aj" = ( /obj/structure/railing, @@ -8070,6 +7314,12 @@ "Aw" = ( /turf/simulated/wall/prepainted/civilian, /area/chapel/chapel_morgue) +"Ax" = ( +/obj/effect/overlay/snow/floor/pointy{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/maintenance/atmos) "Ay" = ( /obj/random/trash_pile, /obj/structure/railing{ @@ -8161,9 +7411,6 @@ }, /turf/simulated/floor/plating, /area/engineering/storage) -"AS" = ( -/turf/simulated/floor/lythios43c, -/area/engineering/engine_room) "AT" = ( /obj/effect/floor_decal/spline/plain{ dir = 4 @@ -8193,14 +7440,6 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/chapel/main) -"Bd" = ( -/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ - dir = 8 - }, -/turf/simulated/floor/outdoors/snow/noblend/lythios43c{ - special_temperature = 233 - }, -/area/engineering/engine_room) "Be" = ( /obj/item/bone/arm, /turf/simulated/floor/outdoors/snow/lythios43c, @@ -8242,14 +7481,6 @@ }, /turf/simulated/floor/plating, /area/engineering/storage) -"Bo" = ( -/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ - dir = 9 - }, -/turf/simulated/floor/outdoors/snow/noblend/lythios43c{ - special_temperature = 233 - }, -/area/engineering/engine_room) "Bq" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/secure_storage/critical/vault1) @@ -8525,6 +7756,10 @@ /obj/effect/overlay/snow/floor/pointy{ dir = 8 }, +/obj/effect/overlay/snow/floor/pointy, +/obj/effect/overlay/snow/floor/pointy{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/atmos) "Ch" = ( @@ -8590,16 +7825,6 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/engineering/hallway) -"Cz" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/cable/cyan{ - icon_state = "1-2" - }, -/turf/simulated/floor, -/area/engineering/engine_room) "CA" = ( /turf/simulated/shuttle/wall/voidcraft/hard_corner, /area/turbolift/rmine/under2) @@ -8611,12 +7836,10 @@ "CC" = ( /turf/simulated/floor/tiled/steel, /area/quartermaster/miningdock) -"CD" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/simulated/floor, -/area/engineering/engine_room) +"CG" = ( +/obj/machinery/lathe/autolathe, +/turf/simulated/floor/tiled, +/area/engineering/workshop) "CH" = ( /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, /obj/effect/paint/sun, @@ -8689,28 +7912,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/foyer) -"CR" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 5 - }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 - }, -/obj/machinery/atmospherics/component/unary/vent_pump/engine{ - dir = 4; - external_pressure_bound = 100; - external_pressure_bound_default = 0; - frequency = 1438; - icon_state = "map_vent_in"; - id_tag = "cooling_out"; - initialize_directions = 4; - on = 1; - pump_direction = 0 - }, -/turf/simulated/floor/reinforced/nitrogen{ - initial_gas_mix = "n2=82.1472;TEMP=293.15" - }, -/area/engineering/engine_core) "CT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -8756,16 +7957,6 @@ }, /turf/simulated/floor/tiled/dark, /area/chapel/main) -"Db" = ( -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/turf/simulated/floor, -/area/engineering/engine_room) "Dc" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -8908,20 +8099,6 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/engineering/atmos/hallway) -"Dt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor, -/area/engineering/engine_room) -"Dv" = ( -/obj/machinery/fire_alarm/north_mount, -/obj/machinery/camera/network/engine, -/turf/simulated/floor, -/area/engineering/engine_room) "Dx" = ( /obj/structure/table/reinforced, /obj/item/storage/toolbox/mechanical{ @@ -8977,13 +8154,6 @@ }, /turf/simulated/floor/plating, /area/engineering/storage) -"DL" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint/sun, -/turf/simulated/floor/plating/lythios43c{ - outdoors = 0 - }, -/area/engineering/engine_core) "DM" = ( /turf/simulated/wall/r_wall/prepainted/civilian, /area/crew_quarters/public_bunker) @@ -9077,10 +8247,7 @@ /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/lower) "Eb" = ( -/obj/machinery/atmospherics/pipe/simple/heat_exchanging, -/turf/simulated/floor/outdoors/snow/noblend/lythios43c{ - special_temperature = 233 - }, +/turf/simulated/floor/greengrid/nitrogen, /area/engineering/engine_room) "Ec" = ( /turf/simulated/floor/tiled/steel, @@ -9113,12 +8280,6 @@ }, /turf/simulated/floor/tiled/steel, /area/quartermaster/miningdock) -"Ep" = ( -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "Eq" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -9362,10 +8523,6 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/refinery) -"Fm" = ( -/obj/structure/catwalk, -/turf/simulated/floor, -/area/engineering/engine_room) "Fn" = ( /obj/effect/floor_decal/spline/plain{ dir = 1 @@ -9390,11 +8547,10 @@ /turf/simulated/floor/tiled/steel_ridged, /area/quartermaster/belterdock/refinery) "Fv" = ( -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/foamedmetal, +/obj/structure/foamedmetal, /turf/simulated/floor, -/area/engineering/engine_room) +/area/rift/surfacebase/underground/under2) "Fy" = ( /obj/structure/closet, /obj/random/maintenance/cargo, @@ -9676,12 +8832,6 @@ "GG" = ( /turf/simulated/shuttle/wall/voidcraft, /area/turbolift/rmine/under2) -"GH" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/simulated/floor, -/area/engineering/engine_room) "GI" = ( /obj/structure/morgue{ dir = 2 @@ -9706,13 +8856,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/secure_storage/lower) -"GO" = ( -/obj/machinery/air_alarm{ - dir = 1; - pixel_y = -25 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "GP" = ( /obj/effect/floor_decal/techfloor{ dir = 4 @@ -9722,10 +8865,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/cryo) -"GQ" = ( -/obj/structure/frame, -/turf/simulated/floor, -/area/engineering/engine_room) "GS" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -9770,16 +8909,6 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, /area/maintenance/lower/mining) -"GZ" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/red, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 - }, -/obj/structure/cable/cyan{ - icon_state = "1-2" - }, -/turf/simulated/floor, -/area/engineering/engine_room) "Ha" = ( /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, /obj/effect/paint/palebottlegreen, @@ -9823,22 +8952,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/engineering/workshop) -"Hg" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/cyan, -/turf/simulated/floor, -/area/engineering/engine_room) -"Hi" = ( -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/turf/simulated/floor, -/area/engineering/engine_room) "Hj" = ( /obj/structure/bed/chair/pew{ dir = 8 @@ -9904,10 +9017,6 @@ /obj/structure/closet/crate, /turf/simulated/floor/tiled/steel, /area/quartermaster/miningdock) -"Ht" = ( -/obj/structure/ladder/up, -/turf/simulated/floor/lythios43c/indoors, -/area/engineering/engine_room) "Hw" = ( /obj/machinery/door/airlock/maintenance/common{ req_one_access = list(27) @@ -9935,8 +9044,14 @@ dir = 1; pixel_y = -25 }, +/obj/structure/closet/radiation, +/obj/item/clothing/glasses/meson, +/obj/item/clothing/glasses/meson, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/simulated/floor/tiled/monotile, -/area/engineering/engine_room) +/area/engineering/engine_monitoring) "HE" = ( /obj/structure/closet/radiation, /obj/machinery/light, @@ -10204,14 +9319,8 @@ /turf/simulated/floor, /area/maintenance/substation/engineering) "II" = ( -/obj/structure/catwalk, -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/camera/network/engine{ + dir = 8 }, /turf/simulated/floor, /area/engineering/engine_room) @@ -10308,16 +9417,11 @@ /obj/random/maintenance/engineering, /turf/simulated/floor/plating, /area/maintenance/atmos) -"Jg" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "Jk" = ( /obj/machinery/power/crypto_miner{ anchored = 0 }, +/obj/machinery/light, /turf/simulated/floor/tiled, /area/engineering/workshop) "Jl" = ( @@ -10589,7 +9693,7 @@ /area/engineering/break_room) "Kp" = ( /obj/machinery/portable_atmospherics/canister/phoron, -/turf/simulated/floor, +/turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_gas) "Kq" = ( /obj/effect/floor_decal/borderfloor{ @@ -10684,13 +9788,6 @@ "KF" = ( /turf/simulated/wall/prepainted/engineering, /area/engineering/storage) -"KG" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red, -/obj/structure/cable/cyan{ - icon_state = "4-8" - }, -/turf/simulated/floor, -/area/engineering/engine_room) "KH" = ( /turf/simulated/floor/tiled/steel_grid, /area/engineering/atmos/hallway) @@ -10720,13 +9817,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/dark, /area/chapel/chapel_morgue) -"KO" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/simulated/floor, -/area/engineering/engine_room) "KP" = ( /obj/machinery/power/apc/north_mount{ alarms_hidden = 1; @@ -10773,22 +9863,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/carpet/bcarpet, /area/chapel/main) -"KU" = ( -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/structure/cable/cyan{ - icon_state = "4-8" - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/simulated/floor, -/area/engineering/engine_room) "KV" = ( /obj/structure/cable/green{ icon_state = "2-4" @@ -10812,6 +9886,10 @@ }, /turf/simulated/floor/tiled/dark, /area/chapel/main) +"KX" = ( +/obj/machinery/portable_atmospherics/canister/carbon_dioxide, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_gas) "KY" = ( /turf/simulated/wall/prepainted/engineering, /area/engineering/workshop) @@ -10852,12 +9930,6 @@ "Le" = ( /turf/simulated/floor/tiled/white, /area/rnd/secure_storage/lower) -"Li" = ( -/obj/structure/cable/cyan{ - icon_state = "1-4" - }, -/turf/simulated/floor, -/area/engineering/engine_room) "Lj" = ( /turf/simulated/wall/prepainted/engineering, /area/maintenance/engineering/pumpstation) @@ -10942,19 +10014,6 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/engineering/hallway) -"Ly" = ( -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/simulated/floor, -/area/engineering/engine_room) "LB" = ( /obj/structure/window/reinforced{ dir = 8 @@ -10978,15 +10037,15 @@ /turf/simulated/floor/tiled/steel_grid, /area/engineering/hallway) "LD" = ( -/obj/machinery/door/blast/regular{ - dir = 2; - id = "sm_monitor_blast"; - name = "Engineering Engine Monitoring Blast Door" - }, /obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, /obj/effect/paint/sun, +/obj/machinery/door/blast/regular{ + dir = 4; + id = "engine_monitor_blast"; + name = "Reactor Blast Door" + }, /turf/simulated/floor, -/area/engineering/engine_room) +/area/engineering/engine_monitoring) "LE" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -11074,10 +10133,10 @@ /turf/simulated/floor/outdoors/snow/lythios43c, /area/rift/surfacebase/underground/under2) "LV" = ( -/obj/machinery/fire_alarm/west_mount{ - pixel_x = -24 +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 10 }, -/turf/simulated/floor, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_room) "LX" = ( /obj/effect/floor_decal/borderfloor{ @@ -11135,12 +10194,6 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/lower/mining) -"Md" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green{ - dir = 10 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "Me" = ( /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, @@ -11197,10 +10250,13 @@ /turf/simulated/floor/plating, /area/maintenance/atmos) "Mu" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/green{ - dir = 8 +/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/machinery/door/blast/regular{ + dir = 4; + name = "Reactor Blast Door"; + id = "engine_room_blast" }, -/obj/structure/catwalk, /turf/simulated/floor, /area/engineering/engine_room) "Mw" = ( @@ -11411,14 +10467,6 @@ /obj/item/storage/single_use/med_pouch/radiation, /turf/simulated/floor/tiled/steel, /area/quartermaster/miningdock) -"Ne" = ( -/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ - dir = 4 - }, -/turf/simulated/floor/outdoors/snow/noblend/lythios43c{ - special_temperature = 233 - }, -/area/engineering/engine_room) "Nf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -11439,17 +10487,15 @@ pixel_x = -32; pixel_y = 30 }, -/obj/item/storage/single_use/med_pouch/radiation, +/obj/machinery/fire_alarm/north_mount{ + pixel_y = 22 + }, /turf/simulated/floor/tiled/monotile, -/area/engineering/engine_room) +/area/engineering/engine_monitoring) "Nk" = ( /obj/machinery/requests_console/preset/ce{ pixel_y = -30 }, -/obj/machinery/mass_driver{ - dir = 8; - id = "enginecore" - }, /turf/simulated/floor/tiled, /area/crew_quarters/heads/chief) "Nm" = ( @@ -11683,21 +10729,6 @@ /obj/random/cutout, /turf/simulated/floor/plating, /area/maintenance/chapel) -"NY" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 4 - }, -/turf/simulated/floor, -/area/engineering/engine_room) -"NZ" = ( -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/simulated/floor, -/area/engineering/engine_room) "Ob" = ( /obj/structure/closet/radiation, /turf/simulated/floor/tiled/techfloor, @@ -11706,7 +10737,7 @@ /obj/machinery/microwave, /obj/structure/table/reinforced, /turf/simulated/floor/tiled/monotile, -/area/engineering/engine_room) +/area/engineering/engine_monitoring) "Od" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -11719,16 +10750,6 @@ }, /turf/simulated/floor/tiled/dark, /area/chapel/main) -"Oe" = ( -/obj/machinery/power/generator{ - anchored = 1; - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/turf/simulated/floor, -/area/engineering/engine_room) "Of" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/portable_atmospherics/canister/phoron, @@ -11750,15 +10771,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel_grid, /area/engineering/atmos/hallway) -"Oi" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ - dir = 4 - }, -/obj/structure/cable/cyan{ - icon_state = "1-2" - }, -/turf/simulated/floor, -/area/engineering/engine_room) "Oj" = ( /turf/simulated/floor/tiled/techfloor, /area/chapel/chapel_morgue) @@ -12058,7 +11070,12 @@ icon_state = "1-4" }, /turf/simulated/floor/tiled/monotile, -/area/engineering/engine_room) +/area/engineering/engine_monitoring) +"Pq" = ( +/obj/machinery/portable_atmospherics/canister/nitrogen, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_gas) "Pr" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 4 @@ -12137,6 +11154,11 @@ /obj/structure/curtain/open/shower/engineering, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_airlock) +"PE" = ( +/obj/machinery/portable_atmospherics/canister/phoron, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_gas) "PG" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -12165,15 +11187,6 @@ }, /turf/simulated/floor/lino, /area/chapel/office) -"PI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "PM" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/effect/paint/beastybrown, @@ -12187,12 +11200,8 @@ /area/engineering/engine_smes) "PP" = ( /obj/machinery/portable_atmospherics/canister/nitrogen, -/turf/simulated/floor, +/turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_gas) -"PQ" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan, -/turf/simulated/floor, -/area/engineering/engine_room) "PR" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -12505,7 +11514,7 @@ dir = 4 }, /turf/simulated/floor/tiled/steel_grid, -/area/engineering/engine_room) +/area/engineering/engine_monitoring) "Rp" = ( /obj/random/trash_pile, /obj/effect/floor_decal/rust, @@ -12794,13 +11803,13 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/engi_wash) -"St" = ( -/obj/structure/catwalk, -/obj/machinery/camera/network/engine{ - dir = 1 +"Su" = ( +/obj/machinery/airlock_sensor{ + id_tag = "eng_al_c_snsr"; + pixel_x = -25 }, -/turf/simulated/floor, -/area/engineering/engine_room) +/turf/simulated/mineral/icerock/lythios43c, +/area/rift/surfacebase/underground/under2) "Sw" = ( /obj/structure/bed/chair/bay/chair/padded/yellow, /obj/machinery/fire_alarm/north_mount, @@ -12908,15 +11917,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/research/xenobio) -"SN" = ( -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/turf/simulated/floor, -/area/engineering/engine_room) "SO" = ( /obj/structure/table/reinforced, /obj/item/storage/firstaid/fire{ @@ -12984,13 +11984,6 @@ /obj/effect/floor_decal/corner/white/diagonal, /turf/simulated/floor/tiled, /area/engineering/break_room) -"Tc" = ( -/obj/machinery/atmospherics/component/quaternary/atmos_filter, -/obj/structure/cable/cyan{ - icon_state = "1-2" - }, -/turf/simulated/floor, -/area/engineering/engine_room) "Td" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -13291,9 +12284,6 @@ /turf/simulated/floor/carpet/bcarpet, /area/chapel/main) "TY" = ( -/obj/machinery/light{ - dir = 8 - }, /obj/machinery/light_switch{ pixel_x = -21 }, @@ -13344,16 +12334,6 @@ /obj/machinery/light, /turf/simulated/floor/tiled/steel_grid, /area/engineering/hallway) -"Ue" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "Uf" = ( /obj/random/trash_pile, /turf/simulated/floor/plating, @@ -13412,14 +12392,6 @@ "Uw" = ( /turf/simulated/floor/tiled/techmaint, /area/quartermaster/miningdock) -"Ux" = ( -/obj/machinery/camera/network/engine{ - dir = 8 - }, -/turf/simulated/floor/outdoors/snow/noblend/lythios43c{ - special_temperature = 233 - }, -/area/engineering/engine_room) "Uy" = ( /obj/structure/undies_wardrobe, /turf/simulated/floor/tiled/white, @@ -13428,9 +12400,6 @@ /obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/engi_wash) -"UC" = ( -/turf/simulated/wall/prepainted, -/area/engineering/engine_room) "UD" = ( /obj/structure/girder/reinforced, /obj/structure/foamedmetal, @@ -13446,15 +12415,6 @@ "UG" = ( /turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/atmos/hallway) -"UI" = ( -/obj/machinery/atmospherics/pipe/simple/visible/black{ - dir = 10 - }, -/obj/structure/cable/cyan{ - icon_state = "1-2" - }, -/turf/simulated/floor, -/area/engineering/engine_room) "UK" = ( /obj/effect/floor_decal/chapel{ dir = 4 @@ -13493,26 +12453,11 @@ }, /turf/simulated/floor/plating, /area/maintenance/research/xenobio) -"UR" = ( -/obj/machinery/power/emitter{ - anchored = 1; - dir = 8; - id = "EngineEmitter"; - pixel_y = 8; - state = 2 - }, -/obj/structure/cable/cyan{ - icon_state = "0-4" - }, -/turf/simulated/floor/tiled/monotile, -/area/engineering/engine_room) "US" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 6 }, -/turf/simulated/floor/outdoors/snow/noblend/lythios43c{ - special_temperature = 233 - }, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_room) "UU" = ( /obj/effect/floor_decal/borderfloor/corner{ @@ -13573,7 +12518,7 @@ /area/crew_quarters/heads/chief) "Va" = ( /obj/structure/fence, -/turf/simulated/floor/outdoors/snow/lythios43c, +/turf/simulated/mineral/floor/icerock/lythios43c/indoors/ignore_cavegen, /area/rift/surfacebase/underground/under2) "Vb" = ( /obj/structure/table/rack{ @@ -13797,19 +12742,12 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/chapel/observation) -"VO" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow, -/obj/structure/cable/cyan{ - icon_state = "1-2" - }, -/turf/simulated/floor, -/area/engineering/engine_room) "VQ" = ( /obj/structure/cable/cyan{ icon_state = "1-2" }, /turf/simulated/floor/tiled/steel_grid, -/area/engineering/engine_room) +/area/engineering/engine_monitoring) "VR" = ( /obj/machinery/light/small{ dir = 1 @@ -13898,8 +12836,11 @@ /obj/structure/cable/cyan{ icon_state = "2-8" }, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/tiled/monotile, -/area/engineering/engine_room) +/area/engineering/engine_monitoring) "Wh" = ( /turf/simulated/wall/prepainted/cargo, /area/maintenance/lower/atmos) @@ -13934,7 +12875,7 @@ dir = 1 }, /turf/simulated/floor/tiled/steel_grid, -/area/engineering/engine_room) +/area/engineering/engine_monitoring) "Wn" = ( /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 8 @@ -14144,11 +13085,6 @@ }, /turf/simulated/floor/tiled/steel, /area/quartermaster/miningdock) -"Xb" = ( -/turf/simulated/floor/outdoors/snow/noblend/lythios43c{ - special_temperature = 233 - }, -/area/engineering/engine_room) "Xd" = ( /obj/effect/floor_decal/rust, /obj/structure/disposalpipe/segment{ @@ -14257,7 +13193,7 @@ name = "RADIOACTIVE AREA"; pixel_x = 21 }, -/turf/simulated/floor/outdoors/snow/lythios43c, +/turf/simulated/mineral/floor/icerock/lythios43c/indoors/ignore_cavegen, /area/rift/surfacebase/underground/under2) "Xx" = ( /obj/effect/floor_decal/chapel, @@ -14388,7 +13324,7 @@ /obj/spawner/window/low_wall/full/nogrille/firelocks, /obj/effect/paint/sun, /turf/simulated/floor/plating, -/area/engineering/engine_room) +/area/engineering/engine_monitoring) "Yq" = ( /obj/machinery/door/airlock{ name = "Chapel Office"; @@ -14506,12 +13442,6 @@ }, /turf/simulated/floor/tiled/steel, /area/quartermaster/miningdock) -"YI" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/red{ - dir = 4 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "YJ" = ( /obj/spawner/window/low_wall/full/nogrille/firelocks, /obj/effect/paint/sun, @@ -14550,14 +13480,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/critical/records) -"YX" = ( -/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ - dir = 6 - }, -/turf/simulated/floor/outdoors/snow/noblend/indoors/lythios43c{ - special_temperature = 233 - }, -/area/engineering/engine_room) "YY" = ( /obj/machinery/power/smes/buildable{ RCon_tag = "Substation - Engineering"; @@ -14607,13 +13529,6 @@ "Ze" = ( /turf/simulated/floor/plating, /area/maintenance/lower/mining) -"Zf" = ( -/obj/structure/catwalk, -/obj/machinery/fire_alarm/east_mount, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor, -/area/engineering/engine_room) "Zg" = ( /obj/structure/table/reinforced, /obj/item/storage/box/nifsofts_engineering{ @@ -14662,16 +13577,7 @@ icon_state = "pipe-c" }, /turf/simulated/floor/tiled/monotile, -/area/engineering/engine_room) -"Zo" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 4 - }, -/obj/structure/cable/cyan{ - icon_state = "4-8" - }, -/turf/simulated/floor, -/area/engineering/engine_room) +/area/engineering/engine_monitoring) "Zq" = ( /obj/machinery/shieldwallgen, /obj/structure/window/reinforced{ @@ -14719,11 +13625,11 @@ /turf/simulated/floor/tiled/steel, /area/hallway/primary/undertwo) "Zy" = ( -/obj/machinery/atmospherics/portables_connector{ - dir = 8 +/obj/structure/sign/securearea{ + pixel_x = -32 }, -/turf/simulated/floor, -/area/engineering/engine_room) +/turf/simulated/floor/outdoors/snow/noblend/indoors/lythios43c, +/area/rift/surfacebase/underground/under2) "ZA" = ( /obj/structure/bed/chair{ dir = 4 @@ -19578,11 +18484,11 @@ su LT su su -su -su +xp +Zy lf -su -su +xp +xp aa aa aa @@ -19772,16 +18678,53 @@ su su su Lp -su -su +xp +qq hW -su -su -su +xp +xp +xp +aa +xp +xp +xp +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa -su -su -su aa aa aa @@ -19804,181 +18747,144 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -Xh -"} -(27,1,1) = {" -Xh -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -su -su -yI -su -su -Kb -su -su -su -aa -aa -aa -su -su -su -su -su -su -su -su -su +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +Xh +"} +(27,1,1) = {" +Xh +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +su +su +yI +su +su +Kb +su +su +xp +aa +aa +aa +xp +xp +xp +xp +xp +xp +xp +sq +xp aa aa aa @@ -20169,12 +19075,12 @@ aa aa aa aa -su -su -su -su -su -su +xp +xp +xp +sq +sq +xp aa aa aa @@ -20363,13 +19269,13 @@ aa aa aa aa -su +sq aa aa -su -su -su -su +xp +xp +sq +xp aa aa aa @@ -20557,15 +19463,15 @@ aa aa aa aa -su +xp aa aa aa aa -su -su -su -su +sq +sq +sq +sq aa aa aa @@ -20757,9 +19663,9 @@ aa aa aa aa -su -su -gg +xp +sq +sq aa aa aa @@ -20952,8 +19858,8 @@ aa aa aa aa -gg -gg +sq +sq aa aa aa @@ -21146,8 +20052,8 @@ aa aa aa aa -gg -gg +sq +sq aa aa aa @@ -21340,8 +20246,8 @@ aa aa aa aa -gg -gg +sq +sq aa aa aa @@ -21534,8 +20440,8 @@ aa aa aa aa -gg -gg +sq +sq aa aa aa @@ -21728,9 +20634,9 @@ aa aa aa aa -gg -gg -gg +sq +sq +sq aa aa aa @@ -21923,9 +20829,9 @@ aa aa aa aa -gg -gg -gg +sq +sq +sq aa aa aa @@ -22117,9 +21023,9 @@ aa aa aa aa -gg -gg -gg +sq +sq +sq aa aa aa @@ -22311,10 +21217,10 @@ aa aa aa aa -gg -gg -gg -gg +sq +sq +sq +sq aa aa aa @@ -22508,8 +21414,8 @@ aa aa aa aa -gg -gg +sq +sq aa aa aa @@ -22702,8 +21608,8 @@ aa aa aa aa -gg -gg +sq +sq aa aa aa @@ -22726,7 +21632,7 @@ Tz He EN He -LR +ly Tz He tJ @@ -22896,8 +21802,8 @@ aa aa aa aa -gg -gg +sq +sq aa aa aa @@ -23091,8 +21997,8 @@ aa aa aa aa -gg -gg +sq +sq aa aa aa @@ -23290,12 +22196,12 @@ Xw aa aa aa -lS -lS -lS -lS -lS -lS +aa +aa +aa +aa +aa +aa Xy Xy Xy @@ -23484,15 +22390,15 @@ Va aa aa aa -lS -lS -am -am -am -am -YX -ai -am +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -23673,21 +22579,21 @@ aa aa aa aa -gg -gg -gg +sq +sq +sq +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa -UC -UC -UC -am -am -am -ah -ah -YX -ai aa aa aa @@ -23868,30 +22774,30 @@ aa aa aa aa -gg -gg -gg -aa -UC -Ht -cr -am -am -am -ah -ah -ah -ah -am -aa +sq +sq +sq aa aa +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq aa aa aa aa aa aa +gG aa aa aa @@ -24063,24 +22969,24 @@ aa aa aa aa -gg -gg -aa -UC -cr -AS -am -am -am -ah -ah -ah -ah -am -am -am -aa -aa +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq aa aa aa @@ -24257,27 +23163,27 @@ aa aa aa aa -gg -gg -gg -lS -am -am -am -am -am -ah -ah -ah -sX -fb -fb -fb -ai -aa -aa -aa -aa +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq aa aa aa @@ -24452,27 +23358,27 @@ aa aa aa aa -gg -gg -am -am -am -am -am -am -ah -ah -ah -YX -fb -fb -fb -al -aa -aa -aa -aa -aa +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq aa aa aa @@ -24646,27 +23552,27 @@ aa aa aa aa -gg -gg -am -am -am -am -lS -lS -ah -ah -ah -sX -fb -fb -fb -ai -aa -aa -aa -aa -aa +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq aa aa aa @@ -24711,34 +23617,133 @@ aa aa aa aa -Xh -"} -(52,1,1) = {" -yw -sq -sq -sq -sq -sq -sq -sq -sq -sq -sq -sq -sq -sq -sq -sq +Xh +"} +(52,1,1) = {" +yw +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +aa +aa +aa +aa +aa +aa +sq +sq +sq +aa +aa +aa +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa aa aa aa -sq -sq -sq aa aa aa @@ -24762,105 +23767,6 @@ sq sq sq sq -sq -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -gg -am -am -am -am -lS -lS -ah -ah -ah -YX -fb -fb -fb -al -aa -aa -aa -aa -aa aa aa aa @@ -25035,26 +23941,26 @@ aa aa aa aa -aa -lS -am -am -am -am -am -ah -ah -ah -sX -fb -fb -fb -ai -aa -aa -aa -aa -aa +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq aa aa aa @@ -25229,26 +24135,26 @@ zy zy aa aa -aa -lS -am -am -am -am -am -ah -ah -ah -YX -fb -fb -fb -al -aa -aa -aa -aa -aa +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq aa aa aa @@ -25421,28 +24327,28 @@ kf kA Yu kB -lS -lS -lS -lS -am -am -am -am -am -ah -ah -ah -sX -fb -fb -ai -am -aa -aa -aa aa aa +sq +sq +sq +sq +sq +sq +sq +sq +sq +cG +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq aa aa aa @@ -25612,34 +24518,34 @@ aa zy kw sW -ks +bK Ce kC -lS -lS -YX -fb -ai -am -am -am -am -ah -ah -ah -YX -fb -fb -al -jc +aa +sq +sq +sq +sq +sq ar ar ar ar ar ar -qm -qm +ar +ar +ar +ar +ar +sq +sq +sq +sq +sq +aa +aa +aa aa aa aa @@ -25805,35 +24711,35 @@ zy aa zy oL -wG -uj -uj -uj +hQ +Ax uj uj -sX -ai -ah -am -am +ML +sq +sq +cG +sq +sq +ar +mA +mA am am -ah -ah -ah -ah am am am -jc mA -ga -LV -GQ -GQ +mA ar -iG -qm +sq +sq +sq +sq +sq +aa +aa +aa aa aa aa @@ -25999,35 +24905,35 @@ zy zy zy kx -wG +hQ +ks uj -Xb -US -gT -US -gT -Ne -Ne -Xb -am +jz +ar +Mu +Mu +Mu +Mu +Mu +ar +mA +mA am am -Ne -Ne -Ne -vY -Eb Eb -gr -fF -gD -iE -iQ -hU -cQ +am +am +mA +mA ar -iG -qm +sq +sq +sq +sq +sq +aa +aa +aa aa aa aa @@ -26193,35 +25099,35 @@ kk kq ks kx -wG +hQ +ks uj -Xb -Ne -Ne -Ne -Ne -Ne -Ne -Xb -am -qI +jz +ar +mA +mA +mA +mA +mA +mA +mA +mA am -Ne -Ne -vY Eb Eb Eb -gr -dm -mA -rB -mA +am mA mA ar -iG -qm +sq +sq +sq +sq +sq +aa +aa +aa aa aa aa @@ -26387,35 +25293,35 @@ ks oK ks ky -wG +hQ +kk uj -Xb -Ne -vY -Bo -Ne -Ne -Ne -Xb -bQ -hC -bQ -Ne -vY -Eb -Eb -Eb -Eb -gr -bV +jz +LV mA -rB mA mA -GO +mA +mA +mA +mA +mA +am +am +Eb +am +am +mA +mA ar -iG -qm +sq +sq +sq +sq +cG +aa +aa +aa aa aa aa @@ -26581,35 +25487,35 @@ wG wG wG wG -wG +hQ +ks uj -Xb -Ne +jz US -gT -Ne -Ne -Ne -Xb -DL -lk -av -vY -Eb -Eb -Eb -Eb -Eb -gr -ak -pX -gc -iQ -iE -mB +mA +mA +mA +mA +mA +mA +mA +mA +am +am +am +am +am +mA +mA ar -iG -qm +Mu +Mu +Mu +Mu +Mu +ar +ML +ML aa aa aa @@ -26776,34 +25682,34 @@ kr kv Mr zt +ks uj -Xb -vY +jz iz -Bd -Bd -Bd -Bd -Ux -av -aw -av -Xb -Xb -Xb -Xb -Xb -Ux -Xb +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA jc -bJ -rB mA -GQ -GQ +mA +mA +mA +mA ar -iG -qm +lk +ML aa aa aa @@ -26970,34 +25876,34 @@ KF KF KF KF +uD +uD +jz ar -ar -uj -ar -aQ -dP -dP -aq -bQ -bQ -dQ -bQ -bQ -jc -jc -jc -jc -ar -jc -jc -bJ -rB +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA mA mA ar -ar -qm -qm +lk +ML aa aa aa @@ -27166,32 +26072,32 @@ Ox BF Rt KF -uD +jz ar -hR mA mA -bI -is -qu -cG -ij -is -mA -kY -du -du -qN -hT -du -db -eQ -Mu -oM -lF +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA ar -iG -qm +lk +ML aa aa aa @@ -27360,32 +26266,32 @@ BF BF Rt KF -uD +jz ar -gz -bu -bs -fj -is -ik -ir -ik -is -mA -bJ -mA -lA -PQ -Hg -PQ -pW -cQ -cd -lU -lF +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA ar -iG -qm +lk +ML aa aa aa @@ -27554,32 +26460,32 @@ BF BF vP KF -uD +jz ar kW -lt -Ac -bK -is -CR -eM -bU -is -mA -Md -cF -cQ -mA -Md -cF -cQ -mA -Fm -Fm -St +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA ar -iG -qm +lk +ML aa aa aa @@ -27748,32 +26654,32 @@ BF BF Vv KF -uD +jz ar -Zy -cg -oM -fj -bQ -eL -is -oG -bQ -NY -mA -Oe -GH -SN -GH -cM -mA -mA -Fm -Fm -Fm +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA ar -iG -qm +lk +ML aa aa aa @@ -27942,32 +26848,32 @@ BF BF Cr KF -uD +jz ar -Dv mA mA -cp -mc -dx -zG -mk -dh -PI -iI -fh -nX -CD -iI -fh -nX -mA -Fm -Fm -aC +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA ar -iG -qm +lk +ML aa aa aa @@ -28136,32 +27042,32 @@ BF BF Ho KF -uD +jz ar mA mA mA -aD -dq -dA -UR -sN mA -Dt -jy mA -iM -CD -jy mA -iM mA -Fm -Fm -Fm +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA ar -iG -qm +lk +ML aa aa aa @@ -28330,32 +27236,32 @@ BF BF wR KF -uD +jz ar -Ep mA -iH -UI -Tc -GZ -jz -fm -VO -do -yV -VO -Oi -Cz -yV -VO -qP -Li -Fm -Fm -Fm +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA ar -iG -qm +lk +ML aa aa aa @@ -28524,32 +27430,32 @@ BF vh Of KF -uD +jz ar -lB -Jg -Zo -mA -yD -YI -dX -dX -dX -Ue -YI -dX -dX -KO -qo -dX -dX -KG -gn -oM -lF +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA ar -iG -qm +lk +ML aa aa aa @@ -28721,29 +27627,29 @@ KF KF ar mA -Db -KU -NZ -NZ -NZ -NZ -NZ -NZ -Ly +mA +mA +mA +mA +mA +mA +mA +mA +mA II -NZ -NZ -Hi -hz -Zf -Fv -xn -lC -lU -lF +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA ar -iG -qm +lk +ML aa aa aa @@ -28936,8 +27842,8 @@ mj jD jD jD -qm -qm +lk +ML aa aa aa @@ -29114,9 +28020,9 @@ go fE Pa Nj -hN -hQ -dg +zG +zG +zG gd zJ jB @@ -29128,10 +28034,10 @@ Ah ZC IT jC -jC +KX jD -qm -aa +lk +ML aa aa aa @@ -29322,10 +28228,10 @@ ui Nn IT jC -jC +KX jD -qm -aa +lk +ML aa aa aa @@ -29512,14 +28418,14 @@ Xg zJ jD Kp -Kp +PE IT IT cO mg jD -qm -aa +lk +ML aa aa aa @@ -29706,14 +28612,14 @@ WJ XT jD PP -PP +Pq hr pR -IT -IT +fD +rY jD -qm -aa +lk +ML aa aa aa @@ -29906,8 +28812,8 @@ aA aA aA aA -qm -aa +lk +ML aa aa aa @@ -30100,8 +29006,8 @@ TY Ao aA aA -qm -aa +lk +ML aa aa aa @@ -30294,8 +29200,8 @@ Vw mE Ew aA -aa -aa +lk +ML aa aa aa @@ -30488,8 +29394,8 @@ hK mE Ex aA -aa -aa +lk +ML aa aa aa @@ -30682,8 +29588,8 @@ UW mE yZ aA -aa -aa +lk +ML aa aa aa @@ -30859,7 +29765,7 @@ cX KY ES FZ -FZ +CG oD gs Mb @@ -30871,13 +29777,13 @@ Qz aA he ol -mE +tL me Nk aA aA -aa -aa +lk +ML aa aa aa @@ -31070,8 +29976,8 @@ aA aA aA aA -aa -aa +lk +ML aa aa aa @@ -31264,8 +30170,8 @@ JQ ff Rs aA -aa -aa +lk +ML aa aa aa @@ -31458,8 +30364,8 @@ aA GB TQ aA -aa -aa +lk +ML aa aa aa @@ -31652,8 +30558,8 @@ aA aA aA aA -aa -aa +lk +ML aa aa aa @@ -31843,11 +30749,11 @@ Gv fK wM aA -aa -aa -aa -aa -aa +Fv +lk +lk +Fv +ML aa aa aa @@ -32037,11 +30943,11 @@ aA aA aA aA -aa -aa -aa -aa -aa +lk +ML +ML +ML +ML aa aa aa @@ -32227,12 +31133,12 @@ KH Zr Qu Ir -aa -aa -aa -aa -aa -aa +lk +lk +lk +lk +Fv +ML aa aa aa @@ -32414,19 +31320,19 @@ RP YG QM Mw -RQ +eW Hp Bj KH Ij Fb Ir -aa -aa -aa -aa -aa -aa +ML +ML +ML +ML +ML +ML aa aa aa @@ -38445,7 +37351,7 @@ aa aa aa aa -aa +Su aa aa aa diff --git a/maps/rift/levels/rift-03-underground1.dmm b/maps/rift/levels/rift-03-underground1.dmm index acfd5e943be9..c2e8a154c7fb 100644 --- a/maps/rift/levels/rift-03-underground1.dmm +++ b/maps/rift/levels/rift-03-underground1.dmm @@ -42,6 +42,10 @@ "ag" = ( /turf/simulated/open, /area/rift/station/stairs_two) +"ah" = ( +/obj/structure/flora/ausbushes/fullgrass, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/underground/under1) "ai" = ( /turf/simulated/shuttle/wall/voidcraft, /area/turbolift/runder/level1) @@ -2273,6 +2277,13 @@ }, /turf/simulated/floor/tiled, /area/engineering/atmos) +"fD" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ + dir = 8 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/underground/under1) "fE" = ( /obj/machinery/atmospherics/pipe/manifold/visible/red, /obj/machinery/meter, @@ -3085,9 +3096,7 @@ /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 5 }, -/turf/simulated/open/lythios43c{ - special_temperature = 233 - }, +/turf/simulated/floor/outdoors/safeice/lythios43c, /area/rift/surfacebase/underground/under1) "io" = ( /obj/random/maintenance/clean, @@ -3873,6 +3882,12 @@ }, /turf/simulated/floor/reinforced/carbon_dioxide, /area/engineering/atmos) +"kX" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 10 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/underground/under1) "kZ" = ( /turf/simulated/wall/r_wall/prepainted, /area/rift/station/fighter_bay/transport_tunnel_garage_maint) @@ -3976,9 +3991,7 @@ /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 4 }, -/turf/simulated/open/lythios43c{ - special_temperature = 233 - }, +/turf/simulated/floor/outdoors/safeice/lythios43c, /area/rift/surfacebase/underground/under1) "lr" = ( /obj/effect/floor_decal/borderfloor, @@ -4160,14 +4173,17 @@ /turf/simulated/floor/concrete/rng/lythios43c, /area/rift/station/fighter_bay/transport_tunnel) "lU" = ( -/obj/structure/railing{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 6 }, -/turf/simulated/open/lythios43c, +/turf/simulated/floor/outdoors/snow/lythios43c, /area/rift/surfacebase/underground/under1) "lV" = ( -/obj/structure/ladder, -/turf/simulated/floor/lythios43c, +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 4 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, /area/rift/surfacebase/underground/under1) "lW" = ( /obj/machinery/light/small{ @@ -4456,6 +4472,12 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/dark, /area/engineering/atmos) +"mM" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 5 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/underground/under1) "mN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/visible/black{ @@ -4676,9 +4698,7 @@ /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 6 }, -/turf/simulated/open/lythios43c{ - special_temperature = 233 - }, +/turf/simulated/floor/outdoors/safeice/lythios43c, /area/rift/surfacebase/underground/under1) "nE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ @@ -4756,9 +4776,7 @@ /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 10 }, -/turf/simulated/open/lythios43c{ - special_temperature = 233 - }, +/turf/simulated/floor/outdoors/safeice/lythios43c, /area/rift/surfacebase/underground/under1) "nV" = ( /turf/simulated/floor/reinforced/nitrogen, @@ -6032,6 +6050,13 @@ /obj/effect/floor_decal/plaque, /turf/simulated/floor/tiled/monotile, /area/hallway/primary/underone) +"si" = ( +/obj/structure/flora/grass/both{ + pixel_x = 10; + pixel_y = 10 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/underground/under1) "sk" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/monotile, @@ -6853,9 +6878,7 @@ /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 5 }, -/turf/simulated/open/lythios43c{ - special_temperature = 233 - }, +/turf/simulated/floor/outdoors/safeice/lythios43c, /area/rift/surfacebase/underground/under1) "vj" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, @@ -10942,6 +10965,12 @@ /obj/machinery/seed_extractor, /turf/simulated/floor/concrete/tile/indoors, /area/security/prison/lower) +"IB" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 9 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/underground/under1) "IC" = ( /obj/machinery/air_alarm{ dir = 4; @@ -11502,9 +11531,7 @@ /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 9 }, -/turf/simulated/open/lythios43c{ - special_temperature = 233 - }, +/turf/simulated/floor/outdoors/safeice/lythios43c, /area/rift/surfacebase/underground/under1) "Kq" = ( /obj/effect/floor_decal/borderfloor, @@ -12746,8 +12773,8 @@ /turf/simulated/floor/tiled/dark, /area/tcommsat/chamber) "Ob" = ( -/obj/structure/railing{ - dir = 8 +/obj/structure/fence/door{ + dir = 4 }, /turf/simulated/floor/outdoors/safeice/lythios43c, /area/rift/surfacebase/underground/under1) @@ -14542,9 +14569,7 @@ /obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ dir = 8 }, -/turf/simulated/open/lythios43c{ - special_temperature = 233 - }, +/turf/simulated/floor/outdoors/safeice/lythios43c, /area/rift/surfacebase/underground/under1) "UE" = ( /obj/random/maintenance/clean, @@ -14673,6 +14698,10 @@ /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/concrete/rng/indoors, /area/rift/station/fighter_bay/transport_tunnel_garage) +"UW" = ( +/obj/structure/fence, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/underground/under1) "UX" = ( /obj/structure/symbol/sa, /turf/simulated/wall/prepainted, @@ -15227,9 +15256,7 @@ /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 6 }, -/turf/simulated/open/lythios43c{ - special_temperature = 233 - }, +/turf/simulated/floor/outdoors/safeice/lythios43c, /area/rift/surfacebase/underground/under1) "WD" = ( /obj/item/flashlight{ @@ -20878,7 +20905,7 @@ WR WR WR WR -WR +ah WR WR WR @@ -21276,7 +21303,7 @@ Va Va WR WR -WR +Qx WR WR WR @@ -21847,7 +21874,7 @@ ER WR WR WR -WR +hq WR WR WR @@ -23394,7 +23421,7 @@ sV WR WR WR -WR +rV WR WR WR @@ -23587,8 +23614,8 @@ es tm WR WR -WR -WR +rV +rV WR WR es @@ -23781,8 +23808,8 @@ es tm WR Zl -WR -WR +rV +rV WR WR uA @@ -23975,7 +24002,7 @@ sV sV WR WR -WR +rV WR WR WR @@ -24170,7 +24197,7 @@ WR WR WR WR -WR +rV WR WR uA @@ -24363,7 +24390,7 @@ sa aa WR WR -WR +rV WR WR WR @@ -24751,10 +24778,10 @@ po WR WR WR +rV +rV WR -WR -WR -WR +rV WR WR WR @@ -24785,7 +24812,7 @@ Lv Lv Va WR -WR +hq WR rV WR @@ -24946,7 +24973,7 @@ WR WR WR WR -WR +rV uB WR ER @@ -24983,7 +25010,7 @@ WR WR WR WR -WR +hq WR WR aa @@ -25141,14 +25168,14 @@ WR WR WR hq +rV WR WR WR WR -WR -oU -oU -oU +Va +Va +Va WR es es @@ -25333,16 +25360,16 @@ po WR WR WR +rV WR +rV +rV WR WR WR -WR -WR -WR -oU -lV -oU +Va +Va +Va WR Va Va @@ -25529,15 +25556,15 @@ WR WR WR WR +rV +rV WR WR -WR -WR -WR -oU -Mb -Mb -Mb +hq +Va +Va +Va +Va Va Va Va @@ -25724,18 +25751,18 @@ WR WR WR WR +rV +rV WR WR +Va WR WR Va -Mb -Mb -Mb -Mb -Mb -Mb -Mb +Va +Va +Va +Va WR WR WR @@ -25920,19 +25947,19 @@ WR WR WR WR +rV WR WR Va Va -Ob -lU -lU -lU -Ob +Va +Va +Va +Va Va WR WR -WR +hq WR WR WR @@ -26113,14 +26140,14 @@ WR WR WR WR +rV +WR WR WR WR WR Va -Va -Va -Va +hq Va Va Va @@ -26136,7 +26163,7 @@ WR Qx WR WR -WR +si WR WR Va @@ -26308,15 +26335,15 @@ WR aa WR WR +rV +rV +rV +hq +Va WR -WR -WR -td -td Va Va Va -td Yr WR WR @@ -26504,14 +26531,14 @@ aa aa WR WR -WR -td -td -td +rV +rV +rV +Va +Va +Va Va Va -td -td WR Va WR @@ -26700,12 +26727,12 @@ aa WR WR WR -td -td +Va +rV +Va Va Va Va -td WR WR Va @@ -26895,8 +26922,8 @@ aa aa aa aa -aa -aa +Va +Va Va Va WR @@ -27089,9 +27116,9 @@ aa aa aa aa -aa -aa -aa +Va +hq +Va aa WR WR @@ -27283,9 +27310,9 @@ aa aa aa aa -aa -aa -aa +UW +Ob +UW aa aa aa @@ -27477,9 +27504,9 @@ aa aa aa aa -aa -aa -aa +Va +WR +Va aa aa aa @@ -27665,16 +27692,16 @@ pv sZ aa WC -in +mM nD in -nD +lU vi -aa -aa -aa -aa -aa +Va +Va +WR +hq +Va WC in nD @@ -27864,17 +27891,17 @@ lq lq lq lq -aa -aa -aa -aa -aa -lq -lq -lq -lq +Zl +WR +Va +Va +Zl +lV lq +lV +lV lq +lV aa aa aa @@ -28054,7 +28081,7 @@ sZ aa UB nS -Kp +IB nS Kp UB @@ -28063,8 +28090,8 @@ aa aa aa aa -UB -nS +fD +kX Kp nS Kp diff --git a/maps/rift/levels/rift-04-surface1.dmm b/maps/rift/levels/rift-04-surface1.dmm index b4144794f522..92853091345d 100644 --- a/maps/rift/levels/rift-04-surface1.dmm +++ b/maps/rift/levels/rift-04-surface1.dmm @@ -592,6 +592,12 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfaceone) +"auZ" = ( +/obj/structure/flora/ausbushes/fullgrass{ + pixel_x = -8 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "avr" = ( /obj/structure/bed/chair/comfy/beige{ dir = 8 @@ -1572,6 +1578,13 @@ }, /turf/simulated/floor/plating, /area/maintenance/starboard) +"bhH" = ( +/obj/structure/flora/ausbushes/brflowers, +/obj/structure/flora/ausbushes/fullgrass{ + pixel_x = -8 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "bhT" = ( /obj/structure/railing, /obj/machinery/power/apc/west_mount, @@ -1603,9 +1616,6 @@ "biN" = ( /obj/machinery/door/window/eastright, /obj/structure/table/rack/shelf/steel, -/obj/item/clothing/suit/space/emergency, -/obj/item/clothing/head/helmet/space/emergency, -/obj/item/tank/oxygen, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, /obj/effect/floor_decal/industrial/outline/yellow, @@ -1616,7 +1626,8 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/clothing/mask/gas/clear, +/obj/item/clothing/mask/warmer, +/obj/item/clothing/suit/storage/hooded/wintercoat, /turf/simulated/floor/tiled/steel, /area/storage/surface_eva) "biY" = ( @@ -1923,6 +1934,7 @@ /obj/effect/floor_decal/corner/purple/border, /obj/structure/closet/jcloset, /obj/item/soap/nanotrasen, +/obj/item/reagent_containers/glass/rag/sponge, /turf/simulated/floor/tiled/steel, /area/janitor) "bqw" = ( @@ -2847,6 +2859,7 @@ /obj/effect/floor_decal/corner/purple/bordercorner2{ dir = 6 }, +/obj/item/reagent_containers/glass/rag/sponge, /turf/simulated/floor/tiled/steel, /area/janitor) "bWD" = ( @@ -2959,6 +2972,10 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfaceone) +"caB" = ( +/obj/structure/flora/ausbushes/palebush, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "caD" = ( /obj/machinery/holopad, /obj/structure/cable/green{ @@ -3162,9 +3179,6 @@ "cfw" = ( /obj/machinery/door/window/eastleft, /obj/structure/table/rack/shelf/steel, -/obj/item/clothing/suit/space/emergency, -/obj/item/clothing/head/helmet/space/emergency, -/obj/item/tank/oxygen, /obj/effect/floor_decal/borderfloor{ dir = 8 }, @@ -3178,6 +3192,7 @@ /obj/structure/window/reinforced{ dir = 8 }, +/obj/item/clothing/suit/storage/hooded/wintercoat, /obj/item/clothing/mask/gas/clear, /turf/simulated/floor/tiled/steel, /area/storage/surface_eva) @@ -3571,9 +3586,6 @@ dir = 8 }, /obj/structure/table/rack/shelf/steel, -/obj/item/clothing/suit/space/emergency, -/obj/item/clothing/head/helmet/space/emergency, -/obj/item/tank/oxygen, /obj/effect/floor_decal/borderfloor{ dir = 6 }, @@ -3585,7 +3597,8 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/clothing/mask/gas/clear, +/obj/item/clothing/mask/warmer, +/obj/item/clothing/suit/storage/hooded/wintercoat, /turf/simulated/floor/tiled/steel, /area/storage/surface_eva) "cvM" = ( @@ -4982,6 +4995,13 @@ /obj/random/trash_pile, /turf/simulated/floor/plating, /area/maintenance/library) +"dns" = ( +/obj/machinery/light/flamp/noshade{ + layer = 4; + pixel_y = 17 + }, +/turf/simulated/floor/plating/lythios43c, +/area/rift/surfacebase/outside/outside1) "dnB" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 4 @@ -5193,6 +5213,10 @@ }, /turf/simulated/floor/tiled/monowhite, /area/medical/medbay_emt_bay) +"dsJ" = ( +/obj/structure/metal_edge, +/turf/simulated/open/lythios43c, +/area/rift/surfacebase/outside/outside1) "dtc" = ( /obj/machinery/atmospherics/component/unary/outlet_injector{ dir = 1 @@ -6311,6 +6335,13 @@ }, /turf/simulated/floor/tiled/steel, /area/quartermaster/hallway) +"ebZ" = ( +/obj/structure/flora/grass/both{ + pixel_x = -5; + pixel_y = -4 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "ech" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/brown/border, @@ -6406,6 +6437,10 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, /area/maintenance/tool_storage) +"efb" = ( +/obj/structure/flora/rock/ice/alternative_1, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "efy" = ( /obj/structure/table/standard, /obj/item/storage/box/beakers, @@ -6442,6 +6477,10 @@ }, /turf/simulated/floor/plating, /area/medical/virologypurge) +"efY" = ( +/obj/structure/flora/ausbushes/ppflowers, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "egb" = ( /obj/machinery/fire_alarm/east_mount, /obj/structure/disposalpipe/segment, @@ -6659,6 +6698,10 @@ }, /turf/simulated/floor/tiled/monodark, /area/security/prison/upper) +"enm" = ( +/obj/structure/flora/grass/both, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "enu" = ( /obj/structure/catwalk, /obj/structure/cable{ @@ -8170,6 +8213,12 @@ /obj/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/plating, /area/rift/surfaceeva/airlock/main) +"fvp" = ( +/obj/structure/flora/tree/pine{ + pixel_x = -19 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "fvO" = ( /obj/structure/cable/green{ icon_state = "16-0" @@ -8384,7 +8433,6 @@ "fBn" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, -/obj/structure/table/reinforced, /turf/simulated/floor/tiled/steel, /area/tether/station/public_meeting_room) "fCu" = ( @@ -9068,6 +9116,7 @@ name = "bookcase (Reference)" }, /obj/item/book/bundle/custom_library/reference, +/obj/item/book/bundle/custom_library/reference, /turf/simulated/floor/wood, /area/library) "gbq" = ( @@ -9814,6 +9863,10 @@ }, /turf/simulated/floor/tiled/monotile, /area/security/prison/upper) +"gGe" = ( +/obj/structure/flora/grass/green, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "gGj" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -11469,6 +11522,12 @@ }, /turf/simulated/floor/tiled/dark, /area/security/prison/upper) +"hyV" = ( +/obj/structure/flora/ausbushes/ppflowers{ + pixel_x = -4 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "hzB" = ( /obj/structure/filingcabinet/medical{ desc = "A large cabinet with hard copy medical records."; @@ -12505,6 +12564,13 @@ }, /turf/simulated/floor/tiled/steel, /area/security/prison/upper) +"ibB" = ( +/obj/structure/flora/ausbushes/lavendergrass{ + pixel_x = 2; + pixel_y = 12 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "ibI" = ( /obj/structure/curtain/open/shower, /obj/machinery/shower, @@ -12626,9 +12692,6 @@ "igZ" = ( /obj/machinery/door/window/eastright, /obj/structure/table/rack/shelf/steel, -/obj/item/clothing/suit/space/emergency, -/obj/item/clothing/head/helmet/space/emergency, -/obj/item/tank/oxygen, /obj/effect/floor_decal/borderfloor{ dir = 10 }, @@ -12640,6 +12703,7 @@ /obj/structure/window/reinforced{ dir = 8 }, +/obj/item/clothing/suit/storage/hooded/wintercoat, /obj/item/clothing/mask/gas/clear, /turf/simulated/floor/tiled/steel, /area/storage/surface_eva) @@ -14885,6 +14949,10 @@ }, /turf/simulated/floor/tiled/steel, /area/quartermaster/office) +"jDP" = ( +/obj/structure/flora/ausbushes/ywflowers, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "jDX" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -14927,6 +14995,12 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/outpost/xenobiology/outpost_hallway) +"jEQ" = ( +/obj/structure/flora/rock/ice{ + pixel_y = 12 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "jER" = ( /obj/structure/flora/ausbushes/brflowers, /obj/structure/flora/ausbushes/sunnybush, @@ -15443,6 +15517,12 @@ /obj/random/maintenance/research, /turf/simulated/floor/plating, /area/maintenance/research/lower) +"jVw" = ( +/obj/structure/flora/bush{ + pixel_y = -4 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "jVC" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 1 @@ -17476,6 +17556,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/black, /turf/simulated/floor/tiled/white, /area/medical/virologyisolation) +"lgY" = ( +/obj/structure/flora/grass/both{ + pixel_x = 10; + pixel_y = 10 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "lht" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock{ @@ -17920,6 +18007,10 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_main) +"lxF" = ( +/obj/structure/flora/tree/pine, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "lxG" = ( /obj/machinery/atmospherics/component/binary/pump/high_power/on{ dir = 1 @@ -17946,6 +18037,10 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/server) +"lxP" = ( +/obj/structure/flora/ausbushes/pointybush, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "lyg" = ( /obj/item/stool/padded, /obj/landmark/spawnpoint/job/entertainer, @@ -18565,6 +18660,17 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_main) +"lUp" = ( +/obj/structure/flora/ausbushes/lavendergrass{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/structure/flora/ausbushes/lavendergrass{ + pixel_x = 2; + pixel_y = 12 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "lUw" = ( /obj/machinery/door/airlock/engineering{ name = "Medbay Substation"; @@ -18652,9 +18758,6 @@ "maf" = ( /obj/machinery/door/window/westright, /obj/structure/table/rack/shelf/steel, -/obj/item/clothing/suit/space/emergency, -/obj/item/clothing/head/helmet/space/emergency, -/obj/item/tank/oxygen, /obj/effect/floor_decal/borderfloor{ dir = 4 }, @@ -18668,7 +18771,8 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/clothing/mask/gas/clear, +/obj/item/clothing/mask/warmer, +/obj/item/clothing/suit/storage/hooded/wintercoat, /turf/simulated/floor/tiled/steel, /area/storage/surface_eva) "mau" = ( @@ -18709,6 +18813,10 @@ /obj/structure/railing, /turf/simulated/floor/plating, /area/maintenance/evahallway) +"mbg" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "mbr" = ( /obj/machinery/computer/arcade, /turf/simulated/floor/tiled, @@ -18879,7 +18987,7 @@ /obj/effect/floor_decal/corner/lightgrey/border{ dir = 6 }, -/obj/structure/table/reinforced, +/obj/machinery/vending/mre, /turf/simulated/floor/tiled/steel, /area/tether/station/public_meeting_room) "mgI" = ( @@ -19544,6 +19652,12 @@ /obj/structure/cable/green, /turf/simulated/floor/tiled/white, /area/rnd/chemistry_lab) +"mvT" = ( +/obj/structure/flora/ausbushes/ywflowers{ + pixel_y = 11 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "mwN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -19968,6 +20082,10 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/wood, /area/library) +"mOI" = ( +/obj/structure/flora/ausbushes/fullgrass, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "mOS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -20939,9 +21057,6 @@ dir = 8 }, /obj/structure/table/rack/shelf/steel, -/obj/item/clothing/suit/space/emergency, -/obj/item/clothing/head/helmet/space/emergency, -/obj/item/tank/oxygen, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, /obj/effect/floor_decal/industrial/outline/yellow, @@ -20952,6 +21067,7 @@ /obj/structure/window/reinforced{ dir = 4 }, +/obj/item/clothing/suit/storage/hooded/wintercoat, /obj/item/clothing/mask/gas/clear, /turf/simulated/floor/tiled/steel, /area/storage/surface_eva) @@ -21419,8 +21535,7 @@ dir = 8 }, /obj/machinery/computer/security{ - dir = 4; - icon_state = "computer" + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/security/prison/upper) @@ -22587,6 +22702,13 @@ }, /turf/simulated/floor/tiled/monotile, /area/rnd/xenoarch_storage) +"omD" = ( +/obj/structure/flora/ausbushes/lavendergrass{ + pixel_x = 6; + pixel_y = 6 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "onl" = ( /obj/effect/floor_decal/spline/plain{ dir = 8 @@ -23892,6 +24014,10 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/quartermaster/garage) +"paQ" = ( +/obj/structure/flora/rock/ice, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "paX" = ( /turf/simulated/wall/prepainted/science, /area/rnd/hallway) @@ -23921,6 +24047,7 @@ /obj/structure/closet/jcloset, /obj/item/soap/nanotrasen, /obj/machinery/light, +/obj/item/reagent_containers/glass/rag/sponge, /turf/simulated/floor/tiled/steel, /area/janitor) "pbz" = ( @@ -24773,6 +24900,13 @@ /obj/item/flame/candle/candelabra/everburn, /turf/simulated/floor/carpet, /area/rift/surfacebase/outside/outside1) +"pAx" = ( +/obj/structure/flora/ausbushes/ppflowers{ + pixel_x = 12; + pixel_y = 3 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "pAQ" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -26241,6 +26375,10 @@ }, /turf/simulated/floor/tiled, /area/medical/virology) +"quA" = ( +/obj/structure/bookcase/lore, +/turf/simulated/floor/wood, +/area/library) "quL" = ( /obj/structure/table/bench/wooden, /turf/simulated/floor/outdoors/gravsnow/lythios43c, @@ -26737,6 +26875,13 @@ /obj/structure/table/wooden_reinforced, /turf/simulated/floor/wood, /area/rnd/outpost/xenobiology/outpost_office) +"qMo" = ( +/obj/structure/flora/grass/both{ + pixel_x = 6; + pixel_y = 10 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "qMA" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -27831,6 +27976,9 @@ }, /turf/simulated/floor/tiled/steel_dirty, /area/rnd/tankstorage) +"rvl" = ( +/turf/simulated/floor/outdoors/safeice/lythios43c, +/area/rift/surfacebase/outside/outside1) "rvy" = ( /obj/structure/catwalk, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ @@ -28318,6 +28466,10 @@ }, /turf/simulated/floor/concrete/rng/indoors, /area/rift/station/fighter_bay/transport_tunnel_garage_maint) +"rHP" = ( +/obj/structure/flora/ausbushes/brflowers, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "rIt" = ( /obj/machinery/power/apc/west_mount, /obj/machinery/light, @@ -28760,6 +28912,10 @@ }, /turf/simulated/floor/tiled/steel, /area/quartermaster/office) +"rUu" = ( +/obj/structure/flora/ausbushes, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "rUD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 4 @@ -29768,6 +29924,10 @@ /obj/structure/flora/ausbushes/ppflowers, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/rift/station/public_garden) +"suv" = ( +/obj/structure/flora/ausbushes/grassybush, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "suV" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, @@ -33936,6 +34096,10 @@ }, /turf/simulated/floor/tiled/monotile, /area/rnd/hallway) +"uJX" = ( +/obj/structure/flora/rock/ice/alternative_2, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "uKd" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -34027,6 +34191,13 @@ }, /turf/simulated/floor/tiled/monotile, /area/rnd/xenoarch_storage) +"uMA" = ( +/obj/structure/flora/grass/brown{ + pixel_x = 7; + pixel_y = 10 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "uNc" = ( /obj/structure/closet/emcloset, /obj/random/maintenance/cargo, @@ -34070,6 +34241,12 @@ /obj/structure/closet/crate/engineering, /turf/simulated/floor/tiled/steel, /area/quartermaster/warehouse) +"uOW" = ( +/obj/structure/flora/grass/green{ + pixel_x = -13 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "uPa" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -37402,6 +37579,13 @@ }, /turf/simulated/floor/lino, /area/tether/surfacebase/entertainment/backstage) +"wXo" = ( +/obj/structure/flora/ausbushes/ywflowers{ + pixel_x = -5; + pixel_y = 11 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "wXJ" = ( /obj/structure/bed/chair{ dir = 4 @@ -37644,6 +37828,13 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/white, /area/medical/psych_ward) +"xcY" = ( +/obj/structure/flora/ausbushes/ywflowers{ + pixel_x = -13; + pixel_y = 2 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "xdq" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -37828,6 +38019,10 @@ }, /turf/simulated/floor/tiled/steel, /area/quartermaster/foyer) +"xhQ" = ( +/obj/structure/flora/ausbushes/leafybush, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "xhZ" = ( /obj/structure/cable/heavyduty{ icon_state = "1-2" @@ -38050,6 +38245,10 @@ }, /turf/simulated/floor/wood, /area/lawoffice) +"xnE" = ( +/obj/structure/flora/bush, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "xnJ" = ( /obj/spawner/window/low_wall/full/nogrille/firelocks, /obj/effect/paint/beastybrown, @@ -38688,6 +38887,10 @@ "xIm" = ( /turf/simulated/wall/prepainted, /area/rnd/outpost/xenobiology/outpost_stairs) +"xJx" = ( +/obj/structure/flora/grass/brown, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "xJK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -39596,7 +39799,7 @@ wCM pqd ubp iFU -nNX +dsJ nNX wCM nog @@ -39790,7 +39993,7 @@ wCM pqd ubp vwm -nNX +dsJ nNX wCM nog @@ -39984,7 +40187,7 @@ wCM pqd ubp vwm -nNX +dsJ nNX wCM nog @@ -40178,7 +40381,7 @@ okO pqd ubp vwm -vFs +dns nNX wCM nog @@ -40372,7 +40575,7 @@ wCM pqd ubp vwm -nNX +dsJ nNX wCM nog @@ -40566,7 +40769,7 @@ wCM pqd ubp vwm -nNX +dsJ nNX wCM nog @@ -40760,7 +40963,7 @@ wCM pqd ubp vwm -nNX +dsJ nNX wCM nog @@ -41148,7 +41351,7 @@ okO pqd ubp vwm -vFs +dns nNX wCM nog @@ -41731,7 +41934,7 @@ pqd ubp lNb iFN -iFN +wXo vUA qcW vUA @@ -41824,7 +42027,7 @@ iFN vUA vUA vUA -iFN +xhQ iFN iFN iFN @@ -41924,17 +42127,17 @@ iFN pqd ubp lNb -iFN +ebZ iFN jZZ nog iFN iFN +qhZ iFN +enm iFN -iFN -iFN -iFN +rHP iFN iFN iFN @@ -42012,7 +42215,7 @@ dGy (14,1,1) = {" dGy iFN -iFN +lxF iFN iFN vUA @@ -42020,9 +42223,9 @@ vUA vUA iFN iFN +lxP iFN -iFN -iFN +gGe iFN iFN iFN @@ -42119,10 +42322,10 @@ pqd ubp lNb iFN -iFN +auZ jZZ nog -iFN +auZ iFN iFN iFN @@ -42180,7 +42383,7 @@ iFN iFN iFN iFN -iFN +mbg iFN iFN iFN @@ -42213,9 +42416,9 @@ vUA vUA vUA iFN -iFN -iFN -iFN +rvl +rvl +mbg iFN iFN iFN @@ -42327,7 +42530,7 @@ mjO mjO qDG iFN -iFN +gGe iFN oFG iFN @@ -42401,11 +42604,17 @@ dGy dGy iFN iFN +lxF iFN iFN iFN iFN +rvl +rvl +rvl +rvl iFN +mbg iFN iFN iFN @@ -42414,13 +42623,7 @@ iFN iFN iFN iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN +lxF iFN iFN iFN @@ -42480,7 +42683,7 @@ iFN iFN iFN iFN -iFN +lxF iFN iFN iFN @@ -42507,7 +42710,7 @@ pqd ubp lNb iFN -iFN +qhZ iFN iFN oFG @@ -42517,7 +42720,7 @@ iFN oFG oFG iFN -iFN +enm iFN tcZ iFN @@ -42529,11 +42732,13 @@ oFG oFG iFN iFN +lxF iFN iFN iFN iFN iFN +lxF iFN iFN iFN @@ -42542,13 +42747,16 @@ iFN iFN iFN iFN +auZ iFN iFN iFN +lxF iFN iFN iFN iFN +lxF iFN iFN iFN @@ -42557,12 +42765,7 @@ iFN iFN iFN iFN -iFN -iFN -iFN -iFN -iFN -iFN +mbg iFN iFN iFN @@ -42598,9 +42801,18 @@ iFN iFN iFN iFN +gGe +rvl +rvl +rvl +rvl +rvl +rvl +rvl iFN iFN iFN +lxF iFN iFN iFN @@ -42619,16 +42831,7 @@ iFN iFN iFN iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN +lxP iFN iFN iFN @@ -42708,7 +42911,7 @@ oFG oFG iFN oFG -iFN +mOI iFN oFG oFG @@ -42743,14 +42946,14 @@ oFG iFN iFN iFN +rHP iFN iFN iFN iFN iFN iFN -iFN -iFN +lxF iFN oFG iFN @@ -42761,7 +42964,7 @@ oFG oFG iFN iFN -iFN +owx iFN oFG oFG @@ -42792,35 +42995,35 @@ iFN iFN iFN iFN +rvl +rvl +rvl +rvl +rvl +rvl +rvl +rvl iFN iFN iFN iFN iFN iFN +enm iFN iFN iFN iFN iFN iFN +pAx iFN iFN iFN iFN iFN iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN +gGe iFN iFN iFN @@ -42846,13 +43049,16 @@ iFN iFN iFN iFN +gGe iFN iFN iFN +gGe iFN iFN iFN iFN +lxF iFN iFN iFN @@ -42863,10 +43069,7 @@ iFN iFN iFN iFN -iFN -iFN -iFN -iFN +lxF iFN iFN iFN @@ -42919,7 +43122,7 @@ oFG iFN iFN iFN -iFN +rHP iFN iFN iFN @@ -42982,17 +43185,17 @@ dGy (19,1,1) = {" dGy iFN +lxF iFN iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN +rvl +rvl +rvl +rvl +rvl +rvl +rvl +rvl iFN iFN iFN @@ -43036,6 +43239,7 @@ ayM iFN iFN iFN +gGe iFN iFN iFN @@ -43046,6 +43250,7 @@ iFN iFN iFN iFN +gGe iFN iFN iFN @@ -43053,6 +43258,7 @@ iFN iFN iFN iFN +gGe iFN iFN iFN @@ -43060,10 +43266,7 @@ iFN iFN iFN iFN -iFN -iFN -iFN -iFN +qiK iFN oFG oFG @@ -43089,7 +43292,7 @@ pqd ubp lNb iFN -iFN +lxF iFN iFN hgE @@ -43108,11 +43311,11 @@ iFN iFN iFN iFN +lxF iFN iFN iFN -iFN -iFN +lxF iFN iFN iFN @@ -43125,6 +43328,7 @@ vUA vUA iFd iFN +mOI iFN iFN iFN @@ -43133,8 +43337,7 @@ iFN iFN iFN iFN -iFN -iFN +rHP iFN iFN iFN @@ -43150,7 +43353,7 @@ iFN iFN iFN iFN -iFN +rHP iFN iFN iFN @@ -43180,13 +43383,25 @@ iFN iFN iFN iFN +rvl +rvl +rvl +rvl +rvl +rvl +rvl +gGe iFN iFN +lxF iFN +gGe iFN iFN +lgY iFN iFN +gGe iFN iFN iFN @@ -43194,20 +43409,8 @@ iFN iFN iFN iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN +efY +mbg iFN iFN iFN @@ -43235,11 +43438,11 @@ iFN iFN iFN iFN +gGe iFN iFN iFN -iFN -iFN +lxF iFN iFN iFN @@ -43309,7 +43512,7 @@ iFN iFN iFN iFN -iFN +fvp iFN iFN iFN @@ -43321,17 +43524,17 @@ iFd iFN iFN iFN +lxF iFN iFN iFN iFN +lxF iFN iFN iFN iFN -iFN -iFN -iFN +lxF iFN hgE hgE @@ -43372,7 +43575,14 @@ dGy iFN iFN iFN +gGe iFN +rvl +rvl +rvl +rvl +rvl +rvl iFN iFN iFN @@ -43389,25 +43599,18 @@ iFN iFN iFN iFN +lxF iFN iFN +lxF +mbg +efY +pAx iFN iFN iFN iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN +gGe iFN iFN iFN @@ -43423,14 +43626,14 @@ ayM ayM iFN iFN +gGe iFN iFN iFN +lxF iFN iFN -iFN -iFN -iFN +gGe iFN iFN iFN @@ -43477,9 +43680,9 @@ pqd ubp lNb vFs +rHP iFN -iFN -iFN +qhZ hgE hgE hgE @@ -43497,15 +43700,15 @@ nNX nNX nNX iFN +lxF iFN iFN +lxF iFN iFN iFN iFN -iFN -iFN -iFN +lxF iFN iFd iFd @@ -43537,7 +43740,7 @@ iFN iFN iFN iFN -iFN +mbg iFN iFN iFN @@ -43568,7 +43771,13 @@ iFN iFN iFN iFN +rvl +suv +rvl +rvl +rvl iFN +auZ iFN iFN iFN @@ -43576,13 +43785,7 @@ iFN iFN iFN iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN +lxF iFN iFN iFN @@ -43629,7 +43832,7 @@ iFN iFN iFN iFN -iFN +lxF iFN iFN iFN @@ -43637,14 +43840,14 @@ iFN evV iFN iFN +lxF iFN iFN iFN +lxF iFN iFN -iFN -iFN -iFN +lxF iFN iFN iFN @@ -43672,8 +43875,8 @@ ubp lNb iFN iFN -iFN -iFN +ibB +lUp hgE hgE hgE @@ -43761,6 +43964,9 @@ iFN iFN iFN iFN +gGe +rvl +auZ iFN iFN iFN @@ -43768,8 +43974,10 @@ iFN iFN iFN iFN +xJx iFN iFN +jVw iFN iFN iFN @@ -43782,20 +43990,15 @@ iFN iFN iFN iFN +gGe iFN iFN iFN iFN +lxF iFN iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN +pAx iFN iFN iFN @@ -43865,14 +44068,14 @@ pqd ubp lNb iFN +gGe iFN +omD iFN iFN iFN iFN -iFN -iFN -iFN +ebZ jZZ nNX nNX @@ -43953,14 +44156,17 @@ dGy dGy iFN iFN +lxF iFN iFN iFN iFN iFN +auZ iFN iFN iFN +lxF iFN iFN iFN @@ -43969,13 +44175,10 @@ iFN iFN iFN iFN +auZ iFN iFN -iFN -iFN -iFN -iFN -iFN +auZ iFN iFN iFN @@ -44002,6 +44205,7 @@ frA ayM iFN iFN +gGe iFN iFN iFN @@ -44009,12 +44213,11 @@ iFN iFN iFN iFN +gGe iFN iFN iFN -iFN -iFN -iFN +hgE iFN iFN iFN @@ -44028,20 +44231,20 @@ oFG oFG iFN iFN +gGe iFN iFN iFN +lxP iFN iFN iFN -iFN -iFN -iFN +lxF iFN iFN oFG iFN -iFN +jDP iFN jZZ nNX @@ -44055,7 +44258,7 @@ nNX nNX rNK iFN -pqd +iFN ubp lNb iFN @@ -44064,7 +44267,7 @@ iFN iFN iFN iFN -iFN +gGe iFN iFN jZZ @@ -44115,12 +44318,12 @@ iFN iFN iFN iFN +lxF iFN iFN iFN iFN -iFN -iFN +lxF iFN iFN iFN @@ -44150,31 +44353,31 @@ iFN iFN iFN iFN +caB iFN iFN iFN +lxF iFN iFN iFN iFN iFN iFN +gGe iFN iFN iFN +gGe iFN iFN iFN iFN iFN iFN +pAx iFN -iFN -iFN -iFN -iFN -iFN -iFN +auZ iFN iFN iFN @@ -44199,6 +44402,7 @@ iFN iFN iFN iFN +gGe iFN iFN iFN @@ -44206,10 +44410,9 @@ iFN iFN iFN iFN -iFN -iFN -iFN -iFN +hgE +hgE +hgE iFN iFN iFN @@ -44225,13 +44428,13 @@ iFN iFN iFN iFN +lxF iFN iFN iFN iFN iFN -iFN -iFN +jDP iFN iFN iFN @@ -44254,12 +44457,12 @@ ubp lNb iFN iFN +gGe iFN +hyV iFN iFN -iFN -iFN -iFN +gGe iFN jZZ nNX @@ -44342,6 +44545,7 @@ dGy iFN iFN iFN +gGe iFN iFN iFN @@ -44350,6 +44554,7 @@ iFN iFN iFN iFN +rHP iFN iFN iFN @@ -44360,6 +44565,7 @@ iFN iFN iFN iFN +hgE iFN iFN iFN @@ -44376,6 +44582,8 @@ iFN iFN iFN iFN +lxF +gGe iFN iFN iFN @@ -44393,19 +44601,14 @@ iFN iFN iFN iFN +lxF iFN iFN +hgE +hgE iFN iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN +jVw iFN iFN iFN @@ -44451,7 +44654,7 @@ iFN iFN iFN iFN -iFN +lxF iFN iFN iFN @@ -44543,22 +44746,29 @@ iFN iFN iFN iFN +gGe iFN iFN iFN +gGe iFN iFN iFN iFN +lxF iFN iFN +hgE +hgE iFN iFN iFN iFN +xJx iFN iFN iFN +lxF iFN iFN iFN @@ -44568,14 +44778,7 @@ iFN iFN iFN iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN +pAx iFN iFN iFN @@ -44586,6 +44789,7 @@ iFN iFN iFN iFN +efY iFN iFN iFN @@ -44595,6 +44799,7 @@ iFN iFN iFN iFN +hgE iFN iFN iFN @@ -44602,9 +44807,7 @@ iFN iFN iFN iFN -iFN -iFN -iFN +mOI iFN oFG oFG @@ -44613,14 +44816,14 @@ iFN iFN iFN iFN +lxF iFN iFN +gGe iFN +hgE iFN -iFN -iFN -iFN -iFN +omD iFN iFN oFG @@ -44643,7 +44846,7 @@ lNb vFs iFN iFN -iFN +gGe iFN iFN iFN @@ -44733,7 +44936,9 @@ iFN iFN iFN iFN +gGe iFN +lxP iFN iFN iFN @@ -44746,25 +44951,23 @@ iFN iFN iFN iFN +hgE +hgE +hgE iFN iFN iFN +lxF iFN +xJx iFN iFN iFN iFN iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN +hgE +hgE +hgE iFN iFN iFN @@ -44778,45 +44981,45 @@ oFG iFN iFN iFN +lxF iFN iFN +jDP iFN iFN iFN +lxF iFN iFN iFN iFN iFN iFN +hgE iFN iFN +mbg iFN -iFN -iFN -iFN -iFN -iFN -iFN +lxP iFN iFN oFG oFG oFG iFN +mbg iFN iFN iFN iFN iFN iFN -iFN -iFN -iFN +hgE +hgE iFN iFN oFG -iFN +gGe oFG iFN iFN @@ -44841,7 +45044,7 @@ iFN iFN iFN iFN -iFN +mbg iFN iFN jZZ @@ -44924,6 +45127,7 @@ dGy iFN iFN iFN +lxF iFN iFN iFN @@ -44931,7 +45135,9 @@ iFN iFN iFN iFN +gGe iFN +jVw iFN iFN iFN @@ -44940,17 +45146,28 @@ iFN iFN iFN iFN +hgE +hgE +hgE iFN iFN iFN iFN +xJx iFN iFN iFN iFN +hgE +hgE +hgE +hgE +hgE +hgE iFN iFN iFN +gGe iFN iFN iFN @@ -44968,25 +45185,11 @@ iFN iFN iFN iFN +rvl iFN iFN iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN +hgE iFN iFN iFN @@ -45003,7 +45206,7 @@ iFN iFN iFN iFN -iFN +lxF iFN iFN iFN @@ -45030,14 +45233,14 @@ ubp lNb iFN iFN +lxF iFN iFN +lxP iFN iFN iFN -iFN -iFN -iFN +uOW jZZ nNX nNX @@ -45085,7 +45288,7 @@ nNX iFN iFN iFN -iFN +lxF iFN iFN iFN @@ -45123,31 +45326,44 @@ iFN iFN iFN iFN +rHP iFN iFN iFN iFN iFN +gGe iFN iFN iFN iFN iFN iFN +hgE +hgE +hgE +hgE iFN iFN +xJx iFN iFN iFN iFN iFN iFN +hgE +hgE +hgE +hgE +hgE iFN iFN iFN iFN iFN iFN +lxP iFN iFN iFN @@ -45163,6 +45379,8 @@ iFN iFN iFN iFN +rvl +rvl iFN iFN iFN @@ -45171,42 +45389,27 @@ iFN iFN iFN iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN +gGe iFN oFG oFG iFN +gGe iFN iFN iFN +gGe iFN iFN iFN iFN +lxF iFN iFN iFN iFN iFN -iFN -iFN -iFN -iFN +auZ iFN iFN iFN @@ -45217,7 +45420,7 @@ mfX mfX mfX iFN -iFN +gGe iFN pqd ubp @@ -45225,7 +45428,7 @@ lNb iFN iFN iFN -iFN +gGe iFN iFN iFN @@ -45284,7 +45487,7 @@ iFN iFN iFN iFN -iFN +mbg iFN iFN iFN @@ -45312,6 +45515,7 @@ dGy iFN iFN iFN +gGe iFN iFN iFN @@ -45319,13 +45523,20 @@ iFN iFN iFN iFN +lxF iFN iFN iFN iFN iFN iFN +lxF iFN +hgE +hgE +hgE +hgE +hgE iFN iFN iFN @@ -45333,6 +45544,7 @@ iFN iFN iFN iFN +xJx iFN iFN iFN @@ -45341,16 +45553,7 @@ iFN iFN iFN iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN +gGe iFN iFN iFN @@ -45358,21 +45561,21 @@ iFN iFN oFG iFN +pAx +jDP iFN iFN iFN iFN +lxF iFN iFN iFN iFN iFN -iFN -iFN -iFN -iFN -iFN -iFN +suv +rvl +rvl iFN iFN iFN @@ -45391,7 +45594,7 @@ iFN iFN iFN iFN -iFN +lxF iFN iFN iFN @@ -45403,13 +45606,13 @@ iFN iFN iFN iFN +lxF iFN iFN iFN iFN iFN -iFN -iFN +mbg iFN iFN iFN @@ -45418,13 +45621,13 @@ ubp lNb iFN iFN +mvT iFN iFN iFN +lxF iFN -iFN -iFN -iFN +uMA jZZ nNX nNX @@ -45473,7 +45676,7 @@ nNX iFN iFN iFN -iFN +lxF iFN iFN iFN @@ -45524,9 +45727,9 @@ iFN iFN iFN iFN -iFN -iFN -iFN +hgE +hgE +hgE iFN iFN iFN @@ -45538,16 +45741,16 @@ iFN iFN iFN iFN -iFN +lxF iFN iFN iFN vUA vUA vUA +uMA iFN -iFN -iFN +uJX iFN oFG oFG @@ -45561,9 +45764,9 @@ iFN iFN iFN iFN -iFN -iFN -iFN +hgE +hgE +hgE iFN iFN vUA @@ -45571,9 +45774,9 @@ vUA vUA iFN iFN +mbg iFN -iFN -iFN +lxF iFN iFN oFG @@ -45584,12 +45787,12 @@ iFN iFN iFN iFN +mbg iFN iFN iFN iFN -iFN -iFN +efY iFN oFG oFG @@ -45602,10 +45805,10 @@ iFN iFN iFN iFN +lxF iFN iFN -iFN -iFN +gGe iFN pqd ubp @@ -45699,7 +45902,7 @@ dGy dGy iFN iFN -iFN +lxF iFN vUA vUA @@ -45708,8 +45911,8 @@ iFN iFN iFN iFN -iFN -iFN +xJx +gGe iFN iFN iFN @@ -45740,23 +45943,23 @@ vUA vUA vUA iFN -iFN +jVw iFN iFN oFG iFN iFN iFN +hgE +hgE iFN iFN iFN iFN iFN -iFN -iFN -iFN -iFN -iFN +hgE +hgE +hgE iFN iFN iFN @@ -45766,19 +45969,19 @@ vUA iFN iFN iFN +enm iFN iFN -iFN -iFN +gGe oFG oFG oFG iFN iFN iFN +gGe iFN -iFN -iFN +lxP iFN iFN iFN @@ -45790,15 +45993,15 @@ oFG iFN iFN iFN +lxF iFN +gGe iFN iFN iFN iFN iFN -iFN -iFN -iFN +paQ iFN vFs pqd @@ -45811,7 +46014,7 @@ iFN iFN iFN iFN -iFN +lxF iFN jZZ nNX @@ -45900,30 +46103,30 @@ vUA vUA iFN iFN +gGe iFN iFN iFN iFN +gGe iFN iFN iFN +gGe iFN iFN iFN iFN +gGe iFN -iFN -iFN -iFN -iFN -iFN +lxP iFN iFN vUA vUA vUA iFN -iFN +xJx iFN iFN iFN @@ -45940,17 +46143,17 @@ iFN oFG iFN iFN +hgE +hgE +hgE +hgE iFN iFN iFN iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN +hgE +hgE +hgE iFN iFN iFN @@ -45962,23 +46165,23 @@ iFN iFN iFN iFN -iFN +mOI iFN oFG oFG oFG iFN iFN +lxF iFN iFN iFN iFN +xJx iFN +gGe iFN -iFN -iFN -iFN -iFN +mbg iFN oFG iFN @@ -45995,14 +46198,14 @@ iFN iFN iFN iFN -pqd +oFG ubp lNb iFN iFN iFN iFN -iFN +lxF iFN iFN iFN @@ -46086,11 +46289,13 @@ dGy (35,1,1) = {" dGy iFN +lxF iFN iFN iFN iFN iFN +xJx iFN iFN iFN @@ -46099,10 +46304,12 @@ iFN iFN iFN iFN +gGe iFN iFN iFN iFN +gGe iFN iFN iFN @@ -46117,6 +46324,7 @@ iFN iFN iFN iFN +gGe iFN iFN iFN @@ -46124,37 +46332,32 @@ iFN iFN iFN iFN +gGe iFN iFN iFN +qMo iFN +hgE +hgE +hgE +hgE iFN iFN iFN iFN +hgE iFN iFN iFN +qMo iFN iFN iFN iFN iFN iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN +lxF iFN iFN iFN @@ -46166,6 +46369,7 @@ iFN iFN iFN iFN +qiK iFN iFN iFN @@ -46175,30 +46379,29 @@ iFN iFN iFN iFN +jDP iFN iFN iFN iFN +lxF iFN iFN +rUu iFN +gGe iFN +lxF +oFG +oFG +oFG +oFG iFN iFN iFN iFN iFN -iFN -pqd -ubp -lNb -iFN -iFN -iFN -iFN -iFN -iFN -iFN +uMA iFN iFN jZZ @@ -46287,8 +46490,10 @@ iFN iFN iFN iFN +gGe iFN iFN +gGe iFN iFN iFN @@ -46310,15 +46515,13 @@ iFN iFN iFN iFN +jDP iFN iFN iFN iFN iFN -iFN -iFN -iFN -iFN +lxF iFN iFN iFN @@ -46330,6 +46533,8 @@ iFN iFN iFN iFN +hgE +hgE iFN iFN iFN @@ -46338,13 +46543,11 @@ iFN iFN iFN iFN +lxF iFN iFN iFN -iFN -iFN -iFN -iFN +efb iFN iFN iFN @@ -46359,36 +46562,36 @@ iFN iFN iFN iFN +xJx iFN iFN iFN +lxF +xcY iFN +lxP iFN iFN iFN iFN iFN +xnE iFN iFN iFN +efb iFN iFN iFN iFN iFN iFN +oFG +oFG +oFG iFN iFN -iFN -iFN -iFN -iFN -pqd -ubp -lNb -iFN -iFN -iFN +lxF iFN iFN iFN @@ -46475,7 +46678,7 @@ dGy dGy iFN iFN -iFN +lxF iFN iFN iFN @@ -46512,11 +46715,11 @@ iFN iFN iFN iFN +lxP iFN iFN iFN -iFN -iFN +lxF iFN iFN oFG @@ -46524,9 +46727,12 @@ iFN iFN iFN iFN +hgE +hgE iFN iFN iFN +gGe iFN iFN iFN @@ -46538,19 +46744,16 @@ iFN iFN iFN iFN +gGe iFN iFN -iFN -iFN -iFN -iFN -iFN +enm iFN iFN oFG oFG iFN -iFN +qiK iFN iFN iFN @@ -46564,21 +46767,21 @@ iFN oFG oFG iFN +enm iFN iFN +auZ iFN iFN iFN iFN iFN iFN -iFN -iFN -iFN +mbg iFN iFN pqd -ubp +oFG lNb iFN iFN @@ -46716,6 +46919,7 @@ iFN oFG oFG iFN +xJx iFN iFN iFN @@ -46724,50 +46928,49 @@ iFN iFN iFN iFN +jDP iFN iFN +xJx iFN iFN +jDP iFN iFN +lxF iFN iFN iFN iFN iFN -iFN -iFN -iFN -iFN -iFN -iFN +qiK oFG oFG +xJx iFN iFN iFN +jDP iFN iFN iFN iFN iFN -iFN -iFN -iFN +xnE iFN oFG oFG iFN +jVw iFN +gGe iFN +bhH +xnE iFN iFN iFN -iFN -iFN -iFN -iFN -iFN +lxF iFN iFN iFN @@ -46776,10 +46979,10 @@ ubp lNb iFN iFN +gGe iFN iFN -iFN -iFN +gGe iFN iFd vUA @@ -46866,14 +47069,14 @@ iFN iFN iFN iFN +xJx iFN +rHP iFN iFN +lxF iFN -iFN -iFN -iFN -iFN +gGe iFN kAb cPn @@ -46901,17 +47104,18 @@ oFG oFG iFN iFN +gGe iFN +efY iFN -iFN -iFN -iFN +gGe iFN iFN oFG iFN iFN iFN +efY iFN iFN iFN @@ -46932,14 +47136,13 @@ iFN iFN iFN iFN -iFN -iFN +jDP iFN oFG oFG iFN iFN -iFN +xJx iFN iFN iFN @@ -46972,7 +47175,7 @@ vFs iFN iFN iFN -iFN +lxF iFN iFN iFd @@ -47059,7 +47262,7 @@ iFN iFN iFN iFN -iFN +lxF iFN iFN iFN @@ -47151,7 +47354,7 @@ vFs iFN iFN iFN -iFN +auZ iFN vFs iFN @@ -47164,7 +47367,7 @@ ubp lNb iFN iFN -iFN +gGe iFN iFN iFN @@ -47255,13 +47458,13 @@ iFN iFN iFN iFN +gGe iFN iFN iFN +gGe iFN -iFN -iFN -iFN +gGe iFN kAb qAg @@ -47357,7 +47560,7 @@ ubp ubp lNb iFN -iFN +gGe iFN iFN iFN @@ -47450,9 +47653,9 @@ iFN iFN iFN iFN +xJx iFN -iFN -iFN +gGe iFN iFN iFN @@ -47523,13 +47726,13 @@ oFG oFG oFG oFG +gGe iFN iFN iFN iFN iFN -iFN -iFN +efY iFN iFN iFN @@ -47551,10 +47754,10 @@ ubp ubp lNb iFN +lxF iFN iFN -iFN -iFN +lxF iFN iFN iFN @@ -47638,15 +47841,15 @@ dGy (43,1,1) = {" dGy iFN +lxF iFN iFN iFN iFN +rHP iFN iFN -iFN -iFN -iFN +xJx iFN iFN iFN @@ -47692,13 +47895,15 @@ iFN iFN iFN iFN -iFN +gGe iFN oFG oFG iFN +lxF iFN iFN +gGe iFN iFN iFN @@ -47711,16 +47916,14 @@ iFN iFN iFN iFN +gGe iFN iFN iFN iFN +xJx iFN -iFN -iFN -iFN -iFN -iFN +rHP iFN iFN iFN @@ -47731,7 +47934,7 @@ pqd lNb vFs iFN -iFN +omD iFN pqd lNb @@ -47739,7 +47942,7 @@ vFs iFN iFN iFN -iFN +lxF iFN pqd ubp @@ -47750,7 +47953,7 @@ iFN iFN iFN iFN -iFN +gGe iFN iFN xoc @@ -47834,6 +48037,7 @@ dGy iFN iFN iFN +gGe iFN iFN iFN @@ -47841,8 +48045,7 @@ iFN iFN iFN iFN -iFN -iFN +gGe iFN iFN kAb @@ -47880,9 +48083,9 @@ iFN iFN iFN iFN +xJx iFN -iFN -iFN +efY iFN iFN iFN @@ -47900,22 +48103,22 @@ iFN iFN iFN iFN +lxF +gGe iFN iFN +qiK iFN iFN iFN +xJx iFN iFN iFN iFN iFN iFN -iFN -iFN -iFN -iFN -iFN +gGe iFN iFN iFN @@ -47926,14 +48129,14 @@ lNb iFN iFN iFN -iFN +omD pqd lNb iFN +auZ +efb iFN -iFN -iFN -iFN +auZ vFs pqd ubp @@ -48027,13 +48230,13 @@ dGy dGy iFN iFN +gGe iFN iFN iFN iFN iFN -iFN -iFN +lxF iFN iFN iFN @@ -48066,14 +48269,14 @@ iFN iFN iFN iFN +gGe iFN iFN iFN iFN +gGe iFN -iFN -iFN -iFN +gGe iFN iFN iFN @@ -48088,10 +48291,10 @@ iFN iFN iFN iFN +jDP iFN iFN -iFN -iFN +jDP iFN iFN iFN @@ -48124,7 +48327,7 @@ iFN pqd lNb iFN -iFN +gGe iFN iFN iFN @@ -48133,11 +48336,11 @@ pqd ubp lNb iFN +gGe iFN iFN iFN -iFN -iFN +uMA iFN iFN jZZ @@ -48230,7 +48433,7 @@ iFN iFN iFN iFN -iFN +gGe iFN iFN iFN @@ -48253,12 +48456,17 @@ kAb kAb dER iFN +efY iFN iFN +hgE +hgE +hgE iFN iFN iFN iFN +lxF iFN iFN iFN @@ -48268,17 +48476,13 @@ iFN iFN iFN iFN -iFN -iFN -iFN -iFN -iFN -iFN +lxF iFN iFN oFG oFG iFN +gGe iFN iFN iFN @@ -48288,8 +48492,7 @@ iFN iFN iFN iFN -iFN -iFN +lxF iFN iFN iFN @@ -48311,7 +48514,7 @@ iFN iFN pqd lNb -iFN +jVw iFN iFN iFN @@ -48319,16 +48522,16 @@ pqd lNb iFN iFN +qMo iFN -iFN -iFN +xnE iFN pqd ubp lNb iFN iFN -iFN +uMA iFN ydQ qqW @@ -48418,11 +48621,11 @@ iFN iFN iFN iFN +gGe iFN iFN iFN -iFN -iFN +rHP iFN iFN iFN @@ -48449,10 +48652,10 @@ iFN iFN iFN iFN -iFN -iFN -iFN -iFN +hgE +hgE +hgE +jEQ iFN iFN iFN @@ -48477,9 +48680,9 @@ iFN iFN iFN iFN -iFN -iFN -iFN +hgE +hgE +hgE iFN iFN iFN @@ -48608,16 +48811,19 @@ dGy (48,1,1) = {" dGy iFN +lxF iFN iFN iFN iFN +gGe iFN iFN iFN iFN iFN iFN +gGe iFN iFN iFN @@ -48631,17 +48837,14 @@ iFN iFN iFN iFN +xJx iFN iFN iFN iFN iFN iFN -iFN -iFN -iFN -iFN -iFN +xJx iFN iFN iFN @@ -48670,14 +48873,14 @@ iFN iFN iFN iFN +hgE +hgE +hgE +hgE iFN iFN iFN -iFN -iFN -iFN -iFN -iFN +gGe iFN iFN lPZ @@ -48707,7 +48910,7 @@ ubp ubp pdn iFN -iFN +efY iFN iFN iFN @@ -48811,12 +49014,14 @@ iFN iFN iFN iFN +lxF iFN iFN iFN iFN iFN iFN +xJx iFN iFN iFN @@ -48824,10 +49029,12 @@ iFN iFN iFN iFN +lxF iFN iFN iFN iFN +lxF iFN iFN iFN @@ -48842,20 +49049,16 @@ iFN iFN iFN iFN +lxF iFN iFN iFN +lxF iFN +gGe iFN iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN +gGe iFN iFN oFG @@ -48864,10 +49067,10 @@ iFN iFN iFN iFN -iFN -iFN -iFN -iFN +hgE +hgE +hgE +hgE iFN iFN iFN @@ -48998,7 +49201,7 @@ dGy iFN iFN iFN -iFN +gGe iFN iFN iFN @@ -49034,7 +49237,7 @@ iFN iFN iFN iFN -iFN +lxF iFN iFN iFN @@ -49059,12 +49262,12 @@ iFN iFN iFN iFN +hgE +hgE iFN iFN iFN -iFN -iFN -iFN +lxF iFN iFN iFN @@ -49191,10 +49394,10 @@ dGy dGy iFN iFN +lxF iFN iFN -iFN -iFN +gGe iFN iFN iFN @@ -49214,15 +49417,15 @@ vUA vUA iFN iFN +lxF iFN +efb iFN iFN iFN iFN iFN -iFN -iFN -iFN +lxF iFN iFN iFN @@ -49252,9 +49455,9 @@ iFN iFN iFN iFN -iFN -iFN -iFN +hgE +hgE +hgE iFN iFN iFN @@ -49391,17 +49594,17 @@ iFN iFN iFN iFN +jDP iFN +gGe iFN iFN iFN iFN +lxF +jDP iFN -iFN -iFN -iFN -iFN -iFN +xJx iFN vUA vUA @@ -49454,7 +49657,7 @@ iFN iFN iFN iFN -iFN +qiK iFN lPZ qQY @@ -49584,6 +49787,7 @@ iFN iFN iFN iFN +lxF iFN iFN iFN @@ -49602,9 +49806,11 @@ iFN iFN iFN iFN +lxF iFN iFN iFN +lxF iFN iFN iFN @@ -49616,10 +49822,7 @@ iFN iFN iFN iFN -iFN -iFN -iFN -iFN +lxF iFN iFN iFN @@ -49775,6 +49978,7 @@ iFN iFN iFN iFN +lxF iFN iFN iFN @@ -49790,6 +49994,7 @@ iFN iFN iFN iFN +jDP iFN iFN iFN @@ -49817,9 +50022,7 @@ iFN iFN iFN iFN -iFN -iFN -iFN +lxF iFN iFN iFN @@ -49966,14 +50169,18 @@ wpT (55,1,1) = {" dGy iFN +lxF iFN +gGe iFN iFN iFN +gGe iFN iFN iFN iFN +xJx iFN iFN iFN @@ -49994,11 +50201,7 @@ iFN iFN iFN iFN -iFN -iFN -iFN -iFN -iFN +efb iFN iFN iFN @@ -50170,18 +50373,18 @@ iFN iFN iFN iFN +lxF iFN iFN iFN iFN iFN +lxF iFN iFN iFN iFN -iFN -iFN -iFN +jDP iFN iFN iFN @@ -50355,11 +50558,11 @@ wpT dGy iFN iFN +lxF iFN iFN iFN -iFN -iFN +gGe iFN iFN iFN @@ -50383,7 +50586,7 @@ iFN vUA vUA vUA -iFN +uMA iFN iFN iFN @@ -50550,12 +50753,12 @@ dGy iFN iFN iFN +gGe iFN iFN iFN iFN -iFN -iFN +gGe iFN iFN iFN @@ -50747,7 +50950,7 @@ iFN iFN iFN iFN -iFN +gGe iFN iFN iFN @@ -50937,7 +51140,7 @@ wpT dGy iFN iFN -iFN +lxF iFN iFN iFN @@ -61890,7 +62093,7 @@ vIk tjR rnI tjR -gbp +quA duD mdW mrc diff --git a/maps/rift/levels/rift-05-surface2.dmm b/maps/rift/levels/rift-05-surface2.dmm index 63fe275acb04..3d577fb291eb 100644 --- a/maps/rift/levels/rift-05-surface2.dmm +++ b/maps/rift/levels/rift-05-surface2.dmm @@ -307,11 +307,12 @@ "aoh" = ( /obj/machinery/door/airlock/glass/research{ name = "Research Lobby"; - req_one_access = list(29,47) + req_one_access = null }, /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/map_helper/access_helper/airlock/station/science/department, /turf/simulated/floor/tiled/steel, /area/rnd/research/researchdivision) "aok" = ( @@ -1393,7 +1394,6 @@ /turf/simulated/floor/maglev{ desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"; dir = 8; - icon_state = "maglevup"; name = "launch rail" }, /area/shuttle/hammerhead/general) @@ -2180,7 +2180,6 @@ /turf/simulated/floor/maglev{ desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"; dir = 8; - icon_state = "maglevup"; name = "launch rail" }, /area/shuttle/hammerhead/cockpit) @@ -2245,7 +2244,6 @@ /area/rnd/research) "bmS" = ( /obj/spawner/window/low_wall/reinforced/electrochromic/full{ - id = null; spawn_grille = 0 }, /obj/effect/paint/babyblue, @@ -2291,7 +2289,7 @@ "bno" = ( /obj/machinery/door/airlock/glass/research{ name = "RnD Lab"; - req_one_access = list(7) + req_one_access = null }, /obj/machinery/door/blast/shutters{ density = 0; @@ -2308,6 +2306,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/map_helper/access_helper/airlock/station/science/fabrication, /turf/simulated/floor/tiled/steel, /area/rnd/research) "bns" = ( @@ -2880,7 +2879,6 @@ /turf/simulated/floor/maglev{ desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"; dir = 8; - icon_state = "maglevup"; name = "launch rail" }, /area/shuttle/hammerhead/general) @@ -4036,11 +4034,12 @@ "cxg" = ( /obj/machinery/door/airlock/glass/research{ name = "Research Lobby"; - req_one_access = list(29,47) + req_one_access = null }, /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/map_helper/access_helper/airlock/station/science/department, /turf/simulated/floor/tiled/steel, /area/rnd/research/researchdivision) "cxu" = ( @@ -4528,6 +4527,10 @@ /obj/effect/floor_decal/corner/paleblue{ dir = 5 }, +/obj/item/storage/firstaid/adv{ + pixel_x = 4; + pixel_y = -11 + }, /turf/simulated/floor/tiled/white, /area/medical/medbay_primary_storage) "cPy" = ( @@ -8264,7 +8267,6 @@ /turf/simulated/floor/maglev{ desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"; dir = 8; - icon_state = "maglevup"; name = "launch rail" }, /area/shuttle/hammerhead/cockpit) @@ -8296,7 +8298,6 @@ /turf/simulated/floor/maglev{ desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"; dir = 8; - icon_state = "maglevup"; name = "launch rail" }, /area/shuttle/hammerhead/general) @@ -9106,7 +9107,6 @@ /area/security/hallway) "fSS" = ( /obj/spawner/window/low_wall/reinforced/electrochromic/full{ - id = null; spawn_grille = 0 }, /obj/effect/paint/babyblue, @@ -10956,6 +10956,13 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rift/turbolift/maint) +"hbr" = ( +/obj/structure/flora/ausbushes/ywflowers{ + pixel_x = 8; + pixel_y = -2 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside2) "hbT" = ( /obj/effect/floor_decal/industrial/warning, /obj/structure/cable/green{ @@ -12562,7 +12569,6 @@ /turf/simulated/floor/maglev{ desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"; dir = 8; - icon_state = "maglevup"; name = "launch rail" }, /area/shuttle/hammerhead/cockpit) @@ -12635,7 +12641,6 @@ /turf/simulated/floor/maglev{ desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"; dir = 8; - icon_state = "maglevup"; name = "launch rail" }, /area/shuttle/hammerhead/cockpit) @@ -13145,8 +13150,7 @@ "iqw" = ( /obj/effect/floor_decal/corner_techfloor_grid/full, /obj/machinery/computer/security{ - dir = 4; - icon_state = "computer" + dir = 4 }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/hammerhead/cockpit) @@ -14712,11 +14716,14 @@ /turf/simulated/floor/tiled/dark, /area/security/security_equiptment_storage) "jsz" = ( -/obj/machinery/door/airlock/maintenance/rnd, +/obj/machinery/door/airlock/maintenance/rnd{ + req_one_access = null + }, /obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/map_helper/access_helper/airlock/station/science/department, /turf/simulated/floor/tiled/steel, /area/rnd/research/researchdivision) "jsK" = ( @@ -15001,6 +15008,10 @@ /obj/machinery/vending/coffee, /turf/simulated/floor/wood, /area/rnd/breakroom) +"jGx" = ( +/obj/structure/flora/ausbushes/brflowers, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside2) "jGy" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -15082,8 +15093,7 @@ dir = 8 }, /obj/machinery/computer/security{ - dir = 4; - icon_state = "computer" + dir = 4 }, /obj/machinery/air_alarm{ dir = 4; @@ -15482,6 +15492,10 @@ }, /turf/simulated/floor/tiled/monowhite, /area/medical/morgue) +"jUn" = ( +/obj/structure/flora/grass/both, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside2) "jUG" = ( /obj/effect/floor_decal/spline/plain{ dir = 9 @@ -16822,6 +16836,10 @@ }, /turf/simulated/floor/tiled, /area/rnd/telescience_lab/storage) +"kMx" = ( +/obj/structure/flora/rock/ice/alternative_2, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside2) "kMU" = ( /obj/machinery/door/airlock/voidcraft/vertical{ name = "Air Management"; @@ -17695,7 +17713,6 @@ }, /obj/machinery/door/window/brigdoor/southright{ dir = 1; - icon_state = "rightsecure"; name = "Cockpit Access"; req_access = list(2); req_one_access = list(2) @@ -17864,7 +17881,6 @@ /turf/simulated/floor/maglev{ desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"; dir = 8; - icon_state = "maglevup"; name = "launch rail" }, /area/shuttle/hammerhead/cockpit) @@ -18944,8 +18960,7 @@ dir = 8 }, /obj/effect/floor_decal/industrial/warning{ - dir = 9; - icon_state = "warning" + dir = 9 }, /turf/simulated/floor/tiled/techmaint, /area/shuttle/hammerhead/general) @@ -19142,8 +19157,7 @@ /obj/machinery/embedded_controller/radio/simple_docking_controller{ frequency = 1380; id_tag = "hammerhead_dock"; - pixel_x = 26; - req_one_access = null + pixel_x = 26 }, /turf/simulated/floor/tiled/steel, /area/security/hammerhead_bay) @@ -19756,7 +19770,6 @@ /turf/simulated/floor/maglev{ desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"; dir = 8; - icon_state = "maglevup"; name = "launch rail" }, /area/shuttle/hammerhead/cockpit) @@ -23724,8 +23737,7 @@ dir = 4 }, /obj/effect/floor_decal/industrial/warning{ - dir = 6; - icon_state = "warning" + dir = 6 }, /obj/effect/floor_decal/sign/dock/two, /turf/simulated/floor/tiled/techmaint, @@ -24143,8 +24155,7 @@ dir = 4 }, /obj/effect/floor_decal/industrial/warning{ - dir = 5; - icon_state = "warning" + dir = 5 }, /turf/simulated/floor/tiled/techmaint, /area/shuttle/hammerhead/general) @@ -26174,6 +26185,13 @@ /obj/machinery/light, /turf/simulated/floor/water/pool, /area/triumph/surfacebase/sauna) +"qvf" = ( +/obj/structure/flora/grass/both{ + pixel_x = 10; + pixel_y = 10 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside2) "qvx" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -28667,16 +28685,15 @@ "rVf" = ( /obj/structure/table/standard, /obj/item/storage/firstaid/adv{ - pixel_x = 4; - pixel_y = 4 + pixel_y = 15 }, -/obj/item/storage/firstaid/adv, /obj/effect/floor_decal/corner/paleblue{ dir = 10 }, /obj/effect/floor_decal/corner/paleblue{ dir = 5 }, +/obj/machinery/lathe/medical/stocked, /turf/simulated/floor/tiled/white, /area/medical/medbay_primary_storage) "rVC" = ( @@ -28908,8 +28925,7 @@ pixel_x = -24 }, /obj/machinery/computer/shuttle_control/explore/hammerhead{ - dir = 4; - icon_state = "computer" + dir = 4 }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/hammerhead/cockpit) @@ -30876,6 +30892,13 @@ }, /turf/simulated/floor/plating/lythios43c, /area/rift/surfacebase/outside/outside2) +"tBL" = ( +/obj/structure/flora/grass/both{ + pixel_x = -5; + pixel_y = -4 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside2) "tBX" = ( /obj/machinery/light{ dir = 1 @@ -31976,7 +31999,6 @@ "uoE" = ( /obj/machinery/door/window/brigdoor/southright{ dir = 8; - icon_state = "rightsecure"; name = "Flight Operations Access"; req_access = list(2); req_one_access = list(2) @@ -32119,6 +32141,12 @@ /obj/structure/closet/wardrobe/science_white, /turf/simulated/floor/tiled/dark, /area/rnd/lockers) +"uvW" = ( +/obj/structure/flora/grass/green{ + pixel_x = -13 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside2) "uwn" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -33021,6 +33049,10 @@ }, /turf/simulated/floor/wood, /area/rift/station/public_garden/gantry) +"uVX" = ( +/obj/structure/flora/grass/green, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside2) "uWd" = ( /obj/machinery/shower{ pixel_y = 18 @@ -33606,6 +33638,10 @@ }, /turf/simulated/floor/tiled/white, /area/medical/recovery_room) +"vmf" = ( +/obj/structure/flora/ausbushes/ywflowers, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside2) "vmU" = ( /obj/effect/floor_decal/steeldecal/steel_decals_central6, /obj/effect/floor_decal/steeldecal/steel_decals10{ @@ -34037,7 +34073,6 @@ /turf/simulated/floor/maglev{ desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"; dir = 8; - icon_state = "maglevup"; name = "launch rail" }, /area/shuttle/hammerhead/cockpit) @@ -34112,7 +34147,6 @@ /turf/simulated/floor/maglev{ desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"; dir = 8; - icon_state = "maglevup"; name = "launch rail" }, /area/shuttle/hammerhead/cockpit) @@ -34252,7 +34286,6 @@ /turf/simulated/floor/maglev{ desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"; dir = 8; - icon_state = "maglevup"; name = "launch rail" }, /area/shuttle/hammerhead/general) @@ -35137,7 +35170,6 @@ /turf/simulated/floor/maglev{ desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"; dir = 8; - icon_state = "maglevup"; name = "launch rail" }, /area/shuttle/hammerhead/cockpit) @@ -36874,7 +36906,6 @@ /turf/simulated/floor/maglev{ desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"; dir = 8; - icon_state = "maglevup"; name = "launch rail" }, /area/shuttle/hammerhead/cockpit) @@ -48129,7 +48160,7 @@ bBF uIZ tVG oLJ -oLJ +uVX oLJ oLJ pBj @@ -48323,7 +48354,7 @@ tex oLJ oLJ oLJ -oLJ +uvW oLJ pBj pBj @@ -48347,7 +48378,7 @@ xec oLJ oLJ oLJ -oLJ +uVX oLJ oLJ oLJ @@ -48546,7 +48577,7 @@ oLJ pBj oLJ oLJ -oLJ +uVX oLJ cnh ufF @@ -49069,15 +49100,15 @@ oLJ oLJ oLJ oLJ +jGx oLJ -oLJ -oLJ +uVX fVv bBF bBF bBF keH -oLJ +hbr oLJ oLJ oLJ @@ -49140,7 +49171,7 @@ oLJ oLJ oLJ oLJ -oLJ +uVX oLJ oLJ oLJ @@ -49266,10 +49297,10 @@ oLJ oLJ oLJ oLJ -oLJ +vmf oLJ tex -oLJ +uVX oLJ oLJ oLJ @@ -49827,8 +49858,8 @@ sAX dUn enB enB -oLJ -oLJ +jUn +tBL oLJ enB enB @@ -50022,7 +50053,7 @@ dUn enB enB oLJ -oLJ +qvf oLJ enB enB @@ -50410,7 +50441,7 @@ dUn enB enB oLJ -oLJ +kMx oLJ enB enB diff --git a/maps/rift/levels/rift-06-surface3.dmm b/maps/rift/levels/rift-06-surface3.dmm index 9e7191e2f608..59c5d76c3211 100644 --- a/maps/rift/levels/rift-06-surface3.dmm +++ b/maps/rift/levels/rift-06-surface3.dmm @@ -1610,6 +1610,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/carpet/blue, /area/crew_quarters/captain) +"afj" = ( +/obj/effect/floor_decal/rust, +/obj/machinery/holopad/ship, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor, +/area/shuttle/oldcentury) "afk" = ( /obj/structure/railing, /obj/structure/railing{ @@ -2433,16 +2439,6 @@ /obj/item/flashlight/lamp, /turf/simulated/floor/wood, /area/bridge/bunker) -"ahI" = ( -/obj/machinery/computer/ship/sensors, -/obj/effect/floor_decal/corner/paleblue{ - dir = 10 - }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 5 - }, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/cockpit) "ahJ" = ( /obj/effect/floor_decal/spline/plain{ dir = 4 @@ -2451,9 +2447,6 @@ /turf/simulated/floor/wood, /area/exploration/meeting) "ahK" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/disposalpipe/sortjunction/flipped{ dir = 4; name = "Bar"; @@ -3122,7 +3115,10 @@ /area/rift/surfacebase/outside/outside3) "ajz" = ( /obj/structure/table/steel, -/obj/machinery/light/small, +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02" + }, /obj/item/material/ashtray/bronze, /turf/simulated/floor/plating, /area/maintenance/station/exploration) @@ -3615,21 +3611,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/locker/laundry_arrival) -"akJ" = ( -/obj/machinery/computer/ship/engines{ - dir = 4 - }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 10 - }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 5 - }, -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/cockpit) "akN" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -3701,12 +3682,6 @@ }, /turf/simulated/floor/tiled/steel, /area/exploration/excursion_dock) -"akV" = ( -/obj/structure/bed/chair/shuttle{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/cockpit) "akX" = ( /obj/machinery/shipsensors{ dir = 1 @@ -3860,22 +3835,16 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rift/trade_shop/landing_pad) -"alq" = ( -/obj/structure/bed/chair/shuttle{ - dir = 1 - }, -/obj/structure/cable/cyan{ - icon_state = "2-4" - }, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/cockpit) "alr" = ( /obj/machinery/appliance/cooker/fryer{ anchored = 0; pixel_x = -2; pixel_y = 2 }, -/obj/machinery/light/small, +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02" + }, /turf/simulated/floor/plating, /area/maintenance/bar/lower) "alt" = ( @@ -3983,23 +3952,6 @@ /obj/structure/panic_button, /turf/simulated/shuttle/wall/voidcraft/green, /area/shuttle/civvie/cockpit) -"alR" = ( -/obj/machinery/door/airlock/glass_external, -/obj/map_helper/airlock/door/ext_door, -/obj/map_helper/airlock/sensor/ext_sensor, -/obj/machinery/airlock_sensor/airlock_exterior/shuttle{ - frequency = 1380; - id_tag = "emt_shuttle_exterior_sensor"; - master_tag = "emt_shuttle_docker"; - pixel_x = -24; - pixel_y = -8 - }, -/obj/structure/fans/tiny, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/shuttle/emt/general) "alS" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/floodlight, @@ -4023,24 +3975,6 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rift/trade_shop/landing_pad) -"alU" = ( -/obj/machinery/computer/shuttle_control/explore/emt{ - dir = 8 - }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 10 - }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 5 - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/cable/cyan{ - icon_state = "2-8" - }, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/cockpit) "alV" = ( /obj/machinery/power/terminal{ dir = 1 @@ -4164,13 +4098,6 @@ }, /turf/simulated/floor/tiled/steel, /area/bridge) -"amh" = ( -/obj/machinery/shipsensors, -/obj/effect/floor_decal/spline/fancy{ - dir = 9 - }, -/turf/simulated/floor/tiled/techfloor/grid/lythios43c, -/area/shuttle/emt/cockpit) "ami" = ( /obj/machinery/power/apc/south_mount, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -4189,12 +4116,6 @@ }, /turf/simulated/floor/reinforced/lythios43c, /area/rift/surfacebase/outside/outside3) -"amk" = ( -/obj/structure/handrail{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/cockpit) "aml" = ( /obj/effect/floor_decal/spline/plain{ dir = 9 @@ -4204,12 +4125,6 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge/meeting_room) -"amm" = ( -/obj/structure/cable/cyan{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/cockpit) "amn" = ( /obj/structure/railing, /turf/simulated/floor/reinforced/lythios43c, @@ -4303,12 +4218,6 @@ "amD" = ( /turf/simulated/shuttle/wall/voidcraft/blue, /area/shuttle/emt/general) -"amE" = ( -/obj/machinery/light/spot{ - pixel_y = 32 - }, -/turf/simulated/shuttle/wall/voidcraft/hard_corner, -/area/shuttle/emt/cockpit) "amH" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 @@ -4625,17 +4534,6 @@ /obj/structure/cable/green, /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) -"anz" = ( -/obj/structure/panic_button, -/turf/simulated/shuttle/wall/voidcraft/hard_corner, -/area/shuttle/emt/cockpit) -"anA" = ( -/obj/structure/shuttle/engine/heater, -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 1 - }, -/turf/simulated/shuttle/wall/voidcraft/blue, -/area/shuttle/emt/general) "anC" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -4744,15 +4642,6 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/exploration/explorer_prep) -"anR" = ( -/obj/machinery/door/airlock/voidcraft{ - name = "cockpit" - }, -/obj/structure/cable/cyan{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/cockpit) "anT" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/lino, @@ -4870,9 +4759,6 @@ "aoo" = ( /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/general) -"aop" = ( -/turf/simulated/shuttle/wall/voidcraft/hard_corner, -/area/shuttle/emt/cockpit) "aor" = ( /obj/structure/mirror/long/right{ dir = 8; @@ -4915,6 +4801,28 @@ /obj/machinery/light, /turf/simulated/floor/tiled/techfloor, /area/shuttle/excursion/cargo) +"aov" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/structure/bed/chair/wheelchair, +/obj/effect/floor_decal/industrial/outline/blue, +/obj/machinery/air_alarm/alarms_hidden{ + dir = 8; + pixel_x = 22; + req_one_access = list(160) + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 6 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 6 + }, +/obj/machinery/light{ + old_wall = 1 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) "aow" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/techfloor/grid, @@ -5239,20 +5147,6 @@ "apj" = ( /turf/simulated/floor/tiled/techmaint, /area/rift/surfaceeva/aa/cliff_north) -"apk" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 9 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 9 - }, -/obj/effect/floor_decal/industrial/outline/blue, -/obj/structure/closet/walllocker/emergsuit_wall{ - pixel_y = 30 - }, -/obj/structure/handrail, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/general) "apl" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, @@ -5824,9 +5718,6 @@ }, /turf/simulated/floor/bluegrid, /area/ai_upload) -"aqP" = ( -/turf/simulated/floor/tiled/monowhite, -/area/shuttle/emt/general) "aqQ" = ( /obj/structure/closet/secure_closet/hop2, /obj/item/clothing/accessory/poncho/roles/cloak/hop, @@ -5838,26 +5729,6 @@ }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/hop) -"aqR" = ( -/obj/structure/cable/cyan{ - icon_state = "2-8" - }, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 5 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 5 - }, -/obj/structure/closet/walllocker/emergsuit_wall{ - pixel_y = 30 - }, -/obj/structure/bed/chair/shuttle, -/obj/machinery/power/apc/east_mount, -/obj/structure/cable/cyan{ - icon_state = "0-2" - }, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/general) "aqS" = ( /obj/structure/railing{ dir = 8 @@ -6042,6 +5913,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, +/obj/random/mre, /turf/simulated/floor/tiled/steel, /area/exploration) "aro" = ( @@ -6125,51 +5997,6 @@ /obj/map_helper/airlock/door/ext_door, /turf/simulated/floor/plating, /area/shuttle/courser/general) -"arB" = ( -/obj/structure/closet/crate/medical, -/obj/item/storage/firstaid/regular{ - pixel_x = -2; - pixel_y = 4 - }, -/obj/item/storage/firstaid/regular{ - pixel_x = -2; - pixel_y = 4 - }, -/obj/item/bodybag/cryobag{ - pixel_x = 5 - }, -/obj/item/bodybag/cryobag{ - pixel_x = 5 - }, -/obj/item/storage/firstaid/o2{ - layer = 2.8; - pixel_x = 4; - pixel_y = 6 - }, -/obj/item/storage/box/masks, -/obj/item/storage/box/gloves{ - pixel_x = 3; - pixel_y = 4 - }, -/obj/item/storage/firstaid/toxin, -/obj/item/storage/firstaid/fire{ - layer = 2.9; - pixel_x = 2; - pixel_y = 3 - }, -/obj/item/storage/firstaid/adv{ - pixel_x = -2 - }, -/obj/item/defib_kit/loaded, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 9 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 9 - }, -/obj/effect/floor_decal/industrial/outline/blue, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/general) "arC" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -6237,15 +6064,6 @@ /obj/structure/table/reinforced, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) -"arO" = ( -/obj/effect/floor_decal/borderfloorwhite/corner{ - dir = 1 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/general) "arR" = ( /obj/effect/floor_decal/borderfloorblack/corner, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -6448,21 +6266,6 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/captain) -"ass" = ( -/obj/machinery/computer/ship/helm, -/obj/item/gps/internal/base{ - desc = "A tracking beacon embedded in the shuttle systems, to help explorers find where they landed."; - gps_tag = "EMT"; - name = "shuttle beacon" - }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 10 - }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 5 - }, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/cockpit) "ast" = ( /obj/machinery/photocopier/faxmachine{ department = "Command Meeting Room" @@ -6904,20 +6707,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ai_upload_foyer) -"atM" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 8 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 8 - }, -/obj/structure/bed/roller, -/obj/effect/floor_decal/industrial/outline/blue, -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/general) "atN" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -7049,10 +6838,6 @@ }, /turf/simulated/floor/grass, /area/hydroponics) -"aue" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on, -/turf/simulated/floor/tiled/monowhite, -/area/shuttle/emt/general) "auf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -7072,17 +6857,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/hop) -"auh" = ( -/obj/structure/table/steel, -/obj/effect/floor_decal/corner/paleblue{ - dir = 10 - }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 5 - }, -/obj/machinery/recharger, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/cockpit) "aui" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -7270,25 +7044,6 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) -"auK" = ( -/obj/structure/table/steel, -/obj/effect/floor_decal/corner/paleblue{ - dir = 10 - }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 5 - }, -/obj/machinery/power/apc/south_mount, -/obj/structure/cable/cyan, -/obj/item/storage/toolbox/mechanical, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/cockpit) -"auL" = ( -/obj/machinery/light/spot{ - pixel_y = 32 - }, -/turf/simulated/shuttle/wall/voidcraft/blue, -/area/shuttle/emt/cockpit) "auM" = ( /obj/machinery/computer/crew{ dir = 1 @@ -7442,12 +7197,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/ai) -"avh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 5 - }, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/general) "avi" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -7528,15 +7277,6 @@ /obj/structure/ship_munition/disperser_charge/emp, /turf/simulated/floor/tiled/dark, /area/exploration/courser_dock) -"avt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/general) "avu" = ( /obj/random/trash_pile, /turf/simulated/floor/plating, @@ -7769,7 +7509,7 @@ /obj/machinery/door/blast/regular{ dir = 2; id = "shuttle_hatch"; - name = "Shuttle Rear Hatch" + name = "Shuttle Side Hatch" }, /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techfloor/grid, @@ -8411,14 +8151,6 @@ /obj/machinery/power/apc/high, /turf/simulated/floor/tiled/techfloor, /area/shuttle/excursion/cargo) -"axq" = ( -/obj/machinery/door/airlock/glass_external, -/obj/map_helper/airlock/door/int_door, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/shuttle/emt/general) "axr" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -8548,7 +8280,10 @@ "axM" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/closet/firecloset/full, -/obj/machinery/light/small, +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02" + }, /turf/simulated/floor/plating, /area/maintenance/substation/command) "axN" = ( @@ -9047,14 +8782,6 @@ /obj/structure/lattice, /turf/simulated/open/lythios43c, /area/rift/surfacebase/outside/outside3) -"azg" = ( -/obj/machinery/atmospherics/portables_connector{ - dir = 4; - name = "Engine Fuel Port" - }, -/obj/effect/floor_decal/industrial/outline/red, -/turf/simulated/floor, -/area/shuttle/emt/general) "azh" = ( /obj/structure/table/woodentable, /obj/random/maintenance/clean, @@ -9346,20 +9073,6 @@ "aAd" = ( /turf/simulated/floor/outdoors/gravsnow/lythios43c, /area/rift/surfacebase/outside/outside3) -"aAf" = ( -/obj/structure/fuel_port{ - dir = 4; - pixel_x = 30 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 1 - }, -/obj/machinery/meter, -/obj/machinery/light/small{ - dir = 4 - }, -/turf/simulated/floor, -/area/shuttle/emt/general) "aAg" = ( /obj/structure/fans/tiny, /obj/machinery/door/airlock/freezer{ @@ -9403,12 +9116,6 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar) -"aAk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10 - }, -/turf/simulated/shuttle/wall/voidcraft/hard_corner, -/area/shuttle/emt/general) "aAl" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 6 @@ -9429,22 +9136,6 @@ /obj/random/maintenance/clean, /turf/simulated/floor/plating, /area/maintenance/bar/lower) -"aAo" = ( -/obj/map_helper/airlock/atmos/chamber_pump, -/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ - dir = 4; - frequency = 1380; - id_tag = "emt_shuttle_docker_pump" - }, -/obj/structure/handrail{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/emt/general) "aAp" = ( /obj/structure/table/reinforced, /obj/effect/floor_decal/corner/blue{ @@ -9557,14 +9248,6 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor, /area/shuttle/emt/general) -"aAP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9 - }, -/obj/machinery/recharge_station, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor, -/area/shuttle/emt/general) "aAR" = ( /obj/structure/handrail{ dir = 4 @@ -9945,12 +9628,6 @@ }, /turf/simulated/floor/plating, /area/rift/surfaceeva/airlock/arrivals/secondary) -"aBY" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8 - }, -/turf/simulated/shuttle/wall/voidcraft/hard_corner, -/area/shuttle/emt/general) "aBZ" = ( /obj/structure/railing, /obj/structure/railing{ @@ -10140,30 +9817,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/commandmaint) -"aCE" = ( -/obj/structure/table/standard, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 10 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 10 - }, -/obj/effect/floor_decal/borderfloorwhite/corner2{ - dir = 9 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner2{ - dir = 9 - }, -/obj/structure/closet/walllocker/emerglocker{ - pixel_x = -30 - }, -/obj/item/storage/box/freezer{ - pixel_x = 5; - pixel_y = 2 - }, -/obj/item/storage/box/freezer, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/general) "aCF" = ( /obj/structure/table/bench/wooden, /obj/landmark/spawnpoint/job/botanist, @@ -10244,20 +9897,6 @@ /obj/random/tool, /turf/simulated/floor/plating, /area/maintenance/bar/lower) -"aCV" = ( -/obj/structure/closet/walllocker/emerglocker{ - pixel_x = -30 - }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/obj/effect/shuttle_landmark/rift/deck3/emt, -/obj/overmap/entity/visitable/ship/landable/emt, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/emt/general) "aCW" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -10735,22 +10374,6 @@ "aEA" = ( /turf/simulated/floor/tiled/techmaint, /area/rift/surfaceeva/aa/cliff_south) -"aEC" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ - dir = 4; - frequency = 1380; - id_tag = "emt_shuttle_docker_pump" - }, -/obj/map_helper/airlock/atmos/chamber_pump, -/obj/structure/handrail{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/emt/general) "aED" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -11020,13 +10643,6 @@ /obj/effect/floor_decal/industrial/outline, /turf/simulated/floor/tiled/dark, /area/security/nuke_storage) -"aFp" = ( -/obj/structure/shuttle/engine/heater, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 6 - }, -/turf/simulated/shuttle/wall/voidcraft/blue, -/area/shuttle/emt/general) "aFq" = ( /obj/structure/catwalk, /obj/structure/cable{ @@ -11337,13 +10953,6 @@ }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/hop) -"aGe" = ( -/obj/structure/shuttle/engine/heater, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10 - }, -/turf/simulated/shuttle/wall/voidcraft/blue, -/area/shuttle/emt/general) "aGf" = ( /obj/effect/floor_decal/corner_techfloor_grid{ dir = 10 @@ -11368,12 +10977,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/commandmaint) -"aGh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9 - }, -/turf/simulated/shuttle/wall/voidcraft/hard_corner, -/area/shuttle/emt/general) "aGj" = ( /obj/structure/railing, /obj/structure/railing{ @@ -11410,7 +11013,10 @@ /turf/simulated/floor/plating, /area/maintenance/bar/lower) "aGo" = ( -/obj/machinery/light/small, +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02" + }, /turf/simulated/floor/plating, /area/maintenance/bar/lower) "aGp" = ( @@ -11828,7 +11434,10 @@ /turf/simulated/floor/tiled/techfloor, /area/ai_upload) "aHA" = ( -/obj/machinery/light/small, +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02" + }, /obj/random/maintenance/clean, /turf/simulated/floor/plating, /area/maintenance/commandmaint) @@ -12532,7 +12141,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/machinery/light/small, +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02" + }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/barrestroom) "aJq" = ( @@ -12745,7 +12357,10 @@ /turf/simulated/floor/tiled/monotile, /area/hydroponics) "aJR" = ( -/obj/machinery/light/small, +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02" + }, /obj/structure/railing{ dir = 8 }, @@ -13082,29 +12697,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/excursion/cargo) -"aKM" = ( -/obj/machinery/vending/wallmed1{ - name = "Emergency NanoMed"; - pixel_y = -28 - }, -/obj/effect/floor_decal/borderfloorwhite, -/obj/effect/floor_decal/corner/paleblue/border, -/obj/effect/floor_decal/borderfloorwhite/corner2, -/obj/effect/floor_decal/borderfloorwhite/corner2{ - dir = 9 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner2, -/obj/effect/floor_decal/corner/paleblue/bordercorner2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 8 - }, -/obj/structure/handrail{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/general) "aKN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -13341,7 +12933,10 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/hop) "aLH" = ( -/obj/machinery/light/small, +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02" + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, @@ -13943,7 +13538,10 @@ /area/shuttle/excursion/general) "aNB" = ( /obj/structure/catwalk, -/obj/machinery/light/small, +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02" + }, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -14082,18 +13680,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/exploration/courser_dock) -"aNX" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 1 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 1 - }, -/obj/machinery/sleep_console{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/general) "aNY" = ( /obj/structure/handrail{ dir = 1 @@ -15654,24 +15240,6 @@ }, /turf/simulated/floor/tiled/steel, /area/exploration) -"aSl" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 1 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloorwhite/corner2{ - dir = 1 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner2{ - dir = 1 - }, -/obj/machinery/sleeper{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/general) "aSm" = ( /obj/machinery/disperser/back{ dir = 4 @@ -15850,7 +15418,10 @@ /obj/machinery/cell_charger, /obj/item/tool/screwdriver, /obj/item/tool/crowbar, -/obj/machinery/light/small, +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02" + }, /turf/simulated/floor/tiled/techmaint, /area/rift/surfaceeva/aa/cliff_south) "aSG" = ( @@ -16002,6 +15573,14 @@ /obj/structure/table/reinforced, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) +"aTb" = ( +/obj/structure/shuttle/engine/heater, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 + }, +/obj/effect/paint/black, +/turf/simulated/wall/rshull, +/area/shuttle/oldcentury) "aTd" = ( /obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ @@ -16330,7 +15909,10 @@ dir = 8; pixel_x = -12 }, -/obj/machinery/light/small, +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02" + }, /turf/simulated/floor/tiled/techmaint, /area/rift/surfaceeva/aa/cliff_south) "aUf" = ( @@ -16495,7 +16077,10 @@ dir = 8; pixel_x = -12 }, -/obj/machinery/light/small, +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02" + }, /turf/simulated/floor/tiled/techmaint, /area/rift/surfaceeva/aa/cliff_north) "aUB" = ( @@ -16939,9 +16524,8 @@ name = "Shuttle Rear Hatch" }, /obj/machinery/button/remote/blast_door{ - dir = 1; id = "shuttle_hatch"; - name = "Shuttle Rear Hatch"; + name = "Shuttle Side Hatch"; pixel_y = -26 }, /obj/machinery/door/firedoor/glass, @@ -17210,12 +16794,6 @@ }, /turf/simulated/floor/carpet/purcarpet, /area/exploration/meeting) -"aWI" = ( -/obj/structure/cable/cyan{ - icon_state = "1-4" - }, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/general) "aWJ" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 9 @@ -17417,25 +16995,6 @@ }, /turf/simulated/floor/tiled/steel, /area/exploration/pathfinder_office) -"aXm" = ( -/obj/structure/cable/cyan{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 1 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloorwhite/corner2{ - dir = 4 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner2{ - dir = 4 - }, -/obj/structure/bed/chair/shuttle, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/general) "aXn" = ( /obj/item/bedsheet, /obj/structure/bed, @@ -17714,7 +17273,10 @@ "aYf" = ( /obj/item/bedsheet, /obj/structure/bed, -/obj/machinery/light/small, +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02" + }, /turf/simulated/floor/tiled/techmaint, /area/rift/surfaceeva/aa/cliff_north) "aYi" = ( @@ -18183,10 +17745,6 @@ }, /turf/simulated/floor/outdoors/snow/lythios43c, /area/rift/surfacebase/outside/outside3) -"aZB" = ( -/obj/structure/shuttle/engine/heater, -/turf/simulated/shuttle/wall/voidcraft/hard_corner, -/area/shuttle/emt/general) "aZC" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 4 @@ -18339,18 +17897,6 @@ }, /turf/simulated/floor/plating/lythios43c, /area/rift/surfacebase/outside/outside3) -"baX" = ( -/obj/effect/floor_decal/borderfloorwhite/corner{ - dir = 4 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner{ - dir = 4 - }, -/obj/structure/cable/cyan{ - icon_state = "1-4" - }, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/general) "bdJ" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -18372,10 +17918,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) -"bfN" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/turf/simulated/floor/plating, -/area/shuttle/emt/cockpit) +"bgH" = ( +/obj/machinery/atmospherics/pipe/tank/air{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline/red, +/turf/simulated/floor, +/area/shuttle/emt/general) "bis" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -18404,6 +17953,22 @@ "bjs" = ( /turf/simulated/wall/prepainted/civilian, /area/maintenance/bar) +"bkq" = ( +/obj/machinery/bodyscanner{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline/blue, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 8 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) +"bly" = ( +/turf/simulated/floor/tiled/techfloor/grid/lythios43c, +/area/shuttle/oldcentury) "bnc" = ( /obj/machinery/door/firedoor/glass{ dir = 8 @@ -18455,6 +18020,13 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway) +"bqa" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 8 + }, +/obj/effect/paint/black, +/turf/simulated/wall/rshull, +/area/shuttle/oldcentury) "bqs" = ( /turf/simulated/wall/prepainted, /area/hallway/secondary/docking_hallway) @@ -18481,6 +18053,26 @@ }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/excursion/general) +"bsQ" = ( +/obj/machinery/computer/ship/helm, +/obj/item/gps/internal/base{ + desc = "A tracking beacon embedded in the shuttle systems, to help explorers find where they landed."; + gps_tag = "EMT"; + name = "shuttle beacon" + }, +/obj/effect/floor_decal/borderfloorwhite/full, +/obj/effect/floor_decal/corner/paleblue{ + dir = 5 + }, +/obj/effect/floor_decal/corner/paleblue{ + dir = 10 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/cockpit) +"btC" = ( +/obj/effect/floor_decal/rust, +/turf/simulated/floor/tiled/techfloor/grid/lythios43c, +/area/shuttle/oldcentury) "bvV" = ( /obj/effect/floor_decal/borderfloor/corner, /obj/effect/floor_decal/corner/lightgrey/bordercorner, @@ -18533,6 +18125,43 @@ /obj/structure/sign/warning/falling, /turf/simulated/wall/r_wall/prepainted, /area/rift/surfacebase/outside/outside3) +"bGu" = ( +/obj/structure/table/standard, +/obj/machinery/air_alarm/alarms_hidden{ + dir = 8; + pixel_x = 22; + req_one_access = list(160) + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 4 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/cockpit) +"bGE" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/structure/cable/cyan{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/cyan, +/obj/effect/floor_decal/borderfloorwhite/corner{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 4 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 4 + }, +/obj/effect/floor_decal/corner/paleblue/bordercorner{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) "bHN" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -18556,10 +18185,41 @@ }, /turf/simulated/floor/plating, /area/maintenance/commandmaint) +"bIJ" = ( +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/obj/effect/debris/cleanable/dirt, +/obj/effect/debris/cleanable/dirt, +/obj/machinery/door/window/brigdoor/southright{ + dir = 8; + req_access = null + }, +/obj/structure/curtain/open/ashlander, +/turf/simulated/floor/tiled/old_tile/green, +/area/shuttle/oldcentury) "bIN" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, /area/crew_quarters/bar) +"bJk" = ( +/obj/structure/flora/tree/pine, +/turf/simulated/floor/outdoors/snow/noblend/lythios43c, +/area/rift/surfacebase/outside/outside3) +"bJt" = ( +/turf/simulated/floor/outdoors/gravsnow/lythios43c, +/area) +"bKm" = ( +/obj/structure/flora/grass/both{ + pixel_x = 6; + pixel_y = 10 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) +"bLD" = ( +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor/carpet/patterened/green, +/area/shuttle/oldcentury) "bMK" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -18603,20 +18263,18 @@ /obj/effect/floor_decal/corner/paleblue/border, /turf/simulated/floor/tiled/steel_grid, /area/exploration/medic_prep) -"bPD" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 5 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 5 +"bOR" = ( +/obj/effect/floor_decal/rust, +/obj/structure/handrail{ + dir = 1 }, -/obj/structure/bed/chair/wheelchair, -/obj/effect/floor_decal/industrial/outline/blue, /obj/structure/cable/cyan{ - icon_state = "2-8" + icon_state = "0-4" }, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/general) +/obj/machinery/power/apc/high/south_mount, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor/tiled/old_tile/gray, +/area/shuttle/oldcentury) "bPV" = ( /turf/simulated/wall/r_wall/prepainted/command, /area/crew_quarters/heads/hop) @@ -18647,6 +18305,11 @@ }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/blueshield) +"bRP" = ( +/obj/effect/floor_decal/rust, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/tiled/techfloor/grid/lythios43c, +/area/shuttle/oldcentury) "bSo" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/cable/green{ @@ -18741,6 +18404,17 @@ }, /turf/simulated/floor/tiled/monotile, /area/exploration/pilot_prep) +"cdU" = ( +/obj/machinery/computer/shuttle_control/explore/emt, +/obj/effect/floor_decal/borderfloorwhite/full, +/obj/effect/floor_decal/corner/paleblue{ + dir = 10 + }, +/obj/effect/floor_decal/corner/paleblue{ + dir = 5 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/cockpit) "cgU" = ( /obj/machinery/computer/secure_data{ dir = 1 @@ -18754,6 +18428,13 @@ }, /turf/simulated/wall/prepainted, /area/rift/surfacebase/outside/outside3) +"chB" = ( +/obj/structure/catwalk, +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/turf/simulated/floor/plating/lythios43c, +/area/rift/surfacebase/outside/outside3) "ciu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 8 @@ -18784,6 +18465,26 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/bar/lower) +"clr" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ + dir = 8 + }, +/obj/structure/handrail{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/shuttle_landmark/rift/deck3/oldcentury, +/obj/machinery/embedded_controller/radio/airlock/docking_port{ + cycle_to_external_air = 1; + frequency = 1380; + id_tag = "oldcentury_docker"; + pixel_x = -28 + }, +/obj/overmap/entity/visitable/ship/landable/oldcentury, +/turf/simulated/floor/tiled/old_tile/green, +/area/shuttle/oldcentury) "cnq" = ( /obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 1 @@ -18851,6 +18552,12 @@ /obj/effect/paint/commandblue, /turf/simulated/floor/plating, /area/bridge/bridge_hallway) +"ctl" = ( +/obj/effect/floor_decal/rust, +/obj/machinery/door/airlock, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/monodark, +/area/shuttle/oldcentury) "cvg" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -18908,6 +18615,22 @@ }, /turf/simulated/floor/plating, /area/rift/surfaceeva/airlock/arrivals/secondary) +"cBe" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 8 + }, +/obj/machinery/recharge_station, +/turf/simulated/floor, +/area/shuttle/oldcentury) +"cBz" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) "cBD" = ( /obj/effect/floor_decal/spline/plain{ dir = 4 @@ -18926,15 +18649,17 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) -"cCj" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ - dir = 4 +"cCS" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ + frequency = 1380; + id_tag = "oldcentury_docker_pump" }, +/obj/map_helper/airlock/atmos/chamber_pump, /obj/structure/cable/green{ - icon_state = "2-8" + icon_state = "2-4" }, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/general) +/turf/simulated/floor/tiled/old_tile/green, +/area/shuttle/oldcentury) "cDv" = ( /obj/structure/catwalk, /turf/simulated/open, @@ -18966,6 +18691,12 @@ }, /turf/simulated/shuttle/wall/voidcraft/green, /area/shuttle/civvie/general) +"cLb" = ( +/obj/structure/flora/ausbushes/pointybush{ + pixel_y = 12 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) "cOE" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -18992,8 +18723,16 @@ }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/excursion/cargo) +"cQw" = ( +/obj/machinery/computer/ship/sensors, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor/plating, +/area/shuttle/oldcentury) "cQT" = ( -/obj/machinery/light/small, +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02" + }, /turf/simulated/floor/plating, /area/maintenance/station/exploration) "cQV" = ( @@ -19022,6 +18761,19 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar) +"cVB" = ( +/obj/machinery/sleeper{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline/blue, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 9 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 9 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) "cWu" = ( /turf/simulated/wall/prepainted/exploration, /area/maintenance/bar/lower) @@ -19069,6 +18821,20 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) +"cZP" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/effect/paint/black, +/turf/simulated/wall/rshull, +/area/shuttle/oldcentury) +"cZT" = ( +/obj/machinery/atmospherics/component/unary/heater{ + dir = 8 + }, +/obj/structure/cable/cyan{ + icon_state = "2-8" + }, +/turf/simulated/floor, +/area/shuttle/oldcentury) "dan" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -19094,6 +18860,19 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/captain) +"deN" = ( +/obj/structure/bed/chair/bay/shuttle{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 8 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 8 + }, +/obj/structure/closet/walllocker/emerglocker/west, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/cockpit) "dfy" = ( /obj/effect/floor_decal/borderfloor{ dir = 10 @@ -19103,15 +18882,6 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) -"dgX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/general) "diY" = ( /obj/effect/floor_decal/industrial/halfstair, /obj/structure/cable/green{ @@ -19119,17 +18889,31 @@ }, /turf/simulated/floor/plating/lythios43c, /area/rift/surfacebase/outside/outside3) +"djI" = ( +/obj/structure/shuttle/engine/heater, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 4 + }, +/turf/simulated/shuttle/wall/voidcraft/hard_corner, +/area/shuttle/emt/general) +"dkS" = ( +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/turf/simulated/floor, +/area/shuttle/emt/cockpit) "dnb" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/telescience_lab) -"dph" = ( -/obj/machinery/light/small{ - dir = 8 +"doA" = ( +/obj/structure/bed/chair/bay/shuttle{ + dir = 1 }, -/obj/machinery/power/terminal, -/obj/machinery/atmospherics/pipe/manifold/hidden/cyan, -/obj/structure/cable/green, +/obj/effect/debris/cleanable/dirt, /turf/simulated/floor, +/area/shuttle/oldcentury) +"doW" = ( +/obj/effect/floor_decal/borderfloorwhite, +/obj/effect/floor_decal/corner/paleblue/border, +/turf/simulated/floor/tiled/white, /area/shuttle/emt/general) "dpK" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, @@ -19147,6 +18931,10 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/shuttle/courser/general) +"dqU" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) "drn" = ( /obj/machinery/door/airlock/maintenance/common, /obj/machinery/door/firedoor/glass, @@ -19157,7 +18945,10 @@ /area/maintenance/commandmaint) "dsO" = ( /obj/structure/catwalk, -/obj/machinery/light/small, +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02" + }, /turf/simulated/floor/plating, /area/maintenance/commandmaint) "dvT" = ( @@ -19190,6 +18981,11 @@ }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/barrestroom) +"dxR" = ( +/obj/effect/paint/black, +/obj/effect/paint_stripe/black, +/turf/simulated/wall/rshull, +/area/shuttle/oldcentury) "dxW" = ( /obj/item/trash/unajerky, /turf/simulated/floor/plating, @@ -19223,6 +19019,12 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway2) +"dBD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/cyan, +/obj/effect/debris/cleanable/dirt, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor, +/area/shuttle/oldcentury) "dCB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -19270,6 +19072,10 @@ "dDI" = ( /turf/simulated/wall/r_wall/prepainted/command, /area/crew_quarters/heads/blueshield) +"dFH" = ( +/obj/machinery/shipsensors, +/turf/simulated/floor/airless, +/area/shuttle/emt/general) "dIa" = ( /obj/spawner/window/low_wall/full/nogrille/firelocks, /obj/effect/paint/violet, @@ -19306,6 +19112,35 @@ /obj/item/flame/candle, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) +"dNn" = ( +/obj/machinery/door/airlock/glass_external, +/obj/map_helper/airlock/door/ext_door, +/obj/machinery/airlock_sensor/airlock_exterior/shuttle{ + dir = 4; + frequency = 1380; + id_tag = "emt_shuttle_exterior_sensor"; + master_tag = "emt_shuttle_docker"; + pixel_y = 23 + }, +/obj/map_helper/airlock/sensor/ext_sensor, +/obj/structure/fans/tiny, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/emt/general) +"dOC" = ( +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 8 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/cockpit) "dOT" = ( /obj/structure/table/hardwoodtable, /obj/effect/floor_decal/spline/plain, @@ -19326,6 +19161,18 @@ }, /turf/simulated/floor/tiled, /area/rnd/telescience_lab) +"dRG" = ( +/obj/effect/floor_decal/borderfloorwhite{ + dir = 1 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) "dSD" = ( /obj/machinery/holopad, /obj/effect/floor_decal/borderfloor{ @@ -19413,6 +19260,14 @@ }, /turf/simulated/floor/tiled/steel, /area/rift/stairwell/primary/surfacethree) +"dXR" = ( +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/machinery/recharge_station, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor, +/area/shuttle/emt/general) "dYH" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -19516,6 +19371,18 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/hallway/primary/surfacethree) +"ekN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 9 + }, +/obj/machinery/meter, +/obj/machinery/computer/ship/engines, +/obj/machinery/air_alarm/alarms_hidden{ + pixel_y = 22; + req_one_access = list(160) + }, +/turf/simulated/floor, +/area/shuttle/emt/general) "ekT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 @@ -19526,6 +19393,11 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/shuttle/courser/general) +"enP" = ( +/obj/machinery/body_scanconsole, +/obj/effect/floor_decal/industrial/outline/blue, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) "eod" = ( /turf/simulated/wall/r_wall/prepainted/command, /area/ai) @@ -19539,15 +19411,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/monotile, /area/hallway/primary/surfacethree) -"eoM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 9 - }, -/obj/structure/handrail{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/emt/general) "epp" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -19576,6 +19439,25 @@ }, /turf/simulated/open, /area/rnd/telescience_lab/chamber) +"eur" = ( +/obj/structure/bed/chair/bay/shuttle{ + dir = 1 + }, +/obj/machinery/power/apc/east_mount{ + old_wall = 1 + }, +/obj/structure/cable/cyan{ + icon_state = "0-4"; + dir = 4 + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 6 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 6 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/cockpit) "evR" = ( /obj/effect/floor_decal/borderfloor/corner, /obj/effect/floor_decal/corner/lightgrey/bordercorner, @@ -19698,6 +19580,15 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rift/turbolift/maint) +"eCH" = ( +/obj/structure/bed/chair/bay/shuttle, +/obj/structure/table/bench/wooden{ + pixel_x = 15 + }, +/obj/effect/debris/cleanable/dirt, +/obj/effect/floor_decal/borderfloorwhite/shifted, +/turf/simulated/floor/carpet/patterened/green, +/area/shuttle/oldcentury) "eDm" = ( /turf/simulated/wall/r_wall/prepainted, /area/crew_quarters/locker/laundry_arrival) @@ -19724,6 +19615,29 @@ }, /turf/simulated/floor/plating, /area/maintenance/commandmaint) +"eEr" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/reinforced/lythios43c, +/area/rift/surfacebase/outside/outside3) +"eEz" = ( +/obj/machinery/door/airlock/glass_external, +/obj/map_helper/airlock/door/ext_door, +/obj/structure/fans/tiny, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/emt/general) +"eGc" = ( +/obj/structure/catwalk, +/obj/structure/cable/green{ + dir = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/plating/lythios43c, +/area/rift/surfacebase/outside/outside3) "eGn" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -19751,6 +19665,20 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) +"eHc" = ( +/obj/machinery/button/remote/blast_door{ + dir = 4; + id = "oldshuttle_hatch"; + name = "Shuttle Side Hatch"; + pixel_x = -24; + req_one_access = list(19,43,67) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 6 + }, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor/tiled/monodark, +/area/shuttle/oldcentury) "eHR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -19822,6 +19750,18 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) +"eJV" = ( +/obj/structure/window/reinforced/polarized{ + dir = 8; + id = "Centuries_old_shuttle_general" + }, +/obj/machinery/media/jukebox, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor/tiled/old_tile/green, +/area/shuttle/oldcentury) "eKt" = ( /obj/effect/floor_decal/borderfloor{ dir = 10 @@ -19863,6 +19803,12 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rift/surfaceeva/airlock/arrivals) +"eKT" = ( +/obj/effect/debris/cleanable/dirt, +/obj/effect/debris/cleanable/dirt, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor/carpet/patterened/green, +/area/shuttle/oldcentury) "eLH" = ( /obj/landmark/spawnpoint/overflow/station, /obj/item/radio/beacon/anchored, @@ -19937,6 +19883,19 @@ }, /turf/simulated/floor/plating, /area/maintenance/research/xenobio) +"eRp" = ( +/obj/machinery/air_alarm/alarms_hidden{ + pixel_y = 24 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/debris/cleanable/dirt, +/obj/structure/closet/largecardboard, +/obj/item/clothing/under/soviet, +/obj/item/clothing/head/ushanka, +/obj/item/clothing/accessory/hawaii/random, +/obj/item/clothing/under/hawaiian, +/turf/simulated/floor, +/area/shuttle/oldcentury) "eWa" = ( /obj/machinery/door/airlock/multi_tile/glass, /obj/effect/floor_decal/borderfloor{ @@ -19959,6 +19918,14 @@ }, /turf/simulated/floor/lino, /area/crew_quarters/bar_backroom) +"eYG" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/effect/paint/black, +/obj/effect/paint/silver, +/turf/simulated/wall/rshull, +/area/shuttle/oldcentury) "eZd" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -19986,6 +19953,10 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway2) +"eZv" = ( +/obj/machinery/shipsensors, +/turf/simulated/floor/tiled/techfloor/grid/lythios43c, +/area/shuttle/oldcentury) "faf" = ( /obj/machinery/holoposter{ pixel_x = 32 @@ -20017,6 +19988,12 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/shuttle/courser/general) +"fdS" = ( +/obj/machinery/atmospherics/component/unary/engine{ + dir = 1 + }, +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/oldcentury) "fea" = ( /turf/simulated/floor/carpet/blue, /area/crew_quarters/heads/blueshield) @@ -20032,6 +20009,10 @@ }, /turf/simulated/floor/tiled/monotile, /area/hallway/secondary/docking_hallway) +"fgd" = ( +/obj/effect/overlay/snow/floor, +/turf/simulated/floor/tiled/steel_grid/lythios43c, +/area/rift/surfacebase/outside/outside3) "fgP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -20091,6 +20072,17 @@ }, /turf/simulated/floor/tiled/steel, /area/exploration/courser_dock) +"fmA" = ( +/obj/machinery/meter, +/obj/structure/fuel_port{ + pixel_x = -27 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 4 + }, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor, +/area/shuttle/oldcentury) "fon" = ( /obj/structure/railing{ dir = 1 @@ -20120,6 +20112,12 @@ /obj/structure/cable/green, /turf/simulated/floor/tiled/steel, /area/hydroponics) +"frm" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, +/turf/simulated/shuttle/wall/voidcraft/blue, +/area/shuttle/emt/general) "fsc" = ( /obj/structure/bed/chair/sofa/black/right, /obj/effect/floor_decal/spline/plain{ @@ -20138,6 +20136,25 @@ "fuM" = ( /turf/simulated/wall/r_wall/prepainted, /area/crew_quarters/barrestroom) +"fxf" = ( +/obj/structure/cable/cyan{ + icon_state = "0-4"; + dir = 8 + }, +/obj/machinery/power/apc/east_mount{ + old_wall = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 6 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 6 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) "fxA" = ( /obj/structure/table/hardwoodtable, /obj/machinery/chemical_dispenser/catering/bar_soft{ @@ -20148,6 +20165,28 @@ /obj/effect/floor_decal/corner/red/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) +"fxK" = ( +/obj/structure/shuttle/engine/heater, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 + }, +/obj/effect/paint/silver, +/turf/simulated/wall/rshull, +/area/shuttle/oldcentury) +"fxP" = ( +/obj/machinery/power/apc/high/west_mount, +/obj/structure/cable/cyan{ + icon_state = "0-4" + }, +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02"; + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor/tiled/monodark, +/area/shuttle/oldcentury) "fyf" = ( /obj/structure/catwalk, /obj/machinery/light/small{ @@ -20171,7 +20210,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, -/obj/machinery/light/small, +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02" + }, /turf/simulated/floor/plating, /area/rift/turbolift/maint) "fDZ" = ( @@ -20181,6 +20223,14 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) +"fFk" = ( +/obj/structure/catwalk, +/obj/structure/cable/green{ + dir = 8; + icon_state = "2-4" + }, +/turf/simulated/floor/plating/lythios43c, +/area/rift/surfacebase/outside/outside3) "fFo" = ( /obj/machinery/door/blast/shutters{ density = 0; @@ -20206,21 +20256,6 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge) -"fFL" = ( -/obj/map_helper/airlock/sensor/chamber_sensor, -/obj/machinery/airlock_sensor{ - frequency = 1380; - id_tag = "emt_shuttle_docker"; - pixel_x = 24 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ - dir = 1 - }, -/obj/structure/handrail{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/emt/general) "fGK" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 @@ -20252,6 +20287,27 @@ }, /turf/simulated/floor, /area/shuttle/civvie/general) +"fIk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 + }, +/turf/simulated/shuttle/wall/voidcraft/blue, +/area/shuttle/emt/general) +"fIx" = ( +/obj/structure/window/reinforced/polarized{ + dir = 8; + id = "Centuries_old_shuttle_general" + }, +/obj/structure/table/rack/shelf/steel, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 + }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor/tiled/old_tile/green, +/area/shuttle/oldcentury) "fIY" = ( /obj/machinery/light/small{ dir = 1 @@ -20285,6 +20341,18 @@ }, /turf/simulated/floor/carpet/blue, /area/crew_quarters/heads/blueshield) +"fOO" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan, +/obj/structure/cable/cyan{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor, +/area/shuttle/oldcentury) "fPu" = ( /obj/structure/cable{ icon_state = "1-2" @@ -20295,7 +20363,10 @@ /turf/simulated/floor/plating, /area/maintenance/substation/exploration) "fPD" = ( -/obj/machinery/light/small, +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02" + }, /obj/random/trash_pile, /turf/simulated/floor/plating, /area/maintenance/commandmaint) @@ -20334,6 +20405,16 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway2) +"fTc" = ( +/obj/machinery/door/airlock/voidcraft/vertical{ + name = "Engine Bay" + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan, +/turf/simulated/floor, +/area/shuttle/emt/general) "fTe" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -20400,6 +20481,16 @@ /obj/effect/paint/palebottlegreen, /turf/simulated/floor/plating, /area/exploration/pilot_Office) +"fYJ" = ( +/obj/structure/curtain/open/shower, +/obj/machinery/door/airlock{ + name = "Toilet" + }, +/obj/structure/cable/cyan{ + icon_state = "1-4" + }, +/turf/simulated/floor/tiled/old_tile/blue, +/area/shuttle/oldcentury) "gaF" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -20413,10 +20504,31 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway) +"gaQ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor, +/area/shuttle/oldcentury) +"gaS" = ( +/obj/structure/bed/chair/sofa/black/right, +/obj/effect/debris/cleanable/dirt, +/obj/effect/debris/cleanable/dirt, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor/carpet/patterened/green, +/area/shuttle/oldcentury) "gbx" = ( /obj/machinery/holopad/ship, /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/general) +"gbA" = ( +/obj/structure/flora/ausbushes/ywflowers{ + pixel_x = -6; + pixel_y = 8 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) "gcc" = ( /obj/machinery/camera/network/civilian{ dir = 4 @@ -20432,6 +20544,12 @@ }, /turf/simulated/floor/tiled/monotile, /area/exploration/pilot_prep) +"gcu" = ( +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/turf/simulated/floor/reinforced/lythios43c, +/area/rift/surfacebase/outside/outside3) "ghf" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/cable/green{ @@ -20442,19 +20560,6 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) -"giX" = ( -/obj/structure/closet/walllocker/emergsuit_wall{ - pixel_x = 32 - }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/emt/general) "gjR" = ( /obj/machinery/light/small{ dir = 8 @@ -20573,6 +20678,59 @@ /obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/maintenance/bar) +"gvh" = ( +/obj/machinery/door/airlock/glass_external, +/obj/map_helper/airlock/door/int_door, +/obj/machinery/access_button{ + dir = 1; + frequency = 1380; + master_tag = "emt_shuttle_docker"; + name = "interior access button"; + pixel_x = 8; + pixel_y = -24 + }, +/obj/machinery/embedded_controller/radio/airlock/docking_port{ + cycle_to_external_air = 1; + dir = 4; + frequency = 1380; + id_tag = "emt_shuttle_docker"; + pixel_x = 8; + pixel_y = -36 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/emt/general) +"gvz" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/cyan, +/obj/machinery/air_alarm/alarms_hidden{ + dir = 4; + pixel_x = -22; + req_one_access = list(160) + }, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor/tiled/monodark, +/area/shuttle/oldcentury) +"gwB" = ( +/obj/structure/shuttle/engine/heater, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 1 + }, +/turf/simulated/shuttle/wall/voidcraft/hard_corner, +/area/shuttle/emt/general) +"gyK" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/debris/cleanable/dirt, +/obj/structure/closet/walllocker/emergsuit_wall{ + pixel_x = 32 + }, +/turf/simulated/floor, +/area/shuttle/oldcentury) +"gzi" = ( +/obj/effect/paint/silver, +/turf/simulated/wall/rshull, +/area/shuttle/oldcentury) "gzQ" = ( /obj/machinery/light{ dir = 8 @@ -20617,6 +20775,10 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway) +"gFD" = ( +/obj/structure/flora/ausbushes/lavendergrass, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) "gGW" = ( /turf/simulated/wall/r_wall/prepainted/command, /area/ai_cyborg_station) @@ -20680,6 +20842,15 @@ /obj/machinery/fire_alarm/west_mount, /turf/simulated/floor/plating, /area/maintenance/bar/lower) +"gRm" = ( +/obj/effect/floor_decal/borderfloorwhite{ + dir = 8 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) "gTy" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -20716,26 +20887,16 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge) -"haO" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 6 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 6 +"hfa" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/atmospherics/pipe/tank/air{ + dir = 8 }, -/obj/effect/floor_decal/borderfloorwhite/corner2, -/obj/effect/floor_decal/corner/paleblue/bordercorner2, -/obj/structure/table/standard, -/obj/item/soap/nanotrasen, -/obj/random/medical/lite, -/obj/random/medical/lite, -/obj/random/medical/lite, -/obj/random/medical/lite, /obj/structure/cable/cyan{ - icon_state = "1-2" + icon_state = "1-8" }, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/general) +/turf/simulated/floor, +/area/shuttle/oldcentury) "hfE" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -20797,6 +20958,13 @@ }, /turf/simulated/floor/plating, /area/maintenance/research/xenobio) +"hkW" = ( +/obj/structure/flora/bush{ + pixel_x = -12; + pixel_y = 14 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) "hkX" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 4 @@ -20825,26 +20993,23 @@ }, /turf/simulated/floor/wood, /area/exploration/pilot_Office) -"hsD" = ( -/obj/machinery/door/airlock/glass_external, -/obj/map_helper/airlock/door/int_door, -/obj/machinery/access_button{ - dir = 1; - frequency = 1380; - master_tag = "emt_shuttle_docker"; - name = "interior access button"; - pixel_x = 24; - pixel_y = 8 +"huM" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9 }, -/obj/machinery/embedded_controller/radio/airlock/docking_port{ - cycle_to_external_air = 1; - dir = 1; - frequency = 1380; - id_tag = "emt_shuttle_docker"; - pixel_x = 36; - pixel_y = 8 +/obj/effect/paint/black, +/turf/simulated/wall/rshull, +/area/shuttle/oldcentury) +"huS" = ( +/obj/structure/cable/green{ + icon_state = "1-2" }, -/turf/simulated/floor/tiled/techfloor/grid, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 2 + }, +/obj/effect/floor_decal/corner/paleblue/border, +/turf/simulated/floor/tiled/white, /area/shuttle/emt/general) "hAi" = ( /obj/machinery/light{ @@ -20960,12 +21125,23 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/exploration/pilot_Office) -"hDa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ +"hDB" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/structure/cable/cyan{ + icon_state = "2-8" + }, +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02"; + dir = 4 + }, +/obj/structure/bed/chair/sofa/black/left{ dir = 8 }, -/turf/simulated/shuttle/wall/voidcraft/hard_corner, -/area/shuttle/emt/general) +/turf/simulated/floor/carpet/patterened/green, +/area/shuttle/oldcentury) "hDW" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 9 @@ -21010,6 +21186,15 @@ }, /turf/simulated/floor/tiled/dark, /area/teleporter) +"hIh" = ( +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 5 + }, +/turf/simulated/floor, +/area/shuttle/emt/general) "hIO" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/machinery/door/blast/regular{ @@ -21137,6 +21322,9 @@ "hXj" = ( /turf/simulated/wall/prepainted/exploration, /area/exploration/explorer_prep) +"hYq" = ( +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) "hYK" = ( /obj/machinery/fire_alarm/south_mount{ pixel_y = -24 @@ -21178,6 +21366,14 @@ }, /turf/simulated/floor/wood, /area/exploration/pilot_Office) +"ibi" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/effect/paint/black, +/obj/effect/paint_stripe/black, +/turf/simulated/wall/rshull, +/area/shuttle/oldcentury) "icY" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -21260,6 +21456,19 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway2) +"iiO" = ( +/obj/structure/catwalk, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/turf/simulated/floor/plating/lythios43c, +/area/rift/surfacebase/outside/outside3) +"ika" = ( +/obj/structure/window/reinforced/polarized/full{ + id = "Centuries_old_shuttle_cockpit" + }, +/turf/simulated/floor/tiled/monodark, +/area/shuttle/oldcentury) "ikZ" = ( /obj/machinery/door/firedoor/glass{ dir = 8 @@ -21284,6 +21493,13 @@ /obj/item/storage/firstaid/o2, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway) +"inC" = ( +/obj/structure/shuttle/engine/heater, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 + }, +/turf/simulated/shuttle/wall/voidcraft/hard_corner, +/area/shuttle/emt/cockpit) "inQ" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -21314,6 +21530,12 @@ }, /turf/simulated/floor/plating, /area/exploration) +"ivj" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 + }, +/turf/simulated/floor, +/area/shuttle/emt/general) "ivw" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 8 @@ -21369,6 +21591,20 @@ /obj/effect/paint/commandblue, /turf/simulated/floor/plating, /area/crew_quarters/heads/hop) +"iCo" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 4 + }, +/obj{ + name = "---Merge conflict marker---" + }, +/obj/structure/flora/grass/both{ + pixel_x = 10; + pixel_y = 10 + }, +/turf/simulated/floor/reinforced/lythios43c, +/area/rift/surfacebase/outside/outside3) "iCv" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -21391,7 +21627,10 @@ /obj/structure/cable/green{ icon_state = "1-4" }, -/obj/machinery/light/small, +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02" + }, /turf/simulated/floor/plating, /area/maintenance/substation/exploration) "iEp" = ( @@ -21415,6 +21654,21 @@ /obj/effect/paint/purplegray, /turf/simulated/floor/plating, /area/rnd/telescience_lab) +"iHi" = ( +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02"; + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/debris/cleanable/dirt, +/obj/machinery/computer/ship/navigation/telescreen{ + pixel_y = 24 + }, +/obj/item/material/twohanded/folded_metal_chair, +/obj/item/material/twohanded/folded_metal_chair, +/turf/simulated/floor, +/area/shuttle/oldcentury) "iIQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -21448,12 +21702,42 @@ /obj/structure/grille, /turf/simulated/floor/plating, /area/rift/surfacebase/outside/outside3) +"iKt" = ( +/obj/machinery/door/window/brigdoor/northleft, +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan, +/obj/effect/floor_decal/borderfloorwhite/cee{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/bordercee, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) +"iKK" = ( +/obj/structure/bed/chair/bay/shuttle{ + dir = 1 + }, +/obj/effect/debris/cleanable/dirt, +/obj/structure/table/bench/wooden{ + pixel_x = 15 + }, +/turf/simulated/floor/carpet/patterened/green, +/area/shuttle/oldcentury) "iLh" = ( /obj/structure/cable/green{ icon_state = "4-8" }, /turf/simulated/floor/tiled/monotile, /area/security/checkpoint2) +"iLn" = ( +/obj/structure/shuttle/engine/heater, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, +/obj/effect/paint/silver, +/turf/simulated/wall/rshull, +/area/shuttle/oldcentury) "iLp" = ( /obj/machinery/door/blast/shutters{ density = 0; @@ -21489,22 +21773,58 @@ /obj/item/bedsheet/reddouble, /turf/simulated/floor/plating, /area/maintenance/commandmaint) +"iQv" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 + }, +/obj/effect/paint/black, +/turf/simulated/wall/rshull, +/area/shuttle/oldcentury) +"iRe" = ( +/obj/structure/handrail{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 10 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 10 + }, +/obj/structure/panic_button{ + pixel_y = -28 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/cockpit) +"iRy" = ( +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) "iRO" = ( /obj/machinery/light/small{ dir = 8 }, /turf/simulated/floor/plating, /area/maintenance/bar/lower) -"iXB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 10 +"iSW" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 4 }, -/obj/machinery/meter, -/obj/structure/cable/cyan{ - icon_state = "1-2" +/obj/effect/paint/black, +/turf/simulated/wall/rshull, +/area/shuttle/oldcentury) +"iZn" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 }, -/turf/simulated/floor, -/area/shuttle/emt/general) +/obj/effect/paint/black, +/obj/effect/paint_stripe/black, +/turf/simulated/wall/rshull, +/area/shuttle/oldcentury) "iZv" = ( /obj/machinery/door/airlock/command{ id_tag = "captaindoor"; @@ -21528,6 +21848,18 @@ }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/captain) +"iZN" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/power/smes/buildable{ + charge = 15000; + cur_coils = 3 + }, +/obj/structure/cable/cyan{ + icon_state = "0-4" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/cyan, +/turf/simulated/floor, +/area/shuttle/oldcentury) "jat" = ( /obj/machinery/light/small{ dir = 4 @@ -21584,6 +21916,21 @@ /obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/steel, /area/exploration/courser_dock) +"jhj" = ( +/obj/structure/flora/rock/ice, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) +"jhF" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ + frequency = 1380; + id_tag = "emt_shuttle_docker_pump" + }, +/obj/map_helper/airlock/atmos/chamber_pump, +/obj/structure/closet/walllocker/emergsuit_wall{ + pixel_y = 30 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/emt/general) "jil" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 4 @@ -21597,6 +21944,14 @@ /obj/map_helper/airlock/door/ext_door, /turf/simulated/floor/tiled/steel_grid, /area/exploration/excursion_dock) +"jin" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 4 + }, +/obj/effect/debris/cleanable/dirt, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor, +/area/shuttle/oldcentury) "jiv" = ( /turf/simulated/wall/prepainted, /area/rift/stairwell/primary/surfacethree) @@ -21656,6 +22011,16 @@ }, /turf/simulated/floor/plating, /area/exploration/explorer_prep) +"jrm" = ( +/obj/structure/handrail{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 2 + }, +/obj/effect/floor_decal/corner/paleblue/border, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) "jrG" = ( /obj/machinery/light, /obj/machinery/atmospherics/pipe/manifold/hidden{ @@ -21670,6 +22035,13 @@ }, /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/general) +"jrR" = ( +/obj/structure/flora/grass/both{ + pixel_x = -5; + pixel_y = -4 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) "jsa" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -21686,6 +22058,13 @@ "jsv" = ( /turf/simulated/wall/r_wall/prepainted/civilian, /area/crew_quarters/bar) +"jsT" = ( +/obj/structure/shuttle/engine/heater, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, +/turf/simulated/shuttle/wall/voidcraft/hard_corner, +/area/shuttle/emt/general) "jtQ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 @@ -21736,6 +22115,26 @@ }, /turf/simulated/floor/tiled/steel, /area/exploration) +"jxX" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline/red, +/turf/simulated/floor, +/area/shuttle/oldcentury) +"jyn" = ( +/obj/structure/bed/chair/bay/shuttle, +/obj/item/reagent_containers/food/drinks/cans/cola_coffee{ + pixel_x = 15; + pixel_y = 3 + }, +/obj/effect/debris/cleanable/dirt, +/obj/machinery/computer/ship/navigation/telescreen{ + pixel_y = 24 + }, +/obj/effect/floor_decal/borderfloorwhite/shifted, +/turf/simulated/floor/carpet/patterened/green, +/area/shuttle/oldcentury) "jyZ" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -21751,6 +22150,12 @@ }, /turf/simulated/floor/tiled/monotile, /area/exploration/pilot_prep) +"jBb" = ( +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/turf/simulated/floor/reinforced/lythios43c, +/area/rift/surfacebase/outside/outside3) "jBo" = ( /turf/simulated/wall/r_wall/prepainted, /area/rift/surfaceeva/aa/cliff_north) @@ -21799,6 +22204,21 @@ }, /turf/simulated/floor/tiled/steel, /area/exploration) +"jFP" = ( +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/structure/window/reinforced/polarized{ + dir = 8; + id = "Centuries_old_shuttle_general" + }, +/obj/machinery/vending/coffee, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor/tiled/old_tile/green, +/area/shuttle/oldcentury) "jGl" = ( /obj/structure/table/reinforced, /obj/item/storage/firstaid/regular, @@ -21912,12 +22332,6 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) -"jLf" = ( -/obj/machinery/door/airlock/glass_external, -/obj/map_helper/airlock/door/ext_door, -/obj/structure/fans/tiny, -/turf/simulated/floor/tiled/techfloor/grid, -/area/shuttle/emt/general) "jLR" = ( /obj/structure/table/wooden_reinforced, /obj/item/book/manual/legal/sop_vol5_6{ @@ -21999,6 +22413,20 @@ "jRd" = ( /turf/simulated/open, /area/rnd/telescience_lab/chamber) +"jRQ" = ( +/obj/structure/handrail{ + dir = 1 + }, +/obj/structure/handrail{ + dir = 1 + }, +/obj/effect/floor_decal/rust, +/obj/machinery/button/windowtint/multitint{ + id = "Centuries_old_shuttle_cockpit"; + pixel_y = -20 + }, +/turf/simulated/floor, +/area/shuttle/oldcentury) "jSm" = ( /obj/structure/girder, /turf/simulated/floor/plating, @@ -22016,6 +22444,10 @@ "jTJ" = ( /turf/simulated/floor/plating, /area/maintenance/research/xenobio) +"jUD" = ( +/obj/structure/flora/grass/green, +/turf/simulated/floor/outdoors/snow/noblend/lythios43c, +/area/rift/surfacebase/outside/outside3) "jVd" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -22026,6 +22458,13 @@ /obj/effect/floor_decal/spline/fancy, /turf/simulated/floor/wood, /area/exploration/pilot_Office) +"jVm" = ( +/obj/structure/flora/ausbushes/lavendergrass{ + pixel_x = 6; + pixel_y = 6 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) "jVy" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/lino, @@ -22071,6 +22510,42 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) +"jXt" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/fire_alarm/south_mount{ + pixel_y = -24 + }, +/obj/effect/floor_decal/corner/beige{ + dir = 5 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/bar) +"jYd" = ( +/obj/structure/table/rack/shelf/steel, +/obj/item/clothing/suit/space/emergency/russian, +/obj/item/clothing/head/helmet/space/emergency/russian, +/obj/item/light/bulb/orange, +/obj/item/light/bulb/orange, +/obj/item/light/bulb/orange, +/obj/item/light/bulb/orange, +/obj/item/light/bulb/orange, +/obj/item/light/bulb/orange, +/obj/item/light/bulb/orange, +/obj/item/light/bulb/orange, +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02"; + dir = 4 + }, +/obj/item/tank/emergency/oxygen, +/obj/item/clothing/mask/gas/clear, +/turf/simulated/floor, +/area/shuttle/oldcentury) "jZk" = ( /obj/structure/lattice, /turf/simulated/open, @@ -22107,6 +22582,17 @@ /obj/effect/paint/palebottlegreen, /turf/simulated/floor/plating, /area/hydroponics) +"kcm" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 4 + }, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor, +/area/shuttle/oldcentury) +"khK" = ( +/obj/structure/flora/rock/ice/alternative_2, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) "kih" = ( /obj/machinery/door/firedoor/glass{ dir = 8 @@ -22119,6 +22605,15 @@ }, /turf/simulated/floor/tiled/monotile, /area/rift/trade_shop/landing_pad) +"kjF" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 10 + }, +/turf/simulated/floor, +/area/shuttle/emt/general) "kjZ" = ( /obj/machinery/power/terminal{ dir = 8 @@ -22311,6 +22806,14 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) +"kMc" = ( +/obj/effect/debris/cleanable/dirt, +/obj/effect/debris/cleanable/dirt, +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/simulated/floor, +/area/shuttle/oldcentury) "kOx" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 @@ -22324,9 +22827,49 @@ }, /turf/simulated/floor/tiled/monotile, /area/exploration) +"kRm" = ( +/obj/structure/table/standard, +/obj/item/soap/nanotrasen, +/obj/item/reagent_containers/glass/beaker/cryoxadone{ + pixel_x = -4 + }, +/obj/random/medical/lite, +/obj/random/medical/lite, +/obj/random/medical/lite, +/obj/random/medical/lite, +/obj/random/medical/lite, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 10 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 10 + }, +/obj/machinery/light{ + dir = 8; + old_wall = 1 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) "kRX" = ( /turf/simulated/wall/r_wall/prepainted/security, /area/security/checkpoint2) +"kSr" = ( +/obj/machinery/door/airlock/glass_external, +/obj/map_helper/airlock/door/ext_door, +/obj/structure/fans/tiny, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/airlock_sensor/airlock_exterior/shuttle{ + frequency = 1380; + id_tag = "oldcentury_docker_sensor"; + master_tag = "oldcentury_docker"; + pixel_x = 24; + pixel_y = -8 + }, +/obj/map_helper/airlock/sensor/ext_sensor, +/turf/simulated/floor/tiled/old_tile/green, +/area/shuttle/oldcentury) "kTT" = ( /obj/machinery/computer/security{ dir = 1 @@ -22381,6 +22924,12 @@ "lbu" = ( /turf/simulated/wall/r_wall/prepainted/civilian, /area/crew_quarters/kitchen) +"lbZ" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) "lcP" = ( /obj/structure/bed/chair{ dir = 4 @@ -22523,6 +23072,17 @@ /obj/landmark/spawnpoint/job/pilot, /turf/simulated/floor/wood, /area/exploration/pilot_Office) +"luX" = ( +/obj/structure/bed/roller, +/obj/effect/floor_decal/industrial/outline/red, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 4 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) "lxt" = ( /obj/effect/paint/black, /obj/effect/paint_stripe/violet, @@ -22641,6 +23201,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway2) +"lLr" = ( +/obj/structure/flora/ausbushes/ppflowers, +/obj/structure/flora/bush{ + pixel_x = -12; + pixel_y = 14 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) "lMp" = ( /turf/simulated/wall/prepainted/science, /area/maintenance/research/xenobio) @@ -22654,6 +23222,69 @@ }, /turf/simulated/floor/plating, /area/maintenance/station/exploration) +"lNQ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/effect/paint/black, +/turf/simulated/wall/rshull, +/area/shuttle/oldcentury) +"lNU" = ( +/obj/structure/closet/crate/medical, +/obj/item/storage/firstaid/regular{ + pixel_x = -2; + pixel_y = 4 + }, +/obj/item/storage/firstaid/regular{ + pixel_x = -2; + pixel_y = 4 + }, +/obj/item/bodybag/cryobag{ + pixel_x = 5 + }, +/obj/item/bodybag/cryobag{ + pixel_x = 5 + }, +/obj/item/storage/firstaid/o2{ + layer = 2.8; + pixel_x = 4; + pixel_y = 6 + }, +/obj/item/storage/box/masks, +/obj/item/storage/box/gloves{ + pixel_x = 3; + pixel_y = 4 + }, +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/fire{ + layer = 2.9; + pixel_x = 2; + pixel_y = 3 + }, +/obj/item/storage/firstaid/adv{ + pixel_x = -2 + }, +/obj/item/reagent_containers/blood/empty, +/obj/item/reagent_containers/blood/empty, +/obj/item/reagent_containers/blood/empty, +/obj/item/reagent_containers/blood/empty, +/obj/item/reagent_containers/blood/empty, +/obj/item/defib_kit/loaded, +/obj/machinery/air_alarm/alarms_hidden{ + pixel_y = 24 + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 5 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 5 + }, +/obj/machinery/light{ + dir = 4; + old_wall = 1 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) "lOr" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -22725,6 +23356,26 @@ }, /turf/simulated/floor/plating, /area/maintenance/commandmaint) +"lUe" = ( +/obj/machinery/power/terminal, +/obj/structure/cable/cyan{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/turf/simulated/floor, +/area/shuttle/oldcentury) +"lVJ" = ( +/obj/structure/flora/ausbushes/lavendergrass{ + pixel_x = 2; + pixel_y = 12 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) "lWu" = ( /obj/machinery/disposal, /obj/effect/floor_decal/borderfloor{ @@ -22839,10 +23490,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/bridge) -"lZF" = ( -/obj/machinery/holopad/ship, -/turf/simulated/floor/tiled/monowhite, -/area/shuttle/emt/general) "lZM" = ( /turf/simulated/wall/prepainted/exploration, /area/exploration/meeting) @@ -22863,6 +23510,12 @@ /obj/structure/bed/padded, /turf/simulated/floor/plating, /area/maintenance/commandmaint) +"mdN" = ( +/obj/effect/floor_decal/rust, +/obj/effect/debris/cleanable/dirt, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor, +/area/shuttle/oldcentury) "mhO" = ( /obj/effect/floor_decal/borderfloor{ dir = 10 @@ -22909,6 +23562,22 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/shuttle/courser/general) +"mlj" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/atmospherics/pipe/tank/phoron{ + dir = 4; + volume = 15000 + }, +/turf/simulated/floor, +/area/shuttle/oldcentury) +"mlu" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloorwhite, +/obj/effect/floor_decal/corner/paleblue/border, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) "mnJ" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/effect/paint/purplegray, @@ -22921,6 +23590,19 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/security/checkpoint2) +"mpR" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/debris/cleanable/blood/oil/streak, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor, +/area/shuttle/oldcentury) "mpX" = ( /turf/simulated/wall/prepainted/exploration, /area/exploration/pathfinder_office) @@ -22951,6 +23633,10 @@ }, /turf/simulated/floor/carpet/blue, /area/crew_quarters/heads/blueshield) +"msd" = ( +/obj/structure/flora/ausbushes/ppflowers, +/turf/simulated/floor/outdoors/snow/noblend/lythios43c, +/area/rift/surfacebase/outside/outside3) "msZ" = ( /obj/machinery/door/airlock/glass_external, /obj/map_helper/airlock/door/ext_door, @@ -22991,6 +23677,16 @@ }, /turf/simulated/floor/tiled/steel, /area/bridge) +"muH" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/catwalk, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating/lythios43c, +/area/rift/surfacebase/outside/outside3) "mvz" = ( /turf/simulated/wall/r_wall/prepainted, /area/hallway/secondary/docking_hallway) @@ -22998,6 +23694,18 @@ /obj/machinery/holopad/ship, /turf/simulated/floor/tiled/monotile, /area/exploration/pilot_prep) +"mwh" = ( +/obj/machinery/computer/shuttle_control/explore/oldcentury{ + dir = 4 + }, +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02"; + dir = 8 + }, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor/tiled/monodark, +/area/shuttle/oldcentury) "mxx" = ( /obj/effect/floor_decal/spline/plain{ dir = 1 @@ -23013,6 +23721,17 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/bar) +"myr" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing, +/obj/structure/marker_beacon/red, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/reinforced/lythios43c, +/area/rift/surfacebase/outside/outside3) "mAj" = ( /turf/simulated/wall/prepainted, /area/hallway/secondary/docking_hallway2) @@ -23054,6 +23773,19 @@ }, /turf/simulated/floor/tiled/techmaint, /area/exploration) +"mCH" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/catwalk, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating/lythios43c, +/area/rift/surfacebase/outside/outside3) "mCR" = ( /obj/machinery/door/airlock/maintenance/int{ name = "Kitchen Access"; @@ -23160,6 +23892,21 @@ }, /turf/simulated/floor/plating, /area/maintenance/station/exploration) +"mQw" = ( +/obj/structure/bed/chair/shuttle{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 4 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) "mQz" = ( /obj/machinery/door/airlock/maintenance/engi{ name = "Substation Access" @@ -23192,6 +23939,10 @@ /obj/structure/lattice, /turf/simulated/open, /area/rnd/telescience_lab/chamber) +"mUB" = ( +/obj/structure/flora/ausbushes/ppflowers, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) "mUS" = ( /obj/structure/catwalk, /obj/structure/cable/green{ @@ -23199,6 +23950,17 @@ }, /turf/simulated/floor/plating/lythios43c, /area/rift/surfaceeva/airlock/arrivals/secondary) +"mUU" = ( +/obj/structure/flora/ausbushes/ywflowers{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/structure/flora/ausbushes/brflowers{ + pixel_x = 3; + pixel_y = -6 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) "mVj" = ( /obj/machinery/light{ dir = 4 @@ -23243,6 +24005,10 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) +"nbh" = ( +/obj/structure/flora/bush, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) "nbB" = ( /obj/effect/floor_decal/industrial/warning, /obj/structure/cable/green{ @@ -23254,6 +24020,16 @@ /obj/structure/sign/warning/docking_area, /turf/simulated/wall/r_wall/prepainted/exploration, /area/exploration/excursion_dock) +"ndR" = ( +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/structure/table/bench/wooden, +/obj/structure/flora/pottedplant/flower{ + pixel_y = 12 + }, +/turf/simulated/floor/carpet/patterened/green, +/area/shuttle/oldcentury) "ndT" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -23365,12 +24141,28 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ai_server_room) +"nlg" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden, +/turf/simulated/shuttle/wall/voidcraft/blue, +/area/shuttle/emt/general) "nms" = ( /obj/structure/table/rack/steel, /obj/random/maintenance/medical, /obj/random/coin, /turf/simulated/floor/plating, /area/maintenance/bar/lower) +"nmw" = ( +/obj/machinery/power/terminal, +/obj/structure/cable/green{ + icon_state = "0-8"; + dir = 1 + }, +/obj/machinery/air_alarm/alarms_hidden{ + pixel_y = 22; + req_one_access = list(160) + }, +/turf/simulated/floor, +/area/shuttle/emt/general) "nmA" = ( /obj/machinery/door/airlock/glass_external/public{ name = "Public External Airlock" @@ -23410,6 +24202,16 @@ }, /turf/simulated/floor/reinforced, /area/rnd/telescience_lab/chamber) +"nqA" = ( +/obj/effect/paint/silver, +/obj/effect/paint_stripe/black, +/obj/machinery/airlock_sensor{ + dir = 4; + id_tag = "oldcentury_docker"; + pixel_x = 12 + }, +/turf/simulated/wall/rshull, +/area/shuttle/oldcentury) "nsi" = ( /obj/structure/railing{ dir = 8 @@ -23438,28 +24240,6 @@ /obj/item/stack/cable_coil/random, /turf/simulated/floor/plating, /area/maintenance/commandmaint) -"nyL" = ( -/obj/effect/floor_decal/borderfloorwhite, -/obj/effect/floor_decal/corner/paleblue/border, -/obj/effect/floor_decal/borderfloorwhite/corner2, -/obj/effect/floor_decal/borderfloorwhite/corner2{ - dir = 9 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner2, -/obj/effect/floor_decal/corner/paleblue/bordercorner2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 8 - }, -/obj/structure/handrail{ - dir = 1 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/general) "nCn" = ( /obj/structure/ladder{ pixel_y = 8 @@ -23486,6 +24266,14 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) +"nHY" = ( +/obj/structure/table/rack/shelf/steel, +/obj/item/tank/jetpack/improvised, +/obj/item/storage/toolbox/mechanical{ + pixel_y = 18 + }, +/turf/simulated/floor, +/area/shuttle/oldcentury) "nJk" = ( /obj/machinery/atmospherics/portables_connector{ dir = 1 @@ -23512,6 +24300,11 @@ /obj/structure/cable/green, /turf/simulated/floor/plating, /area/maintenance/substation/surface_three) +"nMn" = ( +/obj/effect/paint/black, +/obj/effect/paint/silver, +/turf/simulated/wall/rshull, +/area/shuttle/oldcentury) "nMD" = ( /obj/structure/closet/secure_closet/pilot, /obj/machinery/light, @@ -23651,6 +24444,17 @@ /obj/map_helper/airlock/sensor/chamber_sensor, /turf/simulated/floor/tiled/steel_grid, /area/rift/surfaceeva/airlock/arrivals) +"ogS" = ( +/obj/structure/railing, +/obj/structure/flora/ausbushes/ywflowers, +/turf/simulated/floor/outdoors/snow/noblend/lythios43c, +/area/rift/surfacebase/outside/outside3) +"oiE" = ( +/obj/structure/flora/rock/ice/alternative_1{ + layer = 4 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) "okY" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, @@ -23671,6 +24475,13 @@ }, /turf/simulated/floor/tiled/steel, /area/exploration/courser_dock) +"oqd" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) "oqe" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 4 @@ -23722,6 +24533,25 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway) +"otK" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ + dir = 4 + }, +/obj/machinery/airlock_sensor{ + dir = 1; + frequency = 1380; + id_tag = "emt_shuttle_docker"; + pixel_y = -21 + }, +/obj/map_helper/airlock/sensor/chamber_sensor, +/obj/structure/handrail{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/emt/general) "otN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -23780,6 +24610,20 @@ }, /turf/simulated/floor/wood, /area/exploration/pilot_Office) +"oys" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor, +/area/shuttle/oldcentury) +"ozQ" = ( +/obj/effect/floor_decal/borderfloorwhite{ + dir = 1 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) "oAw" = ( /obj/structure/cable/pink{ icon_state = "1-2" @@ -23804,6 +24648,10 @@ "oCx" = ( /turf/simulated/wall/r_wall/prepainted, /area/rift/turbolift/maint) +"oCC" = ( +/obj/effect/paint/black, +/turf/simulated/wall/rshull, +/area/shuttle/oldcentury) "oEP" = ( /obj/machinery/light/small/emergency{ dir = 1 @@ -23880,14 +24728,40 @@ "oLI" = ( /turf/simulated/wall/r_wall/prepainted, /area/rift/surfaceeva/airlock/arrivals) +"oMK" = ( +/obj/structure/table/standard, +/obj/item/storage/box/freezer{ + pixel_x = 5; + pixel_y = 2 + }, +/obj/item/storage/box/freezer, +/obj/structure/window/reinforced/polarized{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 4 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) "oNh" = ( -/obj/machinery/light/small, +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02" + }, /obj/structure/catwalk, /obj/structure/cable/green{ icon_state = "4-8" }, /turf/simulated/floor/plating, /area/maintenance/commandmaint) +"oPq" = ( +/obj/machinery/door/airlock/glass_external, +/obj/map_helper/airlock/door/int_door, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/emt/general) "oQY" = ( /obj/machinery/door/firedoor/glass{ dir = 1 @@ -23984,6 +24858,32 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway) +"oWZ" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 10 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/debris/cleanable/dirt, +/obj/structure/bed/pod, +/obj/item/bedsheet/brown, +/turf/simulated/floor, +/area/shuttle/oldcentury) +"oXk" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ + dir = 1; + frequency = 1380; + id_tag = "oldcentury_docker_pump" + }, +/obj/map_helper/airlock/atmos/chamber_pump, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/old_tile/green, +/area/shuttle/oldcentury) "oXU" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 4 @@ -24006,11 +24906,15 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge) -"pem" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5 +"pat" = ( +/obj/structure/flora/ausbushes/ywflowers, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) +"peo" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" }, -/turf/simulated/shuttle/wall/voidcraft/hard_corner, +/turf/simulated/shuttle/wall/voidcraft/blue, /area/shuttle/emt/general) "peI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -24119,23 +25023,6 @@ }, /turf/simulated/floor/lino, /area/crew_quarters/bar_backroom) -"psu" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 4 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 4 - }, -/obj/structure/bed/roller, -/obj/effect/floor_decal/industrial/outline/blue, -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/cable/cyan{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/general) "ptn" = ( /obj/structure/table/reinforced, /obj/machinery/recharger, @@ -24163,6 +25050,21 @@ }, /turf/simulated/floor/plating, /area/bridge/bunker) +"puC" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan, +/obj/machinery/vending/wallmed1{ + name = "Emergency NanoMed"; + pixel_x = 28 + }, +/obj/effect/floor_decal/borderfloorwhite/cee{ + dir = 1 + }, +/obj/effect/floor_decal/corner/paleblue/bordercee, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) "pxd" = ( /obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, /obj/effect/paint/purplegray, @@ -24190,6 +25092,12 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway2) +"pCy" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/debris/cleanable/dirt, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor, +/area/shuttle/oldcentury) "pFg" = ( /obj/machinery/door/airlock/maintenance/common, /obj/structure/cable/green{ @@ -24220,6 +25128,25 @@ /obj/effect/paint/darkred, /turf/simulated/floor/plating, /area/security/checkpoint2) +"pKp" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02"; + dir = 4 + }, +/obj/structure/bed/chair/bay/shuttle, +/obj/structure/table/bench/wooden{ + pixel_x = -16 + }, +/obj/machinery/air_alarm/alarms_hidden{ + pixel_y = 24 + }, +/obj/effect/floor_decal/borderfloorwhite/shifted, +/turf/simulated/floor/carpet/patterened/green, +/area/shuttle/oldcentury) "pKx" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 8 @@ -24278,7 +25205,10 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "pLB" = ( -/obj/machinery/light/small, +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02" + }, /turf/simulated/floor/plating, /area/maintenance/bar) "pMX" = ( @@ -24346,16 +25276,38 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/commandmaint) +"pTC" = ( +/obj/effect/paint/silver, +/obj/effect/paint_stripe/black, +/turf/simulated/wall/rshull, +/area/shuttle/oldcentury) "pVV" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/shuttle/civvie/general) +"pZx" = ( +/obj/machinery/door/blast/regular{ + dir = 2; + id = "oldshuttle_hatch"; + name = "Shuttle Side Hatch" + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/monodark, +/area/shuttle/oldcentury) "qcL" = ( /obj/landmark/spawnpoint/job/pilot, /obj/item/stool/padded, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/monotile, /area/exploration/pilot_prep) +"qcX" = ( +/obj/structure/cable/cyan{ + icon_state = "0-4" + }, +/obj/machinery/power/apc/high/west_mount, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor, +/area/shuttle/oldcentury) "qdg" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -24396,6 +25348,10 @@ "qgc" = ( /turf/simulated/floor/reinforced, /area/rnd/telescience_lab/chamber) +"qgy" = ( +/obj/structure/flora/grass/green, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) "qgY" = ( /obj/structure/table/hardwoodtable, /obj/machinery/chemical_dispenser/catering/bar_coffee{ @@ -24406,6 +25362,10 @@ /obj/effect/floor_decal/corner/red/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) +"qhn" = ( +/obj/structure/flora/grass/both, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) "qjW" = ( /obj/structure/table/wooden_reinforced, /obj/effect/floor_decal/spline/plain{ @@ -24450,6 +25410,17 @@ }, /turf/simulated/floor/tiled, /area/rnd/telescience_lab) +"qmR" = ( +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/effect/debris/cleanable/dirt, +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02" + }, +/turf/simulated/floor/carpet/patterened/green, +/area/shuttle/oldcentury) "qmY" = ( /obj/machinery/button/remote/blast_door{ dir = 1; @@ -24506,6 +25477,12 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/surface_three) +"qoC" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/atmospherics/pipe/manifold/hidden, +/obj/effect/debris/cleanable/blood/oil/streak, +/turf/simulated/floor, +/area/shuttle/oldcentury) "qsA" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -24533,6 +25510,19 @@ }, /turf/simulated/floor/tiled/steel, /area/rift/stairwell/primary/surfacethree) +"qwS" = ( +/obj/machinery/holopad/ship, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorwhite/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/paleblue/bordercorner{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) "qxq" = ( /obj/spawner/window/low_wall/full/nogrille/firelocks, /turf/simulated/floor/plating, @@ -24625,7 +25615,6 @@ /area/crew_quarters/bar) "qGN" = ( /obj/structure/catwalk, -/obj/machinery/light/small, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -24664,6 +25653,10 @@ "qKs" = ( /turf/simulated/wall/prepainted/command, /area/bridge/meeting_room) +"qKD" = ( +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor/tiled/monodark, +/area/shuttle/oldcentury) "qSJ" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -24694,6 +25687,26 @@ /obj/machinery/light/small/emergency, /turf/simulated/floor/plating, /area/maintenance/commandmaint) +"qVp" = ( +/obj/structure/window/reinforced/polarized{ + dir = 8; + id = "Centuries_old_shuttle_general" + }, +/obj/structure/table/rack/shelf/steel, +/obj/structure/flora/pottedplant/shoot{ + pixel_x = 5; + pixel_y = 23 + }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloorwhite/shifted, +/obj/machinery/button/windowtint/multitint{ + id = "Centuries_old_shuttle_general"; + pixel_x = -11 + }, +/turf/simulated/floor/tiled/old_tile/green, +/area/shuttle/oldcentury) "qVq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -24794,6 +25807,17 @@ /obj/machinery/light, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway) +"rjP" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/structure/bed/chair/sofa/black/corner, +/obj/effect/debris/cleanable/dirt, +/obj/machinery/computer/ship/navigation/telescreen{ + pixel_x = 32 + }, +/turf/simulated/floor/carpet/patterened/green, +/area/shuttle/oldcentury) "rkv" = ( /obj/structure/table/steel, /obj/random/maintenance/research, @@ -24874,6 +25898,18 @@ /obj/machinery/status_display, /turf/simulated/wall/r_wall/prepainted/command, /area/bridge) +"rvp" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 8 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) "rxA" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 4 @@ -24927,19 +25963,6 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) -"rFB" = ( -/obj/machinery/door/airlock/voidcraft{ - name = "battery hatch" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/structure/cable/cyan{ - icon_state = "1-2" - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor, -/area/shuttle/emt/general) "rJB" = ( /obj/structure/bed/chair/bay/comfy/black{ dir = 8 @@ -24972,6 +25995,15 @@ }, /turf/simulated/floor/tiled/steel, /area/exploration/excursion_dock) +"rMf" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, +/obj/effect/debris/cleanable/dirt, +/obj/effect/debris/cleanable/dirt, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor, +/area/shuttle/oldcentury) "rMs" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/beige/border, @@ -25041,6 +26073,14 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/locker/laundry_arrival) +"rWu" = ( +/obj/structure/shuttle/engine/heater, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, +/obj/effect/paint/black, +/turf/simulated/wall/rshull, +/area/shuttle/oldcentury) "rXm" = ( /obj/random/trash_pile, /turf/simulated/floor/plating, @@ -25085,6 +26125,16 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rift/surfaceeva/airlock/arrivals) +"scS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/effect/debris/cleanable/dirt, +/obj/structure/handrail{ + dir = 1 + }, +/turf/simulated/floor, +/area/shuttle/oldcentury) "sdp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -25143,6 +26193,32 @@ /obj/effect/floor_decal/corner/lime/border, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) +"sjx" = ( +/obj/structure/bed/chair/shuttle{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 5 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 5 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) +"ski" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 + }, +/obj/effect/paint/black, +/obj/effect/paint_stripe/black, +/turf/simulated/wall/rshull, +/area/shuttle/oldcentury) "slu" = ( /obj/structure/railing{ dir = 4 @@ -25159,6 +26235,26 @@ }, /turf/simulated/floor/tiled/old_tile/green, /area/shuttle/civvie/general) +"slN" = ( +/obj/machinery/sleep_console{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline/blue, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 1 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) +"smV" = ( +/obj/structure/flora/ausbushes/ppflowers{ + pixel_x = 12; + pixel_y = 6 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) "sny" = ( /obj/structure/railing, /obj/structure/foodcart, @@ -25169,6 +26265,12 @@ }, /turf/simulated/floor/plating, /area/maintenance/bar/lower) +"soe" = ( +/obj/structure/flora/tree/pine{ + pixel_x = -19 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) "stD" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -25221,6 +26323,18 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway) +"sCu" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ + dir = 4 + }, +/obj/effect/debris/cleanable/dirt, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor, +/area/shuttle/oldcentury) +"sDl" = ( +/obj/structure/flora/ausbushes/leafybush, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) "sEW" = ( /obj/machinery/light/spot{ dir = 4; @@ -25230,6 +26344,22 @@ /obj/effect/paint_stripe/violet, /turf/simulated/wall/rshull, /area/shuttle/excursion/general) +"sGd" = ( +/obj/machinery/door/airlock/voidcraft{ + name = "cockpit" + }, +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/cockpit) +"sGC" = ( +/obj/structure/flora/ausbushes/brflowers, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) "sHK" = ( /obj/structure/sign/department/conference_room, /turf/simulated/wall/prepainted/command, @@ -25310,12 +26440,29 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) +"sQd" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/cyan, +/turf/simulated/shuttle/wall/voidcraft/blue, +/area/shuttle/emt/general) "sRD" = ( /obj/structure/railing{ dir = 8 }, /turf/simulated/floor/outdoors/gravsnow/lythios43c, /area/rift/surfacebase/outside/outside3) +"sWD" = ( +/obj/machinery/computer/ship/engines, +/obj/effect/debris/cleanable/dirt, +/obj/effect/debris/cleanable/dirt, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor/plating, +/area/shuttle/oldcentury) +"sYo" = ( +/obj/machinery/door/airlock, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/monodark, +/area/shuttle/oldcentury) "sYS" = ( /obj/structure/table/hardwoodtable, /obj/structure/disposalpipe/segment, @@ -25388,6 +26535,22 @@ }, /turf/simulated/floor/tiled/steel, /area/rift/stairwell/primary/surfacethree) +"tgx" = ( +/obj/structure/bed/chair/shuttle{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 8 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 8 + }, +/obj/machinery/light{ + dir = 8; + old_wall = 1 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) "tiv" = ( /obj/structure/catwalk, /obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ @@ -25468,6 +26631,12 @@ }, /turf/simulated/floor/tiled/monotile, /area/hallway/primary/surfacethree) +"tsO" = ( +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/turf/simulated/floor/reinforced/lythios43c, +/area/rift/surfacebase/outside/outside3) "tuh" = ( /obj/structure/frame{ anchored = 1 @@ -25496,6 +26665,13 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) +"tyg" = ( +/obj/structure/flora/ausbushes/ppflowers{ + pixel_x = 2; + pixel_y = 6 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) "tyY" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/air_alarm{ @@ -25507,6 +26683,29 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) +"tzX" = ( +/obj/structure/table/steel_reinforced, +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02"; + dir = 4 + }, +/obj/effect/floor_decal/rust, +/obj/item/modular_computer/laptop/preset/custom_loadout/standard/talon/pilot, +/turf/simulated/floor/tiled/monodark, +/area/shuttle/oldcentury) +"tAd" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 4; + name = "Engine Fuel Port" + }, +/obj/machinery/light{ + dir = 8; + light_range = 12; + old_wall = 1 + }, +/turf/simulated/floor, +/area/shuttle/emt/general) "tAo" = ( /turf/simulated/wall/r_wall/prepainted/command, /area/bridge) @@ -25624,7 +26823,10 @@ /turf/simulated/floor/tiled/steel_grid, /area/rift/surfaceeva/airlock/arrivals/secondary) "tIR" = ( -/obj/machinery/light/small, +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02" + }, /turf/simulated/floor/tiled/steel, /area/exploration/explorer_prep) "tKy" = ( @@ -25695,6 +26897,18 @@ /obj/effect/paint/palebottlegreen, /turf/simulated/floor/plating, /area/crew_quarters/bar) +"tSQ" = ( +/obj/structure/handrail{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 10 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 10 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) "tSU" = ( /obj/machinery/door/blast/shutters{ density = 0; @@ -25723,6 +26937,13 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge) +"tVf" = ( +/obj/structure/flora/ausbushes/brflowers{ + pixel_x = -21; + pixel_y = 6 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) "tVG" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -25731,12 +26952,27 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway) +"tXr" = ( +/obj/effect/paint/silver, +/obj/effect/paint_stripe/black, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 8 + }, +/turf/simulated/wall/rshull, +/area/shuttle/oldcentury) "tXJ" = ( /obj/structure/bed/chair/comfy/beige{ dir = 8 }, /turf/simulated/floor/lino, /area/crew_quarters/bar_backroom) +"tYG" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 4 + }, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor, +/area/shuttle/oldcentury) "uag" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -25778,6 +27014,29 @@ /obj/effect/floor_decal/spline/fancy, /turf/simulated/floor/tiled, /area/exploration/pilot_prep) +"ufh" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 5 + }, +/obj/machinery/light{ + light_range = 12; + old_wall = 1 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/effect/shuttle_landmark/rift/deck3/emt, +/obj/overmap/entity/visitable/ship/landable/emt, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/emt/general) +"ugY" = ( +/obj/structure/fuel_port{ + dir = 4; + pixel_x = 30 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden, +/turf/simulated/floor, +/area/shuttle/emt/general) "uhz" = ( /obj/structure/bed/chair/bay/chair{ dir = 1 @@ -25790,6 +27049,12 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway) +"ujO" = ( +/obj/structure/flora/grass/brown{ + pixel_y = 10 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) "uka" = ( /obj/effect/floor_decal/borderfloor{ dir = 9 @@ -25822,6 +27087,14 @@ /obj/effect/paint_stripe/violet, /turf/simulated/floor/plating, /area/shuttle/excursion/general) +"uoo" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, +/obj/effect/paint/black, +/obj/effect/paint_stripe/black, +/turf/simulated/wall/rshull, +/area/shuttle/oldcentury) "uoG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -25835,6 +27108,14 @@ }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) +"upb" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 5 + }, +/obj/effect/debris/cleanable/blood/oil/streak, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor, +/area/shuttle/oldcentury) "urI" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -25845,6 +27126,32 @@ }, /turf/simulated/floor/tiled/monotile, /area/exploration) +"uuE" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) +"uvz" = ( +/obj/structure/flora/bush{ + pixel_y = 7 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) +"uwP" = ( +/obj/structure/bed/chair/shuttle{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 9 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 9 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/closet/walllocker/emerglocker/west, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) "uxa" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 9 @@ -25885,6 +27192,14 @@ /obj/effect/paint/commandblue, /turf/simulated/floor/plating, /area/bridge) +"uyX" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/effect/paint/silver, +/obj/effect/paint_stripe/black, +/turf/simulated/wall/rshull, +/area/shuttle/oldcentury) "uAA" = ( /obj/structure/closet/firecloset/full, /turf/simulated/floor/tiled/steel, @@ -25926,6 +27241,21 @@ }, /turf/simulated/open, /area/maintenance/station/exploration) +"uHP" = ( +/obj/structure/flora/grass/brown{ + pixel_x = 7; + pixel_y = 10 + }, +/obj/structure/flora/grass/green{ + pixel_x = -13 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) +"uID" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/sleeper/survival_pod, +/turf/simulated/floor, +/area/shuttle/oldcentury) "uJh" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -25950,12 +27280,32 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel, /area/rift/stairwell/primary/surfacethree) +"uMO" = ( +/obj/machinery/door/airlock/glass_external, +/obj/map_helper/airlock/door/int_door, +/obj/machinery/access_button{ + command = "cycle_int"; + frequency = 1380; + master_tag = "oldcentury_docker"; + pixel_x = -24; + pixel_y = 8 + }, +/turf/simulated/floor, +/area/shuttle/oldcentury) "uMP" = ( /obj/landmark/spawnpoint/job/pilot, /obj/item/stool/padded, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/monotile, /area/exploration/pilot_prep) +"uOB" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/effect/paint/silver, +/obj/effect/paint_stripe/black, +/turf/simulated/wall/rshull, +/area/shuttle/oldcentury) "uOE" = ( /obj/structure/cable/pink{ icon_state = "2-4" @@ -26029,6 +27379,10 @@ /obj/effect/shuttle_landmark/rift/deck3/excursion, /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/general) +"uSZ" = ( +/obj/machinery/telecomms/relay/preset/telecomms, +/turf/simulated/floor/tiled/techfloor/grid/lythios43c, +/area/shuttle/oldcentury) "uTt" = ( /obj/machinery/door/airlock/exploration{ locked = 1; @@ -26069,6 +27423,13 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway2) +"uWR" = ( +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/structure/closet/firecloset/full, +/turf/simulated/floor, +/area/shuttle/emt/general) "uWY" = ( /obj/machinery/computer/telescience, /turf/simulated/floor/tiled, @@ -26097,6 +27458,18 @@ }, /turf/simulated/wall/prepainted/civilian, /area/crew_quarters/bar) +"vcB" = ( +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02"; + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/random/mre, +/obj/random/mre, +/obj/structure/closet/crate, +/turf/simulated/floor, +/area/shuttle/oldcentury) "vcT" = ( /obj/structure/cable{ icon_state = "1-2" @@ -26149,6 +27522,10 @@ "veT" = ( /turf/simulated/wall/prepainted/exploration, /area/exploration) +"vfp" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/cyan, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) "vfQ" = ( /obj/machinery/door/airlock/glass_external/public{ name = "Public External Airlock" @@ -26190,6 +27567,13 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway2) +"vgY" = ( +/obj/structure/panic_button{ + pixel_x = -26 + }, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor/tiled/monodark, +/area/shuttle/oldcentury) "viA" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -26244,6 +27628,13 @@ }, /turf/simulated/floor/tiled/steel, /area/security/checkpoint2) +"vmQ" = ( +/obj/structure/flora/grass/both{ + pixel_x = 10; + pixel_y = 10 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) "vmV" = ( /obj/machinery/light{ dir = 4 @@ -26274,22 +27665,32 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, /area/exploration) -"vsW" = ( -/obj/machinery/light{ - dir = 8 +"vrq" = ( +/obj/structure/railing, +/obj{ + name = "---Merge conflict marker---" }, -/obj/machinery/fire_alarm/south_mount{ - pixel_y = -24 +/obj/structure/flora/tree/pine, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) +"vrM" = ( +/obj/machinery/computer/ship/helm, +/obj/item/gps/internal/base{ + desc = "A tracking beacon embedded in the shuttle systems, to help explorers find where they landed."; + gps_tag = "OLDCENTURY"; + name = "century old beacon" }, -/obj/effect/floor_decal/corner/beige{ - dir = 5 +/obj/item/toy/figure/hop{ + layer = 6; + pixel_x = 7; + pixel_y = 18 }, -/obj/effect/floor_decal/spline/plain{ - dir = 1 +/obj/item/toy/prize/phazon{ + layer = 6; + pixel_y = 27 }, -/obj/machinery/vending/mre, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/bar) +/turf/simulated/floor/plating, +/area/shuttle/oldcentury) "vtz" = ( /obj/structure/sink/kitchen{ pixel_y = 26 @@ -26329,6 +27730,14 @@ }, /turf/simulated/floor/plating, /area/maintenance/bar/lower) +"vwN" = ( +/obj/structure/catwalk, +/obj/structure/cable/green{ + dir = 1; + icon_state = "2-4" + }, +/turf/simulated/floor/plating/lythios43c, +/area/rift/surfacebase/outside/outside3) "vwQ" = ( /turf/simulated/wall/prepainted, /area/crew_quarters/heads/hop) @@ -26407,6 +27816,12 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) +"vCa" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9 + }, +/turf/simulated/shuttle/wall/voidcraft/blue, +/area/shuttle/emt/general) "vCA" = ( /obj/structure/railing{ dir = 4 @@ -26477,6 +27892,14 @@ }, /turf/simulated/floor/tiled, /area/rnd/telescience_lab) +"vKy" = ( +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/turf/simulated/floor/tiled/monodark, +/area/shuttle/oldcentury) +"vLd" = ( +/obj/structure/flora/grass/brown, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) "vLi" = ( /obj/machinery/button/remote/airlock{ id = "bathroomlock18"; @@ -26543,6 +27966,17 @@ /obj/structure/table/steel, /turf/simulated/floor/plating, /area/maintenance/bar/lower) +"vQL" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02"; + dir = 8 + }, +/turf/simulated/floor, +/area/shuttle/oldcentury) "vRz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -26613,6 +28047,16 @@ /obj/structure/closet/firecloset, /turf/simulated/floor/plating, /area/maintenance/research/xenobio) +"vYk" = ( +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02"; + dir = 8 + }, +/obj/effect/debris/cleanable/dirt, +/obj/effect/floor_decal/industrial/halfstair, +/turf/simulated/floor/tiled/monodark, +/area/shuttle/oldcentury) "vZI" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -26720,6 +28164,16 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) +"web" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 4 + }, +/obj/machinery/light{ + dir = 1; + old_wall = 1 + }, +/turf/simulated/floor, +/area/shuttle/emt/general) "wec" = ( /obj/item/radio/intercom{ dir = 4; @@ -26858,12 +28312,37 @@ "wuI" = ( /turf/simulated/wall/prepainted/security, /area/security/checkpoint2) +"wvs" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/cable/green{ + dir = 8; + icon_state = "2-4" + }, +/turf/simulated/floor/reinforced/lythios43c, +/area/rift/surfacebase/outside/outside3) "wxd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, /turf/simulated/floor/lino, /area/crew_quarters/bar_backroom) +"wxW" = ( +/obj/structure/cable/green{ + dir = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) +"wyl" = ( +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + frequency = 1380; + id_tag = "rift_oldcentury_dock"; + req_one_access = list(67) + }, +/turf/simulated/wall/r_wall/prepainted, +/area/rift/surfacebase/outside/outside3) "wyq" = ( /obj/structure/reagent_dispensers/watertank, /obj/machinery/light/small{ @@ -26895,6 +28374,16 @@ "wAD" = ( /turf/simulated/wall/r_wall/prepainted/exploration, /area/maintenance/bar/lower) +"wBK" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/debris/cleanable/dirt, +/obj/effect/debris/cleanable/dirt, +/obj/structure/table/survival_pod, +/turf/simulated/floor, +/area/shuttle/oldcentury) "wBN" = ( /obj/machinery/computer/secure_data, /obj/effect/floor_decal/borderfloor{ @@ -26905,13 +28394,6 @@ }, /turf/simulated/floor/tiled/steel, /area/security/checkpoint2) -"wCu" = ( -/obj/structure/cable/cyan{ - icon_state = "1-2" - }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/turf/simulated/floor, -/area/shuttle/emt/general) "wCC" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -26935,6 +28417,25 @@ }, /turf/simulated/floor/plating, /area/security/prison) +"wGV" = ( +/obj/machinery/photocopier/faxmachine{ + department = "Old Century Shuttle" + }, +/obj/structure/table/steel_reinforced, +/obj/structure/cable/cyan{ + icon_state = "2-8" + }, +/obj/structure/flora/pottedplant/fern{ + pixel_x = 6; + pixel_y = 17 + }, +/obj/machinery/air_alarm/alarms_hidden{ + dir = 8; + pixel_x = 22; + req_one_access = list(160) + }, +/turf/simulated/floor/tiled/monodark, +/area/shuttle/oldcentury) "wIv" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -26981,6 +28482,12 @@ "wOC" = ( /turf/simulated/wall/r_wall/prepainted/command, /area/crew_quarters/captain) +"wOD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, +/turf/simulated/shuttle/wall/voidcraft/blue, +/area/shuttle/emt/cockpit) "wPr" = ( /obj/machinery/light{ dir = 4 @@ -27008,7 +28515,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/obj/machinery/light/small, +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02" + }, /obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" @@ -27060,6 +28570,27 @@ }, /turf/simulated/floor/tiled, /area/rnd/telescience_lab) +"xbv" = ( +/obj/structure/flora/tree/pine, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) +"xfm" = ( +/obj/structure/flora/grass/green{ + pixel_x = -13 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) +"xfK" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/effect/debris/cleanable/dirt, +/obj/effect/debris/cleanable/dirt, +/obj/machinery/computer/ship/navigation/telescreen{ + pixel_x = 32 + }, +/turf/simulated/floor/carpet/patterened/green, +/area/shuttle/oldcentury) "xgk" = ( /obj/structure/bed/chair/comfy/brown{ dir = 1 @@ -27102,6 +28633,13 @@ }, /turf/simulated/floor/tiled, /area/exploration/pilot_prep) +"xiS" = ( +/obj/structure/flora/ausbushes/ywflowers{ + pixel_x = -2; + pixel_y = 8 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) "xmB" = ( /obj/structure/cable/pink{ icon_state = "1-8" @@ -27304,6 +28842,28 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway2) +"xKs" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/structure/bed/chair/bay/shuttle{ + dir = 1 + }, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor/carpet/patterened/green, +/area/shuttle/oldcentury) +"xKI" = ( +/obj/structure/handrail{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 8 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) "xKM" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 4 @@ -27339,6 +28899,11 @@ }, /turf/simulated/floor/tiled/old_tile/green, /area/shuttle/civvie/general) +"xMz" = ( +/obj/effect/debris/cleanable/dirt, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor/carpet/patterened/green, +/area/shuttle/oldcentury) "xOZ" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 @@ -27391,6 +28956,24 @@ }, /turf/simulated/floor/tiled/steel, /area/rift/stairwell/primary/surfacethree) +"xXL" = ( +/obj/machinery/computer/ship/sensors, +/obj/machinery/light{ + dir = 4; + old_wall = 1 + }, +/obj/structure/cable/cyan{ + icon_state = "2-8" + }, +/obj/effect/floor_decal/borderfloorwhite/full, +/obj/effect/floor_decal/corner/paleblue{ + dir = 10 + }, +/obj/effect/floor_decal/corner/paleblue{ + dir = 5 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/cockpit) "xYy" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/power/apc/south_mount, @@ -27430,6 +29013,22 @@ /obj/effect/paint/palebottlegreen, /turf/simulated/floor/plating, /area/hydroponics) +"ybK" = ( +/obj/machinery/door/window/brigdoor/southleft, +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan, +/obj/effect/floor_decal/borderfloorwhite/cee, +/obj/effect/floor_decal/corner/red/bordercee{ + dir = 1 + }, +/obj/machinery/light{ + dir = 4; + old_wall = 1 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) "ybP" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -27451,6 +29050,22 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway2) +"yci" = ( +/obj/structure/toilet{ + dir = 8 + }, +/obj/machinery/shower{ + pixel_y = 18 + }, +/obj/item/reagent_containers/food/drinks/bottle/vodka{ + pixel_x = -12; + pixel_y = 21 + }, +/obj/structure/cable/cyan{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/old_tile/blue, +/area/shuttle/oldcentury) "ydU" = ( /obj/machinery/door/firedoor/glass{ dir = 1 @@ -27515,6 +29130,14 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway) +"ygS" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 4; + name = "Engine Fuel Port" + }, +/obj/effect/floor_decal/industrial/outline/red, +/turf/simulated/floor, +/area/shuttle/oldcentury) "ykb" = ( /obj/machinery/door/airlock{ id_tag = "barbackdoor"; @@ -29889,9 +31512,9 @@ aus aus aus aus -aus -aus -aus +bly +bly +bly aus aus aus @@ -30082,11 +31705,11 @@ aus aus aus aus -aus -aus -aus -aus -aus +bly +bly +bly +bly +bly aus aus aus @@ -30274,15 +31897,15 @@ aus aus aus aus -aus -aus -aus -aus -aus -aus -aus -aus -aus +bly +bly +btC +btC +btC +bRP +gzi +iLn +fdS aus aus aus @@ -30467,17 +32090,17 @@ aus aus aus aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus +bly +bly +btC +bly +bly +bly +uoo +cZP +iSW +iQv +oCC aus aus aus @@ -30573,7 +32196,7 @@ aCA aCA acH acH -acH +mUU acH aCA aCA @@ -30656,22 +32279,22 @@ aus aus aus aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus +bly +bly +btC +btC +bly +bly +pTC +pTC +pTC +pTC +dxR +ibi +ygS +mlj +lNQ +oCC aus aus aus @@ -30846,26 +32469,26 @@ aus aus aus aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus +eZv +oCC +vKy +pTC +pTC +pTC +pZx +pTC +pTC +pTC +pTC +uID +wBK +kMc +rMf +fmA +tYG +qoC +aTb +fdS aus aus aus @@ -31039,27 +32662,27 @@ aus aus aus aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus +bly +oCC +oCC +mwh +vgY +ctl +vYk +qKD +eHc +gvz +fxP +sYo +dBD +sCu +upb +gaQ +nHY +jYd +jxX +oCC +btC aus aus aus @@ -31232,28 +32855,28 @@ aBK aus aus aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus +bly +bly +vKy +vrM +doA +jRQ +pTC +qVp +bIJ +fIx +eJV +jFP +pTC +iHi +oys +kcm +scS +pTC +pTC +nqA +pTC +pTC aus aus aus @@ -31426,35 +33049,35 @@ aBK aus aus aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -apa -aIA +btC +bly +vKy +cQw +mdN +afj +ika +eCH +bLD +bLD +xMz +qmR +pTC +eRp +pCy +kcm +gaQ +uMO +cCS +clr +oXk +kSr +glL +glL +glL +glL +glL +diY +baG aIA ahS aBK @@ -31620,36 +33243,36 @@ aBK aus aus aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus +bly +bly +vKy +sWD +doA +bOR +pTC +jyn +eKT +iKK +gaS +ndR +pTC +vcB +gyK +jin +scS +pTC +uOB +tXr +pTC +pTC aus aus aus aus aus apa -aIA -aIA +iiO +baG ahS aBK aus @@ -31815,35 +33438,35 @@ aus aus aus aus +bly +oCC +oCC +tzX +wGV +uyX +pKp +xfK +xKs +rjP +hDB +uyX +fYJ +nMn +kcm +gaQ +qcX +vQL +cBe +oCC +btC aus aus aus aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -jWp +wyl abI -aIA -aIA +chB +xBA ahS aBK aus @@ -32010,34 +33633,34 @@ aus aus aus aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus +uSZ +oCC +vKy +pTC +pTC +vKy +pTC +pTC +pTC +vKy +pTC +yci +eYG +oWZ +mpR +fOO +lUe +iZN +rWu +fdS aus aus aus aus amn aZo -aIA -aIA +iiO +baG afb jWp aus @@ -32208,22 +33831,22 @@ aus aus aus aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus +bly +bRP +bly +btC +bly +bly +pTC +pTC +pTC +pTC +iZn +ski +cZT +hfa +lNQ +oCC aus aus aus @@ -32231,7 +33854,7 @@ aus amn aZo aIA -aIA +fkw aQv aus aus @@ -32407,17 +34030,17 @@ aus aus aus aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus +bly +bly +bly +btC +bly +bly +iZn +cZP +bqa +huM +oCC aus aus aus @@ -32425,7 +34048,7 @@ aus amn aZo aIA -aIA +fkw aQv aus aus @@ -32602,15 +34225,15 @@ aus aus aus aus -aus -aus -aus -aus -aus -aus -aus -aus -aus +bly +bly +bly +bly +btC +bly +gzi +fxK +fdS aus aus aus @@ -32619,7 +34242,7 @@ aus amn avM aIA -aIA +fkw aQv aus aus @@ -32798,11 +34421,11 @@ aus aus aus aus -aus -aus -aus -aus -aus +bly +btC +bly +btC +bly aus aus aus @@ -32813,7 +34436,7 @@ aus amn aZo aIA -aIA +fkw aTj jWp aus @@ -32993,9 +34616,9 @@ aus aus aus aus -aus -aus -aus +bly +bly +bly aus aus aus @@ -33007,7 +34630,7 @@ aus amn aZo aIA -aIA +fkw ahS aBK aus @@ -33201,7 +34824,7 @@ aus jWp aZo aIA -aIA +fkw ahS aBK aus @@ -33281,7 +34904,7 @@ aOi aOi acH acH -acH +bKm acH vCA aOi @@ -33395,7 +35018,7 @@ aus amn avM aIA -aIA +fkw ahS aBK aus @@ -33589,7 +35212,7 @@ aus amn aZo aIA -aIA +fkw ahS aBK aus @@ -33668,7 +35291,7 @@ aOi aOi aOi acH -acH +cLb acH aNk aOi @@ -33783,7 +35406,7 @@ aus amn aZo aIA -aIA +fkw ahS aBK aus @@ -33977,7 +35600,7 @@ aus amn aZo aIA -aIA +fkw ahS aBK aus @@ -34171,7 +35794,7 @@ aus atI avM aIA -aIA +fkw ahS jWp aus @@ -34365,7 +35988,7 @@ atI avN aGz aIA -aIA +fkw ahS aBK aus @@ -34559,7 +36182,7 @@ aOi aOi aKW aIA -aIA +fkw ahS aBK aus @@ -34753,7 +36376,7 @@ aOi aOi aKW aIA -aIA +fkw ahS aBK aus @@ -34880,7 +36503,7 @@ aHj aHj aHj aHj -aHj +fgd aHj acH acH @@ -34947,7 +36570,7 @@ aOi aOi aKW aIA -aIA +fkw ahS aBK aus @@ -35026,7 +36649,7 @@ aOi aOi aOi acH -acH +bKm aHj aHj aCA @@ -35075,7 +36698,7 @@ aCA aCA aCA aHj -aHj +fgd acH acH acH @@ -35141,7 +36764,7 @@ aOi jWp bFr aIA -aIA +fkw aOP afo aus @@ -35335,7 +36958,7 @@ aOi aOi aOi aIA -aIA +fkw ahS aOi afo @@ -35528,8 +37151,8 @@ jWp jWp jWp jWp -aIA -aIA +chB +vwN afb aTq azf @@ -35660,7 +37283,7 @@ acH acH acH acH -acH +cLb acH acH aOi @@ -35722,8 +37345,8 @@ aOi aOi aOi aKW -aIA -aIA +fFk +eGc aIA aIA aIA @@ -35917,26 +37540,26 @@ aOi aOi aKW aIA -aIA -aIA -aIA -aIA -aIA -aIA -aIA -aIA -aIA -aIA -aIA -aIA -aIA -aIA -aIA -aIA -aIA -aIA -aIA -aIA +iiO +dSP +dSP +dSP +dSP +dSP +dSP +dSP +dSP +dSP +dSP +dSP +dSP +dSP +dSP +dSP +dSP +dSP +dSP +baG aIA aIA aIA @@ -36130,7 +37753,7 @@ aDY aDY aDY dwo -aIA +fkw aIA nsi aDY @@ -36188,7 +37811,7 @@ aOi aOi aOi aOi -acH +smV aAd acH acH @@ -36324,7 +37947,7 @@ aOi aOi aOi aKW -aIA +fkw aIA ahS aOi @@ -36518,7 +38141,7 @@ aOi aOi aOi aKW -aIA +fkw aIA ahS aOi @@ -36712,7 +38335,7 @@ aOi aOi aOi aKW -aIA +fkw aIA ahS aOi @@ -36906,7 +38529,7 @@ aOi aOi aOi aKW -aIA +fkw aIA ahS aOi @@ -37100,7 +38723,7 @@ aOi aOi aOi aKW -aIA +fkw aIA ahS aOi @@ -37294,7 +38917,7 @@ aOi aOi aOi aKW -aIA +fkw aIA ahS aOi @@ -37414,7 +39037,7 @@ acH aOi aOi aOi -acH +xiS acH acH acH @@ -37488,7 +39111,7 @@ aOi aOi aOi aKW -aIA +fkw aIA ahS aOi @@ -37682,7 +39305,7 @@ aOi aOi aOi aKW -aIA +fkw aIA ahS aOi @@ -37717,14 +39340,14 @@ aOi aOi aOi aOi +tyg +qhn acH acH acH +jVm acH -acH -acH -acH -acH +bKm acH acH aTq @@ -37742,7 +39365,7 @@ aJO aTq aTq acH -acH +lLr aAd aAd acH @@ -37809,7 +39432,7 @@ acH acH acH acH -acH +pat acH acH acH @@ -37876,7 +39499,7 @@ aOi aOi aOi aKW -aIA +fkw aIA ahS aOi @@ -37913,7 +39536,7 @@ acH acH acH acH -acH +bKm acH acH acH @@ -38001,9 +39624,9 @@ acH acH acH acH +vmQ acH -acH -acH +xbv acH acH afq @@ -38070,7 +39693,7 @@ aOi aOi aOi aKW -aIA +fkw aIA ahS aOi @@ -38099,7 +39722,7 @@ acH acH acH acH -acH +lVJ acH acH acH @@ -38264,7 +39887,7 @@ aOi aOi aOi aKW -aIA +fkw aIA ahS aOi @@ -38290,12 +39913,12 @@ acH acH acH acH +jVm acH acH acH acH -acH -acH +xfm acH acH acH @@ -38321,7 +39944,7 @@ anP arV aUI aAj -vsW +jXt lbu akB ajM @@ -38383,7 +40006,7 @@ acH acH acH acH -acH +xbv acH acH acH @@ -38443,7 +40066,7 @@ acH acH acH acH -acH +vmQ acH acH acH @@ -38458,30 +40081,27 @@ acH acH aOi aKW -aIA -aIA -afb -aTq -aTq -aTq -aTq -aTq -aTq -aTq -aTq -aTq -aTq -aTq -aTq -aTq -aTq -aTq -aTq -vCA -acH -acH -acH -acH +fFk +dSP +mCH +muH +muH +muH +muH +muH +muH +muH +muH +muH +muH +muH +muH +muH +muH +muH +muH +cBz +wxW acH acH acH @@ -38489,11 +40109,14 @@ acH acH acH acH +xbv acH acH acH +xfm acH acH +uHP rdX rdX rdX @@ -38565,13 +40188,13 @@ acH acH acH acH +xbv acH acH acH acH acH -acH -acH +xbv acH acH acH @@ -38636,7 +40259,7 @@ acH acH acH acH -acH +qhn acH acH acH @@ -38672,6 +40295,7 @@ acH acH acH acH +lbZ acH acH acH @@ -38679,12 +40303,11 @@ acH acH acH acH +xfm acH acH acH -acH -acH -acH +xbv acH acH fuM @@ -38772,7 +40395,7 @@ acH acH acH acH -acH +qhn acH acH acH @@ -38795,7 +40418,7 @@ axS acH acH acH -acH +xbv acH acH aQK @@ -38866,19 +40489,19 @@ aUZ aUZ aUZ aUZ -aha +myr aej acH acH +lVJ acH +qhn acH acH acH acH acH -acH -acH -acH +xfm acH acH fuM @@ -38936,6 +40559,8 @@ aAd acH acH acH +qhn +cLb acH acH acH @@ -38946,9 +40571,7 @@ acH acH acH acH -acH -acH -acH +vmQ acH acH acH @@ -39029,12 +40652,12 @@ aej acH acH acH +xbv acH +sGC acH acH -acH -acH -acH +xbv acH acH acH @@ -39060,14 +40683,14 @@ aPy aPy atd aMk -aus +eEr amj aej acH acH acH acH -acH +qhn acH acH acH @@ -39109,7 +40732,7 @@ aJu aJu fua fua -acH +ujO acH acH aAd @@ -39121,7 +40744,7 @@ acH acH acH acH -acH +sGC acH acH acH @@ -39136,7 +40759,7 @@ acH acH acH acH -acH +bKm acH acH acH @@ -39184,7 +40807,7 @@ acH acH acH acH -acH +xbv acH aQK aBK @@ -39220,19 +40843,19 @@ fRp jTt fRp aej +lVJ acH acH acH acH acH +mUB acH acH +mUB acH acH -acH -acH -acH -acH +xbv acH aAd aAd @@ -39254,7 +40877,7 @@ aGv awC atU ajq -aus +eEr amn aej acH @@ -39304,19 +40927,19 @@ aAU ayu fua acH -acH +vLd acH acH acH aAd +hkW acH acH +cLb acH acH acH -acH -acH -acH +tVf acH acH acH @@ -39326,15 +40949,15 @@ aAd aAd acH acH +qhn acH acH +xbv acH acH acH acH -acH -acH -acH +cLb acH acH acH @@ -39419,7 +41042,7 @@ acH acH acH acH -acH +sGC acH acH acH @@ -39448,7 +41071,7 @@ axX aOu arl ajq -aus +eEr amn aej acH @@ -39499,7 +41122,7 @@ afw fua acH acH -acH +pat acH acH aAd @@ -39507,8 +41130,8 @@ aAd aAd acH aAd -aAd -acH +bJt +qgy aAd aAd aAd @@ -39569,7 +41192,7 @@ aXj (63,1,1) = {" axS acH -acH +xbv acH acH acH @@ -39610,16 +41233,16 @@ fRp aej acH acH +mUB acH acH acH acH acH acH +xbv acH -acH -acH -acH +mUB acH acH aAd @@ -39642,7 +41265,7 @@ ayT ayT aMk aMk -aus +eEr amn aAF vCA @@ -39694,18 +41317,18 @@ fua acH acH acH -acH +xbv acH acH acH aAd aAd aAd +pat acH -acH -acH +vLd aAd -acH +jrR acH acH acH @@ -39720,7 +41343,7 @@ aAd acH acH acH -acH +qhn acH acH aAd @@ -39768,7 +41391,7 @@ acH acH acH acH -aQK +bJk aBK aus aus @@ -39808,7 +41431,7 @@ acH acH acH acH -acH +xbv acH acH acH @@ -39836,7 +41459,7 @@ aQk aTo aSK apE -aus +eEr aus apa aIA @@ -39889,14 +41512,14 @@ acH aQK aQK aQK +msd aQK aQK aQK aQK aQK aQK -aQK -aQK +jUD aQK aQK aQK @@ -39924,7 +41547,7 @@ acH acH acH acH -acH +xbv acH acH acH @@ -40030,7 +41653,7 @@ xLz pjG jWh msZ -glL +wvs glL diY dSP @@ -40153,7 +41776,7 @@ axS acH acH acH -acH +xbv acH acH aQK @@ -40191,6 +41814,7 @@ fRp fRp aej acH +mUB acH acH acH @@ -40200,8 +41824,7 @@ acH acH acH acH -acH -acH +xbv acH acH aAd @@ -40296,7 +41919,7 @@ aus amj aej acH -acH +qhn acH aAd aAd @@ -40499,12 +42122,12 @@ aAd acH acH acH +xbv acH acH acH acH -acH -acH +xbv acH acH acH @@ -40684,7 +42307,7 @@ lxt lxt amn aej -acH +qhn acH acH acH @@ -41074,7 +42697,7 @@ amn aej acH acH -acH +xbv aAd acH aAd @@ -41082,7 +42705,7 @@ acH acH acH acH -acH +xbv acH acH acH @@ -41124,7 +42747,7 @@ acH acH acH acH -acH +xbv acH aQK aBK @@ -41245,7 +42868,7 @@ wce aMM acH acH -acH +sGC adx aus eor @@ -41345,7 +42968,7 @@ aus amn aAF acH -acH +gFD acH aAd aAd @@ -41828,7 +43451,7 @@ aYE auU cnu cnu -adx +ogS aus avE uQv @@ -41899,7 +43522,7 @@ axS acH acH acH -acH +xbv acH acH aQK @@ -41929,11 +43552,11 @@ apX acH acH acH +qgy acH +cLb acH -acH -acH -acH +qgy acH acH acH @@ -42043,7 +43666,7 @@ aqt amn aej acH -acH +lVJ aAd acH acH @@ -42315,7 +43938,7 @@ aQK acH acH acH -acH +soe acH acH acH @@ -42483,6 +44106,7 @@ acH acH acH acH +xbv acH acH acH @@ -42492,11 +44116,14 @@ acH acH acH acH +xbv acH acH +qgy acH acH acH +xbv acH acH acH @@ -42506,16 +44133,12 @@ acH acH acH acH +qgy acH acH acH acH -acH -acH -acH -acH -acH -acH +xbv acH acH acH @@ -42691,14 +44314,17 @@ acH acH acH acH +xbv acH acH acH acH acH acH +xbv acH acH +xbv acH acH acH @@ -42708,10 +44334,7 @@ acH acH acH acH -acH -acH -acH -acH +xbv acH aQK aBK @@ -42889,9 +44512,12 @@ acH acH acH acH +xbv acH +qgy acH acH +qgy acH acH acH @@ -42899,10 +44525,7 @@ acH acH acH acH -acH -acH -acH -acH +lVJ acH acH acH @@ -43073,20 +44696,26 @@ acH acH acH acH +xbv acH acH acH +xbv acH acH acH acH acH acH +qgy acH +qhn +qhn acH acH acH acH +xbv acH acH acH @@ -43096,12 +44725,6 @@ acH acH acH acH -acH -acH -acH -acH -acH -aQK aBK aus aus @@ -43261,6 +44884,7 @@ acH acH acH acH +xbv acH acH acH @@ -43273,29 +44897,28 @@ acH acH acH acH +xbv acH acH +qgy acH acH +qgy acH +qhn acH acH acH acH acH acH +xbv acH acH acH +xbv acH acH -acH -acH -acH -acH -acH -acH -aQK aBK aus aus @@ -43473,8 +45096,10 @@ acH acH acH acH +xbv acH acH +xbv acH acH acH @@ -43488,8 +45113,6 @@ acH acH acH acH -acH -aQK aBK aus aus @@ -43648,17 +45271,22 @@ acH acH acH acH +xbv acH acH acH +xbv acH +qgy acH acH acH acH +xbv acH acH acH +pat acH acH acH @@ -43668,6 +45296,7 @@ acH acH acH acH +xbv acH acH acH @@ -43678,12 +45307,6 @@ acH acH acH acH -acH -acH -acH -acH -acH -aQK aBK aus aus @@ -43868,6 +45491,7 @@ acH acH acH acH +uuE acH acH acH @@ -43877,7 +45501,6 @@ acH acH acH acH -aQK aBK aus aus @@ -44034,12 +45657,14 @@ acH acH acH acH +xbv acH acH acH acH acH acH +xbv acH acH acH @@ -44048,30 +45673,28 @@ acH acH acH acH +xbv acH acH acH acH acH +xbv acH acH acH +qgy acH acH acH +sDl acH acH +qgy acH acH acH acH -acH -acH -acH -acH -acH -acH -aQK aBK aus aus @@ -44237,6 +45860,8 @@ acH acH acH acH +afq +afq acH acH acH @@ -44250,6 +45875,7 @@ acH acH acH acH +qhn acH acH acH @@ -44263,9 +45889,6 @@ acH acH acH acH -acH -acH -aQK aBK aus aus @@ -44305,7 +45928,7 @@ aUu aUu aWz aej -acH +jrR pOJ abu dvT @@ -44425,11 +46048,15 @@ acH acH acH acH +qgy acH acH acH acH acH +afq +afq +afq acH acH acH @@ -44438,28 +46065,24 @@ acH acH acH acH +xbv acH acH acH acH +uuE acH acH +xbv acH +uuE acH acH acH +uuE acH acH acH -acH -acH -acH -acH -acH -acH -acH -acH -aQK aBK aus aus @@ -44498,7 +46121,7 @@ ayc aUu ary aej -acH +qhn acH pOJ yfM @@ -44618,16 +46241,20 @@ acH acH acH acH +xbv acH acH acH acH acH acH +afq +afq acH acH acH acH +xbv acH acH acH @@ -44650,10 +46277,6 @@ acH acH acH acH -acH -acH -acH -aQK ays aus aus @@ -44818,6 +46441,8 @@ acH acH acH acH +afq +afq acH acH acH @@ -44825,24 +46450,22 @@ acH acH acH acH +qgy acH acH acH acH acH +qgy acH acH acH acH +xbv acH acH acH -acH -acH -acH -acH -acH -acH +sDl acH acH acH @@ -44863,7 +46486,6 @@ aej acH aAd aAd -acH afk aPZ aUZ @@ -44880,6 +46502,7 @@ aUZ aUZ aUZ aUZ +aUZ aha acF aIA @@ -45003,6 +46626,7 @@ axS acH acH acH +xbv acH acH acH @@ -45016,21 +46640,20 @@ acH acH acH acH +pat acH acH acH acH acH acH +xbv acH acH acH acH acH -acH -acH -acH -acH +lVJ acH acH acH @@ -45056,8 +46679,9 @@ aQK acH acH aAd -aAd -adx +aId +aus +aus aus aus aus @@ -45065,16 +46689,15 @@ aus aus aus aus -amD -urI -urI -amD -amD -amD -amD -aZB -awp aus +jBb +glL +glL +glL +glL +glL +glL +gcu amj acF aIA @@ -45203,8 +46826,10 @@ acH acH acH acH +xbv acH acH +qgy acH acH acH @@ -45237,38 +46862,36 @@ acH acH acH acH +xbv acH acH acH +uuE acH acH +xbv acH -acH -acH -acH -acH -acH -acH -aAd +uvz aAd -adx +aId +aus +aus aus aus aus aus aus -amh -amE -ayS -arB -atM -aCE -ayS -azg -aAO -aFp -awp aus +amD +dNn +eEz +ayS +amD +amD +amD +amD +amD +eEr amn acF aIA @@ -45403,66 +47026,66 @@ acH acH acH acH +qgy acH acH acH acH acH +xbv acH acH acH acH acH +qgy acH acH acH +gFD acH +qgy acH acH acH acH acH acH +qgy acH +qgy acH acH +vLd acH +xfm acH +soe acH +qgy acH +mUB acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -aAd aAd -adx +aId +aus +aus +aus aus aus aus -aaM -bfN -bfN -aop -apk -arO -aue -avh -avZ -aAf -aAP -anA -awp aus +amD +amD +jhF +ufh +amD +bgH +tAd +aAO +jsT +awp +eEr amn acF aIA @@ -45604,6 +47227,7 @@ acH acH acH acH +qgy acH acH acH @@ -45614,49 +47238,48 @@ acH acH acH acH +jhj acH acH acH +sDl acH acH acH acH acH acH +uuE acH acH +xbv acH +qgy acH acH -acH -acH -acH -acH -acH -acH -acH +uuE acH aAd aAd -aAd -adx +aId +aus +aus aus aus -aaM -aop -akJ -auh -aop -aNX -aqP -aqP -aKM -ayS -aAk -aBY -aGh -ayS aus +aus +dFH +amD +amD +jhF +otK +sQd +ekN +ivj +ugY +gwB +awp +eEr amn cbG aIA @@ -45782,12 +47405,16 @@ acH acH acH acH +xbv acH acH acH acH +xbv acH +qgy acH +pat acH acH acH @@ -45800,57 +47427,53 @@ acH acH acH acH +cLb acH acH acH acH acH acH +aAd acH acH acH acH acH acH +qgy acH acH +qgy acH +qgy acH +gbA acH acH acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -aAd +soe aAd aAd -adx -aus +aId aus -bfN -ahI -akV -amk -anz -aSl -aqP -lZF -avt -axq -aAo -aCV -aEC -alR -glL +amD +ayS +urI +urI +urI +amD +amD +ayS +oPq +gvh +ayS +amD +avZ +fIk +nlg +amD +tsO glL qEh dSP @@ -45999,51 +47622,51 @@ acH acH acH acH +aAd +aAd +aAd acH +aAd acH acH acH acH acH acH +khK acH acH acH acH +xfm acH +xfm acH +khK acH -acH -acH -acH -acH -acH -acH -acH -acH -acH +qhn acH acH aAd aAd -acH -adx -aus +aNk aus -bfN -ass -alq -amm -anR -aWI -aqP -aqP -dgX -hsD -fFL -giX -eoM -jLf +ayS +ayS +cVB +xKI +bkq +kRm +uwP +tgx +gRm +rvp +tSQ +amD +nmw +aQe +gwB +awp aus aus aNG @@ -46178,10 +47801,12 @@ acH acH acH acH +qgy acH acH acH acH +xbv acH acH acH @@ -46190,12 +47815,15 @@ acH acH acH acH +aAd +aAd acH acH acH acH acH acH +qgy acH acH acH @@ -46205,39 +47833,34 @@ acH acH acH acH +xbv acH acH acH acH acH -acH -acH -acH -acH -acH -acH -acH -acH +mUB +jhj aAd aAd -acH -adx -aus +aNk aus -aaM -aop -alU -auK -aop -aXm -aqP -aqP -nyL -ayS -hDa -aAk -pem -ayS +urI +urI +slN +hYq +enP +doW +dRG +hYq +oqd +iRy +huS +fTc +hIh +dXR +gwB +awp aus amn hPQ @@ -46370,6 +47993,7 @@ acH acH acH acH +qgy acH acH acH @@ -46390,8 +48014,7 @@ acH acH acH acH -acH -acH +lVJ acH acH acH @@ -46414,23 +48037,23 @@ aAd aAd aAd aAd -acH -adx -aus -aus +aNk aus -aaM -bfN -bfN -aop -aqR -baX -aue -cCj -rFB -dph -aQe -anA +urI +urI +ozQ +dqU +vfp +mlu +sjx +mQw +oMK +qwS +jrm +amD +web +uWR +gwB awp aus amn @@ -46572,6 +48195,7 @@ acH acH acH acH +ajp acH acH acH @@ -46584,8 +48208,7 @@ acH acH acH acH -acH -acH +qgy acH acH acH @@ -46608,23 +48231,23 @@ aAd aAd aAd aAd -acH -adx -aus -aus +vrq aus -aus -aus -aus -auL ayS -bPD -psu -haO -wCu -iXB +ayS +lNU +luX +luX +fxf +iKt +ybK +puC +bGE +aov +peo +kjF aDH -aGe +gwB awp aus amn @@ -46766,14 +48389,14 @@ acH acH afq afq +ajp +ajp +ajp acH acH acH acH -acH -acH -acH -acH +xbv acH acH acH @@ -46802,26 +48425,26 @@ acH acH acH acH -acH -adx -aus -aus -aus -aus -aus -aus +aNk aus amD +ayS +amD urI urI amD +aaM +aaM +aaM +sGd +aaM +aaM amD +frm +vCa amD -amD -aZB -awp aus -atI +amn aej acH acH @@ -46963,15 +48586,15 @@ afq afq afq afq +ajp +ajp +ajp acH acH acH acH acH -acH -acH -acH -acH +qgy acH acH acH @@ -46985,40 +48608,40 @@ aVw aej acH acH +xbv acH acH acH acH acH +qhn acH acH acH -acH -acH -acH -acH -acH -aiL -aIM -aTN -aTN -aTN -aTN -aTN -aTN -aTN -aTN -aTN -aTN -aTN -aTN -aTN -aTN -aGj +nbh +aNk +aus +aus +aus +aus +aus +aus +aus +dkS +cdU +deN +dOC +iRe +aaM +frm +djI +awp +aus +aus +amn aej acH acH -acH fam ptn qcL @@ -47159,7 +48782,7 @@ afq afq afq afq -acH +ajp acH acH acH @@ -47178,40 +48801,40 @@ aVw aVw aej acH +oiE acH +vLd acH +vLd acH acH acH acH +xbv acH acH -acH -acH -acH -acH -acH -acH -acH -aQK -aQK -aQK -aQK -aQK -aQK -aQK -aQK -aQK -aQK -aQK -aQK -aQK -aQK -aQK -acH -acH -acH -acH +aNk +aus +aus +aus +aus +aus +aus +aus +dkS +bsQ +bGu +xXL +eur +wOD +djI +awp +aus +aus +aus +amn +aej +jrR acH fam bSx @@ -47376,35 +48999,35 @@ acH acH acH acH +xfm acH acH +vLd acH acH acH acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH +aNk +aus +aus +aus +aus +aus +aus +aus +aaM +aaM +aaM +aaM +aaM +inC +awp +aus +aus +aus +aus +iCo +aej acH acH fam @@ -47572,32 +49195,32 @@ acH acH acH acH +xbv acH acH acH +vLd acH acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH +aiL +aIM +aTN +aTN +aTN +aTN +aTN +aTN +aTN +aTN +aTN +aTN +aTN +aTN +aTN +aTN +aTN +aGj +aej acH acH acH @@ -47773,6 +49396,7 @@ acH acH acH acH +xbv acH acH acH @@ -47782,6 +49406,7 @@ acH acH acH acH +qhn acH acH acH @@ -47792,8 +49417,6 @@ acH acH acH acH -afq -afq aqG aqW aqW @@ -47972,6 +49595,14 @@ acH acH acH acH +xbv +acH +acH +acH +acH +acH +acH +acH acH acH acH @@ -47980,14 +49611,6 @@ acH acH acH acH -afq -afq -afq -afq -afq -afq -afq -afq aqG acH aqW @@ -48163,7 +49786,7 @@ acH acH acH acH -acH +qhn acH acH acH @@ -48173,6 +49796,8 @@ afq afq acH acH +acH +acH afq afq afq @@ -48180,9 +49805,7 @@ afq afq afq afq -afq -afq -aqG +acH aqG aqW jPH @@ -48376,7 +49999,7 @@ afq afq afq afq -afq +acH aqG aqW bjm @@ -48570,7 +50193,7 @@ afq afq afq afq -afq +acH aqG aqW aqW @@ -48764,7 +50387,7 @@ ajp ajp afq afq -afq +acH aqG aqG aqG diff --git a/maps/rift/levels/rift-09-west_caves.dmm b/maps/rift/levels/rift-09-west_caves.dmm index c2f3a5d7f964..160ac2801166 100644 --- a/maps/rift/levels/rift-09-west_caves.dmm +++ b/maps/rift/levels/rift-09-west_caves.dmm @@ -410,6 +410,12 @@ /obj/machinery/light/small{ dir = 1 }, +/obj/item/paper{ + info = "Hi, Abby. Thank you for reaching out. The general, simplified outline for the geothermal generator is as such; using the items on hand (two scanner arrays, four cable coils), you are able to craft an Advanced Geothermal Scanning Array. After putting it into the machine, simply use the provided multitool to put it in motion! You'll then be able to activate the SMES and restore powerflow. If you're having trouble finding the aforementioned supplies, make sure to look around!"; + name = "geothermal instructions"; + pixel_x = 6; + pixel_y = -7 + }, /turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors, /area/rift/geothermal) "eQ" = ( @@ -3721,9 +3727,7 @@ /obj/item/tool/screwdriver, /obj/item/stack/cable_coil, /obj/item/stock_parts/scanning_module, -/obj/item/stock_parts/scanning_module{ - name = "Craft me!" - }, +/obj/item/stock_parts/scanning_module, /turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors, /area/rift/geothermal) "Sc" = ( @@ -30560,7 +30564,7 @@ cU Cc pt pt -pt +Cc Cc EI EI @@ -30754,7 +30758,7 @@ cU Cc pt pt -pt +Cc Cc Cc Cc diff --git a/maps/rift/levels/rift-10-west_plains.dmm b/maps/rift/levels/rift-10-west_plains.dmm index 02c0b954d93a..4873dce7c6cf 100644 --- a/maps/rift/levels/rift-10-west_plains.dmm +++ b/maps/rift/levels/rift-10-west_plains.dmm @@ -89,6 +89,12 @@ }, /turf/simulated/floor/reinforced/airless, /area/rnd/outpost/chamber) +"aJ" = ( +/obj/structure/flora/rock/ice{ + pixel_y = 12 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/west) "aL" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -354,6 +360,13 @@ /obj/structure/closet/crate/radiation, /turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors, /area/rift/facility/exterior/shuttle) +"bV" = ( +/obj/structure/flora/grass/both{ + pixel_x = -5; + pixel_y = -4 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/west) "bW" = ( /obj/machinery/light/small{ dir = 8 @@ -423,6 +436,9 @@ }, /turf/simulated/floor/tiled/steel/lythios43c, /area/rift/facility/interior/surface) +"cj" = ( +/turf/simulated/wall/wood/hardwood, +/area/rift/surfacebase/outside/west) "ck" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -707,6 +723,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled/white, /area/rnd/outpost/heating) +"dk" = ( +/obj/structure/girder, +/turf/simulated/floor/wood/lythios43c, +/area/rift/surfacebase/outside/west) "dl" = ( /obj/structure/lattice, /turf/simulated/open/lythios43c, @@ -1032,6 +1052,12 @@ }, /turf/simulated/open, /area/rnd/outpost) +"eO" = ( +/obj/structure/flora/ausbushes/brflowers{ + pixel_y = 14 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/west) "eT" = ( /obj/effect/overlay/snow/floor/pointy{ dir = 8 @@ -1265,6 +1291,10 @@ }, /turf/simulated/floor/tiled/steel_dirty/lythios43c, /area/construction/solars) +"gd" = ( +/obj/structure/flora/tree/pine, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/west) "gf" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -1477,6 +1507,12 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/tiled/steel_dirty/lythios43c, /area/construction/solars) +"gR" = ( +/obj/structure/flora/grass/green{ + pixel_x = -13 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/west) "gS" = ( /obj/machinery/atmospherics/component/unary/heat_exchanger, /obj/structure/window/basic, @@ -1561,18 +1597,9 @@ /turf/simulated/floor/tiled, /area/rnd/outpost) "hi" = ( -/obj/structure/window/wooden{ - dir = 1 - }, -/obj/structure/window/wooden{ - dir = 4 - }, -/obj/structure/window/wooden, -/obj/structure/window/wooden{ - dir = 5 - }, +/obj/structure/flora/grass/green, /turf/simulated/floor/outdoors/snow/lythios43c, -/area/rift/exterior/nuketown) +/area/rift/surfacebase/outside/west) "hj" = ( /turf/simulated/floor/tiled/techfloor/grid/lythios43c/indoors, /area/rift/exterior/checkpoint/south) @@ -1672,7 +1699,7 @@ /turf/simulated/floor/reinforced/airless, /area/rnd/outpost/chamber) "hD" = ( -/obj/structure/simple_door, +/obj/structure/simple_door/wood, /turf/simulated/floor/lythios43c/indoors, /area/rift/exterior/nuketown/bunker) "hF" = ( @@ -1812,6 +1839,13 @@ /obj/random/trash_pile, /turf/simulated/floor/tiled/monotile, /area/rift/exterior/nuketown/interior) +"ih" = ( +/obj/structure/flora/ausbushes/lavendergrass{ + pixel_x = 2; + pixel_y = 12 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/west) "ik" = ( /obj/effect/overlay/snow/floor, /obj/structure/table, @@ -1884,6 +1918,9 @@ }, /turf/simulated/floor/outdoors/snow/lythios43c, /area/rift/exterior/nuketown) +"iF" = ( +/turf/simulated/floor/outdoors/safeice/lythios43c, +/area/rift/surfacebase/outside/west) "iG" = ( /obj/machinery/atmospherics/pipe/tank/air, /turf/simulated/floor, @@ -2265,6 +2302,10 @@ }, /turf/simulated/floor, /area/construction/solarscontrol) +"kq" = ( +/obj/structure/flora/grass/both, +/turf/simulated/floor/outdoors/snow/lythios43c/indoors, +/area/rift/surfacebase/outside/west) "kr" = ( /obj/effect/floor_decal/borderfloor{ dir = 9 @@ -2564,6 +2605,10 @@ "lK" = ( /turf/simulated/mineral/icerock/lythios43c, /area/rift/facility/exterior) +"lL" = ( +/obj/structure/flora/grass/both, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/west) "lM" = ( /obj/structure/fence/cut/large{ dir = 4 @@ -2748,6 +2793,11 @@ }, /turf/simulated/floor/tiled/steel_dirty/lythios43c, /area/construction/solars) +"mK" = ( +/obj/effect/floor_decal/rust, +/obj/structure/railing, +/turf/simulated/floor/tiled/steel_dirty/lythios43c, +/area/rift/surfacebase/outside/west) "mL" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/machinery/light{ @@ -2999,6 +3049,10 @@ }, /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab) +"nV" = ( +/obj/structure/flora/ausbushes/ywflowers, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/west) "nX" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -3092,19 +3146,10 @@ /turf/simulated/floor/outdoors/snow/lythios43c, /area/rift/facility/exterior) "ov" = ( -/obj/structure/window/wooden{ - dir = 8 - }, -/obj/structure/window/wooden{ - dir = 4 - }, /obj/structure/window/wooden{ dir = 1 }, -/obj/structure/window/wooden{ - dir = 9 - }, -/turf/simulated/floor/outdoors/snow/lythios43c, +/turf/simulated/wall/wood, /area/rift/exterior/nuketown) "ox" = ( /obj/machinery/atmospherics/component/binary/pump{ @@ -3131,6 +3176,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled, /area/rnd/outpost) +"oE" = ( +/obj/structure/metal_edge, +/turf/simulated/open/lythios43c, +/area/rift/surfacebase/outside/west) "oG" = ( /obj/structure/bonfire/permanent, /turf/simulated/mineral/floor/icerock/lythios43c/indoors/ignore_cavegen, @@ -3315,6 +3364,10 @@ }, /turf/simulated/floor/tiled, /area/rnd/outpost) +"pA" = ( +/obj/structure/flora/grass/brown, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/exterior/nuketown) "pD" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/black{ dir = 1 @@ -3508,6 +3561,13 @@ /obj/effect/overlay/snow/floor, /turf/simulated/floor/reinforced/lythios43c, /area/rift/facility/exterior) +"qu" = ( +/obj/machinery/light/flamp/noshade{ + layer = 4; + pixel_y = 17 + }, +/turf/simulated/floor/plating/lythios43c, +/area/rift/surfacebase/outside/west) "qv" = ( /obj/machinery/appliance/cooker/oven, /obj/machinery/light/small, @@ -3557,6 +3617,10 @@ /obj/effect/overlay/snow/floor, /turf/simulated/floor/lythios43c/indoors, /area/rift/facility/interior/surface) +"qN" = ( +/obj/structure/flora/ausbushes/ywflowers, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/exterior/nuketown) "qO" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -3730,6 +3794,10 @@ }, /turf/simulated/floor, /area/construction/solarscontrol) +"ry" = ( +/obj/structure/flora/ausbushes/lavendergrass, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/west) "rE" = ( /obj/structure/extinguisher_cabinet{ dir = 1; @@ -4032,20 +4100,9 @@ /turf/simulated/floor/tiled, /area/rnd/outpost) "sW" = ( -/obj/structure/window/wooden{ - dir = 1 - }, -/obj/structure/window/wooden{ - dir = 4 - }, -/obj/structure/window/wooden{ - dir = 8 - }, -/obj/structure/window/wooden{ - dir = 5 - }, +/obj/structure/flora/grass/brown, /turf/simulated/floor/outdoors/snow/lythios43c, -/area/rift/exterior/nuketown) +/area/rift/facility/exterior) "sX" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -4149,18 +4206,9 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab) "ts" = ( -/obj/structure/window/wooden{ - dir = 1 - }, -/obj/structure/window/wooden, -/obj/structure/window/wooden{ - dir = 8 - }, -/obj/structure/window/wooden{ - dir = 5 - }, +/obj/structure/flora/tree/dead, /turf/simulated/floor/outdoors/snow/lythios43c, -/area/rift/exterior/nuketown) +/area/rift/facility/exterior) "tt" = ( /obj/machinery/portable_atmospherics/canister/empty/carbon_dioxide, /obj/machinery/atmospherics/pipe/simple/visible/black, @@ -4205,15 +4253,9 @@ /turf/simulated/floor, /area/rnd/outpost/anomaly_lab/storage) "tF" = ( -/obj/structure/window/wooden{ - dir = 1 - }, -/obj/structure/window/wooden, -/obj/structure/window/wooden{ - dir = 5 - }, +/obj/structure/flora/grass/brown, /turf/simulated/floor/outdoors/snow/lythios43c, -/area/rift/exterior/nuketown) +/area/rift/surfacebase/outside/west) "tG" = ( /turf/simulated/floor/tiled/techfloor/grid/lythios43c/indoors, /area/rift/facility/exterior) @@ -4371,14 +4413,7 @@ /obj/structure/window/wooden{ dir = 4 }, -/obj/structure/window/wooden{ - dir = 1 - }, -/obj/structure/window/wooden, -/obj/structure/window/wooden{ - dir = 5 - }, -/turf/simulated/floor/outdoors/snow/lythios43c, +/turf/simulated/wall/wood, /area/rift/exterior/nuketown) "uz" = ( /obj/structure/window/reinforced{ @@ -4829,6 +4864,13 @@ "wu" = ( /turf/simulated/wall, /area/rift/exterior/nuketown/interior) +"ww" = ( +/obj/structure/flora/ausbushes/sparsegrass{ + pixel_x = 19; + pixel_y = 13 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/west) "wy" = ( /obj/machinery/atmospherics/pipe/simple/visible/supply{ dir = 6 @@ -5135,6 +5177,12 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor, /area/rnd/outpost/heating) +"xA" = ( +/obj/structure/flora/ausbushes/fullgrass{ + pixel_x = -8 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/west) "xB" = ( /obj/effect/floor_decal/industrial/outline/red, /turf/simulated/floor, @@ -5284,6 +5332,10 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/outpost/mixing) +"yo" = ( +/obj/structure/flora/grass/both, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/exterior/nuketown) "yp" = ( /obj/machinery/door/firedoor/border_only{ req_one_access = list(18,47) @@ -5692,6 +5744,12 @@ /obj/structure/fence/door/locked, /turf/simulated/floor/tiled/techfloor/grid/lythios43c/indoors, /area/rift/exterior/checkpoint/south) +"Al" = ( +/obj/structure/flora/ausbushes/pointybush{ + pixel_y = 12 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/west) "Ao" = ( /obj/machinery/power/apc/south_mount, /obj/structure/cable/green, @@ -5721,6 +5779,13 @@ /obj/fiftyspawner/steel, /turf/simulated/floor/tiled/white, /area/rnd/outpost/mixing) +"At" = ( +/obj/structure/flora/ausbushes/sparsegrass{ + pixel_x = 22; + pixel_y = 13 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/west) "Az" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -5968,6 +6033,11 @@ }, /turf/simulated/floor/tiled, /area/rnd/outpost) +"BT" = ( +/obj/structure/railing, +/obj/structure/flora/tree/pine, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/west) "BV" = ( /turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors, /area/rift/facility/interior/surface) @@ -6257,17 +6327,9 @@ /turf/simulated/floor/tiled/steel_dirty/lythios43c, /area/rift/surfacebase/outside/west) "Dy" = ( -/obj/structure/window/wooden{ - dir = 4 - }, -/obj/structure/window/wooden{ - dir = 8 - }, -/obj/structure/window/wooden{ - dir = 5 - }, +/obj/structure/flora/tree/dead, /turf/simulated/floor/outdoors/snow/lythios43c, -/area/rift/exterior/nuketown) +/area/rift/surfacebase/outside/west) "DB" = ( /obj/structure/railing{ dir = 4 @@ -7185,6 +7247,14 @@ }, /turf/simulated/floor, /area/maintenance/substation/outpost) +"Ic" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/ausbushes/sparsegrass{ + pixel_x = 19; + pixel_y = 13 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/west) "If" = ( /obj/structure/railing{ dir = 4 @@ -7441,6 +7511,10 @@ "Jv" = ( /turf/simulated/shuttle/wall/voidcraft/hard_corner, /area/rift/facility/interior/elevator) +"Jw" = ( +/obj/structure/table/woodentable, +/turf/simulated/floor/wood/lythios43c, +/area/rift/surfacebase/outside/west) "Jx" = ( /turf/simulated/wall, /area/rnd/outpost/testing_lab) @@ -8096,6 +8170,14 @@ }, /turf/simulated/floor/tiled/monotile, /area/rnd/outpost/anomaly_lab) +"MA" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/ausbushes/sparsegrass{ + pixel_x = 22; + pixel_y = 13 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/west) "MB" = ( /obj/machinery/door/airlock/science{ name = "Toxins Storage" @@ -8193,6 +8275,10 @@ }, /turf/simulated/floor/tiled, /area/rnd/outpost/testing_lab) +"MW" = ( +/obj/structure/metal_edge, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/west) "MX" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -8443,18 +8529,12 @@ /turf/simulated/floor/tiled/steel_dirty/lythios43c, /area/rift/surfacebase/outside/west) "Of" = ( -/obj/structure/window/wooden{ - dir = 8 - }, -/obj/structure/window/wooden{ - dir = 4 - }, -/obj/structure/window/wooden, -/obj/structure/window/wooden{ - dir = 9 +/obj/structure/flora/grass/brown{ + pixel_x = 11; + pixel_y = 10 }, /turf/simulated/floor/outdoors/snow/lythios43c, -/area/rift/exterior/nuketown) +/area/rift/surfacebase/outside/west) "Og" = ( /obj/structure/girder, /obj/effect/overlay/snow/floor, @@ -8848,6 +8928,14 @@ }, /turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors, /area/rift/facility/interior/elevator) +"PV" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/west) +"Qb" = ( +/obj/structure/flora/rock/ice/alternative_2, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/west) "Qe" = ( /obj/machinery/atmospherics/portables_connector{ dir = 4 @@ -9213,6 +9301,13 @@ /obj/item/reagent_containers/dropper, /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab) +"RM" = ( +/obj/structure/flora/grass/both{ + pixel_x = 10; + pixel_y = 10 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/west) "RO" = ( /obj/structure/table/standard, /obj/item/clothing/gloves/yellow, @@ -9794,10 +9889,8 @@ /turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors, /area/rift/facility/exterior/shuttle) "Ui" = ( -/obj/machinery/door/firedoor{ - dir = 8 - }, -/turf/simulated/mineral/icerock/lythios43c, +/obj/structure/girder/displaced, +/turf/simulated/floor/outdoors/snow/lythios43c, /area/rift/surfacebase/outside/west) "Uj" = ( /obj/structure/closet/firecloset, @@ -9922,6 +10015,12 @@ /obj/machinery/light/small, /turf/simulated/floor/tiled/steel_dirty/lythios43c, /area/rift/surfacebase/outside/west) +"UR" = ( +/obj/structure/flora/ausbushes/ywflowers{ + pixel_x = 8 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/west) "UT" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -10014,6 +10113,20 @@ }, /turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors, /area/rift/facility/exterior/shuttle) +"Vn" = ( +/turf/simulated/floor/wood/lythios43c, +/area/rift/surfacebase/outside/west) +"Vo" = ( +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 8 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/effect/floor_decal/rust, +/obj/structure/railing, +/turf/simulated/floor/tiled/steel_dirty/lythios43c, +/area/rift/surfacebase/outside/west) "Vw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -10133,18 +10246,11 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/testing_lab) "Wp" = ( -/obj/structure/window/wooden{ - dir = 4 - }, -/obj/structure/window/wooden, -/obj/structure/window/wooden{ - dir = 8 - }, -/obj/structure/window/wooden{ - dir = 5 +/obj/structure/flora/grass/brown{ + pixel_y = 10 }, /turf/simulated/floor/outdoors/snow/lythios43c, -/area/rift/exterior/nuketown) +/area/rift/surfacebase/outside/west) "Wt" = ( /obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary{ frequency = 1452; @@ -10229,6 +10335,13 @@ }, /turf/simulated/open/lythios43c, /area/outpost/mining_main/outpost) +"WL" = ( +/obj/effect/floor_decal/rust, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_dirty/lythios43c, +/area/rift/surfacebase/outside/west) "WO" = ( /obj/machinery/atmospherics/pipe/simple/visible/red, /turf/simulated/floor/tiled/white, @@ -10239,6 +10352,10 @@ }, /turf/simulated/floor, /area/rnd/outpost/atmos) +"WQ" = ( +/obj/structure/flora/ausbushes/ppflowers, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/west) "WS" = ( /obj/machinery/fire_alarm/east_mount, /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -10718,6 +10835,13 @@ }, /turf/simulated/floor/wood/lythios43c, /area/rift/exterior/nuketown/interior) +"Ze" = ( +/obj/structure/flora/grass/brown{ + pixel_x = 11; + pixel_y = 10 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/exterior/nuketown) "Zg" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -10782,6 +10906,14 @@ "Zu" = ( /turf/simulated/wall/r_wall, /area/rift/exterior/nuketown/bunker) +"Zv" = ( +/obj/structure/flora/rock/ice/alternative_1, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/west) +"Zx" = ( +/obj/structure/table, +/turf/simulated/floor/wood/lythios43c, +/area/rift/surfacebase/outside/west) "ZA" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 @@ -14266,7 +14398,7 @@ Rs Rs Rs Rs -Rs +sW Rs Rs Rs @@ -14893,10 +15025,10 @@ sv sv sv sv +iF sv sv -sv -sv +iF sv sv sv @@ -15078,19 +15210,19 @@ sv sv sv sv +gd sv sv sv sv sv +hi sv -sv -sv -sv -sv -sv -sv -sv +iF +iF +iF +iF +iF sv sv sv @@ -15281,9 +15413,9 @@ sv sv sv sv -sv -sv -sv +iF +iF +iF sv sv sv @@ -15462,6 +15594,7 @@ sv sv sv sv +gd sv sv sv @@ -15473,12 +15606,11 @@ sv sv sv sv -sv -sv -sv -sv -sv -sv +iF +iF +iF +hi +iF sv sv sv @@ -15641,6 +15773,7 @@ lK sv sv sv +Dy sv sv sv @@ -15659,6 +15792,7 @@ sv sv sv sv +hi sv sv sv @@ -15668,11 +15802,9 @@ sv sv sv sv +iF sv -sv -sv -sv -sv +iF sv sv sv @@ -15835,14 +15967,17 @@ ka sv sv sv +Of sv sv sv sv +lL sv sv sv sv +hi sv sv sv @@ -15858,14 +15993,11 @@ sv sv sv sv +gd sv sv sv -sv -sv -sv -sv -sv +iF sv sv sv @@ -16226,6 +16358,7 @@ sv sv sv sv +tF sv sv sv @@ -16243,18 +16376,17 @@ sv sv sv sv +gd sv sv sv +hi sv sv sv sv sv -sv -sv -sv -sv +hi sv sv sv @@ -16584,7 +16716,7 @@ sr Rs Rs Rs -Rs +ts Rs Rs Rs @@ -16592,7 +16724,7 @@ Rs ho Rs Rs -Rs +sW Rs Rs Rs @@ -16605,7 +16737,7 @@ lK Rs Rs Rs -Rs +sW Rs ho sv @@ -16699,7 +16831,7 @@ PP PP PP PP -Ui +PP PP PP PP @@ -16811,7 +16943,7 @@ sv sv dQ sv -sv +tF sv sv sv @@ -16991,7 +17123,7 @@ lK Rs Rs Rs -Rs +ts Rs Rs Rs @@ -17000,7 +17132,7 @@ sv dQ sv sv -sv +tF sv sv sv @@ -17231,7 +17363,7 @@ sv sv sv sv -sv +gd sv sv sv @@ -17387,15 +17519,19 @@ ho sv sv sv +Dy sv sv sv +tF sv sv +lL sv sv sv sv +gd sv sv sv @@ -17417,6 +17553,7 @@ sv sv sv sv +gd sv sv sv @@ -17424,12 +17561,7 @@ sv sv sv sv -sv -sv -sv -sv -sv -sv +gd sv sv sv @@ -17572,7 +17704,7 @@ Rs Rs Rs Rs -Rs +sW Rs fz Rs @@ -17596,23 +17728,23 @@ sv sv sv sv +hi sv sv +gd sv sv sv +gd sv sv sv sv sv +hi sv sv -sv -sv -sv -sv -sv +hi sv sv sv @@ -17816,7 +17948,7 @@ dQ sv sv sv -sv +gd sv sv sv @@ -18001,7 +18133,7 @@ sv sv sv sv -sv +gd sv sv sv @@ -18173,11 +18305,11 @@ sv sv sv sv +gd sv sv sv -sv -sv +gd sv sv sv @@ -18777,14 +18909,14 @@ iV wu ed ed -ed +pA ed sS ed ed ed ed -ed +pA ed ed ed @@ -18951,7 +19083,7 @@ sv hB zA zA -tF +Xf ed ed ed @@ -18982,7 +19114,7 @@ ed ed ed ed -ed +pA ed ed ed @@ -19140,13 +19272,12 @@ sv sv sv sv -sv +gd sv Pi ds ds -hi -ed +Xf ed ed ed @@ -19155,6 +19286,7 @@ ed ed ed ed +qN ed sS ed @@ -19163,7 +19295,7 @@ sS sS ed ed -ed +pA ed sS ed @@ -19296,7 +19428,7 @@ Rs Rs Rs Rs -Rs +ts Rs Rs Rs @@ -19329,7 +19461,7 @@ sv sv sv sv -sv +gd sv sv sv @@ -19351,12 +19483,12 @@ ed ed ed sS -ed +pA ed sS sS ed -ed +Ze ed ed ed @@ -19380,7 +19512,7 @@ dA sv sv sv -sv +gd sv sv PP @@ -19526,7 +19658,7 @@ sv sv sv sv -sv +gd sv sv sv @@ -19761,7 +19893,7 @@ OH ed ed ed -ed +pA ed ed dA @@ -19769,7 +19901,7 @@ sv sv sv sv -sv +gd sv PP PP @@ -19909,7 +20041,7 @@ sv sv sv sv -sv +gd sv sv sv @@ -20087,7 +20219,7 @@ fz Rs Rs Rs -Rs +ts Rs Rs Rs @@ -20110,7 +20242,7 @@ cL sv sv sv -sv +gd sv rj ed @@ -20146,7 +20278,7 @@ jq jq TD sP -ed +pA ed ed ed @@ -20156,7 +20288,7 @@ dA sv sv sv -sv +gd sv sv sv @@ -20493,7 +20625,7 @@ sv sv sv sv -sv +gd sv sv sv @@ -20536,12 +20668,12 @@ OR OH ed ed +pA ed ed -ed -sW -Dy -Wp +Xf +Xf +Xf rj sv sv @@ -20695,7 +20827,7 @@ sv sv sv ov -Of +Xf ed ed ed @@ -20716,7 +20848,7 @@ sS kE kE ed -ed +yo OH OH OH @@ -20739,7 +20871,7 @@ ed rj sv sv -sv +gd sv sv sv @@ -20877,7 +21009,7 @@ PP sv sv sv -sv +Dy sv sv sv @@ -21021,7 +21153,7 @@ Rs Rs Rs Rs -Rs +sW Rs Rs Rs @@ -21127,7 +21259,7 @@ ed rj sv sv -sv +gd sv sv PP @@ -21313,7 +21445,7 @@ xc xc ed ed -ed +pA ed ed rj @@ -21435,7 +21567,7 @@ Rs Rs Rs Rs -Rs +ts Rs Rs Rs @@ -21463,7 +21595,7 @@ sv sv sv sv -sv +gd sv sv sv @@ -21514,7 +21646,7 @@ rj ed rj sv -sv +gd sv sv PP @@ -21651,7 +21783,7 @@ sv sv sv sv -sv +Dy sv sv sv @@ -21679,7 +21811,7 @@ jq YI sP ed -ed +pA sS sS xc @@ -21872,7 +22004,7 @@ OH OH OH OH -ed +pA ed sS sS @@ -21904,7 +22036,7 @@ rj sv sv sv -sv +gd PP PP PP @@ -22055,7 +22187,7 @@ gA iB gA gA -ts +Xf ed ed ed @@ -22240,7 +22372,7 @@ sv sv sv sv -sv +gd sv sv sv @@ -22286,11 +22418,11 @@ Xf Xf sv sv +gd sv sv sv -sv -sv +gd sv PP PP @@ -22426,7 +22558,7 @@ PP sv sv sv -sv +Dy sv sv sv @@ -22625,14 +22757,14 @@ sv sv sv sv +Dy sv sv sv sv sv sv -sv -sv +gd sv sv DW @@ -22648,7 +22780,7 @@ ed ed ed ed -ed +pA ed sS sS @@ -22675,7 +22807,7 @@ DW sv sv sv -sv +gd sv sv sv @@ -22776,7 +22908,7 @@ Rs Rs Rs Rs -Rs +ts Rs Rs Rs @@ -22817,7 +22949,7 @@ sv sv sv sv -sv +gd sv sv sv @@ -23003,7 +23135,7 @@ lK PP PP sv -sv +tF sv sv sv @@ -23200,7 +23332,7 @@ sv sv sv sv -sv +Dy sv sv sv @@ -23256,7 +23388,7 @@ ed DW sv sv -sv +gd sv sv sv @@ -23369,7 +23501,7 @@ Rs Rs Rs Rs -Rs +ts Rs Rs Rs @@ -23396,6 +23528,7 @@ sv sv sv sv +tF sv sv sv @@ -23404,8 +23537,7 @@ sv sv sv sv -sv -sv +gd sv sv sv @@ -23583,7 +23715,9 @@ lK lK ka sv +tF sv +Dy sv sv sv @@ -23600,14 +23734,12 @@ sv sv sv sv -sv -sv -sv +gd sv sv DW ed -ed +pA ed OH nA @@ -23646,7 +23778,7 @@ sv sv sv sv -sv +gd sv sv PP @@ -23782,17 +23914,17 @@ sv sv sv sv +gd sv sv sv sv sv +tF sv sv sv -sv -sv -sv +Dy sv sv sv @@ -23979,7 +24111,7 @@ sv sv sv sv -sv +Dy sv sv sv @@ -24121,7 +24253,7 @@ lK Rs Rs Rs -Rs +ts Rs Rs Rs @@ -24169,6 +24301,7 @@ sv sv sv sv +tF sv sv sv @@ -24180,8 +24313,7 @@ sv sv sv sv -sv -sv +gd sv sv sv @@ -24348,7 +24480,7 @@ Rs Rs Rs Rs -Rs +ts Rs fz fz @@ -24362,11 +24494,11 @@ sv sv sv sv +Dy sv sv sv -sv -sv +tF sv sv sv @@ -24422,7 +24554,7 @@ sv sv sv sv -sv +gd sv PP PP @@ -24553,7 +24685,7 @@ Rs Rs Vb sv -sv +tF sv sv sv @@ -24578,7 +24710,7 @@ sv DW ed ed -ed +pA ed ed ed @@ -24613,7 +24745,7 @@ ed ed DW sv -sv +gd sv sv sv @@ -24722,6 +24854,7 @@ Rs Rs ot Rs +ts Rs Rs Rs @@ -24733,8 +24866,7 @@ Rs Rs Rs Rs -Rs -Rs +sW Rs Rs Rs @@ -24750,7 +24882,7 @@ sv sv sv sv -sv +Dy sv sv cL @@ -24949,7 +25081,7 @@ sv sv sv sv -sv +Dy sv sv sv @@ -25155,7 +25287,7 @@ sv sv sv sv -sv +Wp sv OI rg @@ -25350,12 +25482,12 @@ sv sv sv sv +Wp sv sv sv sv -sv -sv +tF sv sv sv @@ -25486,7 +25618,7 @@ Rs Rs Rs Rs -Rs +ts Rs Rs Rs @@ -25541,7 +25673,7 @@ sv sv sv sv -sv +Of sv sv sv @@ -25571,7 +25703,7 @@ sv sv sv sv -sv +ww sv sv sv @@ -25765,7 +25897,7 @@ sv sv sv sv -sv +gR sv sv sv @@ -25900,7 +26032,7 @@ Rs Rs Rs Rs -Rs +sW Rs fz fz @@ -25937,7 +26069,7 @@ sv sv sv sv -sv +tF sv sv sv @@ -25953,7 +26085,7 @@ dQ dQ dQ sv -sv +ww sv sv sv @@ -26093,7 +26225,7 @@ Rs Rs Rs Rs -Rs +ts Rs Rs fz @@ -26147,9 +26279,11 @@ dQ dQ dQ sv +tF sv sv sv +Dy sv sv sv @@ -26158,9 +26292,7 @@ sv sv sv sv -sv -sv -sv +gd sv sv sv @@ -26312,7 +26444,7 @@ sv sv sv sv -sv +gd sv sv sv @@ -26334,7 +26466,7 @@ we we sv sv -sv +tF sv dQ dQ @@ -26344,10 +26476,10 @@ sv sv sv sv +hi sv sv -sv -sv +ih sv sv sv @@ -26535,12 +26667,14 @@ dQ dQ dQ sv +PV sv sv sv sv sv sv +hi sv sv sv @@ -26549,9 +26683,7 @@ sv sv sv sv -sv -sv -sv +hi sv sv sv @@ -26722,7 +26854,7 @@ sv sv sv sv -sv +Dy sv dQ dQ @@ -26932,12 +27064,12 @@ sv sv sv sv +hi sv sv sv sv -sv -sv +gd sv sv sv @@ -27355,6 +27487,7 @@ dQ sv sv sv +tF sv sv sv @@ -27370,8 +27503,7 @@ sv sv sv sv -sv -sv +gd sv sv sv @@ -27519,7 +27651,7 @@ sv sv sv sv -sv +hi sv sv sv @@ -27547,18 +27679,18 @@ sv dQ dQ sv +tF sv +Dy sv +tF sv sv sv sv -sv -sv -sv -sv -sv -sv +iF +iF +iF sv sv sv @@ -27646,6 +27778,7 @@ PP sv sv sv +Dy sv sv sv @@ -27694,8 +27827,7 @@ sv sv sv sv -sv -sv +ww sv sv sv @@ -27743,17 +27875,17 @@ dQ sv sv sv +tF sv sv sv sv -sv -sv -sv -sv -sv -sv -sv +iF +iF +iF +iF +iF +iF sv sv sv @@ -27905,7 +28037,7 @@ dQ sv sv sv -sv +gd sv sv sv @@ -27941,13 +28073,13 @@ sv sv sv sv -sv -sv -sv -sv -sv -sv -sv +iF +iF +iF +iF +iF +iF +iF sv sv sv @@ -28039,7 +28171,7 @@ sv sv sv sv -sv +tF sv sv sv @@ -28135,13 +28267,13 @@ sv sv sv sv -sv -sv -sv -sv -sv -sv -sv +iF +iF +iF +iF +iF +iF +iF sv sv sv @@ -28248,7 +28380,7 @@ sv sv sv sv -sv +gd sv sv sv @@ -28283,9 +28415,9 @@ aN sv sv sv +hi sv -sv -sv +tF sv dQ dQ @@ -28318,7 +28450,7 @@ sv sv sv sv -sv +gd sv dQ dQ @@ -28329,12 +28461,12 @@ sv sv sv sv -sv -sv -sv -sv -sv -sv +iF +iF +iF +iF +iF +iF sv sv sv @@ -28485,14 +28617,14 @@ dQ dQ dQ sv +hi sv sv sv sv sv sv -sv -sv +lL sv sv sv @@ -28519,15 +28651,15 @@ dQ sv sv sv +tF sv sv sv -sv -sv -sv -sv -sv -sv +iF +iF +iF +iF +iF sv sv sv @@ -28681,7 +28813,7 @@ dQ sv sv sv -sv +hi sv sv sv @@ -28715,18 +28847,18 @@ sv sv sv sv +gd sv +iF +iF +iF +iF sv sv sv sv sv -sv -sv -sv -sv -sv -sv +cL sv sv sv @@ -28863,12 +28995,12 @@ DI DI Mc sv +ww sv sv sv sv -sv -sv +ww dQ dQ dQ @@ -28876,7 +29008,7 @@ sv sv sv sv -sv +gd sv sv sv @@ -28899,23 +29031,23 @@ sv sv sv sv -sv +gd sv sv dQ dQ sv +tF sv sv sv sv sv +iF +iF +iF sv -sv -sv -sv -sv -sv +iF sv sv sv @@ -29057,12 +29189,12 @@ cO cO aN sv +hi sv +hi sv sv -sv -sv -sv +PV dQ dQ dQ @@ -29106,14 +29238,14 @@ sv sv sv sv +iF +iF sv +iF sv sv sv sv -cL -sv -sv sv sv sv @@ -29285,7 +29417,7 @@ sv sv sv sv -sv +Dy sv sv sv @@ -29300,9 +29432,9 @@ sv sv sv sv +iF sv -sv -sv +iF sv sv sv @@ -29447,8 +29579,8 @@ Mc sv sv sv -sv -sv +gd +hi sv sv dQ @@ -29456,7 +29588,7 @@ dQ dQ sv sv -sv +lL sv sv sv @@ -29481,28 +29613,28 @@ sv sv sv sv -sv +lL sv sv dQ dQ sv +tF sv sv +gd sv sv sv sv +iF sv sv sv sv sv sv -sv -sv -sv -sv +gd sv sv sv @@ -29670,7 +29802,7 @@ PP sv sv sv -sv +tF sv sv sv @@ -30028,10 +30160,10 @@ cO aN sv sv +hi sv sv -sv -sv +gd sv dQ dQ @@ -30072,7 +30204,7 @@ sv sv sv sv -sv +Dy sv sv sv @@ -30221,7 +30353,7 @@ DI DI Mc sv -sv +RM sv sv sv @@ -30267,7 +30399,7 @@ sv sv sv sv -sv +Wp sv sv sv @@ -30420,7 +30552,7 @@ sv sv sv sv -sv +gd dQ dQ dQ @@ -30446,18 +30578,18 @@ sv sv sv sv +tF sv +Dy sv sv sv -sv -sv -sv +lL sv dQ dQ sv -sv +gd sv sv sv @@ -30643,7 +30775,7 @@ sv sv sv sv -sv +tF sv sv sv @@ -30657,7 +30789,7 @@ sv sv sv sv -sv +gd sv sv sv @@ -30813,7 +30945,7 @@ dQ dQ dQ sv -sv +hi sv sv sD @@ -30846,7 +30978,7 @@ dQ dQ sv sv -sv +hi sv sv sv @@ -30996,12 +31128,12 @@ cO cO cO aN +bV sv sv sv sv -sv -sv +Dy sv dQ dQ @@ -31029,7 +31161,7 @@ sv sv sv sv -sv +tF sv sv sv @@ -31582,7 +31714,7 @@ sv sv sv sv -sv +gd sv sv dQ @@ -31776,7 +31908,7 @@ sv sv sv sv -sv +hi sv sv dQ @@ -31930,7 +32062,7 @@ sv sv sv sv -sv +gd sv sv sv @@ -31988,8 +32120,7 @@ PP PP PP sD -sD -sv +kq sv sv sv @@ -32002,6 +32133,7 @@ sv sv sv sv +lL sv sv sv @@ -32129,7 +32261,7 @@ sv sv sv sv -sv +gd sv sv sv @@ -32206,7 +32338,7 @@ sv sv sv sv -sv +Wp sv sv sv @@ -32224,7 +32356,7 @@ sv sv sv sv -sv +Dy sv sv sv @@ -32315,11 +32447,11 @@ sv sv sv sv +gd sv sv sv -sv -sv +gd sv sv sv @@ -32359,7 +32491,7 @@ sv sv sv sv -sv +gd sv dQ dQ @@ -32395,12 +32527,12 @@ sv sv sv sv +lL sv sv sv sv -sv -sv +Dy sv sv sv @@ -32505,6 +32637,7 @@ sv sv sv sv +gd sv sv sv @@ -32517,8 +32650,7 @@ sv sv sv sv -sv -sv +gd sv sv sv @@ -32595,7 +32727,7 @@ sv sv sv sv -sv +Wp sv sv sv @@ -32703,11 +32835,11 @@ sv sv sv sv +gd sv sv sv -sv -sv +gd sv sv sv @@ -32744,7 +32876,7 @@ cO aN sv sv -sv +RM sv sv sv @@ -32890,7 +33022,7 @@ PP PP sv sv -sv +gd sv sv sv @@ -32969,7 +33101,7 @@ sv sv sv sv -sv +gd sv sv sv @@ -33013,7 +33145,7 @@ sv sv sv sv -sv +Dy sv sv sv @@ -33088,19 +33220,19 @@ sv sv sv sv +eO sv sv sv sv sv +gd sv sv sv sv sv -sv -sv -sv +gd sv sv sv @@ -33280,7 +33412,7 @@ sv sv sv sv -sv +gd sv sv sv @@ -33476,6 +33608,7 @@ sv sv sv sv +ry sv sv sv @@ -33487,8 +33620,7 @@ sv sv sv sv -sv -sv +gd sv sv sv @@ -33510,6 +33642,7 @@ sv sv sv sv +tF sv sv sv @@ -33523,8 +33656,7 @@ sv sv sv sv -sv -sv +gd sv sv sv @@ -33664,6 +33796,7 @@ PP sv sv sv +gd sv sv sv @@ -33672,13 +33805,12 @@ sv sv sv sv +dQ sv sv sv sv -sv -sv -sv +gd sv sv sv @@ -33701,12 +33833,12 @@ sv rH kd sv +bV sv sv sv sv -sv -sv +RM sv sv sv @@ -33864,6 +33996,9 @@ sv sv sv sv +dQ +dQ +dQ sv sv sv @@ -33871,6 +34006,7 @@ sv sv sv sv +gd sv sv sv @@ -33881,11 +34017,7 @@ sv sv sv sv -sv -sv -sv -sv -sv +Wp sv sv sv @@ -34041,6 +34173,7 @@ sv sv sv sv +hi sv sv sv @@ -34070,8 +34203,7 @@ sv sv sv sv -sv -sv +gd sv sv sv @@ -34093,7 +34225,7 @@ sv sv sv sv -sv +gd sv sv sv @@ -34110,7 +34242,7 @@ sv sv sv sv -sv +gd dQ dQ dQ @@ -34245,20 +34377,20 @@ sv sv sv sv +dQ sv sv sv +dQ sv +ww sv sv sv sv sv sv -sv -sv -sv -sv +gd sv sv sv @@ -34424,6 +34556,7 @@ PP dP sv sv +dQ sv sv sv @@ -34432,6 +34565,7 @@ sv sv sv sv +dQ sv sv sv @@ -34443,6 +34577,7 @@ sv sv sv sv +hi sv sv sv @@ -34454,6 +34589,7 @@ sv sv sv sv +gd sv sv sv @@ -34461,11 +34597,7 @@ sv sv sv sv -sv -sv -sv -sv -sv +gd sv sv sv @@ -34477,7 +34609,7 @@ Fn IZ gQ sv -sv +tF sv sv sv @@ -34522,7 +34654,7 @@ PP sv sv sv -sv +Dy sv sv sv @@ -34619,8 +34751,10 @@ dP sv sv sv +dQ sv sv +dQ sv sv sv @@ -34628,8 +34762,10 @@ sv sv sv sv +dQ sv sv +dQ sv sv sv @@ -34651,11 +34787,7 @@ sv sv sv sv -sv -sv -sv -sv -sv +Wp sv sv sv @@ -34673,7 +34805,7 @@ gQ sv sv sv -sv +gd sv sv sv @@ -34725,7 +34857,7 @@ aW aW aW sv -sv +hi sv sv PP @@ -34908,7 +35040,7 @@ PP PP PP sv -sv +gd sv sv sv @@ -35023,6 +35155,7 @@ sv sv sv sv +gd sv sv sv @@ -35047,8 +35180,7 @@ sv sv sv sv -sv -sv +gd sv sv Fn @@ -35058,7 +35190,7 @@ MC Fn xf RZ -sv +Wp sv sv sv @@ -35207,6 +35339,7 @@ sv sv sv sv +hi sv sv sv @@ -35227,8 +35360,7 @@ sv sv sv sv -sv -sv +gd sv sv sv @@ -35256,7 +35388,7 @@ sv sv sv sv -sv +gd sv sv PP @@ -35280,7 +35412,7 @@ dQ dQ sv sv -sv +gd sv PP PP @@ -35297,7 +35429,7 @@ sv sv sv sv -sv +gd sv sv sv @@ -35413,6 +35545,7 @@ sv sv sv sv +gd sv sv sv @@ -35430,13 +35563,12 @@ sv sv sv sv +gd sv sv sv sv -sv -sv -sv +Wp sv sv bY @@ -35492,7 +35624,7 @@ sv sv sv sv -sv +hi sv Fb Fb @@ -35579,17 +35711,17 @@ sv sv sv sv +Ui +cj +dk +cj +cj +cj sv sv sv sv -sv -sv -sv -sv -sv -sv -sv +dQ sv sv sv @@ -35644,7 +35776,7 @@ sv sv sv sv -sv +lL sv sv PP @@ -35683,7 +35815,7 @@ sv sv sv sv -sv +hi sv sv sv @@ -35774,10 +35906,10 @@ sv sv sv sv +WQ sv -sv -sv -sv +Vn +Vn sv sv sv @@ -35836,7 +35968,7 @@ vC gQ sv sv -sv +gd sv sv sv @@ -35875,11 +36007,11 @@ PP PP sv sv +gd sv sv sv -sv -sv +gd sv Fb Cf @@ -35964,15 +36096,15 @@ sv sv sv sv +hi sv sv sv +Ui sv +Vn sv -sv -sv -sv -sv +Vn sv sv sv @@ -36055,7 +36187,7 @@ dQ dQ dQ sv -sv +Al sv PP PP @@ -36162,10 +36294,10 @@ sv sv sv sv -sv -sv -sv -sv +cj +Zx +Vn +Vn sv sv sv @@ -36207,8 +36339,8 @@ ia lb lb hS -hS -sv +Vo +MW sv sv sv @@ -36266,7 +36398,7 @@ sv sv sv sv -sv +gd sv sv Fb @@ -36356,10 +36488,10 @@ sv sv sv sv -sv -sv -sv -sv +cj +Jw +Vn +Vn sv sv sv @@ -36401,8 +36533,8 @@ wU wU wU wU -wU -sv +mK +MW sv sv sv @@ -36437,7 +36569,7 @@ Tq rd rd Tq -sv +xA sv dQ dQ @@ -36455,14 +36587,14 @@ PP PP PP sv +hi sv sv sv sv sv sv -sv -sv +hi eV fk WH @@ -36549,8 +36681,8 @@ sv sv sv sv -sv -sv +hi +cj sv sv sv @@ -36596,8 +36728,8 @@ wU wU wU wU -wU -wU +WL +WL ce Do sv @@ -36652,8 +36784,8 @@ sv sv sv sv -sv -sv +gd +hi sv sv sv @@ -36806,7 +36938,7 @@ mW wU dQ sv -sv +gR sv sv sv @@ -36826,12 +36958,12 @@ NI NI Mr sv -sv +tF dQ dQ dQ sv -sv +gd sv PP PP @@ -37002,7 +37134,7 @@ dQ sv sv sv -sv +gd sv sv sv @@ -37036,7 +37168,7 @@ PP PP sv sv -sv +gd sv sv sv @@ -37144,7 +37276,7 @@ sv sv sv sv -sv +gd sv sv sv @@ -37185,7 +37317,7 @@ eZ sv sv sv -sv +gd sv sv sv @@ -37233,7 +37365,7 @@ sv sv sv sv -sv +gd sv sv sv @@ -37392,7 +37524,7 @@ sv sv sv sv -sv +gR sv sv sv @@ -37430,7 +37562,7 @@ sv sv sv sv -sv +gd sv Fb bp @@ -37619,7 +37751,7 @@ sv sv sv sv -sv +hi sv sv sv @@ -37712,7 +37844,7 @@ sv sv sv sv -sv +Zv sv sv sv @@ -37779,7 +37911,7 @@ sv sv sv sv -sv +gd sv sv sv @@ -37913,8 +38045,8 @@ sv sv sv sv -cL sv +cL sv sv sv @@ -37970,6 +38102,7 @@ mW wU dQ sv +lL sv sv sv @@ -37981,8 +38114,7 @@ sv sv sv sv -sv -sv +lL sv mW sv @@ -38008,10 +38140,10 @@ sv sv sv sv +hi sv sv -sv -sv +gd sv sv sv @@ -38350,7 +38482,7 @@ sv sv sv sv -sv +gd sv sv sv @@ -38368,7 +38500,7 @@ sv sv sv sv -sv +gd sv sv sv @@ -38382,9 +38514,9 @@ dQ sv sv sv +gd sv -sv -sv +hi sv sv cL @@ -38587,7 +38719,7 @@ sv sv sv sv -sv +gd sv sv sv @@ -38680,18 +38812,18 @@ PP sv sv sv +hi sv sv sv sv sv +lL sv sv sv sv -sv -sv -sv +Zv sv sv sv @@ -38746,14 +38878,14 @@ mW lb dQ sv +gR sv sv sv sv sv -sv -sv -sv +iF +iF sv sv sv @@ -38771,10 +38903,10 @@ sv sv sv sv +gd sv sv -sv -sv +hi sv sv sv @@ -38945,11 +39077,11 @@ sv sv sv sv -sv -sv -sv -sv -sv +iF +iF +iF +iF +iF sv sv sv @@ -38972,10 +39104,10 @@ sv sv sv sv +hi sv sv -sv -sv +hi sv sv sv @@ -39125,7 +39257,7 @@ Do sv sv sv -sv +gd sv sv sv @@ -39139,31 +39271,31 @@ sv sv sv sv +iF +hi sv -sv -sv -sv -sv -sv +iF +iF +iF sv sv sv mW -sv +lL sv dQ dQ dQ sv sv +gd sv sv sv sv sv -sv -sv -sv +gd +hi sv sv sv @@ -39265,7 +39397,7 @@ sv sv sv sv -sv +gd sv sv sv @@ -39333,12 +39465,12 @@ sv sv sv sv +iF sv -sv -sv -sv -sv -sv +nV +iF +iF +iF sv sv sv @@ -39475,7 +39607,7 @@ sv sv sv sv -sv +hi sv jn cU @@ -39524,16 +39656,16 @@ dQ dQ sv sv +gd sv sv +iF +iF sv +iF sv sv -sv -sv -sv -sv -sv +At sv sv mW @@ -39542,14 +39674,14 @@ sv dQ dQ dQ +lL sv sv sv +lL sv sv -sv -sv -sv +hi sv sv sv @@ -39659,7 +39791,7 @@ sv sv sv sv -sv +hi sv sv sv @@ -39722,9 +39854,9 @@ sv sv sv sv -sv -sv -sv +iF +iF +iF sv sv sv @@ -39739,7 +39871,7 @@ dQ sv sv sv -sv +gd sv sv sv @@ -39902,7 +40034,7 @@ sv sv sv sv -sv +gd sv sv sv @@ -39913,7 +40045,7 @@ sv sv sv sv -sv +PV sv sv sv @@ -39935,11 +40067,11 @@ sv sv sv sv +ww sv sv sv -sv -sv +PV sv sv sv @@ -40243,7 +40375,7 @@ sv sv sv sv -sv +gd sv sv sv @@ -40429,7 +40561,7 @@ sv sv sv sv -sv +lL sv sv sv @@ -41104,7 +41236,7 @@ sv sv sv sv -sv +ww sv sv sv @@ -41273,7 +41405,7 @@ sv sv sv sv -sv +PV sv sv sv @@ -41288,7 +41420,7 @@ sv qZ bw Hz -sv +gd sv Mv je @@ -41458,12 +41590,12 @@ sv sv sv sv +gd sv sv sv sv -sv -sv +lL sv sv sv @@ -41489,15 +41621,15 @@ je sv sv sv +gd sv sv +ww sv sv sv sv -sv -sv -sv +gd sv sv dQ @@ -41661,16 +41793,16 @@ sv sv sv sv +gd sv +lL sv sv sv +gd sv sv -sv -sv -sv -sv +PV sv sv qZ @@ -41794,7 +41926,7 @@ PP PP sv sv -sv +Zv sv sv sv @@ -41847,7 +41979,7 @@ sv sv sv sv -sv +lL sv sv sv @@ -41872,11 +42004,11 @@ bw Hz sv sv -Mv +BT je sv sv -sv +ww sv sv sv @@ -41994,7 +42126,7 @@ sv sv sv sv -sv +hi sv sv sv @@ -42077,7 +42209,7 @@ cL sv sv sv -sv +gd sv sv sv @@ -42243,6 +42375,7 @@ sv sv sv sv +lL sv sv sv @@ -42251,11 +42384,10 @@ sv sv sv sv +gd sv sv sv -sv -qZ bw Hz sv @@ -42281,7 +42413,7 @@ dQ sv sv sv -sv +gd sv sv sv @@ -42436,10 +42568,12 @@ pn sv sv sv +gd sv sv sv sv +PV sv sv sv @@ -42448,8 +42582,6 @@ sv sv sv sv -sv -qZ bw Hz sv @@ -42459,7 +42591,7 @@ je sv sv sv -sv +gd sv sv sv @@ -42572,7 +42704,7 @@ PP PP PP PP -sv +aJ sv sv sv @@ -42638,16 +42770,16 @@ sv sv sv sv +gd sv -sv -sv +PV sv sv qZ bw Hz sv -sv +gd Mv je sv @@ -42658,7 +42790,7 @@ sv sv sv sv -sv +lL sv sv sv @@ -42765,11 +42897,11 @@ PP PP PP PP +Qb sv sv sv -sv -sv +Zv sv sv sv @@ -42827,7 +42959,7 @@ sv sv sv sv -sv +gd sv sv sv @@ -42857,13 +42989,13 @@ sv sv sv sv +gd sv sv sv sv sv -sv -sv +gd sv sv sv @@ -43024,10 +43156,10 @@ sv sv sv sv +lL sv sv -sv -sv +PV sv sv sv @@ -43044,7 +43176,7 @@ sv sv sv sv -sv +gd sv sv sv @@ -43216,14 +43348,14 @@ Iu sv sv sv +MA +Ic sv sv sv +hi sv -sv -sv -sv -sv +gR bL qZ bw @@ -43240,8 +43372,8 @@ sv sv sv sv -sv -sv +PP +PP sv sv sv @@ -43417,7 +43549,7 @@ bL sv sv sv -sv +hi sv qZ bw @@ -43435,7 +43567,7 @@ sv sv sv sv -sv +PP sv sv sv @@ -43605,18 +43737,18 @@ TL TL TL TL +sv +dQ TL TL TL TL TL -TL -TL -TL -bw -bw -Hz sv +dQ +dQ +Hz +PV sv sv Me @@ -43799,17 +43931,17 @@ xC xC xC xC +dQ xC xC xC xC xC xC -xC -xC -bw -bw -Hz +sv +sv +dQ +sv sv sv sv @@ -43997,15 +44129,15 @@ sv sv bL sv -sv +hi sv sv sv qZ -bw -Hz sv sv +sv +gd Mv PJ sv @@ -44192,7 +44324,7 @@ sv sv sv sv -sv +nV sv bL qZ @@ -44780,7 +44912,7 @@ wm qZ bw ES -bL +qu dC or mC @@ -44978,7 +45110,7 @@ or we zL je -we +oE we we sv @@ -45168,11 +45300,11 @@ zL qZ bw ES -we +oE we zL je -we +oE we we we @@ -45362,10 +45494,11 @@ zL qZ bw ES -we +oE we zL je +oE we we we @@ -45381,10 +45514,9 @@ we we we we -we -sv sv sv +UR sv sv sv @@ -45556,11 +45688,11 @@ zL qZ bw ES -we +oE we zL je -we +oE we we we @@ -45750,11 +45882,11 @@ zL qZ bw ES -we +oE we zL je -we +oE we we we @@ -45944,11 +46076,11 @@ wm qZ bw ES -bL +qu we zL je -we +oE we we we @@ -46138,11 +46270,11 @@ zL qZ bw ES -we +oE we zL je -we +oE we we we @@ -46332,11 +46464,11 @@ zL qZ bw ES -we +oE we zL je -we +oE we we we @@ -46526,11 +46658,11 @@ zL qZ bw ES -we +oE we zL je -we +oE we we we @@ -46720,11 +46852,11 @@ zL qZ bw ES -we +oE we zL je -we +oE we we we @@ -46914,11 +47046,11 @@ zL qZ bw ES -we +oE we zL je -we +oE we we we @@ -47108,11 +47240,11 @@ wm qZ bw ES -bL +qu we zL je -we +oE we we we @@ -47302,11 +47434,11 @@ zL qZ bw ES -we +oE we zL je -we +oE we we we @@ -47496,11 +47628,11 @@ zL qZ bw ES -we +oE we zL je -we +oE we we we @@ -47690,11 +47822,11 @@ zL qZ bw ES -we +oE we zL je -we +oE we we we @@ -47884,11 +48016,11 @@ zL qZ bw ES -we +oE we zL je -we +oE we we we @@ -48078,11 +48210,11 @@ zL qZ bw ES -we +oE we zL je -we +oE we we we diff --git a/maps/rift/levels/rift-11-orbital.dmm b/maps/rift/levels/rift-11-orbital.dmm index 745b3cce20e9..a94b9ba5bc5e 100644 --- a/maps/rift/levels/rift-11-orbital.dmm +++ b/maps/rift/levels/rift-11-orbital.dmm @@ -8738,6 +8738,10 @@ }, /turf/simulated/shuttle/wall/voidcraft, /area/shuttle/specops/engine) +"Nq" = ( +/obj/effect/shuttle_landmark/transit/rift/oldcentury, +/turf/space/transit/south, +/area/space) "ND" = ( /obj/effect/step_trigger/lost_in_space, /turf/space, @@ -22153,46 +22157,46 @@ Bv Bv Bv Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP Bv "} (64,1,1) = {" @@ -22347,46 +22351,46 @@ Bv Bv Bv Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv +AP +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +AP Bv "} (65,1,1) = {" @@ -22541,46 +22545,46 @@ Bv Bv Bv Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv +AP +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +AP Bv "} (66,1,1) = {" @@ -22735,46 +22739,46 @@ Bv Bv Bv Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv +AP +Ve +Ve +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +Ve +Ve +AP Bv "} (67,1,1) = {" @@ -22929,46 +22933,46 @@ Bv Bv Bv Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv +AP +Ve +Ve +lc +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +lc +Ve +Ve +AP Bv "} (68,1,1) = {" @@ -23123,46 +23127,46 @@ Bv Bv Bv Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv +AP +Ve +Ve +lc +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +lc +Ve +Ve +AP Bv "} (69,1,1) = {" @@ -23317,46 +23321,46 @@ Bv Bv Bv Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv +AP +Ve +Ve +lc +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +lc +Ve +Ve +AP Bv "} (70,1,1) = {" @@ -23511,46 +23515,46 @@ Bv Bv Bv Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP +AP +Ve +Ve +lc +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +lc +Ve +Ve +AP hP "} (71,1,1) = {" @@ -23705,46 +23709,46 @@ Bv Bv Bv Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP +AP +Ve +Ve +lc +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +lc +Ve +Ve +AP hP "} (72,1,1) = {" @@ -23899,52 +23903,52 @@ Bv Bv Bv Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -"} -(73,1,1) = {" -hP -hP -hP +AP +Ve +Ve +lc +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +lc +Ve +Ve +AP +hP +"} +(73,1,1) = {" +hP +hP +hP hP hP hP @@ -24093,46 +24097,46 @@ Bv Bv Bv Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP +AP +Ve +Ve +lc +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +ig +ig +ig +ig +Ve +Ve +Ve +lc +Ve +Ve +AP hP "} (74,1,1) = {" @@ -24287,46 +24291,46 @@ Bv Bv Bv Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP +AP +Ve +Ve +lc +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +lc +Ve +Ve +AP hP "} (75,1,1) = {" @@ -24481,56 +24485,56 @@ Bv Bv Bv Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -"} -(76,1,1) = {" -hP -hP -hP -hP -hP -hP -hP +AP +Ve +Ve +lc +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +lc +Ve +Ve +AP +hP +"} +(76,1,1) = {" +hP +hP +hP +hP +hP +hP +hP hP hP hP @@ -24675,46 +24679,46 @@ Bv Bv Bv Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP +AP +Ve +Ve +lc +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +lc +Ve +Ve +AP hP "} (77,1,1) = {" @@ -24869,46 +24873,46 @@ Bv Bv Bv Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP +AP +Ve +Ve +lc +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Nq +Ve +Ve +Ve +Ve +Ve +Ve +lc +Ve +Ve +AP hP "} (78,1,1) = {" @@ -25063,46 +25067,46 @@ Bv Bv Bv Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP +AP +Ve +Ve +lc +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +lc +Ve +Ve +AP hP "} (79,1,1) = {" @@ -25257,46 +25261,46 @@ Bv Bv Bv Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP +AP +Ve +Ve +lc +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +lc +Ve +Ve +AP hP "} (80,1,1) = {" @@ -25451,46 +25455,46 @@ Bv Bv Bv Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP +AP +Ve +Ve +lc +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +lc +Ve +Ve +AP hP "} (81,1,1) = {" @@ -25637,54 +25641,54 @@ Bv Bv Bv Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP +Bv +Bv +Bv +Bv +Bv +Bv +Bv +Bv +AP +Ve +Ve +lc +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +lc +Ve +Ve +AP hP "} (82,1,1) = {" @@ -25839,46 +25843,46 @@ Bv Bv Bv Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP +AP +Ve +Ve +lc +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +lc +Ve +Ve +AP hP "} (83,1,1) = {" @@ -26033,46 +26037,46 @@ Bv Bv Bv Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP +AP +Ve +Ve +lc +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +lc +Ve +Ve +AP hP "} (84,1,1) = {" @@ -26227,46 +26231,46 @@ Bv Bv Bv Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP +AP +Ve +Ve +lc +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +lc +Ve +Ve +AP hP "} (85,1,1) = {" @@ -26421,46 +26425,46 @@ Bv Bv Bv Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP +AP +Ve +Ve +lc +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +lc +Ve +Ve +AP hP "} (86,1,1) = {" @@ -26615,46 +26619,46 @@ Bv Bv Bv Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP +AP +Ve +Ve +lc +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +lc +Ve +Ve +AP hP "} (87,1,1) = {" @@ -26809,46 +26813,46 @@ Bv Bv Bv Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP +AP +Ve +Ve +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +Ve +Ve +AP hP "} (88,1,1) = {" @@ -27003,46 +27007,46 @@ Bv Bv Bv Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP +AP +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +AP hP "} (89,1,1) = {" @@ -27197,46 +27201,46 @@ Bv Bv Bv Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP +AP +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +AP hP "} (90,1,1) = {" @@ -27391,46 +27395,46 @@ Bv Bv Bv Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP hP "} (91,1,1) = {" diff --git a/maps/rift/rift.dm b/maps/rift/rift.dm index 533dfedac428..4ebef39ae00a 100644 --- a/maps/rift/rift.dm +++ b/maps/rift/rift.dm @@ -40,6 +40,7 @@ /datum/shuttle/autodock/overmap/emt, /datum/shuttle/autodock/ferry/supply/cargo, /datum/shuttle/autodock/ferry/belter, + /datum/shuttle/autodock/overmap/oldcentury, ) full_name = "NSB Atlas" use_overmap = TRUE diff --git a/maps/rift/shuttles.dm b/maps/rift/shuttles.dm index 40e1d5e90b2a..6759940649a3 100644 --- a/maps/rift/shuttles.dm +++ b/maps/rift/shuttles.dm @@ -135,6 +135,35 @@ name = "civilian jump console" shuttle_tag = "Civilian Transport" +// Civilian Century Shuttle + +/datum/shuttle/autodock/overmap/oldcentury + name = "Civilian Century Shuttle" + warmup_time = 15 + shuttle_area = /area/shuttle/oldcentury + current_location = "rift_oldcentury_pad" + docking_controller_tag = "oldcentury_docker" + landmark_transition = "nav_transit_oldcentury" + fuel_consumption = 8 + move_time = 37 + +/obj/overmap/entity/visitable/ship/landable/oldcentury + name = "Civilian Century Shuttle" + desc = "Is it... A replica ? Or... the real deal ? This shuttle, based on the shuttles from earth's old days. No teasing, this shuttle is a replica, but still a old and crapy ship." + fore_dir = NORTH + vessel_mass = 12000 + vessel_size = SHIP_SIZE_SMALL + shuttle = "Civilian Century Shuttle" + color = "#4cad73" //Greyish green + +/area/shuttle/oldcentury + name = "Civilian Century Shuttle" + icon_state = "shuttle" + +/obj/machinery/computer/shuttle_control/explore/oldcentury + name = "Century jump console" + shuttle_tag = "Civilian Century Shuttle" + //EMT Shuttle /datum/shuttle/autodock/overmap/emt name = "Dart EMT Shuttle" diff --git a/maps/sectors/frozen_192/levels/frozen_192.dmm b/maps/sectors/frozen_192/levels/frozen_192.dmm index 19aac97b65d8..96384fcd6485 100644 --- a/maps/sectors/frozen_192/levels/frozen_192.dmm +++ b/maps/sectors/frozen_192/levels/frozen_192.dmm @@ -948,6 +948,11 @@ icon_state = "tile_full" }, /area/class_p/unexplored) +"Wc" = ( +/obj/structure/table/standard, +/obj/item/clothing/mask/warmer, +/turf/simulated/floor/classp, +/area/class_p/unexplored) "Wr" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -31161,7 +31166,7 @@ yW at at Pr -cp +Wc yW iL iL diff --git a/maps/sectors/miaphus_192/levels/miaphus_192_beach.dmm b/maps/sectors/miaphus_192/levels/miaphus_192_beach.dmm index b4ee05195d45..eca836ffc2df 100644 --- a/maps/sectors/miaphus_192/levels/miaphus_192_beach.dmm +++ b/maps/sectors/miaphus_192/levels/miaphus_192_beach.dmm @@ -435,6 +435,15 @@ /obj/random/empty_or_lootable_crate, /turf/simulated/floor/tiled/steel_dirty, /area/tether_away/beach/desalinator) +"bI" = ( +/obj/effect/floor_decal/tracks/t_north{ + dir = 9 + }, +/obj/random/outcrop, +/turf/simulated/mineral/floor/cave{ + name = "dirt" + }, +/area/tether_away/beach/mineshaft) "bJ" = ( /obj/structure/undies_wardrobe{ density = 0; @@ -518,15 +527,6 @@ /obj/random/meat, /turf/simulated/floor/tiled/steel_dirty, /area/tether_away/beach/station) -"cp" = ( -/obj/effect/floor_decal/tracks{ - dir = 8 - }, -/obj/random/outcrop, -/turf/simulated/mineral/floor/cave{ - name = "dirt" - }, -/area/tether_away/beach/mineshaft) "cs" = ( /obj/structure/table/rack/shelf/steel, /obj/item/storage/box/wormcan, @@ -598,11 +598,6 @@ }, /turf/simulated/floor/water/deep, /area/tether_away/beach/aa) -"di" = ( -/obj/random/obstruction, -/obj/effect/floor_decal/tracks, -/turf/simulated/floor/wood, -/area/tether_away/beach/mineshaft) "dm" = ( /turf/simulated/floor/tiled/old_tile/white, /area/tether_away/beach/resort/lockermed) @@ -687,6 +682,19 @@ }, /turf/simulated/floor/tiled/steel_dirty, /area/tether_away/beach/desalinator) +"eh" = ( +/obj/spawner/window/full, +/obj/effect/floor_decal/tracks{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/tether_away/beach/resort/greenhouse) +"ej" = ( +/obj/effect/floor_decal/industrial/halfstair, +/turf/simulated/mineral/floor/cave{ + name = "dirt" + }, +/area/tether_away/beach/mineshaft) "el" = ( /obj/structure/filingcabinet/tall, /turf/simulated/floor/tiled/old_tile/white, @@ -802,16 +810,6 @@ }, /turf/simulated/floor/wood, /area/tether_away/beach/resort/bunk) -"eX" = ( -/obj/effect/floor_decal/tracks, -/turf/simulated/floor/wood, -/area/tether_away/beach/mineshaft) -"eZ" = ( -/obj/effect/floor_decal/industrial/halfstair{ - dir = 1 - }, -/turf/simulated/floor/tiled/asteroid_steel, -/area/tether_away/beach/desalinator) "fg" = ( /turf/simulated/floor/tiled/steel_dirty, /area/tether_away/beach/bunker/bunk) @@ -924,6 +922,12 @@ outdoors = 1 }, /area/tether_away/beach/station/terminal) +"ga" = ( +/obj/effect/floor_decal/tracks/intersection{ + dir = 9 + }, +/turf/simulated/floor/wood, +/area/tether_away/beach/mineshaft) "gc" = ( /obj/machinery/light/small, /mob/living/simple_mob/animal/roach/jaeger, @@ -933,13 +937,6 @@ /obj/structure/simple_door/sandstone, /turf/simulated/floor/tiled/asteroid_steel, /area/tether_away/beach/resort/greenhouse) -"gf" = ( -/obj/spawner/window/full, -/obj/effect/floor_decal/tracks{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/tether_away/beach/resort/greenhouse) "gq" = ( /turf/simulated/floor/wood, /area/tether_away/beach/desalinator) @@ -962,12 +959,6 @@ /obj/structure/bed/chair/wood, /turf/simulated/floor/wood, /area/tether_away/beach/resort/canteen) -"gC" = ( -/obj/effect/floor_decal/industrial/halfstair{ - dir = 8 - }, -/turf/simulated/floor/tiled/asteroid_steel, -/area/tether_away/beach/desalinator) "gF" = ( /obj/structure/closet/secure_closet/freezer/meat, /obj/random/mre, @@ -1075,6 +1066,17 @@ /obj/item/clothing/gloves/boxing/blue, /turf/simulated/floor/carpet/sblucarpet, /area/tether_away/beach/bunker/mess) +"hu" = ( +/obj/structure/barricade, +/obj/effect/floor_decal/tracks, +/turf/simulated/floor/wood, +/area/tether_away/beach/mineshaft) +"hv" = ( +/obj/effect/floor_decal/tracks{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/tether_away/beach/mineshaft) "hx" = ( /obj/structure/table/wooden_reinforced, /turf/simulated/floor/wood, @@ -1379,15 +1381,6 @@ }, /turf/simulated/floor/tiled/steel_dirty, /area/tether_away/beach/station/tram) -"jw" = ( -/obj/effect/floor_decal/tracks/t_north{ - dir = 9 - }, -/obj/machinery/floodlight, -/turf/simulated/mineral/floor/cave{ - name = "dirt" - }, -/area/tether_away/beach/mineshaft) "jx" = ( /obj/structure/cable/cyan{ icon_state = "0-2" @@ -1413,12 +1406,6 @@ name = "dirt" }, /area/tether_away/beach/mineshaft) -"jJ" = ( -/obj/effect/floor_decal/industrial/halfstair{ - dir = 8 - }, -/turf/simulated/floor/outdoors/beach/sand/desert, -/area/tether_away/beach/desalinator) "jM" = ( /obj/effect/floor_decal/tracks{ dir = 1 @@ -1477,14 +1464,6 @@ /obj/random/multiple/underdark/miningdrills, /turf/simulated/floor/tiled/steel_dirty, /area/tether_away/beach/station) -"kj" = ( -/obj/effect/floor_decal/tracks{ - dir = 8 - }, -/obj/structure/closet/crate/miningcar, -/obj/random/multiple/underdark/ores, -/turf/simulated/floor/wood, -/area/tether_away/beach/mineshaft) "kk" = ( /obj/structure/closet/crate, /obj/item/melee/umbrella/random, @@ -1541,12 +1520,6 @@ /obj/random/mre, /turf/simulated/floor/tiled/steel_dirty, /area/tether_away/beach/bunker/bunk) -"kE" = ( -/obj/effect/floor_decal/tracks/intersection{ - dir = 9 - }, -/turf/simulated/floor/wood, -/area/tether_away/beach/mineshaft) "kK" = ( /obj/machinery/light/small, /turf/simulated/floor/wood/broken, @@ -1600,12 +1573,6 @@ }, /turf/simulated/floor/wood/broken, /area/tether_away/beach/resort/dorm2) -"la" = ( -/obj/effect/floor_decal/industrial/halfstair, -/turf/simulated/mineral/floor/cave{ - name = "dirt" - }, -/area/tether_away/beach/mineshaft) "le" = ( /turf/simulated/floor/water/beach{ dir = 5 @@ -2029,6 +1996,10 @@ "pq" = ( /turf/simulated/floor/water/beach/corner, /area/tether_away/beach/jungle) +"pt" = ( +/obj/structure/sign/signnew/danger, +/turf/simulated/wall/wood, +/area/tether_away/beach/mineshaft) "pu" = ( /obj/structure/bed/chair/sofa/beige/right{ dir = 1 @@ -2042,15 +2013,6 @@ outdoors = 1 }, /area/tether_away/beach/mineyard) -"px" = ( -/obj/effect/floor_decal/tracks/t_north{ - dir = 9 - }, -/obj/random/outcrop, -/turf/simulated/mineral/floor/cave{ - name = "dirt" - }, -/area/tether_away/beach/mineshaft) "py" = ( /obj/structure/cable{ icon_state = "4-8" @@ -2152,15 +2114,6 @@ name = "dirt" }, /area/tether_away/beach/jungle) -"qp" = ( -/obj/effect/floor_decal/tracks{ - dir = 8 - }, -/obj/structure/barricade, -/turf/simulated/mineral/floor/cave{ - name = "dirt" - }, -/area/tether_away/beach/mineshaft) "qq" = ( /obj/machinery/light/small, /turf/simulated/floor/tiled/steel_dirty, @@ -2322,14 +2275,6 @@ }, /turf/simulated/floor/wood, /area/tether_away/beach/resort/dorm1) -"rM" = ( -/obj/effect/floor_decal/industrial/halfstair{ - dir = 1 - }, -/turf/simulated/floor/tiled/asteroid_steel{ - outdoors = 1 - }, -/area/tether_away/beach/resort) "rP" = ( /obj/structure/railing/grey{ dir = 1 @@ -2821,6 +2766,24 @@ }, /turf/simulated/floor/tiled/steel_dirty, /area/tether_away/beach/bunker) +"vD" = ( +/obj/effect/floor_decal/tracks{ + dir = 8 + }, +/obj/structure/table/rack/steel, +/obj/item/pickaxe, +/obj/item/pickaxe, +/obj/item/pickaxe, +/obj/item/storage/bag/ore, +/obj/item/storage/bag/ore, +/obj/item/storage/bag/ore, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/turf/simulated/mineral/floor/cave{ + name = "dirt" + }, +/area/tether_away/beach/mineshaft) "vG" = ( /obj/machinery/door/airlock/maintenance/int{ name = "Kitchen Access" @@ -2882,6 +2845,12 @@ name = "dirt" }, /area/tether_away/beach/mineshaft) +"wh" = ( +/obj/effect/floor_decal/tracks/t_north{ + dir = 9 + }, +/turf/simulated/wall/wood, +/area/tether_away/beach/mineshaft) "wi" = ( /obj/machinery/light/small{ dir = 4 @@ -3015,6 +2984,14 @@ /obj/spawner/window/full, /turf/simulated/floor/plating, /area/tether_away/beach/resort/greenhouse) +"xn" = ( +/obj/effect/floor_decal/tracks{ + dir = 8 + }, +/obj/structure/closet/crate/miningcar, +/obj/random/multiple/underdark/ores, +/turf/simulated/floor/wood, +/area/tether_away/beach/mineshaft) "xs" = ( /obj/structure/cable{ icon_state = "1-2" @@ -3119,6 +3096,15 @@ "yg" = ( /turf/simulated/wall, /area/tether_away/beach/station/tunnel) +"ym" = ( +/obj/effect/floor_decal/tracks{ + dir = 8 + }, +/obj/random/outcrop, +/turf/simulated/mineral/floor/cave{ + name = "dirt" + }, +/area/tether_away/beach/mineshaft) "yu" = ( /obj/machinery/light/small, /turf/simulated/floor/wood/broken, @@ -3159,6 +3145,14 @@ }, /turf/simulated/floor/tiled/steel_dirty, /area/tether_away/beach/desalinator) +"yK" = ( +/obj/effect/floor_decal/industrial/halfstair{ + dir = 1 + }, +/turf/simulated/floor/tiled/asteroid_steel{ + outdoors = 1 + }, +/area/tether_away/beach/resort) "yO" = ( /turf/simulated/wall/r_wall, /area/tether_away/beach/bunker/janitor) @@ -3301,15 +3295,6 @@ }, /turf/simulated/floor/tiled/asteroid_steel, /area/tether_away/beach/resort/greenhouse) -"Av" = ( -/obj/effect/floor_decal/tracks/t_north{ - dir = 9 - }, -/obj/machinery/light/flamp/noshade, -/turf/simulated/mineral/floor/cave{ - name = "dirt" - }, -/area/tether_away/beach/mineshaft) "Aw" = ( /obj/item/stool/padded, /turf/simulated/mineral/floor/cave{ @@ -3673,11 +3658,6 @@ /obj/structure/toilet, /turf/simulated/floor/tiled/asteroid_steel, /area/tether_away/beach/resort) -"DZ" = ( -/obj/structure/barricade, -/obj/effect/floor_decal/tracks, -/turf/simulated/floor/wood, -/area/tether_away/beach/mineshaft) "Ed" = ( /turf/simulated/floor/water/contaminated{ outdoors = 0 @@ -3819,24 +3799,6 @@ /obj/machinery/vending/fishing, /turf/simulated/floor/wood, /area/tether_away/beach/resort/fishing) -"Fh" = ( -/obj/effect/floor_decal/tracks{ - dir = 8 - }, -/obj/structure/table/rack/steel, -/obj/item/pickaxe, -/obj/item/pickaxe, -/obj/item/pickaxe, -/obj/item/storage/bag/ore, -/obj/item/storage/bag/ore, -/obj/item/storage/bag/ore, -/obj/item/flashlight/lantern, -/obj/item/flashlight/lantern, -/obj/item/flashlight/lantern, -/turf/simulated/mineral/floor/cave{ - name = "dirt" - }, -/area/tether_away/beach/mineshaft) "Fm" = ( /obj/structure/cable{ icon_state = "4-8" @@ -3920,6 +3882,15 @@ /obj/item/flashlight/color, /turf/simulated/floor/tiled/old_tile/white, /area/tether_away/beach/resort/lockermed) +"Gg" = ( +/obj/effect/floor_decal/tracks{ + dir = 8 + }, +/obj/structure/barricade, +/turf/simulated/mineral/floor/cave{ + name = "dirt" + }, +/area/tether_away/beach/mineshaft) "Gi" = ( /obj/machinery/door/airlock/sandstone{ id_tag = "LoveShack3" @@ -4082,6 +4053,12 @@ /obj/item/flashlight/lantern, /turf/simulated/floor/tiled/asteroid_steel, /area/tether_away/beach/mineyard) +"HF" = ( +/obj/effect/floor_decal/industrial/halfstair{ + dir = 1 + }, +/turf/simulated/floor/tiled/asteroid_steel, +/area/tether_away/beach/desalinator) "HH" = ( /obj/structure/cable/cyan, /obj/machinery/power/apc/alarms_hidden/west_mount, @@ -4162,6 +4139,12 @@ /obj/structure/reagent_dispensers/water_cooler/full, /turf/simulated/floor/wood, /area/tether_away/beach/desalinator) +"Ir" = ( +/obj/effect/floor_decal/industrial/halfstair{ + dir = 8 + }, +/turf/simulated/floor/outdoors/beach/sand/desert, +/area/tether_away/beach/desalinator) "Iu" = ( /obj/machinery/light/small{ dir = 1 @@ -4259,6 +4242,15 @@ /obj/effect/overlay/coconut, /turf/simulated/floor/outdoors/beach/sand/lowdesert, /area/tether_away/beach/jungle) +"JC" = ( +/obj/effect/floor_decal/tracks/t_north{ + dir = 9 + }, +/obj/machinery/light/flamp/noshade, +/turf/simulated/mineral/floor/cave{ + name = "dirt" + }, +/area/tether_away/beach/mineshaft) "JD" = ( /obj/structure/loot_pile/maint/trash, /turf/simulated/mineral/floor/cave{ @@ -4393,6 +4385,15 @@ "KN" = ( /turf/simulated/wall/wood, /area/tether_away/beach/coast) +"KQ" = ( +/obj/effect/floor_decal/tracks/t_north{ + dir = 9 + }, +/obj/machinery/floodlight, +/turf/simulated/mineral/floor/cave{ + name = "dirt" + }, +/area/tether_away/beach/mineshaft) "KR" = ( /obj/structure/bed/chair/bay, /turf/simulated/floor/wood/broken, @@ -4416,10 +4417,6 @@ name = "dirt" }, /area/tether_away/beach/mineshaft) -"KX" = ( -/obj/structure/sign/signnew/danger, -/turf/simulated/wall/wood, -/area/tether_away/beach/mineshaft) "Le" = ( /obj/structure/fence, /turf/simulated/floor/tiled/asteroid_steel{ @@ -4806,6 +4803,18 @@ outdoors = 1 }, /area/tether_away/beach/station/tram) +"Oz" = ( +/obj/structure/reagent_dispensers/coolanttank, +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + desc = "Its bone dry."; + name = "water pipe" + }, +/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ + desc = "Its bone dry."; + name = "water pipe" + }, +/turf/simulated/floor/tiled/steel_dirty, +/area/tether_away/beach/desalinator) "OE" = ( /obj/machinery/power/apc/alarms_hidden/north_mount, /obj/structure/cable{ @@ -4910,6 +4919,12 @@ outdoors = 1 }, /area/tether_away/beach/mineyard) +"PP" = ( +/obj/effect/floor_decal/industrial/halfstair{ + dir = 8 + }, +/turf/simulated/floor/tiled/asteroid_steel, +/area/tether_away/beach/desalinator) "PQ" = ( /obj/structure/toilet{ dir = 1 @@ -5314,12 +5329,6 @@ }, /turf/simulated/floor/tiled/steel_dirty, /area/tether_away/beach/bunker) -"Td" = ( -/obj/effect/floor_decal/tracks{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/tether_away/beach/mineshaft) "Tg" = ( /obj/machinery/door/blast/shutters{ dir = 2; @@ -5667,6 +5676,11 @@ }, /turf/simulated/floor/tiled/asteroid_steel, /area/tether_away/beach/resort/greenhouse) +"Xa" = ( +/obj/random/obstruction, +/obj/effect/floor_decal/tracks, +/turf/simulated/floor/wood, +/area/tether_away/beach/mineshaft) "Xd" = ( /turf/simulated/floor/water/deep/indoors, /area/tether_away/beach/water) @@ -5825,6 +5839,10 @@ outdoors = 1 }, /area/tether_away/beach/aa) +"YQ" = ( +/obj/effect/floor_decal/tracks, +/turf/simulated/floor/wood, +/area/tether_away/beach/mineshaft) "YR" = ( /obj/structure/cable/cyan{ icon_state = "1-2" @@ -5932,30 +5950,12 @@ /mob/living/simple_mob/animal/roach/jaeger, /turf/simulated/floor/tiled/steel_dirty, /area/tether_away/beach/desalinator) -"ZQ" = ( -/obj/structure/reagent_dispensers/coolanttank, -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - desc = "Its bone dry."; - name = "water pipe" - }, -/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ - desc = "Its bone dry."; - name = "water pipe" - }, -/turf/simulated/floor/tiled/steel_dirty, -/area/tether_away/beach/desalinator) "ZS" = ( /obj/structure/loot_pile/mecha/ripley/random_sprite, /turf/simulated/mineral/floor/cave{ name = "dirt" }, /area/tether_away/beach/mineshaft) -"ZW" = ( -/obj/effect/floor_decal/tracks/t_north{ - dir = 9 - }, -/turf/simulated/wall/wood, -/area/tether_away/beach/mineshaft) "ZX" = ( /obj/structure/cable/cyan{ icon_state = "1-8" @@ -7725,7 +7725,7 @@ ZC ZC ZC Wd -kj +xn Wd ZC ZC @@ -8106,16 +8106,16 @@ Cg an aL Wd -cp +ym aL aL -Av +JC Wd aL aL aG aL -jw +KQ ZC ZC ZC @@ -8310,8 +8310,8 @@ PV aG PV PV -qp -KX +Gg +pt fQ PV PV @@ -8492,26 +8492,26 @@ Cg "} (14,1,1) = {" an -eX -eX -eX -eX -eX -eX -eX -eX -eX -kE -eX -eX -DZ -di -di -di -eX -eX -eX -di +YQ +YQ +YQ +YQ +YQ +YQ +YQ +YQ +YQ +ga +YQ +YQ +hu +Xa +Xa +Xa +YQ +YQ +YQ +Xa au au xy @@ -8695,11 +8695,11 @@ PV PV PV PV -Td +hv aL xy -qp -KX +Gg +pt au xy wg @@ -8884,12 +8884,12 @@ PV Wd PV PV -cp +ym PV Wd aL aL -Td +hv aL aL ZC @@ -9082,8 +9082,8 @@ ZC ZC ZC ZC -px -Td +bI +hv aL ZC ZC @@ -9277,7 +9277,7 @@ ZC ZC ZC Wd -Td +hv Wd ZC ZC @@ -9471,8 +9471,8 @@ ZC ZC ZC aL -Td -Av +hv +JC ZC ZC zV @@ -9665,7 +9665,7 @@ ZC ZC ZC aL -Td +hv aL ZC ZC @@ -9859,7 +9859,7 @@ ZC ZC ZC aL -Td +hv aL ZC ZC @@ -10052,9 +10052,9 @@ ZC ZC ZC ZC -ZW -Td -ZW +wh +hv +wh ZC ZC zV @@ -10247,7 +10247,7 @@ ZC ZC ZC aL -Td +hv aL ZC ZC @@ -10441,7 +10441,7 @@ ZC ZC ZC aL -Td +hv aL ZC ZC @@ -10634,8 +10634,8 @@ ZC ZC ZC ZC -px -Td +bI +hv aL ZC ZC @@ -10829,8 +10829,8 @@ ZC ZC ZC aL -Td -Av +hv +JC ZC ZC zV @@ -11023,7 +11023,7 @@ ZC ZC ZC Wd -Td +hv Wd ZC ZC @@ -11217,7 +11217,7 @@ ZC ZC ZC aL -Td +hv aL ZC ZC @@ -11308,7 +11308,7 @@ ZC JX aG av -la +ej xy xy xy @@ -11411,7 +11411,7 @@ ZC ZC ZC aL -Td +hv aL ZC ZC @@ -11605,8 +11605,8 @@ ZC ZC ZC PV -Td -cp +hv +ym ZC ZC TK @@ -11696,7 +11696,7 @@ ZC ZC ZC av -la +ej xy xy xy @@ -11799,7 +11799,7 @@ ZC ZC ZC Wd -Td +hv Wd ZC bq @@ -11992,8 +11992,8 @@ ZC ZC ZC ZC -Fh -Td +vD +hv aL ZC bq @@ -12187,7 +12187,7 @@ ZC ZC ZC PV -Td +hv aL ZC bq @@ -23534,7 +23534,7 @@ RD as RD Kq -gf +eh zw zw Nv @@ -32476,8 +32476,8 @@ oW oW fP xZ -jJ -jJ +Ir +Ir jh gM oW @@ -32656,7 +32656,7 @@ zw zw zw zw -rM +yK aK aK aK @@ -32850,7 +32850,7 @@ zw zw zw zw -rM +yK aK aK aK @@ -33060,8 +33060,8 @@ QW aK pd yf -gC -gC +PP +PP yf yf yf @@ -33253,7 +33253,7 @@ ak Hx aK aK -eZ +HF NQ NQ pA @@ -33447,7 +33447,7 @@ ak SM aK aK -eZ +HF NQ NQ pA @@ -34358,7 +34358,7 @@ aa aa aa aa -aa +Dr aa aa aa @@ -35015,7 +35015,7 @@ ry ry CG CG -ZQ +Oz yf xe yf @@ -35522,7 +35522,7 @@ aa aa aa aa -Dr +aa aa aa aa diff --git a/maps/sectors/piratebase_192/levels/piratebase_192.dmm b/maps/sectors/piratebase_192/levels/piratebase_192.dmm index 2121c4b02e22..adb8f29930a7 100644 --- a/maps/sectors/piratebase_192/levels/piratebase_192.dmm +++ b/maps/sectors/piratebase_192/levels/piratebase_192.dmm @@ -19983,11 +19983,11 @@ Tg Tg Tg Tg -FU Tg Tg Tg Tg +FU Tg Tg Tg @@ -35115,7 +35115,6 @@ Tg Tg Tg Tg -FU Tg Tg Tg @@ -35125,6 +35124,7 @@ Tg Tg Tg Tg +FU Tg Tg Tg diff --git a/maps/sectors/tradeport/shuttles.dm b/maps/sectors/tradeport/shuttles.dm index 4c74558d4d93..73c3f103f4e3 100644 --- a/maps/sectors/tradeport/shuttles.dm +++ b/maps/sectors/tradeport/shuttles.dm @@ -30,37 +30,3 @@ /area/shuttle/trade_ship/cockpit name = "\improper Beruang Trade Shuttle Cockpit" - -// Tradeport Off-Map Visitor shuttle -/datum/shuttle/autodock/overmap/visitor_ship - name = "Beluga Passenger Liner" - warmup_time = 10 - shuttle_area = list(/area/shuttle/visitor_ship/general, /area/shuttle/visitor_ship/cockpit) - current_location = "nebula_pad_3" - docking_controller_tag = "visitor_space_lock" - fuel_consumption = 10 - move_time = 10 - -/obj/overmap/entity/visitable/ship/landable/visitor_ship - name = "Beluga Passenger Liner" - desc = "You know our motto: 'Right place right time!'" - color = "#754116" //Brown - fore_dir = WEST - vessel_mass = 10000 - vessel_size = SHIP_SIZE_SMALL - shuttle = "Beluga Passenger Liner" - -/obj/machinery/computer/shuttle_control/explore/visitor_ship - name = "short jump console" - shuttle_tag = "Beluga Passenger Liner" - -/area/shuttle/visitor_ship - requires_power = 1 - icon_state = "shuttle2" - area_flags = AREA_RAD_SHIELDED - -/area/shuttle/visitor_ship/general - name = "\improper Beluga Passenger Liner" - -/area/shuttle/visitor_ship/cockpit - name = "\improper Beluga Passenger Liner Cockpit" diff --git a/maps/sectors/tradeport_192/levels/tradeport_192.dmm b/maps/sectors/tradeport_192/levels/tradeport_192.dmm index 579a4ac3a25c..0fb7c51fbd46 100644 --- a/maps/sectors/tradeport_192/levels/tradeport_192.dmm +++ b/maps/sectors/tradeport_192/levels/tradeport_192.dmm @@ -312,6 +312,13 @@ }, /turf/simulated/floor/tiled/old_tile/blue, /area/tradeport/spine) +"bb" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 + }, +/obj/effect/paint/wallgunmetal, +/turf/simulated/wall/rshull, +/area/shuttle/trade_ship/general) "bc" = ( /turf/simulated/wall/r_wall, /area/tradeport/spine) @@ -396,12 +403,6 @@ /obj/item/reagent_containers/glass/bucket, /turf/simulated/floor/grass, /area/tradeport) -"br" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5 - }, -/turf/simulated/shuttle/wall/voidcraft, -/area/shuttle/trade_ship/general) "bs" = ( /obj/structure/railing{ dir = 4 @@ -519,6 +520,17 @@ }, /turf/simulated/mineral/floor/vacuum, /area/tradeport/atmospherics) +"bV" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/firedoor, +/obj/structure/catwalk, +/turf/simulated/floor, +/area/tradeport/pads) "bW" = ( /obj/structure/closet/crate/bin{ anchored = 1 @@ -712,10 +724,6 @@ }, /turf/simulated/floor/wood, /area/tradeport/commons) -"cF" = ( -/obj/machinery/atmospherics/pipe/manifold4w/hidden, -/turf/simulated/shuttle/wall/voidcraft, -/area/shuttle/trade_ship/general) "cG" = ( /obj/machinery/portable_atmospherics/canister/phoron, /obj/machinery/light/small{ @@ -1071,6 +1079,13 @@ }, /turf/simulated/floor/tiled/neutral, /area/tradeport/facility) +"dQ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/universal{ + dir = 4 + }, +/obj/effect/paint/wallgunmetal, +/turf/simulated/wall/rshull, +/area/shuttle/trade_ship/general) "dR" = ( /obj/machinery/vending/snack{ name = "hacked Getmore Chocolate Corp"; @@ -1235,6 +1250,13 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tradeport/engineering) +"ev" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/effect/paint/wallgunmetal, +/turf/simulated/wall/rshull, +/area/shuttle/trade_ship/general) "ew" = ( /obj/structure/railing{ dir = 8 @@ -1292,6 +1314,20 @@ /obj/structure/table/bench/steel, /turf/simulated/floor/tiled/old_tile/red, /area/tradeport) +"eH" = ( +/obj/machinery/access_button{ + command = "cycle_int"; + frequency = 8018; + master_tag = "trade_space_lock"; + pixel_x = -25; + pixel_y = -5 + }, +/obj/machinery/door/airlock/glass_external{ + name = "Ship Hatch" + }, +/obj/map_helper/airlock/door/int_door, +/turf/simulated/floor/tiled/dark, +/area/shuttle/trade_ship/general) "eI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -1369,6 +1405,22 @@ }, /turf/simulated/floor/wood, /area/shuttle/trade_ship/general) +"eV" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/catwalk, +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + frequency = 1380; + id_tag = "nebula_pump3d"; + name = "Nebula Pump Controller"; + pixel_x = -25 + }, +/turf/simulated/floor, +/area/tradeport/pads) "eW" = ( /obj/structure/window/reinforced, /obj/machinery/door/blast/shutters{ @@ -1576,6 +1628,14 @@ /obj/structure/flora/grass/brown, /turf/simulated/floor/snow, /area/tradeport/cyndishow) +"fJ" = ( +/obj/machinery/vending/assist{ + contraband = null; + name = "Old Vending Machine"; + products = list(/obj/item/assembly/prox_sensor = 5, /obj/item/assembly/signaler = 4, /obj/item/assembly/infra = 4, /obj/item/assembly/prox_sensor = 4, /obj/item/handcuffs = 8, /obj/item/flash = 4, /obj/item/cartridge/signal = 4, /obj/item/clothing/glasses/sunglasses = 4) + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/trade_ship/cockpit) "fK" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/biogenerator, @@ -1679,6 +1739,14 @@ }, /turf/simulated/floor/carpet/blue, /area/tradeport/commons) +"gb" = ( +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + frequency = 8018; + id_tag = "trade_space_lock"; + pixel_x = -25 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/trade_ship/general) "gc" = ( /obj/structure/window/reinforced{ dir = 1 @@ -1708,6 +1776,13 @@ }, /turf/simulated/floor/tiled/dark, /area/shuttle/trade_ship/general) +"gf" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9 + }, +/obj/effect/paint/wallgunmetal, +/turf/simulated/wall/rshull, +/area/shuttle/trade_ship/general) "gg" = ( /turf/simulated/floor/tiled/old_tile/blue, /area/tradeport/spine) @@ -1798,19 +1873,27 @@ }, /turf/simulated/floor/tiled/dark, /area/shuttle/trade_ship/general) -"gs" = ( -/obj/machinery/embedded_controller/radio/simple_docking_controller{ - frequency = 1380; - id_tag = "nebula_pump3"; - name = "Nebula Pump Controller"; - pixel_x = 25 - }, +"gu" = ( /obj/machinery/light{ - dir = 4 + dir = 1 }, -/obj/machinery/atmospherics/portables_connector, -/turf/simulated/floor/reinforced, -/area/tradeport/pads) +/obj/item/radio/intercom/trader{ + dir = 1; + pixel_y = 25 + }, +/obj/structure/closet/crate, +/obj/fiftyspawner/bcarpet, +/obj/fiftyspawner/blucarpet, +/obj/fiftyspawner/arcadecarpet, +/obj/fiftyspawner/carpet, +/obj/fiftyspawner/gaycarpet, +/obj/fiftyspawner/oracarpet, +/obj/fiftyspawner/purcarpet, +/obj/fiftyspawner/sblucarpet, +/obj/fiftyspawner/tealcarpet, +/obj/fiftyspawner/turcarpet, +/turf/simulated/floor/tiled/dark, +/area/tradeport/facility) "gv" = ( /obj/machinery/light, /turf/simulated/floor/tiled/neutral, @@ -1855,23 +1938,6 @@ /obj/item/contraband/poster, /turf/simulated/floor/wood, /area/tradeport/cyndi) -"gH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/airlock/multi_tile/glass{ - name = "Nebula Gas - Employees Only"; - req_access = list(160); - req_one_access = null - }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/door/firedoor{ - req_one_access = list(160) - }, -/turf/simulated/floor/tiled/neutral, -/area/tradeport) "gJ" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -1922,6 +1988,22 @@ }, /turf/simulated/floor/tiled/neutral, /area/tradeport/commons) +"gS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/airlock/multi_tile/glass{ + name = "Nebula Gas - Employees Only"; + req_access = list(160) + }, +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/door/firedoor{ + req_one_access = list(160) + }, +/turf/simulated/floor/tiled/neutral, +/area/tradeport) "gU" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -1942,18 +2024,6 @@ /obj/machinery/meter, /turf/simulated/floor/plating, /area/tradeport/pads) -"gW" = ( -/obj/machinery/embedded_controller/radio/simple_docking_controller{ - frequency = 1380; - id_tag = "nebula_pump2"; - name = "Nebula Pump Controller"; - pixel_x = -25 - }, -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/reinforced, -/area/tradeport/pads) "gX" = ( /obj/effect/floor_decal/industrial/outline/grey, /obj/structure/closet/crate, @@ -2038,13 +2108,6 @@ }, /turf/simulated/floor/tiled/dark, /area/shuttle/trade_ship/general) -"hm" = ( -/obj/machinery/camera{ - dir = 8 - }, -/obj/structure/catwalk, -/turf/simulated/floor, -/area/tradeport/pads) "hn" = ( /obj/effect/shuttle_landmark{ base_area = /area/space; @@ -2103,22 +2166,31 @@ /obj/machinery/vending/coffee, /turf/simulated/floor/tiled/old_tile/gray, /area/shuttle/trade_ship/general) +"hC" = ( +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + frequency = 1380; + id_tag = "nebula_pump1b"; + name = "Nebula Pump Controller"; + pixel_x = 25 + }, +/turf/simulated/floor/reinforced, +/area/tradeport/pads) "hD" = ( /obj/structure/cryofeed{ dir = 4 }, /turf/simulated/floor/tiled/techfloor/grid, /area/tradeport/commons) +"hF" = ( +/obj/structure/table/steel_reinforced, +/obj/fiftyspawner/wmarble, +/obj/fiftyspawner/bmarble, +/turf/simulated/floor/tiled/dark, +/area/tradeport/facility) "hJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/neutral, /area/tradeport/facility) -"hK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10 - }, -/turf/simulated/shuttle/wall/voidcraft, -/area/shuttle/trade_ship/general) "hL" = ( /obj/structure/table/rack/shelf/steel, /obj/machinery/light, @@ -2302,6 +2374,16 @@ }, /turf/simulated/floor/tiled/neutral, /area/tradeport/commons) +"it" = ( +/obj/effect/shuttle_landmark{ + base_area = /area/tradeport/pads; + base_turf = /turf/simulated/floor/reinforced; + docking_controller = "nebula_pump3d"; + landmark_tag = "nebula_pad_3d"; + name = "Nebula Pad 3d" + }, +/turf/simulated/floor/reinforced, +/area/tradeport/pads) "iu" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -2339,12 +2421,6 @@ }, /turf/simulated/floor/wood, /area/tradeport/cafeteria) -"iz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 6 - }, -/turf/simulated/shuttle/wall/voidcraft, -/area/shuttle/trade_ship/general) "iA" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -3018,12 +3094,6 @@ }, /turf/simulated/shuttle/floor/white, /area/tradeport/commons) -"kI" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 1 - }, -/turf/simulated/shuttle/wall/voidcraft, -/area/shuttle/trade_ship/general) "kJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -3353,6 +3423,13 @@ }, /turf/simulated/floor, /area/tradeport/pads) +"lN" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 8 + }, +/obj/effect/paint/wallgunmetal, +/turf/simulated/wall/rshull, +/area/shuttle/trade_ship/general) "lO" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 @@ -3432,15 +3509,6 @@ }, /turf/simulated/floor/tiled/dark, /area/shuttle/trade_ship/cockpit) -"md" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - dir = 4; - name = "Nebula Commercial District"; - req_access = null - }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/old_tile/blue, -/area/tradeport) "mf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/old_tile/purple, @@ -3476,6 +3544,15 @@ }, /turf/simulated/floor/tiled/old_tile/yellow, /area/tradeport/safari) +"mj" = ( +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + frequency = 1380; + id_tag = "nebula_pump5b"; + name = "Nebula Pump Controller"; + pixel_x = 25 + }, +/turf/simulated/floor/reinforced, +/area/tradeport/pads) "ml" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -3575,6 +3652,11 @@ /obj/random/paintkit, /turf/simulated/floor/tiled/dark, /area/shuttle/trade_ship/general) +"mE" = ( +/obj/machinery/door/firedoor, +/obj/structure/catwalk, +/turf/simulated/floor, +/area/tradeport/pads) "mF" = ( /obj/structure/table/rack/shelf/steel, /obj/item/syndie/c4explosive, @@ -3606,6 +3688,15 @@ }, /turf/simulated/floor/tiled/old_tile/red, /area/tradeport) +"mI" = ( +/obj/machinery/vending/sovietsoda{ + contraband = list(/obj/item/reagent_containers/food/drinks/cans/crystalgibb = 20); + desc = "An old sweet water vending machine. It looks like someone crossed out the D and replaced it with an F."; + name = "BOFA"; + products = list(/obj/item/reagent_containers/food/drinks/cans/thirteenloko = 20) + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/trade_ship/general) "mJ" = ( /turf/simulated/floor/tiled/hydro, /area/tradeport/cyndishow) @@ -3714,6 +3805,18 @@ }, /turf/simulated/floor/tiled/dark, /area/tradeport/facility) +"nc" = ( +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + frequency = 1380; + id_tag = "nebula_pump1a"; + name = "Nebula Pump Controller"; + pixel_x = 25 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/reinforced, +/area/tradeport/pads) "nd" = ( /obj/effect/floor_decal/techfloor{ dir = 4 @@ -3793,14 +3896,6 @@ /obj/structure/flora/tree/jungle_small, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/tradeport/safarizoo) -"ns" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - dir = 4; - name = "Nebula Commercial District"; - req_access = null - }, -/turf/simulated/floor/tiled/old_tile/red, -/area/tradeport) "nt" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -3824,18 +3919,16 @@ /obj/item/reagent_containers/food/condiment/enzyme, /turf/simulated/floor/wmarble, /area/tradeport/cafeteria) +"nv" = ( +/obj/effect/paint/purple, +/turf/simulated/wall/rshull, +/area/shuttle/trade_ship/general) "nw" = ( /obj/structure/closet/walllocker/autolok_wall{ pixel_y = 24 }, /turf/simulated/floor/tiled/dark, /area/shuttle/trade_ship/cockpit) -"nB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/turf/simulated/shuttle/wall/voidcraft, -/area/shuttle/trade_ship/general) "nC" = ( /obj/effect/floor_decal/industrial/warning, /obj/structure/largecrate/vehicle/bike, @@ -3889,12 +3982,6 @@ }, /turf/simulated/floor/wood, /area/tradeport) -"nM" = ( -/obj/machinery/holosign/bar{ - id = "tradersign" - }, -/turf/simulated/shuttle/wall/voidcraft/hard_corner, -/area/shuttle/trade_ship/general) "nO" = ( /obj/machinery/atmospherics/component/binary/pump/high_power/on{ dir = 8; @@ -3979,17 +4066,6 @@ }, /turf/simulated/floor/tiled/dark, /area/tradeport/facility) -"og" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/door/firedoor{ - dir = 2 - }, -/turf/simulated/floor/tiled/old_tile/red, -/area/tradeport) "oj" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 @@ -4009,6 +4085,17 @@ }, /turf/simulated/floor/plating, /area/tradeport/atmospherics) +"ol" = ( +/obj/machinery/atmospherics/pipe/simple/visible, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/map_helper/airlock/door/int_door, +/obj/machinery/door/airlock/glass_external{ + name = "Ship Hatch" + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/trade_ship/general) "on" = ( /obj/machinery/portable_atmospherics/canister/air, /turf/simulated/floor/reinforced/airmix, @@ -4023,6 +4110,15 @@ "op" = ( /turf/simulated/wall/r_wall, /area/tradeport/cyndi) +"ot" = ( +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + frequency = 1380; + id_tag = "nebula_pump2b"; + name = "Nebula Pump Controller"; + pixel_x = -25 + }, +/turf/simulated/floor/reinforced, +/area/tradeport/pads) "ou" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8; @@ -4047,6 +4143,13 @@ }, /turf/simulated/floor/tiled/red, /area/shuttle/trade_ship/general) +"ox" = ( +/obj/machinery/door/airlock/glass_external{ + name = "Ship Hatch" + }, +/obj/map_helper/airlock/door/ext_door, +/turf/simulated/floor/tiled/dark, +/area/shuttle/trade_ship/general) "oy" = ( /obj/structure/table/glass, /obj/item/radio/intercom/trader{ @@ -4318,6 +4421,13 @@ }, /turf/simulated/floor/tiled/dark, /area/shuttle/trade_ship/general) +"pE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, +/obj/effect/paint/wallgunmetal, +/turf/simulated/wall/rshull, +/area/shuttle/trade_ship/general) "pG" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -4461,6 +4571,19 @@ }, /turf/simulated/floor/plating, /area/tradeport) +"qi" = ( +/obj/map_helper/airlock/door/int_door, +/obj/machinery/door/airlock/glass_external{ + name = "Ship Hatch" + }, +/obj/machinery/access_button/airlock_interior{ + frequency = 1380; + master_tag = "tradeport_hangar_docker"; + pixel_x = -25; + pixel_y = 5 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/trade_ship/general) "qj" = ( /obj/structure/sign/warning/docking_area, /turf/simulated/wall/r_wall, @@ -4776,6 +4899,22 @@ }, /turf/simulated/floor/airless, /area/space) +"rl" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/map_helper/airlock/door/ext_door, +/obj/machinery/door/airlock/glass_external{ + name = "Ship Hatch" + }, +/obj/machinery/access_button/airlock_exterior{ + frequency = 1380; + master_tag = "tradeport_hangar_docker"; + pixel_x = 25; + pixel_y = -5 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/trade_ship/general) "rm" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled/neutral, @@ -5111,12 +5250,6 @@ }, /turf/simulated/floor/tiled/dark, /area/shuttle/trade_ship/general) -"sO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/shuttle/wall/voidcraft, -/area/shuttle/trade_ship/general) "sP" = ( /turf/simulated/wall/r_wall, /area/tradeport/facility) @@ -5381,14 +5514,6 @@ }, /turf/simulated/floor/plating, /area/tradeport/dock) -"tP" = ( -/obj/machinery/door/airlock/glass_external{ - frequency = null; - name = "Ship Hatch" - }, -/obj/map_helper/airlock/door/ext_door, -/turf/simulated/floor/tiled/dark, -/area/shuttle/trade_ship/general) "tR" = ( /obj/machinery/light{ dir = 4 @@ -5558,15 +5683,6 @@ /obj/machinery/recharge_station, /turf/simulated/floor/tiled/dark, /area/shuttle/trade_ship/general) -"uE" = ( -/obj/structure/shuttle/engine/heater{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/turf/simulated/shuttle/wall/voidcraft, -/area/shuttle/trade_ship/general) "uF" = ( /obj/structure/window/reinforced{ dir = 1 @@ -5860,6 +5976,15 @@ }, /turf/simulated/floor/tiled/dark, /area/tradeport/facility) +"vt" = ( +/obj/machinery/atmospherics/component/unary/outlet_injector{ + dir = 4; + frequency = 1445; + id = "burn_in"; + volume_rate = 700 + }, +/turf/simulated/mineral/floor/vacuum, +/area/tradeport/atmospherics) "vv" = ( /obj/structure/table/rack/shelf/steel, /obj/item/silencer, @@ -5899,6 +6024,30 @@ }, /turf/simulated/floor/tiled/neutral, /area/tradeport/atmospherics) +"vz" = ( +/obj/machinery/vending/cigarette{ + name = "Cigarette machine"; + prices = list(); + products = list(/obj/item/storage/fancy/cigarettes = 10, /obj/item/storage/box/matches = 10, /obj/item/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2) + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/trade_ship/cockpit) +"vA" = ( +/obj/machinery/atmospherics/component/unary/vent_pump{ + dir = 4; + external_pressure_bound = 0; + external_pressure_bound_default = 0; + frequency = null; + icon_state = "map_vent_in"; + initialize_directions = 1; + internal_pressure_bound = 4000; + internal_pressure_bound_default = 4000; + pressure_checks = 2; + pressure_checks_default = 2; + pump_direction = 0 + }, +/turf/simulated/floor/reinforced/airmix, +/area/tradeport/atmospherics) "vC" = ( /obj/structure/closet/jcloset, /obj/random/soap, @@ -5919,16 +6068,6 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/tradeport/cafeteria) -"vE" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - dir = 4; - name = "Nebula Commercial District"; - req_access = null - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/old_tile/blue, -/area/tradeport/commhall) "vF" = ( /obj/structure/window/reinforced{ dir = 1 @@ -5965,12 +6104,6 @@ }, /turf/simulated/floor/wood, /area/tradeport/cyndishow) -"vO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9 - }, -/turf/simulated/shuttle/wall/voidcraft, -/area/shuttle/trade_ship/general) "vP" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /obj/map_helper/airlock/atmos/chamber_pump, @@ -6098,12 +6231,6 @@ }, /turf/simulated/floor/tiled/old_tile/beige, /area/tradeport/safari) -"wl" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8 - }, -/turf/simulated/shuttle/wall/voidcraft, -/area/shuttle/trade_ship/general) "wn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -6461,6 +6588,13 @@ }, /turf/simulated/floor/tiled/old_tile/blue, /area/tradeport) +"xy" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 + }, +/obj/effect/paint/wallgunmetal, +/turf/simulated/wall/rshull, +/area/shuttle/trade_ship/general) "xz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -6756,6 +6890,15 @@ }, /turf/simulated/floor/tiled/dark, /area/shuttle/trade_ship/general) +"yy" = ( +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 4; + name = "Nebula Commercial District" + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/old_tile/blue, +/area/tradeport/commhall) "yB" = ( /obj/machinery/light{ dir = 1 @@ -6863,6 +7006,12 @@ }, /turf/simulated/floor/tiled/old_tile/gray, /area/shuttle/trade_ship/general) +"yS" = ( +/obj/structure/table/steel_reinforced, +/obj/fiftyspawner/wood, +/obj/fiftyspawner/wood, +/turf/simulated/floor/tiled/dark, +/area/tradeport/facility) "yT" = ( /obj/structure/undies_wardrobe, /obj/effect/floor_decal/spline/fancy/wood{ @@ -7094,31 +7243,6 @@ }, /turf/simulated/floor/tiled/dark, /area/shuttle/trade_ship/general) -"zH" = ( -/obj/machinery/access_button{ - command = "cycle_ext"; - frequency = 8018; - master_tag = "trade_space_lock"; - pixel_x = 25; - pixel_y = 5 - }, -/obj/machinery/door/airlock/glass_external{ - frequency = null; - name = "Ship Hatch" - }, -/obj/map_helper/airlock/door/ext_door, -/turf/simulated/floor/tiled/dark, -/area/shuttle/trade_ship/general) -"zJ" = ( -/obj/machinery/atmospherics/component/unary/outlet_injector{ - dir = 4; - frequency = 1445; - id = "burn_in"; - req_access = null; - volume_rate = 700 - }, -/turf/simulated/mineral/floor/vacuum, -/area/tradeport/atmospherics) "zK" = ( /obj/machinery/vending/hydronutrients, /turf/simulated/floor/grass, @@ -7215,6 +7339,19 @@ }, /turf/simulated/floor/tiled/old_tile/beige, /area/tradeport/commhall) +"Ae" = ( +/obj/machinery/camera{ + dir = 8 + }, +/obj/structure/catwalk, +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + frequency = 1380; + id_tag = "nebula_pump4d"; + name = "Nebula Pump Controller"; + pixel_x = 25 + }, +/turf/simulated/floor, +/area/tradeport/pads) "Ah" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 @@ -7291,15 +7428,11 @@ /obj/machinery/light, /turf/simulated/floor/tiled/dark, /area/tradeport/facility) -"AA" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/table/steel_reinforced, -/obj/fiftyspawner/glass, -/obj/fiftyspawner/steel, -/turf/simulated/floor/tiled/dark, -/area/tradeport/facility) +"AB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/effect/paint/wallgunmetal, +/turf/simulated/wall/rshull, +/area/shuttle/trade_ship/general) "AD" = ( /turf/simulated/floor/tiled/asteroid_steel/airless, /area/tradeport/pads) @@ -7326,10 +7459,6 @@ /obj/structure/catwalk, /turf/simulated/floor, /area/tradeport/pads) -"AJ" = ( -/obj/structure/table/steel_reinforced, -/turf/simulated/floor/tiled/dark, -/area/tradeport/facility) "AK" = ( /obj/effect/debris/cleanable/blood, /obj/item/bone/skull, @@ -7361,16 +7490,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/tradeport/medical) -"AS" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/item/radio/intercom/trader{ - dir = 1; - pixel_y = 25 - }, -/turf/simulated/floor/tiled/dark, -/area/tradeport/facility) "AT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -7403,20 +7522,6 @@ }, /turf/simulated/floor/tiled/old_tile/blue, /area/tradeport) -"AV" = ( -/mob/living/bot/cleanbot/edCLN{ - desc = "A large cleaning robot. It's nametag reads 'Jim'."; - move_speed = 6; - name = "Jim" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/tiled/old_cargo/beige, -/area/tradeport/atmospherics) "AW" = ( /obj/structure/inflatable, /turf/simulated/floor/airless, @@ -7553,21 +7658,6 @@ /obj/structure/window/phoronreinforced/full, /turf/simulated/floor/plating, /area/tradeport/atmospherics) -"Bq" = ( -/obj/machinery/access_button{ - command = "cycle_int"; - frequency = 8018; - master_tag = "trade_space_lock"; - pixel_x = -25; - pixel_y = -5 - }, -/obj/machinery/door/airlock/glass_external{ - frequency = null; - name = "Ship Hatch" - }, -/obj/map_helper/airlock/door/int_door, -/turf/simulated/floor/tiled/dark, -/area/shuttle/trade_ship/general) "Bs" = ( /obj/machinery/vending/loadout/clothing, /obj/effect/floor_decal/spline/fancy/wood{ @@ -7605,6 +7695,11 @@ /obj/structure/lightpost, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/tradeport/safarizoo) +"By" = ( +/obj/machinery/atmospherics/pipe/manifold4w/hidden, +/obj/effect/paint/wallgunmetal, +/turf/simulated/wall/rshull, +/area/shuttle/trade_ship/general) "Bz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, @@ -7672,6 +7767,16 @@ }, /turf/simulated/floor/tiled/dark, /area/shuttle/trade_ship/cockpit) +"BL" = ( +/obj/structure/shuttle/engine/heater{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/effect/paint/wallgunmetal, +/turf/simulated/wall/rshull, +/area/shuttle/trade_ship/general) "BM" = ( /obj/structure/grille, /obj/structure/window/phoronreinforced/full, @@ -7698,20 +7803,6 @@ /obj/machinery/washing_machine, /turf/simulated/shuttle/floor/white, /area/tradeport/commons) -"BU" = ( -/obj/map_helper/airlock/door/int_door, -/obj/machinery/door/airlock/glass_external{ - frequency = null; - name = "Ship Hatch" - }, -/obj/machinery/access_button/airlock_interior{ - frequency = 1380; - master_tag = "tradeport_hangar_docker"; - pixel_x = -25; - pixel_y = 5 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/trade_ship/general) "BV" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -7756,9 +7847,6 @@ }, /turf/simulated/floor/snow, /area/tradeport/cyndishow) -"BZ" = ( -/turf/simulated/shuttle/wall/voidcraft, -/area/shuttle/trade_ship/cockpit) "Ca" = ( /obj/machinery/vending/loadout/overwear, /turf/simulated/floor/wood, @@ -7769,6 +7857,15 @@ }, /turf/simulated/floor/wood, /area/tradeport/commons) +"Cc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/old_tile/red, +/area/tradeport) "Cd" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/dark, @@ -7905,18 +8002,6 @@ }, /turf/simulated/wall/r_wall, /area/tradeport/pads) -"Cy" = ( -/obj/machinery/camera{ - dir = 4 - }, -/obj/machinery/vending/sovietsoda{ - contraband = list(/obj/item/reagent_containers/food/drinks/cans/crystalgibb=20); - desc = "An old sweet water vending machine. It looks like someone crossed out the D and replaced it with an F."; - name = "BOFA"; - products = list(/obj/item/reagent_containers/food/drinks/cans/thirteenloko=20) - }, -/turf/simulated/floor/tiled/old_tile/blue, -/area/tradeport) "Cz" = ( /obj/machinery/vending/loadout/overwear, /obj/effect/floor_decal/spline/fancy/wood{ @@ -8183,18 +8268,6 @@ }, /turf/simulated/floor/tiled/old_tile/gray, /area/shuttle/trade_ship/general) -"DI" = ( -/obj/machinery/vending/cigarette{ - name = "Cigarette machine"; - prices = list(); - products = list(/obj/item/storage/fancy/cigarettes=10,/obj/item/storage/box/matches=10,/obj/item/flame/lighter/zippo=4,/obj/item/clothing/mask/smokable/cigarette/cigar/havana=2) - }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 1 - }, -/obj/effect/floor_decal/spline/fancy/wood, -/turf/simulated/floor/carpet/bcarpet, -/area/tradeport/commons) "DK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -8218,6 +8291,10 @@ /mob/living/simple_mob/vore/redpanda, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/tradeport/safarizoo) +"DQ" = ( +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/old_tile/blue, +/area/tradeport) "DR" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, @@ -8370,13 +8447,12 @@ /obj/effect/floor_decal/spline/fancy/wood, /turf/simulated/floor/carpet/bcarpet, /area/tradeport/commons) -"Er" = ( -/obj/machinery/vending/sovietsoda{ - contraband = list(/obj/item/reagent_containers/food/drinks/cans/crystalgibb=20); - desc = "An old sweet water vending machine. It looks like someone crossed out the D and replaced it with an F."; - name = "BOFA"; - products = list(/obj/item/reagent_containers/food/drinks/cans/thirteenloko=20) +"Eq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/door/airlock/glass_external{ + name = "Ship Hatch" }, +/obj/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled/dark, /area/shuttle/trade_ship/general) "Et" = ( @@ -8498,12 +8574,6 @@ }, /turf/simulated/floor/tiled/dark, /area/shuttle/trade_ship/cockpit) -"EQ" = ( -/obj/machinery/door/firedoor{ - dir = 2 - }, -/turf/simulated/floor/tiled/old_tile/blue, -/area/tradeport) "ER" = ( /obj/effect/shuttle_landmark{ base_area = /area/tradeport/pads; @@ -8548,6 +8618,20 @@ }, /turf/simulated/floor/wood, /area/tradeport/cafeteria) +"Fa" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/mob/living/bot/cleanbot/edCLN{ + desc = "A large cleaning robot. It's nametag reads 'Jim'."; + move_speed = 6; + name = "Jim" + }, +/turf/simulated/floor/tiled/old_cargo/beige, +/area/tradeport/atmospherics) "Fb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/old_tile/beige, @@ -8630,14 +8714,6 @@ }, /turf/simulated/floor/carpet, /area/shuttle/trade_ship/general) -"Fq" = ( -/obj/machinery/vending/cigarette{ - name = "Cigarette machine"; - prices = list(); - products = list(/obj/item/storage/fancy/cigarettes=10,/obj/item/storage/box/matches=10,/obj/item/flame/lighter/zippo=4,/obj/item/clothing/mask/smokable/cigarette/cigar/havana=2) - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/trade_ship/cockpit) "Fr" = ( /obj/structure/table/steel_reinforced, /obj/item/cell/hyper, @@ -8687,6 +8763,15 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/tradeport/dock) +"FA" = ( +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + frequency = 1380; + id_tag = "nebula_pump6b"; + name = "Nebula Pump Controller"; + pixel_x = -25 + }, +/turf/simulated/floor/reinforced, +/area/tradeport/pads) "FC" = ( /obj/structure/table/glass, /obj/item/radio/intercom/trader{ @@ -8712,6 +8797,13 @@ }, /turf/simulated/floor/plating, /area/shuttle/trade_ship/general) +"FE" = ( +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 4; + name = "Nebula Commercial District" + }, +/turf/simulated/floor/tiled/old_tile/red, +/area/tradeport) "FG" = ( /obj/machinery/light, /turf/space, @@ -8735,6 +8827,23 @@ /obj/machinery/vending/loadout/accessory, /turf/simulated/floor/tiled/steel, /area/tradeport) +"FM" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ + frequency = 8018; + id_tag = "trade_space_lock_pump" + }, +/obj/machinery/airlock_sensor{ + frequency = 8018; + id_tag = "trade_space_lock"; + pixel_x = 25 + }, +/obj/map_helper/airlock/sensor/chamber_sensor, +/obj/map_helper/airlock/atmos/chamber_pump, +/turf/simulated/floor/tiled/dark, +/area/shuttle/trade_ship/general) "FN" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -8757,10 +8866,6 @@ }, /turf/simulated/floor/tiled/dark, /area/shuttle/trade_ship/general) -"FP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/shuttle/wall/voidcraft, -/area/shuttle/trade_ship/general) "FQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -9029,6 +9134,15 @@ /obj/machinery/portable_atmospherics/hydroponics, /turf/simulated/floor/grass, /area/tradeport) +"GL" = ( +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + frequency = 1380; + id_tag = "nebula_pump3b"; + name = "Nebula Pump Controller"; + pixel_x = 25 + }, +/turf/simulated/floor/reinforced, +/area/tradeport/pads) "GM" = ( /obj/structure/window/reinforced{ dir = 1 @@ -9058,18 +9172,6 @@ }, /turf/simulated/floor/wood, /area/tradeport/cafeteria) -"GQ" = ( -/obj/machinery/atmospherics/pipe/simple/visible, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/map_helper/airlock/door/int_door, -/obj/machinery/door/airlock/glass_external{ - frequency = null; - name = "Ship Hatch" - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/trade_ship/general) "GR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -9101,6 +9203,13 @@ }, /turf/simulated/floor/tiled/old_tile/purple, /area/tradeport/spine) +"GW" = ( +/obj/machinery/holosign/bar{ + id = "tradersign" + }, +/obj/effect/paint/wallgunmetal, +/turf/simulated/wall/rshull, +/area/shuttle/trade_ship/general) "GY" = ( /obj/structure/window/reinforced, /obj/machinery/portable_atmospherics/canister/oxygen, @@ -9537,6 +9646,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/tradeport/cyndi) +"IM" = ( +/obj/effect/paint/wallgunmetal, +/turf/simulated/wall/rshull, +/area/shuttle/trade_ship/general) "IN" = ( /obj/structure/table/woodentable, /obj/item/paper_bin{ @@ -9635,19 +9748,6 @@ /obj/structure/catwalk, /turf/simulated/floor, /area/tradeport/pads) -"Jh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/airlock/freezer{ - name = "Nebula Gas - Freezer"; - req_access = list(160); - req_one_access = null - }, -/obj/machinery/door/firedoor{ - req_one_access = list(160) - }, -/turf/simulated/floor/tiled/freezer, -/area/tradeport) "Ji" = ( /obj/structure/table/steel_reinforced, /obj/machinery/door/blast/shutters{ @@ -9781,31 +9881,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/tradeport/dock) -"JJ" = ( -/obj/machinery/embedded_controller/radio/simple_docking_controller{ - frequency = 1380; - id_tag = "nebula_pump5"; - name = "Nebula Pump Controller"; - pixel_x = 25 - }, -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/reinforced, -/area/tradeport/pads) -"JM" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor{ - dir = 2 - }, -/obj/structure/catwalk, -/turf/simulated/floor, -/area/tradeport/pads) "JN" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/warning, @@ -9856,12 +9931,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/tradeport/engineering) -"Ka" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/simulated/shuttle/wall/voidcraft, -/area/shuttle/trade_ship/general) "Kb" = ( /obj/machinery/atmospherics/portables_connector{ dir = 1 @@ -9908,6 +9977,16 @@ "Kj" = ( /turf/space, /area/tradeport/expansion) +"Kk" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/table/steel_reinforced, +/obj/fiftyspawner/glass, +/obj/fiftyspawner/steel, +/obj/fiftyspawner/plastic, +/turf/simulated/floor/tiled/dark, +/area/tradeport/facility) "Kn" = ( /obj/structure/table/hardwoodtable, /obj/item/reagent_containers/food/drinks/shaker{ @@ -10021,6 +10100,18 @@ }, /turf/simulated/shuttle/floor/white, /area/tradeport/commons) +"KI" = ( +/obj/machinery/camera{ + dir = 4 + }, +/obj/machinery/vending/sovietsoda{ + contraband = list(/obj/item/reagent_containers/food/drinks/cans/crystalgibb = 20); + desc = "An old sweet water vending machine. It looks like someone crossed out the D and replaced it with an F."; + name = "BOFA"; + products = list(/obj/item/reagent_containers/food/drinks/cans/thirteenloko = 20) + }, +/turf/simulated/floor/tiled/old_tile/blue, +/area/tradeport) "KJ" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -10048,23 +10139,6 @@ }, /turf/simulated/floor/tiled/old_tile/purple, /area/tradeport/spine) -"KL" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/map_helper/airlock/door/ext_door, -/obj/machinery/door/airlock/glass_external{ - frequency = null; - name = "Ship Hatch" - }, -/obj/machinery/access_button/airlock_exterior{ - frequency = 1380; - master_tag = "tradeport_hangar_docker"; - pixel_x = 25; - pixel_y = -5 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/trade_ship/general) "KM" = ( /obj/effect/floor_decal/techfloor{ dir = 4 @@ -10372,6 +10446,18 @@ }, /turf/simulated/floor/tiled/old_tile/yellow, /area/tradeport/safari) +"LV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/airlock/freezer{ + name = "Nebula Gas - Freezer"; + req_access = list(160) + }, +/obj/machinery/door/firedoor{ + req_one_access = list(160) + }, +/turf/simulated/floor/tiled/freezer, +/area/tradeport) "LX" = ( /obj/machinery/light{ dir = 8 @@ -10385,6 +10471,16 @@ /obj/machinery/light, /turf/simulated/shuttle/floor/white, /area/tradeport/commons) +"Mc" = ( +/obj/effect/shuttle_landmark{ + base_area = /area/tradeport/pads; + base_turf = /turf/simulated/floor/reinforced; + docking_controller = "nebula_pump4d"; + landmark_tag = "nebula_pad_4d"; + name = "Nebula Pad 4d" + }, +/turf/simulated/floor/reinforced, +/area/tradeport/pads) "Md" = ( /obj/structure/table/standard, /obj/item/clothing/gloves/sterile/latex, @@ -10519,24 +10615,6 @@ /obj/effect/floor_decal/spline/plain, /turf/simulated/floor/carpet/bcarpet, /area/tradeport/cyndishow) -"Mw" = ( -/obj/machinery/door/firedoor{ - req_one_access = list(160) - }, -/obj/machinery/door/airlock/sandstone{ - frequency = 1382; - id_tag = "safari_access"; - name = "John Safari's Adventure Emporium"; - req_access = null; - tag = "safari_door" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/old_tile/beige, -/area/tradeport/safari) "Mx" = ( /turf/simulated/floor/plating, /area/tradeport/facility) @@ -10544,18 +10622,6 @@ /obj/structure/bed/chair/comfy/beige, /turf/simulated/floor/plating, /area/tradeport/facility) -"Mz" = ( -/obj/machinery/embedded_controller/radio/simple_docking_controller{ - frequency = 1380; - id_tag = "nebula_pump6"; - name = "Nebula Pump Controller"; - pixel_x = -25 - }, -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/reinforced, -/area/tradeport/pads) "MA" = ( /turf/simulated/wall/r_wall, /area/tradeport/expansion) @@ -10687,9 +10753,6 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/tradeport/cafeteria) -"MX" = ( -/turf/simulated/shuttle/wall/voidcraft/hard_corner, -/area/shuttle/trade_ship/cockpit) "MY" = ( /obj/machinery/door/firedoor{ dir = 8; @@ -11135,13 +11198,6 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/plating, /area/tradeport/engineering) -"OE" = ( -/obj/machinery/door/firedoor{ - dir = 2 - }, -/obj/structure/catwalk, -/turf/simulated/floor, -/area/tradeport/pads) "OF" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 4 @@ -11251,6 +11307,23 @@ }, /turf/simulated/floor/tiled/dark, /area/shuttle/trade_ship/general) +"OW" = ( +/obj/machinery/door/firedoor{ + req_one_access = list(160) + }, +/obj/machinery/door/airlock/sandstone{ + frequency = 1382; + id_tag = "safari_access"; + name = "John Safari's Adventure Emporium"; + tag = "safari_door" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/old_tile/beige, +/area/tradeport/safari) "OX" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -11510,9 +11583,6 @@ }, /turf/simulated/floor/airless, /area/tradeport/exterior) -"PJ" = ( -/turf/simulated/shuttle/wall/voidcraft, -/area/shuttle/trade_ship/general) "PL" = ( /obj/machinery/light{ dir = 8; @@ -11530,24 +11600,6 @@ }, /turf/simulated/floor/plating, /area/tradeport/pads) -"PO" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ - frequency = 8018; - id_tag = "trade_space_lock_pump" - }, -/obj/machinery/airlock_sensor{ - frequency = 8018; - id_tag = "trade_space_lock"; - master_tag = null; - pixel_x = 25 - }, -/obj/map_helper/airlock/sensor/chamber_sensor, -/obj/map_helper/airlock/atmos/chamber_pump, -/turf/simulated/floor/tiled/dark, -/area/shuttle/trade_ship/general) "PP" = ( /turf/simulated/floor/snow, /area/tradeport/cyndishow) @@ -11588,6 +11640,20 @@ /obj/item/clipboard, /turf/simulated/floor/carpet/bcarpet, /area/shuttle/trade_ship/general) +"PW" = ( +/obj/machinery/access_button{ + command = "cycle_ext"; + frequency = 8018; + master_tag = "trade_space_lock"; + pixel_x = 25; + pixel_y = 5 + }, +/obj/machinery/door/airlock/glass_external{ + name = "Ship Hatch" + }, +/obj/map_helper/airlock/door/ext_door, +/turf/simulated/floor/tiled/dark, +/area/shuttle/trade_ship/general) "PY" = ( /obj/structure/table/hardwoodtable, /obj/machinery/reagentgrinder{ @@ -11596,6 +11662,18 @@ /obj/item/reagent_containers/glass/rag, /turf/simulated/floor/wood, /area/tradeport) +"PZ" = ( +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + frequency = 1380; + id_tag = "nebula_pump5a"; + name = "Nebula Pump Controller"; + pixel_x = 25 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/reinforced, +/area/tradeport/pads) "Qc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -11687,6 +11765,18 @@ }, /turf/simulated/floor/outdoors/beach/sand/desert/indoors, /area/tradeport/safarizoo) +"QA" = ( +/obj/machinery/vending/cigarette{ + name = "Cigarette machine"; + prices = list(); + products = list(/obj/item/storage/fancy/cigarettes = 10, /obj/item/storage/box/matches = 10, /obj/item/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2) + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, +/obj/effect/floor_decal/spline/fancy/wood, +/turf/simulated/floor/carpet/bcarpet, +/area/tradeport/commons) "QB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -12060,15 +12150,6 @@ /obj/structure/cable/yellow, /turf/simulated/floor/tiled/old_tile/beige, /area/tradeport/commhall) -"RJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/door/airlock/glass_external{ - frequency = null; - name = "Ship Hatch" - }, -/obj/map_helper/airlock/door/int_door, -/turf/simulated/floor/tiled/dark, -/area/shuttle/trade_ship/general) "RL" = ( /obj/structure/window/reinforced{ dir = 1 @@ -12251,9 +12332,6 @@ /obj/structure/sign/graffiti/pisoff, /turf/simulated/floor/plating, /area/tradeport) -"Su" = ( -/turf/simulated/shuttle/wall/voidcraft/hard_corner, -/area/shuttle/trade_ship/general) "Sy" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 6 @@ -12404,6 +12482,19 @@ }, /turf/simulated/floor/tiled/old_tile/purple, /area/tradeport/spine) +"SV" = ( +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + frequency = 1380; + id_tag = "nebula_pump3a"; + name = "Nebula Pump Controller"; + pixel_x = 25 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/atmospherics/portables_connector, +/turf/simulated/floor/reinforced, +/area/tradeport/pads) "SY" = ( /obj/structure/railing{ dir = 1 @@ -12515,6 +12606,18 @@ /obj/structure/table/hardwoodtable, /turf/simulated/floor/tiled/old_tile/blue, /area/tradeport) +"Tu" = ( +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + frequency = 1380; + id_tag = "nebula_pump2a"; + name = "Nebula Pump Controller"; + pixel_x = -25 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/reinforced, +/area/tradeport/pads) "Tw" = ( /obj/machinery/light, /obj/machinery/atmospherics/component/binary/pump/high_power/on{ @@ -12582,14 +12685,6 @@ /obj/landmark/spawnpoint/job/trader, /turf/simulated/floor/carpet, /area/tradeport/commons) -"TD" = ( -/obj/machinery/vending/assist{ - contraband = null; - name = "Old Vending Machine"; - products = list(/obj/item/assembly/prox_sensor=5,/obj/item/assembly/signaler=4,/obj/item/assembly/infra=4,/obj/item/assembly/prox_sensor=4,/obj/item/handcuffs=8,/obj/item/flash=4,/obj/item/cartridge/signal=4,/obj/item/clothing/glasses/sunglasses=4) - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/trade_ship/cockpit) "TF" = ( /obj/machinery/light{ dir = 1 @@ -12687,6 +12782,18 @@ }, /turf/simulated/floor/tiled/dark, /area/shuttle/trade_ship/general) +"Ua" = ( +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + frequency = 1380; + id_tag = "nebula_pump6a"; + name = "Nebula Pump Controller"; + pixel_x = -25 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/reinforced, +/area/tradeport/pads) "Ub" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ @@ -12697,12 +12804,6 @@ }, /turf/simulated/floor/tiled/neutral, /area/tradeport/facility) -"Uc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/universal{ - dir = 4 - }, -/turf/simulated/shuttle/wall/voidcraft, -/area/shuttle/trade_ship/general) "Ud" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -12867,18 +12968,6 @@ /obj/structure/transit_tube, /turf/simulated/floor/plating, /area/tradeport/spine) -"Uz" = ( -/obj/machinery/embedded_controller/radio/simple_docking_controller{ - frequency = 1380; - id_tag = "nebula_pump1"; - name = "Nebula Pump Controller"; - pixel_x = 25 - }, -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/reinforced, -/area/tradeport/pads) "UC" = ( /obj/effect/floor_decal/industrial/warning{ dir = 9 @@ -13034,6 +13123,14 @@ "UZ" = ( /turf/simulated/floor/wood, /area/shuttle/trade_ship/general) +"Vb" = ( +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 4; + name = "Nebula Commercial District" + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/old_tile/blue, +/area/tradeport) "Vc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -13385,6 +13482,15 @@ /obj/item/stolenpackage, /turf/simulated/floor/tiled/dark, /area/tradeport/facility) +"WJ" = ( +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + frequency = 1380; + id_tag = "nebula_pump3c"; + name = "Nebula Pump Controller"; + pixel_x = 25 + }, +/turf/simulated/floor/reinforced, +/area/tradeport/pads) "WK" = ( /turf/simulated/floor/wood, /area/tradeport/cyndishow) @@ -13588,6 +13694,13 @@ /obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/tradeport/engineering) +"Xy" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/paint/wallgunmetal, +/turf/simulated/wall/rshull, +/area/shuttle/trade_ship/general) "Xz" = ( /obj/machinery/light, /obj/effect/floor_decal/spline/fancy/wood{ @@ -13734,6 +13847,10 @@ "XY" = ( /turf/simulated/floor/airless, /area/tradeport/expansion) +"Yb" = ( +/obj/effect/paint/wallgunmetal, +/turf/simulated/wall/rshull, +/area/shuttle/trade_ship/cockpit) "Yc" = ( /obj/structure/closet/crate/secure{ name = "slime cores crate"; @@ -14056,23 +14173,6 @@ }, /turf/simulated/floor/tiled/neutral, /area/tradeport) -"YX" = ( -/obj/machinery/atmospherics/component/unary/vent_pump{ - dir = 4; - external_pressure_bound = 0; - external_pressure_bound_default = 0; - frequency = null; - icon_state = "map_vent_in"; - initialize_directions = 1; - internal_pressure_bound = 4000; - internal_pressure_bound_default = 4000; - pressure_checks = 2; - pressure_checks_default = 2; - pump_direction = 0; - use_power = 1 - }, -/turf/simulated/floor/reinforced/airmix, -/area/tradeport/atmospherics) "YY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -14082,6 +14182,13 @@ }, /turf/simulated/floor/tiled/old_tile/beige, /area/tradeport/safari) +"Za" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/paint/wallgunmetal, +/turf/simulated/wall/rshull, +/area/shuttle/trade_ship/general) "Zb" = ( /obj/structure/catwalk, /obj/machinery/light/small{ @@ -14239,20 +14346,6 @@ /obj/structure/sign/vacuum, /turf/simulated/wall/r_wall, /area/tradeport/engineering) -"ZE" = ( -/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - frequency = 8018; - id_tag = "trade_space_lock"; - pixel_x = -25; - tag_airpump = null; - tag_chamber_sensor = null; - tag_exterior_door = null; - tag_exterior_sensor = null; - tag_interior_door = null; - tag_interior_sensor = null - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/trade_ship/general) "ZF" = ( /obj/machinery/light/small{ dir = 1 @@ -14336,6 +14429,13 @@ /obj/structure/closet/emcloset, /turf/simulated/floor/tiled/neutral, /area/tradeport/commons) +"ZW" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 1 + }, +/obj/effect/paint/wallgunmetal, +/turf/simulated/wall/rshull, +/area/shuttle/trade_ship/general) "ZX" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -28401,7 +28501,7 @@ Ta Ta pd Ta -Mw +OW hA cf Sk @@ -29568,7 +29668,7 @@ Dh pj pj bh -vE +yy pj pj Dh @@ -35323,7 +35423,7 @@ Dh Dh Dh Dh -Dh +cd Dh wV wV @@ -35726,10 +35826,10 @@ Jv Jv Jv Jv -PJ +IM NP NP -PJ +IM Jv Jv Jv @@ -35756,7 +35856,7 @@ wV wV wV wV -zJ +vt wV wV Dh @@ -35806,7 +35906,7 @@ kf kf kf kf -kf +it kf kf kf @@ -35919,12 +36019,12 @@ Jv Jv Jv Jv -PJ -Su +IM +IM EP aG -Su -PJ +IM +IM Jv Jv Jv @@ -36501,12 +36601,12 @@ Jv Jv Jv Jv -Su -BZ -BZ +IM +Yb +Yb vk -BZ -Su +Yb +IM Jv Jv Jv @@ -36695,12 +36795,12 @@ Jv Jv Jv Jv -PJ +IM oV ZP Gb -TD -PJ +fJ +IM Jv Jv Jv @@ -36884,22 +36984,22 @@ dA Jv Jv Jv -PJ +IM nm nm -PJ +IM Jv -PJ -BZ -MX +IM +Yb +Yb nw vG -PJ +IM Jv -PJ +IM NJ NJ -PJ +IM Jv Jv NQ @@ -37077,24 +37177,24 @@ wV dA Jv Jv -PJ -Su +nv +IM VQ KQ -PJ +IM Jv -PJ +IM gi -BZ +Yb mb Ra -PJ +IM Jv -PJ +IM uA UZ -Su -PJ +IM +nv Jv NQ dA @@ -37271,24 +37371,24 @@ wV dA Jv Jv -PJ +nv hu CW vb -PJ +IM Jv -PJ +IM yH hg nt De -PJ +IM Jv -PJ +IM LK ah bB -PJ +nv Jv NQ dA @@ -37375,7 +37475,7 @@ kf kf kf kf -qX +kf kf kf kf @@ -37465,24 +37565,24 @@ wV dA Jv Jv -PJ +nv Fd CW DG -PJ +IM Vd -PJ +IM Ut -BZ +Yb Sa Gd -PJ +IM ek -PJ +IM qb UZ eS -PJ +nv Jv NQ dA @@ -37659,24 +37759,24 @@ wV dA VO Jv -PJ -PJ +nv +IM DA -PJ -PJ -PJ -PJ -MX -Fq +IM +IM +IM +IM +Yb +vz jC BK -BZ -Uc -PJ -PJ +Yb +dQ +IM +IM cP -PJ -PJ +IM +nv Jv gM dA @@ -37694,7 +37794,7 @@ yc Zh RP oO -YX +vA RP hZ ex @@ -37732,7 +37832,7 @@ ia kf kf kf -rh +kf kf kf Zl @@ -37853,24 +37953,24 @@ wV dA Jv Jv -PJ +nv cg CW hB fw -PJ -PJ -PJ -PJ +IM +IM +IM +IM HX aZ -Su -sO +IM +Za Fl UZ UZ jJ -PJ +nv Jv NQ dA @@ -37910,7 +38010,7 @@ eD Cj eD QC -ns +FE eD Cj eD @@ -37933,6 +38033,7 @@ kf Yn kf kf +Fj kf kf kf @@ -37945,8 +38046,7 @@ kf kf kf kf -kf -kf +pI kf kf IF @@ -37956,7 +38056,7 @@ kf kf kf kf -kf +qX kf kf kf @@ -38047,24 +38147,24 @@ wV dA Jv Jv -Su +nv lf CW CW rR -PJ +IM TK eL -Er +mI im Fv Ea -sO +Za oS UZ UZ jh -Su +nv Jv NQ dA @@ -38119,7 +38219,7 @@ Ph Yn kf kf -kf +rh kf kf kf @@ -38473,7 +38573,7 @@ NX IB BX wo -AV +Fa hT eD eD @@ -38634,14 +38734,14 @@ Fo Po XV yQ -PJ +IM LJ Ct UC bM wZ Me -PJ +IM yf HK mK @@ -38823,24 +38923,24 @@ wV dA Jv Jv -PJ -PJ -PJ -PJ -PJ -Su +IM +IM +IM +IM +IM +IM HT Ct MK xd wZ NO -Su -PJ -PJ -PJ -PJ -PJ +IM +IM +IM +IM +IM +IM Jv NQ dA @@ -38903,7 +39003,6 @@ kf Yn kf kf -Fj kf kf kf @@ -38916,7 +39015,8 @@ kf kf kf kf -pI +kf +kf kf kf gP @@ -39018,8 +39118,8 @@ dA Jv Jv Jv -PJ -Su +IM +IM ab wD hN @@ -39032,8 +39132,8 @@ zY dy FR Bu -Su -PJ +IM +IM Jv Jv NQ @@ -39293,7 +39393,7 @@ kf kf kf kf -kf +gh kf kf kf @@ -39643,7 +39743,7 @@ rG DX pS GI -Cy +KI dM xg Ns @@ -39686,7 +39786,7 @@ kf kf kf kf -gh +kf kf kf kf @@ -39794,8 +39894,8 @@ dA Jv Jv Jv -PJ -Su +IM +IM Fr uS Yc @@ -39808,8 +39908,8 @@ NO fh If HQ -Su -PJ +IM +IM Jv Jv QS @@ -39987,24 +40087,24 @@ Qp dA Jv Jv -PJ -PJ -Su +IM +IM +IM aA aA aA -Su +IM Ax NC NC BG -Su +IM aA aA aA -Su -PJ -PJ +IM +IM +IM Jv FS dA @@ -40057,8 +40157,8 @@ dX cB kZ Yn -kf -Uz +hC +nc ur kf DV @@ -40067,21 +40167,21 @@ kf ia kf kf -kf +GL kf Ef ur kf kf ur -gs +SV np kf kf ur Ef kf -kf +WJ kf gP ia @@ -40089,11 +40189,11 @@ kf kf kf kf -kf +mj yD np ur -JJ +PZ kf kf kf @@ -40180,26 +40280,26 @@ sP sP dA VO -nM -PJ -Su +GW +IM +IM bI Dg xK xK -PJ +IM iE zE zE UQ -PJ +IM ge Ow uD nf -Su -PJ -nM +IM +IM +GW FS dA Jk @@ -40238,7 +40338,7 @@ eD Cj eD Rk -md +Vb eD Cj eD @@ -40283,7 +40383,7 @@ Yn Yn Yn Yn -Yn +ia zr Fu bO @@ -40374,9 +40474,9 @@ Yv Yv mZ Jv -tP -ZE -Bq +ox +gb +eH ep wg Aw @@ -40391,9 +40491,9 @@ ms iR Oi ao -BU +qi LP -tP +ox qB GD Th @@ -40415,7 +40515,7 @@ DC Et Uv Et -gH +gS td mS df @@ -40433,7 +40533,7 @@ pA vw BF Ig -og +Cc Vx Hx YR @@ -40452,7 +40552,7 @@ Rm le jy Rm -JM +bV Rm Rm Rm @@ -40462,7 +40562,7 @@ Rm dn dn Rm -Rm +eV le dn dn @@ -40568,9 +40668,9 @@ Yv Yv mZ Jv -zH -PO -RJ +PW +FM +Eq Rf wR iK @@ -40585,9 +40685,9 @@ OV ri ic Ze -GQ +ol zP -KL +rl RX Uf IX @@ -40627,7 +40727,7 @@ ul Bc Lq NY -EQ +DQ Wz ng ul @@ -40646,7 +40746,7 @@ ur en Hr ur -OE +mE ur ur ur @@ -40656,7 +40756,7 @@ ur ur ur ur -hm +Ae en ur ur @@ -40762,26 +40862,26 @@ sP sP qj Jv -Su -PJ -Su +IM +IM +IM kq im rw ry -Su +IM aH mp eW fV -nM +GW Ch EM tH LG -Su -PJ -Su +IM +IM +IM NQ qj SO @@ -40865,7 +40965,7 @@ Yn Yn Yn Yn -Yn +ia eJ Jg bO @@ -40957,24 +41057,24 @@ Rz dA Jv Jv -PJ -PJ -PJ +IM +IM +IM gj -PJ -Su -Su +IM +IM +IM wh ZX NC lX -Su -Su -PJ +IM +IM +IM TZ -Ka -PJ -PJ +Xy +IM +IM Jv NQ dA @@ -40997,7 +41097,7 @@ QQ ZK Sg Gi -Jh +LV qg Rx oU @@ -41027,8 +41127,8 @@ ia vP bY ia -kf -gW +ot +Tu ur kf ZO @@ -41059,11 +41159,11 @@ kf kf kf kf -kf +FA Em qU ur -Mz +Ua kf kf kf @@ -41156,14 +41256,14 @@ cQ ui im jK -PJ +IM fS lZ ze XO JO FD -PJ +IM sR ey oK @@ -41350,14 +41450,14 @@ cQ Mh FO Pv -PJ +IM fS Mq NK Hn JO FD -PJ +IM uP II QU @@ -41418,7 +41518,7 @@ ia kf kf kf -vq +kf kf kf kf @@ -41432,7 +41532,7 @@ kf kf kf kf -kk +kf kf kf kf @@ -41450,7 +41550,7 @@ kf kf kf kf -Jw +kf kf kf kf @@ -41539,24 +41639,24 @@ Rz dA Jv Jv -PJ -Su +nv +IM Bl yv lH -Su -Su +IM +IM hs hl Yx BP -Su -Su +IM +IM jX js WT -Su -PJ +IM +nv Jv NQ dA @@ -41627,7 +41727,7 @@ kf kf kf kf -kf +kk kf kf kf @@ -41643,7 +41743,7 @@ kf kf kf kf -kf +Jw kf kf kf @@ -41732,26 +41832,26 @@ sP Rz dA Jv -PJ -PJ +nv +IM bJ NO NO NO Md -iz -wl -cF -cF -wl -br +pE +lN +By +By +lN +bb Gv Ks tt IC SR -PJ -PJ +IM +nv NQ nq tu @@ -41926,26 +42026,26 @@ sP Rz dA Jv -PJ -PJ +nv +IM oR zG pC qt IP -nB -uE -uE -uE -uE -kI +ev +BL +BL +BL +BL +ZW eP Ce VX Pz QY -PJ -PJ +IM +nv NQ nq dw @@ -42120,26 +42220,26 @@ sP Rz dA Jv -PJ -iz -wl -wl -wl -FP -FP -vO +nv +pE +lN +lN +lN +AB +AB +gf Iz Iz Iz Iz -hK -FP -FP -wl -wl -wl -br -PJ +xy +AB +AB +lN +lN +lN +bb +nv NQ nq tu @@ -42193,7 +42293,7 @@ Nk Yn kf kf -kf +vq kf kf kf @@ -42201,7 +42301,6 @@ kf Yn kf kf -Bv kf kf kf @@ -42214,7 +42313,8 @@ kf kf kf kf -wC +kf +kf kf kf kf @@ -42314,26 +42414,26 @@ sP sP dA VO -PJ -uE -uE -uE -uE -PJ -PJ +nv +BL +BL +BL +BL +IM +IM Jv Jv Jv Jv Jv Jv -PJ -PJ -uE -uE -uE -uE -PJ +IM +IM +BL +BL +BL +BL +nv gM nq dw @@ -42508,12 +42608,12 @@ dD sP dA Jv -PJ +nv Iz Iz Iz Iz -PJ +IM Jv Jv Jv @@ -42522,12 +42622,12 @@ Jv Jv Jv Jv -PJ +IM Iz Iz Iz Iz -PJ +nv NQ nq tu @@ -42536,7 +42636,7 @@ cA tu tu tu -DI +QA YQ qw wa @@ -42990,7 +43090,7 @@ kf kf kf kf -kf +wC kf kf kf @@ -43861,7 +43961,7 @@ Dh wV wV sP -AA +Kk Ne of Ne @@ -44055,7 +44155,7 @@ Dh wV wV sP -AJ +yS EH yp Yz @@ -44141,7 +44241,7 @@ Nc ia kf kf -kf +Bv kf kf kf @@ -44249,7 +44349,7 @@ Dh wV wV sP -AJ +hF qE Ne lO @@ -44637,7 +44737,7 @@ Dh wV wV sP -AS +gu Ne Ne na @@ -44919,7 +45019,7 @@ kf kf kf kf -kf +Mc kf kf kf @@ -45497,7 +45597,6 @@ Dh Dh Dh ia -Ef kf kf kf @@ -45515,7 +45614,8 @@ kf kf kf kf -Nc +kf +kf ia Dh Dh @@ -45691,25 +45791,25 @@ Dh Dh Dh ia -ia -jD -jD -jD -jD -jD -jD -jD -jD -jD -jD -jD -jD -jD -jD -jD -jD -jD -ia +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf ia Dh Dh @@ -45884,27 +45984,27 @@ Dh Dh Dh Dh -Dh -Dh -Dh -Dh -Dh -Dh -Dh -Dh -Dh -Dh -cd -cd -cd -cd -Dh -Dh -Dh -Dh -Dh -Dh -Dh +ia +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf +ia Dh Dh Dh @@ -46078,27 +46178,27 @@ Dh Dh Dh Dh -Dh -Dh -Dh -Dh -Dh -Dh -Dh -Dh -Dh -Dh -cd -cd -cd -cd -Dh -Dh -Dh -Dh -Dh -Dh -Dh +ia +Ef +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf +Nc +ia Dh Dh Dh @@ -46272,27 +46372,27 @@ Dh Dh Dh Dh -Dh -Dh -Dh -Dh -Dh -Dh -Dh -Dh -Dh -Dh -cd -cd -cd -cd -Dh -Dh -Dh -Dh -Dh -Dh -Dh +ia +ia +jD +jD +jD +jD +jD +jD +jD +jD +jD +jD +jD +jD +jD +jD +jD +jD +jD +ia +ia Dh Dh Dh diff --git a/maps/submaps/level_specific/class_h/AuxiliaryResearchFacility.dmm b/maps/submaps/level_specific/class_h/AuxiliaryResearchFacility.dmm index 12a8cd0836a3..6252eec547c5 100644 --- a/maps/submaps/level_specific/class_h/AuxiliaryResearchFacility.dmm +++ b/maps/submaps/level_specific/class_h/AuxiliaryResearchFacility.dmm @@ -966,7 +966,7 @@ /area/class_h/POIs/AuxiliaryResearchFacility) "wc" = ( /obj/effect/debris/cleanable/dirt, -/obj/item/frame/apc, +/obj/item/frame2/apc, /turf/simulated/floor/plating, /area/class_h/POIs/AuxiliaryResearchFacility) "wg" = ( diff --git a/maps/submaps/level_specific/debrisfield_vr/gecko_cr_wreck.dmm b/maps/submaps/level_specific/debrisfield_vr/gecko_cr_wreck.dmm index 9f9f1729236a..d3ef16c0afbd 100644 --- a/maps/submaps/level_specific/debrisfield_vr/gecko_cr_wreck.dmm +++ b/maps/submaps/level_specific/debrisfield_vr/gecko_cr_wreck.dmm @@ -1899,7 +1899,7 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/item/frame/apc, +/obj/item/frame2/apc, /turf/simulated/floor/tiled/techfloor{ initial_gas_mix = "TEMP=2.7" }, diff --git a/maps/submaps/level_specific/debrisfield_vr/mackerel_lc_wreck.dmm b/maps/submaps/level_specific/debrisfield_vr/mackerel_lc_wreck.dmm index 582d630398c8..481110ca8572 100644 --- a/maps/submaps/level_specific/debrisfield_vr/mackerel_lc_wreck.dmm +++ b/maps/submaps/level_specific/debrisfield_vr/mackerel_lc_wreck.dmm @@ -290,7 +290,7 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/item/frame/apc, +/obj/item/frame2/apc, /obj/item/integrated_circuit, /turf/simulated/floor/tiled/techfloor, /area/shuttle/mackerel_lc_wreck) diff --git a/maps/submaps/level_specific/debrisfield_vr/old_satellite.dmm b/maps/submaps/level_specific/debrisfield_vr/old_satellite.dmm index 464bb53d9839..47500768edaf 100644 --- a/maps/submaps/level_specific/debrisfield_vr/old_satellite.dmm +++ b/maps/submaps/level_specific/debrisfield_vr/old_satellite.dmm @@ -45,7 +45,7 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/solar/fake{ +/obj/machinery/power/solar{ adir = 135 }, /turf/simulated/floor/airless, @@ -57,7 +57,7 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/solar/fake{ +/obj/machinery/power/solar{ adir = 135 }, /turf/simulated/floor/airless, @@ -97,7 +97,7 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/solar/fake, +/obj/machinery/power/solar, /turf/simulated/floor/airless, /area/submap/debrisfield_vr/old_sat) "n" = ( diff --git a/maps/submaps/level_specific/underdark/abandonded_outpost.dmm b/maps/submaps/level_specific/underdark/abandonded_outpost.dmm index ddf6663ec9f4..81854381bf99 100644 --- a/maps/submaps/level_specific/underdark/abandonded_outpost.dmm +++ b/maps/submaps/level_specific/underdark/abandonded_outpost.dmm @@ -171,7 +171,7 @@ /turf/simulated/wall, /area/mine/explored/underdark) "aR" = ( -/obj/item/frame/apc, +/obj/item/frame2/apc, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/mine/explored/underdark) "aS" = ( diff --git a/maps/submaps/mountains/digsite.dmm b/maps/submaps/mountains/digsite.dmm index 0a1a93918401..5386debe8e75 100644 --- a/maps/submaps/mountains/digsite.dmm +++ b/maps/submaps/mountains/digsite.dmm @@ -70,7 +70,7 @@ /turf/simulated/wall, /area/submap/cave/digsite) "t" = ( -/obj/item/frame/apc, +/obj/item/frame2/apc, /obj/item/module/power_control, /turf/simulated/floor/plating/external, /area/submap/cave/digsite) diff --git a/maps/submaps/plains/Diner.dmm b/maps/submaps/plains/Diner.dmm index d37293b6c91e..529663e861fc 100644 --- a/maps/submaps/plains/Diner.dmm +++ b/maps/submaps/plains/Diner.dmm @@ -346,7 +346,7 @@ /turf/simulated/floor/tiled/white, /area/submap/Diner) "bf" = ( -/obj/item/frame/apc, +/obj/item/frame2/apc, /turf/simulated/floor/lino, /area/submap/Diner) "bg" = ( diff --git a/maps/submaps/plains/Diner_vr.dmm b/maps/submaps/plains/Diner_vr.dmm index 67d63b084b69..0d5b25d8a69c 100644 --- a/maps/submaps/plains/Diner_vr.dmm +++ b/maps/submaps/plains/Diner_vr.dmm @@ -358,7 +358,7 @@ /turf/simulated/floor/tiled/white, /area/submap/Diner) "bi" = ( -/obj/item/frame/apc, +/obj/item/frame2/apc, /turf/simulated/floor/lino, /area/submap/Diner) "bj" = ( diff --git a/maps/tether/engines/rust.dmm b/maps/tether/engines/rust.dmm index dc74eca68855..ed936695506a 100644 --- a/maps/tether/engines/rust.dmm +++ b/maps/tether/engines/rust.dmm @@ -1257,7 +1257,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/blast/regular{ - id = "EngineEmitterPortWest"; + id = "EngineEmitterPortWest2"; name = "Engine Gas Storage" }, /turf/simulated/floor/tiled/steel_grid, @@ -1268,7 +1268,7 @@ icon_state = "1-2" }, /obj/machinery/door/blast/regular{ - id = "EngineEmitterPortWest"; + id = "EngineEmitterPortWest2"; name = "Engine Gas Storage" }, /obj/machinery/button/remote/blast_door{ diff --git a/maps/tether/levels/mining.dmm b/maps/tether/levels/mining.dmm index 93b16abbdda6..5ed647eb006b 100644 --- a/maps/tether/levels/mining.dmm +++ b/maps/tether/levels/mining.dmm @@ -1055,9 +1055,7 @@ /turf/simulated/floor/tiled, /area/outpost/mining_main/hangar) "As" = ( -/turf/simulated/mineral/floor/virgo3b{ - color = "#AAAAAA" - }, +/turf/simulated/open/virgo3b, /area/mine/explored) "Ay" = ( /obj/effect/floor_decal/industrial/outline/yellow, @@ -1850,13 +1848,6 @@ }, /turf/simulated/floor/outdoors/grass/sif/virgo3b, /area/mine/explored) -"WM" = ( -/obj/effect/step_trigger/teleporter/to_underdark{ - dir = 4; - pixel_x = -16 - }, -/turf/simulated/floor/outdoors/grass/sif/virgo3b, -/area/mine/explored) "Xe" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -1940,10 +1931,6 @@ /obj/spawner/window/low_wall/borosillicate/full, /turf/simulated/floor/plating, /area/outpost/mining_main/secondary_gear_storage) -"ZF" = ( -/obj/effect/step_trigger/teleporter/from_mining, -/turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/outpost/mining_main/passage) "ZO" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -26607,7 +26594,7 @@ OH us us us -ZF +us "} (128,1,1) = {" Se @@ -26801,7 +26788,7 @@ OH us us us -ZF +us "} (129,1,1) = {" Se @@ -26995,7 +26982,7 @@ mk us us us -ZF +us "} (130,1,1) = {" Se @@ -27189,7 +27176,7 @@ mk us us us -ZF +us "} (131,1,1) = {" Se @@ -27383,7 +27370,7 @@ OH us us us -ZF +us "} (132,1,1) = {" Se @@ -27577,7 +27564,7 @@ mk us us us -ZF +us "} (133,1,1) = {" Se @@ -27771,7 +27758,7 @@ OH us us us -ZF +us "} (134,1,1) = {" Se @@ -27965,7 +27952,7 @@ mk us us us -ZF +us "} (135,1,1) = {" Se @@ -28159,7 +28146,7 @@ OH us us us -ZF +us "} (136,1,1) = {" Se @@ -28353,7 +28340,7 @@ OH us us us -ZF +us "} (137,1,1) = {" Se @@ -37288,8 +37275,8 @@ OH OH OH jz -WM -WM +As +As SD OH OH @@ -37482,8 +37469,8 @@ OH OH OH jz -OH -OH +As +As SD OH OH diff --git a/maps/tether/levels/plains.dmm b/maps/tether/levels/plains.dmm index 5d5905c37ca3..a71bc8e6ad49 100644 --- a/maps/tether/levels/plains.dmm +++ b/maps/tether/levels/plains.dmm @@ -87,11 +87,6 @@ "A" = ( /turf/unsimulated/wall/planetary/virgo3b, /area/tether/outpost/exploration_shed) -"B" = ( -/obj/effect/floor_decal/rust, -/obj/effect/step_trigger/teleporter/from_plains, -/turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/tether/outpost/exploration_shed) "D" = ( /mob/living/simple_mob/animal/passive/gaslamp, /turf/simulated/floor/outdoors/grass/sif/virgo3b, @@ -22845,7 +22840,7 @@ u b "} (118,1,1) = {" -B +O O E O @@ -23039,7 +23034,7 @@ u b "} (119,1,1) = {" -B +O O O O @@ -23233,7 +23228,7 @@ u b "} (120,1,1) = {" -B +O O O O @@ -23427,7 +23422,7 @@ u b "} (121,1,1) = {" -B +O O O O @@ -23621,7 +23616,7 @@ u b "} (122,1,1) = {" -B +O O O O @@ -23815,7 +23810,7 @@ u b "} (123,1,1) = {" -B +O O O O @@ -24009,7 +24004,7 @@ u b "} (124,1,1) = {" -B +O O O O @@ -24203,7 +24198,7 @@ u b "} (125,1,1) = {" -B +O O O O @@ -24397,7 +24392,7 @@ u b "} (126,1,1) = {" -B +O O m G diff --git a/maps/tether/levels/station1.dmm b/maps/tether/levels/station1.dmm index ab124ec41474..bc7c78fb6248 100644 --- a/maps/tether/levels/station1.dmm +++ b/maps/tether/levels/station1.dmm @@ -916,9 +916,6 @@ }, /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/shuttle/securiship/cockpit) -"bQ" = ( -/turf/simulated/floor, -/area/maintenance/station/eng_lower) "bR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -1827,8 +1824,8 @@ "dA" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass_science{ - name = "Exploration"; - req_one_access = list(19,43,67) + name = "Exploration Lobby"; + req_one_access = null }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -2140,12 +2137,6 @@ /obj/machinery/camera/network/engineering, /turf/simulated/floor/tiled, /area/engineering/engine_eva) -"ej" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor, -/area/maintenance/station/eng_lower) "ek" = ( /obj/machinery/vending/cola, /turf/simulated/floor/tiled, @@ -2562,9 +2553,6 @@ }, /turf/simulated/floor/tiled, /area/security/customs) -"eY" = ( -/turf/simulated/floor/wood, -/area/maintenance/abandonedlibrary) "eZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -2769,9 +2757,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/hallway) -"fv" = ( -/turf/simulated/floor, -/area/constructionsite) "fw" = ( /obj/structure/table/standard, /obj/item/towel, @@ -3360,9 +3345,6 @@ }, /turf/simulated/floor/tiled/white, /area/shuttle/medivac/cockpit) -"gP" = ( -/turf/simulated/floor, -/area/vacant/vacant_restaurant_lower) "gQ" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 @@ -5957,12 +5939,6 @@ }, /turf/simulated/floor, /area/constructionsite) -"mh" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/turf/simulated/floor, -/area/maintenance/station/eng_lower) "mi" = ( /turf/simulated/floor/wood, /area/crew_quarters/heads/blueshield) @@ -6395,9 +6371,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/shield_gen) -"nd" = ( -/turf/simulated/floor, -/area/maintenance/station/eng_lower) "ne" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -8125,11 +8098,6 @@ /obj/structure/bed/chair/bay/chair, /turf/simulated/floor/tiled/eris/dark/violetcorener, /area/shuttle/securiship/general) -"qE" = ( -/obj/structure/bookcase, -/obj/effect/debris/cleanable/cobweb, -/turf/simulated/floor/wood, -/area/maintenance/abandonedlibrary) "qF" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 @@ -9469,9 +9437,6 @@ }, /turf/simulated/floor, /area/vacant/vacant_restaurant_lower) -"ts" = ( -/turf/simulated/floor/wood/broken, -/area/maintenance/station/eng_lower) "tt" = ( /turf/simulated/floor/holofloor/tiled/dark, /area/tether/elevator/two) @@ -9535,9 +9500,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/docks) -"tB" = ( -/turf/simulated/floor/wood/broken, -/area/maintenance/abandonedlibrary) "tC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -10968,9 +10930,6 @@ }, /turf/simulated/floor/tiled/eris/techmaint_panels, /area/shuttle/securiship/engines) -"wL" = ( -/turf/simulated/floor/plating, -/area/maintenance/abandonedlibrary) "wM" = ( /obj/spawner/window/low_wall/full/firelocks, /obj/effect/paint_stripe/sun, @@ -12322,9 +12281,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_gen) -"zw" = ( -/turf/simulated/floor/plating, -/area/maintenance/abandonedlibraryconference) "zx" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -12575,13 +12531,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/obj/machinery/door/airlock/science{ - name = "Contraband and Security holdings"; - req_one_access = list(44) - }, /obj/structure/cable/pink{ icon_state = "4-8" }, +/obj/machinery/door/airlock/glass/security{ + name = "Exploration Security Station"; + req_one_access = list(38,63) + }, /turf/simulated/floor/tiled, /area/security/checkpoint/science) "Aa" = ( @@ -13340,9 +13296,6 @@ }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) -"BE" = ( -/turf/simulated/floor, -/area/maintenance/station/eng_lower) "BF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -15137,6 +15090,12 @@ /obj/item/tank/oxygen, /obj/item/tank/oxygen, /obj/item/tank/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "Fa" = ( @@ -17128,9 +17087,6 @@ }, /turf/simulated/floor/tiled, /area/security/customs) -"Jh" = ( -/turf/simulated/floor, -/area/constructionsite) "Ji" = ( /obj/structure/reagent_dispensers/fueltank, /turf/simulated/floor, @@ -19506,16 +19462,11 @@ "Om" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/purple/border, -/obj/structure/table/rack/shelf, /obj/structure/window/reinforced{ dir = 4; pixel_x = 3 }, -/obj/item/suit_cooling_unit, -/obj/item/clothing/mask/breath, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/medical/emt, -/obj/item/clothing/head/helmet/space/void/medical/emt, +/obj/machinery/suit_storage_unit/search_and_rescue, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "On" = ( @@ -19560,7 +19511,7 @@ /area/tether/exploration/crew) "Os" = ( /obj/item/cell/potato, -/obj/item/frame/apc, +/obj/item/frame2/apc, /turf/simulated/floor, /area/vacant/vacant_restaurant_lower) "Ot" = ( @@ -20771,16 +20722,11 @@ /turf/simulated/floor/tiled, /area/hallway/station/docks) "QO" = ( -/obj/structure/table/rack/shelf, /obj/structure/window/reinforced{ dir = 4; pixel_x = 3 }, -/obj/item/suit_cooling_unit, -/obj/item/clothing/mask/breath, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/medical/emt, -/obj/item/clothing/head/helmet/space/void/medical/emt, +/obj/machinery/suit_storage_unit/search_and_rescue, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "QP" = ( @@ -21058,10 +21004,6 @@ /obj/structure/bed/chair/comfy/black, /turf/simulated/floor/plating, /area/maintenance/abandonedlibrary) -"Rx" = ( -/obj/effect/floor_decal/rust, -/turf/simulated/floor, -/area/maintenance/station/eng_lower) "Ry" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -21148,9 +21090,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled, /area/hallway/station/docks) -"RM" = ( -/turf/simulated/floor, -/area/maintenance/station/spacecommandmaint) "RN" = ( /turf/simulated/floor/tiled, /area/engineering/atmos/backup) @@ -21443,9 +21382,6 @@ /obj/structure/table, /turf/simulated/floor/plating, /area/maintenance/abandonedlibrary) -"Sp" = ( -/turf/simulated/floor/carpet, -/area/maintenance/abandonedlibrary) "Sq" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 1 @@ -23991,9 +23927,6 @@ }, /turf/simulated/floor, /area/maintenance/station/eng_lower) -"Xn" = ( -/turf/simulated/floor, -/area/vacant/vacant_restaurant_lower) "Xo" = ( /obj/machinery/air_alarm{ dir = 1; @@ -24722,7 +24655,7 @@ /turf/simulated/floor/tiled, /area/engineering/hallway) "YM" = ( -/obj/item/frame/apc, +/obj/item/frame2/apc, /turf/simulated/floor, /area/constructionsite) "YN" = ( @@ -25181,6 +25114,8 @@ pixel_x = -3; pixel_y = 7 }, +/obj/item/binoculars, +/obj/item/binoculars, /turf/simulated/floor/wood, /area/tether/exploration/crew) "ZI" = ( @@ -42879,7 +42814,7 @@ ng ng ng ng -Xn +ng eF ng ng @@ -44043,7 +43978,7 @@ GS ng ng ng -gP +ng xJ ng ng @@ -46715,7 +46650,7 @@ qx mI mI mI -bQ +iw qm sh Qy @@ -46911,7 +46846,7 @@ Qt mI ya qm -bQ +iw Qy FG NU @@ -47103,9 +47038,9 @@ vD bT wT mI -bQ +iw qm -bQ +iw Qy Qy Qy @@ -47132,7 +47067,7 @@ VO Do Xp zd -ej +dl Vc Ig RH @@ -47297,12 +47232,12 @@ hy nw tP mI -bQ +iw qm -bQ -bQ +iw +iw Ag -bQ +iw pb sh ZL @@ -47491,9 +47426,9 @@ yq yq NV mI -bQ +iw Wy -ej +dl dl Ox dl @@ -47546,7 +47481,7 @@ Ap Qg Qg Qg -fv +Qg Qg Qg LC @@ -47701,9 +47636,9 @@ zM Zk Md zM -Rx Ag -bQ +Ag +iw Fx sh cm @@ -47741,11 +47676,11 @@ aF Qg Qg Ji -fv +Qg Qg LC -Jh -fv +Qg +Qg Qg LC rF @@ -47884,7 +47819,7 @@ Zw Vp zM qm -bQ +iw zM Zw Zw @@ -47936,7 +47871,7 @@ Qg Qg Qg Qg -fv +Qg LC Qg Qg @@ -48078,7 +48013,7 @@ Zw Vp zM qm -bQ +iw zM Zw Zw @@ -48086,15 +48021,15 @@ zM zM zM zM -bQ -bQ -bQ -bQ -bQ -bQ -bQ -bQ -bQ +iw +iw +iw +iw +iw +iw +iw +iw +iw zM TA Zf @@ -48125,10 +48060,10 @@ bS Wp LC Si -Jh Qg Qg -fv +Qg +Qg Wp Qg LC @@ -48272,23 +48207,23 @@ Zw Vp zM qm -bQ +iw zM zM zM zM -bQ -bQ -bQ -bQ -bQ -bQ -bQ -bQ -bQ -bQ -bQ -bQ +iw +iw +iw +iw +iw +iw +iw +iw +iw +iw +iw +iw Jm xB IW @@ -48326,9 +48261,9 @@ LC yH LC LC -fv -fv -fv +Qg +Qg +Qg LC Ap gf @@ -48466,19 +48401,19 @@ Zw Vp zM qm -bQ +iw zM zM -bQ -bQ -bQ -bQ -bQ -bQ -bQ -bQ -bQ -bQ +iw +iw +iw +iw +iw +iw +iw +iw +iw +iw zM zM zM @@ -48660,13 +48595,13 @@ Zw Vp zM qm -bQ -bQ +iw +iw zM -bQ -bQ -bQ -bQ +iw +iw +iw +iw zM zM zM @@ -48707,7 +48642,7 @@ jj Qg LC Ap -fv +Qg Qg Qg LC @@ -48854,12 +48789,12 @@ Zw zM zM qm -bQ -bQ -bQ -bQ -bQ -bQ +iw +iw +iw +iw +iw +iw zM zM Zw @@ -48898,17 +48833,17 @@ SK SK SK Uj -fv +Qg LC Pc Qg -fv +Qg Qg LC Qg aF Qg -fv +Qg LC Qg Qg @@ -49046,12 +48981,12 @@ mI Zw zM zM -bQ +iw qm -bQ -bQ -bQ -bQ +iw +iw +iw +iw zM zM zM @@ -49091,7 +49026,7 @@ Qg YM Qg Qg -fv +Qg Qg LC Fm @@ -49104,7 +49039,7 @@ LC zW LC LC -fv +Qg Qg Qg Qg @@ -49239,10 +49174,10 @@ Ph mI Vp zM -bQ +iw tm Nd -bQ +iw zM zM zM @@ -49291,9 +49226,9 @@ Bg ll Qg Qg -fv Qg -Jh +Qg +Qg Qg Qg Qg @@ -49433,7 +49368,7 @@ Qk Qk zM zM -bQ +iw qm zM zM @@ -49622,12 +49557,12 @@ DB DB zM xL -BE +iw mq iw zM zM -bQ +iw qm zM Zw @@ -49813,15 +49748,15 @@ ZZ ZZ DB DB -bQ +iw +jR +iw +iw +iw +iw jR -bQ -bQ -bQ -nd -mh zM -bQ +iw qm zM Zw @@ -49865,7 +49800,7 @@ lx lx lx AM -RM +cu bf bf bf @@ -50008,14 +49943,14 @@ ZZ DB zU zU -bQ -bQ -bQ -bQ -bQ -bQ +iw +iw +iw +iw +iw +iw zM -bQ +iw qm zM zM @@ -50202,16 +50137,16 @@ ZZ DB bv YH -bQ -bQ +iw +iw ZA -bQ -bQ -bQ +iw +iw +iw Jm -bQ +iw qm -bQ +iw zM Zw UT @@ -50396,14 +50331,14 @@ ZZ DB aM aM -bQ -bQ -bQ -bQ -bQ -bQ +iw +iw +iw +iw +iw +iw zM -bQ +iw Wy hz zM @@ -50589,16 +50524,16 @@ ZZ ZZ DB DB -bQ +iw xI -bQ -bQ -bQ +iw +iw +iw Ag qK zM -bQ -bQ +iw +iw qm zM Zw @@ -50792,7 +50727,7 @@ sy xN xN xN -bQ +iw ga zM Zw @@ -51770,7 +51705,7 @@ Rk zM HM eC -ts +Dm uN au iB @@ -52212,7 +52147,7 @@ St zm Yr ey -zw +zm Gr Vp Vp @@ -52390,8 +52325,8 @@ PW PW EM Xc -eY -qE +cU +Pk CE nM Gh @@ -52584,11 +52519,11 @@ NN XG fz Hi -wL +CJ Pk Vg -qE -eY +Pk +cU vl CJ FS @@ -52777,17 +52712,17 @@ ui Th da fz -wL +CJ Xh cU Ts -wL +CJ Xk Cl Xk Xk Xh -wL +CJ jT iO iO @@ -53360,11 +53295,11 @@ ui pR fz Mt -eY -wL +cU +CJ pT -wL -eY +CJ +cU HK Lv So @@ -53554,15 +53489,15 @@ ui tn fz OV -tB +Xk KG -eY -qE +cU +Pk Xk Ef -wL +CJ pC -wL +CJ uq oh Sm @@ -53747,9 +53682,9 @@ vc ui eP fz -qE +Pk MG -eY +cU kr fS kf @@ -54336,9 +54271,9 @@ Go fc ZK LB -wL +CJ gE -wL +CJ tf jf Zw @@ -54529,8 +54464,8 @@ Ok oG SU ZK -Sp -wL +ja +CJ iI fR jf diff --git a/maps/tether/levels/station2.dmm b/maps/tether/levels/station2.dmm index 2552197e4c77..5ea17f5650eb 100644 --- a/maps/tether/levels/station2.dmm +++ b/maps/tether/levels/station2.dmm @@ -2131,7 +2131,8 @@ "ew" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/vault/bolted{ - req_access = list(53) + req_access = list(53); + id_tag = "vault_bolt" }, /obj/machinery/door/blast/regular{ id = "VaultAc"; @@ -4779,6 +4780,7 @@ /obj/structure/railing{ dir = 4 }, +/obj/structure/railing, /turf/simulated/open, /area/engineering/foyer_mezzenine) "jN" = ( @@ -13871,9 +13873,6 @@ dir = 4 }, /obj/machinery/holopad, -/obj/structure/window/reinforced/polarized/full{ - id = "qm_office" - }, /turf/simulated/floor/wood, /area/quartermaster/qm) "Cg" = ( @@ -22567,7 +22566,7 @@ /area/shuttle/excursion/general) "Uh" = ( /obj/effect/floor_decal/rust, -/obj/item/frame/apc, +/obj/item/frame2/apc, /turf/simulated/floor/plating, /area/vacant/vacant_restaurant_upper) "Ui" = ( @@ -24725,7 +24724,9 @@ /area/maintenance/station/eng_upper) "YA" = ( /obj/effect/floor_decal/industrial/warning, -/obj/machinery/sheet_silo, +/obj/machinery/sheet_silo{ + obj_persist_static_id = "tether_silo" + }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/refinery) "YB" = ( diff --git a/maps/tether/levels/surface1.dmm b/maps/tether/levels/surface1.dmm index ce2060307855..5049747f079a 100644 --- a/maps/tether/levels/surface1.dmm +++ b/maps/tether/levels/surface1.dmm @@ -362,6 +362,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "alC" = ( @@ -472,6 +473,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 10 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/rnd/hallway) "anu" = ( @@ -748,6 +750,10 @@ pixel_y = 30 }, /obj/map_helper/airlock/sensor/chamber_sensor, +/obj/machinery/atmospherics/component/unary/vent_scrubber/high_power{ + dir = 4 + }, +/obj/map_helper/airlock/atmos/scrubber, /turf/simulated/floor/tiled, /area/rnd/external) "aub" = ( @@ -992,6 +998,9 @@ dir = 4 }, /obj/machinery/door/airlock/maintenance/common, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/research) "aAt" = ( @@ -1175,8 +1184,11 @@ /turf/simulated/floor, /area/maintenance/substation/SurfMedsubstation) "aFc" = ( -/turf/simulated/floor/tiled/techfloor/grid, -/area/tether/surfacebase/public_garden_one) +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/engineering/atmos) "aFF" = ( /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 10 @@ -1239,6 +1251,9 @@ dir = 1; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "aGf" = ( @@ -1357,7 +1372,7 @@ /obj/effect/floor_decal/corner/red/border{ dir = 4 }, -/obj/machinery/atmospherics/component/binary/pump/high_power/on{ +/obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 4 }, /turf/simulated/floor/tiled, @@ -1529,15 +1544,15 @@ /area/engineering/atmos) "aMg" = ( /obj/structure/railing, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/grille, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ frequency = 1379; id_tag = "civ_airlock_pump" }, /obj/map_helper/airlock/atmos/chamber_pump, +/obj/machinery/power/apc/north_mount, +/obj/structure/cable{ + icon_state = "0-2" + }, /turf/simulated/floor/tiled, /area/storage/surface_eva/external) "aMH" = ( @@ -1672,6 +1687,9 @@ /obj/machinery/atmospherics/pipe/simple/visible/supply{ dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 5 + }, /turf/simulated/floor/plating, /area/maintenance/lower/research) "aPo" = ( @@ -1725,6 +1743,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/hallway) "aQU" = ( @@ -1824,7 +1845,7 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/mining_eva) "aTK" = ( -/obj/machinery/atmospherics/component/unary/freezer{ +/obj/machinery/atmospherics/portables_connector{ dir = 4 }, /turf/simulated/floor/tiled/techmaint, @@ -2935,11 +2956,6 @@ }, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/surfacebase/outside/outside1) -"bCl" = ( -/obj/structure/railing, -/obj/structure/stairs/spawner/east, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/centralstairwell) "bDa" = ( /obj/structure/cable{ icon_state = "4-8" @@ -2997,6 +3013,9 @@ locked = 1 }, /obj/map_helper/airlock/door/ext_door, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, /turf/simulated/floor/tiled/steel_grid, /area/storage/surface_eva/external) "bEE" = ( @@ -3234,6 +3253,9 @@ /obj/structure/cable{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "bKD" = ( @@ -3260,6 +3282,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/hallway) "bLb" = ( @@ -3382,6 +3407,7 @@ /obj/structure/cable/cyan{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/visible/black, /turf/simulated/floor/tiled, /area/engineering/atmos) "bOD" = ( @@ -3450,6 +3476,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "bRm" = ( @@ -3955,6 +3982,7 @@ /obj/effect/floor_decal/corner/lightgrey/bordercorner{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernorthhall) "cfT" = ( @@ -4307,6 +4335,7 @@ pixel_y = 24 }, /obj/map_helper/airlock/sensor/int_sensor, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernortheva) "cnc" = ( @@ -4318,6 +4347,9 @@ dir = 1; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 10 + }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/xenoflora) "cni" = ( @@ -4651,6 +4683,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "cvo" = ( @@ -4974,6 +5009,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 6 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "cEJ" = ( @@ -5081,6 +5119,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/xenoflora) "cHk" = ( @@ -5517,8 +5558,12 @@ /turf/simulated/floor/plating, /area/crew_quarters/sleep/maintDorm1) "cSI" = ( -/turf/simulated/floor/plating, -/area/maintenance/lowmedbaymaint) +/obj/machinery/atmospherics/pipe/simple/visible/red, +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/engineering/atmos) "cSR" = ( /obj/structure/catwalk, /obj/machinery/light/small{ @@ -5661,6 +5706,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 10 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/storage/surface_eva) "cVF" = ( @@ -5760,9 +5808,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5 - }, +/obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled, /area/storage/surface_eva/external) "cYI" = ( @@ -5844,15 +5890,13 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/brig) "dak" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ - dir = 4 - }, /obj/effect/floor_decal/borderfloor{ dir = 8 }, /obj/effect/floor_decal/corner/yellow/border{ dir = 8 }, +/obj/machinery/atmospherics/pipe/manifold/visible/black, /turf/simulated/floor/tiled, /area/engineering/atmos) "dal" = ( @@ -6048,6 +6092,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "diE" = ( @@ -6224,12 +6269,11 @@ /area/rnd/outpost/heating) "dmT" = ( /obj/structure/railing, -/obj/structure/grille, -/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ - frequency = 1379; - id_tag = "civ_airlock_pump" +/obj/structure/sign/nosmoking_2{ + pixel_y = 30 }, -/obj/map_helper/airlock/atmos/chamber_pump, +/obj/machinery/atmospherics/component/unary/vent_scrubber/high_power, +/obj/map_helper/airlock/atmos/scrubber, /turf/simulated/floor/tiled, /area/storage/surface_eva/external) "dnl" = ( @@ -6551,6 +6595,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/research) "dtJ" = ( @@ -6593,6 +6640,9 @@ /obj/item/radio/intercom{ pixel_y = -24 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/hallway) "dul" = ( @@ -6633,6 +6683,7 @@ /obj/machinery/door/airlock/maintenance/rnd{ name = "Science Maintenance" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/steel_grid, /area/rnd/hallway) "dvX" = ( @@ -6875,6 +6926,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/rnd/hallway) "dDz" = ( @@ -7037,6 +7091,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/solars) "dJe" = ( @@ -7322,6 +7377,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "dSa" = ( @@ -7360,10 +7416,6 @@ }, /turf/simulated/floor, /area/rnd/outpost/atmos) -"dSQ" = ( -/obj/structure/railing, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) "dSV" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass/atmos{ @@ -7380,6 +7432,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 1 }, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/storage/surface_eva/external) "dTk" = ( @@ -7783,6 +7838,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/research) "edz" = ( @@ -7976,6 +8034,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ dir = 6 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/xenoflora) "ejK" = ( @@ -8037,18 +8096,16 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ - dir = 8; - frequency = 1379; - id_tag = "rnd_s_airlock_pump" - }, /obj/effect/floor_decal/steeldecal/steel_decals3{ dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals3{ dir = 5 }, -/obj/map_helper/airlock/atmos/chamber_pump, +/obj/machinery/atmospherics/component/unary/env_heat_pump{ + dir = 8 + }, +/obj/map_helper/airlock/atmos/chamber_temperature_adjuster, /turf/simulated/floor/tiled, /area/rnd/external) "elf" = ( @@ -8615,15 +8672,6 @@ }, /turf/simulated/floor/carpet, /area/crew_quarters/visitor_dining) -"eEA" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/closet/crate, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/turf/simulated/floor/tiled/steel_dirty/virgo3b{ - outdoors = 0 - }, -/area/tether/surfacebase/old_tram) "eFC" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, @@ -8910,6 +8958,9 @@ pixel_y = -40 }, /obj/map_helper/airlock/sensor/chamber_sensor, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/storage/surface_eva/external) "ePJ" = ( @@ -9171,8 +9222,14 @@ /area/hallway/lower/first_west) "eYN" = ( /obj/structure/catwalk, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 5 + }, /turf/simulated/floor/plating, -/area/maintenance/lower/vacant_site) +/area/maintenance/lower/solars) "eZk" = ( /obj/machinery/portable_atmospherics/canister/empty/nitrous_oxide, /obj/machinery/atmospherics/pipe/simple/visible/black, @@ -9215,7 +9272,6 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -9226,6 +9282,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/hallway) "eZZ" = ( @@ -9398,6 +9457,9 @@ /obj/machinery/atmospherics/pipe/simple/visible/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/research) "fez" = ( @@ -9721,12 +9783,11 @@ /turf/simulated/floor/tiled/white, /area/rnd/chemistry_lab) "fli" = ( -/obj/structure/catwalk, /obj/machinery/light/small{ dir = 1 }, /turf/simulated/floor/plating, -/area/maintenance/lower/trash_pit) +/area/maintenance/lower/mining_eva) "flx" = ( /obj/machinery/button/remote/blast_door{ id = "suckysucky"; @@ -9802,6 +9863,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "fmy" = ( @@ -10202,7 +10266,7 @@ "fyb" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/black/border, -/obj/machinery/atmospherics/component/binary/pump/high_power/on, +/obj/machinery/atmospherics/pipe/simple/visible/black, /turf/simulated/floor/tiled, /area/engineering/atmos) "fyE" = ( @@ -10258,6 +10322,9 @@ /obj/machinery/airlock_sensor/phoron/airlock_exterior{ pixel_x = 25 }, +/obj/machinery/atmospherics/pipe/vent{ + dir = 1 + }, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/storage/surface_eva/external) "fzG" = ( @@ -10341,6 +10408,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "fBj" = ( @@ -10427,6 +10497,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/visible/black, /turf/simulated/floor/tiled, /area/engineering/atmos) "fDv" = ( @@ -10503,6 +10574,9 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernorthhall) "fEX" = ( @@ -10569,6 +10643,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/hallway) "fHf" = ( @@ -10627,6 +10704,7 @@ /obj/machinery/door/airlock/maintenance/common{ name = "Mining Maintenance Access" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/tether/surfacebase/lowernorthhall) "fHO" = ( @@ -10823,6 +10901,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 + }, /turf/simulated/floor/plating, /area/maintenance/lower/research) "fNI" = ( @@ -11566,6 +11647,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden, /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernortheva) "gft" = ( @@ -11702,9 +11784,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 4 }, -/obj/machinery/atmospherics/component/binary/pump/high_power/on{ - dir = 1 - }, +/obj/machinery/atmospherics/pipe/simple/visible/black, /turf/simulated/floor/tiled, /area/engineering/atmos) "giJ" = ( @@ -11874,8 +11954,13 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_8) "gkS" = ( -/turf/simulated/floor/tiled/techfloor/grid, -/area/tether/surfacebase/public_garden_one) +/obj/machinery/atmospherics/component/binary/pump{ + dir = 8; + target_pressure = 300 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/turf/simulated/floor/tiled, +/area/engineering/atmos) "gld" = ( /obj/structure/cable/cyan{ icon_state = "4-8" @@ -12172,6 +12257,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "gtS" = ( @@ -12215,7 +12301,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden{ +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 5 }, /turf/simulated/floor/tiled, @@ -12527,6 +12613,9 @@ /obj/machinery/atmospherics/pipe/simple/visible/supply{ dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 5 + }, /turf/simulated/floor/plating, /area/maintenance/lower/research) "gCh" = ( @@ -12708,6 +12797,7 @@ /obj/effect/floor_decal/corner/lightgrey/border{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernorthhall) "gHK" = ( @@ -12748,6 +12838,7 @@ /obj/structure/cable{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/solars) "gIa" = ( @@ -12815,6 +12906,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "gJB" = ( @@ -12960,6 +13052,7 @@ /obj/machinery/atmospherics/pipe/manifold/visible/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "gNh" = ( @@ -13098,6 +13191,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "gQG" = ( @@ -13279,16 +13375,17 @@ /obj/structure/sign/nosmoking_2{ pixel_x = 32 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/rnd/hallway) "gYg" = ( -/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/phoronlock{ - frequency = 1379; - scrub_id = "civ_airlock_scrubber" - }, /obj/structure/railing{ dir = 1 }, +/obj/machinery/atmospherics/component/unary/env_heat_pump{ + dir = 1 + }, +/obj/map_helper/airlock/atmos/chamber_temperature_adjuster, /turf/simulated/floor/tiled/techmaint, /area/storage/surface_eva/external) "gYo" = ( @@ -13373,6 +13470,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "hdR" = ( @@ -13452,6 +13550,9 @@ dir = 1 }, /obj/structure/disposalpipe/junction/yjunction, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/north_stairs_one) "hfw" = ( @@ -13847,9 +13948,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) -"hqx" = ( -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) "hqz" = ( /obj/structure/sink{ dir = 4; @@ -14029,13 +14127,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/outpost) -"htC" = ( -/obj/structure/railing, -/obj/machinery/camera/network/medbay{ - dir = 10 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/centralstairwell) "htG" = ( /obj/effect/floor_decal/borderfloor{ dir = 10 @@ -14245,6 +14336,7 @@ /obj/machinery/door/airlock/maintenance/common, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, /obj/machinery/atmospherics/pipe/simple/visible/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/xenoflora) "hCm" = ( @@ -14316,6 +14408,9 @@ dir = 4 }, /obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/research) "hDY" = ( @@ -14328,19 +14423,15 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_6) -"hDZ" = ( -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/maintDorm2) "hEl" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ - dir = 8 - }, /obj/effect/floor_decal/borderfloor{ dir = 8 }, /obj/effect/floor_decal/corner/yellow/border{ dir = 8 }, +/obj/machinery/atmospherics/pipe/manifold4w/visible/yellow, +/obj/machinery/meter, /turf/simulated/floor/tiled, /area/engineering/atmos) "hEJ" = ( @@ -14480,14 +14571,10 @@ /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "hHF" = ( -/obj/structure/grille, -/obj/structure/railing{ - dir = 4 - }, /obj/structure/sign/fire{ pixel_y = 32 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/wall/prepainted/science, /area/rnd/external) "hHV" = ( /obj/structure/grille, @@ -14874,6 +14961,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/computer/timeclock/premade/west, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "hQu" = ( @@ -14914,6 +15002,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/research) "hQL" = ( @@ -14964,10 +15055,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) -"hSe" = ( -/obj/random/maintenance/cargo, -/turf/simulated/floor/plating, -/area/maintenance/lowmedbaymaint) "hSi" = ( /obj/structure/table/rack, /turf/simulated/floor/plating, @@ -14993,6 +15080,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "hUQ" = ( @@ -15178,10 +15268,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/xenoflora) -"hYQ" = ( -/obj/effect/step_trigger/teleporter/to_mining, -/turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/tether/surfacebase/lowernortheva/external) "hYS" = ( /obj/machinery/light/small{ dir = 8 @@ -15443,6 +15529,7 @@ opacity = 0; open_layer = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/engineering/atmos) "ihc" = ( @@ -15852,6 +15939,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals_central6{ pixel_y = 9 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/engineering/atmos) "iqq" = ( @@ -15948,6 +16036,7 @@ /obj/structure/railing{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/engineering/atmos) "iue" = ( @@ -16029,6 +16118,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "ixh" = ( @@ -16187,6 +16277,9 @@ }, /obj/effect/floor_decal/borderfloor/corner, /obj/effect/floor_decal/corner/yellow/bordercorner, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/engineering/atmos) "iAF" = ( @@ -16238,8 +16331,10 @@ /turf/simulated/floor/tiled, /area/rnd/outpost) "iCc" = ( -/turf/simulated/floor/tiled/techfloor/grid, -/area/tether/surfacebase/public_garden_one) +/obj/machinery/atmospherics/portables_connector, +/obj/machinery/portable_atmospherics/canister/air, +/turf/simulated/floor/tiled, +/area/engineering/atmos) "iCC" = ( /obj/effect/floor_decal/corner/lightorange{ dir = 5 @@ -16302,14 +16397,14 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 5 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "iDK" = ( /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/surfacebase/lowernortheva/external) -"iDS" = ( -/turf/simulated/floor/plating, -/area/maintenance/lower/xenoflora) "iEF" = ( /turf/simulated/wall/prepainted, /area/crew_quarters/visitor_laundry) @@ -16484,6 +16579,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "iKy" = ( @@ -16856,13 +16954,13 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/phoronlock{ - frequency = 1379; - scrub_id = "northciv_airlock_scrubber" - }, /obj/structure/railing{ dir = 8 }, +/obj/map_helper/airlock/atmos/scrubber, +/obj/machinery/atmospherics/component/unary/vent_scrubber/high_power{ + dir = 8 + }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/lowernortheva) "iVi" = ( @@ -17298,6 +17396,9 @@ }, /obj/structure/catwalk, /obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/xenoflora) "jge" = ( @@ -17348,8 +17449,13 @@ /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) "jih" = ( -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/public_garden_maintenance) +/obj/spawner/window/low_wall/full/firelocks, +/obj/effect/paint_stripe/pipecyan, +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/engineering/atmos) "jii" = ( /turf/simulated/wall/prepainted, /area/crew_quarters/sleep/maintDorm2) @@ -17588,6 +17694,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, /obj/machinery/atmospherics/pipe/simple/visible/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/xenoflora) "jrG" = ( @@ -17681,6 +17788,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "jum" = ( @@ -17804,6 +17914,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "jxV" = ( @@ -17950,6 +18063,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "jDD" = ( @@ -18433,6 +18547,7 @@ /obj/effect/floor_decal/corner/lightgrey/border{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernorthhall) "jPR" = ( @@ -18442,6 +18557,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, /obj/machinery/atmospherics/pipe/simple/visible/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/research) "jPU" = ( @@ -18463,6 +18579,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "jQg" = ( @@ -18742,6 +18861,9 @@ /obj/structure/cable/green{ icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/rnd/external) "jYf" = ( @@ -19288,12 +19410,12 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 5 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ - dir = 4 - }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernortheva) "krB" = ( @@ -19407,6 +19529,9 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/rnd/external) "ktx" = ( @@ -19597,6 +19722,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "kyA" = ( @@ -19706,6 +19832,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/rnd/hallway) "kCk" = ( @@ -19889,7 +20018,9 @@ /obj/structure/cable{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/hidden, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 + }, /turf/simulated/floor/tiled, /area/storage/surface_eva/external) "kFW" = ( @@ -19914,13 +20045,16 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/structure/catwalk, /obj/machinery/atmospherics/pipe/manifold/visible/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/visible/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ + dir = 4 + }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/lower/research) "kHm" = ( @@ -20068,8 +20202,11 @@ /turf/simulated/floor/tiled, /area/storage/primary) "kMt" = ( -/turf/simulated/floor/tiled/steel_dirty, -/area/maintenance/lower/atmos) +/obj/machinery/atmospherics/pipe/manifold/visible/black{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/engineering/atmos) "kNh" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -20158,13 +20295,13 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, -/obj/machinery/door/firedoor{ - dir = 1 - }, /obj/structure/extinguisher_cabinet{ dir = 1; pixel_y = -32 }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/hallway) "kQo" = ( @@ -20241,6 +20378,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 6 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/north_stairs_one) "kSj" = ( @@ -20544,6 +20682,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "kXM" = ( @@ -20649,16 +20788,16 @@ /turf/simulated/floor/tiled, /area/crew_quarters/locker) "kYD" = ( -/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/phoronlock{ - frequency = 1379; - scrub_id = "northciv_airlock_scrubber" - }, /obj/machinery/light/small{ dir = 4 }, /obj/structure/railing{ dir = 8 }, +/obj/machinery/atmospherics/component/unary/env_heat_pump{ + dir = 8 + }, +/obj/map_helper/airlock/atmos/chamber_temperature_adjuster, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/lowernortheva) "kZg" = ( @@ -20739,14 +20878,9 @@ /turf/simulated/floor/plating, /area/maintenance/lower/research) "lcn" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, -/obj/machinery/atmospherics/pipe/simple/visible/supply, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/turf/simulated/floor/tiled, +/area/engineering/atmos) "lcF" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -20880,6 +21014,7 @@ /obj/structure/catwalk, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/research) "lgw" = ( @@ -20930,6 +21065,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 10 }, +/obj/machinery/light/small{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "lht" = ( @@ -21213,6 +21351,9 @@ /obj/machinery/light/small{ dir = 1 }, +/obj/machinery/atmospherics/pipe/vent{ + dir = 4 + }, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/rnd/external) "lpU" = ( @@ -21239,6 +21380,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "lqD" = ( @@ -21570,6 +21714,7 @@ pixel_x = 32 }, /obj/machinery/atmospherics/component/unary/vent_pump/on, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/rnd/hallway) "lzC" = ( @@ -21757,6 +21902,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/visible/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/xenoflora) "lEH" = ( @@ -21933,6 +22079,9 @@ icon_state = "2-8" }, /obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 10 + }, /turf/simulated/floor/plating, /area/maintenance/lower/solars) "lMb" = ( @@ -22001,10 +22150,6 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/rnd/outpost) -"lOC" = ( -/obj/effect/floor_decal/rust, -/turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/tether/surfacebase/outside/outside1) "lOQ" = ( /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) @@ -22471,6 +22616,9 @@ /area/crew_quarters/sleep/maintDorm2) "maF" = ( /obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/solars) "maP" = ( @@ -22545,6 +22693,9 @@ dir = 4 }, /obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled/monofloor, /area/tether/surfacebase/north_stairs_one) "mbw" = ( @@ -22565,6 +22716,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/engineering/atmos) "mcw" = ( @@ -22618,8 +22770,16 @@ /turf/simulated/floor/tiled/steel_grid, /area/tether/surfacebase/cargostore/warehouse) "mdc" = ( -/turf/simulated/floor/plating, -/area/vacant/vacant_site) +/obj/machinery/atmospherics/pipe/simple/visible/green{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/yellow/border, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/engineering/atmos) "mdC" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/multi_tile/glass{ @@ -22627,6 +22787,9 @@ name = "Surface EVA" }, /obj/effect/floor_decal/steeldecal/steel_decals_central1, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled/monofloor, /area/storage/surface_eva) "mdJ" = ( @@ -22726,14 +22889,16 @@ /turf/simulated/floor/plating, /area/crew_quarters/sleep/maintDorm1) "mgO" = ( -/obj/structure/grille, -/obj/structure/railing{ - dir = 8 +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 10 }, -/obj/structure/sign/nosmoking_2{ - pixel_y = 30 +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 9 }, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9 + }, +/turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/rnd/external) "mhp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -23196,7 +23361,10 @@ /turf/simulated/floor/tiled/steel_dirty, /area/tether/surfacebase/cargostore/warehouse) "mvN" = ( -/obj/structure/disposalpipe/segment, +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 + }, /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "mvO" = ( @@ -23550,20 +23718,11 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/brig) "mCS" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/component/binary/heat_pump{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) +/turf/simulated/floor/tiled, +/area/engineering/atmos) "mDJ" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -23696,10 +23855,9 @@ /turf/simulated/floor/tiled, /area/engineering/atmos) "mGD" = ( -/turf/simulated/mineral/floor/virgo3b{ - ignore_mapgen = 1 - }, -/area/tether/surfacebase/outside/outside1) +/obj/machinery/atmospherics/pipe/simple/hidden/universal, +/turf/simulated/floor/tiled, +/area/engineering/atmos) "mGH" = ( /obj/structure/cable{ icon_state = "4-8" @@ -23999,7 +24157,7 @@ "mOp" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/orange/border, -/obj/machinery/atmospherics/component/binary/pump/high_power/on, +/obj/machinery/atmospherics/pipe/simple/visible/black, /turf/simulated/floor/tiled, /area/engineering/atmos) "mOC" = ( @@ -24065,6 +24223,9 @@ "mPG" = ( /obj/effect/floor_decal/rust, /obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/research) "mPO" = ( @@ -24198,6 +24359,7 @@ /obj/structure/cable/cyan{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/visible/black, /turf/simulated/floor/tiled, /area/engineering/atmos) "mSR" = ( @@ -24274,6 +24436,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/storage/surface_eva) "mWR" = ( @@ -24325,6 +24490,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/storage/surface_eva) "mXO" = ( @@ -24493,9 +24661,6 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/locker/laundry_arrival) -"ndc" = ( -/turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/tether/surfacebase/outside/outside1) "ndW" = ( /obj/machinery/atmospherics/pipe/manifold/visible/yellow{ dir = 4 @@ -24622,6 +24787,7 @@ /obj/structure/catwalk, /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/maintenance/common, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/research) "nhQ" = ( @@ -24667,6 +24833,7 @@ pixel_x = 26; pixel_y = -1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/rnd/external) "nis" = ( @@ -24676,6 +24843,7 @@ /obj/structure/catwalk, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, /obj/machinery/atmospherics/pipe/simple/visible/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/research) "njM" = ( @@ -24741,6 +24909,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/hallway) "nkI" = ( @@ -24755,17 +24926,6 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/brig/storage) -"nkP" = ( -/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/phoronlock{ - frequency = 1379; - scrub_id = "civ_airlock_scrubber" - }, -/obj/machinery/power/apc/north_mount, -/obj/structure/cable{ - icon_state = "0-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/storage/surface_eva/external) "nkZ" = ( /obj/structure/window/reinforced{ dir = 8 @@ -24842,6 +25002,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 10 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/storage/surface_eva) "nng" = ( @@ -25453,8 +25616,11 @@ /turf/simulated/floor/tiled, /area/crew_quarters/showers) "nGT" = ( -/turf/simulated/floor/plating, -/area/maintenance/lower/mining_eva) +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, +/turf/simulated/floor/tiled/steel_dirty/virgo3b, +/area/tether/surfacebase/lowernortheva/external) "nHh" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -26743,6 +26909,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/xenoflora) "owM" = ( @@ -26830,6 +26997,9 @@ /obj/machinery/light/small{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/research) "oyX" = ( @@ -27286,6 +27456,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "oPA" = ( @@ -27317,6 +27490,9 @@ locked = 1 }, /obj/map_helper/airlock/door/int_door, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_grid, /area/storage/surface_eva/external) "oPM" = ( @@ -27725,6 +27901,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 + }, /turf/simulated/floor/plating, /area/maintenance/lower/research) "pby" = ( @@ -27733,6 +27912,7 @@ }, /obj/machinery/door/firedoor/glass, /obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/tether/surfacebase/north_stairs_one) "pcc" = ( @@ -27921,6 +28101,7 @@ locked = 1 }, /obj/map_helper/airlock/door/ext_door, +/obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/steel_grid, /area/rnd/external) "pgI" = ( @@ -28152,16 +28333,6 @@ "pmc" = ( /turf/simulated/wall/prepainted, /area/crew_quarters/sleep/maintDorm3) -"pms" = ( -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 4 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) "png" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -28244,6 +28415,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/maintenance/lower/solars) "poO" = ( @@ -28330,6 +28504,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "prE" = ( @@ -29399,6 +29574,9 @@ dir = 6 }, /obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/research) "pUj" = ( @@ -29407,12 +29585,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) -"pUq" = ( -/obj/structure/railing{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/public_garden_maintenance) "pUN" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 @@ -29817,6 +29989,7 @@ icon_state = "1-2" }, /obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/solars) "qev" = ( @@ -29939,6 +30112,9 @@ /obj/machinery/power/apc/south_mount, /obj/structure/cable, /obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 + }, /turf/simulated/floor/plating, /area/maintenance/lower/solars) "qki" = ( @@ -29970,6 +30146,9 @@ /obj/machinery/atmospherics/pipe/manifold/visible/supply{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 10 + }, /turf/simulated/floor/plating, /area/maintenance/lower/research) "qlp" = ( @@ -30074,6 +30253,7 @@ id_tag = "northciv_airlock_outer"; locked = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/steel_grid, /area/tether/surfacebase/lowernortheva) "qoo" = ( @@ -30327,15 +30507,18 @@ "qtm" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/mauve/border, -/obj/machinery/door/firedoor{ - dir = 1 - }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/hallway) "qtD" = ( @@ -30367,8 +30550,15 @@ /turf/simulated/floor/wood, /area/vacant/vacant_bar) "quN" = ( -/turf/simulated/floor/plating, -/area/maintenance/lower/public_garden_maintenance) +/obj/structure/railing{ + dir = 4 + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/high_power{ + dir = 4 + }, +/obj/map_helper/airlock/atmos/scrubber, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/lowernortheva) "quR" = ( /obj/structure/closet, /obj/random/drinkbottle, @@ -30727,13 +30917,20 @@ pixel_x = 25; pixel_y = -8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/steel_grid, /area/tether/surfacebase/lowernortheva) "qEb" = ( -/obj/structure/catwalk, -/obj/random/maintenance/clean, -/turf/simulated/floor/plating, -/area/maintenance/lower/trash_pit) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/engineering/atmos) "qEi" = ( /obj/structure/catwalk, /obj/structure/cable/green{ @@ -30761,6 +30958,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/hallway) "qFl" = ( @@ -30843,6 +31043,9 @@ dir = 8; name = "Surface EVA" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled/monofloor, /area/storage/surface_eva) "qJt" = ( @@ -30874,15 +31077,11 @@ /turf/simulated/floor, /area/tether/surfacebase/security/gasstorage) "qKh" = ( -/obj/structure/sign/nosmoking_2{ - pixel_x = -32 - }, -/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/phoronlock{ - frequency = 1379; - scrub_id = "northciv_airlock_scrubber" +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 4 }, /turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/lowernortheva) +/area/engineering/atmos) "qKp" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -30971,6 +31170,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/solars) "qMv" = ( @@ -31183,6 +31383,9 @@ name = "package tagger - Void"; sort_tag = "Void" }, +/obj/machinery/camera/network/medbay{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralstairwell) "qPU" = ( @@ -31390,6 +31593,9 @@ pixel_y = -24 }, /obj/map_helper/airlock/sensor/ext_sensor, +/obj/machinery/atmospherics/pipe/vent{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/surfacebase/lowernortheva) "qVm" = ( @@ -32054,6 +32260,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernorthhall) "rnT" = ( @@ -32144,6 +32351,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 + }, /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "rsp" = ( @@ -32384,6 +32594,9 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/storage/surface_eva) "ryX" = ( @@ -32401,12 +32614,6 @@ /obj/effect/floor_decal/corner/mauve/border, /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) -"rzR" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/maintenance/lowmedbaymaint) "rAy" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -32427,26 +32634,28 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 4 }, -/obj/machinery/door/firedoor, /obj/structure/extinguisher_cabinet{ pixel_y = 30 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/hallway) "rAD" = ( /obj/structure/railing{ dir = 1 }, -/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/phoronlock{ - frequency = 1379; - scrub_id = "civ_airlock_scrubber" - }, /obj/structure/sign/fire{ pixel_y = -32 }, +/obj/map_helper/airlock/atmos/scrubber, +/obj/machinery/atmospherics/component/unary/vent_scrubber/high_power{ + dir = 1 + }, /turf/simulated/floor/tiled/techmaint, /area/storage/surface_eva/external) "rAF" = ( @@ -32458,6 +32667,9 @@ dir = 1; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "rAY" = ( @@ -32553,6 +32765,7 @@ /obj/machinery/vending/wallmed_airlock{ pixel_x = 32 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernorthhall) "rER" = ( @@ -33068,10 +33281,12 @@ name = "Research Division Access"; req_access = list(47) }, -/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_grid, /area/hallway/lower/first_west) "rRn" = ( @@ -33463,13 +33678,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) -"saV" = ( -/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/phoronlock{ - frequency = 1379; - scrub_id = "northciv_airlock_scrubber" - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/lowernortheva) "sbh" = ( /obj/machinery/air_alarm{ dir = 8; @@ -33792,8 +34000,11 @@ /turf/simulated/floor/plating, /area/maintenance/asmaint2) "sjS" = ( -/turf/simulated/floor/plating, -/area/vacant/vacant_bar) +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/engineering/atmos) "sjY" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 8 @@ -33945,6 +34156,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "snl" = ( @@ -33959,6 +34173,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/xenoflora) "snX" = ( @@ -34105,12 +34320,19 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "sqw" = ( -/obj/structure/grille, -/obj/structure/railing{ - dir = 4 +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 }, -/turf/simulated/floor/tiled/techmaint, -/area/rnd/external) +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/rnd/hallway) "sqG" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -34179,6 +34401,9 @@ dir = 4 }, /obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 10 + }, /turf/simulated/floor/plating, /area/maintenance/lower/research) "ssm" = ( @@ -34356,6 +34581,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernorthhall) "swt" = ( @@ -34542,6 +34770,7 @@ }, /obj/effect/floor_decal/borderfloor/cee, /obj/effect/floor_decal/industrial/danger/cee, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/engineering/atmos) "sDd" = ( @@ -34606,6 +34835,7 @@ /area/tether/surfacebase/security/lowerhall) "sEn" = ( /obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "sEW" = ( @@ -34637,6 +34867,7 @@ /obj/machinery/atmospherics/pipe/manifold/visible/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/xenoflora) "sGX" = ( @@ -34739,6 +34970,9 @@ pixel_y = 22 }, /obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 + }, /turf/simulated/floor/plating, /area/maintenance/lower/solars) "sLq" = ( @@ -34889,16 +35123,6 @@ /obj/item/reagent_containers/dropper, /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab) -"sOa" = ( -/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/phoronlock{ - frequency = 1379; - scrub_id = "civ_airlock_scrubber" - }, -/obj/structure/sign/nosmoking_2{ - pixel_y = 30 - }, -/turf/simulated/floor/tiled/techmaint, -/area/storage/surface_eva/external) "sOk" = ( /obj/structure/table/rack, /obj/machinery/door/window/eastright, @@ -34992,21 +35216,12 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/tether/surfacebase/tram) "sRo" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/rust, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/supply{ +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 }, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) +/obj/machinery/atmospherics/pipe/simple/visible/black, +/turf/simulated/floor/tiled, +/area/engineering/atmos) "sSa" = ( /obj/machinery/light/spot, /turf/simulated/floor/tiled/techfloor/grid/virgo3b, @@ -35155,8 +35370,15 @@ /turf/simulated/floor/tiled, /area/rnd/hallway) "sUU" = ( -/turf/simulated/floor/tiled/techfloor/grid, -/area/tether/surfacebase/public_garden_one) +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/solars) "sUX" = ( /obj/machinery/door/window/northright, /obj/effect/floor_decal/industrial/outline/yellow, @@ -35448,25 +35670,20 @@ /turf/simulated/floor/tiled/techmaint, /area/holodeck_control) "tdn" = ( -/turf/simulated/floor/tiled/techfloor/grid/virgo3b, -/area/tether/surfacebase/outside/outside1) -"tdu" = ( -/obj/effect/floor_decal/borderfloor{ +/obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 4 }, -/obj/effect/floor_decal/corner/yellow/border{ +/turf/simulated/floor/tiled, +/area/engineering/atmos) +"tdu" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 6 - }, -/obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 6 - }, -/turf/simulated/floor/tiled/steel_dirty/virgo3b{ - outdoors = 0 +/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ + dir = 1 }, -/area/tether/surfacebase/old_tram) +/turf/simulated/floor/tiled, +/area/engineering/atmos) "tdD" = ( /obj/effect/floor_decal/rust, /obj/machinery/portable_atmospherics/canister/phoron, @@ -35890,8 +36107,14 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/maintDorm3) "ttR" = ( -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) +/obj/machinery/atmospherics/pipe/simple/visible/green{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/engineering/atmos) "ttV" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/multi_tile/metal/mait{ @@ -35909,6 +36132,9 @@ dir = 4 }, /obj/machinery/meter, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 5 + }, /turf/simulated/floor/tiled, /area/engineering/atmos) "twy" = ( @@ -35977,6 +36203,7 @@ dir = 8 }, /obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/research) "tyN" = ( @@ -36007,9 +36234,6 @@ /obj/item/storage/fancy/markers, /turf/simulated/floor/plating, /area/crew_quarters/sleep/maintDorm1) -"tAe" = ( -/turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/tether/surfacebase/tunnel) "tAB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -36063,6 +36287,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "tCu" = ( @@ -36082,6 +36309,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "tCv" = ( @@ -36224,6 +36452,7 @@ /obj/machinery/atmospherics/pipe/zpipe/up/scrubbers{ dir = 1 }, +/obj/machinery/atmospherics/pipe/zpipe/up/aux, /turf/simulated/floor/plating, /area/engineering/atmos) "tEf" = ( @@ -36259,6 +36488,9 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "tEH" = ( @@ -36497,6 +36729,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/research) "tNc" = ( @@ -36825,6 +37060,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "tWp" = ( @@ -37057,11 +37293,7 @@ /turf/simulated/floor/tiled/techmaint, /area/holodeck_control) "ubB" = ( -/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/phoronlock{ - frequency = 1379; - scrub_id = "rnd_s_airlock_scrubber" - }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/mineral, /area/rnd/external) "ubM" = ( /obj/machinery/light/small{ @@ -37199,6 +37431,9 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernortheva) "ufQ" = ( @@ -37712,12 +37947,6 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) -"uvN" = ( -/obj/machinery/atmospherics/component/unary/heater{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/engineering/atmos) "uwj" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 4 @@ -38009,10 +38238,6 @@ /obj/machinery/camera/network/civilian, /turf/simulated/floor/tiled, /area/crew_quarters/showers) -"uHx" = ( -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plating, -/area/maintenance/lower/xenoflora) "uHG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -38101,6 +38326,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "uKW" = ( @@ -38155,6 +38383,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/storage/surface_eva) "uLV" = ( @@ -38278,6 +38509,10 @@ /obj/effect/floor_decal/steeldecal/steel_decals3{ dir = 6 }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/high_power{ + dir = 4 + }, +/obj/map_helper/airlock/atmos/scrubber, /turf/simulated/floor/tiled, /area/rnd/external) "uOz" = ( @@ -38468,9 +38703,6 @@ ignore_mapgen = 1 }, /area/tether/surfacebase/outside/outside1) -"uWt" = ( -/turf/simulated/floor/plating, -/area/vacant/vacant_bar) "uWz" = ( /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/plating, @@ -38689,9 +38921,6 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/firedoor{ - dir = 8 - }, /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -38699,6 +38928,7 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 4 }, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/rnd/hallway) "vbT" = ( @@ -38902,16 +39132,15 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos/processing) "vie" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ - dir = 4 - }, -/obj/machinery/meter, /obj/effect/floor_decal/borderfloor{ dir = 8 }, /obj/effect/floor_decal/corner/yellow/border{ dir = 8 }, +/obj/machinery/atmospherics/component/binary/heat_pump{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/engineering/atmos) "viB" = ( @@ -39703,6 +39932,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "vCj" = ( @@ -39838,6 +40068,9 @@ dir = 4 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "vFy" = ( @@ -40299,6 +40532,9 @@ /obj/machinery/atmospherics/pipe/simple/visible/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/research) "vPh" = ( @@ -40515,6 +40751,10 @@ /obj/machinery/light{ dir = 8 }, +/obj/machinery/atmospherics/portables_connector{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "vTu" = ( @@ -40646,21 +40886,18 @@ /obj/effect/floor_decal/steeldecal/steel_decals3{ dir = 5 }, -/obj/machinery/light_switch{ - pixel_y = 25 - }, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 8; frequency = 1379; id_tag = "rnd_s_airlock_pump" }, /obj/map_helper/airlock/atmos/chamber_pump, +/obj/structure/sign/nosmoking_2{ + pixel_y = 30 + }, /turf/simulated/floor/tiled, /area/rnd/external) "vXJ" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 9 - }, /obj/effect/floor_decal/borderfloor{ dir = 8 }, @@ -41880,6 +42117,7 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/rnd/hallway) "wEY" = ( @@ -41926,11 +42164,10 @@ /turf/simulated/floor/tiled, /area/engineering/atmos) "wGt" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/steel_dirty/virgo3b{ - outdoors = 0 - }, -/area/tether/surfacebase/old_tram) +/obj/machinery/atmospherics/pipe/manifold/visible/cyan, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/turf/simulated/floor/tiled, +/area/engineering/atmos) "wGP" = ( /obj/machinery/atmospherics/portables_connector, /obj/effect/floor_decal/corner/purple{ @@ -41984,24 +42221,19 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 10 - }, /obj/structure/cable{ icon_state = "1-2" }, /obj/structure/cable{ icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernortheva) "wJB" = ( -/obj/machinery/air_alarm{ - pixel_y = 22 - }, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/air_alarm/east_mount, /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "wKf" = ( @@ -42059,7 +42291,7 @@ "wLI" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/white/border, -/obj/machinery/atmospherics/component/binary/pump/high_power/on, +/obj/machinery/atmospherics/pipe/simple/visible/black, /turf/simulated/floor/tiled, /area/engineering/atmos) "wLU" = ( @@ -42265,6 +42497,7 @@ /obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "wRB" = ( @@ -42526,6 +42759,9 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/hallway) "wXS" = ( @@ -42554,6 +42790,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "wYh" = ( @@ -42648,6 +42887,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "wZP" = ( @@ -42673,6 +42915,7 @@ icon_state = "1-4" }, /obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/research) "xaC" = ( @@ -42700,6 +42943,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, /obj/machinery/atmospherics/pipe/simple/visible/supply, /obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/research) "xbO" = ( @@ -42819,6 +43063,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden, /obj/map_helper/airlock/door/int_door, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/steel_grid, /area/rnd/external) "xgV" = ( @@ -43169,12 +43414,12 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "xqC" = ( -/obj/structure/grille, -/obj/structure/railing{ - dir = 8 +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 5 }, -/turf/simulated/floor/tiled/techmaint, -/area/rnd/external) +/turf/simulated/floor/plating, +/area/maintenance/lower/research) "xqE" = ( /obj/structure/cable/yellow{ icon_state = "1-4" @@ -43429,11 +43674,11 @@ /turf/simulated/floor/tiled/dark, /area/storage/surface_eva) "xxB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/first_west) "xxM" = ( /obj/effect/floor_decal/borderfloor, /obj/machinery/light/small, @@ -43471,6 +43716,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "xyi" = ( @@ -43497,9 +43745,6 @@ /obj/item/radio, /turf/simulated/floor/tiled, /area/rnd/testingroom) -"xyG" = ( -/turf/simulated/floor/virgo3b, -/area/tether/surfacebase/outside/outside1) "xyK" = ( /obj/structure/cable/heavyduty{ icon_state = "4-8" @@ -43758,7 +44003,6 @@ /turf/simulated/floor/tiled/steel_dirty, /area/rnd/outpost/storage) "xHn" = ( -/obj/structure/grille, /obj/structure/railing{ dir = 4 }, @@ -43768,6 +44012,9 @@ frequency = 1379; id_tag = "northciv_airlock_pump" }, +/obj/structure/sign/nosmoking_2{ + pixel_x = -32 + }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/lowernortheva) "xHo" = ( @@ -44270,11 +44517,17 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "ych" = ( -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, +/turf/simulated/floor/tiled/steel_dirty/virgo3b, +/area/storage/surface_eva/external) "ycD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/spline/plain{ @@ -44551,9 +44804,10 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/rnd/external) "ylH" = ( @@ -59549,13 +59803,13 @@ elP elP elP aEl -gkS -aFc -aFc -aFc -aFc -sUU -aFc +eGo +eGo +eGo +eGo +eGo +eGo +eGo bre his his @@ -59565,7 +59819,7 @@ nLH kPz ikt jCv -jCv +ych fyZ wtA his @@ -59743,13 +59997,13 @@ elP elP elP aEl -aFc -sUU -aFc eGo eGo -aFc -gkS +eGo +eGo +eGo +eGo +eGo bre his his @@ -59937,9 +60191,9 @@ elP elP elP aEl -aFc -aFc -iCc +eGo +eGo +eGo eGo eGo eGo @@ -59950,7 +60204,7 @@ his isQ tXK qpi -sOa +qpi dmT cYq dTb @@ -60131,8 +60385,8 @@ elP elP elP aEl -aFc -aFc +eGo +eGo eGo eGo eGo @@ -60144,7 +60398,7 @@ his isQ tXK qpi -nkP +qpi aMg kFT eOM @@ -60325,13 +60579,13 @@ elP elP elP aEl -aFc eGo eGo -iCc eGo eGo -aFc +eGo +eGo +eGo bre his his @@ -60519,13 +60773,13 @@ elP elP elP aEl -gkS -aFc eGo eGo eGo -aFc -aFc +eGo +eGo +eGo +eGo bre ivS baG @@ -60713,13 +60967,13 @@ puQ aEl mkH aEl -sUU -aFc +eGo +eGo vAW fqB wuH -gkS -sUU +eGo +eGo bre ivS baG @@ -61733,10 +61987,10 @@ his his his his -fZN -fZN -fZN -fZN +his +his +his +his his his his @@ -61927,10 +62181,10 @@ his his his his -fZN -ubB -ubB -fZN +his +his +his +his his his his @@ -62123,7 +62377,7 @@ his his fZN hHF -sqw +fZN fZN his his @@ -62485,7 +62739,7 @@ eGv xOq pUj xOq -xOq +xxB xOq xOq vEz @@ -62513,7 +62767,7 @@ rki ksX jXH pgC -xvt +mgO uXC uXC uXC @@ -62644,11 +62898,11 @@ his rly aNj pRR -pUq ifV ifV ifV -jih +ifV +kaz cni bre bre @@ -62891,7 +63145,7 @@ ctQ rOR cbm kwE -qpe +sqw omk omk omk @@ -63062,16 +63316,16 @@ sua sua sua gzN -mdc +phe jTk -mdc +phe cfZ tIU lLU qMs dIB gHZ -dIB +eYN pvV qnR rJU @@ -63092,8 +63346,8 @@ aVp rJf gOa fZN -mgO -xqC +fZN +fZN fZN his his @@ -63253,13 +63507,13 @@ fLr kkn cqs phe -mdc -mdc -mdc -mdc -mdc -mdc -mdc +phe +phe +phe +phe +phe +phe +phe tIU gHN gHN @@ -63279,7 +63533,7 @@ flx pFz rft jbN -qpe +sqw omk tOS aph @@ -63444,16 +63698,16 @@ oMb xOq fAY wGb -mdc -mdc -mdc -mdc -mdc +phe +phe +phe +phe +phe jTk -mdc phe -mdc -mdc +phe +phe +phe tIU oHb oHb @@ -63473,7 +63727,7 @@ vRZ ycJ rJU sUO -qpe +sqw aVW aVW aVW @@ -63618,7 +63872,7 @@ iTc eSi oiD rly -jih +kaz kaz rly ceM @@ -63642,12 +63896,12 @@ alC alC fae dvD -mdc -mdc -mdc -mdc -mdc -mdc +phe +phe +phe +phe +phe +phe tIU tIU tIU @@ -63667,7 +63921,7 @@ gNF tBd cbm uQD -qpe +sqw aVW bUw aVW @@ -63813,7 +64067,7 @@ lfF oiD cni cni -quN +cmk xJL dBk qJd @@ -63835,12 +64089,12 @@ wbf fcZ fcZ wvB -mdc -mdc -mdc -mdc -mdc -mdc +phe +phe +phe +phe +phe +phe cJi sua sua @@ -64028,13 +64282,13 @@ wXZ wGb jTk jTk -mdc -mdc phe -mdc -mdc -mdc -mdc +phe +phe +phe +phe +phe +phe sua sua sua @@ -64221,19 +64475,19 @@ kYj jta fLr acR -mdc -mdc -mdc phe -mdc -mdc -mdc +phe +phe +phe +phe +phe +phe irV sua sua sua tIU -spN +sUU juN juN oln @@ -64417,17 +64671,17 @@ fLr sua sua sua -mdc -mdc -mdc -mdc -mdc +phe +phe +phe +phe +phe sua sua sua sua tIU -spN +sUU juN jFt jFt @@ -64612,16 +64866,16 @@ sua sua sua sua -mdc -mdc -mdc +phe +phe +phe guo sua sua sua sua tIU -spN +sUU juN bvO bvO @@ -64806,7 +65060,7 @@ sua sua sua sua -mdc +phe jTk jTk emA @@ -64815,7 +65069,7 @@ sua sua sua tIU -spN +sUU juN cLP cLP @@ -65009,7 +65263,7 @@ sua sua sua tIU -spN +sUU juN lvK bvO @@ -65025,7 +65279,7 @@ hJR oMB oMB fTb -qpe +sqw aVW aVW aVW @@ -65203,7 +65457,7 @@ sua sua sua tIU -spN +sUU juN cLP cLP @@ -65397,7 +65651,7 @@ sua sua sua tIU -spN +sUU juN bvO bvO @@ -65413,7 +65667,7 @@ bSX uEC bSX axa -qpe +sqw omk bLp bLp @@ -65591,7 +65845,7 @@ sua sua sua tIU -spN +sUU juN xcr xcr @@ -65610,7 +65864,7 @@ imB dDu dvR xaq -sBb +xqC bLp uCh uCh @@ -65765,7 +66019,7 @@ snl ibH bdi sBd -nGT +sBd rkZ fLr xAe @@ -65785,7 +66039,7 @@ sua sua sua tIU -spN +sUU juN xcr xcr @@ -65954,12 +66208,12 @@ mkS rfR pkY hzA -mvN -mvN -mvN -mvN -mvN -mvN +lZe +lZe +lZe +lZe +lZe +lZe lZe rey eeR @@ -66001,7 +66255,7 @@ fuf pTX dQJ opX -xxB +dQJ dQJ kGI dQJ @@ -66355,11 +66609,11 @@ oXQ vES rey oMr -uHx +oMr oMr mXi -iDS -iDS +bVo +bVo bVo tZw mga @@ -66549,7 +66803,7 @@ jMI uKU fLr iyH -iDS +bVo bVo huJ oMr @@ -66570,7 +66824,7 @@ tZw tZw tZw bLp -sRo +vOr uYR wrk pJV @@ -66759,9 +67013,9 @@ mNR tZw ggb hYH -iDS -iDS -iDS +bVo +bVo +bVo aCJ bLp fey @@ -67560,14 +67814,14 @@ iGi drN tFg mIF -qSU +hNQ bOd -qSU -qSU -aoc +nnD +nnD +sRo fDu mSt -hNQ +kMt tkj oSm pZm @@ -67575,7 +67829,7 @@ pZm pZm pZm vGE -ych +pYC sic vGE his @@ -67754,7 +68008,7 @@ moV oiY qAN oiY -oiY +qEb mPX tHp tHp @@ -67769,7 +68023,7 @@ pZm pZm pZm vGE -ych +pYC vMv vGE vGE @@ -67948,7 +68202,7 @@ qSU qSU qSU qSU -qSU +tdn qSU qSU qSU @@ -67963,16 +68217,16 @@ pZm pZm pZm vGE -ych +pYC wVw vGE dvi lJo mry -hqx -ych -ych -ych +pYC +pYC +pYC +pYC vGE his his @@ -68094,7 +68348,7 @@ jFz jFz jFz jFz -sEn +mvN sEn pby kSh @@ -68122,7 +68376,7 @@ qqd qqd mCf bLp -mCS +fey bLp uCh uCh @@ -68142,7 +68396,7 @@ qSU qSU qSU qSU -qSU +tdn pFp keb qZv @@ -68157,16 +68411,16 @@ oSm pZm pZm vGE -ych +pYC eGl vGE nTk -ych +pYC khn -ych -ych -hqx -ych +pYC +pYC +pYC +pYC vGE his his @@ -68316,7 +68570,7 @@ djJ lOQ lfi bLp -sRo +vOr bLp uCh uCh @@ -68336,7 +68590,7 @@ qSU qSU qSU qSU -qSU +tdn pkD pkD pkD @@ -68351,16 +68605,16 @@ oSm pZm pZm vGE -ych +pYC cWT vGE dvi -ych +pYC iZr -hqx -ych -ych -ych +pYC +pYC +pYC +pYC vGE his his @@ -68510,7 +68764,7 @@ eDq lOQ ucF vno -sRo +vOr bLp uCh uCh @@ -68530,7 +68784,7 @@ rga rga rga rga -rga +cSI bEs wKQ bEs @@ -68545,16 +68799,16 @@ oSm pZm pZm vGE -ych +pYC nYA vGE oQP -ych +pYC rEa nSb -hqx -ych -ych +pYC +pYC +pYC vGE his his @@ -68692,7 +68946,7 @@ tZw tZw ryX xTb -iDS +bVo rOS jEh hLB @@ -68724,7 +68978,7 @@ nqp dLW iua qSU -qSU +tdn nqp ldK eXL @@ -68739,7 +68993,7 @@ oSm vGE vGE vGE -ych +pYC ozq vGE vGE @@ -68849,10 +69103,10 @@ isQ nLH pMm nLH -eGP -eGP -eGP -eGP +jFz +fli +sBd +sBd wJB lho nwj @@ -68886,7 +69140,7 @@ uWW tZw ryX tZw -iDS +bVo rOS jEh hLB @@ -68918,7 +69172,7 @@ laB oSm eMp eMp -eMp +jih eMp oSm xQw @@ -68930,18 +69184,18 @@ lpU oSm oSm oSm -ych -ych +pYC +pYC xVh -ych -ych -ych +pYC +pYC +pYC ttV -ych +pYC crA -ych -ych -ych +pYC +pYC +pYC gju vGE his @@ -69023,7 +69277,7 @@ uXC ijH "} (127,1,1) = {" -hYQ +iDK iDK iDK wMH @@ -69044,8 +69298,8 @@ jTS ykP fpK eGP -saV -qKh +eGP +eGP eGP jJw jJw @@ -69080,7 +69334,7 @@ uWW tZw ryX tZw -iDS +bVo rOS jEh hLB @@ -69110,10 +69364,10 @@ nsD plD hLP vTc -uvN -aTK -xlc xlc +aTK +qKh +olq eMp iEZ xDs @@ -69124,18 +69378,18 @@ jyB cst cst oSm -ych pYC -ych -ych pYC -ych +pYC +pYC +pYC +pYC jIl -ych +pYC nSb sYr tPg -ych +pYC gju vGE his @@ -69217,7 +69471,7 @@ ujj ujj "} (128,1,1) = {" -hYQ +iDK iDK iDK wMH @@ -69238,7 +69492,7 @@ xtl bvK tNc eGP -xHn +quN xHn eGP eTu @@ -69319,7 +69573,7 @@ luN uTF oSm pYC -ych +pYC vGE vGE vGE @@ -69411,7 +69665,7 @@ osh qbg "} (129,1,1) = {" -hYQ +iDK iDK iDK iDK @@ -69499,8 +69753,8 @@ kgX lPH lPH cfb -qSU -qSU +hNQ +sjS qSU eMp aoc @@ -69512,8 +69766,8 @@ oui pgI pgI oSm -ych -ych +pYC +pYC vGE fVb dqk @@ -69523,8 +69777,8 @@ svy eif bxB ilY -uWt -sjS +dZL +dZL hfw yas dWg @@ -69605,7 +69859,7 @@ osh qbg "} (130,1,1) = {" -hYQ +iDK iDK iDK iDK @@ -69624,7 +69878,7 @@ wMH wMH wMH iDK -iDK +nGT qog geY ufe @@ -69675,7 +69929,7 @@ vny aqB oou sse -lcn +xbu xbu xbu tyn @@ -69693,7 +69947,7 @@ kgX agK fCg fVL -qSU +mCS qSU nqp eMp @@ -69706,8 +69960,8 @@ cUL oSm oSm oSm -ych -ych +pYC +pYC vGE vdG kfM @@ -69799,7 +70053,7 @@ osh qbg "} (131,1,1) = {" -hYQ +iDK iDK iDK iDK @@ -69839,7 +70093,7 @@ nTv hWK rkE uyB -mvN +lZe wLp ioI cBT @@ -69881,14 +70135,14 @@ igQ ipX mcv sDb -qSU -qSU -lPH +lcn +lcn +gkS twr +iCc +nYu +nUw xOF -qSU -qSU -qSU iEU oSm nMw @@ -69901,7 +70155,7 @@ sXS sXS oSm fTt -ych +pYC vGE rdj dEy @@ -69911,7 +70165,7 @@ oBS cKH cKH kfM -uWt +dZL qun aqJ diV @@ -69993,7 +70247,7 @@ osh qbg "} (132,1,1) = {" -hYQ +iDK iDK iDK iDK @@ -70065,7 +70319,7 @@ cCq bLp bLp bLp -dSQ +mas pub bLp bLp @@ -70078,10 +70332,10 @@ bzF oQx vsp nUw -vJA -qSU +ttR qSU qSU +gkc qSU rOk eMp @@ -70094,8 +70348,8 @@ qfH luN uTF oSm -ych -ych +pYC +pYC vGE nrR mRH @@ -70105,7 +70359,7 @@ ygD pyc amW kfM -uWt +dZL kfM kfM vqX @@ -70187,7 +70441,7 @@ osh qbg "} (133,1,1) = {" -hYQ +iDK iDK iDK iDK @@ -70272,10 +70526,10 @@ qSU qSU qSU gkc -vJA -qSU -qSU -qSU +tdu +lcn +mGD +aFc qSU qSU eMp @@ -70288,7 +70542,7 @@ oui wwN wwN oSm -ych +pYC bmM vGE hfw @@ -70381,7 +70635,7 @@ osh qbg "} (134,1,1) = {" -hYQ +iDK iDK iDK iDK @@ -70482,17 +70736,17 @@ qwg oSm oSm oSm -ych -ttR +pYC +pYC vGE cCl cCl hfw -uWt +dZL wWb kfM -uWt -uWt +dZL +dZL dZL kfM kfM @@ -70575,7 +70829,7 @@ osh qbg "} (135,1,1) = {" -hYQ +iDK iDK iDK wMH @@ -70659,8 +70913,8 @@ gja rMX tEe iuc -nUw -bPU +wGt +mdc cfw qwg qwg @@ -70674,22 +70928,22 @@ lZW thY stQ dVP -ych -ych -ych -ych +pYC +pYC +pYC +pYC vGE uqL cCl hfw kfM wWb -uWt +dZL kfM kfM kfM kfM -uWt +dZL hfw hfw hfw @@ -70769,7 +71023,7 @@ osh qbg "} (136,1,1) = {" -hYQ +iDK iDK iDK wMH @@ -70841,7 +71095,7 @@ rOS uCh uCh bLp -dSQ +mas pub bLp uCh @@ -70870,7 +71124,7 @@ aKB oSm dqb xDr -ych +pYC eBz vGE cCl @@ -71035,7 +71289,7 @@ rOS uCh uCh bLp -dSQ +mas fBj bLp uCh @@ -71236,7 +71490,7 @@ uCh bLp sZP ppA -pms +vUu cxs dLf qSU @@ -71265,7 +71519,7 @@ bxd uKS kwf csQ -kMt +bgm vqX oZY mRU @@ -71429,7 +71683,7 @@ bLp uCh bLp bLp -dSQ +mas wgQ oSm dBT @@ -71623,7 +71877,7 @@ bLp uCh uCh bLp -dSQ +mas vUu oSm vUe @@ -71653,7 +71907,7 @@ ppD uKS kwf xNq -kMt +bgm vqX vqX vqX @@ -71847,7 +72101,7 @@ uzS fDs kwf xNq -kMt +bgm pmc iQx bUa @@ -72429,7 +72683,7 @@ ppD jSj kwf xNq -kMt +bgm pmc lzW wne @@ -72623,7 +72877,7 @@ uzS lBd kwf fWO -kMt +bgm pmc jxE xNZ @@ -72817,7 +73071,7 @@ bxd jSj kwf xNq -kMt +bgm pmc pmc pmc @@ -73011,7 +73265,7 @@ gvB sqj kwf xNq -kMt +bgm jii mZE pjU @@ -73019,7 +73273,7 @@ npe pUR mCD vUS -hDZ +yhs vjj tSu wqT @@ -73213,7 +73467,7 @@ uHG dwF dwF mzX -hDZ +yhs pUR tSu wqT @@ -73399,7 +73653,7 @@ kwf kwf kwf fcm -kMt +bgm jii jii uPD @@ -73593,7 +73847,7 @@ pAF dkN kwf nvz -kMt +bgm jii ylH cjT @@ -73706,7 +73960,7 @@ xtx uMB hSy gbY -hSe +pbi jgC dyl saP @@ -73787,7 +74041,7 @@ sXj aFK kwf xNq -kMt +bgm jii mwQ maD @@ -73899,9 +74153,9 @@ lMb xtx cIA hSy -cSI +jgC xbO -hSe +pbi xtZ oVc xpO @@ -73981,7 +74235,7 @@ xVK vQH kwf xNq -kMt +bgm jii jii jii @@ -74095,7 +74349,7 @@ rPl hSy jgC edI -cSI +jgC rIZ bbo xpO @@ -74870,7 +75124,7 @@ iMm sQq sQq fJF -htC +fJF dlE dlE pRN @@ -75064,7 +75318,7 @@ muj uIE sQq nDL -bCl +nDL dlE bOD vLe @@ -75270,7 +75524,7 @@ uXk ruq mWX vdT -fli +iMe jDD cHG cdU @@ -75853,7 +76107,7 @@ naP fmy pDO jUZ -qEb +dJw aeX wOt bxQ @@ -76884,7 +77138,7 @@ his his uaU lgC -lOC +eJo uXC uXC qDA @@ -77015,7 +77269,7 @@ uFy eBH xtJ smX -rzR +bOD lwd jgC mxP @@ -77071,10 +77325,10 @@ his his his his -lOC eJo eJo -lOC +eJo +eJo srn eJo eJo @@ -77082,7 +77336,7 @@ fyK uXC fyK srn -lOC +eJo his his his @@ -77260,7 +77514,7 @@ eJo uXC uXC srn -lOC +eJo gFo his his @@ -77271,7 +77525,7 @@ srn eJo eJo fyK -ndc +uXC uXC uXC uXC @@ -77280,7 +77534,7 @@ eJo eJo eJo eJo -lOC +eJo eJo eJo uXC @@ -77414,7 +77668,7 @@ upn upn aAw aAw -eYN +qOj qOj qOj qOj @@ -77462,14 +77716,14 @@ uXC fyK eJo eJo -ndc +uXC uXC eJo eJo fyK srn eJo -lOC +eJo fyK eJo srn @@ -77645,7 +77899,7 @@ srn uXC uXC uXC -lOC +eJo eJo uXC fyK @@ -77653,7 +77907,7 @@ uXC eJo srn eJo -ndc +uXC uXC uXC eJo @@ -77670,7 +77924,7 @@ uXC eJo eJo srn -lOC +eJo eJo fyK uXC @@ -77842,10 +78096,10 @@ cgG cgG cgG fhP -tdn +mHr cgG cgG -tdn +mHr cgG cgG atJ @@ -77855,7 +78109,7 @@ fhP cgG fhP srn -tdn +mHr srn cgG atJ @@ -77869,7 +78123,7 @@ cgG fyK srn xee -tdn +mHr aFY fyK aFY @@ -77883,12 +78137,12 @@ aFY aFY aFY aFY -mGD -mGD -mGD uWf -mGD -mGD +uWf +uWf +uWf +uWf +uWf osh osh osh @@ -77954,50 +78208,50 @@ uFC uFC uFC uFC -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr sxt csJ csJ @@ -78028,33 +78282,33 @@ csJ csJ csJ sxt -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr ijF -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr ijF -tdn -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr +mHr fyK -tdn +mHr srn ijF srn @@ -78071,18 +78325,18 @@ aFY aFY fyK aFY -tdn +mHr aFY aFY aFY -tdn +mHr aFY -mGD +uWf fyK -mGD -mGD -mGD -mGD +uWf +uWf +uWf +uWf pII osh osh @@ -78148,50 +78402,50 @@ uFC uFC uFC uFC -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr sxt csJ csJ @@ -78222,10 +78476,10 @@ csJ csJ csJ sxt -tdn +mHr ijF -tdn -tdn +mHr +mHr tQo tQo qeS @@ -78244,25 +78498,25 @@ tQo tQo tQo kTm -tdn mHr -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr +mHr srn ijF fyK -tdn +mHr isQ eJo xee aFY aFY aFY -tdn +mHr aFY -tdn +mHr fyK aFY aFY @@ -78271,13 +78525,13 @@ aFY aFY fyK aFY -mGD -mGD -tdn -mGD -tdn -mGD -mGD +uWf +uWf +mHr +uWf +mHr +uWf +uWf osh osh osh @@ -78452,26 +78706,26 @@ isQ eJo xee aFY -tdn +mHr aFY aFY fyK -tdn +mHr aFY -tdn +mHr aFY -tdn -tdn +mHr +mHr aFY aFY aFY -mGD -mGD +uWf +uWf fyK -mGD -mGD +uWf +uWf fyK -mGD +uWf osh osh osh @@ -78536,50 +78790,50 @@ uFC uFC uFC uFC -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr sxt csJ csJ @@ -78610,9 +78864,9 @@ csJ csJ csJ sxt -tdn -tdn -tdn +mHr +mHr +mHr sSa tQo mAA @@ -78632,26 +78886,26 @@ lWm yhp xcL srn -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr fyK srn -tdn +mHr fyK ijF -tdn +mHr isQ uXC xee aFY aFY fyK -tdn +mHr fyK aFY -tdn +mHr aFY fyK aFY @@ -78660,10 +78914,10 @@ aFY fyK aFY fyK -tdn -mGD -mGD -mGD +mHr +uWf +uWf +uWf uWf osh osh @@ -78730,50 +78984,50 @@ uFC uFC uFC uFC -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr sxt csJ csJ @@ -78804,13 +79058,13 @@ csJ csJ csJ sxt -tdn -tdn -tdn +mHr +mHr +mHr ijF tQo aQV -eEA +wrE thm ufR sZU @@ -78821,18 +79075,18 @@ uQO tQo vEy thm -tdu +xmT dwq muw xcL -tdn -tdn -tdn +mHr +mHr +mHr srn mHr -tdn -tdn -tdn +mHr +mHr +mHr fyK fyK ijF @@ -78842,24 +79096,24 @@ pDZ fyK aFY aFY -tdn +mHr aFY aFY aFY aFY -tdn +mHr aFY aFY aFY aFY aFY -mGD -mGD +uWf +uWf fyK -mGD -mGD -mGD -mGD +uWf +uWf +uWf +uWf osh osh osh @@ -78924,50 +79178,50 @@ uFC uFC uFC uFC -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr sxt csJ csJ @@ -78998,13 +79252,13 @@ csJ csJ csJ sxt -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr tQo aQV -wGt +uoX thm uoX sZU @@ -79021,14 +79275,14 @@ tQo tQo iKy srn -tdn +mHr srn -tdn +mHr fyK -tdn +mHr srn -tdn -tdn +mHr +mHr fyK mHr uXC @@ -79039,22 +79293,22 @@ aFY aFY aFY aFY -tdn +mHr aFY aFY aFY aFY -tdn +mHr fyK aFY uWf -mGD -mGD -mGD +uWf +uWf +uWf ter -mGD -tdn -mGD +uWf +mHr +uWf osh osh osh @@ -79118,50 +79372,50 @@ uFC uFC uFC uFC -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr sxt csJ csJ @@ -79192,10 +79446,10 @@ csJ csJ csJ sxt -tdn +mHr ijF -tdn -tdn +mHr +mHr tQo aQV uoX @@ -79212,15 +79466,15 @@ thm myX xcL srn -tdn -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr +mHr srn -tdn +mHr srn -tdn +mHr fyK srn ijF @@ -79229,26 +79483,26 @@ fyK pDZ aFY aFY -tdn +mHr aFY -tdn +mHr fyK aFY -tdn +mHr aFY fyK aFY aFY aFY aFY -tdn -mGD +mHr +uWf fyK -mGD -mGD -mGD -mGD -mGD +uWf +uWf +uWf +uWf +uWf osh osh osh @@ -79312,50 +79566,50 @@ uFC uFC uFC uFC -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr sxt csJ csJ @@ -79386,9 +79640,9 @@ csJ csJ csJ sxt -tdn -tdn -tdn +mHr +mHr +mHr sSa tQo aQV @@ -79405,43 +79659,43 @@ thm thm uYO xcL -tdn -tdn -tdn -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr +mHr +mHr +mHr fyK -tdn -tdn -tdn +mHr +mHr +mHr ijF fyK isQ uXC pDZ aFY -tdn +mHr aFY aFY -tdn +mHr aFY aFY -tdn +mHr aFY aFY -tdn +mHr aFY aFY aFY -mGD -mGD -mGD +uWf +uWf +uWf fyK -mGD -tdn -mGD +uWf +mHr +uWf osh osh osh @@ -79630,11 +79884,11 @@ fyK fyK aFY fyK -mGD -mGD -mGD -mGD -mGD +uWf +uWf +uWf +uWf +uWf uWf osh osh @@ -79700,50 +79954,50 @@ uFC uFC uFC uFC -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr sxt csJ csJ @@ -79774,10 +80028,10 @@ csJ csJ csJ sxt -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr tQo tQo hvt @@ -79795,40 +80049,40 @@ tQo tQo iKy srn -tdn -tdn -tdn -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr +mHr +mHr +mHr srn ijF fyK -tdn +mHr isQ srn pDZ aFY -tdn +mHr aFY -tdn -tdn +mHr +mHr aFY aFY fyK aFY aFY -tdn +mHr aFY aFY aFY -mGD -mGD -tdn -mGD -mGD -mGD +uWf +uWf +mHr +uWf +uWf +uWf osh osh osh @@ -79894,50 +80148,50 @@ uFC uFC uFC uFC -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr sxt csJ csJ @@ -79968,37 +80222,37 @@ csJ csJ csJ sxt -tdn -tdn +mHr +mHr ijF -tdn -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr +mHr ijF -tdn -tdn -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr +mHr +mHr ijF -tdn -tdn +mHr +mHr srn -tdn -tdn +mHr +mHr mHr srn -tdn +mHr fyK -tdn +mHr srn ijF ijF -tdn -xyG +mHr +fyK fyK gIy srn @@ -80017,12 +80271,12 @@ fyK aFY aFY fyK -mGD -tdn -mGD -mGD +uWf +mHr +uWf +uWf kBj -mGD +uWf osh osh osh @@ -80182,7 +80436,7 @@ uEq uEq uEq uEq -tdn +mHr srn uEq srn @@ -80202,20 +80456,20 @@ aFY aFY aFY aFY -tdn +mHr aFY aFY aFY fyK aFY -tdn +mHr aFY aFY -mGD -mGD uWf -mGD -mGD +uWf +uWf +uWf +uWf pII osh osh @@ -80472,7 +80726,7 @@ qbg qbg onC emW -tAe +emW onC isQ kEx @@ -80665,8 +80919,8 @@ qbg (187,1,1) = {" qbg onC -tAe -tAe +emW +emW onC isQ kEx diff --git a/maps/tether/levels/surface2.dmm b/maps/tether/levels/surface2.dmm index 6be758fd1955..792c40148282 100644 --- a/maps/tether/levels/surface2.dmm +++ b/maps/tether/levels/surface2.dmm @@ -132,6 +132,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/south) "agl" = ( @@ -409,13 +412,6 @@ /obj/item/reagent_containers/glass/bottle/eznutrient, /turf/simulated/mineral/floor/virgo3b, /area/tether/surfacebase/outside/outside2) -"arf" = ( -/obj/structure/catwalk, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/bar) "arm" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -1304,15 +1300,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tcomsat) "aZT" = ( /obj/structure/bed/chair{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "0-4" - }, /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 }, @@ -2249,6 +2245,9 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 }, +/obj/machinery/camera/network/medbay{ + dir = 10 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralstairwell) "bKL" = ( @@ -2595,6 +2594,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tcomsat) "bVk" = ( @@ -2817,12 +2819,6 @@ }, /turf/simulated/floor/water/indoors, /area/tether/surfacebase/fish_farm) -"cep" = ( -/obj/structure/railing{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) "cex" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/multi_tile/glass{ @@ -3000,14 +2996,19 @@ /area/maintenance/lower/north) "chj" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "chl" = ( @@ -3224,18 +3225,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) -"cmH" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/effect/floor_decal/techfloor{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/black{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) "cmK" = ( /turf/simulated/floor/grass, /area/maintenance/lower/south) @@ -3473,29 +3462,17 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/armory) "cxu" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 5 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 5 - }, -/obj/effect/floor_decal/borderfloorwhite/corner2{ - dir = 5 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner2{ - dir = 5 - }, -/obj/machinery/bodyscanner{ - dir = 4 - }, -/obj/effect/floor_decal/corner_steel_grid{ +/obj/effect/floor_decal/corner/paleblue/diagonal, +/obj/structure/flora/pottedplant/orientaltree, +/obj/machinery/camera/network/medbay{ dir = 10 }, -/obj/machinery/light{ - dir = 1 +/obj/machinery/status_display{ + level = 4; + pixel_y = -32 }, /turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/recoveryward) +/area/tether/surfacebase/medical/breakroom) "cxA" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -3616,11 +3593,13 @@ pixel_x = 24 }, /obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/structure/table/standard, -/obj/item/storage/single_use/mre/random, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ +/obj/structure/disposalpipe/trunk{ dir = 8 }, +/obj/machinery/disposal, +/obj/machinery/camera/network/medbay{ + dir = 10 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "cEd" = ( @@ -3654,8 +3633,18 @@ /turf/simulated/floor/outdoors/dirt/virgo3b, /area/tether/surfacebase/outside/outside2) "cFv" = ( -/turf/simulated/mineral/floor/virgo3b, -/area/tether/surfacebase/outside/outside2) +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/atmospherics/pipe/simple/visible/supply, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/south) "cFG" = ( /obj/machinery/power/smes/buildable{ RCon_tag = "Substation - Research"; @@ -3753,10 +3742,15 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 1 }, -/obj/effect/floor_decal/steeldecal/steel_decals10, /obj/structure/sign/poster{ pixel_y = 32 }, +/obj/effect/floor_decal/corner_steel_grid{ + dir = 10 + }, +/obj/machinery/body_scanconsole{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) "cIl" = ( @@ -4053,6 +4047,7 @@ dir = 5 }, /obj/effect/floor_decal/rust, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/south) "cST" = ( @@ -4704,6 +4699,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/table/glass, +/obj/item/storage/single_use/mre/random, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "dtU" = ( @@ -4720,10 +4716,12 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) "duD" = ( -/obj/structure/catwalk, -/obj/effect/floor_decal/rust, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) +/area/maintenance/lower/south) "dvE" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled, @@ -4786,10 +4784,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techfloor, /area/maintenance/asmaint2) -"dAG" = ( -/obj/structure/stairs/spawner/west, -/turf/simulated/floor/tiled/techfloor, -/area/chapel/main) "dBJ" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -5041,6 +5035,9 @@ /obj/machinery/atmospherics/pipe/zpipe/down/scrubbers{ dir = 1 }, +/obj/machinery/atmospherics/pipe/zpipe/down/aux{ + dir = 1 + }, /turf/simulated/open, /area/engineering/atmos) "dLp" = ( @@ -5958,6 +5955,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tcomsat) "etm" = ( @@ -6136,6 +6136,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tcomsat) "eBG" = ( @@ -6246,6 +6249,7 @@ opacity = 0; open_layer = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/engineering/atmos) "eEq" = ( @@ -6617,11 +6621,6 @@ /obj/machinery/camera/network/engineering, /turf/simulated/floor/plating, /area/maintenance/substation/command) -"eUc" = ( -/obj/effect/floor_decal/borderfloorwhite, -/obj/effect/floor_decal/corner/paleblue/border, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/recoveryward) "eUq" = ( /obj/structure/table/standard, /obj/item/stock_parts/subspace/transmitter, @@ -6685,9 +6684,6 @@ /obj/structure/sign/poster{ pixel_x = -32 }, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 4 - }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "eWF" = ( @@ -7170,9 +7166,6 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) -"fmr" = ( -/turf/simulated/floor/plating, -/area/maintenance/lower/bar) "fmD" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -7257,6 +7250,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/tcommsat/computer) "fun" = ( @@ -7443,6 +7439,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/south) "fAy" = ( @@ -7713,6 +7712,7 @@ }, /obj/machinery/atmospherics/pipe/simple/visible/supply, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/south) "fKx" = ( @@ -7967,11 +7967,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/north) -"fQD" = ( -/obj/structure/catwalk, -/obj/effect/floor_decal/rust, -/turf/simulated/floor/plating, -/area/maintenance/lower/public_garden_maintenance/upper) "fQP" = ( /turf/simulated/shuttle/wall/voidcraft, /area/tether/surfacebase/old_shelter) @@ -8710,25 +8705,9 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/middlehall) "gpO" = ( -/obj/machinery/power/apc/east_mount, -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 4 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloorwhite/corner2{ - dir = 6 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner2{ - dir = 6 - }, -/obj/structure/flora/pottedplant/stoutbush, +/obj/structure/window/reinforced, /turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/recoveryward) +/area/tether/surfacebase/medical/uppersouthstairwell) "gqK" = ( /obj/structure/sign/deck/second, /turf/simulated/wall/r_wall/prepainted/science, @@ -9753,6 +9732,7 @@ "gYG" = ( /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, /obj/machinery/atmospherics/pipe/simple/visible/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/south) "gYL" = ( @@ -9777,6 +9757,9 @@ dir = 4 }, /obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tcommsat/entrance) "gZb" = ( @@ -9802,12 +9785,8 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/medical/resleeving) "hag" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/south) "hal" = ( @@ -9834,12 +9813,6 @@ /obj/effect/floor_decal/rust, /turf/simulated/shuttle/floor/voidcraft, /area/tether/surfacebase/old_shelter) -"hbc" = ( -/obj/effect/floor_decal/techfloor, -/obj/structure/catwalk, -/obj/effect/floor_decal/rust, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) "hbM" = ( /obj/structure/stairs/spawner/south, /turf/simulated/floor/tiled, @@ -9856,8 +9829,8 @@ dir = 2; icon_state = "pipe-c" }, -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 4 +/obj/effect/floor_decal/corner_steel_grid{ + dir = 5 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) @@ -10287,8 +10260,12 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_two) "hvD" = ( +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, -/area/maintenance/lower/atmos) +/area/maintenance/lower/south) "hvF" = ( /obj/structure/bookcase, /turf/simulated/floor/wood, @@ -10421,6 +10398,9 @@ /obj/structure/cable/cyan{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/engineering/atmos) "hBi" = ( @@ -11137,20 +11117,11 @@ /turf/simulated/floor/tiled, /area/tcommsat/computer) "iav" = ( -/obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/item/radio/intercom/department/medbay{ - dir = 4; - pixel_x = 24 - }, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/machinery/disposal, -/obj/machinery/camera/network/medbay{ - dir = 10 +/obj/structure/sign/poster{ + pixel_y = -32 }, /turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/breakroom) +/area/tether/surfacebase/medical/uppersouthstairwell) "iaC" = ( /obj/machinery/door/blast/regular{ density = 0; @@ -11173,6 +11144,7 @@ "ibp" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/structure/table/glass, +/obj/random/medical, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "ibB" = ( @@ -11544,6 +11516,7 @@ /obj/structure/catwalk, /obj/machinery/atmospherics/pipe/simple/visible/supply, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/south) "iri" = ( @@ -11560,6 +11533,9 @@ /obj/machinery/atmospherics/pipe/simple/visible/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/south) "irk" = ( @@ -12024,13 +12000,7 @@ /area/tether/surfacebase/security/outfitting/storage) "iEC" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/structure/reagent_dispensers/water_cooler/full{ - dir = 4 - }, -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/breakroom) "iEH" = ( /obj/machinery/door/airlock/security{ @@ -12240,15 +12210,6 @@ /obj/machinery/camera/network/research, /turf/simulated/floor/wood, /area/rnd/breakroom) -"iLx" = ( -/obj/structure/table/standard, -/obj/structure/bedsheetbin, -/obj/random/soap, -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/recoveryward) "iLA" = ( /obj/machinery/button/remote/blast_door{ id = "xenobiodiv1"; @@ -12355,22 +12316,15 @@ /area/tether/surfacebase/medical/resleeving) "iNF" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 5 }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 8 }, -/obj/structure/disposalpipe/sortjunction{ - dir = 1; - name = "Medical Breakroom"; - sortType = "Medical Breakroom" +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/maintenance/medical{ + name = "Medical Maintenance Access" }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) @@ -12465,6 +12419,7 @@ /obj/structure/railing, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "iSt" = ( @@ -12495,8 +12450,15 @@ /area/tcommsat/computer) "iTp" = ( /obj/structure/catwalk, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/atmospherics/pipe/simple/visible/supply, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/turf/simulated/floor/plating, +/area/maintenance/lower/south) "iTw" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -12676,6 +12638,7 @@ /obj/random/maintenance/clean, /obj/random/maintenance/clean, /obj/random/maintenance/engineering, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/south) "jcA" = ( @@ -12825,6 +12788,9 @@ /area/engineering/atmos) "jhB" = ( /obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/atmospherics/pipe/zpipe/up/aux{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/south) "jhE" = ( @@ -12837,22 +12803,8 @@ /turf/simulated/floor/tiled/techfloor, /area/server) "jiF" = ( -/obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/extinguisher_cabinet{ - dir = 1; - pixel_y = -32 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/breakroom) +/turf/simulated/mineral, +/area/tether/surfacebase/medical/recoveryward) "jiV" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -13064,10 +13016,13 @@ /area/maintenance/lower/bar) "jra" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/machinery/power/apc/south_mount, -/obj/structure/cable/green, -/obj/structure/table/standard, -/obj/random/medical, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "jri" = ( @@ -13585,8 +13540,12 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/evastorage) "jJe" = ( -/turf/simulated/floor/outdoors/grass/sif/virgo3b, -/area/tether/surfacebase/outside/outside2) +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 5 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/south) "jKw" = ( /obj/structure/table/glass, /obj/machinery/fire_alarm/west_mount{ @@ -13605,17 +13564,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/patient_c) -"jLb" = ( -/obj/structure/catwalk, -/obj/effect/floor_decal/rust, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/north) "jLf" = ( /obj/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -14263,6 +14211,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tcommsat/entrance) "kmq" = ( @@ -14540,9 +14491,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) -"kyL" = ( -/turf/simulated/floor, -/area/maintenance/lower/north) "kzz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -14589,9 +14537,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/middlehall) -"kCm" = ( -/turf/simulated/floor, -/area/maintenance/lower/north) "kCZ" = ( /obj/machinery/door/airlock/security{ id_tag = "bathroomlock9"; @@ -14676,14 +14621,16 @@ /area/tether/surfacebase/surface_two_hall) "kHg" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/item/deck/cah/black{ pixel_x = 5; pixel_y = 29 }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/structure/flora/skeleton{ + name = "\proper Sheb" + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "kHB" = ( @@ -15103,11 +15050,18 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/fish_farm) "kWG" = ( -/obj/structure/railing{ - dir = 1 +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/atmospherics/pipe/simple/visible/supply, +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/north) +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 10 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/south) "kWN" = ( /obj/effect/floor_decal/borderfloor{ dir = 9 @@ -15267,6 +15221,9 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tcommsat/entrance) "lde" = ( @@ -15315,14 +15272,20 @@ /area/tether/surfacebase/security/interrogation) "lfa" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/table/glass, /obj/item/deck/cah, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "lfi" = ( -/turf/simulated/floor/tiled/dark, +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ + dir = 1 + }, +/turf/simulated/floor/plating, /area/maintenance/lower/south) "lfl" = ( /obj/structure/cable{ @@ -15347,10 +15310,6 @@ /obj/structure/table/wooden_reinforced, /turf/simulated/floor/carpet/turcarpet, /area/bridge/meeting_room) -"lgE" = ( -/obj/structure/bed/chair, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) "lhm" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -15486,6 +15445,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tcomsat) "lpW" = ( @@ -15524,12 +15486,15 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 1 }, -/obj/machinery/body_scanconsole{ - dir = 4 - }, /obj/effect/floor_decal/corner_steel_grid{ dir = 10 }, +/obj/machinery/bodyscanner{ + dir = 4 + }, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) "lra" = ( @@ -15880,6 +15845,9 @@ /obj/machinery/atmospherics/pipe/simple/visible/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/south) "lFn" = ( @@ -15969,6 +15937,9 @@ pixel_y = 22 }, /obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/south) "lIC" = ( @@ -16217,6 +16188,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/south) "lSe" = ( @@ -16370,16 +16344,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) -"lYE" = ( -/obj/structure/bookcase/manuals/medical, -/obj/item/book/manual/resleeving, -/obj/item/book/manual/stasis, -/obj/item/book/manual/medical_diagnostics_manual{ - pixel_y = 7 - }, -/obj/effect/floor_decal/corner/paleblue/diagonal, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/breakroom) "lYP" = ( /turf/simulated/floor/plating, /area/vacant/vacant_bar_upper) @@ -16691,17 +16655,17 @@ /turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/outside/outside2) "miX" = ( -/obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/machinery/camera/network/medbay{ - dir = 10 +/obj/structure/mirror{ + dir = 4; + pixel_x = -25 }, -/obj/machinery/status_display{ - level = 4; - pixel_y = -32 +/obj/structure/sink{ + dir = 8; + pixel_x = -12; + pixel_y = 2 }, -/obj/structure/flora/pottedplant/orientaltree, /turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/breakroom) +/area/tether/surfacebase/medical/recoveryward) "mjL" = ( /obj/effect/floor_decal/corner/yellow{ dir = 1 @@ -17047,12 +17011,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 10 +/obj/machinery/door/airlock{ + id_tag = "bathroomlock7"; + name = "Restroom" }, -/obj/effect/floor_decal/steeldecal/steel_decals4, -/obj/effect/floor_decal/corner_steel_grid{ - dir = 5 +/obj/machinery/door/firedoor/glass{ + dir = 8 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) @@ -17232,16 +17196,6 @@ /obj/landmark/spawnpoint/job/security_officer, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/outfitting) -"mEJ" = ( -/obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/structure/flora/skeleton{ - name = "\proper Sheb" - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/breakroom) "mFl" = ( /obj/effect/floor_decal/corner_techfloor_grid, /obj/effect/floor_decal/corner_techfloor_grid{ @@ -17335,6 +17289,9 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/red, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/engineering/atmos) "mKH" = ( @@ -17643,6 +17600,7 @@ "mUL" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/machinery/door/firedoor, +/obj/machinery/door/airlock/maintenance/medical, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "mUT" = ( @@ -18137,6 +18095,9 @@ req_access = list(61) }, /obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tcomsat) "nmb" = ( @@ -18535,6 +18496,9 @@ /obj/structure/cable{ icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/south) "nxi" = ( @@ -18731,6 +18695,9 @@ /obj/structure/cable{ icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/south) "nIQ" = ( @@ -18945,14 +18912,9 @@ /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_slimepens) "nOX" = ( -/obj/machinery/door/airlock{ - id_tag = "bathroomlock7"; - name = "Restroom" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -19637,10 +19599,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/engineering/pumpstation) -"onI" = ( -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) "ooX" = ( /obj/machinery/light/small{ dir = 1 @@ -19810,6 +19768,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/engineering/lower/lobby) "owe" = ( @@ -19836,6 +19797,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tcommsat/entrance) "oxn" = ( @@ -20245,9 +20209,6 @@ /turf/simulated/floor/tiled/dark, /area/maintenance/lower/south) "oPZ" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/structure/stairs/spawner/south, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_two) @@ -20344,17 +20305,19 @@ /area/engineering/atmos) "oSY" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/structure/cable/green{ - icon_state = "1-8" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, /obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" + dir = 4 + }, +/obj/structure/extinguisher_cabinet{ + dir = 1; + pixel_y = -32 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "oTC" = ( @@ -20592,18 +20555,8 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/south) "pcj" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/holoplant, -/obj/effect/floor_decal/corner/paleblue{ - dir = 9 - }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 6 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/uppersouthstairwell) +/turf/simulated/floor/outdoors/grass/sif/virgo3b, +/area/tether/surfacebase/medical/recoveryward) "pcu" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -20686,14 +20639,11 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/north) "phQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/railing{ + dir = 8 }, -/turf/simulated/floor/tiled/dark, -/area/maintenance/lower/south) +/turf/simulated/open, +/area/tether/surfacebase/public_garden_two) "phS" = ( /obj/effect/floor_decal/borderfloor/shifted, /obj/effect/floor_decal/corner/white/border/shifted, @@ -21214,6 +21164,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/supply, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, /obj/effect/floor_decal/rust, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/south) "pBY" = ( @@ -21439,6 +21390,12 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/structure/table/standard, +/obj/structure/bedsheetbin, +/obj/random/soap, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) "pLC" = ( @@ -21569,15 +21526,6 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppersouthstairwell) "pRb" = ( -/obj/structure/mirror{ - dir = 4; - pixel_x = -25 - }, -/obj/structure/sink{ - dir = 8; - pixel_x = -12; - pixel_y = 2 - }, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 }, @@ -21813,6 +21761,9 @@ /obj/structure/catwalk, /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/maintenance/common, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/south) "pZt" = ( @@ -22332,10 +22283,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/north) -"qtM" = ( -/obj/machinery/camera/network/medbay, -/turf/simulated/open, -/area/tether/surfacebase/medical/centralstairwell) "qut" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/air_alarm{ @@ -22363,6 +22310,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/engineering/atmos) "quR" = ( @@ -22394,6 +22344,9 @@ /obj/structure/cable/cyan{ icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/engineering/atmos) "qvD" = ( @@ -23113,6 +23066,7 @@ }, /obj/machinery/atmospherics/pipe/simple/visible/supply, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/south) "rcx" = ( @@ -23157,12 +23111,16 @@ /area/tether/surfacebase/medical/examroom) "rev" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/structure/disposalpipe/sortjunction{ + dir = 1; + name = "Medical Breakroom"; + sortType = "Medical Breakroom" }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) @@ -23346,6 +23304,9 @@ dir = 4 }, /obj/landmark/spawnpoint/job/medical_doctor, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "rkD" = ( @@ -23579,7 +23540,20 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "rrk" = ( -/turf/simulated/floor/tiled/dark, +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, +/turf/simulated/floor/plating, /area/maintenance/lower/south) "rrQ" = ( /obj/structure/table/steel, @@ -24147,6 +24121,9 @@ dir = 1 }, /obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 + }, /turf/simulated/floor/plating, /area/maintenance/lower/south) "rRK" = ( @@ -24188,6 +24165,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/red{ dir = 9 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/engineering/atmos) "rTQ" = ( @@ -24774,6 +24752,9 @@ /obj/machinery/atmospherics/pipe/simple/visible/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/south) "soc" = ( @@ -24802,9 +24783,8 @@ /area/tcomsat) "spN" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/structure/cable/green{ - icon_state = "2-4" - }, +/obj/structure/table/glass, +/obj/machinery/recharger, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "sqi" = ( @@ -24961,10 +24941,9 @@ /turf/simulated/floor/plating, /area/maintenance/readingrooms) "ssQ" = ( -/obj/machinery/atmospherics/component/unary/freezer{ - icon_state = "freezer_1"; - set_temperature = 73; - use_power = 1 +/obj/machinery/atmospherics/component/binary/heat_pump{ + use_power = 1; + target_temp = 80 }, /turf/simulated/floor/tiled/dark, /area/tcommsat/computer) @@ -25104,6 +25083,9 @@ dir = 1 }, /obj/machinery/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tcomsat) "swP" = ( @@ -25240,6 +25222,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tcommsat/computer) "sBb" = ( @@ -25311,6 +25296,9 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/engineering/atmos) "sDf" = ( @@ -25764,11 +25752,9 @@ /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) "sVc" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/public_garden_two) +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/turf/simulated/floor/plating, +/area/maintenance/lower/south) "sVB" = ( /obj/structure/catwalk, /obj/machinery/fire_alarm/north_mount, @@ -26099,6 +26085,9 @@ /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 5 + }, /turf/simulated/floor/plating, /area/maintenance/lower/south) "tju" = ( @@ -26134,15 +26123,12 @@ /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) "tkx" = ( -/obj/machinery/door/airlock/maintenance/medical{ - name = "Medical Maintenance Access" - }, -/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/techfloor, -/area/tether/surfacebase/medical/breakroom) +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/maintenance/lower/mining) "tlq" = ( /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ id = "ward_tint"; @@ -26182,6 +26168,7 @@ /obj/machinery/door/firedoor/glass, /obj/structure/catwalk, /obj/machinery/door/airlock/maintenance/common, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/south) "tnO" = ( @@ -26391,6 +26378,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/engineering/lower/breakroom) "twA" = ( @@ -27032,9 +27022,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/bathroom) -"uhr" = ( -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) "uhO" = ( /obj/machinery/air_alarm{ dir = 4; @@ -27079,6 +27066,9 @@ /obj/structure/cable/cyan{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/engineering/atmos) "uiV" = ( @@ -27196,12 +27186,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/east_stairs_two) -"unR" = ( -/obj/structure/bed/double/padded, -/obj/item/bedsheet/double, -/obj/structure/curtain/open/privacy, -/turf/simulated/floor/wood, -/area/vacant/vacant_bar_upper) "uoh" = ( /obj/structure/bed/chair{ dir = 1 @@ -27561,18 +27545,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/east_stairs_two) -"uDc" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/floor_decal/techfloor{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/visible/purple{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) "uDh" = ( /obj/structure/table/rack/shelf/steel, /obj/machinery/fire_alarm/west_mount{ @@ -27698,6 +27670,9 @@ /obj/machinery/camera/network/engineering{ dir = 4 }, +/obj/structure/railing{ + dir = 4 + }, /turf/simulated/open, /area/engineering/atmos) "uFm" = ( @@ -27760,6 +27735,9 @@ /obj/structure/railing{ dir = 1 }, +/obj/structure/railing{ + dir = 4 + }, /turf/simulated/open, /area/rnd/staircase/secondfloor) "uGA" = ( @@ -28106,6 +28084,9 @@ /obj/structure/railing{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/south) "uTF" = ( @@ -28279,14 +28260,15 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, -/obj/machinery/light{ - dir = 4 - }, /obj/item/storage/box/cups{ pixel_x = 8; pixel_y = 8 }, /obj/item/storage/box/donkpockets, +/obj/machinery/power/apc/east_mount, +/obj/structure/cable/green{ + icon_state = "0-8" + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "vbZ" = ( @@ -28535,9 +28517,9 @@ /turf/simulated/floor/tiled/steel_dirty, /area/maintenance/asmaint2) "vkz" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/engineering/lower/breakroom) "vkN" = ( @@ -28609,21 +28591,6 @@ /obj/item/reagent_containers/food/drinks/teapot, /turf/simulated/floor/wood, /area/maintenance/lower/atmos) -"voy" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 9 - }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 6 - }, -/obj/structure/sign/poster{ - pixel_y = -32 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/uppersouthstairwell) "voF" = ( /obj/machinery/holopad, /turf/simulated/floor/carpet/turcarpet, @@ -28717,12 +28684,6 @@ /obj/machinery/shieldgen, /turf/simulated/floor/plating, /area/engineering/atmos/storage) -"vqa" = ( -/obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/structure/table/standard, -/obj/machinery/recharger, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/breakroom) "vqk" = ( /obj/structure/cable{ icon_state = "16-0" @@ -29069,6 +29030,7 @@ pixel_x = -5; pixel_y = 24 }, +/obj/effect/floor_decal/steeldecal/steel_decals10, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) "vDa" = ( @@ -29098,9 +29060,6 @@ /obj/structure/railing, /turf/simulated/open, /area/tether/surfacebase/medical/centralstairwell) -"vEo" = ( -/turf/simulated/floor/plating, -/area/maintenance/lower/bar) "vEx" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -29225,6 +29184,7 @@ /obj/random/maintenance/clean, /obj/random/maintenance/clean, /obj/random/maintenance/clean, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/south) "vKx" = ( @@ -29306,9 +29266,21 @@ /turf/simulated/floor/tiled, /area/tcommsat/computer) "vNL" = ( -/obj/structure/cable/green{ - icon_state = "1-4" +/obj/machinery/power/apc/east_mount, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 4 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorwhite/corner2{ + dir = 6 + }, +/obj/effect/floor_decal/corner/paleblue/bordercorner2{ + dir = 6 }, +/obj/structure/flora/pottedplant/stoutbush, +/obj/structure/cable/green, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) "vOq" = ( @@ -29327,6 +29299,9 @@ /obj/machinery/door/firedoor{ dir = 8 }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) "vOs" = ( @@ -29549,10 +29524,6 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_two_hall) -"vZe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/dark, -/area/maintenance/lower/south) "vZp" = ( /obj/machinery/door/blast/regular{ id = "xenobiodiv7"; @@ -29593,6 +29564,10 @@ dir = 4 }, /obj/effect/floor_decal/corner/paleblue/diagonal, +/obj/item/radio/intercom/department/medbay{ + dir = 4; + pixel_x = 24 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "waY" = ( @@ -29750,6 +29725,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/red{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/engineering/atmos) "weP" = ( @@ -29796,9 +29772,15 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/south) "wgc" = ( -/obj/machinery/fire_alarm/east_mount, +/obj/effect/floor_decal/corner/paleblue/diagonal, +/obj/structure/bookcase/manuals/medical, +/obj/item/book/manual/medical_diagnostics_manual{ + pixel_y = 7 + }, +/obj/item/book/manual/stasis, +/obj/item/book/manual/resleeving, /turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/recoveryward) +/area/tether/surfacebase/medical/breakroom) "wgA" = ( /obj/structure/bed/chair/comfy/brown, /turf/simulated/floor/wood, @@ -29932,14 +29914,9 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "wno" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/effect/floor_decal/techfloor{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/supply, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/structure/catwalk, +/obj/effect/floor_decal/rust, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/south) "wnq" = ( @@ -29978,6 +29955,9 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tcommsat/computer) "wqy" = ( @@ -30466,6 +30446,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/engineering/lower/lobby) "wFz" = ( @@ -30619,11 +30602,11 @@ /obj/structure/cable/green{ icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tcomsat) -"wLg" = ( -/turf/simulated/floor/plating, -/area/maintenance/asmaint2) "wLo" = ( /obj/machinery/door/blast/regular{ density = 0; @@ -30770,6 +30753,9 @@ /obj/structure/railing{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 + }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/south) "wSF" = ( @@ -31410,6 +31396,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/engineering/lower/lobby) "xqg" = ( @@ -32002,8 +31991,11 @@ /turf/simulated/open/virgo3b, /area/tether/surfacebase/outside/outside2) "xOk" = ( -/obj/machinery/door/airlock/maintenance/medical, -/turf/simulated/floor/tiled/techfloor, +/obj/effect/floor_decal/corner/paleblue/diagonal, +/obj/structure/reagent_dispensers/water_cooler/full{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "xOY" = ( /turf/simulated/floor, @@ -32147,9 +32139,6 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/outfitting) -"xSX" = ( -/turf/simulated/floor/plating, -/area/maintenance/lower/rnd) "xTm" = ( /obj/effect/floor_decal/corner_techfloor_grid{ dir = 9 @@ -33238,10 +33227,10 @@ fQP uUP fQP gbr -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -33251,8 +33240,8 @@ vFJ vFJ vFJ vFJ -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -33263,23 +33252,23 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -33432,49 +33421,49 @@ shS uBs hMi gEU -jJe -jJe fxm -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -33626,55 +33615,55 @@ pMA bLg bLg krO -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -33820,31 +33809,31 @@ qip dlA haY sMR -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -33859,19 +33848,19 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -34014,28 +34003,28 @@ gbr scM fQP gbr -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -34053,20 +34042,20 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm bwy bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -34208,28 +34197,28 @@ vFJ vFJ vFJ vFJ -jJe fxm -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -34254,19 +34243,19 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -34401,28 +34390,28 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -34451,23 +34440,23 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -34594,28 +34583,28 @@ tXE vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm lbt -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -34652,16 +34641,16 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -34788,27 +34777,27 @@ tXE vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -34850,13 +34839,13 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -34981,27 +34970,27 @@ tXE tXE vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -35047,10 +35036,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -35175,25 +35164,25 @@ tXE tXE vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -35242,10 +35231,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -35369,24 +35358,24 @@ tXE tXE vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm lbt -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -35437,10 +35426,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -35563,24 +35552,24 @@ tXE tXE vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -35632,10 +35621,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -35758,23 +35747,23 @@ tXE vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -35826,10 +35815,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -35952,23 +35941,23 @@ tXE vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm lbt -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -36020,10 +36009,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -36146,23 +36135,23 @@ tXE vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -36214,10 +36203,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -36340,23 +36329,23 @@ tXE vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm lbt -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -36409,9 +36398,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -36534,22 +36523,22 @@ tXE vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm lbt -jJe +fxm bwy bwy bwy @@ -36603,9 +36592,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -36728,22 +36717,22 @@ tXE vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm lbt -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -36797,9 +36786,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -36922,22 +36911,22 @@ tXE vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -36991,9 +36980,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -37116,22 +37105,22 @@ tXE vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -37186,8 +37175,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -37310,22 +37299,22 @@ tXE vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -37380,10 +37369,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -37504,22 +37493,22 @@ tXE vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm lbt -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -37574,10 +37563,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -37698,21 +37687,21 @@ tXE vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -37768,10 +37757,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -37891,22 +37880,22 @@ tXE tXE vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -37962,11 +37951,11 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -38085,22 +38074,22 @@ tXE tXE vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -38156,11 +38145,11 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -38279,22 +38268,22 @@ tXE tXE vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -38350,11 +38339,11 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -38473,21 +38462,21 @@ tXE tXE vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -38544,11 +38533,11 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -38667,21 +38656,21 @@ tXE tXE vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -38738,11 +38727,11 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -38861,21 +38850,21 @@ tXE tXE vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm lbt -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm lbt -jJe +fxm bwy bwy bwy @@ -38933,10 +38922,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -39057,19 +39046,19 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -39127,10 +39116,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -39250,20 +39239,20 @@ tXE vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -39321,10 +39310,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -39444,20 +39433,20 @@ tXE vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -39516,10 +39505,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -39637,21 +39626,21 @@ tXE tXE vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -39710,10 +39699,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -39831,21 +39820,21 @@ tXE tXE vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm lbt -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -39904,10 +39893,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -40025,20 +40014,20 @@ tXE tXE vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -40099,10 +40088,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -40219,20 +40208,20 @@ tXE tXE vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -40293,10 +40282,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -40373,10 +40362,10 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -40413,20 +40402,20 @@ tXE tXE vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm lbt -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -40487,10 +40476,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -40566,14 +40555,14 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -40607,20 +40596,20 @@ tXE tXE vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -40682,10 +40671,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -40758,20 +40747,20 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -40801,19 +40790,19 @@ tXE tXE vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -40876,16 +40865,16 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ vFJ vFJ -jJe +fxm vFJ vFJ vFJ @@ -40952,20 +40941,20 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -40995,17 +40984,17 @@ tXE tXE vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -41070,25 +41059,25 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -41146,7 +41135,7 @@ vFJ vFJ vFJ vFJ -jJe +fxm bwy bwy bwy @@ -41156,20 +41145,20 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -41189,14 +41178,14 @@ tXE tXE vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -41265,26 +41254,26 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -41339,8 +41328,8 @@ vFJ vFJ vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -41354,17 +41343,17 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -41382,12 +41371,12 @@ tXE (46,1,1) = {" tXE vFJ -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -41459,10 +41448,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy @@ -41475,12 +41464,12 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -41533,8 +41522,8 @@ vFJ vFJ vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -41555,11 +41544,11 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -41576,11 +41565,11 @@ tXE (47,1,1) = {" tXE vFJ -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -41670,11 +41659,11 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -41727,8 +41716,8 @@ vFJ vFJ vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -41750,10 +41739,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -41770,10 +41759,10 @@ tXE (48,1,1) = {" tXE vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy @@ -41865,10 +41854,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -41920,9 +41909,9 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -41946,10 +41935,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -41964,10 +41953,10 @@ tXE (49,1,1) = {" tXE vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy @@ -42059,10 +42048,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -42114,9 +42103,9 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -42141,10 +42130,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -42158,10 +42147,10 @@ tXE (50,1,1) = {" tXE vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy @@ -42254,10 +42243,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -42307,10 +42296,10 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy @@ -42337,9 +42326,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -42352,10 +42341,10 @@ tXE (51,1,1) = {" tXE vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy @@ -42448,10 +42437,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -42501,10 +42490,10 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy @@ -42532,9 +42521,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -42546,10 +42535,10 @@ tXE (52,1,1) = {" tXE vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy @@ -42642,10 +42631,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -42695,9 +42684,9 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -42727,8 +42716,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -42740,10 +42729,10 @@ tXE (53,1,1) = {" tXE vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy @@ -42836,10 +42825,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -42888,10 +42877,10 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy @@ -42921,8 +42910,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -42934,10 +42923,10 @@ tXE (54,1,1) = {" tXE vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy @@ -43030,10 +43019,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -43082,10 +43071,10 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy @@ -43115,8 +43104,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -43128,10 +43117,10 @@ tXE (55,1,1) = {" tXE vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy @@ -43225,9 +43214,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -43276,9 +43265,9 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -43309,8 +43298,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -43322,10 +43311,10 @@ tXE (56,1,1) = {" tXE vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy @@ -43419,9 +43408,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -43470,9 +43459,9 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -43503,8 +43492,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -43516,10 +43505,10 @@ tXE (57,1,1) = {" tXE vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy @@ -43613,17 +43602,17 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -43664,9 +43653,9 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -43697,8 +43686,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -43710,10 +43699,10 @@ tXE (58,1,1) = {" tXE vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy @@ -43808,22 +43797,22 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -43858,9 +43847,9 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -43891,8 +43880,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -43904,10 +43893,10 @@ tXE (59,1,1) = {" tXE vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy @@ -44003,22 +43992,22 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -44051,10 +44040,10 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy @@ -44085,8 +44074,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -44098,10 +44087,10 @@ tXE (60,1,1) = {" tXE vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy @@ -44205,14 +44194,14 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -44245,9 +44234,9 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -44279,8 +44268,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -44292,9 +44281,9 @@ tXE (61,1,1) = {" tXE vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -44400,19 +44389,19 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -44439,9 +44428,9 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -44472,9 +44461,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -44486,9 +44475,9 @@ tXE (62,1,1) = {" tXE vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -44600,18 +44589,18 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -44633,9 +44622,9 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -44666,9 +44655,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -44680,9 +44669,9 @@ tXE (63,1,1) = {" tXE vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -44800,14 +44789,14 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -44827,9 +44816,9 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -44859,10 +44848,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -44874,9 +44863,9 @@ tXE (64,1,1) = {" tXE vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -44999,10 +44988,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -45019,11 +45008,11 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -45053,10 +45042,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -45068,9 +45057,9 @@ tXE (65,1,1) = {" tXE vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -45195,10 +45184,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -45213,9 +45202,9 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -45250,7 +45239,7 @@ nee nee nee nee -jJe +fxm vFJ vFJ vFJ @@ -45262,9 +45251,9 @@ tXE (66,1,1) = {" tXE vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -45391,10 +45380,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -45407,9 +45396,9 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -45444,7 +45433,7 @@ izs izs izs nee -jJe +fxm vFJ vFJ vFJ @@ -45456,9 +45445,9 @@ tXE (67,1,1) = {" tXE vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -45586,10 +45575,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -45601,8 +45590,8 @@ vFJ vFJ vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -45638,7 +45627,7 @@ izs izs izs nee -jJe +fxm vFJ vFJ vFJ @@ -45650,9 +45639,9 @@ tXE (68,1,1) = {" tXE vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -45782,21 +45771,21 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -45832,7 +45821,7 @@ izs izs izs nee -jJe +fxm vFJ vFJ vFJ @@ -45845,8 +45834,8 @@ tXE tXE vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -45976,19 +45965,19 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -46026,7 +46015,7 @@ izs izs izs nee -jJe +fxm vFJ vFJ vFJ @@ -46039,8 +46028,8 @@ tXE tXE vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -46169,17 +46158,17 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -46220,7 +46209,7 @@ izs izs izs nee -jJe +fxm vFJ vFJ vFJ @@ -46233,8 +46222,8 @@ tXE tXE vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -46414,7 +46403,7 @@ izs izs izs nee -jJe +fxm vFJ vFJ vFJ @@ -46427,8 +46416,8 @@ tXE tXE vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -46608,7 +46597,7 @@ izs izs izs nee -jJe +fxm vFJ vFJ vFJ @@ -46621,8 +46610,8 @@ tXE tXE vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -46802,7 +46791,7 @@ izs izs izs nee -jJe +fxm vFJ vFJ vFJ @@ -46815,8 +46804,8 @@ tXE tXE vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -46996,7 +46985,7 @@ izs izs izs nee -jJe +fxm vFJ vFJ vFJ @@ -47009,8 +46998,8 @@ tXE tXE vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -47190,7 +47179,7 @@ izs izs izs nee -jJe +fxm vFJ vFJ vFJ @@ -47203,8 +47192,8 @@ tXE tXE vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -47384,7 +47373,7 @@ izs izs izs nee -jJe +fxm vFJ vFJ vFJ @@ -47397,8 +47386,8 @@ tXE tXE vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -47578,7 +47567,7 @@ izs izs izs nee -jJe +fxm vFJ vFJ vFJ @@ -47591,8 +47580,8 @@ tXE tXE vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -47772,7 +47761,7 @@ izs izs izs nee -jJe +fxm vFJ vFJ vFJ @@ -47784,9 +47773,9 @@ tXE (79,1,1) = {" tXE vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -47966,7 +47955,7 @@ izs izs izs nee -jJe +fxm vFJ vFJ vFJ @@ -47978,9 +47967,9 @@ tXE (80,1,1) = {" tXE vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -48160,9 +48149,9 @@ izs izs izs nee -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -48172,9 +48161,9 @@ tXE (81,1,1) = {" tXE vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -48354,9 +48343,9 @@ izs izs izs nee -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -48366,8 +48355,8 @@ tXE (82,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -48548,9 +48537,9 @@ izs izs izs nee -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -48560,8 +48549,8 @@ tXE (83,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -48742,9 +48731,9 @@ izs izs izs nee -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -48754,8 +48743,8 @@ tXE (84,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -48936,9 +48925,9 @@ izs izs izs nee -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -48948,8 +48937,8 @@ tXE (85,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -49130,9 +49119,9 @@ izs izs izs nee -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -49143,7 +49132,7 @@ tXE tXE vFJ vFJ -jJe +fxm bwy bwy bwy @@ -49324,9 +49313,9 @@ nee nee nee nee -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -49337,7 +49326,7 @@ tXE tXE vFJ vFJ -jJe +fxm bwy bwy bwy @@ -49352,7 +49341,7 @@ bwy bwy bwy bwy -jJe +fxm wFz wFz wFz @@ -49518,9 +49507,9 @@ izs izs izs nee -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -49531,7 +49520,7 @@ tXE tXE vFJ vFJ -jJe +fxm bwy bwy bwy @@ -49545,7 +49534,7 @@ bwy bwy bwy bwy -jJe +fxm wFz wFz wFz @@ -49712,9 +49701,9 @@ izs izs izs nee -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -49724,8 +49713,8 @@ tXE (89,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -49739,8 +49728,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm wFz wFz wFz @@ -49906,9 +49895,9 @@ izs izs izs nee -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -49918,8 +49907,8 @@ tXE (90,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -49933,7 +49922,7 @@ bwy bwy bwy bwy -jJe +fxm wFz wFz wFz @@ -49948,7 +49937,7 @@ gcA rdu tto mkT -sVc +tto oPZ lKQ pCm @@ -50100,9 +50089,9 @@ nee nee nee nee -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -50112,8 +50101,8 @@ tXE (91,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -50127,7 +50116,7 @@ bwy bwy bwy bwy -jJe +fxm wFz wFz wFz @@ -50142,7 +50131,7 @@ gkc uGJ tto gLy -oYn +phQ oYn nnL pCm @@ -50294,9 +50283,9 @@ izs izs izs nee -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -50305,8 +50294,8 @@ tXE "} (92,1,1) = {" tXE -jJe -jJe +fxm +fxm bwy bwy bwy @@ -50320,8 +50309,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm wFz wFz wFz @@ -50488,9 +50477,9 @@ izs izs izs nee -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -50499,8 +50488,8 @@ tXE "} (93,1,1) = {" tXE -jJe -jJe +fxm +fxm bwy bwy bwy @@ -50514,9 +50503,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm wFz wFz wFz @@ -50566,7 +50555,7 @@ xJt xJt xJt xJt -uDc +xJt ctM ctM xJt @@ -50682,9 +50671,9 @@ izs izs izs nee -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -50693,8 +50682,8 @@ tXE "} (94,1,1) = {" tXE -jJe -jJe +fxm +fxm bwy bwy bwy @@ -50705,12 +50694,12 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm wFz wFz wFz @@ -50733,7 +50722,7 @@ ixp wcm rAZ wcm -fQD +rAZ rAZ fXN aUF @@ -50747,33 +50736,33 @@ jhE nkX vht hSr -iTp +hTu cZv -iTp -duD -iTp -iTp -iTp -iTp +hTu +cZv +hTu +hTu +hTu +hTu sdA -iTp -iTp -duD -iTp -iTp -iTp hTu -iTp -iTp +hTu +cZv +hTu +hTu +hTu +hTu +hTu +hTu dKt -duD -iTp -iTp -iTp -iTp -iTp +cZv +hTu +hTu +hTu +hTu +hTu +hTu hTu -iTp jqg jRP wFz @@ -50876,9 +50865,9 @@ izs izs izs nee -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -50888,8 +50877,8 @@ tXE (95,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -50898,13 +50887,13 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm wFz wFz wFz @@ -50942,32 +50931,32 @@ npR fGw eRZ hjS -duD -iTp -iTp +cZv +hTu +hTu epY -iTp -iTp -iTp +hTu +hTu +hTu fsz hTu -iTp -iTp -iTp -iTp -iTp -duD -iTp -iTp +hTu +hTu +hTu +hTu +hTu +cZv +hTu +hTu fsz -iTp +hTu fsz -iTp -iTp -iTp -iTp -duD -iTp +hTu +hTu +hTu +hTu +cZv +hTu lfz jRP wFz @@ -51070,8 +51059,8 @@ nee nee nee nee -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -51082,8 +51071,8 @@ tXE (96,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -51091,14 +51080,14 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm wFz wFz wFz @@ -51141,26 +51130,26 @@ nzI bxo xeM osU -cmH +kSO wdg lBA -cmH +kSO qsa oEL biW kSO -cmH -cmH +kSO +kSO rsZ -cmH +kSO sZS -cmH +kSO fBg iJf hBF gho aoQ -iTp +hTu sve kqP jRP @@ -51264,8 +51253,8 @@ nee izs izs nee -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -51276,8 +51265,8 @@ tXE (97,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -51285,14 +51274,14 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm wFz wFz wFz @@ -51458,8 +51447,8 @@ nee izs izs nee -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -51470,8 +51459,8 @@ tXE (98,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -51479,13 +51468,13 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm wFz wFz wFz @@ -51541,7 +51530,7 @@ veN cUl pwF ylZ -wLg +lvu oEd ylZ kSm @@ -51652,8 +51641,8 @@ nee izs izs nee -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -51665,7 +51654,7 @@ tXE tXE vFJ vFJ -jJe +fxm bwy bwy bwy @@ -51673,13 +51662,13 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm wFz wFz wFz @@ -51736,9 +51725,9 @@ tMO pwF kSm ixI -wLg -wLg -wLg +lvu +lvu +lvu gdE iHu hLa @@ -51846,9 +51835,9 @@ nee nee nee nee -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -51859,7 +51848,7 @@ tXE tXE vFJ vFJ -jJe +fxm bwy bwy bwy @@ -51867,11 +51856,11 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm fav fav fav @@ -51928,10 +51917,10 @@ pbv jii bUE pwF -wLg -wLg -wLg -wLg +lvu +lvu +lvu +lvu ixI jRP feD @@ -52039,10 +52028,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -52053,7 +52042,7 @@ tXE tXE vFJ vFJ -jJe +fxm bwy bwy bwy @@ -52061,11 +52050,11 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm xYa bsm eIW @@ -52107,7 +52096,7 @@ pkL pkL viD kiI -xSX +kYf caQ mJS fwL @@ -52124,9 +52113,9 @@ wEh pwF glB ylZ -wLg +lvu vBU -wLg +lvu jRP cgg jRP @@ -52234,9 +52223,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -52247,7 +52236,7 @@ tXE tXE vFJ vFJ -jJe +fxm bwy bwy bwy @@ -52255,11 +52244,11 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm xYa gXt ged @@ -52428,10 +52417,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -52440,8 +52429,8 @@ tXE (103,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -52449,11 +52438,11 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm xYa fkm rZb @@ -52527,8 +52516,8 @@ jRP jRP jRP wFz -jJe -jJe +fxm +fxm bwy bwy bwy @@ -52623,10 +52612,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ tXE @@ -52634,8 +52623,8 @@ tXE (104,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -52644,10 +52633,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm fav nth rmF @@ -52690,8 +52679,8 @@ rGe xcr xcr jsJ -xSX -xSX +kYf +kYf mJS kEs gzB @@ -52721,9 +52710,9 @@ dOK yez jRP wFz -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -52818,17 +52807,17 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ tXE "} (105,1,1) = {" tXE vFJ -jJe +fxm bwy bwy bwy @@ -52839,9 +52828,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm xYa xta dtu @@ -52884,7 +52873,7 @@ pkL pkL xcr xcr -xSX +kYf caQ mJS qwm @@ -52915,9 +52904,9 @@ gwx tvc jRP wFz -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -53012,18 +53001,18 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ tXE "} (106,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -53035,7 +53024,7 @@ bwy bwy bwy bwy -jJe +fxm xYa aii skQ @@ -53109,9 +53098,9 @@ jRP wkn jRP wFz -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -53207,17 +53196,17 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ tXE "} (107,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -53273,7 +53262,7 @@ pkL xcr xcr eUG -xSX +kYf mJS akY aBA @@ -53401,18 +53390,18 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ tXE "} (108,1,1) = {" tXE vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -53595,9 +53584,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ tXE "} @@ -53605,8 +53594,8 @@ tXE tXE vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -53663,7 +53652,7 @@ eCd eCd vdC xDK -xSX +kYf neA kix cFG @@ -53789,9 +53778,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ tXE "} @@ -53800,7 +53789,7 @@ tXE vFJ vFJ vFJ -jJe +fxm bwy bwy bwy @@ -53855,9 +53844,9 @@ pkL xcr eCd eCd -xSX -xSX -xSX +kYf +kYf +kYf neA dNA bOF @@ -53984,8 +53973,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ tXE "} @@ -53994,7 +53983,7 @@ tXE vFJ vFJ vFJ -jJe +fxm bwy bwy bwy @@ -54049,9 +54038,9 @@ xcr xcr eCd dHP -xSX -xSX -xSX +kYf +kYf +kYf neA lfl iRG @@ -54178,8 +54167,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ tXE "} @@ -54188,7 +54177,7 @@ tXE vFJ vFJ vFJ -jJe +fxm bwy bwy bwy @@ -54244,8 +54233,8 @@ eUG eCd qJh kYf -xSX -xSX +kYf +kYf wDT vQz neA @@ -54372,17 +54361,17 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm tXE "} (113,1,1) = {" tXE vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -54415,7 +54404,7 @@ lPT dpc tkd rWu -kCm +chK xUE gzA sYE @@ -54467,9 +54456,9 @@ wLH eCq ctv vMH -uhr +yeu crD -hvD +yeu vMH rgv iHY @@ -54490,8 +54479,8 @@ bwy wFz wFz wFz -jJe -jJe +fxm +fxm bwy bwy bwy @@ -54575,8 +54564,8 @@ uBb tXE vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -54609,7 +54598,7 @@ pwO oTC tkd rWu -kCm +chK xUE gzA pdg @@ -54632,7 +54621,7 @@ eUG eCd eCd fEl -xSX +kYf tIz jdi adx @@ -54651,19 +54640,19 @@ gYL ntm jaI uHS -wLg -wLg +lvu +lvu qAD lvu eCq -wLg +lvu wLH aVH ekL vMH -uhr -uhr -uhr +yeu +yeu +yeu vMH tJL mMJ @@ -54684,8 +54673,8 @@ wFz wFz wFz wFz -jJe -jJe +fxm +fxm bwy bwy bwy @@ -54769,8 +54758,8 @@ uBb tXE vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -54803,7 +54792,7 @@ uBU ngy tkd rWu -kCm +chK xUE gzA gzA @@ -54826,7 +54815,7 @@ eCd eCd eCd fEl -xSX +kYf tIz gcP qqB @@ -54855,17 +54844,17 @@ uQs dGK dGK alM -onI xRn -onI +xRn +xRn vMH dcg mMJ vMH qFt -uhr +yeu aDr -uhr +yeu vMH wFz wFz @@ -54879,7 +54868,7 @@ wFz wFz wFz wFz -jJe +fxm bwy bwy bwy @@ -54962,8 +54951,8 @@ uBb (116,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -54997,7 +54986,7 @@ uBU dUM tkd rWu -kCm +chK xUE tfu gzA @@ -55041,7 +55030,7 @@ cfb uHS lvu hgc -wLg +lvu pjh pjh pjh @@ -55051,14 +55040,14 @@ pjh pjh rRK ntX -onI +xRn vMH ust rrQ vMH btT -uhr -uhr +yeu +yeu iHY vMH wFz @@ -55073,8 +55062,8 @@ wFz wFz wFz wFz -jJe -jJe +fxm +fxm bwy bwy bwy @@ -55156,8 +55145,8 @@ uBb (117,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -55209,8 +55198,8 @@ pOQ xbU wcp kIy -xSX -xSX +kYf +kYf eUG eUG eUG @@ -55245,7 +55234,7 @@ pVt pjh pjh oRy -onI +xRn vMH vMH vMH @@ -55258,8 +55247,8 @@ vMH vMH vMH vMH -onI -onI +xRn +xRn qJx iXe vMH @@ -55349,9 +55338,9 @@ uBb "} (118,1,1) = {" tXE -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -55384,7 +55373,7 @@ tkd tkd tkd tkd -kCm +chK rWu xUE gzA @@ -55393,7 +55382,7 @@ gzA sYE xUE gXq -kCm +chK chK xbU jCJ @@ -55403,7 +55392,7 @@ rzZ xbU wcp kIy -xSX +kYf eUG eUG eUG @@ -55439,31 +55428,31 @@ jcK fWd pjh pVC -onI +xRn vMH rtZ aNo vMH ffO -uhr -uhr +yeu +yeu vMH pQj iVZ bsh -onI -onI -onI -onI -onI -onI +xRn +xRn +xRn +xRn +xRn +xRn hLz jri nKr bsh uOu raZ -onI +xRn kim yas bwy @@ -55578,7 +55567,7 @@ bdR msN eeg dbW -kCm +chK rWu xUE gzA @@ -55586,7 +55575,7 @@ gzA xxJ sYE xUE -kCm +chK chK gzA xbU @@ -55597,7 +55586,7 @@ mRe xbU wcp kIy -xSX +kYf eUG eUG eUG @@ -55633,31 +55622,31 @@ oFb fWd pjh laP -onI +xRn vMH vMH vMH vMH -onI -onI -onI +xRn +xRn +xRn alM -onI +xRn xRn rPd -onI +xRn ozi -cep +rRK rRK jRs -onI -onI -onI -onI +xRn +xRn +xRn +xRn uTL -onI -onI -onI +xRn +xRn +xRn kim yas wFz @@ -55772,7 +55761,7 @@ lzF hKR uiV dbW -kCm +chK rWu xUE sYE @@ -55780,8 +55769,8 @@ sYE sYE sYE xUE -kyL -kCm +chK +chK snd xbU vYI @@ -55827,12 +55816,12 @@ bRO mgD pjh rPW -onI -onI -onI -onI -onI -onI +xRn +xRn +xRn +xRn +xRn +xRn ozi rRK vMH @@ -55851,7 +55840,7 @@ vMH vMH vMH vMH -onI +xRn seB vMH wFz @@ -55966,7 +55955,7 @@ kNW jkL jIT dbW -kCm +chK rWu xUE xUE @@ -55981,7 +55970,7 @@ xbU qaV oiE xbU -xSX +kYf xDB amr fUb @@ -56020,13 +56009,13 @@ jap aEr wXZ pjh -uhr +yeu ntX -onI +xRn ayZ jRs -onI -onI +xRn +xRn jzp vMH vMH @@ -56038,7 +56027,7 @@ kTO vMH vMH mYS -uhr +yeu rny fmf kIC @@ -56160,7 +56149,7 @@ knU knU knU knU -kCm +chK opH fAH qtA @@ -56219,27 +56208,27 @@ xGk vKx xGk xGk -onI -onI +xRn +xRn eMe vMH dhc nqH erz yeu -uhr -uhr +yeu +yeu uPG vMH uva -uhr -lgE +yeu +rny fmf kIC kIC kIC vMH -onI +xRn tTc vMH wFz @@ -56357,7 +56346,7 @@ knU trr opH wmV -kWG +cVV bTH xUE epf @@ -56413,27 +56402,27 @@ gdv hwF oWy xGk -onI -onI +xRn +xRn btW vMH jSv nqH -uhr -uhr -uhr +yeu +yeu +yeu kDx nzP vMH -uhr -uhr +yeu +yeu rMv fmf kIC kIC kIC vMH -onI +xRn pzk vMH wFz @@ -56549,9 +56538,9 @@ lSe knU knU wjg -jLb +xrG wmV -kWG +cVV ioh xUE wEK @@ -56565,7 +56554,7 @@ pXi yiY fCy hKp -xSX +kYf kIy qvW eCd @@ -56607,8 +56596,8 @@ cJb hwF hwF xGk -uhr -onI +yeu +xRn jzp vMH vOs @@ -56616,7 +56605,7 @@ nqH aIP kDx ffO -uhr +yeu tpJ vMH wQB @@ -56627,7 +56616,7 @@ kIC kIC kIC vMH -onI +xRn syt vMH wFz @@ -56757,7 +56746,7 @@ uBd cLE nDD yiY -xSX +kYf wcp kYf kIy @@ -56801,7 +56790,7 @@ hWE rXq hwF xGk -uhr +yeu xRn vMH vMH @@ -56810,7 +56799,7 @@ gBu wvN cgx mOK -uhr +yeu vMH vMH vMH @@ -56822,7 +56811,7 @@ vMH vMH vMH xRn -onI +xRn vMH wFz wFz @@ -56995,10 +56984,10 @@ hWE cJb kTQ xGk -uhr -onI -onI -onI +yeu +xRn +xRn +xRn vMH vMH vMH @@ -57014,9 +57003,9 @@ kIC kIC kIC kIC -uhr -onI -onI +yeu +xRn +xRn vMH wFz wFz @@ -57145,9 +57134,9 @@ fFu sVL xpn yiY -xSX +kYf vqk -xSX +kYf kIy eCd eCd @@ -57189,16 +57178,16 @@ hWE cJb hwF xGk -uhr -onI -onI -onI +yeu +xRn +xRn +xRn hLz nKr nKr dtn vMH -uhr +yeu vMH nLj nLj @@ -57208,9 +57197,9 @@ kIC kIC kIC kIC -uhr -onI -onI +yeu +xRn +xRn vMH wFz wFz @@ -57339,9 +57328,9 @@ nFz wWD mLj wDn -xSX +kYf vuJ -xSX +kYf kIy epZ jdR @@ -57384,15 +57373,15 @@ cJb hwF xGk kqI -onI -onI -onI -onI -onI -onI +xRn +xRn +xRn +xRn +xRn +xRn wMT vMH -uhr +yeu cFa cFa cFa @@ -57477,8 +57466,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm uBb "} (129,1,1) = {" @@ -57586,7 +57575,7 @@ vMH vMH vMH vMH -uhr +yeu cFa dFL dFL @@ -57670,9 +57659,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm tXE "} (130,1,1) = {" @@ -57772,15 +57761,15 @@ cJb hwF xGk kqI -onI +xRn sxo vMH qgY qFQ ffO -uhr +yeu jPo -uhr +yeu cFa eBn eBn @@ -57864,8 +57853,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ tXE "} @@ -57966,11 +57955,11 @@ cJb baa xGk cwF -onI +xRn gUy vMH -uhr -uhr +yeu +yeu aIP uEH vMH @@ -57985,7 +57974,7 @@ cfY eBn cfY eBn -unR +cfY cFa wFz bwy @@ -58056,10 +58045,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ tXE "} @@ -58160,8 +58149,8 @@ cJb hwF xGk cwF -onI -hbc +xRn +ikB vMH sxe vgC @@ -58249,10 +58238,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ tXE @@ -58354,13 +58343,13 @@ cJb hwF xGk cwF -onI +xRn eUR dyu -uhr +yeu ffO asf -uhr +yeu vMH nLj cFa @@ -58441,10 +58430,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -58548,13 +58537,13 @@ cJb hwF xGk lAt -onI +xRn ixv vMH fiE -uhr -uhr -uhr +yeu +yeu +yeu vMH nLj cFa @@ -58634,9 +58623,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -58828,8 +58817,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -59022,8 +59011,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -59136,7 +59125,7 @@ rRh iqG fKt pBU -wno +rbK rbK vJr tjt @@ -59215,9 +59204,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -59229,9 +59218,9 @@ tXE "} (138,1,1) = {" tXE -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -59260,7 +59249,7 @@ eks eks eks eks -eks +xUE xUE phg uvM @@ -59409,9 +59398,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -59424,8 +59413,8 @@ tXE (139,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -59454,7 +59443,7 @@ mIX rke eWt mUL -xOk +hJZ hJZ kww hJZ @@ -59603,8 +59592,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -59618,8 +59607,8 @@ tXE (140,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -59647,8 +59636,8 @@ uBq dtz lfa kHg -mEJ -eks +iEC +hJZ hJZ aYa hJZ @@ -59755,26 +59744,26 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -59797,8 +59786,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -59813,8 +59802,8 @@ tXE tXE vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -59840,9 +59829,9 @@ azR jmA uEv uEv -nen -lYE -eks +wgc +iEC +xUE xUE bvU uvM @@ -59946,31 +59935,31 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -59991,8 +59980,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -60007,8 +59996,8 @@ tXE tXE vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -60034,13 +60023,13 @@ wWu bkP dPX dPX -nen +xOk iEC -eks +eoE sCb bHM sCb -kWG +cVV xUE sYE xbU @@ -60088,10 +60077,10 @@ rTA eEe gYG cRZ -tOr -tOr -iPR -fkn +sVc +sVc +wno +jJe fkn snw pmH @@ -60139,33 +60128,33 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ vFJ vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -60185,8 +60174,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -60201,8 +60190,8 @@ tXE tXE vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -60227,10 +60216,10 @@ eks byl bkP ibp -ibp -nen -miX -eks +spN +cxu +iEC +ckW eCL cmO yhc @@ -60285,7 +60274,7 @@ ecI tOr tOr hVT -fkn +hvD qqM snw tOr @@ -60332,9 +60321,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -60359,9 +60348,9 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -60379,8 +60368,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -60395,8 +60384,8 @@ tXE tXE vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -60423,8 +60412,8 @@ eXv iIZ shc nen -vqa -eks +iEC +ckW ckW oiB bGd @@ -60479,7 +60468,7 @@ nhv mcX mcX mcX -fkn +hvD sku snw snw @@ -60526,7 +60515,7 @@ bwy bwy bwy bwy -jJe +fxm vFJ vFJ vFJ @@ -60554,9 +60543,9 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -60573,8 +60562,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -60588,9 +60577,9 @@ tXE (145,1,1) = {" tXE vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -60616,9 +60605,9 @@ pxm bkP cjR cjR -spN -jra -eks +nen +iEC +ckW ckW agZ ion @@ -60673,7 +60662,7 @@ bMb kUo glL mcX -fkn +hvD tUS snw nmb @@ -60719,8 +60708,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -60750,9 +60739,9 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -60766,9 +60755,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -60782,8 +60771,8 @@ tXE (146,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -60809,7 +60798,7 @@ eks imh bkP nen -nen +jra rev iNF tkx @@ -60913,9 +60902,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -60945,9 +60934,9 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -60960,8 +60949,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -60976,8 +60965,8 @@ tXE (147,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -61005,9 +60994,9 @@ hOc wDz chj oSY -jiF -eks +iEC scr +ckW cqh tos kyu @@ -61061,7 +61050,7 @@ lcp idy rTQ mcX -fkn +hvD tUS snw tOr @@ -61072,7 +61061,7 @@ snw dfA dfA snw -feb +rrk snw std std @@ -61107,9 +61096,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -61140,9 +61129,9 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -61153,9 +61142,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -61169,9 +61158,9 @@ tXE "} (148,1,1) = {" tXE -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -61199,8 +61188,8 @@ boR waC vbK cDL -iav -eks +iEC +ckW ckW svv ckW @@ -61255,7 +61244,7 @@ gtR wOd wOd mcX -fkn +hvD cCy snw dXW @@ -61266,7 +61255,7 @@ snw snw snw snw -feb +rrk snw dfA dfA @@ -61301,9 +61290,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -61335,9 +61324,9 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -61346,10 +61335,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -61363,8 +61352,8 @@ tXE "} (149,1,1) = {" tXE -jJe -jJe +fxm +fxm bwy bwy bwy @@ -61449,7 +61438,7 @@ tfp idy idy mcX -fkn +hvD ciL snw snw @@ -61495,8 +61484,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -61530,20 +61519,20 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -61557,8 +61546,8 @@ tXE "} (150,1,1) = {" tXE -jJe -jJe +fxm +fxm bwy bwy bwy @@ -61643,17 +61632,17 @@ tfp foH foH mcX -fkn -fkn +lfi +hag tna -fkn -fkn -fkn -fkn +hag +hag +hag +hag tna -fkn +hag jco -uMt +duD wSE snw dfA @@ -61689,8 +61678,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -61725,18 +61714,18 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -61752,7 +61741,7 @@ tXE (151,1,1) = {" tXE vFJ -jJe +fxm bwy bwy bwy @@ -61766,7 +61755,7 @@ bwy mAy mAy mAy -jJe +fxm eCv tCY yjH @@ -61837,7 +61826,7 @@ tfp bYv bYv mcX -fkn +hvD uth snw ism @@ -61883,8 +61872,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -61920,14 +61909,14 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -61946,8 +61935,8 @@ tXE (152,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -61959,8 +61948,8 @@ bwy bwy bwy mAy -jJe -jJe +fxm +fxm eCv fSf dIs @@ -62031,7 +62020,7 @@ tfp dfA snw lSX -fkn +hvD tUS snw snw @@ -62078,8 +62067,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -62115,11 +62104,11 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -62140,8 +62129,8 @@ tXE (153,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -62153,8 +62142,8 @@ bwy bwy bwy mAy -jJe -jJe +fxm +fxm eCv ctt pXB @@ -62225,7 +62214,7 @@ tfp dfA snw avZ -fkn +hvD wRV snw dfA @@ -62272,8 +62261,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -62335,7 +62324,7 @@ tXE tXE vFJ vFJ -jJe +fxm bwy bwy bwy @@ -62348,7 +62337,7 @@ bwy bwy mAy mAy -jJe +fxm lFn lFn lFn @@ -62381,8 +62370,8 @@ fah mUT fah daS -dAG -dAG +dox +dox sYA fah mSY @@ -62419,7 +62408,7 @@ tfp dfA snw aYe -fkn +hvD tUS snw dfA @@ -62466,8 +62455,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -62529,7 +62518,7 @@ tXE tXE vFJ vFJ -jJe +fxm bwy bwy bwy @@ -62542,7 +62531,7 @@ bwy bwy mAy mAy -jJe +fxm hAs fjg bTU @@ -62613,7 +62602,7 @@ dfA dfA snw qxM -fkn +hvD tUS snw snw @@ -62660,9 +62649,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -62723,7 +62712,7 @@ tXE tXE vFJ vFJ -jJe +fxm bwy bwy bwy @@ -62735,8 +62724,8 @@ bwy bwy bwy mAy -jJe -jJe +fxm +fxm hAs uTQ mIc @@ -62754,7 +62743,7 @@ nLH nOJ qyx ipR -pcj +uEI uEI liF gYw @@ -62855,8 +62844,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -62916,8 +62905,8 @@ tXE (157,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -62930,7 +62919,7 @@ bwy bwy mAy mAy -jJe +fxm hAs jBO aNi @@ -62947,8 +62936,8 @@ sIY rxm sQs uuj -rxm -voy +iav +uEI uEI liF gYw @@ -62972,7 +62961,7 @@ xZX tOr cmK ioL -rrk +aEs rlf tOr snw @@ -63001,10 +62990,10 @@ jZT jZT jZT jZT -jZT -jZT -jZT -jZT +kWG +iTp +iTp +cFv jZT qdO snw @@ -63049,8 +63038,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -63110,8 +63099,8 @@ tXE (158,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -63123,8 +63112,8 @@ bwy bwy bwy mAy -jJe -jJe +fxm +fxm jXk jXk jXk @@ -63134,12 +63123,12 @@ qMz vCf ujn rYi -qtM +etM qsf jQW rTT xmy -rxm +gpO rXt rXt uDW @@ -63166,8 +63155,8 @@ snw fsS tOr snw -rrk -hag +aEs +rlf tOr xZX tSk @@ -63243,8 +63232,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -63303,8 +63292,8 @@ tXE "} (159,1,1) = {" tXE -jJe -jJe +fxm +fxm bwy bwy bwy @@ -63318,7 +63307,7 @@ bwy bwy mAy mAy -jJe +fxm alC jKw jAo @@ -63362,7 +63351,7 @@ xZX snw tOr pmb -rrk +aEs snw xZX xZX @@ -63421,7 +63410,7 @@ pTA fhQ pYv jOP -jJe +fxm bwy bwy bwy @@ -63437,8 +63426,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -63497,8 +63486,8 @@ tXE "} (160,1,1) = {" tXE -jJe -jJe +fxm +fxm bwy bwy bwy @@ -63615,7 +63604,7 @@ cyp ouj yjT jOP -jJe +fxm bwy bwy bwy @@ -63630,8 +63619,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -63691,8 +63680,8 @@ tXE "} (161,1,1) = {" uBb -jJe -jJe +fxm +fxm bwy bwy bwy @@ -63726,7 +63715,7 @@ whe mZm omx uEI -arf +uQP rMt pAU kMx @@ -63744,11 +63733,11 @@ shL qVF qVF sGi -rrk +aEs tOr -lfi +aEs tOr -rrk +aEs gvS sPt jrt @@ -63809,7 +63798,7 @@ yjT yjT yjT qIe -jJe +fxm bwy bwy bwy @@ -63824,8 +63813,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -63885,8 +63874,8 @@ tXE "} (162,1,1) = {" uBb -jJe -jJe +fxm +fxm bwy bwy bwy @@ -63941,13 +63930,13 @@ fah snw tOr tOr -rrk +aEs jUY -phQ +doA maf -rrk +aEs jUY -rrk +aEs snw snw snw @@ -64003,7 +63992,7 @@ qIe scX scX qIe -jJe +fxm bwy bwy bwy @@ -64018,9 +64007,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -64079,8 +64068,8 @@ tXE "} (163,1,1) = {" uBb -jJe -jJe +fxm +fxm bwy bwy bwy @@ -64114,7 +64103,7 @@ pxA rga lZN uEI -arf +uQP rMt ylr vIt @@ -64142,7 +64131,7 @@ kXz tOr jUY tOr -rrk +aEs abF snw dfA @@ -64197,7 +64186,7 @@ qIe gPy gPy qIe -jJe +fxm bwy bwy bwy @@ -64212,7 +64201,7 @@ bwy bwy bwy bwy -jJe +fxm vFJ vFJ vFJ @@ -64273,9 +64262,9 @@ tXE "} (164,1,1) = {" uBb -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -64303,12 +64292,12 @@ wWc qcl oDp xay -eUc +hUI pxA vpG stt stt -arf +uQP rMt rMt rMt @@ -64319,7 +64308,7 @@ rMt rMt rMt rMt -arf +uQP fah ahi inU @@ -64330,12 +64319,12 @@ snw tOr vIG iHj -vZe +oPN cVu tOr tOr -lfi -rrk +aEs +aEs snw sNE snw @@ -64391,7 +64380,7 @@ fOm gPy gPy pQm -jJe +fxm bwy bwy bwy @@ -64406,7 +64395,7 @@ bwy bwy bwy bwy -jJe +fxm vFJ vFJ vFJ @@ -64467,9 +64456,9 @@ tXE "} (165,1,1) = {" tXE -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -64494,10 +64483,10 @@ oEY lqt eEy vNL -rOp -rOp -rOp -hUI +eVD +eVD +lxQ +qpB pxA yeV hJZ @@ -64529,9 +64518,9 @@ iGQ fsU tOr fsU -rrk -rrk -rrk +aEs +aEs +aEs snw dfA snw @@ -64585,7 +64574,7 @@ wis eSc pvM pQm -jJe +fxm bwy bwy bwy @@ -64599,8 +64588,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -64662,9 +64651,9 @@ tXE (166,1,1) = {" tXE wFz -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -64685,13 +64674,13 @@ fIx kUc sAb oEY -cxu +pxA myH -gpO -eVD -eVD -lxQ -qpB +pxA +pxA +pxA +pxA +pxA pxA xUE xUE @@ -64720,10 +64709,10 @@ bOp xjC sPt idB -rrk +aEs tOr -rrk -rrk +aEs +aEs snw snw snw @@ -64757,13 +64746,13 @@ wFz wFz wFz wFz -jJe -jJe -jJe +fxm +fxm +fxm wFz -jJe -jJe -jJe +fxm +fxm +fxm wFz ndx dDB @@ -64779,7 +64768,7 @@ sNL gPy poo pQm -jJe +fxm bwy bwy bwy @@ -64792,9 +64781,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -64857,8 +64846,8 @@ tXE tXE wFz wFz -jJe -jJe +fxm +fxm bwy bwy bwy @@ -64879,13 +64868,13 @@ cUi oEY oEY oEY -pxA +miX nOX +gwS pxA -pxA -pxA -pxA -pxA +npE +thk +xly pxA gRB eeE @@ -64915,9 +64904,9 @@ fsU kXz hTV jUY -rrk +aEs maf -rrk +aEs snw wFz wFz @@ -64947,18 +64936,18 @@ wFz wFz wFz wFz -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy -jJe -jJe +fxm +fxm ndx bnH ndx @@ -64973,7 +64962,7 @@ qIe pQm qIe qIe -jJe +fxm bwy bwy bwy @@ -64985,9 +64974,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -65052,8 +65041,8 @@ tXE wFz wFz wFz -jJe -jJe +fxm +fxm bwy bwy bwy @@ -65076,10 +65065,10 @@ wyh pRb nGn edL -pxA -npE -thk -xly +pEs +jux +naz +biO pxA oGS uCO @@ -65096,20 +65085,20 @@ ydu fah uCO fah -vEo +nkd nxW aOU -vEo -vEo +nkd +nkd wkK snw -rrk -rrk -rrk +aEs +aEs +aEs kXz qkb jUY -rrk +aEs kXz tOr snw @@ -65128,20 +65117,20 @@ wFz wFz wFz wFz -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm wFz wFz wFz wFz wFz -jJe -jJe -jJe +fxm +fxm +fxm wFz -jJe +fxm bwy bwy bwy @@ -65151,8 +65140,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm ndx sqq iZM @@ -65163,11 +65152,11 @@ ndx wUq iZM ndx -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -65178,9 +65167,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -65265,15 +65254,15 @@ wFz wFz wFz pxA -gwS +rOp aKe mVl pLq hoH -pEs -jux -naz -biO +pxA +cBj +gcV +pxA pxA iue uCO @@ -65290,22 +65279,22 @@ ydu fah ooX reD -vEo +nkd nkd nxW nkd -vEo +nkd nkd aUm tOr -rrk +aEs tOr tOr gUe iHj oPN caT -rrk +aEs snw cFu cFu @@ -65321,21 +65310,21 @@ snw wFz wFz wFz -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -65346,7 +65335,7 @@ bwy bwy bwy bwy -jJe +fxm ndx iOU apo @@ -65357,8 +65346,8 @@ ndx iOU apo ndx -jJe -jJe +fxm +fxm bwy bwy bwy @@ -65372,9 +65361,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -65459,15 +65448,15 @@ wFz wFz wFz pxA -rOp -wgc -rOp -iLx -rOp +tBO +pxA +vul +pxA +hCY pxA cBj gcV -pxA +xly pxA xAg uCO @@ -65484,26 +65473,26 @@ fah fah uCO fah -vEo +nkd nxW nxW lJC nxW -vEo +nkd snw lQq -rrk +aEs lDH aEs -rrk -rrk +aEs +aEs lDH -rrk +aEs iAL snw -jJe -jJe -jJe +fxm +fxm +fxm snw gCr snw @@ -65522,8 +65511,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm bwy bwy bwy @@ -65540,7 +65529,7 @@ bwy bwy bwy bwy -jJe +fxm ndx cGM cGM @@ -65551,8 +65540,8 @@ ndx cGM cGM ndx -jJe -jJe +fxm +fxm bwy bwy bwy @@ -65566,9 +65555,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -65653,15 +65642,15 @@ wFz wFz wFz pxA -tBO +gBM pxA -vul +tuv pxA -hCY +dtX pxA -cBj -gcV -xly +rtt +jwq +biO pxA nRA iNS @@ -65678,12 +65667,12 @@ mAy fah upb fah -fmr -vEo -vEo +nkd +nkd +nkd pYe -vEo -vEo +nkd +nkd snw gCr gCr @@ -65695,20 +65684,20 @@ snw gCr gCr snw -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm mAy mAy bwy @@ -65734,18 +65723,18 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -65847,15 +65836,15 @@ wFz wFz wFz pxA -gBM pxA -tuv pxA -dtX pxA -rtt -jwq -biO +pxA +pxA +pxA +pxA +pxA +pxA pxA fah upb @@ -65872,37 +65861,37 @@ mAy mAy mAy fah -vEo +nkd nkd nxW izp -vEo -vEo +nkd +nkd fah -jJe -jJe +fxm +fxm oHZ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm mAy mAy bwy @@ -65932,10 +65921,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy @@ -66040,16 +66029,16 @@ bwy wFz wFz wFz -pxA -pxA -pxA -pxA -pxA -pxA -pxA -pxA -pxA -pxA +jiF +jiF +jiF +pcj +pcj +pcj +pcj +pcj +pcj +pcj pxA bwy bwy @@ -66066,37 +66055,37 @@ rnc vnb mAy fah -vEo +nkd nkd nxW riz -vEo +nkd pyd fah -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm mAy mAy bwy @@ -66236,13 +66225,13 @@ bwy wFz wFz wFz -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -66267,30 +66256,30 @@ fah fah fah fah -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm uNr uNr -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm mAy mAy bwy @@ -66428,12 +66417,12 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -66458,32 +66447,32 @@ mAy wFz wFz wFz -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm uNr uNr -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm uNr uNr -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm mAy mAy mAy @@ -66541,7 +66530,7 @@ xza xWR fKG vFJ -cFv +jOP jOP jOP vFJ @@ -66647,37 +66636,37 @@ bwy bwy bwy rnc -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm mAy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm uNr uNr -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm mAy mAy mAy @@ -66842,35 +66831,35 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm mAy mAy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm mAy mAy mAy @@ -67037,34 +67026,34 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm mAy mAy mAy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm mAy mAy mAy @@ -67122,7 +67111,7 @@ azT wCU wCU fKG -cFv +jOP jOP vFJ vFJ @@ -67232,32 +67221,32 @@ bwy bwy bwy bwy -jJe +fxm mAy mAy mAy mAy mAy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm mAy -jJe -jJe +fxm +fxm mAy mAy mAy @@ -67318,7 +67307,7 @@ mAy fKG jOP jOP -cFv +jOP vFJ vFJ vFJ @@ -67426,7 +67415,7 @@ bwy bwy bwy bwy -jJe +fxm mAy mAy mAy @@ -67434,19 +67423,19 @@ mAy mAy uNr uNr -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm mAy mAy mAy @@ -67620,7 +67609,7 @@ bwy bwy bwy bwy -jJe +fxm mAy mAy mAy @@ -67628,17 +67617,17 @@ mAy mAy uNr uNr -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm mAy -jJe -jJe +fxm +fxm mAy mAy mAy @@ -67814,7 +67803,7 @@ bwy bwy bwy bwy -jJe +fxm mAy mAy mAy @@ -67824,11 +67813,11 @@ mAy mAy mAy mAy -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm mAy mAy mAy @@ -68017,12 +68006,12 @@ mAy mAy mAy mAy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm mAy -jJe +fxm mAy mAy mAy @@ -68932,8 +68921,8 @@ tXE wFz wFz wFz -jJe -jJe +fxm +fxm bwy bwy bwy @@ -69127,9 +69116,9 @@ wFz wFz wFz wFz -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -69322,9 +69311,9 @@ wFz wFz wFz wFz -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -69517,9 +69506,9 @@ wFz wFz wFz wFz -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy diff --git a/maps/tether/levels/surface3.dmm b/maps/tether/levels/surface3.dmm index 4e18771f12c5..d24d3000b8aa 100644 --- a/maps/tether/levels/surface3.dmm +++ b/maps/tether/levels/surface3.dmm @@ -209,6 +209,7 @@ dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals5, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "adP" = ( @@ -336,7 +337,7 @@ "afT" = ( /obj/structure/flora/pottedplant/unusual, /obj/machinery/fire_alarm/east_mount, -/obj/machinery/camera/network/research{ +/obj/machinery/camera/network/research/xenobio{ dir = 1 }, /turf/simulated/floor/wood, @@ -411,12 +412,11 @@ /area/tether/surfacebase/outside/outside3) "aiC" = ( /obj/structure/railing, -/obj/structure/grille, -/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ - frequency = 1379; - id_tag = "southciv_airlock_pump" +/obj/structure/sign/nosmoking_2{ + pixel_y = 30 }, -/obj/map_helper/airlock/atmos/chamber_pump, +/obj/machinery/atmospherics/component/unary/env_heat_pump, +/obj/map_helper/airlock/atmos/chamber_temperature_adjuster, /turf/simulated/floor/tiled, /area/tether/surfacebase/topairlock) "aiJ" = ( @@ -468,11 +468,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) -"akq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "akz" = ( /obj/structure/table/bench/steel, /obj/effect/floor_decal/borderfloor{ @@ -536,12 +531,6 @@ /obj/machinery/power/apc/east_mount, /turf/simulated/floor/bluegrid, /area/rnd/robotics/mechbay) -"amn" = ( -/obj/structure/railing{ - dir = 1 - }, -/turf/simulated/open, -/area/tether/surfacebase/medical/uppersouthstairwell) "amw" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -920,18 +909,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/research) -"avu" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 9 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 9 - }, -/obj/machinery/vending/medical{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/storage) "avK" = ( /obj/machinery/power/apc/north_mount, /obj/structure/cable/orange{ @@ -1169,14 +1146,12 @@ /turf/simulated/floor/tiled/techfloor, /area/rnd/workshop) "aCE" = ( -/obj/structure/table/rack, -/obj/random/maintenance/medical, -/obj/random/maintenance/clean, -/obj/random/medical/lite, -/obj/random/maintenance/medical, -/obj/random/toy, -/turf/simulated/floor/plating, -/area/maintenance/lower/medsec_maintenance) +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/triage) "aCO" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/freezer, @@ -1230,13 +1205,10 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aDP" = ( -/obj/effect/floor_decal/techfloor{ - dir = 6 - }, -/obj/random/maintenance/medical, -/obj/random/maintenance/medical, /obj/random/maintenance/medical, /obj/structure/closet/firecloset, +/obj/effect/floor_decal/techfloor, +/obj/random/maintenance/medical, /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/lower/medsec_maintenance) "aEt" = ( @@ -1363,10 +1335,6 @@ /obj/effect/floor_decal/steeldecal/steel_decals4, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) -"aHd" = ( -/obj/machinery/holopad, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "aHg" = ( /obj/effect/floor_decal/industrial/loading{ dir = 4 @@ -1409,20 +1377,14 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "aHM" = ( -/obj/machinery/atmospherics/portables_connector{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 10 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 }, -/obj/item/radio/intercom{ - pixel_y = -24 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/area/rnd/xenobiology/xenoflora) "aIi" = ( /obj/structure/sign/nanotrasen, /turf/simulated/wall/prepainted/science, @@ -1557,7 +1519,7 @@ dir = 8 }, /turf/simulated/floor/tiled/techfloor, -/area/vacant/vacant_shop) +/area/tether/surfacebase/barbackmaintenance) "aLt" = ( /obj/structure/table/wooden_reinforced, /obj/item/radio/phone, @@ -1627,14 +1589,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 1 +/obj/effect/floor_decal/techfloor{ + dir = 5 }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 6 +/obj/effect/floor_decal/techfloor/corner{ + dir = 4 }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) +/turf/simulated/floor/tiled/techfloor/grid, +/area/maintenance/lower/medsec_maintenance) "aNO" = ( /obj/machinery/light{ dir = 8 @@ -1749,20 +1711,12 @@ /turf/simulated/floor/wood, /area/rnd/outpost/xenobiology/outpost_office) "aSf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ - dir = 5 +/obj/machinery/light/small{ + dir = 8 }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/turf/simulated/floor/wood, +/area/tether/surfacebase/barbackmaintenance) "aSh" = ( /obj/effect/floor_decal/borderfloorblack/corner{ dir = 8 @@ -1792,6 +1746,11 @@ dir = 4 }, /obj/structure/disposalpipe/junction, +/obj/structure/table/steel, +/obj/item/defib_kit/loaded, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "aSE" = ( @@ -1872,28 +1831,7 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"aUW" = ( -/obj/machinery/door/window/brigdoor/southright{ - dir = 4; - req_access = list(30,35,47,77); - req_one_access = list() - }, -/obj/machinery/door/window/brigdoor/southright{ - dir = 8; - req_access = list(30,35,47,77); - req_one_access = list() - }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "aUY" = ( -/obj/machinery/portable_atmospherics/canister/oxygen/prechilled, -/obj/machinery/atmospherics/portables_connector, -/obj/item/tool/wrench, -/obj/machinery/door/window/brigdoor/southright{ - req_access = list(); - req_one_access = list(5) - }, /obj/machinery/air_alarm{ pixel_y = 25 }, @@ -1903,6 +1841,9 @@ /obj/effect/floor_decal/corner/paleblue{ dir = 6 }, +/obj/machinery/atmospherics/pipe/simple/hidden/universal{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "aVs" = ( @@ -1979,6 +1920,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppersouthstairwell) "aZw" = ( @@ -2116,9 +2058,6 @@ /turf/simulated/floor/tiled/techfloor, /area/rnd/workshop) "bcG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4 - }, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -2128,6 +2067,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/cyan, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "bcW" = ( @@ -2217,6 +2157,7 @@ /obj/structure/cable/green{ icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "bfL" = ( @@ -2264,9 +2205,6 @@ /turf/simulated/floor/tiled, /area/hallway/primary/port) "bgt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 9 - }, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -2331,7 +2269,9 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 1 }, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "bhB" = ( @@ -2343,15 +2283,20 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "bhO" = ( -/obj/machinery/light, -/obj/machinery/portable_atmospherics/hydroponics, -/obj/machinery/camera/network/civilian{ - dir = 1 +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 }, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lime/border, /turf/simulated/floor/tiled, -/area/tether/surfacebase/botanystorage) +/area/hallway/lower/third_south) "biu" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -2397,12 +2342,6 @@ /turf/simulated/floor/tiled/eris/cafe, /area/hydroponics) "bjO" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 8 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 8 - }, /obj/item/radio/intercom/department/medbay{ dir = 8; pixel_x = -24 @@ -2411,6 +2350,12 @@ dir = 4 }, /obj/machinery/disposal, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 9 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 9 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "bkm" = ( @@ -2424,6 +2369,9 @@ dir = 10 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "blA" = ( @@ -2448,10 +2396,6 @@ /turf/simulated/floor/carpet, /area/library) "bmh" = ( -/obj/structure/closet/l3closet/scientist, -/obj/machinery/light{ - dir = 1 - }, /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -2464,15 +2408,10 @@ /obj/effect/floor_decal/corner/mauve/bordercorner2{ dir = 1 }, +/obj/machinery/portable_atmospherics/hydroponics, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "bmn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 10 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/effect/floor_decal/corner/paleblue{ dir = 9 }, @@ -2480,6 +2419,11 @@ dir = 6 }, /obj/machinery/camera/network/medbay, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 6 + }, +/obj/structure/table/steel, +/obj/item/reagent_containers/glass/beaker/cryoxadone, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "bmE" = ( @@ -2666,19 +2610,16 @@ /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "brh" = ( -/obj/machinery/camera/network/tether, /obj/effect/floor_decal/borderfloor{ dir = 1 }, /obj/effect/floor_decal/corner/mauve/border{ dir = 1 }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/machinery/camera/network/research, +/obj/structure/closet/firecloset, /turf/simulated/floor/tiled, -/area/hallway/primary/starboard) +/area/rnd/xenobiology/xenoflora) "brA" = ( /turf/simulated/open, /area/rnd/staircase/thirdfloor) @@ -2774,29 +2715,7 @@ /obj/effect/paint_stripe/bottlegreen, /turf/simulated/floor/plating, /area/crew_quarters/bar) -"but" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass/research{ - name = "Xenoflora Research"; - req_one_access = list(30,35,47,77) - }, -/turf/simulated/floor/tiled/steel_grid, -/area/rnd/xenobiology/xenoflora_storage) "buF" = ( -/obj/item/storage/firstaid/o2{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/storage/firstaid/o2, /obj/effect/floor_decal/corner/blue/full{ dir = 8 }, @@ -2804,6 +2723,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/table/standard, +/obj/machinery/lathe/medical/stocked, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "buX" = ( @@ -2871,9 +2791,6 @@ pixel_x = 5 }, /obj/structure/curtain/open/shower, -/obj/machinery/camera/network/research/xenobio{ - dir = 10 - }, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_south_airlock) "bww" = ( @@ -2882,13 +2799,6 @@ }, /turf/simulated/floor/wood, /area/triumph/surfacebase/sauna) -"bwH" = ( -/obj/machinery/biogenerator, -/obj/effect/floor_decal/borderfloor{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) "bxs" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -2922,12 +2832,10 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 1 }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, /obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/structure/closet/l3closet/scientist, /turf/simulated/floor/tiled, -/area/hallway/primary/starboard) +/area/rnd/xenobiology/xenoflora) "bxM" = ( /obj/structure/toilet{ dir = 8 @@ -2946,6 +2854,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/wood, /area/tether/surfacebase/barbackmaintenance) "byD" = ( @@ -2959,18 +2868,8 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "bzg" = ( -/obj/structure/window/reinforced, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 10 - }, -/obj/machinery/light{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) @@ -3035,11 +2934,8 @@ "bBk" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/mauve/border, -/obj/machinery/door/firedoor{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/hallway/primary/starboard) +/turf/simulated/wall/prepainted/science, +/area/rnd/xenobiology/xenoflora) "bBs" = ( /obj/machinery/portable_atmospherics/hydroponics/soil, /obj/machinery/camera/network/civilian, @@ -3049,6 +2945,10 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "bBD" = ( @@ -3143,15 +3043,14 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "bCF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lime/border, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/botanystorage) "bCV" = ( /obj/structure/bed/chair/shuttle{ dir = 1 @@ -3287,12 +3186,13 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) "bHT" = ( -/obj/machinery/chem_master, /obj/effect/floor_decal/borderfloorwhite, /obj/item/radio/intercom{ pixel_y = -28 }, /obj/effect/floor_decal/corner/orange/border, +/obj/structure/table/reinforced, +/obj/machinery/chemical_dispenser/full, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) "bIe" = ( @@ -3376,16 +3276,17 @@ dir = 1; pixel_y = -28 }, +/obj/machinery/camera/network/research/xenobio{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_first_aid) "bLf" = ( -/obj/machinery/atmospherics/component/binary/pump{ - dir = 4; - name = "Isolation to Waste" +/obj/machinery/atmospherics/pipe/simple/visible/universal{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/turf/simulated/floor/tiled/steel_dirty/virgo3b, +/area/tether/surfacebase/outside/outside3) "bLy" = ( /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics) @@ -3639,15 +3540,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_hallway) -"bTv" = ( -/obj/structure/table/glass, -/obj/random/medical, -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 8 - }, -/obj/item/tool/screwdriver, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) "bTM" = ( /obj/structure/sign/directions/evac{ dir = 1 @@ -3890,6 +3782,9 @@ name = "Surface EVA" }, /obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/topairlock) "caF" = ( @@ -3901,6 +3796,9 @@ /area/rnd/research_storage) "caI" = ( /obj/machinery/holopad, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "caX" = ( @@ -3961,6 +3859,7 @@ dir = 4; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "cdd" = ( @@ -4012,7 +3911,7 @@ name = "Fire/Phoron Shelter" }, /turf/simulated/floor/tiled/techfloor/grid, -/area/vacant/vacant_shop) +/area/tether/surfacebase/barbackmaintenance) "ceB" = ( /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 8 @@ -4024,26 +3923,21 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 10 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/topairlock) "cfG" = ( /obj/effect/floor_decal/borderfloor{ - dir = 5 + dir = 1 }, /obj/effect/floor_decal/corner/mauve/border{ - dir = 5 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 5 - }, -/obj/effect/floor_decal/corner/mauve/bordercorner2{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 + dir = 1 }, +/obj/machinery/portable_atmospherics/hydroponics, /turf/simulated/floor/tiled, -/area/hallway/primary/starboard) +/area/rnd/xenobiology/xenoflora) "cfT" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, @@ -4231,6 +4125,9 @@ }, /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "ckA" = ( @@ -4240,6 +4137,7 @@ dir = 4; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "ckD" = ( @@ -4325,6 +4223,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 5 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "cou" = ( @@ -4430,17 +4331,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"csz" = ( -/obj/structure/reagent_dispensers/watertank, -/obj/item/reagent_containers/glass/bucket, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) "csF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -4497,7 +4387,6 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "ctR" = ( -/obj/machinery/botany/extractor, /obj/machinery/light{ dir = 8 }, @@ -4507,6 +4396,8 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 8 }, +/obj/structure/reagent_dispensers/watertank, +/obj/item/reagent_containers/glass/bucket, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "ctU" = ( @@ -4528,7 +4419,7 @@ /obj/item/slime_scanner, /obj/item/multitool, /obj/machinery/camera/network/research/xenobio{ - dir = 10 + dir = 1 }, /turf/simulated/floor/tiled/techmaint, /area/rnd/outpost/xenobiology/outpost_storage) @@ -4626,12 +4517,14 @@ /turf/simulated/wall/prepainted/science, /area/rnd/staircase/thirdfloor) "cwf" = ( -/obj/item/radio/intercom{ - dir = 1; - pixel_y = 24 +/obj/machinery/vending/medical{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/triage) "cwy" = ( /obj/machinery/door/airlock{ name = "Internal Affairs"; @@ -4854,14 +4747,26 @@ /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_south_airlock) "cBN" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/light{ +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 8 }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/area/rnd/xenobiology/xenoflora) "cBT" = ( /obj/structure/table/steel, /obj/item/integrated_circuit_printer, @@ -4924,7 +4829,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ +/obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, /turf/simulated/floor/tiled, @@ -4940,6 +4845,7 @@ dir = 8 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "cDs" = ( @@ -4968,12 +4874,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/surgery1) -"cEO" = ( -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "cEQ" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -5057,16 +4957,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) -"cGJ" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/airlock/glass/research{ - name = "Xenoflora Research"; - req_one_access = list(30,35,47,77) - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "cGO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -5117,13 +5007,14 @@ /turf/simulated/floor/bluegrid, /area/rnd/robotics/mechbay) "cKI" = ( -/obj/structure/table/glass, -/obj/effect/floor_decal/steeldecal/steel_decals10{ +/obj/structure/window/reinforced{ dir = 8 }, -/obj/item/defib_kit/loaded, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology/xenoflora_storage) "cKJ" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/effect/paint_stripe/purplegray, @@ -5177,7 +5068,6 @@ /turf/simulated/wall/prepainted/civilian, /area/tether/surfacebase/shuttle_pad) "cOu" = ( -/obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment{ dir = 8 }, @@ -5190,9 +5080,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/door/airlock/glass/research{ - name = "Xenoflora Research"; - req_one_access = list(30,35,47,77) +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) @@ -5600,14 +5489,22 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/tourbus/general) "dcU" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 4 +/obj/structure/catwalk, +/obj/structure/railing{ + dir = 1 }, -/obj/machinery/camera/network/research/xenobio{ - dir = 9 +/obj/structure/table/standard, +/obj/item/reagent_containers/food/drinks/teapot, +/obj/item/reagent_containers/food/drinks/tea{ + pixel_x = 9; + pixel_y = -6 }, -/turf/simulated/floor/tiled, -/area/rnd/outpost/xenobiology/outpost_hallway) +/obj/item/reagent_containers/food/drinks/tea{ + pixel_x = -7; + pixel_y = 6 + }, +/turf/simulated/open, +/area/rnd/outpost/xenobiology/outpost_stairs) "dda" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, @@ -5634,19 +5531,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) -"ddu" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/machinery/fire_alarm/south_mount{ - pixel_y = -24 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 10 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/botanystorage) "ddX" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/zpipe/down{ @@ -5665,16 +5549,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/open, /area/rnd/research_storage) -"dea" = ( -/obj/structure/bed/padded, -/obj/effect/floor_decal/techfloor{ - dir = 8 - }, -/obj/machinery/vending/wallmed1/public{ - pixel_x = -28 - }, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/panic_shelter) "def" = ( /obj/effect/floor_decal/spline/plain, /turf/simulated/floor/water/deep/pool, @@ -5712,6 +5586,9 @@ dir = 2; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "dia" = ( @@ -5787,12 +5664,15 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "dln" = ( @@ -5820,7 +5700,7 @@ dir = 4 }, /turf/simulated/floor/tiled/techmaint, -/area/vacant/vacant_shop) +/area/tether/surfacebase/barbackmaintenance) "dna" = ( /obj/machinery/newscaster{ pixel_y = 30 @@ -5977,12 +5857,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) -"drE" = ( -/obj/machinery/camera/network/research/xenobio{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/rnd/outpost/xenobiology/outpost_main) "drY" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -6209,16 +6083,10 @@ /turf/simulated/floor/grass, /area/hydroponics/cafegarden) "dyy" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/machinery/atmospherics/portables_connector, -/obj/effect/floor_decal/borderfloor{ - dir = 5 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 5 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/area/rnd/xenobiology/xenoflora) "dyJ" = ( /turf/simulated/wall/r_wall/prepainted/command, /area/crew_quarters/captain) @@ -6262,18 +6130,19 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/lower/medsec_maintenance) "dzs" = ( -/obj/item/radio/intercom{ - dir = 1; - pixel_y = 24 - }, /obj/effect/floor_decal/borderfloor{ - dir = 1 + dir = 5 }, /obj/effect/floor_decal/corner/mauve/border{ - dir = 1 + dir = 5 + }, +/obj/machinery/portable_atmospherics/hydroponics, +/obj/machinery/atmospherics/portables_connector, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 9 }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "dAe" = ( /obj/structure/closet/hydrant{ pixel_y = -32 @@ -6355,13 +6224,14 @@ /turf/simulated/floor/plating, /area/hallway/lower/third_south) "dBH" = ( -/obj/machinery/botany/editor, /obj/effect/floor_decal/borderfloor{ dir = 8 }, /obj/effect/floor_decal/corner/mauve/border{ dir = 8 }, +/obj/structure/reagent_dispensers/watertank, +/obj/item/reagent_containers/glass/bucket, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "dBP" = ( @@ -6410,6 +6280,9 @@ id_tag = "southciv_airlock_outer"; locked = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/universal{ + dir = 4 + }, /turf/simulated/floor/tiled/steel_grid, /area/tether/surfacebase/topairlock) "dCm" = ( @@ -6608,6 +6481,9 @@ dir = 4; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "dIO" = ( @@ -6690,6 +6566,7 @@ "dLp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/shuttle_pad) "dLw" = ( @@ -6986,6 +6863,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) "dVr" = ( @@ -7043,6 +6921,7 @@ dir = 8; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "dXD" = ( @@ -7080,13 +6959,6 @@ /obj/structure/cable/green, /turf/simulated/floor/lino, /area/tether/surfacebase/entertainment/stage) -"dXU" = ( -/obj/machinery/atmospherics/component/binary/pump{ - dir = 4; - name = "Port to Isolation" - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "dXZ" = ( /obj/machinery/light, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -7254,17 +7126,9 @@ /turf/simulated/floor/tiled, /area/teleporter/departing) "eet" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 1 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 1 - }, -/obj/structure/flora/pottedplant/stoutbush, -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, +/obj/effect/paint_stripe/babyblue, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/turf/simulated/floor/plating, /area/tether/surfacebase/medical/storage) "eez" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -7346,6 +7210,9 @@ name = "Surface EVA" }, /obj/effect/floor_decal/steeldecal/steel_decals_central1, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled/monofloor, /area/tether/surfacebase/topairlock) "eha" = ( @@ -7356,6 +7223,7 @@ dir = 8 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "eho" = ( @@ -7400,13 +7268,22 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "eiR" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/area/rnd/xenobiology/xenoflora) "eiX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) "ejU" = ( @@ -7440,10 +7317,9 @@ /obj/machinery/power/apc/south_mount, /obj/random/maintenance/medical, /obj/random/maintenance/medical, -/obj/random/maintenance/clean, -/obj/random/maintenance/medical, /obj/structure/closet, /obj/effect/floor_decal/techfloor, +/obj/random/maintenance/medical, /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/lower/medsec_maintenance) "elj" = ( @@ -7499,6 +7375,7 @@ dir = 1 }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "enf" = ( @@ -7608,17 +7485,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/carpet/blue, /area/tether/surfacebase/security/breakroom) -"eqo" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/machinery/atmospherics/portables_connector, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "eqR" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -7778,6 +7644,14 @@ dir = 4 }, /obj/structure/table/standard, +/obj/item/storage/firstaid/o2{ + pixel_x = -7; + pixel_y = 15 + }, +/obj/item/storage/firstaid/o2{ + pixel_y = 10; + pixel_x = -12 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "euI" = ( @@ -7824,18 +7698,10 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) "evK" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/machinery/atmospherics/portables_connector, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 1 - }, -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/tiled, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/turf/simulated/floor/plating, /area/rnd/xenobiology/xenoflora_storage) "ewg" = ( /obj/machinery/photocopier, @@ -7858,6 +7724,7 @@ /obj/machinery/door/airlock/glass, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "ewD" = ( @@ -8160,7 +8027,7 @@ }, /obj/machinery/door/airlock/research{ name = "Research Department"; - req_access = list(7) + req_access = list(47) }, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) @@ -8299,6 +8166,11 @@ /obj/effect/floor_decal/techfloor{ dir = 4 }, +/obj/structure/closet, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/panic_shelter) "eKA" = ( @@ -8355,12 +8227,12 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 1 }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 +/obj/structure/closet/secure_closet/hydroponics{ + req_access = list(); + req_one_access = list(30,35,47,77) }, -/obj/effect/floor_decal/steeldecal/steel_decals7, /turf/simulated/floor/tiled, -/area/hallway/primary/starboard) +/area/rnd/xenobiology/xenoflora) "eMK" = ( /obj/effect/floor_decal/techfloor{ dir = 1 @@ -8383,10 +8255,10 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_main) "eMY" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/effect/floor_decal/corner/mauve/full, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/effect/paint_stripe/purplegray, +/turf/simulated/floor/plating, +/area/rnd/xenobiology/xenoflora_storage) "eNU" = ( /obj/machinery/air_alarm{ dir = 8; @@ -8415,11 +8287,18 @@ /turf/simulated/floor/tiled/dark, /area/rnd/research/testingrange) "eOE" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/door/airlock/maintenance/medical{ + name = "Medical Maintenance Access"; + req_access = list(5) + }, +/obj/machinery/door/firedoor/glass{ + dir = 8 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) @@ -8468,11 +8347,11 @@ /turf/simulated/floor/plating, /area/tether/surfacebase/security/hos) "ePT" = ( -/obj/structure/flora/ausbushes/sunnybush, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/grass, -/area/hydroponics) +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, +/obj/machinery/botany/extractor, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology/xenoflora) "eQc" = ( /turf/simulated/wall/prepainted/science, /area/rnd/xenobiology/xenoflora) @@ -8722,12 +8601,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) -"eWa" = ( -/obj/structure/closet/l3closet/scientist, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/mauve/border, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) "eWp" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -8760,16 +8633,6 @@ /obj/effect/floor_decal/corner/red/border, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/processing) -"eWA" = ( -/obj/machinery/portable_atmospherics/canister/nitrogen, -/obj/effect/floor_decal/industrial/warning{ - dir = 9 - }, -/obj/machinery/fire_alarm/south_mount{ - pixel_y = -24 - }, -/turf/simulated/floor/tiled/white, -/area/rnd/xenobiology/xenoflora_storage) "eWB" = ( /obj/machinery/button/remote/blast_door{ dir = 8; @@ -8792,7 +8655,7 @@ /area/hallway/primary/starboard) "eXn" = ( /obj/machinery/vending/hydronutrients{ - dir = 8 + dir = 1 }, /turf/simulated/floor/grass, /area/hydroponics) @@ -8826,15 +8689,6 @@ icon_state = "techmaint" }, /area/tether/surfacebase/security/upperhall) -"eZy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "eZH" = ( /obj/structure/disposalpipe/segment, /turf/simulated/wall/prepainted/science, @@ -8971,21 +8825,11 @@ /turf/simulated/floor/wood, /area/crew_quarters/captain) "fgp" = ( -/obj/structure/table/glass, -/obj/effect/floor_decal/borderfloor{ - dir = 6 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 6 - }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/machinery/light_switch{ - pixel_x = 25 +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 10 }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/turf/simulated/floor/tiled/steel_dirty/virgo3b, +/area/tether/surfacebase/outside/outside3) "fgP" = ( /obj/machinery/light{ dir = 4 @@ -9236,11 +9080,11 @@ icon_state = "1-2" }, /turf/simulated/floor/tiled/techfloor, -/area/vacant/vacant_shop) +/area/tether/surfacebase/barbackmaintenance) "fnK" = ( -/obj/machinery/camera/network/research, +/obj/structure/closet/firecloset, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/area/rnd/xenobiology/xenoflora) "fnZ" = ( /obj/effect/floor_decal/spline/plain{ dir = 8 @@ -9280,12 +9124,6 @@ }, /turf/simulated/floor/carpet, /area/tether/surfacebase/security/hos) -"fpW" = ( -/obj/structure/closet/firecloset, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/mauve/border, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) "fqA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -9396,23 +9234,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) -"fuT" = ( -/obj/effect/floor_decal/techfloor{ - dir = 4 - }, -/obj/effect/floor_decal/techfloor/hole{ - dir = 4 - }, -/obj/effect/floor_decal/techfloor/hole/right{ - dir = 4 - }, -/obj/machinery/shower{ - dir = 8; - pixel_x = -2 - }, -/obj/effect/floor_decal/industrial/outline/blue, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/panic_shelter) "fvy" = ( /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/borderfloor/corner, @@ -9607,13 +9428,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/panic_shelter) -"fBW" = ( -/obj/machinery/portable_atmospherics/canister/nitrous_oxide, -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "fCh" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -9718,8 +9532,11 @@ /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) "fEn" = ( -/turf/simulated/wall, -/area/tether/surfacebase/topairlock) +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/southhall) "fEA" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -9835,7 +9652,7 @@ /obj/random/maintenance/clean, /obj/random/maintenance/clean, /turf/simulated/floor/tiled/techfloor, -/area/vacant/vacant_shop) +/area/tether/surfacebase/barbackmaintenance) "fIr" = ( /obj/machinery/papershredder, /obj/effect/floor_decal/borderfloor, @@ -9912,12 +9729,11 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/cafeteria) "fJV" = ( -/obj/structure/cable/green{ - icon_state = "1-8" +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 }, -/obj/structure/flora/ausbushes/ppflowers, -/turf/simulated/floor/grass, -/area/hydroponics) +/turf/simulated/floor/tiled, +/area/rnd/xenobiology/xenoflora_storage) "fKc" = ( /obj/structure/table/glass, /obj/machinery/light{ @@ -9943,9 +9759,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/door/firedoor{ - dir = 1 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) "fKZ" = ( @@ -10137,6 +9951,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) "fPc" = ( @@ -10149,15 +9964,8 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 1 }, -/obj/effect/floor_decal/borderfloorwhite/corner2{ - dir = 1 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner2{ - dir = 1 - }, /obj/machinery/button/remote/airlock{ desc = "A remote control switch for the medbay foyer."; - dir = 1; id = "MedbayFoyer"; name = "Medbay Doors Control"; pixel_x = -10; @@ -10178,6 +9986,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "fPn" = ( @@ -10304,6 +10115,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) "fUa" = ( @@ -10435,15 +10247,9 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/cafeteria) "fWO" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/botanystorage) +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/turf/simulated/floor/wood, +/area/tether/surfacebase/barbackmaintenance) "fWV" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -10574,19 +10380,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "fZm" = ( -/obj/machinery/atmospherics/component/unary/heater{ - icon_state = "heater" - }, -/obj/effect/floor_decal/corner/green{ - dir = 10 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 1 - }, -/turf/simulated/floor/tiled, +/turf/simulated/wall/prepainted/civilian, /area/rnd/xenobiology/xenoflora_storage) "fZp" = ( /obj/structure/disposalpipe/segment{ @@ -10626,9 +10420,6 @@ /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "fZO" = ( -/obj/machinery/atmospherics/component/unary/freezer{ - dir = 4 - }, /obj/effect/floor_decal/corner/paleblue{ dir = 6 }, @@ -10638,10 +10429,22 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/portable_atmospherics/canister/oxygen/prechilled, +/obj/machinery/atmospherics/portables_connector, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/item/tool/wrench, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "fZS" = ( /obj/structure/lattice, +/obj/machinery/atmospherics/pipe/zpipe/down/aux{ + dir = 1 + }, /turf/simulated/open, /area/tether/surfacebase/barbackmaintenance) "gaD" = ( @@ -10657,6 +10460,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "gbb" = ( @@ -10772,15 +10576,29 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "gig" = ( -/obj/machinery/camera/network/research, /obj/effect/floor_decal/borderfloor{ dir = 1 }, /obj/effect/floor_decal/corner/mauve/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 8 + }, +/obj/structure/table/glass, +/obj/item/pipe_dispenser, +/obj/item/storage/toolbox/mechanical, +/obj/item/clothing/mask/gas, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/obj/machinery/power/apc/north_mount, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 6 + }, +/obj/machinery/camera/network/research, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "gjg" = ( /obj/structure/bed/chair{ dir = 8 @@ -10886,6 +10704,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/shuttle_pad) "gmw" = ( @@ -11125,17 +10944,10 @@ dir = 1 }, /turf/simulated/wall/prepainted, -/area/vacant/vacant_shop) +/area/tether/surfacebase/barbackmaintenance) "gtb" = ( /turf/simulated/wall/prepainted/security, /area/tether/surfacebase/security/iaa/officecommon) -"gtl" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 - }, -/obj/machinery/meter, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "gty" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -11400,17 +11212,18 @@ /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "gzy" = ( -/obj/machinery/light_switch{ - pixel_x = 25 - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/medsec_maintenance) +/obj/machinery/reagentgrinder, +/obj/structure/table/glass, +/obj/effect/floor_decal/borderfloor, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology/xenoflora) "gzG" = ( /obj/structure/cable/green{ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) "gzU" = ( @@ -11484,12 +11297,13 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "gEL" = ( -/obj/machinery/portable_atmospherics/canister/phoron, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 }, +/obj/machinery/portable_atmospherics/hydroponics, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/area/rnd/xenobiology/xenoflora) "gEQ" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -11591,6 +11405,7 @@ }, /obj/machinery/door/airlock/glass_external/public, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "gKp" = ( @@ -11618,6 +11433,7 @@ "gKL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "gLd" = ( @@ -11661,16 +11477,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) -"gMB" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/botanystorage) "gMY" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/machinery/door/blast/regular{ @@ -11755,16 +11561,17 @@ }, /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/steeldecal/steel_decals6, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "gPL" = ( /obj/structure/cable/green{ icon_state = "1-4" }, -/obj/machinery/camera/network/research{ +/obj/structure/closet/l3closet/scientist, +/obj/machinery/camera/network/research/xenobio{ dir = 1 }, -/obj/structure/closet/l3closet/scientist, /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_decon) "gQS" = ( @@ -11814,7 +11621,7 @@ dir = 4 }, /turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_three_hall) +/area/tether/surfacebase/barbackmaintenance) "gSM" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -11915,7 +11722,7 @@ dir = 4 }, /turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_three_hall) +/area/tether/surfacebase/barbackmaintenance) "gUM" = ( /obj/machinery/air_alarm{ dir = 4; @@ -11944,11 +11751,6 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/wood, /area/triumph/surfacebase/sauna) -"gWY" = ( -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, -/obj/structure/catwalk, -/turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/tether/surfacebase/outside/outside3) "gXa" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -12127,8 +11929,7 @@ icon_state = "0-8" }, /obj/machinery/door/window/southright{ - dir = 1; - req_one_access = list(19,43,67) + dir = 1 }, /turf/simulated/floor/plating, /area/shuttle/tourbus/general) @@ -12155,12 +11956,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) -"hbO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/panic_shelter) "hcd" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -12326,16 +12121,14 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "hip" = ( -/obj/machinery/atmospherics/pipe/simple/visible, -/obj/machinery/meter, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 4 +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lime/border, +/obj/machinery/light, +/obj/machinery/camera/network/civilian{ + dir = 1 }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/area/tether/surfacebase/botanystorage) "hjV" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/machinery/power/apc/east_mount, @@ -12382,56 +12175,14 @@ /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 1 }, -/obj/machinery/door/firedoor{ - dir = 1 - }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) "hkJ" = ( -/obj/structure/table/glass, -/obj/item/packageWrap, -/obj/item/hand_labeler, -/obj/machinery/power/apc/west_mount{ - cell_type = /obj/item/cell/super - }, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 8 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 8 - }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ +/obj/effect/floor_decal/techfloor{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "0-4" - }, -/obj/effect/floor_decal/borderfloorwhite/corner2{ - dir = 8 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner2{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) -"hle" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 5 - }, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 1 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) +/turf/simulated/floor/tiled/techfloor/grid, +/area/maintenance/lower/medsec_maintenance) "hmR" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/cable/green{ @@ -12451,6 +12202,12 @@ /obj/item/clothing/gloves/sterile/nitrile, /obj/item/clothing/gloves/sterile/nitrile, /obj/item/defib_kit/loaded, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 1 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "hoA" = ( @@ -12462,6 +12219,9 @@ id_tag = "southciv_airlock_inner"; locked = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_grid, /area/tether/surfacebase/topairlock) "hoE" = ( @@ -12596,10 +12356,10 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/vending/medical, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "hsO" = ( -/obj/machinery/chem_master, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -12615,6 +12375,8 @@ /obj/effect/floor_decal/corner/orange/border{ dir = 1 }, +/obj/structure/table/reinforced, +/obj/machinery/chemical_dispenser/full, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) "hty" = ( @@ -12663,6 +12425,9 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/topairlock) "huZ" = ( @@ -12750,19 +12515,17 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "hyb" = ( -/obj/machinery/door/airlock/maintenance/medical{ - name = "Medical Maintenance Access"; - req_access = list(5) - }, -/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, /turf/simulated/floor/tiled/techfloor/grid, -/area/tether/surfacebase/medical/triage) +/area/maintenance/lower/medsec_maintenance) "hyk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -12841,6 +12604,12 @@ /obj/random/tetheraid, /obj/random/tetheraid, /obj/item/storage/secure/briefcase/ml3m_pack_med, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 1 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "hBL" = ( @@ -12871,13 +12640,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"hCH" = ( -/obj/machinery/portable_atmospherics/canister/nitrous_oxide, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "hDB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -12903,12 +12665,6 @@ }, /turf/simulated/floor/water/pool, /area/triumph/surfacebase/sauna) -"hEA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/panic_shelter) "hEQ" = ( /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) @@ -13059,18 +12815,11 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/upperhall) "hLe" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 11 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 4 +/obj/machinery/atmospherics/component/binary/pump{ + dir = 1 }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "hLj" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -13173,13 +12922,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/breakroom) -"hNC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "hNS" = ( /obj/machinery/light, /obj/machinery/media/jukebox, @@ -13206,7 +12948,7 @@ dir = 5 }, /turf/simulated/floor/tiled/techfloor, -/area/vacant/vacant_shop) +/area/tether/surfacebase/barbackmaintenance) "hPw" = ( /obj/machinery/door/airlock{ name = "Unisex Restrooms" @@ -13284,13 +13026,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) -"hRu" = ( -/obj/item/radio/intercom{ - dir = 8; - pixel_x = -24 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "hRE" = ( /obj/effect/floor_decal/steeldecal/steel_decals6, /obj/structure/disposalpipe/segment{ @@ -13336,15 +13071,18 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) "hTs" = ( -/obj/machinery/seed_extractor, -/obj/effect/floor_decal/borderfloor{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/tether/surfacebase/surface_three_hall) "hTV" = ( /obj/machinery/light/small, /obj/effect/floor_decal/techfloor, @@ -13358,6 +13096,7 @@ dir = 2; icon_state = "pipe-j2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) "hUG" = ( @@ -13448,16 +13187,10 @@ /turf/simulated/floor/tiled, /area/hallway/primary/port) "hXb" = ( -/obj/machinery/portable_atmospherics/canister/nitrogen, -/obj/effect/floor_decal/industrial/warning{ - dir = 5 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) -"hXr" = ( -/obj/machinery/atmospherics/pipe/manifold/visible, -/obj/machinery/meter, -/turf/simulated/floor/tiled, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, +/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/turf/simulated/floor/plating, /area/rnd/xenobiology/xenoflora_storage) "hXB" = ( /obj/effect/floor_decal/corner/grey/diagonal, @@ -13515,21 +13248,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) -"hYE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "hYJ" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -13595,17 +13313,16 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "ick" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 5 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/botanystorage) +/area/rnd/xenobiology/xenoflora_storage) "icq" = ( /obj/machinery/door/airlock/multi_tile/glass{ name = "Internal Affairs" @@ -13639,19 +13356,13 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "icV" = ( -/obj/structure/closet/secure_closet/hydroponics, -/obj/machinery/camera/network/civilian, /obj/effect/floor_decal/borderfloor{ dir = 5 }, /obj/effect/floor_decal/corner/lime/border{ dir = 5 }, -/obj/item/shovel/spade, -/obj/item/storage/belt/utility, -/obj/item/stack/material/sandstone{ - amount = 5 - }, +/obj/machinery/portable_atmospherics/hydroponics, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "idP" = ( @@ -13942,9 +13653,6 @@ /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 4 }, -/obj/machinery/door/firedoor{ - dir = 1 - }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "inl" = ( @@ -14013,27 +13721,12 @@ /turf/simulated/floor/wood, /area/crew_quarters/captain) "ioX" = ( -/obj/structure/medical_stand, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 10 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 10 - }, -/obj/effect/floor_decal/borderfloorwhite/corner2{ - dir = 9 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner2{ - dir = 9 - }, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 4 - }, -/obj/machinery/fire_alarm/west_mount{ - pixel_x = -24 +/obj/effect/floor_decal/techfloor{ + dir = 6 }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) +/obj/random/trash_pile, +/turf/simulated/floor/tiled/techfloor/grid, +/area/maintenance/lower/medsec_maintenance) "ioZ" = ( /obj/structure/table/marble, /obj/machinery/chemical_dispenser/catering/bar_alc{ @@ -14072,6 +13765,7 @@ /obj/structure/cable/orange{ icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) "iqj" = ( @@ -14131,9 +13825,18 @@ /turf/simulated/floor/wood, /area/triumph/surfacebase/sauna) "irb" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) "irO" = ( @@ -14227,6 +13930,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) "iub" = ( @@ -14265,21 +13969,27 @@ /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "iuy" = ( -/obj/machinery/portable_atmospherics/hydroponics, /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/floor_decal/corner/mauve{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 8 + }, +/obj/machinery/door/airlock/glass/research{ + name = "Xenoflora Research"; + req_one_access = list(30,35,47,77) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, +/obj/machinery/door/firedoor{ + dir = 8 }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "iuD" = ( /obj/structure/bed/chair/wood, /turf/simulated/floor/tiled/eris/cafe, @@ -14343,12 +14053,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) -"iwu" = ( -/obj/machinery/air_alarm{ - pixel_y = 25 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "iwC" = ( /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) @@ -14445,16 +14149,8 @@ /turf/simulated/floor/tiled, /area/crew_quarters/heads/hop) "izr" = ( -/obj/structure/window/basic/full, -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/basic, -/obj/structure/window/basic{ - dir = 1 - }, -/obj/structure/window/basic{ - dir = 8 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_storage) "iBt" = ( @@ -14571,11 +14267,8 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/effect/floor_decal/techfloor{ - dir = 8 - }, /turf/simulated/floor/tiled/techfloor, -/area/vacant/vacant_shop) +/area/tether/surfacebase/barbackmaintenance) "iDZ" = ( /obj/effect/floor_decal/corner/lightgrey{ dir = 9 @@ -14634,8 +14327,13 @@ /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_north_airlock) "iGh" = ( -/turf/simulated/wall/r_wall/prepainted/science, -/area/crew_quarters/panic_shelter) +/obj/structure/table/glass, +/obj/item/storage/box/botanydisk, +/obj/item/storage/box/botanydisk, +/obj/item/material/minihoe, +/obj/item/reagent_containers/glass/bucket, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology/xenoflora) "iGD" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -14691,24 +14389,11 @@ /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "iIx" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 8 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 8 - }, -/obj/structure/table/glass, -/obj/item/storage/box/gloves{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/storage/box/masks, -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -22 +/obj/machinery/light_switch{ + pixel_x = 25 }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) +/turf/simulated/floor/wood, +/area/maintenance/lower/medsec_maintenance) "iIJ" = ( /obj/structure/curtain/open/shower, /obj/machinery/shower{ @@ -14725,6 +14410,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/wood, /area/tether/surfacebase/barbackmaintenance) "iIW" = ( @@ -14839,15 +14525,6 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_first_aid) -"iLL" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/fire_alarm/east_mount, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "iLO" = ( /obj/structure/closet/wardrobe/xenos, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -14897,15 +14574,15 @@ /area/tether/surfacebase/surface_three_hall) "iNx" = ( /obj/structure/railing, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/obj/structure/grille, -/obj/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ frequency = 1379; id_tag = "southciv_airlock_pump" }, +/obj/map_helper/airlock/atmos/chamber_pump, +/obj/machinery/power/apc/north_mount, +/obj/structure/cable/orange{ + icon_state = "0-2" + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/topairlock) "iNJ" = ( @@ -14964,10 +14641,8 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "iOA" = ( -/obj/structure/window/reinforced, -/obj/machinery/atmospherics/component/unary/vent_pump/on, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/turf/simulated/floor/tiled/techfloor, +/area/tether/surfacebase/barbackmaintenance) "iOE" = ( /obj/machinery/vending/boozeomat, /turf/simulated/floor/wood, @@ -14979,6 +14654,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "iOW" = ( @@ -15056,20 +14732,12 @@ /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/topairlock) "iRw" = ( -/obj/structure/table/glass, -/obj/item/storage/box/beakers{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/storage/box/syringes, -/obj/item/storage/box/gloves{ - pixel_x = 4; - pixel_y = 4 +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 4 }, -/obj/effect/floor_decal/borderfloor/corner, -/obj/effect/floor_decal/corner/mauve/bordercorner, +/obj/machinery/meter, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "iRQ" = ( /obj/machinery/door/window{ dir = 4; @@ -15156,7 +14824,6 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppersouthstairwell) "iTS" = ( @@ -15542,12 +15209,9 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/effect/floor_decal/techfloor{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techfloor, -/area/vacant/vacant_shop) +/area/tether/surfacebase/barbackmaintenance) "jeM" = ( /obj/machinery/fire_alarm/north_mount, /obj/machinery/vending/loadout/accessory, @@ -15728,15 +15392,7 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/iaa) -"jkg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/grass, -/area/hydroponics) "jko" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, @@ -15799,6 +15455,9 @@ /obj/machinery/status_display{ pixel_x = -32 }, +/obj/machinery/camera/network/medbay{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "jlw" = ( @@ -15872,12 +15531,12 @@ /turf/simulated/floor/tiled, /area/hallway/primary/port) "jmm" = ( -/obj/structure/window/reinforced, -/obj/machinery/atmospherics/portables_connector{ - dir = 1 +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/triage) "jnl" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, @@ -15979,7 +15638,7 @@ pixel_y = -10 }, /turf/simulated/wall/prepainted, -/area/tether/surfacebase/surface_three_hall) +/area/tether/surfacebase/barbackmaintenance) "jrv" = ( /obj/structure/bed/chair/sofa/brown/right{ dir = 1 @@ -16076,30 +15735,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/staircase/thirdfloor) -"jtm" = ( -/obj/item/roller, -/obj/item/roller{ - pixel_y = 8 - }, -/obj/item/roller{ - pixel_y = 16 - }, -/obj/structure/table/glass, -/obj/machinery/light{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 8 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 8 - }, -/obj/structure/extinguisher_cabinet{ - dir = 4; - pixel_x = -30 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) "jtN" = ( /obj/structure/table/woodentable, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -16148,13 +15783,13 @@ /obj/structure/railing{ dir = 1 }, -/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/phoronlock{ - frequency = 1379; - scrub_id = "southciv_airlock_scrubber" - }, /obj/structure/sign/fire{ pixel_y = -32 }, +/obj/map_helper/airlock/atmos/scrubber, +/obj/machinery/atmospherics/component/unary/vent_scrubber/high_power{ + dir = 1 + }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/topairlock) "jvB" = ( @@ -16165,13 +15800,8 @@ /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) "jvD" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ - id = "medbayfoyer"; - name = "medbayfoyer" - }, -/obj/effect/paint_stripe/babyblue, -/turf/simulated/floor/plating, -/area/tether/surfacebase/medical/triage) +/turf/simulated/wall/prepainted/medical, +/area/maintenance/lower/medsec_maintenance) "jvH" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -16239,24 +15869,15 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/north_stairs_three) "jwU" = ( -/obj/structure/closet/secure_closet/hydroponics{ - req_access = list(); - req_one_access = list(30,35,47,77) - }, -/obj/effect/floor_decal/borderfloor{ - dir = 10 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 10 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 8 - }, -/obj/effect/floor_decal/corner/mauve/bordercorner2{ +/obj/structure/disposalpipe/segment, +/obj/random/medical, +/obj/machinery/recharger, +/obj/structure/table/steel, +/obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 8 }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/triage) "jxr" = ( /obj/effect/floor_decal/spline/plain{ dir = 1 @@ -16327,7 +15948,7 @@ /area/teleporter/departing) "jBw" = ( /turf/simulated/wall/prepainted, -/area/vacant/vacant_shop) +/area/tether/surfacebase/barbackmaintenance) "jBy" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -16512,15 +16133,15 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/cafeteria) "jGP" = ( -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 4 - }, -/obj/landmark/spawnpoint/job/medical_doctor, +/obj/machinery/vending/blood, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "jHu" = ( +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super + }, /obj/structure/cable/green{ - icon_state = "4-8" + icon_state = "0-4" }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) @@ -16534,6 +16155,7 @@ /obj/structure/railing{ dir = 1 }, +/obj/random/cutout, /turf/simulated/open, /area/rnd/outpost/xenobiology/outpost_stairs) "jIV" = ( @@ -16583,20 +16205,6 @@ /obj/structure/lattice, /turf/simulated/open, /area/hallway/primary/fore) -"jJW" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloorwhite, -/obj/effect/floor_decal/corner/paleblue/border, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/firedoor{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/uppersouthstairwell) "jKO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, @@ -16784,10 +16392,10 @@ /turf/simulated/floor/tiled, /area/hallway/primary/fore) "jQd" = ( -/obj/structure/window/reinforced, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/obj/effect/paint_stripe/bottlegreen, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/tether/surfacebase/botanystorage) "jQZ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -16979,11 +16587,20 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "jWi" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/grass, -/area/hydroponics) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "jWP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -17160,6 +16777,10 @@ /obj/structure/cable/green{ icon_state = "1-4" }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "kdz" = ( @@ -17168,14 +16789,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/research) -"kdK" = ( -/obj/machinery/fire_alarm/south_mount{ - pixel_y = -24 - }, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/mauve/border, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) "kdQ" = ( /obj/machinery/atmospherics/component/unary/engine, /turf/simulated/floor/tiled/techmaint, @@ -17235,7 +16848,6 @@ /turf/simulated/wall/r_wall/prepainted/command, /area/tether/surfacebase/surface_three_hall) "khZ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/cyan, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -17245,6 +16857,12 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, +/obj/machinery/camera/network/medbay{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 5 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "kia" = ( @@ -17296,6 +16914,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled/monofloor, /area/crew_quarters/bar) "kiZ" = ( @@ -17520,12 +17141,18 @@ /turf/simulated/floor/grass, /area/hydroponics) "kqR" = ( -/obj/machinery/door/window/brigdoor/southright{ - req_access = null; - req_one_access = list(30,35,47,77) +/obj/structure/table/glass, +/obj/item/storage/box/beakers{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/storage/box/syringes, +/obj/item/storage/box/gloves{ + pixel_x = 4; + pixel_y = 4 }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/area/rnd/xenobiology/xenoflora) "krj" = ( /obj/machinery/light, /turf/simulated/floor/tiled/freezer/cold, @@ -17572,11 +17199,11 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/structure/cable/green{ - icon_state = "1-8" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "ktl" = ( @@ -17814,15 +17441,9 @@ /area/tether/surfacebase/bar_backroom) "kCv" = ( /obj/machinery/holopad, -/obj/machinery/camera/network/research/xenobio{ - dir = 9 - }, /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_first_aid) "kCR" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, @@ -17838,6 +17459,9 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner2{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 10 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "kDm" = ( @@ -17888,18 +17512,6 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/surfacebase/outside/outside3) -"kFn" = ( -/obj/machinery/vending/hydronutrients{ - req_one_access = list(30,35,47,77) - }, -/obj/effect/floor_decal/borderfloor{ - dir = 5 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 5 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) "kFx" = ( /turf/simulated/wall/shull, /area/shuttle/tourbus/general) @@ -18105,23 +17717,18 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "kOG" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 11 + }, /obj/effect/floor_decal/borderfloor{ - dir = 6 + dir = 4 }, /obj/effect/floor_decal/corner/mauve/border{ - dir = 6 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 6 - }, -/obj/effect/floor_decal/corner/mauve/bordercorner2{ - dir = 6 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 + dir = 4 }, /turf/simulated/floor/tiled, -/area/hallway/primary/starboard) +/area/rnd/xenobiology/xenoflora_storage) "kPZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -18366,22 +17973,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) -"kXW" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 8 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloorwhite/corner2{ - dir = 8 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner2{ - dir = 8 - }, -/obj/machinery/vending/blood, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) "kYg" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -18412,7 +18003,7 @@ icon_state = "pipe-j2" }, /obj/machinery/camera/network/research/xenobio{ - dir = 10 + dir = 1 }, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_main) @@ -18442,19 +18033,6 @@ }, /turf/simulated/floor/tiled, /area/teleporter/departing) -"kZr" = ( -/obj/structure/window/basic/full, -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/basic, -/obj/structure/window/basic{ - dir = 1 - }, -/obj/structure/window/basic{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/rnd/outpost/xenobiology/outpost_storage) "kZR" = ( /obj/machinery/computer/secure_data{ dir = 4 @@ -18532,17 +18110,17 @@ /turf/simulated/floor/wood, /area/rnd/outpost/xenobiology/outpost_office) "lbF" = ( -/obj/effect/floor_decal/corner_steel_grid{ - dir = 5 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, +/obj/effect/floor_decal/steeldecal/steel_decals10, +/obj/landmark/spawnpoint/job/medical_doctor, /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 1; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) @@ -18642,6 +18220,9 @@ /obj/machinery/light{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) "lgl" = ( @@ -18655,12 +18236,12 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/security/hos) "lgu" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/structure/flora/ausbushes/ppflowers, -/turf/simulated/floor/grass, -/area/hydroponics) +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, +/obj/machinery/botany/editor, +/obj/machinery/light, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology/xenoflora) "lgD" = ( /obj/structure/table/marble, /turf/simulated/floor/carpet/purcarpet, @@ -18976,27 +18557,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/port) -"lpk" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) "lpH" = ( /obj/machinery/door/firedoor, /obj/structure/table/reinforced, @@ -19028,20 +18588,11 @@ /turf/simulated/floor/plating, /area/tether/surfacebase/medical/storage) "lqQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/structure/railing{ + dir = 8 }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/turf/simulated/floor/outdoors/grass/sif/virgo3b, +/area/tether/surfacebase/outside/outside3) "lrz" = ( /obj/machinery/librarycomp, /obj/structure/table/woodentable, @@ -19071,6 +18622,9 @@ /obj/machinery/camera/network/civilian{ dir = 4 }, +/obj/machinery/vending/wallmed1/public{ + pixel_x = -28 + }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/panic_shelter) "lsn" = ( @@ -19139,24 +18693,9 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) "lth" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/power/apc/south_mount{ - req_access = list(67) - }, -/obj/effect/floor_decal/borderfloorwhite, -/obj/effect/floor_decal/corner/paleblue/border, -/obj/effect/floor_decal/borderfloorwhite/corner2, -/obj/effect/floor_decal/corner/paleblue/bordercorner2, +/obj/machinery/vending/blood, /turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/uppersouthstairwell) +/area/tether/surfacebase/medical/storage) "ltI" = ( /obj/item/stool/padded, /turf/simulated/floor/tiled/white, @@ -19242,21 +18781,14 @@ /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) "lwr" = ( -/obj/machinery/portable_atmospherics/hydroponics, /obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 + icon_state = "1-8" }, -/obj/effect/floor_decal/corner/mauve{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 9 }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "lwv" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -19320,11 +18852,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_breakroom) -"lxQ" = ( -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/manifold/visible/yellow, -/turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/tether/surfacebase/outside/outside3) "lxW" = ( /obj/effect/floor_decal/borderfloor{ dir = 9 @@ -19351,8 +18878,20 @@ /turf/simulated/floor/outdoors/grass/sif/virgo3b, /area/tether/surfacebase/outside/outside3) "lAa" = ( -/turf/simulated/wall/prepainted/civilian, -/area/vacant/vacant_shop) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) "lAH" = ( /obj/structure/sign/nosmoking_1, /turf/simulated/wall/prepainted/medical, @@ -19642,6 +19181,7 @@ dir = 2; icon_state = "pipe-j2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "lJu" = ( @@ -19663,9 +19203,9 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "lJy" = ( -/obj/machinery/power/apc/north_mount, -/obj/structure/cable/green{ - icon_state = "0-2" +/obj/item/radio/intercom{ + dir = 1; + pixel_y = 24 }, /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -19673,8 +19213,16 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 1 }, +/obj/machinery/portable_atmospherics/hydroponics, +/obj/machinery/atmospherics/portables_connector, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 8 + }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "lJJ" = ( /obj/machinery/fire_alarm/south_mount{ pixel_y = -24 @@ -19715,6 +19263,9 @@ dir = 8; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "lLp" = ( @@ -19747,7 +19298,7 @@ /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, /obj/machinery/door/firedoor{ - dir = 1 + dir = 8 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) @@ -19790,6 +19341,9 @@ /obj/machinery/camera/network/civilian{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 5 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "lOu" = ( @@ -19961,6 +19515,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "lVY" = ( @@ -19968,18 +19523,21 @@ /turf/simulated/floor/tiled, /area/rnd/research/testingrange) "lWj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ - dir = 4 +/obj/structure/closet/secure_closet/hydroponics, +/obj/machinery/camera/network/civilian, +/obj/item/shovel/spade, +/obj/item/storage/belt/utility, +/obj/item/stack/material/sandstone{ + amount = 5 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/effect/floor_decal/borderfloor{ + dir = 1 }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/effect/floor_decal/corner/lime/border{ + dir = 1 }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/area/tether/surfacebase/botanystorage) "lWn" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -19993,9 +19551,6 @@ req_one_access = list(35,28) }, /obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "lWD" = ( @@ -20447,6 +20002,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "mjl" = ( @@ -20472,7 +20028,12 @@ /turf/simulated/floor/plating, /area/rnd/research_storage) "mjF" = ( -/obj/landmark/spawnpoint/job/medical_doctor, +/obj/machinery/vending/wallmed1{ + pixel_x = -30 + }, +/obj/structure/filingcabinet/chestdrawer{ + name = "Scan Records" + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "mkj" = ( @@ -20512,7 +20073,20 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "mkR" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 1 + }, +/obj/machinery/portable_atmospherics/hydroponics, +/obj/machinery/atmospherics/portables_connector, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) "mlC" = ( @@ -20536,6 +20110,7 @@ "mlP" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/door/airlock/maintenance/common, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/barbackmaintenance) "mmA" = ( @@ -20581,16 +20156,9 @@ /turf/simulated/floor/grass, /area/tether/surfacebase/public_garden_three) "mon" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/mauve/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, +/obj/structure/closet/l3closet/scientist, /turf/simulated/floor/tiled, -/area/hallway/primary/starboard) +/area/rnd/xenobiology/xenoflora) "mow" = ( /obj/structure/table/marble, /turf/simulated/floor/carpet/turcarpet, @@ -20682,6 +20250,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/wood, /area/tether/surfacebase/barbackmaintenance) "msB" = ( @@ -21010,11 +20580,15 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/recreation_area_restroom) "mCv" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/orange{ + icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/area/tether/surfacebase/southhall) "mCW" = ( /obj/structure/table/woodentable, /obj/item/flame/candle, @@ -21057,9 +20631,11 @@ /area/rnd/robotics) "mEK" = ( /obj/machinery/power/apc/south_mount, -/obj/structure/cable/green, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lime/border, +/obj/structure/cable/green{ + icon_state = "0-8" + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "mEP" = ( @@ -21254,19 +20830,11 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "mKu" = ( -/obj/structure/window/basic/full, -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, -/obj/structure/window/basic, -/obj/structure/window/basic{ - dir = 1 - }, -/obj/structure/window/basic{ - dir = 4 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_first_aid) "mKy" = ( @@ -21352,9 +20920,12 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "mLY" = ( -/obj/structure/table/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, +/obj/machinery/portable_atmospherics/canister/nitrogen, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "mMd" = ( /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/borderfloor{ @@ -21416,25 +20987,28 @@ /area/tether/surfacebase/security/lobby) "mNV" = ( /obj/structure/table/reinforced, +/obj/machinery/button/remote/airlock{ + name = "Vault Bolt controll"; + layer = 2.8 + }, /obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/folder/blue, /obj/item/folder/red, +/obj/item/folder/blue, /obj/item/pen/multi, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hop) "mOi" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/effect/floor_decal/borderfloor{ - dir = 10 +/obj/machinery/atmospherics/portables_connector{ + dir = 1 }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 10 +/obj/structure/window/reinforced{ + dir = 8 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/botanystorage) +/area/rnd/xenobiology/xenoflora_storage) "mOr" = ( /obj/machinery/gibber, /obj/machinery/light{ @@ -21541,6 +21115,7 @@ name = "Xenobotany"; sortType = "Xenobotany" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "mQM" = ( @@ -21626,6 +21201,7 @@ /obj/machinery/door/airlock{ name = "Game Room" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/wood, /area/tether/surfacebase/barbackmaintenance) "mTf" = ( @@ -21743,7 +21319,7 @@ /area/rnd/outpost/xenobiology/outpost_decon) "mXz" = ( /turf/simulated/wall/r_wall/prepainted, -/area/vacant/vacant_shop) +/area/tether/surfacebase/barbackmaintenance) "mXI" = ( /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_breakroom) @@ -21827,6 +21403,7 @@ pixel_x = 24 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "naT" = ( @@ -21973,7 +21550,9 @@ /obj/structure/cable/orange{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/hidden, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/topairlock) "nff" = ( @@ -22163,30 +21742,11 @@ /turf/simulated/floor/tiled/techfloor, /area/rnd/workshop) "nlx" = ( -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/admin) -"nlz" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/power/apc/east_mount, -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/obj/machinery/light{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/admin) "nml" = ( /turf/simulated/open, /area/bridge/bridge_hallway) @@ -22214,10 +21774,6 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "nnn" = ( -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 1 - }, -/obj/landmark/spawnpoint/job/medical_doctor, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -22227,6 +21783,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/sleeper{ + dir = 4 + }, +/obj/effect/floor_decal/corner_steel_grid{ + dir = 10 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "nno" = ( @@ -22300,6 +21862,7 @@ /obj/structure/cable/orange{ icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "npn" = ( @@ -22314,7 +21877,6 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "nps" = ( -/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppersouthstairwell) "npQ" = ( @@ -22412,14 +21974,11 @@ /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_autopsy) "nsl" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/panic_shelter) +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, +/obj/machinery/biogenerator, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology/xenoflora) "nsp" = ( /obj/structure/bed/chair{ dir = 4 @@ -22476,6 +22035,7 @@ /obj/structure/cable/orange{ icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "ntl" = ( @@ -22515,6 +22075,7 @@ /obj/structure/cable/orange{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) "ntE" = ( @@ -22544,33 +22105,11 @@ }, /turf/simulated/wall/prepainted/civilian, /area/crew_quarters/kitchen) -"nvE" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 9 - }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 6 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/obj/structure/table/glass, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = -4 - }, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = 7; - pixel_y = 1 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) "nvP" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "nvU" = ( @@ -22659,33 +22198,25 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "nxm" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/cyan, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, /obj/effect/floor_decal/corner/paleblue/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 9 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "nyb" = ( +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/effect/paint_stripe/bottlegreen, /obj/structure/cable/green{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 + icon_state = "4-8" }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/plating, /area/tether/surfacebase/botanystorage) -"nyB" = ( -/obj/effect/floor_decal/corner/mauve{ - dir = 9 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) "nyK" = ( /obj/structure/flora/pottedplant/stoutbush, /obj/effect/floor_decal/borderfloor{ @@ -22763,9 +22294,6 @@ dir = 8 }, /obj/structure/table/standard, -/obj/machinery/camera/network/medbay{ - dir = 4 - }, /obj/item/sleevemate, /obj/item/storage/box/nifsofts_medical{ pixel_x = 7; @@ -23252,6 +22780,7 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "nMQ" = ( @@ -23479,6 +23008,12 @@ dir = 2; icon_state = "pipe-j2" }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "nTK" = ( @@ -23650,7 +23185,16 @@ /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_south_airlock) "nYN" = ( -/obj/effect/floor_decal/steeldecal/steel_decals10, +/obj/machinery/air_alarm{ + dir = 4; + pixel_x = -22 + }, +/obj/structure/table/steel, +/obj/item/storage/box/masks, +/obj/item/storage/box/gloves{ + pixel_x = 4; + pixel_y = 4 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "nZi" = ( @@ -23686,25 +23230,6 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) -"oaE" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 6 - }, -/obj/machinery/meter, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 8 - }, -/obj/effect/floor_decal/corner/mauve/bordercorner2{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "obf" = ( /obj/structure/extinguisher_cabinet{ pixel_y = 30 @@ -23875,6 +23400,7 @@ /obj/structure/cable/green{ icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) "oeS" = ( @@ -23897,24 +23423,6 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"ofn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "ofB" = ( /obj/structure/table/glass, /obj/structure/window/reinforced{ @@ -24099,10 +23607,13 @@ /obj/machinery/camera/network/civilian{ dir = 9 }, -/obj/map_helper/airlock/sensor/ext_sensor, /obj/machinery/airlock_sensor/phoron/airlock_exterior{ pixel_x = 25 }, +/obj/machinery/atmospherics/pipe/vent{ + dir = 1 + }, +/obj/map_helper/airlock/sensor/ext_sensor, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/surfacebase/topairlock) "okA" = ( @@ -24161,18 +23672,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) -"omw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) "omJ" = ( /obj/effect/floor_decal/borderfloor{ dir = 10 @@ -24255,8 +23754,9 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "onT" = ( -/turf/simulated/wall/r_wall/prepainted/science, -/area/rnd/xenobiology/xenoflora_storage) +/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/turf/simulated/floor/tiled/steel_dirty/virgo3b, +/area/tether/surfacebase/outside/outside3) "oos" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 4 @@ -24426,21 +23926,15 @@ /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/bar) "otb" = ( -/obj/structure/closet/secure_closet/hydroponics{ - req_access = list(); - req_one_access = list(30,35,47,77) - }, /obj/effect/floor_decal/borderfloor{ - dir = 9 + dir = 1 }, /obj/effect/floor_decal/corner/mauve/border{ - dir = 9 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 10 + dir = 1 }, -/obj/effect/floor_decal/corner/mauve/bordercorner2{ - dir = 10 +/obj/machinery/portable_atmospherics/hydroponics, +/obj/machinery/light{ + dir = 1 }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) @@ -24458,10 +23952,7 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) "otW" = ( -/obj/structure/sign/directions/engineering{ - dir = 10; - pixel_y = -10 - }, +/obj/structure/sign/directions/engineering, /turf/simulated/wall/prepainted, /area/tether/surfacebase/north_stairs_three) "oua" = ( @@ -24484,6 +23975,13 @@ /obj/structure/table/marble, /turf/simulated/floor/carpet/sblucarpet, /area/crew_quarters/bar) +"ovx" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/open, +/area/rnd/staircase/thirdfloor) "ovP" = ( /obj/structure/bed/chair{ dir = 8 @@ -24501,6 +23999,7 @@ icon_state = "1-4" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "owg" = ( @@ -24530,6 +24029,7 @@ }, /obj/machinery/door/airlock/glass_external/public, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "owF" = ( @@ -24548,6 +24048,9 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) "oxs" = ( @@ -24617,12 +24120,6 @@ /obj/machinery/atmospherics/pipe/tank/air, /turf/simulated/floor/plating, /area/tether/surfacebase/topairlock) -"ozw" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "ozC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -24669,20 +24166,6 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, /area/rnd/research_storage) -"oBc" = ( -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "oBv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -24747,8 +24230,6 @@ /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) "oDf" = ( -/obj/machinery/chemical_dispenser/full, -/obj/structure/table/reinforced, /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 }, @@ -24758,6 +24239,8 @@ /obj/effect/floor_decal/corner/orange/border{ dir = 5 }, +/obj/structure/table/reinforced, +/obj/machinery/chem_master, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) "oDl" = ( @@ -24771,6 +24254,9 @@ icon_state = "4-8" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "oDC" = ( @@ -24840,10 +24326,6 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge) -"oEG" = ( -/obj/machinery/holopad, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/panic_shelter) "oEM" = ( /obj/structure/closet/firecloset, /turf/simulated/shuttle/floor/black, @@ -24898,6 +24380,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "oGT" = ( @@ -25031,6 +24514,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "oKJ" = ( @@ -25145,13 +24629,6 @@ "oNi" = ( /turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_north_airlock) -"oNq" = ( -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 10 - }, -/obj/structure/catwalk, -/turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/tether/surfacebase/outside/outside3) "oNP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -25290,6 +24767,9 @@ /obj/effect/floor_decal/corner/lime/bordercorner2{ dir = 8 }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "oRD" = ( @@ -25333,11 +24813,11 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) "oSE" = ( -/obj/machinery/atmospherics/pipe/manifold/visible{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 6 }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/turf/simulated/floor/tiled/steel_dirty/virgo3b, +/area/tether/surfacebase/outside/outside3) "oSJ" = ( /obj/structure/disposalpipe/segment, /obj/machinery/light{ @@ -25345,16 +24825,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/shuttle_pad) -"oSY" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/effect/floor_decal/borderfloor/corner{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lime/bordercorner{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/botanystorage) "oTr" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -25497,18 +24967,12 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) "oYs" = ( -/obj/machinery/door/firedoor, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/airlock/glass/research{ - name = "Xenoflora Research"; - req_one_access = list(30,35,47,77) - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/obj/effect/floor_decal/techfloor, +/obj/structure/closet/firecloset, +/obj/random/maintenance/medical, +/obj/random/maintenance/medical, +/turf/simulated/floor/tiled/techfloor/grid, +/area/maintenance/lower/medsec_maintenance) "oYS" = ( /obj/machinery/door/morgue{ name = "Private Study"; @@ -25582,6 +25046,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "paU" = ( @@ -25726,6 +25191,9 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 1 }, +/obj/structure/sink{ + pixel_y = 22 + }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "pek" = ( @@ -26047,6 +25515,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "pkZ" = ( @@ -26105,10 +25574,6 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_first_aid) -"pnr" = ( -/obj/machinery/light, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "pnK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, @@ -26330,6 +25795,7 @@ /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/borderfloor/corner, /obj/effect/floor_decal/corner/mauve/bordercorner, +/obj/machinery/portable_atmospherics/hydroponics, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "ptc" = ( @@ -26399,21 +25865,6 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar) -"pvf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "pvn" = ( /obj/structure/cable{ icon_state = "1-2" @@ -26433,8 +25884,7 @@ }, /obj/effect/floor_decal/industrial/outline/red, /obj/machinery/door/window/southleft{ - dir = 1; - req_one_access = list(19,43,67) + dir = 1 }, /turf/simulated/floor/plating, /area/shuttle/tourbus/general) @@ -26565,6 +26015,7 @@ dir = 8; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "pAM" = ( @@ -26713,8 +26164,11 @@ /turf/simulated/open, /area/tether/surfacebase/surface_three_hall) "pDC" = ( -/obj/effect/paint_stripe/purplegray, /obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 9 + }, /turf/simulated/floor/plating, /area/rnd/xenobiology/xenoflora_storage) "pDG" = ( @@ -27092,6 +26546,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "pPF" = ( @@ -27120,9 +26577,9 @@ /obj/structure/railing{ dir = 1 }, -/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/phoronlock{ - frequency = 1379; - scrub_id = "southciv_airlock_scrubber" +/obj/map_helper/airlock/atmos/scrubber, +/obj/machinery/atmospherics/component/unary/vent_scrubber/high_power{ + dir = 1 }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/topairlock) @@ -27217,18 +26674,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"pRx" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 5 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 5 - }, -/obj/machinery/atmospherics/component/unary/vent_pump/on, -/obj/structure/closet/secure_closet/medical3, -/obj/item/soap/nanotrasen, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/storage) "pSv" = ( /obj/structure/table/wooden_reinforced, /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -27304,17 +26749,8 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) "pVR" = ( -/obj/effect/floor_decal/corner/lightgrey{ - dir = 6 - }, -/obj/effect/floor_decal/corner/lightgrey{ - dir = 9 - }, -/obj/machinery/door/firedoor{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/turf/simulated/floor/outdoors/grass/sif/virgo3b, +/area/tether/surfacebase/topairlock) "pWy" = ( /obj/machinery/transhuman/synthprinter, /turf/simulated/floor/tiled/dark, @@ -27326,9 +26762,6 @@ /turf/simulated/floor/tiled/dark, /area/rnd/research/testingrange) "pWN" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 4 - }, /obj/effect/floor_decal/borderfloorwhite{ dir = 8 }, @@ -27341,11 +26774,8 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner2{ dir = 10 }, -/obj/machinery/vending/medical{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) +/turf/simulated/wall/prepainted, +/area/maintenance/lower/medsec_maintenance) "pWS" = ( /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 8 @@ -27358,15 +26788,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) -"pWX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "pXd" = ( /obj/structure/table/glass, /obj/effect/floor_decal/spline/plain{ @@ -27435,18 +26856,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) -"pYn" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 27 - }, -/obj/effect/floor_decal/techfloor{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/panic_shelter) "pYp" = ( /obj/machinery/power/breakerbox/activated{ RCon_tag = "Surface Civilian Substation Bypass" @@ -27569,6 +26978,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "qbX" = ( @@ -27608,34 +27020,16 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "qcU" = ( -/obj/machinery/atmospherics/portables_connector{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/mauve/border, -/obj/machinery/camera/network/research{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 5 }, +/turf/simulated/floor/tiled/steel_dirty/virgo3b, +/area/tether/surfacebase/outside/outside3) +"qdY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) -"qdY" = ( -/obj/effect/floor_decal/borderfloorwhite/corner{ - dir = 4 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 4 - }, -/obj/machinery/camera/network/medbay{ - dir = 4 - }, -/obj/structure/flora/pottedplant{ - icon_state = "plant-21" - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) "qei" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -27691,12 +27085,14 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "qgC" = ( -/obj/machinery/portable_atmospherics/canister/carbon_dioxide, -/obj/effect/floor_decal/industrial/warning{ - dir = 5 - }, -/turf/simulated/floor/tiled/white, -/area/rnd/xenobiology/xenoflora_storage) +/obj/structure/table/rack, +/obj/random/toy, +/obj/random/maintenance/medical, +/obj/random/medical/lite, +/obj/random/maintenance/clean, +/obj/random/maintenance/medical, +/turf/simulated/floor/plating, +/area/maintenance/lower/medsec_maintenance) "qgL" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -27831,7 +27227,6 @@ /area/tether/surfacebase/public_garden_three) "qkn" = ( /obj/structure/bed/chair/comfy, -/obj/machinery/camera/network/civilian, /obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) @@ -27882,6 +27277,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "qlA" = ( @@ -27994,6 +27390,7 @@ }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "qoB" = ( @@ -28282,24 +27679,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/rnd/research_storage) -"qxA" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 8 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 8 - }, -/obj/structure/table/glass, -/obj/machinery/recharger, -/obj/random/medical{ - pixel_x = -4; - pixel_y = 5 - }, -/obj/machinery/vending/wallmed1{ - pixel_x = -30 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) "qxD" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -28326,9 +27705,6 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 8 }, -/obj/machinery/camera/network/research/xenobio{ - dir = 4 - }, /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_hallway) "qyj" = ( @@ -28527,6 +27903,7 @@ /obj/structure/disposalpipe/junction{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "qGh" = ( @@ -28569,22 +27946,6 @@ /obj/landmark/spawnpoint/job/xenobiologist, /turf/simulated/floor/wood, /area/rnd/outpost/xenobiology/outpost_office) -"qIn" = ( -/obj/structure/table/standard{ - name = "plastic table frame" - }, -/obj/item/reagent_containers/glass/bucket, -/obj/item/material/minihoe, -/obj/item/storage/box/botanydisk, -/obj/item/storage/box/botanydisk, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) "qJG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -28803,7 +28164,7 @@ "qSA" = ( /obj/structure/sign/department/chapel, /turf/simulated/wall/prepainted, -/area/vacant/vacant_shop) +/area/tether/surfacebase/barbackmaintenance) "qTe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -28868,6 +28229,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "qUd" = ( @@ -28936,8 +28298,7 @@ }, /obj/effect/floor_decal/industrial/outline/red, /obj/machinery/door/window/southright{ - dir = 1; - req_one_access = list(19,43,67) + dir = 1 }, /turf/simulated/floor/plating, /area/shuttle/tourbus/general) @@ -28979,12 +28340,23 @@ /turf/simulated/floor/grass, /area/hydroponics) "qWk" = ( -/obj/structure/catwalk, -/obj/machinery/atmospherics/component/binary/passive_gate{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/tether/surfacebase/outside/outside3) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/corner_steel_grid{ + dir = 10 + }, +/obj/machinery/sleep_console{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/triage) "qWl" = ( /obj/structure/bookcase, /obj/item/book/manual/security_space_law, @@ -28999,13 +28371,14 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/security/hos) "qWo" = ( -/obj/effect/floor_decal/borderfloor{ +/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ dir = 1 }, -/obj/effect/floor_decal/industrial/danger{ - dir = 1 +/obj/machinery/door/window/brigdoor/southright{ + req_access = null; + req_one_access = list(30,35,47,77); + dir = 8 }, -/obj/machinery/camera/network/research, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) "qWC" = ( @@ -29102,17 +28475,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "ral" = ( -/obj/machinery/atmospherics/portables_connector{ +/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ dir = 1 }, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/mauve/border, -/obj/machinery/light, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/turf/simulated/floor/tiled/steel_dirty/virgo3b, +/area/tether/surfacebase/outside/outside3) "rav" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -29223,6 +28594,9 @@ dir = 6 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "rdd" = ( @@ -29323,18 +28697,13 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "rgg" = ( -/obj/structure/closet/secure_closet/hydroponics, /obj/effect/floor_decal/borderfloor{ dir = 4 }, /obj/effect/floor_decal/corner/lime/border{ dir = 4 }, -/obj/item/shovel/spade, -/obj/item/storage/belt/utility, -/obj/item/stack/material/sandstone{ - amount = 5 - }, +/obj/machinery/portable_atmospherics/hydroponics, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "rgh" = ( @@ -29469,7 +28838,7 @@ dir = 8 }, /turf/simulated/floor/tiled/techfloor, -/area/vacant/vacant_shop) +/area/tether/surfacebase/barbackmaintenance) "rkU" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 1 @@ -29518,17 +28887,12 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) "rmG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) -"rnj" = ( -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/simple/visible/universal, -/turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/tether/surfacebase/outside/outside3) +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology/xenoflora_storage) "rnF" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -29577,19 +28941,11 @@ /turf/simulated/wall/prepainted/civilian, /area/crew_quarters/bar) "rqi" = ( -/obj/structure/window/reinforced{ +/obj/structure/disposalpipe/junction/yjunction{ dir = 1 }, -/obj/effect/floor_decal/borderfloorwhite, -/obj/effect/floor_decal/corner/paleblue/border, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/flora/pottedplant{ - icon_state = "plant-21" - }, /turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/uppersouthstairwell) +/area/tether/surfacebase/medical/admin) "rqm" = ( /obj/structure/cable{ icon_state = "4-8" @@ -29608,14 +28964,14 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "rqu" = ( -/obj/effect/floor_decal/borderfloor/corner{ +/obj/structure/window/reinforced{ dir = 8 }, -/obj/effect/floor_decal/corner/mauve/bordercorner{ - dir = 8 +/obj/machinery/atmospherics/component/binary/heat_pump{ + dir = 4 }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "rqV" = ( /obj/structure/table/reinforced, /obj/machinery/cell_charger, @@ -29764,16 +29120,17 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/breakroom) "rvP" = ( -/obj/machinery/reagentgrinder, -/obj/structure/table/glass, +/obj/machinery/light{ + dir = 4 + }, /obj/effect/floor_decal/borderfloor{ - dir = 6 + dir = 4 }, /obj/effect/floor_decal/corner/mauve/border{ - dir = 6 + dir = 4 }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "rwh" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -29818,6 +29175,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 8 }, +/obj/machinery/honey_extractor, /turf/simulated/floor/grass, /area/hydroponics) "rwX" = ( @@ -29958,19 +29316,13 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/surgery2) "rDc" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 1 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ +/obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 4 }, -/obj/effect/floor_decal/borderfloorwhite/corner2{ - dir = 4 +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 9 }, -/obj/effect/floor_decal/corner/paleblue/bordercorner2{ +/obj/structure/disposalpipe/segment{ dir = 4 }, /turf/simulated/floor/tiled/white, @@ -29982,15 +29334,13 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "rDo" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/effect/floor_decal/corner/mauve{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/visible, +/obj/machinery/meter, +/obj/structure/window/reinforced{ + dir = 8 }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "rDG" = ( /obj/effect/floor_decal/spline/plain{ dir = 4 @@ -30013,6 +29363,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "rET" = ( @@ -30057,6 +29410,9 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "rGF" = ( @@ -30074,6 +29430,7 @@ /obj/machinery/door/firedoor{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/southhall) "rHx" = ( @@ -30302,10 +29659,11 @@ dir = 1; pixel_y = -24 }, +/obj/structure/medical_stand/anesthetic, /obj/structure/disposalpipe/segment{ - dir = 8 + dir = 1; + icon_state = "pipe-c" }, -/obj/structure/medical_stand/anesthetic, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "rPr" = ( @@ -30401,9 +29759,11 @@ /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/bar) "rQI" = ( -/obj/structure/flora/ausbushes/genericbush, -/turf/simulated/floor/grass, -/area/hydroponics) +/obj/effect/floor_decal/steeldecal/steel_decals10, +/obj/landmark/spawnpoint/job/medical_doctor, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/triage) "rQN" = ( /obj/structure/table/woodentable, /obj/machinery/recharger, @@ -30692,6 +30052,9 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "rYO" = ( @@ -30948,6 +30311,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) "sgl" = ( @@ -31067,6 +30431,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "siR" = ( @@ -31105,13 +30470,14 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "siU" = ( -/obj/machinery/seed_storage/xenobotany{ - dir = 1 +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 6 }, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/mauve/border, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "siX" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/medical{ @@ -31166,6 +30532,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 10 + }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "skn" = ( @@ -31240,6 +30609,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "snx" = ( @@ -31690,6 +31060,7 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 8 }, +/obj/machinery/seed_extractor, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "sBU" = ( @@ -31783,20 +31154,11 @@ /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "sEU" = ( -/obj/machinery/atmospherics/component/unary/freezer{ - icon_state = "freezer" - }, -/obj/effect/floor_decal/corner/green{ - dir = 10 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 9 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 9 +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/turf/simulated/floor/carpet/bcarpet, +/area/tether/surfacebase/barbackmaintenance) "sFc" = ( /obj/effect/floor_decal/techfloor{ dir = 6 @@ -31805,6 +31167,11 @@ /obj/machinery/light_switch{ pixel_x = 25 }, +/obj/machinery/shower{ + dir = 8; + pixel_x = -2 + }, +/obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/panic_shelter) "sFg" = ( @@ -31875,11 +31242,13 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "sGB" = ( -/obj/effect/floor_decal/borderfloor/corner{ - dir = 8 +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 }, -/obj/effect/floor_decal/corner/lime/bordercorner{ - dir = 8 +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lime/border, +/obj/machinery/fire_alarm/south_mount{ + pixel_y = -24 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) @@ -32002,10 +31371,9 @@ /turf/simulated/floor/wood, /area/library) "sKX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "sLb" = ( /obj/effect/floor_decal/spline/plain{ dir = 6 @@ -32084,25 +31452,10 @@ }, /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/techfloor, -/area/vacant/vacant_shop) +/area/tether/surfacebase/barbackmaintenance) "sMI" = ( -/obj/item/radio/intercom{ - dir = 8; - pixel_x = -24 - }, -/obj/structure/table/glass, -/obj/machinery/recharger, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 8 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) +/turf/simulated/floor/wood, +/area/maintenance/lower/medsec_maintenance) "sNk" = ( /obj/machinery/holopad, /turf/simulated/floor/tiled/techfloor, @@ -32182,18 +31535,10 @@ /turf/simulated/open/virgo3b, /area/tether/surfacebase/outside/outside3) "sQe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) +/obj/structure/disposalpipe/segment, +/obj/machinery/portable_atmospherics/hydroponics, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology/xenoflora) "sQg" = ( /obj/machinery/door/firedoor/glass, /obj/structure/disposalpipe/segment{ @@ -32225,7 +31570,6 @@ /area/tether/surfacebase/surface_three_hall) "sQo" = ( /obj/structure/lattice, -/obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/zpipe/down/scrubbers{ dir = 1 }, @@ -32235,33 +31579,25 @@ /obj/structure/cable/green{ icon_state = "32-1" }, -/obj/structure/window/basic/full, -/obj/structure/grille, -/obj/structure/window/basic, -/obj/structure/window/basic{ - dir = 8 - }, -/obj/structure/window/basic{ - dir = 1 - }, -/obj/structure/window/basic{ - dir = 4 - }, /obj/structure/disposalpipe/down{ dir = 1 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/open, /area/rnd/outpost/xenobiology/outpost_stairs) "sQL" = ( /turf/simulated/wall/prepainted/science, /area/rnd/staircase/thirdfloor) "sRl" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/effect/floor_decal/industrial/warning{ +/obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 4 }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/triage) "sRp" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -32297,22 +31633,15 @@ dir = 4; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) "sSW" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, -/obj/structure/disposalpipe/junction/yjunction{ - dir = 1 - }, +/obj/structure/medical_stand, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppersouthstairwell) -"sTj" = ( -/obj/structure/flora/ausbushes/fullgrass, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/grass, -/area/hydroponics) "sTo" = ( /obj/machinery/button/remote/airlock{ id = "barbackdoor"; @@ -32484,13 +31813,17 @@ /turf/simulated/floor/tiled, /area/hallway/primary/fore) "taq" = ( -/obj/structure/closet/firecloset, /obj/effect/floor_decal/borderfloor{ dir = 1 }, /obj/effect/floor_decal/corner/mauve/border{ dir = 1 }, +/obj/machinery/portable_atmospherics/hydroponics, +/obj/machinery/power/apc/north_mount, +/obj/structure/cable/green{ + icon_state = "0-2" + }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "taB" = ( @@ -32626,10 +31959,6 @@ }, /turf/simulated/floor/wood, /area/tether/surfacebase/security/hos) -"tdp" = ( -/obj/machinery/portable_atmospherics/canister/phoron, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "tdw" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 @@ -32739,12 +32068,16 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "tiw" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/effect/floor_decal/corner/mauve{ - dir = 10 +/obj/effect/floor_decal/borderfloor{ + dir = 4 }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible, +/obj/machinery/meter, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "tjb" = ( /obj/effect/floor_decal/corner/beige{ dir = 10 @@ -32882,14 +32215,20 @@ /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "tns" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/effect/floor_decal/borderfloor{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +/obj/effect/floor_decal/corner/lime/border{ + dir = 1 }, +/obj/structure/closet/secure_closet/hydroponics, +/obj/item/shovel/spade, +/obj/item/stack/material/sandstone{ + amount = 5 + }, +/obj/item/storage/belt/utility, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/area/tether/surfacebase/botanystorage) "tnx" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 4 @@ -33069,16 +32408,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) -"tuh" = ( -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 4 - }, -/obj/structure/catwalk, -/turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/tether/surfacebase/outside/outside3) "tvl" = ( /obj/machinery/air_alarm{ pixel_y = 28 @@ -33116,14 +32445,11 @@ /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) "tvQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "twj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -33134,18 +32460,11 @@ /turf/simulated/floor/wood, /area/shuttle/tourbus/general) "txh" = ( -/obj/structure/table/glass, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/mauve/border, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 - }, -/obj/machinery/air_alarm{ - dir = 1; - pixel_y = -22 +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 8 }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/turf/simulated/floor/tiled/steel_dirty/virgo3b, +/area/tether/surfacebase/outside/outside3) "txq" = ( /obj/item/radio/intercom/department/security{ dir = 4; @@ -33282,21 +32601,9 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "tBR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/holopad, +/obj/machinery/smartfridge/drying_rack, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/area/rnd/xenobiology/xenoflora) "tCk" = ( /obj/machinery/door/blast/regular{ density = 0; @@ -33351,7 +32658,6 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) "tEa" = ( -/obj/structure/railing, /obj/machinery/light, /turf/simulated/open, /area/tether/surfacebase/medical/uppernorthstairwell) @@ -33374,19 +32680,6 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/captain) -"tFl" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 1 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 1 - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/flora/pottedplant/stoutbush, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/storage) "tFM" = ( /obj/structure/window/reinforced, /obj/effect/floor_decal/steeldecal/steel_decals6{ @@ -33461,6 +32754,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "tHQ" = ( @@ -33596,6 +32890,7 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 }, +/obj/machinery/beehive, /turf/simulated/floor/grass, /area/hydroponics) "tLs" = ( @@ -33651,18 +32946,13 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/topairlock) "tMg" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/machinery/atmospherics/component/binary/passive_gate{ + dir = 8; + name = "Waste Purge Valve"; + target_pressure = 4500 }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/turf/simulated/floor/tiled/steel_dirty/virgo3b, +/area/tether/surfacebase/outside/outside3) "tMl" = ( /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled/dark, @@ -33673,9 +32963,15 @@ /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/surfacebase/outside/outside3) "tMA" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/panic_shelter) +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lime/border{ + dir = 1 + }, +/obj/machinery/portable_atmospherics/hydroponics, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/botanystorage) "tMI" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -33737,6 +33033,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "tOm" = ( @@ -33949,6 +33246,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "tTd" = ( @@ -34194,21 +33494,21 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "tXm" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/effect/floor_decal/corner/mauve/full{ +/obj/effect/floor_decal/borderfloor{ dir = 4 }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) -"tYC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 +/obj/effect/floor_decal/corner/mauve/border{ + dir = 4 }, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 }, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/panic_shelter) +/turf/simulated/floor/tiled, +/area/rnd/xenobiology/xenoflora_storage) +"tYC" = ( +/obj/machinery/camera/network/civilian, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/servicebackroom) "tYL" = ( /obj/structure/bed/chair/wood{ dir = 8 @@ -34222,9 +33522,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/topairlock) "tZe" = ( @@ -34367,6 +33665,9 @@ /obj/structure/cable/green{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 + }, /turf/simulated/floor/wood, /area/tether/surfacebase/barbackmaintenance) "uaI" = ( @@ -34478,18 +33779,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) -"ugO" = ( -/obj/machinery/light, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/mauve/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/hallway/primary/starboard) "ugQ" = ( /obj/machinery/air_alarm{ alarm_id = "pen_nine"; @@ -34528,11 +33817,18 @@ /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/bar) "uhL" = ( -/obj/structure/cable/green{ - icon_state = "2-4" +/obj/machinery/fire_alarm/west_mount{ + pixel_x = -24 }, -/turf/simulated/floor/grass, -/area/hydroponics) +/obj/machinery/disposal, +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/triage) "uih" = ( /turf/simulated/wall/prepainted/command, /area/crew_quarters/captain) @@ -34608,11 +33904,6 @@ /obj/item/bone/skull{ name = "Yo'rick" }, -/obj/item/paper{ - desc = ""; - info = "The Silence Into Laughter program works to place hard working, studied, accomplished, hardworking, homebrewed, diplomaholding, or otherwise clowns and mimes into the workforce! The Head Clowncellor and the Director at Mime have finally worked together to bring this titan of a workers' union! If you have a background in silence or laughter, please apply at our exonet site at: https://forum.vore-station.net/viewforum.php?f=45"; - name = "Clowns and Mimes Wanted!" - }, /obj/machinery/camera/network/civilian{ dir = 4 }, @@ -34738,18 +34029,16 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/machinery/camera/network/research/xenobio, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_south_airlock) "umH" = ( -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/machinery/light{ - dir = 8 +/obj/landmark/spawnpoint/job/medical_doctor, +/obj/effect/floor_decal/corner_steel_grid{ + dir = 5 }, -/obj/machinery/fire_alarm/west_mount{ - pixel_x = -24 +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) @@ -34788,10 +34077,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lobby) -"uoL" = ( -/obj/structure/railing, -/turf/simulated/open, -/area/tether/surfacebase/medical/uppernorthstairwell) "upe" = ( /obj/structure/table/reinforced, /obj/machinery/recharger/wallcharger{ @@ -34831,6 +34116,7 @@ dir = 8; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "upx" = ( @@ -34936,16 +34222,11 @@ /turf/simulated/wall/prepainted/civilian, /area/hydroponics) "urk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 9 +/obj/structure/railing{ + dir = 8 }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/turf/simulated/open, +/area/tether/surfacebase/public_garden_three) "urz" = ( /obj/machinery/vending/boozeomat, /turf/simulated/floor/lino, @@ -34973,6 +34254,12 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/topairlock) "urO" = ( @@ -35005,8 +34292,15 @@ /obj/machinery/door/firedoor{ dir = 8 }, +/obj/machinery/door/airlock/glass/research{ + name = "Xenoflora Research"; + req_one_access = list(30,35,47,77) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, -/area/hallway/primary/starboard) +/area/rnd/xenobiology/xenoflora) "usd" = ( /obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ @@ -35015,11 +34309,9 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/barbackmaintenance) "usi" = ( -/obj/machinery/smartfridge/drying_rack, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/mauve/border, +/obj/machinery/atmospherics/portables_connector, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "usw" = ( /obj/structure/table/standard, /obj/item/storage/box/syringes, @@ -35059,11 +34351,14 @@ /turf/simulated/floor/tiled/dark, /area/bridge) "usU" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/atmospherics/portables_connector{ + dir = 4 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/botanystorage) +/area/rnd/xenobiology/xenoflora_storage) "usX" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -35076,11 +34371,11 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lobby) "utB" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/turf/simulated/floor/tiled/steel_dirty/virgo3b, +/area/tether/surfacebase/outside/outside3) "utK" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -35094,6 +34389,7 @@ dir = 2; icon_state = "pipe-j2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "uvj" = ( @@ -35320,9 +34616,6 @@ /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 1 }, -/obj/machinery/door/firedoor{ - dir = 1 - }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "uCB" = ( @@ -35345,9 +34638,12 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/surgery2) "uDD" = ( -/obj/machinery/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/portable_atmospherics/canister/oxygen, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "uDM" = ( /obj/machinery/mech_recharger, /turf/simulated/floor/bluegrid, @@ -35457,6 +34753,7 @@ dir = 4 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "uIN" = ( @@ -35523,25 +34820,14 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "uJT" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_south_airlock) "uKK" = ( @@ -35675,6 +34961,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "uMB" = ( @@ -35719,8 +35006,11 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/topairlock) "uOn" = ( @@ -35806,11 +35096,17 @@ /turf/simulated/floor/tiled, /area/hallway/primary/port) "uRH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 +/obj/effect/floor_decal/borderfloor{ + dir = 1 }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) +/obj/effect/floor_decal/corner/mauve/border{ + dir = 1 + }, +/obj/machinery/vending/hydronutrients{ + req_one_access = list(30,35,47,77) + }, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology/xenoflora) "uRQ" = ( /obj/structure/table/woodentable, /turf/simulated/floor/carpet, @@ -35906,26 +35202,19 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) -"uUT" = ( -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 1 - }, -/obj/landmark/spawnpoint/job/medical_doctor, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) "uVb" = ( /obj/machinery/status_display{ pixel_x = 32 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/closet/secure_closet/medical3, +/obj/item/soap/nanotrasen, +/obj/machinery/atmospherics/component/unary/vent_pump/on, /obj/effect/floor_decal/borderfloorwhite{ - dir = 4 + dir = 5 }, /obj/effect/floor_decal/corner/paleblue/border{ - dir = 4 + dir = 5 }, -/obj/structure/closet/secure_closet/medical3, -/obj/item/soap/nanotrasen, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "uVs" = ( @@ -36050,20 +35339,26 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "uYD" = ( -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 4 +/obj/item/roller, +/obj/item/roller{ + pixel_y = 8 }, -/obj/landmark/spawnpoint/job/medical_doctor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/item/roller{ + pixel_y = 16 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/light{ dir = 8 }, -/obj/structure/disposalpipe/segment{ +/obj/structure/table/steel, +/obj/structure/extinguisher_cabinet{ + dir = 4; + pixel_x = -30 + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 }, /turf/simulated/floor/tiled/white, @@ -36157,11 +35452,17 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) @@ -36278,13 +35579,15 @@ /turf/simulated/open/virgo3b, /area/tether/surfacebase/outside/outside3) "vfe" = ( -/obj/machinery/botany/extractor, -/obj/effect/floor_decal/borderfloor{ +/obj/effect/floor_decal/borderfloor/corner{ dir = 8 }, -/obj/effect/floor_decal/corner/mauve/border{ +/obj/effect/floor_decal/corner/mauve/bordercorner{ dir = 8 }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "vfH" = ( @@ -36292,13 +35595,6 @@ /obj/item/paper_bin, /turf/simulated/floor/carpet/blue, /area/tether/surfacebase/security/breakroom) -"vgg" = ( -/obj/machinery/portable_atmospherics/canister/nitrogen, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "vgh" = ( /obj/machinery/fire_alarm/west_mount{ pixel_x = -26 @@ -36317,6 +35613,7 @@ dir = 8; icon_state = "pipe-c" }, +/obj/machinery/portable_atmospherics/hydroponics/soil, /turf/simulated/floor/grass, /area/hydroponics) "vhg" = ( @@ -36427,9 +35724,8 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 1 }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled, -/area/hallway/primary/starboard) +/turf/simulated/wall/prepainted/science, +/area/rnd/xenobiology/xenoflora) "vkE" = ( /obj/structure/table/steel, /obj/item/paper_bin{ @@ -36550,13 +35846,6 @@ }, /turf/simulated/floor/outdoors/grass/sif/virgo3b, /area/tether/surfacebase/outside/outside3) -"vpN" = ( -/obj/machinery/portable_atmospherics/canister/carbon_dioxide, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "vqg" = ( /obj/structure/table/wooden_reinforced, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -36583,8 +35872,20 @@ /turf/simulated/floor/carpet/sblucarpet, /area/crew_quarters/bar) "vrb" = ( -/obj/effect/floor_decal/steeldecal/steel_decals10, /obj/machinery/holopad, +/obj/item/radio/intercom{ + dir = 8; + pixel_x = -24 + }, +/obj/structure/table/steel, +/obj/machinery/recharger, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 + }, +/obj/random/medical{ + pixel_x = -4; + pixel_y = 5 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "vrU" = ( @@ -36651,14 +35952,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/hallway/primary/port) -"vvl" = ( -/obj/machinery/atmospherics/portables_connector{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/mauve/border, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "vvn" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 4 @@ -36696,6 +35989,9 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "vxb" = ( @@ -36711,7 +36007,6 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/cafeteria) "vyj" = ( -/obj/machinery/chemical_dispenser/full, /obj/structure/table/reinforced, /obj/structure/sign/poster{ pixel_x = 32 @@ -36722,27 +36017,9 @@ /obj/effect/floor_decal/corner/orange/border{ dir = 6 }, +/obj/machinery/chem_master, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) -"vyD" = ( -/obj/structure/window/reinforced, -/obj/machinery/atmospherics/portables_connector{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 5 - }, -/obj/machinery/status_display{ - pixel_x = 32 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "vyS" = ( /obj/structure/bed/chair{ dir = 8 @@ -36844,11 +36121,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) -"vBf" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/babyblue, -/turf/simulated/floor/plating, -/area/tether/surfacebase/medical/triage) "vBN" = ( /obj/machinery/computer/operating, /turf/simulated/floor/tiled/white, @@ -36958,14 +36230,10 @@ /obj/machinery/air_alarm{ pixel_y = 25 }, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/effect/paint_stripe/purplegray, +/turf/simulated/floor/plating, +/area/rnd/xenobiology/xenoflora_storage) "vFb" = ( /obj/structure/table/glass, /obj/item/radio{ @@ -37248,6 +36516,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/monofloor{ dir = 4 }, @@ -37278,15 +36547,6 @@ /mob/living/simple_mob/animal/passive/chicken, /turf/simulated/floor/grass, /area/hydroponics/cafegarden) -"vMH" = ( -/obj/structure/table/glass, -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 8 - }, -/obj/machinery/recharger, -/obj/random/medical, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) "vMR" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ @@ -37303,9 +36563,8 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/door/firedoor{ - dir = 8 - }, +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppersouthstairwell) "vNg" = ( @@ -37490,6 +36749,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "vRG" = ( @@ -37908,25 +37168,6 @@ "vZg" = ( /turf/simulated/floor/tiled/techmaint, /area/rnd/outpost/xenobiology/outpost_storage) -"vZr" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/hallway/primary/starboard) "wan" = ( /obj/structure/disposalpipe/sortjunction{ dir = 4; @@ -38025,6 +37266,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "wcp" = ( @@ -38059,20 +37301,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) -"wcS" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "wcT" = ( /obj/structure/bed/chair/office/dark, /turf/simulated/floor/carpet, @@ -38242,6 +37470,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "wjd" = ( @@ -38341,6 +37570,7 @@ /obj/effect/floor_decal/corner/mauve/bordercorner2{ dir = 4 }, +/obj/machinery/seed_storage/xenobotany, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "won" = ( @@ -38758,10 +37988,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ - id = "iaar"; - name = "iaar" - }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officeb) "wyP" = ( @@ -38805,18 +38031,6 @@ }, /turf/simulated/floor/carpet, /area/library) -"wzT" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 5 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "wzX" = ( /obj/structure/table/woodentable, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -38833,13 +38047,15 @@ /turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/surgery2) "wAO" = ( -/obj/machinery/light, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, /obj/effect/floor_decal/borderfloorwhite/corner2, /obj/effect/floor_decal/corner/paleblue/bordercorner2, -/obj/structure/filingcabinet/chestdrawer{ - name = "Scan Records" +/obj/machinery/fire_alarm/west_mount{ + pixel_x = -24 + }, +/obj/machinery/light{ + dir = 8 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) @@ -38858,19 +38074,15 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) "wBv" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/structure/cable/green{ - icon_state = "1-4" - }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 8 }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 5 }, +/obj/structure/cable/green, +/obj/machinery/power/apc/east_mount, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppersouthstairwell) "wBV" = ( @@ -38878,7 +38090,7 @@ dir = 1 }, /obj/machinery/camera/network/research/xenobio{ - dir = 10 + dir = 1 }, /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_breakroom) @@ -38955,6 +38167,9 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/topairlock) "wDq" = ( @@ -39106,6 +38321,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "wHu" = ( @@ -39126,7 +38342,7 @@ dir = 8 }, /turf/simulated/open, -/area/vacant/vacant_shop) +/area/tether/surfacebase/barbackmaintenance) "wJt" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -39196,7 +38412,7 @@ /area/rnd/workshop) "wLU" = ( /obj/structure/loot_pile/maint/trash, -/turf/simulated/floor/plating, +/turf/simulated/floor/wood, /area/maintenance/lower/medsec_maintenance) "wMm" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -39220,6 +38436,9 @@ name = "Medical Storage"; sortType = "Medical Storage" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "wNv" = ( @@ -39311,7 +38530,7 @@ /area/hydroponics) "wRs" = ( /obj/machinery/door/airlock/glass{ - req_one_access = list(19,43,67) + req_one_access = list(19,67) }, /obj/structure/cable{ icon_state = "1-2" @@ -39369,21 +38588,6 @@ /obj/structure/sign/department/xenolab, /turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_hallway) -"wSx" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/primary/starboard) "wTy" = ( /turf/simulated/wall/prepainted/civilian, /area/tether/surfacebase/north_stairs_three) @@ -39400,9 +38604,6 @@ /turf/simulated/floor/plating, /area/shuttle/tourbus/general) "wUf" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/steeldecal/steel_decals4{ @@ -39433,11 +38634,8 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/effect/floor_decal/corner/paleblue/diagonal, -/turf/simulated/floor/tiled/white, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/triage) "wVh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -39453,7 +38651,7 @@ /obj/random/maintenance/clean, /obj/random/maintenance/clean, /turf/simulated/floor/tiled/techfloor, -/area/vacant/vacant_shop) +/area/tether/surfacebase/barbackmaintenance) "wVQ" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -39672,6 +38870,7 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "xdQ" = ( @@ -39756,11 +38955,14 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "xhp" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ +/obj/structure/window/reinforced{ dir = 8 }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 + }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "xhR" = ( /obj/machinery/light{ dir = 1 @@ -39870,14 +39072,11 @@ /turf/simulated/floor/wood, /area/rnd/outpost/xenobiology/outpost_office) "xkN" = ( -/obj/effect/floor_decal/techfloor{ - dir = 4 - }, -/obj/effect/floor_decal/techfloor/corner{ - dir = 4 +/obj/machinery/atmospherics/portables_connector{ + dir = 1 }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/lower/medsec_maintenance) +/turf/simulated/floor/tiled, +/area/rnd/xenobiology/xenoflora_storage) "xlw" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -40063,19 +39262,17 @@ /turf/simulated/floor/bluegrid, /area/rnd/robotics/mechbay) "xrg" = ( -/obj/structure/reagent_dispensers/watertank, -/obj/item/reagent_containers/glass/bucket, -/obj/machinery/light{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/floor_decal/borderfloor{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/tether/surfacebase/surface_three_hall) "xrE" = ( /obj/structure/cable/green{ icon_state = "2-4" @@ -40090,6 +39287,12 @@ dir = 2; icon_state = "pipe-j2" }, +/obj/random/medical, +/obj/item/tool/screwdriver, +/obj/structure/table/steel, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "xrM" = ( @@ -40367,18 +39570,14 @@ /turf/simulated/floor/lino, /area/crew_quarters/bar) "xxq" = ( -/obj/structure/bed/padded, -/obj/effect/floor_decal/techfloor{ - dir = 9 - }, -/obj/machinery/fire_alarm/west_mount{ - pixel_x = -24 - }, -/obj/machinery/status_display{ - pixel_y = 30 +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, +/obj/structure/closet/secure_closet/hydroponics{ + req_access = list(); + req_one_access = list(30,35,47,77) }, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/panic_shelter) +/turf/simulated/floor/tiled, +/area/rnd/xenobiology/xenoflora) "xxQ" = ( /obj/machinery/computer/rdconsole/robotics{ dir = 8 @@ -40506,6 +39705,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "xCi" = ( @@ -40518,8 +39720,9 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 1 }, +/obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "xCs" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -40622,23 +39825,13 @@ dir = 5 }, /turf/simulated/floor/tiled/techfloor, -/area/vacant/vacant_shop) +/area/tether/surfacebase/barbackmaintenance) "xDw" = ( /turf/simulated/floor/tiled/techfloor, /area/rnd/workshop) "xDB" = ( /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_main) -"xFl" = ( -/obj/structure/sign/nosmoking_2{ - pixel_y = 30 - }, -/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/phoronlock{ - frequency = 1379; - scrub_id = "southciv_airlock_scrubber" - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/topairlock) "xFU" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 @@ -40775,6 +39968,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 1 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "xII" = ( @@ -40849,13 +40048,6 @@ }, /turf/simulated/floor/carpet, /area/tether/surfacebase/security/hos) -"xJx" = ( -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/tether/surfacebase/outside/outside3) "xKc" = ( /obj/machinery/fire_alarm/east_mount, /obj/effect/floor_decal/borderfloor{ @@ -40878,17 +40070,14 @@ layer = 4; pixel_y = 32 }, -/obj/machinery/portable_atmospherics/canister/oxygen/prechilled, -/obj/machinery/atmospherics/portables_connector, /obj/effect/floor_decal/corner/paleblue{ dir = 9 }, /obj/effect/floor_decal/corner/paleblue{ dir = 6 }, -/obj/machinery/door/window/brigdoor/southright{ - req_access = list(); - req_one_access = list(5,24) +/obj/machinery/atmospherics/component/binary/heat_pump{ + dir = 8 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) @@ -40951,6 +40140,12 @@ pixel_y = -40 }, /obj/map_helper/airlock/sensor/chamber_sensor, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/topairlock) "xLl" = ( @@ -40965,9 +40160,9 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/barbackmaintenance) "xLS" = ( -/obj/machinery/fire_alarm/north_mount, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/obj/structure/closet/firecloset/full, +/turf/simulated/floor/tiled/techfloor, +/area/tether/surfacebase/barbackmaintenance) "xMN" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -41112,14 +40307,16 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "xQJ" = ( -/obj/structure/closet, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, /obj/effect/floor_decal/techfloor{ - dir = 8 + dir = 9 }, +/obj/machinery/fire_alarm/west_mount{ + pixel_x = -24 + }, +/obj/machinery/status_display{ + pixel_y = 30 + }, +/obj/structure/bed/padded, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/panic_shelter) "xQL" = ( @@ -41206,14 +40403,11 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "xSf" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/corner/mauve{ - dir = 10 +/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ + dir = 8 }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "xSs" = ( /obj/machinery/light{ dir = 4 @@ -41336,16 +40530,8 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) "xWL" = ( -/obj/structure/window/basic/full, -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/basic, -/obj/structure/window/basic{ - dir = 1 - }, -/obj/structure/window/basic{ - dir = 8 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_first_aid) "xWN" = ( @@ -41493,11 +40679,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 9 +/obj/effect/floor_decal/borderfloorwhite{ + dir = 1 }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 4 +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 1 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) @@ -41632,29 +40818,25 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) "ygy" = ( -/obj/effect/floor_decal/corner/mauve{ - dir = 6 +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 4 + }, +/obj/machinery/atmospherics/portables_connector{ + dir = 1 }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "ygY" = ( /obj/structure/cable/green{ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) -"yhk" = ( -/obj/machinery/power/apc/north_mount, -/obj/structure/cable/orange{ - icon_state = "0-2" - }, -/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/phoronlock{ - frequency = 1379; - scrub_id = "southciv_airlock_scrubber" - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/topairlock) "yhO" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, @@ -41667,6 +40849,9 @@ /obj/machinery/camera/network/medbay{ dir = 1 }, +/obj/structure/table/steel, +/obj/item/packageWrap, +/obj/item/hand_labeler, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "yhZ" = ( @@ -41689,16 +40874,6 @@ "yja" = ( /turf/simulated/wall/prepainted/civilian, /area/tether/surfacebase/barbackmaintenance) -"yjc" = ( -/obj/machinery/atmospherics/portables_connector, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "yjJ" = ( /obj/spawner/window/low_wall/full/nogrille/firelocks, /obj/effect/paint_stripe/bottlegreen, @@ -41752,6 +40927,9 @@ dir = 4; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "ylC" = ( @@ -59268,7 +58446,7 @@ xiZ mcN oxB tAS -tAS +urk nFK wdH uLN @@ -59343,7 +58521,7 @@ jSF aAR aNO xDB -drE +xDB eto xDB xmi @@ -59549,7 +58727,7 @@ sQo pQk wAF wAF -jHZ +dcU qyl dOV xCK @@ -59708,7 +58886,7 @@ dRr qZR ndL dRr -dcU +dRr arO dRr dRr @@ -60321,7 +59499,7 @@ ogU ftd nQQ eMX -kZr +izr for oWB lgT @@ -62024,7 +61202,7 @@ wKZ dMn brA brA -fin +ovx wfe iXl eQn @@ -67109,7 +66287,7 @@ eGm eGm myj dPd -dPd +utB okq eGm eGm @@ -67299,7 +66477,7 @@ eGm eGm eGm eGm -fFk +pVR fFk fFk akS @@ -67493,8 +66671,8 @@ eGm eGm eGm eGm +pVR fFk -xFl aiC tYY urJ @@ -67687,8 +66865,8 @@ eGm eGm eGm eGm +pVR fFk -yhk iNx neW xLb @@ -67881,7 +67059,7 @@ qnw qnw eGm eGm -fFk +pVR fFk fFk odx @@ -67998,7 +67176,7 @@ hxW xQe qqn ekZ -hyt +jvD hyt hyt hyt @@ -68076,7 +67254,7 @@ fFk fFk fFk fFk -fEn +fFk hqw uqp huc @@ -68184,15 +67362,15 @@ eGm eGm hxW nKi -aCE gHJ -gzy +gHJ +gHJ wLU hxW eMK -xkN +qqn aDP -hyt +jvD uKK qTK ade @@ -68373,20 +67551,20 @@ bYs eGm eGm eGm -vBf -vBf -vBf -ncQ -ncQ -ncQ -ncQ -ncQ -ncQ -ncQ +eGm +eGm +eGm +hxW +qgC +gHJ +sMI +sMI +sMI +hxW hyb -ncQ -ncQ -ncQ +qqn +oYs +jvD tAn leN pPj @@ -68567,15 +67745,15 @@ bYs eGm eGm eGm -vBf -nvE -qdY -umH -kXW +eGm +eGm +eGm +hxW +gHJ +sMI sMI -qxA iIx -jtm +sMI pWN aNw hkJ @@ -68762,19 +67940,19 @@ gGi gGi gGi ncQ -iDI -hle -ryH -qgz -bCF -rmG -rmG -sQe -uRH +ncQ +ncQ +ncQ +ncQ +ncQ +ncQ +ncQ +ncQ +ncQ eOE -omw +ncQ wUV -bLR +ncQ xZX vnq wUr @@ -68958,17 +68136,17 @@ cHD ncQ iDI khZ -nYN +uhL jGP vrb mjF nYN uYD -hEQ +cwf qJG jHu wAO -jvD +bLR rDc cAA mie @@ -69152,13 +68330,13 @@ tEa ncQ fZO bcG -cxO -tpu -oRj -hEQ -cxO +ryH +rQI +jmm +rQI +qgz lbF -hEQ +sRl vPr aIJ yhO @@ -69243,7 +68421,7 @@ lIJ lIJ iDb tDV -lIJ +fEn loy pdv pGm @@ -69342,17 +68520,17 @@ dOV dOV gGi cHD -uoL +cHD vKj bmn nxm -dAL -tpu -pmZ hEQ -dAL -lbF +cxO +tpu +oRj hEQ +qWk +tpu wMm oQR duF @@ -69435,7 +68613,7 @@ sgg dVi sgg sRR -owK +mCv ntv owK jFG @@ -69539,14 +68717,14 @@ uvB oIn ncQ xKh -nxm -vMH -uUT -bTv -mjF -cKI -nnn +bgt hEQ +dAL +tpu +pmZ +hEQ +nnn +umH ccI bfh gOY @@ -69735,8 +68913,8 @@ ncQ aUY bgt iSD -qgz -qgz +jwU +aCE xrE ghR aSy @@ -69752,7 +68930,7 @@ kLr lGe mIe gnX -kiZ +jWi pIo lRV dHP @@ -69792,7 +68970,7 @@ qEy jsq bRh qTX -woF +lAa rBT xYd oVB @@ -69946,7 +69124,7 @@ lAH hyt hyt kzD -kiZ +jWi pIo lRV lRV @@ -69986,7 +69164,7 @@ qEy qEy bRh qTX -woF +lAa iCu xYd lLy @@ -70140,7 +69318,7 @@ uTj fET nFz oho -kiZ +jWi pIo lRV aon @@ -70180,7 +69358,7 @@ jgu knh bRh qTX -woF +lAa rBT xYd xYd @@ -70528,7 +69706,7 @@ xzG xZS pZi oeS -dPz +hTs fVH lRV dHP @@ -70722,7 +69900,7 @@ oYg vVS elj bGk -kiZ +jWi vNH kTG kTG @@ -70762,7 +69940,7 @@ cbH sGH nMb dAN -sjh +bhO lQF mYh lff @@ -71110,7 +70288,7 @@ uTj fUX laF bGk -szv +xrg kuE siS owg @@ -71312,12 +70490,12 @@ fAs neE fAs gsY -pVR -pVR -ptF +jBw +jBw +jBw gRV jrd -lAa +yja aTx aQY aTx @@ -71506,12 +70684,12 @@ fAs hRM mHM qSA -sHq -sHq -ptF +xLS +xLS +jBw gUy -ptF -lAa +jBw +yja cTe eHz fEa @@ -71668,7 +70846,7 @@ eGm eGm wcw bYs -lqG +dPd jSJ jSJ jSJ @@ -71700,12 +70878,12 @@ bbe ukr gjZ jBw -pDy -pDy +iOA +iOA jBw dmb jBw -lAa +yja pFk eHz fEa @@ -71862,8 +71040,8 @@ dPd eGm kFF bYs +dPd lqG -avu bjO uXv siZ @@ -71877,9 +71055,9 @@ aHH wtZ nlx ogM -amn seh -lth +seh +fFS fFS bnV ykZ @@ -71931,9 +71109,9 @@ yja vun eez lYy -noU -jNp -dQk +sEU +fWO +aSf mlP fZS yja @@ -72056,8 +71234,8 @@ tZk eGm kFF bYs -lqG -iSZ +dPd +eet xIm nUc rsb @@ -72071,16 +71249,16 @@ uCx hbo nlx eBj -amn seh -rqi +seh +fFS fFS vjk urR bBk -pjB -pjB -pjB +eQc +eQc +ijD pjB pjB pjB @@ -72093,7 +71271,7 @@ aLn wIR rky fIl -lAa +yja maT vLc fEa @@ -72250,8 +71428,8 @@ tZk tZk kFF bYs -lqG -tFl +dPd +eet hBf sDe eAP @@ -72267,14 +71445,14 @@ caI tmV seh seh -jJW +fFS fFS eMD -wSx +cOu mon -pjB +fnK xxq -dea +ijD xQJ lsk sql @@ -72444,33 +71622,33 @@ tZk tZk eCd bYs -lqG +dPd eet hou tRu afz hJl eun -nUc +lth nUc adu unp olW fWV -uMB +rqi nps iTu iTu sSW fxY brh -wSx -ugO -pjB +cOu +lLp +lLp +lgu +ijD mwV lmA -lmA -lmA wUl cxt shZ @@ -72638,10 +71816,10 @@ tZk tZk eCd bYs -lqG +dPd +eet iSZ nUc -nUc afz hdj elR @@ -72653,17 +71831,17 @@ jhw wbQ kcM uMw -nlx -nlx +uMB +uMB rOz fxY bxG -wSx -mon -pjB +cOu +lLp +lLp +ePT +ijD lTa -tMA -hEA lmA hTV pjB @@ -72832,8 +72010,8 @@ tZk tZk eCd bYs -lqG -pRx +dPd +eet uVb kBG vSh @@ -72852,13 +72030,13 @@ hhO wCb fxY cfG -vZr -kOG -pjB +cOu +lLp +hck +kDm +ijD lKq lmA -hbO -lmA wfN pjB mvE @@ -73026,7 +72204,7 @@ tZk tZk eCd bYs -lqG +dPd lqG lqG lqG @@ -73045,14 +72223,14 @@ fxY fxY fxY fxY -eQc +cfG cOu -eQc -iGh +lLp +rrA +oWK +ijD ktJ lmA -hbO -lmA fBE pjB pjB @@ -73220,32 +72398,32 @@ tZk tZk eCd bYs -bYs -bYs -bYs -bYs -bYs dPd dPd -guv -xLS -cBN -eiR -guv -hRu -vgg -mkR -fBW -yiU -tdp -guv +dPd +dPd +dPd +dPd +dPd +dPd +dPd +dPd +dPd +dPd +dPd +dPd +dPd +dPd +dPd +dPd +eQc otb -lpk -jwU +cOu +lLp iGh +rDi +ijD wrI -oEG -hbO xNT kpb cxt @@ -73414,32 +72592,32 @@ tZk tZk tZk kvC -lUf -lUf -scG -bYs -bYs -bYs +lqQ +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm dPd -guv -cwf -pWX -tns -guv -fnK -hXb -sRl -hCH -vpN -gEL -guv +dPd +dPd +dPd +dPd +dPd +dPd +eQc taq -vcz -fpW -iGh +cBN +lLp +rrA +oWK +ijD dVr -nsl -tYC hNv baR bak @@ -73611,29 +72789,29 @@ tZk eGm eGm eGm -scG -bYs -bYs +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm dPd -guv -iwu -ozw -eZy -guv -iwu -eiR -utB -irb -eiR -eiR -guv +dPd +nGW bmh -vcz -eWa -iGh +cOu +lLp +kqR +gzy +ijD wDv -pYn -fuT eKr sFc cxt @@ -73805,32 +72983,32 @@ tZk eGm eGm eGm -wcw -bYs -bYs +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm dPd -guv -fnK -aHd -hYE -cGJ -urk -akq -hNC -oBc -iLL -wcS -oYs +dPd +nGW wUf ksc -kdK -ijD +lLp +tBR +nsl ijD ijD ijD ijD ijD -iGh wDv uSg rrx @@ -73998,27 +73176,27 @@ tZk tZk eGm eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm dPd -kFF -bYs -bYs dPd -onT -pDC -aUW -pDC -onT -guv -guv -guv -but -guv -guv -guv +nGW wnG -vcz -rqu -dBH +cOu +lLp +biA vfe dBH ctR @@ -74190,30 +73368,30 @@ tZk tZk tZk tZk -tZk eGm eGm -kFF -bYs -bYs +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm dPd -onT -mCv -mCv -mCv -onT -sEU -wzT -bzg -ofn -oaE -aHM -guv -pea +dPd +eQc +uRH vcz -lLp -lLp -lLp +dyy +eiR +aHM lLp lLp lLp @@ -74230,7 +73408,7 @@ mva tCB prj jZr -prj +uSd mbp rYa dKA @@ -74384,32 +73562,32 @@ tZk tZk tZk tZk -tZk eGm eGm -kFF -bYs -bYs -bYs -onT -cEO -eiR -eiR -onT -fZm -hXr -jQd -aSf -dXU -eWA -guv +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +dPd +dPd +eQc pea dli bbg -bbg -bbg -bbg -bbg +gEL +gEL +sQe +sQe psA cWU jdA @@ -74578,34 +73756,34 @@ tZk tZk tZk tZk -tZk eGm eGm eGm -scG -bYs -bYs -onT -eiR -eiR -eiR -onT -yjc -lGr -iOA -lWj -gtl -qgC +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +dPd +dPd guv vEE iuy -nyB eMY -lLp -lLp -hck -kDm -jdA +eMY +eMY +eMY +eMY +eMY +eMY jdA prj bes @@ -74775,31 +73953,31 @@ tZk tZk eGm eGm -dPd eGm -scG -bYs -onT -eiR -eiR -eiR -onT -qWo -eiR -kqR -tBR -oSE -ral +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +dPd +dPd guv xCi -iuy -lLp -tiw -biA -lLp -rrA -oWK -jdA +irb +qdY +qdY +qdY +rmG +ick +fJV +eMY xhR prj wQV @@ -74970,20 +74148,20 @@ tZk eGm eGm eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +dPd dPd -kFF -bYs -onT -iwu -eiR -eiR -onT -eqo -nuD -jmm -pvf -oSE -vvl guv gig lwr @@ -74992,17 +74170,17 @@ xSf tvQ uDD mLY -rDi -jdA -uSd +yiU +eMY +prj kev -lgu -qWg -jkg -sTj -ePT -jWi -tmg +ikm +tRs +xSs +eFm +lal +hxw +prj elV geu ptE @@ -75165,39 +74343,39 @@ tZk eGm eGm eGm -kFF -bYs -onT -xLS -eiR -pnr -onT -evK -nuD -jmm -pvf +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm oSE qcU -eQc +guv lJy rDo -lLp -tiw +mOi +qWo xhp -lLp -rrA -oWK -jdA -uSd -prj -wQV -wpq -prj -prj -prj -hyk -uhL -fJV +cKI +rqu +usU +eMY +xSZ +yjJ +bBD +yjJ +xSZ +yjJ +bMg +yjJ +lWr +nyb bFS aoO bFS @@ -75359,39 +74537,39 @@ tZk tZk tZk eGm -kFF -bYs -onT -onT -onT -onT -onT -eqo -nuD -jmm -lqQ +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm bLf txh guv -pea -tiw -lLp -tiw -lLp -lLp +mkR +nuD +xkN +bzg +usi +hLe iRw -rvP -jdA -rQI -prj -ikm -tRs -xSs -eFm -lal -hxw -qFU -prj +lGr +eMY +uDV +oqa +eGZ +ugQ +xSZ +eUn +hLZ +kaq +jko +oRr bFS oEm eaa @@ -75553,39 +74731,39 @@ tZk tZk tZk tZk -eCd -bYs -dOV -dOV -dOV -bYs -guv -dyy -hip -vyD -nlz +tZk +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm tMg fgp -guv +evK dzs tiw ygy tXm -lLp -lLp +rvP +kOG siU -nGW -eQc -xSZ -yjJ -bBD -yjJ +wEu +fZm +uDV +aDG +iNJ +fxy xSZ -yjJ -bMg -yjJ -lWr -yjJ +gqH +qYU +qZj +iNJ +mEK bFS bsT bqs @@ -75748,38 +74926,38 @@ tZk tZk tZk tZk -kvC -kvC -kvC -szm -bYs -guv -guv -guv -guv -guv +tZk +tZk +eGm +eGm +eGm +eGm +eGm +eGm +eGm +kFF +ral +onT +hXb +hXb +hXb +hXb +pDC +wEu +wEu +wEu wEu -guv -guv -xCi -lLp -lLp -lLp -lLp -lLp -usi -nGW dOV uDV -oqa -eGZ -ugQ -xSZ -eUn -hLZ -kaq -jko -oRr +xvH +nLY +kvq +yjJ +fXX +qYU +nZm +vDg +bCF bFS vKs rFM @@ -75945,41 +75123,41 @@ tZk tZk tZk tZk -eCd -bYs -bYs -bYs -xJx -gWY -gWY -tuh -bYs -nGW -kFn -hTs -qIn -csz -xrg -hLe -bwH -nGW +tZk +tZk +tZk +eGm +eGm +eGm +kFF +dCz +dPd +dOV +dOV +dOV +dOV +dOV +dOV +dOV +dOV +dOV dOV uDV -aDG -iNJ -fxy -xSZ -gqH +gyl +aIw +hAD +yjJ +oML qYU -qZj -nyb -mEK -bFS +gxR +wwu +bCF bFS oVJ bqs bqs bqs +bqs aHu bqs iSb @@ -76140,36 +75318,36 @@ tZk tZk tZk tZk +tZk +tZk +tZk +tZk +tZk +tZk +kvC +kvC +kvC +kvC +kvC +kvC +kvC +kvC kvC kvC szm -oNq -rnj -qWk -lxQ -bYs -nGW -nGW -nGW -nGW -nGW -nGW -nGW -nGW -nGW dOV uDV -xvH -nLY -kvq +nTo +aIw +sKb yjJ -fXX +uiX qYU -nZm -vDg +vzy +qbj sGB -ddu -bFS +xSZ +tYC qkn mxM ykO @@ -76336,33 +75514,33 @@ tZk tZk tZk tZk +tZk +tZk +tZk +tZk +tZk +tZk +tZk +tZk +tZk +tZk +tZk +tZk +tZk +tZk eCd -bYs -bYs -bYs -dCz -bYs -dOV -dOV -dOV -dOV -dOV -dOV -dOV -dOV -dOV dOV uDV -gyl -aIw -hAD +tPS +bKH +euf yjJ -oML +tns qYU -gxR -wwu qYU -bhO +qYU +hip +xSZ bFS bFS bFS @@ -76531,35 +75709,35 @@ tZk tZk tZk tZk -kvC -kvC -kvC -kvC -kvC -kvC -kvC -kvC -kvC -kvC -kvC -kvC -kvC -ail +tZk +tZk +tZk +tZk +tZk +tZk +tZk +tZk +tZk +tZk +tZk +tZk +tZk +eCd dOV uDV -nTo -aIw -sKb -yjJ -uiX -qYU -vzy -qbj -usU -oSY -fWO -mOi uDV +uDV +uDV +xSZ +lWj +qYU +qYU +lPs +aMa +xSZ +dOV +dOV +dOV dOV dOV dOV @@ -76740,20 +75918,17 @@ tZk tZk eCd dOV -uDV -tPS -bKH -euf -yjJ -nTo -qYU -qYU -qYU -qYU +dOV +dOV +dOV +dOV +jQd +tMA +lPs lPs lPs aMa -uDV +xSZ dOV biw kvC @@ -76766,6 +75941,9 @@ kvC kvC kvC kvC +kvC +kvC +kvC tZk tZk tZk @@ -76932,22 +76110,19 @@ tZk tZk tZk tZk -eCd +tZk +kvC +kvC +kvC +ail dOV -uDV -uDV -uDV -uDV -xSZ +jQd icV rgg -ick -ick -gMB -gMB -gMB +rgg +rgg akk -uDV +xSZ dOV xCK tZk @@ -77022,6 +76197,9 @@ tZk tZk tZk tZk +tZk +tZk +tZk eGm eGm eGm @@ -77126,17 +76304,14 @@ tZk tZk tZk tZk +tZk +tZk +tZk +tZk eCd dOV -dOV -dOV -dOV -dOV -uDV -uDV -uDV -uDV uDV +jQd uDV uDV uDV @@ -77216,6 +76391,9 @@ tZk tZk tZk tZk +tZk +tZk +tZk eGm eGm eGm @@ -77321,13 +76499,10 @@ tZk tZk tZk tZk -kvC -kvC -kvC -szm -dOV -dOV -dOV +tZk +tZk +tZk +eCd dOV dOV dOV @@ -77410,6 +76585,9 @@ tZk tZk tZk tZk +tZk +tZk +tZk eGm eGm eGm @@ -77528,9 +76706,9 @@ kvC kvC kvC kvC -kvC -kvC -kvC +tZk +tZk +tZk tZk tZk tZk diff --git a/maps/tether/levels/underdark.dmm b/maps/tether/levels/underdark.dmm index 0682c61267f4..d52b94fbb302 100644 --- a/maps/tether/levels/underdark.dmm +++ b/maps/tether/levels/underdark.dmm @@ -15,18 +15,6 @@ "f" = ( /turf/simulated/floor/outdoors/dirt/virgo3b, /area/mine/explored/underdark) -"g" = ( -/obj/structure/railing{ - dir = 8 - }, -/turf/simulated/floor/outdoors/dirt/virgo3b, -/area/mine/explored/underdark) -"h" = ( -/obj/item/newspaper{ - pixel_x = 4 - }, -/turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/mine/explored/underdark) "j" = ( /obj/effect/decal/remains/deer, /turf/simulated/mineral/floor/virgo3b{ @@ -48,10 +36,6 @@ }, /turf/simulated/floor/outdoors/dirt/virgo3b, /area/mine/explored/underdark) -"o" = ( -/obj/structure/railing, -/turf/simulated/floor/outdoors/dirt/virgo3b, -/area/mine/explored/underdark) "q" = ( /turf/simulated/mineral/floor/virgo3b, /area/mine/unexplored/underdark) @@ -75,10 +59,7 @@ /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/mine/explored/underdark) "v" = ( -/obj/effect/step_trigger/teleporter/from_underdark{ - dir = 4; - pixel_x = -16 - }, +/obj/structure/stairs/spawner/east, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/mine/explored/underdark) "w" = ( @@ -98,9 +79,6 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/structure/railing{ - dir = 8 - }, /turf/simulated/floor/outdoors/dirt/virgo3b, /area/mine/explored/underdark) "A" = ( @@ -120,6 +98,7 @@ /obj/machinery/power/apc/north_mount{ alarms_hidden = 1 }, +/obj/structure/railing, /turf/simulated/floor/outdoors/dirt/virgo3b, /area/mine/explored/underdark) "D" = ( @@ -35543,7 +35522,7 @@ k C u u -f +K P u u @@ -35734,10 +35713,10 @@ X X X k -o +f v v -K +f P T y @@ -35928,10 +35907,10 @@ X X X k -o -h -u -K +f +f +f +f P P P @@ -36124,7 +36103,7 @@ X k f z -g +f f f f diff --git a/maps/tether/tether.dm b/maps/tether/tether.dm index 1339aa52f5e8..ed89fb68119b 100644 --- a/maps/tether/tether.dm +++ b/maps/tether/tether.dm @@ -165,6 +165,8 @@ link_above = /datum/map_level/tether/station/surface_mid flags = LEGACY_LEVEL_STATION|LEGACY_LEVEL_CONTACT|LEGACY_LEVEL_PLAYER|LEGACY_LEVEL_CONSOLES|LEGACY_LEVEL_SEALED base_turf = /turf/simulated/floor/outdoors/rocks/virgo3b + link_north = /datum/map_level/tether/mine + link_south = /datum/map_level/tether/plains // holomap_offset_x = TETHER_HOLOMAP_MARGIN_X // holomap_offset_y = TETHER_HOLOMAP_MARGIN_Y + TETHER_MAP_SIZE*0 @@ -267,6 +269,8 @@ ) flags = LEGACY_LEVEL_CONTACT|LEGACY_LEVEL_PLAYER|LEGACY_LEVEL_SEALED base_turf = /turf/simulated/floor/outdoors/rocks/virgo3b + link_below = /datum/map_level/tether/underdark + link_south = /datum/map_level/tether/station/surface_low /datum/map_level/tether/mine/on_loaded_immediate(z_index, list/datum/callback/additional_generation) . = ..() @@ -294,6 +298,7 @@ ) flags = LEGACY_LEVEL_CONTACT|LEGACY_LEVEL_PLAYER|LEGACY_LEVEL_SEALED base_turf = /turf/simulated/mineral/floor/virgo3b + link_above = /datum/map_level/tether/mine /datum/map_level/tether/underdark/on_loaded_immediate(z_index, list/datum/callback/additional_generation) . = ..() @@ -321,6 +326,7 @@ ) flags = LEGACY_LEVEL_CONTACT|LEGACY_LEVEL_PLAYER|LEGACY_LEVEL_SEALED base_turf = /turf/simulated/mineral/floor/virgo3b + link_north = /datum/map_level/tether/station/surface_low /datum/map_level/tether/plains/on_loaded_immediate(z_index, list/datum/callback/additional_generation) . = ..() diff --git a/maps/triumph/levels/deck2.dmm b/maps/triumph/levels/deck2.dmm index be1a3c30623e..1888991cd2ba 100644 --- a/maps/triumph/levels/deck2.dmm +++ b/maps/triumph/levels/deck2.dmm @@ -1207,6 +1207,7 @@ /obj/machinery/light{ dir = 8 }, +/obj/item/reagent_containers/glass/rag/sponge, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "dt" = ( @@ -13103,6 +13104,8 @@ /obj/item/mop, /obj/item/storage/bag/trash, /obj/item/lightreplacer, +/obj/item/reagent_containers/glass/rag/sponge, +/obj/item/reagent_containers/glass/rag/sponge, /turf/simulated/floor/tiled/dark, /area/janitor) "NW" = ( @@ -14966,7 +14969,6 @@ /obj/machinery/computer/security/telescreen{ pixel_x = 32 }, -/obj/machinery/vending/mre, /turf/simulated/floor/wood, /area/crew_quarters/bar) "Ty" = ( diff --git a/maps/triumph/levels/deck3.dmm b/maps/triumph/levels/deck3.dmm index 40c3b49ac1e2..54f45a1f291d 100644 --- a/maps/triumph/levels/deck3.dmm +++ b/maps/triumph/levels/deck3.dmm @@ -2045,9 +2045,6 @@ }, /turf/simulated/floor/tiled, /area/medical/surgeryprep) -"bPc" = ( -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2) "bPE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -2717,8 +2714,7 @@ "csx" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/voidcraft/vertical{ - frequency = 1380; - id_tag = null + frequency = 1380 }, /obj/structure/cable/green{ icon_state = "1-2" @@ -2985,7 +2981,6 @@ dir = 1; frequency = 1445; id = "burn_in"; - req_access = null; volume_rate = 700 }, /turf/simulated/floor/reinforced, @@ -4642,9 +4637,6 @@ /obj/item/clothing/under/rank/medical/scrubs, /turf/simulated/floor/tiled/white, /area/crew_quarters/medbreak/surgery) -"dYb" = ( -/turf/simulated/floor/plating, -/area/maintenance/medbay/aft) "dYB" = ( /obj/structure/cable/green{ icon_state = "1-8" @@ -6073,10 +6065,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/ward) -"ffL" = ( -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/research) "fhj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -6467,7 +6455,6 @@ /obj/machinery/power/emitter{ anchored = 1; dir = 1; - id = null; pixel_y = 8; state = 2 }, @@ -10627,10 +10614,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology) -"iNs" = ( -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/medbay/aft) "iNI" = ( /obj/effect/floor_decal/techfloor, /obj/structure/disposalpipe/segment{ @@ -10813,7 +10796,6 @@ dir = 8; frequency = 1445; id = "burn_in"; - req_access = null; volume_rate = 700 }, /turf/simulated/floor/reinforced, @@ -15124,9 +15106,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/hallway) -"mIO" = ( -/turf/simulated/floor/plating, -/area/maintenance/medbay/aft) "mKe" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/shuttle/wall/voidcraft/blue, @@ -15237,9 +15216,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/aft) -"mPq" = ( -/turf/simulated/floor/plating, -/area/maintenance/medbay/fore) "mQm" = ( /obj/machinery/light{ dir = 8 @@ -16114,13 +16090,6 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/rnd/test_area) -"nBw" = ( -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -22 - }, -/turf/simulated/floor/plating, -/area/maintenance/medbay/aft) "nCp" = ( /obj/machinery/door/window/brigdoor/southright{ req_access = list(55); @@ -18270,9 +18239,7 @@ "pky" = ( /obj/machinery/door/airlock/multi_tile/glass{ id_tag = "MedbayFoyer"; - name = "General Wing"; - req_access = null; - req_one_access = null + name = "General Wing" }, /obj/machinery/door/firedoor/glass, /obj/effect/floor_decal/borderfloor{ @@ -18502,8 +18469,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/voidcraft/vertical{ - frequency = 1380; - id_tag = null + frequency = 1380 }, /obj/machinery/access_button{ dir = 1; @@ -18571,7 +18537,6 @@ /obj/machinery/power/emitter{ anchored = 1; dir = 1; - id = null; pixel_y = 8; state = 2 }, @@ -19447,6 +19412,9 @@ /obj/item/bodybag/cryobag, /obj/structure/table/steel_reinforced, /obj/effect/floor_decal/industrial/outline/blue, +/obj/item/stack/nanopaste{ + amount = 30 + }, /turf/simulated/floor/tiled/white, /area/medical/sleeper) "qak" = ( @@ -20356,13 +20324,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/resleeving) -"qOi" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2) "qOj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -20680,7 +20641,6 @@ dir = 1; frequency = 1445; id = "burn_in"; - req_access = null; volume_rate = 700 }, /turf/simulated/floor/wood, @@ -21778,8 +21738,7 @@ /obj/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 8; - frequency = 1380; - id_tag = null + frequency = 1380 }, /turf/simulated/floor/plating, /area/medical/patient_wing) @@ -22872,10 +22831,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) -"sVE" = ( -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/medbay/fore) "sVF" = ( /obj/machinery/light{ dir = 4 @@ -24947,10 +24902,8 @@ /area/maintenance/substation/medical_science) "uFV" = ( /obj/structure/table/steel_reinforced, -/obj/item/stack/nanopaste{ - amount = 30 - }, /obj/effect/floor_decal/industrial/outline/blue, +/obj/machinery/lathe/medical/stocked, /turf/simulated/floor/tiled/white, /area/medical/sleeper) "uGR" = ( @@ -25066,6 +25019,9 @@ /obj/item/tank/oxygen{ pixel_y = -4 }, +/obj/item/hardsuit/medical{ + pixel_y = -4 + }, /obj/structure/table/rack, /turf/simulated/floor/tiled, /area/medical/medbay_emt_bay) @@ -26275,8 +26231,7 @@ /obj/machinery/door/airlock/multi_tile/glass{ dir = 4; name = "Chem & Offices"; - req_access = list(5); - req_one_access = null + req_access = list(5) }, /obj/structure/cable/green{ icon_state = "4-8" @@ -26826,8 +26781,7 @@ /obj/machinery/door/firedoor/glass, /obj/map_helper/airlock/door/int_door, /obj/machinery/door/airlock/voidcraft/vertical{ - frequency = 1380; - id_tag = null + frequency = 1380 }, /turf/simulated/floor/tiled/white, /area/shuttle/emt/general) @@ -26873,8 +26827,7 @@ /obj/machinery/door/firedoor/glass, /obj/map_helper/airlock/door/ext_door, /obj/machinery/door/airlock/voidcraft/vertical{ - frequency = 1380; - id_tag = null + frequency = 1380 }, /turf/simulated/floor/tiled/white, /area/shuttle/emt/general) @@ -27104,9 +27057,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/medbay/fore) -"wxx" = ( -/turf/simulated/floor/plating, -/area/maintenance/medbay/aft) "wxE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -28591,13 +28541,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay4) -"xJM" = ( -/obj/structure/catwalk, -/obj/machinery/light/small{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/medbay/fore) "xJN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 4 @@ -28878,9 +28821,6 @@ }, /turf/simulated/floor/tiled, /area/medical/sleeper) -"xVR" = ( -/turf/simulated/floor/plating, -/area/maintenance/medbay/aft) "xXp" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -28891,9 +28831,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/test_area) -"xXR" = ( -/turf/simulated/floor/plating, -/area/maintenance/research) "xYe" = ( /obj/structure/bed/chair/wheelchair, /obj/effect/floor_decal/industrial/outline/blue, @@ -28914,8 +28851,7 @@ /obj/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 8; - frequency = 1380; - id_tag = null + frequency = 1380 }, /turf/simulated/floor/plating, /area/medical/patient_wing) @@ -37192,7 +37128,7 @@ xZt bQa axl cXl -xXR +cpA cpA axl xOh @@ -37203,10 +37139,10 @@ aDe kxT qPj mWG -nBw +djF +mWG mWG mWG -xVR eXE jMj bBu @@ -37384,11 +37320,11 @@ suI bTp bTp cpA -xXR -xXR -xXR -xXR -xXR +cpA +cpA +cpA +cpA +cpA eaK suI mDp @@ -37398,9 +37334,9 @@ kxT pps vmM mWG -wxx mWG -dYb +mWG +mWG eXE jMj eVl @@ -37576,10 +37512,10 @@ suI suI bmt bTp -ffL -xXR -xXR -xXR +bTp +cpA +cpA +cpA cpA fSv tAg @@ -37593,7 +37529,7 @@ tAg tAg fcw mWG -mIO +mWG mWG eXE jMj @@ -37786,9 +37722,9 @@ jzz cew tAg xFt -xVR +mWG vmM -dYb +mWG mGW jMj jMj @@ -37988,7 +37924,7 @@ piP trY trY trY -mIO +mWG djF kpp kxT @@ -38153,12 +38089,12 @@ vnY vnY suI bTp -ffL +bTp bTp bTp wWi bTp -ffL +bTp bTp oSx bTp @@ -38177,7 +38113,7 @@ kpp jMj jMj jMj -iNs +jMj jMj jMj uCv @@ -38347,17 +38283,17 @@ tKG tKG suI bTp -xXR +cpA tji fij -xXR +cpA qOV oXx -xXR +cpA vLK fcA bTp -xXR +cpA tAg mRv lwt @@ -38928,8 +38864,8 @@ bTp tys bTp bTp -ffL -xXR +bTp +cpA cNb meR nAu @@ -39121,7 +39057,7 @@ rOo tji sXB oSV -xXR +cpA bTp jgN ejI @@ -39352,7 +39288,7 @@ nel utr mWG jMj -mIO +mWG toD xcx kxG @@ -39544,7 +39480,7 @@ dbh yde dAV utr -mIO +mWG jMj mWG uYk @@ -39740,7 +39676,7 @@ jgb utr mWG jMj -mIO +mWG toD mIe kxG @@ -40481,7 +40417,7 @@ soU eWW xIf bTp -xXR +cpA uEl jPQ cbF @@ -40675,7 +40611,7 @@ pdP eWW xIf fNX -xXR +cpA uEl pGO xkX @@ -40696,7 +40632,7 @@ ieR ofg duZ iPU -sVE +fVB rsU kfN afR @@ -41062,8 +40998,8 @@ qhW jam sZy xIf -ffL -xXR +bTp +cpA uEl uEl tbn @@ -41277,7 +41213,7 @@ tYf meR fmZ duZ -sVE +fVB wwu pNX sUJ @@ -41447,7 +41383,7 @@ lui cIp qpQ pgB -xXR +cpA gyl xIf oZk @@ -41471,7 +41407,7 @@ rkN meR oDD duZ -sVE +fVB mKr pNX pNX @@ -41641,7 +41577,7 @@ lui cIp qpQ tua -xXR +cpA cpA ipX bTp @@ -41666,14 +41602,14 @@ meR toX duZ kzb -sVE +fVB duZ dht jZr chM duZ uHQ -mPq +nXk tWY nyz twF @@ -41839,7 +41775,7 @@ nZB eec xIf bTp -xXR +cpA uJh ogl geD @@ -41860,10 +41796,10 @@ rIr qIz qIz qIz -sVE +fVB duZ dht -mPq +nXk nXk duZ duZ @@ -42029,7 +41965,7 @@ lui cIp qpQ aZk -xXR +cpA fMM xIf bTp @@ -42054,16 +41990,16 @@ nAQ hBs cny xGm -sVE +fVB duZ rbF nXk -mPq +nXk geo -mPq +nXk crH -sVE -sVE +fVB +fVB wlz aFA hLb @@ -42248,16 +42184,16 @@ iEr hBs cny xGm -sVE +fVB crH -mPq -mPq -mPq -mPq +nXk +nXk +nXk +nXk gwo duZ mKr -sVE +fVB wlz iWo ufn @@ -42442,7 +42378,7 @@ sBd qIz qIz qIz -sVE +fVB duZ rbF rbF @@ -42450,8 +42386,8 @@ dht nXk eUu duZ -mPq -sVE +nXk +fVB uvd uvd uvd @@ -42636,7 +42572,7 @@ ieJ eBe qIz mKr -sVE +fVB duZ duZ duZ @@ -42645,7 +42581,7 @@ duZ duZ duZ mKr -sVE +fVB uvd dic tGx @@ -42830,16 +42766,16 @@ eaq aHX qIz mKr -sVE +fVB rRb -sVE -sVE -sVE -sVE -sVE -sVE -xJM -sVE +fVB +fVB +fVB +fVB +fVB +fVB +rRb +fVB uvd dFm pBq @@ -43391,11 +43327,11 @@ bKl ocU fcW xuX -xXR +cpA dFC -xXR +cpA iKj -xXR +cpA dFC knh mxb @@ -43587,7 +43523,7 @@ xIf rFp bTp bTp -ffL +bTp bTp bTp bTp @@ -52532,7 +52468,7 @@ oZA nnJ tYH pkD -bPc +pkD rbc itd iKx @@ -52728,7 +52664,7 @@ wMp cDA rMs iyp -qOi +fzF fzF mZv mNh diff --git a/maps/triumph/levels/deck4.dmm b/maps/triumph/levels/deck4.dmm index a2dbaf1377d0..2a46fc53a9fd 100644 --- a/maps/triumph/levels/deck4.dmm +++ b/maps/triumph/levels/deck4.dmm @@ -833,9 +833,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/security) -"aDG" = ( -/turf/simulated/floor/plating, -/area/maintenance/chapel) "aDH" = ( /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 4 @@ -4123,13 +4120,6 @@ }, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) -"cVd" = ( -/obj/structure/catwalk, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/maintenance/central) "cVf" = ( /obj/effect/floor_decal/sign/dock/three, /turf/simulated/wall/r_wall/prepainted, @@ -4307,10 +4297,6 @@ }, /turf/simulated/floor/tiled/old_cargo/white, /area/security/forensics) -"dcn" = ( -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/security/starboard) "dcL" = ( /obj/structure/closet/secure_closet/security, /obj/effect/floor_decal/industrial/outline/yellow, @@ -4745,9 +4731,6 @@ }, /turf/simulated/floor/tiled/dark, /area/security/security_equiptment_storage) -"dlg" = ( -/turf/simulated/floor/plating, -/area/maintenance/security/port) "dlH" = ( /obj/effect/floor_decal/techfloor{ dir = 10 @@ -7326,9 +7309,6 @@ "eZe" = ( /turf/simulated/wall/prepainted/security, /area/security/hallway) -"eZM" = ( -/turf/simulated/floor/plating, -/area/maintenance/security/starboard) "faa" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -10013,13 +9993,6 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/hop) -"gUz" = ( -/obj/structure/catwalk, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/maintenance/security/starboard) "gUA" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -14732,9 +14705,6 @@ /obj/structure/wall_frame/prepainted, /turf/simulated/floor/plating, /area/exploration/pathfinder_office) -"kbl" = ( -/turf/simulated/floor/plating, -/area/maintenance/security/starboard) "kbw" = ( /obj/structure/grille, /obj/machinery/door/firedoor/glass, @@ -15690,13 +15660,6 @@ }, /turf/simulated/floor/tiled, /area/exploration/explorer_prep) -"kIq" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/central) "kIs" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -16099,12 +16062,6 @@ /obj/machinery/computer/secure_data, /turf/simulated/floor/tiled/old_cargo/red, /area/security/security_processing) -"kWe" = ( -/obj/structure/railing{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/maintenance/security/starboard) "kWo" = ( /obj/effect/floor_decal/spline/plain{ dir = 1 @@ -16269,10 +16226,6 @@ }, /turf/simulated/floor/tiled, /area/exploration) -"lbc" = ( -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/central) "lbH" = ( /obj/machinery/computer/ship/navigation{ dir = 1 @@ -17021,9 +16974,6 @@ }, /turf/simulated/floor/tiled, /area/security/security_lockerroom) -"lMv" = ( -/turf/simulated/floor/plating, -/area/maintenance/security/starboard) "lMU" = ( /obj/machinery/holopad, /obj/effect/floor_decal/corner/blue{ @@ -17159,10 +17109,6 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/shuttle/courser/cockpit) -"lPI" = ( -/obj/structure/table/rack, -/turf/simulated/floor/plating, -/area/maintenance/chapel) "lPJ" = ( /obj/effect/floor_decal/techfloor{ dir = 5 @@ -17320,13 +17266,6 @@ }, /turf/simulated/floor/bluegrid, /area/ai) -"lXu" = ( -/obj/structure/catwalk, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/maintenance/central) "lXS" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/simple/hidden{ @@ -18288,9 +18227,6 @@ }, /turf/simulated/floor/tiled/dark, /area/hallway/primary/aft) -"mIv" = ( -/turf/space, -/area/space) "mID" = ( /obj/structure/table/borosilicate, /turf/simulated/floor/wood, @@ -19007,10 +18943,6 @@ "nlv" = ( /turf/simulated/wall/r_wall, /area/prison/cell_block) -"nlD" = ( -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/security/starboard) "nmp" = ( /obj/structure/ladder, /obj/structure/railing{ @@ -20011,12 +19943,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/hallway/primary/aft) -"nRY" = ( -/obj/machinery/air_alarm{ - pixel_y = 22 - }, -/turf/simulated/floor/plating, -/area/maintenance/security/starboard) "nSi" = ( /obj/machinery/ai_slipper, /obj/machinery/turretid/stun{ @@ -22801,13 +22727,6 @@ }, /turf/simulated/floor/tiled/dark, /area/security/riot_control) -"pNr" = ( -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -22 - }, -/turf/simulated/floor/plating, -/area/maintenance/central) "pNt" = ( /obj/spawner/window/low_wall/borosillicate/reinforced/full, /obj/effect/paint_stripe/commandblue, @@ -24026,9 +23945,6 @@ }, /turf/simulated/floor/tiled, /area/bridge/hallway) -"qKv" = ( -/turf/simulated/floor/plating, -/area/security/brig) "qKF" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -25395,9 +25311,6 @@ "rKA" = ( /turf/simulated/wall/r_wall/prepainted/exploration, /area/exploration/showers) -"rKE" = ( -/turf/simulated/floor/wood, -/area/maintenance/security/starboard) "rKO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -25445,9 +25358,6 @@ }, /turf/simulated/shuttle/wall/voidcraft/hard_corner, /area/shuttle/excursion/cargo) -"rNn" = ( -/turf/simulated/floor/wood, -/area/maintenance/security/starboard) "rOm" = ( /obj/effect/floor_decal/chapel{ dir = 4 @@ -27285,9 +27195,6 @@ }, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/civilian_hallway_mid) -"tjq" = ( -/turf/simulated/floor/plating, -/area/maintenance/security/starboard) "tjQ" = ( /obj/structure/catwalk, /obj/structure/cable{ @@ -27461,9 +27368,6 @@ /obj/random/tech_supply, /turf/simulated/floor/tiled, /area/maintenance/tool_storage) -"tqE" = ( -/turf/simulated/floor/wood/broken, -/area/maintenance/central) "trn" = ( /obj/structure/shuttle/engine/heater{ dir = 4 @@ -31841,12 +31745,6 @@ }, /turf/simulated/floor/tiled/dark, /area/security/riot_control) -"wsX" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/maintenance/chapel) "wtl" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -32198,9 +32096,15 @@ /turf/simulated/floor/grass, /area/hydroponics/garden) "wFu" = ( -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/chapel) +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 8 + }, +/obj/machinery/vending/mre, +/turf/simulated/floor/tiled, +/area/exploration) "wFM" = ( /obj/machinery/light/small/emergency{ dir = 8 @@ -34018,10 +33922,6 @@ }, /turf/simulated/floor/tiled/dark, /area/security/hallway) -"xJr" = ( -/obj/structure/table/rack, -/turf/simulated/floor/plating, -/area/maintenance/chapel) "xJO" = ( /obj/effect/shuttle_landmark/triumph/deck4/excursion_space, /turf/space, @@ -34384,9 +34284,6 @@ }, /turf/simulated/floor/wood, /area/hallway/secondary/docking_hallway) -"ybN" = ( -/turf/simulated/floor/plating, -/area/maintenance/central) "ybW" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -40199,7 +40096,7 @@ jNg jNg jNg jNg -mIv +jNg jNg jNg jNg @@ -43261,7 +43158,7 @@ jCz jCz eEE fCV -qKv +izv izv uTN xDy @@ -46509,7 +46406,7 @@ qfY uCu mKg jPL -jPL +wFu iBx bAB rju @@ -49252,7 +49149,7 @@ eQL iAm xwU aNK -dlg +oYj eoX eAT lxz @@ -49820,8 +49717,8 @@ plb pdu oxc dIm -aDG -wsX +uze +lhZ dhZ bjg vNz @@ -49834,7 +49731,7 @@ vOV sXI xwU aNK -dlg +oYj sMV eAT quW @@ -50011,9 +49908,9 @@ eOl shJ dsD vca -wFu +pdu umY -aDG +uze cIC trR odY @@ -50028,7 +49925,7 @@ qOz okH jFO aNK -dlg +oYj uhE eAT siW @@ -50204,13 +50101,13 @@ eOl eOl eOl iEX -aDG +uze pdu oxc -aDG +uze dhZ kFr -aDG +uze bjg kiQ bjg @@ -50222,7 +50119,7 @@ nNR ebA xtc aNK -dlg +oYj eoX eAT isn @@ -50401,7 +50298,7 @@ dsD dYN pdu oxc -aDG +uze jfr obp cCy @@ -50416,7 +50313,7 @@ tVO iAm clz aNK -dlg +oYj nvI eAT eAT @@ -50610,7 +50507,7 @@ eQL xdl mIj aNK -dlg +oYj nvI xsh rwg @@ -50786,11 +50683,11 @@ kjF jnZ bnw dsD -aDG +uze pdu oxc xmw -aDG +uze pMT xmw eNi @@ -50983,10 +50880,10 @@ dsD dIm pdu bMJ -aDG +uze obb dvF -aDG +uze kMv kfP oxc @@ -50998,7 +50895,7 @@ wim xgP oWB aNK -dlg +oYj nvI ucf lSW @@ -51192,7 +51089,7 @@ oHN iRB kPv aNK -dlg +oYj nvI ucf wcN @@ -51386,7 +51283,7 @@ qZT tMU gbt aNK -dlg +oYj nvI eZe gUB @@ -51581,7 +51478,7 @@ nRX ftM aNK oYj -dlg +oYj xwP xjZ xGF @@ -51774,7 +51671,7 @@ byY bZl hbS aNK -dlg +oYj eoX nvI nOk @@ -52339,7 +52236,7 @@ eWd mID nQR gkR -wFu +pdu mYb bHQ cri @@ -53104,16 +53001,16 @@ xxb fSv dIm rGu -aDG uze -lPI -aDG +uze +xxb +uze kST uze -aDG -aDG +uze +uze upZ -aDG +uze ujK pdu mYb @@ -53502,7 +53399,7 @@ rxu wGN nEa nnP -wsX +lhZ pdu mYb tep @@ -53915,8 +53812,8 @@ oAT kSZ kSZ tMx -tjq -tjq +cyD +cyD lzA nTl bzJ @@ -54302,8 +54199,8 @@ rBP nMY nQj dth -nlD -tjq +dNv +cyD own own stV @@ -54312,14 +54209,14 @@ own dlI jQB cJh -tjq +cyD puF tOv jdj glq jdj -tjq -tjq +cyD +cyD mOV mOV mOV @@ -54472,7 +54369,7 @@ gJj uKB ciK nnP -wsX +lhZ pdu mYb hGB @@ -54496,8 +54393,8 @@ qLQ yjr gPm dth -nlD -tjq +dNv +cyD own qTR kPs @@ -54506,19 +54403,19 @@ own jdj tyN jKU -tjq +cyD +sEA sEA -rNn coK oVo jdj -tjq -tjq -tjq -tjq -tjq -tjq -tjq +cyD +cyD +cyD +cyD +cyD +cyD +cyD iwC kSZ lft @@ -54667,7 +54564,7 @@ uKB ojm nnP mfu -wFu +pdu mYb uMq sQf @@ -54698,22 +54595,22 @@ qfo iyz own vRr -rNn +sEA cJh -rNn +sEA xjI -tjq +cyD jdj jdj jdj jdj jdj jdj -tjq -tjq -tjq -tjq -tjq +cyD +cyD +cyD +cyD +cyD pDd lft jNg @@ -54861,7 +54758,7 @@ uKB ojm nnP keD -xJr +xxb mYb jfm lcR @@ -54884,22 +54781,22 @@ dth dth qHn dth -nlD -tjq +dNv +cyD own oIG gPV fMf own lsb -tjq -rKE -rNn +cyD +sEA +sEA aka cJh lID jdj -tjq +cyD oDQ kSZ jdj @@ -55055,7 +54952,7 @@ uKB ojm nnP gMJ -aDG +uze mYb xUy mpL @@ -55078,8 +54975,8 @@ sly dth rEd dth -nlD -tjq +dNv +cyD own own caS @@ -55094,8 +54991,8 @@ jdj jdj jdj kSZ -tjq -tjq +cyD +cyD kSZ jdj uHE @@ -55272,28 +55169,28 @@ lhL oeW oeW oeW -nlD -tjq +dNv +cyD kSZ oDQ bAz vde kSZ -tjq -nlD -tjq -tjq +cyD +dNv +cyD +cyD vde fOY vte jdj -tjq -tjq -tjq -tjq +cyD +cyD +cyD +cyD oQY -rNn -rNn +sEA +sEA rgW rBw biu @@ -55466,28 +55363,28 @@ loX ujD qoX oeW -nlD -nlD -nlD -nlD +dNv +dNv +dNv +dNv bAz -nlD -nlD -nlD -nlD -nlD -nlD -nlD -nlD -nlD +dNv +dNv +dNv +dNv +dNv +dNv +dNv +dNv +dNv xmE -nlD -nlD -nlD -nlD +dNv +dNv +dNv +dNv jdj pPX -rNn +sEA rgW khQ blv @@ -55661,7 +55558,7 @@ oeW nVc oeW dRO -tjq +cyD jdj vte bAz @@ -55676,12 +55573,12 @@ jdj jdj jdj kSZ -nlD -tjq -nlD +dNv +cyD +dNv jdj lOX -rNn +sEA rgW ciW kJp @@ -55854,7 +55751,7 @@ oeW oeW oeW oeW -nlD +dNv jdj jdj jdj @@ -55862,17 +55759,17 @@ bAz jdj cyD oDQ -tjq -tjq +cyD +cyD lAI -tjq +cyD oDQ -tjq +cyD wzh wzh qXp wzh -nlD +dNv jdj ctY mak @@ -56047,19 +55944,19 @@ hCV dNv nRe wFM -nlD -nlD -tjq +dNv +dNv +cyD jdj -tjq +cyD bAz jdj -tjq cyD cyD -tjq +cyD +cyD bQO -tjq +cyD wzh wzh wzh @@ -56214,7 +56111,7 @@ vMW twI cvL cUk -kIq +xvw hvp dDx nUC @@ -56242,27 +56139,27 @@ pcK pcK pcK pcK -nlD -nlD -nlD -nlD +dNv +dNv +dNv +dNv bAz jdj -tjq -tjq -tjq -kbl +cyD +cyD +cyD +cyD bQO -tjq +cyD wzh ulS eMF eaR eUD wzh -nlD -tjq -tjq +dNv +cyD +cyD lft lft lft @@ -56442,12 +56339,12 @@ jdj jdj eBJ jdj -tjq -tjq -tjq -tjq +cyD +cyD +cyD +cyD bQO -tjq +cyD wzh tPy vTh @@ -56455,8 +56352,8 @@ ckU mha wzh dRO -tjq -kbl +cyD +cyD lft lft jNg @@ -56602,7 +56499,7 @@ bpS twI jah cHn -kIq +xvw hvp hVk dqo @@ -56639,18 +56536,18 @@ jdj bQO bQO bQO -tjq +cyD lAI -tjq +cyD wzh weh weh weh eUD wzh -nlD -tjq -tjq +dNv +cyD +cyD lft lft jNg @@ -56794,8 +56691,8 @@ twI twI twI twI -ybN -ybN +hlO +hlO xvw hvp czv @@ -56831,20 +56728,20 @@ vjJ bAz jdj lzA -tjq -tjq cyD cyD -tjq +cyD +cyD +cyD wzh tci esm tPH dBa wzh -nlD +dNv lAI -tjq +cyD lft tFU cgo @@ -56989,7 +56886,7 @@ bjw kXr twI lhx -ybN +hlO ykw hvp jBQ @@ -57025,10 +56922,10 @@ jdj bAz jdj lzA -tjq -tjq -tjq -tjq +cyD +cyD +cyD +cyD cyD wzh oxx @@ -57036,8 +56933,8 @@ esm fmm eUD wzh -nlD -tjq +dNv +cyD wne lft lft @@ -57184,7 +57081,7 @@ atV twI wqS hlO -cVd +bNR hvp vNu waj @@ -57219,22 +57116,22 @@ jdj bAz jdj wxk -tjq -tjq -tjq +cyD +cyD +cyD jdj -tjq +cyD wzh wzh wzh wzh qXp wzh -nlD +dNv jdj jdj jdj -tjq +cyD lft bph jNg @@ -57376,9 +57273,9 @@ vkl bjw ihi twI -ybN -ybN -cVd +hlO +hlO +bNR hvp hvp hvp @@ -57414,22 +57311,22 @@ bAz jdj jdj teS -tjq -tjq +cyD +cyD jdj -tjq -tjq -tjq +cyD +cyD +cyD jdj lAI -nlD +dNv kSZ -nlD +dNv jdj -tjq +cyD vde -tjq -tjq +cyD +cyD bph rUF jNg @@ -57571,8 +57468,8 @@ gjv cbS twI hzc -ybN -cVd +hlO +bNR uTr xBE iOd @@ -57601,30 +57498,30 @@ sGG ctD pcK bWH -tjq -tjq +cyD +cyD jdj bAz tUY jdj cyD -kbl -tjq +cyD +cyD jdj -tjq cyD -kbl +cyD +cyD jdj phr -nlD -nlD -nlD +dNv +dNv +dNv fnF -tjq -tjq -tjq -tjq -tjq +cyD +cyD +cyD +cyD +cyD rUF rUF psc @@ -57765,8 +57662,8 @@ wZQ wZQ wZQ hlO -ybN -cVd +hlO +bNR xzG tKm lkp @@ -57799,26 +57696,26 @@ piB piB viO jRq -nlD +dNv fnF -tjq -tjq +cyD +cyD cyD jdj -tjq -tjq -tjq +cyD +cyD +cyD jdj -tjq -nlD -tjq +cyD +dNv +cyD jdj jdj -kbl -tjq -tjq -tjq -tjq +cyD +cyD +cyD +cyD +cyD dqg rUF jNg @@ -57959,7 +57856,7 @@ hJE gvL wZQ lhx -ybN +hlO bNR uTr xrR @@ -57989,30 +57886,30 @@ kkT dtm pcK vde -tjq +cyD nmp jdj xgT -nlD +dNv jdj xgT -tjq -tjq +cyD +cyD jdj -tjq +cyD xgT cyD jdj kSZ -nlD -tjq +dNv +cyD jdj xRc -tjq -tjq -tjq -tjq -tjq +cyD +cyD +cyD +cyD +cyD dqg rUF jNg @@ -58153,8 +58050,8 @@ izy okP wZQ oZE -ybN -cVd +hlO +bNR uTr uTr uTr @@ -58187,7 +58084,7 @@ jdj jdj jdj jdj -nlD +dNv jdj jdj jdj @@ -58197,16 +58094,16 @@ jdj jdj jdj jdj -tjq -dcn -tjq +cyD +dNv +cyD jdj teS -tjq -tjq -tjq +cyD +cyD +cyD ksB -tjq +cyD dqg rUF jNg @@ -58347,8 +58244,8 @@ xvm sve wZQ qtd -ybN -cVd +hlO +bNR uTr kXy ygA @@ -58357,7 +58254,7 @@ njW hcC uTr ehT -ybN +hlO wPz byt fop @@ -58381,7 +58278,7 @@ kSZ kSZ xkf jdj -nlD +dNv nTl vde cyD @@ -58389,11 +58286,11 @@ fOY gXA jdj cyD -tjq +cyD kSZ -tjq -nlD -tjq +cyD +dNv +cyD jdj lAI jdj @@ -58541,8 +58438,8 @@ pgF izz wZQ qYe -ybN -cVd +hlO +bNR uTr uKO ygA @@ -58554,7 +58451,7 @@ byt byt byt byt -ybN +hlO qJG jBm izO @@ -58571,31 +58468,31 @@ eaB nEf xCr wIY -nlD -nlD -nlD +dNv +dNv +dNv kAa -nlD -nlD -nlD -nlD -nlD -nlD -nlD -nlD -nlD -nlD -nlD -nlD -tjq +dNv +dNv +dNv +dNv +dNv +dNv +dNv +dNv +dNv +dNv +dNv +dNv +cyD jdj -tjq -tjq -tjq -tjq -rNn -rNn -rNn +cyD +cyD +cyD +cyD +sEA +sEA +sEA rUF jNg klc @@ -58734,14 +58631,14 @@ bRC pgF oAh wZQ -ybN -ybN +hlO +hlO tot uTr ygA abL tEj -tqE +njW njW uTr byt @@ -58765,31 +58662,31 @@ gvc wzN nuL wIY -nlD +dNv phr jdj jdj -tjq -tjq -tjq +cyD +cyD +cyD jdj kSZ -tjq +cyD cyD kSZ lAI jdj cyD -nlD +dNv kSZ jdj oGE -tjq -tjq -tjq +cyD +cyD +cyD wLx mUO -rNn +sEA rUF jNg klc @@ -58929,8 +58826,8 @@ hgn dnu wZQ qLs -ybN -cVd +hlO +bNR uTr uTr uTr @@ -58939,7 +58836,7 @@ sXj njW uTr byt -ybN +hlO ugo tnA mBh @@ -58974,16 +58871,16 @@ jdj jdj jdj jdj -nlD -kWe +dNv +dkf jdj jdj jdj eXv -tjq +cyD rku mGw -rNn +sEA rUF jNg psc @@ -59123,8 +59020,8 @@ cVE xIb wZQ ehT -ybN -cVd +hlO +bNR uTr xpv jVj @@ -59153,16 +59050,16 @@ bkP ljJ dDm wIY -nlD -tjq +dNv +cyD jdj -tjq -eZM +cyD +cyD iwC -tjq +cyD jdj tvy -lMv +cyD kBR jdj fDQ @@ -59172,12 +59069,12 @@ vIe jdj jdj teS -tjq -kbl -tjq +cyD +cyD +cyD pQg jhs -rNn +sEA rUF jNg psc @@ -59347,7 +59244,7 @@ qzE fUE hJp wIY -nlD +dNv tUY jdj bWZ @@ -59362,15 +59259,15 @@ jdj mYH cyD wbu -nlD +dNv lAI jdj xRc -tjq -tjq -tjq -rNn -rNn +cyD +cyD +cyD +sEA +sEA rUF rUF psc @@ -59511,7 +59408,7 @@ nTC nTC nTC nTC -ybN +hlO bNR uTr uTr @@ -59542,28 +59439,28 @@ woe cdx wIY dRO -kbl +cyD jdj cta rjP qBJ -tjq +cyD jdj sYf bVS sZk jdj fNJ -tjq +cyD jdj dRO -nlD +dNv uEN -nlD -nlD -nlD -nlD -rNn +dNv +dNv +dNv +dNv +sEA bph rUF jNg @@ -59706,12 +59603,12 @@ djp nTC nTC rUV -cVd +bNR +byt byt byt byt byt -lbc rdF byt byt @@ -59735,13 +59632,13 @@ fLD rpb bEg wIY -nlD +dNv aRg jdj iwC mmA iwC -eZM +cyD jdj veF aYQ @@ -59750,13 +59647,13 @@ jdj qOl xCy jdj -nlD +dNv dkf jdj wne phr -tjq -tjq +cyD +cyD lft bph xRj @@ -59900,14 +59797,14 @@ lgi nTC eYO jah -cVd +bNR tkR dBP ehT abL vOz rUV -ybN +hlO byt vEl ugo @@ -59929,8 +59826,8 @@ rCH jDn piy wIY -nlD -kbl +dNv +cyD jdj jdj jdj @@ -60093,8 +59990,8 @@ eaK gCd nTC nTC -ybN -cVd +hlO +bNR aLV aLV aLV @@ -60123,24 +60020,24 @@ wIY wIY wIY wIY -nlD +dNv eFX -tjq +cyD jdj acq ssZ -tjq -tjq +cyD +cyD dvz kSZ pop -tjq +cyD dJe jdj -tjq -nlD -kbl -tjq +cyD +dNv +cyD +cyD cyD ssZ mhR @@ -60295,11 +60192,11 @@ kYE oZB aLV rZy -ybN +hlO byt xFb hcC -pNr +kXy ehT hlO xZS @@ -60318,25 +60215,25 @@ yfy jPM jdj rlA -nlD -dcn +dNv +dNv kNs -nlD -dcn -nlD -nlD -nlD -dcn -nlD -nlD -nlD +dNv +dNv +dNv +dNv +dNv +dNv +dNv +dNv +dNv kNs -nlD -dcn -nlD -nlD -nlD -tjq +dNv +dNv +dNv +dNv +dNv +cyD aKv kRj jNg @@ -60492,7 +60389,7 @@ byt byt byt byt -lbc +byt byt byt byt @@ -60505,33 +60402,33 @@ kgu jRj gKk tjQ -gUz +tjQ tjQ tjQ jRq bAb jdj -nlD -tjq -tjq +dNv +cyD +cyD wCb -tjq -nlD -tjq -kbl -tjq -tjq -dcn -tjq -tjq +cyD +dNv +cyD +cyD +cyD +cyD +dNv +cyD +cyD wCb -tjq +cyD kSZ kSZ aMc lzA -tjq -tjq +cyD +cyD kRj jNg jNg @@ -60683,7 +60580,7 @@ bLT qXL aLV byt -ybN +hlO jYs jYs jYs @@ -60700,14 +60597,14 @@ fnO wWq vde gJD -tjq -tjq -nlD +cyD +cyD +dNv mRK jdj -dcn -tjq -tjq +dNv +cyD +cyD jdj jdj wni @@ -60870,14 +60767,14 @@ lcW nTC eYO jah -lXu +sMo aLV aLV aLV aLV aLV byt -ybN +hlO jYs dXG eSO @@ -60895,21 +60792,21 @@ vRx wWq wWq wWq -nRY -dcn -nlD +teS +dNv +dNv fnF -nlD -tjq -tjq +dNv +cyD +cyD jdj -tjq +cyD wFM cex -kbl +cyD cyD rUP -nlD +dNv dfS qwz qwz @@ -61068,7 +60965,7 @@ sMo tQS fZF byt -lbc +byt byt byt byt @@ -61089,21 +60986,21 @@ brF iDg iDg wWq -tjq -tjq +cyD +cyD uEM jdj -tjq -tjq +cyD +cyD cyD jdj cyD -nlD -nlD -nlD -nlD -dcn -nlD +dNv +dNv +dNv +dNv +dNv +dNv dfS qwz pcl @@ -61257,12 +61154,12 @@ nTC ecK nTC nTC -ybN +hlO sMo uTr ehT qXW -ybN +hlO xpH xpH gMn @@ -61284,19 +61181,19 @@ iDg iDg wWq tve -kbl +cyD egZ jdj -tjq +cyD tUY -tjq +cyD jdj kSZ -tjq +cyD oni lzA bIg -tjq +cyD kSZ dfS qwz diff --git a/maps/triumph/levels/flagship.dmm b/maps/triumph/levels/flagship.dmm index 487e4c446f3d..b0e44847bd9c 100644 --- a/maps/triumph/levels/flagship.dmm +++ b/maps/triumph/levels/flagship.dmm @@ -585,7 +585,8 @@ /obj/machinery/vending/cigarette, /obj/machinery/light{ dir = 8; - use_power = 0 + use_power = 0; + old_wall = 1 }, /turf/simulated/shuttle/floor/darkred, /area/shuttle/escape) @@ -1989,7 +1990,9 @@ }, /area/centcom/medical) "gf" = ( -/obj/machinery/vending/cigarette, +/obj/machinery/vending/mre{ + emagged = 1 + }, /turf/unsimulated/floor/wood, /area/centcom/restaurant) "gh" = ( @@ -2636,6 +2639,14 @@ icon_state = "white" }, /area/centcom/control) +"in" = ( +/obj/machinery/light{ + dir = 4; + use_power = 0; + old_wall = 1 + }, +/turf/simulated/shuttle/floor/white, +/area/shuttle/escape) "ip" = ( /obj/machinery/porta_turret/crescent{ density = 1 @@ -4699,6 +4710,12 @@ }, /turf/unsimulated/floor/steel, /area/centcom/control) +"pa" = ( +/obj/structure/handrail{ + dir = 4 + }, +/turf/simulated/shuttle/floor/white, +/area/shuttle/escape) "pb" = ( /obj/machinery/status_display{ pixel_y = 29 @@ -9707,7 +9724,8 @@ }, /obj/machinery/light{ dir = 4; - use_power = 0 + use_power = 0; + old_wall = 1 }, /turf/simulated/shuttle/floor/darkred, /area/shuttle/escape) @@ -9907,6 +9925,10 @@ icon_state = "white" }, /area/centcom/medical) +"Gg" = ( +/obj/structure/handrail, +/turf/simulated/shuttle/floor/black, +/area/shuttle/escape) "Gh" = ( /obj/machinery/mecha_part_fabricator, /turf/unsimulated/floor/steel, @@ -10852,6 +10874,12 @@ /obj/structure/table/woodentable, /turf/unsimulated/floor/wood, /area/centcom/restaurant) +"Jg" = ( +/obj/structure/handrail{ + dir = 1 + }, +/turf/simulated/shuttle/floor/black, +/area/shuttle/escape) "Ji" = ( /obj/effect/floor_decal/corner/blue{ dir = 6 @@ -12167,7 +12195,8 @@ /obj/machinery/vending/medical, /obj/machinery/light{ dir = 8; - use_power = 0 + use_power = 0; + old_wall = 1 }, /turf/simulated/shuttle/floor, /area/shuttle/escape) @@ -12605,11 +12634,16 @@ }, /turf/unsimulated/floor/steel, /area/centcom/evac) +"Ox" = ( +/obj/structure/handrail, +/turf/simulated/shuttle/floor, +/area/shuttle/escape) "Oz" = ( /obj/machinery/vending/fitness, /obj/machinery/light{ dir = 8; - use_power = 0 + use_power = 0; + old_wall = 1 }, /turf/simulated/shuttle/floor/darkred, /area/shuttle/escape) @@ -13569,7 +13603,10 @@ }, /area/centcom/security) "Rx" = ( -/obj/machinery/light, +/obj/machinery/light{ + old_wall = 1; + use_power = 0 + }, /turf/simulated/shuttle/floor/black, /area/shuttle/escape) "Ry" = ( @@ -14357,7 +14394,8 @@ "Ui" = ( /obj/machinery/light{ dir = 8; - use_power = 0 + use_power = 0; + old_wall = 1 }, /turf/simulated/shuttle/floor/white, /area/shuttle/escape) @@ -15216,7 +15254,8 @@ }, /obj/machinery/light{ dir = 4; - use_power = 0 + use_power = 0; + old_wall = 1 }, /turf/simulated/shuttle/floor, /area/shuttle/escape) @@ -29440,7 +29479,7 @@ jQ wG Pn yz -Pn +in wG jQ jQ @@ -29823,15 +29862,15 @@ AF AF AF jQ -CG +Gg yz Ui +pa yz -yz -yz +pa Ui yz -CG +Jg jQ AF AF @@ -30987,7 +31026,7 @@ AF AF AF jQ -CG +Gg yz Pn yz @@ -30995,7 +31034,7 @@ yz yz yz Pn -CG +Jg jQ AF AF @@ -31379,8 +31418,8 @@ Ne AA OZ jQ -CG -CG +Gg +Jg jQ ze lM @@ -31763,7 +31802,7 @@ AF AF AF jQ -Sp +Ox Sp dx mE @@ -31961,8 +32000,8 @@ mA Sp dx jQ -CG -CG +Gg +Jg jQ nb lM @@ -32349,8 +32388,8 @@ Sp Sp Sp jQ -CG -CG +Gg +Jg jQ lM lM diff --git a/tgui/packages/common/README.md b/tgui/packages/common/README.md new file mode 100644 index 000000000000..a2d3121989ef --- /dev/null +++ b/tgui/packages/common/README.md @@ -0,0 +1,3 @@ +# Common + +This is explicitly only for functions and other helpers. diff --git a/tgui/packages/tgui-panel/ping/PingIndicator.js b/tgui/packages/tgui-panel/ping/PingIndicator.tsx similarity index 100% rename from tgui/packages/tgui-panel/ping/PingIndicator.js rename to tgui/packages/tgui-panel/ping/PingIndicator.tsx diff --git a/tgui/packages/tgui-panel/ping/constants.js b/tgui/packages/tgui-panel/ping/constants.ts similarity index 100% rename from tgui/packages/tgui-panel/ping/constants.js rename to tgui/packages/tgui-panel/ping/constants.ts diff --git a/tgui/packages/tgui/assets.js b/tgui/packages/tgui/assets.ts similarity index 100% rename from tgui/packages/tgui/assets.js rename to tgui/packages/tgui/assets.ts diff --git a/tgui/packages/tgui/components/Sprite.tsx b/tgui/packages/tgui/components/Sprite.tsx index 465e968606fe..9aab94cefe75 100644 --- a/tgui/packages/tgui/components/Sprite.tsx +++ b/tgui/packages/tgui/components/Sprite.tsx @@ -25,3 +25,5 @@ export const Sprite = (props: SpriteProps) => { ])} /> ); }; + +// todo: this is all kind of terrible; we need a way to autodetect sizeKeys too so it's more friendly to users. diff --git a/tgui/packages/tgui/interfaces/JoinMenu.tsx b/tgui/packages/tgui/interfaces/JoinMenu.tsx index 007bdbbe9ab6..efba4d6385f3 100644 --- a/tgui/packages/tgui/interfaces/JoinMenu.tsx +++ b/tgui/packages/tgui/interfaces/JoinMenu.tsx @@ -58,17 +58,27 @@ export const JoinMenu = (props, context) => {
- Round Duration: {data.duration}
- Security Level: {data.security_level} - {!!data.evacuated && ( -
- {(data.evacuated === 2)? "A crew transfer is in progress."
- : ((data.evacuated === 3)? "The installation has been evacuated."
- : "An evacuation is in progress.")}
-
- )}
+
+
+ Round Duration: {data.duration}
+
+
+ Security Level: {data.security_level}
+
+
+
+ {!!data.evacuated && (
+
+ {(data.evacuated === 2)? "A crew transfer is in progress."
+ : ((data.evacuated === 3)? "The installation has been evacuated."
+ : "An evacuation is in progress.")}
+
+ )}
+
+
+
@@ -135,7 +145,7 @@ const JoinFaction = (props: JoinFactionProps, context) => {
});
return (
-
+
{
ordered.map((depName) => {
const jobs: JoinableJob[] = props.departments[depName];
@@ -168,7 +178,7 @@ const JoinFaction = (props: JoinFactionProps, context) => {
);
})
}
-
+
);
};
diff --git a/tgui/packages/tgui/interfaces/Telecomms.js b/tgui/packages/tgui/interfaces/Telecomms.js
index ad83346594c3..ec2ab04403b8 100644
--- a/tgui/packages/tgui/interfaces/Telecomms.js
+++ b/tgui/packages/tgui/interfaces/Telecomms.js
@@ -146,7 +146,7 @@ export const Telecomms = (props, context) => {
))}
-
+ act('freq')} />}>
{frequencies.map(entry => (
About the life of a xenomorph Part 1, by Dr. xbio. Peter Steffans
+A simplification of the lifecycle of xenomorphs, written for laymen with a general interest in Xenomorphs.
+Birth
+Xenomorph Larvae have two primary ways to come into existance.
+Facehuggers and Hatching
+The Xenomorph Queen lays eggs, these eggs mature and from them, a Face hugger can be harvested. Movement around the egg can cause the facehugger to emerge on its own.
+ The Facehugger has a quite descriptive name, as its only purpose in life seems to be to jump onto, and hug a face. It is to note here, that the proportions seem to be mostly adapted for human, and similar creatures. While humanoid species with snouts, or beaks are less easily ensnared by the facehuggers many legs (They vary from 6 to 12), they are not immune to the attack.
+ While latched onto the Face the Facehugger forces a very small larvae into its victim, before dying off, leaving the victim with a unwelcome passenger.
+ The Facehugger itself dies of after leaving the egg for to long, survival durations can vary, between a few minutes up to a couple days (when the specimen was suspended in sugarwater). There have been reports of Facehuggers surviving for a couple hours moving around on their own, before ambushing crew members.
+ Inside the host, the larvae goes on a rampage, consuming interal organs, and other tissues almost indiscriminately, growing rapidly, before eating its way out of the hosts torso, creating a gaping hole leading, which is certainly lethal, if the destroyed internals werent already.
+ Larvae that hatched this way often called red larvae, due to the blood coating them after hatching.
'Spawn' pool
+Decently established hives can create one or more pools of a acidic biomass slurry.
+ These pools are a waste dump for any biomass the hive has no other use for, from hatched corpses to plant matter, depending on the situation they can discard still clothed bodies into the pools, but leftover equipment can then be found in all depths of the pool, and sometimes grown into larvae, which usually leads to an early death of the affected creature.
+ Larvae from a 'spawn' pool are called green larvae(due to the coloration of the pool)
Larvae
+Most of the time larvae just patrole the inner hive, feeding on weeds until they can evolve into a proper xenomorph.
+ There are how ever reports of larvae just rushing at attacking forces(be it marines, colonists or PMC). It is uncertain if such behaviour comes from a lack of connection to the hive in those larvae or a different defect.
+ Unconfirmed reports suggest that larvae might also function as scouts/observers, utilizing their small and flexible form to reach places other xenomorphs can not reach.
First evolution step
+After just a few minutes(sometimes just seconds) the larvae evolves and takes up a role in the hive.
+ There is 4 main types of xenomorphs at this level:
Drone
+Drones serve primary as maintainers of the hive, their build resin structures, look after hosts, remove corpses, feed the spawn pools.
+ They arent particular fast, but comparatively strong and dexterous, making them decent kidnappers.
+ In most cases the follow up queens of a hive. Reports of hybrids and field teams support this, but there are exceptions.
Runner
+Runner are the hives shock troopers, incredible fast, not particular durable, deliver not nessecary lethal, but slowing cuts. They try to flank and haress attackers.
+ They also serve as scouts, and occasionally kidnappers
Defender
+Defenders are bulky, strong, and resilient.
+ They have the thickest chitin of the four.
+ They can take a fair bit of bullets and still break a soldiers arm/leg/rib, not as fast as the others.
Sentinel
+Sentinels are a quick and weak xenomorph, that focuses on defending the hive, rarely seen during xenomorph attacks.
+ Their primary means of attack is a neurotoxin which seems to work almost species independent.
+ They can deliver the toxin either by spit (leading to a small fog cloud on impact, inhilation of that cloud is sufficent!), or sting (usually done by ambush, or to soldiers dragged away by drones/runners)
Further evolution steps
+While the interlectual community is split about names and exact properties of specific further evolution steps, and Xenomorph Hybrids being unable to vocalize names for the different evolution steps, the JSDF has created a visual guide for their Marines to help them know what to expect from a particular xenomorph.
+Specialists
+Generally evolving from Drones, these xenomorphs continue to maintain the hive primarily.
+'Hivelord'
+Larger and more bulky than drones these xenomorph are capable of creating large amounts of resin in short amounts of time, and reinforcing existing structures to take longer to take down.
+'Carrier'
+Alot taller than a drone, but in exchange capable of carrying and sustaining so called facehuggers for extended periods of time, also seen to carry smaller wounded xenomorphs away, or captured soldiers.
+'Burrower'
+If Carriers are the hives caseevac then burrowers are the hives Pioneers. They create underground tunnels, sometimes even through bedrock, and use their digging claws to destroy fortifications.
+Frontliner
+While Defenders are the common 'infantry' of the hive, these evolutions lean further into different parts of its combat capability.
+'Warrior'
+Taking a more bowed forward stance, the Warrior uses its thick skull plate and mandibles to ram and slash its targets, while using the proximity to single out individual soldiers.
+'Crusher'
+Utilizing speed, thick metalrich chitin plates, and alot of muscle the crusher tramples soldiers and fortifications alike. Particular old crushers have been seen pushing and sometimes flipping Tanks around.
+Shock-Trooper
+Furthering the hit and run, or ambush capabilities of the Runner.
+'Lurker'
+Lurker emit a particular enzyme on their chitin that allows there grown weeds to take on quite peculiar optical properties giving the Lurker very good active camoflage.
+'Wraith'
+As if almost invisible Xenomorphs werent bad enough, the wraith is capable of short range translocation, and 'phaseshift'(exact physics behind this are unknown). Making the Wraith a not so lethal but very chaotic element on the battlefield.
+'Ravager'
+Quite a massive creature primarily wielding two sythe shaped claws that can, will, and have cut through spaceship grade armored bulkheads like their are butter(Cold butter but still far to easily.)
+Chemical
+When spitting and injecting Neurotoxin isnt enough to deal with the threat, these Evolutions can be encountered.
+'Spitter'
+Giving up the ability to sting, the Spitter focuses on delivering Neurotoxin, or acid through a focused glob of either toxic or corrosive goo.
+'Defiler'
+Prefering to sting people that spit at them, the defiler can choose from an array of interesting compounds to deliver through a surprisingly sharp needle. From neurotoxin, to xenomorph larvae.
+'Boiler'
+The xenomorph version of a mortar. Delivering clouds of toxic or corrosive gas behind barricades, into chokepoints or where ever the hive wants it.
+'Praetorian'
+Praetorians are quite graceful as they walk over the battlefield, usually accompanying the queen. Their tactics are much less so, usually being a spray and pray style, delivering large amounts of either acid or neurotoxin in its direct surroundings, while using the chaos to get some slices with thier claws in.
+and many more
+There are about eight to eleven hundred more subcategorizations of xenomorphs, that we have autopsy and sighting reports off, but those mentioned above cover those that are frequent enough. And minor variations in toxin composition or claw length would simply strech this book beyond the limits of my publisher.
+The Queen
+At the core of every hive found around the frontier is a Queen. These massive and gigantic variation of xenomorph have some quite unique abilities.
+ As mentioned above, they are capable of laying eggs, containing facehuggers, they are also capable of dominating the xenomorph hivemind, making them the defacto leader of the hive.
+ Their psychic abilities are potent enough that they are capable of installing primal messages into the thought process of other species. This 'psychic whisper' seems to be based on such a basic level that it is a biologic communication, unbound of language or vocabulary, with the receiving brain trying and making the most sense of the whispered message. The message appears inside the recipient's mind in its preferred language.
+ Their size give the queen sufficient surface area and mass to emit shrieks, capable of piercing ear protection and often times pushing soldiers off balance.
+ Overall the queen combines features of all four types of xenomorph, having a spit attack, sharp claws, the ability to build and maintain resin structures, and many more situational capabilities
'Shrike'
+Smaller but not less terrifying than a queen.
+ Shrikes can be seen leading small outgrowths of the hive.
+ Still capable of laying eggs, even though at lower quantity, shrikes are often found leading 'underdeveloped' hives, usually these 'hives' are just a 'scouting party' to assess the local situation.
+ There have been situations where there was just the one hive with a shrike at its head on the planet, but most sightings of a shrike were indicators for a larger hive somewhere else on the planet.
Capabilities
+The shrike serves as a herald for the queen, seen at the frontlines much more often than the queen herself. It utilizes its smaller frame for flinging small groups of soldiers around, before letting the other xenomorphs finish them off.
+ Its name the Shrike has earned for its affinity to impale soldiers on its Tail.
'King'
+Not really an alternate version of the queen, the king is probably the most capable combat variation of the xenomorphs.
+ It seems to have an even more devastating shrieks than the queen, shattering freshly set bones, and toppling even braced soldiers.
+ Its claws rend flesh and bones apart, and it is capable of localized EMP pulses.
- ])
-
+ ])
+
is applied on 0. var/sort_order = 0 - //! HUD + //* HUD /// our screen loc var/hud_position - //! Grammar + //* Grammar /// player friendly name var/display_name = "unknown" /// player friendly preposition @@ -105,7 +105,7 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) /// is this a "plural" slot? var/display_plural = FALSE - //! Equip Checks + //* Equip Checks /// equip checks to use var/slot_equip_checks = NONE /// slot flags required to have if checking @@ -113,13 +113,13 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) /// slot flags forbidden to have if checking var/slot_flags_forbidden = NONE - //! Stripping + //* Stripping /// always show on strip/force equip menu, or only show when full var/always_show_on_strip_menu = TRUE /// default INV_VIEW flags for stripping var/default_strip_inv_view_flags = NONE - //! Rendering + //* Rendering /// rendering slot key var/render_key /// rendering plural slot key - only set on base type of plural slots @@ -136,14 +136,26 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) VAR_PRIVATE/list/render_dim_y_cache /// fallback states; if set for a bodytype, that bodytype converts to this if not in worn_bodytypes, rather than defaulted. VAR_PROTECTED/list/render_fallback + /// cascade renders to these slot ids + // todo: this should be flag-based; for a future refactor via /datum/inventory, not hardcoded! + VAR_PROTECTED/list/legacy_visibility_sensitive_slots = list() -/datum/inventory_slot_meta/New() +/datum/inventory_slot/New() if(!id && (inventory_slot_flags & INV_SLOT_ALLOW_RANDOM_ID)) id = "[++id_next]" + // resolve typepaths to ids + for(var/i in 1 to length(legacy_visibility_sensitive_slots)) + var/what = legacy_visibility_sensitive_slots[i] + if(ispath(what, /datum/inventory_slot)) + var/datum/inventory_slot/resolving = what + if(!initial(resolving.id)) + stack_trace("no id on [resolving]; cascade render slot targets should have hardcoded ids at this point in time") + legacy_visibility_sensitive_slots[i] = initial(resolving.id) + rebuild_rendering_caches() -/datum/inventory_slot_meta/proc/_equip_check(obj/item/I, mob/wearer, mob/user, flags) +/datum/inventory_slot/proc/_equip_check(obj/item/I, mob/wearer, mob/user, flags) if(slot_equip_checks & SLOT_EQUIP_CHECK_USE_FLAGS) if(!(flags & INV_OP_FORCE)) if(!CHECK_MULTIPLE_BITFIELDS(I.slot_flags, slot_flags_required)) @@ -158,16 +170,30 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) /** * checked if slot_equip_checks specifies to use proc */ -/datum/inventory_slot_meta/proc/allow_equip(obj/item/I, mob/wearer, mob/user, force) +/datum/inventory_slot/proc/allow_equip(obj/item/I, mob/wearer, mob/user, force) return TRUE /** * checks for obfuscation when making the strip menu */ -/datum/inventory_slot_meta/proc/strip_obfuscation_check(obj/item/equipped, mob/wearer, mob/user) +/datum/inventory_slot/proc/strip_obfuscation_check(obj/item/equipped, mob/wearer, mob/user) return default_strip_inv_view_flags -/datum/inventory_slot_meta/proc/rebuild_rendering_caches() +//* Rendering *// + +// todo: shouldn't have to specify bodytype +// todo: yes we should? otherwise we can't tell it to render differently against a mob's default bodytype. +/datum/inventory_slot/proc/render(mob/wearer, obj/item/item, bodytype) + return item.render_mob_appearance(wearer, id, bodytype) + +/datum/inventory_slot/proc/should_render(mob/wearer, obj/item/item) + return TRUE + +/datum/inventory_slot/proc/cascade_render_visibility(mob/wearer, obj/item/item) + for(var/slot_id in legacy_visibility_sensitive_slots) + wearer.inventory.update_slot_visible(slot_id, FALSE) + +/datum/inventory_slot/proc/rebuild_rendering_caches() PROTECTED_PROC(TRUE) // if you think you need this outside you should rethink render_state_cache = list() render_dim_x_cache = list() @@ -193,7 +219,7 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) /** * returns (icon, dim_x, dim_y) if found in defaults, null if not */ -/datum/inventory_slot_meta/proc/resolve_default_assets(bodytype, state, mob/wearer, obj/item/equipped, inhand_domain) +/datum/inventory_slot/proc/resolve_default_assets(bodytype, state, mob/wearer, obj/item/equipped, inhand_domain) var/bodytype_str = bodytype_to_string(bodytype) if(!render_state_cache[bodytype_str]?[state]) return @@ -202,7 +228,7 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) /** * returns layer */ -/datum/inventory_slot_meta/proc/resolve_default_layer(bodytype, mob/wearer, obj/item/equipped, inhand_domain) +/datum/inventory_slot/proc/resolve_default_layer(bodytype, mob/wearer, obj/item/equipped, inhand_domain) if(!islist(render_layer)) return render_layer var/index = 1 @@ -214,7 +240,7 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) index = (B.show_above_suit == 1)? 2 : 1 return render_layer[clamp(index, 1, length(render_layer))] -/datum/inventory_slot_meta/proc/handle_worn_fallback(bodytype, list/worn_data) +/datum/inventory_slot/proc/handle_worn_fallback(bodytype, list/worn_data) var/bodytype_str = bodytype_to_string(bodytype) if(!render_fallback[bodytype_str]) return FALSE @@ -224,11 +250,13 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) worn_data[WORN_DATA_STATE] = render_fallback[bodytype_str] return TRUE -/datum/inventory_slot_meta/inventory - abstract_type = /datum/inventory_slot_meta/inventory +//? Implementations ?// + +/datum/inventory_slot/inventory + abstract_type = /datum/inventory_slot/inventory inventory_slot_flags = INV_SLOT_IS_RENDERED | INV_SLOT_IS_INVENTORY | INV_SLOT_IS_STRIPPABLE | INV_SLOT_HUD_REQUIRES_EXPAND | INV_SLOT_CONSIDERED_WORN -/datum/inventory_slot_meta/inventory/back +/datum/inventory_slot/inventory/back name = "back" render_key = "back" id = SLOT_ID_BACK @@ -248,9 +276,9 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) render_fallback = list( BODYTYPE_STRING_TESHARI = "_fallback_" ) - render_layer = BACK_LAYER + render_layer = HUMAN_LAYER_SLOT_BACKPACK -/datum/inventory_slot_meta/inventory/uniform +/datum/inventory_slot/inventory/uniform name = "uniform" render_key = "under" id = SLOT_ID_UNIFORM @@ -272,7 +300,10 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) BODYTYPE_STRING_TESHARI = "_fallback_", BODYTYPE_STRING_VOX = "_fallback_", ) - render_layer = UNIFORM_LAYER + render_layer = HUMAN_LAYER_SLOT_UNIFORM + legacy_visibility_sensitive_slots = list( + SLOT_ID_SHOES, + ) /// list of rolldown icons; must DIRECTLY corrospond to default icons. var/list/render_rolldown_icons = list( @@ -290,7 +321,7 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) /// list of rollsleeve states var/list/render_rollsleeve_states -/datum/inventory_slot_meta/inventory/uniform/rebuild_rendering_caches() +/datum/inventory_slot/inventory/uniform/rebuild_rendering_caches() . = ..() render_rolldown_states = list() for(var/bodytype_str in render_rolldown_icons) @@ -317,7 +348,7 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) for(var/state in render_rollsleeve_states[bodytype_str]) render_rollsleeve_states[bodytype_str][state] = TRUE -/datum/inventory_slot_meta/inventory/uniform/resolve_default_assets(bodytype, state, mob/wearer, obj/item/equipped, inhand_domain) +/datum/inventory_slot/inventory/uniform/resolve_default_assets(bodytype, state, mob/wearer, obj/item/equipped, inhand_domain) if(!istype(equipped, /obj/item/clothing/under)) return ..() var/obj/item/clothing/under/U = equipped @@ -331,13 +362,47 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) else return ..() -/datum/inventory_slot_meta/inventory/uniform/proc/check_rolldown_cache(bodytype, state) +/datum/inventory_slot/inventory/uniform/proc/check_rolldown_cache(bodytype, state) return render_rolldown_states[bodytype_to_string(bodytype)]?[state] -/datum/inventory_slot_meta/inventory/uniform/proc/check_rollsleeve_cache(bodytype, state) +/datum/inventory_slot/inventory/uniform/proc/check_rollsleeve_cache(bodytype, state) return render_rollsleeve_states[bodytype_to_string(bodytype)]?[state] -/datum/inventory_slot_meta/inventory/head +/datum/inventory_slot/inventory/uniform/should_render(mob/wearer, obj/item/item) + if(!ishuman(wearer)) + return ..() + var/mob/living/carbon/human/casted_human = wearer + if((casted_human.wear_suit?.inv_hide_flags) & HIDEJUMPSUIT) + return FALSE + return ..() + + +/datum/inventory_slot/inventory/uniform/render(mob/wearer, obj/item/item, bodytype) + . = ..() + if(!ishuman(wearer)) + return + var/mob/living/carbon/human/human = wearer + var/icon/clipmask = human.tail_style?.clip_mask + if(!clipmask) + return + var/tail_rendered = !!human.standing_overlays[HUMAN_OVERLAY_TAIL] + if(!tail_rendered) + return + if(istype(item, /obj/item/clothing/suit)) + var/obj/item/clothing/suit/suit = item + if(suit.inv_hide_flags & HIDETAIL) + return + if(suit.taurized) + return + var/list/mutating + if(!islist(.)) + mutating = list(.) + else + mutating = . + for(var/image/appearancelike as anything in mutating) + appearancelike.filters += filter(arglist(alpha_mask_filter(icon = clipmask))) + +/datum/inventory_slot/inventory/head name = "head" render_key = "head" id = SLOT_ID_HEAD @@ -367,9 +432,12 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) BODYTYPE_STRING_ZORREN_HIGH = 'icons/mob/clothing/species/fox/helmet.dmi', BODYTYPE_STRING_UNATHI_DIGI = 'icons/mob/clothing/species/unathidigi/head.dmi', ) - render_layer = HEAD_LAYER + render_layer = HUMAN_LAYER_SLOT_HEAD + legacy_visibility_sensitive_slots = list( + SLOT_ID_HEAD, + ) -/datum/inventory_slot_meta/inventory/suit +/datum/inventory_slot/inventory/suit name = "outerwear" render_key = "suit" id = SLOT_ID_SUIT @@ -401,9 +469,44 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) BODYTYPE_STRING_ZADDAT = 'icons/mob/clothing/species/zaddat/suits.dmi', BODYTYPE_STRING_UNATHI_DIGI = 'icons/mob/clothing/species/unathidigi/suits.dmi', ) - render_layer = SUIT_LAYER + render_layer = HUMAN_LAYER_SLOT_OVERSUIT + legacy_visibility_sensitive_slots = list( + SLOT_ID_UNIFORM, + SLOT_ID_SHOES, + ) -/datum/inventory_slot_meta/inventory/belt +/datum/inventory_slot/inventory/suit/render(mob/wearer, obj/item/item, bodytype) + . = ..() + if(!ishuman(wearer)) + return + var/mob/living/carbon/human/human = wearer + var/icon/clipmask = human.tail_style?.clip_mask + if(!clipmask) + return + var/tail_rendered = !!human.standing_overlays[HUMAN_OVERLAY_TAIL] + if(!tail_rendered) + return + if(istype(item, /obj/item/clothing/suit)) + var/obj/item/clothing/suit/suit = item + if(suit.taurized) + return + var/list/mutating + if(!islist(.)) + mutating = list(.) + else + mutating = . + for(var/image/appearancelike as anything in mutating) + appearancelike.filters += filter(arglist(alpha_mask_filter(icon = clipmask))) + +/datum/inventory_slot/inventory/suit/cascade_render_visibility(mob/wearer, obj/item/item) + . = ..() + var/mob/living/carbon/human/casted = wearer + if(!istype(casted)) + return + casted.render_spriteacc_tail() + casted.render_spriteacc_wings() + +/datum/inventory_slot/inventory/belt name = "belt" render_key = "belt" id = SLOT_ID_BELT @@ -420,16 +523,16 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) BODYTYPE_STRING_WEREBEAST = 'icons/mob/clothing/species/werebeast/belt.dmi', BODYTYPE_STRING_UNATHI_DIGI = 'icons/mob/clothing/species/unathidigi/belt.dmi', ) - render_layer = list(BELT_LAYER, BELT_LAYER_ALT) + render_layer = list(HUMAN_LAYER_SLOT_BELT, HUMAN_LAYER_SLOT_BELT_ALT) -/datum/inventory_slot_meta/inventory/pocket - abstract_type = /datum/inventory_slot_meta/inventory/pocket +/datum/inventory_slot/inventory/pocket + abstract_type = /datum/inventory_slot/inventory/pocket sort_order = 2000 inventory_slot_flags = INV_SLOT_IS_INVENTORY | INV_SLOT_IS_STRIPPABLE slot_equip_checks = SLOT_EQUIP_CHECK_USE_PROC default_strip_inv_view_flags = INV_VIEW_OBFUSCATE_HIDE_ITEM_NAME | INV_VIEW_STRIP_FUMBLE_ON_FAILURE | INV_VIEW_STRIP_IS_SILENT -/datum/inventory_slot_meta/inventory/pocket/allow_equip(obj/item/I, mob/wearer, mob/user, force) +/datum/inventory_slot/inventory/pocket/allow_equip(obj/item/I, mob/wearer, mob/user, force) . = ..() if(I.slot_flags & SLOT_DENYPOCKET) return FALSE @@ -437,21 +540,21 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) return TRUE return I.w_class <= WEIGHT_CLASS_SMALL -/datum/inventory_slot_meta/inventory/pocket/left +/datum/inventory_slot/inventory/pocket/left name = "left pocket" id = SLOT_ID_LEFT_POCKET display_name = "left pocket" display_preposition = "in" hud_position = ui_storage1 -/datum/inventory_slot_meta/inventory/pocket/right +/datum/inventory_slot/inventory/pocket/right name = "right pocket" id = SLOT_ID_RIGHT_POCKET display_name = "right pocket" display_preposition = "in" hud_position = ui_storage2 -/datum/inventory_slot_meta/inventory/id +/datum/inventory_slot/inventory/id name = "id" render_key = "id" id = SLOT_ID_WORN_ID @@ -470,9 +573,19 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) render_fallback = list( BODYTYPE_STRING_TESHARI = "_fallback_" ) - render_layer = ID_LAYER + render_layer = HUMAN_LAYER_SLOT_IDSLOT + +/datum/inventory_slot/inventory/id/should_render(mob/wearer, obj/item/item) + if(ishuman(wearer)) + var/mob/living/carbon/human/H = wearer + // todo: this should be a trait system. + if(istype(H.w_uniform, /obj/item/clothing/under)) + var/obj/item/clothing/under/uni = H.w_uniform + if(!uni.displays_id) + return FALSE + return ..() -/datum/inventory_slot_meta/inventory/shoes +/datum/inventory_slot/inventory/shoes name = "shoes" render_key = "shoes" id = SLOT_ID_SHOES @@ -494,9 +607,21 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) render_fallback = list( BODYTYPE_STRING_TESHARI = "_fallback_" // this doesn't actually exist, so item becomes invis ) - render_layer = list(SHOES_LAYER, SHOES_LAYER_ALT) + render_layer = list(HUMAN_LAYER_SLOT_SHOES, HUMAN_LAYER_SLOT_SHOES_ALT) -/datum/inventory_slot_meta/inventory/gloves +/datum/inventory_slot/inventory/shoes/should_render(mob/wearer, obj/item/item) + if(!ishuman(wearer)) + return ..() + var/mob/living/carbon/human/casted_human = wearer + if((casted_human.wear_suit?.inv_hide_flags | casted_human.w_uniform?.inv_hide_flags) & HIDESHOES) + return FALSE + for(var/bodypart in list(BP_L_FOOT, BP_R_FOOT)) + var/obj/item/organ/external/foot/foot = casted_human.get_organ(bodypart) + if(istype(foot) && foot.is_hidden_by_tail()) + return FALSE + return ..() + +/datum/inventory_slot/inventory/gloves name = "gloves" render_key = "gloves" id = SLOT_ID_GLOVES @@ -517,9 +642,9 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) render_fallback = list( BODYTYPE_STRING_TESHARI = "_fallback_" ) - render_layer = GLOVES_LAYER + render_layer = HUMAN_LAYER_SLOT_GLOVES -/datum/inventory_slot_meta/inventory/glasses +/datum/inventory_slot/inventory/glasses name = "glasses" render_key = "glasses" id = SLOT_ID_GLASSES @@ -540,9 +665,9 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) render_fallback = list( BODYTYPE_STRING_TESHARI = "_fallback_" ) - render_layer = GLASSES_LAYER + render_layer = HUMAN_LAYER_SLOT_GLASSES -/datum/inventory_slot_meta/inventory/suit_storage +/datum/inventory_slot/inventory/suit_storage name = "suit storage" render_key = "suit-store" id = SLOT_ID_SUIT_STORAGE @@ -552,9 +677,20 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) hud_position = ui_sstore1 slot_equip_checks = SLOT_EQUIP_CHECK_USE_PROC inventory_slot_flags = INV_SLOT_IS_RENDERED | INV_SLOT_IS_INVENTORY | INV_SLOT_IS_STRIPPABLE - render_layer = SUIT_STORE_LAYER + render_layer = HUMAN_LAYER_SLOT_SUITSTORE -/datum/inventory_slot_meta/inventory/suit_storage/allow_equip(obj/item/I, mob/wearer, mob/user, force) +/datum/inventory_slot/inventory/suit_storage/render(mob/wearer, obj/item/item, bodytype) + var/mob/living/carbon/human/casted_human = wearer + if(!istype(casted_human)) + return + var/datum/species/species = casted_human.species + return image( + icon = species.suit_storage_icon, + icon_state = item.item_state || item.icon_state, + layer = HUMAN_LAYER_SLOT_SUITSTORE, + ) + +/datum/inventory_slot/inventory/suit_storage/allow_equip(obj/item/I, mob/wearer, mob/user, force) . = ..() var/obj/item/suit_item = wearer.item_by_slot_id(SLOT_ID_SUIT) if(!suit_item) @@ -564,9 +700,9 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) return TRUE return FALSE -/datum/inventory_slot_meta/inventory/ears +/datum/inventory_slot/inventory/ears sort_order = 9500 - abstract_type = /datum/inventory_slot_meta/inventory/ears + abstract_type = /datum/inventory_slot/inventory/ears inventory_slot_flags = INV_SLOT_IS_RENDERED | INV_SLOT_IS_INVENTORY | INV_SLOT_IS_STRIPPABLE | INV_SLOT_CONSIDERED_WORN | INV_SLOT_HUD_REQUIRES_EXPAND render_default_icons = list( BODYTYPE_STRING_DEFAULT = 'icons/mob/clothing/ears.dmi', @@ -578,10 +714,10 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) render_fallback = list( BODYTYPE_STRING_TESHARI = "_fallback_" ) - render_layer = EARS_LAYER + render_layer = HUMAN_LAYER_SLOT_EARS render_key_plural = "ears" -/datum/inventory_slot_meta/inventory/ears/left +/datum/inventory_slot/inventory/ears/left name = "left ear" render_key = "ear-l" id = SLOT_ID_LEFT_EAR @@ -591,7 +727,7 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) slot_equip_checks = SLOT_EQUIP_CHECK_USE_FLAGS slot_flags_required = SLOT_EARS -/datum/inventory_slot_meta/inventory/ears/right +/datum/inventory_slot/inventory/ears/right name = "right ear" render_key = "ear-r" id = SLOT_ID_RIGHT_EAR @@ -600,9 +736,9 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) hud_position = ui_r_ear slot_equip_checks = SLOT_EQUIP_CHECK_USE_FLAGS slot_flags_required = SLOT_EARS - render_layer = EARS_LAYER + render_layer = HUMAN_LAYER_SLOT_EARS -/datum/inventory_slot_meta/inventory/mask +/datum/inventory_slot/inventory/mask name = "mask" render_key = "mask" id = SLOT_ID_MASK @@ -631,15 +767,22 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) render_fallback = list( BODYTYPE_STRING_TESHARI = "_fallback_", ) - render_layer = FACEMASK_LAYER + render_layer = HUMAN_LAYER_SLOT_MASK + +/datum/inventory_slot/inventory/mask/should_render(mob/wearer, obj/item/item) + if(ishuman(wearer)) + var/mob/living/carbon/human/casted_human = wearer + if(casted_human.head?.inv_hide_flags & HIDEMASK) + return FALSE + return ..() -/datum/inventory_slot_meta/restraints +/datum/inventory_slot/restraints sort_order = -250 always_show_on_strip_menu = FALSE - abstract_type = /datum/inventory_slot_meta/restraints + abstract_type = /datum/inventory_slot/restraints inventory_slot_flags = INV_SLOT_IS_RENDERED | INV_SLOT_IS_STRIPPABLE | INV_SLOT_STRIP_ONLY_REMOVES | INV_SLOT_STRIP_SIMPLE_LINK -/datum/inventory_slot_meta/restraints/handcuffs +/datum/inventory_slot/restraints/handcuffs name = "handcuffed" render_key = "handcuffs" id = SLOT_ID_HANDCUFFED @@ -651,12 +794,12 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) BODYTYPE_STRING_TESHARI = 'icons/mob/clothing/species/teshari/handcuffs.dmi', BODYTYPE_STRING_UNATHI_DIGI = 'icons/mob/clothing/species/unathidigi/handcuffs.dmi', ) - render_layer = HANDCUFF_LAYER + render_layer = HUMAN_LAYER_SLOT_HANDCUFFED -/datum/inventory_slot_meta/restraints/handcuffs/allow_equip(obj/item/I, mob/wearer, mob/user, force) +/datum/inventory_slot/restraints/handcuffs/allow_equip(obj/item/I, mob/wearer, mob/user, force) return istype(I, /obj/item/handcuffs) && !istype(I, /obj/item/handcuffs/legcuffs) -/datum/inventory_slot_meta/restraints/legcuffs +/datum/inventory_slot/restraints/legcuffs name = "legcuffed" render_key = "legcuffs" id = SLOT_ID_LEGCUFFED @@ -668,42 +811,42 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) BODYTYPE_STRING_TESHARI = 'icons/mob/clothing/species/teshari/handcuffs.dmi', BODYTYPE_STRING_UNATHI_DIGI = 'icons/mob/clothing/species/unathidigi/handcuffs.dmi' ) - render_layer = LEGCUFF_LAYER + render_layer = HUMAN_LAYER_SLOT_LEGCUFFED -/datum/inventory_slot_meta/restraints/legcuffs/allow_equip(obj/item/I, mob/wearer, mob/user, force) +/datum/inventory_slot/restraints/legcuffs/allow_equip(obj/item/I, mob/wearer, mob/user, force) return istype(I, /obj/item/handcuffs/legcuffs) /** * these have no excuse to be accessed by id * they will have randomized ids */ -/datum/inventory_slot_meta/abstract +/datum/inventory_slot/abstract inventory_slot_flags = INV_SLOT_IS_ABSTRACT | INV_SLOT_ALLOW_RANDOM_ID - abstract_type = /datum/inventory_slot_meta/abstract + abstract_type = /datum/inventory_slot/abstract -/datum/inventory_slot_meta/abstract/put_in_hands +/datum/inventory_slot/abstract/put_in_hands name = "put in hands" id = SLOT_ID_HANDS display_name = "hands" display_preposition = "in" display_plural = TRUE -/datum/inventory_slot_meta/abstract/attach_as_accessory +/datum/inventory_slot/abstract/attach_as_accessory name = "attach as accessory" display_name = "clothes" display_preposition = "clipped to" -/datum/inventory_slot_meta/abstract/put_in_backpack +/datum/inventory_slot/abstract/put_in_backpack name = "put in backpack" display_name = "backpack" display_preposition = "in" -/datum/inventory_slot_meta/abstract/put_in_belt +/datum/inventory_slot/abstract/put_in_belt name = "put in belt" display_name = "belt" display_preposition = "in" -/datum/inventory_slot_meta/abstract/put_in_storage +/datum/inventory_slot/abstract/put_in_storage name = "put in storage" display_name = "storage" display_preposition = "in" @@ -711,31 +854,31 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) /** * like put in storage, but prioritizes active, even if it's not on you. */ -/datum/inventory_slot_meta/abstract/put_in_storage_try_active +/datum/inventory_slot/abstract/put_in_storage_try_active name = "put in storage (active storage)" display_name = "storage" display_name = "in" -/datum/inventory_slot_meta/abstract/hand - abstract_type = /datum/inventory_slot_meta/abstract/hand +/datum/inventory_slot/abstract/hand + abstract_type = /datum/inventory_slot/abstract/hand // our render default icons are based on inhand type // this hijacks render_default_icons SO much but i don't care! /** * returns (icon, dim_x, dim_y) if found in defaults, null if not */ -/datum/inventory_slot_meta/abstract/hand/resolve_default_assets(bodytype, state, mob/wearer, obj/item/equipped, inhand_domain) +/datum/inventory_slot/abstract/hand/resolve_default_assets(bodytype, state, mob/wearer, obj/item/equipped, inhand_domain) if(!render_state_cache[inhand_domain]?[state]) return return list(render_default_icons[inhand_domain], render_dim_x_cache[inhand_domain], render_dim_y_cache[inhand_domain]) -/datum/inventory_slot_meta/abstract/hand/left +/datum/inventory_slot/abstract/hand/left name = "put in left hand" display_name = "left hand" display_preposition = "in" id = SLOT_ID_LEFT_HAND render_key = "left" - render_layer = L_HAND_LAYER + render_layer = HUMAN_LAYER_SLOT_LHAND render_default_icons = list( INHAND_DEFAULT_ICON_BALLS = 'icons/mob/items/lefthand_balls.dmi', INHAND_DEFAULT_ICON_BOOKS = 'icons/mob/items/lefthand_books.dmi', @@ -757,13 +900,13 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) INHAND_DEFAULT_ICON_64X64 = 'icons/mob/items/64x64_lefthand.dmi', ) -/datum/inventory_slot_meta/abstract/hand/right +/datum/inventory_slot/abstract/hand/right name = "put in right hand" display_name = "right hand" display_preposition = "in" id = SLOT_ID_RIGHT_HAND render_key = "right" - render_layer = R_HAND_LAYER + render_layer = HUMAN_LAYER_SLOT_RHAND render_default_icons = list( INHAND_DEFAULT_ICON_BALLS = 'icons/mob/items/righthand_balls.dmi', INHAND_DEFAULT_ICON_BOOKS = 'icons/mob/items/righthand_books.dmi', @@ -785,8 +928,8 @@ GLOBAL_LIST_EMPTY(inventory_slot_type_cache) INHAND_DEFAULT_ICON_64X64 = 'icons/mob/items/64x64_righthand.dmi', ) -/datum/inventory_slot_meta/abstract/use_one_for_accessory +/datum/inventory_slot/abstract/use_one_for_accessory render_key = "acc" -/datum/inventory_slot_meta/abstract/use_one_for_all +/datum/inventory_slot/abstract/use_one_for_all render_key = "all" diff --git a/code/modules/mob/inventory/items.dm b/code/modules/mob/inventory/items.dm index c05f784e2137..a63fbf7a26a2 100644 --- a/code/modules/mob/inventory/items.dm +++ b/code/modules/mob/inventory/items.dm @@ -387,7 +387,7 @@ /obj/item/proc/is_being_worn() if(!worn_slot) return FALSE - var/datum/inventory_slot_meta/slot_meta = resolve_inventory_slot_meta(worn_slot) + var/datum/inventory_slot/slot_meta = resolve_inventory_slot(worn_slot) return slot_meta.inventory_slot_flags & INV_SLOT_CONSIDERED_WORN /** diff --git a/code/modules/mob/inventory/rendering.dm b/code/modules/mob/inventory/rendering.dm index 164aa61eb697..25f9983f65ec 100644 --- a/code/modules/mob/inventory/rendering.dm +++ b/code/modules/mob/inventory/rendering.dm @@ -245,24 +245,26 @@ * * @params * * M - the mob we're rendering + * * slot_id_or_hand_index - the slot ID or numerical held index we're in + * * bodytype - the effective bodytype */ /obj/item/proc/render_mob_appearance(mob/M, slot_id_or_hand_index, bodytype = BODYTYPE_DEFAULT) // SHOULD_NOT_OVERRIDE(TRUE) // if you think you need to, rethink. // todo: eh reevaluate later // determine if in hands var/inhands = isnum(slot_id_or_hand_index)? slot_id_or_hand_index : null - var/datum/inventory_slot_meta/slot_meta + var/datum/inventory_slot/slot_meta // resolve slot if(inhands) - slot_meta = resolve_inventory_slot_meta((slot_id_or_hand_index % 2)? /datum/inventory_slot_meta/abstract/hand/left : /datum/inventory_slot_meta/abstract/hand/right) + slot_meta = resolve_inventory_slot((slot_id_or_hand_index % 2)? /datum/inventory_slot/abstract/hand/left : /datum/inventory_slot/abstract/hand/right) else - slot_meta = resolve_inventory_slot_meta(slot_id_or_hand_index) + slot_meta = resolve_inventory_slot(slot_id_or_hand_index) var/list/resolved = resolve_worn_assets(M, slot_meta, inhands, bodytype) return _render_mob_appearance(M, slot_meta, inhands, bodytype, resolved[WORN_DATA_ICON], resolved[WORN_DATA_STATE], resolved[WORN_DATA_LAYER], resolved [WORN_DATA_SIZE_X], resolved[WORN_DATA_SIZE_Y], resolved[WORN_DATA_ALIGN_Y]) -/obj/item/proc/_render_mob_appearance(mob/M, datum/inventory_slot_meta/slot_meta, inhands, bodytype, icon_used, state_used, layer_used, dim_x, dim_y, align_y) +/obj/item/proc/_render_mob_appearance(mob/M, datum/inventory_slot/slot_meta, inhands, bodytype, icon_used, state_used, layer_used, dim_x, dim_y, align_y) SHOULD_NOT_OVERRIDE(TRUE) // if you think you need to, rethink. PRIVATE_PROC(TRUE) // if you think you need to call this, rethink. var/list/additional = render_additional(M, icon_used, state_used, layer_used, dim_x, dim_y, align_y, bodytype, inhands, slot_meta) @@ -273,7 +275,7 @@ // worn_state_guard makes us not render if we'd render the same as in-inventory icon. if(no_render) // don't bother return additional - MA = mutable_appearance(icon_used, state_used, BODY_LAYER + layer_used, FLOAT_PLANE) + MA = mutable_appearance(icon_used, state_used, layer_used, FLOAT_PLANE) // temporary - until coloration MA.color = color MA = center_appearance(MA, dim_x, dim_y) @@ -288,7 +290,7 @@ * * icon/icon state/layer information is included in the mutable appearance */ -/obj/item/proc/render_apply_custom(mob/M, mutable_appearance/MA, bodytype, inhands, datum/inventory_slot_meta/slot_meta, icon_used, align_y) +/obj/item/proc/render_apply_custom(mob/M, mutable_appearance/MA, bodytype, inhands, datum/inventory_slot/slot_meta, icon_used, align_y) return MA /** @@ -296,13 +298,13 @@ * * icon/icon state/layer information is included in the mutable appearance */ -/obj/item/proc/render_apply_blood(mutable_appearance/MA, bodytype, inhands, datum/inventory_slot_meta/slot_meta, icon_used) +/obj/item/proc/render_apply_blood(mutable_appearance/MA, bodytype, inhands, datum/inventory_slot/slot_meta, icon_used) return MA /** * override to apply overlays to our current mutable appearance; called first */ -/obj/item/proc/render_apply_overlays(mutable_appearance/MA, bodytype, inhands, datum/inventory_slot_meta/slot_meta, icon_used) +/obj/item/proc/render_apply_overlays(mutable_appearance/MA, bodytype, inhands, datum/inventory_slot/slot_meta, icon_used) if(addblends) var/mutable_appearance/adding = mutable_appearance(icon = MA.icon, icon_state = addblends) adding.blend_mode = BLEND_ADD @@ -312,7 +314,7 @@ /** * override to include additional appearances while rendering */ -/obj/item/proc/render_additional(mob/M, icon/icon_used, state_used, layer_used, dim_x, dim_y, align_y, bodytype, inhands, datum/inventory_slot_meta/slot_meta) +/obj/item/proc/render_additional(mob/M, icon/icon_used, state_used, layer_used, dim_x, dim_y, align_y, bodytype, inhands, datum/inventory_slot/slot_meta) RETURN_TYPE(/list) return list() @@ -325,9 +327,9 @@ * - inhands - if we're going to inhands * - bodytype - bodytype in question */ -/obj/item/proc/resolve_worn_assets(mob/M, datum/inventory_slot_meta/slot_meta, inhands, bodytype) +/obj/item/proc/resolve_worn_assets(mob/M, datum/inventory_slot/slot_meta, inhands, bodytype) if(istext(slot_meta)) - slot_meta = resolve_inventory_slot_meta(slot_meta) + slot_meta = resolve_inventory_slot(slot_meta) var/list/data = new /list(WORN_DATA_LIST_SIZE) //? state ; item_state_slots --> (worn_state | inhand_state) --> item_state --> icon_state @@ -422,20 +424,20 @@ /obj/item/proc/debug_worn_assets(slot_or_id, mob/M = worn_mob(), bodytype) var/mob/living/carbon/human/H = ishuman(M)? M : null - var/datum/inventory_slot_meta/slot_meta + var/datum/inventory_slot/slot_meta if(isnull(slot_or_id)) slot_or_id = worn_slot if(isnum(slot_or_id)) - slot_meta = resolve_inventory_slot_meta((slot_or_id % 2)? /datum/inventory_slot_meta/abstract/hand/left : /datum/inventory_slot_meta/abstract/hand/right) + slot_meta = resolve_inventory_slot((slot_or_id % 2)? /datum/inventory_slot/abstract/hand/left : /datum/inventory_slot/abstract/hand/right) else - slot_meta = resolve_inventory_slot_meta(slot_or_id) + slot_meta = resolve_inventory_slot(slot_or_id) if(isnull(bodytype) && H) bodytype = H.species.get_effective_bodytype(H, src, slot_meta) . = resolve_worn_assets(M, slot_meta, isnum(slot_or_id), bodytype) .[WORN_DATA_ICON] = "[.[WORN_DATA_ICON]]" // todo: remove, aka get rid of fucking uniform _s state -/obj/item/proc/resolve_legacy_state(mob/M, datum/inventory_slot_meta/slot_meta, inhands, bodytype) +/obj/item/proc/resolve_legacy_state(mob/M, datum/inventory_slot/slot_meta, inhands, bodytype) return (item_state_slots?[slot_meta.id]) || (inhands? inhand_state : worn_state) || item_state || icon_state /obj/item/proc/resolve_worn_state(inhands, slot_key, bodytype) diff --git a/code/modules/mob/inventory/stripping.dm b/code/modules/mob/inventory/stripping.dm index ce9ed20c094b..20691482912a 100644 --- a/code/modules/mob/inventory/stripping.dm +++ b/code/modules/mob/inventory/stripping.dm @@ -33,7 +33,7 @@ var/last_order for(var/id in slot_ids) // todo: optimize - var/datum/inventory_slot_meta/meta = resolve_inventory_slot_meta(id) + var/datum/inventory_slot/meta = resolve_inventory_slot(id) var/remove_only = meta.inventory_slot_flags & INV_SLOT_STRIP_ONLY_REMOVES var/obj/item/I = _item_by_slot(id) if(remove_only && !I) @@ -97,7 +97,7 @@ if(!strip_interaction_prechecks(user)) return FALSE - var/datum/inventory_slot_meta/slot_meta = resolve_inventory_slot_meta(slot_id) + var/datum/inventory_slot/slot_meta = resolve_inventory_slot(slot_id) if(!slot_meta) return FALSE @@ -158,9 +158,9 @@ var/view_flags = NONE - var/datum/inventory_slot_meta/slot_meta = resolve_inventory_slot_meta(slot_id_or_index) + var/datum/inventory_slot/slot_meta = resolve_inventory_slot(slot_id_or_index) if(!isnum(slot_id_or_index)) - slot_meta = resolve_inventory_slot_meta(slot_id_or_index) + slot_meta = resolve_inventory_slot(slot_id_or_index) view_flags = slot_meta.strip_obfuscation_check(ours, src, user) if(view_flags & (INV_VIEW_OBFUSCATE_HIDE_SLOT)) return FALSE // how are you seeing this @@ -252,7 +252,7 @@ return var/slot = I.worn_slot if(slot != SLOT_ID_HANDS) - var/datum/inventory_slot_meta/slot_meta = resolve_inventory_slot_meta(slot) + var/datum/inventory_slot/slot_meta = resolve_inventory_slot(slot) var/view_flags = slot_meta.strip_obfuscation_check(I, src, user) if(view_flags & (INV_VIEW_OBFUSCATE_DISALLOW_INTERACT | INV_VIEW_OBFUSCATE_HIDE_ITEM_EXISTENCE | INV_VIEW_OBFUSCATE_HIDE_SLOT)) return // how tf are you gonna interact with it huh diff --git a/code/modules/mob/living/carbon/breathe.dm b/code/modules/mob/living/carbon/breathe.dm index 5e7ead6578f4..5213fe1a9b7e 100644 --- a/code/modules/mob/living/carbon/breathe.dm +++ b/code/modules/mob/living/carbon/breathe.dm @@ -72,9 +72,9 @@ if(breath) //handle mask filtering - if(istype(wear_mask, /obj/item/clothing/mask) && breath) + if(istype(wear_mask, /obj/item/clothing/mask)) var/obj/item/clothing/mask/M = wear_mask - var/datum/gas_mixture/gas_filtered = M.filter_air(breath) + var/datum/gas_mixture/gas_filtered = M.process_air(breath) loc.assume_air(gas_filtered) return breath return null @@ -96,4 +96,8 @@ /mob/living/carbon/proc/handle_post_breath(datum/gas_mixture/breath) if(breath) - loc?.assume_air(breath) //by default, exhale + if(istype(wear_mask, /obj/item/clothing/mask)) + var/obj/item/clothing/mask/M = wear_mask + loc.assume_air(M.process_exhale(breath)) + else + loc?.assume_air(breath) //by default, exhale diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm index 1eab6fae097d..2db93426db2b 100644 --- a/code/modules/mob/living/carbon/carbon_defense.dm +++ b/code/modules/mob/living/carbon/carbon_defense.dm @@ -4,6 +4,12 @@ return null ..() +/mob/living/carbon/emp_act(severity) + . = ..() + // tODO: REFACTOR THIS DUMB SHIT + for(var/obj/item/organ/organ in organs | internal_organs) + organ.emp_act(severity) + /mob/living/carbon/standard_weapon_hit_effects(obj/item/I, mob/living/user, var/effective_force, var/blocked, var/soaked, var/hit_zone) if(!effective_force || blocked >= 100) return 0 diff --git a/code/modules/mob/living/carbon/carbon_defines.dm b/code/modules/mob/living/carbon/carbon_defines.dm index 8cea5e39817e..d3eb1024b1d8 100644 --- a/code/modules/mob/living/carbon/carbon_defines.dm +++ b/code/modules/mob/living/carbon/carbon_defines.dm @@ -1,13 +1,13 @@ /** * The root type of complex mobs. - * + * * These mobs have: * * organ / bodypart simulation * * reagent metabolism * * species * * virus simulation * * and more. - * + * * todo: this should be carbon.dm at some point */ /mob/living/carbon @@ -18,6 +18,12 @@ /// species - datumized handling of racial intrinsics like health, environmental, breathing, etc. set using set_species() **only** var/datum/species/species + //* Rendering *// + /// keyed overlay storage list + /// must map key to an overlay or a list of overlays + /// the overlay in question must be an image or a mutable appearance + var/list/standing_overlays = list() + var/list/stomach_contents = list() ///var/list/datum/disease2/disease/virus2 = list() var/list/antibodies = list() diff --git a/code/modules/mob/living/carbon/carbon_movement.dm b/code/modules/mob/living/carbon/carbon_movement.dm index a8bbd6f793e2..059deedb94f7 100644 --- a/code/modules/mob/living/carbon/carbon_movement.dm +++ b/code/modules/mob/living/carbon/carbon_movement.dm @@ -5,12 +5,9 @@ if(src.nutrition && src.stat != 2) if(ishuman(src)) var/mob/living/carbon/human/M = src - if(M.stat != 2 && M.nutrition > 0) - M.nutrition -= M.species.hunger_factor/10 - if(M.m_intent == "run") - M.nutrition -= M.species.hunger_factor/10 - if(M.nutrition < 0) - M.nutrition = 0 + if(M.stat != 2 && M.nutrition > 0 && M.m_intent == MOVE_INTENT_RUN) + // Only running takes nutrition now, still as much as before + M.nutrition = max(0, M.nutrition - M.species.hunger_factor/5) else src.nutrition -= DEFAULT_HUNGER_FACTOR/10 if(src.m_intent == "run") diff --git a/code/modules/mob/living/carbon/damage_procs.dm b/code/modules/mob/living/carbon/damage_procs.dm index 0f6d2d9f2c61..3aa39ee701a8 100644 --- a/code/modules/mob/living/carbon/damage_procs.dm +++ b/code/modules/mob/living/carbon/damage_procs.dm @@ -27,7 +27,7 @@ if(!defer_updates && .) update_health() - UpdateDamageIcon() + update_damage_overlay() /mob/living/carbon/take_overall_damage(brute, burn, damage_mode, weapon_descriptor, defer_updates) if(status_flags & STATUS_GODMODE) @@ -43,4 +43,4 @@ if(!defer_updates && .) update_health() - UpdateDamageIcon() + update_damage_overlay() diff --git a/code/modules/mob/living/carbon/health.dm b/code/modules/mob/living/carbon/health.dm index 60324390e38f..90f260a9ffdb 100644 --- a/code/modules/mob/living/carbon/health.dm +++ b/code/modules/mob/living/carbon/health.dm @@ -18,3 +18,5 @@ ingested.clear_reagents() touching.clear_reagents() // todo: organs + // redo graphics + rebuild_standing_overlays() diff --git a/code/modules/mob/living/carbon/human/ai_controlled/ai_controlled.dm b/code/modules/mob/living/carbon/human/ai_controlled/ai_controlled.dm index 51608c1e1e80..c43d9c05500a 100644 --- a/code/modules/mob/living/carbon/human/ai_controlled/ai_controlled.dm +++ b/code/modules/mob/living/carbon/human/ai_controlled/ai_controlled.dm @@ -81,10 +81,10 @@ equip_to_slot_or_del(new to_wear_back(src), SLOT_ID_BACK) if(to_wear_l_hand) - equip_to_slot_or_del(new to_wear_l_hand(src), /datum/inventory_slot_meta/abstract/hand/left) + equip_to_slot_or_del(new to_wear_l_hand(src), /datum/inventory_slot/abstract/hand/left) if(to_wear_r_hand) - equip_to_slot_or_del(new to_wear_r_hand(src), /datum/inventory_slot_meta/abstract/hand/right) + equip_to_slot_or_del(new to_wear_r_hand(src), /datum/inventory_slot/abstract/hand/right) if(to_wear_id_type) var/obj/item/card/id/W = new to_wear_id_type(src) diff --git a/code/modules/mob/living/carbon/human/appearance.dm b/code/modules/mob/living/carbon/human/appearance.dm index c845bd03d641..e213076aa78f 100644 --- a/code/modules/mob/living/carbon/human/appearance.dm +++ b/code/modules/mob/living/carbon/human/appearance.dm @@ -75,7 +75,7 @@ grad_wingstyle = wing_gradient - update_wing_showing() + render_spriteacc_wings() return 1 /mob/living/carbon/human/proc/change_facial_hair(var/facial_hair_style) @@ -212,9 +212,9 @@ var/datum/sprite_accessory/S = GLOB.legacy_hair_lookup[hairstyle] if(check_gender && gender != NEUTER) - if(gender == MALE && S.gender == FEMALE) + if(gender == MALE && S.random_generation_gender == FEMALE) continue - else if(gender == FEMALE && S.gender == MALE) + else if(gender == FEMALE && S.random_generation_gender == MALE) continue if(S.apply_restrictions && !(use_species in S.species_allowed)) @@ -233,11 +233,8 @@ for(var/facialhairstyle in GLOB.legacy_facial_hair_lookup) var/datum/sprite_accessory/S = GLOB.legacy_facial_hair_lookup[facialhairstyle] - if(gender != NEUTER) - if(gender == MALE && S.gender == FEMALE) - continue - else if(gender == FEMALE && S.gender == MALE) - continue + if(!isnull(S.random_generation_gender) && gender != S.random_generation_gender) + continue if(S.apply_restrictions && !(use_species in S.species_allowed)) continue diff --git a/code/modules/mob/living/carbon/human/blood.dm b/code/modules/mob/living/carbon/human/blood.dm index b7b1dbcfd8c7..1e02d8efeafe 100644 --- a/code/modules/mob/living/carbon/human/blood.dm +++ b/code/modules/mob/living/carbon/human/blood.dm @@ -45,6 +45,15 @@ var/const/CE_STABLE_THRESHOLD = 0.5 B.color = B.data["blood_colour"] B.name = B.data["blood_name"] +/mob/living/carbon/human/proc/fixblood_if_broken() + if(species.species_flags & NO_BLOOD) + return + if(!should_have_organ(O_HEART)) + return + if(!vessel.has_reagent("blood")) + vessel.add_reagent("blood", 0.1) + fixblood() + // Takes care blood loss and regeneration /mob/living/carbon/human/handle_blood() if(inStasisNow()) @@ -211,7 +220,7 @@ var/const/CE_STABLE_THRESHOLD = 0.5 if(!amt) return 0 - if(amt > vessel.get_reagent_amount("blood")) + if(amt >= vessel.get_reagent_amount("blood")) amt = vessel.get_reagent_amount("blood") - 1 // Bit of a safety net; it's impossible to add blood if there's not blood already in the vessel. return vessel.remove_reagent("blood",amt * (src.mob_size/MOB_MEDIUM)) @@ -260,6 +269,9 @@ var/const/CE_STABLE_THRESHOLD = 0.5 if(vessel.get_reagent_amount("blood") < amount) return null + if(amount >= vessel.get_reagent_amount("blood")) + amount = vessel.get_reagent_amount("blood") - 1 // Bit of a safety net; it's impossible to add blood if there's not blood already in the vessel. + . = ..() vessel.remove_reagent("blood",amount) // Removes blood if human @@ -286,6 +298,8 @@ var/const/CE_STABLE_THRESHOLD = 0.5 reagents.add_reagent("blood", amount, injected.data) reagents.update_total() return + + fixblood_if_broken() var/datum/reagent/blood/our = get_blood(vessel) diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index dc6a4f7a171a..457416f29466 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -354,13 +354,13 @@ m_type = 1 if("ara") - message = "aras" + message = "aras." var/use_sound use_sound = pick('sound/voice/ara_ara1.ogg','sound/voice/ara_ara2.ogg') playsound(src.loc, use_sound, 50, 0) if("uwu") - message = "lets out a devious noise" + message = "lets out a devious noise." playsound(src.loc, 'sound/voice/uwu.ogg', 50, 0) if ("drool") @@ -444,7 +444,8 @@ robotic = 1 if(!robotic) message = "coughs up a small amount of blood!" - BloodyMouth() + //! disabled for shitcode reasons + // BloodyMouth() if(get_gender() == FEMALE) if(species.female_cough_sounds) playsound(src, pick(species.female_cough_sounds), 120) @@ -961,10 +962,12 @@ src.animate_tail_once() if("wag", "sway") - src.animate_tail_start() + src.toggle_tail_vr() + // src.animate_tail_start() if("qwag", "fastsway") - src.animate_tail_fast() + src.toggle_tail_vr() + // src.animate_tail_fast() if("swag", "stopsway") src.animate_tail_stop() @@ -1035,10 +1038,10 @@ return if ("help") - to_chat(src, "nyaha, awoo, bark, blink, blink_r, blush, bow-(none)/mob, burp, chirp, choke, chuckle, clap, collapse, cough, cry, custom, deathgasp, drool, eyebrow, fastsway/qwag, \ - flip, frown, gasp, giggle, glare-(none)/mob, grin, groan, grumble, handshake, hiss, hug-(none)/mob, laugh, look-(none)/mob, merp, moan, mumble, nod, nya, pale, peep, point-atom, \ + to_chat(src, "nyaha, ara, awoo, bark, bleat, blink, blink_r, blush, bow-(none)/mob, burp, chirp, choke, chuckle, clap, collapse, cough, cry, custom, deathgasp, drool, eyebrow, fastsway/qwag, \ + flip, frown, gasp, giggle, glare-(none)/mob, grin, groan, grumble, handshake, hiss, hug-(none)/mob, laugh, look-(none)/mob, mar, merp, moan, mrrp, mumble, nod, nya, pale, peep, point-atom, prbt, \ raise, roll, salute, fullsalute, scream, sneeze, shake, shiver, shrug, sigh, signal-#1-10, slap-(none)/mob, smile, sneeze, sniff, snore, stare-(none)/mob, stopsway/swag, squeak, sway/wag, swish, tremble, twitch, \ - twitch_v, vomit, weh, whimper, wink, yawn. Moth: mchitter, mlaugh, mscream, msqueak. Synthetics: beep, buzz, buzz2, chime, die, dwoop, error, honk, no, ping, rcough, rsneeze, scary, \ + twitch_v, uwu, vomit, weh, whimper, wink, yawn. Moth: mchitter, mlaugh, mscream, msqueak. Synthetics: beep, buzz, buzz2, chime, die, dwoop, error, honk, no, ping, rcough, rsneeze, scary, \ shutdown, startup, warn, ye, yes. Vox: shriekshort, shriekloud") else @@ -1110,19 +1113,19 @@ if ("vwag") if(toggle_tail_vr(message = 1)) m_type = 1 - message = "[wagging ? "starts" : "stops"] wagging their tail." + message = "[get_sprite_accessory_variation(SPRITE_ACCESSORY_SLOT_TAIL, SPRITE_ACCESSORY_VARIATION_WAGGING) ? "starts" : "stops"] wagging their tail." else return 1 if ("vflap") if(toggle_wing_vr(message = 1)) m_type = 1 - message = "[flapping ? "starts" : "stops"] flapping their wings." + message = "[get_sprite_accessory_variation(SPRITE_ACCESSORY_SLOT_WINGS, SPRITE_ACCESSORY_VARIATION_FLAPPING) ? "starts" : "stops"] flapping their wings." else return 1 if ("vspread") if(toggle_wing_spread(message = 1)) m_type = 1 - message = "[spread ? "extends" : "retracts"] their wings." + message = "[get_sprite_accessory_variation(SPRITE_ACCESSORY_SLOT_WINGS, SPRITE_ACCESSORY_VARIATION_SPREAD) ? "extends" : "retracts"] their wings." else return 1 if ("mlem") @@ -1161,7 +1164,7 @@ playsound(src.loc, 'sound/misc/prbt.ogg', 50, 1, -1) m_type = 2 if ("mrrp") - message = "mrrps" + message = "mrrps." m_type = 2 playsound(src.loc, "sound/voice/mrrp.ogg", 50, 1, -1) if ("weh") @@ -1172,6 +1175,10 @@ message = "lets out a merp." m_type = 2 playsound(loc, 'sound/voice/merp.ogg', 50, 1, -1) + if ("bleat") + message = "bleats!" + m_type = 2 + playsound(loc, pick(list('sound/voice/baa.ogg','sound/voice/baa2.ogg')), 50, 1, -1) if ("bark") message = "lets out a bark." m_type = 2 @@ -1187,7 +1194,7 @@ if("mar") message = "lets out a mar." m_type = 2 - playsound(loc, 'sound/voice/mar.ogg', 50, 1, -1) + playsound(loc, 'sound/voice/mar.ogg', 50, 1, -1) if ("nsay") nsay() return TRUE @@ -1259,51 +1266,6 @@ /mob/living/carbon/human/proc/spam_flag_false() //used for addtimer spam_flag = FALSE -/mob/living/carbon/human/proc/toggle_tail_vr(var/setting,var/message = 0) - if(!tail_style || !tail_style.ani_state) - if(message) - to_chat(src, "You don't have a tail that supports this.") - return 0 - - var/new_wagging = isnull(setting) ? !wagging : setting - if(new_wagging != wagging) - wagging = new_wagging - update_tail_showing() - return 1 - -/mob/living/carbon/human/proc/toggle_wing_vr(var/setting,var/message = 0) - if(!wing_style || !wing_style.ani_state) - if(message) - to_chat(src, "You don't have wings that support this.") - return 0 - - var/new_flapping = isnull(setting) ? !flapping : setting - if(new_flapping != flapping) - flapping = setting - if(flapping) - spread = FALSE - update_wing_showing() - return 1 - -/mob/living/carbon/human/proc/toggle_wing_spread(var/folded,var/message = 0) - if(!wing_style) - if(message) - to_chat(src, "You don't have wings!") - return 0 - - if(!wing_style.spr_state) - if(message) - to_chat(src, "You don't have wings that support this.") - return 0 - - var/new_spread = isnull(folded) ? !spread : folded - if(new_spread != spread) - spread = new_spread - if(spread) - flapping = FALSE - update_wing_showing() - return 1 - /mob/living/carbon/human/verb/toggle_gender_identity_vr() set name = "Set Gender Identity" set desc = "Sets the pronouns when examined and performing an emote." @@ -1313,10 +1275,3 @@ return 0 change_gender_identity(new_gender_identity) return 1 - -/mob/living/carbon/human/verb/switch_tail_layer() - set name = "Switch tail layer" - set category = VERB_CATEGORY_IC - set desc = "Switch tail layer on top." - tail_alt = !tail_alt - update_tail_showing() diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index f8976ba73c60..906f80f456a3 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -290,8 +290,7 @@ if(suiciding) . += SPAN_WARNING("[T.He] appears to have commited suicide... There is no hope of recovery.") - -//! I hate this. Though it's better than what it was before. -Zandario + //* I hate this. Though it's better than what it was before. -Zandario var/message = FALSE var/weight_examine = round(weight) if(show_pudge()) //Some clothing or equipment can hide this. @@ -323,7 +322,7 @@ else message = SPAN_DANGER("[T.He] [T.is] so morbidly obese, you wonder how [T.he] can even stand, let alone waddle around the station.") . += message -//! End of the bs + //* End of the bs if(attempt_vr(src,"examine_bellies",args)) . += attempt_vr(src,"examine_bellies",args) diff --git a/code/modules/mob/living/carbon/human/gradient.dm b/code/modules/mob/living/carbon/human/gradient.dm deleted file mode 100644 index 4b0352fdb3cc..000000000000 --- a/code/modules/mob/living/carbon/human/gradient.dm +++ /dev/null @@ -1,19 +0,0 @@ -GLOBAL_LIST_INIT(hair_gradients, list( - "None" = "none", - "Fade (Up)" = "fadeup", - "Fade Low (Up)" = "fadeup_low", - "Fade (Down)" = "fadedown", - "Fade Low (Down)" = "fadedown_low", - "Fade High (Down)" = "fadedown_high", - "Reflected (Center)"= "reflected", - "Reflected Inverse (Center)"= "reflected_inverse", - "Vertical Split (Back)"= "vsplit_back", - "Vertical Split" = "vsplit", - "Vertical Split (Back, Front Effect)"= "vsplit_dual", - "Bottom (Flat)" = "bottomflat", - "Shoulders (Flat)" = "shouldersflat", - "Wavy" = "wavy", - "Wavy Spiked" = "wavy_spiked", - "Striped" = "striped", - "Striped (Vertical)"= "striped_vertical" - )) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 59c9e65f598f..389205a497bf 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -44,8 +44,6 @@ dna.real_name = real_name sync_organ_dna() - init_world_bender_hud() - if(mapload) return INITIALIZE_HINT_LATELOAD @@ -65,19 +63,8 @@ qdel(organ) QDEL_NULL(nif) QDEL_LIST_NULL(vore_organs) - cleanup_world_bender_hud() return ..() -/mob/living/carbon/human/prepare_data_huds() - //Update med hud images... - . = ..() - //...sec hud images... - update_hud_sec_implants() - update_hud_sec_job() - update_hud_sec_status() - //...and display them. - add_to_all_human_data_huds() - /mob/living/carbon/human/statpanel_data(client/C) . = ..() if(C.statpanel_tab("Status")) @@ -1115,6 +1102,7 @@ return var/datum/species/S + var/datum/species/old_species = species // provided? if so, set // (and hope to god the provider isn't stupid and didn't quantum entangle a datum) @@ -1148,6 +1136,36 @@ reload_rendering() update_vision() + //! FUCK FUCK FUCK FUCK FUCK FUCK FUCK + for(var/key in species.sprite_accessory_defaults) + var/datum/sprite_accessory/accessory = species.sprite_accessory_defaults[key] + var/datum/sprite_accessory/existing = get_sprite_accessory(key) + if(existing && old_species?.sprite_accessory_defaults?[key] != existing) + continue + switch(key) + if(SPRITE_ACCESSORY_SLOT_EARS) + ear_style = accessory + r_ears = r_skin + g_ears = g_skin + b_ears = b_skin + if(SPRITE_ACCESSORY_SLOT_FACEHAIR) + if(SPRITE_ACCESSORY_SLOT_HAIR) + if(SPRITE_ACCESSORY_SLOT_HORNS) + horn_style = accessory + r_horn = r_skin + g_horn = g_skin + b_horn = b_skin + if(SPRITE_ACCESSORY_SLOT_TAIL) + tail_style = accessory + r_tail = r_skin + g_tail = g_skin + b_tail = b_skin + if(SPRITE_ACCESSORY_SLOT_WINGS) + wing_style = accessory + r_wing = r_skin + g_wing = g_skin + b_wing = b_skin + // skip the rest if(skip) return @@ -1260,6 +1278,7 @@ W.add_fingerprint(src) /mob/living/carbon/human/emp_act(severity) + . = ..() if(isSynthetic()) switch(severity) if(1) @@ -1279,8 +1298,6 @@ to_chat(src, "*BZZZT*") to_chat(src, "Warning: Electromagnetic pulse detected.") to_chat(src, "Warning: Navigation systems offline. Restarting...") - ..() - /mob/living/carbon/human/can_inject(var/mob/user, var/error_msg, var/target_zone, var/ignore_thickness = FALSE) . = 1 @@ -1586,21 +1603,6 @@ msg += get_display_species() return msg -//Crazy alternate human stuff -/mob/living/carbon/human/proc/init_world_bender_hud() - var/animal = pick("cow","chicken_brown", "chicken_black", "chicken_white", "chick", "mouse_brown", "mouse_gray", "mouse_white", "lizard", "cat2", "goose", "penguin") - var/image/img = image('icons/mob/animal.dmi', src, animal) - // hud refactor when - img.override = TRUE - LAZYINITLIST(hud_list) - hud_list[WORLD_BENDER_ANIMAL_HUD] = img - var/datum/atom_hud/world_bender/animals/A = GLOB.huds[WORLD_BENDER_HUD_ANIMALS] - A.add_to_hud(src) - -/mob/living/carbon/human/proc/cleanup_world_bender_hud() - var/datum/atom_hud/world_bender/animals/A = GLOB.huds[WORLD_BENDER_HUD_ANIMALS] - A.remove_from_hud(src) - /mob/living/carbon/human/get_mob_riding_slots() return list(back, head, wear_suit) diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm index 7a74efb5c0c0..7e6078e372d8 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/code/modules/mob/living/carbon/human/human_damage.dm @@ -292,7 +292,7 @@ if(!parts.len) return var/obj/item/organ/external/picked = pick(parts) if(picked.heal_damage(brute,burn)) - UpdateDamageIcon() + update_damage_overlay() update_health() @@ -316,7 +316,7 @@ parts -= picked update_health() if(update) - UpdateDamageIcon() + update_damage_overlay() //////////////////////////////////////////// diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index e400818df377..b87a9859e57f 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -33,54 +33,57 @@ /// Throws byond:tm: errors if placed in human/emote, but not here. var/spam_flag = FALSE - hud_possible = list( - LIFE_HUD, - BIOLOGY_HUD, - ID_HUD, - WANTED_HUD, - IMPLOYAL_HUD, - IMPTRACK_HUD, - IMPCHEM_HUD, - ANTAG_HUD, + atom_huds_to_initialize = list( + /datum/atom_hud_provider/medical_biology, + /datum/atom_hud_provider/medical_health, + /datum/atom_hud_provider/security_implant, + /datum/atom_hud_provider/security_job, + /datum/atom_hud_provider/security_status, + /datum/atom_hud_provider/special_role, + /datum/atom_hud_provider/overriding/world_bender_animals, ) //! Buckling - For riding.dm buckle_allowed = TRUE buckle_flags = BUCKLING_NO_DEFAULT_BUCKLE // Custom procs handle that. -//! ## Hair colour and style + //! LEGACY, TODO TO REMOVE + /// current head overlay pixel y offset + var/head_spriteacc_offset = 0 + + //* Hair colour and style var/h_style = "Bald" var/r_hair = 0 var/g_hair = 0 var/b_hair = 0 -//! ## Hair gradients + //* Hair gradients var/grad_style = "None" var/r_grad = 0 var/g_grad = 0 var/b_grad = 0 -//! ## Facial hair colour and style + //* Facial hair colour and style var/f_style = "Shaved" var/r_facial = 0 var/g_facial = 0 var/b_facial = 0 -//! ## Eye colour + //* Eye colour var/r_eyes = 0 var/g_eyes = 0 var/b_eyes = 0 /// Skin tone var/s_tone = 0 -//! ## Skin colour + //* Skin colour /// Skin flag var/skin_state = SKIN_NORMAL var/r_skin = 238 // TODO: Set defaults for other races. var/g_skin = 206 var/b_skin = 179 -//! ## ears, horns, tails, wings and custom species. + //* ears, horns, tails, wings and custom species. var/datum/sprite_accessory/ears/ear_style = null var/r_ears = 30 var/g_ears = 30 @@ -113,12 +116,16 @@ var/r_tail3 = 30 var/g_tail3 = 30 var/b_tail3 = 30 + // pain + var/legacy_tail_variation var/datum/sprite_accessory/wing/wing_style = null var/grad_wingstyle = "None" var/r_gradwing = 0 var/g_gradwing = 0 var/b_gradwing = 0 + // pain + var/legacy_wing_variation var/r_wing = 30 var/g_wing = 30 @@ -130,9 +137,6 @@ var/g_wing3 = 30 var/b_wing3 = 30 - var/wagging = 0 //UGH. - var/flapping = 0 - var/spread = 0 /// What's my status? var/vantag_pref = VANTAG_NONE // todo: REOMVE THIS FOR SPECIES VAR CHANGES @@ -147,7 +151,7 @@ var/custom_species -//! ## Synth colors + //* Synth colors /// Lets normally uncolorable synth parts be colorable. var/synth_color = 0 // Used with synth_color to color synth parts that normaly can't be colored. @@ -183,7 +187,7 @@ /// Which PDA type the player has chosen. var/pdachoice = 1 -//! ## General information + //* General information var/home_system = "" var/citizenship = "" var/personal_faction = "" @@ -191,7 +195,7 @@ var/antag_faction = "" var/antag_vis = "" -//! ## Equipment slots + //* Equipment slots var/obj/item/wear_suit = null var/obj/item/w_uniform = null var/obj/item/shoes = null diff --git a/code/modules/mob/living/carbon/human/human_organs.dm b/code/modules/mob/living/carbon/human/human_organs.dm index 17e661de0b5a..4d9e0db3c5fa 100644 --- a/code/modules/mob/living/carbon/human/human_organs.dm +++ b/code/modules/mob/living/carbon/human/human_organs.dm @@ -105,11 +105,12 @@ // Canes and crutches help you stand (if the latter is ever added) // One cane mitigates a broken leg+foot, or a missing foot. - // Two canes are needed for a lost leg. If you are missing both legs, canes aren't gonna help you. + var/cane_help=4 if (l_hand && istype(l_hand, /obj/item/cane)) - stance_damage -= 2 + stance_damage -= cane_help + cane_help-=1 if (r_hand && istype(r_hand, /obj/item/cane)) - stance_damage -= 2 + stance_damage -= cane_help // standing is poor if(stance_damage >= 4 || (stance_damage >= 2 && prob(5))) diff --git a/code/modules/mob/living/carbon/human/human_powers.dm b/code/modules/mob/living/carbon/human/human_powers.dm index 3eeafaaa6b1f..292a64e66136 100644 --- a/code/modules/mob/living/carbon/human/human_powers.dm +++ b/code/modules/mob/living/carbon/human/human_powers.dm @@ -398,7 +398,7 @@ return hiding_tail = !hiding_tail to_chat(usr, SPAN_SMALLNOTICE("You are now [hiding_tail ? "hiding" : "showing"] your tail.")) - update_tail_showing() + render_spriteacc_tail() /mob/living/carbon/human/proc/hide_wings() set name = "Toggle Hide Wings" @@ -409,7 +409,7 @@ return hiding_wings = !hiding_wings to_chat(usr, SPAN_SMALLNOTICE("You are now [hiding_wings ? "hiding" : "showing"] your wings.")) - update_wing_showing() + render_spriteacc_wings() /mob/living/carbon/human/proc/hide_horns() set name = "Toggle Hide Horns" diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index 32d7e8a521be..8c67c1da4092 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -266,7 +266,7 @@ . = ..() if(!.) return - var/datum/inventory_slot_meta/slot_meta = resolve_inventory_slot_meta(id) + var/datum/inventory_slot/slot_meta = resolve_inventory_slot(id) if(!slot_meta) return FALSE return !(slot_meta.inventory_slot_flags & INV_SLOT_IS_INVENTORY) || !species || (id in species.hud.gear) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 8b77562499d7..e7b3034586a0 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -775,6 +775,9 @@ MOB_BODYTEMP_EQUALIZATION_MAX_UNFAVORABLE \ ) + if(istype(loc, /obj/machinery/atmospherics/component/unary/cryo_cell)) + adjust = min(adjust, 2) // snowflake patch for cryo i fucking hate this aoguhwagoehs8ry0u34ajwioer + if(is_stabilizing) adjust_bodytemperature(adjust) else if(difference < 0) diff --git a/code/modules/mob/living/carbon/human/movement.dm b/code/modules/mob/living/carbon/human/movement.dm index 9ed5dcd925eb..d57738dc5b29 100644 --- a/code/modules/mob/living/carbon/human/movement.dm +++ b/code/modules/mob/living/carbon/human/movement.dm @@ -33,7 +33,7 @@ tally += (halloss / 45) //halloss shouldn't slow you down if you can't even feel it var/hungry = (500 - nutrition)/5 // So overeat would be 100 and default level would be 80 - if (hungry >= 70) + if (m_intent == MOVE_INTENT_RUN && hungry >= 70)//You can walk while hungry, but you cant run so fast while hungry tally += hungry/50 if(reagents.has_reagent("numbenzyme")) diff --git a/code/modules/mob/living/carbon/human/rendering.dm b/code/modules/mob/living/carbon/human/rendering.dm new file mode 100644 index 000000000000..1e601df9b654 --- /dev/null +++ b/code/modules/mob/living/carbon/human/rendering.dm @@ -0,0 +1,862 @@ +/mob/living/carbon/human/flatten_standing_overlays() + . = ..() + render_spriteacc_ears(TRUE) + render_spriteacc_facehair(TRUE) + render_spriteacc_hair(TRUE) + render_spriteacc_tail(TRUE) + render_spriteacc_wings(TRUE) + render_spriteacc_horns(TRUE) + reapply_standing_overlays() + +/mob/living/carbon/human/proc/render_spriteacc_ears(flatten) + if((head?.inv_hide_flags | wear_mask?.inv_hide_flags) & (BLOCKHEADHAIR | BLOCKHAIR)) + remove_standing_overlay(HUMAN_OVERLAY_EARS) + return + var/datum/sprite_accessory/rendering = get_sprite_accessory(SPRITE_ACCESSORY_SLOT_EARS) + if(isnull(rendering)) + remove_standing_overlay(HUMAN_OVERLAY_EARS) + return + var/obj/item/organ/external/head/head_organ = get_organ(BP_HEAD) + if(!head_organ || head_organ.is_stump()) + remove_standing_overlay(HUMAN_OVERLAY_EARS) + return + var/rendered = rendering.render( + src, + list( + rgb(r_ears, g_ears, b_ears), + rgb(r_ears2, g_ears2, b_ears2), + rgb(r_ears3, g_ears3, b_ears3), + ), + HUMAN_LAYER_SPRITEACC_EARS_FRONT, + HUMAN_LAYER_SPRITEACC_EARS_BEHIND, + 0, // TODO + null, + flattened = flatten, + ) + // todo: this is awful + if(islist(rendered)) + for(var/image/I as anything in rendered) + I.pixel_y += head_spriteacc_offset + I.alpha = head_organ.hair_opacity + else + var/image/I = rendered + I.pixel_y += head_spriteacc_offset + I.alpha = head_organ.hair_opacity + + . = rendered + set_standing_overlay(HUMAN_OVERLAY_EARS, rendered) + +/mob/living/carbon/human/proc/render_spriteacc_horns(flatten) + if((head?.inv_hide_flags | wear_mask?.inv_hide_flags) & (BLOCKHEADHAIR | BLOCKHAIR)) + remove_standing_overlay(HUMAN_OVERLAY_HORNS) + return + var/datum/sprite_accessory/rendering = get_sprite_accessory(SPRITE_ACCESSORY_SLOT_HORNS) + if(isnull(rendering)) + remove_standing_overlay(HUMAN_OVERLAY_HORNS) + return + if(hiding_horns && rendering.can_be_hidden) + //! legacy code + remove_standing_overlay(HUMAN_OVERLAY_HORNS) + return + var/obj/item/organ/external/head/head_organ = get_organ(BP_HEAD) + if(!head_organ || head_organ.is_stump()) + remove_standing_overlay(HUMAN_OVERLAY_HORNS) + return + var/rendered = rendering.render( + src, + list( + rgb(r_horn, g_horn, b_horn), + rgb(r_horn2, g_horn2, b_horn2), + rgb(r_horn3, g_horn3, b_horn3), + ), + HUMAN_LAYER_SPRITEACC_HORNS_FRONT, + HUMAN_LAYER_SPRITEACC_HORNS_BEHIND, + 0, // TODO + null, + flattened = flatten, + ) + // todo: this is awful + if(islist(rendered)) + for(var/image/I as anything in rendered) + I.pixel_y += head_spriteacc_offset + I.alpha = head_organ.hair_opacity + else + var/image/I = rendered + I.pixel_y += head_spriteacc_offset + I.alpha = head_organ.hair_opacity + + . = rendered + set_standing_overlay(HUMAN_OVERLAY_HORNS, rendered) + +/mob/living/carbon/human/proc/render_spriteacc_facehair(flatten) + if((head?.inv_hide_flags | wear_mask?.inv_hide_flags) & BLOCKHAIR) + remove_standing_overlay(HUMAN_OVERLAY_FACEHAIR) + return + var/datum/sprite_accessory/rendering = get_sprite_accessory(SPRITE_ACCESSORY_SLOT_FACEHAIR) + if(isnull(rendering)) + remove_standing_overlay(HUMAN_OVERLAY_FACEHAIR) + return + var/obj/item/organ/external/head/head_organ = get_organ(BP_HEAD) + if(!head_organ || head_organ.is_stump()) + remove_standing_overlay(HUMAN_OVERLAY_FACEHAIR) + return + var/rendered = rendering.render( + src, + list( + rgb(r_facial, g_facial, b_facial), + ), + HUMAN_LAYER_SPRITEACC_FACEHAIR_FRONT, + HUMAN_LAYER_SPRITEACC_FACEHAIR_BEHIND, + 0, // TODO + null, + flattened = flatten, + ) + // todo: this is awful + if(islist(rendered)) + for(var/image/I as anything in rendered) + I.pixel_y += head_spriteacc_offset + I.alpha = head_organ.hair_opacity + else + var/image/I = rendered + I.pixel_y += head_spriteacc_offset + I.alpha = head_organ.hair_opacity + + . = rendered + set_standing_overlay(HUMAN_OVERLAY_FACEHAIR, rendered) + +/mob/living/carbon/human/proc/render_spriteacc_hair(flatten) + if((head?.inv_hide_flags | wear_mask?.inv_hide_flags) & (BLOCKHEADHAIR | BLOCKHAIR)) + remove_standing_overlay(HUMAN_OVERLAY_HAIR) + return + var/datum/sprite_accessory/rendering = get_sprite_accessory(SPRITE_ACCESSORY_SLOT_HAIR) + if(isnull(rendering)) + remove_standing_overlay(HUMAN_OVERLAY_HAIR) + return + var/obj/item/organ/external/head/head_organ = get_organ(BP_HEAD) + if(!head_organ || head_organ.is_stump()) + remove_standing_overlay(HUMAN_OVERLAY_HAIR) + return + // todo: what is this for? + // if(head && (head.inv_hide_flags & BLOCKHEADHAIR)) + // if(!(hair_style.hair_flags & HAIR_VERY_SHORT)) + // hair_style = GLOB.legacy_hair_lookup["Short Hair"] + var/rendered = rendering.render( + src, + list( + rgb(r_hair, g_hair, b_hair), + ), + HUMAN_LAYER_SPRITEACC_HAIR_FRONT, + HUMAN_LAYER_SPRITEACC_HAIR_BEHIND, + 0, // TODO + null, + flattened = flatten, + ) + // todo: this is awful + if(islist(rendered)) + for(var/image/I as anything in rendered) + I.pixel_y += head_spriteacc_offset + I.alpha = head_organ.hair_opacity + else + var/image/I = rendered + I.pixel_y += head_spriteacc_offset + I.alpha = head_organ.hair_opacity + + . = rendered + set_standing_overlay(HUMAN_OVERLAY_HAIR, rendered) + +/mob/living/carbon/human/proc/render_spriteacc_wings(flatten) + var/datum/sprite_accessory/wing/rendering = get_sprite_accessory(SPRITE_ACCESSORY_SLOT_WINGS) + if(isnull(rendering)) + remove_standing_overlay(HUMAN_OVERLAY_WINGS) + return + if(hiding_wings && rendering.can_be_hidden) + //! legacy code + remove_standing_overlay(HUMAN_OVERLAY_WINGS) + return + var/rendered = rendering.render( + src, + list( + rgb(r_wing, g_wing, b_wing), + rgb(r_wing2, g_wing2, b_wing2), + rgb(r_wing3, g_wing3, b_wing3), + ), + HUMAN_LAYER_SPRITEACC_WINGS_FRONT, + HUMAN_LAYER_SPRITEACC_WINGS_BEHIND, + 0, // TODO + null, + legacy_wing_variation, + flattened = flatten, + ) + + . = rendered + set_standing_overlay(HUMAN_OVERLAY_WINGS, rendered) + + +/mob/living/carbon/human/proc/render_spriteacc_tail(flatten) + var/datum/sprite_accessory/tail/rendering = get_sprite_accessory(SPRITE_ACCESSORY_SLOT_TAIL) + if(isnull(rendering)) + remove_standing_overlay(HUMAN_OVERLAY_TAIL) + return + if(hiding_tail && rendering.can_be_hidden) + //! legacy code + remove_standing_overlay(HUMAN_OVERLAY_TAIL) + return + var/rendered = rendering.render( + src, + list( + rgb(r_tail, g_tail, b_tail), + rgb(r_tail2, g_tail2, b_tail2), + rgb(r_tail3, g_tail3, b_tail3), + ), + HUMAN_LAYER_SPRITEACC_TAIL_FRONT, + HUMAN_LAYER_SPRITEACC_TAIL_BEHIND, + 0, // TODO, + null, + legacy_tail_variation, + flattened = flatten, + ) + + . = rendered + set_standing_overlay(HUMAN_OVERLAY_TAIL, rendered) + +/mob/living/carbon/human/proc/set_wing_variation(variation) + var/datum/sprite_accessory/wing/rendering = get_sprite_accessory(SPRITE_ACCESSORY_SLOT_WINGS) + if(!rendering?.variations?[variation] && !isnull(variation)) + return + legacy_wing_variation = variation + render_spriteacc_wings() + +/mob/living/carbon/human/proc/set_tail_variation(variation) + var/datum/sprite_accessory/tail/rendering = get_sprite_accessory(SPRITE_ACCESSORY_SLOT_TAIL) + // todo: legacy sihtcode lol + if(istype(rendering) && rendering.ani_state && variation == SPRITE_ACCESSORY_VARIATION_WAGGING) + else + if(!rendering?.variations?[variation] && !isnull(variation)) + return + legacy_tail_variation = variation + render_spriteacc_tail() + +/mob/living/carbon/proc/get_sprite_accessory(slot) + return + +/mob/living/carbon/human/get_sprite_accessory(slot) + switch(slot) + if(SPRITE_ACCESSORY_SLOT_TAIL) + // . = GLOB.sprite_accessory_tails[tail_style] + . = tail_style + if(SPRITE_ACCESSORY_SLOT_HAIR) + . = GLOB.legacy_hair_lookup[h_style] + if(SPRITE_ACCESSORY_SLOT_FACEHAIR) + . = GLOB.legacy_facial_hair_lookup[f_style] + if(SPRITE_ACCESSORY_SLOT_WINGS) + // . = GLOB.sprite_accessory_wings[wing_style] + . = wing_style + if(SPRITE_ACCESSORY_SLOT_HORNS) + // . = GLOB.sprite_accessory_ears[horn_style] + . = horn_style + if(SPRITE_ACCESSORY_SLOT_EARS) + // . = GLOB.sprite_accessory_ears[ear_style] + . = ear_style + if(slot == SPRITE_ACCESSORY_SLOT_TAIL && !.) + var/datum/robolimb/limb = isSynthetic() + if(istype(limb)) + . = limb?.legacy_includes_tail + if(.) + //! :skull_emoji: + // todo: better defaulting system, this is horrible. + r_tail = r_skin + g_tail = g_skin + b_tail = b_skin + +/mob/living/carbon/proc/render_sprite_accessory(slot) + return + +/mob/living/carbon/human/render_sprite_accessory(slot) + switch(slot) + if(SPRITE_ACCESSORY_SLOT_TAIL) + render_spriteacc_tail() + if(SPRITE_ACCESSORY_SLOT_HAIR) + render_spriteacc_hair() + if(SPRITE_ACCESSORY_SLOT_FACEHAIR) + render_spriteacc_facehair() + if(SPRITE_ACCESSORY_SLOT_WINGS) + render_spriteacc_wings() + if(SPRITE_ACCESSORY_SLOT_HORNS) + render_spriteacc_horns() + if(SPRITE_ACCESSORY_SLOT_EARS) + render_spriteacc_ears() + +/mob/living/carbon/proc/set_sprite_accessory_variation(slot, variation) + return + +/mob/living/carbon/human/set_sprite_accessory_variation(slot, variation) + switch(slot) + if(SPRITE_ACCESSORY_SLOT_HAIR) + if(SPRITE_ACCESSORY_SLOT_FACEHAIR) + if(SPRITE_ACCESSORY_SLOT_HORNS) + if(SPRITE_ACCESSORY_SLOT_EARS) + if(SPRITE_ACCESSORY_SLOT_WINGS) + set_wing_variation(variation) + if(SPRITE_ACCESSORY_SLOT_TAIL) + set_tail_variation(variation) + +/mob/living/carbon/proc/has_sprite_accessory_variation(slot, variation) + return + +/mob/living/carbon/human/has_sprite_accessory_variation(slot, variation) + var/datum/sprite_accessory/resolved = get_sprite_accessory(slot) + if(istype(resolved, /datum/sprite_accessory/tail) && variation == SPRITE_ACCESSORY_VARIATION_WAGGING) + var/datum/sprite_accessory/tail/tail = resolved + if(tail.ani_state) + return TRUE + return (resolved?.variations?[variation])? TRUE : FALSE + +/mob/living/carbon/proc/get_sprite_accessory_variation(slot) + return + +/mob/living/carbon/human/get_sprite_accessory_variation(slot) + var/datum/sprite_accessory/resolved = get_sprite_accessory(slot) + var/variation + switch(slot) + if(SPRITE_ACCESSORY_SLOT_HAIR) + if(SPRITE_ACCESSORY_SLOT_FACEHAIR) + if(SPRITE_ACCESSORY_SLOT_HORNS) + if(SPRITE_ACCESSORY_SLOT_EARS) + if(SPRITE_ACCESSORY_SLOT_TAIL) + variation = legacy_tail_variation + if(SPRITE_ACCESSORY_SLOT_WINGS) + variation = legacy_wing_variation + if(istype(resolved, /datum/sprite_accessory/tail) && variation == SPRITE_ACCESSORY_VARIATION_WAGGING) + var/datum/sprite_accessory/tail/tail = resolved + if(tail.ani_state) + return SPRITE_ACCESSORY_VARIATION_WAGGING + return (resolved.variations?[variation])? variation : null + +//! old code below + +//Not really once, since BYOND can't do that. +//Update this if the ability to flick() images or make looping animation start at the first frame is ever added. +//You can sort of flick images now with flick_overlay -Aro +/mob/living/carbon/human/proc/animate_tail_once() + var/datum/sprite_accessory/accessory = get_sprite_accessory(SPRITE_ACCESSORY_SLOT_TAIL) + var/time = accessory.variation_animation_times?[SPRITE_ACCESSORY_VARIATION_WAGGING] || accessory.variation_animation_time + if(!set_sprite_accessory_variation(SPRITE_ACCESSORY_SLOT_TAIL, SPRITE_ACCESSORY_VARIATION_WAGGING)) + return + addtimer(CALLBACK(src, PROC_REF(animate_tail_reset)), time, TIMER_CLIENT_TIME) + +/mob/living/carbon/human/proc/toggle_tail_vr(var/setting,var/message = 0) + if(!has_sprite_accessory_variation(SPRITE_ACCESSORY_SLOT_TAIL, SPRITE_ACCESSORY_VARIATION_WAGGING)) + if(message) + to_chat(src, "You don't have a tail that supports this.") + return 0 + + if(!set_sprite_accessory_variation( + SPRITE_ACCESSORY_SLOT_TAIL, + get_sprite_accessory_variation(SPRITE_ACCESSORY_SLOT_TAIL) == SPRITE_ACCESSORY_VARIATION_WAGGING? null : SPRITE_ACCESSORY_VARIATION_WAGGING, + )) + return 0 + return 1 + +/mob/living/carbon/human/proc/animate_tail_start() + set_sprite_accessory_variation(SPRITE_ACCESSORY_SLOT_TAIL, SPRITE_ACCESSORY_VARIATION_WAGGING) + // set_tail_state("[species.get_tail(src)]_slow[rand(0,9)]") + +/mob/living/carbon/human/proc/animate_tail_fast() + set_sprite_accessory_variation(SPRITE_ACCESSORY_SLOT_TAIL, SPRITE_ACCESSORY_VARIATION_WAGGING) + // set_tail_state("[species.get_tail(src)]_loop[rand(0,9)]") + +/mob/living/carbon/human/proc/animate_tail_reset() + set_sprite_accessory_variation(SPRITE_ACCESSORY_SLOT_TAIL, null) + // if(stat != DEAD) + // set_tail_state("[species.get_tail(src)]_idle[rand(0,9)]") + // else + // set_tail_state("[species.get_tail(src)]_static") + // toggle_tail_vr(FALSE) // So tails stop when someone dies. TODO - Fix this hack ~Leshana + +/mob/living/carbon/human/proc/animate_tail_stop() + set_sprite_accessory_variation(SPRITE_ACCESSORY_SLOT_TAIL, null) + +/mob/living/carbon/human/proc/toggle_wing_vr(var/setting,var/message = 0) + if(!has_sprite_accessory_variation(SPRITE_ACCESSORY_SLOT_WINGS, SPRITE_ACCESSORY_VARIATION_FLAPPING)) + if(message) + to_chat(src, "You don't have wings that support this.") + return 0 + if(!set_sprite_accessory_variation( + SPRITE_ACCESSORY_SLOT_WINGS, + get_sprite_accessory_variation(SPRITE_ACCESSORY_SLOT_WINGS) == SPRITE_ACCESSORY_VARIATION_FLAPPING? null : SPRITE_ACCESSORY_VARIATION_FLAPPING, + )) + return 0 + return 1 + +/mob/living/carbon/human/proc/toggle_wing_spread(var/folded,var/message = 0) + if(!has_sprite_accessory_variation(SPRITE_ACCESSORY_SLOT_WINGS, SPRITE_ACCESSORY_VARIATION_SPREAD)) + if(message) + to_chat(src, "You don't have wings!") + return 0 + if(!set_sprite_accessory_variation( + SPRITE_ACCESSORY_SLOT_WINGS, + get_sprite_accessory_variation(SPRITE_ACCESSORY_SLOT_WINGS) == SPRITE_ACCESSORY_VARIATION_SPREAD? null : SPRITE_ACCESSORY_VARIATION_SPREAD, + )) + return 0 + return 1 + +//? FUCK FUCK FUCK FUCK FUCK- + +/mob/living/carbon/human/update_hair() + update_eyes() //Pirated out of here, for glowing eyes. + + var/obj/item/organ/external/head/head_organ = get_organ(BP_HEAD) + if(istype(head_organ,/obj/item/organ/external/head/vr)) + var/obj/item/organ/external/head/vr/head_organ_vr = head_organ + head_spriteacc_offset = head_organ_vr.head_offset + else + head_spriteacc_offset = 0 + + render_spriteacc_ears() + render_spriteacc_horns() + render_spriteacc_hair() + render_spriteacc_facehair() + +//? Body + +/mob/living/carbon/human/update_damage_overlay() + // first check whether something actually changed about damage appearance + var/damage_appearance = "" + + for(var/obj/item/organ/external/O in organs) + if(isnull(O) || O.is_stump()) + continue + damage_appearance += O.damage_state + + if(damage_appearance == previous_damage_appearance) + // nothing to do here + return + + previous_damage_appearance = damage_appearance + + var/image/standing_image = image(icon = species.damage_overlays, icon_state = "00", layer = HUMAN_LAYER_DAMAGE) + + // blend the individual damage states with our icons + for(var/obj/item/organ/external/O in organs) + if(isnull(O) || O.is_stump()) + continue + + O.update_icon() + if(O.damage_state == "00") continue + var/icon/DI + var/cache_index = "[O.damage_state]/[O.icon_name]/[species.get_blood_colour(src)]/[species.get_bodytype_legacy(src)]" + if(GLOB.damage_icon_parts[cache_index] == null) + DI = icon(species.get_damage_overlays(src), O.damage_state) // the damage icon for whole human + DI.Blend(icon(species.get_damage_mask(src), O.icon_name), ICON_MULTIPLY) // mask with this organ's pixels + DI.Blend(species.get_blood_colour(src), ICON_MULTIPLY) + GLOB.damage_icon_parts[cache_index] = DI + else + DI = GLOB.damage_icon_parts[cache_index] + + standing_image.add_overlay(DI) + + set_standing_overlay(HUMAN_OVERLAY_DAMAGE, standing_image) + +//BASE MOB SPRITE +/mob/living/carbon/human/update_icons_body() + var/husk_color_mod = rgb(96,88,80) + var/hulk_color_mod = rgb(48,224,40) + + var/husk = (MUTATION_HUSK in src.mutations) + var/fat = (MUTATION_FAT in src.mutations) + var/hulk = (MUTATION_HULK in src.mutations) + var/skeleton = (MUTATION_SKELETON in src.mutations) + + robolimb_count = 0 //TODO, here, really tho? + robobody_count = 0 + + //CACHING: Generate an index key from visible bodyparts. + //0 = destroyed, 1 = normal, 2 = robotic, 3 = necrotic. + + //Create a new, blank icon for our mob to use. + var/icon/stand_icon = new(species.icon_template ? species.icon_template : 'icons/mob/human.dmi', icon_state = "blank") + + var/g = gender == FEMALE ? "f" : "m" + /* This was the prior code before the above line. It was faulty and has been commented out. + var/g = "male" + if(gender == FEMALE) + g = "female" + */ + + var/icon_key = "[species.get_race_key(src)][s_base][g][s_tone][r_skin][g_skin][b_skin]" + if(lip_style) + icon_key += "[lip_style]" + else + icon_key += "nolips" + var/obj/item/organ/internal/eyes/eyes = internal_organs_by_name[O_EYES] + if(eyes) + icon_key += "[rgb(eyes.eye_colour[1], eyes.eye_colour[2], eyes.eye_colour[3])]" + else + icon_key += "[r_eyes], [g_eyes], [b_eyes]" + + var/obj/item/organ/external/head/head = organs_by_name[BP_HEAD] + if(head) + if(!istype(head, /obj/item/organ/external/stump)) + icon_key += "[head.eye_icon]" + for(var/organ_tag in species.has_limbs) + var/obj/item/organ/external/part = organs_by_name[organ_tag] + // Allowing tails to prevent bodyparts rendering, granting more spriter freedom for taur/digitigrade stuff. + if(isnull(part) || part.is_stump() || part.is_hidden_by_tail()) + icon_key += "0" + continue + if(part) + icon_key += "[part.name]" + icon_key += "[part.species.get_race_key(part.owner)]" + icon_key += "[part.dna.GetUIState(DNA_UI_GENDER)]" + icon_key += "[part.s_tone]" + if(part.s_col && part.s_col.len >= 3) + icon_key += "[rgb(part.s_col[1],part.s_col[2],part.s_col[3])]" + if(part.body_hair && part.h_col && part.h_col.len >= 3) + icon_key += "[rgb(part.h_col[1],part.h_col[2],part.h_col[3])]" + if(species.color_force_greyscale) + icon_key += "_ags" + if(species.color_mult) + icon_key += "[ICON_MULTIPLY]" + else + icon_key += "[ICON_ADD]" + else + icon_key += "#000000" + for(var/M in part.markings) + icon_key += "[M][part.markings[M]["color"]]" + + if(part.robotic >= ORGAN_ROBOT) + icon_key += "2[part.model ? "-[part.model]": ""]" + robolimb_count++ + if((part.robotic == ORGAN_ROBOT || part.robotic == ORGAN_LIFELIKE || part.robotic == ORGAN_NANOFORM) && (part.organ_tag == BP_HEAD || part.organ_tag == BP_TORSO || part.organ_tag == BP_GROIN)) + robobody_count ++ + else if(part.status & ORGAN_DEAD) + icon_key += "3" + else + icon_key += "1" + if(part.transparent) + icon_key += "_t" + + icon_key = "[icon_key][husk ? 1 : 0][fat ? 1 : 0][hulk ? 1 : 0][skeleton ? 1 : 0]" + + var/icon/base_icon + if(GLOB.human_icon_cache[icon_key]) + base_icon = GLOB.human_icon_cache[icon_key] + else + //BEGIN CACHED ICON GENERATION. + var/obj/item/organ/external/chest = get_organ(BP_TORSO) + base_icon = chest.get_icon() + + for(var/obj/item/organ/external/part in organs) + if(isnull(part) || part.is_stump() || part.is_hidden_by_tail()) + continue + var/icon/temp = part.get_icon(skeleton) + //That part makes left and right legs drawn topmost and lowermost when human looks WEST or EAST + //And no change in rendering for other parts (they icon_position is 0, so goes to 'else' part) + if(part.icon_position & (LEFT | RIGHT)) + var/icon/temp2 = new(species.icon_template ? species.icon_template : 'icons/mob/human.dmi', icon_state = "blank") + temp2.Insert(new/icon(temp,dir=NORTH),dir=NORTH) + temp2.Insert(new/icon(temp,dir=SOUTH),dir=SOUTH) + if(!(part.icon_position & LEFT)) + temp2.Insert(new/icon(temp,dir=EAST),dir=EAST) + if(!(part.icon_position & RIGHT)) + temp2.Insert(new/icon(temp,dir=WEST),dir=WEST) + base_icon.Blend(temp2, ICON_OVERLAY) + if(part.icon_position & LEFT) + temp2.Insert(new/icon(temp,dir=EAST),dir=EAST) + if(part.icon_position & RIGHT) + temp2.Insert(new/icon(temp,dir=WEST),dir=WEST) + base_icon.Blend(temp2, ICON_UNDERLAY) + else if(part.icon_position & UNDER) + base_icon.Blend(temp, ICON_UNDERLAY) + else + base_icon.Blend(temp, ICON_OVERLAY) + + if(!skeleton) + if(husk) + base_icon.ColorTone(husk_color_mod) + else if(hulk) + var/list/tone = ReadRGB(hulk_color_mod) + base_icon.MapColors(rgb(tone[1],0,0),rgb(0,tone[2],0),rgb(0,0,tone[3])) + + // Handle husk overlay. + if(husk) + var/husk_icon = species.get_husk_icon(src) + if(husk_icon) + var/icon/mask = new(base_icon) + var/icon/husk_over = new(species.husk_icon,"") + mask.MapColors(0,0,0,1, 0,0,0,1, 0,0,0,1, 0,0,0,1, 0,0,0,0) + husk_over.Blend(mask, ICON_ADD) + base_icon.Blend(husk_over, ICON_OVERLAY) + + GLOB.human_icon_cache[icon_key] = base_icon + + //END CACHED ICON GENERATION. + stand_icon.Blend(base_icon,ICON_OVERLAY) + icon = stand_icon + + //tail + render_spriteacc_tail() + //wing + render_spriteacc_wings() + +/mob/living/carbon/human/proc/update_skin() + var/image/skin = species.update_skin(src) + set_standing_overlay(HUMAN_OVERLAY_SKIN, skin) + +/mob/living/carbon/human/proc/update_bloodied() + if(!blood_DNA && !feet_blood_DNA) + remove_standing_overlay(HUMAN_OVERLAY_BLOOD) + return + + var/image/both = image(icon = 'icons/effects/effects.dmi', icon_state = "nothing", layer = HUMAN_LAYER_BLOOD) + + //Bloody hands + if(blood_DNA) + var/image/bloodsies = image(icon = species.get_blood_mask(src), icon_state = "bloodyhands", layer = HUMAN_LAYER_BLOOD) + bloodsies.color = hand_blood_color + both.add_overlay(bloodsies) + + //Bloody feet + if(feet_blood_DNA) + var/image/bloodsies = image(icon = species.get_blood_mask(src), icon_state = "shoeblood", layer = HUMAN_LAYER_BLOOD) + bloodsies.color = feet_blood_color + both.add_overlay(bloodsies) + + set_standing_overlay(HUMAN_OVERLAY_BLOOD, both) + + +//UNDERWEAR OVERLAY +/mob/living/carbon/human/proc/update_underwear() + if(!(species.species_appearance_flags & HAS_UNDERWEAR)) + remove_standing_overlay(HUMAN_OVERLAY_UNDERWEAR) + return + var/list/setting = list() + // SHITCODE WARNING + // MANUAL UNDERWEAR SORT + for(var/key in list( + "Underwear, bottom", + "Socks", + "Underwear, top", + "Undershirt", + )) + var/existing = all_underwear[key] + all_underwear -= key + if(existing) + all_underwear[key] = existing + // END + + for(var/category in all_underwear) + if(hide_underwear[category]) + continue + var/datum/category_item/underwear/UWI = all_underwear[category] + var/image/wear = UWI.generate_image(all_underwear_metadata[category], layer = HUMAN_LAYER_UNDERWEAR) + setting += wear + set_standing_overlay(HUMAN_OVERLAY_UNDERWEAR, setting) + +/mob/living/carbon/human/update_eyes() + var/obj/item/organ/internal/eyes/eyes = internal_organs_by_name[O_EYES] + if(eyes) + eyes.update_colour() + update_icons_body() + + //TODO: Probably redo this. I know I wrote it, but... + + //This is ONLY for glowing eyes for now. Boring flat eyes are done by the head's own proc. + if(!species.has_glowing_eyes) + remove_standing_overlay(HUMAN_OVERLAY_EYES) + return + + //Our glowy eyes should be hidden if some equipment hides them. + if(!should_have_organ(O_EYES) || (head && (head.inv_hide_flags & BLOCKHAIR)) || (wear_mask && (wear_mask.inv_hide_flags & BLOCKHAIR))) + remove_standing_overlay(HUMAN_OVERLAY_EYES) + return + + //Get the head, we'll need it later. + var/obj/item/organ/external/head/head_organ = get_organ(BP_HEAD) + if(!head_organ || head_organ.is_stump() ) + remove_standing_overlay(HUMAN_OVERLAY_EYES) + return + + //The eyes store the color themselves, funny enough. + if(!head_organ.eye_icon) + remove_standing_overlay(HUMAN_OVERLAY_EYES) + return + + var/icon/eyes_icon = new/icon(head_organ.eye_icon_location, head_organ.eye_icon) + if(eyes) + eyes_icon.Blend(rgb(eyes.eye_colour[1], eyes.eye_colour[2], eyes.eye_colour[3]), ICON_ADD) + else + eyes_icon.Blend(rgb(128,0,0), ICON_ADD) + + var/image/eyes_image = image(eyes_icon) + eyes_image.plane = ABOVE_LIGHTING_PLANE + + set_standing_overlay(HUMAN_OVERLAY_EYES, eyes_image) + +/mob/living/carbon/human/update_mutations() + if(!LAZYLEN(mutations)) + remove_standing_overlay(HUMAN_OVERLAY_MUTATIONS) + return //No mutations, no icons. + + //TODO: THIS PROC??? + var/fat + if(MUTATION_FAT in mutations) + fat = "fat" + + var/image/standing = image(icon = 'icons/effects/genetics.dmi', layer = HUMAN_LAYER_MUTATIONS) + var/g = gender == FEMALE ? "f" : "m" + + for(var/datum/gene/gene in dna_genes) + if(!gene.block) + continue + if(gene.is_active(src)) + var/underlay = gene.OnDrawUnderlays(src,g,fat) + if(underlay) + standing.underlays += underlay + + for(var/mut in mutations) + if(mut == MUTATION_LASER) + standing.overlays += "lasereyes_s" //TODO + + set_standing_overlay(HUMAN_OVERLAY_MUTATIONS, standing) + +//? Misc + +/mob/living/carbon/human/update_modifier_visuals() + if(!LAZYLEN(modifiers)) + remove_standing_overlay(HUMAN_OVERLAY_MODIFIERS) + return //No modifiers, no effects. + + var/image/effects = new() + for(var/datum/modifier/M in modifiers) + if(M.mob_overlay_state) + var/image/I = image(icon = 'icons/mob/modifier_effects.dmi', icon_state = M.mob_overlay_state) + effects.add_overlay(I) //TODO, this compositing is annoying. + + set_standing_overlay(HUMAN_OVERLAY_MODIFIERS, effects) + +/mob/living/carbon/human/update_fire() + if(!on_fire) + remove_standing_overlay(HUMAN_OVERLAY_FIRE) + return + set_standing_overlay( + HUMAN_OVERLAY_FIRE, + image(icon = 'icons/mob/OnFire.dmi', icon_state = get_fire_icon_state(), layer = HUMAN_LAYER_FIRE), + ) + +/mob/living/carbon/human/update_water() + var/depth = check_submerged() + if(!depth || lying) + remove_standing_overlay(HUMAN_OVERLAY_LIQUID) + return + var/image/applying + if(depth < 3) + applying = image(icon = 'icons/mob/submerged.dmi', icon_state = "human_swimming_[depth]", layer = HUMAN_LAYER_LIQUID) //TODO: Improve + if(depth == 4) + applying = image(icon = 'icons/mob/submerged.dmi', icon_state = "hacid_1", layer = HUMAN_LAYER_LIQUID) + if(depth == 5) + applying = image(icon = 'icons/mob/submerged.dmi', icon_state = "hacid_2", layer = HUMAN_LAYER_LIQUID) + if(depth == 6) + applying = image(icon = 'icons/mob/submerged.dmi', icon_state = "hblood_1", layer = HUMAN_LAYER_LIQUID) + if(depth == 7) + applying = image(icon = 'icons/mob/submerged.dmi', icon_state = "hblood_2", layer = HUMAN_LAYER_LIQUID) + set_standing_overlay(HUMAN_OVERLAY_LIQUID, applying) + +// todo: burn with fire +/mob/living/carbon/human/update_acidsub() + var/depth = check_submerged() + if(!depth || lying) + remove_standing_overlay(HUMAN_OVERLAY_LIQUID) + return + + set_standing_overlay( + HUMAN_OVERLAY_LIQUID, + image(icon = 'icons/mob/submerged.dmi', icon_state = "hacid_[depth]", layer = HUMAN_LAYER_LIQUID), + ) + +// todo: burn with fire +/mob/living/carbon/human/update_bloodsub() + var/depth = check_submerged() + if(!depth || lying) + remove_standing_overlay(HUMAN_OVERLAY_LIQUID) + return + + set_standing_overlay( + HUMAN_OVERLAY_LIQUID, + image(icon = 'icons/mob/submerged.dmi', icon_state = "hblood_[depth]", layer = HUMAN_LAYER_LIQUID), + ) + +/mob/living/carbon/human/proc/update_surgery() + var/image/total = new + for(var/obj/item/organ/external/E in organs) + if(E.open) + var/image/I = image(icon = 'icons/mob/surgery.dmi', icon_state = "[E.icon_name][round(E.open)]", layer = HUMAN_LAYER_SURGERY) + total.add_overlay(I) //TODO: This compositing is annoying + + if(length(total.overlays)) + set_standing_overlay(HUMAN_OVERLAY_SURGERY, total) + else + remove_standing_overlay(HUMAN_OVERLAY_SURGERY) + +//? Inventory + +/mob/living/carbon/human/update_inv_w_uniform() + inventory.update_slot_render(SLOT_ID_UNIFORM) + +/mob/living/carbon/human/update_inv_wear_id() + inventory.update_slot_render(SLOT_ID_WORN_ID) + +/mob/living/carbon/human/update_inv_gloves() + inventory.update_slot_render(SLOT_ID_GLOVES) + +/mob/living/carbon/human/update_inv_glasses() + inventory.update_slot_render(SLOT_ID_GLASSES) + +/mob/living/carbon/human/update_inv_ears() + inventory.update_slot_render(SLOT_ID_LEFT_EAR) + inventory.update_slot_render(SLOT_ID_RIGHT_EAR) + +/mob/living/carbon/human/update_inv_shoes() + inventory.update_slot_render(SLOT_ID_SHOES) + +/mob/living/carbon/human/update_inv_s_store() + inventory.update_slot_render(SLOT_ID_SUIT_STORAGE) + +/mob/living/carbon/human/update_inv_head() + inventory.update_slot_render(SLOT_ID_HEAD) + +/mob/living/carbon/human/update_inv_belt() + inventory.update_slot_render(SLOT_ID_BELT) + +/mob/living/carbon/human/update_inv_wear_suit() + inventory.update_slot_render(SLOT_ID_SUIT) + +/mob/living/carbon/human/update_inv_wear_mask() + inventory.update_slot_render(SLOT_ID_MASK) + +/mob/living/carbon/human/update_inv_back() + inventory.update_slot_render(SLOT_ID_BACK) + +/mob/living/carbon/human/update_inv_handcuffed() + inventory.update_slot_render(SLOT_ID_HANDCUFFED) + +/mob/living/carbon/human/update_inv_legcuffed() + inventory.update_slot_render(SLOT_ID_LEGCUFFED) + +/mob/living/carbon/human/update_inv_r_hand() + if(isnull(r_hand)) + remove_standing_overlay(HUMAN_OVERLAY_RHAND) + return + set_standing_overlay( + HUMAN_OVERLAY_RHAND, + r_hand.render_mob_appearance(src, 2, BODYTYPE_DEFAULT), + ) + +/mob/living/carbon/human/update_inv_l_hand() + if(isnull(l_hand)) + remove_standing_overlay(HUMAN_OVERLAY_LHAND) + return + set_standing_overlay( + HUMAN_OVERLAY_LHAND, + l_hand.render_mob_appearance(src, 1, BODYTYPE_DEFAULT), + ) diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index dad9fe7f973d..7f5ab6620904 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -7,57 +7,7 @@ GLOBAL_LIST_EMPTY(tail_icon_cache) GLOBAL_LIST_EMPTY(light_overlay_cache) GLOBAL_LIST_EMPTY(damage_icon_parts) -//////////////////////////////////////////////////////////////////////////////////////////////// -// # Human Icon Updating System -// -// This system takes care of the "icon" for human mobs. Of course humans don't just have a single -// icon+icon_state, but a combination of dozens of little sprites including including the body, -// clothing, equipment, in-universe HUD images, etc. -// -// # Basic Operation -// Whenever you do something that should update the on-mob appearance of a worn or held item, You -// will need to call the relevant update_inv_* proc. All of these are named after the variable they -// update from. They are defined at the /mob level so you don't even need to cast to carbon/human. -// -// The new system leverages SSoverlays to actually add/remove the overlays from mob.overlays -// Since SSoverlays already manages batching updates to reduce apperance churn etc, we don't need -// to worry about that. (In short, you can call add/cut overlay as many times as you want, it will -// only get assigned to the mob once per tick.) -// As a corrolary, this means users of this system do NOT need to tell the system when you're done -// making changes. -// -// There are also these special cases: -// update_icons_body() //Handles updating your mob's icon to reflect their gender/race/complexion etc -// UpdateDamageIcon() //Handles damage overlays for brute/burn damage //(will rename this when I geta round to it) ~Carn -// update_skin() //Handles updating skin for species that have a skin overlay. -// update_bloodied() //Handles adding/clearing the blood overlays for hands & feet. Call when bloodied or cleaned. -// update_underwear() //Handles updating the sprite for underwear. -// update_hair() //Handles updating your hair and eyes overlay -// update_mutations() //Handles updating your appearance for certain mutations. e.g MUTATION_TELEKINESIS head-glows -// update_fire() //Handles overlay from being on fire. -// update_water() //Handles overlay from being submerged. -// update_surgery() //Handles overlays from open external organs. -// -// # History (i.e. I'm used to the old way, what is different?) -// You used to have to call update_icons(FALSE) if you planned to make more changes, and call update_icons(TRUE) -// on the final update. All that is gone, just call update_inv_whatever() and it handles the rest. -// -//////////////////////////////////////////////////////////////////////////////////////////////// - -//Add an entry to overlays, assuming it exists -/mob/living/carbon/human/proc/apply_layer(cache_index) - if((. = overlays_standing[cache_index])) - add_overlay(.) - -//Remove an entry from overlays, and from the list -/mob/living/carbon/human/proc/remove_layer(cache_index) - var/I = overlays_standing[cache_index] - if(I) - cut_overlay(I) - overlays_standing[cache_index] = null - /mob/living/carbon/human - var/list/overlays_standing[TOTAL_LAYERS] var/previous_damage_appearance // store what the body last looked like, so we only have to update it if something changed //UPDATES OVERLAYS FROM OVERLAYS_LYING/OVERLAYS_STANDING @@ -79,6 +29,23 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) /mob/living/carbon/human/update_icons_huds() stack_trace("CANARY: Old human update_icons_huds was called.") +//TODO: Carbon procs in my human update_icons?? +/mob/living/carbon/human/update_hud() //TODO: do away with this if possible + // todo: this is utterly shitcode and fucking stupid ~silicons + // todo: the rest of hud code here ain't much better LOL + var/list/obj/item/relevant = get_equipped_items(TRUE, TRUE) + if(hud_used) + for(var/obj/item/I as anything in relevant) + position_hud_item(I, slot_id_by_item(I)) + if(client) + client.screen |= relevant + +//update whether handcuffs appears on our hud. +/mob/living/carbon/proc/update_hud_handcuffed() + if(hud_used && hud_used.l_hand_hud_object && hud_used.r_hand_hud_object) + hud_used.l_hand_hud_object.update_icon() + hud_used.r_hand_hud_object.update_icon() + /mob/living/carbon/human/update_transform() var/matrix/old_matrix = transform var/matrix/M = matrix() @@ -93,6 +60,16 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) M.Scale(desired_scale_x, desired_scale_y) M.Translate(0, 16 * (desired_scale_y - 1)) + // Mark atom as wide/long for ZM. + if (desired_scale_x > 1) + zmm_flags |= ZMM_LOOKAHEAD + else + zmm_flags &= ~ZMM_LOOKAHEAD + if (desired_scale_y > 1) + zmm_flags |= ZMM_LOOKBESIDE + else + zmm_flags &= ~ZMM_LOOKBESIDE + // handle turning M.Turn(lying) // extremely lazy heuristic to see if we should shift down to appear to be, well, down. @@ -108,422 +85,6 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) update_icon_special() //May contain transform-altering things update_ssd_overlay() -//DAMAGE OVERLAYS -//constructs damage icon for each organ from mask * damage field and saves it in our overlays_ lists -/mob/living/carbon/human/UpdateDamageIcon() - if(QDESTROYING(src)) - return - - remove_layer(DAMAGE_LAYER) - - // first check whether something actually changed about damage appearance - var/damage_appearance = "" - - for(var/obj/item/organ/external/O in organs) - if(isnull(O) || O.is_stump()) - continue - damage_appearance += O.damage_state - - if(damage_appearance == previous_damage_appearance) - // nothing to do here - return - - previous_damage_appearance = damage_appearance - - var/image/standing_image = image(icon = species.damage_overlays, icon_state = "00", layer = BODY_LAYER+DAMAGE_LAYER) - - // blend the individual damage states with our icons - for(var/obj/item/organ/external/O in organs) - if(isnull(O) || O.is_stump()) - continue - - O.update_icon() - if(O.damage_state == "00") continue - var/icon/DI - var/cache_index = "[O.damage_state]/[O.icon_name]/[species.get_blood_colour(src)]/[species.get_bodytype_legacy(src)]" - if(GLOB.damage_icon_parts[cache_index] == null) - DI = icon(species.get_damage_overlays(src), O.damage_state) // the damage icon for whole human - DI.Blend(icon(species.get_damage_mask(src), O.icon_name), ICON_MULTIPLY) // mask with this organ's pixels - DI.Blend(species.get_blood_colour(src), ICON_MULTIPLY) - GLOB.damage_icon_parts[cache_index] = DI - else - DI = GLOB.damage_icon_parts[cache_index] - - standing_image.add_overlay(DI) - - overlays_standing[DAMAGE_LAYER] = standing_image - apply_layer(DAMAGE_LAYER) - -//BASE MOB SPRITE -/mob/living/carbon/human/update_icons_body() - if(QDESTROYING(src) || !(atom_flags & ATOM_INITIALIZED)) - return - - var/husk_color_mod = rgb(96,88,80) - var/hulk_color_mod = rgb(48,224,40) - - var/husk = (MUTATION_HUSK in src.mutations) - var/fat = (MUTATION_FAT in src.mutations) - var/hulk = (MUTATION_HULK in src.mutations) - var/skeleton = (MUTATION_SKELETON in src.mutations) - - robolimb_count = 0 //TODO, here, really tho? - robobody_count = 0 - - //CACHING: Generate an index key from visible bodyparts. - //0 = destroyed, 1 = normal, 2 = robotic, 3 = necrotic. - - //Create a new, blank icon for our mob to use. - var/icon/stand_icon = new(species.icon_template ? species.icon_template : 'icons/mob/human.dmi', icon_state = "blank") - - var/g = gender == FEMALE ? "f" : "m" - /* This was the prior code before the above line. It was faulty and has been commented out. - var/g = "male" - if(gender == FEMALE) - g = "female" - */ - - var/icon_key = "[species.get_race_key(src)][s_base][g][s_tone][r_skin][g_skin][b_skin]" - if(lip_style) - icon_key += "[lip_style]" - else - icon_key += "nolips" - var/obj/item/organ/internal/eyes/eyes = internal_organs_by_name[O_EYES] - if(eyes) - icon_key += "[rgb(eyes.eye_colour[1], eyes.eye_colour[2], eyes.eye_colour[3])]" - else - icon_key += "[r_eyes], [g_eyes], [b_eyes]" - - var/obj/item/organ/external/head/head = organs_by_name[BP_HEAD] - if(head) - if(!istype(head, /obj/item/organ/external/stump)) - icon_key += "[head.eye_icon]" - for(var/organ_tag in species.has_limbs) - var/obj/item/organ/external/part = organs_by_name[organ_tag] - // Allowing tails to prevent bodyparts rendering, granting more spriter freedom for taur/digitigrade stuff. - if(isnull(part) || part.is_stump() || part.is_hidden_by_tail()) - icon_key += "0" - continue - if(part) - icon_key += "[part.name]" - icon_key += "[part.species.get_race_key(part.owner)]" - icon_key += "[part.dna.GetUIState(DNA_UI_GENDER)]" - icon_key += "[part.s_tone]" - if(part.s_col && part.s_col.len >= 3) - icon_key += "[rgb(part.s_col[1],part.s_col[2],part.s_col[3])]" - if(part.body_hair && part.h_col && part.h_col.len >= 3) - icon_key += "[rgb(part.h_col[1],part.h_col[2],part.h_col[3])]" - if(species.color_force_greyscale) - icon_key += "_ags" - if(species.color_mult) - icon_key += "[ICON_MULTIPLY]" - else - icon_key += "[ICON_ADD]" - else - icon_key += "#000000" - for(var/M in part.markings) - icon_key += "[M][part.markings[M]["color"]]" - - if(part.robotic >= ORGAN_ROBOT) - icon_key += "2[part.model ? "-[part.model]": ""]" - robolimb_count++ - if((part.robotic == ORGAN_ROBOT || part.robotic == ORGAN_LIFELIKE || part.robotic == ORGAN_NANOFORM) && (part.organ_tag == BP_HEAD || part.organ_tag == BP_TORSO || part.organ_tag == BP_GROIN)) - robobody_count ++ - else if(part.status & ORGAN_DEAD) - icon_key += "3" - else - icon_key += "1" - if(part.transparent) - icon_key += "_t" - - icon_key = "[icon_key][husk ? 1 : 0][fat ? 1 : 0][hulk ? 1 : 0][skeleton ? 1 : 0]" - - var/icon/base_icon - if(GLOB.human_icon_cache[icon_key]) - base_icon = GLOB.human_icon_cache[icon_key] - else - //BEGIN CACHED ICON GENERATION. - var/obj/item/organ/external/chest = get_organ(BP_TORSO) - base_icon = chest.get_icon() - - for(var/obj/item/organ/external/part in organs) - if(isnull(part) || part.is_stump() || part.is_hidden_by_tail()) - continue - var/icon/temp = part.get_icon(skeleton) - //That part makes left and right legs drawn topmost and lowermost when human looks WEST or EAST - //And no change in rendering for other parts (they icon_position is 0, so goes to 'else' part) - if(part.icon_position & (LEFT | RIGHT)) - var/icon/temp2 = new(species.icon_template ? species.icon_template : 'icons/mob/human.dmi', icon_state = "blank") - temp2.Insert(new/icon(temp,dir=NORTH),dir=NORTH) - temp2.Insert(new/icon(temp,dir=SOUTH),dir=SOUTH) - if(!(part.icon_position & LEFT)) - temp2.Insert(new/icon(temp,dir=EAST),dir=EAST) - if(!(part.icon_position & RIGHT)) - temp2.Insert(new/icon(temp,dir=WEST),dir=WEST) - base_icon.Blend(temp2, ICON_OVERLAY) - if(part.icon_position & LEFT) - temp2.Insert(new/icon(temp,dir=EAST),dir=EAST) - if(part.icon_position & RIGHT) - temp2.Insert(new/icon(temp,dir=WEST),dir=WEST) - base_icon.Blend(temp2, ICON_UNDERLAY) - else if(part.icon_position & UNDER) - base_icon.Blend(temp, ICON_UNDERLAY) - else - base_icon.Blend(temp, ICON_OVERLAY) - - if(!skeleton) - if(husk) - base_icon.ColorTone(husk_color_mod) - else if(hulk) - var/list/tone = ReadRGB(hulk_color_mod) - base_icon.MapColors(rgb(tone[1],0,0),rgb(0,tone[2],0),rgb(0,0,tone[3])) - - // Handle husk overlay. - if(husk) - var/husk_icon = species.get_husk_icon(src) - if(husk_icon) - var/icon/mask = new(base_icon) - var/icon/husk_over = new(species.husk_icon,"") - mask.MapColors(0,0,0,1, 0,0,0,1, 0,0,0,1, 0,0,0,1, 0,0,0,0) - husk_over.Blend(mask, ICON_ADD) - base_icon.Blend(husk_over, ICON_OVERLAY) - - GLOB.human_icon_cache[icon_key] = base_icon - - //END CACHED ICON GENERATION. - stand_icon.Blend(base_icon,ICON_OVERLAY) - icon = stand_icon - - //tail - update_tail_showing() - //wing - update_wing_showing() - -/mob/living/carbon/human/proc/update_skin() - if(QDESTROYING(src)) - return - - remove_layer(SKIN_LAYER) - - var/image/skin = species.update_skin(src) - if(skin) - skin.layer = BODY_LAYER+SKIN_LAYER - overlays_standing[SKIN_LAYER] = skin - apply_layer(SKIN_LAYER) - -/mob/living/carbon/human/proc/update_bloodied() - if(QDESTROYING(src)) - return - - remove_layer(BLOOD_LAYER) - if(!blood_DNA && !feet_blood_DNA) - return - - var/image/both = image(icon = 'icons/effects/effects.dmi', icon_state = "nothing", layer = BODY_LAYER+BLOOD_LAYER) - - //Bloody hands - if(blood_DNA) - var/image/bloodsies = image(icon = species.get_blood_mask(src), icon_state = "bloodyhands", layer = BODY_LAYER+BLOOD_LAYER) - bloodsies.color = hand_blood_color - both.add_overlay(bloodsies) - - //Bloody feet - if(feet_blood_DNA) - var/image/bloodsies = image(icon = species.get_blood_mask(src), icon_state = "shoeblood", layer = BODY_LAYER+BLOOD_LAYER) - bloodsies.color = feet_blood_color - both.add_overlay(bloodsies) - - overlays_standing[BLOOD_LAYER] = both - - apply_layer(BLOOD_LAYER) - -/mob/living/carbon/human/proc/BloodyMouth() - - var/image/both = image(icon = 'icons/effects/effects.dmi', icon_state = "nothing", layer = BODY_LAYER+BLOOD_LAYER) - - //"lol", said the scorpion, "lmao" - var/image/bloodsies = image(icon = species.get_blood_mask(src), icon_state = "redwings", layer = BODY_LAYER+BLOOD_LAYER) - bloodsies.color = src.species.blood_color - both.add_overlay(bloodsies) - - overlays_standing[BLOOD_LAYER] = both - - apply_layer(BLOOD_LAYER) - - -//UNDERWEAR OVERLAY -/mob/living/carbon/human/proc/update_underwear() - if(QDESTROYING(src)) - return - - remove_layer(UNDERWEAR_LAYER) - - if(species.species_appearance_flags & HAS_UNDERWEAR) - overlays_standing[UNDERWEAR_LAYER] = list() - for(var/category in all_underwear) - if(hide_underwear[category]) - continue - var/datum/category_item/underwear/UWI = all_underwear[category] - var/image/wear = UWI.generate_image(all_underwear_metadata[category], layer = BODY_LAYER+UNDERWEAR_LAYER) - overlays_standing[UNDERWEAR_LAYER] += wear - - apply_layer(UNDERWEAR_LAYER) - -//HAIR OVERLAY -/mob/living/carbon/human/update_hair() - if(QDESTROYING(src)) - return - - //Reset our hair - remove_layer(HAIR_LAYER) - update_eyes() //Pirated out of here, for glowing eyes. - - var/obj/item/organ/external/head/head_organ = get_organ(BP_HEAD) - if(!head_organ || head_organ.is_stump() ) - return - - //masks and helmets can obscure our hair. - if( (head && (head.inv_hide_flags & BLOCKHAIR)) || (wear_mask && (wear_mask.inv_hide_flags & BLOCKHAIR))) - return - - //base icons - var/icon/face_standing = icon(icon = 'icons/mob/human_face.dmi', icon_state = "bald_s") - - if(f_style) - var/datum/sprite_accessory/facial_hair_style = GLOB.legacy_facial_hair_lookup[f_style] - if(facial_hair_style && (!facial_hair_style.apply_restrictions || (src.species.get_bodytype_legacy(src) in facial_hair_style.species_allowed))) - var/icon/facial_s = new/icon("icon" = facial_hair_style.icon, "icon_state" = "[facial_hair_style.icon_state]_s") - if(facial_hair_style.do_colouration) - facial_s.Blend(rgb(r_facial, g_facial, b_facial), facial_hair_style.color_blend_mode) - - face_standing.Blend(facial_s, ICON_OVERLAY) - - if(h_style) - var/datum/sprite_accessory/hair/hair_style = GLOB.legacy_hair_lookup[h_style] - if(head && (head.inv_hide_flags & BLOCKHEADHAIR)) - if(!(hair_style.hair_flags & HAIR_VERY_SHORT)) - hair_style = GLOB.legacy_hair_lookup["Short Hair"] - - if(hair_style && (!hair_style.apply_restrictions || (src.species.get_bodytype_legacy(src) in hair_style.species_allowed))) - var/icon/grad_s - var/icon/hair_s = new/icon("icon" = hair_style.icon, "icon_state" = "[hair_style.icon_state]_s") - var/icon/hair_s_add - if(hair_style.icon_add) - hair_s_add = new/icon("icon" = hair_style.icon_add, "icon_state" = "[hair_style.icon_state]_s") - if(hair_style.do_colouration) - if(grad_style) - grad_s = new/icon("icon" = 'icons/mob/hair_gradients.dmi', "icon_state" = GLOB.hair_gradients[grad_style]) - grad_s.Blend(hair_s, ICON_AND) - grad_s.Blend(rgb(r_grad, g_grad, b_grad), ICON_MULTIPLY) - hair_s.Blend(rgb(r_hair, g_hair, b_hair), ICON_MULTIPLY) - if(hair_s_add) - hair_s.Blend(hair_s_add, ICON_ADD) - if(grad_s) - hair_s.Blend(grad_s, ICON_OVERLAY) - - face_standing.Blend(hair_s, ICON_OVERLAY) - - var/icon/ears_s = get_ears_overlay() - if(ears_s) - if(ears_s.Height() > face_standing.Height()) - face_standing.Crop(1, 1, face_standing.Width(), ears_s.Height()) - face_standing.Blend(ears_s, ICON_OVERLAY) - if(istype(head_organ,/obj/item/organ/external/head/vr)) - var/obj/item/organ/external/head/vr/head_organ_vr = head_organ - overlays_standing[HAIR_LAYER] = image(face_standing, layer = BODY_LAYER+HAIR_LAYER, "pixel_y" = head_organ_vr.head_offset) - apply_layer(HAIR_LAYER) - return - - var/icon/horns_s = get_horns_overlay() - if(horns_s && (!hiding_horns && horn_style.can_be_hidden)) - if(horns_s.Height() > face_standing.Height()) - face_standing.Crop(1, 1, face_standing.Width(), horns_s.Height()) - face_standing.Blend(horns_s, ICON_OVERLAY) - if(istype(head_organ,/obj/item/organ/external/head/vr)) - var/obj/item/organ/external/head/vr/head_organ_vr = head_organ - overlays_standing[HAIR_LAYER] = image(face_standing, layer = BODY_LAYER+HAIR_LAYER, "pixel_y" = head_organ_vr.head_offset) - apply_layer(HAIR_LAYER) - return - - face_standing += rgb(,,,head_organ.hair_opacity) - - overlays_standing[HAIR_LAYER] = image(face_standing, layer = BODY_LAYER+HAIR_LAYER) - apply_layer(HAIR_LAYER) - -/mob/living/carbon/human/update_eyes() - if(QDESTROYING(src)) - return - - var/obj/item/organ/internal/eyes/eyes = internal_organs_by_name[O_EYES] - if(eyes) - eyes.update_colour() - update_icons_body() - - //Reset our eyes - remove_layer(EYES_LAYER) - - //TODO: Probably redo this. I know I wrote it, but... - - //This is ONLY for glowing eyes for now. Boring flat eyes are done by the head's own proc. - if(!species.has_glowing_eyes) - return - - //Our glowy eyes should be hidden if some equipment hides them. - if(!should_have_organ(O_EYES) || (head && (head.inv_hide_flags & BLOCKHAIR)) || (wear_mask && (wear_mask.inv_hide_flags & BLOCKHAIR))) - return - - //Get the head, we'll need it later. - var/obj/item/organ/external/head/head_organ = get_organ(BP_HEAD) - if(!head_organ || head_organ.is_stump() ) - return - - //The eyes store the color themselves, funny enough. - if(!head_organ.eye_icon) - return - - var/icon/eyes_icon = new/icon(head_organ.eye_icon_location, head_organ.eye_icon) - if(eyes) - eyes_icon.Blend(rgb(eyes.eye_colour[1], eyes.eye_colour[2], eyes.eye_colour[3]), ICON_ADD) - else - eyes_icon.Blend(rgb(128,0,0), ICON_ADD) - - var/image/eyes_image = image(eyes_icon) - eyes_image.plane = ABOVE_LIGHTING_PLANE - - overlays_standing[EYES_LAYER] = eyes_image - apply_layer(EYES_LAYER) - -/mob/living/carbon/human/update_mutations() - if(QDESTROYING(src)) - return - - remove_layer(MUTATIONS_LAYER) - - if(!LAZYLEN(mutations)) - return //No mutations, no icons. - - //TODO: THIS PROC??? - var/fat - if(MUTATION_FAT in mutations) - fat = "fat" - - var/image/standing = image(icon = 'icons/effects/genetics.dmi', layer = BODY_LAYER+MUTATIONS_LAYER) - var/g = gender == FEMALE ? "f" : "m" - - for(var/datum/gene/gene in dna_genes) - if(!gene.block) - continue - if(gene.is_active(src)) - var/underlay = gene.OnDrawUnderlays(src,g,fat) - if(underlay) - standing.underlays += underlay - - for(var/mut in mutations) - if(mut == MUTATION_LASER) - standing.overlays += "lasereyes_s" //TODO - - overlays_standing[MUTATIONS_LAYER] = standing - apply_layer(MUTATIONS_LAYER) /* --------------------------------------- */ //Recomputes every icon on the mob. Expensive. @@ -531,11 +92,8 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) //other drastic body-shape change, but otherwise avoid. /mob/living/carbon/human/regenerate_icons() ..() - if(transforming || QDELETED(src)) - return - update_icons_body() - UpdateDamageIcon() + update_damage_overlay() update_mutations() update_skin() update_underwear() @@ -563,630 +121,6 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) update_bloodsub() update_surgery() -/* --------------------------------------- */ -//vvvvvv UPDATE_INV PROCS vvvvvv - -/mob/living/carbon/human/update_inv_w_uniform() - if(QDESTROYING(src)) - return - - remove_layer(UNIFORM_LAYER) - - //Shoes can be affected by uniform being drawn onto them - update_inv_shoes() - - if(!w_uniform) - return - - if(wear_suit && (wear_suit.inv_hide_flags & HIDEJUMPSUIT) && !istype(wear_suit, /obj/item/clothing/suit/space/hardsuit)) - return //Wearing a suit that prevents uniform rendering - - //Build a uniform sprite - var/icon/c_mask = tail_style?.clip_mask - if(c_mask) - var/obj/item/clothing/suit/S = wear_suit - if((wear_suit?.inv_hide_flags & HIDETAIL) || (istype(S) && S.taurized)) // Reasons to not mask: 1. If you're wearing a suit that hides the tail or if you're wearing a taurized suit. - c_mask = null - var/list/MA_or_list = w_uniform.render_mob_appearance(src, SLOT_ID_UNIFORM, species.get_effective_bodytype(src, w_uniform, SLOT_ID_UNIFORM)) - - if(c_mask) - if(islist(MA_or_list)) - for(var/mutable_appearance/MA2 as anything in MA_or_list) - MA2.filters += filter(type = "alpha", icon = c_mask) - else - var/mutable_appearance/MA = MA_or_list - MA.filters += filter(type = "alpha", icon = c_mask) - overlays_standing[UNIFORM_LAYER] = MA_or_list - - apply_layer(UNIFORM_LAYER) - -/mob/living/carbon/human/update_inv_wear_id() - if(QDESTROYING(src)) - return - - remove_layer(ID_LAYER) - - if(!wear_id) - return //Not wearing an ID - - //Only draw the ID on the mob if the uniform allows for it - if(w_uniform && istype(w_uniform, /obj/item/clothing/under)) - var/obj/item/clothing/under/U = w_uniform - if(U.displays_id) - overlays_standing[ID_LAYER] = wear_id.render_mob_appearance(src, SLOT_ID_WORN_ID, species.get_effective_bodytype(src, wear_id, SLOT_ID_WORN_ID)) - - apply_layer(ID_LAYER) - -/mob/living/carbon/human/update_inv_gloves() - if(QDESTROYING(src)) - return - - remove_layer(GLOVES_LAYER) - - if(!gloves) - return //No gloves, no reason to be here. - - overlays_standing[GLOVES_LAYER] = gloves.render_mob_appearance(src, SLOT_ID_GLOVES, species.get_effective_bodytype(src, gloves, SLOT_ID_GLOVES)) - - apply_layer(GLOVES_LAYER) - -/mob/living/carbon/human/update_inv_glasses() - if(QDESTROYING(src)) - return - - remove_layer(GLASSES_LAYER) - - if(!glasses) - return //Not wearing glasses, no need to update anything. - - overlays_standing[GLASSES_LAYER] = glasses.render_mob_appearance(src, SLOT_ID_GLASSES, species.get_effective_bodytype(src, glasses, SLOT_ID_GLASSES)) - - apply_layer(GLASSES_LAYER) - -/mob/living/carbon/human/update_inv_ears() - if(QDESTROYING(src)) - return - - remove_layer(EARS_LAYER) - - if((head && head.inv_hide_flags & (BLOCKHAIR | BLOCKHEADHAIR)) || (wear_mask && wear_mask.inv_hide_flags & (BLOCKHAIR | BLOCKHEADHAIR))) - return //Ears are blocked (by hair being blocked, overloaded) - - if(!l_ear && !r_ear) - return //Why bother, if no ear sprites - - // Blank image upon which to layer left & right overlays. - var/list/mutable_appearance/both = list() - if(l_ear) - both += l_ear.render_mob_appearance(src, SLOT_ID_LEFT_EAR, species.get_effective_bodytype(src, l_ear, SLOT_ID_LEFT_EAR)) - if(r_ear) - both += r_ear.render_mob_appearance(src, SLOT_ID_RIGHT_EAR, species.get_effective_bodytype(src, r_ear, SLOT_ID_RIGHT_EAR)) - - overlays_standing[EARS_LAYER] = both - apply_layer(EARS_LAYER) - -/mob/living/carbon/human/update_inv_shoes() - if(QDESTROYING(src)) - return - - remove_layer(SHOES_LAYER) - remove_layer(SHOES_LAYER_ALT) //Dumb alternate layer for shoes being under the uniform. - - if(!shoes || (wear_suit && wear_suit.inv_hide_flags & HIDESHOES) || (w_uniform && w_uniform.inv_hide_flags & HIDESHOES)) - return //Either nothing to draw, or it'd be hidden. - - for(var/f in list(BP_L_FOOT, BP_R_FOOT)) - var/obj/item/organ/external/foot/foot = get_organ(f) - if(istype(foot) && foot.is_hidden_by_tail()) //If either foot is hidden by the tail, don't render footwear. - return - - //Allow for shoe layer toggle nonsense - var/shoe_layer = SHOES_LAYER - if(istype(shoes, /obj/item/clothing/shoes)) - var/obj/item/clothing/shoes/ushoes = shoes - if(ushoes.shoes_under_pants == 1) - shoe_layer = SHOES_LAYER_ALT - - //NB: the use of a var for the layer on this one - overlays_standing[shoe_layer] = shoes.render_mob_appearance(src, SLOT_ID_SHOES, species.get_effective_bodytype(src, shoes, SLOT_ID_SHOES)) - - apply_layer(SHOES_LAYER) - apply_layer(SHOES_LAYER_ALT) - -/mob/living/carbon/human/update_inv_s_store() - if(QDESTROYING(src)) - return - - remove_layer(SUIT_STORE_LAYER) - - if(!s_store) - return //Why bother, nothing there. - - //TODO, this is unlike the rest of the things - //Basically has no variety in slot icon choices at all. WHY SPECIES ONLY?? - var/t_state = s_store.item_state - if(!t_state) - t_state = s_store.icon_state - overlays_standing[SUIT_STORE_LAYER] = image(icon = species.suit_storage_icon, icon_state = t_state, layer = BODY_LAYER+SUIT_STORE_LAYER) - - apply_layer(SUIT_STORE_LAYER) - -/mob/living/carbon/human/update_inv_head() - if(QDESTROYING(src)) - return - - remove_layer(HEAD_LAYER) - - if(!head) - return //No head item, why bother. - - overlays_standing[HEAD_LAYER] = head.render_mob_appearance(src, SLOT_ID_HEAD, species.get_effective_bodytype(src, head, SLOT_ID_HEAD)) - - apply_layer(HEAD_LAYER) - -/mob/living/carbon/human/update_inv_belt() - if(QDESTROYING(src)) - return - - remove_layer(BELT_LAYER) - remove_layer(BELT_LAYER_ALT) //Because you can toggle belt layer with a verb - - if(!belt) - return //No belt, why bother. - - //Toggle for belt layering with uniform - var/belt_layer = BELT_LAYER - if(istype(belt, /obj/item/storage/belt)) - var/obj/item/storage/belt/ubelt = belt - if(ubelt.show_above_suit) - belt_layer = BELT_LAYER_ALT - - //NB: this uses a var from above - overlays_standing[belt_layer] = belt.render_mob_appearance(src, SLOT_ID_BELT, species.get_effective_bodytype(src, belt, SLOT_ID_BELT)) - - apply_layer(belt_layer) - -/mob/living/carbon/human/update_inv_wear_suit() - if(QDESTROYING(src)) - return - - remove_layer(SUIT_LAYER) - - //Hide/show other layers if necessary - update_inv_w_uniform() - update_inv_shoes() - update_tail_showing() - update_wing_showing() - - if(!wear_suit) - return //No point, no suit. - - // Part of splitting the suit sprites up - - var/icon/c_mask = null - var/tail_is_rendered = (overlays_standing[TAIL_LAYER] || overlays_standing[TAIL_LAYER_ALT]) - var/valid_clip_mask = tail_style?.clip_mask - - var/obj/item/clothing/suit/S = wear_suit - if(tail_is_rendered && valid_clip_mask && !(istype(S) && S.taurized)) //Clip the lower half of the suit off using the tail's clip mask for taurs since taur bodies aren't hidden. - c_mask = valid_clip_mask - var/list/MA_or_list = wear_suit.render_mob_appearance(src, SLOT_ID_SUIT, species.get_effective_bodytype(src, wear_suit, SLOT_ID_SUIT)) - if(c_mask) - if(islist(MA_or_list)) - for(var/mutable_appearance/MA2 as anything in MA_or_list) - MA2.filters += filter(type = "alpha", icon = c_mask) - else - var/mutable_appearance/MA = MA_or_list - MA.filters += filter(type = "alpha", icon = c_mask) - overlays_standing[SUIT_LAYER] = MA_or_list - - apply_layer(SUIT_LAYER) - -/mob/living/carbon/human/update_inv_wear_mask() - if(QDESTROYING(src)) - return - - remove_layer(FACEMASK_LAYER) - - if(!wear_mask || (head && head.inv_hide_flags & HIDEMASK)) - return //Why bother, nothing in mask slot. - - overlays_standing[FACEMASK_LAYER] = wear_mask.render_mob_appearance(src, SLOT_ID_MASK, species.get_effective_bodytype(src, wear_mask, SLOT_ID_MASK)) - - apply_layer(FACEMASK_LAYER) - -/mob/living/carbon/human/update_inv_back() - if(QDESTROYING(src)) - return - - remove_layer(BACK_LAYER) - - if(!back) - return //Why do anything - - overlays_standing[BACK_LAYER] = back.render_mob_appearance(src, SLOT_ID_BACK, species.get_effective_bodytype(src, back, SLOT_ID_BACK)) - - apply_layer(BACK_LAYER) - -//TODO: Carbon procs in my human update_icons?? -/mob/living/carbon/human/update_hud() //TODO: do away with this if possible - if(QDESTROYING(src)) - return - // todo: this is utterly shitcode and fucking stupid ~silicons - // todo: the rest of hud code here ain't much better LOL - var/list/obj/item/relevant = get_equipped_items(TRUE, TRUE) - if(hud_used) - for(var/obj/item/I as anything in relevant) - position_hud_item(I, slot_id_by_item(I)) - if(client) - client.screen |= relevant - -//update whether handcuffs appears on our hud. -/mob/living/carbon/proc/update_hud_handcuffed() - if(QDESTROYING(src)) - return - - if(hud_used && hud_used.l_hand_hud_object && hud_used.r_hand_hud_object) - hud_used.l_hand_hud_object.update_icon() - hud_used.r_hand_hud_object.update_icon() - -/mob/living/carbon/human/update_inv_handcuffed() - if(QDESTROYING(src)) - return - - remove_layer(HANDCUFF_LAYER) - update_hud_handcuffed() //TODO - - if(!handcuffed) - return //Not cuffed, why bother - - overlays_standing[HANDCUFF_LAYER] = handcuffed.render_mob_appearance(src, SLOT_ID_HANDCUFFED, species.get_effective_bodytype(src, handcuffed, SLOT_ID_HANDCUFFED)) - - apply_layer(HANDCUFF_LAYER) - -/mob/living/carbon/human/update_inv_legcuffed() - if(QDESTROYING(src)) - return - - remove_layer(LEGCUFF_LAYER) - - if(!legcuffed) - return //Not legcuffed, why bother. - - overlays_standing[LEGCUFF_LAYER] = legcuffed.render_mob_appearance(src, SLOT_ID_LEGCUFFED, species.get_effective_bodytype(src, legcuffed, SLOT_ID_LEGCUFFED)) - - apply_layer(LEGCUFF_LAYER) - -/mob/living/carbon/human/update_inv_r_hand() - if(QDESTROYING(src)) - return - - remove_layer(R_HAND_LAYER) - - if(!r_hand) - return //No hand, no bother. - - overlays_standing[R_HAND_LAYER] = r_hand.render_mob_appearance(src, 2, BODYTYPE_DEFAULT) - - apply_layer(R_HAND_LAYER) - -/mob/living/carbon/human/update_inv_l_hand() - if(QDESTROYING(src)) - return - - remove_layer(L_HAND_LAYER) - - if(!l_hand) - return //No hand, no bother. - - overlays_standing[L_HAND_LAYER] = l_hand.render_mob_appearance(src, 1, BODYTYPE_DEFAULT) - - apply_layer(L_HAND_LAYER) - -/mob/living/carbon/human/proc/update_tail_showing() - if(QDESTROYING(src)) - return - - remove_layer(TAIL_LAYER) - remove_layer(TAIL_LAYER_ALT) - - if(hiding_tail && tail_style.can_be_hidden) - return - - var/used_tail_layer = tail_alt ? TAIL_LAYER_ALT : TAIL_LAYER - - var/list/image/tail_images = list() - - var/image/rendering - rendering = get_tail_image(TRUE) - if(rendering) - rendering.layer = BODY_LAYER + used_tail_layer - tail_images += rendering - - if(tail_style?.front_behind_system) - rendering = get_tail_image(FALSE) - rendering.layer = BODY_LAYER - used_tail_layer - tail_images += rendering - - if(length(tail_images)) - overlays_standing[used_tail_layer] = tail_images - apply_layer(used_tail_layer) - return - - var/species_tail = species.get_tail(src) // Species tail icon_state prefix. - - //This one is actually not that bad I guess. - if(species_tail && !(wear_suit && wear_suit.inv_hide_flags & HIDETAIL)) - var/icon/tail_s = get_tail_icon() - overlays_standing[used_tail_layer] = image(icon = tail_s, icon_state = "[species_tail]_s", layer = BODY_LAYER+used_tail_layer) - animate_tail_reset() - -//TODO: Is this the appropriate place for this, and not on species...? -/mob/living/carbon/human/proc/get_tail_icon() - var/icon_key = "[species.get_race_key(src)][r_skin][g_skin][b_skin][r_hair][g_hair][b_hair]" - var/icon/tail_icon = GLOB.tail_icon_cache[icon_key] - if(!tail_icon) - //generate a new one - var/species_tail_anim = species.get_tail_animation(src) - if(!species_tail_anim && species.icobase_tail) - species_tail_anim = species.icobase // Allow override of file for non-animated tails - if(!species_tail_anim) - species_tail_anim = 'icons/effects/species.dmi' - tail_icon = new/icon(species_tail_anim) - tail_icon.Blend(rgb(r_skin, g_skin, b_skin), species.color_mult ? ICON_MULTIPLY : ICON_ADD) - // The following will not work with animated tails. - var/use_species_tail = species.get_tail_hair(src) - if(use_species_tail) - var/icon/hair_icon = icon('icons/effects/species.dmi', "[species.get_tail(src)]_[use_species_tail]_s") // Suffix icon state string with '_s' to compensate for diff in .dmi b/w us & Polaris. //TODO: No. - if(species.color_force_greyscale) - hair_icon.MapColors(arglist(color_matrix_greyscale())) - hair_icon.Blend(rgb(r_hair, g_hair, b_hair), species.color_mult ? ICON_MULTIPLY : ICON_ADD) // Check for species color_mult - tail_icon.Blend(hair_icon, ICON_OVERLAY) - GLOB.tail_icon_cache[icon_key] = tail_icon - - return tail_icon - -/mob/living/carbon/human/proc/set_tail_state(var/t_state) - var/used_tail_layer = tail_alt ? TAIL_LAYER_ALT : TAIL_LAYER - var/list/image/tail_overlays = overlays_standing[used_tail_layer] - - remove_layer(TAIL_LAYER) - remove_layer(TAIL_LAYER_ALT) - - if(!tail_overlays || hiding_tail) - return - if(islist(tail_overlays)) - for(var/image/tail_overlay as anything in tail_overlays) - if(species.get_tail_animation(src)) - tail_overlay.icon_state = t_state - overlays_standing[used_tail_layer] = tail_overlays - else - var/image/tail_overlay = tail_overlays - if(species.get_tail_animation(src)) - tail_overlay.icon_state = t_state - . = tail_overlay - overlays_standing[used_tail_layer] = tail_overlay - - apply_layer(used_tail_layer) - -//Not really once, since BYOND can't do that. -//Update this if the ability to flick() images or make looping animation start at the first frame is ever added. -//You can sort of flick images now with flick_overlay -Aro -/mob/living/carbon/human/proc/animate_tail_once() - if(QDESTROYING(src)) - return - - var/t_state = "[species.get_tail(src)]_once" - var/used_tail_layer = tail_alt ? TAIL_LAYER_ALT : TAIL_LAYER - - var/image/tail_overlay = overlays_standing[used_tail_layer] - if(tail_overlay && tail_overlay.icon_state == t_state) - return //let the existing animation finish - - tail_overlay = set_tail_state(t_state) // Calls remove_layer & apply_layer - if(tail_overlay) - spawn(20) - //check that the animation hasn't changed in the meantime - if(overlays_standing[used_tail_layer] == tail_overlay && tail_overlay.icon_state == t_state) - animate_tail_stop() - -/mob/living/carbon/human/proc/animate_tail_start() - if(QDESTROYING(src)) - return - - set_tail_state("[species.get_tail(src)]_slow[rand(0,9)]") - -/mob/living/carbon/human/proc/animate_tail_fast() - if(QDESTROYING(src)) - return - - set_tail_state("[species.get_tail(src)]_loop[rand(0,9)]") - -/mob/living/carbon/human/proc/animate_tail_reset() - if(QDESTROYING(src)) - return - - if(stat != DEAD) - set_tail_state("[species.get_tail(src)]_idle[rand(0,9)]") - else - set_tail_state("[species.get_tail(src)]_static") - toggle_tail_vr(FALSE) // So tails stop when someone dies. TODO - Fix this hack ~Leshana - -/mob/living/carbon/human/proc/animate_tail_stop() - if(QDESTROYING(src)) - return - - set_tail_state("[species.get_tail(src)]_static") - -/// Wings! See update_icons_vr.dm for more wing procs -/mob/living/carbon/human/proc/update_wing_showing() - if(QDESTROYING(src)) - return - - remove_layer(WING_LAYER) - - if(hiding_wings && wing_style.can_be_hidden) - return - - overlays_standing[WING_LAYER] = list() - - var/image/vr_wing_image = get_wing_image(TRUE) - if(vr_wing_image) - vr_wing_image.layer = BODY_LAYER+WING_LAYER - overlays_standing[WING_LAYER] += vr_wing_image - - if(wing_style?.front_behind_system) - var/image/vr_wing_image_2 = get_wing_image(FALSE) - vr_wing_image_2.layer = BODY_LAYER - WING_LAYER - overlays_standing[WING_LAYER] += vr_wing_image_2 - - apply_layer(WING_LAYER) - -/mob/living/carbon/human/update_modifier_visuals() - if(QDESTROYING(src)) - return - - remove_layer(MODIFIER_EFFECTS_LAYER) - - if(!LAZYLEN(modifiers)) - return //No modifiers, no effects. - - var/image/effects = new() - for(var/datum/modifier/M in modifiers) - if(M.mob_overlay_state) - var/image/I = image(icon = 'icons/mob/modifier_effects.dmi', icon_state = M.mob_overlay_state) - effects.add_overlay(I) //TODO, this compositing is annoying. - - overlays_standing[MODIFIER_EFFECTS_LAYER] = effects - - apply_layer(MODIFIER_EFFECTS_LAYER) - -/mob/living/carbon/human/update_fire() - if(QDESTROYING(src)) - return - - remove_layer(FIRE_LAYER) - - if(!on_fire) - return - - overlays_standing[FIRE_LAYER] = image(icon = 'icons/mob/OnFire.dmi', icon_state = get_fire_icon_state(), layer = BODY_LAYER+FIRE_LAYER) - - apply_layer(FIRE_LAYER) - -/mob/living/carbon/human/update_water() - if(QDESTROYING(src)) - return - - remove_layer(MOB_WATER_LAYER) - - var/depth = check_submerged() - if(!depth || lying) - return - if(depth < 3) - overlays_standing[MOB_WATER_LAYER] = image(icon = 'icons/mob/submerged.dmi', icon_state = "human_swimming_[depth]", layer = BODY_LAYER+MOB_WATER_LAYER) //TODO: Improve - apply_layer(MOB_WATER_LAYER) - if(depth == 4) - overlays_standing[MOB_WATER_LAYER] = image(icon = 'icons/mob/submerged.dmi', icon_state = "hacid_1", layer = BODY_LAYER+MOB_WATER_LAYER) - apply_layer(MOB_WATER_LAYER) - if(depth == 5) - overlays_standing[MOB_WATER_LAYER] = image(icon = 'icons/mob/submerged.dmi', icon_state = "hacid_2", layer = BODY_LAYER+MOB_WATER_LAYER) - apply_layer(MOB_WATER_LAYER) - if(depth == 6) - overlays_standing[MOB_WATER_LAYER] = image(icon = 'icons/mob/submerged.dmi', icon_state = "hblood_1", layer = BODY_LAYER+MOB_WATER_LAYER) - apply_layer(MOB_WATER_LAYER) - if(depth == 7) - overlays_standing[MOB_WATER_LAYER] = image(icon = 'icons/mob/submerged.dmi', icon_state = "hblood_2", layer = BODY_LAYER+MOB_WATER_LAYER) - apply_layer(MOB_WATER_LAYER) - -/mob/living/carbon/human/update_acidsub() - if(QDESTROYING(src)) - return - - remove_layer(MOB_WATER_LAYER) - - var/depth = check_submerged() - if(!depth || lying) - return - - overlays_standing[MOB_WATER_LAYER] = image(icon = 'icons/mob/submerged.dmi', icon_state = "hacid_[depth]", layer = BODY_LAYER+MOB_WATER_LAYER) //TODO: Improve - - apply_layer(MOB_WATER_LAYER) - -/mob/living/carbon/human/update_bloodsub() - if(QDESTROYING(src)) - return - - remove_layer(MOB_WATER_LAYER) - - var/depth = check_submerged() - if(!depth || lying) - return - - overlays_standing[MOB_WATER_LAYER] = image(icon = 'icons/mob/submerged.dmi', icon_state = "hblood_[depth]", layer = BODY_LAYER+MOB_WATER_LAYER) //TODO: Improve - - apply_layer(MOB_WATER_LAYER) - -/mob/living/carbon/human/proc/update_surgery() - if(QDESTROYING(src)) - return - - remove_layer(SURGERY_LAYER) - - var/image/total = new - for(var/obj/item/organ/external/E in organs) - if(E.open) - var/image/I = image(icon = 'icons/mob/surgery.dmi', icon_state = "[E.icon_name][round(E.open)]", layer = BODY_LAYER+SURGERY_LAYER) - total.add_overlay(I) //TODO: This compositing is annoying - - if(total.overlays.len) - overlays_standing[SURGERY_LAYER] = total - apply_layer(SURGERY_LAYER) - -/mob/living/carbon/human/proc/get_wing_image(front) //redbull gives you wings - var/icon/grad_swing - if(QDESTROYING(src)) - return - - //If you are FBP with wing style and didn't set a custom one - if(synthetic && synthetic.includes_wing && !wing_style) - var/icon/wing_s = new/icon("icon" = synthetic.icon, "icon_state" = "wing") //I dunno. If synths have some custom wing? - wing_s.Blend(rgb(src.r_skin, src.g_skin, src.b_skin), species.color_mult ? ICON_MULTIPLY : ICON_ADD) - return image(wing_s) - - //If you have custom wings selected - if(wing_style && (!(wear_suit && wear_suit.inv_hide_flags & HIDETAIL) || !wing_style.clothing_can_hide)) - var/icon/wing_s = new/icon("icon" = wing_style.icon, "icon_state" = spread ? wing_style.spr_state : (flapping && wing_style.ani_state ? wing_style.ani_state : (wing_style.front_behind_system? (wing_style.icon_state + (front? "_FRONT" : "_BEHIND")) : wing_style.icon_state))) - if(wing_style.do_colouration) - if(grad_wingstyle) - grad_swing = new/icon("icon" = 'icons/mob/wing_gradients.dmi', "icon_state" = GLOB.hair_gradients[grad_wingstyle]) - grad_swing.Blend(wing_s, ICON_AND) - grad_swing.Blend(rgb(r_gradwing, g_gradwing, b_gradwing), ICON_MULTIPLY) - wing_s.Blend(rgb(src.r_wing, src.g_wing, src.b_wing), wing_style.color_blend_mode) - if(grad_swing) - wing_s.Blend(grad_swing, ICON_OVERLAY) - if(wing_style.extra_overlay) - var/icon/overlay = new/icon("icon" = wing_style.icon, "icon_state" = wing_style.extra_overlay) - overlay.Blend(rgb(src.r_wing2, src.g_wing2, src.b_wing2), wing_style.color_blend_mode) - wing_s.Blend(overlay, ICON_OVERLAY) - qdel(overlay) - - if(wing_style.extra_overlay2) - var/icon/overlay = new/icon("icon" = wing_style.icon, "icon_state" = wing_style.extra_overlay2) - if(wing_style.ani_state) - overlay = new/icon("icon" = wing_style.icon, "icon_state" = wing_style.extra_overlay2_w) - overlay.Blend(rgb(src.r_wing3, src.g_wing3, src.b_wing3), wing_style.color_blend_mode) - wing_s.Blend(overlay, ICON_OVERLAY) - qdel(overlay) - else - overlay.Blend(rgb(src.r_wing3, src.g_wing3, src.b_wing3), wing_style.color_blend_mode) - wing_s.Blend(overlay, ICON_OVERLAY) - qdel(overlay) - - if(wing_style.center) - center_appearance(wing_s, wing_style.dimension_x, wing_style.dimension_y) - return image(wing_s, "pixel_x" = -16) - // TODO - Move this to where it should go ~Leshana /mob/proc/stop_flying() if(QDESTROYING(src)) @@ -1196,7 +130,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) /mob/living/carbon/human/stop_flying() if((. = ..())) - update_wing_showing() + render_spriteacc_wings() //Stolen from bay for shifting equipment by default and not having to resprite it /proc/overlay_image(icon,icon_state,color,flags) diff --git a/code/modules/mob/living/carbon/lick_wounds.dm b/code/modules/mob/living/carbon/lick_wounds.dm index a775613fe514..9b3718c9196d 100644 --- a/code/modules/mob/living/carbon/lick_wounds.dm +++ b/code/modules/mob/living/carbon/lick_wounds.dm @@ -49,7 +49,7 @@ if(affecting.brute_dam > 20 || affecting.burn_dam > 20) to_chat(src, "The wounds on [M]'s [affecting.name] are too severe to treat with just licking.") return - + else visible_message("\The [src] starts licking the wounds on [M]'s [affecting.name] clean.", \ "You start licking the wounds on [M]'s [affecting.name] clean." ) @@ -65,10 +65,10 @@ if(affecting.is_bandaged() && affecting.is_salved()) // We do a second check after the delay, in case it was bandaged after the first check. to_chat(src, "The wounds on [M]'s [affecting.name] have already been treated.") - return + return else - visible_message("\The [src] [pick("slathers \a [W.desc] on [M]'s [affecting.name] with their spit.", + visible_message("\The [src] [pick("slathers \a [W.desc] on [M]'s [affecting.name] with their spit.", "drags their tongue across \a [W.desc] on [M]'s [affecting.name].", "drips saliva onto \a [W.desc] on [M]'s [affecting.name].", "uses their tongue to disinfect \a [W.desc] on [M]'s [affecting.name].", @@ -78,5 +78,5 @@ W.salve() W.bandage() W.disinfect() - H.UpdateDamageIcon() + H.update_damage_overlay() playsound(src.loc, 'sound/effects/ointment.ogg', 25) diff --git a/code/modules/mob/living/carbon/rendering.dm b/code/modules/mob/living/carbon/rendering.dm new file mode 100644 index 000000000000..66d3a9e291e6 --- /dev/null +++ b/code/modules/mob/living/carbon/rendering.dm @@ -0,0 +1,66 @@ +//* This file is explicitly licensed under the MIT license. *// +//* Copyright (c) 2024 silicons *// + +/** + * flatten all keyed overlays + */ +/mob/living/carbon/proc/flatten_standing_overlays() + return + +/** + * rebuild all keyed overlays + */ +/mob/living/carbon/proc/rebuild_standing_overlays(dump_all_overlays = TRUE) + regenerate_icons() + // todo: rebuild inventory + reapply_standing_overlays(dump_all_overlays) + +/** + * reapply all keyed overlays + * + * * inventory overlays *are* included in this + * + * @params + * * dump_all_overlays - drop all non-priority overlays + */ +/mob/living/carbon/proc/reapply_standing_overlays(dump_all_overlays = TRUE) + if(dump_all_overlays) + cut_overlays() + for(var/key in standing_overlays) + add_overlay(standing_overlays[key]) + inventory.reapply_slot_renders() + +/** + * obliterate a keyed overlay or list of keyed overlays from our overlays + * + * * inventory overlays are not handled by this; check /datum/inventory + */ +/mob/living/carbon/proc/remove_standing_overlay(key, do_not_update) + . = standing_overlays[key] + + standing_overlays -= key + + if(!do_not_update) + cut_overlay(.) + +/** + * set a keyed overlay or list of keyed overlays to our overlays + * + * * inventory overlays are not handled by this; check /datum/inventory + */ +/mob/living/carbon/proc/set_standing_overlay(key, list/overlay_or_list, do_not_update) + . = standing_overlays[key] + + if(isnull(overlay_or_list) || (islist(overlay_or_list) && !length(overlay_or_list))) + standing_overlays -= key + // unreference so we don't try to add overlay it + overlay_or_list = null + else + standing_overlays[key] = overlay_or_list + + if(!do_not_update) + if(!isnull(.)) + cut_overlay(.) + if(!isnull(overlay_or_list)) + add_overlay(overlay_or_list) + diff --git a/code/modules/mob/living/health.dm b/code/modules/mob/living/health.dm index edf3f14bf9de..f5bcd9cf190f 100644 --- a/code/modules/mob/living/health.dm +++ b/code/modules/mob/living/health.dm @@ -101,7 +101,7 @@ * set body temperature */ /mob/living/proc/set_bodytemperature(amt) - bodytemperature = amt + bodytemperature = max(TCMB, amt) /** * adjust body temperature */ diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 51241bb0c7e2..88bb83a1dec7 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -5,13 +5,6 @@ selected_image = image(icon = 'icons/mob/screen1.dmi', loc = src, icon_state = "centermarker") -/mob/living/prepare_huds() - ..() - prepare_data_huds() - -/mob/living/proc/prepare_data_huds() - update_hud_med_all() - /mob/living/Destroy() if(nest) //Ew. if(istype(nest, /obj/structure/prop/nest)) @@ -393,7 +386,7 @@ default behaviour is: . += iterating var/list/returned = iterating.return_inventory() . += returned - + /mob/living/proc/can_inject(var/mob/user, var/error_msg, var/target_zone, var/ignore_thickness = FALSE) return 1 @@ -421,9 +414,6 @@ default behaviour is: /mob/living/proc/restore_all_organs() return -/mob/living/proc/UpdateDamageIcon() - return - /mob/living/proc/Examine_OOC() set name = "Examine Meta-Info (OOC)" set category = VERB_CATEGORY_OOC diff --git a/code/modules/mob/living/mobility.dm b/code/modules/mob/living/mobility.dm index 806aff17988d..9f0697f85618 100644 --- a/code/modules/mob/living/mobility.dm +++ b/code/modules/mob/living/mobility.dm @@ -29,6 +29,8 @@ * does not set other mobility flags or update mobility. */ /mob/living/proc/set_resting(value) + if(HAS_TRAIT(src, TRAIT_MOB_FORCED_STANDING)) + value = FALSE if(resting == value) return resting = value diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index fa5eb18cd5c0..03cde2178079 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -85,7 +85,7 @@ var/list/ai_verbs_default = list( /// Used to prevent dummy AIs from spawning with communicators. var/is_dummy = FALSE -//! ## MALF VARIABLES + //* MALF VARIABLES /// Master var that determines if AI is malfunctioning. var/malfunctioning = FALSE /// Installed piece of hardware. diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index f5ea6663dc93..7991a9fba01c 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -75,7 +75,7 @@ var/integrated_light_power = 4.5 var/datum/wires/robot/wires -//! ## Icon stuff + //* Icon stuff /// Persistent icontype tracking allows for cleaner icon updates var/icontype /// Used to store the associations between sprite names and sprite index. @@ -85,7 +85,7 @@ /// Remaining attempts to select icon before a selection is forced. var/icon_selection_tries = 0 -//! ## Hud stuff + //* Hud stuff var/atom/movable/screen/cells = null var/atom/movable/screen/inv1 = null @@ -916,6 +916,7 @@ cut_overlays() if (dogborg) + zmm_flags |= ZMM_LOOKAHEAD // Resting dogborgs don't get overlays. if (stat == CONSCIOUS && resting) if(sitting) @@ -925,6 +926,8 @@ else icon_state = "[module_sprites[icontype]]-rest" return + else + zmm_flags &= ~ZMM_LOOKAHEAD if(stat == CONSCIOUS) if(!shell || deployed) // Shell borgs that are not deployed will have no eyes. diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index 7932630f2010..1d4231208d11 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -267,17 +267,14 @@ var/sensor_type = input("Please select sensor type.", "Sensor Integration", null) as null|anything in list("Security","Medical","Disable") if(isnull(sensor_type)) return - switch(hudmode) - if("Security") - get_atom_hud(DATA_HUD_SECURITY_ADVANCED).remove_hud_from(src) - if("Medical") - get_atom_hud(DATA_HUD_MEDICAL).remove_hud_from(src) + + self_perspective.remove_atom_hud(source = ATOM_HUD_SOURCE_SILICON_SENSOR_AUGMENT) switch(sensor_type) if ("Security") - get_atom_hud(DATA_HUD_SECURITY_ADVANCED).add_hud_to(src) + self_perspective.add_atom_hud(/datum/atom_hud/data/human/security/advanced, ATOM_HUD_SOURCE_SILICON_SENSOR_AUGMENT) to_chat(src,"Security records overlay enabled.") if ("Medical") - get_atom_hud(DATA_HUD_MEDICAL).add_hud_to(src) + self_perspective.add_atom_hud(/datum/atom_hud/data/human/medical, ATOM_HUD_SOURCE_SILICON_SENSOR_AUGMENT) to_chat(src,"Life signs monitor overlay enabled.") if ("Disable") to_chat(src,"Sensor augmentations disabled.") diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm index 3af0ca9ee2b0..092fdf357d27 100644 --- a/code/modules/mob/login.dm +++ b/code/modules/mob/login.dm @@ -64,24 +64,12 @@ update_client_color() - //Reload alternate appearances - for(var/v in GLOB.active_alternate_appearances) - if(!v) - continue - var/datum/atom_hud/alternate_appearance/AA = v - AA.onNewMob(src) - - if(!client.tooltips) - client.tooltips = new(client) - var/turf/T = get_turf(src) if(isturf(T)) update_client_z(T.z) SEND_SIGNAL(src, COMSIG_MOB_CLIENT_LOGIN, client) - reload_huds() - // reset perspective to using reset_perspective(no_optimizations = TRUE) // load rendering onto client's screen diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index cc40541682f3..5360221ecc45 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -23,15 +23,12 @@ // physiology init_physiology() // atom HUDs - set_key_focus(src) prepare_huds() - for(var/v in GLOB.active_alternate_appearances) - if(!v) - continue - var/datum/atom_hud/alternate_appearance/AA = v - AA.onNewMob(src) + set_key_focus(src) // todo: remove hooks hook_vr("mob_new",list(src)) + // signal + SEND_GLOBAL_SIGNAL(COMSIG_GLOBAL_MOB_NEW, src) // abilities init_abilities() // inventory @@ -81,6 +78,8 @@ else // mind is not ours, null it out mind = null + // signal + SEND_GLOBAL_SIGNAL(COMSIG_GLOBAL_MOB_DEL, src) // abilities dispose_abilities() // this kicks out client @@ -127,7 +126,7 @@ * * This is simply "mob_"+ a global incrementing counter that goes up for every mob */ -/mob/GenerateTag() +/mob/generate_tag() tag = "mob_[++next_mob_id]" /** @@ -135,20 +134,15 @@ * * Goes through hud_possible list and adds the images to the hud_list variable (if not already * cached) + * + * todo: this should be atom level but uhh lmao lol */ -/atom/proc/prepare_huds() - hud_list = list() - for(var/hud in hud_possible) - var/hint = hud_possible[hud] - switch(hint) - if(HUD_LIST_LIST) - hud_list[hud] = list() - else - var/image/I = image(GLOB.hud_icon_files[hud] || 'icons/screen/atom_hud/misc.dmi', src, "") - I.plane = FLOAT_PLANE - I.layer = FLOAT_LAYER + 100 + (GLOB.hud_icon_layers[hud] || 0) - I.appearance_flags = RESET_COLOR|RESET_TRANSFORM|KEEP_APART - hud_list[hud] = I +/mob/proc/prepare_huds() + if(!atom_huds_to_initialize) + return + for(var/hud in atom_huds_to_initialize) + update_atom_hud_provider(src, hud) + atom_huds_to_initialize = null /mob/proc/remove_screen_obj_references() hands = null diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index b0512526e191..98bb8ff77031 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -50,8 +50,11 @@ /// Atom we're buckl**ing** to. Used to stop stuff like lava from incinerating those who are mid buckle. var/atom/movable/buckling - //* HUD + //* HUD (Atom) + /// HUDs to initialize, typepaths + var/list/atom_huds_to_initialize + //* HUD /// active, opened storage // todo: doesn't clear from clients properly on logout, relies on login clearing screne. // todo: we'll eventually need a system to handle ckey transfers properly. @@ -246,7 +249,7 @@ var/timeofdeath = 0 //?Living // todo: go to carbon, simple mobs don't need environmental stabilization - var/bodytemperature = 310.055 //98.7 F + var/bodytemperature = 310.055 //98.7 F or 36,905 C var/drowsyness = 0 //?Carbon var/nutrition = 400 //?Carbon diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index ece66f8d706c..de5a862f371e 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -605,7 +605,7 @@ var/list/global/organ_rel_size = list( return // They may have hidden the icons in the bottom left with the hide button. - if(!hud_used.inventory_shown && !held && (resolve_inventory_slot_meta(slot)?.inventory_slot_flags & INV_SLOT_HUD_REQUIRES_EXPAND)) + if(!hud_used.inventory_shown && !held && (resolve_inventory_slot(slot)?.inventory_slot_flags & INV_SLOT_HUD_REQUIRES_EXPAND)) item.screen_loc = null return diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 1627c58d1cb9..ec71b233cd4d 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -478,7 +478,6 @@ // Moving wheelchair if they have one if(character.buckled && istype(character.buckled, /obj/structure/bed/chair/wheelchair)) character.buckled.forceMove(character.loc) - character.buckled.setDir(character.dir) SSticker.mode.latespawn(character) diff --git a/code/modules/mob/observer/dead/dead.dm b/code/modules/mob/observer/dead/dead.dm index f92102db5cd9..8341927ae1de 100644 --- a/code/modules/mob/observer/dead/dead.dm +++ b/code/modules/mob/observer/dead/dead.dm @@ -112,14 +112,15 @@ GLOBAL_LIST_EMPTY(observer_list) var/mob/living/carbon/human/H = body icon = H.icon icon_state = H.icon_state - if(H.overlays_standing) - for(var/i in 1 to length(H.overlays_standing)) - if(!H.overlays_standing[i]) - continue - add_overlay(H.overlays_standing[i]) + // todo: fixup (get rid of other planes) + for(var/key in H.standing_overlays) + add_overlay(H.standing_overlays[key]) + for(var/slot_id in H.inventory.rendered_normal_overlays) + add_overlay(H.inventory.rendered_normal_overlays[slot_id]) else icon = body.icon icon_state = body.icon_state + // todo: fixup (get rid of other planes) add_overlay(body.overlays) gender = body.gender @@ -142,12 +143,6 @@ GLOBAL_LIST_EMPTY(observer_list) T = locate(1,1,1) forceMove(T) - for(var/v in GLOB.active_alternate_appearances) - if(!v) - continue - var/datum/atom_hud/alternate_appearance/AA = v - AA.onNewMob(src) - if(!name) //To prevent nameless ghosts name = capitalize(pick(GLOB.first_names_male)) + " " + capitalize(pick(GLOB.last_names)) real_name = name @@ -305,9 +300,9 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp medHUD = !medHUD if(medHUD) - get_atom_hud(DATA_HUD_MEDICAL).add_hud_to(src) + self_perspective.add_atom_hud(/datum/atom_hud/data/human/medical, ATOM_HUD_SOURCE_OBSERVER) else - get_atom_hud(DATA_HUD_MEDICAL).remove_hud_from(src) + self_perspective.remove_atom_hud(/datum/atom_hud/data/human/medical, ATOM_HUD_SOURCE_OBSERVER) to_chat(src,"Medical HUD [medHUD ? "Enabled" : "Disabled"]") /mob/observer/dead/verb/toggle_antagHUD() @@ -330,11 +325,10 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp has_enabled_antagHUD = TRUE antagHUD = !antagHUD - var/datum/atom_hud/H = GLOB.huds[ANTAG_HUD] if(antagHUD) - H.add_hud_to(src) + self_perspective.add_atom_hud(/datum/atom_hud/antag, ATOM_HUD_SOURCE_OBSERVER) else - H.remove_hud_from(src) + self_perspective.remove_atom_hud(/datum/atom_hud/antag, ATOM_HUD_SOURCE_OBSERVER) to_chat(src,"AntagHUD [antagHUD ? "Enabled" : "Disabled"]") /mob/observer/dead/proc/dead_tele(var/area/A in GLOB.sortedAreas) diff --git a/code/modules/mob/observer/dead/orbit.dm b/code/modules/mob/observer/dead/orbit.dm index e3099ce8591f..804cc45f1b3e 100644 --- a/code/modules/mob/observer/dead/orbit.dm +++ b/code/modules/mob/observer/dead/orbit.dm @@ -97,6 +97,6 @@ return data -/datum/orbit_menu/ui_assets(mob/user) - . = ..() || list() - . += get_asset_datum(/datum/asset/simple/orbit) +/datum/orbit_menu/ui_asset_injection(datum/tgui/ui, list/immediate, list/deferred) + immediate += /datum/asset_pack/simple/orbit + return ..() diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm index 85bc9b61c77c..a9451d4e3046 100644 --- a/code/modules/mob/say.dm +++ b/code/modules/mob/say.dm @@ -12,6 +12,11 @@ if(message) me_verb_subtle(message) +/mob/proc/subtler_wrapper() + var/message = input("","subtler (text)") as message|null + if(message) + subtler_anti_ghost(message) + /mob/verb/whisper(message as text) set name = "Whisper" set category = VERB_CATEGORY_IC diff --git a/code/modules/mob/update_icons.dm b/code/modules/mob/update_icons.dm index adb10c898cdf..a5e110a93bbc 100644 --- a/code/modules/mob/update_icons.dm +++ b/code/modules/mob/update_icons.dm @@ -20,6 +20,9 @@ // End obsolete +/mob/proc/update_damage_overlay() + return + /mob/proc/update_hud() return diff --git a/code/modules/modular_computers/computers/modular_computer/ui.dm b/code/modules/modular_computers/computers/modular_computer/ui.dm index 2ae564ead147..97989cb91a73 100644 --- a/code/modules/modular_computers/computers/modular_computer/ui.dm +++ b/code/modules/modular_computers/computers/modular_computer/ui.dm @@ -1,8 +1,7 @@ // Operates TGUI -/obj/item/modular_computer/ui_assets(mob/user) - return list( - get_asset_datum(/datum/asset/simple/headers) - ) +/obj/item/modular_computer/ui_asset_injection(datum/tgui/ui, list/immediate, list/deferred) + immediate += /datum/asset_pack/simple/headers + return ..() /obj/item/modular_computer/ui_interact(mob/user, datum/tgui/ui) if(!screen_on || !enabled) diff --git a/code/modules/modular_computers/file_system/program.dm b/code/modules/modular_computers/file_system/program.dm index ff1c41b2f6ba..b1e018908fa7 100644 --- a/code/modules/modular_computers/file_system/program.dm +++ b/code/modules/modular_computers/file_system/program.dm @@ -151,10 +151,9 @@ QDEL_NULL(TM) return 1 -/datum/computer_file/program/ui_assets(mob/user) - return list( - get_asset_datum(/datum/asset/simple/headers) - ) +/datum/computer_file/program/ui_asset_injection(datum/tgui/ui, list/immediate, list/deferred) + immediate += /datum/asset_pack/simple/headers + return ..() /datum/computer_file/program/ui_interact(mob/user, datum/tgui/ui) if(program_state != PROGRAM_STATE_ACTIVE) diff --git a/code/modules/modular_computers/file_system/programs/generic/game.dm b/code/modules/modular_computers/file_system/programs/generic/game.dm index 5fe42f33b9d1..f3f5c1cd2d79 100644 --- a/code/modules/modular_computers/file_system/programs/generic/game.dm +++ b/code/modules/modular_computers/file_system/programs/generic/game.dm @@ -82,10 +82,9 @@ * UI assets define a list of asset datums to be sent with the UI. * In this case, it's a bunch of cute enemy sprites. */ -/datum/computer_file/program/game/ui_assets(mob/user) - return list( - get_asset_datum(/datum/asset/simple/arcade), - ) +/datum/computer_file/program/game/ui_asset_injection(datum/tgui/ui, list/immediate, list/deferred) + immediate += /datum/asset_pack/simple/arcade + return ..() /** * This provides all of the relevant data to the UI in a list(). diff --git a/code/modules/multiz/turf.dm b/code/modules/multiz/turf.dm index f3b45acfb6e9..a4261ffa6b4a 100644 --- a/code/modules/multiz/turf.dm +++ b/code/modules/multiz/turf.dm @@ -116,13 +116,6 @@ /turf/check_impact(atom/movable/falling_atom) return TRUE -/turf/smooth_icon() - . = ..() - if(SSzmimic.initialized) - var/turf/simulated/open/above = above() - if(istype(above)) - above.queue() - //* lookups /turf/proc/above() diff --git a/code/modules/multiz/turfs/open.dm b/code/modules/multiz/turfs/open.dm index 33e1ad1d90f5..2a629990ab9e 100644 --- a/code/modules/multiz/turfs/open.dm +++ b/code/modules/multiz/turfs/open.dm @@ -16,7 +16,6 @@ . = ..() icon_state = "" ASSERT(!isnull(below())) - queue() /turf/simulated/open/Entered(atom/movable/mover) ..() @@ -29,11 +28,6 @@ if(AM.movement_type & MOVEMENT_GROUND) AM.fall() -/turf/simulated/open/proc/queue() - if(smoothing_flags & SMOOTH_QUEUED) - return - smoothing_flags |= SMOOTH_QUEUED - //! We hijack smoothing flags. /turf/simulated/open/smooth_icon() return // Nope.amv diff --git a/code/modules/multiz/zmimic/mimic_movable.dm b/code/modules/multiz/zmimic/mimic_movable.dm index 43a9c075e8a6..9c3bf5afb619 100644 --- a/code/modules/multiz/zmimic/mimic_movable.dm +++ b/code/modules/multiz/zmimic/mimic_movable.dm @@ -4,39 +4,18 @@ /// Movable-level Z-Mimic flags. This uses ZMM_* flags, not ZM_* flags. var/zmm_flags = NONE -/atom/movable/doMove(atom/destination) - . = ..(destination) +/atom/movable/doMove(atom/dest) + . = ..(dest) if (. && bound_overlay) // The overlay will handle cleaning itself up on non-openspace turfs. - if (isturf(destination)) - var/turf/current = get_turf(src) - bound_overlay.doMove(current.above) + if (isturf(dest)) + // If you feel a need to change this from get_step(), don't. Any change that would require that is illegal with Z-Mimic's layering model. + bound_overlay.doMove(get_step(src, UP)) if (bound_overlay && dir != bound_overlay.dir) bound_overlay.setDir(dir) else // Not a turf, so we need to destroy immediately instead of waiting for the destruction timer to proc. qdel(bound_overlay) -/atom/movable/Move(...) - . = ..() - if (!.) - return - - if (bound_overlay) - var/turf/current = get_turf(src) - bound_overlay.doMove(current.above) - // forceMove could've deleted our overlay - if (bound_overlay && bound_overlay.dir != dir) - bound_overlay.setDir(dir) - - if (light_source_solo) - light_source_solo.source_atom.update_light() - else if (light_source_multi) - var/datum/light_source/L - var/thing - for (thing in light_source_multi) - L = thing - L.source_atom.update_light() - /atom/movable/setDir(ndir) . = ..() if (. && bound_overlay) @@ -47,10 +26,10 @@ return if (MOVABLE_IS_BELOW_ZTURF(src)) - SSzmimic.queued_overlays += bound_overlay + SSzcopy.queued_overlays += bound_overlay bound_overlay.queued += 1 - else if (bound_overlay && !bound_overlay.destruction_timer) - bound_overlay.destruction_timer = addtimer(CALLBACK(bound_overlay, TYPE_PROC_REF(/datum, qdel_self)), 10 SECONDS, TIMER_STOPPABLE) + else + qdel(bound_overlay) // Grabs a list of every openspace object that's directly or indirectly mimicking this object. Returns an empty list if none found. /atom/movable/proc/get_above_oo() @@ -67,7 +46,7 @@ atom_flags = ATOM_ABSTRACT anchored = TRUE mouse_opacity = FALSE - abstract_type = /atom/movable/openspace // unsure if this is valid, check with Lohi + abstract_type = /atom/movable/openspace /atom/movable/openspace/can_fall() return FALSE @@ -119,34 +98,36 @@ var/turf/myturf = loc if (istype(myturf)) myturf.shadower = null + return ..() -/atom/movable/openspace/multiplier/proc/copy_lighting(atom/movable/lighting_overlay/LO) +/atom/movable/openspace/multiplier/proc/copy_lighting(atom/movable/lighting_overlay/LO, use_shadower_mult = TRUE) appearance = LO layer = MIMICED_LIGHTING_LAYER_MAIN plane = OPENTURF_MAX_PLANE blend_mode = BLEND_MULTIPLY invisibility = 0 - if (icon_state == LIGHTING_BASE_ICON_STATE) - // We're using a color matrix, so just darken the colors across the board. - var/list/c_list = color - c_list[CL_MATRIX_RR] *= SHADOWER_DARKENING_FACTOR - c_list[CL_MATRIX_RG] *= SHADOWER_DARKENING_FACTOR - c_list[CL_MATRIX_RB] *= SHADOWER_DARKENING_FACTOR - c_list[CL_MATRIX_GR] *= SHADOWER_DARKENING_FACTOR - c_list[CL_MATRIX_GG] *= SHADOWER_DARKENING_FACTOR - c_list[CL_MATRIX_GB] *= SHADOWER_DARKENING_FACTOR - c_list[CL_MATRIX_BR] *= SHADOWER_DARKENING_FACTOR - c_list[CL_MATRIX_BG] *= SHADOWER_DARKENING_FACTOR - c_list[CL_MATRIX_BB] *= SHADOWER_DARKENING_FACTOR - c_list[CL_MATRIX_AR] *= SHADOWER_DARKENING_FACTOR - c_list[CL_MATRIX_AG] *= SHADOWER_DARKENING_FACTOR - c_list[CL_MATRIX_AB] *= SHADOWER_DARKENING_FACTOR - color = c_list - else - // Not a color matrix, so we can just use the color var ourselves. - color = SHADOWER_DARKENING_COLOR + if (use_shadower_mult) + if (icon_state == LIGHTING_BASE_ICON_STATE) + // We're using a color matrix, so just darken the colors across the board. + var/list/c_list = color + c_list[CL_MATRIX_RR] *= SHADOWER_DARKENING_FACTOR + c_list[CL_MATRIX_RG] *= SHADOWER_DARKENING_FACTOR + c_list[CL_MATRIX_RB] *= SHADOWER_DARKENING_FACTOR + c_list[CL_MATRIX_GR] *= SHADOWER_DARKENING_FACTOR + c_list[CL_MATRIX_GG] *= SHADOWER_DARKENING_FACTOR + c_list[CL_MATRIX_GB] *= SHADOWER_DARKENING_FACTOR + c_list[CL_MATRIX_BR] *= SHADOWER_DARKENING_FACTOR + c_list[CL_MATRIX_BG] *= SHADOWER_DARKENING_FACTOR + c_list[CL_MATRIX_BB] *= SHADOWER_DARKENING_FACTOR + c_list[CL_MATRIX_AR] *= SHADOWER_DARKENING_FACTOR + c_list[CL_MATRIX_AG] *= SHADOWER_DARKENING_FACTOR + c_list[CL_MATRIX_AB] *= SHADOWER_DARKENING_FACTOR + color = c_list + else + // Not a color matrix, so we can just use the color var ourselves. + color = SHADOWER_DARKENING_COLOR if (our_overlays || priority_overlays) compile_overlays() @@ -154,9 +135,9 @@ // compile_overlays() calls update_above(). update_above() -//! -- OPENSPACE MIMIC -- +// -- OPENSPACE MIMIC -- -/// Object used to hold a mimiced atom's appearance. +// Object used to hold a mimiced atom's appearance. /atom/movable/openspace/mimic plane = OPENTURF_MAX_PLANE var/atom/movable/associated_atom @@ -170,10 +151,10 @@ /atom/movable/openspace/mimic/New() atom_flags |= ATOM_INITIALIZED - SSzmimic.openspace_overlays += 1 + SSzcopy.openspace_overlays += 1 /atom/movable/openspace/mimic/Destroy() - SSzmimic.openspace_overlays -= 1 + SSzcopy.openspace_overlays -= 1 queued = 0 if (associated_atom) @@ -188,26 +169,40 @@ /atom/movable/openspace/mimic/attackby(obj/item/W, mob/user) to_chat(user, SPAN_NOTICE("\The [src] is too far away.")) -/atom/movable/openspace/mimic/attack_hand(mob/user, list/params) +/atom/movable/openspace/mimic/attack_hand(mob/user) to_chat(user, SPAN_NOTICE("You cannot reach \the [src] from here.")) /atom/movable/openspace/mimic/examine(...) SHOULD_CALL_PARENT(FALSE) . = associated_atom.examine(arglist(args)) // just pass all the args to the copied atom -/atom/movable/openspace/mimic/doMove(atom/destination) +/atom/movable/openspace/mimic/doMove(turf/dest) + var/atom/old_loc = loc . = ..() - if (MOVABLE_IS_BELOW_ZTURF(associated_atom)) + if (TURF_IS_MIMICKING(dest)) if (destruction_timer) deltimer(destruction_timer) destruction_timer = null + if (old_loc.z != loc.z) + reset_internal_layering() else if (!destruction_timer) - destruction_timer = addtimer(CALLBACK(src, TYPE_PROC_REF(/datum, qdel_self)), 10 SECONDS, TIMER_STOPPABLE) + destruction_timer = ZM_DESTRUCTION_TIMER(src) // Called when the turf we're on is deleted/changed. /atom/movable/openspace/mimic/proc/owning_turf_changed() if (!destruction_timer) - destruction_timer = addtimer(CALLBACK(src, TYPE_PROC_REF(/datum, qdel_self)), 10 SECONDS, TIMER_STOPPABLE) + destruction_timer = ZM_DESTRUCTION_TIMER(src) + +/atom/movable/openspace/mimic/proc/reset_internal_layering() + if (bound_overlay?.override_depth) + depth = bound_overlay.override_depth + else if (isturf(associated_atom.loc)) + depth = min(SSzcopy.zlev_maximums[associated_atom.z] - associated_atom.z, OPENTURF_MAX_DEPTH) + override_depth = depth + + plane = OPENTURF_MAX_PLANE - depth + + bound_overlay?.reset_internal_layering() // -- TURF PROXY -- diff --git a/code/modules/multiz/zmimic/mimic_turf.dm b/code/modules/multiz/zmimic/mimic_turf.dm index f4a025cac965..adb5472e5f9e 100644 --- a/code/modules/multiz/zmimic/mimic_turf.dm +++ b/code/modules/multiz/zmimic/mimic_turf.dm @@ -1,4 +1,3 @@ - /turf /// The z-turf above us, if present. var/tmp/turf/above @@ -16,8 +15,10 @@ var/tmp/z_queued = 0 /// If this Z-turf leads to space, uninterrupted. var/tmp/z_eventually_space = FALSE + /// Use this appearance for our appearance instead of `appearance`. If MZ_OVERRIDE is set, *only* this will be visible, no movables will be copied. + var/z_appearance - //debug + // debug var/tmp/z_depth var/tmp/z_generation = 0 @@ -29,7 +30,7 @@ if(mz_flags & MZ_MIMIC_BELOW) z_queued += 1 // This adds duplicates for a reason. Do not change this unless you understand how ZM queues work. - SSzmimic.queued_turfs += src + SSzcopy.queued_turfs += src /// Enables Z-mimic for a turf that didn't already have it enabled. /turf/proc/enable_zmimic(additional_flags = 0) @@ -54,7 +55,7 @@ if (shadower) CRASH("Attempt to enable Z-mimic on already-enabled turf!") shadower = new(src) - SSzmimic.openspace_turfs += 1 + SSzcopy.openspace_turfs += 1 var/turf/under = below() if (under) below = under @@ -67,7 +68,7 @@ /// Cleans up Z-mimic objects for this turf. You shouldn't call this directly 99% of the time. /turf/proc/cleanup_zmimic() - SSzmimic.openspace_turfs -= 1 + SSzcopy.openspace_turfs -= 1 // Don't remove ourselves from the queue, the subsystem will explode. We'll naturally fall out of the queue. z_queued = 0 @@ -87,9 +88,3 @@ if (below) below.above = null below = null - -/turf/Entered(atom/movable/thing, atom/oldLoc) - ..() - if (thing.bound_overlay || (thing.zmm_flags & ZMM_IGNORE) || thing.invisibility == INVISIBILITY_ABSTRACT || !TURF_IS_MIMICKING(above)) - return - above.update_mimic() diff --git a/code/modules/nano/nanoui.dm b/code/modules/nano/nanoui.dm index a505448584dc..ce088950e478 100644 --- a/code/modules/nano/nanoui.dm +++ b/code/modules/nano/nanoui.dm @@ -58,8 +58,6 @@ var/list/datum/nanoui/children = list() var/datum/topic_state/state = null - var/static/datum/asset/simple/namespaced/nanoui/nano_asset - /** * Create a new nanoui instance. * @@ -75,8 +73,6 @@ * @return /nanoui new nanoui object */ /datum/nanoui/New(mob/nuser, nsrc_object, nui_key, ntemplate_filename, ntitle, nwidth, nheight, atom/nref, datum/nanoui/master_ui, datum/topic_state/state = default_state) - if(!istype(nano_asset)) - nano_asset = get_asset_datum(/datum/asset/simple/namespaced/nanoui) user = nuser src_object = nsrc_object ui_key = nui_key @@ -100,8 +96,8 @@ ref = nref add_common_assets() - if (nuser?.client) - nano_asset.send(nuser.client) //ship it + + SSassets.send_asset_pack(nuser.client, /datum/asset_pack/simple/nanoui) /** * Use this proc to add assets which are common to (and required by) all nano uis @@ -347,17 +343,19 @@ var/head_content = "" + var/datum/asset_pack/nanoui_pack = SSassets.ready_asset_pack(/datum/asset_pack/simple/nanoui) + for(var/filename in scripts) - head_content += "" + head_content += "" for(var/filename in stylesheets) - head_content += "" + head_content += "" var/template_data_json = "{}" // An empty JSON object if (templates.len > 0) // transform urls for(var/key in templates) - templates[key] = SSassets.transport.get_asset_url(templates[key]) + templates[key] = nanoui_pack.get_url(templates[key]) template_data_json = json_encode(templates) var/list/send_data = get_send_data(initial_data) @@ -420,6 +418,7 @@ if(status == UI_CLOSE) return + SSassets.send_asset_pack(user.client, /datum/asset_pack/simple/nanoui) user << browse(get_html(), "window=[window_id];[window_size][window_options]") winset(user, "mapwindow.map", "focus=true") // return keyboard focus to map on_close_winset() diff --git a/code/modules/nifsoft/software/01_vision.dm b/code/modules/nifsoft/software/01_vision.dm index 9dcaf7c17040..a33feae1eb1a 100644 --- a/code/modules/nifsoft/software/01_vision.dm +++ b/code/modules/nifsoft/software/01_vision.dm @@ -9,15 +9,15 @@ if(.) // i'd refactor nifsofts but i have a personal goddamn vendetta against nifs for(var/i in data_huds) - var/datum/atom_hud/H = GLOB.huds[i] - H.add_hud_to(nif.human) + var/datum/atom_hud/hud = GLOB.atom_huds[i] + nif.human.self_perspective.add_atom_hud(hud, ATOM_HUD_SOURCE_NIF) /datum/nifsoft/hud/deactivate(force) . = ..() if(.) for(var/i in data_huds) - var/datum/atom_hud/H = GLOB.huds[i] - H.remove_hud_from(nif.human) + var/datum/atom_hud/hud = GLOB.atom_huds[i] + nif.human.self_perspective.remove_atom_hud(hud, ATOM_HUD_SOURCE_NIF) /datum/nifsoft/hud/ar_civ name = "AR Overlay (Civ)" @@ -27,7 +27,7 @@ a_drain = 0.01 planes_enabled = list(/atom/movable/screen/plane_master/augmented) vision_flags = (NIF_V_AR_CIVILIAN) - data_huds = list(DATA_HUD_ID_JOB) + data_huds = list(/datum/atom_hud/data/human/job_id) incompatible_with = list(NIF_MEDICAL_AR,NIF_SECURITY_AR,NIF_ENGINE_AR,NIF_SCIENCE_AR,NIF_OMNI_AR) /datum/nifsoft/hud/ar_med @@ -38,7 +38,7 @@ access = ACCESS_MEDICAL_MAIN a_drain = 0.01 planes_enabled = list(/atom/movable/screen/plane_master/augmented) - data_huds = list(DATA_HUD_MEDICAL) + data_huds = list(/datum/atom_hud/data/human/medical) vision_flags = (NIF_V_AR_MEDICAL) incompatible_with = list(NIF_CIVILIAN_AR,NIF_SECURITY_AR,NIF_ENGINE_AR,NIF_SCIENCE_AR,NIF_OMNI_AR) @@ -49,7 +49,7 @@ cost = 150 access = ACCESS_SECURITY_EQUIPMENT a_drain = 0.01 - data_huds = list(DATA_HUD_SECURITY_ADVANCED) + data_huds = list(/datum/atom_hud/data/human/security/advanced) planes_enabled = list(/atom/movable/screen/plane_master/augmented) vision_flags = (NIF_V_AR_SECURITY) incompatible_with = list(NIF_CIVILIAN_AR,NIF_MEDICAL_AR,NIF_ENGINE_AR,NIF_SCIENCE_AR,NIF_OMNI_AR) @@ -61,7 +61,7 @@ cost = 150 access = ACCESS_ENGINEERING_MAIN a_drain = 0.01 - data_huds = list(DATA_HUD_ID_JOB) + data_huds = list(/datum/atom_hud/data/human/job_id) planes_enabled = list(/atom/movable/screen/plane_master/augmented) vision_flags = (NIF_V_AR_ENGINE) incompatible_with = list(NIF_CIVILIAN_AR,NIF_MEDICAL_AR,NIF_SECURITY_AR,NIF_SCIENCE_AR,NIF_OMNI_AR) @@ -73,7 +73,7 @@ cost = 50 access = ACCESS_SCIENCE_MAIN a_drain = 0.01 - data_huds = list(DATA_HUD_ID_JOB) + data_huds = list(/datum/atom_hud/data/human/job_id) planes_enabled = list(/atom/movable/screen/plane_master/augmented) vision_flags = (NIF_V_AR_SCIENCE) incompatible_with = list(NIF_CIVILIAN_AR,NIF_MEDICAL_AR,NIF_SECURITY_AR,NIF_ENGINE_AR,NIF_OMNI_AR) @@ -85,7 +85,7 @@ cost = 250 access = ACCESS_COMMAND_CAPTAIN a_drain = 0.01 - data_huds = list(DATA_HUD_SECURITY_ADVANCED, DATA_HUD_MEDICAL) + data_huds = list(/datum/atom_hud/data/human/security/advanced, /datum/atom_hud/data/human/medical) planes_enabled = list(/atom/movable/screen/plane_master/augmented) vision_flags = (NIF_V_AR_OMNI) incompatible_with = list(NIF_CIVILIAN_AR,NIF_MEDICAL_AR,NIF_SECURITY_AR,NIF_ENGINE_AR,NIF_SCIENCE_AR) diff --git a/code/modules/nifsoft/software/05_health.dm b/code/modules/nifsoft/software/05_health.dm index 86c87cb8c36a..783504558917 100644 --- a/code/modules/nifsoft/software/05_health.dm +++ b/code/modules/nifsoft/software/05_health.dm @@ -114,7 +114,7 @@ W.heal_damage(0.1) EO.update_damages() if(EO.update_icon()) - nif.human.UpdateDamageIcon(1) + nif.human.update_damage_overlay(1) nif.use_charge(0.1) return TRUE //Return entirely, we only heal one at a time. else if(mode == 1) diff --git a/code/modules/nifsoft/software/13_soulcatcher.dm b/code/modules/nifsoft/software/13_soulcatcher.dm index e418080f2800..fa1d267a3bfb 100644 --- a/code/modules/nifsoft/software/13_soulcatcher.dm +++ b/code/modules/nifsoft/software/13_soulcatcher.dm @@ -544,8 +544,6 @@ dummy.compile_overlays() dummy.alpha = 192 - // remove hudlist - dummy.cut_overlay(dummy.hud_list) // appearance clone immediately appearance = dummy.appearance plane = AUGMENTED_PLANE diff --git a/code/modules/nifsoft/software/15_misc.dm b/code/modules/nifsoft/software/15_misc.dm index 3a30b55eef1e..d36438d51420 100644 --- a/code/modules/nifsoft/software/15_misc.dm +++ b/code/modules/nifsoft/software/15_misc.dm @@ -173,13 +173,9 @@ if((. = ..())) if((. = ..())) var/mob/living/carbon/human/H = nif.human - var/datum/atom_hud/world_bender/animals/A = GLOB.huds[WORLD_BENDER_HUD_ANIMALS] - if(A && H) - A.add_hud_to(H) + H.self_perspective.add_atom_hud(/datum/atom_hud/world_bender, ATOM_HUD_SOURCE_NIF) /datum/nifsoft/worldbend/deactivate(var/force = FALSE) if((. = ..())) var/mob/living/carbon/human/H = nif.human - var/datum/atom_hud/world_bender/animals/A = GLOB.huds[WORLD_BENDER_HUD_ANIMALS] - if(A && H) - A.remove_hud_from(H) + H.self_perspective.remove_atom_hud(/datum/atom_hud/world_bender, ATOM_HUD_SOURCE_NIF) diff --git a/code/modules/organs/external/external.dm b/code/modules/organs/external/external.dm index 2c498aea62a7..4b7282d15d9b 100644 --- a/code/modules/organs/external/external.dm +++ b/code/modules/organs/external/external.dm @@ -27,14 +27,14 @@ /// Number of wounds we have - some wounds like bruises will collate into one datum representing all of them. var/wound_tally -//! ## STRINGS + //* ## STRINGS /// Fracture description if any. var/broken_description /// Modifier used for generating the on-mob damage overlay for this limb. var/damage_state = "00" -//! ## DAMAGE VARS + //* ## DAMAGE VARS /// Multiplier for incoming brute damage. var/brute_mod = 1 /// As above for burn. @@ -59,7 +59,7 @@ var/base_miss_chance = 20 -//! ## APPEARANCE VARS + //* ## APPEARANCE VARS /// Snowflake warning, reee. Used for slime limbs. var/nonsolid /// Also for slimes. Used for transparent limbs. @@ -92,7 +92,7 @@ /// Markings (body_markings) to apply to the icon var/list/markings = list() -//! ## STRUCTURAL VARS + //* ## STRUCTURAL VARS /// Master-limb. var/obj/item/organ/external/parent /// Sub-limbs. @@ -105,7 +105,7 @@ var/organ_rel_size = 25 var/atom/movable/splinted -//! ## JOINT/STATE VARS + //* ## JOINT/STATE VARS /// It would be more appropriate if these two were named "affects_grasp" and "affects_stand" at this point var/can_grasp /// Modifies stance tally/ability to stand. @@ -128,7 +128,7 @@ var/encased -//! ## SURGERY VARS + //* ## SURGERY VARS var/open = FALSE var/stage = FALSE var/cavity = FALSE @@ -186,13 +186,13 @@ var/burn_damage = 0 switch(severity) if (1) - burn_damage += rand(10, 16) + burn_damage += rand(10, 14) if (2) - burn_damage += rand(8, 12) + burn_damage += rand(7, 8.5) if(3) burn_damage += rand(4, 8) if(4) - burn_damage += rand(2, 6) + burn_damage += rand(2, 5) if(burn_damage) inflict_bodypart_damage( @@ -357,6 +357,9 @@ // todo: this is awful var/sharp = damage_mode & DAMAGE_MODE_SHARP var/edge = damage_mode & DAMAGE_MODE_EDGE + // cache owner incase we get detached + // todo: this is awful + var/mob/living/carbon/owner = src.owner // todo: lol this is shit // legacy: organ damage on high damage @@ -379,7 +382,7 @@ if(weapon_descriptor) add_autopsy_data(weapon_descriptor, brute + burn) - //! LEGACY BELOW + //* LEGACY BELOW var/can_cut = (sharp) && (robotic < ORGAN_ROBOT) @@ -399,7 +402,10 @@ else if(!(damage_mode & DAMAGE_MODE_NO_OVERFLOW)) var/overflow_brute = brute - can_inflict_brute // keep allowing it, but, diminishing returns - var/damage_anyways_brute = brute * min(1, 1 / ((brute_dam + damage_softcap_intensifier) / (damage_softcap_intensifier + max_damage))) + var/damage_anyways_brute = !(damage_mode & DAMAGE_MODE_NO_OVERFLOW) && ( \ + overflow_brute * min(1, 1 / ((max(brute_dam, max_damage) + damage_softcap_intensifier) / (damage_softcap_intensifier + max_damage))) \ + ) + overflow_brute -= damage_anyways_brute if(can_cut) if(sharp && !edge) create_wound( PIERCE, damage_anyways_brute ) @@ -413,11 +419,13 @@ var/can_inflict_burn = max(0, max_damage - burn_dam) if(can_inflict_burn >= burn) create_wound( BURN, burn ) - else if(!(damage_mode & DAMAGE_MODE_NO_OVERFLOW)) + else var/overflow_burn = burn - can_inflict_burn - // keep allowing it, but, diminishing returns - var/damage_anyways_burn = burn * min(1, 1 / ((burn_dam + damage_softcap_intensifier) / (damage_softcap_intensifier + max_damage))) - create_wound( BURN, damage_anyways_burn ) + var/damage_anyways_burn = !(damage_mode & DAMAGE_MODE_NO_OVERFLOW) && ( \ + overflow_burn * min(1, 1 / ((max(burn_dam, max_damage) + damage_softcap_intensifier) / (damage_softcap_intensifier + max_damage))) \ + ) + overflow_burn -= damage_anyways_burn + create_wound(BURN, damage_anyways_burn + can_inflict_burn) // rest goes into shock owner.shock_stage += overflow_burn * 0.33 @@ -438,8 +446,8 @@ // and the brute damage dealt exceeds the tearoff threshold, the organ is torn off. //Check edge eligibility - //! edge eligibility disabled; organs should optimally not reqiure the item reference and should instead - //! get descriptors (damage, damage mode, etc) of the inbound attack. + //* edge eligibility disabled; organs should optimally not reqiure the item reference and should instead + //* get descriptors (damage, damage mode, etc) of the inbound attack. var/edge_eligible = edge // var/edge_eligible = 0 // if(edge) @@ -462,7 +470,7 @@ droplimb(0, DROPLIMB_BLUNT) else if(brute >= max_damage / DROPLIMB_THRESHOLD_TEAROFF && prob(brute*0.33)) droplimb(0, DROPLIMB_EDGE) - //! damage spreading disabled; the attacking weapon should handle this if necessary. + //* damage spreading disabled; the attacking weapon should handle this if necessary. // else if(spread_dam && owner && parent && (brute_overflow || burn_overflow) && (brute_overflow >= 5 || burn_overflow >= 5) && !permutation) //No infinite damage loops. // var/brute_third = brute_overflow * 0.33 // var/burn_third = burn_overflow * 0.33 @@ -475,7 +483,7 @@ // C.take_damage(brute_on_children, burn_on_children, 0, 0, null, forbidden_limbs, 1) //Splits the damage to each individual 'child', incase multiple exist. // parent.take_damage(brute_third, burn_third, 0, 0, null, forbidden_limbs, 1) - //! LEGACY ABOVE + //* LEGACY ABOVE if(!defer_host_updates) owner?.update_health() @@ -776,7 +784,7 @@ Note that amputating the affected organ does in fact remove the infection from t wounds -= W //TODO: robot wounds for robot limbs src.update_damages() if (update_icon()) - owner.UpdateDamageIcon(1) + owner.update_damage_overlay(1) return for(var/datum/wound/W as anything in wounds) @@ -820,7 +828,7 @@ Note that amputating the affected organ does in fact remove the infection from t // sync the organ's damage with its wounds src.update_damages() if (update_icon()) - owner.UpdateDamageIcon(1) + owner.update_damage_overlay(1) //Updates brute_damn and burn_damn from wound damages. Updates BLEEDING status. /obj/item/organ/external/proc/update_damages() @@ -956,7 +964,7 @@ Note that amputating the affected organ does in fact remove the infection from t spawn(1) if(istype(victim)) victim.update_health() - victim.UpdateDamageIcon() + victim.update_damage_overlay() victim.update_icons_body() else victim.update_icons() @@ -1158,7 +1166,7 @@ Note that amputating the affected organ does in fact remove the infection from t return 0 /obj/item/organ/external/robotize(var/company, var/skip_prosthetics = 0, var/keep_organs = 0, force) - //! SHITCODE ALERT: REFACTOR ORGANS ASAP; FORCE IS JUST SO PREFS WORK. + //* SHITCODE ALERT: REFACTOR ORGANS ASAP; FORCE IS JUST SO PREFS WORK. if(robotic >= ORGAN_ROBOT && !force) return @@ -1212,7 +1220,7 @@ Note that amputating the affected organ does in fact remove the infection from t owner.refresh_modular_limb_verbs() return 1 -//! ## VIRGO HOOK, TODO: Integrate this. + //* ## VIRGO HOOK, TODO: Integrate this. //Sideways override for nanoform limbs (ugh) /obj/item/organ/external/robotize(var/company, var/skip_prosthetics = FALSE, var/keep_organs = FALSE, force) var/original_robotic = robotic diff --git a/code/modules/organs/external/external_icons.dm b/code/modules/organs/external/external_icons.dm index 4358a54f8d34..1af4e4b43306 100644 --- a/code/modules/organs/external/external_icons.dm +++ b/code/modules/organs/external/external_icons.dm @@ -100,7 +100,7 @@ GLOBAL_LIST_EMPTY(limb_icon_cache) for(var/M in markings) var/datum/sprite_accessory/marking/mark_style = markings[M]["datum"] var/icon/mark_s = new/icon("icon" = mark_style.icon, "icon_state" = "[mark_style.icon_state]-[organ_tag]") - mark_s.Blend(markings[M]["color"], mark_style.color_blend_mode) + mark_s.Blend(markings[M]["color"], mark_style.legacy_use_additive_color_matrix? ICON_ADD : ICON_MULTIPLY) add_overlay(mark_s) //So when it's not on your body, it has icons mob_icon.Blend(mark_s, ICON_OVERLAY) //So when it's on your body, it has icons icon_cache_key += "[M][markings[M]["color"]]" @@ -111,38 +111,11 @@ GLOBAL_LIST_EMPTY(limb_icon_cache) mob_icon.Blend(eyecon, ICON_OVERLAY) icon_cache_key += "[eye_icon]" - add_overlay(get_hair_icon()) + add_overlay(owner.render_spriteacc_facehair()) + add_overlay(owner.render_spriteacc_hair()) return mob_icon -/obj/item/organ/external/head/proc/get_hair_icon() - var/image/res = image('icons/mob/human_face.dmi',"bald_s") - //Facial hair - if(owner.f_style) - var/datum/sprite_accessory/facial_hair_style = GLOB.legacy_facial_hair_lookup[owner.f_style] - if(facial_hair_style && (!facial_hair_style.apply_restrictions || (species.get_bodytype_legacy(owner) in facial_hair_style.species_allowed))) - var/icon/facial_s = new/icon("icon" = facial_hair_style.icon, "icon_state" = "[facial_hair_style.icon_state]_s") - if(facial_hair_style.do_colouration) - facial_s.Blend(rgb(owner.r_facial, owner.g_facial, owner.b_facial), facial_hair_style.color_blend_mode) - res.add_overlay(facial_s) - - //Head hair - if(owner.h_style) - var/style = owner.h_style - var/datum/sprite_accessory/hair/hair_style = GLOB.legacy_hair_lookup[style] - if(owner.head && (owner.head.inv_hide_flags & BLOCKHEADHAIR)) - if(!(hair_style.hair_flags & HAIR_VERY_SHORT)) - hair_style = GLOB.legacy_hair_lookup["Short Hair"] - if(hair_style && (!hair_style.apply_restrictions || (species.get_bodytype_legacy(owner) in hair_style.species_allowed))) - var/icon/hair_s = new/icon("icon" = hair_style.icon, "icon_state" = "[hair_style.icon_state]_s") - var/icon/hair_s_add = new/icon("icon" = hair_style.icon_add, "icon_state" = "[hair_style.icon_state]_s") - if(hair_style.do_colouration && islist(h_col) && h_col.len >= 3) - hair_s.Blend(rgb(h_col[1], h_col[2], h_col[3]), ICON_MULTIPLY) - hair_s.Blend(hair_s_add, ICON_ADD) - res.add_overlay(hair_s) - - return res - /obj/item/organ/external/proc/get_icon(var/skeletal) if(owner && ishuman(owner)) @@ -181,7 +154,7 @@ GLOBAL_LIST_EMPTY(limb_icon_cache) for(var/M in markings) var/datum/sprite_accessory/marking/mark_style = markings[M]["datum"] var/icon/mark_s = new/icon("icon" = mark_style.icon, "icon_state" = "[mark_style.icon_state]-[organ_tag]") - mark_s.Blend(markings[M]["color"], mark_style.color_blend_mode) + mark_s.Blend(markings[M]["color"], mark_style.legacy_use_additive_color_matrix? ICON_ADD : ICON_MULTIPLY) add_overlay(mark_s) //So when it's not on your body, it has icons mob_icon.Blend(mark_s, ICON_OVERLAY) //So when it's on your body, it has icons icon_cache_key += "[M][markings[M]["color"]]" @@ -201,7 +174,7 @@ GLOBAL_LIST_EMPTY(limb_icon_cache) for(var/M in markings) var/datum/sprite_accessory/marking/mark_style = markings[M]["datum"] var/icon/mark_s = new/icon("icon" = mark_style.icon, "icon_state" = "[mark_style.icon_state]-[organ_tag]") - mark_s.Blend(markings[M]["color"], mark_style.color_blend_mode) + mark_s.Blend(markings[M]["color"], mark_style.legacy_use_additive_color_matrix? ICON_ADD : ICON_MULTIPLY) add_overlay(mark_s) //So when it's not on your body, it has icons mob_icon.Blend(mark_s, ICON_OVERLAY) //So when it's on your body, it has icons icon_cache_key += "[M][markings[M]["color"]]" diff --git a/code/modules/organs/external/robolimbs.dm b/code/modules/organs/external/robolimbs.dm index 06be0ff2db94..d56ed840b16a 100644 --- a/code/modules/organs/external/robolimbs.dm +++ b/code/modules/organs/external/robolimbs.dm @@ -71,6 +71,10 @@ var/const/cyberbeast_monitor_styles= "blank=cyber_blank;\ if(species_company in GLOB.all_robolimbs) R.species_alternates[species] = GLOB.all_robolimbs[species_company] +/datum/sprite_accessory/tail/legacy_robolimb + do_colouration = FALSE + abstract_type = /datum/sprite_accessory/tail/legacy_robolimb + /datum/robolimb /// Shown when selecting the limb. var/company = "Unbranded" @@ -108,10 +112,6 @@ var/const/cyberbeast_monitor_styles= "blank=cyber_blank;\ var/robo_brute_mod = 1 /// Multiplier for incoming burn damage. var/robo_burn_mod = 1 - /// Cyberlimbs dmi includes a tail sprite to wear. - var/includes_tail - /// Cyberlimbs dmi includes a wing sprite to wear. - var/includes_wing /// If it should make the torso a species var/suggested_species = SPECIES_HUMAN /// Species in this list cannot take these prosthetics. @@ -121,6 +121,16 @@ var/const/cyberbeast_monitor_styles= "blank=cyber_blank;\ /// List of ckeys that are allowed to pick this in charsetup. var/list/whitelisted_to + /// typepath or id of sprite accessory to default for, for tail + var/datum/sprite_accessory/legacy_includes_tail + +/datum/robolimb/New() + if(ispath(legacy_includes_tail)) + var/datum/sprite_accessory/casted = legacy_includes_tail + legacy_includes_tail = initial(casted.id) + if(istext(legacy_includes_tail)) + legacy_includes_tail = GLOB.sprite_accessory_tails[legacy_includes_tail] + /datum/robolimb/unbranded_monitor company = "Unbranded Monitor" desc = "A generic unbranded interpretation of a popular prosthetic head model. It looks rudimentary and cheaply constructed." @@ -622,7 +632,7 @@ var/const/cyberbeast_monitor_styles= "blank=cyber_blank;\ desc = "This limb has a slight salvaged handicraft vibe to it. The CE-marking on it is definitely not the standardized one, it looks more like a hand-written sharpie monogram." icon = 'icons/mob/cyberlimbs/_fluff_vr/rahboop.dmi' blood_color = "#5e280d" - includes_tail = 1 + legacy_includes_tail = /datum/sprite_accessory/tail/bodyset/eggnerd unavailable_to_build = TRUE /obj/item/disk/limb/eggnerdltd @@ -671,7 +681,7 @@ var/const/cyberbeast_monitor_styles= "blank=cyber_blank;\ desc = "A slightly more refined limb variant from Eggnerd Prototyping. Its got red plating instead of orange." icon = 'icons/mob/cyberlimbs/rahboopred/rahboopred.dmi' blood_color = "#5e280d" - includes_tail = 1 + legacy_includes_tail = /datum/sprite_accessory/tail/bodyset/eggnerd_red unavailable_to_build = TRUE /obj/item/disk/limb/eggnerdltdred @@ -688,8 +698,8 @@ var/const/cyberbeast_monitor_styles= "blank=cyber_blank;\ icon = 'icons/mob/cyberlimbs/DSITajaran/dsi_tajaran.dmi' blood_color = "#ffe2ff" lifelike = 1 + legacy_includes_tail = /datum/sprite_accessory/tail/bodyset/oss_tajaran unavailable_to_build = TRUE - includes_tail = 1 skin_tone = 1 suggested_species = SPECIES_TAJ speech_bubble_appearance = "normal" @@ -705,7 +715,7 @@ var/const/cyberbeast_monitor_styles= "blank=cyber_blank;\ blood_color = "#ffe2ff" lifelike = 1 unavailable_to_build = TRUE - includes_tail = 1 + legacy_includes_tail = /datum/sprite_accessory/tail/bodyset/oss_lizard skin_tone = 1 suggested_species = SPECIES_UNATHI speech_bubble_appearance = "normal" @@ -721,7 +731,7 @@ var/const/cyberbeast_monitor_styles= "blank=cyber_blank;\ blood_color = "#ffe2ff" lifelike = 1 unavailable_to_build = TRUE - includes_tail = 1 + legacy_includes_tail = /datum/sprite_accessory/tail/bodyset/oss_naramadi skin_tone = 1 suggested_species = SPECIES_SERGAL speech_bubble_appearance = "normal" @@ -737,7 +747,7 @@ var/const/cyberbeast_monitor_styles= "blank=cyber_blank;\ blood_color = "#ffe2ff" lifelike = 1 unavailable_to_build = TRUE - includes_tail = 1 + legacy_includes_tail = /datum/sprite_accessory/tail/bodyset/oss_nevrean skin_tone = 1 suggested_species = SPECIES_NEVREAN speech_bubble_appearance = "normal" @@ -753,7 +763,7 @@ var/const/cyberbeast_monitor_styles= "blank=cyber_blank;\ blood_color = "#ffe2ff" lifelike = 1 unavailable_to_build = TRUE - includes_tail = 1 + legacy_includes_tail = /datum/sprite_accessory/tail/bodyset/oss_vulpkanin skin_tone = 1 suggested_species = SPECIES_VULPKANIN speech_bubble_appearance = "normal" @@ -768,8 +778,8 @@ var/const/cyberbeast_monitor_styles= "blank=cyber_blank;\ icon = 'icons/mob/cyberlimbs/DSIAkula/dsi_akula.dmi' blood_color = "#ffe2ff" lifelike = 1 + legacy_includes_tail = /datum/sprite_accessory/tail/bodyset/oss_akula unavailable_to_build = TRUE - includes_tail = 1 skin_tone = 1 suggested_species = SPECIES_AKULA speech_bubble_appearance = "normal" @@ -785,7 +795,7 @@ var/const/cyberbeast_monitor_styles= "blank=cyber_blank;\ blood_color = "#ffe2ff" lifelike = 1 unavailable_to_build = TRUE - includes_tail = 1 + legacy_includes_tail = /datum/sprite_accessory/tail/bodyset/oss_spider skin_tone = 1 suggested_species = SPECIES_VASILISSAN speech_bubble_appearance = "normal" diff --git a/code/modules/organs/external/species/slime.dm b/code/modules/organs/external/species/slime.dm index a4ad1b4c5f0f..3afd45779469 100644 --- a/code/modules/organs/external/species/slime.dm +++ b/code/modules/organs/external/species/slime.dm @@ -1,61 +1,61 @@ /obj/item/organ/external/chest/unbreakable/slime nonsolid = 1 - max_damage = 50 + max_damage = 200 encased = 0 spread_dam = 1 transparent = 1 /obj/item/organ/external/groin/unbreakable/slime nonsolid = 1 - max_damage = 30 + max_damage = 75 spread_dam = 1 transparent = 1 /obj/item/organ/external/arm/unbreakable/slime nonsolid = 1 - max_damage = 20 + max_damage = 25 spread_dam = 1 transparent = 1 /obj/item/organ/external/arm/right/unbreakable/slime nonsolid = 1 - max_damage = 20 + max_damage = 25 spread_dam = 1 transparent = 1 /obj/item/organ/external/leg/unbreakable/slime nonsolid = 1 - max_damage = 20 + max_damage = 25 spread_dam = 1 transparent = 1 /obj/item/organ/external/leg/right/unbreakable/slime nonsolid = 1 - max_damage = 20 + max_damage = 25 spread_dam = 1 transparent = 1 /obj/item/organ/external/foot/unbreakable/slime nonsolid = 1 - max_damage = 20 + max_damage = 25 spread_dam = 1 transparent = 1 /obj/item/organ/external/foot/right/unbreakable/slime nonsolid = 1 - max_damage = 20 + max_damage = 25 spread_dam = 1 transparent = 1 /obj/item/organ/external/hand/unbreakable/slime nonsolid = 1 - max_damage = 20 + max_damage = 25 spread_dam = 1 transparent = 1 /obj/item/organ/external/hand/right/unbreakable/slime nonsolid = 1 - max_damage = 20 + max_damage = 25 spread_dam = 1 transparent = 1 @@ -63,7 +63,7 @@ nonsolid = 1 cannot_gib = 0 vital = 0 - max_damage = 30 + max_damage = 25 encased = 0 spread_dam = 1 transparent = 1 diff --git a/code/modules/organs/external/subtypes/standard.dm b/code/modules/organs/external/subtypes/standard.dm index 34dd3b361d97..deab9e72497b 100644 --- a/code/modules/organs/external/subtypes/standard.dm +++ b/code/modules/organs/external/subtypes/standard.dm @@ -276,8 +276,7 @@ if(owner) if(iscarbon(owner)) name = "[owner.real_name]'s head" - spawn(1) - owner.update_hair() + owner.update_hair() get_icon() ..() diff --git a/code/modules/organs/external/subtypes/standard_vr.dm b/code/modules/organs/external/subtypes/standard_vr.dm index cf5323858073..da6c65e433ba 100644 --- a/code/modules/organs/external/subtypes/standard_vr.dm +++ b/code/modules/organs/external/subtypes/standard_vr.dm @@ -12,7 +12,7 @@ for(var/M in markings) var/datum/sprite_accessory/marking/mark_style = markings[M]["datum"] var/icon/mark_s = new/icon("icon" = mark_style.icon, "icon_state" = "[mark_style.icon_state]-[organ_tag]") - mark_s.Blend(markings[M]["color"], mark_style.color_blend_mode) + mark_s.Blend(markings[M]["color"], mark_style.legacy_use_additive_color_matrix? ICON_ADD : ICON_MULTIPLY) overlays_to_add.Add(mark_s) //So when it's not on your body, it has icons mob_icon.Blend(mark_s, ICON_OVERLAY) //So when it's on your body, it has icons icon_cache_key += "[M][markings[M]["color"]]" diff --git a/code/modules/organs/internal/augment/armmounted.dm b/code/modules/organs/internal/augment/armmounted.dm index f76ff37047dd..b6e32224a72a 100644 --- a/code/modules/organs/internal/augment/armmounted.dm +++ b/code/modules/organs/internal/augment/armmounted.dm @@ -9,7 +9,7 @@ w_class = WEIGHT_CLASS_BULKY organ_tag = O_AUG_L_FOREARM parent_organ = BP_L_ARM - target_slot = /datum/inventory_slot_meta/abstract/hand/left + target_slot = /datum/inventory_slot/abstract/hand/left target_parent_classes = list(ORGAN_FLESH, ORGAN_ASSISTED) integrated_object_type = /obj/item/gun/energy/laser/mounted/augment @@ -20,11 +20,11 @@ if(O_AUG_L_FOREARM) organ_tag = O_AUG_R_FOREARM parent_organ = BP_R_ARM - target_slot = /datum/inventory_slot_meta/abstract/hand/left + target_slot = /datum/inventory_slot/abstract/hand/left if(O_AUG_R_FOREARM) organ_tag = O_AUG_L_FOREARM parent_organ = BP_L_ARM - target_slot = /datum/inventory_slot_meta/abstract/hand/right + target_slot = /datum/inventory_slot/abstract/hand/right to_chat(user, "You swap \the [src]'s servos to install neatly into \the lower [parent_organ] mount.") return @@ -58,11 +58,11 @@ if(O_AUG_L_HAND) organ_tag = O_AUG_R_HAND parent_organ = BP_R_HAND - target_slot = /datum/inventory_slot_meta/abstract/hand/left + target_slot = /datum/inventory_slot/abstract/hand/left if(O_AUG_R_HAND) organ_tag = O_AUG_L_HAND parent_organ = BP_L_HAND - target_slot = /datum/inventory_slot_meta/abstract/hand/right + target_slot = /datum/inventory_slot/abstract/hand/right to_chat(user, "You swap \the [src]'s servos to install neatly into \the upper [parent_organ] mount.") return @@ -90,11 +90,11 @@ if(O_AUG_L_UPPERARM) organ_tag = O_AUG_R_UPPERARM parent_organ = BP_R_ARM - target_slot = /datum/inventory_slot_meta/abstract/hand/left + target_slot = /datum/inventory_slot/abstract/hand/left if(O_AUG_R_UPPERARM) organ_tag = O_AUG_L_UPPERARM parent_organ = BP_L_ARM - target_slot = /datum/inventory_slot_meta/abstract/hand/right + target_slot = /datum/inventory_slot/abstract/hand/right to_chat(user, "You swap \the [src]'s servos to install neatly into \the upper [parent_organ] mount.") return diff --git a/code/modules/organs/internal/subtypes/augment.dm b/code/modules/organs/internal/subtypes/augment.dm index 851229b75b91..bbe4e3311c7a 100644 --- a/code/modules/organs/internal/subtypes/augment.dm +++ b/code/modules/organs/internal/subtypes/augment.dm @@ -218,7 +218,7 @@ to_chat(M, SPAN_NOTICE("You cannot use your augments when restrained.")) return FALSE - if((slot == /datum/inventory_slot_meta/abstract/hand/left && l_hand) || (slot == /datum/inventory_slot_meta/abstract/hand/right && r_hand)) + if((slot == /datum/inventory_slot/abstract/hand/left && l_hand) || (slot == /datum/inventory_slot/abstract/hand/right && r_hand)) to_chat(M, SPAN_WARNING("Your hand is full. Drop something first.")) return FALSE diff --git a/code/modules/organs/internal/subtypes/liver.dm b/code/modules/organs/internal/subtypes/liver.dm index 8fa79107371f..e1669431959d 100644 --- a/code/modules/organs/internal/subtypes/liver.dm +++ b/code/modules/organs/internal/subtypes/liver.dm @@ -37,7 +37,7 @@ // Do some reagent processing. if(owner.chem_effects[CE_ALCOHOL_TOXIC]) - take_damage(owner.chem_effects[CE_ALCOHOL_TOXIC] * 0.1 * (dt * 5), prob(1)) // Chance to warn them + take_damage(owner.chem_effects[CE_ALCOHOL_TOXIC] * 0.1 * (dt * 5), prob(99)) // Chance to warn them if(filter_effect < 2) //Liver is badly damaged, you're drinking yourself to death owner.adjustToxLoss(owner.chem_effects[CE_ALCOHOL_TOXIC] * 0.2 * (dt * 5)) if(filter_effect < 3) diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm index 07dcf906ae5e..dc8e7c6d4f13 100644 --- a/code/modules/organs/organ.dm +++ b/code/modules/organs/organ.dm @@ -5,14 +5,14 @@ drop_sound = 'sound/items/drop/flesh.ogg' pickup_sound = 'sound/items/pickup/flesh.ogg' -//! ## STRINGS VARS + //* ## STRINGS VARS /// Unique identifier. var/organ_tag = "organ" /// The organ holding this object. var/parent_organ = BP_TORSO -//! STATUS VARS + //* STATUS VARS /// Various status flags var/status = 0 /** @@ -29,7 +29,7 @@ var/stapled_nerves = FALSE -//! ##REFERENCE VARS + //* ##REFERENCE VARS /// Current mob owning the organ. var/mob/living/carbon/human/owner /// Transplant match data. @@ -45,7 +45,7 @@ var/s_base -//! ## DAMAGE VARS + //* ## DAMAGE VARS /// Damage before considered bruised var/min_bruised_damage = 10 /// Damage before becoming broken @@ -62,12 +62,12 @@ /// decay rate var/decay_rate = ORGAN_DECAY_PER_SECOND_DEFAULT -//! ## LANGUAGE VARS - For organs that assist with certain languages. + //* ## LANGUAGE VARS - For organs that assist with certain languages. var/list/will_assist_languages = list() var/list/datum/language/assists_languages = list() -//! ## VERB VARS + //* ## VERB VARS /// Verbs added by the organ when present in the body. var/list/organ_verbs /// Is the parent supposed to be organic, robotic, assisted? diff --git a/code/modules/organs/subtypes/nano.dm b/code/modules/organs/subtypes/nano.dm index 02cdd22195e2..e466cc56a486 100644 --- a/code/modules/organs/subtypes/nano.dm +++ b/code/modules/organs/subtypes/nano.dm @@ -2,7 +2,7 @@ /obj/item/organ/external/chest/unbreakable/nano robotic = ORGAN_NANOFORM encased = FALSE - max_damage = 100 + max_damage = 200 min_broken_damage = 1000 vital = TRUE emp_mod = 7 diff --git a/code/modules/overmap/legacy/ships/computers/sensors.dm b/code/modules/overmap/legacy/ships/computers/sensors.dm index b8da4f51c558..553ddbf1fb1e 100644 --- a/code/modules/overmap/legacy/ships/computers/sensors.dm +++ b/code/modules/overmap/legacy/ships/computers/sensors.dm @@ -118,9 +118,8 @@ if(istype(O) && !QDELETED(O) && (O in view(7,linked))) var/obj/item/paper/P = new /obj/item/paper(get_turf(src)) P.name = "paper (Sensor Scan - [O])" - P.info = O.get_scan_data(usr) - // TODO: strangle whoever made this, DO NOT MANUALLY CALL INIT - P.Initialize() // has to be called because the scanner desc uses a combination of html and markdown for some reason + P.info = replacetext(html_encode(O.get_scan_data(usr)), "\n", "
") + P.init_parsepencode(P.info) playsound(src, "sound/machines/printer.ogg", 30, 1) . = TRUE diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index e154c1b46026..92209ce67943 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -698,7 +698,7 @@ CREATE_WALL_MOUNTING_TYPES_SHIFTED(/obj/machinery/power/apc, 22) "You disassembled the broken APC frame.",\ "You hear welding.") else - new /obj/item/frame/apc(loc) + new /obj/item/frame2/apc(loc) user.visible_message(\ "[src] has been cut from the wall by [user.name] with the [WT.name].",\ "You cut the APC frame from the wall.",\ @@ -706,7 +706,7 @@ CREATE_WALL_MOUNTING_TYPES_SHIFTED(/obj/machinery/power/apc, 22) qdel(src) return else if (opened && ((machine_stat & BROKEN) || hacker || emagged)) - if (istype(W, /obj/item/frame/apc) && (machine_stat & BROKEN)) + if (istype(W, /obj/item/frame2/apc) && (machine_stat & BROKEN)) if(cell) to_chat(user, "You need to remove the power cell first.") return diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index 980695395cb0..9757c4173c31 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -228,7 +228,7 @@ var/mob/living/silicon/robot/R = loc severity *= R.cell_emp_mult - charge -= charge / severity + charge -= charge / (severity + 1) if (charge < 0) charge = 0 diff --git a/code/modules/power/fusion/core/core_control.dm b/code/modules/power/fusion/core/core_control.dm index 802a509693f7..08f267e39747 100644 --- a/code/modules/power/fusion/core/core_control.dm +++ b/code/modules/power/fusion/core/core_control.dm @@ -50,7 +50,7 @@ Device ident '[cur_viewed_device.id_tag]' [cur_viewed_device.owned_field ? "active" : "inactive"].
Power status: [cur_viewed_device.avail()]/[cur_viewed_device.active_power_usage * 0.001] kW
- Bring field [cur_viewed_device.owned_field ? "offline" : "online"].
+ Bring field [cur_viewed_device.owned_field ? "offline, which will cause it to explode" : "online"].
Field power density (W.m-3):
---- diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm deleted file mode 100644 index ecbf71a212d2..000000000000 --- a/code/modules/power/solar.dm +++ /dev/null @@ -1,548 +0,0 @@ -#define SOLAR_MAX_DIST 40 -/// Will never start itself. -#define SOLAR_AUTO_START_NO 0 -/// Will always start itself. -#define SOLAR_AUTO_START_YES 1 -/// Will start itself if config allows it (default is no). -#define SOLAR_AUTO_START_CONFIG 2 -GLOBAL_VAR_INIT(solar_gen_rate, 1500) -GLOBAL_LIST_EMPTY(solars_list) - -/obj/machinery/power/solar - name = "solar panel" - desc = "A solar electrical generator." - icon = 'icons/obj/power.dmi' - icon_state = "sp_base" - anchored = 1 - density = 1 - use_power = USE_POWER_OFF - idle_power_usage = 0 - active_power_usage = 0 - integrity = 100 - integrity_max = 100 - - var/id = 0 - var/obscured = 0 - var/sunfrac = 0 - var/adir = SOUTH // actual dir - var/ndir = SOUTH // target dir - var/turn_angle = 0 - var/obj/machinery/power/solar_control/control = null - -/obj/machinery/power/solar/can_drain_energy(datum/actor, flags) - return FALSE - -/obj/machinery/power/solar/Initialize(mapload, obj/item/solar_assembly/S) - . = ..() - Make(S) - connect_to_network() - -/obj/machinery/power/solar/Destroy() - unset_control() //remove from control computer - ..() - -//set the control of the panel to a given computer if closer than SOLAR_MAX_DIST -/obj/machinery/power/solar/proc/set_control(var/obj/machinery/power/solar_control/SC) - if(SC && (get_dist(src, SC) > SOLAR_MAX_DIST)) - return 0 - control = SC - return 1 - -//set the control of the panel to null and removes it from the control list of the previous control computer if needed -/obj/machinery/power/solar/proc/unset_control() - if(control) - control.connected_panels.Remove(src) - control = null - -/obj/machinery/power/solar/proc/Make(var/obj/item/solar_assembly/S) - if(!S) - S = new /obj/item/solar_assembly(src) - S.glass_type = /obj/item/stack/material/glass - else - S.forceMove(src) - if(S.glass_type == /obj/item/stack/material/glass/reinforced) //if the panel is in reinforced glass - set_max_integrity(integrity_max * 2) - set_integrity(integrity * 2) - update_icon() - -/obj/machinery/power/solar/attackby(obj/item/I, mob/living/user, list/params, clickchain_flags, damage_multiplier) - // todo: tool act - if(I.is_crowbar()) - playsound(src.loc, 'sound/machines/click.ogg', 50, 1) - user.visible_message("[user] begins to take the glass off the solar panel.") - if(do_after(user, 50)) - var/obj/item/solar_assembly/S = locate() in src - if(S) - S.loc = src.loc - S.give_glass() - playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) - user.visible_message("[user] takes the glass off the solar panel.") - new /obj/item/solar_assembly(get_turf(src)) - qdel(src) - return CLICKCHAIN_DO_NOT_PROPAGATE | CLICKCHAIN_DID_SOMETHING - return CLICKCHAIN_DO_NOT_PROPAGATE - -/obj/machinery/solar/drop_products(method, atom/where) - . = ..() - switch(method) - if(ATOM_DECONSTRUCT_DISASSEMBLED) - new /obj/item/stack/material/glass(where, 2) - else - for(var/i in 1 to 2) - new /obj/item/material/shard(where) - -/obj/machinery/power/solar/update_icon() - ..() - cut_overlays() - if(machine_stat & BROKEN) - add_overlay(image('icons/obj/power.dmi', icon_state = "solar_panel-b", layer = FLY_LAYER)) - else - add_overlay(image('icons/obj/power.dmi', icon_state = "solar_panel", layer = FLY_LAYER)) - setDir(angle2dir(adir)) - return - -//calculates the fraction of the SSsun.sunlight that the panel recieves -/obj/machinery/power/solar/proc/update_solar_exposure() - if(!SSsun.sun) - return - if(obscured) - sunfrac = 0 - return - - //find the smaller angle between the direction the panel is facing and the direction of the SSsun.sun (the sign is not important here) - var/p_angle = min(abs(adir - SSsun.sun.angle), 360 - abs(adir - SSsun.sun.angle)) - - if(p_angle > 90) // if facing more than 90deg from SSsun.sun, zero output - sunfrac = 0 - return - - sunfrac = cos(p_angle) ** 2 - //isn't the power recieved from the incoming light proportionnal to cos(p_angle) (Lambert's cosine law) rather than cos(p_angle)^2 ? - -/obj/machinery/power/solar/process(delta_time)//TODO: remove/add this from machines to save on processing as needed ~Carn PRIORITY - if(machine_stat & BROKEN) - return - if(!SSsun.sun || !control) //if there's no SSsun.sun or the panel is not linked to a solar control computer, no need to proceed - return - - if(powernet) - if(powernet == control.powernet)//check if the panel is still connected to the computer - if(obscured) //get no light from the SSsun.sun, so don't generate power - return - var/sgen = GLOB.solar_gen_rate * sunfrac - add_avail(sgen * 0.001) - control.gen += sgen - else //if we're no longer on the same powernet, remove from control computer - unset_control() - -/obj/machinery/power/solar/atom_break() - . = ..() - machine_stat |= BROKEN - unset_control() - update_icon() - -/obj/machinery/power/solar/atom_fix() - . = ..() - machine_stat &= ~(BROKEN) - update_icon() - -/obj/machinery/power/solar/fake/Initialize(mapload, obj/item/solar_assembly/S) - . = ..(mapload, S, FALSE) - -/obj/machinery/power/solar/fake/process(delta_time) - return PROCESS_KILL - -//trace towards SSsun.sun to see if we're in shadow -/obj/machinery/power/solar/proc/occlusion() - - var/ax = x // start at the solar panel - var/ay = y - var/turf/T = null - - for(var/i = 1 to 20) // 20 steps is enough - ax += SSsun.sun.dx // do step - ay += SSsun.sun.dy - - T = locate( round(ax,0.5),round(ay,0.5),z) - - if(!T || T.x == 1 || T.x==world.maxx || T.y==1 || T.y==world.maxy) // not obscured if we reach the edge - break - - if(T.opacity) // if we hit a solid turf, panel is obscured - obscured = 1 - return - - obscured = 0 // if hit the edge or stepped 20 times, not obscured - update_solar_exposure() - - -// -// Solar Assembly - For construction of solar arrays. -// - -/obj/item/solar_assembly - name = "solar panel assembly" - desc = "A solar panel assembly kit, allows constructions of a solar panel, or with a tracking circuit board, a solar tracker" - icon = 'icons/obj/power.dmi' - icon_state = "sp_base" - item_state = "camera" - w_class = WEIGHT_CLASS_BULKY // Pretty big! - anchored = 0 - var/tracker = 0 - var/glass_type = null - -/obj/item/solar_assembly/attack_hand(mob/user, list/params) - if(!anchored || !isturf(loc)) // You can't pick it up - ..() - -// Give back the glass type we were supplied with -/obj/item/solar_assembly/proc/give_glass() - if(glass_type) - var/obj/item/stack/material/S = new glass_type(src.loc) - S.amount = 2 - glass_type = null - - -/obj/item/solar_assembly/attackby(var/obj/item/W, var/mob/user) - if (!isturf(loc)) - return 0 - if(!anchored) - if(W.is_wrench()) - anchored = 1 - user.visible_message("[user] wrenches the solar assembly into place.") - playsound(src, W.tool_sound, 75, 1) - return 1 - else - if(W.is_wrench()) - anchored = 0 - user.visible_message("[user] unwrenches the solar assembly from it's place.") - playsound(src, W.tool_sound, 75, 1) - return 1 - - // todo: phoronglass solars - if(istype(W, /obj/item/stack/material) && istype(W.get_primary_material(), /datum/material/glass)) - var/obj/item/stack/material/S = W - if(S.use(2)) - glass_type = W.type - playsound(src.loc, 'sound/machines/click.ogg', 50, 1) - user.visible_message("[user] places the glass on the solar assembly.") - if(tracker) - new /obj/machinery/power/tracker(get_turf(src), src) - else - new /obj/machinery/power/solar(get_turf(src), src) - qdel(src) - else - to_chat(user, "You need two sheets of glass to put them into a solar panel.") - return - return 1 - - if(!tracker) - if(istype(W, /obj/item/tracker_electronics)) - if(!user.attempt_consume_item_for_construction(W)) - return - tracker = 1 - user.visible_message("[user] inserts the electronics into the solar assembly.") - return 1 - else - if(W.is_crowbar()) - new /obj/item/tracker_electronics(src.loc) - tracker = 0 - user.visible_message("[user] takes out the electronics from the solar assembly.") - return 1 - ..() - -// -// Solar Control Computer -// - -/obj/machinery/power/solar_control - name = "solar panel control" - desc = "A controller for solar panel arrays." - icon = 'icons/obj/computer.dmi' - icon_state = "solar" - anchored = 1 - density = 1 - use_power = USE_POWER_IDLE - idle_power_usage = 250 - var/id = 0 - var/cdir = 0 - var/targetdir = 0 // target angle in manual tracking (since it updates every game minute) - var/gen = 0 - var/lastgen = 0 - var/track = 0 // 0= off 1=timed 2=auto (tracker) - var/trackrate = 600 // 300-900 seconds - var/nexttime = 0 // time for a panel to rotate of 1� in manual tracking - var/obj/machinery/power/tracker/connected_tracker = null - var/list/connected_panels = list() - var/auto_start = SOLAR_AUTO_START_NO - -// Used for mapping in solar arrays which automatically start itself. -// Generally intended for far away and remote locations, where player intervention is rare. -// In the interest of backwards compatability, this isn't named auto_start, as doing so might break downstream maps. -/obj/machinery/power/solar_control/autostart - auto_start = SOLAR_AUTO_START_YES - -// Similar to above but controlled by the configuration file. -// Intended to be used for the main solar arrays, so individual servers can choose to have them start automatically or require manual intervention. -/obj/machinery/power/solar_control/config_start - auto_start = SOLAR_AUTO_START_CONFIG - -/obj/machinery/power/solar_control/Initialize(mapload) - . = ..() - connect_to_network() - set_panels(cdir) - -/obj/machinery/power/solar_control/Destroy() - for(var/obj/machinery/power/solar/M in connected_panels) - M.unset_control() - if(connected_tracker) - connected_tracker.unset_control() - return ..() - -/obj/machinery/power/solar_control/proc/auto_start(forced = FALSE) - // Automatically sets the solars, if allowed. - if(forced || auto_start == SOLAR_AUTO_START_YES || (auto_start == SOLAR_AUTO_START_CONFIG && config_legacy.autostart_solars) ) - track = 2 // Auto tracking mode. - search_for_connected() - if(connected_tracker) - connected_tracker.set_angle(SSsun.sun.angle) - set_panels(cdir) - -// This would use LateInitialize(), however the powernet does not appear to exist during that time. -/hook/roundstart/proc/auto_start_solars() - for(var/a in GLOB.solars_list) - var/obj/machinery/power/solar_control/SC = a - SC.auto_start() - return TRUE - -/obj/machinery/power/solar_control/can_drain_energy(datum/actor, flags) - return FALSE - -/obj/machinery/power/solar_control/disconnect_from_network() - ..() - GLOB.solars_list.Remove(src) - -/obj/machinery/power/solar_control/connect_to_network() - var/to_return = ..() - if(powernet) //if connected and not already in solar_list... - GLOB.solars_list |= src //... add it - return to_return - -/// Search for unconnected panels and trackers in the computer powernet and connect them -/obj/machinery/power/solar_control/proc/search_for_connected() - if(powernet) - for(var/obj/machinery/power/M in powernet.nodes) - if(istype(M, /obj/machinery/power/solar)) - var/obj/machinery/power/solar/S = M - if(!S.control) //i.e unconnected - S.set_control(src) - connected_panels |= S - else if(istype(M, /obj/machinery/power/tracker)) - if(!connected_tracker) //if there's already a tracker connected to the computer don't add another - var/obj/machinery/power/tracker/T = M - if(!T.control) //i.e unconnected - connected_tracker = T - T.set_control(src) - -/// Called by the SSsun.sun controller, update the facing angle (either manually or via tracking) and rotates the panels accordingly -/obj/machinery/power/solar_control/proc/update() - if(machine_stat & (NOPOWER | BROKEN)) - return - - switch(track) - if(1) - if(trackrate) //we're manual tracking. If we set a rotation speed... - cdir = targetdir //...the current direction is the targetted one (and rotates panels to it) - if(2) // auto-tracking - if(connected_tracker) - connected_tracker.set_angle(SSsun.sun.angle) - - set_panels(cdir) - updateDialog() - -/obj/machinery/power/solar_control/update_icon() - cut_overlays() - if(machine_stat & BROKEN) - icon_state = "broken" - return - if(machine_stat & NOPOWER) - icon_state = "c_unpowered" - return - icon_state = "solar" - if(cdir > -1) - add_overlay(image('icons/obj/computer.dmi', "solcon-o", FLY_LAYER, angle2dir(cdir))) - return - -/obj/machinery/power/solar_control/attack_hand(mob/user, list/params) - if(!..()) - interact(user) - -/obj/machinery/power/solar_control/interact(mob/user) - - var/t = "Generated power : [round(lastgen)] W
" - t += "Star Orientation: [SSsun.sun.angle]° ([angle2text(SSsun.sun.angle)])
" - t += "Array Orientation: [rate_control(src,"cdir","[cdir]°",1,15)] ([angle2text(cdir)])
" - t += "Tracking:
"
- switch(track)
- if(0)
- t += "Off Timed Auto
" - if(1) - t += "Off Timed Auto
" - if(2) - t += "Off Timed Auto
" - - t += "Tracking Rate: [rate_control(src,"tdir","[trackrate] deg/h ([trackrate<0 ? "CCW" : "CW"])",1,30,180)]
" - if(1) - t += "Off Timed Auto
" - if(2) - t += "Off Timed Auto
" - - t += "Tracking Rate: [rate_control(src,"tdir","[trackrate] deg/h ([trackrate<0 ? "CCW" : "CW"])",1,30,180)]
" - - t += "Connected devices:
"
-
- t += "Search for devices
" - t += "Solar panels : [connected_panels.len] connected
" - t += "Solar tracker : [connected_tracker ? "Found" : "Not found"]
" - t += "Solar panels : [connected_panels.len] connected
" - t += "Solar tracker : [connected_tracker ? "Found" : "Not found"]
" - - t += "Close" - - var/datum/browser/popup = new(user, "solar", name) - popup.set_content(t) - popup.open() - - return - -/obj/machinery/power/solar_control/attackby(obj/item/I, user as mob) - if(I.is_screwdriver()) - playsound(src, I.tool_sound, 50, 1) - if(do_after(user, 20)) - if (src.machine_stat & BROKEN) - to_chat(user, "The broken glass falls out.") - var/obj/structure/frame/A = new /obj/structure/frame/computer( src.loc ) - new /obj/item/material/shard( src.loc ) - var/obj/item/circuitboard/solar_control/M = new /obj/item/circuitboard/solar_control( A ) - for (var/obj/C in src) - C.loc = src.loc - A.circuit = M - A.state = 3 - A.icon_state = "computer_3" - A.anchored = 1 - qdel(src) - else - to_chat(user, "You disconnect the monitor.") - var/obj/structure/frame/A = new /obj/structure/frame/computer( src.loc ) - var/obj/item/circuitboard/solar_control/M = new /obj/item/circuitboard/solar_control( A ) - for (var/obj/C in src) - C.loc = src.loc - A.circuit = M - A.state = 4 - A.icon_state = "computer_4" - A.anchored = 1 - qdel(src) - else - src.attack_hand(user) - return - -/obj/machinery/power/solar_control/process(delta_time) - lastgen = gen - gen = 0 - - if(machine_stat & (NOPOWER | BROKEN)) - return - - if(connected_tracker) //NOTE : handled here so that we don't add trackers to the processing list - if(connected_tracker.powernet != powernet) - connected_tracker.unset_control() - - if(track==1 && trackrate) //manual tracking and set a rotation speed - if(nexttime <= world.time) //every time we need to increase/decrease the angle by 1�... - targetdir = (targetdir + trackrate/abs(trackrate) + 360) % 360 //... do it - nexttime += 36000/abs(trackrate) //reset the counter for the next 1� - - updateDialog() - -/obj/machinery/power/solar_control/Topic(href, href_list) - if(..()) - usr << browse(null, "window=solcon") - usr.unset_machine() - return 0 - if(href_list["close"] ) - usr << browse(null, "window=solcon") - usr.unset_machine() - return 0 - - if(href_list["rate control"]) - if(href_list["cdir"]) - src.cdir = clamp((360+src.cdir+text2num(href_list["cdir"]))%360, 0, 359) - src.targetdir = src.cdir - if(track == 2) //manual update, so losing auto-tracking - track = 0 - spawn(1) - set_panels(cdir) - if(href_list["tdir"]) - src.trackrate = clamp(src.trackrate+text2num(href_list["tdir"]), -7200, 7200) - if(src.trackrate) nexttime = world.time + 36000/abs(trackrate) - - if(href_list["track"]) - track = text2num(href_list["track"]) - if(track == 2) - if(connected_tracker) - connected_tracker.set_angle(SSsun.sun.angle) - set_panels(cdir) - else if (track == 1) //begin manual tracking - src.targetdir = src.cdir - if(src.trackrate) nexttime = world.time + 36000/abs(trackrate) - set_panels(targetdir) - - if(href_list["search_connected"]) - src.search_for_connected() - if(connected_tracker && track == 2) - connected_tracker.set_angle(SSsun.sun.angle) - src.set_panels(cdir) - - interact(usr) - return 1 - -//rotates the panel to the passed angle -/obj/machinery/power/solar_control/proc/set_panels(var/cdir) - - for(var/obj/machinery/power/solar/S in connected_panels) - S.adir = cdir //instantly rotates the panel - S.occlusion()//and - S.update_icon() //update it - - update_icon() - - -/obj/machinery/power/solar_control/power_change() - ..() - update_icon() - - -/obj/machinery/power/solar_control/proc/broken() - machine_stat |= BROKEN - update_icon() - - -/obj/machinery/power/solar_control/legacy_ex_act(severity) - switch(severity) - if(1.0) - //SN src = null - qdel(src) - return - if(2.0) - if (prob(50)) - broken() - if(3.0) - if (prob(25)) - broken() - return - -// -// MISC -// - -/obj/item/paper/solar - name = "paper- 'Going green! Setup your own solar array instructions.'" - info = "
Welcome
At greencorps we love the environment, and space. With this package you are able to help mother nature and produce energy without any usage of fossil fuel or phoron! Singularity energy is dangerous while solar energy is safe, which is why it's better. Now here is how you setup your own solar array.
You can make a solar panel by wrenching the solar assembly onto a cable node. Adding a glass panel, reinforced or regular glass will do, will finish the construction of your solar panel. It is that easy!
Now after setting up 19 more of these solar panels you will want to create a solar tracker to keep track of our mother nature's gift, the SSsun.sun. These are the same steps as before except you insert the tracker equipment circuit into the assembly before performing the final step of adding the glass. You now have a tracker! Now the last step is to add a computer to calculate the SSsun.sun's movements and to send commands to the solar panels to change direction with the SSsun.sun. Setting up the solar computer is the same as setting up any computer, so you should have no trouble in doing that. You do need to put a wire node under the computer, and the wire needs to be connected to the tracker.
Congratulations, you should have a working solar array. If you are having trouble, here are some tips. Make sure all solar equipment are on a cable node, even the computer. You can always deconstruct your creations if you make a mistake.
That's all to it, be safe, be green!
" - -/proc/rate_control(var/S, var/V, var/C, var/Min=1, var/Max=5, var/Limit=null) //How not to name vars - var/href = "-[href]=-[Min]'>- [(C?C : 0)] [href]=[Min]'>+[href]=[Max]'>+" - if(Limit) return "[href]=-[Limit]'>-"+rate+"[href]=[Limit]'>+" - return rate diff --git a/code/modules/power/solar/solar.dm b/code/modules/power/solar/solar.dm new file mode 100644 index 000000000000..0fd562b271b7 --- /dev/null +++ b/code/modules/power/solar/solar.dm @@ -0,0 +1,135 @@ +#define SOLAR_MAX_DIST 40 +/// Will start itself if config allows it (default is no). +#define SOLAR_AUTO_START_CONFIG 2 +GLOBAL_VAR_INIT(solar_gen_rate, 1500) +GLOBAL_LIST_EMPTY(solars_list) + +/obj/machinery/power/solar + name = "solar panel" + desc = "A solar electrical generator." + icon = 'icons/obj/power.dmi' + icon_state = "sp_base" + anchored = 1 + density = 1 + use_power = USE_POWER_OFF + idle_power_usage = 0 + active_power_usage = 0 + integrity = 100 + integrity_max = 100 + + var/id = 0 + var/sunfrac = 0 + var/adir = SOUTH // actual dir + var/ndir = SOUTH // target dir + var/turn_angle = 0 + var/obj/machinery/power/solar_control/control = null + +/obj/machinery/power/solar/Initialize(mapload) + . = ..() + connect_to_network() + update_icon() + +/obj/machinery/power/solar/Destroy() + unset_control() //remove from control computer + return ..() + +//set the control of the panel to a given computer if closer than SOLAR_MAX_DIST +/obj/machinery/power/solar/proc/set_control(var/obj/machinery/power/solar_control/SC) + if(SC && (get_dist(src, SC) > SOLAR_MAX_DIST)) + return 0 + control = SC + return 1 + +//set the control of the panel to null and removes it from the control list of the previous control computer if needed +/obj/machinery/power/solar/proc/unset_control() + if(control) + control.connected_panels.Remove(src) + control = null + +/obj/machinery/power/solar/attackby(obj/item/I, mob/living/user, list/params, clickchain_flags, damage_multiplier) + // todo: tool act + if(I.is_crowbar()) + playsound(src.loc, 'sound/machines/click.ogg', 50, 1) + user.visible_message("[user] begins to take the glass off the solar panel.") + if(do_after(user, 50)) + playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) + user.visible_message("[user] takes the glass off the solar panel.") + deconstruct(ATOM_DECONSTRUCT_DISASSEMBLED) + return CLICKCHAIN_DO_NOT_PROPAGATE | CLICKCHAIN_DID_SOMETHING + return CLICKCHAIN_DO_NOT_PROPAGATE + return ..() + +/obj/machinery/solar/drop_products(method, atom/where) + . = ..() + switch(method) + if(ATOM_DECONSTRUCT_DISASSEMBLED) + drop_product(method, new /obj/structure/frame2/solar_panel/anchored, where) + else + for(var/i in 1 to 2) + new /obj/item/material/shard(where) + +/obj/machinery/power/solar/update_icon() + ..() + cut_overlays() + if(machine_stat & BROKEN) + add_overlay(image('icons/obj/power.dmi', icon_state = "solar_panel-b", layer = FLY_LAYER)) + else + add_overlay(image('icons/obj/power.dmi', icon_state = "solar_panel", layer = FLY_LAYER)) + setDir(angle2dir(adir)) + return + +//calculates the fraction of the SSsun.sunlight that the panel recieves +/obj/machinery/power/solar/proc/update_solar_exposure() + var/p_angle = 180 + var/solar_brightness = 1 + + var/datum/planet/our_planet = null + var/turf/T = get_turf(src) + if(T.outdoors && (T.z <= SSplanets.z_to_planet.len)) + our_planet = SSplanets.z_to_planet[z] + + if(our_planet && istype(our_planet)) + solar_brightness = our_planet.sun_apparent_brightness * 1.3 + var/time_num = text2num(our_planet.current_time.show_time("hh")) + text2num(our_planet.current_time.show_time("mm")) / 60 + var/hours_in_day = our_planet.current_time.seconds_in_day / (1 HOURS) + var/sunangle_by_time = (time_num / hours_in_day) * 360 // day as progress from 0 to 1 * 360 + p_angle = abs(adir - sunangle_by_time) + else + if(!SSsun.sun) + return + //find the smaller angle between the direction the panel is facing and the direction of the SSsun.sun (the sign is not important here) + p_angle = min(abs(adir - SSsun.sun.angle), 360 - abs(adir - SSsun.sun.angle)) + + sunfrac = max(cos(p_angle), 0) * solar_brightness + +/obj/machinery/power/solar/process(delta_time)//TODO: remove/add this from machines to save on processing as needed ~Carn PRIORITY + if(machine_stat & BROKEN) + return + if(!control) //if there's the panel is not linked to a solar control computer, no need to proceed + return + + if(!sunfrac) //Not getting any sun, so why process + return + + if(powernet) + if(powernet == control.powernet)//check if the panel is still connected to the computer + var/sgen = GLOB.solar_gen_rate * sunfrac + add_avail(sgen * 0.001) + control.gen += sgen + else //if we're no longer on the same powernet, remove from control computer + unset_control() + +/obj/machinery/power/solar/atom_break() + . = ..() + machine_stat |= BROKEN + unset_control() + update_icon() + +/obj/machinery/power/solar/atom_fix() + . = ..() + machine_stat &= ~(BROKEN) + update_icon() + +/obj/item/paper/solar + name = "paper- 'Going green! Setup your own solar array instructions.'" + info = "Welcome
At greencorps we love the environment, and space. With this package you are able to help mother nature and produce energy without any usage of fossil fuel or phoron! Singularity energy is dangerous while solar energy is safe, which is why it's better. Now here is how you setup your own solar array.
You can make a solar panel by wrenching the solar assembly onto a cable node. Adding a glass panel, reinforced or regular glass will do, will finish the construction of your solar panel. It is that easy!
Now after setting up 19 more of these solar panels you will want to create a solar tracker to keep track of our mother nature's gift, the SSsun.sun. These are the same steps as before except you insert the tracker equipment circuit into the assembly before performing the final step of adding the glass. You now have a tracker! Now the last step is to add a computer to calculate the SSsun.sun's movements and to send commands to the solar panels to change direction with the SSsun.sun. Setting up the solar computer is the same as setting up any computer, so you should have no trouble in doing that. You do need to put a wire node under the computer, and the wire needs to be connected to the tracker.
Congratulations, you should have a working solar array. If you are having trouble, here are some tips. Make sure all solar equipment are on a cable node, even the computer. You can always deconstruct your creations if you make a mistake.
That's all to it, be safe, be green!
" diff --git a/code/modules/power/solar/solar_control.dm b/code/modules/power/solar/solar_control.dm new file mode 100644 index 000000000000..cd503e9daa74 --- /dev/null +++ b/code/modules/power/solar/solar_control.dm @@ -0,0 +1,300 @@ +/obj/machinery/power/solar_control + name = "solar panel control" + desc = "A controller for solar panel arrays." + icon = 'icons/obj/computer.dmi' + icon_state = "solar" + anchored = 1 + density = 1 + use_power = USE_POWER_IDLE + idle_power_usage = 250 + var/id = 0 + var/cdir = 0 + var/targetdir = 0 // target angle in manual tracking (since it updates every game minute) + var/gen = 0 + var/lastgen = 0 + var/track = 0 // 0= off 1=timed 2=auto (tracker) + var/trackrate = 600 // 300-900 seconds + var/nexttime = 0 // time for a panel to rotate of 1� in manual tracking + var/obj/machinery/power/tracker/connected_tracker = null + var/list/connected_panels = list() + var/auto_start = FALSE + +// Used for mapping in solar arrays which automatically start itself. +// Generally intended for far away and remote locations, where player intervention is rare. +// In the interest of backwards compatability, this isn't named auto_start, as doing so might break downstream maps. +/obj/machinery/power/solar_control/autostart + auto_start = TRUE + +// Similar to above but controlled by the configuration file. +// Intended to be used for the main solar arrays, so individual servers can choose to have them start automatically or require manual intervention. +/obj/machinery/power/solar_control/config_start + auto_start = SOLAR_AUTO_START_CONFIG + +/obj/machinery/power/solar_control/Initialize(mapload) + . = ..() + connect_to_network() + set_panels(cdir) + +/obj/machinery/power/solar_control/Destroy() + for(var/obj/machinery/power/solar/M in connected_panels) + M.unset_control() + if(connected_tracker) + connected_tracker.unset_control() + return ..() + +/obj/machinery/power/solar_control/proc/auto_start(forced = FALSE) + // Automatically sets the solars, if allowed. + if(forced || auto_start == TRUE || (auto_start == SOLAR_AUTO_START_CONFIG && config_legacy.autostart_solars) ) + track = 2 // Auto tracking mode. + search_for_connected() + if(connected_tracker) + set_tracker_angle() + set_panels(cdir) + +// This would use LateInitialize(), however the powernet does not appear to exist during that time. +/hook/roundstart/proc/auto_start_solars() + for(var/a in GLOB.solars_list) + var/obj/machinery/power/solar_control/SC = a + SC.auto_start() + return TRUE + +/obj/machinery/power/solar_control/can_drain_energy(datum/actor, flags) + return FALSE + +/obj/machinery/power/solar_control/disconnect_from_network() + ..() + GLOB.solars_list.Remove(src) + +/obj/machinery/power/solar_control/connect_to_network() + var/to_return = ..() + if(powernet) //if connected and not already in solar_list... + GLOB.solars_list |= src //... add it + return to_return + +/// Search for unconnected panels and trackers in the computer powernet and connect them +/obj/machinery/power/solar_control/proc/search_for_connected() + if(powernet) + for(var/obj/machinery/power/M in powernet.nodes) + if(istype(M, /obj/machinery/power/solar)) + var/obj/machinery/power/solar/S = M + if(!S.control) //i.e unconnected + S.set_control(src) + connected_panels |= S + else if(istype(M, /obj/machinery/power/tracker)) + if(!connected_tracker) //if there's already a tracker connected to the computer don't add another + var/obj/machinery/power/tracker/T = M + if(!T.control) //i.e unconnected + connected_tracker = T + T.set_control(src) + +/// Called by the SSsun.sun controller, update the facing angle (either manually or via tracking) and rotates the panels accordingly +/obj/machinery/power/solar_control/proc/update() + if(machine_stat & (NOPOWER | BROKEN)) + return + + switch(track) + if(1) + if(trackrate) //we're manual tracking. If we set a rotation speed... + cdir = targetdir //...the current direction is the targetted one (and rotates panels to it) + if(2) // auto-tracking + if(connected_tracker) + set_tracker_angle() + + set_panels(cdir) + updateDialog() + +/obj/machinery/power/solar_control/update_icon() + cut_overlays() + if(machine_stat & BROKEN) + icon_state = "broken" + return + if(machine_stat & NOPOWER) + icon_state = "c_unpowered" + return + icon_state = "solar" + if(cdir > -1) + add_overlay(image('icons/obj/computer.dmi', "solcon-o", FLY_LAYER, angle2dir(cdir))) + return + +/obj/machinery/power/solar_control/attack_hand(mob/user, list/params) + if(!..()) + interact(user) + +/obj/machinery/power/solar_control/interact(mob/user) + var/t = "Generated power : [round(lastgen)] W" + t += "Star Orientation: [cdir]° ([angle2text(cdir)])
" + t += "Array Orientation: [rate_control(src,"cdir","[cdir]°",1,15)] ([angle2text(cdir)])
" + t += "Tracking:
"
+ switch(track)
+ if(0)
+ t += "Off Timed Auto
" + if(1) + t += "Off Timed Auto
" + if(2) + t += "Off Timed Auto
" + + t += "Tracking Rate: [rate_control(src,"tdir","[trackrate] deg/h ([trackrate<0 ? "CCW" : "CW"])",1,30,180)]
" + if(1) + t += "Off Timed Auto
" + if(2) + t += "Off Timed Auto
" + + t += "Tracking Rate: [rate_control(src,"tdir","[trackrate] deg/h ([trackrate<0 ? "CCW" : "CW"])",1,30,180)]
" + + t += "Connected devices:
"
+
+ t += "Search for devices
" + t += "Solar panels : [connected_panels.len] connected
" + t += "Solar tracker : [connected_tracker ? "Found" : "Not found"]
" + t += "Solar panels : [connected_panels.len] connected
" + t += "Solar tracker : [connected_tracker ? "Found" : "Not found"]
" + + t += "Close" + + var/datum/browser/popup = new(user, "solar", name) + popup.set_content(t) + popup.open() + + return + +/obj/machinery/power/solar_control/attackby(obj/item/I, user as mob) + if(I.is_screwdriver()) + playsound(src, I.tool_sound, 50, 1) + if(do_after(user, 20)) + if (src.machine_stat & BROKEN) + to_chat(user, "The broken glass falls out.") + var/obj/structure/frame/A = new /obj/structure/frame/computer( src.loc ) + new /obj/item/material/shard( src.loc ) + var/obj/item/circuitboard/solar_control/M = new /obj/item/circuitboard/solar_control( A ) + for (var/obj/C in src) + C.loc = src.loc + A.circuit = M + A.state = 3 + A.icon_state = "computer_3" + A.anchored = 1 + qdel(src) + else + to_chat(user, "You disconnect the monitor.") + var/obj/structure/frame/A = new /obj/structure/frame/computer( src.loc ) + var/obj/item/circuitboard/solar_control/M = new /obj/item/circuitboard/solar_control( A ) + for (var/obj/C in src) + C.loc = src.loc + A.circuit = M + A.state = 4 + A.icon_state = "computer_4" + A.anchored = 1 + qdel(src) + else + src.attack_hand(user) + return + +/obj/machinery/power/solar_control/process(delta_time) + lastgen = gen + gen = 0 + + if(machine_stat & (NOPOWER | BROKEN)) + return + + if(connected_tracker) //NOTE : handled here so that we don't add trackers to the processing list + if(connected_tracker.powernet != powernet) + connected_tracker.unset_control() + + if(track==1 && trackrate) //manual tracking and set a rotation speed + if(nexttime <= world.time) //every time we need to increase/decrease the angle by 1�... + targetdir = (targetdir + trackrate/abs(trackrate) + 360) % 360 //... do it + nexttime += 36000/abs(trackrate) //reset the counter for the next 1� + + update() + + updateDialog() + +/obj/machinery/power/solar_control/Topic(href, href_list) + if(..()) + usr << browse(null, "window=solcon") + usr.unset_machine() + return 0 + if(href_list["close"] ) + usr << browse(null, "window=solcon") + usr.unset_machine() + return 0 + + if(href_list["rate control"]) + if(href_list["cdir"]) + src.cdir = clamp((360+src.cdir+text2num(href_list["cdir"]))%360, 0, 359) + src.targetdir = src.cdir + if(track == 2) //manual update, so losing auto-tracking + track = 0 + spawn(1) + set_panels(cdir) + if(href_list["tdir"]) + src.trackrate = clamp(src.trackrate+text2num(href_list["tdir"]), -7200, 7200) + if(src.trackrate) nexttime = world.time + 36000/abs(trackrate) + + if(href_list["track"]) + track = text2num(href_list["track"]) + if(track == 2) + if(connected_tracker) + set_tracker_angle() + set_panels(cdir) + else if (track == 1) //begin manual tracking + src.targetdir = src.cdir + if(src.trackrate) nexttime = world.time + 36000/abs(trackrate) + set_panels(targetdir) + + if(href_list["search_connected"]) + src.search_for_connected() + if(connected_tracker && track == 2) + set_tracker_angle() + src.set_panels(cdir) + + interact(usr) + return 1 + +/obj/machinery/power/solar_control/proc/set_tracker_angle() + var/angle = 0 + var/datum/planet/our_planet = null + var/turf/T = get_turf(src) + if(T.z <= SSplanets.z_to_planet.len) + our_planet = SSplanets.z_to_planet[z] + + if(our_planet && istype(our_planet)) + var/time_num = text2num(our_planet.current_time.show_time("hh")) + (text2num(our_planet.current_time.show_time("mm"))/60) + var/day_hours = our_planet.current_time.seconds_in_day / (1 HOURS) + angle = round((time_num / day_hours) * 360) // day as progress from 0 to 1 * 360 + else + angle = SSsun.sun.angle + + connected_tracker.set_angle(angle) + +//rotates the panel to the passed angle +/obj/machinery/power/solar_control/proc/set_panels(var/cdir) + + for(var/obj/machinery/power/solar/S in connected_panels) + S.adir = cdir //instantly rotates the panel + S.update_solar_exposure()//and + S.update_icon() //update it + + update_icon() + + +/obj/machinery/power/solar_control/power_change() + ..() + update_icon() + + +/obj/machinery/power/solar_control/proc/broken() + machine_stat |= BROKEN + update_icon() + + +/obj/machinery/power/solar_control/legacy_ex_act(severity) + switch(severity) + if(1.0) + //SN src = null + qdel(src) + return + if(2.0) + if (prob(50)) + broken() + if(3.0) + if (prob(25)) + broken() + return + +/proc/rate_control(var/S, var/V, var/C, var/Min=1, var/Max=5, var/Limit=null) //How not to name vars + var/href = "-[href]=-[Min]'>- [(C?C : 0)] [href]=[Min]'>+[href]=[Max]'>+" + if(Limit) return "[href]=-[Limit]'>-"+rate+"[href]=[Limit]'>+" + return rate diff --git a/code/modules/power/tracker.dm b/code/modules/power/solar/tracker.dm similarity index 72% rename from code/modules/power/tracker.dm rename to code/modules/power/solar/tracker.dm index 0b0385792441..7263733e874c 100644 --- a/code/modules/power/tracker.dm +++ b/code/modules/power/solar/tracker.dm @@ -8,17 +8,17 @@ desc = "A solar directional tracker." icon = 'icons/obj/power.dmi' icon_state = "tracker" - anchored = 1 - density = 1 + anchored = TRUE + density = TRUE use_power = USE_POWER_OFF var/id = 0 var/sun_angle = 0 // sun angle as set by sun datum var/obj/machinery/power/solar_control/control = null -/obj/machinery/power/tracker/Initialize(mapload, obj/item/solar_assembly/S) +/obj/machinery/power/tracker/Initialize(mapload) . = ..() - Make(S) + update_icon() connect_to_network() /obj/machinery/power/tracker/Destroy() @@ -38,15 +38,6 @@ control.connected_tracker = null control = null -/obj/machinery/power/tracker/proc/Make(var/obj/item/solar_assembly/S) - if(!S) - S = new /obj/item/solar_assembly(src) - S.glass_type = /obj/item/stack/material/glass - S.tracker = 1 - S.anchored = 1 - S.loc = src - update_icon() - //updates the tracker icon and the facing angle for the control computer /obj/machinery/power/tracker/proc/set_angle(var/angle) sun_angle = angle @@ -57,21 +48,20 @@ if(powernet && (powernet == control.powernet)) //update if we're still in the same powernet control.cdir = angle -/obj/machinery/power/tracker/attackby(var/obj/item/W, var/mob/user) +/obj/machinery/power/tracker/drop_products(method, atom/where) + . = ..() + drop_product(method, new /obj/structure/frame2/solar_panel/tracker/anchored, where) - if(W.is_crowbar()) +/obj/machinery/power/tracker/attackby(obj/item/I, mob/living/user, list/params, clickchain_flags, damage_multiplier) + // todo: tool system + if(I.is_crowbar()) playsound(src.loc, 'sound/machines/click.ogg', 50, 1) user.visible_message("[user] begins to take the glass off the solar tracker.") if(do_after(user, 50)) - var/obj/item/solar_assembly/S = locate() in src - if(S) - S.loc = src.loc - S.give_glass() - playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) - user.visible_message("[user] takes the glass off the tracker.") - qdel(src) - return - ..() + deconstruct(ATOM_DECONSTRUCT_DISASSEMBLED) + return CLICKCHAIN_DID_SOMETHING | CLICKCHAIN_DO_NOT_PROPAGATE + return CLICKCHAIN_DO_NOT_PROPAGATE + return ..() // Tracker Electronic diff --git a/code/modules/power/tesla/coil.dm b/code/modules/power/tesla/coil.dm index be531a988a8d..0121fcb4dc42 100644 --- a/code/modules/power/tesla/coil.dm +++ b/code/modules/power/tesla/coil.dm @@ -12,7 +12,7 @@ circuit = /obj/item/circuitboard/tesla_coil - var/power_loss = 2 + var/power_loss = 1.2 var/input_power_multiplier = 1 var/zap_cooldown = 100 var/last_zap = 0 diff --git a/code/modules/preferences/_preferences.dm b/code/modules/preferences/_preferences.dm index 4df40de85b35..0b8120fe2539 100644 --- a/code/modules/preferences/_preferences.dm +++ b/code/modules/preferences/_preferences.dm @@ -29,27 +29,27 @@ GLOBAL_LIST_EMPTY(preferences_datums) return creating /datum/preferences - //! Intrinsics + //* Intrinsics /// did we load yet? var/initialized = FALSE - //! Error Handling + //* Error Handling /// queued error messages to display var/list/io_error_queue -//! ## Doohickeys For Savefiles + //* ## Doohickeys For Savefiles var/path /// Holder so it doesn't default to slot 1, rather the last one used. var/default_slot = 1 var/savefile_version = 0 // todo: kick this out of prefs -//! ## Non-Preference Stuff + //* ## Non-Preference Stuff var/muted = 0 var/last_ip var/last_id -//! ## Cooldowns for saving/loading. + //* ## Cooldowns for saving/loading. //? ## These are four are all separate due to loading code calling these one after another. var/saveprefcooldown var/loadprefcooldown @@ -60,7 +60,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) //? These lists may only ever contain associative key-values, where //? values MUST be string, number, or null. //? Savefiles do not play nice with typepaths. - //! Loaded data + //* Loaded data /// character data var/list/character /// global data @@ -68,13 +68,13 @@ GLOBAL_LIST_EMPTY(preferences_datums) /// data for byond skin - checkboxes and whatnot; this is ENTIRELY synchronized by the skin system. var/list/skin -//! ## Game Preferences + //* ## Game Preferences /// Special role selection. var/be_special = 0 /// Event role prefs flag. var/be_event_role = NONE -//! ## Character Preferences + //* ## Character Preferences /// Our character's name var/real_name /// Whether we are a random name every round @@ -146,7 +146,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) /// Enable/disable markings on synth parts. var/synth_markings = 1 -//! ## Background Preferences + //* ## Background Preferences ///Antag associated faction. var/antag_faction = "None" ///How visible antag association is to others. @@ -163,7 +163,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/uplinklocation = "PDA" -//! ## Mob Preview + //* ## Mob Preview /// Should only be a key-value list of north/south/east/west = atom/movable/screen. var/list/char_render_holders var/static/list/preview_screen_locs = list( @@ -174,13 +174,13 @@ GLOBAL_LIST_EMPTY(preferences_datums) "BG" = "character_preview_map:1,1 to 3,8" ) -//! ## Skills Preferences - Depricated. + //* ## Skills Preferences - Depricated. var/used_skillpoints = 0 var/skill_specialization = null /// Skills can range from 0 to 3. var/list/skills = list() -//! ## Body Preferences + //* ## Body Preferences /// Maps each organ to either null(intact), "cyborg" or "amputated" /// will probably not be able to do this for head and torso ;) var/list/organ_data = list() @@ -195,7 +195,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/list/body_descriptors = list() -//! ## OOC Metadata + //* ## OOC Metadata var/metadata = "" var/headshot_url = "" var/full_ref_url = "" @@ -214,7 +214,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/datum/category_collection/player_setup_collection/player_setup var/datum/browser/panel -//! ## Character Directory Stuff + //* ## Character Directory Stuff /// Should we show in Character Directory. var/show_in_directory = 1 /// Sorting tag to use for vore-prefs. diff --git a/code/modules/preferences/apply.dm b/code/modules/preferences/apply.dm index cf1197513e8e..6c0d997bf087 100644 --- a/code/modules/preferences/apply.dm +++ b/code/modules/preferences/apply.dm @@ -129,7 +129,7 @@ // storage? if(allow_storage_spawn) for(var/obj/item/instance as anything in overflow) - if(character.force_equip_to_slot(instance, /datum/inventory_slot_meta/abstract/put_in_backpack)) + if(character.force_equip_to_slot(instance, /datum/inventory_slot/abstract/put_in_backpack)) overflow -= instance if(!(flags & PREF_COPY_TO_SILENT)) to_chat(character, SPAN_NOTICE("Putting \the [instance] into your backpack.")) @@ -151,7 +151,7 @@ // storage? if(allow_storage_spawn) for(var/obj/item/instance as anything in instances) - if(character.force_equip_to_slot(instance, /datum/inventory_slot_meta/abstract/put_in_backpack, INV_OP_SILENT)) + if(character.force_equip_to_slot(instance, /datum/inventory_slot/abstract/put_in_backpack, INV_OP_SILENT)) instances -= instance if(!(flags & PREF_COPY_TO_SILENT)) to_chat(character, SPAN_NOTICE("Putting \the [instance] into your backpack.")) diff --git a/code/modules/preferences/preference_setup/helpers/species_pick.dm b/code/modules/preferences/preference_setup/helpers/species_pick.dm index 06786ee3474f..178deea1b46a 100644 --- a/code/modules/preferences/preference_setup/helpers/species_pick.dm +++ b/code/modules/preferences/preference_setup/helpers/species_pick.dm @@ -57,10 +57,10 @@ var/datum/sprite_accessory/HS = GLOB.sprite_accessory_hair[h_style_id] var/datum/sprite_accessory/FS = GLOB.sprite_accessory_facial_hair[f_style_id] if(!(HS.name in valid_hair)) - var/datum/sprite_accessory/hair/H = /datum/sprite_accessory/hair/bald + var/datum/sprite_accessory/hair/H = /datum/sprite_accessory/hair/legacy/bald h_style_id = initial(H.id) if(!(FS.name in valid_fhair)) - var/datum/sprite_accessory/facial_hair/FH = /datum/sprite_accessory/facial_hair/shaved + var/datum/sprite_accessory/facial_hair/FH = /datum/sprite_accessory/facial_hair/legacy/shaved f_style_id = initial(FH.id) // limbs/markings reset_limbs() diff --git a/code/modules/preferences/preference_setup/vore/01_ears.dm b/code/modules/preferences/preference_setup/vore/01_ears.dm index d0bfd39a9c79..987b73f7a9f0 100644 --- a/code/modules/preferences/preference_setup/vore/01_ears.dm +++ b/code/modules/preferences/preference_setup/vore/01_ears.dm @@ -210,19 +210,31 @@ if(temp_wing_style_id.apply_restrictions && (!(species_name in temp_wing_style_id.species_allowed))) pref.wing_style_id = initial(pref.wing_style_id) +/datum/category_item/player_setup_item/vore/ears/proc/should_override(datum/sprite_accessory/setting, datum/sprite_accessory/existing, datum/sprite_accessory/species) + if(species && (existing == species)) + // if they're set by species, only override if we're set + return setting != null + // otherwise, override always + return TRUE + /datum/category_item/player_setup_item/vore/ears/copy_to_mob(datum/preferences/prefs, mob/M, data, flags) // todo: this is just a shim if(!ishuman(M)) return TRUE var/mob/living/carbon/human/character = M var/datum/sprite_accessory/S = GLOB.sprite_accessory_ears[pref.ear_style_id] - character.ear_style = S + // todo: this is shitcode + if(should_override(S, character.ear_style, character.species?.sprite_accessory_defaults?[SPRITE_ACCESSORY_SLOT_EARS])) + character.ear_style = S S = GLOB.sprite_accessory_tails[pref.tail_style_id] - character.tail_style = S + if(should_override(S, character.tail_style, character.species?.sprite_accessory_defaults?[SPRITE_ACCESSORY_SLOT_TAIL])) + character.tail_style = S S = GLOB.sprite_accessory_wings[pref.wing_style_id] - character.wing_style = S + if(should_override(S, character.wing_style, character.species?.sprite_accessory_defaults?[SPRITE_ACCESSORY_SLOT_WINGS])) + character.wing_style = S S = GLOB.sprite_accessory_ears[pref.horn_style_id] - character.horn_style = S + if(should_override(S, character.horn_style, character.species?.sprite_accessory_defaults?[SPRITE_ACCESSORY_SLOT_HORNS])) + character.horn_style = S character.r_ears = pref.r_ears character.b_ears = pref.b_ears @@ -362,7 +374,7 @@ var/datum/sprite_accessory/ears/current = pref.ear_style_id && GLOB.sprite_accessory_ears[pref.ear_style_id] for(var/id in GLOB.sprite_accessory_ears) var/datum/sprite_accessory/ears/instance = GLOB.sprite_accessory_ears[id] - if(((!instance.ckeys_allowed) || (usr.ckey in instance.ckeys_allowed)) && ((!instance.apply_restrictions) || (species_name in instance.species_allowed))) + if(((!instance.apply_restrictions) || (species_name in instance.species_allowed))) pretty_ear_styles[instance.name] = id // Present choice to user @@ -405,7 +417,7 @@ var/datum/sprite_accessory/ears/current = pref.horn_style_id && GLOB.sprite_accessory_ears[pref.horn_style_id] for(var/id in GLOB.sprite_accessory_ears) var/datum/sprite_accessory/ears/instance = GLOB.sprite_accessory_ears[id] - if(((!instance.ckeys_allowed) || (usr.ckey in instance.ckeys_allowed)) && ((!instance.apply_restrictions) || (species_name in instance.species_allowed))) + if(((!instance.apply_restrictions) || (species_name in instance.species_allowed))) pretty_horn_styles[instance.name] = id // Present choice to user @@ -448,7 +460,7 @@ var/datum/sprite_accessory/tail/current = pref.tail_style_id && GLOB.sprite_accessory_tails[pref.tail_style_id] for(var/id in GLOB.sprite_accessory_tails) var/datum/sprite_accessory/tail/instance = GLOB.sprite_accessory_tails[id] - if(((!instance.ckeys_allowed) || (usr.ckey in instance.ckeys_allowed)) && ((!instance.apply_restrictions) || (species_name in instance.species_allowed))) + if(((!instance.apply_restrictions) || (species_name in instance.species_allowed))) pretty_tail_styles[instance.name] = id // Present choice to user @@ -491,7 +503,7 @@ var/datum/sprite_accessory/wing/current = pref.wing_style_id && GLOB.sprite_accessory_wings[pref.wing_style_id] for(var/id in GLOB.sprite_accessory_wings) var/datum/sprite_accessory/wing/instance = GLOB.sprite_accessory_wings[id] - if(((!instance.ckeys_allowed) || (usr.ckey in instance.ckeys_allowed)) && ((!instance.apply_restrictions) || (species_name in instance.species_allowed))) + if(((!instance.apply_restrictions) || (species_name in instance.species_allowed))) pretty_wing_styles[instance.name] = id // Present choice to user diff --git a/code/modules/preferences/preferences_setup.dm b/code/modules/preferences/preferences_setup.dm index ef1f401dcd1b..f95ba36cb852 100644 --- a/code/modules/preferences/preferences_setup.dm +++ b/code/modules/preferences/preferences_setup.dm @@ -212,9 +212,7 @@ var/datum/species/RS = real_species_datum() for(var/facialhairstyle in GLOB.legacy_facial_hair_lookup) var/datum/sprite_accessory/S = GLOB.legacy_facial_hair_lookup[facialhairstyle] - if(biological_gender == MALE && S.gender == FEMALE) - continue - if(biological_gender == FEMALE && S.gender == MALE) + if(!isnull(S.random_generation_gender) && biological_gender != S.random_generation_gender) continue if(S.apply_restrictions && !(RS.name in S.species_allowed) && (!custom_base || !(custom_base in S.species_allowed))) //Custom species base species allowance continue diff --git a/code/modules/projectiles/ammunition/rounds.dm b/code/modules/projectiles/ammunition/rounds.dm index 64df58b42bce..6085d7794348 100644 --- a/code/modules/projectiles/ammunition/rounds.dm +++ b/code/modules/projectiles/ammunition/rounds.dm @@ -503,7 +503,7 @@ /obj/item/ammo_casing/a5mmcaseless desc = "A 5mm solid phoron caseless round." caliber = "5mm caseless" - icon_state = "casing" // Placeholder. Should probably be purple. + icon_state = "p-casing" projectile_type = /obj/projectile/bullet/pistol // Close enough to be comparable. materials_base = list(MAT_STEEL = 180) casing_flags = CASING_DELETE @@ -512,10 +512,27 @@ desc = "A 5mm solid phoron caseless stun round." projectile_type = /obj/projectile/energy/electrode // Maybe nerf this considering there's 30 rounds in a mag. + /* * Misc */ +/obj/item/ammo_casing/fiftycalcaseless + name = "caseless phoron round" + desc = "A 12.7mm caseless round." + caliber = "12.7mm caseless" + icon_state = "p-casing" + projectile_type = /obj/projectile/bullet/incendiary/caseless + casing_flags = CASING_DELETE + +/obj/item/ammo_casing/phoron_shrap + name = "phoron shrapnel" + desc = "Should you really be holding this?" + caliber = "phoron shrapnel" + icon_state = "phoronshrap" + projectile_type = /obj/projectile/bullet/incendiary/caseless + casing_flags = CASING_DELETE + /obj/item/ammo_casing/rocket name = "rocket shell" desc = "A high explosive designed to be fired from a launcher." diff --git a/code/modules/projectiles/guns/projectile/caseless.dm b/code/modules/projectiles/guns/projectile/caseless.dm index 6332892d9a7f..752b1ec0defb 100644 --- a/code/modules/projectiles/guns/projectile/caseless.dm +++ b/code/modules/projectiles/guns/projectile/caseless.dm @@ -24,7 +24,7 @@ /obj/item/gun/ballistic/caseless/usmc name = "M41A Pulse Rifle" - desc = "A relic dating back to the Xenomorph Wars and the former primary battle rifle of the United Solar Marine Corps. Loads using 10x24mm caseless Magazines" + desc = "A relic of the Phoron Wars and a more violent age. The former primary battle rifle of the United Terran Marine Corps. It's now discontinued, like most caseless designs, due to cost and lack of need. Still preferred by many. Loads using 10x24mm caseless Magazines." icon_state = "usmc" item_state = "usmc" w_class = WEIGHT_CLASS_BULKY @@ -35,7 +35,72 @@ magazine_type = /obj/item/ammo_magazine/m10x24mm/small allowed_magazines = list(/obj/item/ammo_magazine/m10x24mm/small, /obj/item/ammo_magazine/m10x24mm/med, /obj/item/ammo_magazine/m10x24mm/large) recoil = 0 + auto_eject = 1 + auto_eject_sound = 'sound/weapons/smg_empty_alarm.ogg' firemodes = list( list(mode_name="semiauto", burst=1, fire_delay=0, move_delay=null, burst_accuracy=null, dispersion=null), list(mode_name="4-round bursts", burst=4, fire_delay=null, move_delay=6, burst_accuracy=list(0,-5,-10,-15), dispersion=list(0.0, 0.2, 0.4, 0.6)),//Small damage countered by tight spread. ) + +/obj/item/gun/ballistic/caseless/wild_hunt //extremely powerful and rare rifle - meant to spawn with maybe 2 mags extra, or be for asset protection/ert/solo antags/etc + name = "Gorlex WILD-HUNT 12.7mm Caseless Rifle" + desc = "An ancient rifle of the Phoron Wars. For when you want to kill something with no negotiation. The Wild Hunt is a beast that kicks like a mule and fires experimental caseless phoron rounds. It has, obviously, horrific results, setting targets on fire after giving them a golf-ball sized hole. Now generally disused due to the extreme maintenance cost and impracticality. Nobody makes these, anymore." + icon_state = "wild-hunt" + item_state = "wild-hunt" + caliber = "12.7mm caseless" + w_class = WEIGHT_CLASS_BULKY + slot_flags = SLOT_BACK + load_method = MAGAZINE + magazine_type = /obj/item/ammo_magazine/mfiftycalcaseless + recoil = 1 + accuracy = -10 + allowed_magazines = list(/obj/item/ammo_magazine/mfiftycalcaseless) + one_handed_penalty = 100 //you simply do not + auto_eject = 1 + auto_eject_sound = 'sound/weapons/smg_empty_alarm.ogg' + fire_sound = 'sound/weapons/gunshot/sniper.ogg' + + firemodes = list( + list(mode_name="semiauto", burst=1, fire_delay=0, move_delay=null, burst_accuracy=null, dispersion=null), + list(mode_name="automatic", burst=1, fire_delay=-1, move_delay=null, burst_accuracy=null, dispersion=null, automatic = 1) + ) + +/obj/item/gun/ballistic/caseless/wild_hunt/update_icon_state() + . = ..() + if(ammo_magazine) + icon_state = initial(icon_state) + else + icon_state = "[initial(icon_state)]-empty" + +/obj/item/gun/ballistic/caseless/wild_hunt/Initialize(mapload) + . = ..() + var/fluff_date = rand(2501,2543) + desc += "\n You see a stamp on the side: GORLEX MARAUDERS, MANUFACTURED IN [fluff_date]." + + +/obj/item/gun/ballistic/caseless/phoron_spitter // phoron war SMG that fires phoron shards. + name = "Gorlex 'SHRAPNEL-SPITTER' Phoron SMG" + desc = "A short-barrel SMG from the Phoron Wars that lacks conventional ammo, instead using compressed matter cartridges. Coils accelerate a ferromagnetic, self-oxidizing cloud of alloy. Lack of traditional cycling means it can fire blindingly fast. Like all caseless weapons, it's fallen by the wayside, and is no longer produced." + caliber = "phoron shrapnel" + w_class = WEIGHT_CLASS_BULKY + slot_flags = SLOT_BACK + load_method = MAGAZINE + magazine_type = /obj/item/ammo_magazine/mphoronshot + allowed_magazines = list(/obj/item/ammo_magazine/mphoronshot) + icon_state = "phoron_shredder" + item_state = "ashot" //close enough + recoil = 1.5 + accuracy = -30 + one_handed_penalty = 50 + auto_eject = 1 + auto_eject_sound = 'sound/weapons/smg_empty_alarm.ogg' + + firemodes = list( + list(mode_name="full auto", burst=1, fire_delay=-1, move_delay=null, burst_accuracy=null, dispersion=null, automatic = 1), + list(mode_name="fuller auto", burst=2, fire_delay=-1, move_delay=null, burst_accuracy=null, dispersion=null, automatic = 1) + ) + +/obj/item/gun/ballistic/caseless/phoron_spitter/Initialize(mapload) + . = ..() + var/fluff_date = rand(2501,2543) + desc += "\nYou see a stamp on the side: GORLEX MARAUDERS, MANUFACTURED IN [fluff_date]." diff --git a/code/modules/projectiles/magazines/unsorted.dm b/code/modules/projectiles/magazines/unsorted.dm index 783a94ddcb0d..6f6f3ebe5a0d 100644 --- a/code/modules/projectiles/magazines/unsorted.dm +++ b/code/modules/projectiles/magazines/unsorted.dm @@ -317,6 +317,29 @@ icon_state = "caseless-mag-alt" ammo_type = /obj/item/ammo_casing/a5mmcaseless/stun +/////// 12.7mm / 50 caliber caseless ///////// + +/obj/item/ammo_magazine/mfiftycalcaseless + name = "Wild Hunt magazine (12.7mm caseless)" + ammo_type = /obj/item/ammo_casing/fiftycalcaseless + icon_state = "caseless-127" + caliber = "12.7mm caseless" + mag_type = MAGAZINE + max_ammo = 20 + multiple_sprites = 1 + +/////// phoron shrapnel smg ////// + +/obj/item/ammo_magazine/mphoronshot + name = "compressed phoron matter container" + desc = "A compressed matter container meant for the Gorlex SHRAPNEL-SPITTER SMG. Contains a phoron alloy that self-oxidzes and ignites on contact with air. \n \nThey're in good shape for the shape they're in, \nbut God, I wonder how they think they can win, \nwith phoron rolling down their skin." + max_ammo = 40 + caliber = "phoron shrapnel" + mag_type = MAGAZINE + ammo_type = /obj/item/ammo_casing/phoron_shrap + icon_state = "spitterammo" + multiple_sprites = 1 + ///////// 9mm ///////// /obj/item/ammo_magazine/m9mm diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index e72fec88cb49..b45355d7a2ac 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -496,6 +496,17 @@ damage = 15 range = 6 +/obj/projectile/bullet/incendiary/caseless + name = "caseless phoron slug" + icon_state = "bullet_alt" + damage = 50 + damage_type = BRUTE + incendiary = 1 + flammability = 4 + armor_penetration = 35 + + + /* Practice rounds and blanks */ /obj/projectile/bullet/practice diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm index 961a9031f42c..918337188c10 100644 --- a/code/modules/projectiles/projectile/special.dm +++ b/code/modules/projectiles/projectile/special.dm @@ -18,8 +18,8 @@ var/sev4_range = 1 /obj/projectile/ion/on_hit(var/atom/target, var/blocked = 0) - empulse(target, sev1_range, sev2_range, sev3_range, sev4_range) - return 1 + empulse(target, sev1_range, sev2_range, sev3_range, sev4_range) + return 1 /obj/projectile/ion/small sev1_range = -1 diff --git a/code/modules/reagents/Drink-Recipes.dm b/code/modules/reagents/Drink-Recipes.dm index 26e25d2d813b..f69b422f1d8e 100644 --- a/code/modules/reagents/Drink-Recipes.dm +++ b/code/modules/reagents/Drink-Recipes.dm @@ -1336,7 +1336,7 @@ name = "Gimlet" id = "gimlet" result = "gimlet" - required_reagents = list("gin" = 1, "limejuice" = 1, "sodawater" = 1) + required_reagents = list("gin" = 1, "limejuice" = 1, "sugar" = 1) result_amount = 3 /datum/chemical_reaction/drinks/newsheriff @@ -1452,6 +1452,13 @@ required_reagents = list("whiskey" = 1, "protein" = 1) result_amount = 2 +/datum/chemical_reaction/drinks/drymonstertamer + name = "Dry Monster Tamer" + id = "drymonstertamer" + result = "drymonstertamer" + required_reagents = list("sassafras" = 1, "protein" = 1) + result_amount = 2 + /datum/chemical_reaction/drinks/phobos name = "Phobos" id = "phobos" diff --git a/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Dispenser.dm b/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Dispenser.dm index 563bdd79bfe1..cab571b25cf7 100644 --- a/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Dispenser.dm +++ b/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Dispenser.dm @@ -1,4 +1,4 @@ - +#define ETHANOL_MET_DIVISOR 20 /datum/reagent/ethanol name = "Ethanol" //Parent class for all alcoholic reagents. @@ -8,12 +8,13 @@ reagent_state = REAGENT_LIQUID color = "#404030" - ingest_met = REM * 2 + metabolism = REM/ETHANOL_MET_DIVISOR + + ingest_met = REM * 5 var/nutriment_factor = 0 var/hydration_factor = 0 - // todo: this is awful why is strength lower when higher? - var/strength = 10 // This is, essentially, units between stages - the lower, the stronger. Less fine tuning, more clarity. + var/proof = 200 var/toxicity = 1 var/druggy = 0 @@ -21,6 +22,8 @@ var/targ_temp = 310 var/halluci = 0 + data=0 + glass_name = "ethanol" glass_desc = "A well-known alcohol with a variety of applications." @@ -28,9 +31,10 @@ if(istype(L)) L.adjust_fire_stacks(amount / 15) +#define ABV (proof/200) + /datum/reagent/ethanol/affect_blood(mob/living/carbon/M, alien, removed) //This used to do just toxin. That's boring. Let's make this FUN. - if(issmall(M)) removed *= 2 - var/strength_mod = 3 //Alcohol is 3x stronger when injected into the veins. + var/strength_mod = 1 //Alcohol is 3x stronger when injected into the veins. if(alien == IS_SKRELL) strength_mod *= 5 if(alien == IS_TAJARA) @@ -46,85 +50,83 @@ to_chat(M, "You feel your leaves start to wilt.") strength_mod *=5 //cit change - alcohol ain't good for plants - var/effective_dose = dose * strength_mod * (1 + volume/60) //drinking a LOT will make you go down faster + var/effective_dose = volume * strength_mod * ABV * min(1,dose*(ETHANOL_MET_DIVISOR/10)) // give it 50 ticks to ramp up M.add_chemical_effect(CE_ALCOHOL, 1) if(HAS_TRAIT(M, TRAIT_ALCOHOL_INTOLERANT)) - var/intolerant_dose = 100*strength_mod*removed/strength - if(prob((intolerant_dose))) - M.add_chemical_effect(CE_ALCOHOL_TOXIC, 1) - M.adjustToxLoss(intolerant_dose) // 10 strength = 10 tox per u, so 10u deathbell = 100, 10u vodka = 6.6666..., 10u beer = 20 + if(proof > 0) + var/intolerant_dose = strength_mod*removed*ABV*10 + if(prob((intolerant_dose))) + M.add_chemical_effect(CE_ALCOHOL_TOXIC, 1) + M.adjustToxLoss(intolerant_dose) return 0 - if(effective_dose >= strength) // Early warning - M.make_dizzy(18) // It is decreased at the speed of 3 per tick - if(effective_dose >= strength * 2) // Slurring - M.slurring = max(M.slurring, 90) - if(effective_dose >= strength * 3) // Confusion - walking in random directions + #define DOSE_LEVEL 6 + var/effect_level=round(effective_dose/DOSE_LEVEL) + if(effect_level != data) + var/lowering=(data>effect_level) + data=effect_level + if(lowering) + switch(effect_level) + if(0) + to_chat(M,SPAN_NOTICE("You no longer feel under the influence.")) + if(1) + to_chat(M,SPAN_DANGER("You are no longer slurring your words as much.")) + if(2) + to_chat(M,SPAN_DANGER("You can walk straight again.")) + if(3) + to_chat(M,SPAN_DANGER("You're not seeing double anymore.")) + if(4) + to_chat(M,SPAN_DANGER("You no longer feel like you're going to puke.")) + if(5) + to_chat(M,SPAN_DANGER("You don't feel like you're going to pass out anymore.")) + if(6) + to_chat(M,SPAN_DANGER("You feel like you're out of the danger zone.")) + else + var/hydration_str="" + if(M.hydration<250) + hydration_str=" You're feeling a little dehydrated, too." + switch(effect_level) + if(1) + to_chat(M,SPAN_DANGER("You're starting to feel a little tipsy.[hydration_str]")) + M.dizziness=max(M.dizziness,150) + if(2) + to_chat(M,SPAN_DANGER("You're starting to slur your words.[hydration_str]")) + if(3) + to_chat(M,SPAN_DANGER("You can barely walk straight![hydration_str]")) + if(4) + to_chat(M,SPAN_DANGER("You're seeing double!.[hydration_str]")) + M.eye_blurry=max(M.eye_blurry,30) + if(5) + to_chat(M,SPAN_USERDANGER("You feel like you might puke...[hydration_str]")) + if(6) + to_chat(M,SPAN_USERDANGER("Your eyelids feel heavy![hydration_str]")) + if(7) + to_chat(M,SPAN_USERDANGER("You are getting dangerously drunk![hydration_str]")) + var/hydration_removal=(clamp((M.hydration-150)/300,0,1)*effect_level) + max(0,(M.hydration-450)/300) + if(hydration_removal>0) + M.adjust_hydration(-hydration_removal) + volume-=removed*hydration_removal*3 + if(effect_level>=2) + M.slurring=max(M.slurring,10) + if(effect_level>=3 && prob(effect_level-2)) M.Confuse(60) - if(effective_dose >= strength * 4) // Blurry vision - M.eye_blurry = max(M.eye_blurry, 30) - if(effective_dose >= strength * 5) // Drowsyness - periodically falling asleep - M.drowsyness = max(M.drowsyness, 60) - if(effective_dose >= strength * 6) // Toxic dose - M.add_chemical_effect(CE_ALCOHOL_TOXIC, toxicity*3) - if(effective_dose >= strength * 7) // Pass out - M.afflict_unconscious(20 * 60) - M.afflict_sleeping(20 * 90) - - if(druggy != 0) - M.druggy = max(M.druggy, druggy*3) - - if(adj_temp > 0 && M.bodytemperature < targ_temp) // 310 is the normal bodytemp. 310.055 - M.bodytemperature = min(targ_temp, M.bodytemperature + (adj_temp * TEMPERATURE_DAMAGE_COEFFICIENT)) - if(adj_temp < 0 && M.bodytemperature > targ_temp) - M.bodytemperature = min(targ_temp, M.bodytemperature - (adj_temp * TEMPERATURE_DAMAGE_COEFFICIENT)) - - if(halluci) - M.hallucination = max(M.hallucination, halluci*3) - return effective_dose + if(effect_level>=5 && prob(effect_level-4) && !M.lastpuke) + M.vomit(1,0) + if(M.nutrition>=100) + volume-=DOSE_LEVEL/4 + if(effect_level>=6 && prob(effect_level-5)) + M.drowsyness=max(M.drowsyness,60) + if(effect_level>=7) + M.add_chemical_effect(CE_ALCOHOL_TOXIC, toxicity*strength_mod) + if(volume>DOSE_LEVEL*7) + volume-=REM // liver working overtime, or whatever (mostly to prevent people from always just dying from this) + #undef DOSE_LEVEL + return /datum/reagent/ethanol/affect_ingest(mob/living/carbon/M, alien, removed) if(issmall(M)) removed *= 2 M.adjust_nutrition(nutriment_factor * removed) M.adjust_hydration(hydration_factor * removed) - var/strength_mod = 1 - if(alien == IS_SKRELL) - strength_mod *= 5 - if(alien == IS_TAJARA) - strength_mod *= 1.25 - if(alien == IS_UNATHI) - strength_mod *= 0.75 - if(alien == IS_DIONA) - strength_mod = 0 - if(alien == IS_SLIME) - strength_mod *= 2 - var/is_vampire = M.species.is_vampire - if(is_vampire) - handle_vampire(M, alien, removed, is_vampire) - - if(HAS_TRAIT(M, TRAIT_ALCOHOL_INTOLERANT)) - var/intolerant_dose = 50*strength_mod*removed/strength - if(prob((intolerant_dose))) - M.add_chemical_effect(CE_ALCOHOL_TOXIC, 1) - M.adjustToxLoss(intolerant_dose) // 10 strength = 5 tox per u, so 10u deathbell = 50, 10u vodka = 3.3333..., 10u beer = 10 - return 0 - var/effective_dose = strength_mod * dose // this was being recalculated a bunch before--why? - M.add_chemical_effect(CE_ALCOHOL, 1) - if(effective_dose >= strength) // Early warning - M.make_dizzy(6) // It is decreased at the speed of 3 per tick - if(effective_dose >= strength * 2) // Slurring - M.slurring = max(M.slurring, 30) - if(effective_dose >= strength * 3) // Confusion - walking in random directions - M.Confuse(20) - if(effective_dose >= strength * 4) // Blurry vision - M.eye_blurry = max(M.eye_blurry, 10) - if(effective_dose >= strength * 5) // Drowsyness - periodically falling asleep - M.drowsyness = max(M.drowsyness, 20) - if(effective_dose >= strength * 6) // Toxic dose - M.add_chemical_effect(CE_ALCOHOL_TOXIC, toxicity) - if(effective_dose >= strength * 7) // Pass out - M.afflict_unconscious(20 * 20) - M.afflict_sleeping(20 * 30) - + M.bloodstr.add_reagent("ethanol", removed * ABV) if(druggy != 0) M.druggy = max(M.druggy, druggy) @@ -135,7 +137,7 @@ if(halluci) M.hallucination = max(M.hallucination, halluci) - return effective_dose + return /datum/reagent/ethanol/touch_obj(obj/O) if(istype(O, /obj/item/paper)) @@ -154,6 +156,7 @@ to_chat(usr, "The solution dissolves the ink on the book.") return +#undef ABV /datum/reagent/acid name = "Sulphuric acid" diff --git a/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Food-Drinks.dm index 2a855375787d..6dd52a4462f1 100644 --- a/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Food-Drinks.dm @@ -1998,6 +1998,7 @@ reagent_state = REAGENT_SOLID color = "#619494" adj_temp = -5 + hydration = 9 glass_name = "Ice" glass_desc = "Generally, you're supposed to put something else in there too..." @@ -2333,6 +2334,8 @@ // Basic +#define ABSINTHE 130 + /datum/reagent/ethanol/absinthe name = "Absinthe" id = "absinthe" @@ -2340,18 +2343,21 @@ taste_description = "licorice" taste_mult = 1.5 color = "#33EE00" - strength = 12 + proof = ABSINTHE glass_name = "Absinthe" glass_desc = "Wormwood, anise, oh my." +#define BEER 10 + /datum/reagent/ethanol/ale name = "Ale" id = "ale" description = "A dark alchoholic beverage made by malted barley and yeast." taste_description = "hearty barley ale" color = "#4C3100" - strength = 50 + proof = BEER + nutriment_factor=5 glass_name = "Ale" glass_desc = "A freezing pint of delicious ale." @@ -2362,8 +2368,8 @@ description = "An alcoholic beverage made from malted grains, hops, yeast, and water." taste_description = "beer" color = "#FFD300" - strength = 50 - nutriment_factor = 1 + proof = BEER + nutriment_factor = 5 glass_name = "Beer" glass_desc = "A freezing pint of beer" @@ -2373,6 +2379,8 @@ if(.) M.jitteriness = max(M.jitteriness - 3, 0) +#define CURACAO 60 + /datum/reagent/ethanol/bluecuracao name = "Blue Curacao" id = "bluecuracao" @@ -2380,11 +2388,13 @@ taste_description = "oranges" taste_mult = 1.1 color = "#0000CD" - strength = 15 + proof = CURACAO glass_name = "Blue Curacao" glass_desc = "Exotically blue, fruity drink, distilled from oranges." +#define COGNAC 80 + /datum/reagent/ethanol/cognac name = "Cognac" id = "cognac" @@ -2392,7 +2402,7 @@ taste_description = "rich and smooth alcohol" taste_mult = 1.1 color = "#AB3C05" - strength = 15 + proof = 80 glass_name = "Cognac" glass_desc = "Damn, you feel like some kind of French aristocrat just by holding this." @@ -2404,7 +2414,7 @@ taste_description = "butterscotch and salt" taste_mult = 1.1 color = "#ECB633" - strength = 50 + proof = 10 glass_name = "Rum" glass_desc = "Now you want to Pray for a pirate suit, don't you?" @@ -2414,24 +2424,28 @@ if(.) M.dizziness += 5 +#define GIN 100 + /datum/reagent/ethanol/gin name = "Gin" id = "gin" description = "It's gin. In space. I say, good sir." taste_description = "an alcoholic christmas tree" color = "#0064C6" - strength = 15 + proof = GIN glass_name = "Gin" glass_desc = "A crystal clear glass of Griffeater gin." +#define VICTORY_GIN 70 + /datum/reagent/ethanol/victory_gin name = "Victory Gin" id = "victory_gin" description = "An oily grain alcohol brewed on Adhomai. Notably weaker than regular gin." taste_description = "oily gin" color = "#0064C6" - strength = 20 + proof = VICTORY_GIN glass_name = "Victory Gin" glass_desc = "An oily grain alcohol brewed on Adhomai. Notably weaker than regular gin." @@ -2457,6 +2471,8 @@ return M.make_jittery(5) +#define KAHLUA 40 + /datum/reagent/ethanol/coffee/kahlua name = "Kahlua" id = "kahlua" @@ -2464,34 +2480,26 @@ taste_description = "spiked latte" taste_mult = 1.1 color = "#4C3100" - strength = 15 + proof = KAHLUA glass_name = "RR Coffee Liquor" glass_desc = "A widely known, Mexican coffee-flavored liqueur. In production since 1936!" // glass_desc = "DAMN, THIS THING LOOKS ROBUST" //If this isn't what our players should talk like, it isn't what our game should say to them. +#define MELON_LIQUOR 46 + /datum/reagent/ethanol/melonliquor name = "Melon Liquor" id = "melonliquor" description = "A relatively sweet and fruity 46 proof liquor." taste_description = "fruity alcohol" color = "#138808" // rgb: 19, 136, 8 - strength = 50 + proof = MELON_LIQUOR glass_name = "Melon Liquor" glass_desc = "A relatively sweet and fruity 46 proof liquor." -/datum/reagent/ethanol/melonspritzer - name = "Melon Spritzer" - id = "melonspritzer" - description = "Melons: Citrus style." - taste_description = "sour melon" - color = "#934D5D" - strength = 10 - - glass_name = "Melon Spritzer" - glass_desc = "Melons: Citrus style." - glass_special = list(DRINK_FIZZ) +#define RUM 120 /datum/reagent/ethanol/rum name = "Rum" @@ -2500,7 +2508,7 @@ taste_description = "spiked butterscotch" taste_mult = 1.1 color = "#ECB633" - strength = 15 + proof = RUM glass_name = "Rum" glass_desc = "Makes you want to buy a ship and just go pillaging." @@ -2512,40 +2520,31 @@ taste_description = "milky coconut" taste_mult = 1.1 color = "#e0e0e0" - strength = 20 + proof = 90 glass_name = "White Rum" glass_desc = "Makes you want to buy a ship and just go pillaging." +#define SAKE 40 + /datum/reagent/ethanol/sake name = "Sake" id = "sake" description = "Anime's favorite drink." taste_description = "dry alcohol" color = "#DDDDDD" - strength = 25 + proof = SAKE glass_name = "Sake" glass_desc = "A glass of sake." -/datum/reagent/ethanol/sexonthebeach - name = "Sex On The Beach" - id = "sexonthebeach" - description = "A concoction of vodka and a secret combination of orange juice and pomegranate." - taste_description = "sand, you don't like sand, it's coarse and rough and irritating and it gets everywhere" - color = "#FF0033" - strength = 90 // it is one SIXTH vodka - - glass_name = "Sex on the Beach" - glass_desc = "A concoction of vodka and a secret combination of orange juice and pomegranate." - /datum/reagent/ethanol/thirteenloko name = "Thirteen Loko" id = "thirteenloko" description = "A potent mixture of caffeine and alcohol." taste_description = "battery acid" color = "#102000" - strength = 25 + proof = 40 nutriment_factor = 1 glass_name = "Thirteen Loko" @@ -2560,6 +2559,8 @@ M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) M.make_jittery(5) +#define VERMOUTH 35 + /datum/reagent/ethanol/vermouth name = "Vermouth" id = "vermouth" @@ -2567,18 +2568,20 @@ taste_description = "dry alcohol" taste_mult = 1.3 color = "#91FF91" // rgb: 145, 255, 145 - strength = 15 + proof = VERMOUTH glass_name = "Vermouth" glass_desc = "You wonder why you're even drinking this straight." +#define VODKA 80 + /datum/reagent/ethanol/vodka name = "Vodka" id = "vodka" description = "Number one drink AND fueling choice for Russians worldwide." taste_description = "potato alcohol" color = "#0064C8" // rgb: 0, 100, 200 - strength = 15 + proof = VODKA glass_name = "Vodka" glass_desc = "The glass contain wodka. Xynta." @@ -2587,24 +2590,28 @@ . = ..() M.cure_radiation(RAD_MOB_CURE_STRENGTH_VODKA(removed)) +#define WHISKEY 80 + /datum/reagent/ethanol/whiskey name = "Whiskey" id = "whiskey" description = "A superb and well-aged single-malt whiskey. Damn." taste_description = "molasses" color = "#4C3100" - strength = 15 + proof = WHISKEY glass_name = "Whiskey" glass_desc = "The silky, smokey whiskey goodness inside the glass makes the drink look very classy." +#define WINE 20 + /datum/reagent/ethanol/wine name = "Red Wine" id = "wine" description = "A premium alchoholic beverage made from distilled grape juice. This one's red!" taste_description = "bitter sweetness" color = "#7E4043" // rgb: 126, 64, 67 - strength = 30 + proof = WINE glass_name = "Wine" glass_desc = "A very classy looking drink." @@ -2615,17 +2622,19 @@ description = "A premium alchoholic beverage made from distilled grape juice. This one's white!" taste_description = "bitter sweetness" color = "#FCF1D2" - strength = 30 + proof = WINE glass_name = "White Wine" glass_desc = "A very classy looking drink. Now in white!" +#define SCHNAPPS 60 + /datum/reagent/ethanol/peppermintschnapps name = "Peppermint Schnapps" id = "schnapps_pep" description = "A flavoured grain liqueur with a fresh, minty taste." taste_description = "minty" - strength = 90 + proof = SCHNAPPS glass_name = "Peppermint Schnapps" glass_desc = "A flavoured grain liqueur with a fresh, minty taste." @@ -2635,7 +2644,7 @@ id = "schnapps_pea" description = "A flavoured grain liqueur with a fresh, peachy taste." taste_description = "peachy" - strength = 90 + proof = SCHNAPPS glass_name = "Peach Schnapps" glass_desc = "A flavoured grain liqueur with a fresh, peachy taste." @@ -2645,7 +2654,7 @@ id = "schnapps_lem" description = "A flavoured grain liqueur with a fresh, lemony taste." taste_description = "lemony" - strength = 90 + proof = SCHNAPPS glass_name = "Lemonade Schnapps" glass_desc = "A flavoured grain liqueur with a fresh, lemony taste." @@ -2660,20 +2669,150 @@ glass_name = "Champagne" glass_desc = "An even classier looking drink." +#define CIDER 10 + /datum/reagent/ethanol/cider name = "Cider" id = "cider" description = "An alcoholic drink made from apple juice. Erratum on earlier recipe books: this is definitely hard." taste_description = "tartness" color = "#CE9C00" // rgb: 206, 156, 0 - strength = 40 + proof = CIDER glass_name = "Cider" glass_desc = "The second most Irish drink." glass_special = list(DRINK_FIZZ) +#define MEAD 10 + +/datum/reagent/ethanol/mead + name = "Mead" + id = "mead" + description = "A Viking's drink, though a cheap one." + taste_description = "sweet yet alcoholic" + reagent_state = REAGENT_LIQUID + color = "#FFBB00" + proof = MEAD + nutriment_factor = 2 + + glass_name = "Mead" + glass_desc = "A Viking's beverage, though a cheap one." + +#define MESSA_MEAD 100 + +/datum/reagent/ethanol/messa_mead + name = "Messa's Mead" + id = "messa_mead" + description = "A sweet tajaran liquor. Produced from the frementation of honey and earthen roots." + taste_description = "chilled honey" + reagent_state = REAGENT_LIQUID + color = "#FFBB00" + proof = MESSA_MEAD + nutriment_factor = 2 + + glass_name = "Messa's Mead" + glass_desc = "A sweet tajaran liquor. Produced from the fermentation of honey and earthen roots native to Adhomai." + +/datum/reagent/ethanol/moonshine + name = "Moonshine" + id = "moonshine" + description = "You've really hit rock bottom now... your liver packed its bags and left last night." + taste_description = "bitterness" + taste_mult = 2.5 + color = "#0064C8" + proof = 150 + + glass_name = "Moonshine" + glass_desc = "You've really hit rock bottom now... your liver packed its bags and left last night." + +#define TEQUILA 80 + +/datum/reagent/ethanol/tequila + name = "Tequila" + id = "tequila" + description = "A drink made for fighting." + taste_description = "paint thinner" + color = "#cccac5" + proof = TEQUILA + + glass_name = "Tequila" + glass_desc = "Is that guy making fun of you? You should show him what's what." + +#define BITTERS 40 + +/datum/reagent/ethanol/bitters + name = "Bitters" + id = "bitters" + description = "A blend of fermented fruits and herbs, commonly used in cocktails." + taste_description = "sharp bitterness" + color = "#9b6241" // rgb(155, 98, 65) + proof = BITTERS + + glass_name = "Bitters" + glass_desc = "A blend of fermented fruits and herbs, commonly used in cocktails." + +#define BRANDY 100 + +/datum/reagent/ethanol/winebrandy + name = "Wine Brandy" + id = "winebrandy" + description = "A premium spirit made from distilled wine." + taste_description = "very sweet dried fruit with many elegant notes" + color = "#4C130B" // rgb(76,19,11) + proof = BRANDY + + glass_name = "Wine Brandy" + glass_desc = "A very classy looking after-dinner drink." + +/datum/reagent/ethanol/alcsassafras + name = "Hard Rootbeer" + id = "alcsassafras" + description = "Doesn't matter if you're drunk when you have a horse to take you home!" + taste_description = "bitter vanilla with a sharp burn" + proof = 50 + + glass_name = "CC's Hard Rootbeer" + glass_desc = "You'd better carry two guns if you're gonna keep drinking these!" + glass_icon = DRINK_ICON_NOISY + glass_special = list(DRINK_FIZZ) + // Cocktails +#define SCREWDRIVERCOCKTAIL (VODKA/3) + +/datum/reagent/ethanol/screwdrivercocktail + name = "Screwdriver" + id = "screwdrivercocktail" + description = "Vodka, mixed with plain ol' orange juice. The result is surprisingly delicious." + taste_description = "oranges" + color = "#A68310" + proof = SCREWDRIVERCOCKTAIL + + glass_name = "Screwdriver" + glass_desc = "A simple, yet superb mixture of Vodka and orange juice. Just the thing for the tired engineer." + +/datum/reagent/ethanol/sexonthebeach + name = "Sex On The Beach" + id = "sexonthebeach" + description = "A concoction of vodka and a secret combination of orange juice and pomegranate." + taste_description = "sand, you don't like sand, it's coarse and rough and irritating and it gets everywhere" + color = "#FF0033" + proof = SCREWDRIVERCOCKTAIL/2 + + glass_name = "Sex on the Beach" + glass_desc = "A concoction of vodka and a secret combination of orange juice and pomegranate." + +/datum/reagent/ethanol/melonspritzer + name = "Melon Spritzer" + id = "melonspritzer" + description = "Melons: Citrus style." + taste_description = "sour melon" + color = "#934D5D" + proof = WINE/3 + + glass_name = "Melon Spritzer" + glass_desc = "Melons: Citrus style." + glass_special = list(DRINK_FIZZ) /datum/reagent/ethanol/acid_spit name = "Acid Spit" @@ -2682,18 +2821,31 @@ taste_description = "bitter tang" reagent_state = REAGENT_LIQUID color = "#365000" - strength = 30 + proof = WINE*5/6 glass_name = "Acid Spit" glass_desc = "A drink from the company archives. Made from live aliens." +#define MARTINI (2*VERMOUTH+GIN)/3 + +/datum/reagent/ethanol/martini + name = "Classic Martini" + id = "martini" + description = "Vermouth with Gin. Not quite how 007 enjoyed it, but still delicious." + taste_description = "dry class" + color = "#0064C8" + proof = MARTINI + + glass_name = "classic martini" + glass_desc = "Damn, the bartender even stirred it, not shook it." + /datum/reagent/ethanol/alliescocktail name = "Allies Cocktail" id = "alliescocktail" description = "A drink made from your allies, not as sweet as when made from your enemies." taste_description = "bitter sweetness" color = "#D8AC45" - strength = 20 // bit of vodka makes it stronger + proof = (MARTINI+VODKA)/2 glass_name = "Allies cocktail" glass_desc = "A drink made from your allies." @@ -2704,7 +2856,7 @@ description = "So very, very, very good." taste_description = "sweet and creamy" color = "#B7EA75" - strength = 45 // it is 1/3 whiskey, come on + proof = WHISKEY/3 glass_name = "Aloe" glass_desc = "Very, very, very good." @@ -2716,7 +2868,7 @@ taste_description = "dark and metallic" reagent_state = REAGENT_LIQUID color = "#FF975D" - strength = 25 + proof = (WINE+VODKA)/2 glass_name = "Amasec" glass_desc = "Always handy before combat!" @@ -2724,39 +2876,41 @@ /datum/reagent/ethanol/andalusia name = "Andalusia" id = "andalusia" - description = "A nice, strangely named drink." + description = "A nice, strangely named drink." // it's the southern tip of spain you cretin taste_description = "lemons" color = "#F4EA4A" - strength = 15 + proof = (RUM+WHISKEY)/3 glass_name = "Andalusia" glass_desc = "A nice, strange named drink." +#define ANTIFREEZE (VODKA/3) + /datum/reagent/ethanol/antifreeze name = "Anti-freeze" id = "antifreeze" description = "Ultimate refreshment." taste_description = "ice cold vodka" color = "#56DEEA" - strength = 45 // i'm sorry, it's 1/3 vodka, it should not be stronger than it somehow + proof = ANTIFREEZE adj_temp = 20 targ_temp = 330 glass_name = "Anti-freeze" glass_desc = "The ultimate refreshment." -/datum/reagent/ethanol/atomicbomb - name = "Atomic Bomb" - id = "atomicbomb" - description = "Nuclear proliferation never tasted so good." - taste_description = "coffee, almonds, and whiskey, with a kick" - reagent_state = REAGENT_LIQUID - color = "#666300" - strength = 10 // it's sweet sciency magic, i'll allow it - druggy = 50 +#define IRISH_CREAM (WHISKEY*2/3) - glass_name = "Atomic Bomb" - glass_desc = "We cannot take legal responsibility for your actions after imbibing." +/datum/reagent/ethanol/irish_cream + name = "Irish Cream" + id = "irishcream" + description = "Whiskey-imbued cream, what else would you expect from the Irish." + taste_description = "creamy alcohol" + color = "#DDD9A3" + proof = IRISH_CREAM + + glass_name = "Irish cream" + glass_desc = "It's cream, mixed with whiskey. What else would you expect from the Irish?" /datum/reagent/ethanol/coffee/b52 name = "B-52" @@ -2765,18 +2919,31 @@ taste_description = "coffee, almonds, and whiskey" taste_mult = 1.3 color = "#997650" - strength = 12 + proof = (IRISH_CREAM+KAHLUA+COGNAC)/3 glass_name = "B-52" glass_desc = "Kahlua, Irish cream, and cognac. You will get bombed." +/datum/reagent/ethanol/atomicbomb + name = "Atomic Bomb" + id = "atomicbomb" + description = "Nuclear proliferation never tasted so good." + taste_description = "coffee, almonds, and whiskey, with a kick" + reagent_state = REAGENT_LIQUID + color = "#666300" + proof = 200 // don't question it + druggy = 50 + + glass_name = "Atomic Bomb" + glass_desc = "We cannot take legal responsibility for your actions after imbibing." + /datum/reagent/ethanol/bahama_mama name = "Bahama mama" id = "bahama_mama" description = "Tropical cocktail." taste_description = "lime and orange" color = "#FF7F3B" - strength = 90 // 1/6th rum + proof = RUM/6 glass_name = "Bahama Mama" glass_desc = "Tropical cocktail." @@ -2798,7 +2965,7 @@ description = "Barefoot and pregnant." taste_description = "creamy berries" color = "#FFCDEA" - strength = 45 // 1/3 vermouth + proof = VERMOUTH/3 glass_name = "Barefoot" glass_desc = "Barefoot and pregnant." @@ -2811,7 +2978,7 @@ taste_mult = 2 reagent_state = REAGENT_LIQUID color = "#404040" - strength = 12 + proof = WHISKEY/2 glass_name = "Beepsky Smash" glass_desc = "Heavy, hot and strong. Just like the Iron fist of the LAW." @@ -2826,19 +2993,21 @@ description = "This appears to be beer mixed with milk. Odd." taste_description = "sour milk" color = "#895C4C" - strength = 100 // 50% beer - nutriment_factor = 2 + proof = BEER/2 + nutriment_factor = 5 glass_name = "Bilk" glass_desc = "A brew of milk and beer. For those alcoholics who fear osteoporosis." +#define BLACK_RUSSIAN ((2*VODKA+KAHLUA)/3) + /datum/reagent/ethanol/black_russian name = "Black Russian" id = "blackrussian" description = "For the lactose-intolerant. Still as classy as a White Russian." taste_description = "coffee" color = "#360000" - strength = 15 + proof = BLACK_RUSSIAN glass_name = "Black Russian" glass_desc = "For the lactose-intolerant. Still as classy as a White Russian." @@ -2849,7 +3018,7 @@ description = "A strange yet pleasurable mixture made of vodka, tomato and lime juice. Or at least you THINK the red stuff is tomato juice." taste_description = "tomatoes with a hint of lime" color = "#B40000" - strength = 90 // 1/6 vodka + proof = VODKA/6 glass_name = "Bloody Mary" glass_desc = "Tomato juice, mixed with Vodka and a lil' bit of lime. Tastes like liquid murder." @@ -2860,7 +3029,7 @@ description = "Ewww..." taste_description = "sweet 'n creamy" color = "#8CFF8C" - strength = 75 // 1/5 rum + proof = RUM/5 glass_name = "Booger" glass_desc = "Ewww..." @@ -2872,7 +3041,7 @@ taste_description = "coffee and paint thinner" taste_mult = 1.1 color = "#4C3100" - strength = 15 + proof = (2*TEQUILA+KAHLUA)/3 glass_name = "Brave Bull" glass_desc = "Tequila and coffee liquor, brought together in a mouthwatering mixture. Drink up." @@ -2883,29 +3052,18 @@ description = "You take a tiny sip and feel a burning sensation..." taste_description = "constantly changing flavors" color = "#2E6671" - strength = 90 // 1/9 vodka (this used to be 10! 10!! why so strong!) + proof = SCREWDRIVERCOCKTAIL/3 glass_name = "Changeling Sting" glass_desc = "A stingy drink." -/datum/reagent/ethanol/martini - name = "Classic Martini" - id = "martini" - description = "Vermouth with Gin. Not quite how 007 enjoyed it, but still delicious." - taste_description = "dry class" - color = "#0064C8" - strength = 25 - - glass_name = "classic martini" - glass_desc = "Damn, the bartender even stirred it, not shook it." - /datum/reagent/ethanol/cuba_libre name = "Cuba Libre" id = "cubalibre" description = "Rum, mixed with cola. Viva la revolucion." taste_description = "cola" color = "#3E1B00" - strength = 30 + proof = RUM/3 glass_name = "Cuba Libre" glass_desc = "A classic mix of rum and cola." @@ -2917,7 +3075,7 @@ taste_description = "a beach" nutriment_factor = 1 color = "#2E6671" - strength = 12 + proof = GIN*1.5 // it's 50% nothing, which strengthens it somehow. go with it glass_name = "Driest Martini" glass_desc = "Only for the experienced. You think you see sand floating in the glass." @@ -2928,7 +3086,7 @@ description = "Refreshingly lemony, deliciously dry." taste_description = "dry, tart lemons" color = "#FFFFAE" - strength = 45 // 1/3 gin + proof = GIN/3 glass_name = "Gin Fizz" glass_desc = "Refreshingly lemony, deliciously dry." @@ -2950,7 +3108,7 @@ taste_description = "a poor excuse for alcohol" reagent_state = REAGENT_LIQUID color = "#FFBB00" - strength = 30 + proof = RUM/2 glass_name = "Grog" @@ -2962,7 +3120,7 @@ description = "The surprise is, it's green!" taste_description = "tartness and bananas" color = "#2E6671" - strength = 50 // should be ~96, but probably not + proof = (2*BEER+WHISKEY)/3 glass_name = "Erika Surprise" glass_desc = "The surprise is, it's green!" @@ -2975,7 +3133,7 @@ taste_mult = 5 reagent_state = REAGENT_LIQUID color = "#7F00FF" - strength = 8 // 10 seems week for the joke + proof = (2*VODKA+GIN+WHISKEY+COGNAC)/3 // stronger than it should be on purpose druggy = 15 glass_name = "Pan-Galactic Gargle Blaster" @@ -2987,7 +3145,7 @@ description = "An all time classic, mild cocktail." taste_description = "mild and tart" color = "#0064C8" - strength = 50 + proof = GIN/3 glass_name = "Gin and Tonic" glass_desc = "A mild but still great cocktail. Drink up, like a true Englishman." @@ -2999,7 +3157,7 @@ taste_description = "burning cinnamon" taste_mult = 1.3 color = "#F4E46D" - strength = 15 + proof = VODKA glass_name = "Goldschlager" glass_desc = "100 proof that teen girls will drink anything with gold in it." @@ -3011,7 +3169,7 @@ taste_description = "giving peace a chance" reagent_state = REAGENT_LIQUID color = "#FF88FF" - strength = 15 + proof = 100 druggy = 50 glass_name = "Hippie's Delight" @@ -3023,7 +3181,7 @@ description = "Either someone's failure at cocktail making or attempt in alchohol production. In any case, do you really want to drink that?" taste_description = "pure alcohol" color = "#4C3100" - strength = 20 + proof = 100 toxicity = 2 glass_name = "Hooch" @@ -3035,7 +3193,7 @@ description = "A beer which is so cold the air around it freezes." taste_description = "refreshingly cold" color = "#FFD300" - strength = 50 + proof = BEER adj_temp = -20 targ_temp = 280 @@ -3049,7 +3207,7 @@ description = "Mmm, tastes like chocolate cake..." taste_description = "delicious anger" color = "#2E6671" - strength = 30 + proof = (BEER+IRISH_CREAM)/2 glass_name = "Irish Car Bomb" glass_desc = "An irish car bomb." @@ -3060,29 +3218,18 @@ description = "Coffee, and alcohol. More fun than a Mimosa to drink in the morning." taste_description = "giving up on the day" color = "#4C3100" - strength = 50 + proof = IRISH_CREAM/2 glass_name = "Irish coffee" glass_desc = "Coffee and alcohol. More fun than a Mimosa to drink in the morning." -/datum/reagent/ethanol/irish_cream - name = "Irish Cream" - id = "irishcream" - description = "Whiskey-imbued cream, what else would you expect from the Irish." - taste_description = "creamy alcohol" - color = "#DDD9A3" - strength = 25 - - glass_name = "Irish cream" - glass_desc = "It's cream, mixed with whiskey. What else would you expect from the Irish?" - /datum/reagent/ethanol/longislandicedtea name = "Long Island Iced Tea" id = "longislandicedtea" description = "The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only." taste_description = "sweet tea, with a kick" color = "#895B1F" - strength = 20 + proof = (VODKA+GIN+TEQUILA+RUM)/4 glass_name = "Long Island iced tea" glass_desc = "The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only." @@ -3093,7 +3240,7 @@ description = "The Detective's undercover drink of choice. He never could stomach gin..." taste_description = "mild dryness" color = "#C13600" - strength = 15 + proof = (2*WHISKEY+VERMOUTH)/3 glass_name = "Manhattan" glass_desc = "The Detective's undercover drink of choice. He never could stomach gin..." @@ -3104,7 +3251,7 @@ description = "A scientist's drink of choice, for pondering ways to blow up the station." taste_description = "death, the destroyer of worlds" color = "#C15D00" - strength = 10 + proof = 200 // don't question it druggy = 30 glass_name = "Manhattan Project" @@ -3116,7 +3263,7 @@ description = "Beer and Ale, brought together in a delicious mix. Intended for true men only." taste_description = "hair on your chest and your chin" color = "#4C3100" - strength = 25 + proof = BEER glass_name = "The Manly Dorf" glass_desc = "A manly concotion made from Ale and Beer. Intended for true men only." @@ -3127,49 +3274,11 @@ description = "On the rocks with salt on the rim. Arriba~!" taste_description = "dry and salty" color = "#8CFF8C" - strength = 15 + proof = TEQUILA/3 glass_name = "Margarita" glass_desc = "On the rocks with salt on the rim. Arriba~!" -/datum/reagent/ethanol/mead - name = "Mead" - id = "mead" - description = "A Viking's drink, though a cheap one." - taste_description = "sweet yet alcoholic" - reagent_state = REAGENT_LIQUID - color = "#FFBB00" - strength = 50 - nutriment_factor = 1 - - glass_name = "Mead" - glass_desc = "A Viking's beverage, though a cheap one." - -/datum/reagent/ethanol/messa_mead - name = "Messa's Mead" - id = "messa_mead" - description = "A sweet tajaran liquor. Produced from the frementation of honey and earthen roots." - taste_description = "chilled honey" - reagent_state = REAGENT_LIQUID - color = "#FFBB00" - strength = 30 - nutriment_factor = 1 - - glass_name = "Messa's Mead" - glass_desc = "A sweet tajaran liquor. Produced from the fermentation of honey and earthen roots native to Adhomai." - -/datum/reagent/ethanol/moonshine - name = "Moonshine" - id = "moonshine" - description = "You've really hit rock bottom now... your liver packed its bags and left last night." - taste_description = "bitterness" - taste_mult = 2.5 - color = "#0064C8" - strength = 12 - - glass_name = "Moonshine" - glass_desc = "You've really hit rock bottom now... your liver packed its bags and left last night." - /datum/reagent/ethanol/neurotoxin name = "Neurotoxin" id = "neurotoxin" @@ -3177,7 +3286,7 @@ taste_description = "a numbing sensation" reagent_state = REAGENT_LIQUID color = "#2E2E61" - strength = 10 + proof = 200 glass_name = "Neurotoxin" glass_desc = "A drink that is guaranteed to knock you silly." @@ -3194,7 +3303,7 @@ description = "Tequila with silver in it, a favorite of alcoholic women in the club scene." taste_description = "metallic paint thinner" color = "#585840" - strength = 30 + proof = TEQUILA glass_name = "Patron" glass_desc = "Drinking patron in the bar, with all the subpar ladies." @@ -3204,7 +3313,7 @@ id = "pwine" description = "Is this even wine? Toxic! Hallucinogenic! Probably consumed in boatloads by your superiors!" color = "#000000" - strength = 10 + proof = WINE druggy = 50 halluci = 10 @@ -3230,7 +3339,7 @@ description = "The true Viking's drink! Even though it has a strange red color." taste_description = "sweet and salty alcohol" color = "#C73C00" - strength = 50 + proof = MEAD/2 blood_content = 0.5 glass_name = "Red Mead" @@ -3242,24 +3351,13 @@ description = "A spicy Vodka! Might be a bit hot for the little guys!" taste_description = "hot and spice" color = "#FFA371" - strength = 15 + proof = VODKA adj_temp = 50 targ_temp = 360 glass_name = "Sbiten" glass_desc = "A spicy mix of Vodka and Spice. Very hot." -/datum/reagent/ethanol/screwdrivercocktail - name = "Screwdriver" - id = "screwdrivercocktail" - description = "Vodka, mixed with plain ol' orange juice. The result is surprisingly delicious." - taste_description = "oranges" - color = "#A68310" - strength = 45 // 1/3 vodka - - glass_name = "Screwdriver" - glass_desc = "A simple, yet superb mixture of Vodka and orange juice. Just the thing for the tired engineer." - /datum/reagent/drink/silencer name = "Silencer" id = "silencer" @@ -3278,7 +3376,7 @@ description = "A blue-space beverage!" taste_description = "concentrated matter" color = "#2E6671" - strength = 10 + proof = 200 // one of those things you just shouldn't question glass_name = "Singulo" glass_desc = "A blue-space beverage." @@ -3289,7 +3387,7 @@ description = "A cold refreshment" taste_description = "refreshing cold" color = "#FFFFFF" - strength = 100 //50% beer + proof = BEER/2 glass_name = "Snow White" glass_desc = "A cold refreshment." @@ -3300,40 +3398,40 @@ description = "Comprised of: White soda, blue curacao, melon liquor." taste_description = "fruit" color = "#00A86B" - strength = 100 + proof = (MELON_LIQUOR+CURACAO)/3 glass_name = "Sui Dream" glass_desc = "A froofy, fruity, and sweet mixed drink. Understanding the name only brings shame." +/datum/reagent/ethanol/whiskey_cola + name = "Whiskey Cola" + id = "whiskeycola" + description = "Whiskey, mixed with cola. Surprisingly refreshing." + taste_description = "cola with an alcoholic undertone" + color = "#3E1B00" + proof = WHISKEY/3 + + glass_name = "Whiskey Cola" + glass_desc = "An innocent-looking mixture of cola and Whiskey. Delicious." + /datum/reagent/ethanol/syndicatebomb name = "Syndicate Bomb" id = "syndicatebomb" description = "Tastes like terrorism!" - taste_description = "strong alcohol" + taste_description = "terrorism" color = "#2E6671" - strength = 30 + proof = ((WHISKEY/3)+BEER)/2 glass_name = "Syndicate Bomb" glass_desc = "Tastes like terrorism!" -/datum/reagent/ethanol/tequila - name = "Tequila" - id = "tequila" - description = "A drink made for fighting." - taste_description = "paint thinner" - color = "#cccac5" - strength = 25 - - glass_name = "Tequila" - glass_desc = "Is that guy making fun of you? You should show him what's what." - /datum/reagent/ethanol/tequila_sunrise name = "Tequila Sunrise" id = "tequilasunrise" description = "Tequila and orange juice. Much like a Screwdriver, only Mexican~." taste_description = "oranges" color = "#FFE48C" - strength = 25 + proof = TEQUILA/3 glass_name = "Tequila Sunrise" glass_desc = "Oh great, now you feel nostalgic about sunrises back on Earth..." @@ -3344,7 +3442,7 @@ description = "Made for a woman, strong enough for a man." taste_description = "dry" color = "#666340" - strength = 10 + proof = 200 druggy = 50 glass_name = "Three Mile Island iced tea" @@ -3357,7 +3455,7 @@ taste_description = "spicy toxins" reagent_state = REAGENT_LIQUID color = "#7F00FF" - strength = 10 + proof = 200 adj_temp = 15 targ_temp = 330 @@ -3370,7 +3468,7 @@ description = "Vodka with Gin. Not quite how 007 enjoyed it, but still delicious." taste_description = "shaken, not stirred" color = "#0064C8" - strength = 15 + proof = (2*VODKA+VERMOUTH)/3 glass_name = "Vodka Martini" glass_desc ="A bastardization of the classic martini. Still great." @@ -3382,7 +3480,7 @@ description = "For when a gin and tonic isn't russian enough." taste_description = "tart bitterness" color = "#0064C8" // rgb: 0, 100, 200 - strength = 30 + proof = VODKA/3 glass_name = "Vodka and Tonic" glass_desc = "For when a gin and tonic isn't Russian enough." @@ -3394,42 +3492,32 @@ description = "That's just, like, your opinion, man..." taste_description = "coffee icecream" color = "#A68340" - strength = 20 + proof = BLACK_RUSSIAN*2/3 glass_name = "White Russian" glass_desc = "A very nice looking drink. But that's just, like, your opinion, man." -/datum/reagent/ethanol/whiskey_cola - name = "Whiskey Cola" - id = "whiskeycola" - description = "Whiskey, mixed with cola. Surprisingly refreshing." - taste_description = "cola with an alcoholic undertone" - color = "#3E1B00" - strength = 45 - - glass_name = "Whiskey Cola" - glass_desc = "An innocent-looking mixture of cola and Whiskey. Delicious." - - /datum/reagent/ethanol/whiskeysoda name = "Whiskey Soda" id = "whiskeysoda" description = "Ultimate refreshment." taste_description = "carbonated whiskey" color = "#EAB300" - strength = 45 + proof = WHISKEY/3 glass_name = "Whiskey Soda" glass_desc = "Ultimate refreshment." +#define WHISKEY_SPECIAL_BLEND 160 + /datum/reagent/ethanol/specialwhiskey // I have no idea what this is and where it comes from name = "Special Blend Whiskey" id = "specialwhiskey" description = "Just when you thought regular station whiskey was good... This silky, amber goodness has to come along and ruin everything. The smell of it singes your nostrils." taste_description = "unspeakable whiskey bliss" color = "#523600" - strength = 10 + proof = WHISKEY_SPECIAL_BLEND glass_name = "special blend whiskey" glass_desc = "Just when you thought regular station whiskey was good... This silky, amber goodness has to come along and ruin everything." @@ -3440,7 +3528,7 @@ description = "This barely qualifies as a drink, and could give jet fuel a run for its money. Also known to cause feelings of euphoria and numbness." taste_description = "spiced numbness" color = "#242424" - strength = 5 + proof = 300 // unathi have unlocked secrets unknown to others glass_name = "Redeemer's Brew" glass_desc = "This barely qualifies as a drink, and may cause euphoria and numbness. Imbiber beware!" @@ -3479,7 +3567,7 @@ description = "Alcohol in more alcohol." taste_description = "thick, dry alcohol" color = "#FFFF7F" - strength = 12 + proof = (2*BEER+SAKE)/3 nutriment_factor = 1 glass_name = "Sake Bomb" @@ -3491,7 +3579,7 @@ description = "Sake, egg, and sugar. A disgusting folk cure." taste_description = "eggy booze" color = "#E8C477" - strength = 30 + proof = SAKE*10/5 nutriment_factor = 3 glass_name = "Tamagozake" @@ -3503,7 +3591,7 @@ description = "An alcoholic drink made with vodka, sake, and juices." taste_description = "spicy tomato sake" color = "#FF3232" - strength = 25 + proof = (SAKE+VODKA)/3 glass_name = "Ginza Mary" glass_desc = "Tomato juice, vodka, and sake make something not quite completely unlike a Bloody Mary." @@ -3514,7 +3602,7 @@ description = "A pale pink cocktail made with sake and berry juice." taste_description = "fruity booze" color = "#FA8072" - strength = 35 + proof = SAKE/2 glass_name = "Tokyo Rose" glass_desc = "It's kinda pretty!" @@ -3525,7 +3613,7 @@ description = "For when you're too weeb for a real martini." taste_description = "dry alcohol" color = "#0064C8" - strength = 30 + proof = (SAKE+GIN)/2 glass_name = "Saketini" glass_desc = "What are you doing drinking this outside of New Kyoto?" @@ -3536,7 +3624,7 @@ description = "A loathsome cocktail favored by Heaven's skeleton shift workers." taste_description = "sour coffee" color = "#8f7729" - strength = 20 + proof = KAHLUA/2 glass_name = "Elysium Facepunch" glass_desc = "A loathsome cocktail favored by Heaven's skeleton shift workers." @@ -3547,7 +3635,7 @@ description = "A deeply alcoholic mix, popular in Nyx." taste_description = "hard alcohol" color = "#947459" - strength = 10 + proof = (WHISKEY+VODKA+TEQUILA)/3 glass_name = "Erebus Moonrise" glass_desc = "A deeply alcoholic mix, popular in Nyx." @@ -3558,7 +3646,7 @@ description = "A strange drink invented in the aerostats of Venus." taste_description = "strange alcohol" color = "#FAEBD7" - strength = 66 + proof = CURACAO/2 glass_name = "Balloon" glass_desc = "A strange drink invented in the aerostats of Venus." @@ -3569,7 +3657,7 @@ description = "On Natuna, they do the best with what they have." taste_description = "watered-down beer" color = "#FFFFCC" - strength = 80 + proof = BEER/3 glass_name = "Natuna Brandy" glass_desc = "On Natuna, they do the best with what they have." @@ -3581,7 +3669,7 @@ description = "Invented by a Eutopian marketing team, this is one of the most expensive cocktails in existence." taste_description = "impossibly rich alcohol" color = "#614126" - strength = 15 + proof = (2*COGNAC+WHISKEY_SPECIAL_BLEND)/3 glass_name = "Euphoria" glass_desc = "Invented by a Eutopian marketing team, this is one of the most expensive cocktails in existence." @@ -3592,7 +3680,7 @@ description = "Common in the entertainment districts of Titan." taste_description = "sweet alcohol" color = "#614126" - strength = 100 + proof = BEER/2 glass_name = "Xanadu Cannon" glass_desc = "Common in the entertainment districts of Titan." @@ -3603,7 +3691,7 @@ description = "From Shelf. Not for human consumption." taste_description = "oily bitterness" color = "#d3d3d3" - strength = 32 + proof = 60 // it's magic glass_name = "Debugger" glass_desc = "From Shelf. Not for human consumption." @@ -3614,7 +3702,7 @@ description = "Ethanol and orange soda. A common emergency drink on frontier colonies." taste_description = "bitter oranges" color = "#ffc04c" - strength = 43 + proof = 40 // literally 4 parts something else to 1 part ethanol glass_name = "Spacer's Brew" glass_desc = "Ethanol and orange soda. A common emergency drink on frontier colonies." @@ -3625,7 +3713,7 @@ description = "A dry cocktail popular on Binma." taste_description = "very dry alcohol" color = "#c3c3c3" - strength = 24 + proof = (SAKE+TEQUILA)/2 glass_name = "Binman Bliss" glass_desc = "A dry cocktail popular on Binma." @@ -3636,29 +3724,18 @@ description = "An exotic cocktail from New Kyoto." taste_description = "fruity liquor" color = "#9999FF" - strength = 35 + proof = (SAKE+MELON_LIQUOR)/2 glass_name = "Chrysanthemum" glass_desc = "An exotic cocktail from New Kyoto." -/datum/reagent/ethanol/bitters - name = "Bitters" - id = "bitters" - description = "A blend of fermented fruits and herbs, commonly used in cocktails." - taste_description = "sharp bitterness" - color = "#9b6241" // rgb(155, 98, 65) - strength = 100 - - glass_name = "Bitters" - glass_desc = "A blend of fermented fruits and herbs, commonly used in cocktails." - /datum/reagent/ethanol/soemmerfire name = "Soemmer Fire" id = "soemmerfire" description = "A painfully hot mixed drink, for when you absolutely need to hurt right now." taste_description = "pure fire" color = "#d13b21" // rgb(209, 59, 33) - strength = 25 + proof = (2*WHISKEY+VERMOUTH)/3*2/3 glass_name = "Soemmer Fire" glass_desc = "A painfully hot mixed drink, for when you absolutely need to hurt right now." @@ -3669,24 +3746,13 @@ return M.bodytemperature += 10 * TEMPERATURE_DAMAGE_COEFFICIENT -/datum/reagent/ethanol/winebrandy - name = "Wine Brandy" - id = "winebrandy" - description = "A premium spirit made from distilled wine." - taste_description = "very sweet dried fruit with many elegant notes" - color = "#4C130B" // rgb(76,19,11) - strength = 20 - - glass_name = "Wine Brandy" - glass_desc = "A very classy looking after-dinner drink." - /datum/reagent/ethanol/morningafter name = "Morning After" id = "morningafter" description = "The finest hair of the dog, coming up!" taste_description = "bitter regrets" color = "#482000" // rgb(72, 32, 0) - strength = 60 + proof = VODKA/6 glass_name = "Morning After" glass_desc = "The finest hair of the dog, coming up!" @@ -3697,7 +3763,7 @@ description = "A dry martini, ice cold and well shaken." taste_description = "lemony class" color = "#cca01c" // rgb(204, 160, 28) - strength = 20 + proof = (GIN*3+VODKA+WINE)/5 glass_name = "Vesper" glass_desc = "A dry martini, ice cold and well shaken." @@ -3708,7 +3774,7 @@ description = "A heinous combination of clashing flavors." taste_description = "plague and coldsweats" color = "#3a6617" // rgb(58, 102, 23) - strength = 10 + proof = (VODKA*3+RUM+WHISKEY)/8 glass_name = "Rotgut Fever Dream" glass_desc = "Why are you doing this to yourself?" @@ -3719,7 +3785,7 @@ description = "A dangerous combination of all things flammable. Why would you drink this?" taste_description = "corrosive death" color = "#7c003a" // rgb(124, 0, 58) - strength = 10 + proof = 150 glass_name = "Vox's Delight" glass_desc = "Not recommended if you enjoy having organs." @@ -3740,7 +3806,7 @@ description = "A boozy, citrus-packed brew." taste_description = "the bartender's frustration" color = "#c6c603" // rgb(198, 198, 3) - strength = 9 + proof = (MARTINI*2+VODKA/3+RUM)/6 glass_name = "Screaming Viking" glass_desc = "A boozy, citrus-packed brew." @@ -3751,7 +3817,7 @@ description = "A bootleg brew of all the worst things on station." taste_description = "cough syrup and fire" color = "#6b0145" // rgb(107, 1, 69) - strength = 10 + proof = 150 glass_name = "Robustin" glass_desc = "A bootleg brew of all the worst things on station." @@ -3762,7 +3828,7 @@ description = "A perfect martini, watered down and ruined." taste_description = "emasculation and failure" color = "#2E6671" // rgb(46, 102, 113) - strength = 60 + proof = GIN*0.75 glass_name = "Virgin Sip" glass_desc = "A perfect martini, watered down and ruined." @@ -3773,7 +3839,7 @@ description = "A thick and vibrant alcoholic gel, perfect for the night life." taste_description = "thick, alcoholic cherry gel" color = "#e00b0b" // rgb(224, 11, 11) - strength = 10 + proof = VODKA/5 glass_name = "Jelly Shot" glass_desc = "A thick and vibrant alcoholic gel, perfect for the night life." @@ -3784,7 +3850,7 @@ description = "A thick and toxic slime jelly shot." taste_description = "liquified organs" color = "#6fa300" // rgb(111, 163, 0) - strength = 10 + proof = VODKA*2 glass_name = "Named Bullet" glass_desc = "A thick slime jelly shot. You can feel your death approaching." @@ -3801,7 +3867,7 @@ description = "A light and refreshing rasberry cocktail." taste_description = "sweet raspberry" color = "#dd00a6" // rgb(221, 0, 166) - strength = 30 + proof = GIN/5 glass_name = "Clover Club" glass_desc = "A light and refreshing rasberry cocktail." @@ -3812,7 +3878,7 @@ description = "A dark, complicated mix of gin and campari... classy." taste_description = "summer nights and wood smoke" color = "#77000d" // rgb(119, 0, 13) - strength = 25 + proof = (GIN+BITTERS+VERMOUTH)/3 glass_name = "Negroni" glass_desc = "A dark, complicated blend, perfect for relaxing nights by the fire." @@ -3823,7 +3889,7 @@ description = "A smokey, refreshing lemoned whiskey." taste_description = "smoke and citrus" color = "#a0692e" // rgb(160, 105, 46) - strength = 20 + proof = WHISKEY/2 glass_name = "Whiskey Sour" glass_desc = "A smokey, refreshing lemoned whiskey." @@ -3834,7 +3900,7 @@ description = "A classic mix of whiskey and sugar... simple and direct." taste_description = "smokey, divine whiskey" color = "#774410" // rgb(119, 68, 16) - strength = 40 + proof = (WHISKEY+BITTERS)/3 glass_name = "Old Fashioned" glass_desc = "A classic mix of whiskey and sugar... simple and direct." @@ -3845,7 +3911,7 @@ description = "Refeshing rum and citrus. Time for a tropical get away." taste_description = "refreshing citrus and rum" color = "#d1ff49" // rgb(209, 255, 73 - strength = 40 + proof = RUM*3/5 glass_name = "Daiquiri" glass_desc = "Refeshing rum and citrus. Time for a tropical get away." @@ -3856,7 +3922,7 @@ description = "Minty rum and citrus, made for sailing." taste_description = "minty rum and lime" color = "#d1ff49" // rgb(209, 255, 73 - strength = 75 // 1/5 rum + proof = RUM/5 glass_name = "Mojito" glass_desc = "Minty rum and citrus, made for sailing." @@ -3868,7 +3934,7 @@ description = "Tequila and citrus, iced just right..." taste_description = "grapefruit and cold fire" color = "#ffb070" // rgb(255, 176, 112) - strength = 75 // 1/3 tequila + proof = TEQUILA/3 glass_name = "Paloma" glass_desc = "Tequila and citrus, iced just right..." @@ -3880,7 +3946,7 @@ description = "Wine Brandy, Lemon, and a dream. A South American classic" taste_description = "light sweetness" color = "#f9f96b" // rgb(249, 249, 107) - strength = 60 // 1/3 brandy + proof = BRANDY/3 glass_name = "Pisco Sour" glass_desc = "South American bliss, served ice cold." @@ -3891,7 +3957,7 @@ description = "Minty, rich, and painfully cold. It's a blizzard in a cup." taste_description = "biting cold" color = "#ffe8c4" // rgb(255, 232, 196) - strength = 45 // 1/3 whiskey + proof = WHISKEY/3 adj_temp = -20 targ_temp = 220 //Dangerous to certain races. Drink in moderation. @@ -3904,7 +3970,7 @@ description = "Minty and refreshing, perfect for a hot day." taste_description = "refreshing mint" color = "#bbfc8a" // rgb(187, 252, 138) - strength = 45 + proof = WHISKEY/3 adj_temp = -5 glass_name = "Mint Julep" @@ -3916,7 +3982,7 @@ description = "Anime's favorite drink." taste_description = "the power of god and anime" color = "#DDDDDD" - strength = 25 + proof = SAKE glass_name = "God's Sake" glass_desc = "A glass of sake." @@ -3927,7 +3993,7 @@ description = "Number one drink AND fueling choice for Russians multiverse-wide." taste_description = "russian steel and a hint of grain" color = "#0064C8" - strength = 10 + proof = 200 glass_name = "Godka" glass_desc = "The glass is barely able to contain the wodka. Xynta." @@ -3949,13 +4015,15 @@ var/adjust_tox = rand(-4, 2) M.adjustToxLoss(adjust_tox * removed) +#define HOLYWINE 100 + /datum/reagent/ethanol/holywine name = "Angel Ichor" id = "holywine" description = "A premium alchoholic beverage made from distilled angel blood." taste_description = "wings in a glass, and a hint of grape" color = "#C4921E" - strength = 20 + proof = HOLYWINE glass_name = "Angel Ichor" glass_desc = "A very pious looking drink." @@ -3967,7 +4035,7 @@ description = "A strange yet pleasurable mixture made of vodka, angel's ichor and lime juice. Or at least you THINK the yellow stuff is angel's ichor." taste_description = "grapes with a hint of lime" color = "#DCAE12" - strength = 20 + proof = (2*VODKA+3*HOLYWINE)/6 glass_name = "Holy Mary" glass_desc = "Angel's Ichor, mixed with Vodka and a lil' bit of lime. Tastes like liquid ascension." @@ -3979,7 +4047,7 @@ taste_description = "sweet victory and sour iron" taste_mult = 1.5 color = "#F3C906" - strength = 30 + proof = (RUM+HOLYWINE)/6 glass_name = "Angels' Wrath" glass_desc = "Just looking at this thing makes you sweat." @@ -3992,7 +4060,7 @@ description = "Miracle time!" taste_description = "sweet forgiveness and bitter iron" color = "#AD772B" - strength = 25 + proof = (HOLYWINE+KAHLUA+RUM)/3 glass_name = "Angel's Kiss" glass_desc = "Miracle time!" @@ -4003,7 +4071,7 @@ description = "A trip to Valhalla." taste_description = "valhalla" color = "#955B37" - strength = 30 + proof = (HOLYWINE+MEAD)/2 glass_name = "Ichor Mead" glass_desc = "A trip to Valhalla." @@ -4023,7 +4091,7 @@ description = "A refreshing drink for the aspiring botanist." taste_description = "happy plants" color = "#F07800" - strength = 85 + proof = RUM/5 glass_name = "Planters Punch" glass_desc = "A refreshing drink for the aspiring botanist." @@ -4033,7 +4101,7 @@ id = "olympusmons" description = "For those that need the extra kick." taste_description = "stronge coffee infused booze" - strength = 25 + proof = (BLACK_RUSSIAN+WHISKEY+RUM)/3 glass_name = "Olympus Mons" glass_desc = "For those that need the extra kick." @@ -4043,7 +4111,7 @@ id = "sazerac" description = "When a regular whiskey cocktail isn't enough." taste_description = "a strong bite of flavor" - strength = 20 + proof = (2*COGNAC+ABSINTHE+BITTERS)/3 glass_name = "Sazerac" glass_desc = "When a regular whiskey cocktail isn't enough." @@ -4053,7 +4121,7 @@ id = "junglejuice" description = "An overload of sweetness and sugary goodness." taste_description = "fruits and bad decisions" - strength = 40 + proof = (VODKA+RUM)/5 glass_name = "Jungle Juice" glass_desc = "An overload of sweetness and sugary goodness." @@ -4063,7 +4131,7 @@ id = "gimlet" description = "For those who want to look fancy with their gin." taste_description = "lime infused tree" - strength = 45 // 1/3 gin + proof = GIN/3 glass_name = "Gimlet" glass_desc = "For those who want to look fancy with their gin." @@ -4073,30 +4141,18 @@ id = "firepunch" description = "A spicy take on a summer classic." taste_description = "rum and sugar" - strength = 45 + proof = RUM/3 targ_temp = 300 glass_name = "Fire Punch" glass_desc = "A spicy take on a summer classic." -/datum/reagent/ethanol/alcsassafras - name = "Hard Rootbeer" - id = "alcsassafras" - description = "Doesn't matter if you're drunk when you have a horse to take you home!" - taste_description = "bitter vanilla with a sharp burn" - strength = 20 - - glass_name = "CC's Hard Rootbeer" - glass_desc = "You'd better carry two guns if you're gonna keep drinking these!" - glass_icon = DRINK_ICON_NOISY - glass_special = list(DRINK_FIZZ) - /datum/reagent/ethanol/newsheriff name = "New Sheriff" id = "newsheriff" description = "A drink to make your saddles blaze!" taste_description = "an earthy kick with a lingering burn" - strength = 35 + proof = (WHISKEY+COGNAC)/3 glass_name = "New Sheriff" glass_desc = "A drink to make your saddles blaze!" @@ -4106,7 +4162,7 @@ id = "thehuckleberry" description = "If I thought you weren't my best customer, I just don't think I could bear it." taste_description = "sweet fruits masking barrel-aged wit" - strength = 20 + proof = WHISKEY/3 adj_temp = -10 glass_name = "The Huckleberry" @@ -4117,7 +4173,7 @@ id = "quickdraw" description = "Nobody was faster than Beauregard. Nobody could outdraw him. Nobody could aim as true as old Jack. If he died, Nobody saw him." taste_description = "aged herbs and gunsmoke" - strength = 35 + proof = (RUM+BITTERS)/3 glass_name = "Quickdraw" glass_desc = "Nobody was faster than Beauregard. Nobody could outdraw him. Nobody could aim as true as old Jack. If he died, Nobody saw him." @@ -4127,7 +4183,7 @@ id = "dmhand" description = "If you find yourself drinking this during a game of poker, keep your back to the wall." taste_description = "a pair of classics and a licorice surprise" - strength = 35 + proof = (WHISKEY+RUM)/3 glass_name = "Dead Man's Hand" glass_desc = "If you find yourself drinking this during a game of poker, keep your back to the wall." @@ -4137,7 +4193,7 @@ id = "snakeoil" description = "A 'healthy' potion with a bite! Now with 56% less Arsenic." taste_description = "sour alcohol and something metallic" - strength = 75 + proof = ABSINTHE/3 druggy = 15 toxicity = 2 adj_temp = 5 @@ -4150,7 +4206,7 @@ id = "highnoon" description = "There's two kinds of people here on the Frontier, partner. Those with guns, and those who drink. You drink." taste_description = "aged whiskey and earthy metals" - strength = 30 + proof = WHISKEY/5 adj_temp = 2 glass_name = "High Noon" @@ -4161,7 +4217,7 @@ id = "bloodmeridian" description = "The perfect drink for when you want to dance and fiddle all night. Does it work? You be The Judge." taste_description = "lingering regret, gunpowder, and blood" - strength = 50 + proof = 40 blood_content = 0.4 glass_name = "Blood Meridian" @@ -4172,7 +4228,7 @@ id = "theoutlaw" description = "If you're planning to cheat or rob 'em, you gotta be quick. Either on the draw, or on your horse." taste_description = "a violent life on the run" - strength = 50 + proof = (VODKA+BITTERS)/3 glass_name = "The Outlaw" glass_desc = "If you're planning to cheat or rob 'em, you gotta be quick. Either on the draw, or on your horse." @@ -4182,7 +4238,7 @@ id = "thelawman" description = "They ran out five men before I took up the badge. Since then I've hung twenty." taste_description = "robust coffee and an open campfire" - strength = 65 + proof = WHISKEY/5 adj_temp = 25 glass_name = "The Lawman" @@ -4193,7 +4249,7 @@ id = "hangmansnoose" description = "To some looking at their final days in a cell, this drink is a better mercy than the gallows. Doesn't make it go down any easier." taste_description = "a dusty rope and blood in the nostrils" - strength = 60 + proof = 100 toxicity = 10 glass_name = "Hangman's Noose" @@ -4204,7 +4260,7 @@ id = "bigiron" description = "Have this one, partner. Then have nineteen more." taste_description = "a mysterious visit and the red Texas sky" - strength = 30 // 2/3 rum, rounded up to 30 (was 45) + proof = RUM*2/3 glass_name = "Big Iron" glass_desc = "Have this one, partner. Then have nineteen more." @@ -4214,7 +4270,7 @@ id = "lastcactus" description = "If you can get past its spines, it's filled with cool, clear water." taste_description = "refreshing sweetness and a cold burn" - strength = 30 + proof = VODKA/5 adj_temp = -10 glass_name = "Last Cactus" @@ -4225,7 +4281,7 @@ id = "thebestboy" description = "An eternal tribute to the best crewmember to ever work on Space Station 13. Keep away from washing machines." taste_description = "cool cream, refreshing orange, and strong alcohol" - strength = 50 + proof = SCREWDRIVERCOCKTAIL*3/5 adj_temp = -5 glass_name = "The Best Boy" @@ -4236,7 +4292,7 @@ id = "phobos" description = "A drink invented by Tyrmalin Moonshiners to cope with the harsh Martian climate." taste_description = "grain alcohol" - strength = 15 + proof = 150 glass_name = "Phobos" glass_desc = "A drink invented by Tyrmalin Moonshiners to cope with the harsh Martian climate." @@ -4246,7 +4302,7 @@ id = "greenstuff" description = "Tyrmalin grog aggressively blended with unfiltered absinthe." taste_description = "black licorice and thick malt" - strength = 5 + proof = 300 // again: how do they do it? glass_name = "Green Stuff" glass_desc = "Tyrmalin grog aggressively blended with unfiltered absinthe." @@ -4257,7 +4313,7 @@ description = "This warm, thick drink has a subtle, tangy sweetness to it. Although visually reminiscent of lava, it's actually very hydrating!" taste_description = "faint, tangy sweetness" color = "#CCCC99" - strength = 50 + proof = (WHISKEY+CIDER)/5 adj_temp = -5 glass_name = "Goliath Spit" @@ -4269,7 +4325,7 @@ description = "Not just another Bloody Mary. Mary on a cross." taste_description = "copper, tomatoes, and heretical sweetness" color = "#B40000" - strength = 30 + proof = (VODKA/3+VODKA)/5 blood_content = 0.2 glass_name = "Mary On a Cross" @@ -4281,18 +4337,31 @@ description = "A drink usually enjoyed by only the highest castes of Apinae society. Incredibly sweet, it is said to have enormous health benefits." taste_description = "honey and royalty" color = "#f0d76b" - strength = 50 + proof = (2*BRANDY)/5 glass_name = "Royal Jelly" glass_desc = "A drink usually enjoyed by only the highest castes of Apinae society. Incredibly sweet, it is said to have enormous health benefits." +//This functions the same as Doctor's Delight, except it gets you drunk too. +/datum/reagent/ethanol/royaljelly/affect_ingest(mob/living/carbon/M, alien, removed) + . = ..() + if(alien == IS_DIONA) + return + M.adjustOxyLoss(-4 * removed) + M.heal_organ_damage(2 * removed, 2 * removed) + M.adjustToxLoss(-2 * removed) + if(M.dizziness) + M.dizziness = max(0, M.dizziness - 15) + if(M.confused) + M.Confuse(-5) + /datum/reagent/ethanol/coquito name = "Coquito" id = "coquito" description = "A holiday beverage akin to eggnog, made with coconut milk." taste_description = "creamy spiced coconut" color = "#ffffff" - strength = 50 + proof = RUM/3*2/5 glass_name = "Coquito" glass_desc = "It's a little coconut!" @@ -4303,7 +4372,7 @@ description = "Rum, pineapple, and coconut plended up with ice." taste_description = "coconuts and pineapple soaked in rum" color = "#fdf49e" - strength = 45 // 1/3 rum + proof = RUM/3 glass_name = "Piña Colada" glass_desc = "For those not into yoga." @@ -4314,7 +4383,7 @@ description = "An airy blend of champagne and orange juice, often drunk as a morning refreshment." taste_description = "orange juice and a dry, bubbly wine" color = "#daa411" - strength = 60 // 1/2 champagne + proof = WINE/2 glass_name = "Mimosa" glass_desc = "A bubbly and tangy refreshment." @@ -4326,7 +4395,7 @@ description = "Old fashioned, beer, and chili. A drink for an angry, angry soul." taste_description = "an old-world classic with a firey finish" color = "#8d5b28" // rgb(119, 68, 16) - strength = 20 + proof = (((WHISKEY+BITTERS)/3)+BEER)/3 glass_name = "Johnny Silverhand" glass_desc = "...at the end of it all, it's the code you live by that defines who you are." @@ -4337,7 +4406,7 @@ description = "An updated take on a Moscow Mule, for those trying to make a fresh mark on the world." taste_description = "vodka and lime with a burst of fizzy ginger" color = "#db7878" // rgb(119, 68, 16) - strength = 20 + proof = VODKA/9 glass_name = "Jackie Welles" glass_desc = "But that's done after tomorrow. Afterlife, here we come, baby!" @@ -4348,26 +4417,15 @@ description = "Vodka and cola with a splash of sakura. A drink for those who shoot for the moon." taste_description = "vodka, cola, and sakura flower" color = "#206cc4" // rgb(119, 68, 16) - strength = 20 + proof = VODKA/3 glass_name = "David Martinez" glass_desc = "You still have a dream to stick around for. Need you to see it through. That's my dream." -//This functions the same as Doctor's Delight, except it gets you drunk too. -/datum/reagent/ethanol/royaljelly/affect_ingest(mob/living/carbon/M, alien, removed) - . = ..() - if(alien == IS_DIONA) - return - M.adjustOxyLoss(-4 * removed) - M.heal_organ_damage(2 * removed, 2 * removed) - M.adjustToxLoss(-2 * removed) - if(M.dizziness) - M.dizziness = max(0, M.dizziness - 15) - if(M.confused) - M.Confuse(-5) - //Blood-based Cocktails +#define DEMONSBLOOD 100 + /datum/reagent/ethanol/demonsblood name = "Demons Blood" id = "demonsblood" @@ -4375,7 +4433,7 @@ taste_description = "sweet tasting iron" taste_mult = 1.5 color = "#820000" - strength = 15 + proof = DEMONSBLOOD blood_content = 1 glass_name = "Demons' Blood" @@ -4387,7 +4445,7 @@ description = "Creepy time!" taste_description = "bitter iron" color = "#A68310" - strength = 15 + proof = DEMONSBLOOD blood_content = 1 glass_name = "Devil's Kiss" @@ -4399,7 +4457,7 @@ description = "When the tang of blood and citrus hits, your tongue just might finally be able to pronounce some of the scrawls seen in the tunnels..." taste_description = "bitter iron and citrus" color = "#7D1717" - strength = 50 + proof = DEMONSBLOOD/3 blood_content = 1 glass_name = "Nar'Sour" @@ -4411,7 +4469,7 @@ description = "Nanotrasen's 2518 Pet of The Year has been swept up in the Geometer's brilliant crimson tide! Yap!" taste_description = "bloody orange creamsicle with a bite (and a bark!)" color = "#7D1717" - strength = 50 + proof = ((DEMONSBLOOD/3)+(SCREWDRIVERCOCKTAIL*3/5))/2 blood_content = 1 glass_name = "Nar'Sian" @@ -4422,7 +4480,7 @@ description = "A nighttime vigilante and a bloodsucking parasite could bond over a drink like this." taste_description = "iron, a dash of whiskey, and a hint of molasses" color = "#990033" - strength = 20 + proof = (WHISKEY_SPECIAL_BLEND+ABSINTHE)/3 blood_content = 2 glass_name = "Night's Delight" @@ -4434,7 +4492,7 @@ description = "A delectable cocktail for a classy vampire." taste_description = "metallic, citrusy fizz" color = "#CC0000" - strength = 20 + proof = WINE/3 blood_content = 1 glass_name = "Blud's Fizz" @@ -4445,7 +4503,7 @@ description = "The chaplain might've put on the wrong hat this morning..." taste_description = "some really sinful grapes" color = "#660000" - strength = 20 + proof = WINE/2 blood_content = 1 glass_name = "Wrong Hat" @@ -4457,7 +4515,7 @@ description = "It's like someone took a straw to your brain and just went wild." taste_description = "grey matter" color = "#575e49" - strength = 20 + proof = (VODKA+KAHLUA)/3 blood_content = 1 glass_name = "Brain Drain" @@ -4471,7 +4529,7 @@ description = "The secret reason a bishop's hat is so tall." taste_description = "some really pious grapes" color = "#330033" - strength = 20 + proof = 100 // oops! unused! glass_name = "Holy Grail" glass_desc = "The secret reason a bishop's hat is so tall." @@ -4726,38 +4784,14 @@ taste_description = "your brains smashed out by a smooth brick of hard, ice cold alcohol" color = "#9f6aff" taste_mult = 5 - strength = 10 + proof = 500 adj_temp = 10 targ_temp = 330 glass_name = "Deathbell" glass_desc = "The perfect blend of the most alcoholic things a bartender can get their hands on." -/datum/reagent/ethanol/deathbell/affect_ingest(mob/living/carbon/M, alien, removed) - . = ..() - - if(. >= strength) // Early warning - M.make_dizzy(24) // Intentionally higher than normal to compensate for it's previous effects. - if(. >= strength * 2.5) // Slurring takes longer. Again, intentional. - M.slurring = max(M.slurring, 30) - -/datum/reagent/ethanol/monstertamer - name = "Monster Tamer" - id = "monstertamer" - description = "A questionably-delicious blend of a carnivore's favorite food and a potent neural depressant." - taste_description = "the gross yet satisfying combination of chewing on a raw steak while downing a shot of whiskey" - strength = 50 - color = "#d3785d" - metabolism = REM * 2.5 // about right for mixing nutriment and ethanol. - var/alt_nutriment_factor = 5 //half as much as protein since it's half protein. - //using a new variable instead of nutriment_factor so we can call ..() without that adding nutrition for us without taking factors for protein into account - - glass_name = "Monster Tamer" - glass_desc = "This looks like a vaguely-alcoholic slurry of meat. Gross." - -/datum/reagent/ethanol/monstertamer/affect_ingest(mob/living/carbon/M, alien, removed) - ..() - +/proc/monster_tamer(mob/living/carbon/M, alien, removed, alt_nutriment_factor) if(!M.species.is_vampire) //it's still food! switch(alien) if(IS_DIONA) //Diona don't get any nutrition from nutriment or protein. @@ -4780,6 +4814,25 @@ to_chat(H, "Your mind starts to clear, soothed into a state of clarity as your senses return.") log_and_message_admins("is no longer feral.", H) +/datum/reagent/ethanol/monstertamer + name = "Monster Tamer" + id = "monstertamer" + description = "A questionably-delicious blend of a carnivore's favorite food and a potent neural depressant." + taste_description = "the gross yet satisfying combination of chewing on a raw steak while downing a shot of whiskey" + proof = WHISKEY/2 + color = "#d3785d" + metabolism = REM * 2.5 // about right for mixing nutriment and ethanol. + var/alt_nutriment_factor = 5 //half as much as protein since it's half protein. + //using a new variable instead of nutriment_factor so we can call ..() without that adding nutrition for us without taking factors for protein into account + + glass_name = "Monster Tamer" + glass_desc = "This looks like an alcoholic slurry of meat. Gross." + +/datum/reagent/ethanol/monstertamer/affect_ingest(mob/living/carbon/M, alien, removed) + ..() + + monster_tamer(M,alien, removed, alt_nutriment_factor) + /datum/reagent/ethanol/monstertamer/affect_blood(mob/living/carbon/M, alien, removed) ..() if(alien == IS_SKRELL) @@ -4788,12 +4841,38 @@ if(alien == IS_SLIME || alien == IS_CHIMERA) //slimes and chimera can get nutrition from injected nutriment and protein M.nutrition += (alt_nutriment_factor * removed) +/datum/reagent/drink/drymonstertamer + name = "Dry Monster Tamer" + id = "drymonstertamer" + description = "A questionably-delicious blend of a carnivore's favorite food and, it turns out, certain oligosaccharides common to certain plants." + taste_description = "the gross yet satisfying combination of chewing on a raw steak while gulping a bunch of root beer" + color = "#d3785d" + metabolism = REM * 2.5 // not actually right for the mix, but required to make it mechanically equivalent for feralness purposes + var/alt_nutriment_factor = 5 //half as much as protein since it's half protein. + //using a new variable instead of nutriment_factor so we can call ..() without that adding nutrition for us without taking factors for protein into account + + glass_name = "Dry Monster Tamer" + glass_desc = "This looks like a fizzy slurry of meat. Gross." + +/datum/reagent/drink/drymonstertamer/affect_ingest(mob/living/carbon/M, alien, removed) + ..() + + monster_tamer(M,alien, removed, alt_nutriment_factor) + +/datum/reagent/drink/drymonstertamer/affect_blood(mob/living/carbon/M, alien, removed) + ..() + if(alien == IS_SKRELL) + M.adjustToxLoss(removed) //Equivalent to half as much protein, since it's half protein. + if(!M.species.is_vampire) + if(alien == IS_SLIME || alien == IS_CHIMERA) //slimes and chimera can get nutrition from injected nutriment and protein + M.nutrition += (alt_nutriment_factor * removed) + /datum/reagent/ethanol/galacticpanic name = "Galactic Panic Attack" id = "galacticpanic" description = "The absolute worst thing you could ever put in your body." taste_description = "an entire galaxy collasping in on itself." - strength = 10 + proof = 300 druggy = 50 halluci = 30 var/adj_dizzy = 10 @@ -4806,17 +4885,13 @@ . = ..() M.afflict_stun(20 * 2) - if(. >= strength) // Early warning - M.make_dizzy(24) // Intentionally higher than normal to compensate for it's previous effects. - if(. >= strength * 2.5) // Slurring takes longer. Again, intentional. - M.slurring = max(M.slurring, 30) /datum/reagent/ethanol/lotus name = "Lotus" id = "lotus" description = "The result of making one mistake after another and trying to cover it up with sugar." taste_description = "rich, sweet fruit and even more sugar." - strength = 25 + proof = (WINE+VERMOUTH)/6 color = "#d3785d" glass_name = "Lotus" @@ -4827,7 +4902,7 @@ id = "sbagliato" description = "A drink invented because a bartender was too drunk." taste_description = "sweet bubbly wine and vermouth." - strength = 30 + proof = (WINE+VERMOUTH)/3 color = "#d3785d" glass_name = "Negroni Sbagliato" @@ -4836,13 +4911,13 @@ /datum/reagent/ethanol/fusionnaire name = "Fusionnaire" id = "fusionnaire" - description = "The one true ellusive, some even consider it never existed!" + description = "The one true elusive, some even consider it never existed!" taste_description = "strong currents of fresh zesty winds" color = "#E6E2AA" - strength = 65 + proof = (VODKA*2+SCHNAPPS*2+RUM)/9 glass_name = "Fusionnaire" - glass_desc = "The one true ellusive, lighter than air, harder than the mountains!" + glass_desc = "The one true elusive, lighter than air, harder than the mountains!" /datum/reagent/ethanol/originalsin name = "Original Sin" @@ -4850,7 +4925,7 @@ description = "Angel Ichor, entirely transformed by one drop of apple juice" taste_description = "the apple Eve gave to Adam" color = "#99CC35" - strength = 17 + proof = HOLYWINE*1.5 glass_name = "Original Sin" glass_desc = "A drink so fine, you may just risk eternal damnation!" @@ -4860,7 +4935,7 @@ id = "bulldog" description = "An inventive kahlua recipe." taste_description = "fizzy, creamy, soda and coffee hell." - strength = 30 + proof = BLACK_RUSSIAN*2/3*4/5 color = "#d3785d" glass_name = "Space Bulldog" @@ -4871,7 +4946,7 @@ id = "italiancrisis" description = "This drink was concocted by a madwoman, causing the Italian Crisis of 2123." taste_description = "cola, fruit, fizz, coffee, and cream swirled together in an old boot." - strength = 20 + proof = (((WINE+VERMOUTH)/3)+(BLACK_RUSSIAN*2/3*4/5))/2 // the things we do for code color = "#d3785d" glass_name = "Italian Crisis" @@ -4930,8 +5005,7 @@ id = "honeyshot" description = "The perfect drink for bees." taste_description = "sweet tart grenadine flavored with honey." - strength = 40 - var/adj_dizzy = 10 + proof = VODKA/3 color = "#d3785d" glass_name = "Honey shot" @@ -4942,7 +5016,7 @@ id = "scsatw" description = "The screwdriver's bigger cousin." taste_description = "smooth, savory booze and tangy orange juice." - strength = 30 + proof = (3*SCREWDRIVERCOCKTAIL+RUM+WHISKEY+GIN)/6 color = "#d3785d" glass_name = "Slow Comfortable Screw Against the Wall" @@ -4963,7 +5037,7 @@ id = "unsweettea" description = "A sick experiment to take the sweetness out of tea after sugar has been added resulted in this." taste_description = "bland, slightly bitter, discount black tea." - strength = 80 + proof = 25 druggy = 10 color = "#d3785d" @@ -4975,8 +5049,7 @@ id = "lovemaker" description = "A drink said to help one find true love." taste_description = "sweet fruit and honey." - strength = 30 - var/adj_dizzy = 30 + proof = SCREWDRIVERCOCKTAIL/2*5/6 adj_temp = 10 targ_temp = 360 color = "#d3785d" @@ -4989,7 +5062,7 @@ id = "peacetreaty" description = "A Tajaran cocktail named (somewhat in jest) of the peace treaty that ended the civil war on Adhomai." color = "#DFDF93" - strength = 21 + proof = (VICTORY_GIN+MESSA_MEAD)/3 taste_description = "tart, oily honey" glass_icon_state = "peacetreatyglass" @@ -5001,7 +5074,7 @@ id = "winter_offensive" description = "The Tajaran equivalent of Gin 'On the Rocks', named after the famous People Republic of Adhomai military campaign." color = "#664300" - strength = 15 + proof = VICTORY_GIN/2 taste_description = "oily gin" adj_temp = 10 targ_temp = 270 @@ -5015,7 +5088,7 @@ id = "internationale" description = "A cocktail mixing Tajaran gin and Pan-Slavic Vodka. A symbol of unity between Human and Tajaran leftists." color = "#D9CCAA" - strength = 28 + proof = (VICTORY_GIN+VODKA)/2 taste_description = "earthy, oily unity" glass_icon_state = "internationaleglass" @@ -5030,7 +5103,7 @@ description = "A White Russian gone awry." taste_description = "milky grain alcohol" color = "#9fbbd8" - strength = 30 + proof = VODKA/2 glass_name = "Russian Bastard" glass_desc = "A White Russian gone awry." @@ -5041,7 +5114,7 @@ description = "Often lost and now found." taste_description = "the strength to go on" color = "#9ce454" - strength = 30 + proof = (COGNAC+KAHLUA*3+MELON_LIQUOR*3)/9 glass_name = "A Will to Live" glass_desc = "Often lost and now found." @@ -5052,7 +5125,7 @@ description = "A horrid concoction of deathbell and nuclear waste. Is this really necessary?" taste_description = "radioactivity and alcohol poisoning" color = "#6c3c94" - strength = 10 + proof = 400 glass_name = "A Desire to Die" glass_desc = "Deathbell and nuclear waste. The bane of your liver." @@ -5085,7 +5158,7 @@ description = "The daiquiri's dry cousin." taste_description = "sickly sweetness" color = "#be5227" - strength = 10 + proof = COGNAC*5/9 glass_name = "Sidecar" glass_desc = "The daiquiri's dry cousin." @@ -5096,7 +5169,7 @@ description = "Named after a field artillery gun. Enough said." taste_description = "the impact of a 75mm shell" color = "#d8d4ad" - strength = 35 + proof = (GIN+2*WINE)/4 glass_name = "French 75" glass_desc = "Named after a field artillery gun. Enough said." @@ -5107,7 +5180,7 @@ description = "A French 75 with the gin substituted for vodka." taste_description = "the impact of a harder 75mm shell" color = "#d8d4ad" - strength = 25 + proof = (VODKA+2*WINE)/4 glass_name = "French 76" glass_desc = "A French 75 with the gin substituted for vodka." @@ -5118,7 +5191,7 @@ description = "Made on Terra when and where alcohol was illegal. How defiant." taste_description = "sweet and sour defiance" color = "#f1e362" - strength = 30 + proof = GIN/4 glass_name = "Last Word" glass_desc = "Made on Terra when and where alcohol was illegal. How defiant." @@ -5295,7 +5368,7 @@ description = "A drink made from the venom of the Yuum." taste_description = "harsh and stinging sweetness" color = "#550000" - strength = 10 + proof = 200 glass_name = "Mumbak sting" glass_desc = "A drink made from the venom of the Yuum." @@ -5305,7 +5378,7 @@ description = "Wine made from various fruits from the swamps of Moghes." taste_description = "swampy fruit" color = "#6b596b" - strength = 15 + proof = 150 glass_name = "wasgaelhi" glass_desc = "Wine made from various fruits from the swamps of Moghes." diff --git a/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Medicine.dm b/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Medicine.dm index 168a979eef48..b9d658ac15f2 100644 --- a/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Medicine.dm +++ b/code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Medicine.dm @@ -552,7 +552,7 @@ H.losebreath = 10 H.adjustOxyLoss(5) if(prob(2)) - to_chat(H,"You feel a dull pain behind your eyes and at thee back of your head...") + to_chat(H,"You feel a dull pain behind your eyes and at the back of your head...") H.hallucination += 20 //It messes with your mind for some reason. H.eye_blurry += 20 //Groggy vision for a small bit. if(prob(3)) @@ -1421,11 +1421,11 @@ else if(world.time > data + ANTIDEPRESSANT_MESSAGE_DELAY) data = world.time - if(prob(90)) - to_chat(M, "Your mind feels much more stable.") - else + if(prob(1)) to_chat(M, "Your mind breaks apart...") M.hallucination += 200 + else + to_chat(M, "Your mind feels much more stable.") /datum/reagent/adranol//Moved from Chemistry-Reagents-Medicine_vr.dm name = "Adranol" diff --git a/code/modules/reagents/items/hypovial.dm b/code/modules/reagents/items/hypovial.dm index dac6865d58a2..2326605f29ee 100644 --- a/code/modules/reagents/items/hypovial.dm +++ b/code/modules/reagents/items/hypovial.dm @@ -13,6 +13,7 @@ start_rename = TRUE /// how many [state][#] overlays we have for reagents remaining var/overlay_count = 3 + item_flags = ITEM_CAREFUL_BLUDGEON | ITEM_ENCUMBERS_WHILE_HELD | ITEM_EASY_LATHE_DECONSTRUCT /obj/item/reagent_containers/glass/hypovial/update_icon(updates) cut_overlays() diff --git a/code/modules/reagents/machinery/chem_master.dm b/code/modules/reagents/machinery/chem_master.dm index e4f0cd7fd7bf..691d9a521137 100644 --- a/code/modules/reagents/machinery/chem_master.dm +++ b/code/modules/reagents/machinery/chem_master.dm @@ -1,5 +1,6 @@ //TODO: We don't have check_reactions or something like it, so we can't prevent idiot transfers. @Zandario // todo: this is horrifying and needs refactored. ESPECIALLY ITS TGUI. ~silicons +// todo: it's been like 9 months and i worked on asset cache please kill this shit with fire and rewirte it all oh my god ~silicons /obj/machinery/chem_master name = "ChemMaster 3000" desc = "Used to seperate and package chemicals in to autoinjectors, patches, pills, or bottles. Warranty void if used to create Space Drugs." @@ -177,7 +178,7 @@ /obj/machinery/chem_master/proc/load_styles() /// Calculate the span tags and ids fo all the available pill icons. - var/datum/asset/spritesheet/simple/pill_assets = get_asset_datum(/datum/asset/spritesheet/simple/pills) + var/datum/asset_pack/spritesheet/simple/pill_assets = SSassets.ready_asset_pack(/datum/asset_pack/spritesheet/simple/pills) pill_styles = list() for (var/x in 1 to PILL_STYLE_COUNT) var/list/pill_style_list = list() @@ -185,7 +186,7 @@ pill_style_list["className"] = pill_assets.icon_class_name("pill[x]") pill_styles += list(pill_style_list) - var/datum/asset/spritesheet/simple/bottle_assets = get_asset_datum(/datum/asset/spritesheet/simple/bottles) + var/datum/asset_pack/spritesheet/simple/bottle_assets = SSassets.ready_asset_pack(/datum/asset_pack/spritesheet/simple/bottles) bottle_styles = list() for (var/x in 1 to BOTTLE_STYLE_COUNT) var/list/bottle_style_list = list() @@ -193,7 +194,7 @@ bottle_style_list["className"] = bottle_assets.icon_class_name("bottle[x]") bottle_styles += list(bottle_style_list) - var/datum/asset/spritesheet/simple/patches_assets = get_asset_datum(/datum/asset/spritesheet/simple/patches) + var/datum/asset_pack/spritesheet/simple/patches_assets = SSassets.ready_asset_pack(/datum/asset_pack/spritesheet/simple/patches) patch_styles = list() for (var/raw_patch_style in PATCH_STYLE_LIST) //adding className for use in UI @@ -204,12 +205,11 @@ condi_styles = strip_condi_styles_to_icons(get_condi_styles()) -/obj/machinery/chem_master/ui_assets(mob/user) - return list( - get_asset_datum(/datum/asset/spritesheet/simple/pills), - get_asset_datum(/datum/asset/spritesheet/simple/bottles), - get_asset_datum(/datum/asset/spritesheet/simple/patches), - ) +/obj/machinery/chem_master/ui_asset_injection(datum/tgui/ui, list/immediate, list/deferred) + immediate += /datum/asset_pack/spritesheet/simple/bottles + immediate += /datum/asset_pack/spritesheet/simple/patches + immediate += /datum/asset_pack/spritesheet/simple/pills + return ..() /obj/machinery/chem_master/ui_interact(mob/user, datum/tgui/ui = null) ui = SStgui.try_update_ui(user, src, ui) @@ -759,7 +759,7 @@ if (style_reagent in styles) styles[style_reagent] += carton_in_hand - var/datum/asset/spritesheet/simple/assets = get_asset_datum(/datum/asset/spritesheet/simple/condiments) + var/datum/asset_pack/spritesheet/simple/assets = SSassets.ready_asset_pack(/datum/asset_pack/spritesheet/simple/condiments) for (var/reagent in styles) styles[reagent]["className"] = assets.icon_class_name(reagent) return styles diff --git a/code/modules/reagents/machinery/dispenser/dispenser.dm b/code/modules/reagents/machinery/dispenser/dispenser.dm index cb9703c76ef9..2bbf1d68c28d 100644 --- a/code/modules/reagents/machinery/dispenser/dispenser.dm +++ b/code/modules/reagents/machinery/dispenser/dispenser.dm @@ -20,6 +20,7 @@ use_power = USE_POWER_IDLE idle_power_usage = 50 anchored = TRUE + obj_rotation_flags = OBJ_ROTATION_ENABLED | OBJ_ROTATION_DEFAULTING default_unanchor = 3 SECONDS default_deconstruct = 0 SECONDS default_panel = 0 SECONDS diff --git a/code/modules/reagents/machinery/dispenser/synthesizer.dm b/code/modules/reagents/machinery/dispenser/synthesizer.dm index b6cb49b102bc..1ce6bcb44d00 100644 --- a/code/modules/reagents/machinery/dispenser/synthesizer.dm +++ b/code/modules/reagents/machinery/dispenser/synthesizer.dm @@ -84,6 +84,7 @@ /obj/item/reagent_synth/cafe name = "reagent synthesis module (Cafe)" reagents_provided = list( + /datum/reagent/water, /datum/reagent/drink/coffee, /datum/reagent/drink/coffee/cafe_latte, /datum/reagent/drink/coffee/soy_latte, @@ -92,7 +93,9 @@ /datum/reagent/drink/milk/cream, /datum/reagent/drink/tea, /datum/reagent/drink/ice, + /datum/reagent/drink/tea/icetea, /datum/reagent/nutriment/mint, + /datum/reagent/sugar, /datum/reagent/drink/juice/orange, /datum/reagent/drink/juice/lemon, /datum/reagent/drink/juice/lime, diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index 7941d2b5e0c0..0a25404d2358 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -157,6 +157,8 @@ pickup_sound = 'sound/items/pickup/glass.ogg' /// rped rating var/rped_rating = 0 + item_flags = ITEM_CAREFUL_BLUDGEON | ITEM_ENCUMBERS_WHILE_HELD | ITEM_EASY_LATHE_DECONSTRUCT + /obj/item/reagent_containers/glass/beaker/Initialize(mapload) . = ..() diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index e35d79f58399..57af42c64645 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -142,6 +142,12 @@ filled_reagents = list("inaprovaline" = 5) preserve_item = 0 hyposound = 'sound/effects/hypospray.ogg' + materials_base = list( + MAT_STEEL = 250, + MAT_GLASS = 250, + ) + item_flags = ITEM_CAREFUL_BLUDGEON | ITEM_ENCUMBERS_WHILE_HELD | ITEM_EASY_LATHE_DECONSTRUCT + /obj/item/reagent_containers/hypospray/autoinjector/on_reagent_change() ..() @@ -187,6 +193,7 @@ icon_state = "autoinjector" amount_per_transfer_from_this = 15 volume = 15 + materials_base = list(MAT_STEEL = 500, MAT_GLASS = 500,) origin_tech = list(TECH_BIO = 4) filled_reagents = list("inaprovaline" = 15) diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index f77a78961997..07a18cc86494 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -8,7 +8,7 @@ icon = 'icons/obj/medical/syringe.dmi' item_state = "syringe_0" icon_state = "0" - materials_base = list(MAT_GLASS = 150) + materials_base = list(MAT_GLASS = 150, MAT_STEEL = 250) amount_per_transfer_from_this = 5 possible_transfer_amounts = null volume = 15 @@ -17,7 +17,7 @@ sharp = 1 integrity_flags = INTEGRITY_ACIDPROOF rad_flags = RAD_NO_CONTAMINATE - item_flags = ITEM_NOBLUDGEON | ITEM_ENCUMBERS_WHILE_HELD + item_flags = ITEM_NOBLUDGEON | ITEM_ENCUMBERS_WHILE_HELD | ITEM_EASY_LATHE_DECONSTRUCT var/mode = SYRINGE_DRAW var/image/filling //holds a reference to the current filling overlay var/visible_name = "a syringe" diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index 0b95e65ddb78..c9ebcae5d921 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -760,18 +760,6 @@ return P - -// update the icon_state to reflect hidden status -/obj/structure/disposalpipe/proc/update() - var/turf/T = src.loc - hide(!T.is_plating() && !istype(T,/turf/space)) // space never hides pipes - -// hide called by levelupdate if turf intact status changes -// change visibility status and force update of icon -/obj/structure/disposalpipe/hide(var/intact) - invisibility = intact ? 101: 0 // hide if floor is intact - updateicon() - // update actual icon_state depending on visibility // if invisible, append "f" to icon_state to show faded version // this will be revealed if a T-scanner is used @@ -980,8 +968,6 @@ dpdir = dir | turn(dir, 180) else dpdir = dir | turn(dir, -90) - - update() return ///// Z-Level stuff @@ -991,7 +977,6 @@ /obj/structure/disposalpipe/up/New() ..() dpdir = dir - update() return /obj/structure/disposalpipe/up/nextdir(fromdir) @@ -1041,7 +1026,6 @@ /obj/structure/disposalpipe/down/New() ..() dpdir = dir - update() return /obj/structure/disposalpipe/down/nextdir(fromdir) @@ -1101,7 +1085,6 @@ dpdir = dir | turn(dir, 90) | turn(dir,180) else // pipe-y dpdir = dir | turn(dir,90) | turn(dir, -90) - update() return @@ -1158,7 +1141,6 @@ if(sort_tag) GLOB.tagger_locations |= sort_tag updatename() updatedesc() - update() /obj/structure/disposalpipe/tagger/attackby(obj/item/I, mob/user) if(..()) @@ -1226,7 +1208,6 @@ updatedir() updatename() updatedesc() - update() /obj/structure/disposalpipe/sortjunction/attackby(obj/item/I, mob/user) if(..()) @@ -1318,8 +1299,6 @@ /obj/structure/disposalpipe/trunk/LateInitialize() . = ..() getlinked() - update() - /obj/structure/disposalpipe/trunk/proc/getlinked() linked = null var/obj/machinery/disposal/D = locate() in src.loc @@ -1331,8 +1310,6 @@ var/obj/structure/disposaloutlet/O = locate() in src.loc if(O) linked = O - - update() return // Override attackby so we disallow trunkremoval when somethings ontop @@ -1416,11 +1393,6 @@ // i.e. will be treated as an empty turf desc = "A broken piece of disposal pipe." -/obj/structure/disposalpipe/broken/New() - ..() - update() - return - // called when welded // for broken pipe, remove and turn into scrap /obj/structure/disposalpipe/broken/welded() diff --git a/code/modules/species/inventory.dm b/code/modules/species/inventory.dm index 2871a3880fde..e6040e63be06 100644 --- a/code/modules/species/inventory.dm +++ b/code/modules/species/inventory.dm @@ -9,7 +9,7 @@ * get equip offsets for a given inhand * * @params - * - slot - /datum/inventory_slot_meta/abstract/hand/left or right_hand + * - slot - /datum/inventory_slot/abstract/hand/left or right_hand * - index - index of the held item in held items */ /datum/species/proc/get_inhand_offsets(slot, index) diff --git a/code/modules/species/outsider/vox.dm b/code/modules/species/outsider/vox.dm index 3a5938eabc55..c309a1a07484 100644 --- a/code/modules/species/outsider/vox.dm +++ b/code/modules/species/outsider/vox.dm @@ -126,7 +126,7 @@ H.equip_to_slot_or_del(new /obj/item/tank/vox(H), SLOT_ID_BACK, INV_OP_SILENT | INV_OP_FLUFFLESS) H.internal = H.back else - H.equip_to_slot_or_del(new /obj/item/tank/vox(H), /datum/inventory_slot_meta/abstract/hand/right, INV_OP_SILENT | INV_OP_FLUFFLESS) + H.equip_to_slot_or_del(new /obj/item/tank/vox(H), /datum/inventory_slot/abstract/hand/right, INV_OP_SILENT | INV_OP_FLUFFLESS) H.internal = H.r_hand H.internal = locate(/obj/item/tank) in H.contents if(istype(H.internal,/obj/item/tank) && H.internals) diff --git a/code/modules/species/promethean/promethean.dm b/code/modules/species/promethean/promethean.dm index fa199a27a6e6..2087aa8c3715 100644 --- a/code/modules/species/promethean/promethean.dm +++ b/code/modules/species/promethean/promethean.dm @@ -58,15 +58,12 @@ var/datum/species/shapeshifter/promethean/prometheans max_age = 80 - gluttonous = 0 virus_immune = TRUE - slowdown = -0.2 - brute_mod = 0.5 - burn_mod = 2 + brute_mod = 0.9 + burn_mod = 1.1 oxy_mod = 0 flash_mod = 0.5 //No centralized, lensed eyes. - item_slowdown_mod = 0.66 cloning_modifier = /datum/modifier/cloning_sickness/promethean @@ -171,9 +168,9 @@ var/datum/species/shapeshifter/promethean/prometheans new /obj/item/reagent_containers/food/snacks/wrapped/proteinbar(L) new /obj/item/tool/prybar/red(L) if(H.backbag == 1) - H.equip_to_slot_or_del(L, /datum/inventory_slot_meta/abstract/hand/right) + H.equip_to_slot_or_del(L, /datum/inventory_slot/abstract/hand/right) else - H.equip_to_slot_or_del(L, /datum/inventory_slot_meta/abstract/put_in_backpack) + H.equip_to_slot_or_del(L, /datum/inventory_slot/abstract/put_in_backpack) /datum/species/shapeshifter/promethean/hug(mob/living/carbon/human/H, mob/living/target) diff --git a/code/modules/species/promethean/promethean_blob.dm b/code/modules/species/promethean/promethean_blob.dm index ad39f64e1d4f..7ae94ae2dec0 100644 --- a/code/modules/species/promethean/promethean_blob.dm +++ b/code/modules/species/promethean/promethean_blob.dm @@ -472,8 +472,8 @@ if(!isnull(blob.mob_radio)) if(!equip_to_slots_if_possible(blob.mob_radio, list( - /datum/inventory_slot_meta/inventory/ears/left, - /datum/inventory_slot_meta/inventory/ears/right, + /datum/inventory_slot/inventory/ears/left, + /datum/inventory_slot/inventory/ears/right, ))) blob.mob_radio.forceMove(reform_spot) blob.mob_radio = null diff --git a/code/modules/species/protean/protean.dm b/code/modules/species/protean/protean.dm index 575e350d9beb..4d979be9cd21 100644 --- a/code/modules/species/protean/protean.dm +++ b/code/modules/species/protean/protean.dm @@ -181,9 +181,9 @@ permit.set_name(H.real_name) if(H.backbag == 1) //Somewhat misleading, 1 == no bag (not boolean) - H.equip_to_slot_or_del(box, /datum/inventory_slot_meta/abstract/hand/left) + H.equip_to_slot_or_del(box, /datum/inventory_slot/abstract/hand/left) else - H.equip_to_slot_or_del(box, /datum/inventory_slot_meta/abstract/put_in_backpack) + H.equip_to_slot_or_del(box, /datum/inventory_slot/abstract/put_in_backpack) /datum/species/protean/get_blood_colour(var/mob/living/carbon/human/H) return rgb(80,80,80,230) @@ -307,8 +307,7 @@ holder.adjustBruteLoss(-brute_heal_left, include_robo = TRUE) holder.adjustFireLoss(-burn_heal_left, include_robo = TRUE) holder.adjustToxLoss(-3.6) // With them now having tox immunity, this is redundant, along with the rad regen, but I'm keeping it in, in case they do somehow get some system instability - holder.radiation = max(RAD_MOB_CURE_PROTEAN_REGEN) - + holder.cure_radiation(RAD_MOB_CURE_PROTEAN_REGEN) /proc/protean_requires_healing(mob/living/carbon/human/H) if(!istype(H)) @@ -359,7 +358,7 @@ return for(var/obj/item/hardsuit/protean/suit in contents) - force_equip_to_slot(suit, /datum/inventory_slot_meta/inventory/back) + force_equip_to_slot(suit, /datum/inventory_slot/inventory/back) to_chat(src, SPAN_WARNING("You deploy your nanosuit.")) suit.toggle_seals(src, TRUE) return diff --git a/code/modules/species/protean/protean_blob.dm b/code/modules/species/protean/protean_blob.dm index 70bd8bae23ae..c1d05cc26ef3 100644 --- a/code/modules/species/protean/protean_blob.dm +++ b/code/modules/species/protean/protean_blob.dm @@ -109,8 +109,7 @@ var/obj/item/organ/external/E = humanform.get_organ(BP_TORSO) //Set us to their health, but, human health ignores robolimbs so we do it 'the hard way' health = maxHealth - E.brute_dam - E.burn_dam - movement_cooldown = 0.5 + max(0, (maxHealth - health) - 100) / 35 - base_attack_cooldown = 10 + max(0, (maxHealth - health) - 100) / 15 + movement_cooldown = 0.5 + max(0, (maxHealth - health) - 100) / 50 //Alive, becoming dead if((stat < DEAD) && (health <= 0)) @@ -492,8 +491,8 @@ if(!isnull(blob.mob_radio)) if(!equip_to_slots_if_possible(blob.mob_radio, list( - /datum/inventory_slot_meta/inventory/ears/left, - /datum/inventory_slot_meta/inventory/ears/right, + /datum/inventory_slot/inventory/ears/left, + /datum/inventory_slot/inventory/ears/right, ))) blob.mob_radio.forceMove(reform_spot) blob.mob_radio = null @@ -663,7 +662,7 @@ if("headsets") chosen_list = GLOB.clothing_headsets icon_file = 'icons/mob/clothing/ears.dmi' - + var/picked = input(src,"What clothing would you like to mimic?","Mimic Clothes") as null|anything in chosen_list if(!ispath(chosen_list[picked])) @@ -673,7 +672,7 @@ if(isnull(H.icon_override)) H.icon_override = icon_file H.update_worn_icon() //so our overlays update. - + if (ismob(H.loc)) var/mob/M = H.loc M.update_inv_belt() //so our overlays @@ -717,7 +716,7 @@ chosenpart = H.boots chosen_list = GLOB.clothing_shoes - + var/picked = input(src,"What clothing would you like to mimic?","Mimic Clothes") as null|anything in chosen_list if(!ispath(chosen_list[picked])) @@ -738,7 +737,7 @@ var/obj/item/holder/H = loc var/color_in = input("Pick a color. Cancelling sets it to default.","Color", H.color) as null|color - + if(color_in) H.color = color_in else diff --git a/code/modules/species/shadekin/shadekin.dm b/code/modules/species/shadekin/shadekin.dm index bcfc62668bcd..e23e436f9b21 100644 --- a/code/modules/species/shadekin/shadekin.dm +++ b/code/modules/species/shadekin/shadekin.dm @@ -8,8 +8,10 @@ deform = 'icons/mob/species/shadekin/body.dmi' preview_icon = 'icons/mob/species/shadekin/preview.dmi' husk_icon = 'icons/mob/species/shadekin/husk.dmi' - tail = "tail" - icobase_tail = TRUE + + sprite_accessory_defaults = list( + SPRITE_ACCESSORY_SLOT_TAIL = /datum/sprite_accessory/tail/bodyset/shadekin, + ) //TODO: Something that's not wiki copypaste blurb = {" diff --git a/code/modules/species/shadekin/shadekin_blackeyed.dm b/code/modules/species/shadekin/shadekin_blackeyed.dm index 4509b9199aad..fede97d8c4a5 100644 --- a/code/modules/species/shadekin/shadekin_blackeyed.dm +++ b/code/modules/species/shadekin/shadekin_blackeyed.dm @@ -9,7 +9,10 @@ deform = 'icons/mob/species/shadekin/body.dmi' preview_icon = 'icons/mob/species/shadekin/preview_blackeyed.dmi' husk_icon = 'icons/mob/species/shadekin/husk.dmi' - tail = "tail" + + sprite_accessory_defaults = list( + SPRITE_ACCESSORY_SLOT_TAIL = /datum/sprite_accessory/tail/bodyset/shadekin, + ) //TODO: Something more fitting for black-eyes //TODO: CIT ADDENDUM: since we're not really on the tether anymore we'll need a bullshit reason as to why they're around wherever we are. diff --git a/code/modules/species/species.dm b/code/modules/species/species.dm index 483aa2255e5d..3fc6aa0378aa 100644 --- a/code/modules/species/species.dm +++ b/code/modules/species/species.dm @@ -4,6 +4,8 @@ * They are **not** singletons, however, they are globally cached as a static set * for use in preferences to determine default properties/whatever * + * todo: make them singletons + * * ? Someday we'll rework this. Someday. I believe. * * Mob set_species supports either a datum or a typepath. Mobs, upon receiving a typepath, will make their own copy for modification. @@ -40,12 +42,19 @@ ///Used for metabolizing reagents. var/reagent_tag - //? Traits / Physiology + //* Traits / Physiology *// /// Intrinsic datum traits to apply to the mob var/list/mob_traits /// physiology modifier to add - path or instance var/datum/physiology_modifier/mob_physiology_modifier + //* Sprite Accessories *// + /// default sprite accessories for each slot; will render onto mobs if they don't have one specifically set. + /// set to id/typepath to have it resolved during init. + var/list/sprite_accessory_defaults = list() + + // todo: old code below + //? Additional info /// what you see on tooltip/examine var/examine_name @@ -114,20 +123,6 @@ /// The basic skin colours this species uses. var/list/base_skin_colours - //? Tail - /// Name of tail state in species effects icon file. - var/tail - /// If set, the icon to obtain tail animation states from. - var/tail_animation - var/tail_hair - /// This is for overriding tail rendering with a specific icon in icobase, for static tails only, since tails would wag when dead if you used this. - var/icobase_tail = 0 - - //? Wing - var/wing_hair - var/wing - var/wing_animation - var/icobase_wing //? Organs /// Determines the organs that the species spawns with and which required-organ checks are conducted. @@ -510,6 +505,8 @@ built += new path abilities = built + sprite_accessory_defaults = resolve_sprite_accessory_key_list_inplace(sprite_accessory_defaults) + /** * called when we apply to a mob * @@ -625,9 +622,9 @@ GLOBAL_LIST_INIT(species_oxygen_tank_by_gas, list( box.obj_storage.fit_to_contents(no_shrink = TRUE) if(H.backbag == 1) - H.equip_to_slot_or_del(box, /datum/inventory_slot_meta/abstract/hand/right, INV_OP_SILENT | INV_OP_FLUFFLESS) + H.equip_to_slot_or_del(box, /datum/inventory_slot/abstract/hand/right, INV_OP_SILENT | INV_OP_FLUFFLESS) else - H.equip_to_slot_or_del(box, /datum/inventory_slot_meta/abstract/put_in_backpack, INV_OP_FORCE | INV_OP_SILENT) + H.equip_to_slot_or_del(box, /datum/inventory_slot/abstract/put_in_backpack, INV_OP_FORCE | INV_OP_SILENT) /** * called to ensure organs are consistent with our species's @@ -900,9 +897,7 @@ GLOBAL_LIST_INIT(species_oxygen_tank_by_gas, list( base_species = to_copy.name icobase = to_copy.icobase deform = to_copy.deform - tail = to_copy.tail - tail_animation = to_copy.tail_animation - icobase_tail = to_copy.icobase_tail + sprite_accessory_defaults = to_copy.sprite_accessory_defaults.Copy() color_mult = to_copy.color_mult primitive_form = to_copy.primitive_form species_appearance_flags = to_copy.species_appearance_flags diff --git a/code/modules/species/species_getters.dm b/code/modules/species/species_getters.dm index fec59dd8c1ba..fc3a8c44bb6b 100644 --- a/code/modules/species/species_getters.dm +++ b/code/modules/species/species_getters.dm @@ -64,15 +64,6 @@ /datum/species/proc/get_additional_examine_text(mob/living/carbon/human/H) return -/datum/species/proc/get_tail(mob/living/carbon/human/H) - return tail - -/datum/species/proc/get_tail_animation(mob/living/carbon/human/H) - return tail_animation - -/datum/species/proc/get_tail_hair(mob/living/carbon/human/H) - return tail_hair - /datum/species/proc/get_blood_mask(mob/living/carbon/human/H) return blood_mask @@ -181,14 +172,8 @@ /datum/species/proc/get_vision_flags(mob/living/carbon/human/H) return vision_flags -/datum/species/proc/get_wing_hair(mob/living/carbon/human/H) //I have no idea what this is even used for other than teshari, but putting it in just in case. - return wing_hair //Since the tail has it. - -/datum/species/proc/get_wing(mob/living/carbon/human/H) - return wing - -/datum/species/proc/get_wing_animation(mob/living/carbon/human/H) - return wing_animation +/datum/species/proc/get_default_sprite_accessory(mob/living/carbon/human/character, slot) + return sprite_accessory_defaults[slot] //! ## Names /datum/species/proc/get_true_name(mob/living/carbon/human/H) diff --git a/code/modules/species/species_shapeshift.dm b/code/modules/species/species_shapeshift.dm index 418338c7b3f0..eeec0317d9e7 100644 --- a/code/modules/species/species_shapeshift.dm +++ b/code/modules/species/species_shapeshift.dm @@ -58,20 +58,11 @@ var/list/wrapped_species_by_ref = list() var/datum/species/S = SScharacters.resolve_species_name(wrapped_species_by_ref["\ref[H]"]) return S.get_damage_overlays(H) -/datum/species/shapeshifter/get_tail(mob/living/carbon/human/H) - if(!H) return ..() - var/datum/species/S = SScharacters.resolve_species_name(wrapped_species_by_ref["\ref[H]"]) - return S.get_tail(H) - -/datum/species/shapeshifter/get_tail_animation(mob/living/carbon/human/H) - if(!H) return ..() - var/datum/species/S = SScharacters.resolve_species_name(wrapped_species_by_ref["\ref[H]"]) - return S.get_tail_animation(H) - -/datum/species/shapeshifter/get_tail_hair(mob/living/carbon/human/H) - if(!H) return ..() - var/datum/species/S = SScharacters.resolve_species_name(wrapped_species_by_ref["\ref[H]"]) - return S.get_tail_hair(H) +/datum/species/shapeshifter/get_default_sprite_accessory(mob/living/carbon/human/character, slot) + if(!character) + return ..() + var/datum/species/S = SScharacters.resolve_species_name(wrapped_species_by_ref["\ref[character]"]) + return S.get_default_sprite_accessory(arglist(args)) /datum/species/shapeshifter/get_husk_icon(mob/living/carbon/human/H) if(H) @@ -110,18 +101,16 @@ var/list/wrapped_species_by_ref = list() var/list/valid_gradstyles = GLOB.hair_gradients for(var/hairstyle in GLOB.legacy_hair_lookup) var/datum/sprite_accessory/S = GLOB.legacy_hair_lookup[hairstyle] - if(gender == MALE && S.gender == FEMALE) + if(gender == MALE && S.random_generation_gender == FEMALE) continue - if(gender == FEMALE && S.gender == MALE) + if(gender == FEMALE && S.random_generation_gender == MALE) continue if(S.apply_restrictions && !(species.get_bodytype_legacy(src) in S.species_allowed)) continue valid_hairstyles += hairstyle for(var/facialhairstyle in GLOB.legacy_facial_hair_lookup) var/datum/sprite_accessory/S = GLOB.legacy_facial_hair_lookup[facialhairstyle] - if(gender == MALE && S.gender == FEMALE) - continue - if(gender == FEMALE && S.gender == MALE) + if(!isnull(S.random_generation_gender) && gender != S.random_generation_gender) continue if(S.apply_restrictions && !(species.get_bodytype_legacy(src) in S.species_allowed)) continue @@ -305,8 +294,7 @@ var/list/wrapped_species_by_ref = list() var/list/pretty_ear_styles = list("Normal" = null) for(var/path in GLOB.legacy_ears_lookup) var/datum/sprite_accessory/ears/instance = GLOB.legacy_ears_lookup[path] - if((!instance.ckeys_allowed) || (ckey in instance.ckeys_allowed)) - pretty_ear_styles[instance.name] = path + pretty_ear_styles[instance.name] = path // Present choice to user var/new_ear_style = tgui_input_list(src, "Pick some ears!", "Character Preference", pretty_ear_styles) @@ -345,7 +333,7 @@ var/list/wrapped_species_by_ref = list() g_ears3 = new_color_rgb_list[2] b_ears3 = new_color_rgb_list[3] - update_hair() //Includes Virgo ears + render_spriteacc_ears() //Includes Virgo ears /mob/living/carbon/human/proc/shapeshifter_select_horns() set name = "Select Secondary Ears" @@ -359,8 +347,7 @@ var/list/wrapped_species_by_ref = list() var/list/pretty_horn_styles = list("Normal" = null) for(var/path in GLOB.legacy_ears_lookup) var/datum/sprite_accessory/ears/instance = GLOB.legacy_ears_lookup[path] - if((!instance.ckeys_allowed) || (ckey in instance.ckeys_allowed)) - pretty_horn_styles[instance.name] = path + pretty_horn_styles[instance.name] = path // Present choice to user var/new_horn_style = tgui_input_list(src, "Pick some secondary ears!", "Character Preference", pretty_horn_styles) @@ -399,7 +386,7 @@ var/list/wrapped_species_by_ref = list() g_horn3 = new_color_rgb_list[2] b_horn3 = new_color_rgb_list[3] - update_hair() //Includes Virgo ears + render_spriteacc_ears() //Includes Virgo ears /mob/living/carbon/human/proc/shapeshifter_select_tail() set name = "Select Tail" @@ -413,8 +400,7 @@ var/list/wrapped_species_by_ref = list() var/list/pretty_tail_styles = list("Normal" = null) for(var/path in GLOB.legacy_tail_lookup) var/datum/sprite_accessory/tail/instance = GLOB.legacy_tail_lookup[path] - if((!instance.ckeys_allowed) || (ckey in instance.ckeys_allowed)) - pretty_tail_styles[instance.name] = path + pretty_tail_styles[instance.name] = path // Present choice to user var/new_tail_style = tgui_input_list(src, "Pick a tail!", "Character Preference", pretty_tail_styles) @@ -453,7 +439,7 @@ var/list/wrapped_species_by_ref = list() g_tail3 = new_color_rgb_list[2] b_tail3 = new_color_rgb_list[3] - update_tail_showing() + render_spriteacc_tail() /mob/living/carbon/human/proc/shapeshifter_select_wings() set name = "Select Wings" @@ -467,8 +453,7 @@ var/list/wrapped_species_by_ref = list() var/list/pretty_wing_styles = list("None" = null) for(var/path in GLOB.legacy_wing_lookup) var/datum/sprite_accessory/wing/instance = GLOB.legacy_wing_lookup[path] - if((!instance.ckeys_allowed) || (ckey in instance.ckeys_allowed)) - pretty_wing_styles[instance.name] = path + pretty_wing_styles[instance.name] = path // Present choice to user var/new_wing_style = tgui_input_list(src, "Pick some wings!", "Character Preference", pretty_wing_styles) @@ -507,7 +492,7 @@ var/list/wrapped_species_by_ref = list() g_wing3 = new_color_rgb_list[2] b_wing3 = new_color_rgb_list[3] - update_wing_showing() + render_spriteacc_wings() /mob/living/carbon/human/proc/promethean_toggle_body_transparency() diff --git a/code/modules/species/station/adherent.dm b/code/modules/species/station/adherent.dm index e7f226da246e..81f4a8470fab 100644 --- a/code/modules/species/station/adherent.dm +++ b/code/modules/species/station/adherent.dm @@ -132,7 +132,7 @@ wikilink = "N/A" /datum/species/adherent/equip_survival_gear(mob/living/carbon/human/H, extendedtank = FALSE, comprehensive = FALSE) - H.equip_to_slot_or_del(new /obj/item/storage/belt/utility/crystal, /datum/inventory_slot_meta/abstract/put_in_backpack) + H.equip_to_slot_or_del(new /obj/item/storage/belt/utility/crystal, /datum/inventory_slot/abstract/put_in_backpack) /datum/species/adherent/New() /*equip_adjust = list( @@ -164,8 +164,8 @@ return slowdown */ /datum/species/adherent/handle_environment_special(mob/living/carbon/human/H, datum/gas_mixture/environment, dt) - for(var/i in H.overlays_standing) - H.cut_overlay(i) + for(var/key in H.standing_overlays) + H.cut_overlay(H.standing_overlays[key]) //Todo: find a better way to adjust clothing, than to wipe all overlays /datum/species/adherent/handle_fall_special(mob/living/carbon/human/H, turf/landing) diff --git a/code/modules/species/station/apidaen.dm b/code/modules/species/station/apidaen.dm index 8936204ce60d..e9f592dfe8e5 100644 --- a/code/modules/species/station/apidaen.dm +++ b/code/modules/species/station/apidaen.dm @@ -1,3 +1,4 @@ + /datum/species/apidaen uid = SPECIES_ID_APIDAEN id = SPECIES_ID_APIDAEN @@ -8,8 +9,10 @@ deform = 'icons/mob/species/apidaen/body.dmi' // No deformed set has been made yet. preview_icon = 'icons/mob/species/apidaen/preview.dmi' husk_icon = 'icons/mob/species/apidaen/husk.dmi' - tail = "tail" //Bee tail. I've desaturated it for the sprite sheet. - icobase_tail = 1 + + sprite_accessory_defaults = list( + SPRITE_ACCESSORY_SLOT_TAIL = /datum/sprite_accessory/tail/bodyset/apidean, + ) vision_innate = /datum/vision/baseline/species_tier_2 diff --git a/code/modules/species/station/custom_species.dm b/code/modules/species/station/custom_species.dm index 9f8b5d83a4f6..8a3cf1198e46 100644 --- a/code/modules/species/station/custom_species.dm +++ b/code/modules/species/station/custom_species.dm @@ -84,11 +84,11 @@ H.equip_to_slot_or_del(new /obj/item/clothing/mask/breath(H), SLOT_ID_MASK) if(H.backbag == 1) H.equip_to_slot_or_del(new /obj/item/tank/vox(H), SLOT_ID_BACK) - H.equip_to_slot_or_del(new /obj/item/storage/box/vox(H), /datum/inventory_slot_meta/abstract/hand/right) + H.equip_to_slot_or_del(new /obj/item/storage/box/vox(H), /datum/inventory_slot/abstract/hand/right) H.internal = H.back else - H.equip_to_slot_or_del(new /obj/item/tank/vox(H), /datum/inventory_slot_meta/abstract/hand/right) - H.equip_to_slot_or_del(new /obj/item/storage/box/vox(H.back), /datum/inventory_slot_meta/abstract/put_in_backpack) + H.equip_to_slot_or_del(new /obj/item/tank/vox(H), /datum/inventory_slot/abstract/hand/right) + H.equip_to_slot_or_del(new /obj/item/storage/box/vox(H.back), /datum/inventory_slot/abstract/put_in_backpack) H.internal = H.r_hand H.internal = locate(/obj/item/tank) in H.contents if(istype(H.internal,/obj/item/tank) && H.internals) diff --git a/code/modules/species/station/diona.dm b/code/modules/species/station/diona.dm index 8439b7435c08..6c72a3d1bbd6 100644 --- a/code/modules/species/station/diona.dm +++ b/code/modules/species/station/diona.dm @@ -118,9 +118,9 @@ /datum/species/diona/equip_survival_gear(mob/living/carbon/human/H) if(H.backbag == 1) - H.equip_to_slot_or_del(new /obj/item/flashlight/flare(H), /datum/inventory_slot_meta/abstract/hand/right) + H.equip_to_slot_or_del(new /obj/item/flashlight/flare(H), /datum/inventory_slot/abstract/hand/right) else - H.equip_to_slot_or_del(new /obj/item/flashlight/flare(H.back), /datum/inventory_slot_meta/abstract/put_in_backpack) + H.equip_to_slot_or_del(new /obj/item/flashlight/flare(H.back), /datum/inventory_slot/abstract/put_in_backpack) /datum/species/diona/handle_death(mob/living/carbon/human/H) diff --git a/code/modules/species/station/monkey.dm b/code/modules/species/station/monkey.dm index 7c198c538089..d4ca2e39ec71 100644 --- a/code/modules/species/station/monkey.dm +++ b/code/modules/species/station/monkey.dm @@ -23,7 +23,11 @@ gibbed_anim = "gibbed-m" dusted_anim = "dust-m" death_message = "lets out a faint chimper as it collapses and stops moving..." - tail = "chimptail" + + sprite_accessory_defaults = list( + SPRITE_ACCESSORY_SLOT_TAIL = /datum/sprite_accessory/tail/bodyset/monkey/chimp, + ) + fire_icon_state = "monkey" unarmed_types = list(/datum/unarmed_attack/bite, /datum/unarmed_attack/claws) @@ -84,7 +88,10 @@ intrinsic_languages = LANGUAGE_ID_FARWA flesh_color = "#AFA59E" base_color = "#333333" - tail = "farwatail" + + sprite_accessory_defaults = list( + SPRITE_ACCESSORY_SLOT_TAIL = /datum/sprite_accessory/tail/bodyset/monkey/farwa, + ) /datum/species/monkey/skrell name = SPECIES_MONKEY_SKRELL @@ -100,7 +107,8 @@ flesh_color = "#8CD7A3" blood_color = "#1D2CBF" reagent_tag = IS_SKRELL - tail = null + + sprite_accessory_defaults = list() /datum/species/monkey/unathi name = SPECIES_MONKEY_UNATHI @@ -110,7 +118,10 @@ icobase = 'icons/mob/species/monkey/body_stok.dmi' deform = 'icons/mob/species/monkey/body_stok.dmi' - tail = "stoktail" + sprite_accessory_defaults = list( + SPRITE_ACCESSORY_SLOT_TAIL = /datum/sprite_accessory/tail/bodyset/monkey/stok, + ) + greater_form = SPECIES_UNATHI default_language = LANGUAGE_ID_STOK intrinsic_languages = LANGUAGE_ID_STOK @@ -125,7 +136,9 @@ icobase = 'icons/mob/species/monkey/body_sobaka.dmi' deform = 'icons/mob/species/monkey/body_sobaka.dmi' - tail = null //The tail is part of its body due to tail using the "icons/effects/species.dmi" file. It must be null, or they'll have a chimp tail. + + sprite_accessory_defaults = list() + greater_form = SPECIES_AKULA default_language = LANGUAGE_ID_SKRELL //Closest we have. intrinsic_languages = LANGUAGE_ID_SKRELL @@ -137,7 +150,9 @@ icobase = 'icons/mob/species/monkey/body_sergaling.dmi' deform = 'icons/mob/species/monkey/body_sergaling.dmi' - tail = null + + sprite_accessory_defaults = list() + default_language = LANGUAGE_ID_NARAMADI intrinsic_languages = LANGUAGE_ID_NARAMADI @@ -148,7 +163,9 @@ greater_form = SPECIES_NEVREAN icobase = 'icons/mob/species/monkey/body_sparra.dmi' deform = 'icons/mob/species/monkey/body_sparra.dmi' - tail = null + + sprite_accessory_defaults = list() + default_language = LANGUAGE_ID_BIRDSONG intrinsic_languages = LANGUAGE_ID_BIRDSONG @@ -181,7 +198,8 @@ intrinsic_languages = LANGUAGE_ID_VULPKANIN flesh_color = "#966464" base_color = "#000000" - tail = null + + sprite_accessory_defaults = list() //INSERT CODE HERE SO MONKEYS CAN BE SPAWNED. //Also, M was added to the end of the spawn names to signify that it's a monkey, since some names were conflicting. diff --git a/code/modules/species/station/rapala.dm b/code/modules/species/station/rapala.dm index ec9d2fcea5c0..d1bf832f5dfe 100644 --- a/code/modules/species/station/rapala.dm +++ b/code/modules/species/station/rapala.dm @@ -8,8 +8,10 @@ deform = 'icons/mob/species/rapala/deformed_body.dmi' preview_icon = 'icons/mob/species/rapala/preview.dmi' husk_icon = 'icons/mob/species/rapala/husk.dmi' - tail = "tail" - icobase_tail = 1 + + sprite_accessory_defaults = list( + SPRITE_ACCESSORY_SLOT_TAIL = /datum/sprite_accessory/tail/bodyset/rapala, + ) max_additional_languages = 3 name_language = null diff --git a/code/modules/species/station/standard/akula.dm b/code/modules/species/station/standard/akula.dm index 843f3bca5c84..3abeba3b9cbe 100644 --- a/code/modules/species/station/standard/akula.dm +++ b/code/modules/species/station/standard/akula.dm @@ -10,8 +10,10 @@ preview_icon = 'icons/mob/species/akula/preview.dmi' husk_icon = 'icons/mob/species/akula/husk.dmi' default_bodytype = BODYTYPE_AKULA - tail = "tail" - icobase_tail = 1 + + sprite_accessory_defaults = list( + SPRITE_ACCESSORY_SLOT_TAIL = /datum/sprite_accessory/tail/bodyset/akula, + ) blurb = {" The Akula are a species of amphibious humanoids like the Skrell, but have an appearance very similar to that of a shark. diff --git a/code/modules/species/station/standard/krisitik.dm b/code/modules/species/station/standard/krisitik.dm index 5db3ae728093..1cf0c620b287 100644 --- a/code/modules/species/station/standard/krisitik.dm +++ b/code/modules/species/station/standard/krisitik.dm @@ -10,8 +10,9 @@ preview_icon = 'icons/mob/species/krisitik/preview.dmi' husk_icon = 'icons/mob/species/krisitik/husk.dmi' - tail = "tail" - icobase_tail = 1 + sprite_accessory_defaults = list( + SPRITE_ACCESSORY_SLOT_TAIL = /datum/sprite_accessory/tail/bodyset/krisitik, + ) max_additional_languages = 3 name_language = LANGUAGE_ID_SQUEAKISH diff --git a/code/modules/species/station/standard/moth.dm b/code/modules/species/station/standard/moth.dm index 9e416179ea4d..312bcadda85b 100644 --- a/code/modules/species/station/standard/moth.dm +++ b/code/modules/species/station/standard/moth.dm @@ -21,7 +21,11 @@ GLOBAL_LIST_INIT(moth_lore_data, init_moth_lore()) icobase = 'icons/mob/species/moth/body.dmi' deform = 'icons/mob/species/moth/body.dmi' - wing = "moth_plain" + sprite_accessory_defaults = list( + SPRITE_ACCESSORY_SLOT_EARS = /datum/sprite_accessory/ears/bodyset/moth, + SPRITE_ACCESSORY_SLOT_WINGS = /datum/sprite_accessory/wing/bodyset/moth, + ) + unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws, /datum/unarmed_attack/bite/sharp) vision_innate = /datum/vision/baseline/species_tier_2 diff --git a/code/modules/species/station/standard/naramadi.dm b/code/modules/species/station/standard/naramadi.dm index 3695b7a170df..8ea4b78c40b0 100644 --- a/code/modules/species/station/standard/naramadi.dm +++ b/code/modules/species/station/standard/naramadi.dm @@ -7,9 +7,11 @@ default_bodytype = BODYTYPE_SERGAL icobase = 'icons/mob/species/naramadi/body.dmi' deform = 'icons/mob/species/naramadi/deformed_body.dmi' - tail = "tail" - icobase_tail = 1 + sprite_accessory_defaults = list( + SPRITE_ACCESSORY_SLOT_TAIL = /datum/sprite_accessory/tail/bodyset/naramadi, + ) + slowdown = -0.25 snow_movement = -1 // Ignores light snow //darksight = 8 diff --git a/code/modules/species/station/standard/nevrean.dm b/code/modules/species/station/standard/nevrean.dm index 5c1b981cef88..60d21842909a 100644 --- a/code/modules/species/station/standard/nevrean.dm +++ b/code/modules/species/station/standard/nevrean.dm @@ -10,8 +10,10 @@ deform = 'icons/mob/species/nevrean/deformed_body.dmi' preview_icon = 'icons/mob/species/nevrean/preview.dmi' husk_icon = 'icons/mob/species/nevrean/husk.dmi' - tail = "tail" - icobase_tail = 1 + + sprite_accessory_defaults = list( + SPRITE_ACCESSORY_SLOT_TAIL = /datum/sprite_accessory/tail/bodyset/nevrean, + ) blurb = {" Nevreans are a race of avian and dinosaur-like creatures living on Tal. They belong to a group of races that hails from Eltus, diff --git a/code/modules/species/station/standard/tajaran.dm b/code/modules/species/station/standard/tajaran.dm index 288b1ab0a030..1f12598f48ad 100644 --- a/code/modules/species/station/standard/tajaran.dm +++ b/code/modules/species/station/standard/tajaran.dm @@ -15,8 +15,10 @@ deform = 'icons/mob/species/tajaran/deformed_body_greyscale.dmi' preview_icon = 'icons/mob/species/tajaran/preview.dmi' husk_icon = 'icons/mob/species/tajaran/husk.dmi' - tail = "tajtail" - tail_animation = 'icons/mob/species/tajaran/tail_greyscale.dmi' + + sprite_accessory_defaults = list( + SPRITE_ACCESSORY_SLOT_TAIL = /datum/sprite_accessory/tail/bodyset/tajaran, + ) max_additional_languages = 3 name_language = /datum/language/tajaran diff --git a/code/modules/species/station/standard/teshari.dm b/code/modules/species/station/standard/teshari.dm index 2ba15cae12be..269ce2ff490a 100644 --- a/code/modules/species/station/standard/teshari.dm +++ b/code/modules/species/station/standard/teshari.dm @@ -27,16 +27,16 @@ suit_storage_icon = 'icons/mob/clothing/species/teshari/belt_mirror.dmi' fire_icon_state = "generic" // Humanoid is too big for them and spriting a new one is really annoying. - tail = "teshtail" - tail_hair = "feathers" - icobase_tail = 1 + sprite_accessory_defaults = list( + SPRITE_ACCESSORY_SLOT_TAIL = /datum/sprite_accessory/tail/bodyset/teshari, + ) max_additional_languages = 3 name_language = LANGUAGE_ID_TESHARI intrinsic_languages = LANGUAGE_ID_TESHARI whitelist_languages = list( LANGUAGE_ID_TESHARI, - LANGUAGE_ID_SKRELL + LANGUAGE_ID_SKRELL, ) male_cough_sounds = list('sound/effects/mob_effects/tesharicougha.ogg', 'sound/effects/mob_effects/tesharicoughb.ogg') diff --git a/code/modules/species/station/standard/unathi.dm b/code/modules/species/station/standard/unathi.dm index 51b906ec8009..06175054ae6d 100644 --- a/code/modules/species/station/standard/unathi.dm +++ b/code/modules/species/station/standard/unathi.dm @@ -18,8 +18,10 @@ deform = 'icons/mob/species/unathi/deformed_body_greyscale.dmi' husk_icon = 'icons/mob/species/unathi/husk.dmi' preview_icon = 'icons/mob/species/unathi/preview.dmi' - tail = "sogtail" - tail_animation = 'icons/mob/species/unathi/tail_greyscale.dmi' + + sprite_accessory_defaults = list( + SPRITE_ACCESSORY_SLOT_TAIL = /datum/sprite_accessory/tail/bodyset/unathi, + ) blurb = {" A heavily reptillian species, Unathi hail from the Uuosa-Eso system, which roughly translates to 'burning mother'. diff --git a/code/modules/species/station/standard/unathidigi.dm b/code/modules/species/station/standard/unathidigi.dm index ed5f2d739819..91567adb686f 100644 --- a/code/modules/species/station/standard/unathidigi.dm +++ b/code/modules/species/station/standard/unathidigi.dm @@ -8,8 +8,10 @@ deform = 'icons/mob/species/unathidigi/deformed_body.dmi' husk_icon = 'icons/mob/species/unathidigi/husk.dmi' preview_icon = 'icons/mob/species/unathidigi/preview.dmi' - tail = "sogtail" - tail_animation = 'icons/mob/species/unathidigi/tail.dmi' + + sprite_accessory_defaults = list( + SPRITE_ACCESSORY_SLOT_TAIL = /datum/sprite_accessory/tail/bodyset/unathi, + ) blurb = {" As a result of the many challenges of living on Moghes and other worlds, Unathi have become morphologically diverse. diff --git a/code/modules/species/station/standard/vulpkanin.dm b/code/modules/species/station/standard/vulpkanin.dm index 63d3c4b43572..0c4341bba4bb 100644 --- a/code/modules/species/station/standard/vulpkanin.dm +++ b/code/modules/species/station/standard/vulpkanin.dm @@ -11,8 +11,9 @@ preview_icon = 'icons/mob/species/vulpkanin/preview.dmi' husk_icon = 'icons/mob/species/vulpkanin/husk.dmi' - tail = "vulptail" - tail_animation = 'icons/mob/clothing/species/vulpkanin/tail.dmi' // probably need more than just one of each, but w/e + sprite_accessory_defaults = list( + SPRITE_ACCESSORY_SLOT_TAIL = /datum/sprite_accessory/tail/bodyset/vulpkanin, + ) max_additional_languages = 3 name_language = LANGUAGE_ID_VULPKANIN diff --git a/code/modules/species/station/standard/zaddat.dm b/code/modules/species/station/standard/zaddat.dm index 14cfb58db951..83680c9daf29 100644 --- a/code/modules/species/station/standard/zaddat.dm +++ b/code/modules/species/station/standard/zaddat.dm @@ -118,7 +118,7 @@ if(H.backbag == 1) H.put_in_hands_or_del(L) else - H.equip_to_slot_or_del(L, /datum/inventory_slot_meta/abstract/put_in_backpack) + H.equip_to_slot_or_del(L, /datum/inventory_slot/abstract/put_in_backpack) /datum/species/zaddat/handle_environment_special(mob/living/carbon/human/H, datum/gas_mixture/environment, dt) diff --git a/code/modules/species/station/standard/zorren.dm b/code/modules/species/station/standard/zorren.dm index f85fef1614ce..b4030ab65585 100644 --- a/code/modules/species/station/standard/zorren.dm +++ b/code/modules/species/station/standard/zorren.dm @@ -9,8 +9,10 @@ icobase = 'icons/mob/species/zorren_hi/body_greyscale.dmi' deform = 'icons/mob/species/zorren_hi/deformed_body.dmi' - tail = "tail" - icobase_tail = 1 + + sprite_accessory_defaults = list( + SPRITE_ACCESSORY_SLOT_TAIL = /datum/sprite_accessory/tail/bodyset/zorren_highlander, + ) max_additional_languages = 3 intrinsic_languages = LANGUAGE_ID_TERMINUS @@ -75,8 +77,10 @@ icobase = 'icons/mob/species/zorren_fl/body_greyscale.dmi' deform = 'icons/mob/species/zorren_fl/deformed_body.dmi' - tail = "tail" - icobase_tail = 1 + + sprite_accessory_defaults = list( + SPRITE_ACCESSORY_SLOT_TAIL = /datum/sprite_accessory/tail/bodyset/zorren_flatlander, + ) max_additional_languages = 3 intrinsic_languages = LANGUAGE_ID_TERMINUS diff --git a/code/modules/species/station/vasilissan.dm b/code/modules/species/station/vasilissan.dm index 1d511efa7348..aa81d3fd530e 100644 --- a/code/modules/species/station/vasilissan.dm +++ b/code/modules/species/station/vasilissan.dm @@ -8,8 +8,10 @@ deform = 'icons/mob/species/vasilissan/deformed_body.dmi' preview_icon = 'icons/mob/species/vasilissan/preview.dmi' husk_icon = 'icons/mob/species/vasilissan/husk.dmi' - tail = "tail" // Spider tail. - icobase_tail = 1 + + sprite_accessory_defaults = list( + SPRITE_ACCESSORY_SLOT_TAIL = /datum/sprite_accessory/tail/bodyset/vasilissan, + ) vision_innate = /datum/vision/baseline/species_tier_2 slowdown = -0.15 // Small speedboost, as they've got a bunch of legs. Or something. I dunno. diff --git a/code/modules/species/station/werebeast.dm b/code/modules/species/station/werebeast.dm index 684835482631..398e3d24d99d 100644 --- a/code/modules/species/station/werebeast.dm +++ b/code/modules/species/station/werebeast.dm @@ -10,7 +10,6 @@ icobase = 'icons/mob/species/werebeast/body.dmi' deform = 'icons/mob/species/werebeast/deformed_body.dmi' preview_icon = 'icons/mob/species/werebeast/preview.dmi' - tail = "tail" max_additional_languages = 3 intrinsic_languages = LANGUAGE_ID_VULPKANIN diff --git a/code/modules/species/station/xenochimera.dm b/code/modules/species/station/xenochimera.dm index 16b54032d5ba..c82cf52a1892 100644 --- a/code/modules/species/station/xenochimera.dm +++ b/code/modules/species/station/xenochimera.dm @@ -17,8 +17,6 @@ deform = 'icons/mob/species/xenochimera/deformed_body.dmi' preview_icon = 'icons/mob/species/xenochimera/preview.dmi' husk_icon = 'icons/mob/species/xenochimera/husk.dmi' - tail = "tail" //Scree's tail. Can be disabled in the Species Customization tab by choosing "hide species specific tail sprite" - icobase_tail = 1 max_additional_languages = 5 @@ -526,13 +524,17 @@ switch(atmos_biomorph) if("flexible") target.species.warning_low_pressure = WARNING_LOW_PRESSURE - target.species.hazard_low_pressure = -1 + target.species.hazard_low_pressure = HAZARD_LOW_PRESSURE target.species.warning_high_pressure = WARNING_HIGH_PRESSURE target.species.hazard_high_pressure = HAZARD_HIGH_PRESSURE if("compact") target.species.warning_low_pressure = 50 - target.species.hazard_low_pressure = -1 + target.species.hazard_low_pressure = 0 + target.species.warning_high_pressure = WARNING_HIGH_PRESSURE + target.species.hazard_high_pressure = HAZARD_HIGH_PRESSURE if("elastic") + target.species.warning_low_pressure = WARNING_LOW_PRESSURE + target.species.hazard_low_pressure = HAZARD_LOW_PRESSURE target.species.warning_high_pressure = WARNING_HIGH_PRESSURE + 200 target.species.hazard_high_pressure = HAZARD_HIGH_PRESSURE + 400 diff --git a/code/modules/species/station/xenomorph_hybrids/xeno_hybrids.dm b/code/modules/species/station/xenomorph_hybrids/xeno_hybrids.dm index e9b3287f2401..4f807228f546 100644 --- a/code/modules/species/station/xenomorph_hybrids/xeno_hybrids.dm +++ b/code/modules/species/station/xenomorph_hybrids/xeno_hybrids.dm @@ -18,8 +18,10 @@ "Alternate" = "alt", ) - tail = "tail" - icobase_tail = 1 + sprite_accessory_defaults = list( + SPRITE_ACCESSORY_SLOT_TAIL = /datum/sprite_accessory/tail/bodyset/xenohybrid, + ) + unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws, /datum/unarmed_attack/bite/sharp) max_additional_languages = 2 diff --git a/code/modules/species/virtual_reality/opaque_form.dm b/code/modules/species/virtual_reality/opaque_form.dm index 6dd3b09165a2..485005bee4a6 100644 --- a/code/modules/species/virtual_reality/opaque_form.dm +++ b/code/modules/species/virtual_reality/opaque_form.dm @@ -28,8 +28,11 @@ name = SPECIES_VR_UNATHI icobase = 'icons/mob/species/unathi/body_greyscale.dmi' deform = 'icons/mob/species/unathi/deformed_body_greyscale.dmi' - tail = "sogtail" - tail_animation = 'icons/mob/species/unathi/tail_greyscale.dmi' + + sprite_accessory_defaults = list( + SPRITE_ACCESSORY_SLOT_TAIL = /datum/sprite_accessory/tail/bodyset/unathi, + ) + species_appearance_flags = HAS_HAIR_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_EYE_COLOR has_limbs = list( BP_TORSO = list("path" = /obj/item/organ/external/chest/unathi), @@ -51,8 +54,11 @@ name = "Virtual Reality Tajaran" icobase = 'icons/mob/species/tajaran/body_greyscale.dmi' deform = 'icons/mob/species/tajaran/deformed_body_greyscale.dmi' - tail = "tajtail" - tail_animation = 'icons/mob/species/tajaran/tail_greyscale.dmi' + + sprite_accessory_defaults = list( + SPRITE_ACCESSORY_SLOT_TAIL = /datum/sprite_accessory/tail/bodyset/tajaran, + ) + species_appearance_flags = HAS_HAIR_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_EYE_COLOR has_limbs = list( BP_TORSO = list("path" = /obj/item/organ/external/chest), diff --git a/code/modules/species/xenomorphs/alien_species.dm b/code/modules/species/xenomorphs/alien_species.dm index dea33584e26f..972c372e55c5 100644 --- a/code/modules/species/xenomorphs/alien_species.dm +++ b/code/modules/species/xenomorphs/alien_species.dm @@ -173,8 +173,10 @@ caste_name = "drone" weeds_plasma_rate = 15 slowdown = 1 - tail = "xenos_drone_tail" - //rarity_value = 5 + + sprite_accessory_defaults = list( + SPRITE_ACCESSORY_SLOT_TAIL = /datum/sprite_accessory/tail/bodyset/xenomorph/drone, + ) icobase = 'icons/mob/species/xenomorph/drone.dmi' deform = 'icons/mob/species/xenomorph/drone.dmi' @@ -213,7 +215,10 @@ caste_name = "hunter" slowdown = -2 total_health = 150 - tail = "xenos_hunter_tail" + + sprite_accessory_defaults = list( + SPRITE_ACCESSORY_SLOT_TAIL = /datum/sprite_accessory/tail/bodyset/xenomorph/hunter, + ) icobase = 'icons/mob/species/xenomorph/hunter.dmi' deform = 'icons/mob/species/xenomorph/hunter.dmi' @@ -244,7 +249,10 @@ caste_name = "sentinel" slowdown = 0 total_health = 200 - tail = "xenos_sentinel_tail" + + sprite_accessory_defaults = list( + SPRITE_ACCESSORY_SLOT_TAIL = /datum/sprite_accessory/tail/bodyset/xenomorph/sentinel, + ) icobase = 'icons/mob/species/xenomorph/sentinel.dmi' deform = 'icons/mob/species/xenomorph/sentinel.dmi' @@ -278,8 +286,10 @@ weeds_plasma_rate = 20 caste_name = "queen" slowdown = 4 - tail = "xenos_queen_tail" - //rarity_value = 10 + + sprite_accessory_defaults = list( + SPRITE_ACCESSORY_SLOT_TAIL = /datum/sprite_accessory/tail/bodyset/xenomorph/queen, + ) icobase = 'icons/mob/species/xenomorph/queen.dmi' deform = 'icons/mob/species/xenomorph/queen.dmi' diff --git a/code/modules/sprite_accessories/README.md b/code/modules/sprite_accessories/README.md new file mode 100644 index 000000000000..33c1d5adfd06 --- /dev/null +++ b/code/modules/sprite_accessories/README.md @@ -0,0 +1,3 @@ +# Sprite Accessories + +The sprite accessory system is used to make renderable mob-addons that, as its name implies, is a sprite accessory and does not otherwise impact the mob's function. diff --git a/code/modules/sprite_accessories/ears/_ears.dm b/code/modules/sprite_accessories/ears.dm similarity index 85% rename from code/modules/sprite_accessories/ears/_ears.dm rename to code/modules/sprite_accessories/ears.dm index 6f62acd2bedf..c8d0e44825e8 100644 --- a/code/modules/sprite_accessories/ears/_ears.dm +++ b/code/modules/sprite_accessories/ears.dm @@ -4,7 +4,7 @@ icon = 'icons/mob/sprite_accessories/ears.dmi' do_colouration = 0 // Set to 1 to blend (ICON_ADD) hair color - color_blend_mode = ICON_ADD // Only appliciable if do_coloration = 1 + legacy_use_additive_color_matrix = TRUE // Only appliciable if do_coloration = 1 var/desc = "You should not see this..." // todo: sort ears by something that makes sense diff --git a/code/modules/sprite_accessories/ears/animal/bovine.dm b/code/modules/sprite_accessories/ears/animal/bovine.dm index 1f1011f58844..9de2ffaa6b35 100644 --- a/code/modules/sprite_accessories/ears/animal/bovine.dm +++ b/code/modules/sprite_accessories/ears/animal/bovine.dm @@ -9,14 +9,14 @@ id = "ears_cow_colorable" icon_state = "cow-c" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/cow_nohorns name = "cow, no horns" id = "ears_cow_nohorns" icon_state = "cow-nohorns" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE //? sheep /datum/sprite_accessory/ears/ram @@ -24,4 +24,4 @@ id = "ears_ram" icon_state = "ram" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/ears/animal/canid.dm b/code/modules/sprite_accessories/ears/animal/canid.dm index 31faf4f2e74d..c3c54b2e3b32 100644 --- a/code/modules/sprite_accessories/ears/animal/canid.dm +++ b/code/modules/sprite_accessories/ears/animal/canid.dm @@ -10,7 +10,7 @@ icon_state = "fenearshc" extra_overlay = "fenears-inner" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/foxears name = "highlander zorren ears" @@ -22,7 +22,7 @@ id = "ears_zorren_high_color" icon_state = "foxearshc" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/sandfox name = "Sandfox Ears" @@ -31,7 +31,7 @@ icon_state = "sandfox" extra_overlay = "sandfox-inner" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE //? vulp /datum/sprite_accessory/ears/vulp @@ -39,7 +39,7 @@ id = "ears_vulp_dual" icon_state = "vulp" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "vulp-inner" /datum/sprite_accessory/ears/vulp_jackal @@ -47,7 +47,7 @@ id = "ears_vulp_thin_dual" icon_state = "vulp_jackal" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "vulp_jackal-inner" /datum/sprite_accessory/ears/vulp_short @@ -55,14 +55,14 @@ id = "ears_vulp_short" icon_state = "vulp_terrier" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/vulp_short_dc name = "vulpkanin short, dual-color" id = "ears_vulp_short_dual" icon_state = "vulp_terrier" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "vulp_terrier-inner" //? wolf @@ -76,7 +76,7 @@ id = "ears_wolf_color" icon_state = "wolf" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "wolfinner" /datum/sprite_accessory/ears/wolf_green @@ -94,4 +94,4 @@ id = "lab_ears" icon_state = "lab" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/ears/animal/cervid.dm b/code/modules/sprite_accessories/ears/animal/cervid.dm index 519ca41609a3..3ce56b68b7d2 100644 --- a/code/modules/sprite_accessories/ears/animal/cervid.dm +++ b/code/modules/sprite_accessories/ears/animal/cervid.dm @@ -4,21 +4,21 @@ id = "ears_antlers_crown" icon_state = "antlercrown" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/antlers name = "antlers" id = "ears_antlers" icon_state = "antlers" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/antlers_e name = "antlers with ears" id = "ears_antlers_nohorns" icon_state = "cow-nohorns" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "antlers_mark" /datum/sprite_accessory/ears/antlers_large @@ -27,21 +27,21 @@ icon = 'icons/mob/sprite_accessories/ears_32x64.dmi' icon_state = "antlers_large" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/smallantlers name = "small antlers" id = "ears_antlers_small" icon_state = "smallantlers" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/smallantlers_e name = "small antlers with ears" id = "ears_antlers_small_ear" icon_state = "smallantlers" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "deer" //? deer @@ -50,4 +50,4 @@ id = "ears_deer" icon_state = "deer" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/ears/animal/equine.dm b/code/modules/sprite_accessories/ears/animal/equine.dm index 0cff4f18bae2..9ce0a57c1aca 100644 --- a/code/modules/sprite_accessories/ears/animal/equine.dm +++ b/code/modules/sprite_accessories/ears/animal/equine.dm @@ -4,5 +4,5 @@ id = "ears_donkey" icon_state = "donkey" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "otie-inner" diff --git a/code/modules/sprite_accessories/ears/animal/feline.dm b/code/modules/sprite_accessories/ears/animal/feline.dm index 69c2cf40c9e7..8801297eaa2a 100644 --- a/code/modules/sprite_accessories/ears/animal/feline.dm +++ b/code/modules/sprite_accessories/ears/animal/feline.dm @@ -4,7 +4,7 @@ id = "ears_kitty_color" icon_state = "kitty" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "kittyinner" /datum/sprite_accessory/ears/kittyr @@ -13,6 +13,6 @@ icon = 'icons/mob/sprite_accessories/ears_uneven.dmi' icon_state = "kittyrinner" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "kittyr" diff --git a/code/modules/sprite_accessories/ears/animal/leporid.dm b/code/modules/sprite_accessories/ears/animal/leporid.dm index 569023d9c8a3..b454b9c196a8 100644 --- a/code/modules/sprite_accessories/ears/animal/leporid.dm +++ b/code/modules/sprite_accessories/ears/animal/leporid.dm @@ -7,7 +7,7 @@ extra_overlay = "bnnuy-inner" extra_overlay2 = "bnnuy-tips" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/bnnuy2 name = "Bnnuy Ears 2" @@ -17,7 +17,7 @@ extra_overlay = "bnnuy-inner" extra_overlay2 = "bnnuy-tips2" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/bunnyalt name = "bunny 2, dual-color" @@ -25,21 +25,21 @@ icon_state = "bunny-alt" extra_overlay = "bunny-alt-inner" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/bunnyhc name = "bunny, colorable" id = "ears_bunny_colorable" icon_state = "bunny" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/bunny_floppy name = "floppy bunny ears (colorable)" id = "ears_bunny_floppy" icon_state = "floppy_bun" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/bunny_tall name = "Bunny Tall Ears" @@ -48,7 +48,7 @@ icon_state = "bunny-tall" extra_overlay = "bunny-tall-inner" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/bunny_white name = "bunny, white" @@ -61,11 +61,11 @@ icon = 'icons/mob/sprite_accessories/ears_32x64.dmi' icon_state = "rabbit-swept" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/swooped_bunny name = "Swooped bunny ears (colorable)" id = "ears_bunny_swoop" icon_state = "swooped_bunny" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/ears/animal/murid.dm b/code/modules/sprite_accessories/ears/animal/murid.dm index 69bc7e472c55..d6ff55fac90a 100644 --- a/code/modules/sprite_accessories/ears/animal/murid.dm +++ b/code/modules/sprite_accessories/ears/animal/murid.dm @@ -4,7 +4,7 @@ id = "ears_mouse" icon_state = "mouse" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "mouseinner" /datum/sprite_accessory/ears/mousehcno @@ -12,7 +12,7 @@ id = "ears_mouse_outer" icon_state = "mouse" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/mouse_grey name = "mouse, grey" diff --git a/code/modules/sprite_accessories/ears/animal/sciurid.dm b/code/modules/sprite_accessories/ears/animal/sciurid.dm index 19c2691fd254..ccf44f53c983 100644 --- a/code/modules/sprite_accessories/ears/animal/sciurid.dm +++ b/code/modules/sprite_accessories/ears/animal/sciurid.dm @@ -4,7 +4,7 @@ id = "ears_squirrel_color" icon_state = "squirrel" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/squirrel_orange name = "squirel, orange" diff --git a/code/modules/sprite_accessories/ears/animal/shark.dm b/code/modules/sprite_accessories/ears/animal/shark.dm index af1f41c6c5ea..b5e042057265 100644 --- a/code/modules/sprite_accessories/ears/animal/shark.dm +++ b/code/modules/sprite_accessories/ears/animal/shark.dm @@ -3,7 +3,7 @@ id = "shark_ears" icon_state = "shark_ears" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/sharkears/upper name = "shark ears upper" @@ -20,7 +20,7 @@ id = "shark_fin" icon_state = "shark_fin" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/sharkfinalt name = "shark fin alt" diff --git a/code/modules/sprite_accessories/ears/animal/ursid.dm b/code/modules/sprite_accessories/ears/animal/ursid.dm index b808873fd15f..4c60373c7aeb 100644 --- a/code/modules/sprite_accessories/ears/animal/ursid.dm +++ b/code/modules/sprite_accessories/ears/animal/ursid.dm @@ -14,11 +14,11 @@ id = "ears_bear_colorable" icon_state = "bear" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/smallbear name = "small bear" id = "ears_bear_small" icon_state = "smallbear" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/ears/antenna.dm b/code/modules/sprite_accessories/ears/antenna.dm index 1d7624df62bb..955af54f9516 100644 --- a/code/modules/sprite_accessories/ears/antenna.dm +++ b/code/modules/sprite_accessories/ears/antenna.dm @@ -3,32 +3,32 @@ id = "ears_antenna" icon_state = "antennae" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/curly_bug name = "curly antennae, colorable" id = "ears_antenna_curly" icon_state = "curly_bug" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/dual_robot name = "synth antennae, colorable" id = "ears_antenna_synth_dual" icon_state = "dual_robot_antennae" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/left_robot name = "left synth, colorable" id = "ears_antenna_synth_left" icon_state = "left_robot_antennae" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/right_robot name = "right synth, colorable" id = "ears_antenna_synth_right" icon_state = "right_robot_antennae" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/ears/fictional/demon.dm b/code/modules/sprite_accessories/ears/fictional/demon.dm index 841ec4656c0e..0a2139c1258a 100644 --- a/code/modules/sprite_accessories/ears/fictional/demon.dm +++ b/code/modules/sprite_accessories/ears/fictional/demon.dm @@ -8,28 +8,28 @@ id = "ears_demon_colorable" icon_state = "demon-horns1_c" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/demon_horns2 name = "demon horns, colorable(outward)" id = "ears_demon_colorable_out" icon_state = "demon-horns2" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/demon_horns3 name = "demon horns, colorable(upward)" id = "ears_demon_colorable_up" icon_state = "demon-horns3" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/demon_horns4 name = "demon horns, colorable ring(upward)" id = "ears_demon_colorable_up2" icon_state = "demon-horns4" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "demon-horns4-ring" /datum/sprite_accessory/ears/demon_horns5 @@ -37,4 +37,4 @@ id = "ears_demon_colorable_stub" icon_state = "demon-horns5" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/ears/fictional/draconic.dm b/code/modules/sprite_accessories/ears/fictional/draconic.dm index 830649977213..c08c31ccf393 100644 --- a/code/modules/sprite_accessories/ears/fictional/draconic.dm +++ b/code/modules/sprite_accessories/ears/fictional/draconic.dm @@ -3,18 +3,18 @@ id = "ears_dragon" icon_state = "dragon-horns" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/drake name = "drake frills" id = "ears_drake" icon_state = "drake" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/large_dragon name = "vary large dragon horns" id = "ears_dragon_verybig" icon_state = "big_liz" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/ears/fictional/elf.dm b/code/modules/sprite_accessories/ears/fictional/elf.dm index e4f0c670cc7b..064152d0c839 100644 --- a/code/modules/sprite_accessories/ears/fictional/elf.dm +++ b/code/modules/sprite_accessories/ears/fictional/elf.dm @@ -3,18 +3,18 @@ id = "ears_elf" icon_state = "elfs" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/elfshort name = "elven ears (short)" id = "ears_elf_short" icon_state = "elfshort" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/floppyelf name = "floppy elven ears" id = "ears_elf_floppy" icon_state = "floppy-elf" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/ears/fictional/halo.dm b/code/modules/sprite_accessories/ears/fictional/halo.dm index 41a7035f0785..4eead50aa4a1 100644 --- a/code/modules/sprite_accessories/ears/fictional/halo.dm +++ b/code/modules/sprite_accessories/ears/fictional/halo.dm @@ -6,25 +6,25 @@ id = "halo_simple" icon_state = "halosimple" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/halosimpleshatter name = "halo - simple shattered" id = "halo_simple_shatter" icon_state = "halosimpleshatter" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/halobasicangel name = "halo - basic" id = "halo_basic_angel" icon_state = "halobasic" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/halobasicshatter name = "halo - basic shattered" id = "halo_basic_shatter" icon_state = "halobasicshatter" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/ears/fictional/jackalope.dm b/code/modules/sprite_accessories/ears/fictional/jackalope.dm index 3b964e5b4215..aae93584f16f 100644 --- a/code/modules/sprite_accessories/ears/fictional/jackalope.dm +++ b/code/modules/sprite_accessories/ears/fictional/jackalope.dm @@ -5,4 +5,4 @@ icon_state = "jackalope" extra_overlay = "jackalope-antlers" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/ears/fictional/oni.dm b/code/modules/sprite_accessories/ears/fictional/oni.dm index 9e4d2639083f..78d642acaaa2 100644 --- a/code/modules/sprite_accessories/ears/fictional/oni.dm +++ b/code/modules/sprite_accessories/ears/fictional/oni.dm @@ -7,5 +7,5 @@ name = "oni horns, colorable" id = "ears_oni_color" icon_state = "oni-h1_c" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + do_colouration = TRUE + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/ears/fictional/otie.dm b/code/modules/sprite_accessories/ears/fictional/otie.dm index e5b6e55f23ad..6ee1be34ecd0 100644 --- a/code/modules/sprite_accessories/ears/fictional/otie.dm +++ b/code/modules/sprite_accessories/ears/fictional/otie.dm @@ -3,5 +3,5 @@ id = "ears_otie" icon_state = "otie" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "otie-inner" diff --git a/code/modules/sprite_accessories/ears/fictional/sergal.dm b/code/modules/sprite_accessories/ears/fictional/sergal.dm index bc241a3f1a2b..3446a6f2cb27 100644 --- a/code/modules/sprite_accessories/ears/fictional/sergal.dm +++ b/code/modules/sprite_accessories/ears/fictional/sergal.dm @@ -8,4 +8,4 @@ id = "ears_sergal_color" icon_state = "serg_plain_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/ears/fictional/shadekin.dm b/code/modules/sprite_accessories/ears/fictional/shadekin.dm index 603ed6152f15..f98560895a9b 100644 --- a/code/modules/sprite_accessories/ears/fictional/shadekin.dm +++ b/code/modules/sprite_accessories/ears/fictional/shadekin.dm @@ -3,6 +3,6 @@ id = "ears_shadekin" icon_state = "shadekin" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE apply_restrictions = TRUE species_allowed = list(SPECIES_SHADEKIN, SPECIES_SHADEKIN_CREW) diff --git a/code/modules/sprite_accessories/ears/fictional/teshari.dm b/code/modules/sprite_accessories/ears/fictional/teshari.dm index 757a09632bf9..cd25419d6630 100644 --- a/code/modules/sprite_accessories/ears/fictional/teshari.dm +++ b/code/modules/sprite_accessories/ears/fictional/teshari.dm @@ -3,7 +3,7 @@ id = "ears_teshari" icon_state = "teshari" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "teshariinner" /datum/sprite_accessory/ears/tesharihigh @@ -11,7 +11,7 @@ id = "ears_teshari_upper" icon_state = "tesharihigh" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "tesharihighinner" /datum/sprite_accessory/ears/tesharilow @@ -19,14 +19,14 @@ id = "ears_teshari_lower" icon_state = "tesharilow" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "tesharilowinner" /datum/sprite_accessory/ears/tesh_pattern_ear_male name = "Teshari male ear pattern (colorable)" id = "ears_teshari_male" icon_state = "teshari" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE do_colouration = 1 extra_overlay = "teshari_male_pattern" @@ -34,6 +34,6 @@ name = "Teshari female ear pattern (colorable)" id = "ears_teshari_female" icon_state = "teshari" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE do_colouration = 1 extra_overlay = "teshari_female_pattern" diff --git a/code/modules/sprite_accessories/ears/horns.dm b/code/modules/sprite_accessories/ears/horns.dm index c783e074f020..ad5d70f3f1b3 100644 --- a/code/modules/sprite_accessories/ears/horns.dm +++ b/code/modules/sprite_accessories/ears/horns.dm @@ -3,14 +3,14 @@ id = "ears_horns_synth_curly" icon_state = "synthhorns_curled" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/synthhorns_plain name = "Synth horns, plain" id = "ears_horns_synth_plain" icon_state = "synthhorns_plain" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "synthhorns_plain_light" /datum/sprite_accessory/ears/synthhorns_thick @@ -18,5 +18,82 @@ id = "ears_horns_synth_thick" icon_state = "synthhorns_thick" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "synthhorns_thick_light" + +/datum/sprite_accessory/ears/horns + abstract_type = /datum/sprite_accessory/ears/horns + +// todo: someone sort this shit alphabetically + +/datum/sprite_accessory/ears/horns/crippled_bull + name = "Crippled Bull Horns" + id = "horn-crippled-bull" + icon = 'icons/mob/sprite_accessory/horns/horns.dmi' + icon_state = "crippledbull" + icon_sidedness = SPRITE_ACCESSORY_SIDEDNESS_FRONT_BEHIND + do_colouration = TRUE + legacy_use_additive_color_matrix = FALSE + +/datum/sprite_accessory/ears/horns/ticketrack + name = "Ticket Rack Horns" + id = "horn-ticket-rack" + icon = 'icons/mob/sprite_accessory/horns/horns.dmi' + icon_state = "ticketrack" + do_colouration = TRUE + icon_sidedness = SPRITE_ACCESSORY_SIDEDNESS_FRONT_BEHIND + legacy_use_additive_color_matrix = FALSE + +/datum/sprite_accessory/ears/horns/hopeful_horns + name = "Hopeful Horns" + id = "horn-hopeful" + icon = 'icons/mob/sprite_accessory/horns/horns.dmi' + icon_state = "crippledbull" + icon_sidedness = SPRITE_ACCESSORY_SIDEDNESS_FRONT_BEHIND + do_colouration = TRUE + legacy_use_additive_color_matrix = FALSE + +/datum/sprite_accessory/ears/horns/broad_curls + name = "Broad Curls Horns" + id = "horn-broad-curls" + icon = 'icons/mob/sprite_accessory/horns/horns.dmi' + icon_state = "broadcurls" + icon_sidedness = SPRITE_ACCESSORY_SIDEDNESS_FRONT_BEHIND + do_colouration = TRUE + legacy_use_additive_color_matrix = FALSE + +/datum/sprite_accessory/ears/horns/painted_points + name = "Painted Points Horns" + id = "horn-painted-points" + icon = 'icons/mob/sprite_accessory/horns/horns_32x48_bottom_aligned.dmi' + icon_state = "paintedpoints" + icon_dimension_x = 32 + icon_dimension_y = 48 + icon_sidedness = SPRITE_ACCESSORY_SIDEDNESS_FRONT_BEHIND + icon_alignment = SPRITE_ACCESSORY_ALIGNMENT_BOTTOM + do_colouration = TRUE + legacy_use_additive_color_matrix = FALSE + +/datum/sprite_accessory/ears/horns/whos_horns + name = "Who's Horns" + id = "horn-whos_horns" + icon = 'icons/mob/sprite_accessory/horns/horns_32x48_bottom_aligned.dmi' + icon_state = "whoshorns" + icon_dimension_x = 32 + icon_dimension_y = 48 + icon_sidedness = SPRITE_ACCESSORY_SIDEDNESS_FRONT_BEHIND + icon_alignment = SPRITE_ACCESSORY_ALIGNMENT_BOTTOM + do_colouration = TRUE + legacy_use_additive_color_matrix = FALSE + +/datum/sprite_accessory/ears/horns/highrise + name = "High Rise Horns" + id = "horn-high-rise" + icon = 'icons/mob/sprite_accessory/horns/horns_32x48_bottom_aligned.dmi' + icon_state = "highrise" + icon_dimension_x = 32 + icon_dimension_y = 48 + icon_sidedness = SPRITE_ACCESSORY_SIDEDNESS_FRONT_BEHIND + icon_alignment = SPRITE_ACCESSORY_ALIGNMENT_BOTTOM + do_colouration = TRUE + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/ears/misc.dm b/code/modules/sprite_accessories/ears/misc.dm index 66825b1b97de..61b4723f725d 100644 --- a/code/modules/sprite_accessories/ears/misc.dm +++ b/code/modules/sprite_accessories/ears/misc.dm @@ -3,7 +3,7 @@ id = "ears_capra_horns" icon_state = "caprahorns" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/inkling name = "colorable mature inkling tentacles" @@ -11,21 +11,21 @@ icon = 'icons/mob/human_face_vr.dmi' icon_state = "inkling-colorable" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/peekinghuman name = "peeking ears" id = "ears_peeking" icon_state = "earpeek" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/sleek name = "sleek ears" id = "ears_sleek" icon_state = "sleek" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/teppiears name = "Teppi Ears" @@ -34,7 +34,7 @@ icon_state = "teppi_ears" extra_overlay = "teppi_ears_inner" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/teppihorns name = "Teppi Horns" @@ -42,7 +42,7 @@ icon = 'icons/mob/sprite_accessories/ears_32x64.dmi' icon_state = "teppi_horns" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/teppiearshorns name = "Teppi Ears and Horns" @@ -52,11 +52,11 @@ extra_overlay = "teppi_ears_inner" extra_overlay2 = "teppi_horns" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/zears name = "jagged ears" id = "ears_jagged" icon_state = "zears" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/ears/xenomorph.dm b/code/modules/sprite_accessories/ears/xenomorph.dm index aadc5076cc50..bc2bdec00515 100644 --- a/code/modules/sprite_accessories/ears/xenomorph.dm +++ b/code/modules/sprite_accessories/ears/xenomorph.dm @@ -4,7 +4,7 @@ icon = "icons/mob/sprite_accessories/xeno_parts.dmi" icon_state = "xenohead_standard" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/ears/xenohead/royal name = "Xenomorph Royal dome" diff --git a/code/modules/sprite_accessories/facial_hair/_facial_hair.dm b/code/modules/sprite_accessories/facial_hair/_facial_hair.dm index a3a56feadd56..275d9e8db949 100644 --- a/code/modules/sprite_accessories/facial_hair/_facial_hair.dm +++ b/code/modules/sprite_accessories/facial_hair/_facial_hair.dm @@ -9,174 +9,187 @@ /datum/sprite_accessory/facial_hair abstract_type = /datum/sprite_accessory/facial_hair icon = 'icons/mob/human_face_or_vr.dmi' - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE apply_restrictions = FALSE -/datum/sprite_accessory/facial_hair/shaved + /// without this, we don't put the _s at the end of the state + /// added to allow legacy hairs to work. + var/append_s_at_end = FALSE + +/datum/sprite_accessory/facial_hair/New() + ..() + if(append_s_at_end) + icon_state = "[icon_state]_s" + +/datum/sprite_accessory/facial_hair/legacy + abstract_type = /datum/sprite_accessory/facial_hair/legacy + append_s_at_end = TRUE + +/datum/sprite_accessory/facial_hair/legacy/shaved name = "Shaved" id = "fhair_shaved" icon_state = "bald" - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/facial_hair/neck_fluff +/datum/sprite_accessory/facial_hair/legacy/neck_fluff name = "Neck Fluff" id = "fhair_neckfluff" icon = 'icons/mob/human_face_or_vr.dmi' icon_state = "facial_neckfluff" - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/facial_hair/watson +/datum/sprite_accessory/facial_hair/legacy/watson name = "Watson Mustache" id = "fhair_watson" icon_state = "facial_watson" -/datum/sprite_accessory/facial_hair/hogan +/datum/sprite_accessory/facial_hair/legacy/hogan name = "Hulk Hogan Mustache" id = "fhair_hogan" icon_state = "facial_hogan" //-Neek -/datum/sprite_accessory/facial_hair/vandyke +/datum/sprite_accessory/facial_hair/legacy/vandyke name = "Van Dyke Mustache" id = "fhair_vandyke" icon_state = "facial_vandyke" -/datum/sprite_accessory/facial_hair/chaplin +/datum/sprite_accessory/facial_hair/legacy/chaplin name = "Square Mustache" id = "fhair_square" icon_state = "facial_chaplin" -/datum/sprite_accessory/facial_hair/selleck +/datum/sprite_accessory/facial_hair/legacy/selleck name = "Selleck Mustache" id = "fhair_selleck" icon_state = "facial_selleck" -/datum/sprite_accessory/facial_hair/neckbeard +/datum/sprite_accessory/facial_hair/legacy/neckbeard name = "Neckbeard" id = "fhair_neck" icon_state = "facial_neckbeard" -/datum/sprite_accessory/facial_hair/fullbeard +/datum/sprite_accessory/facial_hair/legacy/fullbeard name = "Full Beard" id = "fhair_full" icon_state = "facial_fullbeard" -/datum/sprite_accessory/facial_hair/longbeard +/datum/sprite_accessory/facial_hair/legacy/longbeard name = "Long Beard" id = "fhair_long" icon_state = "facial_longbeard" -/datum/sprite_accessory/facial_hair/vlongbeard +/datum/sprite_accessory/facial_hair/legacy/vlongbeard name = "Very Long Beard" id = "fhair_verylong" icon_state = "facial_wise" -/datum/sprite_accessory/facial_hair/elvis +/datum/sprite_accessory/facial_hair/legacy/elvis name = "Elvis Sideburns" id = "fhair_elvis" icon_state = "facial_elvis" //Fuck it, everyone is Elvis. species_allowed = list(SPECIES_HUMAN,SPECIES_PROMETHEAN,SPECIES_HUMAN_VATBORN,SPECIES_UNATHI) -/datum/sprite_accessory/facial_hair/abe +/datum/sprite_accessory/facial_hair/legacy/abe name = "Abraham Lincoln Beard" id = "fhair_lincoln" icon_state = "facial_abe" -/datum/sprite_accessory/facial_hair/chinstrap +/datum/sprite_accessory/facial_hair/legacy/chinstrap name = "Chinstrap" id = "fhair_chinstrap" icon_state = "facial_chin" -/datum/sprite_accessory/facial_hair/hip +/datum/sprite_accessory/facial_hair/legacy/hip name = "Hipster Beard" id = "fhair_hipster" icon_state = "facial_hip" -/datum/sprite_accessory/facial_hair/gt +/datum/sprite_accessory/facial_hair/legacy/gt name = "Goatee" id = "fhair_goatee" icon_state = "facial_gt" -/datum/sprite_accessory/facial_hair/jensen +/datum/sprite_accessory/facial_hair/legacy/jensen name = "Adam Jensen Beard" id = "fhair_jensen" icon_state = "facial_jensen" -/datum/sprite_accessory/facial_hair/volaju +/datum/sprite_accessory/facial_hair/legacy/volaju name = "Volaju" id = "fhair_volaju" icon_state = "facial_volaju" -/datum/sprite_accessory/facial_hair/dwarf +/datum/sprite_accessory/facial_hair/legacy/dwarf name = "Dwarf Beard" id = "fhair_dwarf" icon_state = "facial_dwarf" -/datum/sprite_accessory/facial_hair/threeOclock +/datum/sprite_accessory/facial_hair/legacy/threeOclock name = "3 O'clock Shadow" id = "fhair_3oclock" icon_state = "facial_3oclock" -/datum/sprite_accessory/facial_hair/threeOclockstache +/datum/sprite_accessory/facial_hair/legacy/threeOclockstache name = "3 O'clock Shadow and Moustache" id = "fhair_3oclock_mous" icon_state = "facial_3oclockmoustache" -/datum/sprite_accessory/facial_hair/fiveOclock +/datum/sprite_accessory/facial_hair/legacy/fiveOclock name = "5 O'clock Shadow" id = "fhair_5oclock" icon_state = "facial_5oclock" -/datum/sprite_accessory/facial_hair/fiveOclockstache +/datum/sprite_accessory/facial_hair/legacy/fiveOclockstache name = "5 O'clock Shadow and Moustache" id = "fhair_5oclock_mous" icon_state = "facial_5oclockmoustache" -/datum/sprite_accessory/facial_hair/sevenOclock +/datum/sprite_accessory/facial_hair/legacy/sevenOclock name = "7 O'clock Shadow" id = "fhair_7oclock" icon_state = "facial_7oclock" -/datum/sprite_accessory/facial_hair/sevenOclockstache +/datum/sprite_accessory/facial_hair/legacy/sevenOclockstache name = "7 O'clock Shadow and Moustache" id = "fhair_7oclock_mous" icon_state = "facial_7oclockmoustache" -/datum/sprite_accessory/facial_hair/mutton +/datum/sprite_accessory/facial_hair/legacy/mutton name = "Mutton Chops" id = "fhair_mutton" icon_state = "facial_mutton" -/datum/sprite_accessory/facial_hair/muttonstache +/datum/sprite_accessory/facial_hair/legacy/muttonstache name = "Mutton Chops and Moustache" id = "fhair_mutton_mous" icon_state = "facial_muttonmus" -/datum/sprite_accessory/facial_hair/walrus +/datum/sprite_accessory/facial_hair/legacy/walrus name = "Walrus Moustache" id = "fhair_walrus" icon_state = "facial_walrus" -/datum/sprite_accessory/facial_hair/croppedbeard +/datum/sprite_accessory/facial_hair/legacy/croppedbeard name = "Full Cropped Beard" id = "fhair_fullcrop" icon_state = "facial_croppedfullbeard" -/datum/sprite_accessory/facial_hair/chinless +/datum/sprite_accessory/facial_hair/legacy/chinless name = "Chinless Beard" id = "fhair_chinless" icon_state = "facial_chinlessbeard" -/datum/sprite_accessory/facial_hair/tribeard +/datum/sprite_accessory/facial_hair/legacy/tribeard name = "Tribeard" id = "fhair_tribeard" icon_state = "facial_tribeard" -/datum/sprite_accessory/facial_hair/moonshiner +/datum/sprite_accessory/facial_hair/legacy/moonshiner name = "Moonshiner" id = "fhair_moonshiner" icon_state = "facial_moonshiner" -/datum/sprite_accessory/facial_hair/martial +/datum/sprite_accessory/facial_hair/legacy/martial name = "Martial Artist" id = "fhair_martial" icon_state = "facial_martialartist" diff --git a/code/modules/sprite_accessories/facial_hair/tajaran.dm b/code/modules/sprite_accessories/facial_hair/tajaran.dm index f5b70e434a86..b67d0af0f564 100644 --- a/code/modules/sprite_accessories/facial_hair/tajaran.dm +++ b/code/modules/sprite_accessories/facial_hair/tajaran.dm @@ -1,39 +1,39 @@ -/datum/sprite_accessory/facial_hair/taj_sideburns +/datum/sprite_accessory/facial_hair/legacy/taj_sideburns name = "Tajaran Sideburns" id = "fhair_tajaran_sideburns" icon_state = "facial_sideburns" species_allowed = list(SPECIES_TAJ) apply_restrictions = TRUE -/datum/sprite_accessory/facial_hair/taj_mutton +/datum/sprite_accessory/facial_hair/legacy/taj_mutton name = "Tajaran Mutton" id = "fhair_tajaran_mutton" icon_state = "facial_mutton" species_allowed = list(SPECIES_TAJ) apply_restrictions = TRUE -/datum/sprite_accessory/facial_hair/taj_pencilstache +/datum/sprite_accessory/facial_hair/legacy/taj_pencilstache name = "Tajaran Pencilstache" id = "fhair_tajaran_pencilstache" icon_state = "facial_pencilstache" species_allowed = list(SPECIES_TAJ) apply_restrictions = TRUE -/datum/sprite_accessory/facial_hair/taj_moustache +/datum/sprite_accessory/facial_hair/legacy/taj_moustache name = "Tajaran Moustache" id = "fhair_tajaran_moustache" icon_state = "facial_moustache" species_allowed = list(SPECIES_TAJ) apply_restrictions = TRUE -/datum/sprite_accessory/facial_hair/taj_goatee +/datum/sprite_accessory/facial_hair/legacy/taj_goatee name = "Tajaran Goatee" id = "fhair_tajaran_goatee" icon_state = "facial_goatee" species_allowed = list(SPECIES_TAJ) apply_restrictions = TRUE -/datum/sprite_accessory/facial_hair/taj_smallstache +/datum/sprite_accessory/facial_hair/legacy/taj_smallstache name = "Tajaran Smallsatche" id = "fhair_tajaran_smallstache" icon_state = "facial_smallstache" diff --git a/code/modules/sprite_accessories/facial_hair/teshari.dm b/code/modules/sprite_accessories/facial_hair/teshari.dm index fdba2cc9fa9f..5b47a11d4968 100644 --- a/code/modules/sprite_accessories/facial_hair/teshari.dm +++ b/code/modules/sprite_accessories/facial_hair/teshari.dm @@ -1,25 +1,25 @@ //Teshari things -/datum/sprite_accessory/facial_hair/teshari_beard +/datum/sprite_accessory/facial_hair/legacy/teshari_beard name = "Teshari Beard" id = "fhair_teshari_chin" icon_state = "teshari_chin" species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/facial_hair/teshari_scraggly +/datum/sprite_accessory/facial_hair/legacy/teshari_scraggly name = "Teshari Scraggly" id = "fhair_teshari_scraggly" icon_state = "teshari_scraggly" species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/facial_hair/teshari_chops +/datum/sprite_accessory/facial_hair/legacy/teshari_chops name = "Teshari Chops" id = "fhair_teshari_chops" icon_state = "teshari_gap" species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE - gender = NEUTER + random_generation_gender = null diff --git a/code/modules/sprite_accessories/facial_hair/unathi.dm b/code/modules/sprite_accessories/facial_hair/unathi.dm index f05b1dbff7ff..4c73626c0ae4 100644 --- a/code/modules/sprite_accessories/facial_hair/unathi.dm +++ b/code/modules/sprite_accessories/facial_hair/unathi.dm @@ -1,24 +1,24 @@ //unathi horn beards and the like -/datum/sprite_accessory/facial_hair/una_chinhorn +/datum/sprite_accessory/facial_hair/legacy/una_chinhorn name = "Unathi Chin Horn" id = "fhair_unathi_chin" icon_state = "facial_chinhorns" species_allowed = list(SPECIES_UNATHI) -/datum/sprite_accessory/facial_hair/una_hornadorns +/datum/sprite_accessory/facial_hair/legacy/una_hornadorns name = "Unathi Horn Adorns" id = "fhair_unathi_adorns" icon_state = "facial_hornadorns" species_allowed = list(SPECIES_UNATHI) -/datum/sprite_accessory/facial_hair/una_spinespikes +/datum/sprite_accessory/facial_hair/legacy/una_spinespikes name = "Unathi Spine Spikes" id = "fhair_unathi_spikes" icon_state = "facial_spikes" species_allowed = list(SPECIES_UNATHI) -/datum/sprite_accessory/facial_hair/una_dorsalfrill +/datum/sprite_accessory/facial_hair/legacy/una_dorsalfrill name = "Unathi Dorsal Frill" id = "fhair_unathi_dorsalfrill" icon_state = "facial_dorsalfrill" diff --git a/code/modules/sprite_accessories/facial_hair/vox.dm b/code/modules/sprite_accessories/facial_hair/vox.dm index 647f26246970..4ba8ff4ba36a 100644 --- a/code/modules/sprite_accessories/facial_hair/vox.dm +++ b/code/modules/sprite_accessories/facial_hair/vox.dm @@ -1,41 +1,41 @@ // More Vox things -/datum/sprite_accessory/facial_hair/vox_face_colonel +/datum/sprite_accessory/facial_hair/legacy/vox_face_colonel name = "Vox Colonel" id = "fhair_vox_colonel" icon_state = "vox_colonel" species_allowed = list(SPECIES_VOX) apply_restrictions = TRUE -/datum/sprite_accessory/facial_hair/vox_face_fu +/datum/sprite_accessory/facial_hair/legacy/vox_face_fu name = "Quill Fu" id = "fhair_vox_quillfu" icon_state = "vox_fu" species_allowed = list(SPECIES_VOX) apply_restrictions = TRUE -/datum/sprite_accessory/facial_hair/vox_face_neck +/datum/sprite_accessory/facial_hair/legacy/vox_face_neck name = "Neck Quills" id = "fhair_vox_neck" icon_state = "vox_neck" species_allowed = list(SPECIES_VOX) apply_restrictions = TRUE -/datum/sprite_accessory/facial_hair/vox_face_beard +/datum/sprite_accessory/facial_hair/legacy/vox_face_beard name = "Quill Beard" id = "fhair_vox_beard" icon_state = "vox_beard" species_allowed = list(SPECIES_VOX) apply_restrictions = TRUE -/datum/sprite_accessory/facial_hair/vox_ruff_beard +/datum/sprite_accessory/facial_hair/legacy/vox_ruff_beard name = "Ruff Beard" id = "fhair_vox_ruff" icon_state = "vox_ruff_beard" species_allowed = list(SPECIES_VOX) apply_restrictions = TRUE -/datum/sprite_accessory/facial_hair/vox_shaved_beard +/datum/sprite_accessory/facial_hair/legacy/vox_shaved_beard name = "Vox Shaved" id = "fhair_vox_shaved" icon_state = "vox_bald" diff --git a/code/modules/sprite_accessories/facial_hair/vulpkanin.dm b/code/modules/sprite_accessories/facial_hair/vulpkanin.dm index 3ec4b24b299d..2d6835766c64 100644 --- a/code/modules/sprite_accessories/facial_hair/vulpkanin.dm +++ b/code/modules/sprite_accessories/facial_hair/vulpkanin.dm @@ -1,80 +1,80 @@ -/datum/sprite_accessory/facial_hair/vulp_none +/datum/sprite_accessory/facial_hair/legacy/vulp_none name = "None" id = "fhair_vulp_none" icon = 'icons/mob/human_face_vr.dmi' icon_state = "none" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) apply_restrictions = TRUE - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/facial_hair/vulp_blaze +/datum/sprite_accessory/facial_hair/legacy/vulp_blaze name = "Blaze" id = "fhair_vulp_blaze" icon = 'icons/mob/human_face_vr.dmi' icon_state = "vulp_facial_blaze" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) apply_restrictions = TRUE - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/facial_hair/vulp_vulpine +/datum/sprite_accessory/facial_hair/legacy/vulp_vulpine name = "Vulpine" id = "fhair_vulp_vulpine" icon = 'icons/mob/human_face_vr.dmi' icon_state = "vulp_facial_vulpine" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) apply_restrictions = TRUE - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/facial_hair/vulp_earfluff +/datum/sprite_accessory/facial_hair/legacy/vulp_earfluff name = "Earfluff" id = "fhair_vulp_earfluff" icon = 'icons/mob/human_face_vr.dmi' icon_state = "vulp_facial_earfluff" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) apply_restrictions = TRUE - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/facial_hair/vulp_mask +/datum/sprite_accessory/facial_hair/legacy/vulp_mask name = "Mask" id = "fhair_vulp_mask" icon = 'icons/mob/human_face_vr.dmi' icon_state = "vulp_facial_mask" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) apply_restrictions = TRUE - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/facial_hair/vulp_patch +/datum/sprite_accessory/facial_hair/legacy/vulp_patch name = "Patch" id = "fhair_vulp_patch" icon = 'icons/mob/human_face_vr.dmi' icon_state = "vulp_facial_patch" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) apply_restrictions = TRUE - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/facial_hair/vulp_ruff +/datum/sprite_accessory/facial_hair/legacy/vulp_ruff name = "Ruff" id = "fhair_vulp_ruff" icon = 'icons/mob/human_face_vr.dmi' icon_state = "vulp_facial_ruff" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) apply_restrictions = TRUE - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/facial_hair/vulp_kita +/datum/sprite_accessory/facial_hair/legacy/vulp_kita name = "Kita" id = "fhair_vulp_kita" icon = 'icons/mob/human_face_vr.dmi' icon_state = "vulp_facial_kita" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) apply_restrictions = TRUE - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/facial_hair/vulp_swift +/datum/sprite_accessory/facial_hair/legacy/vulp_swift name = "Swift" id = "fhair_vulp_swift" icon = 'icons/mob/human_face_vr.dmi' icon_state = "vulp_facial_swift" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) apply_restrictions = TRUE - gender = NEUTER + random_generation_gender = null diff --git a/code/modules/sprite_accessories/hair.dm b/code/modules/sprite_accessories/hair.dm new file mode 100644 index 000000000000..bc278dfe33bf --- /dev/null +++ b/code/modules/sprite_accessories/hair.dm @@ -0,0 +1,109 @@ +GLOBAL_LIST_INIT(hair_gradients, list( + "None" = "none", + "Fade (Up)" = "fadeup", + "Fade Low (Up)" = "fadeup_low", + "Fade (Down)" = "fadedown", + "Fade Low (Down)" = "fadedown_low", + "Fade High (Down)" = "fadedown_high", + "Reflected (Center)"= "reflected", + "Reflected Inverse (Center)"= "reflected_inverse", + "Vertical Split (Back)"= "vsplit_back", + "Vertical Split" = "vsplit", + "Vertical Split (Back, Front Effect)"= "vsplit_dual", + "Bottom (Flat)" = "bottomflat", + "Shoulders (Flat)" = "shouldersflat", + "Wavy" = "wavy", + "Wavy Sharp Spikes" = "wavy_spiked", + "Wavy Smooth Spikes" = "wavy_smooth", + "Wavy Smoothish Spikes" = "wavy_smooth2", + "Striped" = "striped", + "Striped (Vertical)"= "striped_vertical" + )) + +GLOBAL_LIST_EMPTY(hair_gradient_icon_cache) + +// todo: should we really be doing this? +/proc/hair_gradient_icon(id, list/image/layers_or_singular, gradient, width = WORLD_ICON_SIZE) + var/image/casted_single = layers_or_singular + var/cache_key = "[gradient]-[width]-[id]-[islist(layers_or_singular)? "combined" : casted_single.icon_state]" + if(isnull(GLOB.hair_gradient_icon_cache[cache_key])) + var/icon/combined + if(islist(layers_or_singular)) + combined = icon('icons/system/blank_32x32.dmi', "4-dir") + // gather all layers + for(var/image/layer as anything in layers_or_singular) + combined.Blend(icon(layer.icon, layer.icon_state, frame = 1), ICON_OVERLAY) + else + combined = icon(casted_single.icon, casted_single.icon_state) + // gather gradient + var/icon/cutting = icon('icons/mob/hair_gradients.dmi', GLOB.hair_gradients[gradient]) + // we can't make it any taller but we can make it wider.. + cutting.Scale(width, cutting.Height()) + // and them together + cutting.Blend(combined, ICON_AND) + // set; gradient should just be a grayscale (or otherwise) part of the hair where the gradient covers now. + GLOB.hair_gradient_icon_cache[cache_key] = cutting + return GLOB.hair_gradient_icon_cache[cache_key] + +/datum/sprite_accessory/hair + abstract_type = /datum/sprite_accessory/hair + icon = 'icons/mob/human_face_m.dmi' // default icon for all hairs + //Enhanced colours and hair for all + legacy_use_additive_color_matrix = FALSE + apply_restrictions = FALSE + + /// ignored if new has_add_state is specified + var/icon_add_legacy = 'icons/mob/human_face.dmi' + var/hair_flags + /// without this, we don't put the _s at the end of the state + /// added to allow legacy hairs to work. + var/append_s_at_end = FALSE + +/datum/sprite_accessory/hair/New() + ..() + if(append_s_at_end) + icon_state = "[icon_state]_s" + +/datum/sprite_accessory/hair/render(mob/for_whom, list/colors, layer_front, layer_behind, layer_side, with_base_state, with_variation, flattened) + var/list/image/layers = ..() + + if(flattened) + return layers + + for(var/image/rendered as anything in layers) + // first add the add state + if(has_add_state) + // if we have that don't do legacy behavior + else if(icon_add_legacy) + var/image/adding = image(icon_add_legacy, icon_state = icon_state) + adding.blend_mode = BLEND_ADD + adding.appearance_flags = RESET_COLOR + rendered.overlays += adding + + // then deal with gradient if we have to + if(do_colouration && ishuman(for_whom)) + var/mob/living/carbon/human/casted_human = for_whom + if(casted_human.grad_style && casted_human.grad_style != "None") + var/image/gradient_icon = image(hair_gradient_icon(id, rendered, casted_human.grad_style, icon_dimension_x)) + gradient_icon.color = rgb( + casted_human.r_grad, + casted_human.g_grad, + casted_human.b_grad, + ) + gradient_icon.blend_mode = BLEND_OVERLAY + gradient_icon.appearance_flags = RESET_COLOR + rendered.overlays += gradient_icon + + return layers + +/datum/sprite_accessory/hair/flat_cache_keys(mob/for_whom, list/colors, layer_front, layer_behind, layer_side, with_base_state = icon_state, with_variation, flattened) + . = ..() + if(!ishuman(for_whom)) + return + var/mob/living/carbon/human/casted_human = for_whom + . += casted_human.grad_style + . += rgb(casted_human.r_grad, casted_human.g_grad, casted_human.b_grad) + +/datum/sprite_accessory/hair/legacy + abstract_type = /datum/sprite_accessory/hair/legacy + append_s_at_end = TRUE diff --git a/code/modules/sprite_accessories/hair/hair.dm b/code/modules/sprite_accessories/hair/hair.dm new file mode 100644 index 000000000000..f7ff7b5e0be0 --- /dev/null +++ b/code/modules/sprite_accessories/hair/hair.dm @@ -0,0 +1,177 @@ +//* This file is explicitly licensed under the MIT license. *// +//* Copyright (c) 2024 silicons *// + +/* +ATTENTION! This file is dedicated to all "modern hair sprites"; that only require white/ +greyscaling sprites to be added and rendered and do NOT need their darkscale counterparts. +If you're looking to add or port hair sprites, this is the place to add them. + +"Where should I add the sprite?" +> These sprites are located in icons/mob/sprite_accessory/hair/hair.dmi + +"How do I know if the name I came up for my hair sprite isn't taken?" +> Check both hair.dm (this very file) and legacy.dm (the neighbouring file) and ctrl + F. All +hairstyles should be in either of these files. How am I sure? I don't fucking know. I hope +they are. This code is a mess. +*/ + +/datum/sprite_accessory/hair/simple + name = "Simple (Normal)" + id = "hair-normal-simple" + icon = 'icons/mob/sprite_accessory/hair/hair.dmi' + icon_state = "simple" + icon_add_legacy = null + hair_flags = HAIR_TIEABLE + +/datum/sprite_accessory/hair/simple_long + name = "Simple (Long)" + id = "hair-long-simple" + icon = 'icons/mob/sprite_accessory/hair/hair.dmi' + icon_state = "simple_long" + icon_add_legacy = null + hair_flags = HAIR_TIEABLE + +/datum/sprite_accessory/hair/simple_short + name = "Simple (Short)" + id = "hair-short-simple" + icon = 'icons/mob/sprite_accessory/hair/hair.dmi' + icon_state = "simple_short" + icon_add_legacy = null + hair_flags = HAIR_TIEABLE + +/datum/sprite_accessory/hair/strict + name = "Strict" + id = "hair-strict" + icon = 'icons/mob/sprite_accessory/hair/hair.dmi' + icon_state = "strict" + icon_add_legacy = null + hair_flags = HAIR_TIEABLE + +/datum/sprite_accessory/hair/strict_long + name = "Strict (Long)" + id = "hair-strict-long" + icon = 'icons/mob/sprite_accessory/hair/hair.dmi' + icon_state = "strict_long" + icon_add_legacy = null + hair_flags = HAIR_TIEABLE + +/datum/sprite_accessory/hair/strict_short + name = "Strict (Short)" + id = "hair-strict-short" + icon = 'icons/mob/sprite_accessory/hair/hair.dmi' + icon_state = "strict_short" + icon_add_legacy = null + hair_flags = HAIR_TIEABLE + +/datum/sprite_accessory/hair/bonnie + name = "Bonnie" + id = "hair-bonnie" + icon = 'icons/mob/sprite_accessory/hair/hair.dmi' + icon_state = "bonnie" + icon_add_legacy = null + hair_flags = HAIR_TIEABLE + +/datum/sprite_accessory/hair/bonnie_short + name = "Bonnie (Short)" + id = "hair-bonnie-short" + icon = 'icons/mob/sprite_accessory/hair/hair.dmi' + icon_state = "bonnie_short" + icon_add_legacy = null + hair_flags = HAIR_TIEABLE + +/datum/sprite_accessory/hair/bonnie_long + name = "Bonnie (Long)" + id = "hair-bonnie-long" + icon = 'icons/mob/sprite_accessory/hair/hair.dmi' + icon_state = "bonnie_long" + icon_add_legacy = null + hair_flags = HAIR_TIEABLE + +/datum/sprite_accessory/hair/bonnie_alt + name = "Bonnie (Alt)" + id = "hair-bonnie-alt" + icon = 'icons/mob/sprite_accessory/hair/hair.dmi' + icon_state = "bonnie_alt" + icon_add_legacy = null + hair_flags = HAIR_TIEABLE + +/datum/sprite_accessory/hair/bonnie_alt_long + name = "Bonnie (Alt, Long)" + id = "hair-bonnie-alt-long" + icon = 'icons/mob/sprite_accessory/hair/hair.dmi' + icon_state = "bonnie_alt_long" + icon_add_legacy = null + hair_flags = HAIR_TIEABLE + +/datum/sprite_accessory/hair/bonnie_alt_short + name = "Bonnie (Alt, Short)" + id = "hair-bonnie-alt-short" + icon = 'icons/mob/sprite_accessory/hair/hair.dmi' + icon_state = "bonnie_alt_short" + icon_add_legacy = null + hair_flags = HAIR_TIEABLE + +/datum/sprite_accessory/hair/dawn + name = "Dawn" + id = "hair-dawn" + icon = 'icons/mob/sprite_accessory/hair/hair.dmi' + icon_state = "dawn" + icon_add_legacy = null + hair_flags = HAIR_TIEABLE + +// the short version of this hair is in legacy.dm +/datum/sprite_accessory/hair/fluffy_long + name = "Fluffy Long" + id = "hair-fluffy-long" + icon = 'icons/mob/sprite_accessory/hair/hair.dmi' + icon_state = "hair_fluffy_long" + icon_add_legacy = null + hair_flags = HAIR_TIEABLE + +/datum/sprite_accessory/hair/khmuro + name = "Khmuro" + id = "hair-khmuro" + icon = 'icons/mob/sprite_accessory/hair/hair.dmi' + icon_state = "khmuro" + icon_add_legacy = null + hair_flags = HAIR_TIEABLE + +/datum/sprite_accessory/hair/kobeni_right + name = "Kobeni (Right)" + id = "hair-kobeni-right" + icon = 'icons/mob/sprite_accessory/hair/hair.dmi' + icon_state = "kobeni_r" + icon_add_legacy = null + hair_flags = HAIR_TIEABLE + +/datum/sprite_accessory/hair/kobeni_left + name = "Kobeni (Left)" + id = "hair-kobeni-left" + icon = 'icons/mob/sprite_accessory/hair/hair.dmi' + icon_state = "kobeni_l" + icon_add_legacy = null + hair_flags = HAIR_TIEABLE + +/datum/sprite_accessory/hair/morning + name = "Morning" + id = "hair-morning" + icon = 'icons/mob/sprite_accessory/hair/hair.dmi' + icon_state = "morning" + icon_add_legacy = null + hair_flags = HAIR_TIEABLE + +/datum/sprite_accessory/hair/upward + name = "Upward" + id = "hair-upward" + icon = 'icons/mob/sprite_accessory/hair/hair.dmi' + icon_state = "upward" + icon_add_legacy = null + hair_flags = HAIR_TIEABLE + +/datum/sprite_accessory/hair/highlander + name = "Highlander" + id = "hair-highlander" + icon = 'icons/mob/sprite_accessory/hair/hair.dmi' + icon_state = "highlander" + icon_add_legacy = null + hair_flags = HAIR_TIEABLE diff --git a/code/modules/sprite_accessories/hair/_hair.dm b/code/modules/sprite_accessories/hair/legacy.dm similarity index 62% rename from code/modules/sprite_accessories/hair/_hair.dm rename to code/modules/sprite_accessories/hair/legacy.dm index 68b460887f04..69ad9e425585 100644 --- a/code/modules/sprite_accessories/hair/_hair.dm +++ b/code/modules/sprite_accessories/hair/legacy.dm @@ -1,1700 +1,1696 @@ /* -//////////////////////////// -/ =--------------------= / -/ == Hair Definitions == / -/ =--------------------= / -//////////////////////////// -*/ +You probably shouldn't be messing with this file anymore. Use hair.dm + +ATTENTION! Hair sprites NOT contained in icons/mob/sprite_accessory/hair/hair.dm go here and +are considered "legacy hair sprites"; that use darkscaling (a-k-a obsolete scaling) instead +of white/greyscaling. In other words, these are all the hairstyles added BEFORE April 2024. +Hopefully, no one will ever wanna touch this file ever again in the history of Citadel:RP. -/datum/sprite_accessory/hair - abstract_type = /datum/sprite_accessory/hair - icon = 'icons/mob/human_face_m.dmi' // default icon for all hairs - var/icon_add = 'icons/mob/human_face.dmi' - //Enhanced colours and hair for all - color_blend_mode = ICON_MULTIPLY - apply_restrictions = FALSE - var/hair_flags +These sprites are scattered around icons/mob/human_face.dmi, human_face_vr.dmi (and the +many other .dmi files that start with "human_face".) +*/ -/datum/sprite_accessory/hair/eighties +/datum/sprite_accessory/hair/legacy/eighties name = "80's" id = "hair_80s" icon_state = "hair_80s" -/datum/sprite_accessory/hair/eighties_alt +/datum/sprite_accessory/hair/legacy/eighties_alt name = "80's (Alternative)" id = "hair_80s_alt" icon_state = "hair_80s_alt" -/datum/sprite_accessory/hair/afro +/datum/sprite_accessory/hair/legacy/afro name = "Afro" id = "hair_afro" icon_state = "hair_afro" -/datum/sprite_accessory/hair/afro2 +/datum/sprite_accessory/hair/legacy/afro2 name = "Afro 2" id = "hair_afro2" icon_state = "hair_afro2" -/datum/sprite_accessory/hair/afro_large +/datum/sprite_accessory/hair/legacy/afro_large name = "Big Afro" id = "hair_afro_big" icon_state = "hair_bigafro" -/datum/sprite_accessory/hair/ahoge +/datum/sprite_accessory/hair/legacy/ahoge name = "Ahoge" id = "hair_ahoge" icon_state = "hair_ahoge" icon = 'icons/mob/human_face_vr.dmi' - icon_add = null + icon_add_legacy = null -/datum/sprite_accessory/hair/bald //Everyone goes bald. +/datum/sprite_accessory/hair/legacy/bald //Everyone goes bald. name = "Bald" id = "hair_bald" icon_state = "bald" - gender = MALE + random_generation_gender = MALE hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/baldfade +/datum/sprite_accessory/hair/legacy/baldfade name = "Balding Fade" id = "hair_balding_fade" icon_state = "hair_baldfade" - gender = MALE + random_generation_gender = MALE hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/balding +/datum/sprite_accessory/hair/legacy/balding name = "Balding Hair" id = "hair_balding" icon_state = "hair_e" - gender = MALE + random_generation_gender = MALE hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/bedhead +/datum/sprite_accessory/hair/legacy/bedhead name = "Bedhead" id = "hair_bedhead" icon_state = "hair_bedhead" -/datum/sprite_accessory/hair/bedhead2 +/datum/sprite_accessory/hair/legacy/bedhead2 name = "Bedhead 2" id = "hair_bedhead2" icon_state = "hair_bedheadv2" -/datum/sprite_accessory/hair/bedhead3 +/datum/sprite_accessory/hair/legacy/bedhead3 name = "Bedhead 3" id = "hair_bedhead3" icon_state = "hair_bedheadv3" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/bedheadlong +/datum/sprite_accessory/hair/legacy/bedheadlong name = "Bedhead Long" id = "hair_bedhead_long" icon_state = "hair_long_bedhead" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/bedheadlongest +/datum/sprite_accessory/hair/legacy/bedheadlongest name = "Bedhead Concerning" id = "hair_bedhead_longest" icon_state = "hair_longest_bedhead" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/beehive +/datum/sprite_accessory/hair/legacy/beehive name = "Beehive" id = "hair_beehive" icon_state = "hair_beehive" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/beehive2 +/datum/sprite_accessory/hair/legacy/beehive2 name = "Beehive 2" id = "hair_beehive2" icon_state = "hair_beehive2" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/belenko +/datum/sprite_accessory/hair/legacy/belenko name = "Belenko" id = "hair_balenko" icon_state = "hair_belenko" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/belenkotied +/datum/sprite_accessory/hair/legacy/belenkotied name = "Belenko Tied" id = "hair_balenko_tied" icon_state = "hair_belenkotied" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/bob +/datum/sprite_accessory/hair/legacy/bob name = "Bob" id = "hair_bob" icon_state = "hair_bobcut" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/bobcutalt +/datum/sprite_accessory/hair/legacy/bobcutalt name = "Bob Chin Length" id = "hair_bob_chin" icon_state = "hair_bobcutalt" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/bobcurl +/datum/sprite_accessory/hair/legacy/bobcurl name = "Bobcurl" id = "hair_bob_curl" icon_state = "hair_bobcurl" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/bowl +/datum/sprite_accessory/hair/legacy/bowl name = "Bowl" id = "hair_bowlcut" icon_state = "hair_bowlcut" -/datum/sprite_accessory/hair/bowlcut2 +/datum/sprite_accessory/hair/legacy/bowlcut2 name = "Bowl 2" id = "hair_bowlcut2" icon_state = "hair_bowlcut2" -/datum/sprite_accessory/hair/grandebraid +/datum/sprite_accessory/hair/legacy/grandebraid name = "Braid Grande" id = "hair_braid_grande" icon_state = "hair_grande" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/braid2 +/datum/sprite_accessory/hair/legacy/braid2 name = "Braid Long" id = "hair_braid_long" icon_state = "hair_hbraid" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/braid_medium +/datum/sprite_accessory/hair/legacy/braid_medium name = "Braid Medium" id = "hair_braid_medium" icon_state = "hair_mediumbraid" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/braid_short +/datum/sprite_accessory/hair/legacy/braid_short name = "Braid Short" id = "hair_braid_short" icon_state = "hair_shortbraid" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/braid +/datum/sprite_accessory/hair/legacy/braid name = "Floorlength Braid" id = "hair_braid_floorlength" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "hair_braid" -/datum/sprite_accessory/hair/bun +/datum/sprite_accessory/hair/legacy/bun name = "Bun" id = "hair_bun" icon_state = "hair_bun" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/bun2 +/datum/sprite_accessory/hair/legacy/bun2 name = "Bun 2" id = "hair_bun2" icon_state = "hair_bun2" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/bun3 +/datum/sprite_accessory/hair/legacy/bun3 name = "Bun 3" id = "hair_bun3" icon_state = "hair_bun3" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/bun +/datum/sprite_accessory/hair/legacy/bun name = "Bun Casual" id = "hair_bun_casual" icon_state = "hair_bun" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/doublebun +/datum/sprite_accessory/hair/legacy/doublebun name = "Bun Double" id = "hair_bun_double" icon_state = "hair_doublebun" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/tightbun +/datum/sprite_accessory/hair/legacy/tightbun name = "Bun Tight" id = "hair_bun_tight" icon_state = "hair_tightbun" - gender = FEMALE + random_generation_gender = FEMALE hair_flags = HAIR_VERY_SHORT | HAIR_TIEABLE -/datum/sprite_accessory/hair/buzz +/datum/sprite_accessory/hair/legacy/buzz name = "Buzzcut" id = "hair_buzzcut" icon_state = "hair_buzzcut" hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/crono +/datum/sprite_accessory/hair/legacy/crono name = "Chrono" id = "hair_chrono" icon_state = "hair_toriyama" -/datum/sprite_accessory/hair/cia +/datum/sprite_accessory/hair/legacy/cia name = "CIA" id = "hair_cia" icon_state = "hair_cia" -/datum/sprite_accessory/hair/coffeehouse +/datum/sprite_accessory/hair/legacy/coffeehouse name = "Coffee House Cut" id = "hair_coffeehouse" icon_state = "hair_coffeehouse" - gender = MALE + random_generation_gender = MALE hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/combover +/datum/sprite_accessory/hair/legacy/combover name = "Combover" id = "hair_combover" icon_state = "hair_combover" -/datum/sprite_accessory/hair/country +/datum/sprite_accessory/hair/legacy/country name = "Country" id = "hair_country" icon_state = "hair_country" -/datum/sprite_accessory/hair/crew +/datum/sprite_accessory/hair/legacy/crew name = "Crewcut" id = "hair_crewcut" icon_state = "hair_crewcut" hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/curls +/datum/sprite_accessory/hair/legacy/curls name = "Curls" id = "hair_curls" icon_state = "hair_curls" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/cut +/datum/sprite_accessory/hair/legacy/cut name = "Cut Hair" id = "hair_cut" icon_state = "hair_c" hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/damsel +/datum/sprite_accessory/hair/legacy/damsel name = "Damsel" id = "hair_damsel" icon_state = "hair_damsel" -/datum/sprite_accessory/hair/dave +/datum/sprite_accessory/hair/legacy/dave name = "Dave" id = "hair_dave" icon_state = "hair_dave" -/datum/sprite_accessory/hair/devillock +/datum/sprite_accessory/hair/legacy/devillock name = "Devil Lock" id = "hair_devillock" icon_state = "hair_devilock" -/datum/sprite_accessory/hair/diagonal_bangs +/datum/sprite_accessory/hair/legacy/diagonal_bangs name = "Diagonal Bangs" id = "hair_diagonalbangs" icon_state = "hair_diagonal_bangs" -/datum/sprite_accessory/hair/dreadlocks +/datum/sprite_accessory/hair/legacy/dreadlocks name = "Dreadlocks" id = "hair_dreadlocks" icon_state = "hair_dreads" -/datum/sprite_accessory/hair/mahdrills +/datum/sprite_accessory/hair/legacy/mahdrills name = "Drillruru" id = "hair_drillruru" icon_state = "hair_drillruru" -/datum/sprite_accessory/hair/emo +/datum/sprite_accessory/hair/legacy/emo name = "Emo" id = "hair_emo" icon_state = "hair_emo" -/datum/sprite_accessory/hair/emo2 +/datum/sprite_accessory/hair/legacy/emo2 name = "Emo Alt" id = "hair_emo_alt" icon_state = "hair_emo2" -/datum/sprite_accessory/hair/fringeemo +/datum/sprite_accessory/hair/legacy/fringeemo name = "Emo Fringe" id = "hair_emo_fringe" icon_state = "hair_emofringe" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/halfshaved +/datum/sprite_accessory/hair/legacy/halfshaved name = "Emo Half-Shaved" id = "hair_emo_halfshave" icon_state = "hair_halfshaved" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/longemo +/datum/sprite_accessory/hair/legacy/longemo name = "Emo Long" id = "hair_emo_long" icon_state = "hair_emolong" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/highfade +/datum/sprite_accessory/hair/legacy/highfade name = "Fade High" id = "hair_fade_high" icon_state = "hair_highfade" - gender = MALE + random_generation_gender = MALE hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/medfade +/datum/sprite_accessory/hair/legacy/medfade name = "Fade Medium" id = "hair_fade_medium" icon_state = "hair_medfade" hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/lowfade +/datum/sprite_accessory/hair/legacy/lowfade name = "Fade Low" id = "hair_fade_low" icon_state = "hair_lowfade" - gender = MALE + random_generation_gender = MALE hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/partfade +/datum/sprite_accessory/hair/legacy/partfade name = "Fade Parted" id = "hair_fade_parted" icon_state = "hair_shavedpart" - gender = MALE + random_generation_gender = MALE hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/familyman +/datum/sprite_accessory/hair/legacy/familyman name = "Family Man" id = "hair_familyman" icon_state = "hair_thefamilyman" -/datum/sprite_accessory/hair/father +/datum/sprite_accessory/hair/legacy/father name = "Father" id = "hair_father" icon_state = "hair_father" -/datum/sprite_accessory/hair/feather +/datum/sprite_accessory/hair/legacy/feather name = "Feather" id = "hair_feather" icon_state = "hair_feather" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/flair +/datum/sprite_accessory/hair/legacy/flair name = "Flaired Hair" id = "hair_flair" icon_state = "hair_flair" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/sargeant +/datum/sprite_accessory/hair/legacy/sargeant name = "Flat Top" id = "hair_sargeant" icon_state = "hair_sargeant" hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/flowhair +/datum/sprite_accessory/hair/legacy/flowhair name = "Flow Hair" id = "hair_flow" icon_state = "hair_f" -/datum/sprite_accessory/hair/fluffy_short +// the long version of this hairstyle is in hair.dm +/datum/sprite_accessory/hair/legacy/fluffy_short name = "Fluffy Short" id = "hair_fluffy_short" icon_state = "hair_fluffy_short" -/datum/sprite_accessory/hair/longfringe +/datum/sprite_accessory/hair/legacy/longfringe name = "Fringe Long" id = "hair_fringe_long" icon_state = "hair_longfringe" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/longestalt +/datum/sprite_accessory/hair/legacy/longestalt name = "Fringe Longer" id = "hair_fringe_verylong" icon_state = "hair_vlongfringe" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/fringetail +/datum/sprite_accessory/hair/legacy/fringetail name = "Fringetail" id = "hair_fringe_tail" icon_state = "hair_fringetail" hair_flags = HAIR_TIEABLE|HAIR_VERY_SHORT -/datum/sprite_accessory/hair/gelled +/datum/sprite_accessory/hair/legacy/gelled name = "Gelled Back" id = "hair_gelled" icon_state = "hair_gelled" -/datum/sprite_accessory/hair/gentle +/datum/sprite_accessory/hair/legacy/gentle name = "Gentle" id = "hair_gentle" icon_state = "hair_gentle" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/glamour +/datum/sprite_accessory/hair/legacy/glamour name = "Glamour" id = "hair_glamour" icon_state = "hair_glamour" -/datum/sprite_accessory/hair/glossy +/datum/sprite_accessory/hair/legacy/glossy name = "Glossy" id = "hair_glossy" icon_state = "hair_glossy" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/hairfre +/datum/sprite_accessory/hair/legacy/hairfre name = "Hairfre" id = "hair_hairfre" icon_state = "hair_hairfre" -/datum/sprite_accessory/hair/halfbang +/datum/sprite_accessory/hair/legacy/halfbang name = "Half-banged Hair" id = "hair_halfbang" icon_state = "hair_halfbang" -/datum/sprite_accessory/hair/halfbangalt +/datum/sprite_accessory/hair/legacy/halfbangalt name = "Half-banged Hair Alt" id = "hair_halfbang_alt" icon_state = "hair_halfbang_alt" -/datum/sprite_accessory/hair/hedgehog +/datum/sprite_accessory/hair/legacy/hedgehog name = "Hedgehog Hair" id = "hair_hedgehog" icon_state = "hair_hedgehog" - icon_add = null + icon_add_legacy = null -/datum/sprite_accessory/hair/hightight +/datum/sprite_accessory/hair/legacy/hightight name = "High and Tight" id = "hair_hightight" icon_state = "hair_hightight" hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/himecut +/datum/sprite_accessory/hair/legacy/himecut name = "Hime Cut" id = "hair_hime" icon_state = "hair_himecut" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/shorthime +/datum/sprite_accessory/hair/legacy/shorthime name = "Hime Cut Short" id = "hair_hime_short" icon_state = "hair_shorthime" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/hitop +/datum/sprite_accessory/hair/legacy/hitop name = "Hitop" id = "hair_hitop" icon_state = "hair_hitop" -/datum/sprite_accessory/hair/jade +/datum/sprite_accessory/hair/legacy/jade name = "Jade" id = "hair_jade" icon_state = "hair_jade" -/datum/sprite_accessory/hair/jay +/datum/sprite_accessory/hair/legacy/jay name = "Jay" id = "hair_jay" icon_state = "hair_jay" -/datum/sprite_accessory/hair/jensen +/datum/sprite_accessory/hair/legacy/jensen name = "Jensen" id = "hair_jensen" icon_state = "hair_jensen" -/datum/sprite_accessory/hair/joestar +/datum/sprite_accessory/hair/legacy/joestar name = "Joestar" id = "hair_joestar" icon_state = "hair_joestar" -/datum/sprite_accessory/hair/kagami +/datum/sprite_accessory/hair/legacy/kagami name = "Kagami" id = "hair_kagami" icon_state = "hair_kagami" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/kusangi +/datum/sprite_accessory/hair/legacy/kusangi name = "Kusanagi Hair" id = "hair_kusanagi" icon_state = "hair_kusanagi" -/datum/sprite_accessory/hair/long +/datum/sprite_accessory/hair/legacy/long name = "Long Hair Shoulder-length" id = "hair_long_shoulder" icon_state = "hair_b" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/longer +/datum/sprite_accessory/hair/legacy/longer name = "Long Hair" id = "hair_long" icon_state = "hair_vlong" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/longeralt2 +/datum/sprite_accessory/hair/legacy/longeralt2 name = "Long Hair Alt 2" id = "hair_long_alt" icon_state = "hair_longeralt2" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/longest +/datum/sprite_accessory/hair/legacy/longest name = "Very Long Hair" id = "hair_verylong" icon_state = "hair_longest" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/manbun +/datum/sprite_accessory/hair/legacy/manbun name = "Manbun" id = "hair_manbun" icon_state = "hair_manbun" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/modern +/datum/sprite_accessory/hair/legacy/modern name = "Modern" id = "hair_modern" icon_state = "hair_modern" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/mohawk +/datum/sprite_accessory/hair/legacy/mohawk name = "Mohawk" id = "hair_mohawk" icon_state = "hair_d" -/datum/sprite_accessory/hair/regulationmohawk +/datum/sprite_accessory/hair/legacy/regulationmohawk name = "Mohawk Regulation" id = "hair_mohawk_regulation" icon_state = "hair_shavedmohawk" hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/reversemohawk +/datum/sprite_accessory/hair/legacy/reversemohawk name = "Mohawk Reverse" id = "hair_mohawk_reverse" icon_state = "hair_reversemohawk" -/datum/sprite_accessory/hair/messy +/datum/sprite_accessory/hair/legacy/messy name = "Messy" id = "hair_messy" icon_state = "hair_messy_tg" - icon_add = null + icon_add_legacy = null -/datum/sprite_accessory/hair/mohawkunshaven +/datum/sprite_accessory/hair/legacy/mohawkunshaven name = "Mohawk Unshaven" id = "hair_mohawk_unshaven" icon_state = "hair_unshaven_mohawk" -/datum/sprite_accessory/hair/mulder +/datum/sprite_accessory/hair/legacy/mulder name = "Mulder" id = "hair_mulder" icon_state = "hair_mulder" -/datum/sprite_accessory/hair/newyou +/datum/sprite_accessory/hair/legacy/newyou name = "New You" id = "hair_newyou" icon_state = "hair_newyou" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/nia +/datum/sprite_accessory/hair/legacy/nia name = "Nia" id = "hair_nia" icon_state = "hair_nia" -/datum/sprite_accessory/hair/nitori +/datum/sprite_accessory/hair/legacy/nitori name = "Nitori" id = "hair_nitori" icon_state = "hair_nitori" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/odango +/datum/sprite_accessory/hair/legacy/odango name = "Odango" id = "hair_odango" icon_state = "hair_odango" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/ombre +/datum/sprite_accessory/hair/legacy/ombre name = "Ombre" id = "hair_ombre" icon_state = "hair_ombre" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/oxton +/datum/sprite_accessory/hair/legacy/oxton name = "Oxton" id = "hair_oxton" icon_state = "hair_oxton" -/datum/sprite_accessory/hair/longovereye +/datum/sprite_accessory/hair/legacy/longovereye name = "Overeye Long" id = "hair_overeye_long" icon_state = "hair_longovereye" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/shortovereye +/datum/sprite_accessory/hair/legacy/shortovereye name = "Overeye Short" id = "hair_overeye_short" icon_state = "hair_shortovereye" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/veryshortovereyealternate +/datum/sprite_accessory/hair/legacy/veryshortovereyealternate name = "Overeye Very Short, Alternate" id = "hair_overeye_veryshort_alt" icon_state = "hair_veryshortovereyealternate" -/datum/sprite_accessory/hair/veryshortovereye +/datum/sprite_accessory/hair/legacy/veryshortovereye name = "Overeye Very Short" id = "hair_overeye_veryshort" icon_state = "hair_veryshortovereye" -/datum/sprite_accessory/hair/parted +/datum/sprite_accessory/hair/legacy/parted name = "Parted" id = "hair_parted" icon_state = "hair_parted" -/datum/sprite_accessory/hair/partedalt +/datum/sprite_accessory/hair/legacy/partedalt name = "Parted Alt" id = "hair_parted_alt" icon_state = "hair_partedalt" -/datum/sprite_accessory/hair/pixie +/datum/sprite_accessory/hair/legacy/pixie name = "Pixie" id = "hair_pixie" icon_state = "hair_pixie" -/datum/sprite_accessory/hair/pompadour +/datum/sprite_accessory/hair/legacy/pompadour name = "Pompadour" id = "hair_pompadour" icon_state = "hair_pompadour" -/datum/sprite_accessory/hair/dandypomp +/datum/sprite_accessory/hair/legacy/dandypomp name = "Pompadour Dandy" id = "hair_pompadour_dandy" icon_state = "hair_dandypompadour" -/datum/sprite_accessory/hair/ponytail1 +/datum/sprite_accessory/hair/legacy/ponytail1 name = "Ponytail 1" id = "hair_ponytail" icon_state = "hair_ponytail" hair_flags = HAIR_TIEABLE|HAIR_VERY_SHORT -/datum/sprite_accessory/hair/ponytail2 +/datum/sprite_accessory/hair/legacy/ponytail2 name = "Ponytail 2" id = "hair_ponytail2" icon_state = "hair_pa" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/ponytail3 +/datum/sprite_accessory/hair/legacy/ponytail3 name = "Ponytail 3" id = "hair_ponytail3" icon_state = "hair_ponytail3" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/ponytail4 +/datum/sprite_accessory/hair/legacy/ponytail4 name = "Ponytail 4" id = "hair_ponytail4" icon_state = "hair_ponytail4" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/ponytail5 +/datum/sprite_accessory/hair/legacy/ponytail5 name = "Ponytail 5" id = "hair_ponytail5" icon_state = "hair_ponytail5" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/ponytail6 +/datum/sprite_accessory/hair/legacy/ponytail6 name = "Ponytail 6" id = "hair_ponytail6" icon_state = "hair_ponytail6" hair_flags = HAIR_TIEABLE|HAIR_VERY_SHORT -/datum/sprite_accessory/hair/ponytail6_fixed //Eggnerd's done with waiting for upstream fixes lmao. +/datum/sprite_accessory/hair/legacy/ponytail6_fixed //Eggnerd's done with waiting for upstream fixes lmao. name = "Ponytail 6 but fixed" id = "hair_ponytail6_alt" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "hair_ponytail6" -/datum/sprite_accessory/hair/sharpponytail +/datum/sprite_accessory/hair/legacy/sharpponytail name = "Ponytail Sharp" id = "hair_ponytail_sharp" icon_state = "hair_sharpponytail" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/simple_ponytail +/datum/sprite_accessory/hair/legacy/simple_ponytail name = "Ponytail Simple" id = "hair_simple_ponytail" icon_state = "hair_simple_ponytail" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/spikyponytail +/datum/sprite_accessory/hair/legacy/spikyponytail name = "Ponytail Spiky" id = "hair_ponytail_spiky" icon_state = "hair_spikyponytail" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/highponytail +/datum/sprite_accessory/hair/legacy/highponytail name = "High Ponytail" id = "hair_ponytail_high" icon_state = "hair_highponytail" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/poofy +/datum/sprite_accessory/hair/legacy/poofy name = "Poofy" id = "hair_poofy" icon_state = "hair_poofy" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/poofy2 +/datum/sprite_accessory/hair/legacy/poofy2 name = "Poofy 2" id = "hair_poofy2" icon_state = "hair_poofy2" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/quiff +/datum/sprite_accessory/hair/legacy/quiff name = "Quiff" id = "hair_quiff" icon_state = "hair_quiff" -/datum/sprite_accessory/hair/nofade +/datum/sprite_accessory/hair/legacy/nofade name = "Regulation Cut" id = "hair_regulation" icon_state = "hair_nofade" - gender = MALE + random_generation_gender = MALE hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/ronin +/datum/sprite_accessory/hair/legacy/ronin name = "Ronin" id = "hair_ronin" icon_state = "hair_ronin" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/rosa +/datum/sprite_accessory/hair/legacy/rosa name = "Rosa" id = "hair_rosa" icon_state = "hair_rosa" -/datum/sprite_accessory/hair/rows +/datum/sprite_accessory/hair/legacy/rows name = "Rows" id = "hair_row" icon_state = "hair_rows1" hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/rows2 +/datum/sprite_accessory/hair/legacy/rows2 name = "Rows 2" id = "hair_row2" icon_state = "hair_rows2" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/rowbun +/datum/sprite_accessory/hair/legacy/rowbun name = "Row Bun" id = "hair_row_bun" icon_state = "hair_rowbun" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/rowdualbraid +/datum/sprite_accessory/hair/legacy/rowdualbraid name = "Row Dual Braid" id = "hair_row_braid_dual" icon_state = "hair_rowdualtail" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/rowbraid +/datum/sprite_accessory/hair/legacy/rowbraid name = "Row Braid" id = "hair_row_braid" icon_state = "hair_rowbraid" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/royal_curls +/datum/sprite_accessory/hair/legacy/royal_curls name = "Royal Curls" id = "hair_royal_curls" icon_state = "hair_royal_curls" -/datum/sprite_accessory/hair/runner +/datum/sprite_accessory/hair/legacy/runner name = "Runner" id = "hair_runner" icon_state = "hair_runner" -/datum/sprite_accessory/hair/sabitsuki +/datum/sprite_accessory/hair/legacy/sabitsuki name = "Sabitsuki" id = "hair_sabitsuki" icon_state = "hair_sabitsuki" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/scully +/datum/sprite_accessory/hair/legacy/scully name = "Scully" id = "hair_scully" icon_state = "hair_scully" -/datum/sprite_accessory/hair/shavehair +/datum/sprite_accessory/hair/legacy/shavehair name = "Shaved Hair" id = "hair_shaved" icon_state = "hair_shaved" hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/shortbangs +/datum/sprite_accessory/hair/legacy/shortbangs name = "Short Bangs" id = "hair_bangs_short" icon_state = "hair_shortbangs" -/datum/sprite_accessory/hair/short +/datum/sprite_accessory/hair/legacy/short name = "Short Hair" // try to capatilize the names please~ id = "hair_short" icon_state = "hair_a" // you do not need to define _s or _l sub-states, game automatically does this for you hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/short2 +/datum/sprite_accessory/hair/legacy/short2 name = "Short Hair 2" id = "hair_short2" icon_state = "hair_shorthair3" hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/shortalt2 +/datum/sprite_accessory/hair/legacy/shortalt2 name = "Short Hair 2 Alt" id = "hair_short2_alt" icon_state = "shorthair3a" hair_flags = HAIR_VERY_SHORT icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' -/datum/sprite_accessory/hair/short3 +/datum/sprite_accessory/hair/legacy/short3 name = "Short Hair 3" id = "hair_short3" icon_state = "hair_shorthair4" hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/shy +/datum/sprite_accessory/hair/legacy/shy name = "Shy" id = "hair_fluttershy" // let's be brutally honest about what htis is icon_state = "hair_shy" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/sideponytail +/datum/sprite_accessory/hair/legacy/sideponytail name = "Side Ponytail" id = "hair_ponytail_side" icon_state = "hair_stail" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/sideponytail4 //Not happy about this... but it's for the save files. +/datum/sprite_accessory/hair/legacy/sideponytail4 //Not happy about this... but it's for the save files. name = "Side Ponytail 2" id = "hair_ponytail_side2" icon_state = "hair_ponytailf" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/sideponytail2 +/datum/sprite_accessory/hair/legacy/sideponytail2 name = "Shoulder One" id = "hair_shoulder_one" icon_state = "hair_oneshoulder" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/sideponytail3 +/datum/sprite_accessory/hair/legacy/sideponytail3 name = "Shoulder Tress" id = "hair_shoulder_tress" icon_state = "hair_tressshoulder" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/skinhead +/datum/sprite_accessory/hair/legacy/skinhead name = "Skinhead" id = "hair_skinhead" icon_state = "hair_skinhead" hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/sleeze +/datum/sprite_accessory/hair/legacy/sleeze name = "Sleeze" id = "hair_sleaze" icon_state = "hair_sleeze" hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/spiky +/datum/sprite_accessory/hair/legacy/spiky name = "Spiky" id = "hair_spiky" icon_state = "hair_spikey" -/datum/sprite_accessory/hair/thinning +/datum/sprite_accessory/hair/legacy/thinning name = "Thinning" id = "hair_thinning" icon_state = "hair_thinning" hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/thinningfront +/datum/sprite_accessory/hair/legacy/thinningfront name = "Thinning Front" id = "hair_thinning_front" icon_state = "hair_thinningfront" hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/thinningback +/datum/sprite_accessory/hair/legacy/thinningback name = "Thinning Back" id = "hair_thinning_back" icon_state = "hair_thinningrear" hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/topknot +/datum/sprite_accessory/hair/legacy/topknot name = "Topknot" id = "hair_topknot" icon_state = "hair_topknot" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/trimflat +/datum/sprite_accessory/hair/legacy/trimflat name = "Trimmed Flat Top" id = "hair_trimmed_flat" icon_state = "hair_trimflat" - gender = MALE + random_generation_gender = MALE hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/jade +/datum/sprite_accessory/hair/legacy/jade name = "Jade" id = "hair_jade" icon_state = "hair_jade" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/trimmed +/datum/sprite_accessory/hair/legacy/trimmed name = "Trimmed" id = "hair_trimmed" icon_state = "hair_trimmed" - gender = MALE + random_generation_gender = MALE hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/twintai1 +/datum/sprite_accessory/hair/legacy/twintai1 name = "Twintail" id = "hair_twintails" icon_state = "hair_twintail" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/twintail2 +/datum/sprite_accessory/hair/legacy/twintail2 name = "Twintail Short" id = "hair_twintails_short" icon_state = "hair_twintailshort" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/undercut1 +/datum/sprite_accessory/hair/legacy/undercut1 name = "Undercut" id = "hair_undercut" icon_state = "hair_undercut1" - gender = MALE + random_generation_gender = MALE hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/undercut2 +/datum/sprite_accessory/hair/legacy/undercut2 name = "Undercut Swept Right" id = "hair_undercut_right" icon_state = "hair_undercut2" - gender = MALE + random_generation_gender = MALE hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/undercut3 +/datum/sprite_accessory/hair/legacy/undercut3 name = "Undercut Swept Left" id = "hair_undercut_left" icon_state = "hair_undercut3" - gender = MALE + random_generation_gender = MALE hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/undercutlong +/datum/sprite_accessory/hair/legacy/undercutlong name = "Undercut Long" id = "hair_undercut_long" icon_state = "hair_undercutlong" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/unkept +/datum/sprite_accessory/hair/legacy/unkept name = "Unkept" id = "hair_upkept" icon_state = "hair_unkept" -/datum/sprite_accessory/hair/updo +/datum/sprite_accessory/hair/legacy/updo name = "Updo" id = "hair_updo" icon_state = "hair_updo" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/vegeta +/datum/sprite_accessory/hair/legacy/vegeta name = "Vegeta" id = "hair_vegeta" icon_state = "hair_toriyama2" -/datum/sprite_accessory/hair/volaju +/datum/sprite_accessory/hair/legacy/volaju name = "Volaju" id = "hair_volaju" icon_state = "hair_volaju" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/wavy +/datum/sprite_accessory/hair/legacy/wavy name = "Wavy" id = "hair_wavy" icon_state = "hair_wavy" -/datum/sprite_accessory/hair/wisp +/datum/sprite_accessory/hair/legacy/wisp name = "Wisp" id = "hair_wisp" icon_state = "hair_wisp" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/zieglertail +/datum/sprite_accessory/hair/legacy/zieglertail name = "Zieglertail" id = "hair_ziegler" icon_state = "hair_ziegler" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/glossy +/datum/sprite_accessory/hair/legacy/glossy name = "Glossy" id = "hair_glossy" icon_state = "hair_glossy" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/sharpponytail +/datum/sprite_accessory/hair/legacy/sharpponytail name = "Ponytail Sharp" id = "hair_ponytail_sharp" icon_state = "hair_sharpponytail" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/partedalt +/datum/sprite_accessory/hair/legacy/partedalt name = "Parted Alt" id = "hair_parted2" icon_state = "hair_partedalt" -/datum/sprite_accessory/hair/amazon +/datum/sprite_accessory/hair/legacy/amazon name = "Amazon" id = "hair_amazon" icon_state = "hair_amazon" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/straightlong +/datum/sprite_accessory/hair/legacy/straightlong name = "Straight Long" id = "hair_long_straight" icon_state = "hair_straightlong" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/marysue +/datum/sprite_accessory/hair/legacy/marysue name = "Mary Sue" id = "hair_marysue" icon_state = "hair_marysue" -/datum/sprite_accessory/hair/sideundercut +/datum/sprite_accessory/hair/legacy/sideundercut name = "Side Undercut" id = "hair_undercut_side" icon_state = "hair_sideundercut" hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/donutbun +/datum/sprite_accessory/hair/legacy/donutbun name = "Donut Bun" id = "hair_bun_donut" icon_state = "hair_donutbun" -/datum/sprite_accessory/hair/gentle2 +/datum/sprite_accessory/hair/legacy/gentle2 name = "Gentle 2, Long" id = "hair_gentle2" icon_state = "hair_gentle2long" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/sweepshave +/datum/sprite_accessory/hair/legacy/sweepshave name = "Sweep Shave" id = "hair_sweepshave" icon_state = "hair_sweepshave" -/datum/sprite_accessory/hair/beachwave +/datum/sprite_accessory/hair/legacy/beachwave name = "Beach Waves" id = "hair_beachwave" icon_state = "hair_beachwave" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/celebcurls +/datum/sprite_accessory/hair/legacy/celebcurls name = "Celeb Curls" id = "hair_curls_celeb" icon_state = "hair_celebcurls" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/bigcurls +/datum/sprite_accessory/hair/legacy/bigcurls name = "Big Curls" id = "hair_curls_big" icon_state = "hair_bigcurls" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/jessica +/datum/sprite_accessory/hair/legacy/jessica name = "Jessica" id = "hair_jessica" icon_state = "hair_jessica" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/proper +/datum/sprite_accessory/hair/legacy/proper name = "Proper" id = "hair_proper" icon_state = "hair_proper" -/datum/sprite_accessory/hair/himeup +/datum/sprite_accessory/hair/legacy/himeup name = "Hime Updo" id = "hair_hime_updo" icon_state = "hair_himeup" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/front_braid +/datum/sprite_accessory/hair/legacy/front_braid name = "Braided front" id = "hair_braid_front" icon_state = "hair_braidfront" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/antenna +/datum/sprite_accessory/hair/legacy/antenna name = "Antenna" id = "hair_antenna" icon_state = "hair_antenna" -/datum/sprite_accessory/hair/protagonist +/datum/sprite_accessory/hair/legacy/protagonist name = "Slightly Long" id = "hair_protagonist" icon_state = "hair_protagonist" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/braidtail +/datum/sprite_accessory/hair/legacy/braidtail name = "Braided Tail" id = "hair_braid_tail" icon_state = "hair_braidtail" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/business +/datum/sprite_accessory/hair/legacy/business name = "Business Hair" id = "hair_business" icon_state = "hair_business" hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/business3 +/datum/sprite_accessory/hair/legacy/business3 name = "Business Hair 3" id = "hair_business3" icon_state = "hair_business3" hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/business4 +/datum/sprite_accessory/hair/legacy/business4 name = "Business Hair 4" id = "hair_business4" icon_state = "hair_business4" hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/sidepartlongalt +/datum/sprite_accessory/hair/legacy/sidepartlongalt name = "Long Side Part" id = "hair_sidepart_long" icon_state = "hair_longsidepart" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/miles +/datum/sprite_accessory/hair/legacy/miles name = "Miles Hair" id = "hair_miles" icon_state = "hair_miles" -/datum/sprite_accessory/hair/vivi +/datum/sprite_accessory/hair/legacy/vivi name = "Vivi" id = "hair_vivi" icon_state = "hair_vivi" -/datum/sprite_accessory/hair/taro +/datum/sprite_accessory/hair/legacy/taro name = "Taro" id = "hair_taro" icon_state = "hair_taro" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/judge +/datum/sprite_accessory/hair/legacy/judge name = "Judge" id = "hair_judge" icon_state = "hair_judge" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/mia +/datum/sprite_accessory/hair/legacy/mia name = "Mia" id = "hair_mia" icon_state = "hair_mia" -/datum/sprite_accessory/hair/elize +/datum/sprite_accessory/hair/legacy/elize name = "Elize" id = "hair_elize" icon_state = "hair_elize" -/datum/sprite_accessory/hair/longbraid +/datum/sprite_accessory/hair/legacy/longbraid name = "Long Braid" id = "hair_longbraid" icon_state = "hair_longbraid" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/emoright +/datum/sprite_accessory/hair/legacy/emoright name = "Emo Right" id = "hair_emoright" icon_state = "hair_emoright" -/datum/sprite_accessory/hair/aradia +/datum/sprite_accessory/hair/legacy/aradia name = "Aradia" id = "hair_aradia" icon_state = "hair_aradia" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/dirk +/datum/sprite_accessory/hair/legacy/dirk name = "Dirk" id = "hair_dirk" icon_state = "hair_dirk" -/datum/sprite_accessory/hair/equius +/datum/sprite_accessory/hair/legacy/equius name = "Equius" id = "hair_equius" icon_state = "hair_equius" -/datum/sprite_accessory/hair/feferi +/datum/sprite_accessory/hair/legacy/feferi name = "Feferi" id = "hair_feferi" icon_state = "hair_feferi" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/gamzee +/datum/sprite_accessory/hair/legacy/gamzee name = "Gamzee" id = "hair_gamzee" icon_state = "hair_gamzee" -/datum/sprite_accessory/hair/kanaya +/datum/sprite_accessory/hair/legacy/kanaya name = "Kanaya" id = "hair_kanaya" icon_state = "hair_kanaya" -/datum/sprite_accessory/hair/nepeta +/datum/sprite_accessory/hair/legacy/nepeta name = "Nepeta" id = "hair_nepeta" icon_state = "hair_nepeta" -/datum/sprite_accessory/hair/rose +/datum/sprite_accessory/hair/legacy/rose name = "Rose" id = "hair_rose" icon_state = "hair_rose" -/datum/sprite_accessory/hair/roxy +/datum/sprite_accessory/hair/legacy/roxy name = "Roxy" id = "hair_roxy" icon_state = "hair_roxy" -/datum/sprite_accessory/hair/terezi +/datum/sprite_accessory/hair/legacy/terezi name = "Terezi" id = "hair_terezi" icon_state = "hair_terezi" -/datum/sprite_accessory/hair/vriska +/datum/sprite_accessory/hair/legacy/vriska name = "Vriska" id = "hair_vriska" icon_state = "hair_vriska" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/flipped +/datum/sprite_accessory/hair/legacy/flipped name = "Flipped" id = "hair_flipped" icon_state = "hair_flipped" -/datum/sprite_accessory/hair/darcy +/datum/sprite_accessory/hair/legacy/darcy name = "Darcy" id = "hair_darcy" icon_state = "hair_darcy" -/datum/sprite_accessory/hair/antonio +/datum/sprite_accessory/hair/legacy/antonio name = "Antonio" id = "hair_antonio" icon_state = "hair_antonio" -/datum/sprite_accessory/hair/sweptfringe +/datum/sprite_accessory/hair/legacy/sweptfringe name = "Swept Fringe" id = "hair_sweptfringe" icon_state = "hair_sweptfringe" -/datum/sprite_accessory/hair/mialong +/datum/sprite_accessory/hair/legacy/mialong name = "Mia Long" id = "hair_mialong" icon_state = "hair_mialong" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/dreadslong +/datum/sprite_accessory/hair/legacy/dreadslong name = "Long Dreadlocks" id = "hair_dreadslong" icon_state = "hair_dreadslong" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/jeanponytail +/datum/sprite_accessory/hair/legacy/jeanponytail name = "Jean Ponytail" id = "hair_jeanponytail" icon_state = "hair_jeanponytail" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/shouldersweep +/datum/sprite_accessory/hair/legacy/shouldersweep name = "Shoulder Swept" id = "hair_shouldersweep" icon_state = "hair_shouldersweep" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/afropuffdouble +/datum/sprite_accessory/hair/legacy/afropuffdouble name = "Afropuff" id = "hair_afropuffdouble" icon_state = "hair_afropuffdouble" -/datum/sprite_accessory/hair/afropuffleft +/datum/sprite_accessory/hair/legacy/afropuffleft name = "Afropuff Left" id = "hair_afropuffleft" icon_state = "hair_afropuffleft" -/datum/sprite_accessory/hair/afropuffright +/datum/sprite_accessory/hair/legacy/afropuffright name = "Afropuff Right" id = "hair_afropuffright" icon_state = "hair_afropuffright" -/datum/sprite_accessory/hair/suave +/datum/sprite_accessory/hair/legacy/suave name = "Suave" id = "hair_suave" icon_state = "hair_suave" -/datum/sprite_accessory/hair/suave2 +/datum/sprite_accessory/hair/legacy/suave2 name = "Suave Alt" id ="hair_suave2" icon_state = "hair_suave2" -/datum/sprite_accessory/hair/jane +/datum/sprite_accessory/hair/legacy/jane name = "Jane" id = "hair_jane" icon_state = "hair_jane" -/datum/sprite_accessory/hair/rockstarcurls +/datum/sprite_accessory/hair/legacy/rockstarcurls name = "Rockstar Curls" id = "hair_rockstarcurls" icon_state = "hair_rockstarcurls" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/band +/datum/sprite_accessory/hair/legacy/band name = "Banded Long" id = "hair_band" icon_state = "hair_band" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/bieb +/datum/sprite_accessory/hair/legacy/bieb name = "Beaver" id = "hair_bieb" icon_state = "hair_bieb" -/datum/sprite_accessory/hair/fabio +/datum/sprite_accessory/hair/legacy/fabio name = "Fabio" id = "hair_fabio" icon_state = "hair_fabio" -/datum/sprite_accessory/hair/froofylong +/datum/sprite_accessory/hair/legacy/froofylong name = "Froofy Long" id = "hair_froofy_long" icon_state = "hair_froofy_long" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/glammetal +/datum/sprite_accessory/hair/legacy/glammetal name = "Glammetal" id = "hair_glammetal" icon_state = "hair_glammetal" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/midb +/datum/sprite_accessory/hair/legacy/midb name = "Mid-length hair" id = "hair_midb" icon_state = "hair_midb" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/halfshavedL +/datum/sprite_accessory/hair/legacy/halfshavedL name = "Half Shaved Left" id = "hair_halfshavedL" icon_state = "hair_halfshavedL" -/datum/sprite_accessory/hair/rockandroll +/datum/sprite_accessory/hair/legacy/rockandroll name = "Rock and Roll" id = "hair_rockandroll" icon_state = "hair_rockandroll" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/shortflip +/datum/sprite_accessory/hair/legacy/shortflip name = "Flip Short" id = "hair_shortflip" icon_state = "hair_shortflip" -/datum/sprite_accessory/hair/dreadlongalt +/datum/sprite_accessory/hair/legacy/dreadlongalt name = "Long Dreadlocks Alt" id = "hair_dreadlongalt" icon_state = "hair_dreadlongalt" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/keanu +/datum/sprite_accessory/hair/legacy/keanu name = "Keanu" id = "hair_keanu" icon_state = "hair_keanu" -/datum/sprite_accessory/hair/long3 +/datum/sprite_accessory/hair/legacy/long3 name = "Long Hair Alt 3" id = "hair_long3" icon_state = "hair_long3" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/supernova +/datum/sprite_accessory/hair/legacy/supernova name = "Supernova" id = "hair_supernova" icon_state = "hair_supernova" -/datum/sprite_accessory/hair/astolfo +/datum/sprite_accessory/hair/legacy/astolfo name = "Astolfo" id = "hair_astolfo" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "hair_astolfo" -/datum/sprite_accessory/hair/awoohair +/datum/sprite_accessory/hair/legacy/awoohair name = "Shoulder-length Messy" id = "hair_messy_shoulder" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "momijihair" -/datum/sprite_accessory/hair/citheronia_colorable +/datum/sprite_accessory/hair/legacy/citheronia_colorable name = "Citheronia Hair" id = "hair_citheronia" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "citheronia_hair_c" do_colouration = 1 -/datum/sprite_accessory/hair/twindrills +/datum/sprite_accessory/hair/legacy/twindrills name = "Twin Drills" id = "hair_twindrills" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "hair_twincurl" -/datum/sprite_accessory/hair/myopia +/datum/sprite_accessory/hair/legacy/myopia name = "Myopia" id = "hair_myopia" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "myopia" hair_flags = HAIR_VERY_SHORT -/datum/sprite_accessory/hair/shortish +/datum/sprite_accessory/hair/legacy/shortish name = "Shortish" id = "hair_shortish" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "bshort-1" -/datum/sprite_accessory/hair/shortmess +/datum/sprite_accessory/hair/legacy/shortmess name = "Short Mess" id = "hair_short_mess" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "bshort-2" -/datum/sprite_accessory/hair/peaked +/datum/sprite_accessory/hair/legacy/peaked name = "Peaked" id = "hair_peaked" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "bshort-3" -/datum/sprite_accessory/hair/blindbangs +/datum/sprite_accessory/hair/legacy/blindbangs name = "Blind Bangs" id = "hair_bangs_blind" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "blindbangs" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/reallyblindbangs +/datum/sprite_accessory/hair/legacy/reallyblindbangs name = "Grudge" id = "hair_grudge" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "grudge" hair_flags = HAIR_TIEABLE -/datum/sprite_accessory/hair/zone +/datum/sprite_accessory/hair/legacy/zone name = "Zone" id = "hair_zone" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "zone" -/datum/sprite_accessory/hair/halfcut +/datum/sprite_accessory/hair/legacy/halfcut name = "Halfcut" id = "hair_halfcut" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "halfcut" -/datum/sprite_accessory/hair/halfcut_smooth +/datum/sprite_accessory/hair/legacy/halfcut_smooth name = "Halfcut Smooth" id = "hair_halfcutsmooth" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "halfcut_smooth" -/datum/sprite_accessory/hair/halfcut_rough +/datum/sprite_accessory/hair/legacy/halfcut_rough name = "Halfcut Rough" id = "hair_halfcutrough" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "halfcut_rough" -/datum/sprite_accessory/hair/braided_sidetail +/datum/sprite_accessory/hair/legacy/braided_sidetail name = "Braided Sidetail" id = "hair_braidedsidetail" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "braided_sidetail" -/datum/sprite_accessory/hair/baum +/datum/sprite_accessory/hair/legacy/baum name = "Baum" id = "hair_baum" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "baum" -/datum/sprite_accessory/hair/bluntbangs +/datum/sprite_accessory/hair/legacy/bluntbangs name = "Blunt Bangs" id = "hair_bluntbangs" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "bluntbangs" -/datum/sprite_accessory/hair/bluntbangsalt +/datum/sprite_accessory/hair/legacy/bluntbangsalt name = "Blunt Bangs 2" id = "hair_bluntbangsalt" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "bluntbangsalt" -/datum/sprite_accessory/hair/slightlymessy +/datum/sprite_accessory/hair/legacy/slightlymessy name = "Slightly Messy Long" id = "hair_slightlymessy" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "slightlymessy" -/datum/sprite_accessory/hair/kisaragi +/datum/sprite_accessory/hair/legacy/kisaragi name = "Kisaragi" id = "hair_kisaragi" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "kisaragi" -/datum/sprite_accessory/hair/fortuneteller +/datum/sprite_accessory/hair/legacy/fortuneteller name = "Fortune Teller" id = "hair_fortuneteller" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "fortuneteller" -/datum/sprite_accessory/hair/hajime +/datum/sprite_accessory/hair/legacy/hajime name = "Hajime" id = "hair_hajime" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "hajime" -/datum/sprite_accessory/hair/hajimeshort +/datum/sprite_accessory/hair/legacy/hajimeshort name = "Hajime Short" id = "hair_hajimealt" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "hajimealt" -/datum/sprite_accessory/hair/quadcurls +/datum/sprite_accessory/hair/legacy/quadcurls name = "Quad Curls" id = "hair_quadcurls" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "quadcurls" -/datum/sprite_accessory/hair/combedback +/datum/sprite_accessory/hair/legacy/combedback name = "Combed Back" id = "hair_combedback" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "combedback" -/datum/sprite_accessory/hair/combedbob +/datum/sprite_accessory/hair/legacy/combedbob name = "Combed Bob" id = "hair_combedbob" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "combedbob" -/datum/sprite_accessory/hair/geisha +/datum/sprite_accessory/hair/legacy/geisha name = "Geisha" id = "hair_geisha" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "geisha" -/datum/sprite_accessory/hair/cotton +/datum/sprite_accessory/hair/legacy/cotton name = "Cotton" id = "hair_cotton" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "cotton" -/datum/sprite_accessory/hair/cottonalt +/datum/sprite_accessory/hair/legacy/cottonalt name = "Cotton Short" id = "hair_cottonalt" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "cottonalt" -/datum/sprite_accessory/hair/africanpigtails +/datum/sprite_accessory/hair/legacy/africanpigtails name = "African Pigtails" id = "hair_africanpigtails" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "africanpigtails" -/datum/sprite_accessory/hair/inari +/datum/sprite_accessory/hair/legacy/inari name = "Inari" id = "hair_inari" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "inari" -/datum/sprite_accessory/hair/rocksatr +/datum/sprite_accessory/hair/legacy/rocksatr name = "Rockstar" id = "hair_rockstar" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "rockstar" -/datum/sprite_accessory/hair/ornateponytail +/datum/sprite_accessory/hair/legacy/ornateponytail name = "Ornate Ponytail" id = "hair_ornate_ponytail" icon_state = "hair_ornate_ponytail" -/datum/sprite_accessory/hair/eagle +/datum/sprite_accessory/hair/legacy/eagle name = "Eagle" id = "hair_eagle" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "eagle" -/datum/sprite_accessory/hair/macaw +/datum/sprite_accessory/hair/legacy/macaw name = "Macaw" id = "hair_macaw" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "macaw" -/datum/sprite_accessory/hair/owl +/datum/sprite_accessory/hair/legacy/owl name = "Owl" id = "hair_owl" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "owl" -/datum/sprite_accessory/hair/falcon +/datum/sprite_accessory/hair/legacy/falcon name = "Falcon" id = "hair_falcon" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "falcon" -/datum/sprite_accessory/hair/hummingbird +/datum/sprite_accessory/hair/legacy/hummingbird name = "Hummingbird" id = "hair_hummingbird" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "hummingbird" -/datum/sprite_accessory/hair/magpie +/datum/sprite_accessory/hair/legacy/magpie name = "Magpie" id = "hair_magpie" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "magpie" -/datum/sprite_accessory/hair/starling +/datum/sprite_accessory/hair/legacy/starling name = "Starling" id = "hair_starling" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "starling" -/datum/sprite_accessory/hair/stork +/datum/sprite_accessory/hair/legacy/stork name = "Stork" id = "hair_stork" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "stork" -/datum/sprite_accessory/hair/princess +/datum/sprite_accessory/hair/legacy/princess name = "Princess" id = "hair_princess" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "princess" diff --git a/code/modules/sprite_accessories/hair/sergal.dm b/code/modules/sprite_accessories/hair/species/sergal.dm similarity index 65% rename from code/modules/sprite_accessories/hair/sergal.dm rename to code/modules/sprite_accessories/hair/species/sergal.dm index c1efc05b4c4d..0735b9af1589 100644 --- a/code/modules/sprite_accessories/hair/sergal.dm +++ b/code/modules/sprite_accessories/hair/species/sergal.dm @@ -1,37 +1,37 @@ //Cheesewedge things -/datum/sprite_accessory/hair/ergal_plain +/datum/sprite_accessory/hair/legacy/ergal_plain name = "Sergal Plain" id = "hair_sergal_plain" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "serg_plain" species_allowed = list(SPECIES_SERGAL) apply_restrictions = TRUE -/datum/sprite_accessory/hair/sergal_medicore +/datum/sprite_accessory/hair/legacy/sergal_medicore name = "Sergal Medicore" id = "hair_sergal_medicore" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "serg_medicore" species_allowed = list(SPECIES_SERGAL) apply_restrictions = TRUE -/datum/sprite_accessory/hair/sergal_tapered +/datum/sprite_accessory/hair/legacy/sergal_tapered name = "Sergal Tapered" id = "hair_sergal_tapered" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "serg_tapered" species_allowed = list(SPECIES_SERGAL) apply_restrictions = TRUE -/datum/sprite_accessory/hair/sergal_fairytail +/datum/sprite_accessory/hair/legacy/sergal_fairytail name = "Sergal Fairytail" id = "hair_sergal_fairytail" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "serg_fairytail" species_allowed = list(SPECIES_SERGAL) apply_restrictions = TRUE diff --git a/code/modules/sprite_accessories/hair/shadekin.dm b/code/modules/sprite_accessories/hair/species/shadekin.dm similarity index 61% rename from code/modules/sprite_accessories/hair/shadekin.dm rename to code/modules/sprite_accessories/hair/species/shadekin.dm index 7b64c9be2cc4..f86f4ad5f070 100644 --- a/code/modules/sprite_accessories/hair/shadekin.dm +++ b/code/modules/sprite_accessories/hair/species/shadekin.dm @@ -1,31 +1,31 @@ // Shadekin stuffs -/datum/sprite_accessory/hair/shadekin_hair_short +/datum/sprite_accessory/hair/legacy/shadekin_hair_short name = "Shadekin Short Hair" id = "hair_shadekin_short" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "shadekin_short" species_allowed = list(SPECIES_SHADEKIN, SPECIES_SHADEKIN_CREW) apply_restrictions = TRUE - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/hair/shadekin_hair_poofy +/datum/sprite_accessory/hair/legacy/shadekin_hair_poofy name = "Shadekin Poofy Hair" id = "hair_shadekin_poofy" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "shadekin_poofy" species_allowed = list(SPECIES_SHADEKIN, SPECIES_SHADEKIN_CREW) apply_restrictions = TRUE - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/hair/shadekin_hair_long +/datum/sprite_accessory/hair/legacy/shadekin_hair_long name = "Shadekin Long Hair" id = "hair_shadekin_long" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "shadekin_long" species_allowed = list(SPECIES_SHADEKIN, SPECIES_SHADEKIN_CREW) apply_restrictions = TRUE - gender = NEUTER + random_generation_gender = null diff --git a/code/modules/sprite_accessories/hair/skrell.dm b/code/modules/sprite_accessories/hair/species/skrell.dm similarity index 71% rename from code/modules/sprite_accessories/hair/skrell.dm rename to code/modules/sprite_accessories/hair/species/skrell.dm index b96200999f39..5cddc4bd7b95 100644 --- a/code/modules/sprite_accessories/hair/skrell.dm +++ b/code/modules/sprite_accessories/hair/species/skrell.dm @@ -1,21 +1,21 @@ //Skrell stuff -/datum/sprite_accessory/hair/skr_tentacle_veryshort +/datum/sprite_accessory/hair/legacy/skr_tentacle_veryshort name = "Skrell Very Short Tentacles" id = "hair_skrell_tentacles_veryshort" icon_state = "skrell_hair_veryshort" -/datum/sprite_accessory/hair/skr_tentacle_short +/datum/sprite_accessory/hair/legacy/skr_tentacle_short name = "Skrell Short Tentacles" id = "hair_skrell_tentacles_short" icon_state = "skrell_hair_short" species_allowed = list(SPECIES_SKRELL, SPECIES_XENOCHIMERA, SPECIES_PROTEAN, SPECIES_CUSTOM, SPECIES_PROMETHEAN) -/datum/sprite_accessory/hair/skr_tentacle_average +/datum/sprite_accessory/hair/legacy/skr_tentacle_average name = "Skrell Average Tentacles" id = "hair_skrell_tentacles_average" icon_state = "skrell_hair_average" -/datum/sprite_accessory/hair/skr_tentacle_verylong +/datum/sprite_accessory/hair/legacy/skr_tentacle_verylong name = "Skrell Long Tentacles" id = "hair_skrell_tentacles_long" icon_state = "skrell_hair_verylong" diff --git a/code/modules/sprite_accessories/hair/tajaran.dm b/code/modules/sprite_accessories/hair/species/tajaran.dm similarity index 84% rename from code/modules/sprite_accessories/hair/tajaran.dm rename to code/modules/sprite_accessories/hair/species/tajaran.dm index 655670b22c6b..d79213bb13fe 100644 --- a/code/modules/sprite_accessories/hair/tajaran.dm +++ b/code/modules/sprite_accessories/hair/species/tajaran.dm @@ -1,117 +1,117 @@ //Tajaran hairstyles -/datum/sprite_accessory/hair/taj_ears +/datum/sprite_accessory/hair/legacy/taj_ears name = "Tajaran Ears" id = "hair_tajaran_ears" icon_state = "ears_plain" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN, SPECIES_CUSTOM) apply_restrictions = TRUE -/datum/sprite_accessory/hair/taj_ears_clean +/datum/sprite_accessory/hair/legacy/taj_ears_clean name = "Tajara Clean" id = "hair_tajaran_clean" icon_state = "hair_clean" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN, SPECIES_CUSTOM) apply_restrictions = TRUE -/datum/sprite_accessory/hair/taj_ears_bangs +/datum/sprite_accessory/hair/legacy/taj_ears_bangs name = "Tajara Bangs" id = "hair_tajaran_bangs" icon_state = "hair_bangs" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN, SPECIES_CUSTOM) apply_restrictions = TRUE -/datum/sprite_accessory/hair/taj_ears_braid +/datum/sprite_accessory/hair/legacy/taj_ears_braid name = "Tajara Braid" id = "hair_tajaran_braid" icon_state = "hair_tbraid" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN, SPECIES_CUSTOM) apply_restrictions = TRUE -/datum/sprite_accessory/hair/taj_ears_shaggy +/datum/sprite_accessory/hair/legacy/taj_ears_shaggy name = "Tajara Shaggy" id = "hair_tajaran_shaggy" icon_state = "hair_shaggy" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN, SPECIES_CUSTOM) apply_restrictions = TRUE -/datum/sprite_accessory/hair/taj_ears_mohawk +/datum/sprite_accessory/hair/legacy/taj_ears_mohawk name = "Tajaran Mohawk" id = "hair_tajaran_mohawk" icon_state = "hair_mohawk" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN, SPECIES_CUSTOM) apply_restrictions = TRUE -/datum/sprite_accessory/hair/taj_ears_plait +/datum/sprite_accessory/hair/legacy/taj_ears_plait name = "Tajara Plait" id = "hair_tajaran_plait" icon_state = "hair_plait" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN, SPECIES_CUSTOM) apply_restrictions = TRUE -/datum/sprite_accessory/hair/taj_ears_straight +/datum/sprite_accessory/hair/legacy/taj_ears_straight name = "Tajara Straight" id = "hair_tajaran_straight" icon_state = "hair_straight" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN, SPECIES_CUSTOM) apply_restrictions = TRUE -/datum/sprite_accessory/hair/taj_ears_long +/datum/sprite_accessory/hair/legacy/taj_ears_long name = "Tajara Long" id = "hair_tajaran_long" icon_state = "hair_long" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN, SPECIES_CUSTOM) apply_restrictions = TRUE -/datum/sprite_accessory/hair/taj_ears_rattail +/datum/sprite_accessory/hair/legacy/taj_ears_rattail name = "Tajara Rat Tail" id = "hair_tajaran_tail_rat" icon_state = "hair_rattail" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN, SPECIES_CUSTOM) apply_restrictions = TRUE -/datum/sprite_accessory/hair/taj_ears_spiky +/datum/sprite_accessory/hair/legacy/taj_ears_spiky name = "Tajara Spiky" id = "hair_tajaran_spiky" icon_state = "hair_tajspiky" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN, SPECIES_CUSTOM) apply_restrictions = TRUE -/datum/sprite_accessory/hair/taj_ears_messy +/datum/sprite_accessory/hair/legacy/taj_ears_messy name = "Tajara Messy" id = "hair_tajaran_messy" icon_state = "hair_messy" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN, SPECIES_CUSTOM) apply_restrictions = TRUE -/datum/sprite_accessory/hair/taj_ears_curls +/datum/sprite_accessory/hair/legacy/taj_ears_curls name = "Tajaran Curly" id = "hair_tajaran_curly" icon_state = "hair_curly" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN, SPECIES_CUSTOM) apply_restrictions = TRUE -/datum/sprite_accessory/hair/taj_ears_wife +/datum/sprite_accessory/hair/legacy/taj_ears_wife name = "Tajaran Housewife" id = "hair_tajaran_wife" icon_state = "hair_wife" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN, SPECIES_CUSTOM) apply_restrictions = TRUE -/datum/sprite_accessory/hair/taj_ears_victory +/datum/sprite_accessory/hair/legacy/taj_ears_victory name = "Tajaran Victory Curls" id = "hair_tajaran_victory" icon_state = "hair_victory" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN, SPECIES_CUSTOM) apply_restrictions = TRUE -/datum/sprite_accessory/hair/taj_ears_bob +/datum/sprite_accessory/hair/legacy/taj_ears_bob name = "Tajaran Bob" id = "hair_tajaran_bob" icon_state = "hair_tbob" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN, SPECIES_CUSTOM) apply_restrictions = TRUE -/datum/sprite_accessory/hair/taj_ears_fingercurl +/datum/sprite_accessory/hair/legacy/taj_ears_fingercurl name = "Tajaran Finger Curls" id = "hair_tajaran_fingerwave" icon_state = "hair_fingerwave" diff --git a/code/modules/sprite_accessories/hair/teshari.dm b/code/modules/sprite_accessories/hair/species/teshari.dm similarity index 61% rename from code/modules/sprite_accessories/hair/teshari.dm rename to code/modules/sprite_accessories/hair/species/teshari.dm index cd2aab525d9b..8b63a11c19f2 100644 --- a/code/modules/sprite_accessories/hair/teshari.dm +++ b/code/modules/sprite_accessories/hair/species/teshari.dm @@ -1,249 +1,249 @@ //Teshari things -/datum/sprite_accessory/hair/teshari +/datum/sprite_accessory/hair/legacy/teshari name = "Teshari Default" id = "hair_teshari_default" icon_state = "teshari_default" - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE -/datum/sprite_accessory/hair/teshari_altdefault +/datum/sprite_accessory/hair/legacy/teshari_altdefault name = "Teshari Alt. Default" id = "hair_teshari_default_alt" icon_state = "teshari_ears" - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE -/datum/sprite_accessory/hair/teshari_tight +/datum/sprite_accessory/hair/legacy/teshari_tight name = "Teshari Tight" id = "hair_teshari_tight" icon_state = "teshari_tight" - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE -/datum/sprite_accessory/hair/teshari_excited +/datum/sprite_accessory/hair/legacy/teshari_excited name = "Teshari Spiky" id = "hair_teshari_spiky" icon_state = "teshari_spiky" - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE -/datum/sprite_accessory/hair/teshari_spike +/datum/sprite_accessory/hair/legacy/teshari_spike name = "Teshari Spike" id = "hair_teshari_spike" icon_state = "teshari_spike" - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE -/datum/sprite_accessory/hair/teshari_long +/datum/sprite_accessory/hair/legacy/teshari_long name = "Teshari Overgrown" id = "hair_teshari_long" icon_state = "teshari_long" - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE -/datum/sprite_accessory/hair/teshari_burst +/datum/sprite_accessory/hair/legacy/teshari_burst name = "Teshari Starburst" id = "hair_teshari_burst" icon_state = "teshari_burst" - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE -/datum/sprite_accessory/hair/teshari_shortburst +/datum/sprite_accessory/hair/legacy/teshari_shortburst name = "Teshari Short Starburst" id = "hair_teshari_burst_short" icon_state = "teshari_burst_short" - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE -/datum/sprite_accessory/hair/teshari_mohawk +/datum/sprite_accessory/hair/legacy/teshari_mohawk name = "Teshari Mohawk" id = "hair_teshari_mohawk" icon_state = "teshari_mohawk" - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE -/datum/sprite_accessory/hair/teshari_pointy +/datum/sprite_accessory/hair/legacy/teshari_pointy name = "Teshari Pointy" id = "hair_teshari_pointy" icon_state = "teshari_pointy" - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE -/datum/sprite_accessory/hair/teshari_upright +/datum/sprite_accessory/hair/legacy/teshari_upright name = "Teshari Upright" id = "hair_teshari_upright" icon_state = "teshari_upright" - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE -/datum/sprite_accessory/hair/teshari_mane +/datum/sprite_accessory/hair/legacy/teshari_mane name = "Teshari Mane" id = "hair_teshari_mane" icon_state = "teshari_mane" - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE -/datum/sprite_accessory/hair/teshari_droopy +/datum/sprite_accessory/hair/legacy/teshari_droopy name = "Teshari Droopy" id = "hair_teshari_droopy" icon_state = "teshari_droopy" - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE -/datum/sprite_accessory/hair/teshari_mushroom +/datum/sprite_accessory/hair/legacy/teshari_mushroom name = "Teshari Mushroom" id = "hair_teshari_mushroom" icon_state = "teshari_mushroom" - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE -/datum/sprite_accessory/hair/teshari_twies +/datum/sprite_accessory/hair/legacy/teshari_twies name = "Teshari Twies" id = "hair_teshari_twies" icon_state = "teshari_twies" - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE -/datum/sprite_accessory/hair/teshari_backstrafe +/datum/sprite_accessory/hair/legacy/teshari_backstrafe name = "Teshari Backstrafe" id = "hair_teshari_backstrafe" icon_state = "teshari_backstrafe" - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE -/datum/sprite_accessory/hair/teshari_longway +/datum/sprite_accessory/hair/legacy/teshari_longway name = "Teshari Long way" id = "hair_teshari_longway" icon_state = "teshari_longway" - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE -/datum/sprite_accessory/hair/teshari_tree +/datum/sprite_accessory/hair/legacy/teshari_tree name = "Teshari Tree" id = "hair_teshari_tree" icon_state = "teshari_tree" - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE -/datum/sprite_accessory/hair/teshari_fluffymohawk +/datum/sprite_accessory/hair/legacy/teshari_fluffymohawk name = "Teshari Fluffy Mohawk" id = "hair_teshari_mohawk_fluffy" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "teshari_fluffymohawk" species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE -/datum/sprite_accessory/hair/teshari_sleek +/datum/sprite_accessory/hair/legacy/teshari_sleek name = "Teshari Sleek" id = "hair_teshari_sleek" icon_state = "teshari_sleek" - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE -/datum/sprite_accessory/hair/teshari_thepeel +/datum/sprite_accessory/hair/legacy/teshari_thepeel name = "Teshari 'The Peel'" id = "hair_teshari_peel" icon_state = "teshari_peel" - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE -/datum/sprite_accessory/hair/teshari_sweptup +/datum/sprite_accessory/hair/legacy/teshari_sweptup name = "Teshari Swept Up" id = "hair_teshari_swept_up" icon_state = "teshari_sweep" - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE -/datum/sprite_accessory/hair/teshari_aerodynamic +/datum/sprite_accessory/hair/legacy/teshari_aerodynamic name = "Teshari Aerodynamic" id = "hair_teshari_aerodynamic" icon_state = "teshari_aerodynamic" - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE -/datum/sprite_accessory/hair/teshari_tallmohawk +/datum/sprite_accessory/hair/legacy/teshari_tallmohawk name = "Teshari Tall Mohawk" id = "hair_teshari_mohawk_tall" icon_state = "teshari_tallmohawk" - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE -/datum/sprite_accessory/hair/teshari_cowlick +/datum/sprite_accessory/hair/legacy/teshari_cowlick name = "Teshari Cow-lick" id = "hair_teshari_cowlick" icon_state = "teshari_cowlick" - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE -/datum/sprite_accessory/hair/teshari_spikyalt +/datum/sprite_accessory/hair/legacy/teshari_spikyalt name = "Teshari Spiky alt" id = "hair_teshari_spiky_alt" icon_state = "teshari_spiky2" - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE -/datum/sprite_accessory/hair/teshari_soap +/datum/sprite_accessory/hair/legacy/teshari_soap name = "Teshari Soap" id = "hair_teshari_soap" icon_state = "teshari_soap" - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE -/datum/sprite_accessory/hair/teshari_crowned +/datum/sprite_accessory/hair/legacy/teshari_crowned name = "Teshari Crowned" id = "hair_teshari_crowned" icon_state = "teshari_crowned" - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE -/datum/sprite_accessory/hair/teshari_crest +/datum/sprite_accessory/hair/legacy/teshari_crest name = "Teshari Crest" id = "hair_teshari_crest" icon_state = "teshari_crest" - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE -/datum/sprite_accessory/hair/teshari_ponytail +/datum/sprite_accessory/hair/legacy/teshari_ponytail name = "Teshari Feather Ponytail" id = "hair_teshari_ponytail" icon_state = "teshari_ponytail" - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE -/datum/sprite_accessory/hair/teshari_bun +/datum/sprite_accessory/hair/legacy/teshari_bun name = "Teshari Feather Bun" id = "hair_teshari_bun" icon_state = "teshari_bun" - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE species_allowed = list(SPECIES_TESHARI) apply_restrictions = TRUE diff --git a/code/modules/sprite_accessories/hair/unathi.dm b/code/modules/sprite_accessories/hair/species/unathi.dm similarity index 77% rename from code/modules/sprite_accessories/hair/unathi.dm rename to code/modules/sprite_accessories/hair/species/unathi.dm index d54c17ac800c..0323982b6184 100644 --- a/code/modules/sprite_accessories/hair/unathi.dm +++ b/code/modules/sprite_accessories/hair/species/unathi.dm @@ -1,20 +1,20 @@ //Unathi stuff -/datum/sprite_accessory/hair/una_hood +/datum/sprite_accessory/hair/legacy/una_hood name = "Cobra Hood" id = "hair_unathi_hood" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "soghun_hood" -/datum/sprite_accessory/hair/una_spines_long +/datum/sprite_accessory/hair/legacy/una_spines_long name = "Long Unathi Spines" id = "hair_unathi_spines_long" icon_state = "soghun_longspines" species_allowed = list(SPECIES_UNATHI, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) //Xenochimera get most hairstyles since they're abominations. apply_restrictions = TRUE -/datum/sprite_accessory/hair/una_spines_short +/datum/sprite_accessory/hair/legacy/una_spines_short name = "Short Unathi Spines" id = "hair_unathi_spines_short" icon_state = "soghun_shortspines" @@ -22,60 +22,60 @@ apply_restrictions = TRUE -/datum/sprite_accessory/hair/una_frills_long +/datum/sprite_accessory/hair/legacy/una_frills_long name = "Long Unathi Frills" id = "hair_unathi_frills_long" icon_state = "soghun_longfrills" species_allowed = list(SPECIES_UNATHI, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) apply_restrictions = TRUE -/datum/sprite_accessory/hair/una_frills_short +/datum/sprite_accessory/hair/legacy/una_frills_short name = "Short Unathi Frills" id = "hair_unathi_frills_short" icon_state = "soghun_shortfrills" species_allowed = list(SPECIES_UNATHI, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) apply_restrictions = TRUE -/datum/sprite_accessory/hair/una_horns +/datum/sprite_accessory/hair/legacy/una_horns name = "Unathi Horns" id = "hair_unathi_horns" icon_state = "soghun_horns" species_allowed = list(SPECIES_UNATHI, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) apply_restrictions = TRUE -/datum/sprite_accessory/hair/una_bighorns +/datum/sprite_accessory/hair/legacy/una_bighorns name = "Unathi Big Horns" id = "hair_unathi_horns_big" icon_state = "unathi_bighorn" species_allowed = list(SPECIES_UNATHI, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) apply_restrictions = TRUE -/datum/sprite_accessory/hair/una_smallhorns +/datum/sprite_accessory/hair/legacy/una_smallhorns name = "Unathi Small Horns" id = "hair_unathi_horns_small" icon_state = "unathi_smallhorn" species_allowed = list(SPECIES_UNATHI, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) apply_restrictions = TRUE -/datum/sprite_accessory/hair/una_ramhorns +/datum/sprite_accessory/hair/legacy/una_ramhorns name = "Unathi Ram Horns" id = "hair_unathi_horns_ram" icon_state = "unathi_ramhorn" species_allowed = list(SPECIES_UNATHI, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) apply_restrictions = TRUE -/datum/sprite_accessory/hair/una_sidefrills +/datum/sprite_accessory/hair/legacy/una_sidefrills name = "Unathi Side Frills" id = "hair_unathi_frills_side" icon_state = "unathi_sidefrills" species_allowed = list(SPECIES_UNATHI, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) apply_restrictions = TRUE -/datum/sprite_accessory/hair/una_doublehorns +/datum/sprite_accessory/hair/legacy/una_doublehorns name = "Double Unathi Horns" id = "hair_unathi_horns_double" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "soghun_dubhorns" species_allowed = list(SPECIES_UNATHI, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) apply_restrictions = TRUE diff --git a/code/modules/sprite_accessories/hair/unathi_digitigrade.dm b/code/modules/sprite_accessories/hair/species/unathi_digitigrade.dm similarity index 77% rename from code/modules/sprite_accessories/hair/unathi_digitigrade.dm rename to code/modules/sprite_accessories/hair/species/unathi_digitigrade.dm index 515ea5be3625..173739cb5bce 100644 --- a/code/modules/sprite_accessories/hair/unathi_digitigrade.dm +++ b/code/modules/sprite_accessories/hair/species/unathi_digitigrade.dm @@ -1,91 +1,91 @@ //Normal and digitigrade unathi get different hair because of their different head shape. -/datum/sprite_accessory/hair/una_digi_spines_short +/datum/sprite_accessory/hair/legacy/una_digi_spines_short name = "Short Digitigrade Unathi Spines" id = "hair_flatunathi_spines_short" icon_state = "soghun_shortspines_digi" icon = 'icons/mob/species/unathidigi/hair.dmi' - icon_add = null + icon_add_legacy = null species_allowed = list(SPECIES_UNATHI_DIGI, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) apply_restrictions = TRUE -/datum/sprite_accessory/hair/una_digi_spines_long +/datum/sprite_accessory/hair/legacy/una_digi_spines_long name = "Long Digitigrade Unathi Spines" id = "hair_flatunathi_spines_long" icon_state = "soghun_longspines_digi" icon = 'icons/mob/species/unathidigi/hair.dmi' - icon_add = null + icon_add_legacy = null species_allowed = list(SPECIES_UNATHI_DIGI, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) apply_restrictions = TRUE -/datum/sprite_accessory/hair/una_digi_finhawk +/datum/sprite_accessory/hair/legacy/una_digi_finhawk name = "Digitigrade Unathi Finhawk" id = "hair_flatunathi_finhawk" icon_state = "fin_hawk_digi" icon = 'icons/mob/species/unathidigi/hair.dmi' - icon_add = null + icon_add_legacy = null species_allowed = list(SPECIES_UNATHI_DIGI, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) apply_restrictions = TRUE -/datum/sprite_accessory/hair/una_digi_demonhorns +/datum/sprite_accessory/hair/legacy/una_digi_demonhorns name = "Digitigrade Unathi Demon Horns" id = "hair_flatunathi_horns_demon" icon_state = "demon_horn_digi" icon = 'icons/mob/species/unathidigi/hair.dmi' - icon_add = null + icon_add_legacy = null species_allowed = list(SPECIES_UNATHI_DIGI, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) apply_restrictions = TRUE -/datum/sprite_accessory/hair/una_digi_swepthorns +/datum/sprite_accessory/hair/legacy/una_digi_swepthorns name = "Digitigrade Unathi Swept Horns" id = "hair_flatunathi_horns_swept" icon_state = "swept_horn_digi" icon = 'icons/mob/species/unathidigi/hair.dmi' - icon_add = null + icon_add_legacy = null species_allowed = list(SPECIES_UNATHI_DIGI, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) apply_restrictions = TRUE -/datum/sprite_accessory/hair/una_digi_ramhorns +/datum/sprite_accessory/hair/legacy/una_digi_ramhorns name = "Digitigrade Unathi Ram Horns" id = "hair_flatunathi_horns_ram" icon_state = "ram_horn_digi" icon = 'icons/mob/species/unathidigi/hair.dmi' - icon_add = null + icon_add_legacy = null species_allowed = list(SPECIES_UNATHI_DIGI, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) apply_restrictions = TRUE -/datum/sprite_accessory/hair/una_digi_frills_long +/datum/sprite_accessory/hair/legacy/una_digi_frills_long name = "Long Digitigrade Unathi Frills" id = "hair_flatunathi_frills_long" icon_state = "soghun_longfrills_digi" icon = 'icons/mob/species/unathidigi/hair.dmi' - icon_add = null + icon_add_legacy = null species_allowed = list(SPECIES_UNATHI_DIGI, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) apply_restrictions = TRUE -/datum/sprite_accessory/hair/una_digi_frills_short +/datum/sprite_accessory/hair/legacy/una_digi_frills_short name = "Short Digitigrade Unathi Frills" id = "hair_flatunathi_frills_short" icon_state = "soghun_shortfrills_digi" icon = 'icons/mob/species/unathidigi/hair.dmi' - icon_add = null + icon_add_legacy = null species_allowed = list(SPECIES_UNATHI_DIGI, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) apply_restrictions = TRUE -/datum/sprite_accessory/hair/una_digi_horns +/datum/sprite_accessory/hair/legacy/una_digi_horns name = "Digitigrade Unathi Horns" id = "hair_flatunathi_horns" icon_state = "soghun_horns_digi" icon = 'icons/mob/species/unathidigi/hair.dmi' - icon_add = null + icon_add_legacy = null species_allowed = list(SPECIES_UNATHI_DIGI, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) apply_restrictions = TRUE -/datum/sprite_accessory/hair/una_digi_frills_big +/datum/sprite_accessory/hair/legacy/una_digi_frills_big name = "Big Digitigrade Unathi Frills" id = "hair_flatunathi_frills_big" icon_state = "big_frills_digi" icon = 'icons/mob/species/unathidigi/hair.dmi' - icon_add = null + icon_add_legacy = null species_allowed = list(SPECIES_UNATHI_DIGI, SPECIES_XENOCHIMERA, SPECIES_PROTEAN) apply_restrictions = TRUE diff --git a/code/modules/sprite_accessories/hair/vox.dm b/code/modules/sprite_accessories/hair/species/vox.dm similarity index 72% rename from code/modules/sprite_accessories/hair/vox.dm rename to code/modules/sprite_accessories/hair/species/vox.dm index cdfb3e9b402b..c5056dbe654a 100644 --- a/code/modules/sprite_accessories/hair/vox.dm +++ b/code/modules/sprite_accessories/hair/species/vox.dm @@ -1,116 +1,116 @@ -/datum/sprite_accessory/hair/vox_braid_long +/datum/sprite_accessory/hair/legacy/vox_braid_long name = "Long Vox braid" id = "hair_vox_braid_long" icon_state = "vox_longbraid" species_allowed = list(SPECIES_VOX) apply_restrictions = TRUE -/datum/sprite_accessory/hair/vox_braid_short +/datum/sprite_accessory/hair/legacy/vox_braid_short name = "Short Vox Braid" id = "hair_vox_braid_short" icon_state = "vox_shortbraid" species_allowed = list(SPECIES_VOX) apply_restrictions = TRUE -/datum/sprite_accessory/hair/vox_quills_short +/datum/sprite_accessory/hair/legacy/vox_quills_short name = "Short Vox Quills" id = "hair_vox_quills_short" icon_state = "vox_shortquills" species_allowed = list(SPECIES_VOX) apply_restrictions = TRUE -/datum/sprite_accessory/hair/vox_quills_kingly +/datum/sprite_accessory/hair/legacy/vox_quills_kingly name = "Kingly Vox Quills" id = "hair_vox_quills_kingly" icon_state = "vox_kingly" species_allowed = list(SPECIES_VOX) apply_restrictions = TRUE -/datum/sprite_accessory/hair/vox_quills_mohawk +/datum/sprite_accessory/hair/legacy/vox_quills_mohawk name = "Quill Mohawk" id = "hair_vox_quill_mohawk" icon_state = "vox_mohawk" species_allowed = list(SPECIES_VOX) apply_restrictions = TRUE -/datum/sprite_accessory/hair/vox_quills_afro +/datum/sprite_accessory/hair/legacy/vox_quills_afro name = "Vox Afro" id = "hair_vox_afro" icon_state = "vox_afro" species_allowed = list(SPECIES_VOX) apply_restrictions = TRUE -/datum/sprite_accessory/hair/vox_quills_mohawk +/datum/sprite_accessory/hair/legacy/vox_quills_mohawk name = "Vox Mohawk" id = "hair_vox_mohawk" icon_state = "vox_mohawk" species_allowed = list(SPECIES_VOX) apply_restrictions = TRUE -/datum/sprite_accessory/hair/vox_quills_yasu +/datum/sprite_accessory/hair/legacy/vox_quills_yasu name = "Vox Yasuhiro" id = "hair_vox_yasuhiro" icon_state = "vox_yasu" species_allowed = list(SPECIES_VOX) apply_restrictions = TRUE -/datum/sprite_accessory/hair/vox_quills_horns +/datum/sprite_accessory/hair/legacy/vox_quills_horns name = "Vox Quorns" id = "hair_vox_horns" icon_state = "vox_horns" species_allowed = list(SPECIES_VOX) apply_restrictions = TRUE -/datum/sprite_accessory/hair/vox_quills_nights +/datum/sprite_accessory/hair/legacy/vox_quills_nights name = "Vox Nights" id = "hair_vox_nights" icon_state = "vox_nights" species_allowed = list(SPECIES_VOX) apply_restrictions = TRUE -/datum/sprite_accessory/hair/vox_quills_surf +/datum/sprite_accessory/hair/legacy/vox_quills_surf name = "Vox Surf" id = "hair_vox_surf" icon_state = "vox_surf" species_allowed = list(SPECIES_VOX) apply_restrictions = TRUE -/datum/sprite_accessory/hair/vox_quills_cropped +/datum/sprite_accessory/hair/legacy/vox_quills_cropped name = "Vox Cropped" id = "hair_vox_cropped" icon_state = "vox_cropped" species_allowed = list(SPECIES_VOX) apply_restrictions = TRUE -/datum/sprite_accessory/hair/vox_quills_bald +/datum/sprite_accessory/hair/legacy/vox_quills_bald name = "Vox Bald" id = "hair_vox_bald" icon_state = "vox_bald" species_allowed = list(SPECIES_VOX) apply_restrictions = TRUE -/datum/sprite_accessory/hair/vox_quills_ruffhawk +/datum/sprite_accessory/hair/legacy/vox_quills_ruffhawk name = "Vox Ruffhawk" id = "hair_vox_ruff_hawk" icon_state = "vox_ruff_hawk" species_allowed = list(SPECIES_VOX) apply_restrictions = TRUE -/datum/sprite_accessory/hair/vox_quills_rows +/datum/sprite_accessory/hair/legacy/vox_quills_rows name = "Vox Rows" id = "hair_vox_rows" icon_state = "vox_rows" species_allowed = list(SPECIES_VOX) apply_restrictions = TRUE -/datum/sprite_accessory/hair/vox_quills_mange +/datum/sprite_accessory/hair/legacy/vox_quills_mange name = "Vox Mange" id = "hair_vox_mange" icon_state = "vox_mange" species_allowed = list(SPECIES_VOX) apply_restrictions = TRUE -/datum/sprite_accessory/hair/vox_quills_pony +/datum/sprite_accessory/hair/legacy/vox_quills_pony name = "Vox Pony" id = "hair_vox_pony" icon_state = "vox_pony" diff --git a/code/modules/sprite_accessories/hair/vulpkanin.dm b/code/modules/sprite_accessories/hair/species/vulpkanin.dm similarity index 66% rename from code/modules/sprite_accessories/hair/vulpkanin.dm rename to code/modules/sprite_accessories/hair/species/vulpkanin.dm index c08ae2e2648e..87142be7ea89 100644 --- a/code/modules/sprite_accessories/hair/vulpkanin.dm +++ b/code/modules/sprite_accessories/hair/species/vulpkanin.dm @@ -1,149 +1,149 @@ // Vulpa stuffs -/datum/sprite_accessory/hair/vulp_hair_none +/datum/sprite_accessory/hair/legacy/vulp_hair_none name = "None" id = "hair_vulp_none" icon_state = "bald" species_allowed = list(SPECIES_VULPKANIN) apply_restrictions = TRUE - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/hair/vulp_hair_kajam +/datum/sprite_accessory/hair/legacy/vulp_hair_kajam name = "Kajam" id = "hair_vulp_kajam" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "kajam" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN) apply_restrictions = TRUE - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/hair/vulp_hair_keid +/datum/sprite_accessory/hair/legacy/vulp_hair_keid name = "Keid" id = "hair_vulp_keid" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "keid" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN) apply_restrictions = TRUE - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/hair/vulp_hair_adhara +/datum/sprite_accessory/hair/legacy/vulp_hair_adhara name = "Adhara" id = "hair_vulp_adhara" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "adhara" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN) apply_restrictions = TRUE - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/hair/vulp_hair_kleeia +/datum/sprite_accessory/hair/legacy/vulp_hair_kleeia name = "Kleeia" id = "hair_vulp_kleeia" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "kleeia" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN) apply_restrictions = TRUE - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/hair/vulp_hair_mizar +/datum/sprite_accessory/hair/legacy/vulp_hair_mizar name = "Mizar" id = "hair_vulp_mizar" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "mizar" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN) apply_restrictions = TRUE - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/hair/vulp_hair_apollo +/datum/sprite_accessory/hair/legacy/vulp_hair_apollo name = "Apollo" id = "hair_vulp_apollo" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "apollo" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN) apply_restrictions = TRUE - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/hair/vulp_hair_belle +/datum/sprite_accessory/hair/legacy/vulp_hair_belle name = "Belle" id = "hair_vulp_belle" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "belle" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN) apply_restrictions = TRUE - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/hair/vulp_hair_bun +/datum/sprite_accessory/hair/legacy/vulp_hair_bun name = "Bun" id = "hair_vulp_bun" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "bun" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN) apply_restrictions = TRUE - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/hair/vulp_hair_jagged +/datum/sprite_accessory/hair/legacy/vulp_hair_jagged name = "Jagged" id = "hair_vulp_jagged" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "jagged" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN) apply_restrictions = TRUE - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/hair/vulp_hair_curl +/datum/sprite_accessory/hair/legacy/vulp_hair_curl name = "Curl" id = "hair_vulp_curl" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "curl" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN) apply_restrictions = TRUE - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/hair/vulp_hair_hawk +/datum/sprite_accessory/hair/legacy/vulp_hair_hawk name = "Hawk" id = "hair_vulp_hawk" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "hawk" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN) apply_restrictions = TRUE - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/hair/vulp_hair_anita +/datum/sprite_accessory/hair/legacy/vulp_hair_anita name = "Anita" id = "hair_vulp_anita" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "anita" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN) apply_restrictions = TRUE - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/hair/vulp_hair_short +/datum/sprite_accessory/hair/legacy/vulp_hair_short name = "Short" id = "hair_vulp_short" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "short" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN) apply_restrictions = TRUE - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/hair/vulp_hair_spike +/datum/sprite_accessory/hair/legacy/vulp_hair_spike name = "Spike" id = "hair_vulp_spike" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "spike" species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN) apply_restrictions = TRUE - gender = NEUTER + random_generation_gender = null diff --git a/code/modules/sprite_accessories/hair/xenomorph.dm b/code/modules/sprite_accessories/hair/species/xenomorph.dm similarity index 54% rename from code/modules/sprite_accessories/hair/xenomorph.dm rename to code/modules/sprite_accessories/hair/species/xenomorph.dm index c689578aa941..78f3c71cf7a3 100644 --- a/code/modules/sprite_accessories/hair/xenomorph.dm +++ b/code/modules/sprite_accessories/hair/species/xenomorph.dm @@ -1,58 +1,58 @@ //xeno stuffs -/datum/sprite_accessory/hair/xeno_head_drone_color +/datum/sprite_accessory/hair/legacy/xeno_head_drone_color name = "Drone dome" id = "hair_xeno_drone" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "cxeno_drone" species_allowed = list(SPECIES_XENOHYBRID) - gender = NEUTER + random_generation_gender = null // figure this one out for better coloring -/datum/sprite_accessory/hair/xeno_head_sentinel_color +/datum/sprite_accessory/hair/legacy/xeno_head_sentinel_color name = "Sentinal dome" id = "hair_xeno_sentinel" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "cxeno_sentinel" species_allowed = list(SPECIES_XENOHYBRID) - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/hair/xeno_head_queen_color +/datum/sprite_accessory/hair/legacy/xeno_head_queen_color name = "Queen dome" id = "hair_xeno_queen" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "cxeno_queen" species_allowed = list(SPECIES_XENOHYBRID) - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/hair/xeno_head_hunter_color +/datum/sprite_accessory/hair/legacy/xeno_head_hunter_color name = "Hunter dome" id = "hair_xeno_hunter" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "cxeno_hunter" species_allowed = list(SPECIES_XENOHYBRID) - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/hair/xeno_head_praetorian_color +/datum/sprite_accessory/hair/legacy/xeno_head_praetorian_color name = "Praetorian dome" id = "hair_xeno_praetorian" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "cxeno_praetorian" species_allowed = list(SPECIES_XENOHYBRID) - gender = NEUTER + random_generation_gender = null -/datum/sprite_accessory/hair/xeno_head_hybrid_color1 +/datum/sprite_accessory/hair/legacy/xeno_head_hybrid_color1 name = "Xenohybrid dome 1" id = "hair_xeno_hybrid" icon = 'icons/mob/human_face_vr.dmi' - icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_add_legacy = 'icons/mob/human_face_vr_add.dmi' icon_state = "cxeno_hybrid1" species_allowed = list(SPECIES_XENOHYBRID) - gender = NEUTER + random_generation_gender = null diff --git a/code/modules/sprite_accessories/markings/_markings.dm b/code/modules/sprite_accessories/markings/_markings.dm index eeac62d1bde7..9db9bd5dc8bd 100644 --- a/code/modules/sprite_accessories/markings/_markings.dm +++ b/code/modules/sprite_accessories/markings/_markings.dm @@ -1,8 +1,10 @@ +// todo: this shouldn't be a /sprite_accessory. + /datum/sprite_accessory/marking abstract_type = /datum/sprite_accessory/marking icon = "icons/mob/sprite_accessories/markings.dmi" do_colouration = 1 //Almost all of them have it, COLOR_ADD - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE ///Empty list is unrestricted. Should only restrict the ones that make NO SENSE on other species, //like Tajaran inner-ear coloring overlay stuff. @@ -41,14 +43,14 @@ name = "Abomination" id = "marking_abomination" icon_state = "abomination" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/abomination_alt name = "Abomination Alternate" id = "marking_abomination2" icon_state = "abomination2" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/nevrean_female @@ -56,16 +58,16 @@ id = "marking_nevrean_f" icon_state = "nevrean_f" body_parts = list(BP_HEAD) - color_blend_mode = ICON_MULTIPLY - gender = FEMALE + legacy_use_additive_color_matrix = FALSE + random_generation_gender = FEMALE /datum/sprite_accessory/marking/nevrean_male name = "Male Nevrean beak" id = "marking_nevrean_m" icon_state = "nevrean_m" body_parts = list(BP_HEAD) - color_blend_mode = ICON_MULTIPLY - gender = MALE + legacy_use_additive_color_matrix = FALSE + random_generation_gender = MALE /datum/sprite_accessory/marking/spots name = "Spots" @@ -77,7 +79,7 @@ name = "Shaggy mane/feathers" id = "marking_shaggy" icon_state = "shaggy" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_TORSO) /datum/sprite_accessory/marking/jagged_teeth @@ -90,7 +92,7 @@ name = "Blank round face (use with monster mouth)" id = "marking_face_blank" icon_state = "blankface" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/monster_mouth @@ -121,154 +123,154 @@ name = "Otie face" id = "marking_face_otie" icon_state = "otieface" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/otie_nose name = "Otie nose" id = "marking_nose_otie" icon_state = "otie_nose" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/otienose_lite name = "Short otie nose" id = "marking_nose_otie_short" icon_state = "otienose_lite" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/backstripes name = "Back stripes" id = "marking_stripes_otie" icon_state = "otiestripes" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_TORSO,BP_HEAD) /datum/sprite_accessory/marking/belly_butt name = "Belly and butt" id = "marking_bellybutt" icon_state = "bellyandbutt" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_GROIN,BP_TORSO) /datum/sprite_accessory/marking/fingers_toes name = "Fingers and toes" id = "marking_fingerstoes" icon_state = "fingerstoes" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_HAND,BP_R_HAND) /datum/sprite_accessory/marking/otie_socks name = "Fingerless socks" id = "marking_socks_otie" icon_state = "otiesocks" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND) /datum/sprite_accessory/marking/corvid_beak name = "Corvid beak" id = "marking_beak_corvid" icon_state = "corvidbeak" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/corvid_belly name = "Corvid belly" id = "marking_belly_corvid" icon_state = "corvidbelly" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_GROIN,BP_TORSO,BP_HEAD) /datum/sprite_accessory/marking/cow_body name = "Cow markings" id = "marking_body_cow" icon_state = "cowbody" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_GROIN,BP_TORSO,BP_HEAD) /datum/sprite_accessory/marking/cow_nose name = "Cow nose" id = "marking_nose_cow" icon_state = "cownose" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/zbody name = "Thick jagged stripes" id = "marking_jaggedstripes" icon_state = "zbody" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_LEG,BP_R_LEG,BP_GROIN,BP_TORSO) /datum/sprite_accessory/marking/znose name = "Jagged snout" id = "marking_nose_jagged" icon_state = "znose" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/otter_nose name = "Otter nose" id = "marking_nose_otter" icon_state = "otternose" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/otter_face name = "Otter face" id = "marking_face_otter" icon_state = "otterface" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/deer_face name = "Deer face" id = "marking_face_deer" icon_state = "deerface" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/sharkface name = "Akula snout" id = "marking_face_akula" icon_state = "sharkface" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/sheppy_face name = "Shepherd snout" id = "marking_face_shepherd" icon_state = "shepface" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/sheppy_back name = "Shepherd back" id = "marking_back_shepherd" icon_state = "shepback" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_TORSO,BP_GROIN) /datum/sprite_accessory/marking/harpy_feathers name = "Rapala leg Feather" id = "marking_leg_rapala" icon_state = "harpy-feathers" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_LEG,BP_R_LEG) /datum/sprite_accessory/marking/harpy_legs name = "Rapala leg coloring" id = "marking_leg_harpy" icon_state = "harpy-leg" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG) /datum/sprite_accessory/marking/chooves name = "Cloven hooves" id = "marking_hooves_cloven" icon_state = "chooves" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_FOOT,BP_R_FOOT) /datum/sprite_accessory/marking/alurane @@ -293,98 +295,98 @@ name = "Skrell Highlight" id = "marking_hightlight_skrell" icon_state = "skrellhighlight" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_HAND,BP_R_HAND,BP_GROIN,BP_TORSO,BP_HEAD) /datum/sprite_accessory/marking/skrell_chest name = "Skrell Chest" id = "marking_chest_skrell" icon_state = "skrellchest" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_TORSO) /datum/sprite_accessory/marking/skrell_leg name = "Skrell Leg Marking" id = "marking_leg_skrell" icon_state = "skrellleg" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG) /datum/sprite_accessory/marking/gloss name = "Full body gloss" id = "marking_body_gloss" icon_state = "gloss" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_GROIN,BP_TORSO,BP_HEAD) /datum/sprite_accessory/marking/osocks_rarm name = "Modular Longsock (right arm)" id = "marking_sock_rarm" icon_state = "osocks" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_R_ARM,BP_R_HAND) /datum/sprite_accessory/marking/osocks_larm name = "Modular Longsock (left arm)" id = "marking_sock_larm" icon_state = "osocks" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_ARM,BP_L_HAND) /datum/sprite_accessory/marking/osocks_rleg name = "Modular Longsock (right leg)" id = "marking_sock_rleg" icon_state = "osocks" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_R_FOOT,BP_R_LEG) /datum/sprite_accessory/marking/osocks_lleg name = "Modular Longsock (left leg)" id = "marking_sock_lleg" icon_state = "osocks" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_FOOT,BP_L_LEG) /datum/sprite_accessory/marking/catwomantorso name = "Catwoman chest stripes" id = "marking_chest_catwoman" icon_state = "catwomanchest" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_TORSO) /datum/sprite_accessory/marking/catwomangroin name = "Catwoman groin stripes" id = "marking_groin_catwoman" icon_state = "catwomangroin" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_GROIN) /datum/sprite_accessory/marking/catwoman_rleg name = "Catwoman right leg stripes" id = "marking_catwoman_rleg" icon_state = "catwomanright" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_R_LEG) /datum/sprite_accessory/marking/catwoman_lleg name = "Catwoman left leg stripes" id = "marking_catwoman_lleg" icon_state = "catwomanleft" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_LEG) /datum/sprite_accessory/marking/tentacle_head name = "Squid Head" id = "marking_head_squid" icon_state = "tentaclehead" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/tentacle_mouth name = "Tentacle Mouth" id = "marking_mouth_tentacles" icon_state = "tentaclemouth" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/rosette @@ -397,7 +399,7 @@ name = "Shadekin Snoot" id = "marking_face_shadekin" icon_state = "shadekin-snoot" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) species_allowed = list(SPECIES_SHADEKIN, SPECIES_SHADEKIN_CREW) apply_restrictions = TRUE @@ -406,56 +408,56 @@ name = "Talons" id = "marking_talons" icon_state = "talons" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG) /datum/sprite_accessory/marking/claws name = "Claws" id = "marking_claws" icon_state = "claws" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_HAND,BP_R_HAND) /datum/sprite_accessory/marking/equine_snout //Why the long face? Works best with sergal bodytype. name = "Equine Snout" id = "marking_face_donkey" icon_state = "donkey" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/equine_nose name = "Equine Nose" id = "marking_nose_equine" icon_state = "dnose" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/short_snoot name = "Short Snout" id = "marking_snout_short" icon_state = "shortsnoot" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/short_snoot_nose name = "Short Snout Nose" id = "marking_snout_short_nose" icon_state = "snootnose" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/fullhead name = "Full Head Color" id = "marking_head_full" icon_state = "fullhead" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/nosehuman name = "Human Nose Color" id = "marking_nose" icon_state = "nose" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/lipcolorhuman @@ -468,12 +470,12 @@ name = "Jackal Backpattern" id = "marking_back_jackal" icon_state = "jackal_backpattern" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_ARM,BP_R_ARM,BP_TORSO) /datum/sprite_accessory/marking/jackal_bareback name = "Jackal Bareback" id = "marking_back_jackal2" icon_state = "jackal_bareback" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_ARM,BP_R_ARM,BP_GROIN,BP_TORSO) diff --git a/code/modules/sprite_accessories/markings/diona_stuff.dm b/code/modules/sprite_accessories/markings/diona_stuff.dm index 4c498988943b..79fb6f8c9c3a 100644 --- a/code/modules/sprite_accessories/markings/diona_stuff.dm +++ b/code/modules/sprite_accessories/markings/diona_stuff.dm @@ -7,7 +7,7 @@ name = "Diona Leaves" id = "marking_diona_leaves" icon_state = "diona_leaves" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_GROIN,BP_TORSO,BP_HEAD) apply_restrictions = TRUE @@ -15,7 +15,7 @@ name = "Diona Thorns" id = "marking_diona_thorns" icon_state = "diona_thorns" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_TORSO,BP_HEAD) apply_restrictions = TRUE @@ -23,7 +23,7 @@ name = "Diona Flowers" id = "marking_diona_flowers" icon_state = "diona_flowers" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_TORSO,BP_HEAD) apply_restrictions = TRUE @@ -31,6 +31,6 @@ name = "Diona moss" id = "marking_diona_moss" icon_state = "diona_moss" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_TORSO) apply_restrictions = TRUE diff --git a/code/modules/sprite_accessories/markings/eye_stuff.dm b/code/modules/sprite_accessories/markings/eye_stuff.dm index 8f1c66e2d15c..4951dc901bc8 100644 --- a/code/modules/sprite_accessories/markings/eye_stuff.dm +++ b/code/modules/sprite_accessories/markings/eye_stuff.dm @@ -18,28 +18,28 @@ name = "Eyebrows" id = "marking_eye_brow" icon_state = "brows" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/eye_stuff/tridot name = "Tri-Dot" id = "marking_eye_tridot" icon_state = "tridot" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/eye_stuff/tridotflipped name = "Tri-Dot Flipped" id = "marking_eye_tridotflipped" icon_state = "tridotflipped" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/eye_stuff/zmask name = "Eye mask" id = "marking_eye_mask" icon_state = "zmask" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/eye_stuff/motheyes diff --git a/code/modules/sprite_accessories/markings/panda.dm b/code/modules/sprite_accessories/markings/panda.dm index 0e7331eb29d7..dfb501059a5b 100644 --- a/code/modules/sprite_accessories/markings/panda.dm +++ b/code/modules/sprite_accessories/markings/panda.dm @@ -14,4 +14,4 @@ id = "marking_panda_full" icon_state = "panda" body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND) - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE diff --git a/code/modules/sprite_accessories/markings/sergal.dm b/code/modules/sprite_accessories/markings/sergal.dm index 4ed063cee27b..b4259509d54b 100644 --- a/code/modules/sprite_accessories/markings/sergal.dm +++ b/code/modules/sprite_accessories/markings/sergal.dm @@ -6,7 +6,7 @@ name = "Sergal Markings" id = "marking_sergal_full_m" icon_state = "sergal_full" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_GROIN,BP_TORSO,BP_HEAD) species_allowed = list(SPECIES_SERGAL) apply_restrictions = TRUE @@ -15,7 +15,7 @@ name = "Sergal Markings (Female)" id = "marking_sergal_full_f" icon_state = "sergal_full_female" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_GROIN,BP_TORSO,BP_HEAD) species_allowed = list(SPECIES_SERGAL) apply_restrictions = TRUE diff --git a/code/modules/sprite_accessories/markings/synth_stuff.dm b/code/modules/sprite_accessories/markings/synth_stuff.dm index ac2e584fbb9f..80912c3c764b 100644 --- a/code/modules/sprite_accessories/markings/synth_stuff.dm +++ b/code/modules/sprite_accessories/markings/synth_stuff.dm @@ -6,112 +6,112 @@ name = "Ward - Spirit FBP Lights" id = "marking_synth_spirit" icon_state = "lights" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_TORSO,BP_HEAD) /datum/sprite_accessory/marking/synth/spirit_lights_body name = "Ward - Spirit FBP Lights (body)" id = "marking_synth_spirit_body" icon_state = "lights" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_TORSO) /datum/sprite_accessory/marking/synth/spirit_lights_torso name = "Ward - Spirit FBP Lights (torso)" id = "marking_synth_spirit_torso" icon_state = "lights" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_TORSO) /datum/sprite_accessory/marking/synth/spirit_lights_head name = "Ward - Spirit FBP Lights (head)" id = "marking_synth_spirit_head" icon_state = "lights" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/synth/spirit_panels name = "Ward - Spirit FBP Panels" id = "marking_synth_spirit_panel" icon_state = "panels" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_GROIN,BP_TORSO,BP_HEAD) /datum/sprite_accessory/marking/synth/spirit_panels_body name = "Ward - Spirit FBP Panels (body)" id = "marking_synth_spirit_panel_body" icon_state = "panels" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_GROIN,BP_TORSO) /datum/sprite_accessory/marking/synth/spirit_panels_torso name = "Ward - Spirit FBP Panels (torso)" id = "marking_synth_spirit_panel_torso" icon_state = "panels" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_GROIN,BP_TORSO) /datum/sprite_accessory/marking/synth/spirit_panels_feet name = "Ward - Spirit FBP Panels (feet)" id = "marking_synth_spirit_panel_feet" icon_state = "panels" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_FOOT,BP_R_FOOT) /datum/sprite_accessory/marking/synth/spirit_panels_head name = "Ward - Spirit FBP Panels (head)" id = "marking_synth_spirit_panel_head" icon_state = "panels" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/synth/c_beast_body name = "Cyber Body" id = "marking_synth_cyber_body" icon_state = "c_beast_body" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_TORSO,BP_GROIN) /datum/sprite_accessory/marking/synth/c_beast_plating name = "Cyber Plating (Use with Cyber Body)" id = "marking_synth_cyber_plating" icon_state = "c_beast_plating" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM) /datum/sprite_accessory/marking/synth/c_beast_band name = "Cyber Band (Use with Cybertech head)" id = "marking_synth_cyber_band" icon_state = "c_beast_band" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/synth/c_beast_cheek_a name = "Cyber Beast Cheeks A (Use A, B and C)" id = "marking_synth_cyber_cheek1" icon_state = "c_beast_a" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/synth/c_beast_cheek_b name = "Cyber Beast Cheeks B (Use A, B and C)" id = "marking_synth_cyber_cheek2" icon_state = "c_beast_b" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/synth/c_beast_cheek_c name = "Cyber Beast Cheeks c (Use A, B and C)" id = "marking_synth_cyber_cheek3" icon_state = "c_beast_c" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/synth/eboop_panels name = "Eggnerd FBP panels" id = "marking_synth_eggnerd_panel" icon_state = "eboop" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_GROIN,BP_TORSO,BP_HEAD) // synth antennae @@ -119,7 +119,7 @@ name = "Synthlizard Antennae" id = "marking_synth_antennae" icon_state = "normal_antenna" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/synth/antennae/curled @@ -151,7 +151,7 @@ name = "Synthlizard Snout 1" id = "marking_synth_snout_1" icon_state = "synthliz_snout1" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/synth/snout/alt @@ -168,7 +168,7 @@ name = "Synthlizard Eyes" id = "marking_synthliz_eyes" icon_state = "synthliz_eyes" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) // Replika @@ -177,40 +177,40 @@ name = "Replikant Stripe - Right Thigh" id = "marking_replika_r_thigh" icon_state = "replika" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_R_LEG) /datum/sprite_accessory/marking/synth/replika_r_knee name = "Replikant Stripe - Right Knee" id = "marking_replika_r_knee" icon_state = "replika" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_R_FOOT) /datum/sprite_accessory/marking/synth/replika_l_thigh name = "Replikant Stripe - Left Thigh" id = "marking_replika_l_thigh" icon_state = "replika" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_LEG) /datum/sprite_accessory/marking/synth/replika_l_knee name = "Replikant Stripe - Left Knee" id = "marking_replika_l_knee" icon_state = "replika" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_FOOT) /datum/sprite_accessory/marking/synth/replika_panels_body name = "Replikant Paneling - SynthFlesh (body)" id = "marking_replika_panel_body" icon_state = "replika" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_TORSO) /datum/sprite_accessory/marking/synth/replika_panels_groin name = "Replikant Paneling - SynthFlesh (groin)" id = "marking_replika_panel_groin" icon_state = "replika" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_GROIN) diff --git a/code/modules/sprite_accessories/markings/taj.dm b/code/modules/sprite_accessories/markings/taj.dm index 177f3f911061..ac272c1ca412 100644 --- a/code/modules/sprite_accessories/markings/taj.dm +++ b/code/modules/sprite_accessories/markings/taj.dm @@ -146,7 +146,7 @@ name = "Nose Color, alt. (Taj)" id = "marking_tajaran_nose_alt" icon_state = "taj_nosealt" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/taj/tigerface diff --git a/code/modules/sprite_accessories/markings/tesh.dm b/code/modules/sprite_accessories/markings/tesh.dm index 7251e584023d..b6aa4baac171 100644 --- a/code/modules/sprite_accessories/markings/tesh.dm +++ b/code/modules/sprite_accessories/markings/tesh.dm @@ -14,40 +14,40 @@ name = "Teshari Feathers" id = "marking_teshari_feathers" icon_state = "teshi_feathers" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_FOOT, BP_R_FOOT, BP_L_HAND, BP_R_HAND) /datum/sprite_accessory/marking/tesh/teshi_fluff name = "Teshari underfluff" id = "marking_teshari_fluff" icon_state = "teshi_fluff" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_LEG, BP_R_LEG, BP_GROIN, BP_TORSO, BP_HEAD) /datum/sprite_accessory/marking/tesh/teshi_small_feathers name = "Teshari small wingfeathers" id = "marking_teshari_wingfeathers_small" icon_state = "teshi_sf" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_FOOT, BP_R_FOOT, BP_L_HAND, BP_R_HAND, BP_TORSO) /datum/sprite_accessory/marking/tesh/teshari_coat name = "Teshari coat" id = "marking_teshari_coat" icon_state = "teshi_coat" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_LEG, BP_R_LEG, BP_L_ARM, BP_R_ARM, BP_TORSO, BP_HEAD) /datum/sprite_accessory/marking/tesh/teshari_pattern_male name = "Teshari male pattern" id = "marking_teshari_pattern_m" icon_state = "teshi_pattern_male" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_LEG, BP_R_LEG, BP_L_ARM, BP_R_ARM, BP_L_HAND, BP_R_HAND, BP_TORSO, BP_GROIN, BP_HEAD) /datum/sprite_accessory/marking/tesh/teshari_pattern_female name = "Teshari female pattern" id = "marking_teshari_pattern_f" icon_state = "teshi_pattern_fem" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_LEG, BP_R_LEG, BP_L_HAND, BP_R_HAND, BP_TORSO, BP_GROIN, BP_HEAD) diff --git a/code/modules/sprite_accessories/markings/unathi.dm b/code/modules/sprite_accessories/markings/unathi.dm index fe2df63e76bc..7bb672c237d3 100644 --- a/code/modules/sprite_accessories/markings/unathi.dm +++ b/code/modules/sprite_accessories/markings/unathi.dm @@ -34,61 +34,61 @@ name = "Cobra Hood" id = "marking_unathi_hood" icon_state = "unathihood" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/unathi/unathihood_inner name = "Cobra Hood (Inner)" id = "marking_unathi_hood_inner" icon_state = "unathihood_inner" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/unathi/unathidoublehorns name = "Double Unathi Horns" id = "marking_unathi_horns_double" icon_state = "unathidoublehorns" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/unathi/unathihorns name = "Unathi Horns" id = "marking_unathi_horns" icon_state = "unathihorns" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/unathi/unathiramhorns name = "Unathi Ram Horns" id = "marking_unathi_horns_ram" icon_state = "unathiramhorns" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/unathi/unathishortspines name = "Unathi Short Spines" id = "marking_unathi_spines_short" icon_state = "unathishortspines" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/unathi/unathilongspines name = "Unathi Long Spines" id = "marking_unathi_spines_lnog" icon_state = "unathilongspines" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/unathi/unathishortfrills name = "Unathi Short Frills" id = "marking_unathi_frills_short" icon_state = "unathishortfrills" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/unathi/unathilongfrills name = "Unathi Long Frills" id = "marking_unathi_frills_long" icon_state = "unathilongfrills" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) diff --git a/code/modules/sprite_accessories/markings/vox.dm b/code/modules/sprite_accessories/markings/vox.dm index 0d432e4b7cd4..5d1246cd95a1 100644 --- a/code/modules/sprite_accessories/markings/vox.dm +++ b/code/modules/sprite_accessories/markings/vox.dm @@ -33,19 +33,19 @@ name = "Vox Scales" id = "marking_vox_scales" icon_state = "Voxscales" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_HEAD) /datum/sprite_accessory/marking/vox/voxclaws name = "Vox Claws" icon_state = "Voxclaws" id = "marking_vox_claws" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_HAND,BP_R_HAND) /datum/sprite_accessory/marking/vox/voxbeak name = "Vox Beak" id = "marking_vox_beak" icon_state = "Voxscales" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) diff --git a/code/modules/sprite_accessories/markings/vulpkanin.dm b/code/modules/sprite_accessories/markings/vulpkanin.dm index 822f59f4e9a6..0874af6aee64 100644 --- a/code/modules/sprite_accessories/markings/vulpkanin.dm +++ b/code/modules/sprite_accessories/markings/vulpkanin.dm @@ -6,68 +6,68 @@ name = "belly fur (Vulp)" id = "marking_vulp_belly" icon_state = "vulp_belly" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_TORSO,BP_GROIN) /datum/sprite_accessory/marking/vulp/vulp_fullbelly name = "full belly fur (Vulp)" id = "marking_vulp_fullbelly" icon_state = "vulp_fullbelly" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_TORSO,BP_GROIN) /datum/sprite_accessory/marking/vulp/vulp_crest name = "belly crest (Vulp)" id = "marking_vulp_crest" icon_state = "vulp_crest" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_TORSO,BP_GROIN) /datum/sprite_accessory/marking/vulp/vulp_nose name = "nose (Vulp)" id = "marking_vulp_nose" icon_state = "vulp_nose" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/vulp/vulp_short_nose name = "nose, short (Vulp)" id = "marking_vulp_nose_short" icon_state = "vulp_short_nose" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/vulp/snoutstripe name = "snout stripe (Vulp)" id = "marking_vulp_snoutstripe" icon_state = "snoutstripe" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/vulp/vulp_face name = "face (Vulp)" id = "marking_vulp_face" icon_state = "vulp_face" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/vulp/vulp_facealt name = "face, alt. (Vulp)" id = "marking_vulp_facealt" icon_state = "vulp_facealt" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/vulp/vulp_earsface name = "ears and face (Vulp)" id = "marking_vulp_earsface" icon_state = "vulp_earsface" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) /datum/sprite_accessory/marking/vulp/vulp_all id = "marking_vulp_all" name = "all head highlights (Vulp)" icon_state = "vulp_all" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) diff --git a/code/modules/sprite_accessories/markings/werebeast.dm b/code/modules/sprite_accessories/markings/werebeast.dm index ff3ddbe893be..af2c0f758732 100644 --- a/code/modules/sprite_accessories/markings/werebeast.dm +++ b/code/modules/sprite_accessories/markings/werebeast.dm @@ -1,7 +1,7 @@ /datum/sprite_accessory/marking/werebeast abstract_type = /datum/sprite_accessory/marking/werebeast icon = 'icons/mob/clothing/species/werebeast/werebeast_markings.dmi' - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE species_allowed = list(SPECIES_WEREBEAST) apply_restrictions = TRUE diff --git a/code/modules/sprite_accessories/markings/zorren.dm b/code/modules/sprite_accessories/markings/zorren.dm index bd11fdaafe76..34bf24bc23d1 100644 --- a/code/modules/sprite_accessories/markings/zorren.dm +++ b/code/modules/sprite_accessories/markings/zorren.dm @@ -6,65 +6,65 @@ name = "Zorren Male Torso" id = "marking_zorren_belly_m" icon_state = "zorren_belly" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_TORSO,BP_GROIN) /datum/sprite_accessory/marking/zorren/zorren_belly_female name = "Zorren Female Torso" id = "marking_zorren_belly_f" icon_state = "zorren_belly_female" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_TORSO,BP_GROIN) /datum/sprite_accessory/marking/zorren/zorren_back_patch name = "Zorren Back Patch" id = "marking_zorren_backpatch" icon_state = "zorren_backpatch" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_TORSO) /datum/sprite_accessory/marking/zorren/zorren_face_male name = "Zorren Male Face" id = "marking_zorren_face_m" icon_state = "zorren_face" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) - gender = MALE + random_generation_gender = MALE /datum/sprite_accessory/marking/zorren/zorren_face_female name = "Zorren Female Face" id = "marking_zorren_face_f" icon_state = "zorren_face_female" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) - gender = FEMALE + random_generation_gender = FEMALE /datum/sprite_accessory/marking/zorren/zorren_muzzle_male name = "Zorren Male Muzzle" id = "marking_zorren_muzzle_m" icon_state = "zorren_muzzle" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) - gender = MALE + random_generation_gender = MALE /datum/sprite_accessory/marking/zorren/zorren_muzzle_female name = "Zorren Female Muzzle" id = "marking_zorren_muzzle_f" icon_state = "zorren_muzzle_female" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_HEAD) - gender = FEMALE + random_generation_gender = FEMALE /datum/sprite_accessory/marking/zorren/zorren_socks name = "Zorren Socks" id = "marking_zorren_socks" icon_state = "zorren_socks" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND) /datum/sprite_accessory/marking/zorren/zorren_longsocks name = "Zorren Longsocks" id = "marking_zorren_socks_long" icon_state = "zorren_longsocks" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND) diff --git a/code/modules/sprite_accessories/sprite_accessories.dm b/code/modules/sprite_accessories/sprite_accessories.dm deleted file mode 100644 index 884a75625330..000000000000 --- a/code/modules/sprite_accessories/sprite_accessories.dm +++ /dev/null @@ -1,60 +0,0 @@ -/** - * - * Hello and welcome to sprite_accessories: For sprite accessories, such as hair, - * facial hair, and possibly tattoos and stuff somewhere along the line. This file is - * intended to be friendly for people with little to no actual coding experience. - * The process of adding in new hairstyles has been made pain-free and easy to do. - * Enjoy! - Doohl - * - * - * Notice: This all gets automatically compiled in a list in dna2.dm, so you do not - * have to define any UI values for sprite accessories manually for hair and facial - * hair. Just add in new hair types and the game will naturally adapt. - * - * !!WARNING!!: changing existing hair information can be VERY hazardous to savefiles, - * to the point where you may completely corrupt a server's savefiles. Please refrain - * from doing this unless you absolutely know what you are doing, and have defined a - * conversion in savefile.dm - */ - -// TODO: actual better way to do these -// TODO: actual better way to do "can we use this" checks because one whitelist list and a var is fucking horrible to maintain what the fuck - -/datum/sprite_accessory - - /// The icon file the accessory is located in. - var/icon - /// The icon_state of the accessory. - var/icon_state - /// A custom preview state for whatever reason. - var/preview_state - - /// The preview name of the accessory. - var/name - - /// Determines if the accessory will be skipped or included in random hair generations. - var/gender = NEUTER - - /// Restrict some styles to specific species. - var/list/species_allowed = list(SPECIES_HUMAN,SPECIES_PROMETHEAN,SPECIES_HUMAN_VATBORN) - - /// Whether or not the accessory can be affected by colouration. - var/do_colouration = 1 - - var/color_blend_mode = ICON_MULTIPLY // If checked. - - /// use front/behind, citadel snowflake for now; only usable on wings/tails - var/front_behind_system = FALSE - - // Ckey of person allowed to use this, if defined. - var/list/ckeys_allowed = null - var/apply_restrictions = FALSE //whether to apply restrictions for specific tails/ears/wings - var/center = FALSE - var/dimension_x = 32 - var/dimension_y = 32 - /// id - var/id - // these two are moved up for now - var/extra_overlay // Icon state of an additional overlay to blend in. - var/extra_overlay2 - var/can_be_hidden = TRUE diff --git a/code/modules/sprite_accessories/sprite_accessory.dm b/code/modules/sprite_accessories/sprite_accessory.dm new file mode 100644 index 000000000000..9c151d4cf69c --- /dev/null +++ b/code/modules/sprite_accessories/sprite_accessory.dm @@ -0,0 +1,424 @@ +// TODO: actual better way to do these +// TODO: actual better way to do "can we use this" checks because one whitelist list and a var is fucking horrible to maintain what the fuck + +// todo: ouch at this list +GLOBAL_LIST_EMPTY(sprite_accessory_icon_cache) + +/datum/sprite_accessory + abstract_type = /datum/sprite_accessory + + //* basics *// + /// The preview name of the accessory. + var/name + /// id; must be unique globally amongst /datum/sprite_accessory's! + var/id + + //* character setup *// + /// Determines if the accessory will be skipped or included in random hair generations. + /// if set, someone must be this gender to receive it + var/random_generation_gender + /// can be selected + var/selectable = TRUE + + //* coloration *// + /// coloration mode + // todo: rigsuit update first, this is a placeholder + var/coloration_mode + /// color amount when in overlays mode; other colors will be rendered in _2, _3, etc; + /// _add will go ontop. + // todo: rigsuit update first, this is a placeholder + var/coloration_amount = 1 + + //* icon location & base state *// + /// The icon file the accessory is located in. + var/icon + /// The icon_state of the accessory. + var/icon_state + /// default variation is called 'Normal' + /// assoc list; name to state. + var/list/variations + /// time required for one 'cycle' of a variation animation by variation + var/list/variation_animation_times + /// time required for one 'cycle' of a variation animation, defaulting + var/variation_animation_time = 2 SECONDS + /// sidedness; how many more states we need to inject for it to work + var/icon_sidedness = SPRITE_ACCESSORY_SIDEDNESS_NONE + + //* icon dimensions & alignment *// + var/icon_dimension_x = 32 + var/icon_dimension_y = 32 + /// alignment; how we should align the sprite to the mob + /// we will always be able to be re-aligned by the mob for obvious reasons, especially if their + /// bodyparts are misaligned when the bodyparts in question are considered our anchors. + var/icon_alignment = SPRITE_ACCESSORY_ALIGNMENT_IGNORE + + //* rendering *// + /// overlay/blend this in with ADD mode, rather than overlay mode. + /// used for making stuff not look flat and other effects. + /// a state with [icon_state]-add will be added. + /// -front, -back, -side will be specified as needed too if this is the case. + var/has_add_state = FALSE + + //* legacy below + + /// Restrict some styles to specific species. + var/list/species_allowed = list(SPECIES_HUMAN,SPECIES_PROMETHEAN,SPECIES_HUMAN_VATBORN) + + /// Whether or not the accessory can be affected by colouration. + var/do_colouration = 1 + + /// use additive color matrix on the main overlay, rather than multiply + /// this is slow, please stop using it and do proper greyscales. + var/legacy_use_additive_color_matrix = FALSE + + var/apply_restrictions = FALSE //whether to apply restrictions for specific tails/ears/wings + // these two are moved up for now + // if this is set, we will also apply sidedness (front/behind/side enum) to it! + var/extra_overlay // Icon state of an additional overlay to blend in. + // if this is set, we will also apply sidedness (front/behind/side enum) to it! + var/extra_overlay2 + var/can_be_hidden = TRUE + +/** + * todo: with_base_state completely tramples extra_overlay, extra_overlay2 + * we need to redo this at some point. + */ +/datum/sprite_accessory/proc/render(mob/for_whom, list/colors, layer_front, layer_behind, layer_side, with_base_state = icon_state, with_variation, flattened) + if(flattened) + if(!length(GLOB.clients)) + // lol, lmao + return + var/list/image/layers_flat = flattened(arglist(args)) + return align_layers(layers_flat) + if(variations?[with_variation]) + with_base_state = variations[with_variation] + if(legacy_use_additive_color_matrix && colors) + // clone list to not mutate original + colors = colors.Copy() + // transform colors into additive color matrices + for(var/i in 1 to length(colors)) + if(islist(colors[i])) + stack_trace("attempted to use a color matrix with legacy additive; this is not supported.") + continue + if(!istext(colors[i])) + stack_trace("attempted to use non-text color string with legacy additive; this is not supported.") + var/list/decoded = ReadRGB(colors[i]) + var/list/computed = list( + 1, 0, 0, + 0, 1, 0, + 0, 0, 1, + decoded[1] / 255, decoded[2] / 255, decoded[3] / 255, + ) + colors[i] = computed + + // todo: refactor so we don't need to manually build + var/list/icon_states = list(with_base_state) + if(extra_overlay) + icon_states += extra_overlay + if(extra_overlay2) + icon_states += extra_overlay2 + + var/list/layers = list() + var/index = 0 + // process base layers + for(var/state in icon_states) + ++index + var/image/rendering + // front + rendering = image(icon, icon_sidedness > SPRITE_ACCESSORY_SIDEDNESS_NONE? "[state]-front" : "[state]", layer_front) + if(do_colouration && length(colors) >= index) + rendering.color = colors[index] + // process add layer if needed + if(has_add_state) + var/image/adding + adding = image(icon, icon_sidedness > SPRITE_ACCESSORY_SIDEDNESS_NONE? "[with_base_state]-add-front" : "[with_base_state]-add", layer_front) + adding.blend_mode = BLEND_ADD + rendering.overlays += adding + // add + layers += rendering + + if(icon_sidedness >= SPRITE_ACCESSORY_SIDEDNESS_FRONT_BEHIND) + // behind + rendering = image(icon, "[state]-behind", layer_behind) + if(do_colouration && length(colors) >= index) + rendering.color = colors[index] + // process add layer if needed + if(has_add_state) + var/image/adding + adding = image(icon, "[with_base_state]-add-behind", layer_behind) + adding.blend_mode = BLEND_ADD + rendering.overlays += adding + // add + layers += rendering + + return align_layers(layers) + +/datum/sprite_accessory/proc/align_layers(list/image/layers) + for(var/image/patching as anything in layers) + // patching.appearance_flags = KEEP_TOGETHER + switch(icon_alignment) + if(SPRITE_ACCESSORY_ALIGNMENT_IGNORE) + if(SPRITE_ACCESSORY_ALIGNMENT_BOTTOM) + patching.pixel_x = round((WORLD_ICON_SIZE - icon_dimension_x) * 0.5) + if(SPRITE_ACCESSORY_ALIGNMENT_CENTER) + patching.pixel_x = round((WORLD_ICON_SIZE - icon_dimension_x) * 0.5) + patching.pixel_y = round((WORLD_ICON_SIZE - icon_dimension_y) * 0.5) + return layers + +/** + * order **must** be deterministic! + */ +/datum/sprite_accessory/proc/flat_cache_keys(mob/for_whom, list/colors, layer_front, layer_behind, layer_side, with_base_state = icon_state, with_variation, flattened) + . = list( + id, + with_base_state, + ) + . += jointext(colors, ":") + +/datum/sprite_accessory/proc/flattened(mob/for_whom, list/colors, layer_front, layer_behind, layer_side, with_base_state = icon_state, with_variation, flattened) + var/list/cache_keys = flat_cache_keys(arglist(args)) + var/cache_key = jointext(cache_keys, "-") + // check the main cache key only, icon_sidedness shouldn't check at runtime + if(isnull(GLOB.sprite_accessory_icon_cache[cache_key])) + // for new coders: args is just a list like any other, and it's *sort of* mutable. + // set args.flattened to FALSE + flattened = FALSE + // pass in args + var/list/layers = render(arglist(args)) + // behavior past this point assumes layers cuont is always the same as sidedness. + // as well as the sidedness being the same index as the layer + // at time of writing, + // 1 = front + // 2 = behind + // 3 = side (unimplemented) + ASSERT(length(layers) == icon_sidedness) + // so i yelled 'it's rendering time' + var/client/designated_victim = pick(GLOB.clients) + if(!designated_victim?.initialized) + STACK_TRACE("somehow we got an uninitialized client. ouch!") + return layers + for(var/i in 1 to length(layers)) + var/image/casted = layers[i] + var/icon/rendered = render_compound_icon_with_client(casted, designated_victim) + if(!rendered) + STACK_TRACE("something went horribly wrong ):") + return layers + layers[i] = rendered + // cache things + GLOB.sprite_accessory_icon_cache[cache_key] = layers[1] + switch(icon_sidedness) + if(SPRITE_ACCESSORY_SIDEDNESS_NONE) + GLOB.sprite_accessory_icon_cache[cache_key] = layers[1] + if(SPRITE_ACCESSORY_SIDEDNESS_FRONT_BEHIND) + GLOB.sprite_accessory_icon_cache[cache_key] = layers[1] + GLOB.sprite_accessory_icon_cache["[cache_key]-behind"] = layers[2] + switch(icon_sidedness) + if(SPRITE_ACCESSORY_SIDEDNESS_NONE) + return list( + image( + GLOB.sprite_accessory_icon_cache[cache_key], + layer = layer_front, + ), + ) + if(SPRITE_ACCESSORY_SIDEDNESS_FRONT_BEHIND) + return list( + image( + GLOB.sprite_accessory_icon_cache[cache_key], + layer = layer_front, + ), + image( + GLOB.sprite_accessory_icon_cache["[cache_key]-behind"], + layer = layer_behind, + ), + ) + +//* Resolution *// + +/** + * turns a list of SPRITE_ACCESSORY_SLOT_X = accessory into the cached global accessory instances. + * + * accessory may be an accessory, path, or id string. + */ +/proc/resolve_sprite_accessory_key_list_inplace(list/accessories) + for(var/key in accessories) + var/value = accessories[key] + if(ispath(value)) + var/datum/sprite_accessory/casted = value + value = initial(casted.id) + if(istext(value)) + switch(key) + if(SPRITE_ACCESSORY_SLOT_EARS) + value = GLOB.sprite_accessory_ears[value] + if(SPRITE_ACCESSORY_SLOT_FACEHAIR) + value = GLOB.sprite_accessory_facial_hair[value] + if(SPRITE_ACCESSORY_SLOT_HAIR) + value = GLOB.sprite_accessory_hair[value] + if(SPRITE_ACCESSORY_SLOT_HORNS) + value = GLOB.sprite_accessory_ears[value] + if(SPRITE_ACCESSORY_SLOT_TAIL) + value = GLOB.sprite_accessory_tails[value] + if(SPRITE_ACCESSORY_SLOT_WINGS) + value = GLOB.sprite_accessory_wings[value] + accessories[key] = value + return accessories + +/// by id +GLOBAL_LIST_INIT(sprite_accessory_hair, all_hair_styles()) +/// by id +GLOBAL_LIST_INIT(sprite_accessory_ears, all_ear_styles()) +/// by id +GLOBAL_LIST_INIT(sprite_accessory_tails, all_tail_styles()) +/// by id +GLOBAL_LIST_INIT(sprite_accessory_wings, all_wing_styles()) +/// by id +GLOBAL_LIST_INIT(sprite_accessory_facial_hair, all_facial_hair_styles()) +/// by id +GLOBAL_LIST_INIT(sprite_accessory_markings, all_marking_styles()) + +// todo: most uses of these should either be a direct ref under new marking system or +// todo: an id to ref. +// todo: however, there are some legitimate cases of needing fast name lookup, +// todo: like non-tgui interfaces that let you choose markings +// todo: do not blindly kill these lists, we'll deal with everything as we go. + +// by name +GLOBAL_LIST(legacy_hair_lookup) +// by id +GLOBAL_LIST(legacy_ears_lookup) +// by id +GLOBAL_LIST(legacy_wing_lookup) +// by id +GLOBAL_LIST(legacy_tail_lookup) +// by name +GLOBAL_LIST(legacy_facial_hair_lookup) +// by name +GLOBAL_LIST(legacy_marking_lookup) + +/proc/all_hair_styles() + . = list() + var/list/by_name = list() + for(var/path in subtypesof(/datum/sprite_accessory/hair)) + var/datum/sprite_accessory/S = path + if(initial(S.abstract_type) == path) + continue + S = new path + if(!S.id) + stack_trace("no id on [path]") + continue + if(.[S.id]) + stack_trace("duplicate id [S.id] on [path] and [.[S.id]]") + continue + if(by_name[S.name]) + stack_trace("duplicate name [S.name] on [path]") + continue + .[S.id] = S + by_name[S.name] = S + tim_sort(by_name, GLOBAL_PROC_REF(cmp_text_asc), associative = FALSE) + GLOB.legacy_hair_lookup = by_name + tim_sort(., GLOBAL_PROC_REF(cmp_name_asc), associative = TRUE) + +/proc/all_ear_styles() + . = list() + var/list/by_type = list() + for(var/path in subtypesof(/datum/sprite_accessory/ears)) + var/datum/sprite_accessory/S = path + if(initial(S.abstract_type) == path) + continue + S = new path + if(!S.id) + stack_trace("no id on [path]") + continue + if(.[S.id]) + stack_trace("duplicate id [S.id] on [path] and [.[S.id]]") + continue + .[S.id] = S + by_type[S.type] = S + tim_sort(by_type, GLOBAL_PROC_REF(cmp_name_asc), associative = TRUE) + GLOB.legacy_ears_lookup = by_type + tim_sort(., GLOBAL_PROC_REF(cmp_name_asc), associative = TRUE) + +/proc/all_wing_styles() + . = list() + var/list/by_type = list() + for(var/path in subtypesof(/datum/sprite_accessory/wing)) + var/datum/sprite_accessory/S = path + if(initial(S.abstract_type) == path) + continue + S = new path + if(!S.id) + stack_trace("no id on [path]") + continue + if(.[S.id]) + stack_trace("duplicate id [S.id] on [path] and [.[S.id]]") + continue + .[S.id] = S + by_type[S.type] = S + tim_sort(by_type, GLOBAL_PROC_REF(cmp_name_asc), associative = TRUE) + GLOB.legacy_wing_lookup = by_type + tim_sort(., GLOBAL_PROC_REF(cmp_name_asc), associative = TRUE) + +/proc/all_tail_styles() + . = list() + var/list/by_type = list() + for(var/path in subtypesof(/datum/sprite_accessory/tail)) + var/datum/sprite_accessory/S = path + if(initial(S.abstract_type) == path) + continue + S = new path + if(!S.id) + stack_trace("no id on [path]") + continue + if(.[S.id]) + stack_trace("duplicate id [S.id] on [path] and [.[S.id]]") + continue + .[S.id] = S + by_type[S.type] = S + tim_sort(by_type, GLOBAL_PROC_REF(cmp_name_asc), associative = TRUE) + GLOB.legacy_tail_lookup = by_type + tim_sort(., GLOBAL_PROC_REF(cmp_name_asc), associative = TRUE) + +/proc/all_facial_hair_styles() + . = list() + var/list/by_name = list() + for(var/path in subtypesof(/datum/sprite_accessory/facial_hair)) + var/datum/sprite_accessory/S = path + if(initial(S.abstract_type) == path) + continue + S = new path + if(!S.id) + stack_trace("no id on [path]") + continue + if(.[S.id]) + stack_trace("duplicate id [S.id] on [path] and [.[S.id]]") + continue + if(by_name[S.name]) + stack_trace("duplicate name [S.name] on [path]") + continue + .[S.id] = S + by_name[S.name] = S + tim_sort(by_name, GLOBAL_PROC_REF(cmp_text_asc), associative = FALSE) + GLOB.legacy_facial_hair_lookup = by_name + tim_sort(., GLOBAL_PROC_REF(cmp_name_asc), associative = TRUE) + +/proc/all_marking_styles() + . = list() + var/list/by_name = list() + for(var/path in subtypesof(/datum/sprite_accessory/marking)) + var/datum/sprite_accessory/S = path + if(initial(S.abstract_type) == path) + continue + S = new path + if(!S.id) + stack_trace("no id on [path]") + continue + if(.[S.id]) + stack_trace("duplicate id [S.id] on [path] and [.[S.id]]") + continue + if(by_name[S.name]) + stack_trace("duplicate name [S.name] on [path]") + continue + .[S.id] = S + by_name[S.name] = S + tim_sort(by_name, GLOBAL_PROC_REF(cmp_text_asc), associative = FALSE) + GLOB.legacy_marking_lookup = by_name + tim_sort(., GLOBAL_PROC_REF(cmp_name_asc), associative = TRUE) diff --git a/code/modules/sprite_accessories/tail/_tail.dm b/code/modules/sprite_accessories/tail.dm similarity index 76% rename from code/modules/sprite_accessories/tail/_tail.dm rename to code/modules/sprite_accessories/tail.dm index e78a779f79fd..abc18957d78f 100644 --- a/code/modules/sprite_accessories/tail/_tail.dm +++ b/code/modules/sprite_accessories/tail.dm @@ -4,12 +4,15 @@ icon = 'icons/mob/sprite_accessories/tails.dmi' do_colouration = 0 //Set to 1 to enable coloration using the tail color. - color_blend_mode = ICON_ADD // Only appliciable if do_coloration = 1 + legacy_use_additive_color_matrix = TRUE // Only appliciable if do_coloration = 1 var/show_species_tail = 0 // If false, do not render species' tail. var/clothing_can_hide = 1 // If true, clothing with HIDETAIL hides it var/desc = "You should not see this..." + //! legacy var/ani_state // State when wagging/animated + //! legacy var/extra_overlay_w // Wagging state for extra overlay + //! legacy var/extra_overlay2_w // Tertiary wagging. var/list/hide_body_parts = list() //Uses organ tag defines. Bodyparts in this list do not have their icons rendered, allowing for more spriter freedom when doing taur/digitigrade stuff. var/icon/clip_mask_icon = null //Icon file used for clip mask. @@ -21,6 +24,23 @@ if(clip_mask_icon && clip_mask_state) clip_mask = icon(icon = clip_mask_icon, icon_state = clip_mask_state) +/datum/sprite_accessory/tail/render(mob/for_whom, list/colors, layer_front, layer_behind, layer_side, with_base_state, with_variation, flattened) + // awful? yes. :skull: + // please don't ever copy this pattern anywhere else. + if(with_variation == SPRITE_ACCESSORY_VARIATION_WAGGING && ani_state) + var/old1 = icon_state + var/old2 = extra_overlay + var/old3 = extra_overlay2 + icon_state = ani_state + extra_overlay = extra_overlay_w + extra_overlay2 = extra_overlay2_w + . = ..() + icon_state = old1 + extra_overlay = old2 + extra_overlay2 = old3 + else + return ..() + //For all species tails. Includes haircolored tails. /datum/sprite_accessory/tail/special abstract_type = /datum/sprite_accessory/tail/special diff --git a/code/modules/sprite_accessories/tail/bearlike.dm b/code/modules/sprite_accessories/tail/bearlike.dm index b5e6c1123399..b6cad0dc120e 100644 --- a/code/modules/sprite_accessories/tail/bearlike.dm +++ b/code/modules/sprite_accessories/tail/bearlike.dm @@ -3,7 +3,7 @@ id = "tail_bear" icon_state = "bear" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/bear_brown name = "bear, brown" diff --git a/code/modules/sprite_accessories/tail/bird.dm b/code/modules/sprite_accessories/tail/bird.dm index 2e3140a8a97b..044552dd3f5c 100644 --- a/code/modules/sprite_accessories/tail/bird.dm +++ b/code/modules/sprite_accessories/tail/bird.dm @@ -3,4 +3,4 @@ id = "tail_avian_fantail" icon_state = "fantail" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/tail/bovine.dm b/code/modules/sprite_accessories/tail/bovine.dm index 8c0b6e5cd61d..a5ee09a7c86c 100644 --- a/code/modules/sprite_accessories/tail/bovine.dm +++ b/code/modules/sprite_accessories/tail/bovine.dm @@ -3,13 +3,13 @@ id = "tail_cow" icon_state = "cow" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/satyr name = "goat legs, colorable" id = "tail_satyr_legs" icon_state = "satyr" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE do_colouration = 1 hide_body_parts = list(BP_L_LEG, BP_L_FOOT, BP_R_LEG, BP_R_FOOT) //Exclude pelvis just in case. clip_mask_icon = 'icons/mob/sprite_accessories/taurs.dmi' @@ -19,7 +19,7 @@ name = "horse legs, colorable" id = "tail_satyr_horse_legs" icon_state = "satyr_horse" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE do_colouration = 1 hide_body_parts = list(BP_L_LEG, BP_L_FOOT, BP_R_LEG, BP_R_FOOT) //Exclude pelvis just in case. clip_mask_icon = 'icons/mob/sprite_accessories/taurs.dmi' diff --git a/code/modules/sprite_accessories/tail/canid.dm b/code/modules/sprite_accessories/tail/canid.dm index d5405aff56d5..410a886925d9 100644 --- a/code/modules/sprite_accessories/tail/canid.dm +++ b/code/modules/sprite_accessories/tail/canid.dm @@ -18,7 +18,7 @@ id = "tail_wolf" icon_state = "wolf" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "wolfinner" /datum/sprite_accessory/tail/blackwolf @@ -36,28 +36,28 @@ id = "tail_kitsune_dual" icon_state = "doublekitsune" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/fennec_tail name = "Fennec tail" id = "tail_fox_fennec" icon_state = "fennec_tail_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/fox_tail name = "Fox tail" id = "tail_fox" icon_state = "fox_tail_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/fox_tail_plain name = "Fox tail 2" id = "tail_fox2" icon_state = "fox_tail_plain_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/foxtail name = "Fox" @@ -66,7 +66,7 @@ icon_state = "foxtail_but_good" extra_overlay = "foxtail_but_good-tips" do_colouration = TRUE - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE ani_state = "foxtail_but_good_w" extra_overlay_w = "foxtail_but_good-tips_w" @@ -75,7 +75,7 @@ id = "tail_jackal" icon_state = "jackal_bicolor" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "jackal_bicolor_extra" /datum/sprite_accessory/tail/otietail @@ -84,7 +84,7 @@ icon_state = "otie" ani_state = "otie_w" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/takahiro_kitsune name = "Takahiro Kitsune Tails" //takahiro had five tails i just wanted to follow the 'T' naming convention vs. tamamo and triple @@ -92,7 +92,7 @@ icon_state = "takahiro-kitsunetails" extra_overlay = "takahiro-kitsunetails-tips" do_colouration = TRUE - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/tamamo_kitsune name = "Tamamo Kitsune Tails" //Tamamo-no-Tiro, let it be known! @@ -100,7 +100,7 @@ icon_state = "tamamo-kitsunetails" extra_overlay = "tamamo-kitsunetails-tips" do_colouration = TRUE - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/triple_kitsune name = "Triple Kitsune Tails" @@ -108,7 +108,7 @@ icon_state = "triple-kitsunetails" extra_overlay = "triple-kitsunetails-tips" do_colouration = TRUE - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/ketrai_wag name = "fennix tail (vwag)" @@ -122,4 +122,4 @@ icon_state = "wolf_citmain" ani_state = "wolf_citmain_w" do_colouration = TRUE - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/tail/equine.dm b/code/modules/sprite_accessories/tail/equine.dm index 870c47d7b905..f23aee2e23e4 100644 --- a/code/modules/sprite_accessories/tail/equine.dm +++ b/code/modules/sprite_accessories/tail/equine.dm @@ -3,4 +3,4 @@ id = "tail_horse" icon_state = "horse" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/tail/feline.dm b/code/modules/sprite_accessories/tail/feline.dm index 38f8608f4023..99a587dae0ef 100644 --- a/code/modules/sprite_accessories/tail/feline.dm +++ b/code/modules/sprite_accessories/tail/feline.dm @@ -4,7 +4,7 @@ icon_state = "tigertail" ani_state = "tigertail_w" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "tigertail_mark" extra_overlay_w = "tigertail_mark_w" @@ -13,17 +13,20 @@ id = "tail_tiger" icon_state = "tiger" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "tigerinnerwhite" /datum/sprite_accessory/tail/cat_big name = "kitty (big), colorable" id = "tail_cat_big" + icon = 'icons/mob/sprite_accessory/tails/feline.dmi' icon_state = "catbig" - ani_state = "catbig_wag" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - front_behind_system = TRUE + variations = list( + SPRITE_ACCESSORY_VARIATION_WAGGING = "catbig_wag", + ) + do_colouration = TRUE + legacy_use_additive_color_matrix = FALSE + icon_sidedness = SPRITE_ACCESSORY_SIDEDNESS_FRONT_BEHIND /datum/sprite_accessory/tail/kitty name = "kitty, colorable, downwards" @@ -31,7 +34,7 @@ icon_state = "kittydown" ani_state = "kittydown_wag" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /*/datum/sprite_accessory/tail/kitty_tg name = "kitty, colorable, main" @@ -39,7 +42,7 @@ icon_state = "kittytg" ani_state = "kittytg_wag" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE Currently fucked - Tail renders ontop of the player even if it should be invisible. TODO: Find time to fix this.*/ /datum/sprite_accessory/tail/kittyup @@ -48,7 +51,7 @@ icon_state = "kittyup" ani_state = "kittyup_wag" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/liontail name = "Lion Tail (vwag)" @@ -56,7 +59,7 @@ icon_state = "liontail" ani_state = "liontail_w" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "liontail_markings" extra_overlay_w = "liontail_markings_w" @@ -66,6 +69,6 @@ icon_state = "sneptail" ani_state = "sneptail_w" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "sneptail_mark" extra_overlay_w = "sneptail_mark_w" diff --git a/code/modules/sprite_accessories/tail/insects.dm b/code/modules/sprite_accessories/tail/insects.dm index 1d395816c1cd..9966740b6c97 100644 --- a/code/modules/sprite_accessories/tail/insects.dm +++ b/code/modules/sprite_accessories/tail/insects.dm @@ -8,7 +8,7 @@ id = "tail_bug_abdomen" icon_state = "buggo_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/buggowag name = "Bug abdomen, colorable, vwag change" @@ -16,14 +16,14 @@ icon_state = "buggo_s" ani_state = "buggofat_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/buggo_bee name = "Bug abdomen, bee top, dual-colorable" id = "tail_bug_abdomen_bee" icon_state = "buggo_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "buggobee_markings" /datum/sprite_accessory/tail/buggo_beefull @@ -31,7 +31,7 @@ id = "tail_bug_abdomen_bee2" icon_state = "buggo_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "buggobeefull_markings" /datum/sprite_accessory/tail/buggo_beefullwag @@ -40,7 +40,7 @@ icon_state = "buggo_s" ani_state = "buggofat_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "buggobeefull_markings" extra_overlay_w = "buggofatbeefull_markings" @@ -50,7 +50,7 @@ icon_state = "buggo_s" ani_state = "buggofat_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "buggobee_markings" extra_overlay_w = "buggofatbee_markings" @@ -59,7 +59,7 @@ id = "tail_bug_abdomen_firefly" icon_state = "buggo_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "buggofirefly_markings" /datum/sprite_accessory/tail/buggo_fireflywag @@ -68,7 +68,7 @@ icon_state = "buggo_s" ani_state = "buggofat_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "buggofirefly_markings" extra_overlay_w = "buggofatfirefly_markings" @@ -77,7 +77,7 @@ id = "tail_bug_abdomen_under" icon_state = "buggo_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "buggounder_markings" /datum/sprite_accessory/tail/buggo_underwag @@ -86,7 +86,7 @@ icon_state = "buggo_s" ani_state = "buggofat_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "buggounder_markings" extra_overlay_w = "buggofatunder_markings" @@ -95,14 +95,14 @@ id = "tail_bug_abdomen_fat" icon_state = "buggofat_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/buggofat_bee name = "Fat bug abdomen, bee top, dual-colorable" id = "tail_bug_abdomen_fat_bee" icon_state = "buggofat_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "buggofatbee_markings" /datum/sprite_accessory/tail/buggofat_beefull @@ -110,7 +110,7 @@ id = "tail_bug_abdomen_fat_bee2" icon_state = "buggofat_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "buggofatbeefull_markings" /datum/sprite_accessory/tail/buggofat_firefly @@ -118,7 +118,7 @@ id = "tail_bug_abdomen_fat_firefly" icon_state = "buggofat_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "buggofatfirefly_markings" /datum/sprite_accessory/tail/buggofat_under @@ -126,7 +126,7 @@ id = "tail_bug_abdomen_fat_under" icon_state = "buggofat_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "buggofatunder_markings" /datum/sprite_accessory/tail/buggovass @@ -134,7 +134,7 @@ id = "tail_bug_vass" icon_state = "buggo_vass_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/buggovass_wag name = "Bug abdomen, vass, colorable, vwag change" @@ -142,14 +142,14 @@ icon_state = "buggo_vass_s" ani_state = "buggofat_vass_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/buggovass_bee name = "Bug abdomen, bee top, dc, vass" id = "tail_bug_vass_bee" icon_state = "buggo_vass_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "buggobee_vass_markings" /datum/sprite_accessory/tail/buggovass_beewag @@ -158,7 +158,7 @@ icon_state = "buggo_vass_s" ani_state = "buggofat_vass_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "buggobee_vass_markings" extra_overlay_w = "buggofatbee_vass_markings" @@ -167,7 +167,7 @@ id = "tail_bug_vass_bee3" icon_state = "buggo_vass_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "buggobeefull_vass_markings" /datum/sprite_accessory/tail/buggovass_beefullwag @@ -176,7 +176,7 @@ icon_state = "buggo_vass_s" ani_state = "buggofat_vass_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "buggobeefull_vass_markings" extra_overlay_w = "buggofatbeefull_vass_markings" @@ -185,7 +185,7 @@ id = "tail_bug_vass_firefly" icon_state = "buggo_vass_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "buggofirefly_vass_markings" /datum/sprite_accessory/tail/buggovass_fireflywag @@ -194,7 +194,7 @@ icon_state = "buggo_vass_s" ani_state = "buggofat_vass_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "buggofirefly_vass_markings" extra_overlay_w = "buggofatfirefly_vass_markings" @@ -203,7 +203,7 @@ id = "tail_bug_vass_under" icon_state = "buggo_vass_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "buggounder_vass_markings" /datum/sprite_accessory/tail/buggovass_underwag @@ -212,7 +212,7 @@ icon_state = "buggo_vass_s" ani_state = "buggofat_vass_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "buggounder_vass_markings" extra_overlay_w = "buggofatunder_vass_markings" @@ -221,14 +221,14 @@ id = "tail_bug_vass_fat" icon_state = "buggofat_vass_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/buggovassfat_bee name = "Fat bug abdomen, bee top, dc, vass" id = "tail_bug_vass_fat_bee" icon_state = "buggofat_vass_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "buggofatbee_vass_markings" /datum/sprite_accessory/tail/buggovassfat_beefull @@ -236,7 +236,7 @@ id = "tail_bug_vass_fat_bee2" icon_state = "buggofat_vass_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "buggofatbeefull_vass_markings" /datum/sprite_accessory/tail/buggovassfat_firefly @@ -244,7 +244,7 @@ id = "tail_bug_vass_fat_firefly" icon_state = "buggofat_vass_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "buggofatfirefly_vass_markings" /datum/sprite_accessory/tail/buggovassfat_under @@ -252,5 +252,5 @@ id = "tail_bug_vass_fat_under" icon_state = "buggofat_vass_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "buggofatunder_vass_markings" diff --git a/code/modules/sprite_accessories/tail/misc.dm b/code/modules/sprite_accessories/tail/misc.dm index ac11543247ec..b0272970da29 100644 --- a/code/modules/sprite_accessories/tail/misc.dm +++ b/code/modules/sprite_accessories/tail/misc.dm @@ -3,7 +3,7 @@ id = "tail_jagged_flufftail" icon_state = "ztail" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/curltail name = "curltail (vwag)" @@ -11,7 +11,7 @@ icon_state = "curltail" ani_state = "curltail_w" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "curltail_mark" extra_overlay_w = "curltail_mark_w" @@ -20,14 +20,14 @@ id = "tail_avian_wagtail" icon_state = "wagtail" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/deertail name = "deer tail, dual-color" id = "tail_deer" icon_state = "deertail" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "deertail_mark" /datum/sprite_accessory/tail/Segmentedtail @@ -35,7 +35,7 @@ id = "tail_segmented" icon_state = "Segmentedtail" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "Segmentedtailmarking" ani_state = "Segmentedtail_w" extra_overlay_w = "Segmentedtailmarking_w" @@ -46,4 +46,4 @@ icon_state = "straighttail" ani_state = "straighttail_w" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/tail/rodents_and_adjacent.dm b/code/modules/sprite_accessories/tail/rodents_and_adjacent.dm index 8744e0819021..9b82ed656a83 100644 --- a/code/modules/sprite_accessories/tail/rodents_and_adjacent.dm +++ b/code/modules/sprite_accessories/tail/rodents_and_adjacent.dm @@ -3,7 +3,7 @@ id = "tail_beaver" icon_state = "beaver" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/redpanda name = "red panda" @@ -15,7 +15,7 @@ id = "tail_ringtail" icon_state = "ringtail" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "ringtail_mark" /datum/sprite_accessory/tail/mouse @@ -23,7 +23,7 @@ id = "tail_mouse" icon_state = "mouse" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/mouse_pink name = "mouse, pink" @@ -35,7 +35,7 @@ id = "tail_skunk" icon_state = "skunktail" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "skunktail_mark" /datum/sprite_accessory/tail/squirrel @@ -43,7 +43,7 @@ id = "tail_squirrel" icon_state = "squirrel" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/squirrel_orange name = "squirel, orange" diff --git a/code/modules/sprite_accessories/tail/scalies.dm b/code/modules/sprite_accessories/tail/scalies.dm index c60c1bacacb8..f59d8e797d09 100644 --- a/code/modules/sprite_accessories/tail/scalies.dm +++ b/code/modules/sprite_accessories/tail/scalies.dm @@ -3,21 +3,21 @@ id = "tail_chameleon" icon_state = "chameleon" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/dragon name = "dragon, colorable" id = "tail_dragon" icon_state = "dragon" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/Easterntail name = "Eastern Dragon (Animated)" id = "tail_dragon_eastern" icon_state = "Easterntail" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "EasterntailColorTip" ani_state = "Easterntail_w" extra_overlay_w = "EasterntailColorTip_w" @@ -27,42 +27,42 @@ id = "tail_lizard_darktiger" icon_state = "lizard_tail_dark_tiger" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/lizard_tail_light_tiger name = "Lizard Tail (Light Tiger)" id = "tail_lizard_lighttiger" icon_state = "lizard_tail_light_tiger" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/lizard_tail_smooth name = "Lizard Tail (Smooth)" id = "tail_lizard_smooth" icon_state = "lizard_tail_smooth" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/lizard_tail_spiked name = "Lizard Tail (Spiked)" id = "tail_lizard_spiked" icon_state = "lizard_tail_spiked" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/lizard_tail_smooth_digitigrade name = "Digitigrade Lizard Tail (Smooth)" id = "tail_lizard_smooth_digitigrade" icon_state = "lizard_tail_smooth_digitigrade" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/lizard_tail_spiked_digitigrade name = "Digitigrade Lizard Tail (Spiked)" id = "tail_lizard_spiked_digitigrade" icon_state = "lizard_tail_spiked_digitigrade" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/tail_smooth name = "Smooth Lizard Tail, Colorable" @@ -76,7 +76,7 @@ id = "tail_bigsnake" icon_state = "bigsnaketail" do_colouration = TRUE - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE ani_state = "bigsnaketail_w" /datum/sprite_accessory/tail/bigsnaketailstripes @@ -85,7 +85,7 @@ icon_state = "bigsnaketailstripes" extra_overlay = "bigsnaketailstripes-tips" do_colouration = TRUE - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE ani_state = "bigsnaketailstripes_w" extra_overlay_w = "bigsnaketailstripes-tips_w" @@ -95,7 +95,7 @@ icon_state = "bigsnaketaildual" extra_overlay = "bigsnaketaildual-tips" do_colouration = TRUE - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE ani_state = "bigsnaketaildual_w" extra_overlay_w = "bigsnaketaildual-tips_w" @@ -105,7 +105,7 @@ icon_state = "bigsnaketailstripesalt" extra_overlay = "bigsnaketailstripesalt-tips" do_colouration = TRUE - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE ani_state = "bigsnaketailstripesalt_w" extra_overlay_w = "bigsnaketailstripesalt-tips_w" @@ -115,6 +115,6 @@ icon_state = "bigsnaketailunder" extra_overlay = "bigsnaketailunder-tips" do_colouration = TRUE - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE ani_state = "bigsnaketailunder_w" extra_overlay_w = "bigsnaketailunder-tips_w" diff --git a/code/modules/sprite_accessories/tail/snake.dm b/code/modules/sprite_accessories/tail/snake.dm index 60d5b5866564..fa2fd80837b3 100644 --- a/code/modules/sprite_accessories/tail/snake.dm +++ b/code/modules/sprite_accessories/tail/snake.dm @@ -3,4 +3,4 @@ id = "tail_snake" icon_state = "snaketail" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/tail/species/akula.dm b/code/modules/sprite_accessories/tail/species/akula.dm index 348e3a3e3cb3..5e008967286a 100644 --- a/code/modules/sprite_accessories/tail/species/akula.dm +++ b/code/modules/sprite_accessories/tail/species/akula.dm @@ -3,7 +3,7 @@ id = "tail_akula" icon_state = "sharktail_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/special/akula_anim name = "akula tail, animated" @@ -11,4 +11,4 @@ icon_state = "sharktail_s" ani_state = "sharktail_w" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/tail/species/naramadi.dm b/code/modules/sprite_accessories/tail/species/naramadi.dm index f1fa75be65ad..1c34aa7e046e 100644 --- a/code/modules/sprite_accessories/tail/species/naramadi.dm +++ b/code/modules/sprite_accessories/tail/species/naramadi.dm @@ -3,19 +3,19 @@ id = "tail_naramadi" icon_state = "sergtail_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/special/sergalhc name = "sergal tail, colorable" id = "tail_naramadi_color" icon_state = "sergtail_hc_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/sergaltaildc name = "sergal, dual-color" id = "tail_sergal" icon_state = "sergal" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "sergal_mark" diff --git a/code/modules/sprite_accessories/tail/species/nevrean.dm b/code/modules/sprite_accessories/tail/species/nevrean.dm index 60e68f17e3a8..7f9b048d0970 100644 --- a/code/modules/sprite_accessories/tail/species/nevrean.dm +++ b/code/modules/sprite_accessories/tail/species/nevrean.dm @@ -3,14 +3,14 @@ id = "tail_nevrean_color" icon_state = "nevreantail_hc_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/special/nevrean name = "nevrean tail" id = "tail_nevrean" icon_state = "nevreantail_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/nevreandc name = "nevrean tail, dual-color" @@ -18,7 +18,7 @@ icon_state = "nevreantail_dc" extra_overlay = "nevreantail_dc_tail" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/nevreanwagdc name = "nevrean wagtail, dual-color" @@ -26,7 +26,7 @@ icon_state = "wagtail" extra_overlay = "wagtail_dc_tail" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/nevreanwagdc_alt name = "nevrean wagtail, marked, dual-color" @@ -34,4 +34,4 @@ icon_state = "wagtail2_dc" extra_overlay = "wagtail2_dc_mark" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/tail/species/shadekin.dm b/code/modules/sprite_accessories/tail/species/shadekin.dm index 9707bd2f1096..69624c10de46 100644 --- a/code/modules/sprite_accessories/tail/species/shadekin.dm +++ b/code/modules/sprite_accessories/tail/species/shadekin.dm @@ -3,6 +3,6 @@ id = "tail_shadekin_short" icon_state = "shadekin-short" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE apply_restrictions = TRUE species_allowed = list(SPECIES_SHADEKIN) diff --git a/code/modules/sprite_accessories/tail/species/tajaran.dm b/code/modules/sprite_accessories/tail/species/tajaran.dm index 38de2bb4269a..9b2ed52153b4 100644 --- a/code/modules/sprite_accessories/tail/species/tajaran.dm +++ b/code/modules/sprite_accessories/tail/species/tajaran.dm @@ -3,7 +3,7 @@ id = "tail_tajaran" icon_state = "tajtail_a" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/special/tajaran_anim name = "tajaran tail, Animated" @@ -11,28 +11,28 @@ icon_state = "tajtail_s" ani_state = "tajtail_w" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/special/tajaran_damaged name = "tajaran tail, damaged/short" id = "tail_tajaran_short" icon_state = "tajtail_damaged_s" species_allowed = list(SPECIES_TAJ) - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE /datum/sprite_accessory/tail/special/tajaran_stubby name = "tajaran tail, stubby" id = "tail_tajarna_stubby" icon_state = "tajtail_stubby_s" species_allowed = list(SPECIES_TAJ) - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE /datum/sprite_accessory/tail/stripey name = "stripey taj, colorable" id = "tail_tajaran_stripey" icon_state = "stripeytail" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "stripeytail_mark" /datum/sprite_accessory/tail/stripeytail_brown diff --git a/code/modules/sprite_accessories/tail/species/teshari.dm b/code/modules/sprite_accessories/tail/species/teshari.dm index 10e51baa13d9..590c3221e0e6 100644 --- a/code/modules/sprite_accessories/tail/species/teshari.dm +++ b/code/modules/sprite_accessories/tail/species/teshari.dm @@ -3,7 +3,7 @@ id = "tail_teshari_pattern_f" icon_state = "teshtail_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "teshpattern_fem_tail" /datum/sprite_accessory/tail/tesh_pattern_fem_alt @@ -11,7 +11,7 @@ id = "tail_teshari_pattern_f2" icon_state = "teshtail_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "teshpattern_fem_alt" /datum/sprite_accessory/tail/tesh_pattern_male @@ -19,7 +19,7 @@ id = "tail_teshari_pattern_m" icon_state = "teshtail_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "teshpattern_male_tail" /datum/sprite_accessory/tail/tesh_pattern_male_alt @@ -27,17 +27,18 @@ id = "tail_teshari_pattern_m2" icon_state = "teshtail_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "teshpattern_male_alt" /datum/sprite_accessory/tail/teshari_fluffytail name = "Teshari tail" id = "tail_teshari_fluffy" - icon_state = "teshari_fluffytail" - extra_overlay = "teshari_fluffytail_mark" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - front_behind_system = TRUE + icon = 'icons/mob/sprite_accessory/tails/teshari.dmi' + icon_state = "fluffy" + extra_overlay = "fluffy_2" + do_colouration = TRUE + legacy_use_additive_color_matrix = FALSE + icon_sidedness = SPRITE_ACCESSORY_SIDEDNESS_FRONT_BEHIND /datum/sprite_accessory/tail/special/teshtailfeathered name = "Teshari tail alt" @@ -45,14 +46,14 @@ icon_state = "teshtail_s" extra_overlay = "teshtail_feathers_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/special/tesharitail_noplume name = "teshari tail, no plumage" id = "tail_teshari3" icon_state = "teshtail_noplume_s" species_allowed = list(SPECIES_TESHARI) - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE /datum/sprite_accessory/tail/special/tesharitail_noplume_feathered name = "teshari tail, no plumage w/feathers" @@ -60,14 +61,14 @@ icon_state = "teshtail_noplume_s" extra_overlay = "teshtail_noplume_feathers_s" species_allowed = list(SPECIES_TESHARI) - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE /datum/sprite_accessory/tail/special/tesharitail_damaged name = "teshari tail, damaged" id = "tail_teshari5" icon_state = "teshtail_damaged_s" species_allowed = list(SPECIES_TESHARI) - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE /datum/sprite_accessory/tail/special/tesharitail_damaged_feathered name = "teshari tail, damaged w/feathers" @@ -75,7 +76,7 @@ icon_state = "teshtail_damaged_s" extra_overlay = "teshtail_damaged_feathers_s" species_allowed = list(SPECIES_TESHARI) - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE /datum/sprite_accessory/tail/special/tesharitail_damaged_unbranded name = "teshari tail, damaged w/ unbranded prosthetic" @@ -83,7 +84,7 @@ icon_state = "teshtail_damaged_s" extra_overlay = "teshtail_damaged_prosthetic_unbranded_s" species_allowed = list(SPECIES_TESHARI) - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE /datum/sprite_accessory/tail/special/tesharitail_damaged_unbranded_feathered name = "teshari tail, damaged w/feathers + unbranded prosthetic" @@ -92,7 +93,7 @@ extra_overlay = "teshtail_damaged_feathers_s" extra_overlay2 = "teshtail_damaged_prosthetic_unbranded_s" species_allowed = list(SPECIES_TESHARI) - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE /datum/sprite_accessory/tail/special/tesharitail_damaged_cenilimi name = "teshari tail, damaged w/ Cenilimi Cybernetics prosthetic" @@ -100,7 +101,7 @@ icon_state = "teshtail_damaged_s" extra_overlay = "teshtail_damaged_prosthetic_cenilimi_s" species_allowed = list(SPECIES_TESHARI) - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE /datum/sprite_accessory/tail/special/tesharitail_damaged_cenilimi_feathered name = "teshari tail, damaged w/feathers + Cenilimi Cybernetics prosthetic" @@ -109,7 +110,7 @@ extra_overlay = "teshtail_damaged_feathers_s" extra_overlay2 = "teshtail_damaged_prosthetic_cenilimi_s" species_allowed = list(SPECIES_TESHARI) - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE /datum/sprite_accessory/tail/special/tesharitail_damaged_wood id = "tail_teshari11" @@ -117,7 +118,7 @@ icon_state = "teshtail_damaged_s" extra_overlay = "teshtail_damaged_prosthetic_wood_s" species_allowed = list(SPECIES_TESHARI) - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE /datum/sprite_accessory/tail/special/tesharitail_damaged_wood_feathered name = "teshari tail, damaged w/feathers + wooden prosthetic" @@ -126,7 +127,7 @@ extra_overlay = "teshtail_damaged_feathers_s" extra_overlay2 = "teshtail_damaged_prosthetic_wood_s" species_allowed = list(SPECIES_TESHARI) - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE /datum/sprite_accessory/tail/special/tesharitail_damaged_sifwood name = "teshari tail, damaged w/ Sivian wooden prosthetic" @@ -134,7 +135,7 @@ icon_state = "teshtail_damaged_s" extra_overlay = "teshtail_damaged_prosthetic_wood_sif_s" species_allowed = list(SPECIES_TESHARI) - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE /datum/sprite_accessory/tail/special/tesharitail_damaged_sifwood_feathered name = "teshari tail, damaged w/feathers + Sivian wooden prosthetic" @@ -143,14 +144,14 @@ extra_overlay = "teshtail_damaged_feathers_s" extra_overlay2 = "teshtail_damaged_prosthetic_wood_sif_s" species_allowed = list(SPECIES_TESHARI) - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE /datum/sprite_accessory/tail/special/tesharitail_stubby name = "teshari tail, stubby" id = "tail_teshari15" icon_state = "teshtail_stubby_s" species_allowed = list(SPECIES_TESHARI) - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE /datum/sprite_accessory/tail/special/tesharitail_stubby_feathered name = "teshari tail, stubby w/feathers" @@ -158,7 +159,7 @@ icon_state = "teshtail_stubby_s" extra_overlay = "teshtail_stubby_feathers_s" species_allowed = list(SPECIES_TESHARI) - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE /datum/sprite_accessory/tail/special/tesharitail_stubby_unbranded name = "teshari tail, stubby w/ unbranded prosthetic" @@ -166,7 +167,7 @@ icon_state = "teshtail_stubby_s" extra_overlay = "teshtail_stubby_prosthetic_unbranded_s" species_allowed = list(SPECIES_TESHARI) - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE /datum/sprite_accessory/tail/special/tesharitail_stubby_unbranded_feathered name = "teshari tail, stubby w/ feathers + unbranded prosthetic" @@ -175,7 +176,7 @@ extra_overlay = "teshtail_stubby_feathers_s" extra_overlay2 = "teshtail_stubby_prosthetic_unbranded_s" species_allowed = list(SPECIES_TESHARI) - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE /datum/sprite_accessory/tail/special/tesharitail_stubby_cenilimi name = "teshari tail, stubby w/ Cenilimi Cybernetics prosthetic" @@ -183,7 +184,7 @@ icon_state = "teshtail_stubby_s" extra_overlay = "teshtail_stubby_prosthetic_cenilimi_s" species_allowed = list(SPECIES_TESHARI) - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE /datum/sprite_accessory/tail/special/tesharitail_stubby_cenilimi_feathered name = "teshari tail, stubby w/ feathers + Cenilimi Cybernetics prosthetic" @@ -192,7 +193,7 @@ extra_overlay = "teshtail_stubby_feathers_s" extra_overlay2 = "teshtail_stubby_prosthetic_cenilimi_s" species_allowed = list(SPECIES_TESHARI) - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE /datum/sprite_accessory/tail/special/tesharitail_stubby_wood name = "teshari tail, stubby w/ wooden prosthetic" @@ -200,7 +201,7 @@ icon_state = "teshtail_stubby_s" extra_overlay = "teshtail_stubby_prosthetic_wood_s" species_allowed = list(SPECIES_TESHARI) - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE /datum/sprite_accessory/tail/special/tesharitail_stubby_wood_feathered name = "teshari tail, stubby w/feathers + wooden prosthetic" @@ -209,7 +210,7 @@ extra_overlay = "teshtail_stubby_feathers_s" extra_overlay2 = "teshtail_stubby_prosthetic_wood_s" species_allowed = list(SPECIES_TESHARI) - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE /datum/sprite_accessory/tail/special/tesharitail_stubby_sifwood name = "teshari tail, stubby w/ Sivian wooden prosthetic" @@ -217,7 +218,7 @@ icon_state = "teshtail_stubby_s" extra_overlay = "teshtail_stubby_prosthetic_wood_sif_s" species_allowed = list(SPECIES_TESHARI) - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE /datum/sprite_accessory/tail/special/tesharitail_stubby_sifwood_feathered name = "teshari tail, stubby w/feathers + Sivian wooden prosthetic" @@ -226,7 +227,7 @@ extra_overlay = "teshtail_stubby_feathers_s" extra_overlay2 = "teshtail_stubby_prosthetic_wood_sif_s" species_allowed = list(SPECIES_TESHARI) - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE /datum/sprite_accessory/tail/special/tesharitail_prosthetic_unbranded name = "teshari tail, unbranded prosthetic" diff --git a/code/modules/sprite_accessories/tail/species/unathi.dm b/code/modules/sprite_accessories/tail/species/unathi.dm index 5c14d72f82af..f8d6161e5962 100644 --- a/code/modules/sprite_accessories/tail/species/unathi.dm +++ b/code/modules/sprite_accessories/tail/species/unathi.dm @@ -3,25 +3,25 @@ id = "tail_unathi" icon_state = "sogtail_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/special/unathihc name = "unathi tail, colorable" id = "tail_unathi_color" icon_state = "sogtail_hc_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/special/unathi_damaged name = "unathi tail, damaged" id = "tail_unathi_damaged" icon_state = "unathitail_damaged_s" species_allowed = list(SPECIES_UNATHI) - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE /datum/sprite_accessory/tail/special/unathi_stubby name = "unathi tail, stubby" id = "tail_unathi_stubby" icon_state = "unathitail_stubby_s" species_allowed = list(SPECIES_UNATHI) - color_blend_mode = ICON_ADD + legacy_use_additive_color_matrix = TRUE diff --git a/code/modules/sprite_accessories/tail/species/vulpkanin.dm b/code/modules/sprite_accessories/tail/species/vulpkanin.dm index 2c498e46aad4..2b0a622cf94c 100644 --- a/code/modules/sprite_accessories/tail/species/vulpkanin.dm +++ b/code/modules/sprite_accessories/tail/species/vulpkanin.dm @@ -3,7 +3,7 @@ id = "tail_vulp" icon_state = "vulptail_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/vulp_new name = "new vulp tail (vwag)" @@ -11,7 +11,7 @@ icon_state = "vulptail" ani_state = "vulptail_w" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "vulptail_mark" extra_overlay_w = "vulptail_mark_w" @@ -20,4 +20,4 @@ id = "tail_vulp3" icon_state = "vulptail_alt" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/tail/species/xenomorph.dm b/code/modules/sprite_accessories/tail/species/xenomorph.dm index 1000e6d68996..494f52cc3a18 100644 --- a/code/modules/sprite_accessories/tail/species/xenomorph.dm +++ b/code/modules/sprite_accessories/tail/species/xenomorph.dm @@ -13,14 +13,14 @@ id = "tail_xenomorph3" icon_state = "xenotail_fullcolour" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/xenotailalt_fullcolour name = "xenomorph tail alt. (fully colourable)" id = "tail_xenomorph4" icon_state = "xenotailalt_fullcolour" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/special/xenodrone name = "xenomorph drone tail" @@ -32,7 +32,7 @@ id = "tail_xeno_drone_color" icon_state = "xenos_drone_tail_hc_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/special/xenohunter name = "xenomorph hunter tail" @@ -44,7 +44,7 @@ id = "tail_xeno_hunter_color" icon_state = "xenos_hunter_tail_hc_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/special/xenoqueen name = "xenomorph queen tail" @@ -56,7 +56,7 @@ id = "tail_xeno_queen_color" icon_state = "xenos_queen_tail_hc_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/special/xenosentinel name = "xenomorph sentinel tail" @@ -68,13 +68,13 @@ id = "tail_xeno_sentinel_color" icon_state = "xenos_sentinel_tail_hc_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/special/xenotail_wag name = "Xenomorph tail (Waggable)" id = "tail_xeno_wag" - icon = "icons/mob/sprite_accessories/xeno_parts.dmi" + icon = 'icons/mob/sprite_accessories/xeno_parts.dmi' icon_state = "xenotail" ani_state = "xenotail_w" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/tail/species/zorren.dm b/code/modules/sprite_accessories/tail/species/zorren.dm index 61dca3ba082e..5e425c712568 100644 --- a/code/modules/sprite_accessories/tail/species/zorren.dm +++ b/code/modules/sprite_accessories/tail/species/zorren.dm @@ -3,11 +3,11 @@ id = "tail_zorren_flat" icon_state = "fentail_hc_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/special/foxhc name = "highlander zorren tail, colorable" id = "tail_zorren_high" icon_state = "foxtail_hc_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/tail/synthetic.dm b/code/modules/sprite_accessories/tail/synthetic.dm index 2c8962a8b6fd..61224f37376a 100644 --- a/code/modules/sprite_accessories/tail/synthetic.dm +++ b/code/modules/sprite_accessories/tail/synthetic.dm @@ -3,14 +3,14 @@ id = "tail_synth_wardtakashi" icon_state = "wardtakahashi_vulp" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/wartacosushi_tail_dc name = "Ward-Takahashi Tail, dual-color" id = "tail_synth_wardtakashi2" icon_state = "wardtakahashi_vulp_dc" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "wardtakahashi_vulp_dc_mark" /datum/sprite_accessory/tail/zenghu_taj @@ -23,7 +23,7 @@ id = "tail_synth_egn" icon_state = "eboop" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "eboop_mark" /datum/sprite_accessory/tail/Plugtail @@ -31,7 +31,7 @@ id = "tail_synth_plug" icon_state = "Plugtail" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "PlugtailMarking" extra_overlay2 = "PlugtailMarking2" @@ -40,7 +40,7 @@ id = "tail_synth_dragon" icon_state = "robo_dragon" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "robodragon_b" /datum/sprite_accessory/tail/Segmentedlights @@ -48,7 +48,7 @@ id = "tail_synth_segmented" icon_state = "Segmentedtail" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "Segmentedlights" ani_state = "Segmentedtail_w" extra_overlay_w = "Segmentedlights_w" @@ -58,7 +58,7 @@ id = "tail_synth_lizard" icon_state = "synthtail" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/synthtail_vwag name = "Synthetic lizard tail (vwag)" @@ -66,4 +66,4 @@ icon_state = "synthtail" ani_state = "synthtail_w" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/tail/taurs.dm b/code/modules/sprite_accessories/tail/taurs.dm index 97895ea640e5..cdb71ad7e4ba 100644 --- a/code/modules/sprite_accessories/tail/taurs.dm +++ b/code/modules/sprite_accessories/tail/taurs.dm @@ -1,9 +1,9 @@ -/datum/sprite_accessory/tail/taur - abstract_type = /datum/sprite_accessory/tail/taur +/datum/sprite_accessory/tail/legacy_taur + abstract_type = /datum/sprite_accessory/tail/legacy_taur name = "You should not see this..." icon = 'icons/mob/sprite_accessories/taurs.dmi' do_colouration = 1 // Yes color, using tail color - color_blend_mode = ICON_MULTIPLY // The sprites for taurs are designed for ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE // The sprites for taurs are designed for ICON_MULTIPLY can_be_hidden = FALSE var/icon/suit_sprites = null //File for suit sprites, if any. @@ -42,7 +42,13 @@ // Species-unique long tails/taurhalves -/datum/sprite_accessory/tail/taur/shadekin_tail +/datum/sprite_accessory/tail/legacy_taur/render(mob/for_whom, list/colors, layer_front, layer_behind, layer_side, with_base_state, with_variation, flattened) + var/list/image/layers = ..() + for(var/image/rendered as anything in layers) + rendered.pixel_x -= 16 + return layers + +/datum/sprite_accessory/tail/legacy_taur/shadekin_tail name = "Shadekin Tail" id = "tail_taur_shadekin" icon_state = "shadekin_s" @@ -53,61 +59,61 @@ apply_restrictions = TRUE species_allowed = list(SPECIES_SHADEKIN, SPECIES_SHADEKIN_CREW) -/datum/sprite_accessory/tail/taur/shadekin_tail/shadekin_tail_2c +/datum/sprite_accessory/tail/legacy_taur/shadekin_tail/shadekin_tail_2c name = "Shadekin Tail dual-color" id = "tail_taur_shadekin_colorable" extra_overlay = "shadekin_markings" -/datum/sprite_accessory/tail/taur/shadekin_tail/shadekin_tail_long +/datum/sprite_accessory/tail/legacy_taur/shadekin_tail/shadekin_tail_long name = "Shadekin Long Tail" id = "tail_taur_shadekin_long" icon_state = "shadekin_long_s" -/datum/sprite_accessory/tail/taur/shadekin_tail/shadekin_tail_long_2 +/datum/sprite_accessory/tail/legacy_taur/shadekin_tail/shadekin_tail_long_2 name = "Shadekin Striped Long Tail" id = "tail_taur_shadekin_long_stripes" icon_state = "shadekin_long_2" extra_overlay = "shadekin_long_marking_2" -/datum/sprite_accessory/tail/taur/shadekin_tail/shadekin_tail_small +/datum/sprite_accessory/tail/legacy_taur/shadekin_tail/shadekin_tail_small name = "Shadekin Small Tail" id = "tail_taur_shadekin_small" icon_state = "shadekin_s2" // Tails/taurhalves for everyone -/datum/sprite_accessory/tail/taur/wolf +/datum/sprite_accessory/tail/legacy_taur/wolf name = "Wolf (Taur)" id = "tail_taur_wolf" icon_state = "wolf_s" suit_sprites = 'icons/mob/clothing/taursuits_wolf.dmi' //TFF 22/11/19 - CHOMPStation port of fat taur sprites -/datum/sprite_accessory/tail/taur/fatwolf +/datum/sprite_accessory/tail/legacy_taur/fatwolf name = "Fat Wolf (Taur)" id = "tail_taur_wolf_fat" icon_state = "fatwolf_s" -/datum/sprite_accessory/tail/taur/wolf/wolf_2c +/datum/sprite_accessory/tail/legacy_taur/wolf/wolf_2c name = "Wolf dual-color (Taur)" id = "tail_taur_wolf_colorable" icon_state = "wolf_s" extra_overlay = "wolf_markings" //TFF 22/11/19 - CHOMPStation port of fat taur sprites -/datum/sprite_accessory/tail/taur/wolf/fatwolf_2c +/datum/sprite_accessory/tail/legacy_taur/wolf/fatwolf_2c name = "Fat Wolf dual-color (Taur)" id = "tail_taur_wolf_fat_colorable" icon_state = "fatwolf_s" extra_overlay = "fatwolf_markings" -/datum/sprite_accessory/tail/taur/wolf/synthwolf +/datum/sprite_accessory/tail/legacy_taur/wolf/synthwolf name = "SynthWolf dual-color (Taur)" id = "tail_taur_wolf_synth_colorable" icon_state = "synthwolf_s" extra_overlay = "synthwolf_markings" -/datum/sprite_accessory/tail/taur/naga +/datum/sprite_accessory/tail/legacy_taur/naga name = "Naga (Taur)" id = "tail_taur_naga" icon_state = "naga_s" @@ -140,19 +146,19 @@ msg_prey_stepunder = "You jump over %prey's thick tail." msg_owner_stepunder = "%owner bounds over your tail." -/datum/sprite_accessory/tail/taur/naga/naga_2c +/datum/sprite_accessory/tail/legacy_taur/naga/naga_2c name = "Naga dual-color (Taur)" id = "tail_taur_naga_colorable" icon_state = "naga_s" extra_overlay = "naga_markings" -/datum/sprite_accessory/tail/taur/naga/naga_2c_alt +/datum/sprite_accessory/tail/legacy_taur/naga/naga_2c_alt name = "Naga dual-color alt (Taur)" id = "tail_taur_naga_colorable_alt" icon_state = "altnaga_s" extra_overlay = "altnaga_markings" -/datum/sprite_accessory/tail/taur/naga/naga_tailmaw +/datum/sprite_accessory/tail/legacy_taur/naga/naga_tailmaw name = "Naga Tailmaw (Taur)" id = "tail_taur_naga_tailmaw" icon_state = "altnagatailmaw_s" @@ -160,20 +166,20 @@ extra_overlay2 = "altnagatailmaw_eyes" // yes, a mermaid is not a naga, i'm just lazy so it's using the same messages because it's still a tail okay -/datum/sprite_accessory/tail/taur/naga/mermaid +/datum/sprite_accessory/tail/legacy_taur/naga/mermaid name = "Mermaid (Taur)" id = "tail_taur_mermaid" icon_state = "mermaid_s" suit_sprites = null -/datum/sprite_accessory/tail/taur/naga/mermaid/alt +/datum/sprite_accessory/tail/legacy_taur/naga/mermaid/alt name = "Mermaid Alt (Taur)" id = "tail_taur_mermaid_alt" icon_state = "altmermaid_s" extra_overlay = "altmermaid_markings" extra_overlay2 = "altmermaid_markings2" -/datum/sprite_accessory/tail/taur/horse +/datum/sprite_accessory/tail/legacy_taur/horse name = "Horse (Taur)" id = "tail_taur_horse" icon_state = "horse_s" @@ -194,13 +200,13 @@ msg_owner_grab_fail = "You step down onto %prey, squishing them and forcing them down to the ground!" msg_prey_grab_fail = "%owner steps down and squishes you with their hoof, forcing you down to the ground!" -/datum/sprite_accessory/tail/taur/horse/synthhorse +/datum/sprite_accessory/tail/legacy_taur/horse/synthhorse name = "SynthHorse dual-color (Taur)" id = "tail_taur_horse_synth_colorable" icon_state = "synthhorse_s" extra_overlay = "synthhorse_markings" -/datum/sprite_accessory/tail/taur/cow +/datum/sprite_accessory/tail/legacy_taur/cow name = "Cow (Taur)" id = "tail_taur_cow" icon_state = "cow_s" @@ -221,7 +227,7 @@ msg_owner_grab_fail = "You step down onto %prey, squishing them and forcing them down to the ground!" msg_prey_grab_fail = "%owner steps down and squishes you with their hoof, forcing you down to the ground!" -/datum/sprite_accessory/tail/taur/deer +/datum/sprite_accessory/tail/legacy_taur/deer name = "Deer dual-color (Taur)" id = "tail_taur_deer_colorable" icon_state = "deer_s" @@ -243,25 +249,25 @@ msg_owner_grab_fail = "You step down onto %prey, squishing them and forcing them down to the ground!" msg_prey_grab_fail = "%owner steps down and squishes you with their hoof, forcing you down to the ground!" -/datum/sprite_accessory/tail/taur/lizard +/datum/sprite_accessory/tail/legacy_taur/lizard name = "Lizard (Taur)" id = "tail_taur_lizard" icon_state = "lizard_s" suit_sprites = 'icons/mob/clothing/taursuits_lizard.dmi' -/datum/sprite_accessory/tail/taur/lizard/lizard_2c +/datum/sprite_accessory/tail/legacy_taur/lizard/lizard_2c name = "Lizard dual-color (Taur)" id = "tail_taur_lizard_colorable" icon_state = "lizard_s" extra_overlay = "lizard_markings" -/datum/sprite_accessory/tail/taur/lizard/synthlizard +/datum/sprite_accessory/tail/legacy_taur/lizard/synthlizard name = "SynthLizard dual-color (Taur)" id = "tail_taur_lizard_synth" icon_state = "synthlizard_s" extra_overlay = "synthlizard_markings" -/datum/sprite_accessory/tail/taur/spider +/datum/sprite_accessory/tail/legacy_taur/spider name = "Spider (Taur)" id = "tail_taur_spider" icon_state = "spider_s" @@ -282,7 +288,7 @@ msg_owner_grab_fail = "You step down onto %prey, squishing them and forcing them down to the ground!" msg_prey_grab_fail = "%owner steps down and squishes you with their leg, forcing you down to the ground!" -/datum/sprite_accessory/tail/taur/tents +/datum/sprite_accessory/tail/legacy_taur/tents name = "Tentacles (Taur)" id = "tail_taur_tentacles" icon_state = "tent_s" @@ -309,42 +315,42 @@ msg_owner_grab_fail = "You step down onto %prey with one of your tentacles, forcing them onto the ground!" msg_prey_grab_fail = "%owner steps down onto you with one of their tentacles, squishing you and forcing you onto the ground!" -/datum/sprite_accessory/tail/taur/feline +/datum/sprite_accessory/tail/legacy_taur/feline name = "Feline (Taur)" id = "tail_taur_feline" icon_state = "feline_s" suit_sprites = 'icons/mob/clothing/taursuits_feline.dmi' -/datum/sprite_accessory/tail/taur/fatfeline +/datum/sprite_accessory/tail/legacy_taur/fatfeline name = "Fat Feline (Taur)" id = "tail_taur_feline_fat" icon_state = "fatfeline_s" -/datum/sprite_accessory/tail/taur/fatfeline_wag +/datum/sprite_accessory/tail/legacy_taur/fatfeline_wag name = "Fat Feline (Taur) (vwag)" id = "tail_taur_feline_fat_waggable" icon_state = "fatfeline_s" ani_state = "fatfeline_w" -/datum/sprite_accessory/tail/taur/feline/feline_2c +/datum/sprite_accessory/tail/legacy_taur/feline/feline_2c name = "Feline dual-color (Taur)" id = "tail_taur_feline_colorable" icon_state = "feline_s" extra_overlay = "feline_markings" -/datum/sprite_accessory/tail/taur/feline/fatfeline_2c +/datum/sprite_accessory/tail/legacy_taur/feline/fatfeline_2c name = "Fat Feline dual-color (Taur)" id = "tail_taur_feline_fat_colorable" icon_state = "fatfeline_s" extra_overlay = "fatfeline_markings" -/datum/sprite_accessory/tail/taur/feline/synthfeline +/datum/sprite_accessory/tail/legacy_taur/feline/synthfeline name = "SynthFeline dual-color (Taur)" id = "tail_taur_feline_synth_colorable" icon_state = "synthfeline_s" extra_overlay = "synthfeline_markings" -/datum/sprite_accessory/tail/taur/slug +/datum/sprite_accessory/tail/legacy_taur/slug name = "Slug (Taur)" id = "tail_taur_slug" icon_state = "slug_s" @@ -377,26 +383,26 @@ msg_prey_stepunder = "You jump over %prey's thick tail." msg_owner_stepunder = "%owner bounds over your tail." -/datum/sprite_accessory/tail/taur/frog +/datum/sprite_accessory/tail/legacy_taur/frog name = "Frog (Taur)" id = "tail_taur_frog" icon_state = "frog_s" -/datum/sprite_accessory/tail/taur/drake //Enabling on request, no suit compatibility but then again see 2 above. +/datum/sprite_accessory/tail/legacy_taur/drake //Enabling on request, no suit compatibility but then again see 2 above. name = "Drake (Taur)" id = "tail_taur_drake" icon_state = "drake_s" extra_overlay = "drake_markings" suit_sprites = 'icons/mob/clothing/taursuits_drake.dmi' -/datum/sprite_accessory/tail/taur/otie +/datum/sprite_accessory/tail/legacy_taur/otie name = "Otie (Taur)" id = "tail_taur_otie" icon_state = "otie_s" extra_overlay = "otie_markings" suit_sprites = 'icons/mob/clothing/taursuits_otie.dmi' -/datum/sprite_accessory/tail/taur/wasp +/datum/sprite_accessory/tail/legacy_taur/wasp name = "Wasp (dual color)" id = "tail_taur_wasp" icon_state = "wasp_s" @@ -418,7 +424,7 @@ msg_owner_grab_fail = "You step down onto %prey, squishing them and forcing them down to the ground!" msg_prey_grab_fail = "%owner steps down and squishes you with their leg, forcing you down to the ground!" -/datum/sprite_accessory/tail/taur/mantis +/datum/sprite_accessory/tail/legacy_taur/mantis name = "Mantis (Taur)" id = "tail_taur_mantis" icon_state = "mantis_s" @@ -442,12 +448,11 @@ // Special snowflake tails/taurhalves // todo: remove -/datum/sprite_accessory/tail/taur/alraune - abstract_type = /datum/sprite_accessory/tail/taur/alraune +/datum/sprite_accessory/tail/legacy_taur/alraune + abstract_type = /datum/sprite_accessory/tail/legacy_taur/alraune name = "Alraune (natje) (Taur)" icon_state = "alraune_s" ani_state = "alraune_closed_s" - ckeys_allowed = list("natje") do_colouration = 0 can_ride = 0 clip_mask_state = "taur_clip_mask_alraune" @@ -474,18 +479,17 @@ msg_owner_grab_fail = "You step down onto %prey with one of your vines, forcing them onto the ground!" msg_prey_grab_fail = "%owner steps down onto you with one of their vines, squishing you and forcing you onto the ground!" -/datum/sprite_accessory/tail/taur/alraune/alraune_2c +/datum/sprite_accessory/tail/legacy_taur/alraune/alraune_2c name = "Alraune (dual color)" id = "tail_taur_alraune_colorable" icon_state = "alraunecolor_s" ani_state = "alraunecolor_closed_s" - ckeys_allowed = null do_colouration = 1 extra_overlay = "alraunecolor_markings" extra_overlay_w = "alraunecolor_closed_markings" clip_mask_state = "taur_clip_mask_alraune" -/datum/sprite_accessory/tail/taur/long_lizard +/datum/sprite_accessory/tail/legacy_taur/long_lizard name = "Large Dragon Tail" id = "tail_taur_dragon_large" icon_state = "big_liz" @@ -494,7 +498,7 @@ clip_mask_icon = null clip_mask_state = null -/datum/sprite_accessory/tail/taur/long_lizard/scaled +/datum/sprite_accessory/tail/legacy_taur/long_lizard/scaled name = "Large Dragon Tail/W scales" id = "tail_taur_dragon_large_scales" extra_overlay = "big_liz_mark" diff --git a/code/modules/sprite_accessories/tail/weird_shadow_creature_ocs.dm b/code/modules/sprite_accessories/tail/weird_shadow_creature_ocs.dm index ab6c66827631..935accb7d76f 100644 --- a/code/modules/sprite_accessories/tail/weird_shadow_creature_ocs.dm +++ b/code/modules/sprite_accessories/tail/weird_shadow_creature_ocs.dm @@ -4,13 +4,13 @@ icon_state = "newtailmaw" ani_state = "newtailmaw_w" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/tail/tailmaw name = "tailmaw, colorable" id = "tail_tailmaw2" icon_state = "tailmaw" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE do_colouration = 1 /datum/sprite_accessory/tail/tentacles @@ -18,7 +18,7 @@ id = "tail_tentacles" icon_state = "tentacles" do_colouration = TRUE - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE ani_state = "tentacles_wag" /datum/sprite_accessory/tail/spade_color diff --git a/code/modules/sprite_accessories/wings.dm b/code/modules/sprite_accessories/wings.dm new file mode 100644 index 000000000000..99a83e442b0b --- /dev/null +++ b/code/modules/sprite_accessories/wings.dm @@ -0,0 +1,61 @@ +/datum/sprite_accessory/wing + abstract_type = /datum/sprite_accessory/wing + name = "You should not see this..." + icon = 'icons/mob/sprite_accessories/wings.dmi' + icon_dimension_x = 64 + icon_alignment = SPRITE_ACCESSORY_ALIGNMENT_BOTTOM + do_colouration = 0 //Set to 1 to enable coloration using the tail color. + + legacy_use_additive_color_matrix = TRUE // Only appliciable if do_coloration = 1 + +/datum/sprite_accessory/wing/render(mob/for_whom, list/colors, layer_front, layer_behind, layer_side, with_base_state, with_variation, flattened) + var/list/image/layers = ..() + + if(flattened) + return layers + + for(var/image/rendered as anything in layers) + if(do_colouration && ishuman(for_whom)) + var/mob/living/carbon/human/casted_human = for_whom + if(casted_human.grad_wingstyle && casted_human.grad_wingstyle != "None") + var/image/gradient_icon = image(hair_gradient_icon(id, rendered, casted_human.grad_wingstyle, icon_dimension_x)) + gradient_icon.color = rgb( + casted_human.r_gradwing, + casted_human.g_gradwing, + casted_human.b_gradwing, + ) + gradient_icon.blend_mode = BLEND_OVERLAY + rendered.overlays += gradient_icon + + return layers + +/datum/sprite_accessory/wing/flat_cache_keys(mob/for_whom, list/colors, layer_front, layer_behind, layer_side, with_base_state = icon_state, with_variation, flattened) + . = ..() + if(!ishuman(for_whom)) + return + var/mob/living/carbon/human/casted_human = for_whom + . += casted_human.grad_wingstyle + . += rgb( + casted_human.r_gradwing, + casted_human.g_gradwing, + casted_human.b_gradwing, + ) + +// todo: sort ears by something that makes sense +// todo: tgui choice menu should be modular +// todo: and include way to do categories +//! right now the categories are way too sparse, we'll combine them later. + +//? AND YES, I AM SHITPOSTING WITH THE CATEGORY .DM NAMES +//? Deal with it, I'll deal with this in the emissives PR +//? Seriously I'm not categorizing our 500 kinds of wings. + +//? If anyone wants to sort it, obviously, PLEASE, be my guest, but I just don't have the energy to do the stuff I did +//? in /ears. It just isn't working out for me, sorry. + +//? Potential nomenclatures: +//? - by animal (real or fakefurrysona) type +//? - "Animal", "Species", "Robotic", "Misc" +//? etc + +//? PLEASE HELP WITH THIS. diff --git a/code/modules/sprite_accessories/wings/_wings.dm b/code/modules/sprite_accessories/wings/_wings.dm deleted file mode 100644 index 3ae01264afcc..000000000000 --- a/code/modules/sprite_accessories/wings/_wings.dm +++ /dev/null @@ -1,35 +0,0 @@ -/datum/sprite_accessory/wing - abstract_type = /datum/sprite_accessory/wing - name = "You should not see this..." - icon = 'icons/mob/sprite_accessories/wings.dmi' - dimension_x = 64 - do_colouration = 0 //Set to 1 to enable coloration using the tail color. - - color_blend_mode = ICON_ADD // Only appliciable if do_coloration = 1 - var/clothing_can_hide = 1 // If true, clothing with HIDETAIL hides it. If the clothing is bulky enough to hide a tail, it should also hide wings. - // var/show_species_tail = 1 // Just so // TODO - Seems not needed ~Leshana - var/desc = "You should not see this..." - var/ani_state // State when flapping/animated - var/spr_state // State when spreading wings w/o anim - var/extra_overlay_w // Flapping state for extra overlay - var/extra_overlay2_w - - -// todo: sort ears by something that makes sense -// todo: tgui choice menu should be modular -// todo: and include way to do categories -//! right now the categories are way too sparse, we'll combine them later. - -//? AND YES, I AM SHITPOSTING WITH THE CATEGORY .DM NAMES -//? Deal with it, I'll deal with this in the emissives PR -//? Seriously I'm not categorizing our 500 kinds of wings. - -//? If anyone wants to sort it, obviously, PLEASE, be my guest, but I just don't have the energy to do the stuff I did -//? in /ears. It just isn't working out for me, sorry. - -//? Potential nomenclatures: -//? - by animal (real or fakefurrysona) type -//? - "Animal", "Species", "Robotic", "Misc" -//? etc - -//? PLEASE HELP WITH THIS. diff --git a/code/modules/sprite_accessories/wings/draconic_furries.dm b/code/modules/sprite_accessories/wings/draconic_furries.dm index 93a9746f23bf..9cb1b0ec5f33 100644 --- a/code/modules/sprite_accessories/wings/draconic_furries.dm +++ b/code/modules/sprite_accessories/wings/draconic_furries.dm @@ -3,7 +3,7 @@ id = "wing_cyberdragon" icon_state = "cyberdragon_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/wing/cyberdragon_red name = "Cyber dragon wing (red)" @@ -16,7 +16,7 @@ id = "wing_cyberdragon2" icon_state = "drago_wing" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "drago_wing_2" /datum/sprite_accessory/wing/drake_wing @@ -24,4 +24,4 @@ id = "wing_drake" icon_state = "drake_wing" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/wings/feathered-angel.dm b/code/modules/sprite_accessories/wings/feathered-angel.dm new file mode 100644 index 000000000000..7afd2e6246f3 --- /dev/null +++ b/code/modules/sprite_accessories/wings/feathered-angel.dm @@ -0,0 +1,31 @@ +/datum/sprite_accessory/wing/angel + name = "angel wings" + id = "angelwings" + icon = 'icons/mob/sprite_accessory/wings/feathered-angel.dmi' + icon_state = "angel" + do_colouration = TRUE + legacy_use_additive_color_matrix = FALSE + icon_sidedness = SPRITE_ACCESSORY_SIDEDNESS_FRONT_BEHIND + +//64x48 Wings +/datum/sprite_accessory/wing/seraph + name = "seraphim wings (colorable)" + id = "wing_seraph" + icon = 'icons/mob/sprite_accessory/wings/feathered-angel-64x48.dmi' + icon_state = "seraph" + variations = list( + SPRITE_ACCESSORY_VARIATION_SPREAD = "seraph-spr" + ) + do_colouration = 1 + legacy_use_additive_color_matrix = FALSE + +/datum/sprite_accessory/wing/seraph_eyes + name = "seraphim wings (colorable, eyes)" + id = "wing_serapheye" + icon = 'icons/mob/sprite_accessory/wings/feathered-angel-64x48.dmi' + icon_state = "seraph_eye" + variations = list( + SPRITE_ACCESSORY_VARIATION_SPREAD = "seraph_eye-spr" + ) + //do_colouration = 1 //Maybe some day we'll allow multi-coloration and I'll make this colorable again too so the eyes can get colors. + //legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/wings/feathered-generic.dm b/code/modules/sprite_accessories/wings/feathered-generic.dm new file mode 100644 index 000000000000..43af9e848a15 --- /dev/null +++ b/code/modules/sprite_accessories/wings/feathered-generic.dm @@ -0,0 +1,26 @@ +/datum/sprite_accessory/wing/feathered + name = "feathered wings (colorable)" + id = "wing_feather" + icon = 'icons/mob/sprite_accessory/wings/feathered-generic.dmi' + icon_state = "feathered" + do_colouration = 1 + legacy_use_additive_color_matrix = FALSE + +/datum/sprite_accessory/wing/feathered_medium + name = "medium feathered wings (colorable)" // Keekenox made these feathery things with a little bit more shape to them than the other wings. They are medium sized wing boys. + id = "wing_feather_medium" + icon = 'icons/mob/sprite_accessory/wings/feathered-generic.dmi' + icon_state = "feathered2" + variations = list( + SPRITE_ACCESSORY_VARIATION_SPREAD = "feathered2-spr" + ) + do_colouration = 1 + legacy_use_additive_color_matrix = FALSE + +/datum/sprite_accessory/wing/feathered_large //Made by Natje! + name = "large feathered wings (colorable)" + id = "wing_feather_large" + icon = 'icons/mob/sprite_accessory/wings/feathered-generic.dmi' + icon_state = "feathered3" + do_colouration = 1 + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/wings/feathered.dm b/code/modules/sprite_accessories/wings/feathered.dm index bdf6915e4e4d..49f477a10763 100644 --- a/code/modules/sprite_accessories/wings/feathered.dm +++ b/code/modules/sprite_accessories/wings/feathered.dm @@ -1,31 +1,10 @@ -/datum/sprite_accessory/wing/feathered - name = "feathered wings (colorable)" - id = "wing_feather" - icon_state = "feathered" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - -/datum/sprite_accessory/wing/feathered_medium - name = "medium feathered wings (colorable)" // Keekenox made these feathery things with a little bit more shape to them than the other wings. They are medium sized wing boys. - id = "wing_feather_medium" - icon_state = "feathered2" - spr_state = "feathered2_spr" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - -/datum/sprite_accessory/wing/feathered_large //Made by Natje! - name = "large feathered wings (colorable)" - id = "wing_feather_large" - icon_state = "feathered3" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY /datum/sprite_accessory/wing/harpywings name = "harpy wings (colorable)" id = "wing_harpy" icon_state = "harpywings" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE // the below two weren't my doing // check blame, it wasn't me ~silicons @@ -36,7 +15,7 @@ id = "wing_harpy_archeopterx" icon_state = "Harpywings_alt" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "Neckfur" extra_overlay2 = "Harpywings_altmarkings" @@ -45,7 +24,7 @@ id = "wing_harpy_archeopteryx2" icon_state = "harpywings_alt" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "harpywings_altmarkings" /datum/sprite_accessory/wing/harpywings_alt_neckfur @@ -53,7 +32,7 @@ id = "wing_harpy_archeopteryx3" icon_state = "harpywings_alt" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "harpywings_altmarkings" extra_overlay2 = "neckfur" @@ -62,7 +41,7 @@ id = "wing_harpy_bat2" icon_state = "harpywings_bat" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "harpywings_batmarkings" /datum/sprite_accessory/wing/harpywings_bat_neckfur @@ -70,33 +49,6 @@ id = "wing_harpy_bat_neckfur" icon_state = "harpywings_bat" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE extra_overlay = "harpywings_batmarkings" extra_overlay2 = "neckfur" - -/datum/sprite_accessory/wing/angel - name = "angel wings" - id = "angelwings" - icon_state = "angelwings" - do_colouration = TRUE - color_blend_mode = ICON_MULTIPLY - front_behind_system = TRUE - -//64x48 Wings -/datum/sprite_accessory/wing/seraph - name = "seraphim wings (colorable)" - id = "wing_seraph" - icon = 'icons/mob/sprite_accessories/wings_64x48.dmi' - icon_state = "seraph" - spr_state = "seraph_spr" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - -/datum/sprite_accessory/wing/seraph_eyes - name = "seraphim wings (colorable, eyes)" - id = "wing_serapheye" - icon = 'icons/mob/sprite_accessories/wings_64x48.dmi' - icon_state = "seraph_eye" - spr_state = "seraph_eye_spr" - //do_colouration = 1 //Maybe some day we'll allow multi-coloration and I'll make this colorable again too so the eyes can get colors. - //color_blend_mode = ICON_MULTIPLY diff --git a/code/modules/sprite_accessories/wings/insect_not_really_wings.dm b/code/modules/sprite_accessories/wings/insect_not_really_wings.dm index eb0e28cf59ec..feea047dd6b8 100644 --- a/code/modules/sprite_accessories/wings/insect_not_really_wings.dm +++ b/code/modules/sprite_accessories/wings/insect_not_really_wings.dm @@ -3,18 +3,18 @@ id = "wing_mantis_arms" icon_state = "mantis-arms" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/wing/mantis_arms_saturated name = "mantis arms (saturated)" id = "wing_mantis_arms2" icon_state = "mantis-arms_saturated" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/wing/spider_legs //Not really /WINGS/ but they protrude from the back, kinda. Might as well have them here. name = "spider legs" id = "wing_spider_legs" icon_state = "spider-legs" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/wings/misc.dm b/code/modules/sprite_accessories/wings/misc.dm index de8ffdfcd7c7..7f7d35f777bb 100644 --- a/code/modules/sprite_accessories/wings/misc.dm +++ b/code/modules/sprite_accessories/wings/misc.dm @@ -3,14 +3,14 @@ id = "wing_neckfur" icon_state = "neckfur" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/wing/nevrean name = "nevrean wings/fantail" id = "wing_nevrean_wtail" icon_state = "nevrean_s" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/wing/sepulchre_c_yw name = "demon wings (colorable)" diff --git a/code/modules/sprite_accessories/wings/moth.dm b/code/modules/sprite_accessories/wings/moth.dm index fb47aae413f0..5d6525018a93 100644 --- a/code/modules/sprite_accessories/wings/moth.dm +++ b/code/modules/sprite_accessories/wings/moth.dm @@ -2,14 +2,13 @@ name = "moth wings" id = "wing_moth" icon_state = "moth" - clothing_can_hide = FALSE /datum/sprite_accessory/wing/mothc name = "moth wings (colorable)" id = "wing_moth_color" icon_state = "moth" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/wing/moth_atlas name = "atlas moth wings" @@ -29,8 +28,9 @@ /datum/sprite_accessory/wing/moth_firewatch name = "firewatch moth wings" id = "wing_moth_firewatch" - icon_state = "moth_firewatch" - front_behind_system = TRUE + icon = 'icons/mob/sprite_accessory/wings/moth.dmi' + icon_state = "firewatch" + icon_sidedness = SPRITE_ACCESSORY_SIDEDNESS_FRONT_BEHIND /datum/sprite_accessory/wing/moth_full name = "moth antenna and wings" diff --git a/code/modules/sprite_accessories/wings/non_moth_insects.dm b/code/modules/sprite_accessories/wings/non_moth_insects.dm index f6ed116c6fc7..a74d7296b7ae 100644 --- a/code/modules/sprite_accessories/wings/non_moth_insects.dm +++ b/code/modules/sprite_accessories/wings/non_moth_insects.dm @@ -7,4 +7,4 @@ name = "dragonfly" id = "wing_dragonfly" icon_state = "dragonfly" - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/sprite_accessories/wings/synthetic.dm b/code/modules/sprite_accessories/wings/synthetic.dm index 4157f9adbe5f..052e4e6c6458 100644 --- a/code/modules/sprite_accessories/wings/synthetic.dm +++ b/code/modules/sprite_accessories/wings/synthetic.dm @@ -3,7 +3,7 @@ id = "wing_robot1" icon_state = "Drago_wing" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE //? synth furries count diff --git a/code/modules/sprite_accessories/wings/xenomorph.dm b/code/modules/sprite_accessories/wings/xenomorph.dm index b43d2e1acc17..69069ea8822c 100644 --- a/code/modules/sprite_accessories/wings/xenomorph.dm +++ b/code/modules/sprite_accessories/wings/xenomorph.dm @@ -8,18 +8,18 @@ id = "wing_dorsal_stand" icon_state = "xenodorsal_standard" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/wing/xeno_dorsal_royal name = "Royal Dorsal tubes" id = "wing_dorsal_royal" icon_state = "xenodorsal_royal" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE /datum/sprite_accessory/wing/xeno_dorsal_down name = "Downward Dorsal tubes" id = "wing_dorsal_down" icon_state = "xenodorsal_down" do_colouration = 1 - color_blend_mode = ICON_MULTIPLY + legacy_use_additive_color_matrix = FALSE diff --git a/code/modules/surgery/limb_reattach.dm b/code/modules/surgery/limb_reattach.dm index ebeeec188c67..be6cf7cde02d 100644 --- a/code/modules/surgery/limb_reattach.dm +++ b/code/modules/surgery/limb_reattach.dm @@ -60,7 +60,7 @@ E.replaced(target) target.update_icons_body(FALSE) target.update_health() - target.UpdateDamageIcon() + target.update_damage_overlay() /datum/surgery_step/limb/attach/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/E = tool @@ -100,7 +100,7 @@ E.status &= ~ORGAN_CUT_AWAY target.update_icons_body() target.update_health() - target.UpdateDamageIcon() + target.update_damage_overlay() /datum/surgery_step/limb/connect/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/E = tool @@ -150,7 +150,7 @@ target.update_icons_body(FALSE) target.update_health() - target.UpdateDamageIcon() + target.update_damage_overlay() qdel(tool) diff --git a/code/modules/tgui/datum.dm b/code/modules/tgui/datum.dm index fa0530b5093c..96a04797227b 100644 --- a/code/modules/tgui/datum.dm +++ b/code/modules/tgui/datum.dm @@ -21,14 +21,20 @@ * Called on an object when a tgui object is being created, allowing you to * push various assets to tgui, for examples spritesheets. * - * todo: support typepaths * todo: support file paths * todo: this should be sent to embedding interfaces * - * return list List of asset datum instances (must be /datum/asset instance, not path) + * assets may be: + * * a /datum/asset_pack + * * typepath of a /datum/asset_pack + * + * @params + * * ui - the UI instance that's being opened + * * immediate - what assets to load before the window is opened + * * deferred - what assets to load after the window is opened */ -/datum/proc/ui_assets(mob/user) - return list() +/datum/proc/ui_asset_injection(datum/tgui/ui, list/immediate, list/deferred) + return /** * public diff --git a/code/modules/tgui/modules/atmos_control.dm b/code/modules/tgui/modules/atmos_control.dm index cb3685a6eaff..5cf3767927a4 100644 --- a/code/modules/tgui/modules/atmos_control.dm +++ b/code/modules/tgui/modules/atmos_control.dm @@ -31,10 +31,9 @@ alarm.ui_interact(usr, parent_ui = ui_ref, state = TS) return 1 -/datum/tgui_module_old/atmos_control/ui_assets(mob/user) - return list( - get_asset_datum(/datum/asset/simple/nanomaps), - ) +/datum/tgui_module_old/atmos_control/ui_asset_injection(datum/tgui/ui, list/immediate, list/deferred) + immediate += /datum/asset_pack/simple/nanomaps + return ..() /datum/tgui_module_old/atmos_control/ui_interact(mob/user, datum/tgui/ui) . = ..() diff --git a/code/modules/tgui/modules/crew_monitor.dm b/code/modules/tgui/modules/crew_monitor.dm index c7877af28a64..43188d7f96a0 100644 --- a/code/modules/tgui/modules/crew_monitor.dm +++ b/code/modules/tgui/modules/crew_monitor.dm @@ -2,10 +2,9 @@ name = "Crew monitor" tgui_id = "CrewMonitor" -/datum/tgui_module_old/crew_monitor/ui_assets(mob/user) - return list( - get_asset_datum(/datum/asset/simple/nanomaps), - ) +/datum/tgui_module_old/crew_monitor/ui_asset_injection(datum/tgui/ui, list/immediate, list/deferred) + immediate += /datum/asset_pack/simple/nanomaps + return ..() /datum/tgui_module_old/crew_monitor/ui_act(action, list/params, datum/tgui/ui) if(..()) diff --git a/code/modules/tgui/modules/specific/lathe_control.dm b/code/modules/tgui/modules/specific/lathe_control.dm index 11bac06b7df4..5b78413cb8c9 100644 --- a/code/modules/tgui/modules/specific/lathe_control.dm +++ b/code/modules/tgui/modules/specific/lathe_control.dm @@ -121,9 +121,9 @@ ui_custom_update() return TRUE -/datum/tgui_module/lathe_control/ui_assets(mob/user) - . = ..() - . += get_asset_datum(/datum/asset/spritesheet/materials) +/datum/tgui_module/lathe_control/ui_asset_injection(datum/tgui/ui, list/immediate, list/deferred) + immediate += /datum/asset_pack/spritesheet/materials + return ..() /datum/tgui_module/lathe_control/proc/ui_design_data(datum/design/design) var/list/datum/design/designs = islist(design)? design : list(design) diff --git a/code/modules/tgui/tgui.dm b/code/modules/tgui/tgui.dm index e3c594ae0e52..698529d3954d 100644 --- a/code/modules/tgui/tgui.dm +++ b/code/modules/tgui/tgui.dm @@ -117,18 +117,25 @@ // fancy = user.client.prefs.tgui_fancy, fancy = TRUE, assets = list( - get_asset_datum(/datum/asset/simple/tgui), - )) + /datum/asset_pack/simple/tgui, + ), + ) else window.send_message("ping") - var/flush_queue = window.send_asset(get_asset_datum( - /datum/asset/simple/namespaced/fontawesome)) - flush_queue |= window.send_asset(get_asset_datum( - /datum/asset/simple/namespaced/tgfont)) - for(var/datum/asset/asset in src_object.ui_assets(user)) - flush_queue |= window.send_asset(asset) + var/flush_queue = FALSE + flush_queue |= window.send_asset(/datum/asset_pack/simple/fontawesome) + flush_queue |= window.send_asset(/datum/asset_pack/simple/tgfont) + // prep assets + var/list/assets_immediate = list() + var/list/assets_deferred = list() + // fetch wanted assets + src_object.ui_asset_injection(src, assets_immediate, assets_deferred) + // send all immediate assets + for(var/datum/asset_pack/assetlike as anything in assets_immediate) + flush_queue |= window.send_asset(assetlike) + // ensure all assets are loaded before continuing if (flush_queue) - user.client.browse_queue_flush() + user.client.asset_cache_flush_browse_queue() window.send_message("update", get_payload( with_data = TRUE, with_static_data = TRUE, @@ -142,6 +149,9 @@ src_object.on_ui_open(user, src) for(var/datum/module as anything in modules_registered) module.on_ui_open(user, src, TRUE) + // now send deferred asets + for(var/datum/asset_pack/assetlike as anything in assets_deferred) + window.send_asset(assetlike) return TRUE /** @@ -216,7 +226,7 @@ * * return bool - true if an asset was actually sent */ -/datum/tgui/proc/send_asset(datum/asset/asset) +/datum/tgui/proc/send_asset(datum/asset_pack/asset) if(!window) CRASH("send_asset() was called either without calling open() first or when open() did not return TRUE.") return window.send_asset(asset) diff --git a/code/modules/tgui/tgui_window.dm b/code/modules/tgui/tgui_window.dm index 46c4750d1feb..97d3ac216487 100644 --- a/code/modules/tgui/tgui_window.dm +++ b/code/modules/tgui/tgui_window.dm @@ -16,7 +16,10 @@ var/subscriber_delegate var/fatally_errored = FALSE var/message_queue - var/sent_assets = list() + /** + * sent asset packs + */ + var/list/datum/asset_pack/sent_assets = list() // Vars passed to initialize proc (and saved for later) var/initial_strict_mode var/initial_fancy @@ -88,7 +91,8 @@ html = replacetextEx(html, "\[tgui:strictMode]", strict_mode) // Inject assets var/inline_assets_str = "" - for(var/datum/asset/asset in assets) + for(var/datum/asset_pack/asset as anything in assets) + asset = SSassets.ready_asset_pack(asset) var/mappings = asset.get_url_mappings() for(var/name in mappings) var/url = mappings[name] @@ -97,7 +101,14 @@ inline_assets_str += "Byond.loadCss('[url]', true);\n" else if(copytext(name, -3) == ".js") inline_assets_str += "Byond.loadJs('[url]', true);\n" - asset.send(client) + SSassets.send_asset_pack(client, asset) + // incase they logged out + if(!client) + return + client.asset_cache_flush_browse_queue() // flush their assets + // incase they logged out + if(!client) + return if(length(inline_assets_str)) inline_assets_str = "\n" html = replacetextEx(html, "\n", inline_assets_str) @@ -114,6 +125,9 @@ html = replacetextEx(html, "", inline_css) // Open the window client << browse(html, "window=[id];[options]") + // incase they logged out + if(!client) + return // Detect whether the control is a browser is_browser = winexists(client, id) == "BROWSER" // Instruct the client to signal UI when the window is closed. @@ -290,14 +304,15 @@ * * return bool - TRUE if any assets had to be sent to the client */ -/datum/tgui_window/proc/send_asset(datum/asset/asset) +/datum/tgui_window/proc/send_asset(datum/asset_pack/asset) + asset = SSassets.ready_asset_pack(asset) if(!client || !asset) return - sent_assets |= list(asset) - . = asset.send(client) - if(istype(asset, /datum/asset/spritesheet)) - var/datum/asset/spritesheet/spritesheet = asset - send_message("asset/stylesheet", spritesheet.css_filename()) + sent_assets |= asset + . = SSassets.send_asset_pack(client, asset) + if(istype(asset, /datum/asset_pack/spritesheet)) + var/datum/asset_pack/spritesheet/spritesheet = asset + send_message("asset/stylesheet", spritesheet.get_css_url()) send_raw_message(asset.get_serialized_url_mappings()) /** diff --git a/code/modules/tgui_panel/tgui_panel.dm b/code/modules/tgui_panel/tgui_panel.dm index adb201c618ea..806b5e6b0523 100644 --- a/code/modules/tgui_panel/tgui_panel.dm +++ b/code/modules/tgui_panel/tgui_panel.dm @@ -46,12 +46,11 @@ // Perform a clean initialization window.initialize( strict_mode = TRUE, - assets = list( - get_asset_datum(/datum/asset/simple/tgui_panel), - )) - window.send_asset(get_asset_datum(/datum/asset/simple/namespaced/fontawesome)) - window.send_asset(get_asset_datum(/datum/asset/simple/namespaced/tgfont)) - window.send_asset(get_asset_datum(/datum/asset/spritesheet/chat)) + assets = list(/datum/asset_pack/simple/tgui_panel), + ) + window.send_asset(/datum/asset_pack/simple/fontawesome) + window.send_asset(/datum/asset_pack/simple/tgfont) + window.send_asset(/datum/asset_pack/spritesheet/chat) // Other setup request_telemetry() addtimer(CALLBACK(src, PROC_REF(on_initialize_timed_out)), 5 SECONDS) diff --git a/code/modules/tooltip/tooltip.dm b/code/modules/tooltip/tooltip.dm index ece092bb29bc..17d69a956648 100644 --- a/code/modules/tooltip/tooltip.dm +++ b/code/modules/tooltip/tooltip.dm @@ -40,14 +40,15 @@ Notes: /datum/tooltip/New(client/C) - if (C) - owner = C - var/datum/asset/stuff = get_asset_datum(/datum/asset/simple/jquery) - stuff.send(owner) - owner << browse(file2text('code/modules/tooltip/tooltip.html'), "window=[control]") - - ..() + if(!C) + return + owner = C + addtimer(CALLBACK(src, PROC_REF(init)), 0) +/datum/tooltip/proc/init() + var/datum/asset_pack/stuff = SSassets.ready_asset_pack(/datum/asset_pack/simple/jquery) + SSassets.send_asset_pack(owner, stuff) + owner << browse(file2text('code/modules/tooltip/tooltip.html'), "window=[control]") /datum/tooltip/proc/show(atom/movable/thing, params = null, title = null, content = null, theme = "default", special = "none") if (!thing || !params || (!title && !content) || !owner || !isnum(world.icon_size)) @@ -84,7 +85,6 @@ Notes: return TRUE - /datum/tooltip/proc/hide() queueHide = showing ? TRUE : FALSE diff --git a/code/modules/unit_tests/mob/inventory.dm b/code/modules/unit_tests/mob/inventory.dm index 633a8de4f5bc..0406845779f4 100644 --- a/code/modules/unit_tests/mob/inventory.dm +++ b/code/modules/unit_tests/mob/inventory.dm @@ -1,7 +1,7 @@ /datum/unit_test/inventory_slot_meta_uniqueness/Run() var/list/found = list() - for(var/path in subtypesof(/datum/inventory_slot_meta)) - var/datum/inventory_slot_meta/meta = path + for(var/path in subtypesof(/datum/inventory_slot)) + var/datum/inventory_slot/meta = path if(initial(meta.abstract_type) == path) continue if(initial(meta.inventory_slot_flags) & INV_SLOT_ALLOW_RANDOM_ID) diff --git a/code/modules/unit_tests/mob/sprite_accessories.dm b/code/modules/unit_tests/mob/sprite_accessories.dm index ba2b7edd4dab..9501931fe0ee 100644 --- a/code/modules/unit_tests/mob/sprite_accessories.dm +++ b/code/modules/unit_tests/mob/sprite_accessories.dm @@ -2,9 +2,6 @@ var/list/ids = list() var/list/names_hair = list() var/list/names_beard = list() - var/list/names_tail = list() - var/list/names_wing = list() - var/list/names_ear = list() var/list/names_marking = list() for(var/path in subtypesof(/datum/sprite_accessory)) var/datum/sprite_accessory/S = path @@ -29,21 +26,6 @@ Fail("duplciate name [S.name] on [path] against [names_beard[S.name]:type]") else names_beard[S.name] = S - else if(istype(S, /datum/sprite_accessory/wing)) - if(names_wing[S.name]) - Fail("duplciate name [S.name] on [path] against [names_wing[S.name]:type]") - else - names_wing[S.name] = S - else if(istype(S, /datum/sprite_accessory/ears)) - if(names_ear[S.name]) - Fail("duplciate name [S.name] on [path] against [names_ear[S.name]:type]") - else - names_ear[S.name] = S - else if(istype(S, /datum/sprite_accessory/tail)) - if(names_tail[S.name]) - Fail("duplciate name [S.name] on [path] against [names_tail[S.name]:type]") - else - names_tail[S.name] = S else if(istype(S, /datum/sprite_accessory/marking)) if(names_marking[S.name]) Fail("duplciate name [S.name] on [path] against [names_marking[S.name]:type]") diff --git a/code/modules/unit_tests/wallmounted_obj_dirs/cameras.dm b/code/modules/unit_tests/wallmounted_obj_dirs/cameras.dm deleted file mode 100644 index cf510ae99e53..000000000000 --- a/code/modules/unit_tests/wallmounted_obj_dirs/cameras.dm +++ /dev/null @@ -1,10 +0,0 @@ -/datum/unit_test/camera_direction/Run() - var/list/bad_cameras - for(var/obj/machinery/camera/C in world) - if((C.dir == NORTHWEST || SOUTHWEST || NORTHEAST || NORTHWEST) || (C.dir != NORTH||SOUTH||EAST||WEST)) //specifically checking for non NESW dirs.. - bad_cameras[C] = list("X"=C.x, "Y"=C.y, "Z"=C.z, "A"=C.loc.loc) // loc.loc is a lazy way of getting an area. - if(length(bad_cameras)) - TEST_FAIL("One or more cameras had a non-cardinal direction!") - for(var/obj/I in bad_cameras) - TEST_FAIL("[I] at X [bad_cameras[I]["X"]] Y [bad_cameras[I]["Y"]] Z [bad_cameras[I]["Z"]] in area [bad_cameras[I]["A"]]") - Fail("There were [length(bad_cameras)] cameras with non-cardinal directions.") diff --git a/code/modules/unit_tests/wallmounted_obj_dirs/fire_alarms.dm b/code/modules/unit_tests/wallmounted_obj_dirs/fire_alarms.dm deleted file mode 100644 index 5e17b8d2e28a..000000000000 --- a/code/modules/unit_tests/wallmounted_obj_dirs/fire_alarms.dm +++ /dev/null @@ -1,10 +0,0 @@ -/datum/unit_test/fire_alarm_direction/proc/Run() - var/list/bad_alarms - for(var/obj/machinery/firealarm/C in world) - if((C.dir == NORTHWEST || SOUTHWEST || NORTHEAST || NORTHWEST) || (C.dir != NORTH||SOUTH||EAST||WEST)) //specifically checking for non NESW dirs.. - bad_alarms[C] = list("X"=C.x, "Y"=C.y, "Z"=C.z, "A"=C.loc.loc) // loc.loc is a lazy way of getting an area. - if(length(bad_alarms)) - TEST_FAIL("One or more alarms had a non-cardinal direction!") - for(var/obj/I in bad_alarms) - TEST_FAIL("[I] at X [bad_alarms[I]["X"]] Y [bad_alarms[I]["Y"]] Z [bad_alarms[I]["Z"]] in area [bad_alarms[I]["A"]]") - Fail("There were [length(bad_alarms)] alarms with non-cardinal directions.") diff --git a/code/modules/vehicles_legacy/vehicle.dm b/code/modules/vehicles_legacy/vehicle.dm index 407517dfe821..8e5b29152079 100644 --- a/code/modules/vehicles_legacy/vehicle.dm +++ b/code/modules/vehicles_legacy/vehicle.dm @@ -173,10 +173,6 @@ /obj/vehicle_old/attack_ai(mob/user as mob) return -// For downstream compatibility (in particular Paradise) -/obj/vehicle_old/proc/handle_rotation() - return - //------------------------------------------- // Vehicle procs //------------------------------------------- diff --git a/code/modules/vore/appearance/update_icons_vr.dm b/code/modules/vore/appearance/update_icons_vr.dm deleted file mode 100644 index d68d6c63ca59..000000000000 --- a/code/modules/vore/appearance/update_icons_vr.dm +++ /dev/null @@ -1,92 +0,0 @@ -var/global/list/wing_icon_cache = list() - -/mob/living/carbon/human/proc/get_ears_overlay() - if(ear_style && !(head && (head.inv_hide_flags & BLOCKHEADHAIR))) - var/icon/ears_s = new/icon("icon" = ear_style.icon, "icon_state" = ear_style.icon_state) - if(ear_style.do_colouration) - ears_s.Blend(rgb(src.r_ears, src.g_ears, src.b_ears), ear_style.color_blend_mode) - - if(ear_style.extra_overlay) - var/icon/overlay = new/icon("icon" = ear_style.icon, "icon_state" = ear_style.extra_overlay) - overlay.Blend(rgb(src.r_ears2, src.g_ears2, src.b_ears2), ear_style.color_blend_mode) - ears_s.Blend(overlay, ICON_OVERLAY) - qdel(overlay) - - if(ear_style.extra_overlay2) //MORE COLOURS IS BETTERER - var/icon/overlay = new/icon("icon" = ear_style.icon, "icon_state" = ear_style.extra_overlay2) - overlay.Blend(rgb(src.r_ears3, src.g_ears3, src.b_ears3), ear_style.color_blend_mode) - ears_s.Blend(overlay, ICON_OVERLAY) - qdel(overlay) - - return ears_s - return null - -/mob/living/carbon/human/proc/get_horns_overlay() - if(horn_style && !(head && (head.inv_hide_flags & BLOCKHEADHAIR))) - var/icon/horn_s = new/icon("icon" = horn_style.icon, "icon_state" = horn_style.icon_state) - if(horn_style.do_colouration) - horn_s.Blend(rgb(src.r_horn, src.g_horn, src.b_horn), horn_style.color_blend_mode) - - if(horn_style.extra_overlay) - var/icon/overlay = new/icon("icon" = horn_style.icon, "icon_state" = horn_style.extra_overlay) - overlay.Blend(rgb(src.r_horn2, src.g_horn2, src.b_horn2), horn_style.color_blend_mode) - horn_s.Blend(overlay, ICON_OVERLAY) - qdel(overlay) - - if(horn_style.extra_overlay2) - var/icon/overlay = new/icon("icon" = horn_style.icon, "icon_state" = horn_style.extra_overlay2) - overlay.Blend(rgb(src.r_horn3, src.g_horn3, src.b_horn3), horn_style.color_blend_mode) - horn_s.Blend(overlay, ICON_OVERLAY) - qdel(overlay) - - return horn_s - return null - -/mob/living/carbon/human/proc/get_tail_image(front) - //If you are FBP with tail style and didn't set a custom one - var/datum/robolimb/model = isSynthetic() - if(istype(model) && model.includes_tail && !tail_style) - var/icon/tail_s = new/icon("icon" = synthetic.icon, "icon_state" = "tail") - if(species.color_force_greyscale) - tail_s.MapColors(arglist(color_matrix_greyscale())) - tail_s.Blend(rgb(src.r_skin, src.g_skin, src.b_skin), species.color_mult ? ICON_MULTIPLY : ICON_ADD) - return image(tail_s) - - //If you have a custom tail selected - if(tail_style && !(wear_suit && wear_suit.inv_hide_flags & HIDETAIL && !isTaurTail(tail_style))) - var/base_state = wagging && tail_style.ani_state ? tail_style.ani_state : tail_style.icon_state - if(tail_style.front_behind_system) - base_state += front? "_FRONT" : "_BEHIND" - var/icon/tail_s = new/icon("icon" = tail_style.icon, "icon_state" = base_state) - if(tail_style.do_colouration) - tail_s.Blend(rgb(src.r_tail, src.g_tail, src.b_tail), tail_style.color_blend_mode) - if(tail_style.extra_overlay) - var/extra_overlay_state = tail_style.front_behind_system ? "[tail_style.extra_overlay][front ? "_FRONT" : "_BEHIND"]" : tail_style.extra_overlay - var/icon/overlay = new/icon("icon" = tail_style.icon, "icon_state" = extra_overlay_state) - if(wagging && tail_style.ani_state) - overlay = new/icon("icon" = tail_style.icon, "icon_state" = tail_style.extra_overlay_w) - overlay.Blend(rgb(src.r_tail2, src.g_tail2, src.b_tail2), tail_style.color_blend_mode) - tail_s.Blend(overlay, ICON_OVERLAY) - qdel(overlay) - else - overlay.Blend(rgb(src.r_tail2, src.g_tail2, src.b_tail2), tail_style.color_blend_mode) - tail_s.Blend(overlay, ICON_OVERLAY) - qdel(overlay) - - if(tail_style.extra_overlay2) - var/icon/overlay = new/icon("icon" = tail_style.icon, "icon_state" = tail_style.extra_overlay2) - if(wagging && tail_style.ani_state) - overlay = new/icon("icon" = tail_style.icon, "icon_state" = tail_style.extra_overlay2_w) - overlay.Blend(rgb(src.r_tail3, src.g_tail3, src.b_tail3), tail_style.color_blend_mode) - tail_s.Blend(overlay, ICON_OVERLAY) - qdel(overlay) - else - overlay.Blend(rgb(src.r_tail3, src.g_tail3, src.b_tail3), tail_style.color_blend_mode) - tail_s.Blend(overlay, ICON_OVERLAY) - qdel(overlay) - - if(isTaurTail(tail_style)) - return image(tail_s, "pixel_x" = -16) - else - return image(tail_s) - return null diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm index 73bc3e8c5c53..76b11ed93417 100644 --- a/code/modules/vore/eating/living_vr.dm +++ b/code/modules/vore/eating/living_vr.dm @@ -23,7 +23,6 @@ var/absorbing_prey = 0 // Determines if the person is using the succubus drain or not. See station_special_abilities_vr. var/drain_finalized = 0 // Determines if the succubus drain will be KO'd/absorbed. Can be toggled on at any time. var/fuzzy = 1 // Preference toggle for sharp/fuzzy icon. - var/tail_alt = 0 // Tail layer toggle. var/permit_healbelly = TRUE var/can_be_drop_prey = FALSE var/can_be_drop_pred = TRUE // Mobs are pred by default. diff --git a/code/modules/vore/eating/transforming_vr.dm b/code/modules/vore/eating/transforming_vr.dm index e2e9cf614c08..2519eceb39e4 100644 --- a/code/modules/vore/eating/transforming_vr.dm +++ b/code/modules/vore/eating/transforming_vr.dm @@ -119,7 +119,7 @@ M.g_tail = O.g_tail M.b_tail = O.b_tail M.tail_style = O.tail_style - M.update_tail_showing() + M.render_spriteacc_tail() if(message) to_chat(M, "Your body tingles all over...") to_chat(O, "You tingle as you make noticeable changes to your captive's body.") @@ -137,7 +137,7 @@ return M.tail_style = O.tail_style - M.update_tail_showing() + M.render_spriteacc_tail() if(message) to_chat(M, "Your body tingles all over...") to_chat(O, "You tingle as you make noticeable changes to your captive's body.") @@ -162,7 +162,7 @@ M.g_wing = O.g_wing M.b_wing = O.b_wing M.wing_style = O.wing_style - M.update_wing_showing() + M.render_spriteacc_wings() if(message) to_chat(M, "Your body tingles all over...") to_chat(O, "You tingle as you make noticeable changes to your captive's body.") @@ -180,7 +180,7 @@ return M.wing_style = O.wing_style - M.update_wing_showing() + M.render_spriteacc_wings() if(message) to_chat(M, "Your body tingles all over...") to_chat(O, "You tingle as you make noticeable changes to your captive's body.") @@ -232,7 +232,7 @@ M.custom_species = O.custom_species M.update_icons_body() - M.update_tail_showing() + M.render_spriteacc_tail() if(backup_implants.len) var/obj/item/organ/external/torso = M.get_organ(BP_TORSO) diff --git a/code/modules/vore/fluffstuff/custom_guns.dm b/code/modules/vore/fluffstuff/custom_guns.dm index c954adbe360e..a95627f6da8e 100644 --- a/code/modules/vore/fluffstuff/custom_guns.dm +++ b/code/modules/vore/fluffstuff/custom_guns.dm @@ -55,6 +55,17 @@ slot_flags = SLOT_BACK one_handed_penalty = 60 // The weapon itself is heavy +/obj/item/gun/ballistic/automatic/battlerifle/update_icon() + . = ..() + update_held_icon() + +/obj/item/gun/ballistic/automatic/battlerifle/update_icon_state() + . = ..() + if(istype(ammo_magazine,/obj/item/ammo_magazine/m95)) + icon_state = "battlerifle" + else + icon_state = (ammo_magazine)? "battlerifle" : "battlerifle_empty" + // For general use /obj/item/gun/ballistic/shotgun/pump/JSDF name = "\improper JSDF tactical shotgun" diff --git a/code/modules/vore/fluffstuff/life_crystals.dm b/code/modules/vore/fluffstuff/life_crystals.dm index 1dcb4b135d94..3e2c78e853e7 100644 --- a/code/modules/vore/fluffstuff/life_crystals.dm +++ b/code/modules/vore/fluffstuff/life_crystals.dm @@ -41,8 +41,8 @@ to_chat(user, "The [name] doesn't do anything.") return 0 - owner = user //We're paired to this guy - owner_c = user.client //This is his client + owner = user //We're paired to this person + owner_c = user.client //This is their client update_state(1) to_chat(user, "The [name] glows pleasantly blue.") START_PROCESSING(SSobj, src) @@ -51,9 +51,10 @@ //He's dead, jim if(state < 1) return - if(!owner)//How did we get here? + if(!owner && !owner_c) //How did we get here? + //It's likely because the owner got gibbed. But if it truly bugged out, there'd be no client. return - if((owner.stat == DEAD) || (get_turf(owner) != get_turf(src))) + if((!owner && owner_c) || (owner.stat == DEAD) || (get_turf(owner) != get_turf(src))) if(state == 1) become_alert() if((state == 2) && (last_vitals < world.time - 1 MINUTE)) diff --git a/code/modules/vore/lick_wounds.dm b/code/modules/vore/lick_wounds.dm index b2baf7cd2338..78625be23ef3 100644 --- a/code/modules/vore/lick_wounds.dm +++ b/code/modules/vore/lick_wounds.dm @@ -74,5 +74,5 @@ W.salve() W.bandage() W.disinfect() - H.UpdateDamageIcon() + H.update_damage_overlay() playsound(src, 'sound/effects/ointment.ogg', 25) diff --git a/code/modules/vore/resizing/resize_vr.dm b/code/modules/vore/resizing/resize_vr.dm index f68b066ad1df..c41814e56572 100644 --- a/code/modules/vore/resizing/resize_vr.dm +++ b/code/modules/vore/resizing/resize_vr.dm @@ -82,12 +82,12 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2 /mob/living/carbon/human/resize(var/new_size, var/animate = TRUE) . = ..() - if(LAZYLEN(hud_list)) - var/new_y_offset = (size_multiplier < 1 ? 27 : 32) * (size_multiplier - 1) + if(atom_huds) //it lowers lesser than it raises when it comes to micros v. macros else the medHUD would bury the micro - for(var/key in hud_list) - var/image/HI = hud_list[key] - HI.pixel_y = new_y_offset + var/new_y_offset = (size_multiplier < 1 ? 27 : 32) * (size_multiplier - 1) + for(var/id in atom_huds) + var/image/image = atom_huds[id] + image.pixel_y = new_y_offset // Optimize mannequins - never a point to animating or doing HUDs on these. /mob/living/carbon/human/dummy/mannequin/resize(var/new_size, var/animate = TRUE) @@ -200,14 +200,14 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2 /mob/living/proc/inform_someone_you_just_stepped_over_them(mob/living/micro) var/mob/living/carbon/human/H - var/datum/sprite_accessory/tail/taur/tail + var/datum/sprite_accessory/tail/legacy_taur/tail tail = ishuman(src)? ((H = src) && isTaurTail(H.tail_style) && H.tail_style) : null to_chat(src, tail? STEP_TEXT_OWNER_NON_SHITCODE(tail.msg_owner_help_run, micro) : "You carefully step over [micro].") to_chat(micro, tail? STEP_TEXT_PREY_NON_SHITCODE(tail.msg_prey_help_run, src) : "[src] carefully steps over you.") /mob/living/proc/inform_someone_they_just_ran_under_you(mob/living/micro) var/mob/living/carbon/human/H - var/datum/sprite_accessory/tail/taur/tail + var/datum/sprite_accessory/tail/legacy_taur/tail tail = ishuman(src)? ((H = src) && isTaurTail(H.tail_style) && H.tail_style) : null to_chat(micro, tail? STEP_TEXT_OWNER_NON_SHITCODE(tail.msg_prey_stepunder, src) : "You run between [src]'s legs.") to_chat(src, tail? STEP_TEXT_PREY_NON_SHITCODE(tail.msg_owner_stepunder, micro) : "[micro] runs between your legs.") @@ -226,7 +226,7 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2 if(isliving(AM)) var/fetish_content_check = stupid_fucking_micro_canpass_fetish_check(mover) var/mob/living/carbon/human/H - var/datum/sprite_accessory/tail/taur/tail + var/datum/sprite_accessory/tail/legacy_taur/tail switch(fetish_content_check) if(NEITHER_OF_US_ARE_FETISH_CONTENT, WE_ARE_BOTH_MICROS) return @@ -329,7 +329,7 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2 //Human with taur tail, special messages are sent else - var/datum/sprite_accessory/tail/taur/tail = H.tail_style + var/datum/sprite_accessory/tail/legacy_taur/tail = H.tail_style to_chat(src,STEP_TEXT_OWNER("[tail.msg_owner_disarm_run]")) to_chat(tmob,STEP_TEXT_PREY("[tail.msg_prey_disarm_run]")) @@ -351,7 +351,7 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2 //Human with taur tail, special messages are sent else - var/datum/sprite_accessory/tail/taur/tail = H.tail_style + var/datum/sprite_accessory/tail/legacy_taur/tail = H.tail_style to_chat(src,STEP_TEXT_OWNER("[tail.msg_owner_disarm_walk]")) to_chat(tmob,STEP_TEXT_PREY("[tail.msg_prey_disarm_walk]")) @@ -383,7 +383,7 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2 //Human with taur tail, special messages are sent else - var/datum/sprite_accessory/tail/taur/tail = H.tail_style + var/datum/sprite_accessory/tail/legacy_taur/tail = H.tail_style to_chat(src,STEP_TEXT_OWNER("[tail.msg_owner_harm_run]")) to_chat(tmob,STEP_TEXT_PREY("[tail.msg_prey_harm_run]")) @@ -417,7 +417,7 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2 //Human with taur tail, special messages are sent else - var/datum/sprite_accessory/tail/taur/tail = H.tail_style + var/datum/sprite_accessory/tail/legacy_taur/tail = H.tail_style to_chat(src,STEP_TEXT_OWNER("[tail.msg_owner_harm_walk]")) to_chat(tmob,STEP_TEXT_PREY("[tail.msg_prey_harm_walk]")) @@ -450,14 +450,14 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2 //Human, taur, shoes = no grab, special message else if(H.shoes) - var/datum/sprite_accessory/tail/taur/tail = H.tail_style + var/datum/sprite_accessory/tail/legacy_taur/tail = H.tail_style to_chat(src,STEP_TEXT_OWNER("[tail.msg_owner_grab_fail]")) to_chat(tmob,STEP_TEXT_PREY("[tail.msg_prey_grab_fail]")) add_attack_logs(src,tmob,"Grabbed underfoot (taur, shoes)") //Human, taur, no shoes = yes grab, special message else - var/datum/sprite_accessory/tail/taur/tail = H.tail_style + var/datum/sprite_accessory/tail/legacy_taur/tail = H.tail_style to_chat(src,STEP_TEXT_OWNER("[tail.msg_owner_grab_success]")) to_chat(tmob,STEP_TEXT_PREY("[tail.msg_prey_grab_success]")) equip_to_slot_if_possible(tmob.get_scooped(H), SLOT_ID_SHOES, INV_OP_SILENT) diff --git a/config/entries/general.txt b/config/entries/general.txt index 087eb4531a45..eccbea9f051c 100644 --- a/config/entries/general.txt +++ b/config/entries/general.txt @@ -30,13 +30,6 @@ CLIENT_ERROR_MESSAGE Your version of byond is not supported. Please upgrade. ## The minimum build needed for joining the server, if using 512, a good minimum build would be 1421 as that disables the Middle Mouse Button exploit. CLIENT_ERROR_BUILD 1421 -## Assets can opt-in to caching their results into `tmp`. -## This is important, as preferences assets take upwards of 30 seconds (without sleeps) to collect. -## The cache is assumed to be cleared by TGS recompiling, which deletes `tmp`. -## This should be disabled (through `CACHE_ASSETS 0`) on development, -## but enabled on production (the default). -CACHE_ASSETS 0 - ## Set to 0 to disable admins being able to have snowflake OOC colors ALLOW_ADMIN_OOCCOLOR diff --git a/config/entries/resources.txt b/config/entries/resources.txt index 909bef0809db..62d860863a43 100644 --- a/config/entries/resources.txt +++ b/config/entries/resources.txt @@ -3,8 +3,7 @@ # If you set this mutiple times, the server will rotate between the links. # To use this, the compile option PRELOAD_RSC must be set to 0 to keep byond from preloading resources -EXTERNAL_RSC_URLS http://tgstation13.download/byond/tgstationv2.zip - +#EXTERNAL_RSC_URLS http://tgstation13.download/byond/tgstationv2.zip ######################## # Browser Asset Config # @@ -16,23 +15,27 @@ EXTERNAL_RSC_URLS http://tgstation13.download/byond/tgstationv2.zip # The normal way of getting assets to clients is to use the internal byond system. This can be slow and delay the opening of interface windows. It also doesn't allow the internal IE windows byond uses to cache anything. # You can instead have the server save them to a website via a folder within the game server that the web server can read. This could be a simple webserver or something backed by a CDN. # Valid values: simple, webroot. Simple is the default. -#ASSET_TRANSPORT webroot +#ASSET_TRANSPORT webroot -# Simple asset transport configurable values. +## Simple asset transport configurable values. ## # Uncomment this to have the server passively send all browser assets to each client in the background. (instead of waiting for them to be needed) # This should be uncommented in production and commented in development -#ASSET_SIMPLE_PRELOAD +#ASSET_SIMPLE_PRELOAD -# Webroot asset transport configurable values. +## Webroot asset transport configurable values. ## # Local folder to save assets to. # Assets will be saved in the format of asset.MD5HASH.EXT or in namespaces/hash/ as ASSET_FILE_NAME or asset.MD5HASH.EXT -#ASSET_CDN_WEBROOT data/asset-store/ +# Do not add a / at the end. + +#ASSET_CDN_WEBROOT data/asset-store # URL the folder from above can be accessed from. # for best results the webserver powering this should return a long cache validity time, as all assets sent via this transport use hash based urls # if you want to test this locally, you simpily run the `localhost-asset-webroot-server.py` python3 script to host assets stored in `data/asset-store/` via http://localhost:58715/ -#ASSET_CDN_URL http://localhost:58715/ +# Do not add a / at the end. + +#ASSET_CDN_URL http://localhost:58715 diff --git a/dependencies.sh b/dependencies.sh index bb4090709ee1..10a3db7a4105 100755 --- a/dependencies.sh +++ b/dependencies.sh @@ -7,8 +7,8 @@ #Final authority on what's required to fully build the project # byond version -export BYOND_MAJOR=514 -export BYOND_MINOR=1588 +export BYOND_MAJOR=515 +export BYOND_MINOR=1636 #rust_g git tag export RUST_G_VERSION=3.0.0-experimental-graph-ops diff --git a/donator/djkouta/donator_cloak.dm b/fluff/donator/djkouta/donator_cloak.dm similarity index 82% rename from donator/djkouta/donator_cloak.dm rename to fluff/donator/djkouta/donator_cloak.dm index 768267498092..3a16b7620e24 100644 --- a/donator/djkouta/donator_cloak.dm +++ b/fluff/donator/djkouta/donator_cloak.dm @@ -5,5 +5,5 @@ ckeywhitelist = list("djkouta") /obj/item/clothing/accessory/kouta_cloak - icon = 'donator/djkouta/donator_cloak.dmi' + icon = 'fluff/donator/djkouta/donator_cloak.dmi' icon_state = "slimecloak" diff --git a/donator/djkouta/donator_cloak.dmi b/fluff/donator/djkouta/donator_cloak.dmi similarity index 100% rename from donator/djkouta/donator_cloak.dmi rename to fluff/donator/djkouta/donator_cloak.dmi diff --git a/donator/legacy.dm b/fluff/donator/legacy.dm similarity index 99% rename from donator/legacy.dm rename to fluff/donator/legacy.dm index 00caf02bcda5..d3e3bd967982 100644 --- a/donator/legacy.dm +++ b/fluff/donator/legacy.dm @@ -44,7 +44,7 @@ /datum/loadout_entry/donator/stripedcollar name = "Striped collar" - slot = /datum/inventory_slot_meta/abstract/attach_as_accessory + slot = /datum/inventory_slot/abstract/attach_as_accessory path = /obj/item/clothing/accessory/collar/donator/striped ckeywhitelist = list("jademanique") diff --git a/donator/timothytea/donator_bedsheet.dm b/fluff/donator/timothytea/donator_bedsheet.dm similarity index 79% rename from donator/timothytea/donator_bedsheet.dm rename to fluff/donator/timothytea/donator_bedsheet.dm index 44fae7fd3410..1faac7b9674a 100644 --- a/donator/timothytea/donator_bedsheet.dm +++ b/fluff/donator/timothytea/donator_bedsheet.dm @@ -1,5 +1,5 @@ /obj/item/bedsheet/donator_teak - icon = 'donator/timothytea/donator_bedsheet.dmi' + icon = 'fluff/donator/timothytea/donator_bedsheet.dmi' icon_state = "teaksheet" /datum/loadout_entry/donator/teak_bedsheet diff --git a/donator/timothytea/donator_bedsheet.dmi b/fluff/donator/timothytea/donator_bedsheet.dmi similarity index 100% rename from donator/timothytea/donator_bedsheet.dmi rename to fluff/donator/timothytea/donator_bedsheet.dmi diff --git a/donator/unclebourbon/pmc_mask.dm b/fluff/donator/unclebourbon/pmc_mask.dm similarity index 90% rename from donator/unclebourbon/pmc_mask.dm rename to fluff/donator/unclebourbon/pmc_mask.dm index 1cb54e2ce0e9..e006fd07b261 100644 --- a/donator/unclebourbon/pmc_mask.dm +++ b/fluff/donator/unclebourbon/pmc_mask.dm @@ -1,7 +1,7 @@ /obj/item/clothing/mask/gas/clear/donator_pmc name = "\improper PMC gas mask" desc = "A rugged black gas mask with red lenses." - icon = 'donator/unclebourbon/pmc_mask.dmi' + icon = 'fluff/donator/unclebourbon/pmc_mask.dmi' icon_state = "pmc" worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL | WORN_RENDER_INHAND_ALLOW_DEFAULT inhand_default_type = INHAND_DEFAULT_ICON_MASKS diff --git a/donator/unclebourbon/pmc_mask.dmi b/fluff/donator/unclebourbon/pmc_mask.dmi similarity index 100% rename from donator/unclebourbon/pmc_mask.dmi rename to fluff/donator/unclebourbon/pmc_mask.dmi diff --git a/fluff/plushies/plushies.dm b/fluff/plushies/plushies.dm new file mode 100644 index 000000000000..af4b01a86278 --- /dev/null +++ b/fluff/plushies/plushies.dm @@ -0,0 +1,74 @@ +/obj/item/toy/plushie/snowflake + icon = 'fluff/plushies/plushies.dmi' + /// Name of the player the plushie resembles + var/player_name + +/obj/item/toy/plushie/snowflake/catharsis + name = "red lizard plushie" + desc = "A red lizard plushie! Something seems strangely off about this lizard, though." + icon_state = "catharsis" + pokephrase = "Hiss!" + player_name = "Catharsis" + +/obj/item/toy/plushie/snowflake/evanne + name = "tajaran plushie" + desc = "A pirate tajaran plushie! This one has a lot of wires sticking out." + icon_state = "evanne" + pokephrase = "Mrowl!" + player_name = "Evanne" + +/obj/item/toy/plushie/snowflake/kadence + name = "human plushie" + desc = "A human plushie. This one resembles a scientist." + icon_state = "kadence" + pokephrase = "Human Noise!" + player_name = "Kadence" + +/obj/item/toy/plushie/snowflake/habiki + name = "green synth plushie" + desc = "A green synth plushie. It makes a happy beep when hugged." + icon_state = "habiki" + pokephrase = "Beep!" + player_name = "Habiki" + +/obj/item/toy/plushie/snowflake/eden + name = "wolf plushie" + desc = "A cute wolf plushie. It doesn't bite, right?" + icon_state = "eden" + pokephrase = "Awoo!" + player_name = "Eden" + +/obj/item/toy/plushie/snowflake/wisk + name = "saguar plushie" + desc = "A cute saguar plushie. It looks incredibly squishable." + icon_state = "wisk" + pokephrase = "Yippee!" + player_name = "Wisk" + +/obj/item/toy/plushie/snowflake/kari + name = "wolf plushie" + desc = "A wolf plushie. This one looks like it could beat you up." + icon_state = "kari" + pokephrase = "Gecker!" + player_name = "Kari" + +/obj/item/toy/plushie/snowflake/trubus + name = "blue dragon plushie" + desc = "A blue dragon plushie. It radiates an aura of justice." + icon_state = "trubus" + pokephrase = "Roar!" + player_name = "Trubus" + +/obj/item/toy/plushie/snowflake/charlotte + name = "pathfinder plushie" + desc = "A pathfinder plushie. This one has holographic wings on its back! Batteries not included." + icon_state = "charlotte" + pokephrase = "" // "what noise do humans make" puzzled me for 5 minutes then i gave up + player_name = "Charlotte" + +/obj/item/toy/plushie/snowflake/leas + name = "teshari plushie" + desc = "A teshari plushie. It doesn't look happy about being picked up." + icon_state = "tesh" + pokephrase = "Prbt!" + player_name = "Leas" diff --git a/fluff/plushies/plushies.dmi b/fluff/plushies/plushies.dmi new file mode 100644 index 000000000000..245252aaff20 Binary files /dev/null and b/fluff/plushies/plushies.dmi differ diff --git a/html/images/loading.gif b/html/images/loading.gif deleted file mode 100644 index 6ec34d41709c..000000000000 Binary files a/html/images/loading.gif and /dev/null differ diff --git a/html/images/ntlogo.png b/html/images/ntlogo.png deleted file mode 100644 index d5614a964eef..000000000000 Binary files a/html/images/ntlogo.png and /dev/null differ diff --git a/html/images/paper_bg.png b/html/images/paper_bg.png deleted file mode 100644 index b5e68f35abd9..000000000000 Binary files a/html/images/paper_bg.png and /dev/null differ diff --git a/html/images/sglogo.png b/html/images/sglogo.png deleted file mode 100644 index 930a0c4a5e0a..000000000000 Binary files a/html/images/sglogo.png and /dev/null differ diff --git a/html/images/talisman.png b/html/images/talisman.png deleted file mode 100644 index 0ece637314a0..000000000000 Binary files a/html/images/talisman.png and /dev/null differ diff --git a/icons/README.md b/icons/README.md index f03be528e5ba..29507811d3e8 100644 --- a/icons/README.md +++ b/icons/README.md @@ -28,6 +28,12 @@ Yes, this currently includes all turfs, mobs, objs, and misc things. Sorry. We'l - /helpers - mapping helpers like autopipe/autocable/baseturf replacers go here - /landmarks - landmark icons - /spawners - things like window spawners + - /mob - mob sprites + - /bodysets - limbs and their corrosponding sprite accessories & markings & miscellaneous. + used in the abstraction of limb sprite from limb definition. + - /sprite_accessories - unconverted sprite accessories + - /sprite_accessory - modern sprite accessory system + - /modules - used for specific departments / content packs / logical bundles - /{modulename} - the examples before are just that, examples. some modules will require different styles of icon organization. - /items - items @@ -37,7 +43,8 @@ Yes, this currently includes all turfs, mobs, objs, and misc things. Sorry. We'l - /objects - miscellaneous objects that are not items, machinery, or structures - /overmaps - **All** overmap sprites, whether or not it's screen rendering, goes in here - /runtime - follow similar structure inside this, treat it as a sub-copy. icons in this are copied over for use during runtime - - **Warning!** - everything not in this folder cannot be accessed by "filename" and must be compiled in with 'filename'. + - currently being deprecated; we have chosen to instead copy over all icons/sounds, so the runtime + server can access them. - /screen - all screen objects, like hud icons, buttons, inventory interface, parallax, etc - /actions - all action button sprites go in here - /atom_hud - the /image huds that atoms can have has their icons in here diff --git a/icons/effects/ULIcons.dmi b/icons/effects/ULIcons.dmi deleted file mode 100644 index 3104e6ea6688..000000000000 Binary files a/icons/effects/ULIcons.dmi and /dev/null differ diff --git a/icons/effects/species.dmi b/icons/effects/species.dmi deleted file mode 100644 index a5c5a7d17958..000000000000 Binary files a/icons/effects/species.dmi and /dev/null differ diff --git a/icons/effects/species_tails.dmi b/icons/effects/species_tails.dmi deleted file mode 100644 index 5fea0671c652..000000000000 Binary files a/icons/effects/species_tails.dmi and /dev/null differ diff --git a/icons/effects/species_tails_vr.dmi b/icons/effects/species_tails_vr.dmi index dc52df4660c7..d5ab4d682692 100644 Binary files a/icons/effects/species_tails_vr.dmi and b/icons/effects/species_tails_vr.dmi differ diff --git a/icons/effects/ss13_dark_alpha6.dmi b/icons/effects/ss13_dark_alpha6.dmi deleted file mode 100644 index 742337358daa..000000000000 Binary files a/icons/effects/ss13_dark_alpha6.dmi and /dev/null differ diff --git a/icons/effects/ss13_dark_alpha7.dmi b/icons/effects/ss13_dark_alpha7.dmi deleted file mode 100644 index b270621719ac..000000000000 Binary files a/icons/effects/ss13_dark_alpha7.dmi and /dev/null differ diff --git a/icons/effects/ss13_dark_alpha7_DEBUG.dmi b/icons/effects/ss13_dark_alpha7_DEBUG.dmi deleted file mode 100644 index 91beaddd0894..000000000000 Binary files a/icons/effects/ss13_dark_alpha7_DEBUG.dmi and /dev/null differ diff --git a/icons/effects/ss13_dark_alpha7_old.dmi b/icons/effects/ss13_dark_alpha7_old.dmi deleted file mode 100644 index 85178c4e46f5..000000000000 Binary files a/icons/effects/ss13_dark_alpha7_old.dmi and /dev/null differ diff --git a/icons/machinery/fire_alarm.dmi b/icons/machinery/fire_alarm.dmi new file mode 100644 index 000000000000..258e923c0e9d Binary files /dev/null and b/icons/machinery/fire_alarm.dmi differ diff --git a/icons/machinery/lathe/microlathe.dmi b/icons/machinery/lathe/microlathe.dmi new file mode 100644 index 000000000000..bdfe6e6a15e4 Binary files /dev/null and b/icons/machinery/lathe/microlathe.dmi differ diff --git a/icons/machinery/power/apc.dmi b/icons/machinery/power/apc.dmi new file mode 100644 index 000000000000..ffef6e4e2fee Binary files /dev/null and b/icons/machinery/power/apc.dmi differ diff --git a/icons/machinery/power/solar/panel.dmi b/icons/machinery/power/solar/panel.dmi new file mode 100644 index 000000000000..8eae3405ba13 Binary files /dev/null and b/icons/machinery/power/solar/panel.dmi differ diff --git a/icons/mapping/helpers/access_helpers.dmi b/icons/mapping/helpers/access_helpers.dmi new file mode 100644 index 000000000000..bcec34a58c45 Binary files /dev/null and b/icons/mapping/helpers/access_helpers.dmi differ diff --git a/icons/mob/bodysets/organic/akula/sprite_accessories.dmi b/icons/mob/bodysets/organic/akula/sprite_accessories.dmi new file mode 100644 index 000000000000..c94637d75cf9 Binary files /dev/null and b/icons/mob/bodysets/organic/akula/sprite_accessories.dmi differ diff --git a/icons/mob/bodysets/organic/apidean/sprite_accessories.dmi b/icons/mob/bodysets/organic/apidean/sprite_accessories.dmi new file mode 100644 index 000000000000..3cb8ca531045 Binary files /dev/null and b/icons/mob/bodysets/organic/apidean/sprite_accessories.dmi differ diff --git a/icons/mob/bodysets/organic/krisitik/sprite_accessories.dmi b/icons/mob/bodysets/organic/krisitik/sprite_accessories.dmi new file mode 100644 index 000000000000..407710e27496 Binary files /dev/null and b/icons/mob/bodysets/organic/krisitik/sprite_accessories.dmi differ diff --git a/icons/mob/bodysets/organic/monkey/sprite_accessories.dmi b/icons/mob/bodysets/organic/monkey/sprite_accessories.dmi new file mode 100644 index 000000000000..fa3443897f4d Binary files /dev/null and b/icons/mob/bodysets/organic/monkey/sprite_accessories.dmi differ diff --git a/icons/mob/bodysets/organic/moth/sprite_accessories.dmi b/icons/mob/bodysets/organic/moth/sprite_accessories.dmi new file mode 100644 index 000000000000..729c8b03da0d Binary files /dev/null and b/icons/mob/bodysets/organic/moth/sprite_accessories.dmi differ diff --git a/icons/mob/bodysets/organic/moth/sprite_accessories_64x32.dmi b/icons/mob/bodysets/organic/moth/sprite_accessories_64x32.dmi new file mode 100644 index 000000000000..1f39ee4f09b3 Binary files /dev/null and b/icons/mob/bodysets/organic/moth/sprite_accessories_64x32.dmi differ diff --git a/icons/mob/bodysets/organic/naramadi/sprite_accessories.dmi b/icons/mob/bodysets/organic/naramadi/sprite_accessories.dmi new file mode 100644 index 000000000000..7691df9e0d9e Binary files /dev/null and b/icons/mob/bodysets/organic/naramadi/sprite_accessories.dmi differ diff --git a/icons/mob/bodysets/organic/nevrean/sprite_accessories.dmi b/icons/mob/bodysets/organic/nevrean/sprite_accessories.dmi new file mode 100644 index 000000000000..1e9fecc37e3e Binary files /dev/null and b/icons/mob/bodysets/organic/nevrean/sprite_accessories.dmi differ diff --git a/icons/mob/bodysets/organic/rapala/sprite_accessories.dmi b/icons/mob/bodysets/organic/rapala/sprite_accessories.dmi new file mode 100644 index 000000000000..fbf75c0b23bd Binary files /dev/null and b/icons/mob/bodysets/organic/rapala/sprite_accessories.dmi differ diff --git a/icons/mob/bodysets/organic/shadekin/sprite_accessories.dmi b/icons/mob/bodysets/organic/shadekin/sprite_accessories.dmi new file mode 100644 index 000000000000..989d37c34d99 Binary files /dev/null and b/icons/mob/bodysets/organic/shadekin/sprite_accessories.dmi differ diff --git a/icons/mob/bodysets/organic/tajaran/sprite_accessories.dmi b/icons/mob/bodysets/organic/tajaran/sprite_accessories.dmi new file mode 100644 index 000000000000..fbd0154aecd1 Binary files /dev/null and b/icons/mob/bodysets/organic/tajaran/sprite_accessories.dmi differ diff --git a/icons/mob/bodysets/organic/teshari/sprite_accessories.dmi b/icons/mob/bodysets/organic/teshari/sprite_accessories.dmi new file mode 100644 index 000000000000..685830933ed2 Binary files /dev/null and b/icons/mob/bodysets/organic/teshari/sprite_accessories.dmi differ diff --git a/icons/mob/bodysets/organic/unathi/sprite_accessories.dmi b/icons/mob/bodysets/organic/unathi/sprite_accessories.dmi new file mode 100644 index 000000000000..0fd5cf090742 Binary files /dev/null and b/icons/mob/bodysets/organic/unathi/sprite_accessories.dmi differ diff --git a/icons/mob/bodysets/organic/vasilissan/sprite_accessories.dmi b/icons/mob/bodysets/organic/vasilissan/sprite_accessories.dmi new file mode 100644 index 000000000000..8159922e0183 Binary files /dev/null and b/icons/mob/bodysets/organic/vasilissan/sprite_accessories.dmi differ diff --git a/icons/mob/bodysets/organic/vulpkanin/sprite_accessories.dmi b/icons/mob/bodysets/organic/vulpkanin/sprite_accessories.dmi new file mode 100644 index 000000000000..8cd0fa8ed56c Binary files /dev/null and b/icons/mob/bodysets/organic/vulpkanin/sprite_accessories.dmi differ diff --git a/icons/mob/bodysets/organic/xenohybrid/sprite_accessories.dmi b/icons/mob/bodysets/organic/xenohybrid/sprite_accessories.dmi new file mode 100644 index 000000000000..ef357715c527 Binary files /dev/null and b/icons/mob/bodysets/organic/xenohybrid/sprite_accessories.dmi differ diff --git a/icons/mob/bodysets/organic/xenomorph/sprite_accessories.dmi b/icons/mob/bodysets/organic/xenomorph/sprite_accessories.dmi new file mode 100644 index 000000000000..594966115018 Binary files /dev/null and b/icons/mob/bodysets/organic/xenomorph/sprite_accessories.dmi differ diff --git a/icons/mob/bodysets/organic/zorren_flatlander/sprite_accessories.dmi b/icons/mob/bodysets/organic/zorren_flatlander/sprite_accessories.dmi new file mode 100644 index 000000000000..de8fdb37e79e Binary files /dev/null and b/icons/mob/bodysets/organic/zorren_flatlander/sprite_accessories.dmi differ diff --git a/icons/mob/bodysets/organic/zorren_highlander/sprite_accessories.dmi b/icons/mob/bodysets/organic/zorren_highlander/sprite_accessories.dmi new file mode 100644 index 000000000000..4fd576508e5c Binary files /dev/null and b/icons/mob/bodysets/organic/zorren_highlander/sprite_accessories.dmi differ diff --git a/icons/mob/bodysets/synthetic/eggnerd/sprite_accessories.dmi b/icons/mob/bodysets/synthetic/eggnerd/sprite_accessories.dmi new file mode 100644 index 000000000000..19e8e025231f Binary files /dev/null and b/icons/mob/bodysets/synthetic/eggnerd/sprite_accessories.dmi differ diff --git a/icons/mob/bodysets/synthetic/eggnerd_red/sprite_accessories.dmi b/icons/mob/bodysets/synthetic/eggnerd_red/sprite_accessories.dmi new file mode 100644 index 000000000000..ad3634a384de Binary files /dev/null and b/icons/mob/bodysets/synthetic/eggnerd_red/sprite_accessories.dmi differ diff --git a/icons/mob/bodysets/synthetic/oss_akula/sprite_accessories.dmi b/icons/mob/bodysets/synthetic/oss_akula/sprite_accessories.dmi new file mode 100644 index 000000000000..d049d8bdd02b Binary files /dev/null and b/icons/mob/bodysets/synthetic/oss_akula/sprite_accessories.dmi differ diff --git a/icons/mob/bodysets/synthetic/oss_lizard/sprite_accessories.dmi b/icons/mob/bodysets/synthetic/oss_lizard/sprite_accessories.dmi new file mode 100644 index 000000000000..45793e65f9bf Binary files /dev/null and b/icons/mob/bodysets/synthetic/oss_lizard/sprite_accessories.dmi differ diff --git a/icons/mob/bodysets/synthetic/oss_naramadi/sprite_accessories.dmi b/icons/mob/bodysets/synthetic/oss_naramadi/sprite_accessories.dmi new file mode 100644 index 000000000000..d8abaef50b0f Binary files /dev/null and b/icons/mob/bodysets/synthetic/oss_naramadi/sprite_accessories.dmi differ diff --git a/icons/mob/bodysets/synthetic/oss_nevrean/sprite_accessories.dmi b/icons/mob/bodysets/synthetic/oss_nevrean/sprite_accessories.dmi new file mode 100644 index 000000000000..130c03bc23bc Binary files /dev/null and b/icons/mob/bodysets/synthetic/oss_nevrean/sprite_accessories.dmi differ diff --git a/icons/mob/bodysets/synthetic/oss_spider/sprite_accessories.dmi b/icons/mob/bodysets/synthetic/oss_spider/sprite_accessories.dmi new file mode 100644 index 000000000000..d06647254248 Binary files /dev/null and b/icons/mob/bodysets/synthetic/oss_spider/sprite_accessories.dmi differ diff --git a/icons/mob/bodysets/synthetic/oss_tajaran/sprite_accessories.dmi b/icons/mob/bodysets/synthetic/oss_tajaran/sprite_accessories.dmi new file mode 100644 index 000000000000..a47802667847 Binary files /dev/null and b/icons/mob/bodysets/synthetic/oss_tajaran/sprite_accessories.dmi differ diff --git a/icons/mob/bodysets/synthetic/oss_vulpkanin/sprite_accessories.dmi b/icons/mob/bodysets/synthetic/oss_vulpkanin/sprite_accessories.dmi new file mode 100644 index 000000000000..d5d17403084e Binary files /dev/null and b/icons/mob/bodysets/synthetic/oss_vulpkanin/sprite_accessories.dmi differ diff --git a/icons/mob/clothing/mask.dmi b/icons/mob/clothing/mask.dmi index b683678146e2..f9326f09d6d5 100644 Binary files a/icons/mob/clothing/mask.dmi and b/icons/mob/clothing/mask.dmi differ diff --git a/icons/mob/clothing/ties.dmi b/icons/mob/clothing/ties.dmi index 3d41974b5bc6..6d452683f985 100644 Binary files a/icons/mob/clothing/ties.dmi and b/icons/mob/clothing/ties.dmi differ diff --git a/icons/mob/cyberlimbs/DSIAkula/dsi_akula.dmi b/icons/mob/cyberlimbs/DSIAkula/dsi_akula.dmi index e19538082991..9a362a9eac50 100644 Binary files a/icons/mob/cyberlimbs/DSIAkula/dsi_akula.dmi and b/icons/mob/cyberlimbs/DSIAkula/dsi_akula.dmi differ diff --git a/icons/mob/cyberlimbs/DSILizard/dsi_lizard.dmi b/icons/mob/cyberlimbs/DSILizard/dsi_lizard.dmi index ce86dcadfdc9..ff1df7975e5c 100644 Binary files a/icons/mob/cyberlimbs/DSILizard/dsi_lizard.dmi and b/icons/mob/cyberlimbs/DSILizard/dsi_lizard.dmi differ diff --git a/icons/mob/cyberlimbs/DSINevrean/dsi_nevrean.dmi b/icons/mob/cyberlimbs/DSINevrean/dsi_nevrean.dmi index 5424d46b780d..5fb58421cdf5 100644 Binary files a/icons/mob/cyberlimbs/DSINevrean/dsi_nevrean.dmi and b/icons/mob/cyberlimbs/DSINevrean/dsi_nevrean.dmi differ diff --git a/icons/mob/cyberlimbs/DSISergal/dsi_sergal.dmi b/icons/mob/cyberlimbs/DSISergal/dsi_sergal.dmi index 4ba00625e114..e0f8f34c8da3 100644 Binary files a/icons/mob/cyberlimbs/DSISergal/dsi_sergal.dmi and b/icons/mob/cyberlimbs/DSISergal/dsi_sergal.dmi differ diff --git a/icons/mob/cyberlimbs/DSISpider/dsi_spider.dmi b/icons/mob/cyberlimbs/DSISpider/dsi_spider.dmi index a9ffd20a6dd1..309a2e3e593d 100644 Binary files a/icons/mob/cyberlimbs/DSISpider/dsi_spider.dmi and b/icons/mob/cyberlimbs/DSISpider/dsi_spider.dmi differ diff --git a/icons/mob/cyberlimbs/DSITajaran/dsi_tajaran.dmi b/icons/mob/cyberlimbs/DSITajaran/dsi_tajaran.dmi index 6fbb54ece4e4..deb703f2716f 100644 Binary files a/icons/mob/cyberlimbs/DSITajaran/dsi_tajaran.dmi and b/icons/mob/cyberlimbs/DSITajaran/dsi_tajaran.dmi differ diff --git a/icons/mob/cyberlimbs/DSIVulpkanin/dsi_vulpkanin.dmi b/icons/mob/cyberlimbs/DSIVulpkanin/dsi_vulpkanin.dmi index 79943fa9e917..f753507eadba 100644 Binary files a/icons/mob/cyberlimbs/DSIVulpkanin/dsi_vulpkanin.dmi and b/icons/mob/cyberlimbs/DSIVulpkanin/dsi_vulpkanin.dmi differ diff --git a/icons/mob/cyberlimbs/_fluff_vr/Frosty.dmi b/icons/mob/cyberlimbs/_fluff_vr/Frosty.dmi deleted file mode 100644 index 6ff7e9051779..000000000000 Binary files a/icons/mob/cyberlimbs/_fluff_vr/Frosty.dmi and /dev/null differ diff --git a/icons/mob/cyberlimbs/_fluff_vr/aronai.dmi b/icons/mob/cyberlimbs/_fluff_vr/aronai.dmi deleted file mode 100644 index 4d533fc8d31d..000000000000 Binary files a/icons/mob/cyberlimbs/_fluff_vr/aronai.dmi and /dev/null differ diff --git a/icons/mob/cyberlimbs/_fluff_vr/rahboop.dmi b/icons/mob/cyberlimbs/_fluff_vr/rahboop.dmi index ea30fe3b1a57..8cdac844f923 100644 Binary files a/icons/mob/cyberlimbs/_fluff_vr/rahboop.dmi and b/icons/mob/cyberlimbs/_fluff_vr/rahboop.dmi differ diff --git a/icons/mob/cyberlimbs/_fluff_vr/serdykov.dmi b/icons/mob/cyberlimbs/_fluff_vr/serdykov.dmi deleted file mode 100644 index 10c26a170506..000000000000 Binary files a/icons/mob/cyberlimbs/_fluff_vr/serdykov.dmi and /dev/null differ diff --git a/icons/mob/cyberlimbs/rahboopred/rahboopred.dmi b/icons/mob/cyberlimbs/rahboopred/rahboopred.dmi index f0d9dc8cab59..c5f66c00ab0f 100644 Binary files a/icons/mob/cyberlimbs/rahboopred/rahboopred.dmi and b/icons/mob/cyberlimbs/rahboopred/rahboopred.dmi differ diff --git a/icons/mob/hair_gradients.dmi b/icons/mob/hair_gradients.dmi index 4996755db159..0c6cae388c7a 100644 Binary files a/icons/mob/hair_gradients.dmi and b/icons/mob/hair_gradients.dmi differ diff --git a/icons/mob/human.dmi b/icons/mob/human.dmi index 985a5b96dafa..bdfe87fb6509 100644 Binary files a/icons/mob/human.dmi and b/icons/mob/human.dmi differ diff --git a/icons/mob/items/lefthand_guns.dmi b/icons/mob/items/lefthand_guns.dmi index aeb7c090d58c..1bd3902dd412 100644 Binary files a/icons/mob/items/lefthand_guns.dmi and b/icons/mob/items/lefthand_guns.dmi differ diff --git a/icons/mob/items/righthand_guns.dmi b/icons/mob/items/righthand_guns.dmi index 85ad50c790a7..603ec2ecedd9 100644 Binary files a/icons/mob/items/righthand_guns.dmi and b/icons/mob/items/righthand_guns.dmi differ diff --git a/icons/mob/species/akula/body.dmi b/icons/mob/species/akula/body.dmi index ebbcf4087d04..cff1bb552808 100644 Binary files a/icons/mob/species/akula/body.dmi and b/icons/mob/species/akula/body.dmi differ diff --git a/icons/mob/species/apidaen/body.dmi b/icons/mob/species/apidaen/body.dmi index d243ab745f22..ca3427ab667b 100644 Binary files a/icons/mob/species/apidaen/body.dmi and b/icons/mob/species/apidaen/body.dmi differ diff --git a/icons/mob/species/krisitik/body.dmi b/icons/mob/species/krisitik/body.dmi index 3e64b0e768d4..28b62d7c84f1 100644 Binary files a/icons/mob/species/krisitik/body.dmi and b/icons/mob/species/krisitik/body.dmi differ diff --git a/icons/mob/species/naramadi/body.dmi b/icons/mob/species/naramadi/body.dmi index 130c54a43065..83f1e468249e 100644 Binary files a/icons/mob/species/naramadi/body.dmi and b/icons/mob/species/naramadi/body.dmi differ diff --git a/icons/mob/species/nevrean/body.dmi b/icons/mob/species/nevrean/body.dmi index 431f1ee8d0aa..95518cb75e01 100644 Binary files a/icons/mob/species/nevrean/body.dmi and b/icons/mob/species/nevrean/body.dmi differ diff --git a/icons/mob/species/rapala/body.dmi b/icons/mob/species/rapala/body.dmi index bec334b97c55..287d9f8b0f8a 100644 Binary files a/icons/mob/species/rapala/body.dmi and b/icons/mob/species/rapala/body.dmi differ diff --git a/icons/mob/species/teshari/body.dmi b/icons/mob/species/teshari/body.dmi index 3f8845a64c92..c5fc8b916410 100644 Binary files a/icons/mob/species/teshari/body.dmi and b/icons/mob/species/teshari/body.dmi differ diff --git a/icons/mob/species/vasilissan/body.dmi b/icons/mob/species/vasilissan/body.dmi index 6b77bf293895..79d1caefbb9a 100644 Binary files a/icons/mob/species/vasilissan/body.dmi and b/icons/mob/species/vasilissan/body.dmi differ diff --git a/icons/mob/species/vulpkanin/body.dmi b/icons/mob/species/vulpkanin/body.dmi index 58d39f7f1912..3edc390cd8bb 100644 Binary files a/icons/mob/species/vulpkanin/body.dmi and b/icons/mob/species/vulpkanin/body.dmi differ diff --git a/icons/mob/species/zorren_fl/body_greyscale.dmi b/icons/mob/species/zorren_fl/body_greyscale.dmi index e7d644ca7ab2..914dfcc34c1b 100644 Binary files a/icons/mob/species/zorren_fl/body_greyscale.dmi and b/icons/mob/species/zorren_fl/body_greyscale.dmi differ diff --git a/icons/mob/species/zorren_hi/body_greyscale.dmi b/icons/mob/species/zorren_hi/body_greyscale.dmi index 0784df6f297d..495b7da19b1a 100644 Binary files a/icons/mob/species/zorren_hi/body_greyscale.dmi and b/icons/mob/species/zorren_hi/body_greyscale.dmi differ diff --git a/icons/mob/sprite_accessories/tails.dmi b/icons/mob/sprite_accessories/tails.dmi index 608ffc4f998c..d9d068f17342 100644 Binary files a/icons/mob/sprite_accessories/tails.dmi and b/icons/mob/sprite_accessories/tails.dmi differ diff --git a/icons/mob/sprite_accessories/wings.dmi b/icons/mob/sprite_accessories/wings.dmi index 23bfdf453c8b..a88d95df1b92 100644 Binary files a/icons/mob/sprite_accessories/wings.dmi and b/icons/mob/sprite_accessories/wings.dmi differ diff --git a/icons/mob/sprite_accessory/hair/hair.dmi b/icons/mob/sprite_accessory/hair/hair.dmi new file mode 100644 index 000000000000..4d20734ce2df Binary files /dev/null and b/icons/mob/sprite_accessory/hair/hair.dmi differ diff --git a/icons/mob/sprite_accessory/hair/simple.dmi b/icons/mob/sprite_accessory/hair/simple.dmi new file mode 100644 index 000000000000..b4ddf84de8a2 Binary files /dev/null and b/icons/mob/sprite_accessory/hair/simple.dmi differ diff --git a/icons/mob/sprite_accessory/horns/horns.dmi b/icons/mob/sprite_accessory/horns/horns.dmi new file mode 100644 index 000000000000..ac2d3950c4cb Binary files /dev/null and b/icons/mob/sprite_accessory/horns/horns.dmi differ diff --git a/icons/mob/sprite_accessory/horns/horns_32x48_bottom_aligned.dmi b/icons/mob/sprite_accessory/horns/horns_32x48_bottom_aligned.dmi new file mode 100644 index 000000000000..ea48698152e8 Binary files /dev/null and b/icons/mob/sprite_accessory/horns/horns_32x48_bottom_aligned.dmi differ diff --git a/icons/mob/sprite_accessory/tails/feline.dmi b/icons/mob/sprite_accessory/tails/feline.dmi new file mode 100644 index 000000000000..8bc58d9f9876 Binary files /dev/null and b/icons/mob/sprite_accessory/tails/feline.dmi differ diff --git a/icons/mob/sprite_accessory/tails/teshari.dmi b/icons/mob/sprite_accessory/tails/teshari.dmi new file mode 100644 index 000000000000..eb9966f8a093 Binary files /dev/null and b/icons/mob/sprite_accessory/tails/teshari.dmi differ diff --git a/icons/mob/sprite_accessories/wings_64x48.dmi b/icons/mob/sprite_accessory/wings/feathered-angel-64x48.dmi similarity index 84% rename from icons/mob/sprite_accessories/wings_64x48.dmi rename to icons/mob/sprite_accessory/wings/feathered-angel-64x48.dmi index c16b52d34105..e807c7934b2c 100644 Binary files a/icons/mob/sprite_accessories/wings_64x48.dmi and b/icons/mob/sprite_accessory/wings/feathered-angel-64x48.dmi differ diff --git a/icons/mob/sprite_accessory/wings/feathered-angel.dmi b/icons/mob/sprite_accessory/wings/feathered-angel.dmi new file mode 100644 index 000000000000..55b53b87263f Binary files /dev/null and b/icons/mob/sprite_accessory/wings/feathered-angel.dmi differ diff --git a/icons/mob/sprite_accessory/wings/feathered-generic.dmi b/icons/mob/sprite_accessory/wings/feathered-generic.dmi new file mode 100644 index 000000000000..26d94f73c333 Binary files /dev/null and b/icons/mob/sprite_accessory/wings/feathered-generic.dmi differ diff --git a/icons/mob/sprite_accessory/wings/moth.dmi b/icons/mob/sprite_accessory/wings/moth.dmi new file mode 100644 index 000000000000..8b6d2338393d Binary files /dev/null and b/icons/mob/sprite_accessory/wings/moth.dmi differ diff --git a/icons/modules/frames/base.dmi b/icons/modules/frames/base.dmi new file mode 100644 index 000000000000..e74dd2c57912 Binary files /dev/null and b/icons/modules/frames/base.dmi differ diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi index 500665b42cb8..97caca3b4b97 100644 Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ diff --git a/icons/obj/atmos.dmi b/icons/obj/atmos.dmi index a0b7de563be0..564b6b3262ac 100644 Binary files a/icons/obj/atmos.dmi and b/icons/obj/atmos.dmi differ diff --git a/icons/obj/card_fluff.dmi b/icons/obj/card_fluff.dmi new file mode 100644 index 000000000000..93c2282db6b2 Binary files /dev/null and b/icons/obj/card_fluff.dmi differ diff --git a/icons/obj/clothing/ties.dmi b/icons/obj/clothing/ties.dmi index 9a0319869284..24948c5b7455 100644 Binary files a/icons/obj/clothing/ties.dmi and b/icons/obj/clothing/ties.dmi differ diff --git a/icons/obj/contraband.dmi b/icons/obj/contraband.dmi index a8f92bfd1781..0f17b153573d 100644 Binary files a/icons/obj/contraband.dmi and b/icons/obj/contraband.dmi differ diff --git a/icons/obj/doors/Dooralien.dmi b/icons/obj/doors/alien/LEGACY_Dooralien.dmi similarity index 100% rename from icons/obj/doors/Dooralien.dmi rename to icons/obj/doors/alien/LEGACY_Dooralien.dmi diff --git a/icons/obj/doors/Dooralien_blue.dmi b/icons/obj/doors/alien/LEGACY_Dooralien_blue.dmi similarity index 100% rename from icons/obj/doors/Dooralien_blue.dmi rename to icons/obj/doors/alien/LEGACY_Dooralien_blue.dmi diff --git a/icons/obj/doors/alien/door.dmi b/icons/obj/doors/alien/door.dmi new file mode 100644 index 000000000000..9b3d026d3b8a Binary files /dev/null and b/icons/obj/doors/alien/door.dmi differ diff --git a/icons/obj/doors/alien/door_blue.dmi b/icons/obj/doors/alien/door_blue.dmi new file mode 100644 index 000000000000..34b72e0d58d5 Binary files /dev/null and b/icons/obj/doors/alien/door_blue.dmi differ diff --git a/icons/obj/doors/alien/lights_bolts.dmi b/icons/obj/doors/alien/lights_bolts.dmi new file mode 100644 index 000000000000..970564790d98 Binary files /dev/null and b/icons/obj/doors/alien/lights_bolts.dmi differ diff --git a/icons/obj/doors/alien/lights_bolts_blue.dmi b/icons/obj/doors/alien/lights_bolts_blue.dmi new file mode 100644 index 000000000000..ffbc7726f899 Binary files /dev/null and b/icons/obj/doors/alien/lights_bolts_blue.dmi differ diff --git a/icons/obj/doors/alien/lights_green.dmi b/icons/obj/doors/alien/lights_green.dmi new file mode 100644 index 000000000000..a90504a22072 Binary files /dev/null and b/icons/obj/doors/alien/lights_green.dmi differ diff --git a/icons/obj/doors/alien/lights_green_blue.dmi b/icons/obj/doors/alien/lights_green_blue.dmi new file mode 100644 index 000000000000..8d3edd1f8019 Binary files /dev/null and b/icons/obj/doors/alien/lights_green_blue.dmi differ diff --git a/icons/obj/doors/alien/panel.dmi b/icons/obj/doors/alien/panel.dmi new file mode 100644 index 000000000000..5bc49cb72765 Binary files /dev/null and b/icons/obj/doors/alien/panel.dmi differ diff --git a/icons/obj/doors/alien/sparks_broken.dmi b/icons/obj/doors/alien/sparks_broken.dmi new file mode 100644 index 000000000000..59f7acff5694 Binary files /dev/null and b/icons/obj/doors/alien/sparks_broken.dmi differ diff --git a/icons/obj/doors/alien/sparks_damaged.dmi b/icons/obj/doors/alien/sparks_damaged.dmi new file mode 100644 index 000000000000..a31014faf92f Binary files /dev/null and b/icons/obj/doors/alien/sparks_damaged.dmi differ diff --git a/icons/obj/doors/alien/welded.dmi b/icons/obj/doors/alien/welded.dmi new file mode 100644 index 000000000000..908f6438a342 Binary files /dev/null and b/icons/obj/doors/alien/welded.dmi differ diff --git a/icons/obj/gun/ballistic.dmi b/icons/obj/gun/ballistic.dmi index e7fa9abdc797..30257b6709b0 100644 Binary files a/icons/obj/gun/ballistic.dmi and b/icons/obj/gun/ballistic.dmi differ diff --git a/icons/obj/sponge.dmi b/icons/obj/sponge.dmi new file mode 100644 index 000000000000..d4f3997786e0 Binary files /dev/null and b/icons/obj/sponge.dmi differ diff --git a/icons/obj/wheelchair.dmi b/icons/obj/wheelchair.dmi index e58bf4e09b6e..f3a84b08820c 100644 Binary files a/icons/obj/wheelchair.dmi and b/icons/obj/wheelchair.dmi differ diff --git a/icons/screen/atom_hud/job.dmi b/icons/screen/atom_hud/job.dmi index 1910d170f0aa..3bddacae14be 100644 Binary files a/icons/screen/atom_hud/job.dmi and b/icons/screen/atom_hud/job.dmi differ diff --git a/icons/spideros_icons/sos_1.png b/icons/spideros_icons/sos_1.png deleted file mode 100644 index 079f548fde12..000000000000 Binary files a/icons/spideros_icons/sos_1.png and /dev/null differ diff --git a/icons/spideros_icons/sos_10.png b/icons/spideros_icons/sos_10.png deleted file mode 100644 index 5f962d60f457..000000000000 Binary files a/icons/spideros_icons/sos_10.png and /dev/null differ diff --git a/icons/spideros_icons/sos_11.png b/icons/spideros_icons/sos_11.png deleted file mode 100644 index fd68c8a4ac22..000000000000 Binary files a/icons/spideros_icons/sos_11.png and /dev/null differ diff --git a/icons/spideros_icons/sos_12.png b/icons/spideros_icons/sos_12.png deleted file mode 100644 index ff3a064c0360..000000000000 Binary files a/icons/spideros_icons/sos_12.png and /dev/null differ diff --git a/icons/spideros_icons/sos_13.png b/icons/spideros_icons/sos_13.png deleted file mode 100644 index c396182cfedd..000000000000 Binary files a/icons/spideros_icons/sos_13.png and /dev/null differ diff --git a/icons/spideros_icons/sos_14.png b/icons/spideros_icons/sos_14.png deleted file mode 100644 index 9d90684d8c61..000000000000 Binary files a/icons/spideros_icons/sos_14.png and /dev/null differ diff --git a/icons/spideros_icons/sos_2.png b/icons/spideros_icons/sos_2.png deleted file mode 100644 index 40009fe5622f..000000000000 Binary files a/icons/spideros_icons/sos_2.png and /dev/null differ diff --git a/icons/spideros_icons/sos_3.png b/icons/spideros_icons/sos_3.png deleted file mode 100644 index 138b110b0255..000000000000 Binary files a/icons/spideros_icons/sos_3.png and /dev/null differ diff --git a/icons/spideros_icons/sos_4.png b/icons/spideros_icons/sos_4.png deleted file mode 100644 index 4d5d23149c06..000000000000 Binary files a/icons/spideros_icons/sos_4.png and /dev/null differ diff --git a/icons/spideros_icons/sos_5.png b/icons/spideros_icons/sos_5.png deleted file mode 100644 index 7e43c9d8a460..000000000000 Binary files a/icons/spideros_icons/sos_5.png and /dev/null differ diff --git a/icons/spideros_icons/sos_6.png b/icons/spideros_icons/sos_6.png deleted file mode 100644 index ea6494a91285..000000000000 Binary files a/icons/spideros_icons/sos_6.png and /dev/null differ diff --git a/icons/spideros_icons/sos_7.png b/icons/spideros_icons/sos_7.png deleted file mode 100644 index d93d2b13fec4..000000000000 Binary files a/icons/spideros_icons/sos_7.png and /dev/null differ diff --git a/icons/spideros_icons/sos_8.png b/icons/spideros_icons/sos_8.png deleted file mode 100644 index fd540cb3a82b..000000000000 Binary files a/icons/spideros_icons/sos_8.png and /dev/null differ diff --git a/icons/spideros_icons/sos_9.png b/icons/spideros_icons/sos_9.png deleted file mode 100644 index 05d36c3e6fc0..000000000000 Binary files a/icons/spideros_icons/sos_9.png and /dev/null differ diff --git a/icons/system/blank_32x32.dmi b/icons/system/blank_32x32.dmi index 4f5867e07e72..7a017674044f 100644 Binary files a/icons/system/blank_32x32.dmi and b/icons/system/blank_32x32.dmi differ diff --git a/icons/vending_icons/vendingslot_bg.png b/icons/vending_icons/vendingslot_bg.png deleted file mode 100644 index 6fb6fdcf8b9b..000000000000 Binary files a/icons/vending_icons/vendingslot_bg.png and /dev/null differ diff --git a/maps/away_missions/140x140/snow_outpost.dmm b/maps/away_missions/140x140/snow_outpost.dmm index 9eb53929a4d0..8c7ae8e8ffde 100644 --- a/maps/away_missions/140x140/snow_outpost.dmm +++ b/maps/away_missions/140x140/snow_outpost.dmm @@ -662,7 +662,7 @@ /turf/simulated/wall, /area/awaymission/snow_outpost/dark) "cw" = ( -/obj/item/frame/apc, +/obj/item/frame2/apc, /obj/item/module/power_control, /turf/simulated/floor/plating/external, /area/awaymission/snow_outpost/dark) diff --git a/maps/away_missions/140x140/zoo.dmm b/maps/away_missions/140x140/zoo.dmm index c18ec430314f..21cd0d63ed61 100644 --- a/maps/away_missions/140x140/zoo.dmm +++ b/maps/away_missions/140x140/zoo.dmm @@ -8545,7 +8545,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/solar/fake, +/obj/machinery/power/solar, /turf/simulated/floor/airless{ icon_state = "solarpanel" }, @@ -8630,7 +8630,7 @@ /area/awaymission/zoo/solars) "xt" = ( /obj/structure/cable, -/obj/machinery/power/solar/fake, +/obj/machinery/power/solar, /turf/simulated/floor/airless{ icon_state = "solarpanel" }, diff --git a/maps/away_missions/archive/blackmarketpackers.dmm b/maps/away_missions/archive/blackmarketpackers.dmm index dcd9d3d2f1d1..d3d8cb18dd8f 100644 --- a/maps/away_missions/archive/blackmarketpackers.dmm +++ b/maps/away_missions/archive/blackmarketpackers.dmm @@ -1855,7 +1855,7 @@ /turf/simulated/floor/plating, /area/awaymission) "hK" = ( -/obj/item/frame/apc, +/obj/item/frame2/apc, /turf/simulated/floor/airless, /area/awaymission) "hL" = ( diff --git a/maps/away_missions/archive/stationCollision.dmm b/maps/away_missions/archive/stationCollision.dmm index 3438b17126f2..14eb7f5c755b 100644 --- a/maps/away_missions/archive/stationCollision.dmm +++ b/maps/away_missions/archive/stationCollision.dmm @@ -11,7 +11,7 @@ /turf/simulated/floor/plating, /area/awaymission/northblock) "ad" = ( -/obj/machinery/power/solar/fake, +/obj/machinery/power/solar, /turf/simulated/floor/airless{ icon_state = "solarpanel" }, @@ -29,7 +29,7 @@ }, /area/awaymission/northblock) "ai" = ( -/obj/machinery/power/solar/fake, +/obj/machinery/power/solar, /turf/space, /area/awaymission/northblock) "aj" = ( diff --git a/maps/away_missions/archive/zresearchlabs.dmm b/maps/away_missions/archive/zresearchlabs.dmm index 3a7a99ef376b..89c7035ba635 100644 --- a/maps/away_missions/archive/zresearchlabs.dmm +++ b/maps/away_missions/archive/zresearchlabs.dmm @@ -240,7 +240,7 @@ }, /area/awaymission/labs/cave) "bb" = ( -/obj/item/frame/apc, +/obj/item/frame2/apc, /turf/simulated/floor{ icon_state = "white" }, diff --git a/maps/euthenia/levels/deck4.dmm b/maps/euthenia/levels/deck4.dmm index e604b9aa9605..a5094153ae06 100644 --- a/maps/euthenia/levels/deck4.dmm +++ b/maps/euthenia/levels/deck4.dmm @@ -11007,7 +11007,7 @@ /turf/simulated/floor/tiled, /area/rnd/secure_storage/critical) "Ql" = ( -/obj/item/frame/apc, +/obj/item/frame2/apc, /turf/simulated/floor/airless, /area/main_map/maintenance/deck_four/starboard) "Qm" = ( diff --git a/maps/generic/misc.dm b/maps/generic/misc.dm index df4cfe92d063..3af8d819c540 100644 --- a/maps/generic/misc.dm +++ b/maps/generic/misc.dm @@ -161,8 +161,6 @@ layer = ABOVE_WINDOW_LAYER /obj/machinery/embedded_controller layer = ABOVE_WINDOW_LAYER -/obj/machinery/firealarm - layer = ABOVE_WINDOW_LAYER /obj/machinery/flasher layer = ABOVE_WINDOW_LAYER /obj/machinery/keycard_auth @@ -216,8 +214,6 @@ layer = ABOVE_WINDOW_LAYER /obj/machinery/embedded_controller layer = ABOVE_WINDOW_LAYER -/obj/machinery/firealarm - layer = ABOVE_WINDOW_LAYER /obj/machinery/flasher layer = ABOVE_WINDOW_LAYER /obj/machinery/keycard_auth diff --git a/maps/rift/engines.dm b/maps/rift/engines.dm new file mode 100644 index 000000000000..449067353e34 --- /dev/null +++ b/maps/rift/engines.dm @@ -0,0 +1,22 @@ +/datum/map_template/engine/rift + abstract_type = /datum/map_template/engine/rift + prefix = "maps/rift/engines/" + for_map = /datum/map/station/rift + +/datum/map_template/engine/rift/rust + name = "ProcEngine_Rift_Rust" + desc = "R-UST Fusion Tokamak Engine" + suffix = "rust.dmm" + display_name = list("Budget Star", "Bane of Synthetics", "Glowy Field", "Funny Spinny EM Field", "Protean Rarity Enforcement") + +/datum/map_template/engine/rift/supermatter + name = "ProcEngine_Rift_Supermatter" + desc = "Old Faithful Supermatter" + suffix = "sme.dmm" + display_name = list("Angry Rock", "The Forbidden Rock Candy", "Death Crystal", "Spicy Crystal", "Hypnotizing Stone") + +/datum/map_template/engine/rift/burnchamber + name = "ProcEngine_Rift_Burn" + desc = "Burn Chamber Engine" + suffix = "burn.dmm" + display_name = list("Toxins Lab", "Build a Campfire", "100 Solarmoths", "Teshari's Bane", "Casting Fireball!") diff --git a/maps/rift/engines/burn.dmm b/maps/rift/engines/burn.dmm new file mode 100644 index 000000000000..73151002ff04 --- /dev/null +++ b/maps/rift/engines/burn.dmm @@ -0,0 +1,1891 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aF" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"aT" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"bc" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ + dir = 1 + }, +/obj/machinery/meter, +/turf/simulated/floor, +/area/engineering/engine_room) +"bj" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/effect/floor_decal/industrial/outline, +/turf/simulated/floor, +/area/engineering/engine_room) +"bO" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 9 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"bV" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 10 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"bZ" = ( +/obj/machinery/computer/general_air_control/supermatter_core{ + dir = 1; + frequency = 1438; + input_tag = "cooling_in"; + name = "Engine Pressure Control"; + output_tag = "cooling_out"; + pressure_setting = 100; + sensors = list("engine_sensor"="Engine Core") + }, +/turf/template_noop, +/area/template_noop) +"cm" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 9 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"cG" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 6 + }, +/turf/template_noop, +/area/rift/surfacebase/underground/under2) +"cR" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"da" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/black{ + dir = 8 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"dH" = ( +/obj/machinery/atmospherics/component/binary/pump{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"dI" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 9 + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"dT" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ + dir = 1; + frequency = 1438; + id_tag = "cooling_out"; + pump_direction = 0; + on = 1 + }, +/obj/structure/window/phoronreinforced{ + dir = 1 + }, +/obj/structure/window/phoronreinforced{ + dir = 4 + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"eB" = ( +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"eH" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red, +/turf/simulated/floor, +/area/engineering/engine_room) +"eO" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber{ + tag = null; + dir = 1; + id_tag = "engine_out"; + frequency = 1437 + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"eU" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/yellow, +/obj/machinery/meter, +/turf/simulated/floor, +/area/engineering/engine_room) +"fU" = ( +/obj/machinery/atmospherics/component/binary/pump/high_power{ + dir = 1 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"gB" = ( +/obj/structure/window/phoronreinforced/full{ + dir = 1 + }, +/obj/structure/grille, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"gF" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/turf/simulated/floor, +/turf/simulated/floor, +/area/template_noop) +"gK" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 4 + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"gL" = ( +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/visible/supply{ + dir = 4 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"hg" = ( +/obj/machinery/fire_alarm/south_mount{ + pixel_y = 23; + dir = 2 + }, +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"hi" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ + dir = 8 + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"ho" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 + }, +/obj/machinery/meter, +/turf/simulated/floor, +/area/engineering/engine_room) +"hp" = ( +/obj/machinery/atmospherics/pipe/simple/visible/purple{ + dir = 5 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"hZ" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ + dir = 8 + }, +/turf/template_noop, +/area/rift/surfacebase/underground/under2) +"iv" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan, +/turf/simulated/floor, +/area/engineering/engine_room) +"iV" = ( +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"iY" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 10 + }, +/turf/template_noop, +/area/rift/surfacebase/underground/under2) +"jR" = ( +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/manifold/visible/red{ + dir = 8 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"kh" = ( +/obj/machinery/computer/power_monitor{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/template_noop) +"kY" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 9 + }, +/obj/structure/window/phoronreinforced/full{ + dir = 4 + }, +/obj/structure/grille, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"lf" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/turf/simulated/floor, +/area/engineering/engine_room) +"mb" = ( +/obj/machinery/atmospherics/pipe/simple/visible/purple{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/purple{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"mv" = ( +/obj/structure/cable/cyan{ + icon_state = "1-4" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"nn" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 5 + }, +/turf/template_noop, +/area/rift/surfacebase/underground/under2) +"nA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/turf/simulated/floor, +/turf/simulated/floor, +/area/template_noop) +"nL" = ( +/obj/machinery/atmospherics/pipe/simple/visible/purple{ + dir = 6 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"nP" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/obj/machinery/atmospherics/component/unary/outlet_injector{ + frequency = 1438; + id = "cooling_in"; + use_power = 1 + }, +/obj/structure/window/phoronreinforced, +/obj/structure/window/phoronreinforced{ + dir = 8 + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"oe" = ( +/turf/template_noop, +/area/rift/surfacebase/underground/under2) +"oz" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"pg" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 9 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"pt" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 6 + }, +/obj/structure/window/phoronreinforced/full{ + dir = 4 + }, +/obj/structure/grille, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"pM" = ( +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"pX" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/red{ + dir = 8 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"pY" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"qL" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"rg" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/visible/black{ + dir = 1 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"rW" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/cyan, +/turf/simulated/floor, +/area/engineering/engine_room) +"sq" = ( +/obj/machinery/atmospherics/pipe/simple/visible/black, +/obj/structure/window/phoronreinforced/full{ + dir = 1 + }, +/obj/structure/grille, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"sH" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 10 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"ta" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"to" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/obj/machinery/atmospherics/portables_connector, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"tz" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 5 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"tB" = ( +/obj/machinery/fire_alarm/south_mount{ + pixel_y = -24 + }, +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"ug" = ( +/obj/machinery/atmospherics/component/binary/pump{ + dir = 8 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"um" = ( +/obj/machinery/atmospherics/component/unary/heat_exchanger{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"uE" = ( +/obj/machinery/atmospherics/pipe/simple/visible/purple{ + dir = 9 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"vn" = ( +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 9 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"vK" = ( +/obj/machinery/air_alarm{ + dir = 1; + pixel_y = -25 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"vO" = ( +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"wp" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green{ + dir = 10 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"wB" = ( +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 5 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"xE" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, +/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ + dir = 1; + frequency = 1438; + id_tag = "cooling_out"; + pump_direction = 0; + on = 1 + }, +/obj/structure/window/phoronreinforced{ + dir = 8 + }, +/obj/structure/window/phoronreinforced{ + dir = 1 + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"xI" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/black, +/obj/machinery/meter, +/turf/simulated/floor, +/area/engineering/engine_room) +"xM" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 5 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"xQ" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green{ + dir = 4 + }, +/obj/machinery/meter, +/turf/simulated/floor, +/area/engineering/engine_room) +"zl" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"zE" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Ab" = ( +/turf/simulated/floor, +/turf/simulated/floor, +/area/template_noop) +"Ao" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor, +/turf/simulated/floor, +/area/template_noop) +"AP" = ( +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"Bu" = ( +/turf/simulated/floor, +/area/engineering/engine_room) +"Bz" = ( +/obj/machinery/light, +/turf/simulated/floor, +/area/engineering/engine_room) +"BR" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber{ + id_tag = "engine_out"; + tag = null; + dir = 1; + frequency = 1437 + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"BU" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/black, +/turf/simulated/floor, +/area/engineering/engine_room) +"Cw" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ + dir = 8 + }, +/obj/machinery/air_sensor{ + frequency = 1438; + id_tag = "engine_sensor"; + output = 63 + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"Cy" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 6 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Dj" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Eh" = ( +/obj/structure/cable/cyan{ + icon_state = "2-4" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"EH" = ( +/obj/machinery/atmospherics/pipe/tank/oxygen, +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"ET" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/power/sensor{ + name = "Powernet Sensor - Engine Output"; + name_tag = "Engine Output" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Fi" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/obj/structure/window/phoronreinforced/full{ + dir = 4 + }, +/obj/structure/grille, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"Fw" = ( +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"FP" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, +/obj/machinery/atmospherics/component/unary/outlet_injector{ + frequency = 1438; + id = "cooling_in"; + use_power = 1 + }, +/obj/structure/window/phoronreinforced, +/obj/structure/window/phoronreinforced{ + dir = 4 + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"FW" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Gg" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/cyan, +/turf/simulated/floor, +/area/engineering/engine_room) +"Hh" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/visible/purple{ + dir = 6 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Ho" = ( +/obj/machinery/atmospherics/pipe/tank/nitrous_oxide, +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"HF" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"HN" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/machinery/power/sensor{ + name = "Powernet Sensor - Engine Power"; + name_tag = "Engine Power" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"HU" = ( +/obj/machinery/atmospherics/component/binary/passive_gate, +/turf/simulated/floor, +/area/engineering/engine_room) +"It" = ( +/obj/machinery/computer/atmos_alert{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/template_noop) +"Iz" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green{ + dir = 9 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"IR" = ( +/obj/machinery/atmospherics/component/unary/outlet_injector{ + dir = 1; + frequency = 1437; + id = "engine_in"; + volume_rate = 100 + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"Ji" = ( +/obj/structure/window/phoronreinforced/full{ + dir = 8 + }, +/obj/structure/grille, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"JK" = ( +/obj/machinery/atmospherics/pipe/simple/visible/purple{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"JM" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 6 + }, +/obj/structure/window/phoronreinforced/full{ + dir = 4 + }, +/obj/structure/grille, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"JS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"JZ" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Kh" = ( +/obj/machinery/atmospherics/component/unary/heat_exchanger, +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"Kr" = ( +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Kv" = ( +/obj/machinery/button/ignition{ + id = "engine_igniter"; + pixel_x = -32 + }, +/obj/machinery/computer/general_air_control/supermatter_core{ + frequency = 1437; + name = "Burn Chamber Control"; + sensors = list("engine_sensor"="Burn Chamber"); + dir = 4; + input_tag = "engine_in"; + output_tag = "engine_out" + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"KE" = ( +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 6 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"KF" = ( +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 10 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"KI" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline/blue, +/turf/simulated/floor, +/area/engineering/engine_room) +"Lf" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline/red, +/turf/simulated/floor, +/area/engineering/engine_room) +"Lj" = ( +/obj/machinery/power/generator{ + anchored = 1; + dir = 4 + }, +/obj/structure/cable/yellow, +/obj/machinery/atmospherics/pipe/simple/visible/red, +/turf/simulated/floor, +/area/engineering/engine_room) +"Ma" = ( +/obj/machinery/atmospherics/pipe/tank, +/turf/simulated/floor, +/area/engineering/engine_room) +"Mk" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green{ + dir = 6 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"MH" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 10 + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"MK" = ( +/obj/machinery/igniter{ + id = "engine_igniter"; + on = 0 + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"MZ" = ( +/obj/machinery/atmospherics/component/unary/heat_exchanger, +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"Ng" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green, +/turf/simulated/floor, +/area/engineering/engine_room) +"Nz" = ( +/obj/machinery/atmospherics/pipe/manifold4w/visible/purple, +/obj/machinery/meter, +/turf/simulated/floor, +/area/engineering/engine_room) +"Od" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline, +/turf/simulated/floor, +/area/engineering/engine_room) +"Ok" = ( +/obj/machinery/atmospherics/pipe/simple/visible/black, +/turf/simulated/floor, +/area/engineering/engine_room) +"Ov" = ( +/obj/machinery/atmospherics/component/binary/circulator{ + anchored = 1; + dir = 1 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"OK" = ( +/obj/machinery/atmospherics/pipe/manifold4w/visible/black, +/turf/simulated/floor, +/area/engineering/engine_room) +"Pa" = ( +/obj/machinery/atmospherics/pipe/simple/visible/purple, +/obj/structure/window/phoronreinforced/full{ + dir = 1 + }, +/obj/structure/grille, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"Pz" = ( +/obj/machinery/atmospherics/component/unary/heat_exchanger{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"PW" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 9 + }, +/turf/template_noop, +/area/rift/surfacebase/underground/under2) +"QG" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/obj/machinery/atmospherics/tvalve/digital/mirrored, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"QX" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 4 + }, +/turf/template_noop, +/area/rift/surfacebase/underground/under2) +"Sh" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/red, +/turf/simulated/floor, +/area/engineering/engine_room) +"SK" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/power/apc/south_mount{ + dir = 8; + pixel_y = 0; + pixel_x = 17 + }, +/obj/structure/cable/cyan{ + icon_state = "0-2" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Tb" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 5 + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"Tl" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging, +/turf/template_noop, +/area/rift/surfacebase/underground/under2) +"TA" = ( +/obj/machinery/atmospherics/component/binary/circulator{ + anchored = 1 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"TV" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/black{ + dir = 1 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"UM" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 10 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Vi" = ( +/obj/structure/window/phoronreinforced/full, +/obj/structure/grille, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"Vl" = ( +/obj/effect/floor_decal/industrial/warning/corner, +/turf/simulated/floor, +/area/engineering/engine_room) +"Vn" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 6 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"VK" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/purple{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"VN" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/green, +/turf/simulated/floor, +/area/engineering/engine_room) +"VW" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 6 + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"VX" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 9 + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"Wv" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"WA" = ( +/obj/machinery/computer/security/engineering{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/template_noop) +"WR" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 4 + }, +/obj/machinery/meter, +/turf/simulated/floor, +/area/engineering/engine_room) +"Yg" = ( +/turf/simulated/wall/r_wall/prepainted/engineering, +/area/engineering/engine_room) +"Yi" = ( +/obj/machinery/light, +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"YK" = ( +/obj/machinery/air_alarm{ + pixel_y = 22 + }, +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"YP" = ( +/obj/machinery/atmospherics/pipe/tank/phoron, +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"Zn" = ( +/turf/template_noop, +/area/template_noop) +"Zw" = ( +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/structure/cable/cyan{ + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"ZG" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"ZN" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ + dir = 8 + }, +/turf/simulated/floor, +/area/engineering/engine_room) + +(1,1,1) = {" +Zn +oe +Zn +Zn +oe +oe +oe +oe +oe +oe +oe +oe +oe +oe +oe +oe +Zn +Zn +Zn +Zn +Zn +Zn +Zn +"} +(2,1,1) = {" +Zn +oe +cG +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +nn +Zn +Zn +Zn +Zn +Zn +"} +(3,1,1) = {" +Zn +oe +QX +cG +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +PW +oe +oe +oe +Zn +Zn +"} +(4,1,1) = {" +Zn +oe +QX +iY +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +nn +Zn +"} +(5,1,1) = {" +Zn +oe +iY +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +nn +QX +Zn +"} +(6,1,1) = {" +Zn +Zn +cG +nn +cG +nn +cG +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +PW +QX +Zn +"} +(7,1,1) = {" +Zn +Zn +QX +QX +QX +QX +iY +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +PW +Zn +"} +(8,1,1) = {" +Zn +Zn +QX +QX +QX +QX +cG +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +nn +Zn +"} +(9,1,1) = {" +Zn +Zn +QX +QX +QX +QX +iY +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +Tl +nn +QX +Zn +"} +(10,1,1) = {" +Zn +cG +PW +QX +QX +QX +Yg +Yg +Yg +Yg +Yg +Yg +Yg +Yg +Yg +Yg +Yg +cG +Tl +Tl +PW +QX +Zn +"} +(11,1,1) = {" +Zn +hZ +oe +iY +PW +hZ +Yg +Bu +Yg +Ji +Ji +Ji +Ji +Ji +Yg +Bu +Yg +QX +cG +Tl +Tl +PW +Zn +"} +(12,1,1) = {" +Zn +TV +Ok +Ok +Ok +vn +Yg +nL +Pa +IR +VW +Tb +VW +Tb +Vi +Bu +Yg +QX +iY +Tl +Tl +nn +Zn +"} +(13,1,1) = {" +Zn +iV +Bu +Bu +Bu +Bu +Hh +VK +Pa +IR +gK +gK +gK +gK +Vi +Bu +Yg +iY +nn +oe +oe +QX +Zn +"} +(14,1,1) = {" +Zn +iV +EH +QG +HU +hp +JK +KE +sq +BR +gK +gK +gK +gK +Vi +Bu +Yg +oe +hZ +oe +oe +hZ +Zn +"} +(15,1,1) = {" +Zn +iV +to +VX +Bu +JK +JK +TV +sq +eO +gK +gK +gK +gK +Vi +Bu +Yg +Bu +pY +Bu +Bu +HF +Zn +"} +(16,1,1) = {" +Zn +iV +Bu +Bu +Bu +mb +JK +dH +gB +MK +Cw +MH +dI +hi +Vi +Bu +ta +Bu +pY +Bu +Bu +HF +Zn +"} +(17,1,1) = {" +Zn +aF +YP +QG +HU +Nz +uE +iV +Yg +pt +JM +Fi +Fi +kY +Yg +Bu +Bu +Bu +xQ +Bu +Bu +ho +Zn +"} +(18,1,1) = {" +Zn +iV +to +VX +Bu +JK +Ma +xI +Kv +WR +bc +xE +nP +tz +ta +Bu +Bu +Bu +pY +Bu +Bu +HF +Zn +"} +(19,1,1) = {" +Zn +hg +Bu +Bu +Bu +JK +KE +vn +Vn +pg +bV +dT +FP +eU +Bu +Bu +Bu +Bu +pY +Bu +Bu +Yi +Zn +"} +(20,1,1) = {" +Zn +iV +Ho +QG +HU +uE +iV +Bu +zE +Mk +Ng +Ng +Ng +VN +Ng +Ng +Ng +Ng +Iz +Bu +Bu +tB +Zn +"} +(21,1,1) = {" +Zn +YK +to +VX +Bu +KE +OK +wB +zE +wp +Ng +Ov +iv +rW +iv +iv +iv +iv +fU +ZN +iv +cm +Zn +"} +(22,1,1) = {" +Zn +rg +da +um +MZ +BU +dH +dH +UM +eH +jR +Lj +eH +Sh +eH +eH +pX +xM +Cy +Gg +Bu +vK +Zn +"} +(23,1,1) = {" +Zn +ug +KF +Pz +Kh +vn +bj +bj +Bu +Bu +sH +TA +lf +bO +Bu +Bu +dH +ug +dH +ug +Bu +Bz +Zn +"} +(24,1,1) = {" +Zn +Od +eB +FW +ET +FW +FW +FW +FW +FW +Kr +Bu +Bu +Bu +Bu +Bu +Lf +Lf +KI +KI +Bu +Bu +Zn +"} +(25,1,1) = {" +Zn +Vl +JZ +Eh +HN +Wv +Dj +zl +zl +zl +zl +ZG +zl +zl +zl +zl +Dj +Wv +mv +qL +oz +Bu +Zn +"} +(26,1,1) = {" +Zn +SK +cR +Zw +vO +gL +JS +vO +vO +vO +vO +vO +pM +vO +vO +vO +JS +gL +AP +Fw +aT +Bu +Zn +"} +(27,1,1) = {" +Zn +Zn +Ao +gF +Zn +Zn +Ab +Ab +Ab +Ab +Ab +Zn +Zn +Ab +Zn +Zn +Zn +Zn +nA +Ab +Zn +Zn +Zn +"} +(28,1,1) = {" +Zn +Zn +Zn +Zn +Zn +Zn +Zn +WA +kh +It +Zn +Zn +Zn +Zn +Zn +Zn +Zn +Zn +Zn +Zn +Zn +Zn +Zn +"} +(29,1,1) = {" +Zn +Zn +Zn +Zn +Zn +Zn +Zn +Zn +Zn +Zn +bZ +Zn +Zn +Zn +Zn +Zn +Zn +Zn +Zn +Zn +Zn +Zn +Zn +"} diff --git a/maps/rift/engines/rust.dmm b/maps/rift/engines/rust.dmm new file mode 100644 index 000000000000..5a37b38e2396 --- /dev/null +++ b/maps/rift/engines/rust.dmm @@ -0,0 +1,1850 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"ah" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 6 + }, +/obj/machinery/meter, +/turf/simulated/floor, +/area/engineering/engine_room) +"am" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/red{ + dir = 8 + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"aQ" = ( +/obj/machinery/air_alarm{ + dir = 1; + pixel_y = -25 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"bt" = ( +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"cn" = ( +/turf/simulated/floor, +/area/engineering/engine_room) +"cY" = ( +/obj/machinery/fusion_fuel_injector/mapped{ + dir = 8; + id_tag = "engine-i" + }, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"cZ" = ( +/obj/machinery/computer/general_air_control/supermatter_core{ + dir = 1; + frequency = 1438; + input_tag = "cooling_in"; + name = "Engine Cooling Control"; + output_tag = "cooling_out"; + pressure_setting = 100; + sensors = list("engine_sensor"="Engine Core") + }, +/turf/template_noop, +/area/template_noop) +"dc" = ( +/obj/machinery/light, +/turf/simulated/floor, +/area/engineering/engine_room) +"dt" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"dY" = ( +/obj/machinery/air_sensor{ + frequency = 1438; + id_tag = "engine_sensor"; + output = 63 + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"ea" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 5 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"ey" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"eB" = ( +/obj/structure/cable/cyan{ + icon_state = "1-4" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"fe" = ( +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/structure/cable/cyan{ + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"fK" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/machinery/power/sensor{ + name = "Powernet Sensor - Engine Power"; + name_tag = "Engine Power" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"gu" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 + }, +/obj/machinery/light, +/turf/simulated/floor, +/area/engineering/engine_room) +"gx" = ( +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/machinery/power/generator{ + anchored = 1 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"gD" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green, +/obj/machinery/meter, +/turf/simulated/floor, +/area/engineering/engine_room) +"hh" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging, +/turf/template_noop, +/area/rift/surfacebase/underground/under2) +"if" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/red{ + dir = 8 + }, +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"iH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/turf/simulated/floor, +/turf/simulated/floor, +/area/template_noop) +"iJ" = ( +/turf/simulated/floor, +/turf/simulated/floor, +/area/template_noop) +"iN" = ( +/obj/fiftyspawner/tritium, +/obj/structure/table/reinforced, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/fiftyspawner/tritium, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"jB" = ( +/obj/machinery/atmospherics/component/binary/circulator{ + anchored = 1; + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"jT" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green, +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"kk" = ( +/obj/machinery/fire_alarm/south_mount{ + pixel_y = 23; + dir = 2 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"ky" = ( +/obj/machinery/power/emitter/gyrotron/anchored{ + dir = 1; + id_tag = "engine-g" + }, +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/structure/cable/cyan{ + icon_state = "0-4" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"kz" = ( +/obj/machinery/computer/fusion_core_control{ + id_tag = "engine" + }, +/turf/simulated/floor/tiled/monotile, +/area/template_noop) +"kE" = ( +/obj/machinery/atmospherics/component/binary/pump{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"kJ" = ( +/obj/machinery/power/fusion_core{ + id_tag = "engine"; + anchored = 1 + }, +/obj/structure/cable/cyan{ + icon_state = "0-4" + }, +/turf/simulated/floor/greengrid/nitrogen, +/area/engineering/engine_room) +"kN" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 9 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"lc" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 10 + }, +/turf/template_noop, +/area/rift/surfacebase/underground/under2) +"lv" = ( +/obj/structure/cable/cyan{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 6 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"lC" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 + }, +/obj/machinery/fire_alarm/south_mount{ + pixel_y = -24 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"lS" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ + dir = 8 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"ma" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline/blue, +/turf/simulated/floor, +/area/engineering/engine_room) +"mf" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ + dir = 8 + }, +/turf/template_noop, +/area/rift/surfacebase/underground/under2) +"mi" = ( +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/structure/grille, +/obj/structure/window/phoronreinforced/full{ + icon_state = "phoronwindow0" + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"mo" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"nB" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red, +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"ob" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 6 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"oi" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green, +/turf/simulated/floor, +/area/engineering/engine_room) +"oP" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, +/obj/structure/cable/cyan{ + icon_state = "1-4" + }, +/obj/structure/cable/cyan{ + icon_state = "2-4" + }, +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"pj" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red, +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"pt" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ + dir = 8 + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"qc" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"qh" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"qn" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"rr" = ( +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"rs" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"rx" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"rG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"rH" = ( +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"sW" = ( +/turf/simulated/wall/r_wall/prepainted/engineering, +/area/engineering/engine_room) +"tv" = ( +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/machinery/button/remote/airlock{ + id = "engine_access_hatch"; + name = "Door Bolt Control"; + pixel_x = -5; + pixel_y = 31; + req_access = list(10); + specialfunctions = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"tD" = ( +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"tR" = ( +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"vi" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"vq" = ( +/obj/fiftyspawner/deuterium, +/obj/structure/table/reinforced, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/fiftyspawner/deuterium, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"vx" = ( +/obj/structure/cable/cyan{ + icon_state = "2-4" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"vS" = ( +/obj/machinery/fusion_fuel_injector/mapped{ + dir = 8; + id_tag = "engine-i" + }, +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"vZ" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green{ + dir = 9 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"wg" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 10 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"wh" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red, +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"xW" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 4 + }, +/obj/structure/grille, +/obj/structure/window/phoronreinforced/full{ + icon_state = "phoronwindow0" + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"yB" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 5 + }, +/turf/template_noop, +/area/rift/surfacebase/underground/under2) +"yS" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/power/apc/south_mount{ + dir = 8; + pixel_y = 0; + pixel_x = 17 + }, +/obj/structure/cable/cyan{ + icon_state = "0-2" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"yV" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 + }, +/obj/machinery/meter, +/turf/simulated/floor, +/area/engineering/engine_room) +"zc" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/red, +/turf/simulated/floor, +/area/engineering/engine_room) +"zu" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 9 + }, +/turf/template_noop, +/area/rift/surfacebase/underground/under2) +"zF" = ( +/obj/machinery/computer/fusion_fuel_control{ + id_tag = "engine-i" + }, +/turf/simulated/floor/tiled/monotile, +/area/template_noop) +"zS" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ + frequency = 1438; + id_tag = "cooling_out"; + pump_direction = 0; + on = 1 + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"Al" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/power/sensor{ + name = "Powernet Sensor - Engine Output"; + name_tag = "Engine Output" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Am" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Az" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"AB" = ( +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"AD" = ( +/obj/machinery/power/emitter/gyrotron/anchored{ + id_tag = "engine-g" + }, +/obj/structure/cable/cyan{ + icon_state = "0-4" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"Be" = ( +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/component/unary/outlet_injector{ + frequency = 1438; + id = "cooling_in"; + use_power = 1 + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"Bg" = ( +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor, +/area/engineering/engine_room) +"BK" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, +/obj/structure/grille, +/obj/structure/window/phoronreinforced/full{ + icon_state = "phoronwindow0" + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"BP" = ( +/obj/machinery/door/airlock/hatch{ + icon_state = "door_locked"; + id_tag = "engine_access_hatch"; + locked = 1; + name = "Fusion Core Access"; + req_access = list(11) + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"Ci" = ( +/obj/machinery/fusion_fuel_compressor, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"Cu" = ( +/obj/machinery/computer/gyrotron_control{ + id_tag = "engine-g" + }, +/turf/simulated/floor/tiled/monotile, +/area/template_noop) +"Cx" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 4 + }, +/turf/template_noop, +/area/rift/surfacebase/underground/under2) +"Dl" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Dq" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ + dir = 4 + }, +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/machinery/meter, +/turf/simulated/floor, +/area/engineering/engine_room) +"Dy" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan, +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"DK" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/green, +/turf/simulated/floor, +/area/engineering/engine_room) +"DY" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 6 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"EU" = ( +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"Fy" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 9 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Gj" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan, +/turf/simulated/floor, +/area/engineering/engine_room) +"Gn" = ( +/obj/machinery/air_alarm{ + pixel_y = 22 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"HM" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 5 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"HP" = ( +/obj/machinery/power/emitter/gyrotron/anchored{ + id_tag = "engine-g" + }, +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/structure/cable/cyan{ + icon_state = "0-4" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"HS" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"In" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan, +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"IO" = ( +/obj/machinery/atmospherics/component/binary/circulator{ + anchored = 1; + dir = 8 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"IY" = ( +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/visible/supply{ + dir = 4 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"Jb" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Ji" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"JU" = ( +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"KL" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red, +/obj/structure/cable/cyan{ + icon_state = "1-8" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"KR" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"LJ" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ + dir = 1; + frequency = 1438; + id_tag = "cooling_out"; + pump_direction = 0; + on = 1 + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"LL" = ( +/turf/template_noop, +/area/rift/surfacebase/underground/under2) +"LN" = ( +/obj/machinery/atmospherics/component/binary/pump/high_power{ + dir = 1 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Mb" = ( +/obj/structure/grille, +/obj/structure/window/phoronreinforced/full{ + icon_state = "phoronwindow0" + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"Mf" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"MB" = ( +/obj/machinery/fusion_fuel_injector/mapped{ + dir = 8; + id_tag = "engine-i" + }, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 6 + }, +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"MC" = ( +/obj/machinery/atmospherics/valve/digital{ + dir = 4; + name = "Emergency Cooling Valve 2" + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor, +/area/engineering/engine_room) +"ME" = ( +/obj/machinery/atmospherics/component/binary/pump{ + dir = 8 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"MF" = ( +/obj/machinery/atmospherics/pipe/manifold4w/visible/red, +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/machinery/meter, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"MQ" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"Nc" = ( +/obj/machinery/atmospherics/component/unary/outlet_injector{ + dir = 1; + frequency = 1438; + id = "cooling_in"; + use_power = 1 + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"NN" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 9 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Ob" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"ON" = ( +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Pf" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/turf/simulated/floor, +/turf/simulated/floor, +/area/template_noop) +"Pm" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Qm" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 10 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Qt" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/green{ + dir = 8 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"QV" = ( +/obj/effect/floor_decal/industrial/warning/corner, +/turf/simulated/floor, +/area/engineering/engine_room) +"Re" = ( +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"Ru" = ( +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"RT" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green{ + dir = 6 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Sf" = ( +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"SR" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 6 + }, +/turf/template_noop, +/area/rift/surfacebase/underground/under2) +"ST" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor, +/turf/simulated/floor, +/area/template_noop) +"Ta" = ( +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"Th" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red, +/turf/simulated/floor, +/area/engineering/engine_room) +"TX" = ( +/obj/machinery/atmospherics/valve/digital{ + name = "Emergency Cooling Valve 1"; + dir = 8 + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor, +/area/engineering/engine_room) +"Vn" = ( +/obj/machinery/power/emitter/gyrotron/anchored{ + dir = 1; + id_tag = "engine-g" + }, +/obj/structure/cable/cyan{ + icon_state = "0-4" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"Wh" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 4 + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"WC" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"WF" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline/red, +/turf/simulated/floor, +/area/engineering/engine_room) +"Yd" = ( +/obj/structure/cable/cyan{ + icon_state = "1-8" + }, +/obj/structure/cable/cyan{ + icon_state = "2-8" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Yh" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ + dir = 1 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Ym" = ( +/obj/item/book/manual/rust_engine, +/turf/template_noop, +/area/template_noop) +"ZO" = ( +/turf/template_noop, +/area/template_noop) + +(1,1,1) = {" +ZO +LL +ZO +ZO +LL +LL +LL +LL +LL +LL +LL +LL +LL +LL +LL +LL +ZO +ZO +ZO +ZO +ZO +ZO +ZO +"} +(2,1,1) = {" +ZO +LL +SR +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +yB +ZO +ZO +ZO +ZO +ZO +"} +(3,1,1) = {" +ZO +LL +Cx +SR +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +zu +LL +LL +LL +ZO +ZO +"} +(4,1,1) = {" +ZO +LL +Cx +lc +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +yB +ZO +"} +(5,1,1) = {" +ZO +LL +lc +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +yB +Cx +ZO +"} +(6,1,1) = {" +ZO +ZO +SR +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +zu +Cx +ZO +"} +(7,1,1) = {" +ZO +ZO +Cx +SR +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +zu +ZO +"} +(8,1,1) = {" +ZO +ZO +Cx +lc +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +yB +ZO +"} +(9,1,1) = {" +ZO +ZO +lc +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +hh +yB +Cx +ZO +"} +(10,1,1) = {" +ZO +LL +LL +LL +LL +LL +sW +sW +sW +sW +sW +sW +sW +sW +sW +sW +sW +SR +hh +hh +zu +Cx +ZO +"} +(11,1,1) = {" +ZO +LL +LL +LL +LL +LL +sW +cn +sW +Mb +Mb +Mb +Mb +Mb +sW +cn +sW +Cx +SR +hh +hh +zu +ZO +"} +(12,1,1) = {" +ZO +cn +cn +cn +cn +cn +sW +cn +Mb +zS +am +LJ +Ta +Ta +Mb +cn +sW +Cx +lc +hh +hh +yB +ZO +"} +(13,1,1) = {" +ZO +cn +cn +cn +cn +cn +qn +AD +Mb +Ta +Wh +Ta +Ta +Ta +Mb +Vn +sW +lc +yB +LL +LL +Cx +ZO +"} +(14,1,1) = {" +ZO +cn +cn +cn +cn +cn +cn +Re +Mb +Ta +Wh +kJ +dY +Ta +Mb +rr +sW +LL +mf +LL +LL +mf +ZO +"} +(15,1,1) = {" +ZO +cn +cn +cn +cn +cn +cn +HP +Mb +Ta +Wh +tD +Ta +Ta +Mb +ky +sW +cn +Am +cn +cn +Az +ZO +"} +(16,1,1) = {" +ZO +cn +cn +cn +cn +cn +cn +rH +Mb +Ta +Wh +Be +pt +Nc +BP +rH +qn +cn +Am +cn +cn +Az +ZO +"} +(17,1,1) = {" +ZO +Pm +cn +cn +cn +cn +cn +rH +sW +Mb +xW +mi +BK +Mb +sW +tv +cn +cn +Am +cn +cn +yV +ZO +"} +(18,1,1) = {" +ZO +cn +cn +cn +cn +cn +cn +rH +qn +Bg +vS +MB +cY +dt +qn +rH +cn +cn +Am +cn +cn +Az +ZO +"} +(19,1,1) = {" +ZO +kk +cn +cn +cn +cn +cn +lv +nB +wh +MF +oP +pj +if +nB +KL +Th +ea +Am +cn +cn +gu +ZO +"} +(20,1,1) = {" +ZO +cn +cn +cn +cn +cn +cn +KR +cn +RT +jT +Mf +Qt +DK +oi +Qt +gD +jT +vZ +cn +cn +lC +ZO +"} +(21,1,1) = {" +ZO +Gn +iN +dt +cn +cn +cn +jB +gx +IO +TX +HS +MC +jB +gx +IO +ah +Dy +lS +LN +Gj +kN +ZO +"} +(22,1,1) = {" +ZO +Pm +Ci +dt +cn +cn +cn +wg +Ob +qc +qc +Dq +mo +Fy +DY +vi +ob +zc +Yh +HM +cn +aQ +ZO +"} +(23,1,1) = {" +ZO +cn +vq +dt +cn +cn +cn +cn +Ji +Qm +vi +In +Gj +Gj +NN +cn +kE +ME +ME +kE +cn +dc +ZO +"} +(24,1,1) = {" +ZO +cn +tR +rs +Al +rs +rs +rs +Sf +rs +rs +ON +rs +rs +Ru +cn +WF +WF +ma +ma +cn +cn +ZO +"} +(25,1,1) = {" +ZO +QV +qh +vx +fK +Dl +Jb +WC +WC +WC +WC +Yd +WC +WC +WC +WC +Jb +Dl +eB +ey +rx +cn +ZO +"} +(26,1,1) = {" +ZO +yS +MQ +fe +JU +IY +rG +JU +JU +JU +JU +JU +EU +JU +JU +JU +rG +IY +bt +AB +dt +cn +ZO +"} +(27,1,1) = {" +ZO +ZO +ST +iH +ZO +ZO +iJ +iJ +iJ +iJ +iJ +ZO +ZO +iJ +ZO +ZO +ZO +ZO +Pf +iJ +ZO +ZO +ZO +"} +(28,1,1) = {" +ZO +ZO +ZO +ZO +ZO +ZO +Ym +kz +zF +Cu +ZO +ZO +ZO +ZO +ZO +ZO +ZO +ZO +ZO +ZO +ZO +ZO +ZO +"} +(29,1,1) = {" +ZO +ZO +ZO +ZO +ZO +ZO +ZO +ZO +ZO +ZO +cZ +ZO +ZO +ZO +ZO +ZO +ZO +ZO +ZO +ZO +ZO +ZO +ZO +"} diff --git a/maps/rift/engines/sme.dmm b/maps/rift/engines/sme.dmm new file mode 100644 index 000000000000..2d01e1dd6f2d --- /dev/null +++ b/maps/rift/engines/sme.dmm @@ -0,0 +1,1876 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"ah" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"bo" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green, +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"bw" = ( +/turf/simulated/floor, +/area/template_noop) +"bA" = ( +/obj/machinery/atmospherics/component/quaternary/atmos_filter, +/turf/simulated/floor, +/area/engineering/engine_room) +"bV" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"ck" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red, +/obj/machinery/atmospherics/pipe/simple/visible/green{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"cz" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, +/obj/machinery/meter, +/turf/simulated/floor, +/area/engineering/engine_room) +"cM" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 10 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"cN" = ( +/obj/machinery/air_alarm{ + dir = 1; + pixel_y = -25 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"dj" = ( +/obj/machinery/atmospherics/valve/digital{ + name = "Emergency Cooling Valve 1"; + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor, +/area/engineering/engine_room) +"dN" = ( +/obj/machinery/atmospherics/component/unary/outlet_injector{ + frequency = 1438; + id = "cooling_in"; + name = "Coolant Injector"; + pixel_y = 1; + power_rating = 30000; + use_power = 1; + volume_rate = 700 + }, +/turf/simulated/floor/greengrid/nitrogen, +/area/engineering/engine_room) +"eD" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"eE" = ( +/obj/machinery/door/blast/regular{ + dir = 2; + id = "SupermatterPort"; + name = "Reactor Blast Door" + }, +/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/obj/structure/grille, +/obj/structure/window/phoronreinforced/full{ + icon_state = "phoronwindow0" + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"eH" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"eN" = ( +/obj/machinery/atmospherics/component/unary/heat_exchanger{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"eZ" = ( +/obj/machinery/atmospherics/component/binary/pump/high_power{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"fm" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"fC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers{ + dir = 4 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"fS" = ( +/turf/template_noop, +/area/template_noop) +"gs" = ( +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"gY" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/red{ + dir = 8 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"hk" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 9 + }, +/obj/machinery/light, +/turf/simulated/floor, +/area/engineering/engine_room) +"hD" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"id" = ( +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/structure/cable/cyan{ + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"iU" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, +/turf/simulated/floor/tiled/monotile, +/area/engineering/engine_room) +"ju" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"jN" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/black{ + dir = 1 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"jQ" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 9 + }, +/turf/template_noop, +/area/rift/surfacebase/underground/under2) +"kb" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/turf/simulated/floor, +/area/template_noop) +"kD" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"lf" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 6 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"ls" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/machinery/power/sensor{ + name = "Powernet Sensor - Engine Power"; + name_tag = "Engine Power" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"lT" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/cyan, +/turf/simulated/floor, +/area/engineering/engine_room) +"lY" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline, +/turf/simulated/floor, +/area/engineering/engine_room) +"me" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/power/sensor{ + name = "Powernet Sensor - Engine Output"; + name_tag = "Engine Output" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"mz" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"mD" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ + dir = 4 + }, +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"ni" = ( +/obj/machinery/computer/general_air_control/supermatter_core{ + dir = 1; + frequency = 1438; + input_tag = "cooling_in"; + name = "Engine Cooling Control"; + output_tag = "cooling_out"; + pressure_setting = 100; + sensors = list("engine_sensor"="Engine Core") + }, +/turf/template_noop, +/area/template_noop) +"nG" = ( +/obj/machinery/atmospherics/pipe/tank{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"nL" = ( +/obj/machinery/computer/power_monitor{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/template_noop) +"nM" = ( +/obj/machinery/power/supermatter, +/turf/simulated/floor/greengrid/nitrogen, +/area/engineering/engine_room) +"oc" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 6 + }, +/turf/template_noop, +/area/rift/surfacebase/underground/under2) +"og" = ( +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"qy" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"ri" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"rr" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/machinery/power/generator{ + anchored = 1 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"rs" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 10 + }, +/turf/template_noop, +/area/rift/surfacebase/underground/under2) +"sj" = ( +/obj/machinery/atmospherics/pipe/simple/visible/black, +/turf/simulated/floor, +/area/engineering/engine_room) +"sm" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/power/apc/south_mount{ + dir = 8; + pixel_y = 0; + pixel_x = 24 + }, +/obj/structure/cable/cyan{ + icon_state = "0-2" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"sq" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 5 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"sy" = ( +/obj/structure/cable/cyan{ + icon_state = "1-4" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"tm" = ( +/turf/simulated/wall/r_wall/prepainted/engineering, +/area/engineering/engine_room) +"tt" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green, +/turf/simulated/floor, +/area/engineering/engine_room) +"tC" = ( +/turf/template_noop, +/area/rift/surfacebase/underground/under2) +"us" = ( +/obj/machinery/computer/sm_monitor{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/template_noop) +"uA" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/black{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor, +/area/engineering/engine_room) +"uU" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, +/obj/machinery/button/remote/airlock{ + id = "engine_access_hatch"; + name = "Door Bolt Control"; + pixel_y = 39; + req_access = list(10); + specialfunctions = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"uV" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ + dir = 8 + }, +/turf/template_noop, +/area/rift/surfacebase/underground/under2) +"ve" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging, +/turf/template_noop, +/area/rift/surfacebase/underground/under2) +"vk" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/red, +/turf/simulated/floor, +/area/engineering/engine_room) +"vp" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/engine{ + dir = 1; + external_pressure_bound = 100; + external_pressure_bound_default = 0; + frequency = 1438; + icon_state = "map_vent_in"; + id_tag = "cooling_out"; + initialize_directions = 4; + pump_direction = 0; + on = 1 + }, +/turf/simulated/floor/greengrid/nitrogen, +/area/engineering/engine_room) +"vr" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor, +/area/template_noop) +"vZ" = ( +/obj/machinery/atmospherics/component/binary/pump{ + dir = 8 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"wf" = ( +/obj/machinery/light, +/turf/simulated/floor, +/area/engineering/engine_room) +"wz" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"wF" = ( +/obj/machinery/atmospherics/component/binary/pump{ + dir = 4; + name = "Scrubbers to Filter" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"wS" = ( +/obj/machinery/atmospherics/component/binary/pump{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"xf" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 5 + }, +/turf/template_noop, +/area/rift/surfacebase/underground/under2) +"xl" = ( +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/machinery/power/generator{ + anchored = 1 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"yA" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"yO" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline/red, +/turf/simulated/floor, +/area/engineering/engine_room) +"yP" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/black, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"zw" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"zD" = ( +/obj/machinery/atmospherics/valve/digital{ + dir = 4; + name = "Emergency Cooling Valve 2" + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"zI" = ( +/obj/machinery/fire_alarm/south_mount{ + pixel_y = 23; + dir = 2 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"zJ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/turf/simulated/floor, +/area/template_noop) +"Aj" = ( +/obj/machinery/computer/security/engineering{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/template_noop) +"Ak" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/green{ + dir = 8 + }, +/obj/machinery/meter, +/turf/simulated/floor, +/area/engineering/engine_room) +"Am" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"AA" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/green, +/turf/simulated/floor, +/area/engineering/engine_room) +"AG" = ( +/obj/machinery/door/blast/regular{ + dir = 4; + id = "SupermatterPort"; + name = "Reactor Blast Door" + }, +/obj/structure/grille, +/obj/structure/window/phoronreinforced/full{ + icon_state = "phoronwindow0" + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"AR" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 4 + }, +/obj/machinery/meter, +/turf/simulated/floor, +/area/engineering/engine_room) +"Bd" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green{ + dir = 6 + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Br" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 6 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Bx" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/red, +/turf/simulated/floor, +/area/engineering/engine_room) +"Ce" = ( +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Cw" = ( +/obj/effect/floor_decal/steeldecal/steel_decals_central4{ + dir = 8 + }, +/turf/simulated/floor/tiled/monotile, +/area/engineering/engine_room) +"Dc" = ( +/obj/machinery/air_sensor{ + frequency = 1438; + id_tag = "engine_sensor"; + output = 63 + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"DK" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"DO" = ( +/obj/item/book/manual/supermatter_engine, +/turf/template_noop, +/area/template_noop) +"Ea" = ( +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning/corner, +/turf/simulated/floor, +/area/engineering/engine_room) +"El" = ( +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Ew" = ( +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"ES" = ( +/obj/effect/floor_decal/industrial/warning/corner, +/turf/simulated/floor, +/area/engineering/engine_room) +"FG" = ( +/obj/machinery/button/remote/emitter{ + desc = "A remote control-switch for the engine emitter."; + id = "EngineEmitter"; + name = "Engine Emitter"; + pixel_y = -3; + req_access = list(10); + pixel_x = -7 + }, +/obj/machinery/button/remote/blast_door{ + desc = "A remote control-switch for the engine charging port."; + id = "SupermatterPort"; + name = "Reactor Blast Doors"; + pixel_x = 6; + pixel_y = -3; + req_access = list(10) + }, +/turf/template_noop, +/area/template_noop) +"FW" = ( +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"Go" = ( +/obj/machinery/atmospherics/component/binary/circulator{ + anchored = 1; + dir = 8 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Gw" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan, +/obj/machinery/meter, +/turf/simulated/floor, +/area/engineering/engine_room) +"Ho" = ( +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"HF" = ( +/obj/machinery/fire_alarm/south_mount{ + pixel_y = -24 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"HM" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/black{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Ia" = ( +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 9 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Ih" = ( +/obj/machinery/air_alarm{ + pixel_y = 22 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"IE" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan, +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"JK" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 9 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"JM" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/black, +/turf/simulated/floor, +/area/engineering/engine_room) +"JS" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/turf/simulated/floor/tiled/monotile, +/area/engineering/engine_room) +"JZ" = ( +/obj/structure/grille, +/obj/machinery/door/blast/regular{ + dir = 2; + id = "SupermatterPort"; + name = "Reactor Blast Door" + }, +/obj/structure/window/phoronreinforced/full{ + icon_state = "phoronwindow0" + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"Kr" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"KT" = ( +/turf/simulated/wall/r_wall/prepainted/engineering, +/area/template_noop) +"KW" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"LK" = ( +/obj/machinery/atmospherics/component/binary/pump{ + dir = 1 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"LL" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 5 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"LR" = ( +/obj/machinery/atmospherics/component/binary/circulator{ + anchored = 1; + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"LS" = ( +/obj/machinery/power/emitter{ + anchored = 1; + dir = 8; + id = "EngineEmitter"; + pixel_y = 8; + state = 2 + }, +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 5 + }, +/obj/structure/cable/cyan{ + icon_state = "0-4" + }, +/turf/simulated/floor/tiled/monotile, +/area/engineering/engine_room) +"LV" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan, +/turf/simulated/floor, +/area/engineering/engine_room) +"LX" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/red{ + dir = 8 + }, +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Me" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 10 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Mr" = ( +/turf/simulated/floor, +/area/engineering/engine_room) +"Ms" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green{ + dir = 9 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Mw" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 4 + }, +/turf/template_noop, +/area/rift/surfacebase/underground/under2) +"MN" = ( +/obj/machinery/door/blast/regular{ + dir = 2; + id = "SupermatterPort"; + name = "Reactor Blast Door" + }, +/obj/structure/grille, +/obj/structure/window/phoronreinforced/full{ + icon_state = "phoronwindow0" + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"Nd" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/red{ + dir = 1 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Nh" = ( +/obj/structure/cable/cyan{ + icon_state = "2-4" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Od" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"OU" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 + }, +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Pd" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ + dir = 1 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"PA" = ( +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 5 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"PL" = ( +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"QB" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red, +/turf/simulated/floor, +/area/engineering/engine_room) +"QE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"QG" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red, +/obj/machinery/door/blast/regular{ + dir = 2; + id = "SupermatterPort"; + name = "Reactor Blast Door" + }, +/obj/structure/grille, +/obj/structure/window/phoronreinforced/full{ + icon_state = "phoronwindow0" + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"QO" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 5 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"QQ" = ( +/turf/simulated/floor/greengrid/nitrogen, +/area/engineering/engine_room) +"Rf" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 10 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"RK" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Sp" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Su" = ( +/obj/machinery/atmospherics/component/binary/pump{ + dir = 8 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Sw" = ( +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/visible/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"SQ" = ( +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"Uh" = ( +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Vh" = ( +/obj/machinery/atmospherics/component/unary/heat_exchanger, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_room) +"VA" = ( +/obj/machinery/button/remote/blast_door{ + desc = "A remote control-switch for the engine charging port."; + id = "SupermatterPort"; + name = "Reactor Blast Doors"; + pixel_x = -32; + pixel_y = -5; + req_access = list(10) + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Wa" = ( +/obj/structure/cable/cyan{ + icon_state = "1-8" + }, +/obj/structure/cable/cyan{ + icon_state = "2-8" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Wd" = ( +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor, +/area/engineering/engine_room) +"Wp" = ( +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/manifold/visible/black{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Xt" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 9 + }, +/obj/machinery/meter, +/turf/simulated/floor, +/area/engineering/engine_room) +"Xx" = ( +/obj/machinery/door/airlock/hatch{ + icon_state = "door_locked"; + id_tag = "engine_access_hatch"; + locked = 1; + name = "Supermatter Core Access"; + req_access = list(11) + }, +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" + }, +/area/engineering/engine_room) +"XP" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline/blue, +/turf/simulated/floor, +/area/engineering/engine_room) +"Ys" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/green{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/turf/simulated/floor, +/area/engineering/engine_room) +"Zb" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/red, +/turf/simulated/floor, +/area/engineering/engine_room) +"ZS" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 + }, +/turf/simulated/floor, +/area/engineering/engine_room) + +(1,1,1) = {" +fS +fS +fS +fS +tC +tC +tC +tC +tC +tC +tC +tC +tC +tC +tC +tC +fS +fS +fS +fS +fS +fS +fS +"} +(2,1,1) = {" +fS +tC +oc +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +xf +fS +fS +fS +fS +fS +"} +(3,1,1) = {" +fS +tC +Mw +oc +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +jQ +tC +tC +tC +fS +fS +"} +(4,1,1) = {" +fS +tC +Mw +rs +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +xf +fS +"} +(5,1,1) = {" +fS +tC +rs +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +xf +Mw +fS +"} +(6,1,1) = {" +fS +fS +oc +xf +oc +xf +oc +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +jQ +Mw +fS +"} +(7,1,1) = {" +fS +fS +Mw +Mw +Mw +Mw +Mw +oc +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +jQ +fS +"} +(8,1,1) = {" +fS +fS +Mw +Mw +Mw +Mw +Mw +rs +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +xf +fS +"} +(9,1,1) = {" +fS +fS +Mw +Mw +Mw +Mw +rs +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +ve +xf +Mw +fS +"} +(10,1,1) = {" +fS +oc +jQ +Mw +Mw +Mw +tm +tm +tm +tm +tm +tm +tm +tm +tm +tm +tm +oc +ve +ve +jQ +Mw +fS +"} +(11,1,1) = {" +fS +uV +tC +rs +jQ +uV +tm +Mr +Mr +tm +AG +AG +AG +tm +Mr +Mr +tm +Mw +oc +ve +ve +jQ +fS +"} +(12,1,1) = {" +fS +jN +sj +sj +sj +Ia +tm +Mr +Mr +JZ +SQ +QQ +SQ +MN +Mr +Mr +tm +Mw +rs +ve +ve +xf +fS +"} +(13,1,1) = {" +fS +Ea +Am +Am +nG +Mr +hD +lf +QB +QG +vp +nM +dN +eE +QO +Mr +tm +rs +xf +tC +tC +Mw +fS +"} +(14,1,1) = {" +fS +uA +eN +Vh +yP +Mr +lf +Zb +Mr +JZ +Dc +QQ +SQ +MN +qy +Mr +tm +tC +uV +tC +tC +uV +fS +"} +(15,1,1) = {" +fS +uA +eN +Vh +yP +Mr +bA +Zb +Mr +tm +AG +AG +Xx +tm +uU +Mr +tm +Mr +wz +Mr +Mr +Kr +KT +"} +(16,1,1) = {" +fS +HM +PA +KW +Wp +LK +JM +AR +Mr +hD +JS +Cw +iU +VA +cz +Mr +hD +Mr +wz +Mr +Mr +Kr +KT +"} +(17,1,1) = {" +fS +Su +wF +Mr +wF +Mr +bA +Zb +Mr +Mr +Wd +LS +ju +Mr +qy +Mr +Mr +Mr +wz +Mr +Mr +Kr +KT +"} +(18,1,1) = {" +fS +lY +lY +Mr +lY +Mr +Me +Zb +Mr +Mr +Bd +bo +Ys +tt +AA +Ak +tt +tt +Ms +Mr +Mr +Kr +KT +"} +(19,1,1) = {" +fS +zI +Mr +Mr +Mr +Mr +Mr +Me +gY +QB +ck +LX +ck +gY +vk +Bx +LL +Mr +Br +LV +Gw +hk +KT +"} +(20,1,1) = {" +fS +Mr +Mr +Mr +Mr +Mr +Mr +Mr +LR +xl +Go +zD +dj +LR +rr +Go +RK +Mr +eZ +Mr +Mr +HF +KT +"} +(21,1,1) = {" +fS +Ih +Mr +Mr +Mr +Mr +Mr +Mr +Rf +eH +ZS +OU +yA +yA +JK +Pd +IE +LV +lT +Mr +Mr +Mr +KT +"} +(22,1,1) = {" +fS +Sp +Mr +Mr +Mr +Mr +Mr +Mr +Mr +fm +cM +mD +LV +LV +DK +Xt +Nd +LL +Pd +sq +Mr +cN +KT +"} +(23,1,1) = {" +fS +Mr +Mr +Mr +Mr +Mr +Mr +Mr +Mr +fm +Mr +Uh +Mr +Mr +fm +Mr +vZ +wS +vZ +wS +Mr +wf +KT +"} +(24,1,1) = {" +fS +Mr +og +eD +me +eD +eD +eD +eD +Ew +eD +Ce +eD +eD +El +Mr +yO +yO +XP +XP +Mr +Mr +KT +"} +(25,1,1) = {" +fS +ES +ah +Nh +ls +zw +Od +mz +mz +mz +mz +Wa +mz +mz +mz +mz +Od +zw +sy +Am +bV +Mr +KT +"} +(26,1,1) = {" +fS +sm +kD +id +PL +Sw +QE +FW +FW +FW +FW +FW +PL +FW +FW +FW +fC +Sw +gs +Ho +ri +Mr +KT +"} +(27,1,1) = {" +fS +fS +vr +kb +fS +fS +bw +bw +bw +bw +bw +fS +fS +bw +fS +fS +fS +fS +zJ +bw +fS +fS +fS +"} +(28,1,1) = {" +fS +fS +fS +fS +fS +fS +DO +Aj +nL +us +fS +fS +fS +fS +fS +fS +fS +fS +fS +fS +fS +fS +fS +"} +(29,1,1) = {" +fS +fS +fS +fS +fS +fS +FG +fS +fS +fS +ni +fS +fS +fS +fS +fS +fS +fS +fS +fS +fS +fS +fS +"} diff --git a/maps/rift/levels/rift-02-underground2.dmm b/maps/rift/levels/rift-02-underground2.dmm index ef3d3d91bed4..bc54efe72c3a 100644 --- a/maps/rift/levels/rift-02-underground2.dmm +++ b/maps/rift/levels/rift-02-underground2.dmm @@ -24,22 +24,6 @@ /obj/turbolift_map_holder/rift, /turf/simulated/floor/holofloor/tiled/dark, /area/turbolift/runder/level2) -"ah" = ( -/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ - dir = 4 - }, -/turf/simulated/floor/outdoors/snow/noblend/indoors/lythios43c{ - special_temperature = 233 - }, -/area/engineering/engine_room) -"ai" = ( -/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ - dir = 5 - }, -/turf/simulated/floor/outdoors/snow/noblend/indoors/lythios43c{ - special_temperature = 233 - }, -/area/engineering/engine_room) "aj" = ( /obj/effect/floor_decal/techfloor{ dir = 6 @@ -52,25 +36,9 @@ }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/public_bunker) -"ak" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/green{ - dir = 4 - }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint/sun, -/turf/simulated/floor, -/area/engineering/engine_room) -"al" = ( -/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ - dir = 9 - }, -/turf/simulated/floor/outdoors/snow/noblend/indoors/lythios43c{ - special_temperature = 233 - }, -/area/engineering/engine_room) "am" = ( -/turf/simulated/floor/outdoors/snow/noblend/indoors/lythios43c{ - special_temperature = 233 +/turf/simulated/floor/reinforced/nitrogen{ + initial_gas_mix = "n2=82.1472;TEMP=293.15" }, /area/engineering/engine_room) "an" = ( @@ -94,14 +62,6 @@ /obj/structure/closet/secure_closet/atmos_personal, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos/locker_room) -"aq" = ( -/obj/machinery/atmospherics/pipe/simple/visible/black{ - dir = 9 - }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint/sun, -/turf/simulated/floor/plating, -/area/engineering/engine_room) "ar" = ( /turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_room) @@ -135,23 +95,6 @@ /obj/item/clothing/glasses/welding, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/public_bunker) -"av" = ( -/obj/effect/floor_decal/rust, -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint/sun, -/turf/simulated/floor/plating/lythios43c{ - outdoors = 0 - }, -/area/engineering/engine_core) -"aw" = ( -/obj/effect/floor_decal/rust, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/turf/simulated/floor/plating/lythios43c{ - outdoors = 0 - }, -/area/engineering/engine_core) "ax" = ( /obj/effect/floor_decal/techfloor{ dir = 4 @@ -169,22 +112,6 @@ "aA" = ( /turf/simulated/wall/r_wall/prepainted/engineering, /area/crew_quarters/heads/chief) -"aC" = ( -/obj/machinery/air_alarm{ - dir = 1; - pixel_y = -25 - }, -/obj/structure/catwalk, -/obj/machinery/light, -/turf/simulated/floor, -/area/engineering/engine_room) -"aD" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/black{ - dir = 1 - }, -/obj/machinery/meter, -/turf/simulated/floor, -/area/engineering/engine_room) "aE" = ( /obj/spawner/window/low_wall/full/nogrille/firelocks, /obj/effect/paint/sun, @@ -266,14 +193,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/atmos) -"aQ" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/black{ - dir = 1 - }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint/sun, -/turf/simulated/floor/plating, -/area/engineering/engine_room) "aR" = ( /obj/structure/bed/chair/sofa/black/right, /turf/simulated/floor/plating, @@ -491,26 +410,6 @@ /obj/item/storage/single_use/med_pouch/trauma, /turf/simulated/floor/tiled, /area/engineering/foyer) -"bs" = ( -/obj/machinery/atmospherics/component/unary/heat_exchanger, -/obj/structure/window/phoronreinforced, -/obj/structure/window/phoronreinforced{ - dir = 8 - }, -/turf/simulated/floor, -/area/engineering/engine_room) -"bu" = ( -/obj/machinery/atmospherics/component/unary/heat_exchanger{ - dir = 1 - }, -/obj/structure/window/phoronreinforced{ - dir = 1 - }, -/obj/structure/window/phoronreinforced{ - dir = 8 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "by" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -551,23 +450,13 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/atmos) -"bI" = ( -/obj/machinery/atmospherics/pipe/tank{ - dir = 4 - }, -/turf/simulated/floor, -/area/engineering/engine_room) -"bJ" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green{ +"bK" = ( +/obj/structure/railing{ dir = 4 }, -/turf/simulated/floor, -/area/engineering/engine_room) -"bK" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/black, -/obj/machinery/meter, -/turf/simulated/floor, -/area/engineering/engine_room) +/obj/effect/overlay/snow/floor, +/turf/simulated/floor/plating, +/area/maintenance/atmos) "bL" = ( /obj/structure/table/woodentable, /obj/structure/flora/pottedplant/small{ @@ -583,44 +472,12 @@ "bO" = ( /turf/simulated/wall/prepainted, /area/maintenance/chapel) -"bQ" = ( -/turf/simulated/wall/r_wall/prepainted/engineering, -/area/engineering/engine_core) "bT" = ( -/obj/structure/table/steel_reinforced, -/obj/item/paper_bin, /obj/machinery/requests_console/preset/engineering{ pixel_y = -30 }, /turf/simulated/floor/tiled/monotile, -/area/engineering/engine_room) -"bU" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 6 - }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 - }, -/obj/machinery/atmospherics/component/unary/outlet_injector{ - dir = 4; - frequency = 1438; - id = "cooling_in"; - name = "Coolant Injector"; - pixel_y = 1; - power_rating = 30000; - use_power = 1; - volume_rate = 700 - }, -/turf/simulated/floor/reinforced/nitrogen{ - initial_gas_mix = "n2=82.1472;TEMP=293.15" - }, -/area/engineering/engine_core) -"bV" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/green, -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint/sun, -/turf/simulated/floor, -/area/engineering/engine_room) +/area/engineering/engine_monitoring) "bW" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -667,21 +524,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel_grid, /area/engineering/hallway) -"cd" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green{ - dir = 10 - }, -/obj/structure/catwalk, -/turf/simulated/floor, -/area/engineering/engine_room) "ce" = ( /obj/effect/floor_decal/borderfloor, /turf/simulated/floor/tiled/steel_grid, /area/engineering/hallway) -"cg" = ( -/obj/machinery/atmospherics/portables_connector, -/turf/simulated/floor, -/area/engineering/engine_room) "ch" = ( /obj/structure/table/bench/padded, /obj/machinery/light{ @@ -722,12 +568,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/secure_storage/critical) -"cp" = ( -/obj/machinery/atmospherics/component/binary/pump{ - dir = 8 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "cq" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -753,9 +593,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel_grid, /area/engineering/hallway) -"cr" = ( -/turf/simulated/floor/lythios43c/indoors, -/area/engineering/engine_room) "ct" = ( /obj/machinery/suit_storage_unit/atmos, /turf/simulated/floor/tiled, @@ -793,16 +630,12 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/heads/chief) -"cF" = ( -/obj/machinery/atmospherics/component/binary/circulator{ - anchored = 1; - dir = 1 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "cG" = ( -/turf/simulated/floor/greengrid/nitrogen, -/area/engineering/engine_core) +/obj/machinery/camera/network/engine{ + dir = 8 + }, +/turf/simulated/mineral/floor/icerock/lythios43c/indoors/ignore_cavegen, +/area/rift/surfacebase/underground/under2) "cK" = ( /obj/effect/floor_decal/techfloor{ dir = 6 @@ -827,14 +660,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/public_bunker) -"cM" = ( -/obj/machinery/power/generator{ - anchored = 1; - dir = 4 - }, -/obj/structure/cable/yellow, -/turf/simulated/floor, -/area/engineering/engine_room) "cN" = ( /obj/structure/catwalk, /obj/structure/cable/green{ @@ -843,20 +668,12 @@ /turf/simulated/floor/plating, /area/maintenance/lower/atmos) "cO" = ( -/obj/structure/window/reinforced{ - dir = 8 +/obj/machinery/portable_atmospherics/canister/empty, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 }, -/obj/structure/closet/radiation, -/obj/item/clothing/glasses/meson, -/obj/item/clothing/glasses/meson, -/turf/simulated/floor, +/turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_gas) -"cQ" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 9 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "cR" = ( /obj/effect/floor_decal/borderfloor, /obj/machinery/door/firedoor/glass{ @@ -899,13 +716,6 @@ "da" = ( /turf/simulated/wall/prepainted/engineering, /area/engineering/engine_smes) -"db" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/green{ - dir = 4 - }, -/obj/machinery/meter, -/turf/simulated/floor, -/area/engineering/engine_room) "dc" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -920,39 +730,7 @@ dir = 8 }, /turf/simulated/floor/tiled/steel_grid, -/area/engineering/engine_room) -"dg" = ( -/obj/machinery/computer/general_air_control/supermatter_core{ - dir = 4; - input_tag = "cooling_in"; - name = "Engine Cooling Control"; - output_tag = "cooling_out"; - sensors = list("engine_sensor"="Engine Core") - }, -/turf/simulated/floor/tiled/monotile, -/area/engineering/engine_room) -"dh" = ( -/obj/machinery/button/remote/blast_door{ - desc = "A remote control-switch for the engine charging port."; - id = "SupermatterPort"; - name = "Reactor Blast Doors"; - pixel_x = -25; - pixel_y = -5; - req_access = list(10) - }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 - }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/obj/machinery/button/remote/airlock{ - id = "engine_access_hatch"; - name = "Access Hatch bolts"; - pixel_x = -25; - pixel_y = 7; - specialfunctions = 4 - }, -/turf/simulated/floor, -/area/engineering/engine_room) +/area/engineering/engine_monitoring) "di" = ( /turf/simulated/floor/tiled/monotile, /area/engineering/engineering_monitoring) @@ -972,25 +750,6 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/engineering/hallway) -"dm" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/cyan, -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint/sun, -/turf/simulated/floor, -/area/engineering/engine_room) -"do" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/cyan{ - icon_state = "1-2" - }, -/turf/simulated/floor, -/area/engineering/engine_room) "dp" = ( /obj/machinery/door/airlock/engineeringatmos{ name = "Bunk Room" @@ -1000,10 +759,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/wood, /area/engineering/break_room) -"dq" = ( -/obj/machinery/atmospherics/component/quaternary/atmos_filter, -/turf/simulated/floor, -/area/engineering/engine_room) "dt" = ( /obj/structure/catwalk, /obj/structure/cable/green{ @@ -1014,10 +769,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/atmos) -"du" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green, -/turf/simulated/floor, -/area/engineering/engine_room) "dv" = ( /obj/effect/floor_decal/rust, /obj/structure/railing{ @@ -1028,27 +779,26 @@ "dw" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/maintenance/research/xenobio) -"dx" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/red, -/obj/machinery/meter, -/obj/effect/floor_decal/industrial/warning{ - dir = 10 - }, -/turf/simulated/floor, -/area/engineering/engine_room) -"dA" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/red, -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor, -/area/engineering/engine_room) "dD" = ( -/obj/structure/table/steel_reinforced, -/obj/machinery/fire_alarm/north_mount, -/obj/machinery/light{ - dir = 1 +/obj/machinery/button/remote/blast_door{ + desc = "A remote control-switch for the engine control room blast doors."; + id = "engine_monitor_blast"; + name = "Monitoring Room Blast Doors"; + pixel_y = 9; + req_access = list(10); + pixel_x = 6 }, +/obj/machinery/button/remote/blast_door{ + desc = "A remote control-switch for the engine charging port."; + id = "engine_room_blast"; + name = "Engine Room Window Blast Doors"; + pixel_x = -7; + pixel_y = 9; + req_access = list(10) + }, +/obj/structure/table/marble, /turf/simulated/floor/tiled/monotile, -/area/engineering/engine_room) +/area/engineering/engine_monitoring) "dE" = ( /obj/machinery/light, /turf/simulated/floor/lino, @@ -1112,23 +862,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/mining) -"dP" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/black{ - dir = 4 - }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint/sun, -/turf/simulated/floor/plating, -/area/engineering/engine_room) -"dQ" = ( -/obj/machinery/shield_diffuser, -/obj/machinery/door/blast/regular{ - dir = 4; - id = "EngineVent"; - name = "Reactor Vent" - }, -/turf/simulated/floor/greengrid/nitrogen, -/area/engineering/engine_core) "dR" = ( /obj/effect/floor_decal/borderfloor, /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -1152,10 +885,6 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/plating, /area/engineering/storage) -"dX" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red, -/turf/simulated/floor, -/area/engineering/engine_room) "dY" = ( /obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ @@ -1481,44 +1210,6 @@ "eK" = ( /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/engi_wash) -"eL" = ( -/obj/structure/grille, -/obj/structure/window/phoronreinforced, -/obj/structure/window/phoronreinforced{ - dir = 1 - }, -/obj/structure/window/phoronreinforced{ - dir = 8 - }, -/obj/structure/window/phoronreinforced{ - dir = 4 - }, -/obj/machinery/door/blast/regular{ - dir = 4; - id = "SupermatterPort"; - name = "Reactor Blast Door" - }, -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 4 - }, -/turf/simulated/floor, -/area/engineering/engine_core) -"eM" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/machinery/air_sensor{ - frequency = 1438; - id_tag = "engine_sensor"; - output = 63 - }, -/turf/simulated/floor/reinforced/nitrogen{ - initial_gas_mix = "n2=82.1472;TEMP=293.15" - }, -/area/engineering/engine_core) "eN" = ( /obj/structure/catwalk, /obj/structure/cable/green{ @@ -1526,13 +1217,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/atmos) -"eQ" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/green, -/turf/simulated/floor, -/area/engineering/engine_room) "eT" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 1 @@ -1559,6 +1243,10 @@ }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/public_bunker) +"eW" = ( +/obj/machinery/light, +/turf/simulated/floor/tiled, +/area/engineering/engine_eva) "eX" = ( /obj/machinery/fire_alarm/east_mount, /obj/structure/cable{ @@ -1578,7 +1266,7 @@ icon_state = "1-2" }, /turf/simulated/floor/tiled/steel_grid, -/area/engineering/engine_room) +/area/engineering/engine_monitoring) "fa" = ( /obj/machinery/door/firedoor/glass, /obj/structure/cable{ @@ -1587,12 +1275,6 @@ /obj/structure/cable, /turf/simulated/floor/plating, /area/maintenance/substation/atmos) -"fb" = ( -/obj/machinery/atmospherics/pipe/simple/heat_exchanging, -/turf/simulated/floor/outdoors/snow/noblend/indoors/lythios43c{ - special_temperature = 233 - }, -/area/engineering/engine_room) "ff" = ( /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/chief) @@ -1610,20 +1292,10 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/public_bunker) -"fh" = ( -/obj/machinery/atmospherics/component/binary/circulator{ - anchored = 1 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "fi" = ( /obj/landmark/spawnpoint/job/station_engineer, /turf/simulated/floor/tiled/steel, /area/engineering/locker_room) -"fj" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/black, -/turf/simulated/floor, -/area/engineering/engine_room) "fk" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 @@ -1636,18 +1308,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/hallway/primary/undertwo) -"fm" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 10 - }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 - }, -/obj/structure/cable/cyan{ - icon_state = "1-2" - }, -/turf/simulated/floor, -/area/engineering/engine_room) "fn" = ( /obj/landmark/spawnpoint/job/atmospheric_technician, /turf/simulated/floor/tiled/steel, @@ -1718,8 +1378,14 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/engineering/hallway) +"fD" = ( +/obj/machinery/portable_atmospherics/canister/nitrous_oxide, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_gas) "fE" = ( -/obj/machinery/power/smes/buildable/engine, /obj/structure/sign/securearea{ desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; @@ -1727,16 +1393,9 @@ pixel_x = -32 }, /obj/structure/cable/cyan, +/obj/machinery/power/smes/buildable/engine/rust, /turf/simulated/floor, /area/engineering/engine_smes) -"fF" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ - dir = 8 - }, -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint/sun, -/turf/simulated/floor, -/area/engineering/engine_room) "fG" = ( /obj/structure/catwalk, /obj/structure/cable/cyan{ @@ -1866,23 +1525,12 @@ /obj/effect/floor_decal/borderfloor, /turf/simulated/floor/tiled/steel, /area/hallway/primary/undertwo) -"ga" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor, -/area/engineering/engine_room) -"gc" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ - dir = 1 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "gd" = ( /obj/structure/table/steel_reinforced, /obj/item/storage/firstaid/toxin, +/obj/item/storage/single_use/med_pouch/radiation, /turf/simulated/floor/tiled/monotile, -/area/engineering/engine_room) +/area/engineering/engine_monitoring) "ge" = ( /obj/effect/floor_decal/borderfloor, /obj/machinery/light, @@ -1904,11 +1552,6 @@ }, /turf/simulated/floor/tiled/steel, /area/rift/station/stairs_one) -"gg" = ( -/turf/simulated/floor/outdoors/snow/noblend/indoors/lythios43c{ - special_temperature = 233 - }, -/area/rift/surfacebase/underground/under2) "gk" = ( /obj/effect/floor_decal/borderfloor, /obj/machinery/light, @@ -1930,13 +1573,6 @@ }, /turf/simulated/floor/tiled/steel, /area/rift/station/stairs_one) -"gn" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/red{ - dir = 8 - }, -/obj/structure/catwalk, -/turf/simulated/floor, -/area/engineering/engine_room) "go" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -1963,14 +1599,6 @@ dir = 8 }, /area/engineering/foyer) -"gr" = ( -/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ - dir = 1 - }, -/turf/simulated/floor/outdoors/snow/noblend/lythios43c{ - special_temperature = 233 - }, -/area/engineering/engine_room) "gs" = ( /obj/structure/table/reinforced, /obj/random/tool, @@ -2013,42 +1641,8 @@ /turf/simulated/floor/tiled/steel, /area/rift/station/stairs_one) "gy" = ( -/obj/structure/table/steel_reinforced, -/obj/machinery/button/remote/blast_door{ - desc = "A remote control-switch for the engine control room blast doors."; - id = "sm_monitor_blast"; - name = "Engine Monitoring Room Blast Doors"; - pixel_y = -3; - req_access = list(10) - }, -/obj/machinery/button/remote/blast_door{ - desc = "A remote control-switch for the engine charging port."; - id = "SupermatterPort"; - name = "Reactor Blast Doors"; - pixel_x = -6; - pixel_y = 7; - req_access = list(10) - }, -/obj/machinery/button/remote/emitter{ - desc = "A remote control-switch for the engine emitter."; - id = "EngineEmitter"; - name = "Engine Emitter"; - pixel_x = 6; - pixel_y = 7; - req_access = list(10) - }, /turf/simulated/floor/tiled/steel_grid, -/area/engineering/engine_room) -"gz" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/black{ - dir = 1 - }, -/obj/machinery/meter, -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor, -/area/engineering/engine_room) +/area/engineering/engine_monitoring) "gC" = ( /obj/structure/curtain/open/bed{ name = "brown curtain" @@ -2058,15 +1652,15 @@ }, /turf/simulated/floor/wood, /area/engineering/break_room) -"gD" = ( -/obj/machinery/atmospherics/component/binary/pump/high_power, -/turf/simulated/floor, -/area/engineering/engine_room) "gF" = ( /obj/machinery/vending/engivend, /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/steel, /area/engineering/locker_room) +"gG" = ( +/obj/map_helper/engine_loader, +/turf/simulated/mineral/icerock/lythios43c, +/area/rift/surfacebase/underground/under2) "gH" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced{ @@ -2170,14 +1764,6 @@ /obj/machinery/computer/skills, /turf/simulated/floor/carpet/oracarpet, /area/crew_quarters/heads/chief) -"gT" = ( -/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ - dir = 5 - }, -/turf/simulated/floor/outdoors/snow/noblend/lythios43c{ - special_temperature = 233 - }, -/area/engineering/engine_room) "gU" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -2340,27 +1926,10 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel_grid, /area/engineering/hallway) -"hz" = ( -/obj/structure/catwalk, -/obj/machinery/air_alarm{ - dir = 8; - pixel_x = 24 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/camera/network/engine{ - dir = 8 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "hA" = ( /obj/structure/table/steel_reinforced, /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/critical) -"hC" = ( -/obj/machinery/shield_diffuser, -/turf/simulated/wall/r_wall/prepainted/engineering, -/area/engineering/engine_core) "hE" = ( /obj/structure/bed/chair/comfy/beige{ dir = 1 @@ -2414,24 +1983,11 @@ /obj/landmark/spawnpoint/job/chief_engineer, /turf/simulated/floor/carpet/oracarpet, /area/crew_quarters/heads/chief) -"hN" = ( -/obj/machinery/computer/security/engineering{ - dir = 4 - }, -/turf/simulated/floor/tiled/monotile, -/area/engineering/engine_room) "hQ" = ( -/obj/machinery/computer/sm_monitor{ - dir = 4 - }, -/turf/simulated/floor/tiled/monotile, -/area/engineering/engine_room) -"hR" = ( -/obj/machinery/atmospherics/pipe/simple/visible/black{ - dir = 4 - }, -/turf/simulated/floor, -/area/engineering/engine_room) +/obj/structure/catwalk, +/obj/structure/railing, +/turf/simulated/floor/plating, +/area/maintenance/atmos) "hS" = ( /obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ @@ -2439,18 +1995,6 @@ }, /turf/simulated/floor/tiled/steel, /area/engineering/atmos/locker_room) -"hT" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/green{ - dir = 8 - }, -/turf/simulated/floor, -/area/engineering/engine_room) -"hU" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ - dir = 4 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "hV" = ( /obj/effect/floor_decal/borderfloor/corner, /obj/effect/floor_decal/steeldecal/steel_decals5{ @@ -2492,23 +2036,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/secure_storage/lower) -"ij" = ( -/obj/effect/floor_decal/industrial/warning/cee{ - dir = 8 - }, -/turf/simulated/floor/reinforced/nitrogen{ - initial_gas_mix = "n2=82.1472;TEMP=293.15" - }, -/area/engineering/engine_core) -"ik" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/reinforced/nitrogen{ - initial_gas_mix = "n2=82.1472;TEMP=293.15" - }, -/area/engineering/engine_core) "io" = ( /obj/structure/railing, /obj/random/trash_pile, @@ -2522,36 +2049,6 @@ /obj/machinery/floodlight, /turf/simulated/floor/plating, /area/maintenance/lower/mining) -"ir" = ( -/obj/machinery/mass_driver{ - dir = 8; - id = "enginecore" - }, -/obj/machinery/power/supermatter{ - layer = 4 - }, -/obj/effect/engine_setup/core, -/turf/simulated/floor/greengrid/nitrogen, -/area/engineering/engine_core) -"is" = ( -/obj/structure/grille, -/obj/structure/window/phoronreinforced, -/obj/structure/window/phoronreinforced{ - dir = 1 - }, -/obj/structure/window/phoronreinforced{ - dir = 8 - }, -/obj/structure/window/phoronreinforced{ - dir = 4 - }, -/obj/machinery/door/blast/regular{ - dir = 4; - id = "SupermatterPort"; - name = "Reactor Blast Door" - }, -/turf/simulated/floor, -/area/engineering/engine_core) "it" = ( /obj/structure/girder/reinforced, /obj/structure/foamedmetal, @@ -2604,12 +2101,7 @@ /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 9 }, -/obj/machinery/camera/network/engine{ - dir = 8 - }, -/turf/simulated/floor/outdoors/snow/noblend/lythios43c{ - special_temperature = 233 - }, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_room) "iA" = ( /obj/machinery/door/airlock/maintenance/rnd, @@ -2632,33 +2124,11 @@ }, /turf/simulated/floor/wood, /area/engineering/break_room) -"iE" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ - dir = 8 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "iF" = ( /obj/item/storage/box/monkeycubes, /obj/structure/table/rack/shelf, /turf/simulated/floor/plating, /area/maintenance/research/xenobio) -"iG" = ( -/obj/structure/foamedmetal, -/turf/simulated/floor, -/area/rift/surfacebase/underground/under2) -"iH" = ( -/obj/structure/cable/cyan{ - icon_state = "2-4" - }, -/turf/simulated/floor, -/area/engineering/engine_room) -"iI" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 6 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "iJ" = ( /obj/machinery/atmospherics/pipe/tank/air{ dir = 1 @@ -2677,12 +2147,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/secure_storage/critical) -"iM" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 4 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "iN" = ( /obj/machinery/light/small{ dir = 4 @@ -2710,10 +2174,6 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/engineering/hallway) -"iQ" = ( -/obj/machinery/atmospherics/valve/digital, -/turf/simulated/floor, -/area/engineering/engine_room) "iU" = ( /obj/structure/bed/chair{ dir = 1 @@ -2726,7 +2186,7 @@ "iW" = ( /obj/machinery/recharge_station, /turf/simulated/floor/tiled/monotile, -/area/engineering/engine_room) +/area/engineering/engine_monitoring) "iX" = ( /obj/structure/table/reinforced, /obj/machinery/microwave, @@ -2746,8 +2206,9 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos/locker_room) "jc" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint/sun, +/obj/machinery/camera/network/engine{ + dir = 4 + }, /turf/simulated/floor, /area/engineering/engine_room) "jd" = ( @@ -2828,7 +2289,7 @@ /obj/structure/sign/securearea{ pixel_y = 32 }, -/turf/simulated/floor/outdoors/snow/lythios43c, +/turf/simulated/mineral/floor/icerock/lythios43c/indoors/ignore_cavegen, /area/rift/surfacebase/underground/under2) "jo" = ( /turf/simulated/wall/r_wall/prepainted, @@ -2905,24 +2366,10 @@ }, /turf/simulated/floor/tiled/steel, /area/quartermaster/miningdock) -"jy" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 4 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "jz" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/structure/cable/cyan{ - icon_state = "1-8" - }, -/obj/structure/cable/cyan{ - icon_state = "1-2" - }, +/obj/structure/foamedmetal, /turf/simulated/floor, -/area/engineering/engine_room) +/area/maintenance/atmos) "jA" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -2961,7 +2408,10 @@ /area/engineering/engine_airlock) "jC" = ( /obj/machinery/portable_atmospherics/canister/carbon_dioxide, -/turf/simulated/floor, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_gas) "jD" = ( /turf/simulated/wall/r_wall/prepainted/engineering, @@ -3420,7 +2870,7 @@ dir = 8 }, /obj/effect/overlay/snow/floor, -/turf/simulated/floor/plating, +/turf/simulated/wall/r_wall/prepainted, /area/maintenance/atmos) "kD" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -3519,13 +2969,7 @@ /turf/simulated/floor/wood, /area/engineering/break_room) "kW" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/black{ - dir = 1 - }, -/obj/machinery/air_alarm{ - desc = " "; - pixel_y = 24 - }, +/obj/machinery/camera/network/engine, /turf/simulated/floor, /area/engineering/engine_room) "kX" = ( @@ -3549,12 +2993,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/secure_storage/critical) -"kY" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green{ - dir = 6 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "kZ" = ( /obj/structure/cable{ icon_state = "4-8" @@ -3610,10 +3048,9 @@ /turf/simulated/floor/tiled/monotile, /area/hallway/primary/undertwo) "lk" = ( -/turf/simulated/open/lythios43c{ - outdoors = 0 - }, -/area/engineering/engine_core) +/obj/structure/foamedmetal, +/turf/simulated/floor, +/area/rift/surfacebase/underground/under2) "ll" = ( /turf/simulated/floor/tiled/monotile, /area/hallway/primary/undertwo) @@ -3655,18 +3092,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/engineering/engineering_monitoring) -"lt" = ( -/obj/machinery/atmospherics/component/unary/heat_exchanger{ - dir = 1 - }, -/obj/structure/window/phoronreinforced{ - dir = 1 - }, -/obj/structure/window/phoronreinforced{ - dir = 4 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "lu" = ( /obj/machinery/photocopier, /turf/simulated/floor/lino, @@ -3698,32 +3123,25 @@ /obj/machinery/light, /turf/simulated/floor/tiled/white, /area/rnd/secure_storage/lower) +"ly" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor, +/area/rnd/secure_storage/lower) "lz" = ( /obj/structure/table/steel, /obj/item/storage/fancy/candle_box, /obj/item/flame/lighter, /turf/simulated/floor/plating, /area/maintenance/chapel) -"lA" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 6 - }, -/turf/simulated/floor, -/area/engineering/engine_room) -"lB" = ( -/obj/machinery/air_alarm{ - desc = " "; - pixel_y = 24 - }, -/turf/simulated/floor, -/area/engineering/engine_room) -"lC" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 10 - }, -/obj/structure/catwalk, -/turf/simulated/floor, -/area/engineering/engine_room) "lD" = ( /obj/machinery/camera/network/engineering{ dir = 4 @@ -3737,12 +3155,6 @@ }, /turf/simulated/floor/tiled/steel, /area/engineering/atmos/locker_room) -"lF" = ( -/obj/machinery/atmospherics/portables_connector{ - dir = 1 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "lG" = ( /obj/structure/undies_wardrobe, /obj/machinery/light/small{ @@ -3795,9 +3207,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/engine_airlock) -"lS" = ( -/turf/simulated/mineral/icerock/lythios43c, -/area/engineering/engine_room) "lT" = ( /obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ @@ -3805,10 +3214,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/critical/vault1) -"lU" = ( -/obj/machinery/atmospherics/component/binary/pump, -/turf/simulated/floor, -/area/engineering/engine_room) "lV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -3867,18 +3272,6 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/undertwo) -"mc" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 6 - }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 - }, -/obj/machinery/camera/network/engine{ - dir = 4 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "md" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 4 @@ -3905,13 +3298,8 @@ /turf/simulated/floor/plating, /area/maintenance/lower/atmos) "mg" = ( -/obj/structure/closet/radiation, -/obj/item/clothing/glasses/meson, -/obj/item/clothing/glasses/meson, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor, +/obj/machinery/portable_atmospherics/canister/empty, +/turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_gas) "mh" = ( /obj/effect/floor_decal/borderfloor{ @@ -3957,16 +3345,6 @@ /obj/structure/catwalk, /turf/simulated/floor, /area/engineering/engine_gas) -"mk" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 4 - }, -/obj/machinery/meter, -/obj/effect/floor_decal/industrial/warning{ - dir = 9 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "ml" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -4072,12 +3450,6 @@ "mA" = ( /turf/simulated/floor, /area/engineering/engine_room) -"mB" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 5 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "mC" = ( /obj/effect/floor_decal/rust, /turf/simulated/floor/lythios43c/indoors, @@ -4631,17 +4003,11 @@ }, /turf/simulated/floor/tiled/steel, /area/rift/station/stairs_one) -"nX" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 5 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "oa" = ( /obj/structure/fence/door{ dir = 4 }, -/turf/simulated/floor/outdoors/snow/lythios43c, +/turf/simulated/mineral/floor/icerock/lythios43c/indoors/ignore_cavegen, /area/rift/surfacebase/underground/under2) "ob" = ( /obj/structure/table/steel_reinforced, @@ -4801,7 +4167,7 @@ "ov" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/steel_grid, -/area/engineering/engine_room) +/area/engineering/engine_monitoring) "ox" = ( /obj/effect/floor_decal/techfloor{ dir = 5 @@ -4843,18 +4209,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/workshop) -"oG" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 4 - }, -/obj/machinery/door/airlock/hatch{ - icon_state = "door_locked"; - id_tag = "engine_access_hatch"; - locked = 1; - req_access = list(11) - }, -/turf/simulated/floor, -/area/engineering/engine_core) "oI" = ( /obj/effect/floor_decal/borderfloor, /obj/structure/cable/green{ @@ -4878,12 +4232,6 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, /area/maintenance/atmos) -"oM" = ( -/obj/machinery/atmospherics/component/binary/pump{ - dir = 1 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "oN" = ( /obj/structure/bed/chair{ dir = 8 @@ -5354,19 +4702,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/atmos) -"pW" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ - dir = 8 - }, -/obj/machinery/meter, -/turf/simulated/floor, -/area/engineering/engine_room) -"pX" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green{ - dir = 5 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "pZ" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/steel, @@ -5375,7 +4710,7 @@ /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, /turf/simulated/floor/tiled/monotile, -/area/engineering/engine_room) +/area/engineering/engine_monitoring) "qc" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -5443,13 +4778,6 @@ /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled, /area/quartermaster/miningdock) -"qo" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/red{ - dir = 4 - }, -/obj/machinery/meter, -/turf/simulated/floor, -/area/engineering/engine_room) "qp" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 @@ -5457,6 +4785,15 @@ /obj/machinery/light, /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/critical/vault2) +"qq" = ( +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'RADIOACTIVE AREA'"; + icon_state = "radiation"; + name = "RADIOACTIVE AREA"; + pixel_x = 32 + }, +/turf/simulated/floor/outdoors/snow/noblend/indoors/lythios43c, +/area/rift/surfacebase/underground/under2) "qr" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 @@ -5478,17 +4815,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techfloor, /area/engineering/locker_room) -"qu" = ( -/obj/effect/floor_decal/industrial/warning/cee{ - dir = 8 - }, -/obj/machinery/camera/network/engine{ - dir = 4 - }, -/turf/simulated/floor/reinforced/nitrogen{ - initial_gas_mix = "n2=82.1472;TEMP=293.15" - }, -/area/engineering/engine_core) "qx" = ( /obj/structure/curtain/open/bed{ name = "brown curtain" @@ -5527,34 +4853,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/engine_eva) -"qI" = ( -/obj/machinery/camera/network/engine{ - dir = 8 - }, -/turf/simulated/floor/outdoors/snow/noblend/indoors/lythios43c{ - special_temperature = 233 - }, -/area/engineering/engine_room) -"qN" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green, -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/camera/network/engine{ - dir = 4 - }, -/turf/simulated/floor, -/area/engineering/engine_room) -"qP" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 9 - }, -/obj/structure/cable/cyan{ - icon_state = "1-2" - }, -/turf/simulated/floor, -/area/engineering/engine_room) "qR" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -5728,12 +5026,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/cryo) -"rB" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 4 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "rC" = ( /obj/structure/catwalk, /obj/structure/cable/green{ @@ -5806,7 +5098,7 @@ icon_state = "1-2" }, /turf/simulated/floor/tiled/monotile, -/area/engineering/engine_room) +/area/engineering/engine_monitoring) "rI" = ( /obj/structure/catwalk, /obj/structure/cable/green{ @@ -5899,6 +5191,10 @@ /obj/structure/cable, /turf/simulated/floor, /area/engineering/engine_smes) +"rY" = ( +/obj/machinery/portable_atmospherics/canister/nitrous_oxide, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_gas) "rZ" = ( /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel, @@ -6098,15 +5394,6 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/undertwo) -"sN" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "sO" = ( /obj/structure/table/rack/shelf, /obj/item/extinguisher, @@ -6153,14 +5440,6 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, /area/maintenance/atmos) -"sX" = ( -/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ - dir = 10 - }, -/turf/simulated/floor/outdoors/snow/noblend/indoors/lythios43c{ - special_temperature = 233 - }, -/area/engineering/engine_room) "sZ" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -6183,7 +5462,7 @@ icon_state = "1-2" }, /turf/simulated/floor/tiled/steel_grid, -/area/engineering/engine_room) +/area/engineering/engine_monitoring) "tf" = ( /obj/machinery/fire_alarm/north_mount, /obj/effect/floor_decal/techfloor{ @@ -6344,6 +5623,12 @@ }, /turf/simulated/floor/tiled/techmaint, /area/quartermaster/miningdock) +"tL" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/heads/chief) "tN" = ( /obj/machinery/conveyor{ id = "miningops" @@ -6414,11 +5699,12 @@ "ui" = ( /obj/machinery/portable_atmospherics/canister/phoron, /obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/turf/simulated/floor, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_gas) "uj" = ( /turf/simulated/wall/r_wall/prepainted, -/area/engineering/engine_room) +/area/maintenance/atmos) "uk" = ( /obj/structure/catwalk, /obj/machinery/door/airlock/maintenance/common, @@ -6531,8 +5817,7 @@ /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/secure_storage/critical/vault2) "uD" = ( -/obj/structure/foamedmetal, -/turf/simulated/floor, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/storage) "uG" = ( /turf/simulated/wall/prepainted, @@ -6873,14 +6158,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/critical/records) -"vY" = ( -/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ - dir = 10 - }, -/turf/simulated/floor/outdoors/snow/noblend/lythios43c{ - special_temperature = 233 - }, -/area/engineering/engine_room) "vZ" = ( /obj/machinery/mineral/input, /obj/machinery/conveyor{ @@ -7263,19 +6540,9 @@ }, /turf/simulated/floor/plating, /area/maintenance/chapel) -"xn" = ( -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/structure/cable/cyan{ - icon_state = "4-8" - }, -/turf/simulated/floor, -/area/engineering/engine_room) +"xp" = ( +/turf/simulated/floor/outdoors/snow/noblend/indoors/lythios43c, +/area/rift/surfacebase/underground/under2) "xq" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 @@ -7503,7 +6770,7 @@ dir = 1 }, /turf/simulated/floor/tiled/monotile, -/area/engineering/engine_room) +/area/engineering/engine_monitoring) "xV" = ( /obj/effect/floor_decal/techfloor{ dir = 1 @@ -7642,12 +6909,6 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/refinery) -"yD" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 10 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "yG" = ( /obj/effect/floor_decal/techfloor{ dir = 1 @@ -7738,16 +6999,6 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/engineering/hallway) -"yV" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/yellow, -/obj/structure/cable/cyan{ - icon_state = "1-2" - }, -/turf/simulated/floor, -/area/engineering/engine_room) "yZ" = ( /obj/machinery/button/remote/driver{ id = "enginecore"; @@ -7902,7 +7153,7 @@ /area/engineering/hallway) "zG" = ( /turf/simulated/floor/tiled/monotile, -/area/engineering/engine_room) +/area/engineering/engine_monitoring) "zJ" = ( /turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_airlock) @@ -7966,7 +7217,7 @@ }, /mob/living/simple_mob/animal/passive/bird/parrot/polly, /turf/simulated/floor/tiled/steel_grid, -/area/engineering/engine_room) +/area/engineering/engine_monitoring) "Aa" = ( /obj/machinery/light_switch{ dir = 8; @@ -7982,14 +7233,6 @@ }, /turf/simulated/floor/lino, /area/chapel/office) -"Ac" = ( -/obj/machinery/atmospherics/component/unary/heat_exchanger, -/obj/structure/window/phoronreinforced, -/obj/structure/window/phoronreinforced{ - dir = 4 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "Ad" = ( /obj/effect/floor_decal/borderfloor/corner, /obj/effect/floor_decal/borderfloor/corner{ @@ -8010,7 +7253,8 @@ /obj/structure/cable/cyan{ icon_state = "0-2" }, -/turf/simulated/floor, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_gas) "Aj" = ( /obj/structure/railing, @@ -8070,6 +7314,12 @@ "Aw" = ( /turf/simulated/wall/prepainted/civilian, /area/chapel/chapel_morgue) +"Ax" = ( +/obj/effect/overlay/snow/floor/pointy{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/maintenance/atmos) "Ay" = ( /obj/random/trash_pile, /obj/structure/railing{ @@ -8161,9 +7411,6 @@ }, /turf/simulated/floor/plating, /area/engineering/storage) -"AS" = ( -/turf/simulated/floor/lythios43c, -/area/engineering/engine_room) "AT" = ( /obj/effect/floor_decal/spline/plain{ dir = 4 @@ -8193,14 +7440,6 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/chapel/main) -"Bd" = ( -/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ - dir = 8 - }, -/turf/simulated/floor/outdoors/snow/noblend/lythios43c{ - special_temperature = 233 - }, -/area/engineering/engine_room) "Be" = ( /obj/item/bone/arm, /turf/simulated/floor/outdoors/snow/lythios43c, @@ -8242,14 +7481,6 @@ }, /turf/simulated/floor/plating, /area/engineering/storage) -"Bo" = ( -/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ - dir = 9 - }, -/turf/simulated/floor/outdoors/snow/noblend/lythios43c{ - special_temperature = 233 - }, -/area/engineering/engine_room) "Bq" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/secure_storage/critical/vault1) @@ -8525,6 +7756,10 @@ /obj/effect/overlay/snow/floor/pointy{ dir = 8 }, +/obj/effect/overlay/snow/floor/pointy, +/obj/effect/overlay/snow/floor/pointy{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/atmos) "Ch" = ( @@ -8590,16 +7825,6 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/engineering/hallway) -"Cz" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/cable/cyan{ - icon_state = "1-2" - }, -/turf/simulated/floor, -/area/engineering/engine_room) "CA" = ( /turf/simulated/shuttle/wall/voidcraft/hard_corner, /area/turbolift/rmine/under2) @@ -8611,12 +7836,10 @@ "CC" = ( /turf/simulated/floor/tiled/steel, /area/quartermaster/miningdock) -"CD" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/simulated/floor, -/area/engineering/engine_room) +"CG" = ( +/obj/machinery/lathe/autolathe, +/turf/simulated/floor/tiled, +/area/engineering/workshop) "CH" = ( /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, /obj/effect/paint/sun, @@ -8689,28 +7912,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/foyer) -"CR" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 5 - }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 - }, -/obj/machinery/atmospherics/component/unary/vent_pump/engine{ - dir = 4; - external_pressure_bound = 100; - external_pressure_bound_default = 0; - frequency = 1438; - icon_state = "map_vent_in"; - id_tag = "cooling_out"; - initialize_directions = 4; - on = 1; - pump_direction = 0 - }, -/turf/simulated/floor/reinforced/nitrogen{ - initial_gas_mix = "n2=82.1472;TEMP=293.15" - }, -/area/engineering/engine_core) "CT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -8756,16 +7957,6 @@ }, /turf/simulated/floor/tiled/dark, /area/chapel/main) -"Db" = ( -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/turf/simulated/floor, -/area/engineering/engine_room) "Dc" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -8908,20 +8099,6 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/engineering/atmos/hallway) -"Dt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor, -/area/engineering/engine_room) -"Dv" = ( -/obj/machinery/fire_alarm/north_mount, -/obj/machinery/camera/network/engine, -/turf/simulated/floor, -/area/engineering/engine_room) "Dx" = ( /obj/structure/table/reinforced, /obj/item/storage/toolbox/mechanical{ @@ -8977,13 +8154,6 @@ }, /turf/simulated/floor/plating, /area/engineering/storage) -"DL" = ( -/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, -/obj/effect/paint/sun, -/turf/simulated/floor/plating/lythios43c{ - outdoors = 0 - }, -/area/engineering/engine_core) "DM" = ( /turf/simulated/wall/r_wall/prepainted/civilian, /area/crew_quarters/public_bunker) @@ -9077,10 +8247,7 @@ /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/lower) "Eb" = ( -/obj/machinery/atmospherics/pipe/simple/heat_exchanging, -/turf/simulated/floor/outdoors/snow/noblend/lythios43c{ - special_temperature = 233 - }, +/turf/simulated/floor/greengrid/nitrogen, /area/engineering/engine_room) "Ec" = ( /turf/simulated/floor/tiled/steel, @@ -9113,12 +8280,6 @@ }, /turf/simulated/floor/tiled/steel, /area/quartermaster/miningdock) -"Ep" = ( -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "Eq" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -9362,10 +8523,6 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/refinery) -"Fm" = ( -/obj/structure/catwalk, -/turf/simulated/floor, -/area/engineering/engine_room) "Fn" = ( /obj/effect/floor_decal/spline/plain{ dir = 1 @@ -9390,11 +8547,10 @@ /turf/simulated/floor/tiled/steel_ridged, /area/quartermaster/belterdock/refinery) "Fv" = ( -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/foamedmetal, +/obj/structure/foamedmetal, /turf/simulated/floor, -/area/engineering/engine_room) +/area/rift/surfacebase/underground/under2) "Fy" = ( /obj/structure/closet, /obj/random/maintenance/cargo, @@ -9676,12 +8832,6 @@ "GG" = ( /turf/simulated/shuttle/wall/voidcraft, /area/turbolift/rmine/under2) -"GH" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/simulated/floor, -/area/engineering/engine_room) "GI" = ( /obj/structure/morgue{ dir = 2 @@ -9706,13 +8856,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/secure_storage/lower) -"GO" = ( -/obj/machinery/air_alarm{ - dir = 1; - pixel_y = -25 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "GP" = ( /obj/effect/floor_decal/techfloor{ dir = 4 @@ -9722,10 +8865,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/cryo) -"GQ" = ( -/obj/structure/frame, -/turf/simulated/floor, -/area/engineering/engine_room) "GS" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -9770,16 +8909,6 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, /area/maintenance/lower/mining) -"GZ" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/red, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 - }, -/obj/structure/cable/cyan{ - icon_state = "1-2" - }, -/turf/simulated/floor, -/area/engineering/engine_room) "Ha" = ( /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, /obj/effect/paint/palebottlegreen, @@ -9823,22 +8952,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/engineering/workshop) -"Hg" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/cyan, -/turf/simulated/floor, -/area/engineering/engine_room) -"Hi" = ( -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/turf/simulated/floor, -/area/engineering/engine_room) "Hj" = ( /obj/structure/bed/chair/pew{ dir = 8 @@ -9904,10 +9017,6 @@ /obj/structure/closet/crate, /turf/simulated/floor/tiled/steel, /area/quartermaster/miningdock) -"Ht" = ( -/obj/structure/ladder/up, -/turf/simulated/floor/lythios43c/indoors, -/area/engineering/engine_room) "Hw" = ( /obj/machinery/door/airlock/maintenance/common{ req_one_access = list(27) @@ -9935,8 +9044,14 @@ dir = 1; pixel_y = -25 }, +/obj/structure/closet/radiation, +/obj/item/clothing/glasses/meson, +/obj/item/clothing/glasses/meson, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/simulated/floor/tiled/monotile, -/area/engineering/engine_room) +/area/engineering/engine_monitoring) "HE" = ( /obj/structure/closet/radiation, /obj/machinery/light, @@ -10204,14 +9319,8 @@ /turf/simulated/floor, /area/maintenance/substation/engineering) "II" = ( -/obj/structure/catwalk, -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/camera/network/engine{ + dir = 8 }, /turf/simulated/floor, /area/engineering/engine_room) @@ -10308,16 +9417,11 @@ /obj/random/maintenance/engineering, /turf/simulated/floor/plating, /area/maintenance/atmos) -"Jg" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "Jk" = ( /obj/machinery/power/crypto_miner{ anchored = 0 }, +/obj/machinery/light, /turf/simulated/floor/tiled, /area/engineering/workshop) "Jl" = ( @@ -10589,7 +9693,7 @@ /area/engineering/break_room) "Kp" = ( /obj/machinery/portable_atmospherics/canister/phoron, -/turf/simulated/floor, +/turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_gas) "Kq" = ( /obj/effect/floor_decal/borderfloor{ @@ -10684,13 +9788,6 @@ "KF" = ( /turf/simulated/wall/prepainted/engineering, /area/engineering/storage) -"KG" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red, -/obj/structure/cable/cyan{ - icon_state = "4-8" - }, -/turf/simulated/floor, -/area/engineering/engine_room) "KH" = ( /turf/simulated/floor/tiled/steel_grid, /area/engineering/atmos/hallway) @@ -10720,13 +9817,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/dark, /area/chapel/chapel_morgue) -"KO" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/simulated/floor, -/area/engineering/engine_room) "KP" = ( /obj/machinery/power/apc/north_mount{ alarms_hidden = 1; @@ -10773,22 +9863,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/carpet/bcarpet, /area/chapel/main) -"KU" = ( -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/structure/cable/cyan{ - icon_state = "4-8" - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/simulated/floor, -/area/engineering/engine_room) "KV" = ( /obj/structure/cable/green{ icon_state = "2-4" @@ -10812,6 +9886,10 @@ }, /turf/simulated/floor/tiled/dark, /area/chapel/main) +"KX" = ( +/obj/machinery/portable_atmospherics/canister/carbon_dioxide, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_gas) "KY" = ( /turf/simulated/wall/prepainted/engineering, /area/engineering/workshop) @@ -10852,12 +9930,6 @@ "Le" = ( /turf/simulated/floor/tiled/white, /area/rnd/secure_storage/lower) -"Li" = ( -/obj/structure/cable/cyan{ - icon_state = "1-4" - }, -/turf/simulated/floor, -/area/engineering/engine_room) "Lj" = ( /turf/simulated/wall/prepainted/engineering, /area/maintenance/engineering/pumpstation) @@ -10942,19 +10014,6 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/engineering/hallway) -"Ly" = ( -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/simulated/floor, -/area/engineering/engine_room) "LB" = ( /obj/structure/window/reinforced{ dir = 8 @@ -10978,15 +10037,15 @@ /turf/simulated/floor/tiled/steel_grid, /area/engineering/hallway) "LD" = ( -/obj/machinery/door/blast/regular{ - dir = 2; - id = "sm_monitor_blast"; - name = "Engineering Engine Monitoring Blast Door" - }, /obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, /obj/effect/paint/sun, +/obj/machinery/door/blast/regular{ + dir = 4; + id = "engine_monitor_blast"; + name = "Reactor Blast Door" + }, /turf/simulated/floor, -/area/engineering/engine_room) +/area/engineering/engine_monitoring) "LE" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -11074,10 +10133,10 @@ /turf/simulated/floor/outdoors/snow/lythios43c, /area/rift/surfacebase/underground/under2) "LV" = ( -/obj/machinery/fire_alarm/west_mount{ - pixel_x = -24 +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 10 }, -/turf/simulated/floor, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_room) "LX" = ( /obj/effect/floor_decal/borderfloor{ @@ -11135,12 +10194,6 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/lower/mining) -"Md" = ( -/obj/machinery/atmospherics/pipe/simple/visible/green{ - dir = 10 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "Me" = ( /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, @@ -11197,10 +10250,13 @@ /turf/simulated/floor/plating, /area/maintenance/atmos) "Mu" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/green{ - dir = 8 +/obj/effect/paint_stripe/sun, +/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, +/obj/machinery/door/blast/regular{ + dir = 4; + name = "Reactor Blast Door"; + id = "engine_room_blast" }, -/obj/structure/catwalk, /turf/simulated/floor, /area/engineering/engine_room) "Mw" = ( @@ -11411,14 +10467,6 @@ /obj/item/storage/single_use/med_pouch/radiation, /turf/simulated/floor/tiled/steel, /area/quartermaster/miningdock) -"Ne" = ( -/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ - dir = 4 - }, -/turf/simulated/floor/outdoors/snow/noblend/lythios43c{ - special_temperature = 233 - }, -/area/engineering/engine_room) "Nf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -11439,17 +10487,15 @@ pixel_x = -32; pixel_y = 30 }, -/obj/item/storage/single_use/med_pouch/radiation, +/obj/machinery/fire_alarm/north_mount{ + pixel_y = 22 + }, /turf/simulated/floor/tiled/monotile, -/area/engineering/engine_room) +/area/engineering/engine_monitoring) "Nk" = ( /obj/machinery/requests_console/preset/ce{ pixel_y = -30 }, -/obj/machinery/mass_driver{ - dir = 8; - id = "enginecore" - }, /turf/simulated/floor/tiled, /area/crew_quarters/heads/chief) "Nm" = ( @@ -11683,21 +10729,6 @@ /obj/random/cutout, /turf/simulated/floor/plating, /area/maintenance/chapel) -"NY" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 4 - }, -/turf/simulated/floor, -/area/engineering/engine_room) -"NZ" = ( -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/simulated/floor, -/area/engineering/engine_room) "Ob" = ( /obj/structure/closet/radiation, /turf/simulated/floor/tiled/techfloor, @@ -11706,7 +10737,7 @@ /obj/machinery/microwave, /obj/structure/table/reinforced, /turf/simulated/floor/tiled/monotile, -/area/engineering/engine_room) +/area/engineering/engine_monitoring) "Od" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -11719,16 +10750,6 @@ }, /turf/simulated/floor/tiled/dark, /area/chapel/main) -"Oe" = ( -/obj/machinery/power/generator{ - anchored = 1; - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/turf/simulated/floor, -/area/engineering/engine_room) "Of" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/portable_atmospherics/canister/phoron, @@ -11750,15 +10771,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel_grid, /area/engineering/atmos/hallway) -"Oi" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ - dir = 4 - }, -/obj/structure/cable/cyan{ - icon_state = "1-2" - }, -/turf/simulated/floor, -/area/engineering/engine_room) "Oj" = ( /turf/simulated/floor/tiled/techfloor, /area/chapel/chapel_morgue) @@ -12058,7 +11070,12 @@ icon_state = "1-4" }, /turf/simulated/floor/tiled/monotile, -/area/engineering/engine_room) +/area/engineering/engine_monitoring) +"Pq" = ( +/obj/machinery/portable_atmospherics/canister/nitrogen, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_gas) "Pr" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 4 @@ -12137,6 +11154,11 @@ /obj/structure/curtain/open/shower/engineering, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_airlock) +"PE" = ( +/obj/machinery/portable_atmospherics/canister/phoron, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/techfloor/grid, +/area/engineering/engine_gas) "PG" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -12165,15 +11187,6 @@ }, /turf/simulated/floor/lino, /area/chapel/office) -"PI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "PM" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/effect/paint/beastybrown, @@ -12187,12 +11200,8 @@ /area/engineering/engine_smes) "PP" = ( /obj/machinery/portable_atmospherics/canister/nitrogen, -/turf/simulated/floor, +/turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_gas) -"PQ" = ( -/obj/machinery/atmospherics/pipe/simple/visible/cyan, -/turf/simulated/floor, -/area/engineering/engine_room) "PR" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -12505,7 +11514,7 @@ dir = 4 }, /turf/simulated/floor/tiled/steel_grid, -/area/engineering/engine_room) +/area/engineering/engine_monitoring) "Rp" = ( /obj/random/trash_pile, /obj/effect/floor_decal/rust, @@ -12794,13 +11803,13 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/engi_wash) -"St" = ( -/obj/structure/catwalk, -/obj/machinery/camera/network/engine{ - dir = 1 +"Su" = ( +/obj/machinery/airlock_sensor{ + id_tag = "eng_al_c_snsr"; + pixel_x = -25 }, -/turf/simulated/floor, -/area/engineering/engine_room) +/turf/simulated/mineral/icerock/lythios43c, +/area/rift/surfacebase/underground/under2) "Sw" = ( /obj/structure/bed/chair/bay/chair/padded/yellow, /obj/machinery/fire_alarm/north_mount, @@ -12908,15 +11917,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/research/xenobio) -"SN" = ( -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/turf/simulated/floor, -/area/engineering/engine_room) "SO" = ( /obj/structure/table/reinforced, /obj/item/storage/firstaid/fire{ @@ -12984,13 +11984,6 @@ /obj/effect/floor_decal/corner/white/diagonal, /turf/simulated/floor/tiled, /area/engineering/break_room) -"Tc" = ( -/obj/machinery/atmospherics/component/quaternary/atmos_filter, -/obj/structure/cable/cyan{ - icon_state = "1-2" - }, -/turf/simulated/floor, -/area/engineering/engine_room) "Td" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -13291,9 +12284,6 @@ /turf/simulated/floor/carpet/bcarpet, /area/chapel/main) "TY" = ( -/obj/machinery/light{ - dir = 8 - }, /obj/machinery/light_switch{ pixel_x = -21 }, @@ -13344,16 +12334,6 @@ /obj/machinery/light, /turf/simulated/floor/tiled/steel_grid, /area/engineering/hallway) -"Ue" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "Uf" = ( /obj/random/trash_pile, /turf/simulated/floor/plating, @@ -13412,14 +12392,6 @@ "Uw" = ( /turf/simulated/floor/tiled/techmaint, /area/quartermaster/miningdock) -"Ux" = ( -/obj/machinery/camera/network/engine{ - dir = 8 - }, -/turf/simulated/floor/outdoors/snow/noblend/lythios43c{ - special_temperature = 233 - }, -/area/engineering/engine_room) "Uy" = ( /obj/structure/undies_wardrobe, /turf/simulated/floor/tiled/white, @@ -13428,9 +12400,6 @@ /obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/engi_wash) -"UC" = ( -/turf/simulated/wall/prepainted, -/area/engineering/engine_room) "UD" = ( /obj/structure/girder/reinforced, /obj/structure/foamedmetal, @@ -13446,15 +12415,6 @@ "UG" = ( /turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/atmos/hallway) -"UI" = ( -/obj/machinery/atmospherics/pipe/simple/visible/black{ - dir = 10 - }, -/obj/structure/cable/cyan{ - icon_state = "1-2" - }, -/turf/simulated/floor, -/area/engineering/engine_room) "UK" = ( /obj/effect/floor_decal/chapel{ dir = 4 @@ -13493,26 +12453,11 @@ }, /turf/simulated/floor/plating, /area/maintenance/research/xenobio) -"UR" = ( -/obj/machinery/power/emitter{ - anchored = 1; - dir = 8; - id = "EngineEmitter"; - pixel_y = 8; - state = 2 - }, -/obj/structure/cable/cyan{ - icon_state = "0-4" - }, -/turf/simulated/floor/tiled/monotile, -/area/engineering/engine_room) "US" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 6 }, -/turf/simulated/floor/outdoors/snow/noblend/lythios43c{ - special_temperature = 233 - }, +/turf/simulated/wall/r_wall/prepainted/engineering, /area/engineering/engine_room) "UU" = ( /obj/effect/floor_decal/borderfloor/corner{ @@ -13573,7 +12518,7 @@ /area/crew_quarters/heads/chief) "Va" = ( /obj/structure/fence, -/turf/simulated/floor/outdoors/snow/lythios43c, +/turf/simulated/mineral/floor/icerock/lythios43c/indoors/ignore_cavegen, /area/rift/surfacebase/underground/under2) "Vb" = ( /obj/structure/table/rack{ @@ -13797,19 +12742,12 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/chapel/observation) -"VO" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow, -/obj/structure/cable/cyan{ - icon_state = "1-2" - }, -/turf/simulated/floor, -/area/engineering/engine_room) "VQ" = ( /obj/structure/cable/cyan{ icon_state = "1-2" }, /turf/simulated/floor/tiled/steel_grid, -/area/engineering/engine_room) +/area/engineering/engine_monitoring) "VR" = ( /obj/machinery/light/small{ dir = 1 @@ -13898,8 +12836,11 @@ /obj/structure/cable/cyan{ icon_state = "2-8" }, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/tiled/monotile, -/area/engineering/engine_room) +/area/engineering/engine_monitoring) "Wh" = ( /turf/simulated/wall/prepainted/cargo, /area/maintenance/lower/atmos) @@ -13934,7 +12875,7 @@ dir = 1 }, /turf/simulated/floor/tiled/steel_grid, -/area/engineering/engine_room) +/area/engineering/engine_monitoring) "Wn" = ( /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 8 @@ -14144,11 +13085,6 @@ }, /turf/simulated/floor/tiled/steel, /area/quartermaster/miningdock) -"Xb" = ( -/turf/simulated/floor/outdoors/snow/noblend/lythios43c{ - special_temperature = 233 - }, -/area/engineering/engine_room) "Xd" = ( /obj/effect/floor_decal/rust, /obj/structure/disposalpipe/segment{ @@ -14257,7 +13193,7 @@ name = "RADIOACTIVE AREA"; pixel_x = 21 }, -/turf/simulated/floor/outdoors/snow/lythios43c, +/turf/simulated/mineral/floor/icerock/lythios43c/indoors/ignore_cavegen, /area/rift/surfacebase/underground/under2) "Xx" = ( /obj/effect/floor_decal/chapel, @@ -14388,7 +13324,7 @@ /obj/spawner/window/low_wall/full/nogrille/firelocks, /obj/effect/paint/sun, /turf/simulated/floor/plating, -/area/engineering/engine_room) +/area/engineering/engine_monitoring) "Yq" = ( /obj/machinery/door/airlock{ name = "Chapel Office"; @@ -14506,12 +13442,6 @@ }, /turf/simulated/floor/tiled/steel, /area/quartermaster/miningdock) -"YI" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/red{ - dir = 4 - }, -/turf/simulated/floor, -/area/engineering/engine_room) "YJ" = ( /obj/spawner/window/low_wall/full/nogrille/firelocks, /obj/effect/paint/sun, @@ -14550,14 +13480,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rnd/secure_storage/critical/records) -"YX" = ( -/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ - dir = 6 - }, -/turf/simulated/floor/outdoors/snow/noblend/indoors/lythios43c{ - special_temperature = 233 - }, -/area/engineering/engine_room) "YY" = ( /obj/machinery/power/smes/buildable{ RCon_tag = "Substation - Engineering"; @@ -14607,13 +13529,6 @@ "Ze" = ( /turf/simulated/floor/plating, /area/maintenance/lower/mining) -"Zf" = ( -/obj/structure/catwalk, -/obj/machinery/fire_alarm/east_mount, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor, -/area/engineering/engine_room) "Zg" = ( /obj/structure/table/reinforced, /obj/item/storage/box/nifsofts_engineering{ @@ -14662,16 +13577,7 @@ icon_state = "pipe-c" }, /turf/simulated/floor/tiled/monotile, -/area/engineering/engine_room) -"Zo" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 4 - }, -/obj/structure/cable/cyan{ - icon_state = "4-8" - }, -/turf/simulated/floor, -/area/engineering/engine_room) +/area/engineering/engine_monitoring) "Zq" = ( /obj/machinery/shieldwallgen, /obj/structure/window/reinforced{ @@ -14719,11 +13625,11 @@ /turf/simulated/floor/tiled/steel, /area/hallway/primary/undertwo) "Zy" = ( -/obj/machinery/atmospherics/portables_connector{ - dir = 8 +/obj/structure/sign/securearea{ + pixel_x = -32 }, -/turf/simulated/floor, -/area/engineering/engine_room) +/turf/simulated/floor/outdoors/snow/noblend/indoors/lythios43c, +/area/rift/surfacebase/underground/under2) "ZA" = ( /obj/structure/bed/chair{ dir = 4 @@ -19578,11 +18484,11 @@ su LT su su -su -su +xp +Zy lf -su -su +xp +xp aa aa aa @@ -19772,16 +18678,53 @@ su su su Lp -su -su +xp +qq hW -su -su -su +xp +xp +xp +aa +xp +xp +xp +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa -su -su -su aa aa aa @@ -19804,181 +18747,144 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -Xh -"} -(27,1,1) = {" -Xh -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -su -su -yI -su -su -Kb -su -su -su -aa -aa -aa -su -su -su -su -su -su -su -su -su +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +Xh +"} +(27,1,1) = {" +Xh +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +su +su +yI +su +su +Kb +su +su +xp +aa +aa +aa +xp +xp +xp +xp +xp +xp +xp +sq +xp aa aa aa @@ -20169,12 +19075,12 @@ aa aa aa aa -su -su -su -su -su -su +xp +xp +xp +sq +sq +xp aa aa aa @@ -20363,13 +19269,13 @@ aa aa aa aa -su +sq aa aa -su -su -su -su +xp +xp +sq +xp aa aa aa @@ -20557,15 +19463,15 @@ aa aa aa aa -su +xp aa aa aa aa -su -su -su -su +sq +sq +sq +sq aa aa aa @@ -20757,9 +19663,9 @@ aa aa aa aa -su -su -gg +xp +sq +sq aa aa aa @@ -20952,8 +19858,8 @@ aa aa aa aa -gg -gg +sq +sq aa aa aa @@ -21146,8 +20052,8 @@ aa aa aa aa -gg -gg +sq +sq aa aa aa @@ -21340,8 +20246,8 @@ aa aa aa aa -gg -gg +sq +sq aa aa aa @@ -21534,8 +20440,8 @@ aa aa aa aa -gg -gg +sq +sq aa aa aa @@ -21728,9 +20634,9 @@ aa aa aa aa -gg -gg -gg +sq +sq +sq aa aa aa @@ -21923,9 +20829,9 @@ aa aa aa aa -gg -gg -gg +sq +sq +sq aa aa aa @@ -22117,9 +21023,9 @@ aa aa aa aa -gg -gg -gg +sq +sq +sq aa aa aa @@ -22311,10 +21217,10 @@ aa aa aa aa -gg -gg -gg -gg +sq +sq +sq +sq aa aa aa @@ -22508,8 +21414,8 @@ aa aa aa aa -gg -gg +sq +sq aa aa aa @@ -22702,8 +21608,8 @@ aa aa aa aa -gg -gg +sq +sq aa aa aa @@ -22726,7 +21632,7 @@ Tz He EN He -LR +ly Tz He tJ @@ -22896,8 +21802,8 @@ aa aa aa aa -gg -gg +sq +sq aa aa aa @@ -23091,8 +21997,8 @@ aa aa aa aa -gg -gg +sq +sq aa aa aa @@ -23290,12 +22196,12 @@ Xw aa aa aa -lS -lS -lS -lS -lS -lS +aa +aa +aa +aa +aa +aa Xy Xy Xy @@ -23484,15 +22390,15 @@ Va aa aa aa -lS -lS -am -am -am -am -YX -ai -am +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -23673,21 +22579,21 @@ aa aa aa aa -gg -gg -gg +sq +sq +sq +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa -UC -UC -UC -am -am -am -ah -ah -YX -ai aa aa aa @@ -23868,30 +22774,30 @@ aa aa aa aa -gg -gg -gg -aa -UC -Ht -cr -am -am -am -ah -ah -ah -ah -am -aa +sq +sq +sq aa aa +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq aa aa aa aa aa aa +gG aa aa aa @@ -24063,24 +22969,24 @@ aa aa aa aa -gg -gg -aa -UC -cr -AS -am -am -am -ah -ah -ah -ah -am -am -am -aa -aa +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq aa aa aa @@ -24257,27 +23163,27 @@ aa aa aa aa -gg -gg -gg -lS -am -am -am -am -am -ah -ah -ah -sX -fb -fb -fb -ai -aa -aa -aa -aa +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq aa aa aa @@ -24452,27 +23358,27 @@ aa aa aa aa -gg -gg -am -am -am -am -am -am -ah -ah -ah -YX -fb -fb -fb -al -aa -aa -aa -aa -aa +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq aa aa aa @@ -24646,27 +23552,27 @@ aa aa aa aa -gg -gg -am -am -am -am -lS -lS -ah -ah -ah -sX -fb -fb -fb -ai -aa -aa -aa -aa -aa +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq aa aa aa @@ -24711,34 +23617,133 @@ aa aa aa aa -Xh -"} -(52,1,1) = {" -yw -sq -sq -sq -sq -sq -sq -sq -sq -sq -sq -sq -sq -sq -sq -sq +Xh +"} +(52,1,1) = {" +yw +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +aa +aa +aa +aa +aa +aa +sq +sq +sq +aa +aa +aa +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa aa aa aa -sq -sq -sq aa aa aa @@ -24762,105 +23767,6 @@ sq sq sq sq -sq -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -gg -am -am -am -am -lS -lS -ah -ah -ah -YX -fb -fb -fb -al -aa -aa -aa -aa -aa aa aa aa @@ -25035,26 +23941,26 @@ aa aa aa aa -aa -lS -am -am -am -am -am -ah -ah -ah -sX -fb -fb -fb -ai -aa -aa -aa -aa -aa +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq aa aa aa @@ -25229,26 +24135,26 @@ zy zy aa aa -aa -lS -am -am -am -am -am -ah -ah -ah -YX -fb -fb -fb -al -aa -aa -aa -aa -aa +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq aa aa aa @@ -25421,28 +24327,28 @@ kf kA Yu kB -lS -lS -lS -lS -am -am -am -am -am -ah -ah -ah -sX -fb -fb -ai -am -aa -aa -aa aa aa +sq +sq +sq +sq +sq +sq +sq +sq +sq +cG +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq aa aa aa @@ -25612,34 +24518,34 @@ aa zy kw sW -ks +bK Ce kC -lS -lS -YX -fb -ai -am -am -am -am -ah -ah -ah -YX -fb -fb -al -jc +aa +sq +sq +sq +sq +sq ar ar ar ar ar ar -qm -qm +ar +ar +ar +ar +ar +sq +sq +sq +sq +sq +aa +aa +aa aa aa aa @@ -25805,35 +24711,35 @@ zy aa zy oL -wG -uj -uj -uj +hQ +Ax uj uj -sX -ai -ah -am -am +ML +sq +sq +cG +sq +sq +ar +mA +mA am am -ah -ah -ah -ah am am am -jc mA -ga -LV -GQ -GQ +mA ar -iG -qm +sq +sq +sq +sq +sq +aa +aa +aa aa aa aa @@ -25999,35 +24905,35 @@ zy zy zy kx -wG +hQ +ks uj -Xb -US -gT -US -gT -Ne -Ne -Xb -am +jz +ar +Mu +Mu +Mu +Mu +Mu +ar +mA +mA am am -Ne -Ne -Ne -vY -Eb Eb -gr -fF -gD -iE -iQ -hU -cQ +am +am +mA +mA ar -iG -qm +sq +sq +sq +sq +sq +aa +aa +aa aa aa aa @@ -26193,35 +25099,35 @@ kk kq ks kx -wG +hQ +ks uj -Xb -Ne -Ne -Ne -Ne -Ne -Ne -Xb -am -qI +jz +ar +mA +mA +mA +mA +mA +mA +mA +mA am -Ne -Ne -vY Eb Eb Eb -gr -dm -mA -rB -mA +am mA mA ar -iG -qm +sq +sq +sq +sq +sq +aa +aa +aa aa aa aa @@ -26387,35 +25293,35 @@ ks oK ks ky -wG +hQ +kk uj -Xb -Ne -vY -Bo -Ne -Ne -Ne -Xb -bQ -hC -bQ -Ne -vY -Eb -Eb -Eb -Eb -gr -bV +jz +LV mA -rB mA mA -GO +mA +mA +mA +mA +mA +am +am +Eb +am +am +mA +mA ar -iG -qm +sq +sq +sq +sq +cG +aa +aa +aa aa aa aa @@ -26581,35 +25487,35 @@ wG wG wG wG -wG +hQ +ks uj -Xb -Ne +jz US -gT -Ne -Ne -Ne -Xb -DL -lk -av -vY -Eb -Eb -Eb -Eb -Eb -gr -ak -pX -gc -iQ -iE -mB +mA +mA +mA +mA +mA +mA +mA +mA +am +am +am +am +am +mA +mA ar -iG -qm +Mu +Mu +Mu +Mu +Mu +ar +ML +ML aa aa aa @@ -26776,34 +25682,34 @@ kr kv Mr zt +ks uj -Xb -vY +jz iz -Bd -Bd -Bd -Bd -Ux -av -aw -av -Xb -Xb -Xb -Xb -Xb -Ux -Xb +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA jc -bJ -rB mA -GQ -GQ +mA +mA +mA +mA ar -iG -qm +lk +ML aa aa aa @@ -26970,34 +25876,34 @@ KF KF KF KF +uD +uD +jz ar -ar -uj -ar -aQ -dP -dP -aq -bQ -bQ -dQ -bQ -bQ -jc -jc -jc -jc -ar -jc -jc -bJ -rB +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA mA mA ar -ar -qm -qm +lk +ML aa aa aa @@ -27166,32 +26072,32 @@ Ox BF Rt KF -uD +jz ar -hR mA mA -bI -is -qu -cG -ij -is -mA -kY -du -du -qN -hT -du -db -eQ -Mu -oM -lF +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA ar -iG -qm +lk +ML aa aa aa @@ -27360,32 +26266,32 @@ BF BF Rt KF -uD +jz ar -gz -bu -bs -fj -is -ik -ir -ik -is -mA -bJ -mA -lA -PQ -Hg -PQ -pW -cQ -cd -lU -lF +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA ar -iG -qm +lk +ML aa aa aa @@ -27554,32 +26460,32 @@ BF BF vP KF -uD +jz ar kW -lt -Ac -bK -is -CR -eM -bU -is -mA -Md -cF -cQ -mA -Md -cF -cQ -mA -Fm -Fm -St +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA ar -iG -qm +lk +ML aa aa aa @@ -27748,32 +26654,32 @@ BF BF Vv KF -uD +jz ar -Zy -cg -oM -fj -bQ -eL -is -oG -bQ -NY -mA -Oe -GH -SN -GH -cM -mA -mA -Fm -Fm -Fm +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA ar -iG -qm +lk +ML aa aa aa @@ -27942,32 +26848,32 @@ BF BF Cr KF -uD +jz ar -Dv mA mA -cp -mc -dx -zG -mk -dh -PI -iI -fh -nX -CD -iI -fh -nX -mA -Fm -Fm -aC +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA ar -iG -qm +lk +ML aa aa aa @@ -28136,32 +27042,32 @@ BF BF Ho KF -uD +jz ar mA mA mA -aD -dq -dA -UR -sN mA -Dt -jy mA -iM -CD -jy mA -iM mA -Fm -Fm -Fm +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA ar -iG -qm +lk +ML aa aa aa @@ -28330,32 +27236,32 @@ BF BF wR KF -uD +jz ar -Ep mA -iH -UI -Tc -GZ -jz -fm -VO -do -yV -VO -Oi -Cz -yV -VO -qP -Li -Fm -Fm -Fm +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA ar -iG -qm +lk +ML aa aa aa @@ -28524,32 +27430,32 @@ BF vh Of KF -uD +jz ar -lB -Jg -Zo -mA -yD -YI -dX -dX -dX -Ue -YI -dX -dX -KO -qo -dX -dX -KG -gn -oM -lF +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA ar -iG -qm +lk +ML aa aa aa @@ -28721,29 +27627,29 @@ KF KF ar mA -Db -KU -NZ -NZ -NZ -NZ -NZ -NZ -Ly +mA +mA +mA +mA +mA +mA +mA +mA +mA II -NZ -NZ -Hi -hz -Zf -Fv -xn -lC -lU -lF +mA +mA +mA +mA +mA +mA +mA +mA +mA +mA ar -iG -qm +lk +ML aa aa aa @@ -28936,8 +27842,8 @@ mj jD jD jD -qm -qm +lk +ML aa aa aa @@ -29114,9 +28020,9 @@ go fE Pa Nj -hN -hQ -dg +zG +zG +zG gd zJ jB @@ -29128,10 +28034,10 @@ Ah ZC IT jC -jC +KX jD -qm -aa +lk +ML aa aa aa @@ -29322,10 +28228,10 @@ ui Nn IT jC -jC +KX jD -qm -aa +lk +ML aa aa aa @@ -29512,14 +28418,14 @@ Xg zJ jD Kp -Kp +PE IT IT cO mg jD -qm -aa +lk +ML aa aa aa @@ -29706,14 +28612,14 @@ WJ XT jD PP -PP +Pq hr pR -IT -IT +fD +rY jD -qm -aa +lk +ML aa aa aa @@ -29906,8 +28812,8 @@ aA aA aA aA -qm -aa +lk +ML aa aa aa @@ -30100,8 +29006,8 @@ TY Ao aA aA -qm -aa +lk +ML aa aa aa @@ -30294,8 +29200,8 @@ Vw mE Ew aA -aa -aa +lk +ML aa aa aa @@ -30488,8 +29394,8 @@ hK mE Ex aA -aa -aa +lk +ML aa aa aa @@ -30682,8 +29588,8 @@ UW mE yZ aA -aa -aa +lk +ML aa aa aa @@ -30859,7 +29765,7 @@ cX KY ES FZ -FZ +CG oD gs Mb @@ -30871,13 +29777,13 @@ Qz aA he ol -mE +tL me Nk aA aA -aa -aa +lk +ML aa aa aa @@ -31070,8 +29976,8 @@ aA aA aA aA -aa -aa +lk +ML aa aa aa @@ -31264,8 +30170,8 @@ JQ ff Rs aA -aa -aa +lk +ML aa aa aa @@ -31458,8 +30364,8 @@ aA GB TQ aA -aa -aa +lk +ML aa aa aa @@ -31652,8 +30558,8 @@ aA aA aA aA -aa -aa +lk +ML aa aa aa @@ -31843,11 +30749,11 @@ Gv fK wM aA -aa -aa -aa -aa -aa +Fv +lk +lk +Fv +ML aa aa aa @@ -32037,11 +30943,11 @@ aA aA aA aA -aa -aa -aa -aa -aa +lk +ML +ML +ML +ML aa aa aa @@ -32227,12 +31133,12 @@ KH Zr Qu Ir -aa -aa -aa -aa -aa -aa +lk +lk +lk +lk +Fv +ML aa aa aa @@ -32414,19 +31320,19 @@ RP YG QM Mw -RQ +eW Hp Bj KH Ij Fb Ir -aa -aa -aa -aa -aa -aa +ML +ML +ML +ML +ML +ML aa aa aa @@ -38445,7 +37351,7 @@ aa aa aa aa -aa +Su aa aa aa diff --git a/maps/rift/levels/rift-03-underground1.dmm b/maps/rift/levels/rift-03-underground1.dmm index acfd5e943be9..c2e8a154c7fb 100644 --- a/maps/rift/levels/rift-03-underground1.dmm +++ b/maps/rift/levels/rift-03-underground1.dmm @@ -42,6 +42,10 @@ "ag" = ( /turf/simulated/open, /area/rift/station/stairs_two) +"ah" = ( +/obj/structure/flora/ausbushes/fullgrass, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/underground/under1) "ai" = ( /turf/simulated/shuttle/wall/voidcraft, /area/turbolift/runder/level1) @@ -2273,6 +2277,13 @@ }, /turf/simulated/floor/tiled, /area/engineering/atmos) +"fD" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ + dir = 8 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/underground/under1) "fE" = ( /obj/machinery/atmospherics/pipe/manifold/visible/red, /obj/machinery/meter, @@ -3085,9 +3096,7 @@ /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 5 }, -/turf/simulated/open/lythios43c{ - special_temperature = 233 - }, +/turf/simulated/floor/outdoors/safeice/lythios43c, /area/rift/surfacebase/underground/under1) "io" = ( /obj/random/maintenance/clean, @@ -3873,6 +3882,12 @@ }, /turf/simulated/floor/reinforced/carbon_dioxide, /area/engineering/atmos) +"kX" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 10 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/underground/under1) "kZ" = ( /turf/simulated/wall/r_wall/prepainted, /area/rift/station/fighter_bay/transport_tunnel_garage_maint) @@ -3976,9 +3991,7 @@ /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 4 }, -/turf/simulated/open/lythios43c{ - special_temperature = 233 - }, +/turf/simulated/floor/outdoors/safeice/lythios43c, /area/rift/surfacebase/underground/under1) "lr" = ( /obj/effect/floor_decal/borderfloor, @@ -4160,14 +4173,17 @@ /turf/simulated/floor/concrete/rng/lythios43c, /area/rift/station/fighter_bay/transport_tunnel) "lU" = ( -/obj/structure/railing{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 6 }, -/turf/simulated/open/lythios43c, +/turf/simulated/floor/outdoors/snow/lythios43c, /area/rift/surfacebase/underground/under1) "lV" = ( -/obj/structure/ladder, -/turf/simulated/floor/lythios43c, +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 4 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, /area/rift/surfacebase/underground/under1) "lW" = ( /obj/machinery/light/small{ @@ -4456,6 +4472,12 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/dark, /area/engineering/atmos) +"mM" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 5 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/underground/under1) "mN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/visible/black{ @@ -4676,9 +4698,7 @@ /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 6 }, -/turf/simulated/open/lythios43c{ - special_temperature = 233 - }, +/turf/simulated/floor/outdoors/safeice/lythios43c, /area/rift/surfacebase/underground/under1) "nE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ @@ -4756,9 +4776,7 @@ /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 10 }, -/turf/simulated/open/lythios43c{ - special_temperature = 233 - }, +/turf/simulated/floor/outdoors/safeice/lythios43c, /area/rift/surfacebase/underground/under1) "nV" = ( /turf/simulated/floor/reinforced/nitrogen, @@ -6032,6 +6050,13 @@ /obj/effect/floor_decal/plaque, /turf/simulated/floor/tiled/monotile, /area/hallway/primary/underone) +"si" = ( +/obj/structure/flora/grass/both{ + pixel_x = 10; + pixel_y = 10 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/underground/under1) "sk" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/monotile, @@ -6853,9 +6878,7 @@ /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 5 }, -/turf/simulated/open/lythios43c{ - special_temperature = 233 - }, +/turf/simulated/floor/outdoors/safeice/lythios43c, /area/rift/surfacebase/underground/under1) "vj" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, @@ -10942,6 +10965,12 @@ /obj/machinery/seed_extractor, /turf/simulated/floor/concrete/tile/indoors, /area/security/prison/lower) +"IB" = ( +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 9 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/underground/under1) "IC" = ( /obj/machinery/air_alarm{ dir = 4; @@ -11502,9 +11531,7 @@ /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 9 }, -/turf/simulated/open/lythios43c{ - special_temperature = 233 - }, +/turf/simulated/floor/outdoors/safeice/lythios43c, /area/rift/surfacebase/underground/under1) "Kq" = ( /obj/effect/floor_decal/borderfloor, @@ -12746,8 +12773,8 @@ /turf/simulated/floor/tiled/dark, /area/tcommsat/chamber) "Ob" = ( -/obj/structure/railing{ - dir = 8 +/obj/structure/fence/door{ + dir = 4 }, /turf/simulated/floor/outdoors/safeice/lythios43c, /area/rift/surfacebase/underground/under1) @@ -14542,9 +14569,7 @@ /obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ dir = 8 }, -/turf/simulated/open/lythios43c{ - special_temperature = 233 - }, +/turf/simulated/floor/outdoors/safeice/lythios43c, /area/rift/surfacebase/underground/under1) "UE" = ( /obj/random/maintenance/clean, @@ -14673,6 +14698,10 @@ /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/concrete/rng/indoors, /area/rift/station/fighter_bay/transport_tunnel_garage) +"UW" = ( +/obj/structure/fence, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/underground/under1) "UX" = ( /obj/structure/symbol/sa, /turf/simulated/wall/prepainted, @@ -15227,9 +15256,7 @@ /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 6 }, -/turf/simulated/open/lythios43c{ - special_temperature = 233 - }, +/turf/simulated/floor/outdoors/safeice/lythios43c, /area/rift/surfacebase/underground/under1) "WD" = ( /obj/item/flashlight{ @@ -20878,7 +20905,7 @@ WR WR WR WR -WR +ah WR WR WR @@ -21276,7 +21303,7 @@ Va Va WR WR -WR +Qx WR WR WR @@ -21847,7 +21874,7 @@ ER WR WR WR -WR +hq WR WR WR @@ -23394,7 +23421,7 @@ sV WR WR WR -WR +rV WR WR WR @@ -23587,8 +23614,8 @@ es tm WR WR -WR -WR +rV +rV WR WR es @@ -23781,8 +23808,8 @@ es tm WR Zl -WR -WR +rV +rV WR WR uA @@ -23975,7 +24002,7 @@ sV sV WR WR -WR +rV WR WR WR @@ -24170,7 +24197,7 @@ WR WR WR WR -WR +rV WR WR uA @@ -24363,7 +24390,7 @@ sa aa WR WR -WR +rV WR WR WR @@ -24751,10 +24778,10 @@ po WR WR WR +rV +rV WR -WR -WR -WR +rV WR WR WR @@ -24785,7 +24812,7 @@ Lv Lv Va WR -WR +hq WR rV WR @@ -24946,7 +24973,7 @@ WR WR WR WR -WR +rV uB WR ER @@ -24983,7 +25010,7 @@ WR WR WR WR -WR +hq WR WR aa @@ -25141,14 +25168,14 @@ WR WR WR hq +rV WR WR WR WR -WR -oU -oU -oU +Va +Va +Va WR es es @@ -25333,16 +25360,16 @@ po WR WR WR +rV WR +rV +rV WR WR WR -WR -WR -WR -oU -lV -oU +Va +Va +Va WR Va Va @@ -25529,15 +25556,15 @@ WR WR WR WR +rV +rV WR WR -WR -WR -WR -oU -Mb -Mb -Mb +hq +Va +Va +Va +Va Va Va Va @@ -25724,18 +25751,18 @@ WR WR WR WR +rV +rV WR WR +Va WR WR Va -Mb -Mb -Mb -Mb -Mb -Mb -Mb +Va +Va +Va +Va WR WR WR @@ -25920,19 +25947,19 @@ WR WR WR WR +rV WR WR Va Va -Ob -lU -lU -lU -Ob +Va +Va +Va +Va Va WR WR -WR +hq WR WR WR @@ -26113,14 +26140,14 @@ WR WR WR WR +rV +WR WR WR WR WR Va -Va -Va -Va +hq Va Va Va @@ -26136,7 +26163,7 @@ WR Qx WR WR -WR +si WR WR Va @@ -26308,15 +26335,15 @@ WR aa WR WR +rV +rV +rV +hq +Va WR -WR -WR -td -td Va Va Va -td Yr WR WR @@ -26504,14 +26531,14 @@ aa aa WR WR -WR -td -td -td +rV +rV +rV +Va +Va +Va Va Va -td -td WR Va WR @@ -26700,12 +26727,12 @@ aa WR WR WR -td -td +Va +rV +Va Va Va Va -td WR WR Va @@ -26895,8 +26922,8 @@ aa aa aa aa -aa -aa +Va +Va Va Va WR @@ -27089,9 +27116,9 @@ aa aa aa aa -aa -aa -aa +Va +hq +Va aa WR WR @@ -27283,9 +27310,9 @@ aa aa aa aa -aa -aa -aa +UW +Ob +UW aa aa aa @@ -27477,9 +27504,9 @@ aa aa aa aa -aa -aa -aa +Va +WR +Va aa aa aa @@ -27665,16 +27692,16 @@ pv sZ aa WC -in +mM nD in -nD +lU vi -aa -aa -aa -aa -aa +Va +Va +WR +hq +Va WC in nD @@ -27864,17 +27891,17 @@ lq lq lq lq -aa -aa -aa -aa -aa -lq -lq -lq -lq +Zl +WR +Va +Va +Zl +lV lq +lV +lV lq +lV aa aa aa @@ -28054,7 +28081,7 @@ sZ aa UB nS -Kp +IB nS Kp UB @@ -28063,8 +28090,8 @@ aa aa aa aa -UB -nS +fD +kX Kp nS Kp diff --git a/maps/rift/levels/rift-04-surface1.dmm b/maps/rift/levels/rift-04-surface1.dmm index b4144794f522..92853091345d 100644 --- a/maps/rift/levels/rift-04-surface1.dmm +++ b/maps/rift/levels/rift-04-surface1.dmm @@ -592,6 +592,12 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfaceone) +"auZ" = ( +/obj/structure/flora/ausbushes/fullgrass{ + pixel_x = -8 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "avr" = ( /obj/structure/bed/chair/comfy/beige{ dir = 8 @@ -1572,6 +1578,13 @@ }, /turf/simulated/floor/plating, /area/maintenance/starboard) +"bhH" = ( +/obj/structure/flora/ausbushes/brflowers, +/obj/structure/flora/ausbushes/fullgrass{ + pixel_x = -8 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "bhT" = ( /obj/structure/railing, /obj/machinery/power/apc/west_mount, @@ -1603,9 +1616,6 @@ "biN" = ( /obj/machinery/door/window/eastright, /obj/structure/table/rack/shelf/steel, -/obj/item/clothing/suit/space/emergency, -/obj/item/clothing/head/helmet/space/emergency, -/obj/item/tank/oxygen, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, /obj/effect/floor_decal/industrial/outline/yellow, @@ -1616,7 +1626,8 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/clothing/mask/gas/clear, +/obj/item/clothing/mask/warmer, +/obj/item/clothing/suit/storage/hooded/wintercoat, /turf/simulated/floor/tiled/steel, /area/storage/surface_eva) "biY" = ( @@ -1923,6 +1934,7 @@ /obj/effect/floor_decal/corner/purple/border, /obj/structure/closet/jcloset, /obj/item/soap/nanotrasen, +/obj/item/reagent_containers/glass/rag/sponge, /turf/simulated/floor/tiled/steel, /area/janitor) "bqw" = ( @@ -2847,6 +2859,7 @@ /obj/effect/floor_decal/corner/purple/bordercorner2{ dir = 6 }, +/obj/item/reagent_containers/glass/rag/sponge, /turf/simulated/floor/tiled/steel, /area/janitor) "bWD" = ( @@ -2959,6 +2972,10 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfaceone) +"caB" = ( +/obj/structure/flora/ausbushes/palebush, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "caD" = ( /obj/machinery/holopad, /obj/structure/cable/green{ @@ -3162,9 +3179,6 @@ "cfw" = ( /obj/machinery/door/window/eastleft, /obj/structure/table/rack/shelf/steel, -/obj/item/clothing/suit/space/emergency, -/obj/item/clothing/head/helmet/space/emergency, -/obj/item/tank/oxygen, /obj/effect/floor_decal/borderfloor{ dir = 8 }, @@ -3178,6 +3192,7 @@ /obj/structure/window/reinforced{ dir = 8 }, +/obj/item/clothing/suit/storage/hooded/wintercoat, /obj/item/clothing/mask/gas/clear, /turf/simulated/floor/tiled/steel, /area/storage/surface_eva) @@ -3571,9 +3586,6 @@ dir = 8 }, /obj/structure/table/rack/shelf/steel, -/obj/item/clothing/suit/space/emergency, -/obj/item/clothing/head/helmet/space/emergency, -/obj/item/tank/oxygen, /obj/effect/floor_decal/borderfloor{ dir = 6 }, @@ -3585,7 +3597,8 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/clothing/mask/gas/clear, +/obj/item/clothing/mask/warmer, +/obj/item/clothing/suit/storage/hooded/wintercoat, /turf/simulated/floor/tiled/steel, /area/storage/surface_eva) "cvM" = ( @@ -4982,6 +4995,13 @@ /obj/random/trash_pile, /turf/simulated/floor/plating, /area/maintenance/library) +"dns" = ( +/obj/machinery/light/flamp/noshade{ + layer = 4; + pixel_y = 17 + }, +/turf/simulated/floor/plating/lythios43c, +/area/rift/surfacebase/outside/outside1) "dnB" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 4 @@ -5193,6 +5213,10 @@ }, /turf/simulated/floor/tiled/monowhite, /area/medical/medbay_emt_bay) +"dsJ" = ( +/obj/structure/metal_edge, +/turf/simulated/open/lythios43c, +/area/rift/surfacebase/outside/outside1) "dtc" = ( /obj/machinery/atmospherics/component/unary/outlet_injector{ dir = 1 @@ -6311,6 +6335,13 @@ }, /turf/simulated/floor/tiled/steel, /area/quartermaster/hallway) +"ebZ" = ( +/obj/structure/flora/grass/both{ + pixel_x = -5; + pixel_y = -4 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "ech" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/brown/border, @@ -6406,6 +6437,10 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, /area/maintenance/tool_storage) +"efb" = ( +/obj/structure/flora/rock/ice/alternative_1, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "efy" = ( /obj/structure/table/standard, /obj/item/storage/box/beakers, @@ -6442,6 +6477,10 @@ }, /turf/simulated/floor/plating, /area/medical/virologypurge) +"efY" = ( +/obj/structure/flora/ausbushes/ppflowers, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "egb" = ( /obj/machinery/fire_alarm/east_mount, /obj/structure/disposalpipe/segment, @@ -6659,6 +6698,10 @@ }, /turf/simulated/floor/tiled/monodark, /area/security/prison/upper) +"enm" = ( +/obj/structure/flora/grass/both, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "enu" = ( /obj/structure/catwalk, /obj/structure/cable{ @@ -8170,6 +8213,12 @@ /obj/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/plating, /area/rift/surfaceeva/airlock/main) +"fvp" = ( +/obj/structure/flora/tree/pine{ + pixel_x = -19 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "fvO" = ( /obj/structure/cable/green{ icon_state = "16-0" @@ -8384,7 +8433,6 @@ "fBn" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, -/obj/structure/table/reinforced, /turf/simulated/floor/tiled/steel, /area/tether/station/public_meeting_room) "fCu" = ( @@ -9068,6 +9116,7 @@ name = "bookcase (Reference)" }, /obj/item/book/bundle/custom_library/reference, +/obj/item/book/bundle/custom_library/reference, /turf/simulated/floor/wood, /area/library) "gbq" = ( @@ -9814,6 +9863,10 @@ }, /turf/simulated/floor/tiled/monotile, /area/security/prison/upper) +"gGe" = ( +/obj/structure/flora/grass/green, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "gGj" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -11469,6 +11522,12 @@ }, /turf/simulated/floor/tiled/dark, /area/security/prison/upper) +"hyV" = ( +/obj/structure/flora/ausbushes/ppflowers{ + pixel_x = -4 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "hzB" = ( /obj/structure/filingcabinet/medical{ desc = "A large cabinet with hard copy medical records."; @@ -12505,6 +12564,13 @@ }, /turf/simulated/floor/tiled/steel, /area/security/prison/upper) +"ibB" = ( +/obj/structure/flora/ausbushes/lavendergrass{ + pixel_x = 2; + pixel_y = 12 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "ibI" = ( /obj/structure/curtain/open/shower, /obj/machinery/shower, @@ -12626,9 +12692,6 @@ "igZ" = ( /obj/machinery/door/window/eastright, /obj/structure/table/rack/shelf/steel, -/obj/item/clothing/suit/space/emergency, -/obj/item/clothing/head/helmet/space/emergency, -/obj/item/tank/oxygen, /obj/effect/floor_decal/borderfloor{ dir = 10 }, @@ -12640,6 +12703,7 @@ /obj/structure/window/reinforced{ dir = 8 }, +/obj/item/clothing/suit/storage/hooded/wintercoat, /obj/item/clothing/mask/gas/clear, /turf/simulated/floor/tiled/steel, /area/storage/surface_eva) @@ -14885,6 +14949,10 @@ }, /turf/simulated/floor/tiled/steel, /area/quartermaster/office) +"jDP" = ( +/obj/structure/flora/ausbushes/ywflowers, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "jDX" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -14927,6 +14995,12 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/outpost/xenobiology/outpost_hallway) +"jEQ" = ( +/obj/structure/flora/rock/ice{ + pixel_y = 12 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "jER" = ( /obj/structure/flora/ausbushes/brflowers, /obj/structure/flora/ausbushes/sunnybush, @@ -15443,6 +15517,12 @@ /obj/random/maintenance/research, /turf/simulated/floor/plating, /area/maintenance/research/lower) +"jVw" = ( +/obj/structure/flora/bush{ + pixel_y = -4 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "jVC" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 1 @@ -17476,6 +17556,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/black, /turf/simulated/floor/tiled/white, /area/medical/virologyisolation) +"lgY" = ( +/obj/structure/flora/grass/both{ + pixel_x = 10; + pixel_y = 10 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "lht" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock{ @@ -17920,6 +18007,10 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_main) +"lxF" = ( +/obj/structure/flora/tree/pine, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "lxG" = ( /obj/machinery/atmospherics/component/binary/pump/high_power/on{ dir = 1 @@ -17946,6 +18037,10 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/server) +"lxP" = ( +/obj/structure/flora/ausbushes/pointybush, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "lyg" = ( /obj/item/stool/padded, /obj/landmark/spawnpoint/job/entertainer, @@ -18565,6 +18660,17 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_main) +"lUp" = ( +/obj/structure/flora/ausbushes/lavendergrass{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/structure/flora/ausbushes/lavendergrass{ + pixel_x = 2; + pixel_y = 12 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "lUw" = ( /obj/machinery/door/airlock/engineering{ name = "Medbay Substation"; @@ -18652,9 +18758,6 @@ "maf" = ( /obj/machinery/door/window/westright, /obj/structure/table/rack/shelf/steel, -/obj/item/clothing/suit/space/emergency, -/obj/item/clothing/head/helmet/space/emergency, -/obj/item/tank/oxygen, /obj/effect/floor_decal/borderfloor{ dir = 4 }, @@ -18668,7 +18771,8 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/clothing/mask/gas/clear, +/obj/item/clothing/mask/warmer, +/obj/item/clothing/suit/storage/hooded/wintercoat, /turf/simulated/floor/tiled/steel, /area/storage/surface_eva) "mau" = ( @@ -18709,6 +18813,10 @@ /obj/structure/railing, /turf/simulated/floor/plating, /area/maintenance/evahallway) +"mbg" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "mbr" = ( /obj/machinery/computer/arcade, /turf/simulated/floor/tiled, @@ -18879,7 +18987,7 @@ /obj/effect/floor_decal/corner/lightgrey/border{ dir = 6 }, -/obj/structure/table/reinforced, +/obj/machinery/vending/mre, /turf/simulated/floor/tiled/steel, /area/tether/station/public_meeting_room) "mgI" = ( @@ -19544,6 +19652,12 @@ /obj/structure/cable/green, /turf/simulated/floor/tiled/white, /area/rnd/chemistry_lab) +"mvT" = ( +/obj/structure/flora/ausbushes/ywflowers{ + pixel_y = 11 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "mwN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -19968,6 +20082,10 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/wood, /area/library) +"mOI" = ( +/obj/structure/flora/ausbushes/fullgrass, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "mOS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -20939,9 +21057,6 @@ dir = 8 }, /obj/structure/table/rack/shelf/steel, -/obj/item/clothing/suit/space/emergency, -/obj/item/clothing/head/helmet/space/emergency, -/obj/item/tank/oxygen, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, /obj/effect/floor_decal/industrial/outline/yellow, @@ -20952,6 +21067,7 @@ /obj/structure/window/reinforced{ dir = 4 }, +/obj/item/clothing/suit/storage/hooded/wintercoat, /obj/item/clothing/mask/gas/clear, /turf/simulated/floor/tiled/steel, /area/storage/surface_eva) @@ -21419,8 +21535,7 @@ dir = 8 }, /obj/machinery/computer/security{ - dir = 4; - icon_state = "computer" + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/security/prison/upper) @@ -22587,6 +22702,13 @@ }, /turf/simulated/floor/tiled/monotile, /area/rnd/xenoarch_storage) +"omD" = ( +/obj/structure/flora/ausbushes/lavendergrass{ + pixel_x = 6; + pixel_y = 6 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "onl" = ( /obj/effect/floor_decal/spline/plain{ dir = 8 @@ -23892,6 +24014,10 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/quartermaster/garage) +"paQ" = ( +/obj/structure/flora/rock/ice, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "paX" = ( /turf/simulated/wall/prepainted/science, /area/rnd/hallway) @@ -23921,6 +24047,7 @@ /obj/structure/closet/jcloset, /obj/item/soap/nanotrasen, /obj/machinery/light, +/obj/item/reagent_containers/glass/rag/sponge, /turf/simulated/floor/tiled/steel, /area/janitor) "pbz" = ( @@ -24773,6 +24900,13 @@ /obj/item/flame/candle/candelabra/everburn, /turf/simulated/floor/carpet, /area/rift/surfacebase/outside/outside1) +"pAx" = ( +/obj/structure/flora/ausbushes/ppflowers{ + pixel_x = 12; + pixel_y = 3 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "pAQ" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -26241,6 +26375,10 @@ }, /turf/simulated/floor/tiled, /area/medical/virology) +"quA" = ( +/obj/structure/bookcase/lore, +/turf/simulated/floor/wood, +/area/library) "quL" = ( /obj/structure/table/bench/wooden, /turf/simulated/floor/outdoors/gravsnow/lythios43c, @@ -26737,6 +26875,13 @@ /obj/structure/table/wooden_reinforced, /turf/simulated/floor/wood, /area/rnd/outpost/xenobiology/outpost_office) +"qMo" = ( +/obj/structure/flora/grass/both{ + pixel_x = 6; + pixel_y = 10 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "qMA" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -27831,6 +27976,9 @@ }, /turf/simulated/floor/tiled/steel_dirty, /area/rnd/tankstorage) +"rvl" = ( +/turf/simulated/floor/outdoors/safeice/lythios43c, +/area/rift/surfacebase/outside/outside1) "rvy" = ( /obj/structure/catwalk, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ @@ -28318,6 +28466,10 @@ }, /turf/simulated/floor/concrete/rng/indoors, /area/rift/station/fighter_bay/transport_tunnel_garage_maint) +"rHP" = ( +/obj/structure/flora/ausbushes/brflowers, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "rIt" = ( /obj/machinery/power/apc/west_mount, /obj/machinery/light, @@ -28760,6 +28912,10 @@ }, /turf/simulated/floor/tiled/steel, /area/quartermaster/office) +"rUu" = ( +/obj/structure/flora/ausbushes, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "rUD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 4 @@ -29768,6 +29924,10 @@ /obj/structure/flora/ausbushes/ppflowers, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/rift/station/public_garden) +"suv" = ( +/obj/structure/flora/ausbushes/grassybush, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "suV" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, @@ -33936,6 +34096,10 @@ }, /turf/simulated/floor/tiled/monotile, /area/rnd/hallway) +"uJX" = ( +/obj/structure/flora/rock/ice/alternative_2, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "uKd" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -34027,6 +34191,13 @@ }, /turf/simulated/floor/tiled/monotile, /area/rnd/xenoarch_storage) +"uMA" = ( +/obj/structure/flora/grass/brown{ + pixel_x = 7; + pixel_y = 10 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "uNc" = ( /obj/structure/closet/emcloset, /obj/random/maintenance/cargo, @@ -34070,6 +34241,12 @@ /obj/structure/closet/crate/engineering, /turf/simulated/floor/tiled/steel, /area/quartermaster/warehouse) +"uOW" = ( +/obj/structure/flora/grass/green{ + pixel_x = -13 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "uPa" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -37402,6 +37579,13 @@ }, /turf/simulated/floor/lino, /area/tether/surfacebase/entertainment/backstage) +"wXo" = ( +/obj/structure/flora/ausbushes/ywflowers{ + pixel_x = -5; + pixel_y = 11 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "wXJ" = ( /obj/structure/bed/chair{ dir = 4 @@ -37644,6 +37828,13 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/white, /area/medical/psych_ward) +"xcY" = ( +/obj/structure/flora/ausbushes/ywflowers{ + pixel_x = -13; + pixel_y = 2 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "xdq" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -37828,6 +38019,10 @@ }, /turf/simulated/floor/tiled/steel, /area/quartermaster/foyer) +"xhQ" = ( +/obj/structure/flora/ausbushes/leafybush, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "xhZ" = ( /obj/structure/cable/heavyduty{ icon_state = "1-2" @@ -38050,6 +38245,10 @@ }, /turf/simulated/floor/wood, /area/lawoffice) +"xnE" = ( +/obj/structure/flora/bush, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "xnJ" = ( /obj/spawner/window/low_wall/full/nogrille/firelocks, /obj/effect/paint/beastybrown, @@ -38688,6 +38887,10 @@ "xIm" = ( /turf/simulated/wall/prepainted, /area/rnd/outpost/xenobiology/outpost_stairs) +"xJx" = ( +/obj/structure/flora/grass/brown, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside1) "xJK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -39596,7 +39799,7 @@ wCM pqd ubp iFU -nNX +dsJ nNX wCM nog @@ -39790,7 +39993,7 @@ wCM pqd ubp vwm -nNX +dsJ nNX wCM nog @@ -39984,7 +40187,7 @@ wCM pqd ubp vwm -nNX +dsJ nNX wCM nog @@ -40178,7 +40381,7 @@ okO pqd ubp vwm -vFs +dns nNX wCM nog @@ -40372,7 +40575,7 @@ wCM pqd ubp vwm -nNX +dsJ nNX wCM nog @@ -40566,7 +40769,7 @@ wCM pqd ubp vwm -nNX +dsJ nNX wCM nog @@ -40760,7 +40963,7 @@ wCM pqd ubp vwm -nNX +dsJ nNX wCM nog @@ -41148,7 +41351,7 @@ okO pqd ubp vwm -vFs +dns nNX wCM nog @@ -41731,7 +41934,7 @@ pqd ubp lNb iFN -iFN +wXo vUA qcW vUA @@ -41824,7 +42027,7 @@ iFN vUA vUA vUA -iFN +xhQ iFN iFN iFN @@ -41924,17 +42127,17 @@ iFN pqd ubp lNb -iFN +ebZ iFN jZZ nog iFN iFN +qhZ iFN +enm iFN -iFN -iFN -iFN +rHP iFN iFN iFN @@ -42012,7 +42215,7 @@ dGy (14,1,1) = {" dGy iFN -iFN +lxF iFN iFN vUA @@ -42020,9 +42223,9 @@ vUA vUA iFN iFN +lxP iFN -iFN -iFN +gGe iFN iFN iFN @@ -42119,10 +42322,10 @@ pqd ubp lNb iFN -iFN +auZ jZZ nog -iFN +auZ iFN iFN iFN @@ -42180,7 +42383,7 @@ iFN iFN iFN iFN -iFN +mbg iFN iFN iFN @@ -42213,9 +42416,9 @@ vUA vUA vUA iFN -iFN -iFN -iFN +rvl +rvl +mbg iFN iFN iFN @@ -42327,7 +42530,7 @@ mjO mjO qDG iFN -iFN +gGe iFN oFG iFN @@ -42401,11 +42604,17 @@ dGy dGy iFN iFN +lxF iFN iFN iFN iFN +rvl +rvl +rvl +rvl iFN +mbg iFN iFN iFN @@ -42414,13 +42623,7 @@ iFN iFN iFN iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN +lxF iFN iFN iFN @@ -42480,7 +42683,7 @@ iFN iFN iFN iFN -iFN +lxF iFN iFN iFN @@ -42507,7 +42710,7 @@ pqd ubp lNb iFN -iFN +qhZ iFN iFN oFG @@ -42517,7 +42720,7 @@ iFN oFG oFG iFN -iFN +enm iFN tcZ iFN @@ -42529,11 +42732,13 @@ oFG oFG iFN iFN +lxF iFN iFN iFN iFN iFN +lxF iFN iFN iFN @@ -42542,13 +42747,16 @@ iFN iFN iFN iFN +auZ iFN iFN iFN +lxF iFN iFN iFN iFN +lxF iFN iFN iFN @@ -42557,12 +42765,7 @@ iFN iFN iFN iFN -iFN -iFN -iFN -iFN -iFN -iFN +mbg iFN iFN iFN @@ -42598,9 +42801,18 @@ iFN iFN iFN iFN +gGe +rvl +rvl +rvl +rvl +rvl +rvl +rvl iFN iFN iFN +lxF iFN iFN iFN @@ -42619,16 +42831,7 @@ iFN iFN iFN iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN +lxP iFN iFN iFN @@ -42708,7 +42911,7 @@ oFG oFG iFN oFG -iFN +mOI iFN oFG oFG @@ -42743,14 +42946,14 @@ oFG iFN iFN iFN +rHP iFN iFN iFN iFN iFN iFN -iFN -iFN +lxF iFN oFG iFN @@ -42761,7 +42964,7 @@ oFG oFG iFN iFN -iFN +owx iFN oFG oFG @@ -42792,35 +42995,35 @@ iFN iFN iFN iFN +rvl +rvl +rvl +rvl +rvl +rvl +rvl +rvl iFN iFN iFN iFN iFN iFN +enm iFN iFN iFN iFN iFN iFN +pAx iFN iFN iFN iFN iFN iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN +gGe iFN iFN iFN @@ -42846,13 +43049,16 @@ iFN iFN iFN iFN +gGe iFN iFN iFN +gGe iFN iFN iFN iFN +lxF iFN iFN iFN @@ -42863,10 +43069,7 @@ iFN iFN iFN iFN -iFN -iFN -iFN -iFN +lxF iFN iFN iFN @@ -42919,7 +43122,7 @@ oFG iFN iFN iFN -iFN +rHP iFN iFN iFN @@ -42982,17 +43185,17 @@ dGy (19,1,1) = {" dGy iFN +lxF iFN iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN +rvl +rvl +rvl +rvl +rvl +rvl +rvl +rvl iFN iFN iFN @@ -43036,6 +43239,7 @@ ayM iFN iFN iFN +gGe iFN iFN iFN @@ -43046,6 +43250,7 @@ iFN iFN iFN iFN +gGe iFN iFN iFN @@ -43053,6 +43258,7 @@ iFN iFN iFN iFN +gGe iFN iFN iFN @@ -43060,10 +43266,7 @@ iFN iFN iFN iFN -iFN -iFN -iFN -iFN +qiK iFN oFG oFG @@ -43089,7 +43292,7 @@ pqd ubp lNb iFN -iFN +lxF iFN iFN hgE @@ -43108,11 +43311,11 @@ iFN iFN iFN iFN +lxF iFN iFN iFN -iFN -iFN +lxF iFN iFN iFN @@ -43125,6 +43328,7 @@ vUA vUA iFd iFN +mOI iFN iFN iFN @@ -43133,8 +43337,7 @@ iFN iFN iFN iFN -iFN -iFN +rHP iFN iFN iFN @@ -43150,7 +43353,7 @@ iFN iFN iFN iFN -iFN +rHP iFN iFN iFN @@ -43180,13 +43383,25 @@ iFN iFN iFN iFN +rvl +rvl +rvl +rvl +rvl +rvl +rvl +gGe iFN iFN +lxF iFN +gGe iFN iFN +lgY iFN iFN +gGe iFN iFN iFN @@ -43194,20 +43409,8 @@ iFN iFN iFN iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN +efY +mbg iFN iFN iFN @@ -43235,11 +43438,11 @@ iFN iFN iFN iFN +gGe iFN iFN iFN -iFN -iFN +lxF iFN iFN iFN @@ -43309,7 +43512,7 @@ iFN iFN iFN iFN -iFN +fvp iFN iFN iFN @@ -43321,17 +43524,17 @@ iFd iFN iFN iFN +lxF iFN iFN iFN iFN +lxF iFN iFN iFN iFN -iFN -iFN -iFN +lxF iFN hgE hgE @@ -43372,7 +43575,14 @@ dGy iFN iFN iFN +gGe iFN +rvl +rvl +rvl +rvl +rvl +rvl iFN iFN iFN @@ -43389,25 +43599,18 @@ iFN iFN iFN iFN +lxF iFN iFN +lxF +mbg +efY +pAx iFN iFN iFN iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN +gGe iFN iFN iFN @@ -43423,14 +43626,14 @@ ayM ayM iFN iFN +gGe iFN iFN iFN +lxF iFN iFN -iFN -iFN -iFN +gGe iFN iFN iFN @@ -43477,9 +43680,9 @@ pqd ubp lNb vFs +rHP iFN -iFN -iFN +qhZ hgE hgE hgE @@ -43497,15 +43700,15 @@ nNX nNX nNX iFN +lxF iFN iFN +lxF iFN iFN iFN iFN -iFN -iFN -iFN +lxF iFN iFd iFd @@ -43537,7 +43740,7 @@ iFN iFN iFN iFN -iFN +mbg iFN iFN iFN @@ -43568,7 +43771,13 @@ iFN iFN iFN iFN +rvl +suv +rvl +rvl +rvl iFN +auZ iFN iFN iFN @@ -43576,13 +43785,7 @@ iFN iFN iFN iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN +lxF iFN iFN iFN @@ -43629,7 +43832,7 @@ iFN iFN iFN iFN -iFN +lxF iFN iFN iFN @@ -43637,14 +43840,14 @@ iFN evV iFN iFN +lxF iFN iFN iFN +lxF iFN iFN -iFN -iFN -iFN +lxF iFN iFN iFN @@ -43672,8 +43875,8 @@ ubp lNb iFN iFN -iFN -iFN +ibB +lUp hgE hgE hgE @@ -43761,6 +43964,9 @@ iFN iFN iFN iFN +gGe +rvl +auZ iFN iFN iFN @@ -43768,8 +43974,10 @@ iFN iFN iFN iFN +xJx iFN iFN +jVw iFN iFN iFN @@ -43782,20 +43990,15 @@ iFN iFN iFN iFN +gGe iFN iFN iFN iFN +lxF iFN iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN +pAx iFN iFN iFN @@ -43865,14 +44068,14 @@ pqd ubp lNb iFN +gGe iFN +omD iFN iFN iFN iFN -iFN -iFN -iFN +ebZ jZZ nNX nNX @@ -43953,14 +44156,17 @@ dGy dGy iFN iFN +lxF iFN iFN iFN iFN iFN +auZ iFN iFN iFN +lxF iFN iFN iFN @@ -43969,13 +44175,10 @@ iFN iFN iFN iFN +auZ iFN iFN -iFN -iFN -iFN -iFN -iFN +auZ iFN iFN iFN @@ -44002,6 +44205,7 @@ frA ayM iFN iFN +gGe iFN iFN iFN @@ -44009,12 +44213,11 @@ iFN iFN iFN iFN +gGe iFN iFN iFN -iFN -iFN -iFN +hgE iFN iFN iFN @@ -44028,20 +44231,20 @@ oFG oFG iFN iFN +gGe iFN iFN iFN +lxP iFN iFN iFN -iFN -iFN -iFN +lxF iFN iFN oFG iFN -iFN +jDP iFN jZZ nNX @@ -44055,7 +44258,7 @@ nNX nNX rNK iFN -pqd +iFN ubp lNb iFN @@ -44064,7 +44267,7 @@ iFN iFN iFN iFN -iFN +gGe iFN iFN jZZ @@ -44115,12 +44318,12 @@ iFN iFN iFN iFN +lxF iFN iFN iFN iFN -iFN -iFN +lxF iFN iFN iFN @@ -44150,31 +44353,31 @@ iFN iFN iFN iFN +caB iFN iFN iFN +lxF iFN iFN iFN iFN iFN iFN +gGe iFN iFN iFN +gGe iFN iFN iFN iFN iFN iFN +pAx iFN -iFN -iFN -iFN -iFN -iFN -iFN +auZ iFN iFN iFN @@ -44199,6 +44402,7 @@ iFN iFN iFN iFN +gGe iFN iFN iFN @@ -44206,10 +44410,9 @@ iFN iFN iFN iFN -iFN -iFN -iFN -iFN +hgE +hgE +hgE iFN iFN iFN @@ -44225,13 +44428,13 @@ iFN iFN iFN iFN +lxF iFN iFN iFN iFN iFN -iFN -iFN +jDP iFN iFN iFN @@ -44254,12 +44457,12 @@ ubp lNb iFN iFN +gGe iFN +hyV iFN iFN -iFN -iFN -iFN +gGe iFN jZZ nNX @@ -44342,6 +44545,7 @@ dGy iFN iFN iFN +gGe iFN iFN iFN @@ -44350,6 +44554,7 @@ iFN iFN iFN iFN +rHP iFN iFN iFN @@ -44360,6 +44565,7 @@ iFN iFN iFN iFN +hgE iFN iFN iFN @@ -44376,6 +44582,8 @@ iFN iFN iFN iFN +lxF +gGe iFN iFN iFN @@ -44393,19 +44601,14 @@ iFN iFN iFN iFN +lxF iFN iFN +hgE +hgE iFN iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN +jVw iFN iFN iFN @@ -44451,7 +44654,7 @@ iFN iFN iFN iFN -iFN +lxF iFN iFN iFN @@ -44543,22 +44746,29 @@ iFN iFN iFN iFN +gGe iFN iFN iFN +gGe iFN iFN iFN iFN +lxF iFN iFN +hgE +hgE iFN iFN iFN iFN +xJx iFN iFN iFN +lxF iFN iFN iFN @@ -44568,14 +44778,7 @@ iFN iFN iFN iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN +pAx iFN iFN iFN @@ -44586,6 +44789,7 @@ iFN iFN iFN iFN +efY iFN iFN iFN @@ -44595,6 +44799,7 @@ iFN iFN iFN iFN +hgE iFN iFN iFN @@ -44602,9 +44807,7 @@ iFN iFN iFN iFN -iFN -iFN -iFN +mOI iFN oFG oFG @@ -44613,14 +44816,14 @@ iFN iFN iFN iFN +lxF iFN iFN +gGe iFN +hgE iFN -iFN -iFN -iFN -iFN +omD iFN iFN oFG @@ -44643,7 +44846,7 @@ lNb vFs iFN iFN -iFN +gGe iFN iFN iFN @@ -44733,7 +44936,9 @@ iFN iFN iFN iFN +gGe iFN +lxP iFN iFN iFN @@ -44746,25 +44951,23 @@ iFN iFN iFN iFN +hgE +hgE +hgE iFN iFN iFN +lxF iFN +xJx iFN iFN iFN iFN iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN +hgE +hgE +hgE iFN iFN iFN @@ -44778,45 +44981,45 @@ oFG iFN iFN iFN +lxF iFN iFN +jDP iFN iFN iFN +lxF iFN iFN iFN iFN iFN iFN +hgE iFN iFN +mbg iFN -iFN -iFN -iFN -iFN -iFN -iFN +lxP iFN iFN oFG oFG oFG iFN +mbg iFN iFN iFN iFN iFN iFN -iFN -iFN -iFN +hgE +hgE iFN iFN oFG -iFN +gGe oFG iFN iFN @@ -44841,7 +45044,7 @@ iFN iFN iFN iFN -iFN +mbg iFN iFN jZZ @@ -44924,6 +45127,7 @@ dGy iFN iFN iFN +lxF iFN iFN iFN @@ -44931,7 +45135,9 @@ iFN iFN iFN iFN +gGe iFN +jVw iFN iFN iFN @@ -44940,17 +45146,28 @@ iFN iFN iFN iFN +hgE +hgE +hgE iFN iFN iFN iFN +xJx iFN iFN iFN iFN +hgE +hgE +hgE +hgE +hgE +hgE iFN iFN iFN +gGe iFN iFN iFN @@ -44968,25 +45185,11 @@ iFN iFN iFN iFN +rvl iFN iFN iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN +hgE iFN iFN iFN @@ -45003,7 +45206,7 @@ iFN iFN iFN iFN -iFN +lxF iFN iFN iFN @@ -45030,14 +45233,14 @@ ubp lNb iFN iFN +lxF iFN iFN +lxP iFN iFN iFN -iFN -iFN -iFN +uOW jZZ nNX nNX @@ -45085,7 +45288,7 @@ nNX iFN iFN iFN -iFN +lxF iFN iFN iFN @@ -45123,31 +45326,44 @@ iFN iFN iFN iFN +rHP iFN iFN iFN iFN iFN +gGe iFN iFN iFN iFN iFN iFN +hgE +hgE +hgE +hgE iFN iFN +xJx iFN iFN iFN iFN iFN iFN +hgE +hgE +hgE +hgE +hgE iFN iFN iFN iFN iFN iFN +lxP iFN iFN iFN @@ -45163,6 +45379,8 @@ iFN iFN iFN iFN +rvl +rvl iFN iFN iFN @@ -45171,42 +45389,27 @@ iFN iFN iFN iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN +gGe iFN oFG oFG iFN +gGe iFN iFN iFN +gGe iFN iFN iFN iFN +lxF iFN iFN iFN iFN iFN -iFN -iFN -iFN -iFN +auZ iFN iFN iFN @@ -45217,7 +45420,7 @@ mfX mfX mfX iFN -iFN +gGe iFN pqd ubp @@ -45225,7 +45428,7 @@ lNb iFN iFN iFN -iFN +gGe iFN iFN iFN @@ -45284,7 +45487,7 @@ iFN iFN iFN iFN -iFN +mbg iFN iFN iFN @@ -45312,6 +45515,7 @@ dGy iFN iFN iFN +gGe iFN iFN iFN @@ -45319,13 +45523,20 @@ iFN iFN iFN iFN +lxF iFN iFN iFN iFN iFN iFN +lxF iFN +hgE +hgE +hgE +hgE +hgE iFN iFN iFN @@ -45333,6 +45544,7 @@ iFN iFN iFN iFN +xJx iFN iFN iFN @@ -45341,16 +45553,7 @@ iFN iFN iFN iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN +gGe iFN iFN iFN @@ -45358,21 +45561,21 @@ iFN iFN oFG iFN +pAx +jDP iFN iFN iFN iFN +lxF iFN iFN iFN iFN iFN -iFN -iFN -iFN -iFN -iFN -iFN +suv +rvl +rvl iFN iFN iFN @@ -45391,7 +45594,7 @@ iFN iFN iFN iFN -iFN +lxF iFN iFN iFN @@ -45403,13 +45606,13 @@ iFN iFN iFN iFN +lxF iFN iFN iFN iFN iFN -iFN -iFN +mbg iFN iFN iFN @@ -45418,13 +45621,13 @@ ubp lNb iFN iFN +mvT iFN iFN iFN +lxF iFN -iFN -iFN -iFN +uMA jZZ nNX nNX @@ -45473,7 +45676,7 @@ nNX iFN iFN iFN -iFN +lxF iFN iFN iFN @@ -45524,9 +45727,9 @@ iFN iFN iFN iFN -iFN -iFN -iFN +hgE +hgE +hgE iFN iFN iFN @@ -45538,16 +45741,16 @@ iFN iFN iFN iFN -iFN +lxF iFN iFN iFN vUA vUA vUA +uMA iFN -iFN -iFN +uJX iFN oFG oFG @@ -45561,9 +45764,9 @@ iFN iFN iFN iFN -iFN -iFN -iFN +hgE +hgE +hgE iFN iFN vUA @@ -45571,9 +45774,9 @@ vUA vUA iFN iFN +mbg iFN -iFN -iFN +lxF iFN iFN oFG @@ -45584,12 +45787,12 @@ iFN iFN iFN iFN +mbg iFN iFN iFN iFN -iFN -iFN +efY iFN oFG oFG @@ -45602,10 +45805,10 @@ iFN iFN iFN iFN +lxF iFN iFN -iFN -iFN +gGe iFN pqd ubp @@ -45699,7 +45902,7 @@ dGy dGy iFN iFN -iFN +lxF iFN vUA vUA @@ -45708,8 +45911,8 @@ iFN iFN iFN iFN -iFN -iFN +xJx +gGe iFN iFN iFN @@ -45740,23 +45943,23 @@ vUA vUA vUA iFN -iFN +jVw iFN iFN oFG iFN iFN iFN +hgE +hgE iFN iFN iFN iFN iFN -iFN -iFN -iFN -iFN -iFN +hgE +hgE +hgE iFN iFN iFN @@ -45766,19 +45969,19 @@ vUA iFN iFN iFN +enm iFN iFN -iFN -iFN +gGe oFG oFG oFG iFN iFN iFN +gGe iFN -iFN -iFN +lxP iFN iFN iFN @@ -45790,15 +45993,15 @@ oFG iFN iFN iFN +lxF iFN +gGe iFN iFN iFN iFN iFN -iFN -iFN -iFN +paQ iFN vFs pqd @@ -45811,7 +46014,7 @@ iFN iFN iFN iFN -iFN +lxF iFN jZZ nNX @@ -45900,30 +46103,30 @@ vUA vUA iFN iFN +gGe iFN iFN iFN iFN +gGe iFN iFN iFN +gGe iFN iFN iFN iFN +gGe iFN -iFN -iFN -iFN -iFN -iFN +lxP iFN iFN vUA vUA vUA iFN -iFN +xJx iFN iFN iFN @@ -45940,17 +46143,17 @@ iFN oFG iFN iFN +hgE +hgE +hgE +hgE iFN iFN iFN iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN +hgE +hgE +hgE iFN iFN iFN @@ -45962,23 +46165,23 @@ iFN iFN iFN iFN -iFN +mOI iFN oFG oFG oFG iFN iFN +lxF iFN iFN iFN iFN +xJx iFN +gGe iFN -iFN -iFN -iFN -iFN +mbg iFN oFG iFN @@ -45995,14 +46198,14 @@ iFN iFN iFN iFN -pqd +oFG ubp lNb iFN iFN iFN iFN -iFN +lxF iFN iFN iFN @@ -46086,11 +46289,13 @@ dGy (35,1,1) = {" dGy iFN +lxF iFN iFN iFN iFN iFN +xJx iFN iFN iFN @@ -46099,10 +46304,12 @@ iFN iFN iFN iFN +gGe iFN iFN iFN iFN +gGe iFN iFN iFN @@ -46117,6 +46324,7 @@ iFN iFN iFN iFN +gGe iFN iFN iFN @@ -46124,37 +46332,32 @@ iFN iFN iFN iFN +gGe iFN iFN iFN +qMo iFN +hgE +hgE +hgE +hgE iFN iFN iFN iFN +hgE iFN iFN iFN +qMo iFN iFN iFN iFN iFN iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN +lxF iFN iFN iFN @@ -46166,6 +46369,7 @@ iFN iFN iFN iFN +qiK iFN iFN iFN @@ -46175,30 +46379,29 @@ iFN iFN iFN iFN +jDP iFN iFN iFN iFN +lxF iFN iFN +rUu iFN +gGe iFN +lxF +oFG +oFG +oFG +oFG iFN iFN iFN iFN iFN -iFN -pqd -ubp -lNb -iFN -iFN -iFN -iFN -iFN -iFN -iFN +uMA iFN iFN jZZ @@ -46287,8 +46490,10 @@ iFN iFN iFN iFN +gGe iFN iFN +gGe iFN iFN iFN @@ -46310,15 +46515,13 @@ iFN iFN iFN iFN +jDP iFN iFN iFN iFN iFN -iFN -iFN -iFN -iFN +lxF iFN iFN iFN @@ -46330,6 +46533,8 @@ iFN iFN iFN iFN +hgE +hgE iFN iFN iFN @@ -46338,13 +46543,11 @@ iFN iFN iFN iFN +lxF iFN iFN iFN -iFN -iFN -iFN -iFN +efb iFN iFN iFN @@ -46359,36 +46562,36 @@ iFN iFN iFN iFN +xJx iFN iFN iFN +lxF +xcY iFN +lxP iFN iFN iFN iFN iFN +xnE iFN iFN iFN +efb iFN iFN iFN iFN iFN iFN +oFG +oFG +oFG iFN iFN -iFN -iFN -iFN -iFN -pqd -ubp -lNb -iFN -iFN -iFN +lxF iFN iFN iFN @@ -46475,7 +46678,7 @@ dGy dGy iFN iFN -iFN +lxF iFN iFN iFN @@ -46512,11 +46715,11 @@ iFN iFN iFN iFN +lxP iFN iFN iFN -iFN -iFN +lxF iFN iFN oFG @@ -46524,9 +46727,12 @@ iFN iFN iFN iFN +hgE +hgE iFN iFN iFN +gGe iFN iFN iFN @@ -46538,19 +46744,16 @@ iFN iFN iFN iFN +gGe iFN iFN -iFN -iFN -iFN -iFN -iFN +enm iFN iFN oFG oFG iFN -iFN +qiK iFN iFN iFN @@ -46564,21 +46767,21 @@ iFN oFG oFG iFN +enm iFN iFN +auZ iFN iFN iFN iFN iFN iFN -iFN -iFN -iFN +mbg iFN iFN pqd -ubp +oFG lNb iFN iFN @@ -46716,6 +46919,7 @@ iFN oFG oFG iFN +xJx iFN iFN iFN @@ -46724,50 +46928,49 @@ iFN iFN iFN iFN +jDP iFN iFN +xJx iFN iFN +jDP iFN iFN +lxF iFN iFN iFN iFN iFN -iFN -iFN -iFN -iFN -iFN -iFN +qiK oFG oFG +xJx iFN iFN iFN +jDP iFN iFN iFN iFN iFN -iFN -iFN -iFN +xnE iFN oFG oFG iFN +jVw iFN +gGe iFN +bhH +xnE iFN iFN iFN -iFN -iFN -iFN -iFN -iFN +lxF iFN iFN iFN @@ -46776,10 +46979,10 @@ ubp lNb iFN iFN +gGe iFN iFN -iFN -iFN +gGe iFN iFd vUA @@ -46866,14 +47069,14 @@ iFN iFN iFN iFN +xJx iFN +rHP iFN iFN +lxF iFN -iFN -iFN -iFN -iFN +gGe iFN kAb cPn @@ -46901,17 +47104,18 @@ oFG oFG iFN iFN +gGe iFN +efY iFN -iFN -iFN -iFN +gGe iFN iFN oFG iFN iFN iFN +efY iFN iFN iFN @@ -46932,14 +47136,13 @@ iFN iFN iFN iFN -iFN -iFN +jDP iFN oFG oFG iFN iFN -iFN +xJx iFN iFN iFN @@ -46972,7 +47175,7 @@ vFs iFN iFN iFN -iFN +lxF iFN iFN iFd @@ -47059,7 +47262,7 @@ iFN iFN iFN iFN -iFN +lxF iFN iFN iFN @@ -47151,7 +47354,7 @@ vFs iFN iFN iFN -iFN +auZ iFN vFs iFN @@ -47164,7 +47367,7 @@ ubp lNb iFN iFN -iFN +gGe iFN iFN iFN @@ -47255,13 +47458,13 @@ iFN iFN iFN iFN +gGe iFN iFN iFN +gGe iFN -iFN -iFN -iFN +gGe iFN kAb qAg @@ -47357,7 +47560,7 @@ ubp ubp lNb iFN -iFN +gGe iFN iFN iFN @@ -47450,9 +47653,9 @@ iFN iFN iFN iFN +xJx iFN -iFN -iFN +gGe iFN iFN iFN @@ -47523,13 +47726,13 @@ oFG oFG oFG oFG +gGe iFN iFN iFN iFN iFN -iFN -iFN +efY iFN iFN iFN @@ -47551,10 +47754,10 @@ ubp ubp lNb iFN +lxF iFN iFN -iFN -iFN +lxF iFN iFN iFN @@ -47638,15 +47841,15 @@ dGy (43,1,1) = {" dGy iFN +lxF iFN iFN iFN iFN +rHP iFN iFN -iFN -iFN -iFN +xJx iFN iFN iFN @@ -47692,13 +47895,15 @@ iFN iFN iFN iFN -iFN +gGe iFN oFG oFG iFN +lxF iFN iFN +gGe iFN iFN iFN @@ -47711,16 +47916,14 @@ iFN iFN iFN iFN +gGe iFN iFN iFN iFN +xJx iFN -iFN -iFN -iFN -iFN -iFN +rHP iFN iFN iFN @@ -47731,7 +47934,7 @@ pqd lNb vFs iFN -iFN +omD iFN pqd lNb @@ -47739,7 +47942,7 @@ vFs iFN iFN iFN -iFN +lxF iFN pqd ubp @@ -47750,7 +47953,7 @@ iFN iFN iFN iFN -iFN +gGe iFN iFN xoc @@ -47834,6 +48037,7 @@ dGy iFN iFN iFN +gGe iFN iFN iFN @@ -47841,8 +48045,7 @@ iFN iFN iFN iFN -iFN -iFN +gGe iFN iFN kAb @@ -47880,9 +48083,9 @@ iFN iFN iFN iFN +xJx iFN -iFN -iFN +efY iFN iFN iFN @@ -47900,22 +48103,22 @@ iFN iFN iFN iFN +lxF +gGe iFN iFN +qiK iFN iFN iFN +xJx iFN iFN iFN iFN iFN iFN -iFN -iFN -iFN -iFN -iFN +gGe iFN iFN iFN @@ -47926,14 +48129,14 @@ lNb iFN iFN iFN -iFN +omD pqd lNb iFN +auZ +efb iFN -iFN -iFN -iFN +auZ vFs pqd ubp @@ -48027,13 +48230,13 @@ dGy dGy iFN iFN +gGe iFN iFN iFN iFN iFN -iFN -iFN +lxF iFN iFN iFN @@ -48066,14 +48269,14 @@ iFN iFN iFN iFN +gGe iFN iFN iFN iFN +gGe iFN -iFN -iFN -iFN +gGe iFN iFN iFN @@ -48088,10 +48291,10 @@ iFN iFN iFN iFN +jDP iFN iFN -iFN -iFN +jDP iFN iFN iFN @@ -48124,7 +48327,7 @@ iFN pqd lNb iFN -iFN +gGe iFN iFN iFN @@ -48133,11 +48336,11 @@ pqd ubp lNb iFN +gGe iFN iFN iFN -iFN -iFN +uMA iFN iFN jZZ @@ -48230,7 +48433,7 @@ iFN iFN iFN iFN -iFN +gGe iFN iFN iFN @@ -48253,12 +48456,17 @@ kAb kAb dER iFN +efY iFN iFN +hgE +hgE +hgE iFN iFN iFN iFN +lxF iFN iFN iFN @@ -48268,17 +48476,13 @@ iFN iFN iFN iFN -iFN -iFN -iFN -iFN -iFN -iFN +lxF iFN iFN oFG oFG iFN +gGe iFN iFN iFN @@ -48288,8 +48492,7 @@ iFN iFN iFN iFN -iFN -iFN +lxF iFN iFN iFN @@ -48311,7 +48514,7 @@ iFN iFN pqd lNb -iFN +jVw iFN iFN iFN @@ -48319,16 +48522,16 @@ pqd lNb iFN iFN +qMo iFN -iFN -iFN +xnE iFN pqd ubp lNb iFN iFN -iFN +uMA iFN ydQ qqW @@ -48418,11 +48621,11 @@ iFN iFN iFN iFN +gGe iFN iFN iFN -iFN -iFN +rHP iFN iFN iFN @@ -48449,10 +48652,10 @@ iFN iFN iFN iFN -iFN -iFN -iFN -iFN +hgE +hgE +hgE +jEQ iFN iFN iFN @@ -48477,9 +48680,9 @@ iFN iFN iFN iFN -iFN -iFN -iFN +hgE +hgE +hgE iFN iFN iFN @@ -48608,16 +48811,19 @@ dGy (48,1,1) = {" dGy iFN +lxF iFN iFN iFN iFN +gGe iFN iFN iFN iFN iFN iFN +gGe iFN iFN iFN @@ -48631,17 +48837,14 @@ iFN iFN iFN iFN +xJx iFN iFN iFN iFN iFN iFN -iFN -iFN -iFN -iFN -iFN +xJx iFN iFN iFN @@ -48670,14 +48873,14 @@ iFN iFN iFN iFN +hgE +hgE +hgE +hgE iFN iFN iFN -iFN -iFN -iFN -iFN -iFN +gGe iFN iFN lPZ @@ -48707,7 +48910,7 @@ ubp ubp pdn iFN -iFN +efY iFN iFN iFN @@ -48811,12 +49014,14 @@ iFN iFN iFN iFN +lxF iFN iFN iFN iFN iFN iFN +xJx iFN iFN iFN @@ -48824,10 +49029,12 @@ iFN iFN iFN iFN +lxF iFN iFN iFN iFN +lxF iFN iFN iFN @@ -48842,20 +49049,16 @@ iFN iFN iFN iFN +lxF iFN iFN iFN +lxF iFN +gGe iFN iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN -iFN +gGe iFN iFN oFG @@ -48864,10 +49067,10 @@ iFN iFN iFN iFN -iFN -iFN -iFN -iFN +hgE +hgE +hgE +hgE iFN iFN iFN @@ -48998,7 +49201,7 @@ dGy iFN iFN iFN -iFN +gGe iFN iFN iFN @@ -49034,7 +49237,7 @@ iFN iFN iFN iFN -iFN +lxF iFN iFN iFN @@ -49059,12 +49262,12 @@ iFN iFN iFN iFN +hgE +hgE iFN iFN iFN -iFN -iFN -iFN +lxF iFN iFN iFN @@ -49191,10 +49394,10 @@ dGy dGy iFN iFN +lxF iFN iFN -iFN -iFN +gGe iFN iFN iFN @@ -49214,15 +49417,15 @@ vUA vUA iFN iFN +lxF iFN +efb iFN iFN iFN iFN iFN -iFN -iFN -iFN +lxF iFN iFN iFN @@ -49252,9 +49455,9 @@ iFN iFN iFN iFN -iFN -iFN -iFN +hgE +hgE +hgE iFN iFN iFN @@ -49391,17 +49594,17 @@ iFN iFN iFN iFN +jDP iFN +gGe iFN iFN iFN iFN +lxF +jDP iFN -iFN -iFN -iFN -iFN -iFN +xJx iFN vUA vUA @@ -49454,7 +49657,7 @@ iFN iFN iFN iFN -iFN +qiK iFN lPZ qQY @@ -49584,6 +49787,7 @@ iFN iFN iFN iFN +lxF iFN iFN iFN @@ -49602,9 +49806,11 @@ iFN iFN iFN iFN +lxF iFN iFN iFN +lxF iFN iFN iFN @@ -49616,10 +49822,7 @@ iFN iFN iFN iFN -iFN -iFN -iFN -iFN +lxF iFN iFN iFN @@ -49775,6 +49978,7 @@ iFN iFN iFN iFN +lxF iFN iFN iFN @@ -49790,6 +49994,7 @@ iFN iFN iFN iFN +jDP iFN iFN iFN @@ -49817,9 +50022,7 @@ iFN iFN iFN iFN -iFN -iFN -iFN +lxF iFN iFN iFN @@ -49966,14 +50169,18 @@ wpT (55,1,1) = {" dGy iFN +lxF iFN +gGe iFN iFN iFN +gGe iFN iFN iFN iFN +xJx iFN iFN iFN @@ -49994,11 +50201,7 @@ iFN iFN iFN iFN -iFN -iFN -iFN -iFN -iFN +efb iFN iFN iFN @@ -50170,18 +50373,18 @@ iFN iFN iFN iFN +lxF iFN iFN iFN iFN iFN +lxF iFN iFN iFN iFN -iFN -iFN -iFN +jDP iFN iFN iFN @@ -50355,11 +50558,11 @@ wpT dGy iFN iFN +lxF iFN iFN iFN -iFN -iFN +gGe iFN iFN iFN @@ -50383,7 +50586,7 @@ iFN vUA vUA vUA -iFN +uMA iFN iFN iFN @@ -50550,12 +50753,12 @@ dGy iFN iFN iFN +gGe iFN iFN iFN iFN -iFN -iFN +gGe iFN iFN iFN @@ -50747,7 +50950,7 @@ iFN iFN iFN iFN -iFN +gGe iFN iFN iFN @@ -50937,7 +51140,7 @@ wpT dGy iFN iFN -iFN +lxF iFN iFN iFN @@ -61890,7 +62093,7 @@ vIk tjR rnI tjR -gbp +quA duD mdW mrc diff --git a/maps/rift/levels/rift-05-surface2.dmm b/maps/rift/levels/rift-05-surface2.dmm index 63fe275acb04..3d577fb291eb 100644 --- a/maps/rift/levels/rift-05-surface2.dmm +++ b/maps/rift/levels/rift-05-surface2.dmm @@ -307,11 +307,12 @@ "aoh" = ( /obj/machinery/door/airlock/glass/research{ name = "Research Lobby"; - req_one_access = list(29,47) + req_one_access = null }, /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/map_helper/access_helper/airlock/station/science/department, /turf/simulated/floor/tiled/steel, /area/rnd/research/researchdivision) "aok" = ( @@ -1393,7 +1394,6 @@ /turf/simulated/floor/maglev{ desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"; dir = 8; - icon_state = "maglevup"; name = "launch rail" }, /area/shuttle/hammerhead/general) @@ -2180,7 +2180,6 @@ /turf/simulated/floor/maglev{ desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"; dir = 8; - icon_state = "maglevup"; name = "launch rail" }, /area/shuttle/hammerhead/cockpit) @@ -2245,7 +2244,6 @@ /area/rnd/research) "bmS" = ( /obj/spawner/window/low_wall/reinforced/electrochromic/full{ - id = null; spawn_grille = 0 }, /obj/effect/paint/babyblue, @@ -2291,7 +2289,7 @@ "bno" = ( /obj/machinery/door/airlock/glass/research{ name = "RnD Lab"; - req_one_access = list(7) + req_one_access = null }, /obj/machinery/door/blast/shutters{ density = 0; @@ -2308,6 +2306,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/map_helper/access_helper/airlock/station/science/fabrication, /turf/simulated/floor/tiled/steel, /area/rnd/research) "bns" = ( @@ -2880,7 +2879,6 @@ /turf/simulated/floor/maglev{ desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"; dir = 8; - icon_state = "maglevup"; name = "launch rail" }, /area/shuttle/hammerhead/general) @@ -4036,11 +4034,12 @@ "cxg" = ( /obj/machinery/door/airlock/glass/research{ name = "Research Lobby"; - req_one_access = list(29,47) + req_one_access = null }, /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/map_helper/access_helper/airlock/station/science/department, /turf/simulated/floor/tiled/steel, /area/rnd/research/researchdivision) "cxu" = ( @@ -4528,6 +4527,10 @@ /obj/effect/floor_decal/corner/paleblue{ dir = 5 }, +/obj/item/storage/firstaid/adv{ + pixel_x = 4; + pixel_y = -11 + }, /turf/simulated/floor/tiled/white, /area/medical/medbay_primary_storage) "cPy" = ( @@ -8264,7 +8267,6 @@ /turf/simulated/floor/maglev{ desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"; dir = 8; - icon_state = "maglevup"; name = "launch rail" }, /area/shuttle/hammerhead/cockpit) @@ -8296,7 +8298,6 @@ /turf/simulated/floor/maglev{ desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"; dir = 8; - icon_state = "maglevup"; name = "launch rail" }, /area/shuttle/hammerhead/general) @@ -9106,7 +9107,6 @@ /area/security/hallway) "fSS" = ( /obj/spawner/window/low_wall/reinforced/electrochromic/full{ - id = null; spawn_grille = 0 }, /obj/effect/paint/babyblue, @@ -10956,6 +10956,13 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rift/turbolift/maint) +"hbr" = ( +/obj/structure/flora/ausbushes/ywflowers{ + pixel_x = 8; + pixel_y = -2 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside2) "hbT" = ( /obj/effect/floor_decal/industrial/warning, /obj/structure/cable/green{ @@ -12562,7 +12569,6 @@ /turf/simulated/floor/maglev{ desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"; dir = 8; - icon_state = "maglevup"; name = "launch rail" }, /area/shuttle/hammerhead/cockpit) @@ -12635,7 +12641,6 @@ /turf/simulated/floor/maglev{ desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"; dir = 8; - icon_state = "maglevup"; name = "launch rail" }, /area/shuttle/hammerhead/cockpit) @@ -13145,8 +13150,7 @@ "iqw" = ( /obj/effect/floor_decal/corner_techfloor_grid/full, /obj/machinery/computer/security{ - dir = 4; - icon_state = "computer" + dir = 4 }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/hammerhead/cockpit) @@ -14712,11 +14716,14 @@ /turf/simulated/floor/tiled/dark, /area/security/security_equiptment_storage) "jsz" = ( -/obj/machinery/door/airlock/maintenance/rnd, +/obj/machinery/door/airlock/maintenance/rnd{ + req_one_access = null + }, /obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/map_helper/access_helper/airlock/station/science/department, /turf/simulated/floor/tiled/steel, /area/rnd/research/researchdivision) "jsK" = ( @@ -15001,6 +15008,10 @@ /obj/machinery/vending/coffee, /turf/simulated/floor/wood, /area/rnd/breakroom) +"jGx" = ( +/obj/structure/flora/ausbushes/brflowers, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside2) "jGy" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -15082,8 +15093,7 @@ dir = 8 }, /obj/machinery/computer/security{ - dir = 4; - icon_state = "computer" + dir = 4 }, /obj/machinery/air_alarm{ dir = 4; @@ -15482,6 +15492,10 @@ }, /turf/simulated/floor/tiled/monowhite, /area/medical/morgue) +"jUn" = ( +/obj/structure/flora/grass/both, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside2) "jUG" = ( /obj/effect/floor_decal/spline/plain{ dir = 9 @@ -16822,6 +16836,10 @@ }, /turf/simulated/floor/tiled, /area/rnd/telescience_lab/storage) +"kMx" = ( +/obj/structure/flora/rock/ice/alternative_2, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside2) "kMU" = ( /obj/machinery/door/airlock/voidcraft/vertical{ name = "Air Management"; @@ -17695,7 +17713,6 @@ }, /obj/machinery/door/window/brigdoor/southright{ dir = 1; - icon_state = "rightsecure"; name = "Cockpit Access"; req_access = list(2); req_one_access = list(2) @@ -17864,7 +17881,6 @@ /turf/simulated/floor/maglev{ desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"; dir = 8; - icon_state = "maglevup"; name = "launch rail" }, /area/shuttle/hammerhead/cockpit) @@ -18944,8 +18960,7 @@ dir = 8 }, /obj/effect/floor_decal/industrial/warning{ - dir = 9; - icon_state = "warning" + dir = 9 }, /turf/simulated/floor/tiled/techmaint, /area/shuttle/hammerhead/general) @@ -19142,8 +19157,7 @@ /obj/machinery/embedded_controller/radio/simple_docking_controller{ frequency = 1380; id_tag = "hammerhead_dock"; - pixel_x = 26; - req_one_access = null + pixel_x = 26 }, /turf/simulated/floor/tiled/steel, /area/security/hammerhead_bay) @@ -19756,7 +19770,6 @@ /turf/simulated/floor/maglev{ desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"; dir = 8; - icon_state = "maglevup"; name = "launch rail" }, /area/shuttle/hammerhead/cockpit) @@ -23724,8 +23737,7 @@ dir = 4 }, /obj/effect/floor_decal/industrial/warning{ - dir = 6; - icon_state = "warning" + dir = 6 }, /obj/effect/floor_decal/sign/dock/two, /turf/simulated/floor/tiled/techmaint, @@ -24143,8 +24155,7 @@ dir = 4 }, /obj/effect/floor_decal/industrial/warning{ - dir = 5; - icon_state = "warning" + dir = 5 }, /turf/simulated/floor/tiled/techmaint, /area/shuttle/hammerhead/general) @@ -26174,6 +26185,13 @@ /obj/machinery/light, /turf/simulated/floor/water/pool, /area/triumph/surfacebase/sauna) +"qvf" = ( +/obj/structure/flora/grass/both{ + pixel_x = 10; + pixel_y = 10 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside2) "qvx" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -28667,16 +28685,15 @@ "rVf" = ( /obj/structure/table/standard, /obj/item/storage/firstaid/adv{ - pixel_x = 4; - pixel_y = 4 + pixel_y = 15 }, -/obj/item/storage/firstaid/adv, /obj/effect/floor_decal/corner/paleblue{ dir = 10 }, /obj/effect/floor_decal/corner/paleblue{ dir = 5 }, +/obj/machinery/lathe/medical/stocked, /turf/simulated/floor/tiled/white, /area/medical/medbay_primary_storage) "rVC" = ( @@ -28908,8 +28925,7 @@ pixel_x = -24 }, /obj/machinery/computer/shuttle_control/explore/hammerhead{ - dir = 4; - icon_state = "computer" + dir = 4 }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/hammerhead/cockpit) @@ -30876,6 +30892,13 @@ }, /turf/simulated/floor/plating/lythios43c, /area/rift/surfacebase/outside/outside2) +"tBL" = ( +/obj/structure/flora/grass/both{ + pixel_x = -5; + pixel_y = -4 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside2) "tBX" = ( /obj/machinery/light{ dir = 1 @@ -31976,7 +31999,6 @@ "uoE" = ( /obj/machinery/door/window/brigdoor/southright{ dir = 8; - icon_state = "rightsecure"; name = "Flight Operations Access"; req_access = list(2); req_one_access = list(2) @@ -32119,6 +32141,12 @@ /obj/structure/closet/wardrobe/science_white, /turf/simulated/floor/tiled/dark, /area/rnd/lockers) +"uvW" = ( +/obj/structure/flora/grass/green{ + pixel_x = -13 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside2) "uwn" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -33021,6 +33049,10 @@ }, /turf/simulated/floor/wood, /area/rift/station/public_garden/gantry) +"uVX" = ( +/obj/structure/flora/grass/green, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside2) "uWd" = ( /obj/machinery/shower{ pixel_y = 18 @@ -33606,6 +33638,10 @@ }, /turf/simulated/floor/tiled/white, /area/medical/recovery_room) +"vmf" = ( +/obj/structure/flora/ausbushes/ywflowers, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside2) "vmU" = ( /obj/effect/floor_decal/steeldecal/steel_decals_central6, /obj/effect/floor_decal/steeldecal/steel_decals10{ @@ -34037,7 +34073,6 @@ /turf/simulated/floor/maglev{ desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"; dir = 8; - icon_state = "maglevup"; name = "launch rail" }, /area/shuttle/hammerhead/cockpit) @@ -34112,7 +34147,6 @@ /turf/simulated/floor/maglev{ desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"; dir = 8; - icon_state = "maglevup"; name = "launch rail" }, /area/shuttle/hammerhead/cockpit) @@ -34252,7 +34286,6 @@ /turf/simulated/floor/maglev{ desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"; dir = 8; - icon_state = "maglevup"; name = "launch rail" }, /area/shuttle/hammerhead/general) @@ -35137,7 +35170,6 @@ /turf/simulated/floor/maglev{ desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"; dir = 8; - icon_state = "maglevup"; name = "launch rail" }, /area/shuttle/hammerhead/cockpit) @@ -36874,7 +36906,6 @@ /turf/simulated/floor/maglev{ desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"; dir = 8; - icon_state = "maglevup"; name = "launch rail" }, /area/shuttle/hammerhead/cockpit) @@ -48129,7 +48160,7 @@ bBF uIZ tVG oLJ -oLJ +uVX oLJ oLJ pBj @@ -48323,7 +48354,7 @@ tex oLJ oLJ oLJ -oLJ +uvW oLJ pBj pBj @@ -48347,7 +48378,7 @@ xec oLJ oLJ oLJ -oLJ +uVX oLJ oLJ oLJ @@ -48546,7 +48577,7 @@ oLJ pBj oLJ oLJ -oLJ +uVX oLJ cnh ufF @@ -49069,15 +49100,15 @@ oLJ oLJ oLJ oLJ +jGx oLJ -oLJ -oLJ +uVX fVv bBF bBF bBF keH -oLJ +hbr oLJ oLJ oLJ @@ -49140,7 +49171,7 @@ oLJ oLJ oLJ oLJ -oLJ +uVX oLJ oLJ oLJ @@ -49266,10 +49297,10 @@ oLJ oLJ oLJ oLJ -oLJ +vmf oLJ tex -oLJ +uVX oLJ oLJ oLJ @@ -49827,8 +49858,8 @@ sAX dUn enB enB -oLJ -oLJ +jUn +tBL oLJ enB enB @@ -50022,7 +50053,7 @@ dUn enB enB oLJ -oLJ +qvf oLJ enB enB @@ -50410,7 +50441,7 @@ dUn enB enB oLJ -oLJ +kMx oLJ enB enB diff --git a/maps/rift/levels/rift-06-surface3.dmm b/maps/rift/levels/rift-06-surface3.dmm index 9e7191e2f608..59c5d76c3211 100644 --- a/maps/rift/levels/rift-06-surface3.dmm +++ b/maps/rift/levels/rift-06-surface3.dmm @@ -1610,6 +1610,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/carpet/blue, /area/crew_quarters/captain) +"afj" = ( +/obj/effect/floor_decal/rust, +/obj/machinery/holopad/ship, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor, +/area/shuttle/oldcentury) "afk" = ( /obj/structure/railing, /obj/structure/railing{ @@ -2433,16 +2439,6 @@ /obj/item/flashlight/lamp, /turf/simulated/floor/wood, /area/bridge/bunker) -"ahI" = ( -/obj/machinery/computer/ship/sensors, -/obj/effect/floor_decal/corner/paleblue{ - dir = 10 - }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 5 - }, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/cockpit) "ahJ" = ( /obj/effect/floor_decal/spline/plain{ dir = 4 @@ -2451,9 +2447,6 @@ /turf/simulated/floor/wood, /area/exploration/meeting) "ahK" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/disposalpipe/sortjunction/flipped{ dir = 4; name = "Bar"; @@ -3122,7 +3115,10 @@ /area/rift/surfacebase/outside/outside3) "ajz" = ( /obj/structure/table/steel, -/obj/machinery/light/small, +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02" + }, /obj/item/material/ashtray/bronze, /turf/simulated/floor/plating, /area/maintenance/station/exploration) @@ -3615,21 +3611,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/locker/laundry_arrival) -"akJ" = ( -/obj/machinery/computer/ship/engines{ - dir = 4 - }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 10 - }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 5 - }, -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/cockpit) "akN" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -3701,12 +3682,6 @@ }, /turf/simulated/floor/tiled/steel, /area/exploration/excursion_dock) -"akV" = ( -/obj/structure/bed/chair/shuttle{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/cockpit) "akX" = ( /obj/machinery/shipsensors{ dir = 1 @@ -3860,22 +3835,16 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rift/trade_shop/landing_pad) -"alq" = ( -/obj/structure/bed/chair/shuttle{ - dir = 1 - }, -/obj/structure/cable/cyan{ - icon_state = "2-4" - }, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/cockpit) "alr" = ( /obj/machinery/appliance/cooker/fryer{ anchored = 0; pixel_x = -2; pixel_y = 2 }, -/obj/machinery/light/small, +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02" + }, /turf/simulated/floor/plating, /area/maintenance/bar/lower) "alt" = ( @@ -3983,23 +3952,6 @@ /obj/structure/panic_button, /turf/simulated/shuttle/wall/voidcraft/green, /area/shuttle/civvie/cockpit) -"alR" = ( -/obj/machinery/door/airlock/glass_external, -/obj/map_helper/airlock/door/ext_door, -/obj/map_helper/airlock/sensor/ext_sensor, -/obj/machinery/airlock_sensor/airlock_exterior/shuttle{ - frequency = 1380; - id_tag = "emt_shuttle_exterior_sensor"; - master_tag = "emt_shuttle_docker"; - pixel_x = -24; - pixel_y = -8 - }, -/obj/structure/fans/tiny, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/shuttle/emt/general) "alS" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/floodlight, @@ -4023,24 +3975,6 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rift/trade_shop/landing_pad) -"alU" = ( -/obj/machinery/computer/shuttle_control/explore/emt{ - dir = 8 - }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 10 - }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 5 - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/cable/cyan{ - icon_state = "2-8" - }, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/cockpit) "alV" = ( /obj/machinery/power/terminal{ dir = 1 @@ -4164,13 +4098,6 @@ }, /turf/simulated/floor/tiled/steel, /area/bridge) -"amh" = ( -/obj/machinery/shipsensors, -/obj/effect/floor_decal/spline/fancy{ - dir = 9 - }, -/turf/simulated/floor/tiled/techfloor/grid/lythios43c, -/area/shuttle/emt/cockpit) "ami" = ( /obj/machinery/power/apc/south_mount, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -4189,12 +4116,6 @@ }, /turf/simulated/floor/reinforced/lythios43c, /area/rift/surfacebase/outside/outside3) -"amk" = ( -/obj/structure/handrail{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/cockpit) "aml" = ( /obj/effect/floor_decal/spline/plain{ dir = 9 @@ -4204,12 +4125,6 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge/meeting_room) -"amm" = ( -/obj/structure/cable/cyan{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/cockpit) "amn" = ( /obj/structure/railing, /turf/simulated/floor/reinforced/lythios43c, @@ -4303,12 +4218,6 @@ "amD" = ( /turf/simulated/shuttle/wall/voidcraft/blue, /area/shuttle/emt/general) -"amE" = ( -/obj/machinery/light/spot{ - pixel_y = 32 - }, -/turf/simulated/shuttle/wall/voidcraft/hard_corner, -/area/shuttle/emt/cockpit) "amH" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 @@ -4625,17 +4534,6 @@ /obj/structure/cable/green, /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) -"anz" = ( -/obj/structure/panic_button, -/turf/simulated/shuttle/wall/voidcraft/hard_corner, -/area/shuttle/emt/cockpit) -"anA" = ( -/obj/structure/shuttle/engine/heater, -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 1 - }, -/turf/simulated/shuttle/wall/voidcraft/blue, -/area/shuttle/emt/general) "anC" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -4744,15 +4642,6 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/exploration/explorer_prep) -"anR" = ( -/obj/machinery/door/airlock/voidcraft{ - name = "cockpit" - }, -/obj/structure/cable/cyan{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/cockpit) "anT" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/lino, @@ -4870,9 +4759,6 @@ "aoo" = ( /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/general) -"aop" = ( -/turf/simulated/shuttle/wall/voidcraft/hard_corner, -/area/shuttle/emt/cockpit) "aor" = ( /obj/structure/mirror/long/right{ dir = 8; @@ -4915,6 +4801,28 @@ /obj/machinery/light, /turf/simulated/floor/tiled/techfloor, /area/shuttle/excursion/cargo) +"aov" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/structure/bed/chair/wheelchair, +/obj/effect/floor_decal/industrial/outline/blue, +/obj/machinery/air_alarm/alarms_hidden{ + dir = 8; + pixel_x = 22; + req_one_access = list(160) + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 6 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 6 + }, +/obj/machinery/light{ + old_wall = 1 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) "aow" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/techfloor/grid, @@ -5239,20 +5147,6 @@ "apj" = ( /turf/simulated/floor/tiled/techmaint, /area/rift/surfaceeva/aa/cliff_north) -"apk" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 9 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 9 - }, -/obj/effect/floor_decal/industrial/outline/blue, -/obj/structure/closet/walllocker/emergsuit_wall{ - pixel_y = 30 - }, -/obj/structure/handrail, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/general) "apl" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, @@ -5824,9 +5718,6 @@ }, /turf/simulated/floor/bluegrid, /area/ai_upload) -"aqP" = ( -/turf/simulated/floor/tiled/monowhite, -/area/shuttle/emt/general) "aqQ" = ( /obj/structure/closet/secure_closet/hop2, /obj/item/clothing/accessory/poncho/roles/cloak/hop, @@ -5838,26 +5729,6 @@ }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/hop) -"aqR" = ( -/obj/structure/cable/cyan{ - icon_state = "2-8" - }, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 5 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 5 - }, -/obj/structure/closet/walllocker/emergsuit_wall{ - pixel_y = 30 - }, -/obj/structure/bed/chair/shuttle, -/obj/machinery/power/apc/east_mount, -/obj/structure/cable/cyan{ - icon_state = "0-2" - }, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/general) "aqS" = ( /obj/structure/railing{ dir = 8 @@ -6042,6 +5913,7 @@ /obj/structure/cable/green{ icon_state = "0-4" }, +/obj/random/mre, /turf/simulated/floor/tiled/steel, /area/exploration) "aro" = ( @@ -6125,51 +5997,6 @@ /obj/map_helper/airlock/door/ext_door, /turf/simulated/floor/plating, /area/shuttle/courser/general) -"arB" = ( -/obj/structure/closet/crate/medical, -/obj/item/storage/firstaid/regular{ - pixel_x = -2; - pixel_y = 4 - }, -/obj/item/storage/firstaid/regular{ - pixel_x = -2; - pixel_y = 4 - }, -/obj/item/bodybag/cryobag{ - pixel_x = 5 - }, -/obj/item/bodybag/cryobag{ - pixel_x = 5 - }, -/obj/item/storage/firstaid/o2{ - layer = 2.8; - pixel_x = 4; - pixel_y = 6 - }, -/obj/item/storage/box/masks, -/obj/item/storage/box/gloves{ - pixel_x = 3; - pixel_y = 4 - }, -/obj/item/storage/firstaid/toxin, -/obj/item/storage/firstaid/fire{ - layer = 2.9; - pixel_x = 2; - pixel_y = 3 - }, -/obj/item/storage/firstaid/adv{ - pixel_x = -2 - }, -/obj/item/defib_kit/loaded, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 9 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 9 - }, -/obj/effect/floor_decal/industrial/outline/blue, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/general) "arC" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -6237,15 +6064,6 @@ /obj/structure/table/reinforced, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) -"arO" = ( -/obj/effect/floor_decal/borderfloorwhite/corner{ - dir = 1 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/general) "arR" = ( /obj/effect/floor_decal/borderfloorblack/corner, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -6448,21 +6266,6 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/captain) -"ass" = ( -/obj/machinery/computer/ship/helm, -/obj/item/gps/internal/base{ - desc = "A tracking beacon embedded in the shuttle systems, to help explorers find where they landed."; - gps_tag = "EMT"; - name = "shuttle beacon" - }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 10 - }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 5 - }, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/cockpit) "ast" = ( /obj/machinery/photocopier/faxmachine{ department = "Command Meeting Room" @@ -6904,20 +6707,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ai_upload_foyer) -"atM" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 8 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 8 - }, -/obj/structure/bed/roller, -/obj/effect/floor_decal/industrial/outline/blue, -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/general) "atN" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -7049,10 +6838,6 @@ }, /turf/simulated/floor/grass, /area/hydroponics) -"aue" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on, -/turf/simulated/floor/tiled/monowhite, -/area/shuttle/emt/general) "auf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -7072,17 +6857,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/hop) -"auh" = ( -/obj/structure/table/steel, -/obj/effect/floor_decal/corner/paleblue{ - dir = 10 - }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 5 - }, -/obj/machinery/recharger, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/cockpit) "aui" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -7270,25 +7044,6 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) -"auK" = ( -/obj/structure/table/steel, -/obj/effect/floor_decal/corner/paleblue{ - dir = 10 - }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 5 - }, -/obj/machinery/power/apc/south_mount, -/obj/structure/cable/cyan, -/obj/item/storage/toolbox/mechanical, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/cockpit) -"auL" = ( -/obj/machinery/light/spot{ - pixel_y = 32 - }, -/turf/simulated/shuttle/wall/voidcraft/blue, -/area/shuttle/emt/cockpit) "auM" = ( /obj/machinery/computer/crew{ dir = 1 @@ -7442,12 +7197,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/ai) -"avh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 5 - }, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/general) "avi" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -7528,15 +7277,6 @@ /obj/structure/ship_munition/disperser_charge/emp, /turf/simulated/floor/tiled/dark, /area/exploration/courser_dock) -"avt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/general) "avu" = ( /obj/random/trash_pile, /turf/simulated/floor/plating, @@ -7769,7 +7509,7 @@ /obj/machinery/door/blast/regular{ dir = 2; id = "shuttle_hatch"; - name = "Shuttle Rear Hatch" + name = "Shuttle Side Hatch" }, /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techfloor/grid, @@ -8411,14 +8151,6 @@ /obj/machinery/power/apc/high, /turf/simulated/floor/tiled/techfloor, /area/shuttle/excursion/cargo) -"axq" = ( -/obj/machinery/door/airlock/glass_external, -/obj/map_helper/airlock/door/int_door, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/shuttle/emt/general) "axr" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -8548,7 +8280,10 @@ "axM" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/closet/firecloset/full, -/obj/machinery/light/small, +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02" + }, /turf/simulated/floor/plating, /area/maintenance/substation/command) "axN" = ( @@ -9047,14 +8782,6 @@ /obj/structure/lattice, /turf/simulated/open/lythios43c, /area/rift/surfacebase/outside/outside3) -"azg" = ( -/obj/machinery/atmospherics/portables_connector{ - dir = 4; - name = "Engine Fuel Port" - }, -/obj/effect/floor_decal/industrial/outline/red, -/turf/simulated/floor, -/area/shuttle/emt/general) "azh" = ( /obj/structure/table/woodentable, /obj/random/maintenance/clean, @@ -9346,20 +9073,6 @@ "aAd" = ( /turf/simulated/floor/outdoors/gravsnow/lythios43c, /area/rift/surfacebase/outside/outside3) -"aAf" = ( -/obj/structure/fuel_port{ - dir = 4; - pixel_x = 30 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 1 - }, -/obj/machinery/meter, -/obj/machinery/light/small{ - dir = 4 - }, -/turf/simulated/floor, -/area/shuttle/emt/general) "aAg" = ( /obj/structure/fans/tiny, /obj/machinery/door/airlock/freezer{ @@ -9403,12 +9116,6 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar) -"aAk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10 - }, -/turf/simulated/shuttle/wall/voidcraft/hard_corner, -/area/shuttle/emt/general) "aAl" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 6 @@ -9429,22 +9136,6 @@ /obj/random/maintenance/clean, /turf/simulated/floor/plating, /area/maintenance/bar/lower) -"aAo" = ( -/obj/map_helper/airlock/atmos/chamber_pump, -/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ - dir = 4; - frequency = 1380; - id_tag = "emt_shuttle_docker_pump" - }, -/obj/structure/handrail{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/emt/general) "aAp" = ( /obj/structure/table/reinforced, /obj/effect/floor_decal/corner/blue{ @@ -9557,14 +9248,6 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor, /area/shuttle/emt/general) -"aAP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9 - }, -/obj/machinery/recharge_station, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor, -/area/shuttle/emt/general) "aAR" = ( /obj/structure/handrail{ dir = 4 @@ -9945,12 +9628,6 @@ }, /turf/simulated/floor/plating, /area/rift/surfaceeva/airlock/arrivals/secondary) -"aBY" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8 - }, -/turf/simulated/shuttle/wall/voidcraft/hard_corner, -/area/shuttle/emt/general) "aBZ" = ( /obj/structure/railing, /obj/structure/railing{ @@ -10140,30 +9817,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/commandmaint) -"aCE" = ( -/obj/structure/table/standard, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 10 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 10 - }, -/obj/effect/floor_decal/borderfloorwhite/corner2{ - dir = 9 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner2{ - dir = 9 - }, -/obj/structure/closet/walllocker/emerglocker{ - pixel_x = -30 - }, -/obj/item/storage/box/freezer{ - pixel_x = 5; - pixel_y = 2 - }, -/obj/item/storage/box/freezer, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/general) "aCF" = ( /obj/structure/table/bench/wooden, /obj/landmark/spawnpoint/job/botanist, @@ -10244,20 +9897,6 @@ /obj/random/tool, /turf/simulated/floor/plating, /area/maintenance/bar/lower) -"aCV" = ( -/obj/structure/closet/walllocker/emerglocker{ - pixel_x = -30 - }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/obj/effect/shuttle_landmark/rift/deck3/emt, -/obj/overmap/entity/visitable/ship/landable/emt, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/emt/general) "aCW" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -10735,22 +10374,6 @@ "aEA" = ( /turf/simulated/floor/tiled/techmaint, /area/rift/surfaceeva/aa/cliff_south) -"aEC" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ - dir = 4; - frequency = 1380; - id_tag = "emt_shuttle_docker_pump" - }, -/obj/map_helper/airlock/atmos/chamber_pump, -/obj/structure/handrail{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/emt/general) "aED" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -11020,13 +10643,6 @@ /obj/effect/floor_decal/industrial/outline, /turf/simulated/floor/tiled/dark, /area/security/nuke_storage) -"aFp" = ( -/obj/structure/shuttle/engine/heater, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 6 - }, -/turf/simulated/shuttle/wall/voidcraft/blue, -/area/shuttle/emt/general) "aFq" = ( /obj/structure/catwalk, /obj/structure/cable{ @@ -11337,13 +10953,6 @@ }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/hop) -"aGe" = ( -/obj/structure/shuttle/engine/heater, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10 - }, -/turf/simulated/shuttle/wall/voidcraft/blue, -/area/shuttle/emt/general) "aGf" = ( /obj/effect/floor_decal/corner_techfloor_grid{ dir = 10 @@ -11368,12 +10977,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/commandmaint) -"aGh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9 - }, -/turf/simulated/shuttle/wall/voidcraft/hard_corner, -/area/shuttle/emt/general) "aGj" = ( /obj/structure/railing, /obj/structure/railing{ @@ -11410,7 +11013,10 @@ /turf/simulated/floor/plating, /area/maintenance/bar/lower) "aGo" = ( -/obj/machinery/light/small, +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02" + }, /turf/simulated/floor/plating, /area/maintenance/bar/lower) "aGp" = ( @@ -11828,7 +11434,10 @@ /turf/simulated/floor/tiled/techfloor, /area/ai_upload) "aHA" = ( -/obj/machinery/light/small, +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02" + }, /obj/random/maintenance/clean, /turf/simulated/floor/plating, /area/maintenance/commandmaint) @@ -12532,7 +12141,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/machinery/light/small, +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02" + }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/barrestroom) "aJq" = ( @@ -12745,7 +12357,10 @@ /turf/simulated/floor/tiled/monotile, /area/hydroponics) "aJR" = ( -/obj/machinery/light/small, +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02" + }, /obj/structure/railing{ dir = 8 }, @@ -13082,29 +12697,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/excursion/cargo) -"aKM" = ( -/obj/machinery/vending/wallmed1{ - name = "Emergency NanoMed"; - pixel_y = -28 - }, -/obj/effect/floor_decal/borderfloorwhite, -/obj/effect/floor_decal/corner/paleblue/border, -/obj/effect/floor_decal/borderfloorwhite/corner2, -/obj/effect/floor_decal/borderfloorwhite/corner2{ - dir = 9 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner2, -/obj/effect/floor_decal/corner/paleblue/bordercorner2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 8 - }, -/obj/structure/handrail{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/general) "aKN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -13341,7 +12933,10 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/hop) "aLH" = ( -/obj/machinery/light/small, +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02" + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, @@ -13943,7 +13538,10 @@ /area/shuttle/excursion/general) "aNB" = ( /obj/structure/catwalk, -/obj/machinery/light/small, +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02" + }, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -14082,18 +13680,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/exploration/courser_dock) -"aNX" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 1 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 1 - }, -/obj/machinery/sleep_console{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/general) "aNY" = ( /obj/structure/handrail{ dir = 1 @@ -15654,24 +15240,6 @@ }, /turf/simulated/floor/tiled/steel, /area/exploration) -"aSl" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 1 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloorwhite/corner2{ - dir = 1 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner2{ - dir = 1 - }, -/obj/machinery/sleeper{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/general) "aSm" = ( /obj/machinery/disperser/back{ dir = 4 @@ -15850,7 +15418,10 @@ /obj/machinery/cell_charger, /obj/item/tool/screwdriver, /obj/item/tool/crowbar, -/obj/machinery/light/small, +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02" + }, /turf/simulated/floor/tiled/techmaint, /area/rift/surfaceeva/aa/cliff_south) "aSG" = ( @@ -16002,6 +15573,14 @@ /obj/structure/table/reinforced, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) +"aTb" = ( +/obj/structure/shuttle/engine/heater, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 + }, +/obj/effect/paint/black, +/turf/simulated/wall/rshull, +/area/shuttle/oldcentury) "aTd" = ( /obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ @@ -16330,7 +15909,10 @@ dir = 8; pixel_x = -12 }, -/obj/machinery/light/small, +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02" + }, /turf/simulated/floor/tiled/techmaint, /area/rift/surfaceeva/aa/cliff_south) "aUf" = ( @@ -16495,7 +16077,10 @@ dir = 8; pixel_x = -12 }, -/obj/machinery/light/small, +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02" + }, /turf/simulated/floor/tiled/techmaint, /area/rift/surfaceeva/aa/cliff_north) "aUB" = ( @@ -16939,9 +16524,8 @@ name = "Shuttle Rear Hatch" }, /obj/machinery/button/remote/blast_door{ - dir = 1; id = "shuttle_hatch"; - name = "Shuttle Rear Hatch"; + name = "Shuttle Side Hatch"; pixel_y = -26 }, /obj/machinery/door/firedoor/glass, @@ -17210,12 +16794,6 @@ }, /turf/simulated/floor/carpet/purcarpet, /area/exploration/meeting) -"aWI" = ( -/obj/structure/cable/cyan{ - icon_state = "1-4" - }, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/general) "aWJ" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 9 @@ -17417,25 +16995,6 @@ }, /turf/simulated/floor/tiled/steel, /area/exploration/pathfinder_office) -"aXm" = ( -/obj/structure/cable/cyan{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 1 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloorwhite/corner2{ - dir = 4 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner2{ - dir = 4 - }, -/obj/structure/bed/chair/shuttle, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/general) "aXn" = ( /obj/item/bedsheet, /obj/structure/bed, @@ -17714,7 +17273,10 @@ "aYf" = ( /obj/item/bedsheet, /obj/structure/bed, -/obj/machinery/light/small, +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02" + }, /turf/simulated/floor/tiled/techmaint, /area/rift/surfaceeva/aa/cliff_north) "aYi" = ( @@ -18183,10 +17745,6 @@ }, /turf/simulated/floor/outdoors/snow/lythios43c, /area/rift/surfacebase/outside/outside3) -"aZB" = ( -/obj/structure/shuttle/engine/heater, -/turf/simulated/shuttle/wall/voidcraft/hard_corner, -/area/shuttle/emt/general) "aZC" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 4 @@ -18339,18 +17897,6 @@ }, /turf/simulated/floor/plating/lythios43c, /area/rift/surfacebase/outside/outside3) -"baX" = ( -/obj/effect/floor_decal/borderfloorwhite/corner{ - dir = 4 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner{ - dir = 4 - }, -/obj/structure/cable/cyan{ - icon_state = "1-4" - }, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/general) "bdJ" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -18372,10 +17918,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) -"bfN" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/turf/simulated/floor/plating, -/area/shuttle/emt/cockpit) +"bgH" = ( +/obj/machinery/atmospherics/pipe/tank/air{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline/red, +/turf/simulated/floor, +/area/shuttle/emt/general) "bis" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -18404,6 +17953,22 @@ "bjs" = ( /turf/simulated/wall/prepainted/civilian, /area/maintenance/bar) +"bkq" = ( +/obj/machinery/bodyscanner{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline/blue, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 8 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) +"bly" = ( +/turf/simulated/floor/tiled/techfloor/grid/lythios43c, +/area/shuttle/oldcentury) "bnc" = ( /obj/machinery/door/firedoor/glass{ dir = 8 @@ -18455,6 +18020,13 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway) +"bqa" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 8 + }, +/obj/effect/paint/black, +/turf/simulated/wall/rshull, +/area/shuttle/oldcentury) "bqs" = ( /turf/simulated/wall/prepainted, /area/hallway/secondary/docking_hallway) @@ -18481,6 +18053,26 @@ }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/excursion/general) +"bsQ" = ( +/obj/machinery/computer/ship/helm, +/obj/item/gps/internal/base{ + desc = "A tracking beacon embedded in the shuttle systems, to help explorers find where they landed."; + gps_tag = "EMT"; + name = "shuttle beacon" + }, +/obj/effect/floor_decal/borderfloorwhite/full, +/obj/effect/floor_decal/corner/paleblue{ + dir = 5 + }, +/obj/effect/floor_decal/corner/paleblue{ + dir = 10 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/cockpit) +"btC" = ( +/obj/effect/floor_decal/rust, +/turf/simulated/floor/tiled/techfloor/grid/lythios43c, +/area/shuttle/oldcentury) "bvV" = ( /obj/effect/floor_decal/borderfloor/corner, /obj/effect/floor_decal/corner/lightgrey/bordercorner, @@ -18533,6 +18125,43 @@ /obj/structure/sign/warning/falling, /turf/simulated/wall/r_wall/prepainted, /area/rift/surfacebase/outside/outside3) +"bGu" = ( +/obj/structure/table/standard, +/obj/machinery/air_alarm/alarms_hidden{ + dir = 8; + pixel_x = 22; + req_one_access = list(160) + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 4 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/cockpit) +"bGE" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/structure/cable/cyan{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/cyan, +/obj/effect/floor_decal/borderfloorwhite/corner{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 4 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 4 + }, +/obj/effect/floor_decal/corner/paleblue/bordercorner{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) "bHN" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -18556,10 +18185,41 @@ }, /turf/simulated/floor/plating, /area/maintenance/commandmaint) +"bIJ" = ( +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/obj/effect/debris/cleanable/dirt, +/obj/effect/debris/cleanable/dirt, +/obj/machinery/door/window/brigdoor/southright{ + dir = 8; + req_access = null + }, +/obj/structure/curtain/open/ashlander, +/turf/simulated/floor/tiled/old_tile/green, +/area/shuttle/oldcentury) "bIN" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, /area/crew_quarters/bar) +"bJk" = ( +/obj/structure/flora/tree/pine, +/turf/simulated/floor/outdoors/snow/noblend/lythios43c, +/area/rift/surfacebase/outside/outside3) +"bJt" = ( +/turf/simulated/floor/outdoors/gravsnow/lythios43c, +/area) +"bKm" = ( +/obj/structure/flora/grass/both{ + pixel_x = 6; + pixel_y = 10 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) +"bLD" = ( +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor/carpet/patterened/green, +/area/shuttle/oldcentury) "bMK" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -18603,20 +18263,18 @@ /obj/effect/floor_decal/corner/paleblue/border, /turf/simulated/floor/tiled/steel_grid, /area/exploration/medic_prep) -"bPD" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 5 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 5 +"bOR" = ( +/obj/effect/floor_decal/rust, +/obj/structure/handrail{ + dir = 1 }, -/obj/structure/bed/chair/wheelchair, -/obj/effect/floor_decal/industrial/outline/blue, /obj/structure/cable/cyan{ - icon_state = "2-8" + icon_state = "0-4" }, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/general) +/obj/machinery/power/apc/high/south_mount, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor/tiled/old_tile/gray, +/area/shuttle/oldcentury) "bPV" = ( /turf/simulated/wall/r_wall/prepainted/command, /area/crew_quarters/heads/hop) @@ -18647,6 +18305,11 @@ }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/blueshield) +"bRP" = ( +/obj/effect/floor_decal/rust, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/tiled/techfloor/grid/lythios43c, +/area/shuttle/oldcentury) "bSo" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/cable/green{ @@ -18741,6 +18404,17 @@ }, /turf/simulated/floor/tiled/monotile, /area/exploration/pilot_prep) +"cdU" = ( +/obj/machinery/computer/shuttle_control/explore/emt, +/obj/effect/floor_decal/borderfloorwhite/full, +/obj/effect/floor_decal/corner/paleblue{ + dir = 10 + }, +/obj/effect/floor_decal/corner/paleblue{ + dir = 5 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/cockpit) "cgU" = ( /obj/machinery/computer/secure_data{ dir = 1 @@ -18754,6 +18428,13 @@ }, /turf/simulated/wall/prepainted, /area/rift/surfacebase/outside/outside3) +"chB" = ( +/obj/structure/catwalk, +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/turf/simulated/floor/plating/lythios43c, +/area/rift/surfacebase/outside/outside3) "ciu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 8 @@ -18784,6 +18465,26 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/bar/lower) +"clr" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ + dir = 8 + }, +/obj/structure/handrail{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/shuttle_landmark/rift/deck3/oldcentury, +/obj/machinery/embedded_controller/radio/airlock/docking_port{ + cycle_to_external_air = 1; + frequency = 1380; + id_tag = "oldcentury_docker"; + pixel_x = -28 + }, +/obj/overmap/entity/visitable/ship/landable/oldcentury, +/turf/simulated/floor/tiled/old_tile/green, +/area/shuttle/oldcentury) "cnq" = ( /obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 1 @@ -18851,6 +18552,12 @@ /obj/effect/paint/commandblue, /turf/simulated/floor/plating, /area/bridge/bridge_hallway) +"ctl" = ( +/obj/effect/floor_decal/rust, +/obj/machinery/door/airlock, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/monodark, +/area/shuttle/oldcentury) "cvg" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -18908,6 +18615,22 @@ }, /turf/simulated/floor/plating, /area/rift/surfaceeva/airlock/arrivals/secondary) +"cBe" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 8 + }, +/obj/machinery/recharge_station, +/turf/simulated/floor, +/area/shuttle/oldcentury) +"cBz" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) "cBD" = ( /obj/effect/floor_decal/spline/plain{ dir = 4 @@ -18926,15 +18649,17 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) -"cCj" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ - dir = 4 +"cCS" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ + frequency = 1380; + id_tag = "oldcentury_docker_pump" }, +/obj/map_helper/airlock/atmos/chamber_pump, /obj/structure/cable/green{ - icon_state = "2-8" + icon_state = "2-4" }, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/general) +/turf/simulated/floor/tiled/old_tile/green, +/area/shuttle/oldcentury) "cDv" = ( /obj/structure/catwalk, /turf/simulated/open, @@ -18966,6 +18691,12 @@ }, /turf/simulated/shuttle/wall/voidcraft/green, /area/shuttle/civvie/general) +"cLb" = ( +/obj/structure/flora/ausbushes/pointybush{ + pixel_y = 12 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) "cOE" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -18992,8 +18723,16 @@ }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/excursion/cargo) +"cQw" = ( +/obj/machinery/computer/ship/sensors, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor/plating, +/area/shuttle/oldcentury) "cQT" = ( -/obj/machinery/light/small, +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02" + }, /turf/simulated/floor/plating, /area/maintenance/station/exploration) "cQV" = ( @@ -19022,6 +18761,19 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar) +"cVB" = ( +/obj/machinery/sleeper{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline/blue, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 9 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 9 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) "cWu" = ( /turf/simulated/wall/prepainted/exploration, /area/maintenance/bar/lower) @@ -19069,6 +18821,20 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) +"cZP" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/effect/paint/black, +/turf/simulated/wall/rshull, +/area/shuttle/oldcentury) +"cZT" = ( +/obj/machinery/atmospherics/component/unary/heater{ + dir = 8 + }, +/obj/structure/cable/cyan{ + icon_state = "2-8" + }, +/turf/simulated/floor, +/area/shuttle/oldcentury) "dan" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -19094,6 +18860,19 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/captain) +"deN" = ( +/obj/structure/bed/chair/bay/shuttle{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 8 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 8 + }, +/obj/structure/closet/walllocker/emerglocker/west, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/cockpit) "dfy" = ( /obj/effect/floor_decal/borderfloor{ dir = 10 @@ -19103,15 +18882,6 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) -"dgX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/general) "diY" = ( /obj/effect/floor_decal/industrial/halfstair, /obj/structure/cable/green{ @@ -19119,17 +18889,31 @@ }, /turf/simulated/floor/plating/lythios43c, /area/rift/surfacebase/outside/outside3) +"djI" = ( +/obj/structure/shuttle/engine/heater, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 4 + }, +/turf/simulated/shuttle/wall/voidcraft/hard_corner, +/area/shuttle/emt/general) +"dkS" = ( +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/turf/simulated/floor, +/area/shuttle/emt/cockpit) "dnb" = ( /turf/simulated/wall/r_wall/prepainted/science, /area/rnd/telescience_lab) -"dph" = ( -/obj/machinery/light/small{ - dir = 8 +"doA" = ( +/obj/structure/bed/chair/bay/shuttle{ + dir = 1 }, -/obj/machinery/power/terminal, -/obj/machinery/atmospherics/pipe/manifold/hidden/cyan, -/obj/structure/cable/green, +/obj/effect/debris/cleanable/dirt, /turf/simulated/floor, +/area/shuttle/oldcentury) +"doW" = ( +/obj/effect/floor_decal/borderfloorwhite, +/obj/effect/floor_decal/corner/paleblue/border, +/turf/simulated/floor/tiled/white, /area/shuttle/emt/general) "dpK" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, @@ -19147,6 +18931,10 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/shuttle/courser/general) +"dqU" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) "drn" = ( /obj/machinery/door/airlock/maintenance/common, /obj/machinery/door/firedoor/glass, @@ -19157,7 +18945,10 @@ /area/maintenance/commandmaint) "dsO" = ( /obj/structure/catwalk, -/obj/machinery/light/small, +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02" + }, /turf/simulated/floor/plating, /area/maintenance/commandmaint) "dvT" = ( @@ -19190,6 +18981,11 @@ }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/barrestroom) +"dxR" = ( +/obj/effect/paint/black, +/obj/effect/paint_stripe/black, +/turf/simulated/wall/rshull, +/area/shuttle/oldcentury) "dxW" = ( /obj/item/trash/unajerky, /turf/simulated/floor/plating, @@ -19223,6 +19019,12 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway2) +"dBD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/cyan, +/obj/effect/debris/cleanable/dirt, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor, +/area/shuttle/oldcentury) "dCB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -19270,6 +19072,10 @@ "dDI" = ( /turf/simulated/wall/r_wall/prepainted/command, /area/crew_quarters/heads/blueshield) +"dFH" = ( +/obj/machinery/shipsensors, +/turf/simulated/floor/airless, +/area/shuttle/emt/general) "dIa" = ( /obj/spawner/window/low_wall/full/nogrille/firelocks, /obj/effect/paint/violet, @@ -19306,6 +19112,35 @@ /obj/item/flame/candle, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) +"dNn" = ( +/obj/machinery/door/airlock/glass_external, +/obj/map_helper/airlock/door/ext_door, +/obj/machinery/airlock_sensor/airlock_exterior/shuttle{ + dir = 4; + frequency = 1380; + id_tag = "emt_shuttle_exterior_sensor"; + master_tag = "emt_shuttle_docker"; + pixel_y = 23 + }, +/obj/map_helper/airlock/sensor/ext_sensor, +/obj/structure/fans/tiny, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/emt/general) +"dOC" = ( +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 8 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/cockpit) "dOT" = ( /obj/structure/table/hardwoodtable, /obj/effect/floor_decal/spline/plain, @@ -19326,6 +19161,18 @@ }, /turf/simulated/floor/tiled, /area/rnd/telescience_lab) +"dRG" = ( +/obj/effect/floor_decal/borderfloorwhite{ + dir = 1 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) "dSD" = ( /obj/machinery/holopad, /obj/effect/floor_decal/borderfloor{ @@ -19413,6 +19260,14 @@ }, /turf/simulated/floor/tiled/steel, /area/rift/stairwell/primary/surfacethree) +"dXR" = ( +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/machinery/recharge_station, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor, +/area/shuttle/emt/general) "dYH" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -19516,6 +19371,18 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/hallway/primary/surfacethree) +"ekN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 9 + }, +/obj/machinery/meter, +/obj/machinery/computer/ship/engines, +/obj/machinery/air_alarm/alarms_hidden{ + pixel_y = 22; + req_one_access = list(160) + }, +/turf/simulated/floor, +/area/shuttle/emt/general) "ekT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 @@ -19526,6 +19393,11 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/shuttle/courser/general) +"enP" = ( +/obj/machinery/body_scanconsole, +/obj/effect/floor_decal/industrial/outline/blue, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) "eod" = ( /turf/simulated/wall/r_wall/prepainted/command, /area/ai) @@ -19539,15 +19411,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/monotile, /area/hallway/primary/surfacethree) -"eoM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 9 - }, -/obj/structure/handrail{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/emt/general) "epp" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -19576,6 +19439,25 @@ }, /turf/simulated/open, /area/rnd/telescience_lab/chamber) +"eur" = ( +/obj/structure/bed/chair/bay/shuttle{ + dir = 1 + }, +/obj/machinery/power/apc/east_mount{ + old_wall = 1 + }, +/obj/structure/cable/cyan{ + icon_state = "0-4"; + dir = 4 + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 6 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 6 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/cockpit) "evR" = ( /obj/effect/floor_decal/borderfloor/corner, /obj/effect/floor_decal/corner/lightgrey/bordercorner, @@ -19698,6 +19580,15 @@ }, /turf/simulated/floor/tiled/techfloor, /area/rift/turbolift/maint) +"eCH" = ( +/obj/structure/bed/chair/bay/shuttle, +/obj/structure/table/bench/wooden{ + pixel_x = 15 + }, +/obj/effect/debris/cleanable/dirt, +/obj/effect/floor_decal/borderfloorwhite/shifted, +/turf/simulated/floor/carpet/patterened/green, +/area/shuttle/oldcentury) "eDm" = ( /turf/simulated/wall/r_wall/prepainted, /area/crew_quarters/locker/laundry_arrival) @@ -19724,6 +19615,29 @@ }, /turf/simulated/floor/plating, /area/maintenance/commandmaint) +"eEr" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/reinforced/lythios43c, +/area/rift/surfacebase/outside/outside3) +"eEz" = ( +/obj/machinery/door/airlock/glass_external, +/obj/map_helper/airlock/door/ext_door, +/obj/structure/fans/tiny, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/emt/general) +"eGc" = ( +/obj/structure/catwalk, +/obj/structure/cable/green{ + dir = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/plating/lythios43c, +/area/rift/surfacebase/outside/outside3) "eGn" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -19751,6 +19665,20 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) +"eHc" = ( +/obj/machinery/button/remote/blast_door{ + dir = 4; + id = "oldshuttle_hatch"; + name = "Shuttle Side Hatch"; + pixel_x = -24; + req_one_access = list(19,43,67) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 6 + }, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor/tiled/monodark, +/area/shuttle/oldcentury) "eHR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -19822,6 +19750,18 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) +"eJV" = ( +/obj/structure/window/reinforced/polarized{ + dir = 8; + id = "Centuries_old_shuttle_general" + }, +/obj/machinery/media/jukebox, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor/tiled/old_tile/green, +/area/shuttle/oldcentury) "eKt" = ( /obj/effect/floor_decal/borderfloor{ dir = 10 @@ -19863,6 +19803,12 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rift/surfaceeva/airlock/arrivals) +"eKT" = ( +/obj/effect/debris/cleanable/dirt, +/obj/effect/debris/cleanable/dirt, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor/carpet/patterened/green, +/area/shuttle/oldcentury) "eLH" = ( /obj/landmark/spawnpoint/overflow/station, /obj/item/radio/beacon/anchored, @@ -19937,6 +19883,19 @@ }, /turf/simulated/floor/plating, /area/maintenance/research/xenobio) +"eRp" = ( +/obj/machinery/air_alarm/alarms_hidden{ + pixel_y = 24 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/debris/cleanable/dirt, +/obj/structure/closet/largecardboard, +/obj/item/clothing/under/soviet, +/obj/item/clothing/head/ushanka, +/obj/item/clothing/accessory/hawaii/random, +/obj/item/clothing/under/hawaiian, +/turf/simulated/floor, +/area/shuttle/oldcentury) "eWa" = ( /obj/machinery/door/airlock/multi_tile/glass, /obj/effect/floor_decal/borderfloor{ @@ -19959,6 +19918,14 @@ }, /turf/simulated/floor/lino, /area/crew_quarters/bar_backroom) +"eYG" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/effect/paint/black, +/obj/effect/paint/silver, +/turf/simulated/wall/rshull, +/area/shuttle/oldcentury) "eZd" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -19986,6 +19953,10 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway2) +"eZv" = ( +/obj/machinery/shipsensors, +/turf/simulated/floor/tiled/techfloor/grid/lythios43c, +/area/shuttle/oldcentury) "faf" = ( /obj/machinery/holoposter{ pixel_x = 32 @@ -20017,6 +19988,12 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/shuttle/courser/general) +"fdS" = ( +/obj/machinery/atmospherics/component/unary/engine{ + dir = 1 + }, +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/oldcentury) "fea" = ( /turf/simulated/floor/carpet/blue, /area/crew_quarters/heads/blueshield) @@ -20032,6 +20009,10 @@ }, /turf/simulated/floor/tiled/monotile, /area/hallway/secondary/docking_hallway) +"fgd" = ( +/obj/effect/overlay/snow/floor, +/turf/simulated/floor/tiled/steel_grid/lythios43c, +/area/rift/surfacebase/outside/outside3) "fgP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -20091,6 +20072,17 @@ }, /turf/simulated/floor/tiled/steel, /area/exploration/courser_dock) +"fmA" = ( +/obj/machinery/meter, +/obj/structure/fuel_port{ + pixel_x = -27 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 4 + }, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor, +/area/shuttle/oldcentury) "fon" = ( /obj/structure/railing{ dir = 1 @@ -20120,6 +20112,12 @@ /obj/structure/cable/green, /turf/simulated/floor/tiled/steel, /area/hydroponics) +"frm" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, +/turf/simulated/shuttle/wall/voidcraft/blue, +/area/shuttle/emt/general) "fsc" = ( /obj/structure/bed/chair/sofa/black/right, /obj/effect/floor_decal/spline/plain{ @@ -20138,6 +20136,25 @@ "fuM" = ( /turf/simulated/wall/r_wall/prepainted, /area/crew_quarters/barrestroom) +"fxf" = ( +/obj/structure/cable/cyan{ + icon_state = "0-4"; + dir = 8 + }, +/obj/machinery/power/apc/east_mount{ + old_wall = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 6 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 6 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) "fxA" = ( /obj/structure/table/hardwoodtable, /obj/machinery/chemical_dispenser/catering/bar_soft{ @@ -20148,6 +20165,28 @@ /obj/effect/floor_decal/corner/red/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) +"fxK" = ( +/obj/structure/shuttle/engine/heater, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 + }, +/obj/effect/paint/silver, +/turf/simulated/wall/rshull, +/area/shuttle/oldcentury) +"fxP" = ( +/obj/machinery/power/apc/high/west_mount, +/obj/structure/cable/cyan{ + icon_state = "0-4" + }, +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02"; + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor/tiled/monodark, +/area/shuttle/oldcentury) "fyf" = ( /obj/structure/catwalk, /obj/machinery/light/small{ @@ -20171,7 +20210,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, -/obj/machinery/light/small, +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02" + }, /turf/simulated/floor/plating, /area/rift/turbolift/maint) "fDZ" = ( @@ -20181,6 +20223,14 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) +"fFk" = ( +/obj/structure/catwalk, +/obj/structure/cable/green{ + dir = 8; + icon_state = "2-4" + }, +/turf/simulated/floor/plating/lythios43c, +/area/rift/surfacebase/outside/outside3) "fFo" = ( /obj/machinery/door/blast/shutters{ density = 0; @@ -20206,21 +20256,6 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge) -"fFL" = ( -/obj/map_helper/airlock/sensor/chamber_sensor, -/obj/machinery/airlock_sensor{ - frequency = 1380; - id_tag = "emt_shuttle_docker"; - pixel_x = 24 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ - dir = 1 - }, -/obj/structure/handrail{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/emt/general) "fGK" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 @@ -20252,6 +20287,27 @@ }, /turf/simulated/floor, /area/shuttle/civvie/general) +"fIk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 + }, +/turf/simulated/shuttle/wall/voidcraft/blue, +/area/shuttle/emt/general) +"fIx" = ( +/obj/structure/window/reinforced/polarized{ + dir = 8; + id = "Centuries_old_shuttle_general" + }, +/obj/structure/table/rack/shelf/steel, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 + }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor/tiled/old_tile/green, +/area/shuttle/oldcentury) "fIY" = ( /obj/machinery/light/small{ dir = 1 @@ -20285,6 +20341,18 @@ }, /turf/simulated/floor/carpet/blue, /area/crew_quarters/heads/blueshield) +"fOO" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan, +/obj/structure/cable/cyan{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor, +/area/shuttle/oldcentury) "fPu" = ( /obj/structure/cable{ icon_state = "1-2" @@ -20295,7 +20363,10 @@ /turf/simulated/floor/plating, /area/maintenance/substation/exploration) "fPD" = ( -/obj/machinery/light/small, +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02" + }, /obj/random/trash_pile, /turf/simulated/floor/plating, /area/maintenance/commandmaint) @@ -20334,6 +20405,16 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway2) +"fTc" = ( +/obj/machinery/door/airlock/voidcraft/vertical{ + name = "Engine Bay" + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan, +/turf/simulated/floor, +/area/shuttle/emt/general) "fTe" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -20400,6 +20481,16 @@ /obj/effect/paint/palebottlegreen, /turf/simulated/floor/plating, /area/exploration/pilot_Office) +"fYJ" = ( +/obj/structure/curtain/open/shower, +/obj/machinery/door/airlock{ + name = "Toilet" + }, +/obj/structure/cable/cyan{ + icon_state = "1-4" + }, +/turf/simulated/floor/tiled/old_tile/blue, +/area/shuttle/oldcentury) "gaF" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -20413,10 +20504,31 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway) +"gaQ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor, +/area/shuttle/oldcentury) +"gaS" = ( +/obj/structure/bed/chair/sofa/black/right, +/obj/effect/debris/cleanable/dirt, +/obj/effect/debris/cleanable/dirt, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor/carpet/patterened/green, +/area/shuttle/oldcentury) "gbx" = ( /obj/machinery/holopad/ship, /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/general) +"gbA" = ( +/obj/structure/flora/ausbushes/ywflowers{ + pixel_x = -6; + pixel_y = 8 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) "gcc" = ( /obj/machinery/camera/network/civilian{ dir = 4 @@ -20432,6 +20544,12 @@ }, /turf/simulated/floor/tiled/monotile, /area/exploration/pilot_prep) +"gcu" = ( +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/turf/simulated/floor/reinforced/lythios43c, +/area/rift/surfacebase/outside/outside3) "ghf" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/cable/green{ @@ -20442,19 +20560,6 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) -"giX" = ( -/obj/structure/closet/walllocker/emergsuit_wall{ - pixel_x = 32 - }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/emt/general) "gjR" = ( /obj/machinery/light/small{ dir = 8 @@ -20573,6 +20678,59 @@ /obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/maintenance/bar) +"gvh" = ( +/obj/machinery/door/airlock/glass_external, +/obj/map_helper/airlock/door/int_door, +/obj/machinery/access_button{ + dir = 1; + frequency = 1380; + master_tag = "emt_shuttle_docker"; + name = "interior access button"; + pixel_x = 8; + pixel_y = -24 + }, +/obj/machinery/embedded_controller/radio/airlock/docking_port{ + cycle_to_external_air = 1; + dir = 4; + frequency = 1380; + id_tag = "emt_shuttle_docker"; + pixel_x = 8; + pixel_y = -36 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/emt/general) +"gvz" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/cyan, +/obj/machinery/air_alarm/alarms_hidden{ + dir = 4; + pixel_x = -22; + req_one_access = list(160) + }, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor/tiled/monodark, +/area/shuttle/oldcentury) +"gwB" = ( +/obj/structure/shuttle/engine/heater, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 1 + }, +/turf/simulated/shuttle/wall/voidcraft/hard_corner, +/area/shuttle/emt/general) +"gyK" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/debris/cleanable/dirt, +/obj/structure/closet/walllocker/emergsuit_wall{ + pixel_x = 32 + }, +/turf/simulated/floor, +/area/shuttle/oldcentury) +"gzi" = ( +/obj/effect/paint/silver, +/turf/simulated/wall/rshull, +/area/shuttle/oldcentury) "gzQ" = ( /obj/machinery/light{ dir = 8 @@ -20617,6 +20775,10 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway) +"gFD" = ( +/obj/structure/flora/ausbushes/lavendergrass, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) "gGW" = ( /turf/simulated/wall/r_wall/prepainted/command, /area/ai_cyborg_station) @@ -20680,6 +20842,15 @@ /obj/machinery/fire_alarm/west_mount, /turf/simulated/floor/plating, /area/maintenance/bar/lower) +"gRm" = ( +/obj/effect/floor_decal/borderfloorwhite{ + dir = 8 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) "gTy" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -20716,26 +20887,16 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge) -"haO" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 6 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 6 +"hfa" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/atmospherics/pipe/tank/air{ + dir = 8 }, -/obj/effect/floor_decal/borderfloorwhite/corner2, -/obj/effect/floor_decal/corner/paleblue/bordercorner2, -/obj/structure/table/standard, -/obj/item/soap/nanotrasen, -/obj/random/medical/lite, -/obj/random/medical/lite, -/obj/random/medical/lite, -/obj/random/medical/lite, /obj/structure/cable/cyan{ - icon_state = "1-2" + icon_state = "1-8" }, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/general) +/turf/simulated/floor, +/area/shuttle/oldcentury) "hfE" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -20797,6 +20958,13 @@ }, /turf/simulated/floor/plating, /area/maintenance/research/xenobio) +"hkW" = ( +/obj/structure/flora/bush{ + pixel_x = -12; + pixel_y = 14 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) "hkX" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 4 @@ -20825,26 +20993,23 @@ }, /turf/simulated/floor/wood, /area/exploration/pilot_Office) -"hsD" = ( -/obj/machinery/door/airlock/glass_external, -/obj/map_helper/airlock/door/int_door, -/obj/machinery/access_button{ - dir = 1; - frequency = 1380; - master_tag = "emt_shuttle_docker"; - name = "interior access button"; - pixel_x = 24; - pixel_y = 8 +"huM" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9 }, -/obj/machinery/embedded_controller/radio/airlock/docking_port{ - cycle_to_external_air = 1; - dir = 1; - frequency = 1380; - id_tag = "emt_shuttle_docker"; - pixel_x = 36; - pixel_y = 8 +/obj/effect/paint/black, +/turf/simulated/wall/rshull, +/area/shuttle/oldcentury) +"huS" = ( +/obj/structure/cable/green{ + icon_state = "1-2" }, -/turf/simulated/floor/tiled/techfloor/grid, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 2 + }, +/obj/effect/floor_decal/corner/paleblue/border, +/turf/simulated/floor/tiled/white, /area/shuttle/emt/general) "hAi" = ( /obj/machinery/light{ @@ -20960,12 +21125,23 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/exploration/pilot_Office) -"hDa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ +"hDB" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/structure/cable/cyan{ + icon_state = "2-8" + }, +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02"; + dir = 4 + }, +/obj/structure/bed/chair/sofa/black/left{ dir = 8 }, -/turf/simulated/shuttle/wall/voidcraft/hard_corner, -/area/shuttle/emt/general) +/turf/simulated/floor/carpet/patterened/green, +/area/shuttle/oldcentury) "hDW" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 9 @@ -21010,6 +21186,15 @@ }, /turf/simulated/floor/tiled/dark, /area/teleporter) +"hIh" = ( +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 5 + }, +/turf/simulated/floor, +/area/shuttle/emt/general) "hIO" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/machinery/door/blast/regular{ @@ -21137,6 +21322,9 @@ "hXj" = ( /turf/simulated/wall/prepainted/exploration, /area/exploration/explorer_prep) +"hYq" = ( +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) "hYK" = ( /obj/machinery/fire_alarm/south_mount{ pixel_y = -24 @@ -21178,6 +21366,14 @@ }, /turf/simulated/floor/wood, /area/exploration/pilot_Office) +"ibi" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/effect/paint/black, +/obj/effect/paint_stripe/black, +/turf/simulated/wall/rshull, +/area/shuttle/oldcentury) "icY" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -21260,6 +21456,19 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway2) +"iiO" = ( +/obj/structure/catwalk, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/turf/simulated/floor/plating/lythios43c, +/area/rift/surfacebase/outside/outside3) +"ika" = ( +/obj/structure/window/reinforced/polarized/full{ + id = "Centuries_old_shuttle_cockpit" + }, +/turf/simulated/floor/tiled/monodark, +/area/shuttle/oldcentury) "ikZ" = ( /obj/machinery/door/firedoor/glass{ dir = 8 @@ -21284,6 +21493,13 @@ /obj/item/storage/firstaid/o2, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway) +"inC" = ( +/obj/structure/shuttle/engine/heater, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 + }, +/turf/simulated/shuttle/wall/voidcraft/hard_corner, +/area/shuttle/emt/cockpit) "inQ" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -21314,6 +21530,12 @@ }, /turf/simulated/floor/plating, /area/exploration) +"ivj" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 + }, +/turf/simulated/floor, +/area/shuttle/emt/general) "ivw" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 8 @@ -21369,6 +21591,20 @@ /obj/effect/paint/commandblue, /turf/simulated/floor/plating, /area/crew_quarters/heads/hop) +"iCo" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 4 + }, +/obj{ + name = "---Merge conflict marker---" + }, +/obj/structure/flora/grass/both{ + pixel_x = 10; + pixel_y = 10 + }, +/turf/simulated/floor/reinforced/lythios43c, +/area/rift/surfacebase/outside/outside3) "iCv" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -21391,7 +21627,10 @@ /obj/structure/cable/green{ icon_state = "1-4" }, -/obj/machinery/light/small, +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02" + }, /turf/simulated/floor/plating, /area/maintenance/substation/exploration) "iEp" = ( @@ -21415,6 +21654,21 @@ /obj/effect/paint/purplegray, /turf/simulated/floor/plating, /area/rnd/telescience_lab) +"iHi" = ( +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02"; + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/debris/cleanable/dirt, +/obj/machinery/computer/ship/navigation/telescreen{ + pixel_y = 24 + }, +/obj/item/material/twohanded/folded_metal_chair, +/obj/item/material/twohanded/folded_metal_chair, +/turf/simulated/floor, +/area/shuttle/oldcentury) "iIQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -21448,12 +21702,42 @@ /obj/structure/grille, /turf/simulated/floor/plating, /area/rift/surfacebase/outside/outside3) +"iKt" = ( +/obj/machinery/door/window/brigdoor/northleft, +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan, +/obj/effect/floor_decal/borderfloorwhite/cee{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/bordercee, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) +"iKK" = ( +/obj/structure/bed/chair/bay/shuttle{ + dir = 1 + }, +/obj/effect/debris/cleanable/dirt, +/obj/structure/table/bench/wooden{ + pixel_x = 15 + }, +/turf/simulated/floor/carpet/patterened/green, +/area/shuttle/oldcentury) "iLh" = ( /obj/structure/cable/green{ icon_state = "4-8" }, /turf/simulated/floor/tiled/monotile, /area/security/checkpoint2) +"iLn" = ( +/obj/structure/shuttle/engine/heater, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, +/obj/effect/paint/silver, +/turf/simulated/wall/rshull, +/area/shuttle/oldcentury) "iLp" = ( /obj/machinery/door/blast/shutters{ density = 0; @@ -21489,22 +21773,58 @@ /obj/item/bedsheet/reddouble, /turf/simulated/floor/plating, /area/maintenance/commandmaint) +"iQv" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 + }, +/obj/effect/paint/black, +/turf/simulated/wall/rshull, +/area/shuttle/oldcentury) +"iRe" = ( +/obj/structure/handrail{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 10 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 10 + }, +/obj/structure/panic_button{ + pixel_y = -28 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/cockpit) +"iRy" = ( +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) "iRO" = ( /obj/machinery/light/small{ dir = 8 }, /turf/simulated/floor/plating, /area/maintenance/bar/lower) -"iXB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 10 +"iSW" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 4 }, -/obj/machinery/meter, -/obj/structure/cable/cyan{ - icon_state = "1-2" +/obj/effect/paint/black, +/turf/simulated/wall/rshull, +/area/shuttle/oldcentury) +"iZn" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 }, -/turf/simulated/floor, -/area/shuttle/emt/general) +/obj/effect/paint/black, +/obj/effect/paint_stripe/black, +/turf/simulated/wall/rshull, +/area/shuttle/oldcentury) "iZv" = ( /obj/machinery/door/airlock/command{ id_tag = "captaindoor"; @@ -21528,6 +21848,18 @@ }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/captain) +"iZN" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/power/smes/buildable{ + charge = 15000; + cur_coils = 3 + }, +/obj/structure/cable/cyan{ + icon_state = "0-4" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/cyan, +/turf/simulated/floor, +/area/shuttle/oldcentury) "jat" = ( /obj/machinery/light/small{ dir = 4 @@ -21584,6 +21916,21 @@ /obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/steel, /area/exploration/courser_dock) +"jhj" = ( +/obj/structure/flora/rock/ice, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) +"jhF" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ + frequency = 1380; + id_tag = "emt_shuttle_docker_pump" + }, +/obj/map_helper/airlock/atmos/chamber_pump, +/obj/structure/closet/walllocker/emergsuit_wall{ + pixel_y = 30 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/emt/general) "jil" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 4 @@ -21597,6 +21944,14 @@ /obj/map_helper/airlock/door/ext_door, /turf/simulated/floor/tiled/steel_grid, /area/exploration/excursion_dock) +"jin" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 4 + }, +/obj/effect/debris/cleanable/dirt, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor, +/area/shuttle/oldcentury) "jiv" = ( /turf/simulated/wall/prepainted, /area/rift/stairwell/primary/surfacethree) @@ -21656,6 +22011,16 @@ }, /turf/simulated/floor/plating, /area/exploration/explorer_prep) +"jrm" = ( +/obj/structure/handrail{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 2 + }, +/obj/effect/floor_decal/corner/paleblue/border, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) "jrG" = ( /obj/machinery/light, /obj/machinery/atmospherics/pipe/manifold/hidden{ @@ -21670,6 +22035,13 @@ }, /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/general) +"jrR" = ( +/obj/structure/flora/grass/both{ + pixel_x = -5; + pixel_y = -4 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) "jsa" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -21686,6 +22058,13 @@ "jsv" = ( /turf/simulated/wall/r_wall/prepainted/civilian, /area/crew_quarters/bar) +"jsT" = ( +/obj/structure/shuttle/engine/heater, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, +/turf/simulated/shuttle/wall/voidcraft/hard_corner, +/area/shuttle/emt/general) "jtQ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 @@ -21736,6 +22115,26 @@ }, /turf/simulated/floor/tiled/steel, /area/exploration) +"jxX" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline/red, +/turf/simulated/floor, +/area/shuttle/oldcentury) +"jyn" = ( +/obj/structure/bed/chair/bay/shuttle, +/obj/item/reagent_containers/food/drinks/cans/cola_coffee{ + pixel_x = 15; + pixel_y = 3 + }, +/obj/effect/debris/cleanable/dirt, +/obj/machinery/computer/ship/navigation/telescreen{ + pixel_y = 24 + }, +/obj/effect/floor_decal/borderfloorwhite/shifted, +/turf/simulated/floor/carpet/patterened/green, +/area/shuttle/oldcentury) "jyZ" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -21751,6 +22150,12 @@ }, /turf/simulated/floor/tiled/monotile, /area/exploration/pilot_prep) +"jBb" = ( +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/turf/simulated/floor/reinforced/lythios43c, +/area/rift/surfacebase/outside/outside3) "jBo" = ( /turf/simulated/wall/r_wall/prepainted, /area/rift/surfaceeva/aa/cliff_north) @@ -21799,6 +22204,21 @@ }, /turf/simulated/floor/tiled/steel, /area/exploration) +"jFP" = ( +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/structure/window/reinforced/polarized{ + dir = 8; + id = "Centuries_old_shuttle_general" + }, +/obj/machinery/vending/coffee, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor/tiled/old_tile/green, +/area/shuttle/oldcentury) "jGl" = ( /obj/structure/table/reinforced, /obj/item/storage/firstaid/regular, @@ -21912,12 +22332,6 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) -"jLf" = ( -/obj/machinery/door/airlock/glass_external, -/obj/map_helper/airlock/door/ext_door, -/obj/structure/fans/tiny, -/turf/simulated/floor/tiled/techfloor/grid, -/area/shuttle/emt/general) "jLR" = ( /obj/structure/table/wooden_reinforced, /obj/item/book/manual/legal/sop_vol5_6{ @@ -21999,6 +22413,20 @@ "jRd" = ( /turf/simulated/open, /area/rnd/telescience_lab/chamber) +"jRQ" = ( +/obj/structure/handrail{ + dir = 1 + }, +/obj/structure/handrail{ + dir = 1 + }, +/obj/effect/floor_decal/rust, +/obj/machinery/button/windowtint/multitint{ + id = "Centuries_old_shuttle_cockpit"; + pixel_y = -20 + }, +/turf/simulated/floor, +/area/shuttle/oldcentury) "jSm" = ( /obj/structure/girder, /turf/simulated/floor/plating, @@ -22016,6 +22444,10 @@ "jTJ" = ( /turf/simulated/floor/plating, /area/maintenance/research/xenobio) +"jUD" = ( +/obj/structure/flora/grass/green, +/turf/simulated/floor/outdoors/snow/noblend/lythios43c, +/area/rift/surfacebase/outside/outside3) "jVd" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -22026,6 +22458,13 @@ /obj/effect/floor_decal/spline/fancy, /turf/simulated/floor/wood, /area/exploration/pilot_Office) +"jVm" = ( +/obj/structure/flora/ausbushes/lavendergrass{ + pixel_x = 6; + pixel_y = 6 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) "jVy" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/lino, @@ -22071,6 +22510,42 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) +"jXt" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/fire_alarm/south_mount{ + pixel_y = -24 + }, +/obj/effect/floor_decal/corner/beige{ + dir = 5 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/bar) +"jYd" = ( +/obj/structure/table/rack/shelf/steel, +/obj/item/clothing/suit/space/emergency/russian, +/obj/item/clothing/head/helmet/space/emergency/russian, +/obj/item/light/bulb/orange, +/obj/item/light/bulb/orange, +/obj/item/light/bulb/orange, +/obj/item/light/bulb/orange, +/obj/item/light/bulb/orange, +/obj/item/light/bulb/orange, +/obj/item/light/bulb/orange, +/obj/item/light/bulb/orange, +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02"; + dir = 4 + }, +/obj/item/tank/emergency/oxygen, +/obj/item/clothing/mask/gas/clear, +/turf/simulated/floor, +/area/shuttle/oldcentury) "jZk" = ( /obj/structure/lattice, /turf/simulated/open, @@ -22107,6 +22582,17 @@ /obj/effect/paint/palebottlegreen, /turf/simulated/floor/plating, /area/hydroponics) +"kcm" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 4 + }, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor, +/area/shuttle/oldcentury) +"khK" = ( +/obj/structure/flora/rock/ice/alternative_2, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) "kih" = ( /obj/machinery/door/firedoor/glass{ dir = 8 @@ -22119,6 +22605,15 @@ }, /turf/simulated/floor/tiled/monotile, /area/rift/trade_shop/landing_pad) +"kjF" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 10 + }, +/turf/simulated/floor, +/area/shuttle/emt/general) "kjZ" = ( /obj/machinery/power/terminal{ dir = 8 @@ -22311,6 +22806,14 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) +"kMc" = ( +/obj/effect/debris/cleanable/dirt, +/obj/effect/debris/cleanable/dirt, +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/simulated/floor, +/area/shuttle/oldcentury) "kOx" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 @@ -22324,9 +22827,49 @@ }, /turf/simulated/floor/tiled/monotile, /area/exploration) +"kRm" = ( +/obj/structure/table/standard, +/obj/item/soap/nanotrasen, +/obj/item/reagent_containers/glass/beaker/cryoxadone{ + pixel_x = -4 + }, +/obj/random/medical/lite, +/obj/random/medical/lite, +/obj/random/medical/lite, +/obj/random/medical/lite, +/obj/random/medical/lite, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 10 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 10 + }, +/obj/machinery/light{ + dir = 8; + old_wall = 1 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) "kRX" = ( /turf/simulated/wall/r_wall/prepainted/security, /area/security/checkpoint2) +"kSr" = ( +/obj/machinery/door/airlock/glass_external, +/obj/map_helper/airlock/door/ext_door, +/obj/structure/fans/tiny, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/airlock_sensor/airlock_exterior/shuttle{ + frequency = 1380; + id_tag = "oldcentury_docker_sensor"; + master_tag = "oldcentury_docker"; + pixel_x = 24; + pixel_y = -8 + }, +/obj/map_helper/airlock/sensor/ext_sensor, +/turf/simulated/floor/tiled/old_tile/green, +/area/shuttle/oldcentury) "kTT" = ( /obj/machinery/computer/security{ dir = 1 @@ -22381,6 +22924,12 @@ "lbu" = ( /turf/simulated/wall/r_wall/prepainted/civilian, /area/crew_quarters/kitchen) +"lbZ" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) "lcP" = ( /obj/structure/bed/chair{ dir = 4 @@ -22523,6 +23072,17 @@ /obj/landmark/spawnpoint/job/pilot, /turf/simulated/floor/wood, /area/exploration/pilot_Office) +"luX" = ( +/obj/structure/bed/roller, +/obj/effect/floor_decal/industrial/outline/red, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 4 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) "lxt" = ( /obj/effect/paint/black, /obj/effect/paint_stripe/violet, @@ -22641,6 +23201,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway2) +"lLr" = ( +/obj/structure/flora/ausbushes/ppflowers, +/obj/structure/flora/bush{ + pixel_x = -12; + pixel_y = 14 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) "lMp" = ( /turf/simulated/wall/prepainted/science, /area/maintenance/research/xenobio) @@ -22654,6 +23222,69 @@ }, /turf/simulated/floor/plating, /area/maintenance/station/exploration) +"lNQ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/effect/paint/black, +/turf/simulated/wall/rshull, +/area/shuttle/oldcentury) +"lNU" = ( +/obj/structure/closet/crate/medical, +/obj/item/storage/firstaid/regular{ + pixel_x = -2; + pixel_y = 4 + }, +/obj/item/storage/firstaid/regular{ + pixel_x = -2; + pixel_y = 4 + }, +/obj/item/bodybag/cryobag{ + pixel_x = 5 + }, +/obj/item/bodybag/cryobag{ + pixel_x = 5 + }, +/obj/item/storage/firstaid/o2{ + layer = 2.8; + pixel_x = 4; + pixel_y = 6 + }, +/obj/item/storage/box/masks, +/obj/item/storage/box/gloves{ + pixel_x = 3; + pixel_y = 4 + }, +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/fire{ + layer = 2.9; + pixel_x = 2; + pixel_y = 3 + }, +/obj/item/storage/firstaid/adv{ + pixel_x = -2 + }, +/obj/item/reagent_containers/blood/empty, +/obj/item/reagent_containers/blood/empty, +/obj/item/reagent_containers/blood/empty, +/obj/item/reagent_containers/blood/empty, +/obj/item/reagent_containers/blood/empty, +/obj/item/defib_kit/loaded, +/obj/machinery/air_alarm/alarms_hidden{ + pixel_y = 24 + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 5 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 5 + }, +/obj/machinery/light{ + dir = 4; + old_wall = 1 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) "lOr" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -22725,6 +23356,26 @@ }, /turf/simulated/floor/plating, /area/maintenance/commandmaint) +"lUe" = ( +/obj/machinery/power/terminal, +/obj/structure/cable/cyan{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/turf/simulated/floor, +/area/shuttle/oldcentury) +"lVJ" = ( +/obj/structure/flora/ausbushes/lavendergrass{ + pixel_x = 2; + pixel_y = 12 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) "lWu" = ( /obj/machinery/disposal, /obj/effect/floor_decal/borderfloor{ @@ -22839,10 +23490,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/bridge) -"lZF" = ( -/obj/machinery/holopad/ship, -/turf/simulated/floor/tiled/monowhite, -/area/shuttle/emt/general) "lZM" = ( /turf/simulated/wall/prepainted/exploration, /area/exploration/meeting) @@ -22863,6 +23510,12 @@ /obj/structure/bed/padded, /turf/simulated/floor/plating, /area/maintenance/commandmaint) +"mdN" = ( +/obj/effect/floor_decal/rust, +/obj/effect/debris/cleanable/dirt, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor, +/area/shuttle/oldcentury) "mhO" = ( /obj/effect/floor_decal/borderfloor{ dir = 10 @@ -22909,6 +23562,22 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/shuttle/courser/general) +"mlj" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/atmospherics/pipe/tank/phoron{ + dir = 4; + volume = 15000 + }, +/turf/simulated/floor, +/area/shuttle/oldcentury) +"mlu" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloorwhite, +/obj/effect/floor_decal/corner/paleblue/border, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) "mnJ" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/effect/paint/purplegray, @@ -22921,6 +23590,19 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/security/checkpoint2) +"mpR" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/debris/cleanable/blood/oil/streak, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor, +/area/shuttle/oldcentury) "mpX" = ( /turf/simulated/wall/prepainted/exploration, /area/exploration/pathfinder_office) @@ -22951,6 +23633,10 @@ }, /turf/simulated/floor/carpet/blue, /area/crew_quarters/heads/blueshield) +"msd" = ( +/obj/structure/flora/ausbushes/ppflowers, +/turf/simulated/floor/outdoors/snow/noblend/lythios43c, +/area/rift/surfacebase/outside/outside3) "msZ" = ( /obj/machinery/door/airlock/glass_external, /obj/map_helper/airlock/door/ext_door, @@ -22991,6 +23677,16 @@ }, /turf/simulated/floor/tiled/steel, /area/bridge) +"muH" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/catwalk, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating/lythios43c, +/area/rift/surfacebase/outside/outside3) "mvz" = ( /turf/simulated/wall/r_wall/prepainted, /area/hallway/secondary/docking_hallway) @@ -22998,6 +23694,18 @@ /obj/machinery/holopad/ship, /turf/simulated/floor/tiled/monotile, /area/exploration/pilot_prep) +"mwh" = ( +/obj/machinery/computer/shuttle_control/explore/oldcentury{ + dir = 4 + }, +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02"; + dir = 8 + }, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor/tiled/monodark, +/area/shuttle/oldcentury) "mxx" = ( /obj/effect/floor_decal/spline/plain{ dir = 1 @@ -23013,6 +23721,17 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/bar) +"myr" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing, +/obj/structure/marker_beacon/red, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/reinforced/lythios43c, +/area/rift/surfacebase/outside/outside3) "mAj" = ( /turf/simulated/wall/prepainted, /area/hallway/secondary/docking_hallway2) @@ -23054,6 +23773,19 @@ }, /turf/simulated/floor/tiled/techmaint, /area/exploration) +"mCH" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/catwalk, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating/lythios43c, +/area/rift/surfacebase/outside/outside3) "mCR" = ( /obj/machinery/door/airlock/maintenance/int{ name = "Kitchen Access"; @@ -23160,6 +23892,21 @@ }, /turf/simulated/floor/plating, /area/maintenance/station/exploration) +"mQw" = ( +/obj/structure/bed/chair/shuttle{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 4 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) "mQz" = ( /obj/machinery/door/airlock/maintenance/engi{ name = "Substation Access" @@ -23192,6 +23939,10 @@ /obj/structure/lattice, /turf/simulated/open, /area/rnd/telescience_lab/chamber) +"mUB" = ( +/obj/structure/flora/ausbushes/ppflowers, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) "mUS" = ( /obj/structure/catwalk, /obj/structure/cable/green{ @@ -23199,6 +23950,17 @@ }, /turf/simulated/floor/plating/lythios43c, /area/rift/surfaceeva/airlock/arrivals/secondary) +"mUU" = ( +/obj/structure/flora/ausbushes/ywflowers{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/structure/flora/ausbushes/brflowers{ + pixel_x = 3; + pixel_y = -6 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) "mVj" = ( /obj/machinery/light{ dir = 4 @@ -23243,6 +24005,10 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) +"nbh" = ( +/obj/structure/flora/bush, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) "nbB" = ( /obj/effect/floor_decal/industrial/warning, /obj/structure/cable/green{ @@ -23254,6 +24020,16 @@ /obj/structure/sign/warning/docking_area, /turf/simulated/wall/r_wall/prepainted/exploration, /area/exploration/excursion_dock) +"ndR" = ( +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/structure/table/bench/wooden, +/obj/structure/flora/pottedplant/flower{ + pixel_y = 12 + }, +/turf/simulated/floor/carpet/patterened/green, +/area/shuttle/oldcentury) "ndT" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -23365,12 +24141,28 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ai_server_room) +"nlg" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden, +/turf/simulated/shuttle/wall/voidcraft/blue, +/area/shuttle/emt/general) "nms" = ( /obj/structure/table/rack/steel, /obj/random/maintenance/medical, /obj/random/coin, /turf/simulated/floor/plating, /area/maintenance/bar/lower) +"nmw" = ( +/obj/machinery/power/terminal, +/obj/structure/cable/green{ + icon_state = "0-8"; + dir = 1 + }, +/obj/machinery/air_alarm/alarms_hidden{ + pixel_y = 22; + req_one_access = list(160) + }, +/turf/simulated/floor, +/area/shuttle/emt/general) "nmA" = ( /obj/machinery/door/airlock/glass_external/public{ name = "Public External Airlock" @@ -23410,6 +24202,16 @@ }, /turf/simulated/floor/reinforced, /area/rnd/telescience_lab/chamber) +"nqA" = ( +/obj/effect/paint/silver, +/obj/effect/paint_stripe/black, +/obj/machinery/airlock_sensor{ + dir = 4; + id_tag = "oldcentury_docker"; + pixel_x = 12 + }, +/turf/simulated/wall/rshull, +/area/shuttle/oldcentury) "nsi" = ( /obj/structure/railing{ dir = 8 @@ -23438,28 +24240,6 @@ /obj/item/stack/cable_coil/random, /turf/simulated/floor/plating, /area/maintenance/commandmaint) -"nyL" = ( -/obj/effect/floor_decal/borderfloorwhite, -/obj/effect/floor_decal/corner/paleblue/border, -/obj/effect/floor_decal/borderfloorwhite/corner2, -/obj/effect/floor_decal/borderfloorwhite/corner2{ - dir = 9 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner2, -/obj/effect/floor_decal/corner/paleblue/bordercorner2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 8 - }, -/obj/structure/handrail{ - dir = 1 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/general) "nCn" = ( /obj/structure/ladder{ pixel_y = 8 @@ -23486,6 +24266,14 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) +"nHY" = ( +/obj/structure/table/rack/shelf/steel, +/obj/item/tank/jetpack/improvised, +/obj/item/storage/toolbox/mechanical{ + pixel_y = 18 + }, +/turf/simulated/floor, +/area/shuttle/oldcentury) "nJk" = ( /obj/machinery/atmospherics/portables_connector{ dir = 1 @@ -23512,6 +24300,11 @@ /obj/structure/cable/green, /turf/simulated/floor/plating, /area/maintenance/substation/surface_three) +"nMn" = ( +/obj/effect/paint/black, +/obj/effect/paint/silver, +/turf/simulated/wall/rshull, +/area/shuttle/oldcentury) "nMD" = ( /obj/structure/closet/secure_closet/pilot, /obj/machinery/light, @@ -23651,6 +24444,17 @@ /obj/map_helper/airlock/sensor/chamber_sensor, /turf/simulated/floor/tiled/steel_grid, /area/rift/surfaceeva/airlock/arrivals) +"ogS" = ( +/obj/structure/railing, +/obj/structure/flora/ausbushes/ywflowers, +/turf/simulated/floor/outdoors/snow/noblend/lythios43c, +/area/rift/surfacebase/outside/outside3) +"oiE" = ( +/obj/structure/flora/rock/ice/alternative_1{ + layer = 4 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) "okY" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, @@ -23671,6 +24475,13 @@ }, /turf/simulated/floor/tiled/steel, /area/exploration/courser_dock) +"oqd" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) "oqe" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 4 @@ -23722,6 +24533,25 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway) +"otK" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ + dir = 4 + }, +/obj/machinery/airlock_sensor{ + dir = 1; + frequency = 1380; + id_tag = "emt_shuttle_docker"; + pixel_y = -21 + }, +/obj/map_helper/airlock/sensor/chamber_sensor, +/obj/structure/handrail{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/emt/general) "otN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -23780,6 +24610,20 @@ }, /turf/simulated/floor/wood, /area/exploration/pilot_Office) +"oys" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor, +/area/shuttle/oldcentury) +"ozQ" = ( +/obj/effect/floor_decal/borderfloorwhite{ + dir = 1 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) "oAw" = ( /obj/structure/cable/pink{ icon_state = "1-2" @@ -23804,6 +24648,10 @@ "oCx" = ( /turf/simulated/wall/r_wall/prepainted, /area/rift/turbolift/maint) +"oCC" = ( +/obj/effect/paint/black, +/turf/simulated/wall/rshull, +/area/shuttle/oldcentury) "oEP" = ( /obj/machinery/light/small/emergency{ dir = 1 @@ -23880,14 +24728,40 @@ "oLI" = ( /turf/simulated/wall/r_wall/prepainted, /area/rift/surfaceeva/airlock/arrivals) +"oMK" = ( +/obj/structure/table/standard, +/obj/item/storage/box/freezer{ + pixel_x = 5; + pixel_y = 2 + }, +/obj/item/storage/box/freezer, +/obj/structure/window/reinforced/polarized{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 4 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) "oNh" = ( -/obj/machinery/light/small, +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02" + }, /obj/structure/catwalk, /obj/structure/cable/green{ icon_state = "4-8" }, /turf/simulated/floor/plating, /area/maintenance/commandmaint) +"oPq" = ( +/obj/machinery/door/airlock/glass_external, +/obj/map_helper/airlock/door/int_door, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/emt/general) "oQY" = ( /obj/machinery/door/firedoor/glass{ dir = 1 @@ -23984,6 +24858,32 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway) +"oWZ" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 10 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/debris/cleanable/dirt, +/obj/structure/bed/pod, +/obj/item/bedsheet/brown, +/turf/simulated/floor, +/area/shuttle/oldcentury) +"oXk" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ + dir = 1; + frequency = 1380; + id_tag = "oldcentury_docker_pump" + }, +/obj/map_helper/airlock/atmos/chamber_pump, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/old_tile/green, +/area/shuttle/oldcentury) "oXU" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 4 @@ -24006,11 +24906,15 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge) -"pem" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5 +"pat" = ( +/obj/structure/flora/ausbushes/ywflowers, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) +"peo" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" }, -/turf/simulated/shuttle/wall/voidcraft/hard_corner, +/turf/simulated/shuttle/wall/voidcraft/blue, /area/shuttle/emt/general) "peI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -24119,23 +25023,6 @@ }, /turf/simulated/floor/lino, /area/crew_quarters/bar_backroom) -"psu" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 4 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 4 - }, -/obj/structure/bed/roller, -/obj/effect/floor_decal/industrial/outline/blue, -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/cable/cyan{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/white, -/area/shuttle/emt/general) "ptn" = ( /obj/structure/table/reinforced, /obj/machinery/recharger, @@ -24163,6 +25050,21 @@ }, /turf/simulated/floor/plating, /area/bridge/bunker) +"puC" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan, +/obj/machinery/vending/wallmed1{ + name = "Emergency NanoMed"; + pixel_x = 28 + }, +/obj/effect/floor_decal/borderfloorwhite/cee{ + dir = 1 + }, +/obj/effect/floor_decal/corner/paleblue/bordercee, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) "pxd" = ( /obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks, /obj/effect/paint/purplegray, @@ -24190,6 +25092,12 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway2) +"pCy" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/debris/cleanable/dirt, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor, +/area/shuttle/oldcentury) "pFg" = ( /obj/machinery/door/airlock/maintenance/common, /obj/structure/cable/green{ @@ -24220,6 +25128,25 @@ /obj/effect/paint/darkred, /turf/simulated/floor/plating, /area/security/checkpoint2) +"pKp" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02"; + dir = 4 + }, +/obj/structure/bed/chair/bay/shuttle, +/obj/structure/table/bench/wooden{ + pixel_x = -16 + }, +/obj/machinery/air_alarm/alarms_hidden{ + pixel_y = 24 + }, +/obj/effect/floor_decal/borderfloorwhite/shifted, +/turf/simulated/floor/carpet/patterened/green, +/area/shuttle/oldcentury) "pKx" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 8 @@ -24278,7 +25205,10 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "pLB" = ( -/obj/machinery/light/small, +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02" + }, /turf/simulated/floor/plating, /area/maintenance/bar) "pMX" = ( @@ -24346,16 +25276,38 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/commandmaint) +"pTC" = ( +/obj/effect/paint/silver, +/obj/effect/paint_stripe/black, +/turf/simulated/wall/rshull, +/area/shuttle/oldcentury) "pVV" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/shuttle/civvie/general) +"pZx" = ( +/obj/machinery/door/blast/regular{ + dir = 2; + id = "oldshuttle_hatch"; + name = "Shuttle Side Hatch" + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/monodark, +/area/shuttle/oldcentury) "qcL" = ( /obj/landmark/spawnpoint/job/pilot, /obj/item/stool/padded, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/monotile, /area/exploration/pilot_prep) +"qcX" = ( +/obj/structure/cable/cyan{ + icon_state = "0-4" + }, +/obj/machinery/power/apc/high/west_mount, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor, +/area/shuttle/oldcentury) "qdg" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -24396,6 +25348,10 @@ "qgc" = ( /turf/simulated/floor/reinforced, /area/rnd/telescience_lab/chamber) +"qgy" = ( +/obj/structure/flora/grass/green, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) "qgY" = ( /obj/structure/table/hardwoodtable, /obj/machinery/chemical_dispenser/catering/bar_coffee{ @@ -24406,6 +25362,10 @@ /obj/effect/floor_decal/corner/red/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) +"qhn" = ( +/obj/structure/flora/grass/both, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) "qjW" = ( /obj/structure/table/wooden_reinforced, /obj/effect/floor_decal/spline/plain{ @@ -24450,6 +25410,17 @@ }, /turf/simulated/floor/tiled, /area/rnd/telescience_lab) +"qmR" = ( +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/effect/debris/cleanable/dirt, +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02" + }, +/turf/simulated/floor/carpet/patterened/green, +/area/shuttle/oldcentury) "qmY" = ( /obj/machinery/button/remote/blast_door{ dir = 1; @@ -24506,6 +25477,12 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/surface_three) +"qoC" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/atmospherics/pipe/manifold/hidden, +/obj/effect/debris/cleanable/blood/oil/streak, +/turf/simulated/floor, +/area/shuttle/oldcentury) "qsA" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -24533,6 +25510,19 @@ }, /turf/simulated/floor/tiled/steel, /area/rift/stairwell/primary/surfacethree) +"qwS" = ( +/obj/machinery/holopad/ship, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorwhite/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/paleblue/bordercorner{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) "qxq" = ( /obj/spawner/window/low_wall/full/nogrille/firelocks, /turf/simulated/floor/plating, @@ -24625,7 +25615,6 @@ /area/crew_quarters/bar) "qGN" = ( /obj/structure/catwalk, -/obj/machinery/light/small, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -24664,6 +25653,10 @@ "qKs" = ( /turf/simulated/wall/prepainted/command, /area/bridge/meeting_room) +"qKD" = ( +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor/tiled/monodark, +/area/shuttle/oldcentury) "qSJ" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -24694,6 +25687,26 @@ /obj/machinery/light/small/emergency, /turf/simulated/floor/plating, /area/maintenance/commandmaint) +"qVp" = ( +/obj/structure/window/reinforced/polarized{ + dir = 8; + id = "Centuries_old_shuttle_general" + }, +/obj/structure/table/rack/shelf/steel, +/obj/structure/flora/pottedplant/shoot{ + pixel_x = 5; + pixel_y = 23 + }, +/obj/machinery/door/firedoor/glass{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloorwhite/shifted, +/obj/machinery/button/windowtint/multitint{ + id = "Centuries_old_shuttle_general"; + pixel_x = -11 + }, +/turf/simulated/floor/tiled/old_tile/green, +/area/shuttle/oldcentury) "qVq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -24794,6 +25807,17 @@ /obj/machinery/light, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway) +"rjP" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/structure/bed/chair/sofa/black/corner, +/obj/effect/debris/cleanable/dirt, +/obj/machinery/computer/ship/navigation/telescreen{ + pixel_x = 32 + }, +/turf/simulated/floor/carpet/patterened/green, +/area/shuttle/oldcentury) "rkv" = ( /obj/structure/table/steel, /obj/random/maintenance/research, @@ -24874,6 +25898,18 @@ /obj/machinery/status_display, /turf/simulated/wall/r_wall/prepainted/command, /area/bridge) +"rvp" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 8 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) "rxA" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 4 @@ -24927,19 +25963,6 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) -"rFB" = ( -/obj/machinery/door/airlock/voidcraft{ - name = "battery hatch" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/structure/cable/cyan{ - icon_state = "1-2" - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor, -/area/shuttle/emt/general) "rJB" = ( /obj/structure/bed/chair/bay/comfy/black{ dir = 8 @@ -24972,6 +25995,15 @@ }, /turf/simulated/floor/tiled/steel, /area/exploration/excursion_dock) +"rMf" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, +/obj/effect/debris/cleanable/dirt, +/obj/effect/debris/cleanable/dirt, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor, +/area/shuttle/oldcentury) "rMs" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/beige/border, @@ -25041,6 +26073,14 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/locker/laundry_arrival) +"rWu" = ( +/obj/structure/shuttle/engine/heater, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, +/obj/effect/paint/black, +/turf/simulated/wall/rshull, +/area/shuttle/oldcentury) "rXm" = ( /obj/random/trash_pile, /turf/simulated/floor/plating, @@ -25085,6 +26125,16 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rift/surfaceeva/airlock/arrivals) +"scS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/effect/debris/cleanable/dirt, +/obj/structure/handrail{ + dir = 1 + }, +/turf/simulated/floor, +/area/shuttle/oldcentury) "sdp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -25143,6 +26193,32 @@ /obj/effect/floor_decal/corner/lime/border, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) +"sjx" = ( +/obj/structure/bed/chair/shuttle{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 5 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 5 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) +"ski" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 + }, +/obj/effect/paint/black, +/obj/effect/paint_stripe/black, +/turf/simulated/wall/rshull, +/area/shuttle/oldcentury) "slu" = ( /obj/structure/railing{ dir = 4 @@ -25159,6 +26235,26 @@ }, /turf/simulated/floor/tiled/old_tile/green, /area/shuttle/civvie/general) +"slN" = ( +/obj/machinery/sleep_console{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline/blue, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 1 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) +"smV" = ( +/obj/structure/flora/ausbushes/ppflowers{ + pixel_x = 12; + pixel_y = 6 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) "sny" = ( /obj/structure/railing, /obj/structure/foodcart, @@ -25169,6 +26265,12 @@ }, /turf/simulated/floor/plating, /area/maintenance/bar/lower) +"soe" = ( +/obj/structure/flora/tree/pine{ + pixel_x = -19 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) "stD" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -25221,6 +26323,18 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway) +"sCu" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ + dir = 4 + }, +/obj/effect/debris/cleanable/dirt, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor, +/area/shuttle/oldcentury) +"sDl" = ( +/obj/structure/flora/ausbushes/leafybush, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) "sEW" = ( /obj/machinery/light/spot{ dir = 4; @@ -25230,6 +26344,22 @@ /obj/effect/paint_stripe/violet, /turf/simulated/wall/rshull, /area/shuttle/excursion/general) +"sGd" = ( +/obj/machinery/door/airlock/voidcraft{ + name = "cockpit" + }, +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/cockpit) +"sGC" = ( +/obj/structure/flora/ausbushes/brflowers, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) "sHK" = ( /obj/structure/sign/department/conference_room, /turf/simulated/wall/prepainted/command, @@ -25310,12 +26440,29 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) +"sQd" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/cyan, +/turf/simulated/shuttle/wall/voidcraft/blue, +/area/shuttle/emt/general) "sRD" = ( /obj/structure/railing{ dir = 8 }, /turf/simulated/floor/outdoors/gravsnow/lythios43c, /area/rift/surfacebase/outside/outside3) +"sWD" = ( +/obj/machinery/computer/ship/engines, +/obj/effect/debris/cleanable/dirt, +/obj/effect/debris/cleanable/dirt, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor/plating, +/area/shuttle/oldcentury) +"sYo" = ( +/obj/machinery/door/airlock, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/monodark, +/area/shuttle/oldcentury) "sYS" = ( /obj/structure/table/hardwoodtable, /obj/structure/disposalpipe/segment, @@ -25388,6 +26535,22 @@ }, /turf/simulated/floor/tiled/steel, /area/rift/stairwell/primary/surfacethree) +"tgx" = ( +/obj/structure/bed/chair/shuttle{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 8 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 8 + }, +/obj/machinery/light{ + dir = 8; + old_wall = 1 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) "tiv" = ( /obj/structure/catwalk, /obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ @@ -25468,6 +26631,12 @@ }, /turf/simulated/floor/tiled/monotile, /area/hallway/primary/surfacethree) +"tsO" = ( +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/turf/simulated/floor/reinforced/lythios43c, +/area/rift/surfacebase/outside/outside3) "tuh" = ( /obj/structure/frame{ anchored = 1 @@ -25496,6 +26665,13 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) +"tyg" = ( +/obj/structure/flora/ausbushes/ppflowers{ + pixel_x = 2; + pixel_y = 6 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) "tyY" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/air_alarm{ @@ -25507,6 +26683,29 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) +"tzX" = ( +/obj/structure/table/steel_reinforced, +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02"; + dir = 4 + }, +/obj/effect/floor_decal/rust, +/obj/item/modular_computer/laptop/preset/custom_loadout/standard/talon/pilot, +/turf/simulated/floor/tiled/monodark, +/area/shuttle/oldcentury) +"tAd" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 4; + name = "Engine Fuel Port" + }, +/obj/machinery/light{ + dir = 8; + light_range = 12; + old_wall = 1 + }, +/turf/simulated/floor, +/area/shuttle/emt/general) "tAo" = ( /turf/simulated/wall/r_wall/prepainted/command, /area/bridge) @@ -25624,7 +26823,10 @@ /turf/simulated/floor/tiled/steel_grid, /area/rift/surfaceeva/airlock/arrivals/secondary) "tIR" = ( -/obj/machinery/light/small, +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02" + }, /turf/simulated/floor/tiled/steel, /area/exploration/explorer_prep) "tKy" = ( @@ -25695,6 +26897,18 @@ /obj/effect/paint/palebottlegreen, /turf/simulated/floor/plating, /area/crew_quarters/bar) +"tSQ" = ( +/obj/structure/handrail{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 10 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 10 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) "tSU" = ( /obj/machinery/door/blast/shutters{ density = 0; @@ -25723,6 +26937,13 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge) +"tVf" = ( +/obj/structure/flora/ausbushes/brflowers{ + pixel_x = -21; + pixel_y = 6 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) "tVG" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -25731,12 +26952,27 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway) +"tXr" = ( +/obj/effect/paint/silver, +/obj/effect/paint_stripe/black, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 8 + }, +/turf/simulated/wall/rshull, +/area/shuttle/oldcentury) "tXJ" = ( /obj/structure/bed/chair/comfy/beige{ dir = 8 }, /turf/simulated/floor/lino, /area/crew_quarters/bar_backroom) +"tYG" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 4 + }, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor, +/area/shuttle/oldcentury) "uag" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -25778,6 +27014,29 @@ /obj/effect/floor_decal/spline/fancy, /turf/simulated/floor/tiled, /area/exploration/pilot_prep) +"ufh" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 5 + }, +/obj/machinery/light{ + light_range = 12; + old_wall = 1 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/effect/shuttle_landmark/rift/deck3/emt, +/obj/overmap/entity/visitable/ship/landable/emt, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/emt/general) +"ugY" = ( +/obj/structure/fuel_port{ + dir = 4; + pixel_x = 30 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden, +/turf/simulated/floor, +/area/shuttle/emt/general) "uhz" = ( /obj/structure/bed/chair/bay/chair{ dir = 1 @@ -25790,6 +27049,12 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway) +"ujO" = ( +/obj/structure/flora/grass/brown{ + pixel_y = 10 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) "uka" = ( /obj/effect/floor_decal/borderfloor{ dir = 9 @@ -25822,6 +27087,14 @@ /obj/effect/paint_stripe/violet, /turf/simulated/floor/plating, /area/shuttle/excursion/general) +"uoo" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, +/obj/effect/paint/black, +/obj/effect/paint_stripe/black, +/turf/simulated/wall/rshull, +/area/shuttle/oldcentury) "uoG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -25835,6 +27108,14 @@ }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) +"upb" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 5 + }, +/obj/effect/debris/cleanable/blood/oil/streak, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor, +/area/shuttle/oldcentury) "urI" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -25845,6 +27126,32 @@ }, /turf/simulated/floor/tiled/monotile, /area/exploration) +"uuE" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) +"uvz" = ( +/obj/structure/flora/bush{ + pixel_y = 7 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) +"uwP" = ( +/obj/structure/bed/chair/shuttle{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 9 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 9 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/closet/walllocker/emerglocker/west, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) "uxa" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 9 @@ -25885,6 +27192,14 @@ /obj/effect/paint/commandblue, /turf/simulated/floor/plating, /area/bridge) +"uyX" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/effect/paint/silver, +/obj/effect/paint_stripe/black, +/turf/simulated/wall/rshull, +/area/shuttle/oldcentury) "uAA" = ( /obj/structure/closet/firecloset/full, /turf/simulated/floor/tiled/steel, @@ -25926,6 +27241,21 @@ }, /turf/simulated/open, /area/maintenance/station/exploration) +"uHP" = ( +/obj/structure/flora/grass/brown{ + pixel_x = 7; + pixel_y = 10 + }, +/obj/structure/flora/grass/green{ + pixel_x = -13 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) +"uID" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/sleeper/survival_pod, +/turf/simulated/floor, +/area/shuttle/oldcentury) "uJh" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -25950,12 +27280,32 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel, /area/rift/stairwell/primary/surfacethree) +"uMO" = ( +/obj/machinery/door/airlock/glass_external, +/obj/map_helper/airlock/door/int_door, +/obj/machinery/access_button{ + command = "cycle_int"; + frequency = 1380; + master_tag = "oldcentury_docker"; + pixel_x = -24; + pixel_y = 8 + }, +/turf/simulated/floor, +/area/shuttle/oldcentury) "uMP" = ( /obj/landmark/spawnpoint/job/pilot, /obj/item/stool/padded, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/monotile, /area/exploration/pilot_prep) +"uOB" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/effect/paint/silver, +/obj/effect/paint_stripe/black, +/turf/simulated/wall/rshull, +/area/shuttle/oldcentury) "uOE" = ( /obj/structure/cable/pink{ icon_state = "2-4" @@ -26029,6 +27379,10 @@ /obj/effect/shuttle_landmark/rift/deck3/excursion, /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/general) +"uSZ" = ( +/obj/machinery/telecomms/relay/preset/telecomms, +/turf/simulated/floor/tiled/techfloor/grid/lythios43c, +/area/shuttle/oldcentury) "uTt" = ( /obj/machinery/door/airlock/exploration{ locked = 1; @@ -26069,6 +27423,13 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway2) +"uWR" = ( +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, +/obj/structure/closet/firecloset/full, +/turf/simulated/floor, +/area/shuttle/emt/general) "uWY" = ( /obj/machinery/computer/telescience, /turf/simulated/floor/tiled, @@ -26097,6 +27458,18 @@ }, /turf/simulated/wall/prepainted/civilian, /area/crew_quarters/bar) +"vcB" = ( +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02"; + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/random/mre, +/obj/random/mre, +/obj/structure/closet/crate, +/turf/simulated/floor, +/area/shuttle/oldcentury) "vcT" = ( /obj/structure/cable{ icon_state = "1-2" @@ -26149,6 +27522,10 @@ "veT" = ( /turf/simulated/wall/prepainted/exploration, /area/exploration) +"vfp" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/cyan, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) "vfQ" = ( /obj/machinery/door/airlock/glass_external/public{ name = "Public External Airlock" @@ -26190,6 +27567,13 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway2) +"vgY" = ( +/obj/structure/panic_button{ + pixel_x = -26 + }, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor/tiled/monodark, +/area/shuttle/oldcentury) "viA" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -26244,6 +27628,13 @@ }, /turf/simulated/floor/tiled/steel, /area/security/checkpoint2) +"vmQ" = ( +/obj/structure/flora/grass/both{ + pixel_x = 10; + pixel_y = 10 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) "vmV" = ( /obj/machinery/light{ dir = 4 @@ -26274,22 +27665,32 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, /area/exploration) -"vsW" = ( -/obj/machinery/light{ - dir = 8 +"vrq" = ( +/obj/structure/railing, +/obj{ + name = "---Merge conflict marker---" }, -/obj/machinery/fire_alarm/south_mount{ - pixel_y = -24 +/obj/structure/flora/tree/pine, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) +"vrM" = ( +/obj/machinery/computer/ship/helm, +/obj/item/gps/internal/base{ + desc = "A tracking beacon embedded in the shuttle systems, to help explorers find where they landed."; + gps_tag = "OLDCENTURY"; + name = "century old beacon" }, -/obj/effect/floor_decal/corner/beige{ - dir = 5 +/obj/item/toy/figure/hop{ + layer = 6; + pixel_x = 7; + pixel_y = 18 }, -/obj/effect/floor_decal/spline/plain{ - dir = 1 +/obj/item/toy/prize/phazon{ + layer = 6; + pixel_y = 27 }, -/obj/machinery/vending/mre, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/bar) +/turf/simulated/floor/plating, +/area/shuttle/oldcentury) "vtz" = ( /obj/structure/sink/kitchen{ pixel_y = 26 @@ -26329,6 +27730,14 @@ }, /turf/simulated/floor/plating, /area/maintenance/bar/lower) +"vwN" = ( +/obj/structure/catwalk, +/obj/structure/cable/green{ + dir = 1; + icon_state = "2-4" + }, +/turf/simulated/floor/plating/lythios43c, +/area/rift/surfacebase/outside/outside3) "vwQ" = ( /turf/simulated/wall/prepainted, /area/crew_quarters/heads/hop) @@ -26407,6 +27816,12 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) +"vCa" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9 + }, +/turf/simulated/shuttle/wall/voidcraft/blue, +/area/shuttle/emt/general) "vCA" = ( /obj/structure/railing{ dir = 4 @@ -26477,6 +27892,14 @@ }, /turf/simulated/floor/tiled, /area/rnd/telescience_lab) +"vKy" = ( +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/turf/simulated/floor/tiled/monodark, +/area/shuttle/oldcentury) +"vLd" = ( +/obj/structure/flora/grass/brown, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) "vLi" = ( /obj/machinery/button/remote/airlock{ id = "bathroomlock18"; @@ -26543,6 +27966,17 @@ /obj/structure/table/steel, /turf/simulated/floor/plating, /area/maintenance/bar/lower) +"vQL" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02"; + dir = 8 + }, +/turf/simulated/floor, +/area/shuttle/oldcentury) "vRz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -26613,6 +28047,16 @@ /obj/structure/closet/firecloset, /turf/simulated/floor/plating, /area/maintenance/research/xenobio) +"vYk" = ( +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02"; + dir = 8 + }, +/obj/effect/debris/cleanable/dirt, +/obj/effect/floor_decal/industrial/halfstair, +/turf/simulated/floor/tiled/monodark, +/area/shuttle/oldcentury) "vZI" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -26720,6 +28164,16 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/surfacethree) +"web" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 4 + }, +/obj/machinery/light{ + dir = 1; + old_wall = 1 + }, +/turf/simulated/floor, +/area/shuttle/emt/general) "wec" = ( /obj/item/radio/intercom{ dir = 4; @@ -26858,12 +28312,37 @@ "wuI" = ( /turf/simulated/wall/prepainted/security, /area/security/checkpoint2) +"wvs" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/cable/green{ + dir = 8; + icon_state = "2-4" + }, +/turf/simulated/floor/reinforced/lythios43c, +/area/rift/surfacebase/outside/outside3) "wxd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, /turf/simulated/floor/lino, /area/crew_quarters/bar_backroom) +"wxW" = ( +/obj/structure/cable/green{ + dir = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) +"wyl" = ( +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + frequency = 1380; + id_tag = "rift_oldcentury_dock"; + req_one_access = list(67) + }, +/turf/simulated/wall/r_wall/prepainted, +/area/rift/surfacebase/outside/outside3) "wyq" = ( /obj/structure/reagent_dispensers/watertank, /obj/machinery/light/small{ @@ -26895,6 +28374,16 @@ "wAD" = ( /turf/simulated/wall/r_wall/prepainted/exploration, /area/maintenance/bar/lower) +"wBK" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/debris/cleanable/dirt, +/obj/effect/debris/cleanable/dirt, +/obj/structure/table/survival_pod, +/turf/simulated/floor, +/area/shuttle/oldcentury) "wBN" = ( /obj/machinery/computer/secure_data, /obj/effect/floor_decal/borderfloor{ @@ -26905,13 +28394,6 @@ }, /turf/simulated/floor/tiled/steel, /area/security/checkpoint2) -"wCu" = ( -/obj/structure/cable/cyan{ - icon_state = "1-2" - }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/turf/simulated/floor, -/area/shuttle/emt/general) "wCC" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -26935,6 +28417,25 @@ }, /turf/simulated/floor/plating, /area/security/prison) +"wGV" = ( +/obj/machinery/photocopier/faxmachine{ + department = "Old Century Shuttle" + }, +/obj/structure/table/steel_reinforced, +/obj/structure/cable/cyan{ + icon_state = "2-8" + }, +/obj/structure/flora/pottedplant/fern{ + pixel_x = 6; + pixel_y = 17 + }, +/obj/machinery/air_alarm/alarms_hidden{ + dir = 8; + pixel_x = 22; + req_one_access = list(160) + }, +/turf/simulated/floor/tiled/monodark, +/area/shuttle/oldcentury) "wIv" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -26981,6 +28482,12 @@ "wOC" = ( /turf/simulated/wall/r_wall/prepainted/command, /area/crew_quarters/captain) +"wOD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, +/turf/simulated/shuttle/wall/voidcraft/blue, +/area/shuttle/emt/cockpit) "wPr" = ( /obj/machinery/light{ dir = 4 @@ -27008,7 +28515,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/obj/machinery/light/small, +/obj/machinery/light/small{ + brightness_color = "#da7c02"; + color = "#da7c02" + }, /obj/machinery/power/apc/east_mount, /obj/structure/cable/green{ icon_state = "0-8" @@ -27060,6 +28570,27 @@ }, /turf/simulated/floor/tiled, /area/rnd/telescience_lab) +"xbv" = ( +/obj/structure/flora/tree/pine, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) +"xfm" = ( +/obj/structure/flora/grass/green{ + pixel_x = -13 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) +"xfK" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/effect/debris/cleanable/dirt, +/obj/effect/debris/cleanable/dirt, +/obj/machinery/computer/ship/navigation/telescreen{ + pixel_x = 32 + }, +/turf/simulated/floor/carpet/patterened/green, +/area/shuttle/oldcentury) "xgk" = ( /obj/structure/bed/chair/comfy/brown{ dir = 1 @@ -27102,6 +28633,13 @@ }, /turf/simulated/floor/tiled, /area/exploration/pilot_prep) +"xiS" = ( +/obj/structure/flora/ausbushes/ywflowers{ + pixel_x = -2; + pixel_y = 8 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/outside3) "xmB" = ( /obj/structure/cable/pink{ icon_state = "1-8" @@ -27304,6 +28842,28 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway2) +"xKs" = ( +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/structure/bed/chair/bay/shuttle{ + dir = 1 + }, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor/carpet/patterened/green, +/area/shuttle/oldcentury) +"xKI" = ( +/obj/structure/handrail{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 8 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) "xKM" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 4 @@ -27339,6 +28899,11 @@ }, /turf/simulated/floor/tiled/old_tile/green, /area/shuttle/civvie/general) +"xMz" = ( +/obj/effect/debris/cleanable/dirt, +/obj/effect/debris/cleanable/dirt, +/turf/simulated/floor/carpet/patterened/green, +/area/shuttle/oldcentury) "xOZ" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 @@ -27391,6 +28956,24 @@ }, /turf/simulated/floor/tiled/steel, /area/rift/stairwell/primary/surfacethree) +"xXL" = ( +/obj/machinery/computer/ship/sensors, +/obj/machinery/light{ + dir = 4; + old_wall = 1 + }, +/obj/structure/cable/cyan{ + icon_state = "2-8" + }, +/obj/effect/floor_decal/borderfloorwhite/full, +/obj/effect/floor_decal/corner/paleblue{ + dir = 10 + }, +/obj/effect/floor_decal/corner/paleblue{ + dir = 5 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/cockpit) "xYy" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/power/apc/south_mount, @@ -27430,6 +29013,22 @@ /obj/effect/paint/palebottlegreen, /turf/simulated/floor/plating, /area/hydroponics) +"ybK" = ( +/obj/machinery/door/window/brigdoor/southleft, +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan, +/obj/effect/floor_decal/borderfloorwhite/cee, +/obj/effect/floor_decal/corner/red/bordercee{ + dir = 1 + }, +/obj/machinery/light{ + dir = 4; + old_wall = 1 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/emt/general) "ybP" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -27451,6 +29050,22 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway2) +"yci" = ( +/obj/structure/toilet{ + dir = 8 + }, +/obj/machinery/shower{ + pixel_y = 18 + }, +/obj/item/reagent_containers/food/drinks/bottle/vodka{ + pixel_x = -12; + pixel_y = 21 + }, +/obj/structure/cable/cyan{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/old_tile/blue, +/area/shuttle/oldcentury) "ydU" = ( /obj/machinery/door/firedoor/glass{ dir = 1 @@ -27515,6 +29130,14 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/secondary/docking_hallway) +"ygS" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 4; + name = "Engine Fuel Port" + }, +/obj/effect/floor_decal/industrial/outline/red, +/turf/simulated/floor, +/area/shuttle/oldcentury) "ykb" = ( /obj/machinery/door/airlock{ id_tag = "barbackdoor"; @@ -29889,9 +31512,9 @@ aus aus aus aus -aus -aus -aus +bly +bly +bly aus aus aus @@ -30082,11 +31705,11 @@ aus aus aus aus -aus -aus -aus -aus -aus +bly +bly +bly +bly +bly aus aus aus @@ -30274,15 +31897,15 @@ aus aus aus aus -aus -aus -aus -aus -aus -aus -aus -aus -aus +bly +bly +btC +btC +btC +bRP +gzi +iLn +fdS aus aus aus @@ -30467,17 +32090,17 @@ aus aus aus aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus +bly +bly +btC +bly +bly +bly +uoo +cZP +iSW +iQv +oCC aus aus aus @@ -30573,7 +32196,7 @@ aCA aCA acH acH -acH +mUU acH aCA aCA @@ -30656,22 +32279,22 @@ aus aus aus aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus +bly +bly +btC +btC +bly +bly +pTC +pTC +pTC +pTC +dxR +ibi +ygS +mlj +lNQ +oCC aus aus aus @@ -30846,26 +32469,26 @@ aus aus aus aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus +eZv +oCC +vKy +pTC +pTC +pTC +pZx +pTC +pTC +pTC +pTC +uID +wBK +kMc +rMf +fmA +tYG +qoC +aTb +fdS aus aus aus @@ -31039,27 +32662,27 @@ aus aus aus aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus +bly +oCC +oCC +mwh +vgY +ctl +vYk +qKD +eHc +gvz +fxP +sYo +dBD +sCu +upb +gaQ +nHY +jYd +jxX +oCC +btC aus aus aus @@ -31232,28 +32855,28 @@ aBK aus aus aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus +bly +bly +vKy +vrM +doA +jRQ +pTC +qVp +bIJ +fIx +eJV +jFP +pTC +iHi +oys +kcm +scS +pTC +pTC +nqA +pTC +pTC aus aus aus @@ -31426,35 +33049,35 @@ aBK aus aus aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -apa -aIA +btC +bly +vKy +cQw +mdN +afj +ika +eCH +bLD +bLD +xMz +qmR +pTC +eRp +pCy +kcm +gaQ +uMO +cCS +clr +oXk +kSr +glL +glL +glL +glL +glL +diY +baG aIA ahS aBK @@ -31620,36 +33243,36 @@ aBK aus aus aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus +bly +bly +vKy +sWD +doA +bOR +pTC +jyn +eKT +iKK +gaS +ndR +pTC +vcB +gyK +jin +scS +pTC +uOB +tXr +pTC +pTC aus aus aus aus aus apa -aIA -aIA +iiO +baG ahS aBK aus @@ -31815,35 +33438,35 @@ aus aus aus aus +bly +oCC +oCC +tzX +wGV +uyX +pKp +xfK +xKs +rjP +hDB +uyX +fYJ +nMn +kcm +gaQ +qcX +vQL +cBe +oCC +btC aus aus aus aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -jWp +wyl abI -aIA -aIA +chB +xBA ahS aBK aus @@ -32010,34 +33633,34 @@ aus aus aus aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus +uSZ +oCC +vKy +pTC +pTC +vKy +pTC +pTC +pTC +vKy +pTC +yci +eYG +oWZ +mpR +fOO +lUe +iZN +rWu +fdS aus aus aus aus amn aZo -aIA -aIA +iiO +baG afb jWp aus @@ -32208,22 +33831,22 @@ aus aus aus aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus +bly +bRP +bly +btC +bly +bly +pTC +pTC +pTC +pTC +iZn +ski +cZT +hfa +lNQ +oCC aus aus aus @@ -32231,7 +33854,7 @@ aus amn aZo aIA -aIA +fkw aQv aus aus @@ -32407,17 +34030,17 @@ aus aus aus aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus -aus +bly +bly +bly +btC +bly +bly +iZn +cZP +bqa +huM +oCC aus aus aus @@ -32425,7 +34048,7 @@ aus amn aZo aIA -aIA +fkw aQv aus aus @@ -32602,15 +34225,15 @@ aus aus aus aus -aus -aus -aus -aus -aus -aus -aus -aus -aus +bly +bly +bly +bly +btC +bly +gzi +fxK +fdS aus aus aus @@ -32619,7 +34242,7 @@ aus amn avM aIA -aIA +fkw aQv aus aus @@ -32798,11 +34421,11 @@ aus aus aus aus -aus -aus -aus -aus -aus +bly +btC +bly +btC +bly aus aus aus @@ -32813,7 +34436,7 @@ aus amn aZo aIA -aIA +fkw aTj jWp aus @@ -32993,9 +34616,9 @@ aus aus aus aus -aus -aus -aus +bly +bly +bly aus aus aus @@ -33007,7 +34630,7 @@ aus amn aZo aIA -aIA +fkw ahS aBK aus @@ -33201,7 +34824,7 @@ aus jWp aZo aIA -aIA +fkw ahS aBK aus @@ -33281,7 +34904,7 @@ aOi aOi acH acH -acH +bKm acH vCA aOi @@ -33395,7 +35018,7 @@ aus amn avM aIA -aIA +fkw ahS aBK aus @@ -33589,7 +35212,7 @@ aus amn aZo aIA -aIA +fkw ahS aBK aus @@ -33668,7 +35291,7 @@ aOi aOi aOi acH -acH +cLb acH aNk aOi @@ -33783,7 +35406,7 @@ aus amn aZo aIA -aIA +fkw ahS aBK aus @@ -33977,7 +35600,7 @@ aus amn aZo aIA -aIA +fkw ahS aBK aus @@ -34171,7 +35794,7 @@ aus atI avM aIA -aIA +fkw ahS jWp aus @@ -34365,7 +35988,7 @@ atI avN aGz aIA -aIA +fkw ahS aBK aus @@ -34559,7 +36182,7 @@ aOi aOi aKW aIA -aIA +fkw ahS aBK aus @@ -34753,7 +36376,7 @@ aOi aOi aKW aIA -aIA +fkw ahS aBK aus @@ -34880,7 +36503,7 @@ aHj aHj aHj aHj -aHj +fgd aHj acH acH @@ -34947,7 +36570,7 @@ aOi aOi aKW aIA -aIA +fkw ahS aBK aus @@ -35026,7 +36649,7 @@ aOi aOi aOi acH -acH +bKm aHj aHj aCA @@ -35075,7 +36698,7 @@ aCA aCA aCA aHj -aHj +fgd acH acH acH @@ -35141,7 +36764,7 @@ aOi jWp bFr aIA -aIA +fkw aOP afo aus @@ -35335,7 +36958,7 @@ aOi aOi aOi aIA -aIA +fkw ahS aOi afo @@ -35528,8 +37151,8 @@ jWp jWp jWp jWp -aIA -aIA +chB +vwN afb aTq azf @@ -35660,7 +37283,7 @@ acH acH acH acH -acH +cLb acH acH aOi @@ -35722,8 +37345,8 @@ aOi aOi aOi aKW -aIA -aIA +fFk +eGc aIA aIA aIA @@ -35917,26 +37540,26 @@ aOi aOi aKW aIA -aIA -aIA -aIA -aIA -aIA -aIA -aIA -aIA -aIA -aIA -aIA -aIA -aIA -aIA -aIA -aIA -aIA -aIA -aIA -aIA +iiO +dSP +dSP +dSP +dSP +dSP +dSP +dSP +dSP +dSP +dSP +dSP +dSP +dSP +dSP +dSP +dSP +dSP +dSP +baG aIA aIA aIA @@ -36130,7 +37753,7 @@ aDY aDY aDY dwo -aIA +fkw aIA nsi aDY @@ -36188,7 +37811,7 @@ aOi aOi aOi aOi -acH +smV aAd acH acH @@ -36324,7 +37947,7 @@ aOi aOi aOi aKW -aIA +fkw aIA ahS aOi @@ -36518,7 +38141,7 @@ aOi aOi aOi aKW -aIA +fkw aIA ahS aOi @@ -36712,7 +38335,7 @@ aOi aOi aOi aKW -aIA +fkw aIA ahS aOi @@ -36906,7 +38529,7 @@ aOi aOi aOi aKW -aIA +fkw aIA ahS aOi @@ -37100,7 +38723,7 @@ aOi aOi aOi aKW -aIA +fkw aIA ahS aOi @@ -37294,7 +38917,7 @@ aOi aOi aOi aKW -aIA +fkw aIA ahS aOi @@ -37414,7 +39037,7 @@ acH aOi aOi aOi -acH +xiS acH acH acH @@ -37488,7 +39111,7 @@ aOi aOi aOi aKW -aIA +fkw aIA ahS aOi @@ -37682,7 +39305,7 @@ aOi aOi aOi aKW -aIA +fkw aIA ahS aOi @@ -37717,14 +39340,14 @@ aOi aOi aOi aOi +tyg +qhn acH acH acH +jVm acH -acH -acH -acH -acH +bKm acH acH aTq @@ -37742,7 +39365,7 @@ aJO aTq aTq acH -acH +lLr aAd aAd acH @@ -37809,7 +39432,7 @@ acH acH acH acH -acH +pat acH acH acH @@ -37876,7 +39499,7 @@ aOi aOi aOi aKW -aIA +fkw aIA ahS aOi @@ -37913,7 +39536,7 @@ acH acH acH acH -acH +bKm acH acH acH @@ -38001,9 +39624,9 @@ acH acH acH acH +vmQ acH -acH -acH +xbv acH acH afq @@ -38070,7 +39693,7 @@ aOi aOi aOi aKW -aIA +fkw aIA ahS aOi @@ -38099,7 +39722,7 @@ acH acH acH acH -acH +lVJ acH acH acH @@ -38264,7 +39887,7 @@ aOi aOi aOi aKW -aIA +fkw aIA ahS aOi @@ -38290,12 +39913,12 @@ acH acH acH acH +jVm acH acH acH acH -acH -acH +xfm acH acH acH @@ -38321,7 +39944,7 @@ anP arV aUI aAj -vsW +jXt lbu akB ajM @@ -38383,7 +40006,7 @@ acH acH acH acH -acH +xbv acH acH acH @@ -38443,7 +40066,7 @@ acH acH acH acH -acH +vmQ acH acH acH @@ -38458,30 +40081,27 @@ acH acH aOi aKW -aIA -aIA -afb -aTq -aTq -aTq -aTq -aTq -aTq -aTq -aTq -aTq -aTq -aTq -aTq -aTq -aTq -aTq -aTq -vCA -acH -acH -acH -acH +fFk +dSP +mCH +muH +muH +muH +muH +muH +muH +muH +muH +muH +muH +muH +muH +muH +muH +muH +muH +cBz +wxW acH acH acH @@ -38489,11 +40109,14 @@ acH acH acH acH +xbv acH acH acH +xfm acH acH +uHP rdX rdX rdX @@ -38565,13 +40188,13 @@ acH acH acH acH +xbv acH acH acH acH acH -acH -acH +xbv acH acH acH @@ -38636,7 +40259,7 @@ acH acH acH acH -acH +qhn acH acH acH @@ -38672,6 +40295,7 @@ acH acH acH acH +lbZ acH acH acH @@ -38679,12 +40303,11 @@ acH acH acH acH +xfm acH acH acH -acH -acH -acH +xbv acH acH fuM @@ -38772,7 +40395,7 @@ acH acH acH acH -acH +qhn acH acH acH @@ -38795,7 +40418,7 @@ axS acH acH acH -acH +xbv acH acH aQK @@ -38866,19 +40489,19 @@ aUZ aUZ aUZ aUZ -aha +myr aej acH acH +lVJ acH +qhn acH acH acH acH acH -acH -acH -acH +xfm acH acH fuM @@ -38936,6 +40559,8 @@ aAd acH acH acH +qhn +cLb acH acH acH @@ -38946,9 +40571,7 @@ acH acH acH acH -acH -acH -acH +vmQ acH acH acH @@ -39029,12 +40652,12 @@ aej acH acH acH +xbv acH +sGC acH acH -acH -acH -acH +xbv acH acH acH @@ -39060,14 +40683,14 @@ aPy aPy atd aMk -aus +eEr amj aej acH acH acH acH -acH +qhn acH acH acH @@ -39109,7 +40732,7 @@ aJu aJu fua fua -acH +ujO acH acH aAd @@ -39121,7 +40744,7 @@ acH acH acH acH -acH +sGC acH acH acH @@ -39136,7 +40759,7 @@ acH acH acH acH -acH +bKm acH acH acH @@ -39184,7 +40807,7 @@ acH acH acH acH -acH +xbv acH aQK aBK @@ -39220,19 +40843,19 @@ fRp jTt fRp aej +lVJ acH acH acH acH acH +mUB acH acH +mUB acH acH -acH -acH -acH -acH +xbv acH aAd aAd @@ -39254,7 +40877,7 @@ aGv awC atU ajq -aus +eEr amn aej acH @@ -39304,19 +40927,19 @@ aAU ayu fua acH -acH +vLd acH acH acH aAd +hkW acH acH +cLb acH acH acH -acH -acH -acH +tVf acH acH acH @@ -39326,15 +40949,15 @@ aAd aAd acH acH +qhn acH acH +xbv acH acH acH acH -acH -acH -acH +cLb acH acH acH @@ -39419,7 +41042,7 @@ acH acH acH acH -acH +sGC acH acH acH @@ -39448,7 +41071,7 @@ axX aOu arl ajq -aus +eEr amn aej acH @@ -39499,7 +41122,7 @@ afw fua acH acH -acH +pat acH acH aAd @@ -39507,8 +41130,8 @@ aAd aAd acH aAd -aAd -acH +bJt +qgy aAd aAd aAd @@ -39569,7 +41192,7 @@ aXj (63,1,1) = {" axS acH -acH +xbv acH acH acH @@ -39610,16 +41233,16 @@ fRp aej acH acH +mUB acH acH acH acH acH acH +xbv acH -acH -acH -acH +mUB acH acH aAd @@ -39642,7 +41265,7 @@ ayT ayT aMk aMk -aus +eEr amn aAF vCA @@ -39694,18 +41317,18 @@ fua acH acH acH -acH +xbv acH acH acH aAd aAd aAd +pat acH -acH -acH +vLd aAd -acH +jrR acH acH acH @@ -39720,7 +41343,7 @@ aAd acH acH acH -acH +qhn acH acH aAd @@ -39768,7 +41391,7 @@ acH acH acH acH -aQK +bJk aBK aus aus @@ -39808,7 +41431,7 @@ acH acH acH acH -acH +xbv acH acH acH @@ -39836,7 +41459,7 @@ aQk aTo aSK apE -aus +eEr aus apa aIA @@ -39889,14 +41512,14 @@ acH aQK aQK aQK +msd aQK aQK aQK aQK aQK aQK -aQK -aQK +jUD aQK aQK aQK @@ -39924,7 +41547,7 @@ acH acH acH acH -acH +xbv acH acH acH @@ -40030,7 +41653,7 @@ xLz pjG jWh msZ -glL +wvs glL diY dSP @@ -40153,7 +41776,7 @@ axS acH acH acH -acH +xbv acH acH aQK @@ -40191,6 +41814,7 @@ fRp fRp aej acH +mUB acH acH acH @@ -40200,8 +41824,7 @@ acH acH acH acH -acH -acH +xbv acH acH aAd @@ -40296,7 +41919,7 @@ aus amj aej acH -acH +qhn acH aAd aAd @@ -40499,12 +42122,12 @@ aAd acH acH acH +xbv acH acH acH acH -acH -acH +xbv acH acH acH @@ -40684,7 +42307,7 @@ lxt lxt amn aej -acH +qhn acH acH acH @@ -41074,7 +42697,7 @@ amn aej acH acH -acH +xbv aAd acH aAd @@ -41082,7 +42705,7 @@ acH acH acH acH -acH +xbv acH acH acH @@ -41124,7 +42747,7 @@ acH acH acH acH -acH +xbv acH aQK aBK @@ -41245,7 +42868,7 @@ wce aMM acH acH -acH +sGC adx aus eor @@ -41345,7 +42968,7 @@ aus amn aAF acH -acH +gFD acH aAd aAd @@ -41828,7 +43451,7 @@ aYE auU cnu cnu -adx +ogS aus avE uQv @@ -41899,7 +43522,7 @@ axS acH acH acH -acH +xbv acH acH aQK @@ -41929,11 +43552,11 @@ apX acH acH acH +qgy acH +cLb acH -acH -acH -acH +qgy acH acH acH @@ -42043,7 +43666,7 @@ aqt amn aej acH -acH +lVJ aAd acH acH @@ -42315,7 +43938,7 @@ aQK acH acH acH -acH +soe acH acH acH @@ -42483,6 +44106,7 @@ acH acH acH acH +xbv acH acH acH @@ -42492,11 +44116,14 @@ acH acH acH acH +xbv acH acH +qgy acH acH acH +xbv acH acH acH @@ -42506,16 +44133,12 @@ acH acH acH acH +qgy acH acH acH acH -acH -acH -acH -acH -acH -acH +xbv acH acH acH @@ -42691,14 +44314,17 @@ acH acH acH acH +xbv acH acH acH acH acH acH +xbv acH acH +xbv acH acH acH @@ -42708,10 +44334,7 @@ acH acH acH acH -acH -acH -acH -acH +xbv acH aQK aBK @@ -42889,9 +44512,12 @@ acH acH acH acH +xbv acH +qgy acH acH +qgy acH acH acH @@ -42899,10 +44525,7 @@ acH acH acH acH -acH -acH -acH -acH +lVJ acH acH acH @@ -43073,20 +44696,26 @@ acH acH acH acH +xbv acH acH acH +xbv acH acH acH acH acH acH +qgy acH +qhn +qhn acH acH acH acH +xbv acH acH acH @@ -43096,12 +44725,6 @@ acH acH acH acH -acH -acH -acH -acH -acH -aQK aBK aus aus @@ -43261,6 +44884,7 @@ acH acH acH acH +xbv acH acH acH @@ -43273,29 +44897,28 @@ acH acH acH acH +xbv acH acH +qgy acH acH +qgy acH +qhn acH acH acH acH acH acH +xbv acH acH acH +xbv acH acH -acH -acH -acH -acH -acH -acH -aQK aBK aus aus @@ -43473,8 +45096,10 @@ acH acH acH acH +xbv acH acH +xbv acH acH acH @@ -43488,8 +45113,6 @@ acH acH acH acH -acH -aQK aBK aus aus @@ -43648,17 +45271,22 @@ acH acH acH acH +xbv acH acH acH +xbv acH +qgy acH acH acH acH +xbv acH acH acH +pat acH acH acH @@ -43668,6 +45296,7 @@ acH acH acH acH +xbv acH acH acH @@ -43678,12 +45307,6 @@ acH acH acH acH -acH -acH -acH -acH -acH -aQK aBK aus aus @@ -43868,6 +45491,7 @@ acH acH acH acH +uuE acH acH acH @@ -43877,7 +45501,6 @@ acH acH acH acH -aQK aBK aus aus @@ -44034,12 +45657,14 @@ acH acH acH acH +xbv acH acH acH acH acH acH +xbv acH acH acH @@ -44048,30 +45673,28 @@ acH acH acH acH +xbv acH acH acH acH acH +xbv acH acH acH +qgy acH acH acH +sDl acH acH +qgy acH acH acH acH -acH -acH -acH -acH -acH -acH -aQK aBK aus aus @@ -44237,6 +45860,8 @@ acH acH acH acH +afq +afq acH acH acH @@ -44250,6 +45875,7 @@ acH acH acH acH +qhn acH acH acH @@ -44263,9 +45889,6 @@ acH acH acH acH -acH -acH -aQK aBK aus aus @@ -44305,7 +45928,7 @@ aUu aUu aWz aej -acH +jrR pOJ abu dvT @@ -44425,11 +46048,15 @@ acH acH acH acH +qgy acH acH acH acH acH +afq +afq +afq acH acH acH @@ -44438,28 +46065,24 @@ acH acH acH acH +xbv acH acH acH acH +uuE acH acH +xbv acH +uuE acH acH acH +uuE acH acH acH -acH -acH -acH -acH -acH -acH -acH -acH -aQK aBK aus aus @@ -44498,7 +46121,7 @@ ayc aUu ary aej -acH +qhn acH pOJ yfM @@ -44618,16 +46241,20 @@ acH acH acH acH +xbv acH acH acH acH acH acH +afq +afq acH acH acH acH +xbv acH acH acH @@ -44650,10 +46277,6 @@ acH acH acH acH -acH -acH -acH -aQK ays aus aus @@ -44818,6 +46441,8 @@ acH acH acH acH +afq +afq acH acH acH @@ -44825,24 +46450,22 @@ acH acH acH acH +qgy acH acH acH acH acH +qgy acH acH acH acH +xbv acH acH acH -acH -acH -acH -acH -acH -acH +sDl acH acH acH @@ -44863,7 +46486,6 @@ aej acH aAd aAd -acH afk aPZ aUZ @@ -44880,6 +46502,7 @@ aUZ aUZ aUZ aUZ +aUZ aha acF aIA @@ -45003,6 +46626,7 @@ axS acH acH acH +xbv acH acH acH @@ -45016,21 +46640,20 @@ acH acH acH acH +pat acH acH acH acH acH acH +xbv acH acH acH acH acH -acH -acH -acH -acH +lVJ acH acH acH @@ -45056,8 +46679,9 @@ aQK acH acH aAd -aAd -adx +aId +aus +aus aus aus aus @@ -45065,16 +46689,15 @@ aus aus aus aus -amD -urI -urI -amD -amD -amD -amD -aZB -awp aus +jBb +glL +glL +glL +glL +glL +glL +gcu amj acF aIA @@ -45203,8 +46826,10 @@ acH acH acH acH +xbv acH acH +qgy acH acH acH @@ -45237,38 +46862,36 @@ acH acH acH acH +xbv acH acH acH +uuE acH acH +xbv acH -acH -acH -acH -acH -acH -acH -aAd +uvz aAd -adx +aId +aus +aus aus aus aus aus aus -amh -amE -ayS -arB -atM -aCE -ayS -azg -aAO -aFp -awp aus +amD +dNn +eEz +ayS +amD +amD +amD +amD +amD +eEr amn acF aIA @@ -45403,66 +47026,66 @@ acH acH acH acH +qgy acH acH acH acH acH +xbv acH acH acH acH acH +qgy acH acH acH +gFD acH +qgy acH acH acH acH acH acH +qgy acH +qgy acH acH +vLd acH +xfm acH +soe acH +qgy acH +mUB acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -aAd aAd -adx +aId +aus +aus +aus aus aus aus -aaM -bfN -bfN -aop -apk -arO -aue -avh -avZ -aAf -aAP -anA -awp aus +amD +amD +jhF +ufh +amD +bgH +tAd +aAO +jsT +awp +eEr amn acF aIA @@ -45604,6 +47227,7 @@ acH acH acH acH +qgy acH acH acH @@ -45614,49 +47238,48 @@ acH acH acH acH +jhj acH acH acH +sDl acH acH acH acH acH acH +uuE acH acH +xbv acH +qgy acH acH -acH -acH -acH -acH -acH -acH -acH +uuE acH aAd aAd -aAd -adx +aId +aus +aus aus aus -aaM -aop -akJ -auh -aop -aNX -aqP -aqP -aKM -ayS -aAk -aBY -aGh -ayS aus +aus +dFH +amD +amD +jhF +otK +sQd +ekN +ivj +ugY +gwB +awp +eEr amn cbG aIA @@ -45782,12 +47405,16 @@ acH acH acH acH +xbv acH acH acH acH +xbv acH +qgy acH +pat acH acH acH @@ -45800,57 +47427,53 @@ acH acH acH acH +cLb acH acH acH acH acH acH +aAd acH acH acH acH acH acH +qgy acH acH +qgy acH +qgy acH +gbA acH acH acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -aAd +soe aAd aAd -adx -aus +aId aus -bfN -ahI -akV -amk -anz -aSl -aqP -lZF -avt -axq -aAo -aCV -aEC -alR -glL +amD +ayS +urI +urI +urI +amD +amD +ayS +oPq +gvh +ayS +amD +avZ +fIk +nlg +amD +tsO glL qEh dSP @@ -45999,51 +47622,51 @@ acH acH acH acH +aAd +aAd +aAd acH +aAd acH acH acH acH acH acH +khK acH acH acH acH +xfm acH +xfm acH +khK acH -acH -acH -acH -acH -acH -acH -acH -acH -acH +qhn acH acH aAd aAd -acH -adx -aus +aNk aus -bfN -ass -alq -amm -anR -aWI -aqP -aqP -dgX -hsD -fFL -giX -eoM -jLf +ayS +ayS +cVB +xKI +bkq +kRm +uwP +tgx +gRm +rvp +tSQ +amD +nmw +aQe +gwB +awp aus aus aNG @@ -46178,10 +47801,12 @@ acH acH acH acH +qgy acH acH acH acH +xbv acH acH acH @@ -46190,12 +47815,15 @@ acH acH acH acH +aAd +aAd acH acH acH acH acH acH +qgy acH acH acH @@ -46205,39 +47833,34 @@ acH acH acH acH +xbv acH acH acH acH acH -acH -acH -acH -acH -acH -acH -acH -acH +mUB +jhj aAd aAd -acH -adx -aus +aNk aus -aaM -aop -alU -auK -aop -aXm -aqP -aqP -nyL -ayS -hDa -aAk -pem -ayS +urI +urI +slN +hYq +enP +doW +dRG +hYq +oqd +iRy +huS +fTc +hIh +dXR +gwB +awp aus amn hPQ @@ -46370,6 +47993,7 @@ acH acH acH acH +qgy acH acH acH @@ -46390,8 +48014,7 @@ acH acH acH acH -acH -acH +lVJ acH acH acH @@ -46414,23 +48037,23 @@ aAd aAd aAd aAd -acH -adx -aus -aus +aNk aus -aaM -bfN -bfN -aop -aqR -baX -aue -cCj -rFB -dph -aQe -anA +urI +urI +ozQ +dqU +vfp +mlu +sjx +mQw +oMK +qwS +jrm +amD +web +uWR +gwB awp aus amn @@ -46572,6 +48195,7 @@ acH acH acH acH +ajp acH acH acH @@ -46584,8 +48208,7 @@ acH acH acH acH -acH -acH +qgy acH acH acH @@ -46608,23 +48231,23 @@ aAd aAd aAd aAd -acH -adx -aus -aus +vrq aus -aus -aus -aus -auL ayS -bPD -psu -haO -wCu -iXB +ayS +lNU +luX +luX +fxf +iKt +ybK +puC +bGE +aov +peo +kjF aDH -aGe +gwB awp aus amn @@ -46766,14 +48389,14 @@ acH acH afq afq +ajp +ajp +ajp acH acH acH acH -acH -acH -acH -acH +xbv acH acH acH @@ -46802,26 +48425,26 @@ acH acH acH acH -acH -adx -aus -aus -aus -aus -aus -aus +aNk aus amD +ayS +amD urI urI amD +aaM +aaM +aaM +sGd +aaM +aaM amD +frm +vCa amD -amD -aZB -awp aus -atI +amn aej acH acH @@ -46963,15 +48586,15 @@ afq afq afq afq +ajp +ajp +ajp acH acH acH acH acH -acH -acH -acH -acH +qgy acH acH acH @@ -46985,40 +48608,40 @@ aVw aej acH acH +xbv acH acH acH acH acH +qhn acH acH acH -acH -acH -acH -acH -acH -aiL -aIM -aTN -aTN -aTN -aTN -aTN -aTN -aTN -aTN -aTN -aTN -aTN -aTN -aTN -aTN -aGj +nbh +aNk +aus +aus +aus +aus +aus +aus +aus +dkS +cdU +deN +dOC +iRe +aaM +frm +djI +awp +aus +aus +amn aej acH acH -acH fam ptn qcL @@ -47159,7 +48782,7 @@ afq afq afq afq -acH +ajp acH acH acH @@ -47178,40 +48801,40 @@ aVw aVw aej acH +oiE acH +vLd acH +vLd acH acH acH acH +xbv acH acH -acH -acH -acH -acH -acH -acH -acH -aQK -aQK -aQK -aQK -aQK -aQK -aQK -aQK -aQK -aQK -aQK -aQK -aQK -aQK -aQK -acH -acH -acH -acH +aNk +aus +aus +aus +aus +aus +aus +aus +dkS +bsQ +bGu +xXL +eur +wOD +djI +awp +aus +aus +aus +amn +aej +jrR acH fam bSx @@ -47376,35 +48999,35 @@ acH acH acH acH +xfm acH acH +vLd acH acH acH acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH +aNk +aus +aus +aus +aus +aus +aus +aus +aaM +aaM +aaM +aaM +aaM +inC +awp +aus +aus +aus +aus +iCo +aej acH acH fam @@ -47572,32 +49195,32 @@ acH acH acH acH +xbv acH acH acH +vLd acH acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH -acH +aiL +aIM +aTN +aTN +aTN +aTN +aTN +aTN +aTN +aTN +aTN +aTN +aTN +aTN +aTN +aTN +aTN +aGj +aej acH acH acH @@ -47773,6 +49396,7 @@ acH acH acH acH +xbv acH acH acH @@ -47782,6 +49406,7 @@ acH acH acH acH +qhn acH acH acH @@ -47792,8 +49417,6 @@ acH acH acH acH -afq -afq aqG aqW aqW @@ -47972,6 +49595,14 @@ acH acH acH acH +xbv +acH +acH +acH +acH +acH +acH +acH acH acH acH @@ -47980,14 +49611,6 @@ acH acH acH acH -afq -afq -afq -afq -afq -afq -afq -afq aqG acH aqW @@ -48163,7 +49786,7 @@ acH acH acH acH -acH +qhn acH acH acH @@ -48173,6 +49796,8 @@ afq afq acH acH +acH +acH afq afq afq @@ -48180,9 +49805,7 @@ afq afq afq afq -afq -afq -aqG +acH aqG aqW jPH @@ -48376,7 +49999,7 @@ afq afq afq afq -afq +acH aqG aqW bjm @@ -48570,7 +50193,7 @@ afq afq afq afq -afq +acH aqG aqW aqW @@ -48764,7 +50387,7 @@ ajp ajp afq afq -afq +acH aqG aqG aqG diff --git a/maps/rift/levels/rift-09-west_caves.dmm b/maps/rift/levels/rift-09-west_caves.dmm index c2f3a5d7f964..160ac2801166 100644 --- a/maps/rift/levels/rift-09-west_caves.dmm +++ b/maps/rift/levels/rift-09-west_caves.dmm @@ -410,6 +410,12 @@ /obj/machinery/light/small{ dir = 1 }, +/obj/item/paper{ + info = "Hi, Abby. Thank you for reaching out. The general, simplified outline for the geothermal generator is as such; using the items on hand (two scanner arrays, four cable coils), you are able to craft an Advanced Geothermal Scanning Array. After putting it into the machine, simply use the provided multitool to put it in motion! You'll then be able to activate the SMES and restore powerflow. If you're having trouble finding the aforementioned supplies, make sure to look around!"; + name = "geothermal instructions"; + pixel_x = 6; + pixel_y = -7 + }, /turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors, /area/rift/geothermal) "eQ" = ( @@ -3721,9 +3727,7 @@ /obj/item/tool/screwdriver, /obj/item/stack/cable_coil, /obj/item/stock_parts/scanning_module, -/obj/item/stock_parts/scanning_module{ - name = "Craft me!" - }, +/obj/item/stock_parts/scanning_module, /turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors, /area/rift/geothermal) "Sc" = ( @@ -30560,7 +30564,7 @@ cU Cc pt pt -pt +Cc Cc EI EI @@ -30754,7 +30758,7 @@ cU Cc pt pt -pt +Cc Cc Cc Cc diff --git a/maps/rift/levels/rift-10-west_plains.dmm b/maps/rift/levels/rift-10-west_plains.dmm index 02c0b954d93a..4873dce7c6cf 100644 --- a/maps/rift/levels/rift-10-west_plains.dmm +++ b/maps/rift/levels/rift-10-west_plains.dmm @@ -89,6 +89,12 @@ }, /turf/simulated/floor/reinforced/airless, /area/rnd/outpost/chamber) +"aJ" = ( +/obj/structure/flora/rock/ice{ + pixel_y = 12 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/west) "aL" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -354,6 +360,13 @@ /obj/structure/closet/crate/radiation, /turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors, /area/rift/facility/exterior/shuttle) +"bV" = ( +/obj/structure/flora/grass/both{ + pixel_x = -5; + pixel_y = -4 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/west) "bW" = ( /obj/machinery/light/small{ dir = 8 @@ -423,6 +436,9 @@ }, /turf/simulated/floor/tiled/steel/lythios43c, /area/rift/facility/interior/surface) +"cj" = ( +/turf/simulated/wall/wood/hardwood, +/area/rift/surfacebase/outside/west) "ck" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -707,6 +723,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled/white, /area/rnd/outpost/heating) +"dk" = ( +/obj/structure/girder, +/turf/simulated/floor/wood/lythios43c, +/area/rift/surfacebase/outside/west) "dl" = ( /obj/structure/lattice, /turf/simulated/open/lythios43c, @@ -1032,6 +1052,12 @@ }, /turf/simulated/open, /area/rnd/outpost) +"eO" = ( +/obj/structure/flora/ausbushes/brflowers{ + pixel_y = 14 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/west) "eT" = ( /obj/effect/overlay/snow/floor/pointy{ dir = 8 @@ -1265,6 +1291,10 @@ }, /turf/simulated/floor/tiled/steel_dirty/lythios43c, /area/construction/solars) +"gd" = ( +/obj/structure/flora/tree/pine, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/west) "gf" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -1477,6 +1507,12 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/tiled/steel_dirty/lythios43c, /area/construction/solars) +"gR" = ( +/obj/structure/flora/grass/green{ + pixel_x = -13 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/west) "gS" = ( /obj/machinery/atmospherics/component/unary/heat_exchanger, /obj/structure/window/basic, @@ -1561,18 +1597,9 @@ /turf/simulated/floor/tiled, /area/rnd/outpost) "hi" = ( -/obj/structure/window/wooden{ - dir = 1 - }, -/obj/structure/window/wooden{ - dir = 4 - }, -/obj/structure/window/wooden, -/obj/structure/window/wooden{ - dir = 5 - }, +/obj/structure/flora/grass/green, /turf/simulated/floor/outdoors/snow/lythios43c, -/area/rift/exterior/nuketown) +/area/rift/surfacebase/outside/west) "hj" = ( /turf/simulated/floor/tiled/techfloor/grid/lythios43c/indoors, /area/rift/exterior/checkpoint/south) @@ -1672,7 +1699,7 @@ /turf/simulated/floor/reinforced/airless, /area/rnd/outpost/chamber) "hD" = ( -/obj/structure/simple_door, +/obj/structure/simple_door/wood, /turf/simulated/floor/lythios43c/indoors, /area/rift/exterior/nuketown/bunker) "hF" = ( @@ -1812,6 +1839,13 @@ /obj/random/trash_pile, /turf/simulated/floor/tiled/monotile, /area/rift/exterior/nuketown/interior) +"ih" = ( +/obj/structure/flora/ausbushes/lavendergrass{ + pixel_x = 2; + pixel_y = 12 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/west) "ik" = ( /obj/effect/overlay/snow/floor, /obj/structure/table, @@ -1884,6 +1918,9 @@ }, /turf/simulated/floor/outdoors/snow/lythios43c, /area/rift/exterior/nuketown) +"iF" = ( +/turf/simulated/floor/outdoors/safeice/lythios43c, +/area/rift/surfacebase/outside/west) "iG" = ( /obj/machinery/atmospherics/pipe/tank/air, /turf/simulated/floor, @@ -2265,6 +2302,10 @@ }, /turf/simulated/floor, /area/construction/solarscontrol) +"kq" = ( +/obj/structure/flora/grass/both, +/turf/simulated/floor/outdoors/snow/lythios43c/indoors, +/area/rift/surfacebase/outside/west) "kr" = ( /obj/effect/floor_decal/borderfloor{ dir = 9 @@ -2564,6 +2605,10 @@ "lK" = ( /turf/simulated/mineral/icerock/lythios43c, /area/rift/facility/exterior) +"lL" = ( +/obj/structure/flora/grass/both, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/west) "lM" = ( /obj/structure/fence/cut/large{ dir = 4 @@ -2748,6 +2793,11 @@ }, /turf/simulated/floor/tiled/steel_dirty/lythios43c, /area/construction/solars) +"mK" = ( +/obj/effect/floor_decal/rust, +/obj/structure/railing, +/turf/simulated/floor/tiled/steel_dirty/lythios43c, +/area/rift/surfacebase/outside/west) "mL" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/machinery/light{ @@ -2999,6 +3049,10 @@ }, /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab) +"nV" = ( +/obj/structure/flora/ausbushes/ywflowers, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/west) "nX" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -3092,19 +3146,10 @@ /turf/simulated/floor/outdoors/snow/lythios43c, /area/rift/facility/exterior) "ov" = ( -/obj/structure/window/wooden{ - dir = 8 - }, -/obj/structure/window/wooden{ - dir = 4 - }, /obj/structure/window/wooden{ dir = 1 }, -/obj/structure/window/wooden{ - dir = 9 - }, -/turf/simulated/floor/outdoors/snow/lythios43c, +/turf/simulated/wall/wood, /area/rift/exterior/nuketown) "ox" = ( /obj/machinery/atmospherics/component/binary/pump{ @@ -3131,6 +3176,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled, /area/rnd/outpost) +"oE" = ( +/obj/structure/metal_edge, +/turf/simulated/open/lythios43c, +/area/rift/surfacebase/outside/west) "oG" = ( /obj/structure/bonfire/permanent, /turf/simulated/mineral/floor/icerock/lythios43c/indoors/ignore_cavegen, @@ -3315,6 +3364,10 @@ }, /turf/simulated/floor/tiled, /area/rnd/outpost) +"pA" = ( +/obj/structure/flora/grass/brown, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/exterior/nuketown) "pD" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/black{ dir = 1 @@ -3508,6 +3561,13 @@ /obj/effect/overlay/snow/floor, /turf/simulated/floor/reinforced/lythios43c, /area/rift/facility/exterior) +"qu" = ( +/obj/machinery/light/flamp/noshade{ + layer = 4; + pixel_y = 17 + }, +/turf/simulated/floor/plating/lythios43c, +/area/rift/surfacebase/outside/west) "qv" = ( /obj/machinery/appliance/cooker/oven, /obj/machinery/light/small, @@ -3557,6 +3617,10 @@ /obj/effect/overlay/snow/floor, /turf/simulated/floor/lythios43c/indoors, /area/rift/facility/interior/surface) +"qN" = ( +/obj/structure/flora/ausbushes/ywflowers, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/exterior/nuketown) "qO" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -3730,6 +3794,10 @@ }, /turf/simulated/floor, /area/construction/solarscontrol) +"ry" = ( +/obj/structure/flora/ausbushes/lavendergrass, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/west) "rE" = ( /obj/structure/extinguisher_cabinet{ dir = 1; @@ -4032,20 +4100,9 @@ /turf/simulated/floor/tiled, /area/rnd/outpost) "sW" = ( -/obj/structure/window/wooden{ - dir = 1 - }, -/obj/structure/window/wooden{ - dir = 4 - }, -/obj/structure/window/wooden{ - dir = 8 - }, -/obj/structure/window/wooden{ - dir = 5 - }, +/obj/structure/flora/grass/brown, /turf/simulated/floor/outdoors/snow/lythios43c, -/area/rift/exterior/nuketown) +/area/rift/facility/exterior) "sX" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -4149,18 +4206,9 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab) "ts" = ( -/obj/structure/window/wooden{ - dir = 1 - }, -/obj/structure/window/wooden, -/obj/structure/window/wooden{ - dir = 8 - }, -/obj/structure/window/wooden{ - dir = 5 - }, +/obj/structure/flora/tree/dead, /turf/simulated/floor/outdoors/snow/lythios43c, -/area/rift/exterior/nuketown) +/area/rift/facility/exterior) "tt" = ( /obj/machinery/portable_atmospherics/canister/empty/carbon_dioxide, /obj/machinery/atmospherics/pipe/simple/visible/black, @@ -4205,15 +4253,9 @@ /turf/simulated/floor, /area/rnd/outpost/anomaly_lab/storage) "tF" = ( -/obj/structure/window/wooden{ - dir = 1 - }, -/obj/structure/window/wooden, -/obj/structure/window/wooden{ - dir = 5 - }, +/obj/structure/flora/grass/brown, /turf/simulated/floor/outdoors/snow/lythios43c, -/area/rift/exterior/nuketown) +/area/rift/surfacebase/outside/west) "tG" = ( /turf/simulated/floor/tiled/techfloor/grid/lythios43c/indoors, /area/rift/facility/exterior) @@ -4371,14 +4413,7 @@ /obj/structure/window/wooden{ dir = 4 }, -/obj/structure/window/wooden{ - dir = 1 - }, -/obj/structure/window/wooden, -/obj/structure/window/wooden{ - dir = 5 - }, -/turf/simulated/floor/outdoors/snow/lythios43c, +/turf/simulated/wall/wood, /area/rift/exterior/nuketown) "uz" = ( /obj/structure/window/reinforced{ @@ -4829,6 +4864,13 @@ "wu" = ( /turf/simulated/wall, /area/rift/exterior/nuketown/interior) +"ww" = ( +/obj/structure/flora/ausbushes/sparsegrass{ + pixel_x = 19; + pixel_y = 13 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/west) "wy" = ( /obj/machinery/atmospherics/pipe/simple/visible/supply{ dir = 6 @@ -5135,6 +5177,12 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor, /area/rnd/outpost/heating) +"xA" = ( +/obj/structure/flora/ausbushes/fullgrass{ + pixel_x = -8 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/west) "xB" = ( /obj/effect/floor_decal/industrial/outline/red, /turf/simulated/floor, @@ -5284,6 +5332,10 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/outpost/mixing) +"yo" = ( +/obj/structure/flora/grass/both, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/exterior/nuketown) "yp" = ( /obj/machinery/door/firedoor/border_only{ req_one_access = list(18,47) @@ -5692,6 +5744,12 @@ /obj/structure/fence/door/locked, /turf/simulated/floor/tiled/techfloor/grid/lythios43c/indoors, /area/rift/exterior/checkpoint/south) +"Al" = ( +/obj/structure/flora/ausbushes/pointybush{ + pixel_y = 12 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/west) "Ao" = ( /obj/machinery/power/apc/south_mount, /obj/structure/cable/green, @@ -5721,6 +5779,13 @@ /obj/fiftyspawner/steel, /turf/simulated/floor/tiled/white, /area/rnd/outpost/mixing) +"At" = ( +/obj/structure/flora/ausbushes/sparsegrass{ + pixel_x = 22; + pixel_y = 13 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/west) "Az" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -5968,6 +6033,11 @@ }, /turf/simulated/floor/tiled, /area/rnd/outpost) +"BT" = ( +/obj/structure/railing, +/obj/structure/flora/tree/pine, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/west) "BV" = ( /turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors, /area/rift/facility/interior/surface) @@ -6257,17 +6327,9 @@ /turf/simulated/floor/tiled/steel_dirty/lythios43c, /area/rift/surfacebase/outside/west) "Dy" = ( -/obj/structure/window/wooden{ - dir = 4 - }, -/obj/structure/window/wooden{ - dir = 8 - }, -/obj/structure/window/wooden{ - dir = 5 - }, +/obj/structure/flora/tree/dead, /turf/simulated/floor/outdoors/snow/lythios43c, -/area/rift/exterior/nuketown) +/area/rift/surfacebase/outside/west) "DB" = ( /obj/structure/railing{ dir = 4 @@ -7185,6 +7247,14 @@ }, /turf/simulated/floor, /area/maintenance/substation/outpost) +"Ic" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/ausbushes/sparsegrass{ + pixel_x = 19; + pixel_y = 13 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/west) "If" = ( /obj/structure/railing{ dir = 4 @@ -7441,6 +7511,10 @@ "Jv" = ( /turf/simulated/shuttle/wall/voidcraft/hard_corner, /area/rift/facility/interior/elevator) +"Jw" = ( +/obj/structure/table/woodentable, +/turf/simulated/floor/wood/lythios43c, +/area/rift/surfacebase/outside/west) "Jx" = ( /turf/simulated/wall, /area/rnd/outpost/testing_lab) @@ -8096,6 +8170,14 @@ }, /turf/simulated/floor/tiled/monotile, /area/rnd/outpost/anomaly_lab) +"MA" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/ausbushes/sparsegrass{ + pixel_x = 22; + pixel_y = 13 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/west) "MB" = ( /obj/machinery/door/airlock/science{ name = "Toxins Storage" @@ -8193,6 +8275,10 @@ }, /turf/simulated/floor/tiled, /area/rnd/outpost/testing_lab) +"MW" = ( +/obj/structure/metal_edge, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/west) "MX" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -8443,18 +8529,12 @@ /turf/simulated/floor/tiled/steel_dirty/lythios43c, /area/rift/surfacebase/outside/west) "Of" = ( -/obj/structure/window/wooden{ - dir = 8 - }, -/obj/structure/window/wooden{ - dir = 4 - }, -/obj/structure/window/wooden, -/obj/structure/window/wooden{ - dir = 9 +/obj/structure/flora/grass/brown{ + pixel_x = 11; + pixel_y = 10 }, /turf/simulated/floor/outdoors/snow/lythios43c, -/area/rift/exterior/nuketown) +/area/rift/surfacebase/outside/west) "Og" = ( /obj/structure/girder, /obj/effect/overlay/snow/floor, @@ -8848,6 +8928,14 @@ }, /turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors, /area/rift/facility/interior/elevator) +"PV" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/west) +"Qb" = ( +/obj/structure/flora/rock/ice/alternative_2, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/west) "Qe" = ( /obj/machinery/atmospherics/portables_connector{ dir = 4 @@ -9213,6 +9301,13 @@ /obj/item/reagent_containers/dropper, /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab) +"RM" = ( +/obj/structure/flora/grass/both{ + pixel_x = 10; + pixel_y = 10 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/west) "RO" = ( /obj/structure/table/standard, /obj/item/clothing/gloves/yellow, @@ -9794,10 +9889,8 @@ /turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors, /area/rift/facility/exterior/shuttle) "Ui" = ( -/obj/machinery/door/firedoor{ - dir = 8 - }, -/turf/simulated/mineral/icerock/lythios43c, +/obj/structure/girder/displaced, +/turf/simulated/floor/outdoors/snow/lythios43c, /area/rift/surfacebase/outside/west) "Uj" = ( /obj/structure/closet/firecloset, @@ -9922,6 +10015,12 @@ /obj/machinery/light/small, /turf/simulated/floor/tiled/steel_dirty/lythios43c, /area/rift/surfacebase/outside/west) +"UR" = ( +/obj/structure/flora/ausbushes/ywflowers{ + pixel_x = 8 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/west) "UT" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -10014,6 +10113,20 @@ }, /turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors, /area/rift/facility/exterior/shuttle) +"Vn" = ( +/turf/simulated/floor/wood/lythios43c, +/area/rift/surfacebase/outside/west) +"Vo" = ( +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 8 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/effect/floor_decal/rust, +/obj/structure/railing, +/turf/simulated/floor/tiled/steel_dirty/lythios43c, +/area/rift/surfacebase/outside/west) "Vw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -10133,18 +10246,11 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/testing_lab) "Wp" = ( -/obj/structure/window/wooden{ - dir = 4 - }, -/obj/structure/window/wooden, -/obj/structure/window/wooden{ - dir = 8 - }, -/obj/structure/window/wooden{ - dir = 5 +/obj/structure/flora/grass/brown{ + pixel_y = 10 }, /turf/simulated/floor/outdoors/snow/lythios43c, -/area/rift/exterior/nuketown) +/area/rift/surfacebase/outside/west) "Wt" = ( /obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary{ frequency = 1452; @@ -10229,6 +10335,13 @@ }, /turf/simulated/open/lythios43c, /area/outpost/mining_main/outpost) +"WL" = ( +/obj/effect/floor_decal/rust, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_dirty/lythios43c, +/area/rift/surfacebase/outside/west) "WO" = ( /obj/machinery/atmospherics/pipe/simple/visible/red, /turf/simulated/floor/tiled/white, @@ -10239,6 +10352,10 @@ }, /turf/simulated/floor, /area/rnd/outpost/atmos) +"WQ" = ( +/obj/structure/flora/ausbushes/ppflowers, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/west) "WS" = ( /obj/machinery/fire_alarm/east_mount, /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -10718,6 +10835,13 @@ }, /turf/simulated/floor/wood/lythios43c, /area/rift/exterior/nuketown/interior) +"Ze" = ( +/obj/structure/flora/grass/brown{ + pixel_x = 11; + pixel_y = 10 + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/exterior/nuketown) "Zg" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -10782,6 +10906,14 @@ "Zu" = ( /turf/simulated/wall/r_wall, /area/rift/exterior/nuketown/bunker) +"Zv" = ( +/obj/structure/flora/rock/ice/alternative_1, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/west) +"Zx" = ( +/obj/structure/table, +/turf/simulated/floor/wood/lythios43c, +/area/rift/surfacebase/outside/west) "ZA" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 @@ -14266,7 +14398,7 @@ Rs Rs Rs Rs -Rs +sW Rs Rs Rs @@ -14893,10 +15025,10 @@ sv sv sv sv +iF sv sv -sv -sv +iF sv sv sv @@ -15078,19 +15210,19 @@ sv sv sv sv +gd sv sv sv sv sv +hi sv -sv -sv -sv -sv -sv -sv -sv +iF +iF +iF +iF +iF sv sv sv @@ -15281,9 +15413,9 @@ sv sv sv sv -sv -sv -sv +iF +iF +iF sv sv sv @@ -15462,6 +15594,7 @@ sv sv sv sv +gd sv sv sv @@ -15473,12 +15606,11 @@ sv sv sv sv -sv -sv -sv -sv -sv -sv +iF +iF +iF +hi +iF sv sv sv @@ -15641,6 +15773,7 @@ lK sv sv sv +Dy sv sv sv @@ -15659,6 +15792,7 @@ sv sv sv sv +hi sv sv sv @@ -15668,11 +15802,9 @@ sv sv sv sv +iF sv -sv -sv -sv -sv +iF sv sv sv @@ -15835,14 +15967,17 @@ ka sv sv sv +Of sv sv sv sv +lL sv sv sv sv +hi sv sv sv @@ -15858,14 +15993,11 @@ sv sv sv sv +gd sv sv sv -sv -sv -sv -sv -sv +iF sv sv sv @@ -16226,6 +16358,7 @@ sv sv sv sv +tF sv sv sv @@ -16243,18 +16376,17 @@ sv sv sv sv +gd sv sv sv +hi sv sv sv sv sv -sv -sv -sv -sv +hi sv sv sv @@ -16584,7 +16716,7 @@ sr Rs Rs Rs -Rs +ts Rs Rs Rs @@ -16592,7 +16724,7 @@ Rs ho Rs Rs -Rs +sW Rs Rs Rs @@ -16605,7 +16737,7 @@ lK Rs Rs Rs -Rs +sW Rs ho sv @@ -16699,7 +16831,7 @@ PP PP PP PP -Ui +PP PP PP PP @@ -16811,7 +16943,7 @@ sv sv dQ sv -sv +tF sv sv sv @@ -16991,7 +17123,7 @@ lK Rs Rs Rs -Rs +ts Rs Rs Rs @@ -17000,7 +17132,7 @@ sv dQ sv sv -sv +tF sv sv sv @@ -17231,7 +17363,7 @@ sv sv sv sv -sv +gd sv sv sv @@ -17387,15 +17519,19 @@ ho sv sv sv +Dy sv sv sv +tF sv sv +lL sv sv sv sv +gd sv sv sv @@ -17417,6 +17553,7 @@ sv sv sv sv +gd sv sv sv @@ -17424,12 +17561,7 @@ sv sv sv sv -sv -sv -sv -sv -sv -sv +gd sv sv sv @@ -17572,7 +17704,7 @@ Rs Rs Rs Rs -Rs +sW Rs fz Rs @@ -17596,23 +17728,23 @@ sv sv sv sv +hi sv sv +gd sv sv sv +gd sv sv sv sv sv +hi sv sv -sv -sv -sv -sv -sv +hi sv sv sv @@ -17816,7 +17948,7 @@ dQ sv sv sv -sv +gd sv sv sv @@ -18001,7 +18133,7 @@ sv sv sv sv -sv +gd sv sv sv @@ -18173,11 +18305,11 @@ sv sv sv sv +gd sv sv sv -sv -sv +gd sv sv sv @@ -18777,14 +18909,14 @@ iV wu ed ed -ed +pA ed sS ed ed ed ed -ed +pA ed ed ed @@ -18951,7 +19083,7 @@ sv hB zA zA -tF +Xf ed ed ed @@ -18982,7 +19114,7 @@ ed ed ed ed -ed +pA ed ed ed @@ -19140,13 +19272,12 @@ sv sv sv sv -sv +gd sv Pi ds ds -hi -ed +Xf ed ed ed @@ -19155,6 +19286,7 @@ ed ed ed ed +qN ed sS ed @@ -19163,7 +19295,7 @@ sS sS ed ed -ed +pA ed sS ed @@ -19296,7 +19428,7 @@ Rs Rs Rs Rs -Rs +ts Rs Rs Rs @@ -19329,7 +19461,7 @@ sv sv sv sv -sv +gd sv sv sv @@ -19351,12 +19483,12 @@ ed ed ed sS -ed +pA ed sS sS ed -ed +Ze ed ed ed @@ -19380,7 +19512,7 @@ dA sv sv sv -sv +gd sv sv PP @@ -19526,7 +19658,7 @@ sv sv sv sv -sv +gd sv sv sv @@ -19761,7 +19893,7 @@ OH ed ed ed -ed +pA ed ed dA @@ -19769,7 +19901,7 @@ sv sv sv sv -sv +gd sv PP PP @@ -19909,7 +20041,7 @@ sv sv sv sv -sv +gd sv sv sv @@ -20087,7 +20219,7 @@ fz Rs Rs Rs -Rs +ts Rs Rs Rs @@ -20110,7 +20242,7 @@ cL sv sv sv -sv +gd sv rj ed @@ -20146,7 +20278,7 @@ jq jq TD sP -ed +pA ed ed ed @@ -20156,7 +20288,7 @@ dA sv sv sv -sv +gd sv sv sv @@ -20493,7 +20625,7 @@ sv sv sv sv -sv +gd sv sv sv @@ -20536,12 +20668,12 @@ OR OH ed ed +pA ed ed -ed -sW -Dy -Wp +Xf +Xf +Xf rj sv sv @@ -20695,7 +20827,7 @@ sv sv sv ov -Of +Xf ed ed ed @@ -20716,7 +20848,7 @@ sS kE kE ed -ed +yo OH OH OH @@ -20739,7 +20871,7 @@ ed rj sv sv -sv +gd sv sv sv @@ -20877,7 +21009,7 @@ PP sv sv sv -sv +Dy sv sv sv @@ -21021,7 +21153,7 @@ Rs Rs Rs Rs -Rs +sW Rs Rs Rs @@ -21127,7 +21259,7 @@ ed rj sv sv -sv +gd sv sv PP @@ -21313,7 +21445,7 @@ xc xc ed ed -ed +pA ed ed rj @@ -21435,7 +21567,7 @@ Rs Rs Rs Rs -Rs +ts Rs Rs Rs @@ -21463,7 +21595,7 @@ sv sv sv sv -sv +gd sv sv sv @@ -21514,7 +21646,7 @@ rj ed rj sv -sv +gd sv sv PP @@ -21651,7 +21783,7 @@ sv sv sv sv -sv +Dy sv sv sv @@ -21679,7 +21811,7 @@ jq YI sP ed -ed +pA sS sS xc @@ -21872,7 +22004,7 @@ OH OH OH OH -ed +pA ed sS sS @@ -21904,7 +22036,7 @@ rj sv sv sv -sv +gd PP PP PP @@ -22055,7 +22187,7 @@ gA iB gA gA -ts +Xf ed ed ed @@ -22240,7 +22372,7 @@ sv sv sv sv -sv +gd sv sv sv @@ -22286,11 +22418,11 @@ Xf Xf sv sv +gd sv sv sv -sv -sv +gd sv PP PP @@ -22426,7 +22558,7 @@ PP sv sv sv -sv +Dy sv sv sv @@ -22625,14 +22757,14 @@ sv sv sv sv +Dy sv sv sv sv sv sv -sv -sv +gd sv sv DW @@ -22648,7 +22780,7 @@ ed ed ed ed -ed +pA ed sS sS @@ -22675,7 +22807,7 @@ DW sv sv sv -sv +gd sv sv sv @@ -22776,7 +22908,7 @@ Rs Rs Rs Rs -Rs +ts Rs Rs Rs @@ -22817,7 +22949,7 @@ sv sv sv sv -sv +gd sv sv sv @@ -23003,7 +23135,7 @@ lK PP PP sv -sv +tF sv sv sv @@ -23200,7 +23332,7 @@ sv sv sv sv -sv +Dy sv sv sv @@ -23256,7 +23388,7 @@ ed DW sv sv -sv +gd sv sv sv @@ -23369,7 +23501,7 @@ Rs Rs Rs Rs -Rs +ts Rs Rs Rs @@ -23396,6 +23528,7 @@ sv sv sv sv +tF sv sv sv @@ -23404,8 +23537,7 @@ sv sv sv sv -sv -sv +gd sv sv sv @@ -23583,7 +23715,9 @@ lK lK ka sv +tF sv +Dy sv sv sv @@ -23600,14 +23734,12 @@ sv sv sv sv -sv -sv -sv +gd sv sv DW ed -ed +pA ed OH nA @@ -23646,7 +23778,7 @@ sv sv sv sv -sv +gd sv sv PP @@ -23782,17 +23914,17 @@ sv sv sv sv +gd sv sv sv sv sv +tF sv sv sv -sv -sv -sv +Dy sv sv sv @@ -23979,7 +24111,7 @@ sv sv sv sv -sv +Dy sv sv sv @@ -24121,7 +24253,7 @@ lK Rs Rs Rs -Rs +ts Rs Rs Rs @@ -24169,6 +24301,7 @@ sv sv sv sv +tF sv sv sv @@ -24180,8 +24313,7 @@ sv sv sv sv -sv -sv +gd sv sv sv @@ -24348,7 +24480,7 @@ Rs Rs Rs Rs -Rs +ts Rs fz fz @@ -24362,11 +24494,11 @@ sv sv sv sv +Dy sv sv sv -sv -sv +tF sv sv sv @@ -24422,7 +24554,7 @@ sv sv sv sv -sv +gd sv PP PP @@ -24553,7 +24685,7 @@ Rs Rs Vb sv -sv +tF sv sv sv @@ -24578,7 +24710,7 @@ sv DW ed ed -ed +pA ed ed ed @@ -24613,7 +24745,7 @@ ed ed DW sv -sv +gd sv sv sv @@ -24722,6 +24854,7 @@ Rs Rs ot Rs +ts Rs Rs Rs @@ -24733,8 +24866,7 @@ Rs Rs Rs Rs -Rs -Rs +sW Rs Rs Rs @@ -24750,7 +24882,7 @@ sv sv sv sv -sv +Dy sv sv cL @@ -24949,7 +25081,7 @@ sv sv sv sv -sv +Dy sv sv sv @@ -25155,7 +25287,7 @@ sv sv sv sv -sv +Wp sv OI rg @@ -25350,12 +25482,12 @@ sv sv sv sv +Wp sv sv sv sv -sv -sv +tF sv sv sv @@ -25486,7 +25618,7 @@ Rs Rs Rs Rs -Rs +ts Rs Rs Rs @@ -25541,7 +25673,7 @@ sv sv sv sv -sv +Of sv sv sv @@ -25571,7 +25703,7 @@ sv sv sv sv -sv +ww sv sv sv @@ -25765,7 +25897,7 @@ sv sv sv sv -sv +gR sv sv sv @@ -25900,7 +26032,7 @@ Rs Rs Rs Rs -Rs +sW Rs fz fz @@ -25937,7 +26069,7 @@ sv sv sv sv -sv +tF sv sv sv @@ -25953,7 +26085,7 @@ dQ dQ dQ sv -sv +ww sv sv sv @@ -26093,7 +26225,7 @@ Rs Rs Rs Rs -Rs +ts Rs Rs fz @@ -26147,9 +26279,11 @@ dQ dQ dQ sv +tF sv sv sv +Dy sv sv sv @@ -26158,9 +26292,7 @@ sv sv sv sv -sv -sv -sv +gd sv sv sv @@ -26312,7 +26444,7 @@ sv sv sv sv -sv +gd sv sv sv @@ -26334,7 +26466,7 @@ we we sv sv -sv +tF sv dQ dQ @@ -26344,10 +26476,10 @@ sv sv sv sv +hi sv sv -sv -sv +ih sv sv sv @@ -26535,12 +26667,14 @@ dQ dQ dQ sv +PV sv sv sv sv sv sv +hi sv sv sv @@ -26549,9 +26683,7 @@ sv sv sv sv -sv -sv -sv +hi sv sv sv @@ -26722,7 +26854,7 @@ sv sv sv sv -sv +Dy sv dQ dQ @@ -26932,12 +27064,12 @@ sv sv sv sv +hi sv sv sv sv -sv -sv +gd sv sv sv @@ -27355,6 +27487,7 @@ dQ sv sv sv +tF sv sv sv @@ -27370,8 +27503,7 @@ sv sv sv sv -sv -sv +gd sv sv sv @@ -27519,7 +27651,7 @@ sv sv sv sv -sv +hi sv sv sv @@ -27547,18 +27679,18 @@ sv dQ dQ sv +tF sv +Dy sv +tF sv sv sv sv -sv -sv -sv -sv -sv -sv +iF +iF +iF sv sv sv @@ -27646,6 +27778,7 @@ PP sv sv sv +Dy sv sv sv @@ -27694,8 +27827,7 @@ sv sv sv sv -sv -sv +ww sv sv sv @@ -27743,17 +27875,17 @@ dQ sv sv sv +tF sv sv sv sv -sv -sv -sv -sv -sv -sv -sv +iF +iF +iF +iF +iF +iF sv sv sv @@ -27905,7 +28037,7 @@ dQ sv sv sv -sv +gd sv sv sv @@ -27941,13 +28073,13 @@ sv sv sv sv -sv -sv -sv -sv -sv -sv -sv +iF +iF +iF +iF +iF +iF +iF sv sv sv @@ -28039,7 +28171,7 @@ sv sv sv sv -sv +tF sv sv sv @@ -28135,13 +28267,13 @@ sv sv sv sv -sv -sv -sv -sv -sv -sv -sv +iF +iF +iF +iF +iF +iF +iF sv sv sv @@ -28248,7 +28380,7 @@ sv sv sv sv -sv +gd sv sv sv @@ -28283,9 +28415,9 @@ aN sv sv sv +hi sv -sv -sv +tF sv dQ dQ @@ -28318,7 +28450,7 @@ sv sv sv sv -sv +gd sv dQ dQ @@ -28329,12 +28461,12 @@ sv sv sv sv -sv -sv -sv -sv -sv -sv +iF +iF +iF +iF +iF +iF sv sv sv @@ -28485,14 +28617,14 @@ dQ dQ dQ sv +hi sv sv sv sv sv sv -sv -sv +lL sv sv sv @@ -28519,15 +28651,15 @@ dQ sv sv sv +tF sv sv sv -sv -sv -sv -sv -sv -sv +iF +iF +iF +iF +iF sv sv sv @@ -28681,7 +28813,7 @@ dQ sv sv sv -sv +hi sv sv sv @@ -28715,18 +28847,18 @@ sv sv sv sv +gd sv +iF +iF +iF +iF sv sv sv sv sv -sv -sv -sv -sv -sv -sv +cL sv sv sv @@ -28863,12 +28995,12 @@ DI DI Mc sv +ww sv sv sv sv -sv -sv +ww dQ dQ dQ @@ -28876,7 +29008,7 @@ sv sv sv sv -sv +gd sv sv sv @@ -28899,23 +29031,23 @@ sv sv sv sv -sv +gd sv sv dQ dQ sv +tF sv sv sv sv sv +iF +iF +iF sv -sv -sv -sv -sv -sv +iF sv sv sv @@ -29057,12 +29189,12 @@ cO cO aN sv +hi sv +hi sv sv -sv -sv -sv +PV dQ dQ dQ @@ -29106,14 +29238,14 @@ sv sv sv sv +iF +iF sv +iF sv sv sv sv -cL -sv -sv sv sv sv @@ -29285,7 +29417,7 @@ sv sv sv sv -sv +Dy sv sv sv @@ -29300,9 +29432,9 @@ sv sv sv sv +iF sv -sv -sv +iF sv sv sv @@ -29447,8 +29579,8 @@ Mc sv sv sv -sv -sv +gd +hi sv sv dQ @@ -29456,7 +29588,7 @@ dQ dQ sv sv -sv +lL sv sv sv @@ -29481,28 +29613,28 @@ sv sv sv sv -sv +lL sv sv dQ dQ sv +tF sv sv +gd sv sv sv sv +iF sv sv sv sv sv sv -sv -sv -sv -sv +gd sv sv sv @@ -29670,7 +29802,7 @@ PP sv sv sv -sv +tF sv sv sv @@ -30028,10 +30160,10 @@ cO aN sv sv +hi sv sv -sv -sv +gd sv dQ dQ @@ -30072,7 +30204,7 @@ sv sv sv sv -sv +Dy sv sv sv @@ -30221,7 +30353,7 @@ DI DI Mc sv -sv +RM sv sv sv @@ -30267,7 +30399,7 @@ sv sv sv sv -sv +Wp sv sv sv @@ -30420,7 +30552,7 @@ sv sv sv sv -sv +gd dQ dQ dQ @@ -30446,18 +30578,18 @@ sv sv sv sv +tF sv +Dy sv sv sv -sv -sv -sv +lL sv dQ dQ sv -sv +gd sv sv sv @@ -30643,7 +30775,7 @@ sv sv sv sv -sv +tF sv sv sv @@ -30657,7 +30789,7 @@ sv sv sv sv -sv +gd sv sv sv @@ -30813,7 +30945,7 @@ dQ dQ dQ sv -sv +hi sv sv sD @@ -30846,7 +30978,7 @@ dQ dQ sv sv -sv +hi sv sv sv @@ -30996,12 +31128,12 @@ cO cO cO aN +bV sv sv sv sv -sv -sv +Dy sv dQ dQ @@ -31029,7 +31161,7 @@ sv sv sv sv -sv +tF sv sv sv @@ -31582,7 +31714,7 @@ sv sv sv sv -sv +gd sv sv dQ @@ -31776,7 +31908,7 @@ sv sv sv sv -sv +hi sv sv dQ @@ -31930,7 +32062,7 @@ sv sv sv sv -sv +gd sv sv sv @@ -31988,8 +32120,7 @@ PP PP PP sD -sD -sv +kq sv sv sv @@ -32002,6 +32133,7 @@ sv sv sv sv +lL sv sv sv @@ -32129,7 +32261,7 @@ sv sv sv sv -sv +gd sv sv sv @@ -32206,7 +32338,7 @@ sv sv sv sv -sv +Wp sv sv sv @@ -32224,7 +32356,7 @@ sv sv sv sv -sv +Dy sv sv sv @@ -32315,11 +32447,11 @@ sv sv sv sv +gd sv sv sv -sv -sv +gd sv sv sv @@ -32359,7 +32491,7 @@ sv sv sv sv -sv +gd sv dQ dQ @@ -32395,12 +32527,12 @@ sv sv sv sv +lL sv sv sv sv -sv -sv +Dy sv sv sv @@ -32505,6 +32637,7 @@ sv sv sv sv +gd sv sv sv @@ -32517,8 +32650,7 @@ sv sv sv sv -sv -sv +gd sv sv sv @@ -32595,7 +32727,7 @@ sv sv sv sv -sv +Wp sv sv sv @@ -32703,11 +32835,11 @@ sv sv sv sv +gd sv sv sv -sv -sv +gd sv sv sv @@ -32744,7 +32876,7 @@ cO aN sv sv -sv +RM sv sv sv @@ -32890,7 +33022,7 @@ PP PP sv sv -sv +gd sv sv sv @@ -32969,7 +33101,7 @@ sv sv sv sv -sv +gd sv sv sv @@ -33013,7 +33145,7 @@ sv sv sv sv -sv +Dy sv sv sv @@ -33088,19 +33220,19 @@ sv sv sv sv +eO sv sv sv sv sv +gd sv sv sv sv sv -sv -sv -sv +gd sv sv sv @@ -33280,7 +33412,7 @@ sv sv sv sv -sv +gd sv sv sv @@ -33476,6 +33608,7 @@ sv sv sv sv +ry sv sv sv @@ -33487,8 +33620,7 @@ sv sv sv sv -sv -sv +gd sv sv sv @@ -33510,6 +33642,7 @@ sv sv sv sv +tF sv sv sv @@ -33523,8 +33656,7 @@ sv sv sv sv -sv -sv +gd sv sv sv @@ -33664,6 +33796,7 @@ PP sv sv sv +gd sv sv sv @@ -33672,13 +33805,12 @@ sv sv sv sv +dQ sv sv sv sv -sv -sv -sv +gd sv sv sv @@ -33701,12 +33833,12 @@ sv rH kd sv +bV sv sv sv sv -sv -sv +RM sv sv sv @@ -33864,6 +33996,9 @@ sv sv sv sv +dQ +dQ +dQ sv sv sv @@ -33871,6 +34006,7 @@ sv sv sv sv +gd sv sv sv @@ -33881,11 +34017,7 @@ sv sv sv sv -sv -sv -sv -sv -sv +Wp sv sv sv @@ -34041,6 +34173,7 @@ sv sv sv sv +hi sv sv sv @@ -34070,8 +34203,7 @@ sv sv sv sv -sv -sv +gd sv sv sv @@ -34093,7 +34225,7 @@ sv sv sv sv -sv +gd sv sv sv @@ -34110,7 +34242,7 @@ sv sv sv sv -sv +gd dQ dQ dQ @@ -34245,20 +34377,20 @@ sv sv sv sv +dQ sv sv sv +dQ sv +ww sv sv sv sv sv sv -sv -sv -sv -sv +gd sv sv sv @@ -34424,6 +34556,7 @@ PP dP sv sv +dQ sv sv sv @@ -34432,6 +34565,7 @@ sv sv sv sv +dQ sv sv sv @@ -34443,6 +34577,7 @@ sv sv sv sv +hi sv sv sv @@ -34454,6 +34589,7 @@ sv sv sv sv +gd sv sv sv @@ -34461,11 +34597,7 @@ sv sv sv sv -sv -sv -sv -sv -sv +gd sv sv sv @@ -34477,7 +34609,7 @@ Fn IZ gQ sv -sv +tF sv sv sv @@ -34522,7 +34654,7 @@ PP sv sv sv -sv +Dy sv sv sv @@ -34619,8 +34751,10 @@ dP sv sv sv +dQ sv sv +dQ sv sv sv @@ -34628,8 +34762,10 @@ sv sv sv sv +dQ sv sv +dQ sv sv sv @@ -34651,11 +34787,7 @@ sv sv sv sv -sv -sv -sv -sv -sv +Wp sv sv sv @@ -34673,7 +34805,7 @@ gQ sv sv sv -sv +gd sv sv sv @@ -34725,7 +34857,7 @@ aW aW aW sv -sv +hi sv sv PP @@ -34908,7 +35040,7 @@ PP PP PP sv -sv +gd sv sv sv @@ -35023,6 +35155,7 @@ sv sv sv sv +gd sv sv sv @@ -35047,8 +35180,7 @@ sv sv sv sv -sv -sv +gd sv sv Fn @@ -35058,7 +35190,7 @@ MC Fn xf RZ -sv +Wp sv sv sv @@ -35207,6 +35339,7 @@ sv sv sv sv +hi sv sv sv @@ -35227,8 +35360,7 @@ sv sv sv sv -sv -sv +gd sv sv sv @@ -35256,7 +35388,7 @@ sv sv sv sv -sv +gd sv sv PP @@ -35280,7 +35412,7 @@ dQ dQ sv sv -sv +gd sv PP PP @@ -35297,7 +35429,7 @@ sv sv sv sv -sv +gd sv sv sv @@ -35413,6 +35545,7 @@ sv sv sv sv +gd sv sv sv @@ -35430,13 +35563,12 @@ sv sv sv sv +gd sv sv sv sv -sv -sv -sv +Wp sv sv bY @@ -35492,7 +35624,7 @@ sv sv sv sv -sv +hi sv Fb Fb @@ -35579,17 +35711,17 @@ sv sv sv sv +Ui +cj +dk +cj +cj +cj sv sv sv sv -sv -sv -sv -sv -sv -sv -sv +dQ sv sv sv @@ -35644,7 +35776,7 @@ sv sv sv sv -sv +lL sv sv PP @@ -35683,7 +35815,7 @@ sv sv sv sv -sv +hi sv sv sv @@ -35774,10 +35906,10 @@ sv sv sv sv +WQ sv -sv -sv -sv +Vn +Vn sv sv sv @@ -35836,7 +35968,7 @@ vC gQ sv sv -sv +gd sv sv sv @@ -35875,11 +36007,11 @@ PP PP sv sv +gd sv sv sv -sv -sv +gd sv Fb Cf @@ -35964,15 +36096,15 @@ sv sv sv sv +hi sv sv sv +Ui sv +Vn sv -sv -sv -sv -sv +Vn sv sv sv @@ -36055,7 +36187,7 @@ dQ dQ dQ sv -sv +Al sv PP PP @@ -36162,10 +36294,10 @@ sv sv sv sv -sv -sv -sv -sv +cj +Zx +Vn +Vn sv sv sv @@ -36207,8 +36339,8 @@ ia lb lb hS -hS -sv +Vo +MW sv sv sv @@ -36266,7 +36398,7 @@ sv sv sv sv -sv +gd sv sv Fb @@ -36356,10 +36488,10 @@ sv sv sv sv -sv -sv -sv -sv +cj +Jw +Vn +Vn sv sv sv @@ -36401,8 +36533,8 @@ wU wU wU wU -wU -sv +mK +MW sv sv sv @@ -36437,7 +36569,7 @@ Tq rd rd Tq -sv +xA sv dQ dQ @@ -36455,14 +36587,14 @@ PP PP PP sv +hi sv sv sv sv sv sv -sv -sv +hi eV fk WH @@ -36549,8 +36681,8 @@ sv sv sv sv -sv -sv +hi +cj sv sv sv @@ -36596,8 +36728,8 @@ wU wU wU wU -wU -wU +WL +WL ce Do sv @@ -36652,8 +36784,8 @@ sv sv sv sv -sv -sv +gd +hi sv sv sv @@ -36806,7 +36938,7 @@ mW wU dQ sv -sv +gR sv sv sv @@ -36826,12 +36958,12 @@ NI NI Mr sv -sv +tF dQ dQ dQ sv -sv +gd sv PP PP @@ -37002,7 +37134,7 @@ dQ sv sv sv -sv +gd sv sv sv @@ -37036,7 +37168,7 @@ PP PP sv sv -sv +gd sv sv sv @@ -37144,7 +37276,7 @@ sv sv sv sv -sv +gd sv sv sv @@ -37185,7 +37317,7 @@ eZ sv sv sv -sv +gd sv sv sv @@ -37233,7 +37365,7 @@ sv sv sv sv -sv +gd sv sv sv @@ -37392,7 +37524,7 @@ sv sv sv sv -sv +gR sv sv sv @@ -37430,7 +37562,7 @@ sv sv sv sv -sv +gd sv Fb bp @@ -37619,7 +37751,7 @@ sv sv sv sv -sv +hi sv sv sv @@ -37712,7 +37844,7 @@ sv sv sv sv -sv +Zv sv sv sv @@ -37779,7 +37911,7 @@ sv sv sv sv -sv +gd sv sv sv @@ -37913,8 +38045,8 @@ sv sv sv sv -cL sv +cL sv sv sv @@ -37970,6 +38102,7 @@ mW wU dQ sv +lL sv sv sv @@ -37981,8 +38114,7 @@ sv sv sv sv -sv -sv +lL sv mW sv @@ -38008,10 +38140,10 @@ sv sv sv sv +hi sv sv -sv -sv +gd sv sv sv @@ -38350,7 +38482,7 @@ sv sv sv sv -sv +gd sv sv sv @@ -38368,7 +38500,7 @@ sv sv sv sv -sv +gd sv sv sv @@ -38382,9 +38514,9 @@ dQ sv sv sv +gd sv -sv -sv +hi sv sv cL @@ -38587,7 +38719,7 @@ sv sv sv sv -sv +gd sv sv sv @@ -38680,18 +38812,18 @@ PP sv sv sv +hi sv sv sv sv sv +lL sv sv sv sv -sv -sv -sv +Zv sv sv sv @@ -38746,14 +38878,14 @@ mW lb dQ sv +gR sv sv sv sv sv -sv -sv -sv +iF +iF sv sv sv @@ -38771,10 +38903,10 @@ sv sv sv sv +gd sv sv -sv -sv +hi sv sv sv @@ -38945,11 +39077,11 @@ sv sv sv sv -sv -sv -sv -sv -sv +iF +iF +iF +iF +iF sv sv sv @@ -38972,10 +39104,10 @@ sv sv sv sv +hi sv sv -sv -sv +hi sv sv sv @@ -39125,7 +39257,7 @@ Do sv sv sv -sv +gd sv sv sv @@ -39139,31 +39271,31 @@ sv sv sv sv +iF +hi sv -sv -sv -sv -sv -sv +iF +iF +iF sv sv sv mW -sv +lL sv dQ dQ dQ sv sv +gd sv sv sv sv sv -sv -sv -sv +gd +hi sv sv sv @@ -39265,7 +39397,7 @@ sv sv sv sv -sv +gd sv sv sv @@ -39333,12 +39465,12 @@ sv sv sv sv +iF sv -sv -sv -sv -sv -sv +nV +iF +iF +iF sv sv sv @@ -39475,7 +39607,7 @@ sv sv sv sv -sv +hi sv jn cU @@ -39524,16 +39656,16 @@ dQ dQ sv sv +gd sv sv +iF +iF sv +iF sv sv -sv -sv -sv -sv -sv +At sv sv mW @@ -39542,14 +39674,14 @@ sv dQ dQ dQ +lL sv sv sv +lL sv sv -sv -sv -sv +hi sv sv sv @@ -39659,7 +39791,7 @@ sv sv sv sv -sv +hi sv sv sv @@ -39722,9 +39854,9 @@ sv sv sv sv -sv -sv -sv +iF +iF +iF sv sv sv @@ -39739,7 +39871,7 @@ dQ sv sv sv -sv +gd sv sv sv @@ -39902,7 +40034,7 @@ sv sv sv sv -sv +gd sv sv sv @@ -39913,7 +40045,7 @@ sv sv sv sv -sv +PV sv sv sv @@ -39935,11 +40067,11 @@ sv sv sv sv +ww sv sv sv -sv -sv +PV sv sv sv @@ -40243,7 +40375,7 @@ sv sv sv sv -sv +gd sv sv sv @@ -40429,7 +40561,7 @@ sv sv sv sv -sv +lL sv sv sv @@ -41104,7 +41236,7 @@ sv sv sv sv -sv +ww sv sv sv @@ -41273,7 +41405,7 @@ sv sv sv sv -sv +PV sv sv sv @@ -41288,7 +41420,7 @@ sv qZ bw Hz -sv +gd sv Mv je @@ -41458,12 +41590,12 @@ sv sv sv sv +gd sv sv sv sv -sv -sv +lL sv sv sv @@ -41489,15 +41621,15 @@ je sv sv sv +gd sv sv +ww sv sv sv sv -sv -sv -sv +gd sv sv dQ @@ -41661,16 +41793,16 @@ sv sv sv sv +gd sv +lL sv sv sv +gd sv sv -sv -sv -sv -sv +PV sv sv qZ @@ -41794,7 +41926,7 @@ PP PP sv sv -sv +Zv sv sv sv @@ -41847,7 +41979,7 @@ sv sv sv sv -sv +lL sv sv sv @@ -41872,11 +42004,11 @@ bw Hz sv sv -Mv +BT je sv sv -sv +ww sv sv sv @@ -41994,7 +42126,7 @@ sv sv sv sv -sv +hi sv sv sv @@ -42077,7 +42209,7 @@ cL sv sv sv -sv +gd sv sv sv @@ -42243,6 +42375,7 @@ sv sv sv sv +lL sv sv sv @@ -42251,11 +42384,10 @@ sv sv sv sv +gd sv sv sv -sv -qZ bw Hz sv @@ -42281,7 +42413,7 @@ dQ sv sv sv -sv +gd sv sv sv @@ -42436,10 +42568,12 @@ pn sv sv sv +gd sv sv sv sv +PV sv sv sv @@ -42448,8 +42582,6 @@ sv sv sv sv -sv -qZ bw Hz sv @@ -42459,7 +42591,7 @@ je sv sv sv -sv +gd sv sv sv @@ -42572,7 +42704,7 @@ PP PP PP PP -sv +aJ sv sv sv @@ -42638,16 +42770,16 @@ sv sv sv sv +gd sv -sv -sv +PV sv sv qZ bw Hz sv -sv +gd Mv je sv @@ -42658,7 +42790,7 @@ sv sv sv sv -sv +lL sv sv sv @@ -42765,11 +42897,11 @@ PP PP PP PP +Qb sv sv sv -sv -sv +Zv sv sv sv @@ -42827,7 +42959,7 @@ sv sv sv sv -sv +gd sv sv sv @@ -42857,13 +42989,13 @@ sv sv sv sv +gd sv sv sv sv sv -sv -sv +gd sv sv sv @@ -43024,10 +43156,10 @@ sv sv sv sv +lL sv sv -sv -sv +PV sv sv sv @@ -43044,7 +43176,7 @@ sv sv sv sv -sv +gd sv sv sv @@ -43216,14 +43348,14 @@ Iu sv sv sv +MA +Ic sv sv sv +hi sv -sv -sv -sv -sv +gR bL qZ bw @@ -43240,8 +43372,8 @@ sv sv sv sv -sv -sv +PP +PP sv sv sv @@ -43417,7 +43549,7 @@ bL sv sv sv -sv +hi sv qZ bw @@ -43435,7 +43567,7 @@ sv sv sv sv -sv +PP sv sv sv @@ -43605,18 +43737,18 @@ TL TL TL TL +sv +dQ TL TL TL TL TL -TL -TL -TL -bw -bw -Hz sv +dQ +dQ +Hz +PV sv sv Me @@ -43799,17 +43931,17 @@ xC xC xC xC +dQ xC xC xC xC xC xC -xC -xC -bw -bw -Hz +sv +sv +dQ +sv sv sv sv @@ -43997,15 +44129,15 @@ sv sv bL sv -sv +hi sv sv sv qZ -bw -Hz sv sv +sv +gd Mv PJ sv @@ -44192,7 +44324,7 @@ sv sv sv sv -sv +nV sv bL qZ @@ -44780,7 +44912,7 @@ wm qZ bw ES -bL +qu dC or mC @@ -44978,7 +45110,7 @@ or we zL je -we +oE we we sv @@ -45168,11 +45300,11 @@ zL qZ bw ES -we +oE we zL je -we +oE we we we @@ -45362,10 +45494,11 @@ zL qZ bw ES -we +oE we zL je +oE we we we @@ -45381,10 +45514,9 @@ we we we we -we -sv sv sv +UR sv sv sv @@ -45556,11 +45688,11 @@ zL qZ bw ES -we +oE we zL je -we +oE we we we @@ -45750,11 +45882,11 @@ zL qZ bw ES -we +oE we zL je -we +oE we we we @@ -45944,11 +46076,11 @@ wm qZ bw ES -bL +qu we zL je -we +oE we we we @@ -46138,11 +46270,11 @@ zL qZ bw ES -we +oE we zL je -we +oE we we we @@ -46332,11 +46464,11 @@ zL qZ bw ES -we +oE we zL je -we +oE we we we @@ -46526,11 +46658,11 @@ zL qZ bw ES -we +oE we zL je -we +oE we we we @@ -46720,11 +46852,11 @@ zL qZ bw ES -we +oE we zL je -we +oE we we we @@ -46914,11 +47046,11 @@ zL qZ bw ES -we +oE we zL je -we +oE we we we @@ -47108,11 +47240,11 @@ wm qZ bw ES -bL +qu we zL je -we +oE we we we @@ -47302,11 +47434,11 @@ zL qZ bw ES -we +oE we zL je -we +oE we we we @@ -47496,11 +47628,11 @@ zL qZ bw ES -we +oE we zL je -we +oE we we we @@ -47690,11 +47822,11 @@ zL qZ bw ES -we +oE we zL je -we +oE we we we @@ -47884,11 +48016,11 @@ zL qZ bw ES -we +oE we zL je -we +oE we we we @@ -48078,11 +48210,11 @@ zL qZ bw ES -we +oE we zL je -we +oE we we we diff --git a/maps/rift/levels/rift-11-orbital.dmm b/maps/rift/levels/rift-11-orbital.dmm index 745b3cce20e9..a94b9ba5bc5e 100644 --- a/maps/rift/levels/rift-11-orbital.dmm +++ b/maps/rift/levels/rift-11-orbital.dmm @@ -8738,6 +8738,10 @@ }, /turf/simulated/shuttle/wall/voidcraft, /area/shuttle/specops/engine) +"Nq" = ( +/obj/effect/shuttle_landmark/transit/rift/oldcentury, +/turf/space/transit/south, +/area/space) "ND" = ( /obj/effect/step_trigger/lost_in_space, /turf/space, @@ -22153,46 +22157,46 @@ Bv Bv Bv Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP Bv "} (64,1,1) = {" @@ -22347,46 +22351,46 @@ Bv Bv Bv Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv +AP +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +AP Bv "} (65,1,1) = {" @@ -22541,46 +22545,46 @@ Bv Bv Bv Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv +AP +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +AP Bv "} (66,1,1) = {" @@ -22735,46 +22739,46 @@ Bv Bv Bv Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv +AP +Ve +Ve +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +Ve +Ve +AP Bv "} (67,1,1) = {" @@ -22929,46 +22933,46 @@ Bv Bv Bv Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv +AP +Ve +Ve +lc +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +lc +Ve +Ve +AP Bv "} (68,1,1) = {" @@ -23123,46 +23127,46 @@ Bv Bv Bv Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv +AP +Ve +Ve +lc +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +lc +Ve +Ve +AP Bv "} (69,1,1) = {" @@ -23317,46 +23321,46 @@ Bv Bv Bv Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv +AP +Ve +Ve +lc +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +lc +Ve +Ve +AP Bv "} (70,1,1) = {" @@ -23511,46 +23515,46 @@ Bv Bv Bv Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP +AP +Ve +Ve +lc +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +lc +Ve +Ve +AP hP "} (71,1,1) = {" @@ -23705,46 +23709,46 @@ Bv Bv Bv Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP +AP +Ve +Ve +lc +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +lc +Ve +Ve +AP hP "} (72,1,1) = {" @@ -23899,52 +23903,52 @@ Bv Bv Bv Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -"} -(73,1,1) = {" -hP -hP -hP +AP +Ve +Ve +lc +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +lc +Ve +Ve +AP +hP +"} +(73,1,1) = {" +hP +hP +hP hP hP hP @@ -24093,46 +24097,46 @@ Bv Bv Bv Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP +AP +Ve +Ve +lc +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +ig +ig +ig +ig +Ve +Ve +Ve +lc +Ve +Ve +AP hP "} (74,1,1) = {" @@ -24287,46 +24291,46 @@ Bv Bv Bv Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP +AP +Ve +Ve +lc +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +lc +Ve +Ve +AP hP "} (75,1,1) = {" @@ -24481,56 +24485,56 @@ Bv Bv Bv Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -"} -(76,1,1) = {" -hP -hP -hP -hP -hP -hP -hP +AP +Ve +Ve +lc +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +lc +Ve +Ve +AP +hP +"} +(76,1,1) = {" +hP +hP +hP +hP +hP +hP +hP hP hP hP @@ -24675,46 +24679,46 @@ Bv Bv Bv Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP +AP +Ve +Ve +lc +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +lc +Ve +Ve +AP hP "} (77,1,1) = {" @@ -24869,46 +24873,46 @@ Bv Bv Bv Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP +AP +Ve +Ve +lc +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Nq +Ve +Ve +Ve +Ve +Ve +Ve +lc +Ve +Ve +AP hP "} (78,1,1) = {" @@ -25063,46 +25067,46 @@ Bv Bv Bv Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP +AP +Ve +Ve +lc +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +lc +Ve +Ve +AP hP "} (79,1,1) = {" @@ -25257,46 +25261,46 @@ Bv Bv Bv Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP +AP +Ve +Ve +lc +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +lc +Ve +Ve +AP hP "} (80,1,1) = {" @@ -25451,46 +25455,46 @@ Bv Bv Bv Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP +AP +Ve +Ve +lc +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +lc +Ve +Ve +AP hP "} (81,1,1) = {" @@ -25637,54 +25641,54 @@ Bv Bv Bv Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP +Bv +Bv +Bv +Bv +Bv +Bv +Bv +Bv +AP +Ve +Ve +lc +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +lc +Ve +Ve +AP hP "} (82,1,1) = {" @@ -25839,46 +25843,46 @@ Bv Bv Bv Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP +AP +Ve +Ve +lc +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +lc +Ve +Ve +AP hP "} (83,1,1) = {" @@ -26033,46 +26037,46 @@ Bv Bv Bv Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP +AP +Ve +Ve +lc +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +lc +Ve +Ve +AP hP "} (84,1,1) = {" @@ -26227,46 +26231,46 @@ Bv Bv Bv Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP +AP +Ve +Ve +lc +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +lc +Ve +Ve +AP hP "} (85,1,1) = {" @@ -26421,46 +26425,46 @@ Bv Bv Bv Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP +AP +Ve +Ve +lc +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +lc +Ve +Ve +AP hP "} (86,1,1) = {" @@ -26615,46 +26619,46 @@ Bv Bv Bv Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP +AP +Ve +Ve +lc +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +lc +Ve +Ve +AP hP "} (87,1,1) = {" @@ -26809,46 +26813,46 @@ Bv Bv Bv Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP +AP +Ve +Ve +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +lc +Ve +Ve +AP hP "} (88,1,1) = {" @@ -27003,46 +27007,46 @@ Bv Bv Bv Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP +AP +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +AP hP "} (89,1,1) = {" @@ -27197,46 +27201,46 @@ Bv Bv Bv Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP +AP +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +Ve +AP hP "} (90,1,1) = {" @@ -27391,46 +27395,46 @@ Bv Bv Bv Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -Bv -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP -hP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP +AP hP "} (91,1,1) = {" diff --git a/maps/rift/rift.dm b/maps/rift/rift.dm index 533dfedac428..4ebef39ae00a 100644 --- a/maps/rift/rift.dm +++ b/maps/rift/rift.dm @@ -40,6 +40,7 @@ /datum/shuttle/autodock/overmap/emt, /datum/shuttle/autodock/ferry/supply/cargo, /datum/shuttle/autodock/ferry/belter, + /datum/shuttle/autodock/overmap/oldcentury, ) full_name = "NSB Atlas" use_overmap = TRUE diff --git a/maps/rift/shuttles.dm b/maps/rift/shuttles.dm index 40e1d5e90b2a..6759940649a3 100644 --- a/maps/rift/shuttles.dm +++ b/maps/rift/shuttles.dm @@ -135,6 +135,35 @@ name = "civilian jump console" shuttle_tag = "Civilian Transport" +// Civilian Century Shuttle + +/datum/shuttle/autodock/overmap/oldcentury + name = "Civilian Century Shuttle" + warmup_time = 15 + shuttle_area = /area/shuttle/oldcentury + current_location = "rift_oldcentury_pad" + docking_controller_tag = "oldcentury_docker" + landmark_transition = "nav_transit_oldcentury" + fuel_consumption = 8 + move_time = 37 + +/obj/overmap/entity/visitable/ship/landable/oldcentury + name = "Civilian Century Shuttle" + desc = "Is it... A replica ? Or... the real deal ? This shuttle, based on the shuttles from earth's old days. No teasing, this shuttle is a replica, but still a old and crapy ship." + fore_dir = NORTH + vessel_mass = 12000 + vessel_size = SHIP_SIZE_SMALL + shuttle = "Civilian Century Shuttle" + color = "#4cad73" //Greyish green + +/area/shuttle/oldcentury + name = "Civilian Century Shuttle" + icon_state = "shuttle" + +/obj/machinery/computer/shuttle_control/explore/oldcentury + name = "Century jump console" + shuttle_tag = "Civilian Century Shuttle" + //EMT Shuttle /datum/shuttle/autodock/overmap/emt name = "Dart EMT Shuttle" diff --git a/maps/sectors/frozen_192/levels/frozen_192.dmm b/maps/sectors/frozen_192/levels/frozen_192.dmm index 19aac97b65d8..96384fcd6485 100644 --- a/maps/sectors/frozen_192/levels/frozen_192.dmm +++ b/maps/sectors/frozen_192/levels/frozen_192.dmm @@ -948,6 +948,11 @@ icon_state = "tile_full" }, /area/class_p/unexplored) +"Wc" = ( +/obj/structure/table/standard, +/obj/item/clothing/mask/warmer, +/turf/simulated/floor/classp, +/area/class_p/unexplored) "Wr" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -31161,7 +31166,7 @@ yW at at Pr -cp +Wc yW iL iL diff --git a/maps/sectors/miaphus_192/levels/miaphus_192_beach.dmm b/maps/sectors/miaphus_192/levels/miaphus_192_beach.dmm index b4ee05195d45..eca836ffc2df 100644 --- a/maps/sectors/miaphus_192/levels/miaphus_192_beach.dmm +++ b/maps/sectors/miaphus_192/levels/miaphus_192_beach.dmm @@ -435,6 +435,15 @@ /obj/random/empty_or_lootable_crate, /turf/simulated/floor/tiled/steel_dirty, /area/tether_away/beach/desalinator) +"bI" = ( +/obj/effect/floor_decal/tracks/t_north{ + dir = 9 + }, +/obj/random/outcrop, +/turf/simulated/mineral/floor/cave{ + name = "dirt" + }, +/area/tether_away/beach/mineshaft) "bJ" = ( /obj/structure/undies_wardrobe{ density = 0; @@ -518,15 +527,6 @@ /obj/random/meat, /turf/simulated/floor/tiled/steel_dirty, /area/tether_away/beach/station) -"cp" = ( -/obj/effect/floor_decal/tracks{ - dir = 8 - }, -/obj/random/outcrop, -/turf/simulated/mineral/floor/cave{ - name = "dirt" - }, -/area/tether_away/beach/mineshaft) "cs" = ( /obj/structure/table/rack/shelf/steel, /obj/item/storage/box/wormcan, @@ -598,11 +598,6 @@ }, /turf/simulated/floor/water/deep, /area/tether_away/beach/aa) -"di" = ( -/obj/random/obstruction, -/obj/effect/floor_decal/tracks, -/turf/simulated/floor/wood, -/area/tether_away/beach/mineshaft) "dm" = ( /turf/simulated/floor/tiled/old_tile/white, /area/tether_away/beach/resort/lockermed) @@ -687,6 +682,19 @@ }, /turf/simulated/floor/tiled/steel_dirty, /area/tether_away/beach/desalinator) +"eh" = ( +/obj/spawner/window/full, +/obj/effect/floor_decal/tracks{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/tether_away/beach/resort/greenhouse) +"ej" = ( +/obj/effect/floor_decal/industrial/halfstair, +/turf/simulated/mineral/floor/cave{ + name = "dirt" + }, +/area/tether_away/beach/mineshaft) "el" = ( /obj/structure/filingcabinet/tall, /turf/simulated/floor/tiled/old_tile/white, @@ -802,16 +810,6 @@ }, /turf/simulated/floor/wood, /area/tether_away/beach/resort/bunk) -"eX" = ( -/obj/effect/floor_decal/tracks, -/turf/simulated/floor/wood, -/area/tether_away/beach/mineshaft) -"eZ" = ( -/obj/effect/floor_decal/industrial/halfstair{ - dir = 1 - }, -/turf/simulated/floor/tiled/asteroid_steel, -/area/tether_away/beach/desalinator) "fg" = ( /turf/simulated/floor/tiled/steel_dirty, /area/tether_away/beach/bunker/bunk) @@ -924,6 +922,12 @@ outdoors = 1 }, /area/tether_away/beach/station/terminal) +"ga" = ( +/obj/effect/floor_decal/tracks/intersection{ + dir = 9 + }, +/turf/simulated/floor/wood, +/area/tether_away/beach/mineshaft) "gc" = ( /obj/machinery/light/small, /mob/living/simple_mob/animal/roach/jaeger, @@ -933,13 +937,6 @@ /obj/structure/simple_door/sandstone, /turf/simulated/floor/tiled/asteroid_steel, /area/tether_away/beach/resort/greenhouse) -"gf" = ( -/obj/spawner/window/full, -/obj/effect/floor_decal/tracks{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/tether_away/beach/resort/greenhouse) "gq" = ( /turf/simulated/floor/wood, /area/tether_away/beach/desalinator) @@ -962,12 +959,6 @@ /obj/structure/bed/chair/wood, /turf/simulated/floor/wood, /area/tether_away/beach/resort/canteen) -"gC" = ( -/obj/effect/floor_decal/industrial/halfstair{ - dir = 8 - }, -/turf/simulated/floor/tiled/asteroid_steel, -/area/tether_away/beach/desalinator) "gF" = ( /obj/structure/closet/secure_closet/freezer/meat, /obj/random/mre, @@ -1075,6 +1066,17 @@ /obj/item/clothing/gloves/boxing/blue, /turf/simulated/floor/carpet/sblucarpet, /area/tether_away/beach/bunker/mess) +"hu" = ( +/obj/structure/barricade, +/obj/effect/floor_decal/tracks, +/turf/simulated/floor/wood, +/area/tether_away/beach/mineshaft) +"hv" = ( +/obj/effect/floor_decal/tracks{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/tether_away/beach/mineshaft) "hx" = ( /obj/structure/table/wooden_reinforced, /turf/simulated/floor/wood, @@ -1379,15 +1381,6 @@ }, /turf/simulated/floor/tiled/steel_dirty, /area/tether_away/beach/station/tram) -"jw" = ( -/obj/effect/floor_decal/tracks/t_north{ - dir = 9 - }, -/obj/machinery/floodlight, -/turf/simulated/mineral/floor/cave{ - name = "dirt" - }, -/area/tether_away/beach/mineshaft) "jx" = ( /obj/structure/cable/cyan{ icon_state = "0-2" @@ -1413,12 +1406,6 @@ name = "dirt" }, /area/tether_away/beach/mineshaft) -"jJ" = ( -/obj/effect/floor_decal/industrial/halfstair{ - dir = 8 - }, -/turf/simulated/floor/outdoors/beach/sand/desert, -/area/tether_away/beach/desalinator) "jM" = ( /obj/effect/floor_decal/tracks{ dir = 1 @@ -1477,14 +1464,6 @@ /obj/random/multiple/underdark/miningdrills, /turf/simulated/floor/tiled/steel_dirty, /area/tether_away/beach/station) -"kj" = ( -/obj/effect/floor_decal/tracks{ - dir = 8 - }, -/obj/structure/closet/crate/miningcar, -/obj/random/multiple/underdark/ores, -/turf/simulated/floor/wood, -/area/tether_away/beach/mineshaft) "kk" = ( /obj/structure/closet/crate, /obj/item/melee/umbrella/random, @@ -1541,12 +1520,6 @@ /obj/random/mre, /turf/simulated/floor/tiled/steel_dirty, /area/tether_away/beach/bunker/bunk) -"kE" = ( -/obj/effect/floor_decal/tracks/intersection{ - dir = 9 - }, -/turf/simulated/floor/wood, -/area/tether_away/beach/mineshaft) "kK" = ( /obj/machinery/light/small, /turf/simulated/floor/wood/broken, @@ -1600,12 +1573,6 @@ }, /turf/simulated/floor/wood/broken, /area/tether_away/beach/resort/dorm2) -"la" = ( -/obj/effect/floor_decal/industrial/halfstair, -/turf/simulated/mineral/floor/cave{ - name = "dirt" - }, -/area/tether_away/beach/mineshaft) "le" = ( /turf/simulated/floor/water/beach{ dir = 5 @@ -2029,6 +1996,10 @@ "pq" = ( /turf/simulated/floor/water/beach/corner, /area/tether_away/beach/jungle) +"pt" = ( +/obj/structure/sign/signnew/danger, +/turf/simulated/wall/wood, +/area/tether_away/beach/mineshaft) "pu" = ( /obj/structure/bed/chair/sofa/beige/right{ dir = 1 @@ -2042,15 +2013,6 @@ outdoors = 1 }, /area/tether_away/beach/mineyard) -"px" = ( -/obj/effect/floor_decal/tracks/t_north{ - dir = 9 - }, -/obj/random/outcrop, -/turf/simulated/mineral/floor/cave{ - name = "dirt" - }, -/area/tether_away/beach/mineshaft) "py" = ( /obj/structure/cable{ icon_state = "4-8" @@ -2152,15 +2114,6 @@ name = "dirt" }, /area/tether_away/beach/jungle) -"qp" = ( -/obj/effect/floor_decal/tracks{ - dir = 8 - }, -/obj/structure/barricade, -/turf/simulated/mineral/floor/cave{ - name = "dirt" - }, -/area/tether_away/beach/mineshaft) "qq" = ( /obj/machinery/light/small, /turf/simulated/floor/tiled/steel_dirty, @@ -2322,14 +2275,6 @@ }, /turf/simulated/floor/wood, /area/tether_away/beach/resort/dorm1) -"rM" = ( -/obj/effect/floor_decal/industrial/halfstair{ - dir = 1 - }, -/turf/simulated/floor/tiled/asteroid_steel{ - outdoors = 1 - }, -/area/tether_away/beach/resort) "rP" = ( /obj/structure/railing/grey{ dir = 1 @@ -2821,6 +2766,24 @@ }, /turf/simulated/floor/tiled/steel_dirty, /area/tether_away/beach/bunker) +"vD" = ( +/obj/effect/floor_decal/tracks{ + dir = 8 + }, +/obj/structure/table/rack/steel, +/obj/item/pickaxe, +/obj/item/pickaxe, +/obj/item/pickaxe, +/obj/item/storage/bag/ore, +/obj/item/storage/bag/ore, +/obj/item/storage/bag/ore, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/obj/item/flashlight/lantern, +/turf/simulated/mineral/floor/cave{ + name = "dirt" + }, +/area/tether_away/beach/mineshaft) "vG" = ( /obj/machinery/door/airlock/maintenance/int{ name = "Kitchen Access" @@ -2882,6 +2845,12 @@ name = "dirt" }, /area/tether_away/beach/mineshaft) +"wh" = ( +/obj/effect/floor_decal/tracks/t_north{ + dir = 9 + }, +/turf/simulated/wall/wood, +/area/tether_away/beach/mineshaft) "wi" = ( /obj/machinery/light/small{ dir = 4 @@ -3015,6 +2984,14 @@ /obj/spawner/window/full, /turf/simulated/floor/plating, /area/tether_away/beach/resort/greenhouse) +"xn" = ( +/obj/effect/floor_decal/tracks{ + dir = 8 + }, +/obj/structure/closet/crate/miningcar, +/obj/random/multiple/underdark/ores, +/turf/simulated/floor/wood, +/area/tether_away/beach/mineshaft) "xs" = ( /obj/structure/cable{ icon_state = "1-2" @@ -3119,6 +3096,15 @@ "yg" = ( /turf/simulated/wall, /area/tether_away/beach/station/tunnel) +"ym" = ( +/obj/effect/floor_decal/tracks{ + dir = 8 + }, +/obj/random/outcrop, +/turf/simulated/mineral/floor/cave{ + name = "dirt" + }, +/area/tether_away/beach/mineshaft) "yu" = ( /obj/machinery/light/small, /turf/simulated/floor/wood/broken, @@ -3159,6 +3145,14 @@ }, /turf/simulated/floor/tiled/steel_dirty, /area/tether_away/beach/desalinator) +"yK" = ( +/obj/effect/floor_decal/industrial/halfstair{ + dir = 1 + }, +/turf/simulated/floor/tiled/asteroid_steel{ + outdoors = 1 + }, +/area/tether_away/beach/resort) "yO" = ( /turf/simulated/wall/r_wall, /area/tether_away/beach/bunker/janitor) @@ -3301,15 +3295,6 @@ }, /turf/simulated/floor/tiled/asteroid_steel, /area/tether_away/beach/resort/greenhouse) -"Av" = ( -/obj/effect/floor_decal/tracks/t_north{ - dir = 9 - }, -/obj/machinery/light/flamp/noshade, -/turf/simulated/mineral/floor/cave{ - name = "dirt" - }, -/area/tether_away/beach/mineshaft) "Aw" = ( /obj/item/stool/padded, /turf/simulated/mineral/floor/cave{ @@ -3673,11 +3658,6 @@ /obj/structure/toilet, /turf/simulated/floor/tiled/asteroid_steel, /area/tether_away/beach/resort) -"DZ" = ( -/obj/structure/barricade, -/obj/effect/floor_decal/tracks, -/turf/simulated/floor/wood, -/area/tether_away/beach/mineshaft) "Ed" = ( /turf/simulated/floor/water/contaminated{ outdoors = 0 @@ -3819,24 +3799,6 @@ /obj/machinery/vending/fishing, /turf/simulated/floor/wood, /area/tether_away/beach/resort/fishing) -"Fh" = ( -/obj/effect/floor_decal/tracks{ - dir = 8 - }, -/obj/structure/table/rack/steel, -/obj/item/pickaxe, -/obj/item/pickaxe, -/obj/item/pickaxe, -/obj/item/storage/bag/ore, -/obj/item/storage/bag/ore, -/obj/item/storage/bag/ore, -/obj/item/flashlight/lantern, -/obj/item/flashlight/lantern, -/obj/item/flashlight/lantern, -/turf/simulated/mineral/floor/cave{ - name = "dirt" - }, -/area/tether_away/beach/mineshaft) "Fm" = ( /obj/structure/cable{ icon_state = "4-8" @@ -3920,6 +3882,15 @@ /obj/item/flashlight/color, /turf/simulated/floor/tiled/old_tile/white, /area/tether_away/beach/resort/lockermed) +"Gg" = ( +/obj/effect/floor_decal/tracks{ + dir = 8 + }, +/obj/structure/barricade, +/turf/simulated/mineral/floor/cave{ + name = "dirt" + }, +/area/tether_away/beach/mineshaft) "Gi" = ( /obj/machinery/door/airlock/sandstone{ id_tag = "LoveShack3" @@ -4082,6 +4053,12 @@ /obj/item/flashlight/lantern, /turf/simulated/floor/tiled/asteroid_steel, /area/tether_away/beach/mineyard) +"HF" = ( +/obj/effect/floor_decal/industrial/halfstair{ + dir = 1 + }, +/turf/simulated/floor/tiled/asteroid_steel, +/area/tether_away/beach/desalinator) "HH" = ( /obj/structure/cable/cyan, /obj/machinery/power/apc/alarms_hidden/west_mount, @@ -4162,6 +4139,12 @@ /obj/structure/reagent_dispensers/water_cooler/full, /turf/simulated/floor/wood, /area/tether_away/beach/desalinator) +"Ir" = ( +/obj/effect/floor_decal/industrial/halfstair{ + dir = 8 + }, +/turf/simulated/floor/outdoors/beach/sand/desert, +/area/tether_away/beach/desalinator) "Iu" = ( /obj/machinery/light/small{ dir = 1 @@ -4259,6 +4242,15 @@ /obj/effect/overlay/coconut, /turf/simulated/floor/outdoors/beach/sand/lowdesert, /area/tether_away/beach/jungle) +"JC" = ( +/obj/effect/floor_decal/tracks/t_north{ + dir = 9 + }, +/obj/machinery/light/flamp/noshade, +/turf/simulated/mineral/floor/cave{ + name = "dirt" + }, +/area/tether_away/beach/mineshaft) "JD" = ( /obj/structure/loot_pile/maint/trash, /turf/simulated/mineral/floor/cave{ @@ -4393,6 +4385,15 @@ "KN" = ( /turf/simulated/wall/wood, /area/tether_away/beach/coast) +"KQ" = ( +/obj/effect/floor_decal/tracks/t_north{ + dir = 9 + }, +/obj/machinery/floodlight, +/turf/simulated/mineral/floor/cave{ + name = "dirt" + }, +/area/tether_away/beach/mineshaft) "KR" = ( /obj/structure/bed/chair/bay, /turf/simulated/floor/wood/broken, @@ -4416,10 +4417,6 @@ name = "dirt" }, /area/tether_away/beach/mineshaft) -"KX" = ( -/obj/structure/sign/signnew/danger, -/turf/simulated/wall/wood, -/area/tether_away/beach/mineshaft) "Le" = ( /obj/structure/fence, /turf/simulated/floor/tiled/asteroid_steel{ @@ -4806,6 +4803,18 @@ outdoors = 1 }, /area/tether_away/beach/station/tram) +"Oz" = ( +/obj/structure/reagent_dispensers/coolanttank, +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + desc = "Its bone dry."; + name = "water pipe" + }, +/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ + desc = "Its bone dry."; + name = "water pipe" + }, +/turf/simulated/floor/tiled/steel_dirty, +/area/tether_away/beach/desalinator) "OE" = ( /obj/machinery/power/apc/alarms_hidden/north_mount, /obj/structure/cable{ @@ -4910,6 +4919,12 @@ outdoors = 1 }, /area/tether_away/beach/mineyard) +"PP" = ( +/obj/effect/floor_decal/industrial/halfstair{ + dir = 8 + }, +/turf/simulated/floor/tiled/asteroid_steel, +/area/tether_away/beach/desalinator) "PQ" = ( /obj/structure/toilet{ dir = 1 @@ -5314,12 +5329,6 @@ }, /turf/simulated/floor/tiled/steel_dirty, /area/tether_away/beach/bunker) -"Td" = ( -/obj/effect/floor_decal/tracks{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/tether_away/beach/mineshaft) "Tg" = ( /obj/machinery/door/blast/shutters{ dir = 2; @@ -5667,6 +5676,11 @@ }, /turf/simulated/floor/tiled/asteroid_steel, /area/tether_away/beach/resort/greenhouse) +"Xa" = ( +/obj/random/obstruction, +/obj/effect/floor_decal/tracks, +/turf/simulated/floor/wood, +/area/tether_away/beach/mineshaft) "Xd" = ( /turf/simulated/floor/water/deep/indoors, /area/tether_away/beach/water) @@ -5825,6 +5839,10 @@ outdoors = 1 }, /area/tether_away/beach/aa) +"YQ" = ( +/obj/effect/floor_decal/tracks, +/turf/simulated/floor/wood, +/area/tether_away/beach/mineshaft) "YR" = ( /obj/structure/cable/cyan{ icon_state = "1-2" @@ -5932,30 +5950,12 @@ /mob/living/simple_mob/animal/roach/jaeger, /turf/simulated/floor/tiled/steel_dirty, /area/tether_away/beach/desalinator) -"ZQ" = ( -/obj/structure/reagent_dispensers/coolanttank, -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - desc = "Its bone dry."; - name = "water pipe" - }, -/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ - desc = "Its bone dry."; - name = "water pipe" - }, -/turf/simulated/floor/tiled/steel_dirty, -/area/tether_away/beach/desalinator) "ZS" = ( /obj/structure/loot_pile/mecha/ripley/random_sprite, /turf/simulated/mineral/floor/cave{ name = "dirt" }, /area/tether_away/beach/mineshaft) -"ZW" = ( -/obj/effect/floor_decal/tracks/t_north{ - dir = 9 - }, -/turf/simulated/wall/wood, -/area/tether_away/beach/mineshaft) "ZX" = ( /obj/structure/cable/cyan{ icon_state = "1-8" @@ -7725,7 +7725,7 @@ ZC ZC ZC Wd -kj +xn Wd ZC ZC @@ -8106,16 +8106,16 @@ Cg an aL Wd -cp +ym aL aL -Av +JC Wd aL aL aG aL -jw +KQ ZC ZC ZC @@ -8310,8 +8310,8 @@ PV aG PV PV -qp -KX +Gg +pt fQ PV PV @@ -8492,26 +8492,26 @@ Cg "} (14,1,1) = {" an -eX -eX -eX -eX -eX -eX -eX -eX -eX -kE -eX -eX -DZ -di -di -di -eX -eX -eX -di +YQ +YQ +YQ +YQ +YQ +YQ +YQ +YQ +YQ +ga +YQ +YQ +hu +Xa +Xa +Xa +YQ +YQ +YQ +Xa au au xy @@ -8695,11 +8695,11 @@ PV PV PV PV -Td +hv aL xy -qp -KX +Gg +pt au xy wg @@ -8884,12 +8884,12 @@ PV Wd PV PV -cp +ym PV Wd aL aL -Td +hv aL aL ZC @@ -9082,8 +9082,8 @@ ZC ZC ZC ZC -px -Td +bI +hv aL ZC ZC @@ -9277,7 +9277,7 @@ ZC ZC ZC Wd -Td +hv Wd ZC ZC @@ -9471,8 +9471,8 @@ ZC ZC ZC aL -Td -Av +hv +JC ZC ZC zV @@ -9665,7 +9665,7 @@ ZC ZC ZC aL -Td +hv aL ZC ZC @@ -9859,7 +9859,7 @@ ZC ZC ZC aL -Td +hv aL ZC ZC @@ -10052,9 +10052,9 @@ ZC ZC ZC ZC -ZW -Td -ZW +wh +hv +wh ZC ZC zV @@ -10247,7 +10247,7 @@ ZC ZC ZC aL -Td +hv aL ZC ZC @@ -10441,7 +10441,7 @@ ZC ZC ZC aL -Td +hv aL ZC ZC @@ -10634,8 +10634,8 @@ ZC ZC ZC ZC -px -Td +bI +hv aL ZC ZC @@ -10829,8 +10829,8 @@ ZC ZC ZC aL -Td -Av +hv +JC ZC ZC zV @@ -11023,7 +11023,7 @@ ZC ZC ZC Wd -Td +hv Wd ZC ZC @@ -11217,7 +11217,7 @@ ZC ZC ZC aL -Td +hv aL ZC ZC @@ -11308,7 +11308,7 @@ ZC JX aG av -la +ej xy xy xy @@ -11411,7 +11411,7 @@ ZC ZC ZC aL -Td +hv aL ZC ZC @@ -11605,8 +11605,8 @@ ZC ZC ZC PV -Td -cp +hv +ym ZC ZC TK @@ -11696,7 +11696,7 @@ ZC ZC ZC av -la +ej xy xy xy @@ -11799,7 +11799,7 @@ ZC ZC ZC Wd -Td +hv Wd ZC bq @@ -11992,8 +11992,8 @@ ZC ZC ZC ZC -Fh -Td +vD +hv aL ZC bq @@ -12187,7 +12187,7 @@ ZC ZC ZC PV -Td +hv aL ZC bq @@ -23534,7 +23534,7 @@ RD as RD Kq -gf +eh zw zw Nv @@ -32476,8 +32476,8 @@ oW oW fP xZ -jJ -jJ +Ir +Ir jh gM oW @@ -32656,7 +32656,7 @@ zw zw zw zw -rM +yK aK aK aK @@ -32850,7 +32850,7 @@ zw zw zw zw -rM +yK aK aK aK @@ -33060,8 +33060,8 @@ QW aK pd yf -gC -gC +PP +PP yf yf yf @@ -33253,7 +33253,7 @@ ak Hx aK aK -eZ +HF NQ NQ pA @@ -33447,7 +33447,7 @@ ak SM aK aK -eZ +HF NQ NQ pA @@ -34358,7 +34358,7 @@ aa aa aa aa -aa +Dr aa aa aa @@ -35015,7 +35015,7 @@ ry ry CG CG -ZQ +Oz yf xe yf @@ -35522,7 +35522,7 @@ aa aa aa aa -Dr +aa aa aa aa diff --git a/maps/sectors/piratebase_192/levels/piratebase_192.dmm b/maps/sectors/piratebase_192/levels/piratebase_192.dmm index 2121c4b02e22..adb8f29930a7 100644 --- a/maps/sectors/piratebase_192/levels/piratebase_192.dmm +++ b/maps/sectors/piratebase_192/levels/piratebase_192.dmm @@ -19983,11 +19983,11 @@ Tg Tg Tg Tg -FU Tg Tg Tg Tg +FU Tg Tg Tg @@ -35115,7 +35115,6 @@ Tg Tg Tg Tg -FU Tg Tg Tg @@ -35125,6 +35124,7 @@ Tg Tg Tg Tg +FU Tg Tg Tg diff --git a/maps/sectors/tradeport/shuttles.dm b/maps/sectors/tradeport/shuttles.dm index 4c74558d4d93..73c3f103f4e3 100644 --- a/maps/sectors/tradeport/shuttles.dm +++ b/maps/sectors/tradeport/shuttles.dm @@ -30,37 +30,3 @@ /area/shuttle/trade_ship/cockpit name = "\improper Beruang Trade Shuttle Cockpit" - -// Tradeport Off-Map Visitor shuttle -/datum/shuttle/autodock/overmap/visitor_ship - name = "Beluga Passenger Liner" - warmup_time = 10 - shuttle_area = list(/area/shuttle/visitor_ship/general, /area/shuttle/visitor_ship/cockpit) - current_location = "nebula_pad_3" - docking_controller_tag = "visitor_space_lock" - fuel_consumption = 10 - move_time = 10 - -/obj/overmap/entity/visitable/ship/landable/visitor_ship - name = "Beluga Passenger Liner" - desc = "You know our motto: 'Right place right time!'" - color = "#754116" //Brown - fore_dir = WEST - vessel_mass = 10000 - vessel_size = SHIP_SIZE_SMALL - shuttle = "Beluga Passenger Liner" - -/obj/machinery/computer/shuttle_control/explore/visitor_ship - name = "short jump console" - shuttle_tag = "Beluga Passenger Liner" - -/area/shuttle/visitor_ship - requires_power = 1 - icon_state = "shuttle2" - area_flags = AREA_RAD_SHIELDED - -/area/shuttle/visitor_ship/general - name = "\improper Beluga Passenger Liner" - -/area/shuttle/visitor_ship/cockpit - name = "\improper Beluga Passenger Liner Cockpit" diff --git a/maps/sectors/tradeport_192/levels/tradeport_192.dmm b/maps/sectors/tradeport_192/levels/tradeport_192.dmm index 579a4ac3a25c..0fb7c51fbd46 100644 --- a/maps/sectors/tradeport_192/levels/tradeport_192.dmm +++ b/maps/sectors/tradeport_192/levels/tradeport_192.dmm @@ -312,6 +312,13 @@ }, /turf/simulated/floor/tiled/old_tile/blue, /area/tradeport/spine) +"bb" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 + }, +/obj/effect/paint/wallgunmetal, +/turf/simulated/wall/rshull, +/area/shuttle/trade_ship/general) "bc" = ( /turf/simulated/wall/r_wall, /area/tradeport/spine) @@ -396,12 +403,6 @@ /obj/item/reagent_containers/glass/bucket, /turf/simulated/floor/grass, /area/tradeport) -"br" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5 - }, -/turf/simulated/shuttle/wall/voidcraft, -/area/shuttle/trade_ship/general) "bs" = ( /obj/structure/railing{ dir = 4 @@ -519,6 +520,17 @@ }, /turf/simulated/mineral/floor/vacuum, /area/tradeport/atmospherics) +"bV" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/firedoor, +/obj/structure/catwalk, +/turf/simulated/floor, +/area/tradeport/pads) "bW" = ( /obj/structure/closet/crate/bin{ anchored = 1 @@ -712,10 +724,6 @@ }, /turf/simulated/floor/wood, /area/tradeport/commons) -"cF" = ( -/obj/machinery/atmospherics/pipe/manifold4w/hidden, -/turf/simulated/shuttle/wall/voidcraft, -/area/shuttle/trade_ship/general) "cG" = ( /obj/machinery/portable_atmospherics/canister/phoron, /obj/machinery/light/small{ @@ -1071,6 +1079,13 @@ }, /turf/simulated/floor/tiled/neutral, /area/tradeport/facility) +"dQ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/universal{ + dir = 4 + }, +/obj/effect/paint/wallgunmetal, +/turf/simulated/wall/rshull, +/area/shuttle/trade_ship/general) "dR" = ( /obj/machinery/vending/snack{ name = "hacked Getmore Chocolate Corp"; @@ -1235,6 +1250,13 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tradeport/engineering) +"ev" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/effect/paint/wallgunmetal, +/turf/simulated/wall/rshull, +/area/shuttle/trade_ship/general) "ew" = ( /obj/structure/railing{ dir = 8 @@ -1292,6 +1314,20 @@ /obj/structure/table/bench/steel, /turf/simulated/floor/tiled/old_tile/red, /area/tradeport) +"eH" = ( +/obj/machinery/access_button{ + command = "cycle_int"; + frequency = 8018; + master_tag = "trade_space_lock"; + pixel_x = -25; + pixel_y = -5 + }, +/obj/machinery/door/airlock/glass_external{ + name = "Ship Hatch" + }, +/obj/map_helper/airlock/door/int_door, +/turf/simulated/floor/tiled/dark, +/area/shuttle/trade_ship/general) "eI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -1369,6 +1405,22 @@ }, /turf/simulated/floor/wood, /area/shuttle/trade_ship/general) +"eV" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/catwalk, +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + frequency = 1380; + id_tag = "nebula_pump3d"; + name = "Nebula Pump Controller"; + pixel_x = -25 + }, +/turf/simulated/floor, +/area/tradeport/pads) "eW" = ( /obj/structure/window/reinforced, /obj/machinery/door/blast/shutters{ @@ -1576,6 +1628,14 @@ /obj/structure/flora/grass/brown, /turf/simulated/floor/snow, /area/tradeport/cyndishow) +"fJ" = ( +/obj/machinery/vending/assist{ + contraband = null; + name = "Old Vending Machine"; + products = list(/obj/item/assembly/prox_sensor = 5, /obj/item/assembly/signaler = 4, /obj/item/assembly/infra = 4, /obj/item/assembly/prox_sensor = 4, /obj/item/handcuffs = 8, /obj/item/flash = 4, /obj/item/cartridge/signal = 4, /obj/item/clothing/glasses/sunglasses = 4) + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/trade_ship/cockpit) "fK" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/biogenerator, @@ -1679,6 +1739,14 @@ }, /turf/simulated/floor/carpet/blue, /area/tradeport/commons) +"gb" = ( +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + frequency = 8018; + id_tag = "trade_space_lock"; + pixel_x = -25 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/trade_ship/general) "gc" = ( /obj/structure/window/reinforced{ dir = 1 @@ -1708,6 +1776,13 @@ }, /turf/simulated/floor/tiled/dark, /area/shuttle/trade_ship/general) +"gf" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9 + }, +/obj/effect/paint/wallgunmetal, +/turf/simulated/wall/rshull, +/area/shuttle/trade_ship/general) "gg" = ( /turf/simulated/floor/tiled/old_tile/blue, /area/tradeport/spine) @@ -1798,19 +1873,27 @@ }, /turf/simulated/floor/tiled/dark, /area/shuttle/trade_ship/general) -"gs" = ( -/obj/machinery/embedded_controller/radio/simple_docking_controller{ - frequency = 1380; - id_tag = "nebula_pump3"; - name = "Nebula Pump Controller"; - pixel_x = 25 - }, +"gu" = ( /obj/machinery/light{ - dir = 4 + dir = 1 }, -/obj/machinery/atmospherics/portables_connector, -/turf/simulated/floor/reinforced, -/area/tradeport/pads) +/obj/item/radio/intercom/trader{ + dir = 1; + pixel_y = 25 + }, +/obj/structure/closet/crate, +/obj/fiftyspawner/bcarpet, +/obj/fiftyspawner/blucarpet, +/obj/fiftyspawner/arcadecarpet, +/obj/fiftyspawner/carpet, +/obj/fiftyspawner/gaycarpet, +/obj/fiftyspawner/oracarpet, +/obj/fiftyspawner/purcarpet, +/obj/fiftyspawner/sblucarpet, +/obj/fiftyspawner/tealcarpet, +/obj/fiftyspawner/turcarpet, +/turf/simulated/floor/tiled/dark, +/area/tradeport/facility) "gv" = ( /obj/machinery/light, /turf/simulated/floor/tiled/neutral, @@ -1855,23 +1938,6 @@ /obj/item/contraband/poster, /turf/simulated/floor/wood, /area/tradeport/cyndi) -"gH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/airlock/multi_tile/glass{ - name = "Nebula Gas - Employees Only"; - req_access = list(160); - req_one_access = null - }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/door/firedoor{ - req_one_access = list(160) - }, -/turf/simulated/floor/tiled/neutral, -/area/tradeport) "gJ" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -1922,6 +1988,22 @@ }, /turf/simulated/floor/tiled/neutral, /area/tradeport/commons) +"gS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/airlock/multi_tile/glass{ + name = "Nebula Gas - Employees Only"; + req_access = list(160) + }, +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/door/firedoor{ + req_one_access = list(160) + }, +/turf/simulated/floor/tiled/neutral, +/area/tradeport) "gU" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -1942,18 +2024,6 @@ /obj/machinery/meter, /turf/simulated/floor/plating, /area/tradeport/pads) -"gW" = ( -/obj/machinery/embedded_controller/radio/simple_docking_controller{ - frequency = 1380; - id_tag = "nebula_pump2"; - name = "Nebula Pump Controller"; - pixel_x = -25 - }, -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/reinforced, -/area/tradeport/pads) "gX" = ( /obj/effect/floor_decal/industrial/outline/grey, /obj/structure/closet/crate, @@ -2038,13 +2108,6 @@ }, /turf/simulated/floor/tiled/dark, /area/shuttle/trade_ship/general) -"hm" = ( -/obj/machinery/camera{ - dir = 8 - }, -/obj/structure/catwalk, -/turf/simulated/floor, -/area/tradeport/pads) "hn" = ( /obj/effect/shuttle_landmark{ base_area = /area/space; @@ -2103,22 +2166,31 @@ /obj/machinery/vending/coffee, /turf/simulated/floor/tiled/old_tile/gray, /area/shuttle/trade_ship/general) +"hC" = ( +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + frequency = 1380; + id_tag = "nebula_pump1b"; + name = "Nebula Pump Controller"; + pixel_x = 25 + }, +/turf/simulated/floor/reinforced, +/area/tradeport/pads) "hD" = ( /obj/structure/cryofeed{ dir = 4 }, /turf/simulated/floor/tiled/techfloor/grid, /area/tradeport/commons) +"hF" = ( +/obj/structure/table/steel_reinforced, +/obj/fiftyspawner/wmarble, +/obj/fiftyspawner/bmarble, +/turf/simulated/floor/tiled/dark, +/area/tradeport/facility) "hJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/neutral, /area/tradeport/facility) -"hK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10 - }, -/turf/simulated/shuttle/wall/voidcraft, -/area/shuttle/trade_ship/general) "hL" = ( /obj/structure/table/rack/shelf/steel, /obj/machinery/light, @@ -2302,6 +2374,16 @@ }, /turf/simulated/floor/tiled/neutral, /area/tradeport/commons) +"it" = ( +/obj/effect/shuttle_landmark{ + base_area = /area/tradeport/pads; + base_turf = /turf/simulated/floor/reinforced; + docking_controller = "nebula_pump3d"; + landmark_tag = "nebula_pad_3d"; + name = "Nebula Pad 3d" + }, +/turf/simulated/floor/reinforced, +/area/tradeport/pads) "iu" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -2339,12 +2421,6 @@ }, /turf/simulated/floor/wood, /area/tradeport/cafeteria) -"iz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 6 - }, -/turf/simulated/shuttle/wall/voidcraft, -/area/shuttle/trade_ship/general) "iA" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -3018,12 +3094,6 @@ }, /turf/simulated/shuttle/floor/white, /area/tradeport/commons) -"kI" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 1 - }, -/turf/simulated/shuttle/wall/voidcraft, -/area/shuttle/trade_ship/general) "kJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -3353,6 +3423,13 @@ }, /turf/simulated/floor, /area/tradeport/pads) +"lN" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 8 + }, +/obj/effect/paint/wallgunmetal, +/turf/simulated/wall/rshull, +/area/shuttle/trade_ship/general) "lO" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 @@ -3432,15 +3509,6 @@ }, /turf/simulated/floor/tiled/dark, /area/shuttle/trade_ship/cockpit) -"md" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - dir = 4; - name = "Nebula Commercial District"; - req_access = null - }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/old_tile/blue, -/area/tradeport) "mf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/old_tile/purple, @@ -3476,6 +3544,15 @@ }, /turf/simulated/floor/tiled/old_tile/yellow, /area/tradeport/safari) +"mj" = ( +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + frequency = 1380; + id_tag = "nebula_pump5b"; + name = "Nebula Pump Controller"; + pixel_x = 25 + }, +/turf/simulated/floor/reinforced, +/area/tradeport/pads) "ml" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -3575,6 +3652,11 @@ /obj/random/paintkit, /turf/simulated/floor/tiled/dark, /area/shuttle/trade_ship/general) +"mE" = ( +/obj/machinery/door/firedoor, +/obj/structure/catwalk, +/turf/simulated/floor, +/area/tradeport/pads) "mF" = ( /obj/structure/table/rack/shelf/steel, /obj/item/syndie/c4explosive, @@ -3606,6 +3688,15 @@ }, /turf/simulated/floor/tiled/old_tile/red, /area/tradeport) +"mI" = ( +/obj/machinery/vending/sovietsoda{ + contraband = list(/obj/item/reagent_containers/food/drinks/cans/crystalgibb = 20); + desc = "An old sweet water vending machine. It looks like someone crossed out the D and replaced it with an F."; + name = "BOFA"; + products = list(/obj/item/reagent_containers/food/drinks/cans/thirteenloko = 20) + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/trade_ship/general) "mJ" = ( /turf/simulated/floor/tiled/hydro, /area/tradeport/cyndishow) @@ -3714,6 +3805,18 @@ }, /turf/simulated/floor/tiled/dark, /area/tradeport/facility) +"nc" = ( +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + frequency = 1380; + id_tag = "nebula_pump1a"; + name = "Nebula Pump Controller"; + pixel_x = 25 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/reinforced, +/area/tradeport/pads) "nd" = ( /obj/effect/floor_decal/techfloor{ dir = 4 @@ -3793,14 +3896,6 @@ /obj/structure/flora/tree/jungle_small, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/tradeport/safarizoo) -"ns" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - dir = 4; - name = "Nebula Commercial District"; - req_access = null - }, -/turf/simulated/floor/tiled/old_tile/red, -/area/tradeport) "nt" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -3824,18 +3919,16 @@ /obj/item/reagent_containers/food/condiment/enzyme, /turf/simulated/floor/wmarble, /area/tradeport/cafeteria) +"nv" = ( +/obj/effect/paint/purple, +/turf/simulated/wall/rshull, +/area/shuttle/trade_ship/general) "nw" = ( /obj/structure/closet/walllocker/autolok_wall{ pixel_y = 24 }, /turf/simulated/floor/tiled/dark, /area/shuttle/trade_ship/cockpit) -"nB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/turf/simulated/shuttle/wall/voidcraft, -/area/shuttle/trade_ship/general) "nC" = ( /obj/effect/floor_decal/industrial/warning, /obj/structure/largecrate/vehicle/bike, @@ -3889,12 +3982,6 @@ }, /turf/simulated/floor/wood, /area/tradeport) -"nM" = ( -/obj/machinery/holosign/bar{ - id = "tradersign" - }, -/turf/simulated/shuttle/wall/voidcraft/hard_corner, -/area/shuttle/trade_ship/general) "nO" = ( /obj/machinery/atmospherics/component/binary/pump/high_power/on{ dir = 8; @@ -3979,17 +4066,6 @@ }, /turf/simulated/floor/tiled/dark, /area/tradeport/facility) -"og" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/door/firedoor{ - dir = 2 - }, -/turf/simulated/floor/tiled/old_tile/red, -/area/tradeport) "oj" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 @@ -4009,6 +4085,17 @@ }, /turf/simulated/floor/plating, /area/tradeport/atmospherics) +"ol" = ( +/obj/machinery/atmospherics/pipe/simple/visible, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/map_helper/airlock/door/int_door, +/obj/machinery/door/airlock/glass_external{ + name = "Ship Hatch" + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/trade_ship/general) "on" = ( /obj/machinery/portable_atmospherics/canister/air, /turf/simulated/floor/reinforced/airmix, @@ -4023,6 +4110,15 @@ "op" = ( /turf/simulated/wall/r_wall, /area/tradeport/cyndi) +"ot" = ( +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + frequency = 1380; + id_tag = "nebula_pump2b"; + name = "Nebula Pump Controller"; + pixel_x = -25 + }, +/turf/simulated/floor/reinforced, +/area/tradeport/pads) "ou" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8; @@ -4047,6 +4143,13 @@ }, /turf/simulated/floor/tiled/red, /area/shuttle/trade_ship/general) +"ox" = ( +/obj/machinery/door/airlock/glass_external{ + name = "Ship Hatch" + }, +/obj/map_helper/airlock/door/ext_door, +/turf/simulated/floor/tiled/dark, +/area/shuttle/trade_ship/general) "oy" = ( /obj/structure/table/glass, /obj/item/radio/intercom/trader{ @@ -4318,6 +4421,13 @@ }, /turf/simulated/floor/tiled/dark, /area/shuttle/trade_ship/general) +"pE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, +/obj/effect/paint/wallgunmetal, +/turf/simulated/wall/rshull, +/area/shuttle/trade_ship/general) "pG" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -4461,6 +4571,19 @@ }, /turf/simulated/floor/plating, /area/tradeport) +"qi" = ( +/obj/map_helper/airlock/door/int_door, +/obj/machinery/door/airlock/glass_external{ + name = "Ship Hatch" + }, +/obj/machinery/access_button/airlock_interior{ + frequency = 1380; + master_tag = "tradeport_hangar_docker"; + pixel_x = -25; + pixel_y = 5 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/trade_ship/general) "qj" = ( /obj/structure/sign/warning/docking_area, /turf/simulated/wall/r_wall, @@ -4776,6 +4899,22 @@ }, /turf/simulated/floor/airless, /area/space) +"rl" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/map_helper/airlock/door/ext_door, +/obj/machinery/door/airlock/glass_external{ + name = "Ship Hatch" + }, +/obj/machinery/access_button/airlock_exterior{ + frequency = 1380; + master_tag = "tradeport_hangar_docker"; + pixel_x = 25; + pixel_y = -5 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/trade_ship/general) "rm" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled/neutral, @@ -5111,12 +5250,6 @@ }, /turf/simulated/floor/tiled/dark, /area/shuttle/trade_ship/general) -"sO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/shuttle/wall/voidcraft, -/area/shuttle/trade_ship/general) "sP" = ( /turf/simulated/wall/r_wall, /area/tradeport/facility) @@ -5381,14 +5514,6 @@ }, /turf/simulated/floor/plating, /area/tradeport/dock) -"tP" = ( -/obj/machinery/door/airlock/glass_external{ - frequency = null; - name = "Ship Hatch" - }, -/obj/map_helper/airlock/door/ext_door, -/turf/simulated/floor/tiled/dark, -/area/shuttle/trade_ship/general) "tR" = ( /obj/machinery/light{ dir = 4 @@ -5558,15 +5683,6 @@ /obj/machinery/recharge_station, /turf/simulated/floor/tiled/dark, /area/shuttle/trade_ship/general) -"uE" = ( -/obj/structure/shuttle/engine/heater{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/turf/simulated/shuttle/wall/voidcraft, -/area/shuttle/trade_ship/general) "uF" = ( /obj/structure/window/reinforced{ dir = 1 @@ -5860,6 +5976,15 @@ }, /turf/simulated/floor/tiled/dark, /area/tradeport/facility) +"vt" = ( +/obj/machinery/atmospherics/component/unary/outlet_injector{ + dir = 4; + frequency = 1445; + id = "burn_in"; + volume_rate = 700 + }, +/turf/simulated/mineral/floor/vacuum, +/area/tradeport/atmospherics) "vv" = ( /obj/structure/table/rack/shelf/steel, /obj/item/silencer, @@ -5899,6 +6024,30 @@ }, /turf/simulated/floor/tiled/neutral, /area/tradeport/atmospherics) +"vz" = ( +/obj/machinery/vending/cigarette{ + name = "Cigarette machine"; + prices = list(); + products = list(/obj/item/storage/fancy/cigarettes = 10, /obj/item/storage/box/matches = 10, /obj/item/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2) + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/trade_ship/cockpit) +"vA" = ( +/obj/machinery/atmospherics/component/unary/vent_pump{ + dir = 4; + external_pressure_bound = 0; + external_pressure_bound_default = 0; + frequency = null; + icon_state = "map_vent_in"; + initialize_directions = 1; + internal_pressure_bound = 4000; + internal_pressure_bound_default = 4000; + pressure_checks = 2; + pressure_checks_default = 2; + pump_direction = 0 + }, +/turf/simulated/floor/reinforced/airmix, +/area/tradeport/atmospherics) "vC" = ( /obj/structure/closet/jcloset, /obj/random/soap, @@ -5919,16 +6068,6 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/tradeport/cafeteria) -"vE" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - dir = 4; - name = "Nebula Commercial District"; - req_access = null - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/old_tile/blue, -/area/tradeport/commhall) "vF" = ( /obj/structure/window/reinforced{ dir = 1 @@ -5965,12 +6104,6 @@ }, /turf/simulated/floor/wood, /area/tradeport/cyndishow) -"vO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9 - }, -/turf/simulated/shuttle/wall/voidcraft, -/area/shuttle/trade_ship/general) "vP" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /obj/map_helper/airlock/atmos/chamber_pump, @@ -6098,12 +6231,6 @@ }, /turf/simulated/floor/tiled/old_tile/beige, /area/tradeport/safari) -"wl" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8 - }, -/turf/simulated/shuttle/wall/voidcraft, -/area/shuttle/trade_ship/general) "wn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -6461,6 +6588,13 @@ }, /turf/simulated/floor/tiled/old_tile/blue, /area/tradeport) +"xy" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 + }, +/obj/effect/paint/wallgunmetal, +/turf/simulated/wall/rshull, +/area/shuttle/trade_ship/general) "xz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -6756,6 +6890,15 @@ }, /turf/simulated/floor/tiled/dark, /area/shuttle/trade_ship/general) +"yy" = ( +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 4; + name = "Nebula Commercial District" + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/old_tile/blue, +/area/tradeport/commhall) "yB" = ( /obj/machinery/light{ dir = 1 @@ -6863,6 +7006,12 @@ }, /turf/simulated/floor/tiled/old_tile/gray, /area/shuttle/trade_ship/general) +"yS" = ( +/obj/structure/table/steel_reinforced, +/obj/fiftyspawner/wood, +/obj/fiftyspawner/wood, +/turf/simulated/floor/tiled/dark, +/area/tradeport/facility) "yT" = ( /obj/structure/undies_wardrobe, /obj/effect/floor_decal/spline/fancy/wood{ @@ -7094,31 +7243,6 @@ }, /turf/simulated/floor/tiled/dark, /area/shuttle/trade_ship/general) -"zH" = ( -/obj/machinery/access_button{ - command = "cycle_ext"; - frequency = 8018; - master_tag = "trade_space_lock"; - pixel_x = 25; - pixel_y = 5 - }, -/obj/machinery/door/airlock/glass_external{ - frequency = null; - name = "Ship Hatch" - }, -/obj/map_helper/airlock/door/ext_door, -/turf/simulated/floor/tiled/dark, -/area/shuttle/trade_ship/general) -"zJ" = ( -/obj/machinery/atmospherics/component/unary/outlet_injector{ - dir = 4; - frequency = 1445; - id = "burn_in"; - req_access = null; - volume_rate = 700 - }, -/turf/simulated/mineral/floor/vacuum, -/area/tradeport/atmospherics) "zK" = ( /obj/machinery/vending/hydronutrients, /turf/simulated/floor/grass, @@ -7215,6 +7339,19 @@ }, /turf/simulated/floor/tiled/old_tile/beige, /area/tradeport/commhall) +"Ae" = ( +/obj/machinery/camera{ + dir = 8 + }, +/obj/structure/catwalk, +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + frequency = 1380; + id_tag = "nebula_pump4d"; + name = "Nebula Pump Controller"; + pixel_x = 25 + }, +/turf/simulated/floor, +/area/tradeport/pads) "Ah" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 @@ -7291,15 +7428,11 @@ /obj/machinery/light, /turf/simulated/floor/tiled/dark, /area/tradeport/facility) -"AA" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/table/steel_reinforced, -/obj/fiftyspawner/glass, -/obj/fiftyspawner/steel, -/turf/simulated/floor/tiled/dark, -/area/tradeport/facility) +"AB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/effect/paint/wallgunmetal, +/turf/simulated/wall/rshull, +/area/shuttle/trade_ship/general) "AD" = ( /turf/simulated/floor/tiled/asteroid_steel/airless, /area/tradeport/pads) @@ -7326,10 +7459,6 @@ /obj/structure/catwalk, /turf/simulated/floor, /area/tradeport/pads) -"AJ" = ( -/obj/structure/table/steel_reinforced, -/turf/simulated/floor/tiled/dark, -/area/tradeport/facility) "AK" = ( /obj/effect/debris/cleanable/blood, /obj/item/bone/skull, @@ -7361,16 +7490,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/tradeport/medical) -"AS" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/item/radio/intercom/trader{ - dir = 1; - pixel_y = 25 - }, -/turf/simulated/floor/tiled/dark, -/area/tradeport/facility) "AT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -7403,20 +7522,6 @@ }, /turf/simulated/floor/tiled/old_tile/blue, /area/tradeport) -"AV" = ( -/mob/living/bot/cleanbot/edCLN{ - desc = "A large cleaning robot. It's nametag reads 'Jim'."; - move_speed = 6; - name = "Jim" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/tiled/old_cargo/beige, -/area/tradeport/atmospherics) "AW" = ( /obj/structure/inflatable, /turf/simulated/floor/airless, @@ -7553,21 +7658,6 @@ /obj/structure/window/phoronreinforced/full, /turf/simulated/floor/plating, /area/tradeport/atmospherics) -"Bq" = ( -/obj/machinery/access_button{ - command = "cycle_int"; - frequency = 8018; - master_tag = "trade_space_lock"; - pixel_x = -25; - pixel_y = -5 - }, -/obj/machinery/door/airlock/glass_external{ - frequency = null; - name = "Ship Hatch" - }, -/obj/map_helper/airlock/door/int_door, -/turf/simulated/floor/tiled/dark, -/area/shuttle/trade_ship/general) "Bs" = ( /obj/machinery/vending/loadout/clothing, /obj/effect/floor_decal/spline/fancy/wood{ @@ -7605,6 +7695,11 @@ /obj/structure/lightpost, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/tradeport/safarizoo) +"By" = ( +/obj/machinery/atmospherics/pipe/manifold4w/hidden, +/obj/effect/paint/wallgunmetal, +/turf/simulated/wall/rshull, +/area/shuttle/trade_ship/general) "Bz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, @@ -7672,6 +7767,16 @@ }, /turf/simulated/floor/tiled/dark, /area/shuttle/trade_ship/cockpit) +"BL" = ( +/obj/structure/shuttle/engine/heater{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/effect/paint/wallgunmetal, +/turf/simulated/wall/rshull, +/area/shuttle/trade_ship/general) "BM" = ( /obj/structure/grille, /obj/structure/window/phoronreinforced/full, @@ -7698,20 +7803,6 @@ /obj/machinery/washing_machine, /turf/simulated/shuttle/floor/white, /area/tradeport/commons) -"BU" = ( -/obj/map_helper/airlock/door/int_door, -/obj/machinery/door/airlock/glass_external{ - frequency = null; - name = "Ship Hatch" - }, -/obj/machinery/access_button/airlock_interior{ - frequency = 1380; - master_tag = "tradeport_hangar_docker"; - pixel_x = -25; - pixel_y = 5 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/trade_ship/general) "BV" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -7756,9 +7847,6 @@ }, /turf/simulated/floor/snow, /area/tradeport/cyndishow) -"BZ" = ( -/turf/simulated/shuttle/wall/voidcraft, -/area/shuttle/trade_ship/cockpit) "Ca" = ( /obj/machinery/vending/loadout/overwear, /turf/simulated/floor/wood, @@ -7769,6 +7857,15 @@ }, /turf/simulated/floor/wood, /area/tradeport/commons) +"Cc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/old_tile/red, +/area/tradeport) "Cd" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/dark, @@ -7905,18 +8002,6 @@ }, /turf/simulated/wall/r_wall, /area/tradeport/pads) -"Cy" = ( -/obj/machinery/camera{ - dir = 4 - }, -/obj/machinery/vending/sovietsoda{ - contraband = list(/obj/item/reagent_containers/food/drinks/cans/crystalgibb=20); - desc = "An old sweet water vending machine. It looks like someone crossed out the D and replaced it with an F."; - name = "BOFA"; - products = list(/obj/item/reagent_containers/food/drinks/cans/thirteenloko=20) - }, -/turf/simulated/floor/tiled/old_tile/blue, -/area/tradeport) "Cz" = ( /obj/machinery/vending/loadout/overwear, /obj/effect/floor_decal/spline/fancy/wood{ @@ -8183,18 +8268,6 @@ }, /turf/simulated/floor/tiled/old_tile/gray, /area/shuttle/trade_ship/general) -"DI" = ( -/obj/machinery/vending/cigarette{ - name = "Cigarette machine"; - prices = list(); - products = list(/obj/item/storage/fancy/cigarettes=10,/obj/item/storage/box/matches=10,/obj/item/flame/lighter/zippo=4,/obj/item/clothing/mask/smokable/cigarette/cigar/havana=2) - }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 1 - }, -/obj/effect/floor_decal/spline/fancy/wood, -/turf/simulated/floor/carpet/bcarpet, -/area/tradeport/commons) "DK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -8218,6 +8291,10 @@ /mob/living/simple_mob/vore/redpanda, /turf/simulated/floor/outdoors/grass/heavy/interior, /area/tradeport/safarizoo) +"DQ" = ( +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/old_tile/blue, +/area/tradeport) "DR" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, @@ -8370,13 +8447,12 @@ /obj/effect/floor_decal/spline/fancy/wood, /turf/simulated/floor/carpet/bcarpet, /area/tradeport/commons) -"Er" = ( -/obj/machinery/vending/sovietsoda{ - contraband = list(/obj/item/reagent_containers/food/drinks/cans/crystalgibb=20); - desc = "An old sweet water vending machine. It looks like someone crossed out the D and replaced it with an F."; - name = "BOFA"; - products = list(/obj/item/reagent_containers/food/drinks/cans/thirteenloko=20) +"Eq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/door/airlock/glass_external{ + name = "Ship Hatch" }, +/obj/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled/dark, /area/shuttle/trade_ship/general) "Et" = ( @@ -8498,12 +8574,6 @@ }, /turf/simulated/floor/tiled/dark, /area/shuttle/trade_ship/cockpit) -"EQ" = ( -/obj/machinery/door/firedoor{ - dir = 2 - }, -/turf/simulated/floor/tiled/old_tile/blue, -/area/tradeport) "ER" = ( /obj/effect/shuttle_landmark{ base_area = /area/tradeport/pads; @@ -8548,6 +8618,20 @@ }, /turf/simulated/floor/wood, /area/tradeport/cafeteria) +"Fa" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/mob/living/bot/cleanbot/edCLN{ + desc = "A large cleaning robot. It's nametag reads 'Jim'."; + move_speed = 6; + name = "Jim" + }, +/turf/simulated/floor/tiled/old_cargo/beige, +/area/tradeport/atmospherics) "Fb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/old_tile/beige, @@ -8630,14 +8714,6 @@ }, /turf/simulated/floor/carpet, /area/shuttle/trade_ship/general) -"Fq" = ( -/obj/machinery/vending/cigarette{ - name = "Cigarette machine"; - prices = list(); - products = list(/obj/item/storage/fancy/cigarettes=10,/obj/item/storage/box/matches=10,/obj/item/flame/lighter/zippo=4,/obj/item/clothing/mask/smokable/cigarette/cigar/havana=2) - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/trade_ship/cockpit) "Fr" = ( /obj/structure/table/steel_reinforced, /obj/item/cell/hyper, @@ -8687,6 +8763,15 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/tradeport/dock) +"FA" = ( +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + frequency = 1380; + id_tag = "nebula_pump6b"; + name = "Nebula Pump Controller"; + pixel_x = -25 + }, +/turf/simulated/floor/reinforced, +/area/tradeport/pads) "FC" = ( /obj/structure/table/glass, /obj/item/radio/intercom/trader{ @@ -8712,6 +8797,13 @@ }, /turf/simulated/floor/plating, /area/shuttle/trade_ship/general) +"FE" = ( +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 4; + name = "Nebula Commercial District" + }, +/turf/simulated/floor/tiled/old_tile/red, +/area/tradeport) "FG" = ( /obj/machinery/light, /turf/space, @@ -8735,6 +8827,23 @@ /obj/machinery/vending/loadout/accessory, /turf/simulated/floor/tiled/steel, /area/tradeport) +"FM" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ + frequency = 8018; + id_tag = "trade_space_lock_pump" + }, +/obj/machinery/airlock_sensor{ + frequency = 8018; + id_tag = "trade_space_lock"; + pixel_x = 25 + }, +/obj/map_helper/airlock/sensor/chamber_sensor, +/obj/map_helper/airlock/atmos/chamber_pump, +/turf/simulated/floor/tiled/dark, +/area/shuttle/trade_ship/general) "FN" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -8757,10 +8866,6 @@ }, /turf/simulated/floor/tiled/dark, /area/shuttle/trade_ship/general) -"FP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/shuttle/wall/voidcraft, -/area/shuttle/trade_ship/general) "FQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -9029,6 +9134,15 @@ /obj/machinery/portable_atmospherics/hydroponics, /turf/simulated/floor/grass, /area/tradeport) +"GL" = ( +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + frequency = 1380; + id_tag = "nebula_pump3b"; + name = "Nebula Pump Controller"; + pixel_x = 25 + }, +/turf/simulated/floor/reinforced, +/area/tradeport/pads) "GM" = ( /obj/structure/window/reinforced{ dir = 1 @@ -9058,18 +9172,6 @@ }, /turf/simulated/floor/wood, /area/tradeport/cafeteria) -"GQ" = ( -/obj/machinery/atmospherics/pipe/simple/visible, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/map_helper/airlock/door/int_door, -/obj/machinery/door/airlock/glass_external{ - frequency = null; - name = "Ship Hatch" - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/trade_ship/general) "GR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -9101,6 +9203,13 @@ }, /turf/simulated/floor/tiled/old_tile/purple, /area/tradeport/spine) +"GW" = ( +/obj/machinery/holosign/bar{ + id = "tradersign" + }, +/obj/effect/paint/wallgunmetal, +/turf/simulated/wall/rshull, +/area/shuttle/trade_ship/general) "GY" = ( /obj/structure/window/reinforced, /obj/machinery/portable_atmospherics/canister/oxygen, @@ -9537,6 +9646,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/tradeport/cyndi) +"IM" = ( +/obj/effect/paint/wallgunmetal, +/turf/simulated/wall/rshull, +/area/shuttle/trade_ship/general) "IN" = ( /obj/structure/table/woodentable, /obj/item/paper_bin{ @@ -9635,19 +9748,6 @@ /obj/structure/catwalk, /turf/simulated/floor, /area/tradeport/pads) -"Jh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/airlock/freezer{ - name = "Nebula Gas - Freezer"; - req_access = list(160); - req_one_access = null - }, -/obj/machinery/door/firedoor{ - req_one_access = list(160) - }, -/turf/simulated/floor/tiled/freezer, -/area/tradeport) "Ji" = ( /obj/structure/table/steel_reinforced, /obj/machinery/door/blast/shutters{ @@ -9781,31 +9881,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/tradeport/dock) -"JJ" = ( -/obj/machinery/embedded_controller/radio/simple_docking_controller{ - frequency = 1380; - id_tag = "nebula_pump5"; - name = "Nebula Pump Controller"; - pixel_x = 25 - }, -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/reinforced, -/area/tradeport/pads) -"JM" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor{ - dir = 2 - }, -/obj/structure/catwalk, -/turf/simulated/floor, -/area/tradeport/pads) "JN" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/warning, @@ -9856,12 +9931,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/tradeport/engineering) -"Ka" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/simulated/shuttle/wall/voidcraft, -/area/shuttle/trade_ship/general) "Kb" = ( /obj/machinery/atmospherics/portables_connector{ dir = 1 @@ -9908,6 +9977,16 @@ "Kj" = ( /turf/space, /area/tradeport/expansion) +"Kk" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/table/steel_reinforced, +/obj/fiftyspawner/glass, +/obj/fiftyspawner/steel, +/obj/fiftyspawner/plastic, +/turf/simulated/floor/tiled/dark, +/area/tradeport/facility) "Kn" = ( /obj/structure/table/hardwoodtable, /obj/item/reagent_containers/food/drinks/shaker{ @@ -10021,6 +10100,18 @@ }, /turf/simulated/shuttle/floor/white, /area/tradeport/commons) +"KI" = ( +/obj/machinery/camera{ + dir = 4 + }, +/obj/machinery/vending/sovietsoda{ + contraband = list(/obj/item/reagent_containers/food/drinks/cans/crystalgibb = 20); + desc = "An old sweet water vending machine. It looks like someone crossed out the D and replaced it with an F."; + name = "BOFA"; + products = list(/obj/item/reagent_containers/food/drinks/cans/thirteenloko = 20) + }, +/turf/simulated/floor/tiled/old_tile/blue, +/area/tradeport) "KJ" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -10048,23 +10139,6 @@ }, /turf/simulated/floor/tiled/old_tile/purple, /area/tradeport/spine) -"KL" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/map_helper/airlock/door/ext_door, -/obj/machinery/door/airlock/glass_external{ - frequency = null; - name = "Ship Hatch" - }, -/obj/machinery/access_button/airlock_exterior{ - frequency = 1380; - master_tag = "tradeport_hangar_docker"; - pixel_x = 25; - pixel_y = -5 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/trade_ship/general) "KM" = ( /obj/effect/floor_decal/techfloor{ dir = 4 @@ -10372,6 +10446,18 @@ }, /turf/simulated/floor/tiled/old_tile/yellow, /area/tradeport/safari) +"LV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/airlock/freezer{ + name = "Nebula Gas - Freezer"; + req_access = list(160) + }, +/obj/machinery/door/firedoor{ + req_one_access = list(160) + }, +/turf/simulated/floor/tiled/freezer, +/area/tradeport) "LX" = ( /obj/machinery/light{ dir = 8 @@ -10385,6 +10471,16 @@ /obj/machinery/light, /turf/simulated/shuttle/floor/white, /area/tradeport/commons) +"Mc" = ( +/obj/effect/shuttle_landmark{ + base_area = /area/tradeport/pads; + base_turf = /turf/simulated/floor/reinforced; + docking_controller = "nebula_pump4d"; + landmark_tag = "nebula_pad_4d"; + name = "Nebula Pad 4d" + }, +/turf/simulated/floor/reinforced, +/area/tradeport/pads) "Md" = ( /obj/structure/table/standard, /obj/item/clothing/gloves/sterile/latex, @@ -10519,24 +10615,6 @@ /obj/effect/floor_decal/spline/plain, /turf/simulated/floor/carpet/bcarpet, /area/tradeport/cyndishow) -"Mw" = ( -/obj/machinery/door/firedoor{ - req_one_access = list(160) - }, -/obj/machinery/door/airlock/sandstone{ - frequency = 1382; - id_tag = "safari_access"; - name = "John Safari's Adventure Emporium"; - req_access = null; - tag = "safari_door" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/old_tile/beige, -/area/tradeport/safari) "Mx" = ( /turf/simulated/floor/plating, /area/tradeport/facility) @@ -10544,18 +10622,6 @@ /obj/structure/bed/chair/comfy/beige, /turf/simulated/floor/plating, /area/tradeport/facility) -"Mz" = ( -/obj/machinery/embedded_controller/radio/simple_docking_controller{ - frequency = 1380; - id_tag = "nebula_pump6"; - name = "Nebula Pump Controller"; - pixel_x = -25 - }, -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/reinforced, -/area/tradeport/pads) "MA" = ( /turf/simulated/wall/r_wall, /area/tradeport/expansion) @@ -10687,9 +10753,6 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/tradeport/cafeteria) -"MX" = ( -/turf/simulated/shuttle/wall/voidcraft/hard_corner, -/area/shuttle/trade_ship/cockpit) "MY" = ( /obj/machinery/door/firedoor{ dir = 8; @@ -11135,13 +11198,6 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/plating, /area/tradeport/engineering) -"OE" = ( -/obj/machinery/door/firedoor{ - dir = 2 - }, -/obj/structure/catwalk, -/turf/simulated/floor, -/area/tradeport/pads) "OF" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 4 @@ -11251,6 +11307,23 @@ }, /turf/simulated/floor/tiled/dark, /area/shuttle/trade_ship/general) +"OW" = ( +/obj/machinery/door/firedoor{ + req_one_access = list(160) + }, +/obj/machinery/door/airlock/sandstone{ + frequency = 1382; + id_tag = "safari_access"; + name = "John Safari's Adventure Emporium"; + tag = "safari_door" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/old_tile/beige, +/area/tradeport/safari) "OX" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -11510,9 +11583,6 @@ }, /turf/simulated/floor/airless, /area/tradeport/exterior) -"PJ" = ( -/turf/simulated/shuttle/wall/voidcraft, -/area/shuttle/trade_ship/general) "PL" = ( /obj/machinery/light{ dir = 8; @@ -11530,24 +11600,6 @@ }, /turf/simulated/floor/plating, /area/tradeport/pads) -"PO" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ - frequency = 8018; - id_tag = "trade_space_lock_pump" - }, -/obj/machinery/airlock_sensor{ - frequency = 8018; - id_tag = "trade_space_lock"; - master_tag = null; - pixel_x = 25 - }, -/obj/map_helper/airlock/sensor/chamber_sensor, -/obj/map_helper/airlock/atmos/chamber_pump, -/turf/simulated/floor/tiled/dark, -/area/shuttle/trade_ship/general) "PP" = ( /turf/simulated/floor/snow, /area/tradeport/cyndishow) @@ -11588,6 +11640,20 @@ /obj/item/clipboard, /turf/simulated/floor/carpet/bcarpet, /area/shuttle/trade_ship/general) +"PW" = ( +/obj/machinery/access_button{ + command = "cycle_ext"; + frequency = 8018; + master_tag = "trade_space_lock"; + pixel_x = 25; + pixel_y = 5 + }, +/obj/machinery/door/airlock/glass_external{ + name = "Ship Hatch" + }, +/obj/map_helper/airlock/door/ext_door, +/turf/simulated/floor/tiled/dark, +/area/shuttle/trade_ship/general) "PY" = ( /obj/structure/table/hardwoodtable, /obj/machinery/reagentgrinder{ @@ -11596,6 +11662,18 @@ /obj/item/reagent_containers/glass/rag, /turf/simulated/floor/wood, /area/tradeport) +"PZ" = ( +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + frequency = 1380; + id_tag = "nebula_pump5a"; + name = "Nebula Pump Controller"; + pixel_x = 25 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/reinforced, +/area/tradeport/pads) "Qc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -11687,6 +11765,18 @@ }, /turf/simulated/floor/outdoors/beach/sand/desert/indoors, /area/tradeport/safarizoo) +"QA" = ( +/obj/machinery/vending/cigarette{ + name = "Cigarette machine"; + prices = list(); + products = list(/obj/item/storage/fancy/cigarettes = 10, /obj/item/storage/box/matches = 10, /obj/item/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2) + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, +/obj/effect/floor_decal/spline/fancy/wood, +/turf/simulated/floor/carpet/bcarpet, +/area/tradeport/commons) "QB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -12060,15 +12150,6 @@ /obj/structure/cable/yellow, /turf/simulated/floor/tiled/old_tile/beige, /area/tradeport/commhall) -"RJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/door/airlock/glass_external{ - frequency = null; - name = "Ship Hatch" - }, -/obj/map_helper/airlock/door/int_door, -/turf/simulated/floor/tiled/dark, -/area/shuttle/trade_ship/general) "RL" = ( /obj/structure/window/reinforced{ dir = 1 @@ -12251,9 +12332,6 @@ /obj/structure/sign/graffiti/pisoff, /turf/simulated/floor/plating, /area/tradeport) -"Su" = ( -/turf/simulated/shuttle/wall/voidcraft/hard_corner, -/area/shuttle/trade_ship/general) "Sy" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 6 @@ -12404,6 +12482,19 @@ }, /turf/simulated/floor/tiled/old_tile/purple, /area/tradeport/spine) +"SV" = ( +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + frequency = 1380; + id_tag = "nebula_pump3a"; + name = "Nebula Pump Controller"; + pixel_x = 25 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/atmospherics/portables_connector, +/turf/simulated/floor/reinforced, +/area/tradeport/pads) "SY" = ( /obj/structure/railing{ dir = 1 @@ -12515,6 +12606,18 @@ /obj/structure/table/hardwoodtable, /turf/simulated/floor/tiled/old_tile/blue, /area/tradeport) +"Tu" = ( +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + frequency = 1380; + id_tag = "nebula_pump2a"; + name = "Nebula Pump Controller"; + pixel_x = -25 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/reinforced, +/area/tradeport/pads) "Tw" = ( /obj/machinery/light, /obj/machinery/atmospherics/component/binary/pump/high_power/on{ @@ -12582,14 +12685,6 @@ /obj/landmark/spawnpoint/job/trader, /turf/simulated/floor/carpet, /area/tradeport/commons) -"TD" = ( -/obj/machinery/vending/assist{ - contraband = null; - name = "Old Vending Machine"; - products = list(/obj/item/assembly/prox_sensor=5,/obj/item/assembly/signaler=4,/obj/item/assembly/infra=4,/obj/item/assembly/prox_sensor=4,/obj/item/handcuffs=8,/obj/item/flash=4,/obj/item/cartridge/signal=4,/obj/item/clothing/glasses/sunglasses=4) - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/trade_ship/cockpit) "TF" = ( /obj/machinery/light{ dir = 1 @@ -12687,6 +12782,18 @@ }, /turf/simulated/floor/tiled/dark, /area/shuttle/trade_ship/general) +"Ua" = ( +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + frequency = 1380; + id_tag = "nebula_pump6a"; + name = "Nebula Pump Controller"; + pixel_x = -25 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/reinforced, +/area/tradeport/pads) "Ub" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ @@ -12697,12 +12804,6 @@ }, /turf/simulated/floor/tiled/neutral, /area/tradeport/facility) -"Uc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/universal{ - dir = 4 - }, -/turf/simulated/shuttle/wall/voidcraft, -/area/shuttle/trade_ship/general) "Ud" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -12867,18 +12968,6 @@ /obj/structure/transit_tube, /turf/simulated/floor/plating, /area/tradeport/spine) -"Uz" = ( -/obj/machinery/embedded_controller/radio/simple_docking_controller{ - frequency = 1380; - id_tag = "nebula_pump1"; - name = "Nebula Pump Controller"; - pixel_x = 25 - }, -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/reinforced, -/area/tradeport/pads) "UC" = ( /obj/effect/floor_decal/industrial/warning{ dir = 9 @@ -13034,6 +13123,14 @@ "UZ" = ( /turf/simulated/floor/wood, /area/shuttle/trade_ship/general) +"Vb" = ( +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 4; + name = "Nebula Commercial District" + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/old_tile/blue, +/area/tradeport) "Vc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -13385,6 +13482,15 @@ /obj/item/stolenpackage, /turf/simulated/floor/tiled/dark, /area/tradeport/facility) +"WJ" = ( +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + frequency = 1380; + id_tag = "nebula_pump3c"; + name = "Nebula Pump Controller"; + pixel_x = 25 + }, +/turf/simulated/floor/reinforced, +/area/tradeport/pads) "WK" = ( /turf/simulated/floor/wood, /area/tradeport/cyndishow) @@ -13588,6 +13694,13 @@ /obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/tradeport/engineering) +"Xy" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/paint/wallgunmetal, +/turf/simulated/wall/rshull, +/area/shuttle/trade_ship/general) "Xz" = ( /obj/machinery/light, /obj/effect/floor_decal/spline/fancy/wood{ @@ -13734,6 +13847,10 @@ "XY" = ( /turf/simulated/floor/airless, /area/tradeport/expansion) +"Yb" = ( +/obj/effect/paint/wallgunmetal, +/turf/simulated/wall/rshull, +/area/shuttle/trade_ship/cockpit) "Yc" = ( /obj/structure/closet/crate/secure{ name = "slime cores crate"; @@ -14056,23 +14173,6 @@ }, /turf/simulated/floor/tiled/neutral, /area/tradeport) -"YX" = ( -/obj/machinery/atmospherics/component/unary/vent_pump{ - dir = 4; - external_pressure_bound = 0; - external_pressure_bound_default = 0; - frequency = null; - icon_state = "map_vent_in"; - initialize_directions = 1; - internal_pressure_bound = 4000; - internal_pressure_bound_default = 4000; - pressure_checks = 2; - pressure_checks_default = 2; - pump_direction = 0; - use_power = 1 - }, -/turf/simulated/floor/reinforced/airmix, -/area/tradeport/atmospherics) "YY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -14082,6 +14182,13 @@ }, /turf/simulated/floor/tiled/old_tile/beige, /area/tradeport/safari) +"Za" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/paint/wallgunmetal, +/turf/simulated/wall/rshull, +/area/shuttle/trade_ship/general) "Zb" = ( /obj/structure/catwalk, /obj/machinery/light/small{ @@ -14239,20 +14346,6 @@ /obj/structure/sign/vacuum, /turf/simulated/wall/r_wall, /area/tradeport/engineering) -"ZE" = ( -/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - frequency = 8018; - id_tag = "trade_space_lock"; - pixel_x = -25; - tag_airpump = null; - tag_chamber_sensor = null; - tag_exterior_door = null; - tag_exterior_sensor = null; - tag_interior_door = null; - tag_interior_sensor = null - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/trade_ship/general) "ZF" = ( /obj/machinery/light/small{ dir = 1 @@ -14336,6 +14429,13 @@ /obj/structure/closet/emcloset, /turf/simulated/floor/tiled/neutral, /area/tradeport/commons) +"ZW" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 1 + }, +/obj/effect/paint/wallgunmetal, +/turf/simulated/wall/rshull, +/area/shuttle/trade_ship/general) "ZX" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -28401,7 +28501,7 @@ Ta Ta pd Ta -Mw +OW hA cf Sk @@ -29568,7 +29668,7 @@ Dh pj pj bh -vE +yy pj pj Dh @@ -35323,7 +35423,7 @@ Dh Dh Dh Dh -Dh +cd Dh wV wV @@ -35726,10 +35826,10 @@ Jv Jv Jv Jv -PJ +IM NP NP -PJ +IM Jv Jv Jv @@ -35756,7 +35856,7 @@ wV wV wV wV -zJ +vt wV wV Dh @@ -35806,7 +35906,7 @@ kf kf kf kf -kf +it kf kf kf @@ -35919,12 +36019,12 @@ Jv Jv Jv Jv -PJ -Su +IM +IM EP aG -Su -PJ +IM +IM Jv Jv Jv @@ -36501,12 +36601,12 @@ Jv Jv Jv Jv -Su -BZ -BZ +IM +Yb +Yb vk -BZ -Su +Yb +IM Jv Jv Jv @@ -36695,12 +36795,12 @@ Jv Jv Jv Jv -PJ +IM oV ZP Gb -TD -PJ +fJ +IM Jv Jv Jv @@ -36884,22 +36984,22 @@ dA Jv Jv Jv -PJ +IM nm nm -PJ +IM Jv -PJ -BZ -MX +IM +Yb +Yb nw vG -PJ +IM Jv -PJ +IM NJ NJ -PJ +IM Jv Jv NQ @@ -37077,24 +37177,24 @@ wV dA Jv Jv -PJ -Su +nv +IM VQ KQ -PJ +IM Jv -PJ +IM gi -BZ +Yb mb Ra -PJ +IM Jv -PJ +IM uA UZ -Su -PJ +IM +nv Jv NQ dA @@ -37271,24 +37371,24 @@ wV dA Jv Jv -PJ +nv hu CW vb -PJ +IM Jv -PJ +IM yH hg nt De -PJ +IM Jv -PJ +IM LK ah bB -PJ +nv Jv NQ dA @@ -37375,7 +37475,7 @@ kf kf kf kf -qX +kf kf kf kf @@ -37465,24 +37565,24 @@ wV dA Jv Jv -PJ +nv Fd CW DG -PJ +IM Vd -PJ +IM Ut -BZ +Yb Sa Gd -PJ +IM ek -PJ +IM qb UZ eS -PJ +nv Jv NQ dA @@ -37659,24 +37759,24 @@ wV dA VO Jv -PJ -PJ +nv +IM DA -PJ -PJ -PJ -PJ -MX -Fq +IM +IM +IM +IM +Yb +vz jC BK -BZ -Uc -PJ -PJ +Yb +dQ +IM +IM cP -PJ -PJ +IM +nv Jv gM dA @@ -37694,7 +37794,7 @@ yc Zh RP oO -YX +vA RP hZ ex @@ -37732,7 +37832,7 @@ ia kf kf kf -rh +kf kf kf Zl @@ -37853,24 +37953,24 @@ wV dA Jv Jv -PJ +nv cg CW hB fw -PJ -PJ -PJ -PJ +IM +IM +IM +IM HX aZ -Su -sO +IM +Za Fl UZ UZ jJ -PJ +nv Jv NQ dA @@ -37910,7 +38010,7 @@ eD Cj eD QC -ns +FE eD Cj eD @@ -37933,6 +38033,7 @@ kf Yn kf kf +Fj kf kf kf @@ -37945,8 +38046,7 @@ kf kf kf kf -kf -kf +pI kf kf IF @@ -37956,7 +38056,7 @@ kf kf kf kf -kf +qX kf kf kf @@ -38047,24 +38147,24 @@ wV dA Jv Jv -Su +nv lf CW CW rR -PJ +IM TK eL -Er +mI im Fv Ea -sO +Za oS UZ UZ jh -Su +nv Jv NQ dA @@ -38119,7 +38219,7 @@ Ph Yn kf kf -kf +rh kf kf kf @@ -38473,7 +38573,7 @@ NX IB BX wo -AV +Fa hT eD eD @@ -38634,14 +38734,14 @@ Fo Po XV yQ -PJ +IM LJ Ct UC bM wZ Me -PJ +IM yf HK mK @@ -38823,24 +38923,24 @@ wV dA Jv Jv -PJ -PJ -PJ -PJ -PJ -Su +IM +IM +IM +IM +IM +IM HT Ct MK xd wZ NO -Su -PJ -PJ -PJ -PJ -PJ +IM +IM +IM +IM +IM +IM Jv NQ dA @@ -38903,7 +39003,6 @@ kf Yn kf kf -Fj kf kf kf @@ -38916,7 +39015,8 @@ kf kf kf kf -pI +kf +kf kf kf gP @@ -39018,8 +39118,8 @@ dA Jv Jv Jv -PJ -Su +IM +IM ab wD hN @@ -39032,8 +39132,8 @@ zY dy FR Bu -Su -PJ +IM +IM Jv Jv NQ @@ -39293,7 +39393,7 @@ kf kf kf kf -kf +gh kf kf kf @@ -39643,7 +39743,7 @@ rG DX pS GI -Cy +KI dM xg Ns @@ -39686,7 +39786,7 @@ kf kf kf kf -gh +kf kf kf kf @@ -39794,8 +39894,8 @@ dA Jv Jv Jv -PJ -Su +IM +IM Fr uS Yc @@ -39808,8 +39908,8 @@ NO fh If HQ -Su -PJ +IM +IM Jv Jv QS @@ -39987,24 +40087,24 @@ Qp dA Jv Jv -PJ -PJ -Su +IM +IM +IM aA aA aA -Su +IM Ax NC NC BG -Su +IM aA aA aA -Su -PJ -PJ +IM +IM +IM Jv FS dA @@ -40057,8 +40157,8 @@ dX cB kZ Yn -kf -Uz +hC +nc ur kf DV @@ -40067,21 +40167,21 @@ kf ia kf kf -kf +GL kf Ef ur kf kf ur -gs +SV np kf kf ur Ef kf -kf +WJ kf gP ia @@ -40089,11 +40189,11 @@ kf kf kf kf -kf +mj yD np ur -JJ +PZ kf kf kf @@ -40180,26 +40280,26 @@ sP sP dA VO -nM -PJ -Su +GW +IM +IM bI Dg xK xK -PJ +IM iE zE zE UQ -PJ +IM ge Ow uD nf -Su -PJ -nM +IM +IM +GW FS dA Jk @@ -40238,7 +40338,7 @@ eD Cj eD Rk -md +Vb eD Cj eD @@ -40283,7 +40383,7 @@ Yn Yn Yn Yn -Yn +ia zr Fu bO @@ -40374,9 +40474,9 @@ Yv Yv mZ Jv -tP -ZE -Bq +ox +gb +eH ep wg Aw @@ -40391,9 +40491,9 @@ ms iR Oi ao -BU +qi LP -tP +ox qB GD Th @@ -40415,7 +40515,7 @@ DC Et Uv Et -gH +gS td mS df @@ -40433,7 +40533,7 @@ pA vw BF Ig -og +Cc Vx Hx YR @@ -40452,7 +40552,7 @@ Rm le jy Rm -JM +bV Rm Rm Rm @@ -40462,7 +40562,7 @@ Rm dn dn Rm -Rm +eV le dn dn @@ -40568,9 +40668,9 @@ Yv Yv mZ Jv -zH -PO -RJ +PW +FM +Eq Rf wR iK @@ -40585,9 +40685,9 @@ OV ri ic Ze -GQ +ol zP -KL +rl RX Uf IX @@ -40627,7 +40727,7 @@ ul Bc Lq NY -EQ +DQ Wz ng ul @@ -40646,7 +40746,7 @@ ur en Hr ur -OE +mE ur ur ur @@ -40656,7 +40756,7 @@ ur ur ur ur -hm +Ae en ur ur @@ -40762,26 +40862,26 @@ sP sP qj Jv -Su -PJ -Su +IM +IM +IM kq im rw ry -Su +IM aH mp eW fV -nM +GW Ch EM tH LG -Su -PJ -Su +IM +IM +IM NQ qj SO @@ -40865,7 +40965,7 @@ Yn Yn Yn Yn -Yn +ia eJ Jg bO @@ -40957,24 +41057,24 @@ Rz dA Jv Jv -PJ -PJ -PJ +IM +IM +IM gj -PJ -Su -Su +IM +IM +IM wh ZX NC lX -Su -Su -PJ +IM +IM +IM TZ -Ka -PJ -PJ +Xy +IM +IM Jv NQ dA @@ -40997,7 +41097,7 @@ QQ ZK Sg Gi -Jh +LV qg Rx oU @@ -41027,8 +41127,8 @@ ia vP bY ia -kf -gW +ot +Tu ur kf ZO @@ -41059,11 +41159,11 @@ kf kf kf kf -kf +FA Em qU ur -Mz +Ua kf kf kf @@ -41156,14 +41256,14 @@ cQ ui im jK -PJ +IM fS lZ ze XO JO FD -PJ +IM sR ey oK @@ -41350,14 +41450,14 @@ cQ Mh FO Pv -PJ +IM fS Mq NK Hn JO FD -PJ +IM uP II QU @@ -41418,7 +41518,7 @@ ia kf kf kf -vq +kf kf kf kf @@ -41432,7 +41532,7 @@ kf kf kf kf -kk +kf kf kf kf @@ -41450,7 +41550,7 @@ kf kf kf kf -Jw +kf kf kf kf @@ -41539,24 +41639,24 @@ Rz dA Jv Jv -PJ -Su +nv +IM Bl yv lH -Su -Su +IM +IM hs hl Yx BP -Su -Su +IM +IM jX js WT -Su -PJ +IM +nv Jv NQ dA @@ -41627,7 +41727,7 @@ kf kf kf kf -kf +kk kf kf kf @@ -41643,7 +41743,7 @@ kf kf kf kf -kf +Jw kf kf kf @@ -41732,26 +41832,26 @@ sP Rz dA Jv -PJ -PJ +nv +IM bJ NO NO NO Md -iz -wl -cF -cF -wl -br +pE +lN +By +By +lN +bb Gv Ks tt IC SR -PJ -PJ +IM +nv NQ nq tu @@ -41926,26 +42026,26 @@ sP Rz dA Jv -PJ -PJ +nv +IM oR zG pC qt IP -nB -uE -uE -uE -uE -kI +ev +BL +BL +BL +BL +ZW eP Ce VX Pz QY -PJ -PJ +IM +nv NQ nq dw @@ -42120,26 +42220,26 @@ sP Rz dA Jv -PJ -iz -wl -wl -wl -FP -FP -vO +nv +pE +lN +lN +lN +AB +AB +gf Iz Iz Iz Iz -hK -FP -FP -wl -wl -wl -br -PJ +xy +AB +AB +lN +lN +lN +bb +nv NQ nq tu @@ -42193,7 +42293,7 @@ Nk Yn kf kf -kf +vq kf kf kf @@ -42201,7 +42301,6 @@ kf Yn kf kf -Bv kf kf kf @@ -42214,7 +42313,8 @@ kf kf kf kf -wC +kf +kf kf kf kf @@ -42314,26 +42414,26 @@ sP sP dA VO -PJ -uE -uE -uE -uE -PJ -PJ +nv +BL +BL +BL +BL +IM +IM Jv Jv Jv Jv Jv Jv -PJ -PJ -uE -uE -uE -uE -PJ +IM +IM +BL +BL +BL +BL +nv gM nq dw @@ -42508,12 +42608,12 @@ dD sP dA Jv -PJ +nv Iz Iz Iz Iz -PJ +IM Jv Jv Jv @@ -42522,12 +42622,12 @@ Jv Jv Jv Jv -PJ +IM Iz Iz Iz Iz -PJ +nv NQ nq tu @@ -42536,7 +42636,7 @@ cA tu tu tu -DI +QA YQ qw wa @@ -42990,7 +43090,7 @@ kf kf kf kf -kf +wC kf kf kf @@ -43861,7 +43961,7 @@ Dh wV wV sP -AA +Kk Ne of Ne @@ -44055,7 +44155,7 @@ Dh wV wV sP -AJ +yS EH yp Yz @@ -44141,7 +44241,7 @@ Nc ia kf kf -kf +Bv kf kf kf @@ -44249,7 +44349,7 @@ Dh wV wV sP -AJ +hF qE Ne lO @@ -44637,7 +44737,7 @@ Dh wV wV sP -AS +gu Ne Ne na @@ -44919,7 +45019,7 @@ kf kf kf kf -kf +Mc kf kf kf @@ -45497,7 +45597,6 @@ Dh Dh Dh ia -Ef kf kf kf @@ -45515,7 +45614,8 @@ kf kf kf kf -Nc +kf +kf ia Dh Dh @@ -45691,25 +45791,25 @@ Dh Dh Dh ia -ia -jD -jD -jD -jD -jD -jD -jD -jD -jD -jD -jD -jD -jD -jD -jD -jD -jD -ia +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf ia Dh Dh @@ -45884,27 +45984,27 @@ Dh Dh Dh Dh -Dh -Dh -Dh -Dh -Dh -Dh -Dh -Dh -Dh -Dh -cd -cd -cd -cd -Dh -Dh -Dh -Dh -Dh -Dh -Dh +ia +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf +ia Dh Dh Dh @@ -46078,27 +46178,27 @@ Dh Dh Dh Dh -Dh -Dh -Dh -Dh -Dh -Dh -Dh -Dh -Dh -Dh -cd -cd -cd -cd -Dh -Dh -Dh -Dh -Dh -Dh -Dh +ia +Ef +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf +kf +Nc +ia Dh Dh Dh @@ -46272,27 +46372,27 @@ Dh Dh Dh Dh -Dh -Dh -Dh -Dh -Dh -Dh -Dh -Dh -Dh -Dh -cd -cd -cd -cd -Dh -Dh -Dh -Dh -Dh -Dh -Dh +ia +ia +jD +jD +jD +jD +jD +jD +jD +jD +jD +jD +jD +jD +jD +jD +jD +jD +jD +ia +ia Dh Dh Dh diff --git a/maps/submaps/level_specific/class_h/AuxiliaryResearchFacility.dmm b/maps/submaps/level_specific/class_h/AuxiliaryResearchFacility.dmm index 12a8cd0836a3..6252eec547c5 100644 --- a/maps/submaps/level_specific/class_h/AuxiliaryResearchFacility.dmm +++ b/maps/submaps/level_specific/class_h/AuxiliaryResearchFacility.dmm @@ -966,7 +966,7 @@ /area/class_h/POIs/AuxiliaryResearchFacility) "wc" = ( /obj/effect/debris/cleanable/dirt, -/obj/item/frame/apc, +/obj/item/frame2/apc, /turf/simulated/floor/plating, /area/class_h/POIs/AuxiliaryResearchFacility) "wg" = ( diff --git a/maps/submaps/level_specific/debrisfield_vr/gecko_cr_wreck.dmm b/maps/submaps/level_specific/debrisfield_vr/gecko_cr_wreck.dmm index 9f9f1729236a..d3ef16c0afbd 100644 --- a/maps/submaps/level_specific/debrisfield_vr/gecko_cr_wreck.dmm +++ b/maps/submaps/level_specific/debrisfield_vr/gecko_cr_wreck.dmm @@ -1899,7 +1899,7 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/item/frame/apc, +/obj/item/frame2/apc, /turf/simulated/floor/tiled/techfloor{ initial_gas_mix = "TEMP=2.7" }, diff --git a/maps/submaps/level_specific/debrisfield_vr/mackerel_lc_wreck.dmm b/maps/submaps/level_specific/debrisfield_vr/mackerel_lc_wreck.dmm index 582d630398c8..481110ca8572 100644 --- a/maps/submaps/level_specific/debrisfield_vr/mackerel_lc_wreck.dmm +++ b/maps/submaps/level_specific/debrisfield_vr/mackerel_lc_wreck.dmm @@ -290,7 +290,7 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/item/frame/apc, +/obj/item/frame2/apc, /obj/item/integrated_circuit, /turf/simulated/floor/tiled/techfloor, /area/shuttle/mackerel_lc_wreck) diff --git a/maps/submaps/level_specific/debrisfield_vr/old_satellite.dmm b/maps/submaps/level_specific/debrisfield_vr/old_satellite.dmm index 464bb53d9839..47500768edaf 100644 --- a/maps/submaps/level_specific/debrisfield_vr/old_satellite.dmm +++ b/maps/submaps/level_specific/debrisfield_vr/old_satellite.dmm @@ -45,7 +45,7 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/solar/fake{ +/obj/machinery/power/solar{ adir = 135 }, /turf/simulated/floor/airless, @@ -57,7 +57,7 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/solar/fake{ +/obj/machinery/power/solar{ adir = 135 }, /turf/simulated/floor/airless, @@ -97,7 +97,7 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/solar/fake, +/obj/machinery/power/solar, /turf/simulated/floor/airless, /area/submap/debrisfield_vr/old_sat) "n" = ( diff --git a/maps/submaps/level_specific/underdark/abandonded_outpost.dmm b/maps/submaps/level_specific/underdark/abandonded_outpost.dmm index ddf6663ec9f4..81854381bf99 100644 --- a/maps/submaps/level_specific/underdark/abandonded_outpost.dmm +++ b/maps/submaps/level_specific/underdark/abandonded_outpost.dmm @@ -171,7 +171,7 @@ /turf/simulated/wall, /area/mine/explored/underdark) "aR" = ( -/obj/item/frame/apc, +/obj/item/frame2/apc, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/mine/explored/underdark) "aS" = ( diff --git a/maps/submaps/mountains/digsite.dmm b/maps/submaps/mountains/digsite.dmm index 0a1a93918401..5386debe8e75 100644 --- a/maps/submaps/mountains/digsite.dmm +++ b/maps/submaps/mountains/digsite.dmm @@ -70,7 +70,7 @@ /turf/simulated/wall, /area/submap/cave/digsite) "t" = ( -/obj/item/frame/apc, +/obj/item/frame2/apc, /obj/item/module/power_control, /turf/simulated/floor/plating/external, /area/submap/cave/digsite) diff --git a/maps/submaps/plains/Diner.dmm b/maps/submaps/plains/Diner.dmm index d37293b6c91e..529663e861fc 100644 --- a/maps/submaps/plains/Diner.dmm +++ b/maps/submaps/plains/Diner.dmm @@ -346,7 +346,7 @@ /turf/simulated/floor/tiled/white, /area/submap/Diner) "bf" = ( -/obj/item/frame/apc, +/obj/item/frame2/apc, /turf/simulated/floor/lino, /area/submap/Diner) "bg" = ( diff --git a/maps/submaps/plains/Diner_vr.dmm b/maps/submaps/plains/Diner_vr.dmm index 67d63b084b69..0d5b25d8a69c 100644 --- a/maps/submaps/plains/Diner_vr.dmm +++ b/maps/submaps/plains/Diner_vr.dmm @@ -358,7 +358,7 @@ /turf/simulated/floor/tiled/white, /area/submap/Diner) "bi" = ( -/obj/item/frame/apc, +/obj/item/frame2/apc, /turf/simulated/floor/lino, /area/submap/Diner) "bj" = ( diff --git a/maps/tether/engines/rust.dmm b/maps/tether/engines/rust.dmm index dc74eca68855..ed936695506a 100644 --- a/maps/tether/engines/rust.dmm +++ b/maps/tether/engines/rust.dmm @@ -1257,7 +1257,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/blast/regular{ - id = "EngineEmitterPortWest"; + id = "EngineEmitterPortWest2"; name = "Engine Gas Storage" }, /turf/simulated/floor/tiled/steel_grid, @@ -1268,7 +1268,7 @@ icon_state = "1-2" }, /obj/machinery/door/blast/regular{ - id = "EngineEmitterPortWest"; + id = "EngineEmitterPortWest2"; name = "Engine Gas Storage" }, /obj/machinery/button/remote/blast_door{ diff --git a/maps/tether/levels/mining.dmm b/maps/tether/levels/mining.dmm index 93b16abbdda6..5ed647eb006b 100644 --- a/maps/tether/levels/mining.dmm +++ b/maps/tether/levels/mining.dmm @@ -1055,9 +1055,7 @@ /turf/simulated/floor/tiled, /area/outpost/mining_main/hangar) "As" = ( -/turf/simulated/mineral/floor/virgo3b{ - color = "#AAAAAA" - }, +/turf/simulated/open/virgo3b, /area/mine/explored) "Ay" = ( /obj/effect/floor_decal/industrial/outline/yellow, @@ -1850,13 +1848,6 @@ }, /turf/simulated/floor/outdoors/grass/sif/virgo3b, /area/mine/explored) -"WM" = ( -/obj/effect/step_trigger/teleporter/to_underdark{ - dir = 4; - pixel_x = -16 - }, -/turf/simulated/floor/outdoors/grass/sif/virgo3b, -/area/mine/explored) "Xe" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -1940,10 +1931,6 @@ /obj/spawner/window/low_wall/borosillicate/full, /turf/simulated/floor/plating, /area/outpost/mining_main/secondary_gear_storage) -"ZF" = ( -/obj/effect/step_trigger/teleporter/from_mining, -/turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/outpost/mining_main/passage) "ZO" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -26607,7 +26594,7 @@ OH us us us -ZF +us "} (128,1,1) = {" Se @@ -26801,7 +26788,7 @@ OH us us us -ZF +us "} (129,1,1) = {" Se @@ -26995,7 +26982,7 @@ mk us us us -ZF +us "} (130,1,1) = {" Se @@ -27189,7 +27176,7 @@ mk us us us -ZF +us "} (131,1,1) = {" Se @@ -27383,7 +27370,7 @@ OH us us us -ZF +us "} (132,1,1) = {" Se @@ -27577,7 +27564,7 @@ mk us us us -ZF +us "} (133,1,1) = {" Se @@ -27771,7 +27758,7 @@ OH us us us -ZF +us "} (134,1,1) = {" Se @@ -27965,7 +27952,7 @@ mk us us us -ZF +us "} (135,1,1) = {" Se @@ -28159,7 +28146,7 @@ OH us us us -ZF +us "} (136,1,1) = {" Se @@ -28353,7 +28340,7 @@ OH us us us -ZF +us "} (137,1,1) = {" Se @@ -37288,8 +37275,8 @@ OH OH OH jz -WM -WM +As +As SD OH OH @@ -37482,8 +37469,8 @@ OH OH OH jz -OH -OH +As +As SD OH OH diff --git a/maps/tether/levels/plains.dmm b/maps/tether/levels/plains.dmm index 5d5905c37ca3..a71bc8e6ad49 100644 --- a/maps/tether/levels/plains.dmm +++ b/maps/tether/levels/plains.dmm @@ -87,11 +87,6 @@ "A" = ( /turf/unsimulated/wall/planetary/virgo3b, /area/tether/outpost/exploration_shed) -"B" = ( -/obj/effect/floor_decal/rust, -/obj/effect/step_trigger/teleporter/from_plains, -/turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/tether/outpost/exploration_shed) "D" = ( /mob/living/simple_mob/animal/passive/gaslamp, /turf/simulated/floor/outdoors/grass/sif/virgo3b, @@ -22845,7 +22840,7 @@ u b "} (118,1,1) = {" -B +O O E O @@ -23039,7 +23034,7 @@ u b "} (119,1,1) = {" -B +O O O O @@ -23233,7 +23228,7 @@ u b "} (120,1,1) = {" -B +O O O O @@ -23427,7 +23422,7 @@ u b "} (121,1,1) = {" -B +O O O O @@ -23621,7 +23616,7 @@ u b "} (122,1,1) = {" -B +O O O O @@ -23815,7 +23810,7 @@ u b "} (123,1,1) = {" -B +O O O O @@ -24009,7 +24004,7 @@ u b "} (124,1,1) = {" -B +O O O O @@ -24203,7 +24198,7 @@ u b "} (125,1,1) = {" -B +O O O O @@ -24397,7 +24392,7 @@ u b "} (126,1,1) = {" -B +O O m G diff --git a/maps/tether/levels/station1.dmm b/maps/tether/levels/station1.dmm index ab124ec41474..bc7c78fb6248 100644 --- a/maps/tether/levels/station1.dmm +++ b/maps/tether/levels/station1.dmm @@ -916,9 +916,6 @@ }, /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/shuttle/securiship/cockpit) -"bQ" = ( -/turf/simulated/floor, -/area/maintenance/station/eng_lower) "bR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -1827,8 +1824,8 @@ "dA" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass_science{ - name = "Exploration"; - req_one_access = list(19,43,67) + name = "Exploration Lobby"; + req_one_access = null }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -2140,12 +2137,6 @@ /obj/machinery/camera/network/engineering, /turf/simulated/floor/tiled, /area/engineering/engine_eva) -"ej" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor, -/area/maintenance/station/eng_lower) "ek" = ( /obj/machinery/vending/cola, /turf/simulated/floor/tiled, @@ -2562,9 +2553,6 @@ }, /turf/simulated/floor/tiled, /area/security/customs) -"eY" = ( -/turf/simulated/floor/wood, -/area/maintenance/abandonedlibrary) "eZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -2769,9 +2757,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/hallway) -"fv" = ( -/turf/simulated/floor, -/area/constructionsite) "fw" = ( /obj/structure/table/standard, /obj/item/towel, @@ -3360,9 +3345,6 @@ }, /turf/simulated/floor/tiled/white, /area/shuttle/medivac/cockpit) -"gP" = ( -/turf/simulated/floor, -/area/vacant/vacant_restaurant_lower) "gQ" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 @@ -5957,12 +5939,6 @@ }, /turf/simulated/floor, /area/constructionsite) -"mh" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/turf/simulated/floor, -/area/maintenance/station/eng_lower) "mi" = ( /turf/simulated/floor/wood, /area/crew_quarters/heads/blueshield) @@ -6395,9 +6371,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/shield_gen) -"nd" = ( -/turf/simulated/floor, -/area/maintenance/station/eng_lower) "ne" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -8125,11 +8098,6 @@ /obj/structure/bed/chair/bay/chair, /turf/simulated/floor/tiled/eris/dark/violetcorener, /area/shuttle/securiship/general) -"qE" = ( -/obj/structure/bookcase, -/obj/effect/debris/cleanable/cobweb, -/turf/simulated/floor/wood, -/area/maintenance/abandonedlibrary) "qF" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 @@ -9469,9 +9437,6 @@ }, /turf/simulated/floor, /area/vacant/vacant_restaurant_lower) -"ts" = ( -/turf/simulated/floor/wood/broken, -/area/maintenance/station/eng_lower) "tt" = ( /turf/simulated/floor/holofloor/tiled/dark, /area/tether/elevator/two) @@ -9535,9 +9500,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/docks) -"tB" = ( -/turf/simulated/floor/wood/broken, -/area/maintenance/abandonedlibrary) "tC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -10968,9 +10930,6 @@ }, /turf/simulated/floor/tiled/eris/techmaint_panels, /area/shuttle/securiship/engines) -"wL" = ( -/turf/simulated/floor/plating, -/area/maintenance/abandonedlibrary) "wM" = ( /obj/spawner/window/low_wall/full/firelocks, /obj/effect/paint_stripe/sun, @@ -12322,9 +12281,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_gen) -"zw" = ( -/turf/simulated/floor/plating, -/area/maintenance/abandonedlibraryconference) "zx" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -12575,13 +12531,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/obj/machinery/door/airlock/science{ - name = "Contraband and Security holdings"; - req_one_access = list(44) - }, /obj/structure/cable/pink{ icon_state = "4-8" }, +/obj/machinery/door/airlock/glass/security{ + name = "Exploration Security Station"; + req_one_access = list(38,63) + }, /turf/simulated/floor/tiled, /area/security/checkpoint/science) "Aa" = ( @@ -13340,9 +13296,6 @@ }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) -"BE" = ( -/turf/simulated/floor, -/area/maintenance/station/eng_lower) "BF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -15137,6 +15090,12 @@ /obj/item/tank/oxygen, /obj/item/tank/oxygen, /obj/item/tank/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "Fa" = ( @@ -17128,9 +17087,6 @@ }, /turf/simulated/floor/tiled, /area/security/customs) -"Jh" = ( -/turf/simulated/floor, -/area/constructionsite) "Ji" = ( /obj/structure/reagent_dispensers/fueltank, /turf/simulated/floor, @@ -19506,16 +19462,11 @@ "Om" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/purple/border, -/obj/structure/table/rack/shelf, /obj/structure/window/reinforced{ dir = 4; pixel_x = 3 }, -/obj/item/suit_cooling_unit, -/obj/item/clothing/mask/breath, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/medical/emt, -/obj/item/clothing/head/helmet/space/void/medical/emt, +/obj/machinery/suit_storage_unit/search_and_rescue, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "On" = ( @@ -19560,7 +19511,7 @@ /area/tether/exploration/crew) "Os" = ( /obj/item/cell/potato, -/obj/item/frame/apc, +/obj/item/frame2/apc, /turf/simulated/floor, /area/vacant/vacant_restaurant_lower) "Ot" = ( @@ -20771,16 +20722,11 @@ /turf/simulated/floor/tiled, /area/hallway/station/docks) "QO" = ( -/obj/structure/table/rack/shelf, /obj/structure/window/reinforced{ dir = 4; pixel_x = 3 }, -/obj/item/suit_cooling_unit, -/obj/item/clothing/mask/breath, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/medical/emt, -/obj/item/clothing/head/helmet/space/void/medical/emt, +/obj/machinery/suit_storage_unit/search_and_rescue, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "QP" = ( @@ -21058,10 +21004,6 @@ /obj/structure/bed/chair/comfy/black, /turf/simulated/floor/plating, /area/maintenance/abandonedlibrary) -"Rx" = ( -/obj/effect/floor_decal/rust, -/turf/simulated/floor, -/area/maintenance/station/eng_lower) "Ry" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -21148,9 +21090,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled, /area/hallway/station/docks) -"RM" = ( -/turf/simulated/floor, -/area/maintenance/station/spacecommandmaint) "RN" = ( /turf/simulated/floor/tiled, /area/engineering/atmos/backup) @@ -21443,9 +21382,6 @@ /obj/structure/table, /turf/simulated/floor/plating, /area/maintenance/abandonedlibrary) -"Sp" = ( -/turf/simulated/floor/carpet, -/area/maintenance/abandonedlibrary) "Sq" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 1 @@ -23991,9 +23927,6 @@ }, /turf/simulated/floor, /area/maintenance/station/eng_lower) -"Xn" = ( -/turf/simulated/floor, -/area/vacant/vacant_restaurant_lower) "Xo" = ( /obj/machinery/air_alarm{ dir = 1; @@ -24722,7 +24655,7 @@ /turf/simulated/floor/tiled, /area/engineering/hallway) "YM" = ( -/obj/item/frame/apc, +/obj/item/frame2/apc, /turf/simulated/floor, /area/constructionsite) "YN" = ( @@ -25181,6 +25114,8 @@ pixel_x = -3; pixel_y = 7 }, +/obj/item/binoculars, +/obj/item/binoculars, /turf/simulated/floor/wood, /area/tether/exploration/crew) "ZI" = ( @@ -42879,7 +42814,7 @@ ng ng ng ng -Xn +ng eF ng ng @@ -44043,7 +43978,7 @@ GS ng ng ng -gP +ng xJ ng ng @@ -46715,7 +46650,7 @@ qx mI mI mI -bQ +iw qm sh Qy @@ -46911,7 +46846,7 @@ Qt mI ya qm -bQ +iw Qy FG NU @@ -47103,9 +47038,9 @@ vD bT wT mI -bQ +iw qm -bQ +iw Qy Qy Qy @@ -47132,7 +47067,7 @@ VO Do Xp zd -ej +dl Vc Ig RH @@ -47297,12 +47232,12 @@ hy nw tP mI -bQ +iw qm -bQ -bQ +iw +iw Ag -bQ +iw pb sh ZL @@ -47491,9 +47426,9 @@ yq yq NV mI -bQ +iw Wy -ej +dl dl Ox dl @@ -47546,7 +47481,7 @@ Ap Qg Qg Qg -fv +Qg Qg Qg LC @@ -47701,9 +47636,9 @@ zM Zk Md zM -Rx Ag -bQ +Ag +iw Fx sh cm @@ -47741,11 +47676,11 @@ aF Qg Qg Ji -fv +Qg Qg LC -Jh -fv +Qg +Qg Qg LC rF @@ -47884,7 +47819,7 @@ Zw Vp zM qm -bQ +iw zM Zw Zw @@ -47936,7 +47871,7 @@ Qg Qg Qg Qg -fv +Qg LC Qg Qg @@ -48078,7 +48013,7 @@ Zw Vp zM qm -bQ +iw zM Zw Zw @@ -48086,15 +48021,15 @@ zM zM zM zM -bQ -bQ -bQ -bQ -bQ -bQ -bQ -bQ -bQ +iw +iw +iw +iw +iw +iw +iw +iw +iw zM TA Zf @@ -48125,10 +48060,10 @@ bS Wp LC Si -Jh Qg Qg -fv +Qg +Qg Wp Qg LC @@ -48272,23 +48207,23 @@ Zw Vp zM qm -bQ +iw zM zM zM zM -bQ -bQ -bQ -bQ -bQ -bQ -bQ -bQ -bQ -bQ -bQ -bQ +iw +iw +iw +iw +iw +iw +iw +iw +iw +iw +iw +iw Jm xB IW @@ -48326,9 +48261,9 @@ LC yH LC LC -fv -fv -fv +Qg +Qg +Qg LC Ap gf @@ -48466,19 +48401,19 @@ Zw Vp zM qm -bQ +iw zM zM -bQ -bQ -bQ -bQ -bQ -bQ -bQ -bQ -bQ -bQ +iw +iw +iw +iw +iw +iw +iw +iw +iw +iw zM zM zM @@ -48660,13 +48595,13 @@ Zw Vp zM qm -bQ -bQ +iw +iw zM -bQ -bQ -bQ -bQ +iw +iw +iw +iw zM zM zM @@ -48707,7 +48642,7 @@ jj Qg LC Ap -fv +Qg Qg Qg LC @@ -48854,12 +48789,12 @@ Zw zM zM qm -bQ -bQ -bQ -bQ -bQ -bQ +iw +iw +iw +iw +iw +iw zM zM Zw @@ -48898,17 +48833,17 @@ SK SK SK Uj -fv +Qg LC Pc Qg -fv +Qg Qg LC Qg aF Qg -fv +Qg LC Qg Qg @@ -49046,12 +48981,12 @@ mI Zw zM zM -bQ +iw qm -bQ -bQ -bQ -bQ +iw +iw +iw +iw zM zM zM @@ -49091,7 +49026,7 @@ Qg YM Qg Qg -fv +Qg Qg LC Fm @@ -49104,7 +49039,7 @@ LC zW LC LC -fv +Qg Qg Qg Qg @@ -49239,10 +49174,10 @@ Ph mI Vp zM -bQ +iw tm Nd -bQ +iw zM zM zM @@ -49291,9 +49226,9 @@ Bg ll Qg Qg -fv Qg -Jh +Qg +Qg Qg Qg Qg @@ -49433,7 +49368,7 @@ Qk Qk zM zM -bQ +iw qm zM zM @@ -49622,12 +49557,12 @@ DB DB zM xL -BE +iw mq iw zM zM -bQ +iw qm zM Zw @@ -49813,15 +49748,15 @@ ZZ ZZ DB DB -bQ +iw +jR +iw +iw +iw +iw jR -bQ -bQ -bQ -nd -mh zM -bQ +iw qm zM Zw @@ -49865,7 +49800,7 @@ lx lx lx AM -RM +cu bf bf bf @@ -50008,14 +49943,14 @@ ZZ DB zU zU -bQ -bQ -bQ -bQ -bQ -bQ +iw +iw +iw +iw +iw +iw zM -bQ +iw qm zM zM @@ -50202,16 +50137,16 @@ ZZ DB bv YH -bQ -bQ +iw +iw ZA -bQ -bQ -bQ +iw +iw +iw Jm -bQ +iw qm -bQ +iw zM Zw UT @@ -50396,14 +50331,14 @@ ZZ DB aM aM -bQ -bQ -bQ -bQ -bQ -bQ +iw +iw +iw +iw +iw +iw zM -bQ +iw Wy hz zM @@ -50589,16 +50524,16 @@ ZZ ZZ DB DB -bQ +iw xI -bQ -bQ -bQ +iw +iw +iw Ag qK zM -bQ -bQ +iw +iw qm zM Zw @@ -50792,7 +50727,7 @@ sy xN xN xN -bQ +iw ga zM Zw @@ -51770,7 +51705,7 @@ Rk zM HM eC -ts +Dm uN au iB @@ -52212,7 +52147,7 @@ St zm Yr ey -zw +zm Gr Vp Vp @@ -52390,8 +52325,8 @@ PW PW EM Xc -eY -qE +cU +Pk CE nM Gh @@ -52584,11 +52519,11 @@ NN XG fz Hi -wL +CJ Pk Vg -qE -eY +Pk +cU vl CJ FS @@ -52777,17 +52712,17 @@ ui Th da fz -wL +CJ Xh cU Ts -wL +CJ Xk Cl Xk Xk Xh -wL +CJ jT iO iO @@ -53360,11 +53295,11 @@ ui pR fz Mt -eY -wL +cU +CJ pT -wL -eY +CJ +cU HK Lv So @@ -53554,15 +53489,15 @@ ui tn fz OV -tB +Xk KG -eY -qE +cU +Pk Xk Ef -wL +CJ pC -wL +CJ uq oh Sm @@ -53747,9 +53682,9 @@ vc ui eP fz -qE +Pk MG -eY +cU kr fS kf @@ -54336,9 +54271,9 @@ Go fc ZK LB -wL +CJ gE -wL +CJ tf jf Zw @@ -54529,8 +54464,8 @@ Ok oG SU ZK -Sp -wL +ja +CJ iI fR jf diff --git a/maps/tether/levels/station2.dmm b/maps/tether/levels/station2.dmm index 2552197e4c77..5ea17f5650eb 100644 --- a/maps/tether/levels/station2.dmm +++ b/maps/tether/levels/station2.dmm @@ -2131,7 +2131,8 @@ "ew" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/vault/bolted{ - req_access = list(53) + req_access = list(53); + id_tag = "vault_bolt" }, /obj/machinery/door/blast/regular{ id = "VaultAc"; @@ -4779,6 +4780,7 @@ /obj/structure/railing{ dir = 4 }, +/obj/structure/railing, /turf/simulated/open, /area/engineering/foyer_mezzenine) "jN" = ( @@ -13871,9 +13873,6 @@ dir = 4 }, /obj/machinery/holopad, -/obj/structure/window/reinforced/polarized/full{ - id = "qm_office" - }, /turf/simulated/floor/wood, /area/quartermaster/qm) "Cg" = ( @@ -22567,7 +22566,7 @@ /area/shuttle/excursion/general) "Uh" = ( /obj/effect/floor_decal/rust, -/obj/item/frame/apc, +/obj/item/frame2/apc, /turf/simulated/floor/plating, /area/vacant/vacant_restaurant_upper) "Ui" = ( @@ -24725,7 +24724,9 @@ /area/maintenance/station/eng_upper) "YA" = ( /obj/effect/floor_decal/industrial/warning, -/obj/machinery/sheet_silo, +/obj/machinery/sheet_silo{ + obj_persist_static_id = "tether_silo" + }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/refinery) "YB" = ( diff --git a/maps/tether/levels/surface1.dmm b/maps/tether/levels/surface1.dmm index ce2060307855..5049747f079a 100644 --- a/maps/tether/levels/surface1.dmm +++ b/maps/tether/levels/surface1.dmm @@ -362,6 +362,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "alC" = ( @@ -472,6 +473,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 10 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/rnd/hallway) "anu" = ( @@ -748,6 +750,10 @@ pixel_y = 30 }, /obj/map_helper/airlock/sensor/chamber_sensor, +/obj/machinery/atmospherics/component/unary/vent_scrubber/high_power{ + dir = 4 + }, +/obj/map_helper/airlock/atmos/scrubber, /turf/simulated/floor/tiled, /area/rnd/external) "aub" = ( @@ -992,6 +998,9 @@ dir = 4 }, /obj/machinery/door/airlock/maintenance/common, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/research) "aAt" = ( @@ -1175,8 +1184,11 @@ /turf/simulated/floor, /area/maintenance/substation/SurfMedsubstation) "aFc" = ( -/turf/simulated/floor/tiled/techfloor/grid, -/area/tether/surfacebase/public_garden_one) +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/engineering/atmos) "aFF" = ( /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 10 @@ -1239,6 +1251,9 @@ dir = 1; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "aGf" = ( @@ -1357,7 +1372,7 @@ /obj/effect/floor_decal/corner/red/border{ dir = 4 }, -/obj/machinery/atmospherics/component/binary/pump/high_power/on{ +/obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 4 }, /turf/simulated/floor/tiled, @@ -1529,15 +1544,15 @@ /area/engineering/atmos) "aMg" = ( /obj/structure/railing, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/grille, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ frequency = 1379; id_tag = "civ_airlock_pump" }, /obj/map_helper/airlock/atmos/chamber_pump, +/obj/machinery/power/apc/north_mount, +/obj/structure/cable{ + icon_state = "0-2" + }, /turf/simulated/floor/tiled, /area/storage/surface_eva/external) "aMH" = ( @@ -1672,6 +1687,9 @@ /obj/machinery/atmospherics/pipe/simple/visible/supply{ dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 5 + }, /turf/simulated/floor/plating, /area/maintenance/lower/research) "aPo" = ( @@ -1725,6 +1743,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/hallway) "aQU" = ( @@ -1824,7 +1845,7 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/mining_eva) "aTK" = ( -/obj/machinery/atmospherics/component/unary/freezer{ +/obj/machinery/atmospherics/portables_connector{ dir = 4 }, /turf/simulated/floor/tiled/techmaint, @@ -2935,11 +2956,6 @@ }, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/surfacebase/outside/outside1) -"bCl" = ( -/obj/structure/railing, -/obj/structure/stairs/spawner/east, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/centralstairwell) "bDa" = ( /obj/structure/cable{ icon_state = "4-8" @@ -2997,6 +3013,9 @@ locked = 1 }, /obj/map_helper/airlock/door/ext_door, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, /turf/simulated/floor/tiled/steel_grid, /area/storage/surface_eva/external) "bEE" = ( @@ -3234,6 +3253,9 @@ /obj/structure/cable{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "bKD" = ( @@ -3260,6 +3282,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/hallway) "bLb" = ( @@ -3382,6 +3407,7 @@ /obj/structure/cable/cyan{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/visible/black, /turf/simulated/floor/tiled, /area/engineering/atmos) "bOD" = ( @@ -3450,6 +3476,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "bRm" = ( @@ -3955,6 +3982,7 @@ /obj/effect/floor_decal/corner/lightgrey/bordercorner{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernorthhall) "cfT" = ( @@ -4307,6 +4335,7 @@ pixel_y = 24 }, /obj/map_helper/airlock/sensor/int_sensor, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernortheva) "cnc" = ( @@ -4318,6 +4347,9 @@ dir = 1; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 10 + }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/xenoflora) "cni" = ( @@ -4651,6 +4683,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "cvo" = ( @@ -4974,6 +5009,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 6 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "cEJ" = ( @@ -5081,6 +5119,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/xenoflora) "cHk" = ( @@ -5517,8 +5558,12 @@ /turf/simulated/floor/plating, /area/crew_quarters/sleep/maintDorm1) "cSI" = ( -/turf/simulated/floor/plating, -/area/maintenance/lowmedbaymaint) +/obj/machinery/atmospherics/pipe/simple/visible/red, +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/engineering/atmos) "cSR" = ( /obj/structure/catwalk, /obj/machinery/light/small{ @@ -5661,6 +5706,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 10 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/storage/surface_eva) "cVF" = ( @@ -5760,9 +5808,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5 - }, +/obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled, /area/storage/surface_eva/external) "cYI" = ( @@ -5844,15 +5890,13 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/brig) "dak" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ - dir = 4 - }, /obj/effect/floor_decal/borderfloor{ dir = 8 }, /obj/effect/floor_decal/corner/yellow/border{ dir = 8 }, +/obj/machinery/atmospherics/pipe/manifold/visible/black, /turf/simulated/floor/tiled, /area/engineering/atmos) "dal" = ( @@ -6048,6 +6092,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "diE" = ( @@ -6224,12 +6269,11 @@ /area/rnd/outpost/heating) "dmT" = ( /obj/structure/railing, -/obj/structure/grille, -/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ - frequency = 1379; - id_tag = "civ_airlock_pump" +/obj/structure/sign/nosmoking_2{ + pixel_y = 30 }, -/obj/map_helper/airlock/atmos/chamber_pump, +/obj/machinery/atmospherics/component/unary/vent_scrubber/high_power, +/obj/map_helper/airlock/atmos/scrubber, /turf/simulated/floor/tiled, /area/storage/surface_eva/external) "dnl" = ( @@ -6551,6 +6595,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/research) "dtJ" = ( @@ -6593,6 +6640,9 @@ /obj/item/radio/intercom{ pixel_y = -24 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/hallway) "dul" = ( @@ -6633,6 +6683,7 @@ /obj/machinery/door/airlock/maintenance/rnd{ name = "Science Maintenance" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/steel_grid, /area/rnd/hallway) "dvX" = ( @@ -6875,6 +6926,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/rnd/hallway) "dDz" = ( @@ -7037,6 +7091,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/solars) "dJe" = ( @@ -7322,6 +7377,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "dSa" = ( @@ -7360,10 +7416,6 @@ }, /turf/simulated/floor, /area/rnd/outpost/atmos) -"dSQ" = ( -/obj/structure/railing, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) "dSV" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass/atmos{ @@ -7380,6 +7432,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 1 }, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/storage/surface_eva/external) "dTk" = ( @@ -7783,6 +7838,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/research) "edz" = ( @@ -7976,6 +8034,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ dir = 6 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/xenoflora) "ejK" = ( @@ -8037,18 +8096,16 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ - dir = 8; - frequency = 1379; - id_tag = "rnd_s_airlock_pump" - }, /obj/effect/floor_decal/steeldecal/steel_decals3{ dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals3{ dir = 5 }, -/obj/map_helper/airlock/atmos/chamber_pump, +/obj/machinery/atmospherics/component/unary/env_heat_pump{ + dir = 8 + }, +/obj/map_helper/airlock/atmos/chamber_temperature_adjuster, /turf/simulated/floor/tiled, /area/rnd/external) "elf" = ( @@ -8615,15 +8672,6 @@ }, /turf/simulated/floor/carpet, /area/crew_quarters/visitor_dining) -"eEA" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/closet/crate, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/turf/simulated/floor/tiled/steel_dirty/virgo3b{ - outdoors = 0 - }, -/area/tether/surfacebase/old_tram) "eFC" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, @@ -8910,6 +8958,9 @@ pixel_y = -40 }, /obj/map_helper/airlock/sensor/chamber_sensor, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/storage/surface_eva/external) "ePJ" = ( @@ -9171,8 +9222,14 @@ /area/hallway/lower/first_west) "eYN" = ( /obj/structure/catwalk, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 5 + }, /turf/simulated/floor/plating, -/area/maintenance/lower/vacant_site) +/area/maintenance/lower/solars) "eZk" = ( /obj/machinery/portable_atmospherics/canister/empty/nitrous_oxide, /obj/machinery/atmospherics/pipe/simple/visible/black, @@ -9215,7 +9272,6 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -9226,6 +9282,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/hallway) "eZZ" = ( @@ -9398,6 +9457,9 @@ /obj/machinery/atmospherics/pipe/simple/visible/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/research) "fez" = ( @@ -9721,12 +9783,11 @@ /turf/simulated/floor/tiled/white, /area/rnd/chemistry_lab) "fli" = ( -/obj/structure/catwalk, /obj/machinery/light/small{ dir = 1 }, /turf/simulated/floor/plating, -/area/maintenance/lower/trash_pit) +/area/maintenance/lower/mining_eva) "flx" = ( /obj/machinery/button/remote/blast_door{ id = "suckysucky"; @@ -9802,6 +9863,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "fmy" = ( @@ -10202,7 +10266,7 @@ "fyb" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/black/border, -/obj/machinery/atmospherics/component/binary/pump/high_power/on, +/obj/machinery/atmospherics/pipe/simple/visible/black, /turf/simulated/floor/tiled, /area/engineering/atmos) "fyE" = ( @@ -10258,6 +10322,9 @@ /obj/machinery/airlock_sensor/phoron/airlock_exterior{ pixel_x = 25 }, +/obj/machinery/atmospherics/pipe/vent{ + dir = 1 + }, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/storage/surface_eva/external) "fzG" = ( @@ -10341,6 +10408,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "fBj" = ( @@ -10427,6 +10497,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/visible/black, /turf/simulated/floor/tiled, /area/engineering/atmos) "fDv" = ( @@ -10503,6 +10574,9 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernorthhall) "fEX" = ( @@ -10569,6 +10643,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/hallway) "fHf" = ( @@ -10627,6 +10704,7 @@ /obj/machinery/door/airlock/maintenance/common{ name = "Mining Maintenance Access" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/tether/surfacebase/lowernorthhall) "fHO" = ( @@ -10823,6 +10901,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 + }, /turf/simulated/floor/plating, /area/maintenance/lower/research) "fNI" = ( @@ -11566,6 +11647,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden, /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernortheva) "gft" = ( @@ -11702,9 +11784,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 4 }, -/obj/machinery/atmospherics/component/binary/pump/high_power/on{ - dir = 1 - }, +/obj/machinery/atmospherics/pipe/simple/visible/black, /turf/simulated/floor/tiled, /area/engineering/atmos) "giJ" = ( @@ -11874,8 +11954,13 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_8) "gkS" = ( -/turf/simulated/floor/tiled/techfloor/grid, -/area/tether/surfacebase/public_garden_one) +/obj/machinery/atmospherics/component/binary/pump{ + dir = 8; + target_pressure = 300 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/turf/simulated/floor/tiled, +/area/engineering/atmos) "gld" = ( /obj/structure/cable/cyan{ icon_state = "4-8" @@ -12172,6 +12257,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "gtS" = ( @@ -12215,7 +12301,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden{ +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 5 }, /turf/simulated/floor/tiled, @@ -12527,6 +12613,9 @@ /obj/machinery/atmospherics/pipe/simple/visible/supply{ dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 5 + }, /turf/simulated/floor/plating, /area/maintenance/lower/research) "gCh" = ( @@ -12708,6 +12797,7 @@ /obj/effect/floor_decal/corner/lightgrey/border{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernorthhall) "gHK" = ( @@ -12748,6 +12838,7 @@ /obj/structure/cable{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/solars) "gIa" = ( @@ -12815,6 +12906,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "gJB" = ( @@ -12960,6 +13052,7 @@ /obj/machinery/atmospherics/pipe/manifold/visible/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "gNh" = ( @@ -13098,6 +13191,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "gQG" = ( @@ -13279,16 +13375,17 @@ /obj/structure/sign/nosmoking_2{ pixel_x = 32 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/rnd/hallway) "gYg" = ( -/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/phoronlock{ - frequency = 1379; - scrub_id = "civ_airlock_scrubber" - }, /obj/structure/railing{ dir = 1 }, +/obj/machinery/atmospherics/component/unary/env_heat_pump{ + dir = 1 + }, +/obj/map_helper/airlock/atmos/chamber_temperature_adjuster, /turf/simulated/floor/tiled/techmaint, /area/storage/surface_eva/external) "gYo" = ( @@ -13373,6 +13470,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "hdR" = ( @@ -13452,6 +13550,9 @@ dir = 1 }, /obj/structure/disposalpipe/junction/yjunction, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/north_stairs_one) "hfw" = ( @@ -13847,9 +13948,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) -"hqx" = ( -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) "hqz" = ( /obj/structure/sink{ dir = 4; @@ -14029,13 +14127,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/outpost) -"htC" = ( -/obj/structure/railing, -/obj/machinery/camera/network/medbay{ - dir = 10 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/centralstairwell) "htG" = ( /obj/effect/floor_decal/borderfloor{ dir = 10 @@ -14245,6 +14336,7 @@ /obj/machinery/door/airlock/maintenance/common, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, /obj/machinery/atmospherics/pipe/simple/visible/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/xenoflora) "hCm" = ( @@ -14316,6 +14408,9 @@ dir = 4 }, /obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/research) "hDY" = ( @@ -14328,19 +14423,15 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_6) -"hDZ" = ( -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/maintDorm2) "hEl" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ - dir = 8 - }, /obj/effect/floor_decal/borderfloor{ dir = 8 }, /obj/effect/floor_decal/corner/yellow/border{ dir = 8 }, +/obj/machinery/atmospherics/pipe/manifold4w/visible/yellow, +/obj/machinery/meter, /turf/simulated/floor/tiled, /area/engineering/atmos) "hEJ" = ( @@ -14480,14 +14571,10 @@ /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "hHF" = ( -/obj/structure/grille, -/obj/structure/railing{ - dir = 4 - }, /obj/structure/sign/fire{ pixel_y = 32 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/wall/prepainted/science, /area/rnd/external) "hHV" = ( /obj/structure/grille, @@ -14874,6 +14961,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/computer/timeclock/premade/west, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "hQu" = ( @@ -14914,6 +15002,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/research) "hQL" = ( @@ -14964,10 +15055,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) -"hSe" = ( -/obj/random/maintenance/cargo, -/turf/simulated/floor/plating, -/area/maintenance/lowmedbaymaint) "hSi" = ( /obj/structure/table/rack, /turf/simulated/floor/plating, @@ -14993,6 +15080,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "hUQ" = ( @@ -15178,10 +15268,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/xenoflora) -"hYQ" = ( -/obj/effect/step_trigger/teleporter/to_mining, -/turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/tether/surfacebase/lowernortheva/external) "hYS" = ( /obj/machinery/light/small{ dir = 8 @@ -15443,6 +15529,7 @@ opacity = 0; open_layer = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/engineering/atmos) "ihc" = ( @@ -15852,6 +15939,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals_central6{ pixel_y = 9 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/engineering/atmos) "iqq" = ( @@ -15948,6 +16036,7 @@ /obj/structure/railing{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/engineering/atmos) "iue" = ( @@ -16029,6 +16118,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "ixh" = ( @@ -16187,6 +16277,9 @@ }, /obj/effect/floor_decal/borderfloor/corner, /obj/effect/floor_decal/corner/yellow/bordercorner, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/engineering/atmos) "iAF" = ( @@ -16238,8 +16331,10 @@ /turf/simulated/floor/tiled, /area/rnd/outpost) "iCc" = ( -/turf/simulated/floor/tiled/techfloor/grid, -/area/tether/surfacebase/public_garden_one) +/obj/machinery/atmospherics/portables_connector, +/obj/machinery/portable_atmospherics/canister/air, +/turf/simulated/floor/tiled, +/area/engineering/atmos) "iCC" = ( /obj/effect/floor_decal/corner/lightorange{ dir = 5 @@ -16302,14 +16397,14 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 5 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "iDK" = ( /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/surfacebase/lowernortheva/external) -"iDS" = ( -/turf/simulated/floor/plating, -/area/maintenance/lower/xenoflora) "iEF" = ( /turf/simulated/wall/prepainted, /area/crew_quarters/visitor_laundry) @@ -16484,6 +16579,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "iKy" = ( @@ -16856,13 +16954,13 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/phoronlock{ - frequency = 1379; - scrub_id = "northciv_airlock_scrubber" - }, /obj/structure/railing{ dir = 8 }, +/obj/map_helper/airlock/atmos/scrubber, +/obj/machinery/atmospherics/component/unary/vent_scrubber/high_power{ + dir = 8 + }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/lowernortheva) "iVi" = ( @@ -17298,6 +17396,9 @@ }, /obj/structure/catwalk, /obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/xenoflora) "jge" = ( @@ -17348,8 +17449,13 @@ /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) "jih" = ( -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/public_garden_maintenance) +/obj/spawner/window/low_wall/full/firelocks, +/obj/effect/paint_stripe/pipecyan, +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/engineering/atmos) "jii" = ( /turf/simulated/wall/prepainted, /area/crew_quarters/sleep/maintDorm2) @@ -17588,6 +17694,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, /obj/machinery/atmospherics/pipe/simple/visible/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/xenoflora) "jrG" = ( @@ -17681,6 +17788,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "jum" = ( @@ -17804,6 +17914,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "jxV" = ( @@ -17950,6 +18063,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "jDD" = ( @@ -18433,6 +18547,7 @@ /obj/effect/floor_decal/corner/lightgrey/border{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernorthhall) "jPR" = ( @@ -18442,6 +18557,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, /obj/machinery/atmospherics/pipe/simple/visible/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/research) "jPU" = ( @@ -18463,6 +18579,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "jQg" = ( @@ -18742,6 +18861,9 @@ /obj/structure/cable/green{ icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/rnd/external) "jYf" = ( @@ -19288,12 +19410,12 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 5 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ - dir = 4 - }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernortheva) "krB" = ( @@ -19407,6 +19529,9 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/rnd/external) "ktx" = ( @@ -19597,6 +19722,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "kyA" = ( @@ -19706,6 +19832,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/rnd/hallway) "kCk" = ( @@ -19889,7 +20018,9 @@ /obj/structure/cable{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/hidden, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 + }, /turf/simulated/floor/tiled, /area/storage/surface_eva/external) "kFW" = ( @@ -19914,13 +20045,16 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/structure/catwalk, /obj/machinery/atmospherics/pipe/manifold/visible/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/visible/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ + dir = 4 + }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/lower/research) "kHm" = ( @@ -20068,8 +20202,11 @@ /turf/simulated/floor/tiled, /area/storage/primary) "kMt" = ( -/turf/simulated/floor/tiled/steel_dirty, -/area/maintenance/lower/atmos) +/obj/machinery/atmospherics/pipe/manifold/visible/black{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/engineering/atmos) "kNh" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -20158,13 +20295,13 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, -/obj/machinery/door/firedoor{ - dir = 1 - }, /obj/structure/extinguisher_cabinet{ dir = 1; pixel_y = -32 }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/hallway) "kQo" = ( @@ -20241,6 +20378,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 6 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/north_stairs_one) "kSj" = ( @@ -20544,6 +20682,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "kXM" = ( @@ -20649,16 +20788,16 @@ /turf/simulated/floor/tiled, /area/crew_quarters/locker) "kYD" = ( -/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/phoronlock{ - frequency = 1379; - scrub_id = "northciv_airlock_scrubber" - }, /obj/machinery/light/small{ dir = 4 }, /obj/structure/railing{ dir = 8 }, +/obj/machinery/atmospherics/component/unary/env_heat_pump{ + dir = 8 + }, +/obj/map_helper/airlock/atmos/chamber_temperature_adjuster, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/lowernortheva) "kZg" = ( @@ -20739,14 +20878,9 @@ /turf/simulated/floor/plating, /area/maintenance/lower/research) "lcn" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, -/obj/machinery/atmospherics/pipe/simple/visible/supply, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/turf/simulated/floor/tiled, +/area/engineering/atmos) "lcF" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -20880,6 +21014,7 @@ /obj/structure/catwalk, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/research) "lgw" = ( @@ -20930,6 +21065,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 10 }, +/obj/machinery/light/small{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "lht" = ( @@ -21213,6 +21351,9 @@ /obj/machinery/light/small{ dir = 1 }, +/obj/machinery/atmospherics/pipe/vent{ + dir = 4 + }, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/rnd/external) "lpU" = ( @@ -21239,6 +21380,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "lqD" = ( @@ -21570,6 +21714,7 @@ pixel_x = 32 }, /obj/machinery/atmospherics/component/unary/vent_pump/on, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/rnd/hallway) "lzC" = ( @@ -21757,6 +21902,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/visible/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/xenoflora) "lEH" = ( @@ -21933,6 +22079,9 @@ icon_state = "2-8" }, /obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 10 + }, /turf/simulated/floor/plating, /area/maintenance/lower/solars) "lMb" = ( @@ -22001,10 +22150,6 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/rnd/outpost) -"lOC" = ( -/obj/effect/floor_decal/rust, -/turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/tether/surfacebase/outside/outside1) "lOQ" = ( /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) @@ -22471,6 +22616,9 @@ /area/crew_quarters/sleep/maintDorm2) "maF" = ( /obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/solars) "maP" = ( @@ -22545,6 +22693,9 @@ dir = 4 }, /obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled/monofloor, /area/tether/surfacebase/north_stairs_one) "mbw" = ( @@ -22565,6 +22716,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/engineering/atmos) "mcw" = ( @@ -22618,8 +22770,16 @@ /turf/simulated/floor/tiled/steel_grid, /area/tether/surfacebase/cargostore/warehouse) "mdc" = ( -/turf/simulated/floor/plating, -/area/vacant/vacant_site) +/obj/machinery/atmospherics/pipe/simple/visible/green{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/yellow/border, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/engineering/atmos) "mdC" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/multi_tile/glass{ @@ -22627,6 +22787,9 @@ name = "Surface EVA" }, /obj/effect/floor_decal/steeldecal/steel_decals_central1, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled/monofloor, /area/storage/surface_eva) "mdJ" = ( @@ -22726,14 +22889,16 @@ /turf/simulated/floor/plating, /area/crew_quarters/sleep/maintDorm1) "mgO" = ( -/obj/structure/grille, -/obj/structure/railing{ - dir = 8 +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 10 }, -/obj/structure/sign/nosmoking_2{ - pixel_y = 30 +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 9 }, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9 + }, +/turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/rnd/external) "mhp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -23196,7 +23361,10 @@ /turf/simulated/floor/tiled/steel_dirty, /area/tether/surfacebase/cargostore/warehouse) "mvN" = ( -/obj/structure/disposalpipe/segment, +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 + }, /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "mvO" = ( @@ -23550,20 +23718,11 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/brig) "mCS" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/component/binary/heat_pump{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) +/turf/simulated/floor/tiled, +/area/engineering/atmos) "mDJ" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -23696,10 +23855,9 @@ /turf/simulated/floor/tiled, /area/engineering/atmos) "mGD" = ( -/turf/simulated/mineral/floor/virgo3b{ - ignore_mapgen = 1 - }, -/area/tether/surfacebase/outside/outside1) +/obj/machinery/atmospherics/pipe/simple/hidden/universal, +/turf/simulated/floor/tiled, +/area/engineering/atmos) "mGH" = ( /obj/structure/cable{ icon_state = "4-8" @@ -23999,7 +24157,7 @@ "mOp" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/orange/border, -/obj/machinery/atmospherics/component/binary/pump/high_power/on, +/obj/machinery/atmospherics/pipe/simple/visible/black, /turf/simulated/floor/tiled, /area/engineering/atmos) "mOC" = ( @@ -24065,6 +24223,9 @@ "mPG" = ( /obj/effect/floor_decal/rust, /obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/research) "mPO" = ( @@ -24198,6 +24359,7 @@ /obj/structure/cable/cyan{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/visible/black, /turf/simulated/floor/tiled, /area/engineering/atmos) "mSR" = ( @@ -24274,6 +24436,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/storage/surface_eva) "mWR" = ( @@ -24325,6 +24490,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/storage/surface_eva) "mXO" = ( @@ -24493,9 +24661,6 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/locker/laundry_arrival) -"ndc" = ( -/turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/tether/surfacebase/outside/outside1) "ndW" = ( /obj/machinery/atmospherics/pipe/manifold/visible/yellow{ dir = 4 @@ -24622,6 +24787,7 @@ /obj/structure/catwalk, /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/maintenance/common, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/research) "nhQ" = ( @@ -24667,6 +24833,7 @@ pixel_x = 26; pixel_y = -1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/rnd/external) "nis" = ( @@ -24676,6 +24843,7 @@ /obj/structure/catwalk, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, /obj/machinery/atmospherics/pipe/simple/visible/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/research) "njM" = ( @@ -24741,6 +24909,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/hallway) "nkI" = ( @@ -24755,17 +24926,6 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/brig/storage) -"nkP" = ( -/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/phoronlock{ - frequency = 1379; - scrub_id = "civ_airlock_scrubber" - }, -/obj/machinery/power/apc/north_mount, -/obj/structure/cable{ - icon_state = "0-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/storage/surface_eva/external) "nkZ" = ( /obj/structure/window/reinforced{ dir = 8 @@ -24842,6 +25002,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 10 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/storage/surface_eva) "nng" = ( @@ -25453,8 +25616,11 @@ /turf/simulated/floor/tiled, /area/crew_quarters/showers) "nGT" = ( -/turf/simulated/floor/plating, -/area/maintenance/lower/mining_eva) +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, +/turf/simulated/floor/tiled/steel_dirty/virgo3b, +/area/tether/surfacebase/lowernortheva/external) "nHh" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -26743,6 +26909,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/xenoflora) "owM" = ( @@ -26830,6 +26997,9 @@ /obj/machinery/light/small{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/research) "oyX" = ( @@ -27286,6 +27456,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "oPA" = ( @@ -27317,6 +27490,9 @@ locked = 1 }, /obj/map_helper/airlock/door/int_door, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_grid, /area/storage/surface_eva/external) "oPM" = ( @@ -27725,6 +27901,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 + }, /turf/simulated/floor/plating, /area/maintenance/lower/research) "pby" = ( @@ -27733,6 +27912,7 @@ }, /obj/machinery/door/firedoor/glass, /obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/tether/surfacebase/north_stairs_one) "pcc" = ( @@ -27921,6 +28101,7 @@ locked = 1 }, /obj/map_helper/airlock/door/ext_door, +/obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/steel_grid, /area/rnd/external) "pgI" = ( @@ -28152,16 +28333,6 @@ "pmc" = ( /turf/simulated/wall/prepainted, /area/crew_quarters/sleep/maintDorm3) -"pms" = ( -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 4 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) "png" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -28244,6 +28415,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/maintenance/lower/solars) "poO" = ( @@ -28330,6 +28504,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "prE" = ( @@ -29399,6 +29574,9 @@ dir = 6 }, /obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/research) "pUj" = ( @@ -29407,12 +29585,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) -"pUq" = ( -/obj/structure/railing{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/public_garden_maintenance) "pUN" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 @@ -29817,6 +29989,7 @@ icon_state = "1-2" }, /obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/solars) "qev" = ( @@ -29939,6 +30112,9 @@ /obj/machinery/power/apc/south_mount, /obj/structure/cable, /obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 + }, /turf/simulated/floor/plating, /area/maintenance/lower/solars) "qki" = ( @@ -29970,6 +30146,9 @@ /obj/machinery/atmospherics/pipe/manifold/visible/supply{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 10 + }, /turf/simulated/floor/plating, /area/maintenance/lower/research) "qlp" = ( @@ -30074,6 +30253,7 @@ id_tag = "northciv_airlock_outer"; locked = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/steel_grid, /area/tether/surfacebase/lowernortheva) "qoo" = ( @@ -30327,15 +30507,18 @@ "qtm" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/mauve/border, -/obj/machinery/door/firedoor{ - dir = 1 - }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/hallway) "qtD" = ( @@ -30367,8 +30550,15 @@ /turf/simulated/floor/wood, /area/vacant/vacant_bar) "quN" = ( -/turf/simulated/floor/plating, -/area/maintenance/lower/public_garden_maintenance) +/obj/structure/railing{ + dir = 4 + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/high_power{ + dir = 4 + }, +/obj/map_helper/airlock/atmos/scrubber, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/lowernortheva) "quR" = ( /obj/structure/closet, /obj/random/drinkbottle, @@ -30727,13 +30917,20 @@ pixel_x = 25; pixel_y = -8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/steel_grid, /area/tether/surfacebase/lowernortheva) "qEb" = ( -/obj/structure/catwalk, -/obj/random/maintenance/clean, -/turf/simulated/floor/plating, -/area/maintenance/lower/trash_pit) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/engineering/atmos) "qEi" = ( /obj/structure/catwalk, /obj/structure/cable/green{ @@ -30761,6 +30958,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/hallway) "qFl" = ( @@ -30843,6 +31043,9 @@ dir = 8; name = "Surface EVA" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled/monofloor, /area/storage/surface_eva) "qJt" = ( @@ -30874,15 +31077,11 @@ /turf/simulated/floor, /area/tether/surfacebase/security/gasstorage) "qKh" = ( -/obj/structure/sign/nosmoking_2{ - pixel_x = -32 - }, -/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/phoronlock{ - frequency = 1379; - scrub_id = "northciv_airlock_scrubber" +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 4 }, /turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/lowernortheva) +/area/engineering/atmos) "qKp" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -30971,6 +31170,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/solars) "qMv" = ( @@ -31183,6 +31383,9 @@ name = "package tagger - Void"; sort_tag = "Void" }, +/obj/machinery/camera/network/medbay{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralstairwell) "qPU" = ( @@ -31390,6 +31593,9 @@ pixel_y = -24 }, /obj/map_helper/airlock/sensor/ext_sensor, +/obj/machinery/atmospherics/pipe/vent{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/surfacebase/lowernortheva) "qVm" = ( @@ -32054,6 +32260,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernorthhall) "rnT" = ( @@ -32144,6 +32351,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 + }, /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "rsp" = ( @@ -32384,6 +32594,9 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/storage/surface_eva) "ryX" = ( @@ -32401,12 +32614,6 @@ /obj/effect/floor_decal/corner/mauve/border, /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) -"rzR" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/maintenance/lowmedbaymaint) "rAy" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -32427,26 +32634,28 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 4 }, -/obj/machinery/door/firedoor, /obj/structure/extinguisher_cabinet{ pixel_y = 30 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/hallway) "rAD" = ( /obj/structure/railing{ dir = 1 }, -/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/phoronlock{ - frequency = 1379; - scrub_id = "civ_airlock_scrubber" - }, /obj/structure/sign/fire{ pixel_y = -32 }, +/obj/map_helper/airlock/atmos/scrubber, +/obj/machinery/atmospherics/component/unary/vent_scrubber/high_power{ + dir = 1 + }, /turf/simulated/floor/tiled/techmaint, /area/storage/surface_eva/external) "rAF" = ( @@ -32458,6 +32667,9 @@ dir = 1; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "rAY" = ( @@ -32553,6 +32765,7 @@ /obj/machinery/vending/wallmed_airlock{ pixel_x = 32 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernorthhall) "rER" = ( @@ -33068,10 +33281,12 @@ name = "Research Division Access"; req_access = list(47) }, -/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_grid, /area/hallway/lower/first_west) "rRn" = ( @@ -33463,13 +33678,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) -"saV" = ( -/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/phoronlock{ - frequency = 1379; - scrub_id = "northciv_airlock_scrubber" - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/lowernortheva) "sbh" = ( /obj/machinery/air_alarm{ dir = 8; @@ -33792,8 +34000,11 @@ /turf/simulated/floor/plating, /area/maintenance/asmaint2) "sjS" = ( -/turf/simulated/floor/plating, -/area/vacant/vacant_bar) +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/engineering/atmos) "sjY" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 8 @@ -33945,6 +34156,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "snl" = ( @@ -33959,6 +34173,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/xenoflora) "snX" = ( @@ -34105,12 +34320,19 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "sqw" = ( -/obj/structure/grille, -/obj/structure/railing{ - dir = 4 +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 }, -/turf/simulated/floor/tiled/techmaint, -/area/rnd/external) +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/rnd/hallway) "sqG" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -34179,6 +34401,9 @@ dir = 4 }, /obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 10 + }, /turf/simulated/floor/plating, /area/maintenance/lower/research) "ssm" = ( @@ -34356,6 +34581,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernorthhall) "swt" = ( @@ -34542,6 +34770,7 @@ }, /obj/effect/floor_decal/borderfloor/cee, /obj/effect/floor_decal/industrial/danger/cee, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/engineering/atmos) "sDd" = ( @@ -34606,6 +34835,7 @@ /area/tether/surfacebase/security/lowerhall) "sEn" = ( /obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "sEW" = ( @@ -34637,6 +34867,7 @@ /obj/machinery/atmospherics/pipe/manifold/visible/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/xenoflora) "sGX" = ( @@ -34739,6 +34970,9 @@ pixel_y = 22 }, /obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 + }, /turf/simulated/floor/plating, /area/maintenance/lower/solars) "sLq" = ( @@ -34889,16 +35123,6 @@ /obj/item/reagent_containers/dropper, /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab) -"sOa" = ( -/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/phoronlock{ - frequency = 1379; - scrub_id = "civ_airlock_scrubber" - }, -/obj/structure/sign/nosmoking_2{ - pixel_y = 30 - }, -/turf/simulated/floor/tiled/techmaint, -/area/storage/surface_eva/external) "sOk" = ( /obj/structure/table/rack, /obj/machinery/door/window/eastright, @@ -34992,21 +35216,12 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/tether/surfacebase/tram) "sRo" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/rust, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/supply{ +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 }, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) +/obj/machinery/atmospherics/pipe/simple/visible/black, +/turf/simulated/floor/tiled, +/area/engineering/atmos) "sSa" = ( /obj/machinery/light/spot, /turf/simulated/floor/tiled/techfloor/grid/virgo3b, @@ -35155,8 +35370,15 @@ /turf/simulated/floor/tiled, /area/rnd/hallway) "sUU" = ( -/turf/simulated/floor/tiled/techfloor/grid, -/area/tether/surfacebase/public_garden_one) +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/solars) "sUX" = ( /obj/machinery/door/window/northright, /obj/effect/floor_decal/industrial/outline/yellow, @@ -35448,25 +35670,20 @@ /turf/simulated/floor/tiled/techmaint, /area/holodeck_control) "tdn" = ( -/turf/simulated/floor/tiled/techfloor/grid/virgo3b, -/area/tether/surfacebase/outside/outside1) -"tdu" = ( -/obj/effect/floor_decal/borderfloor{ +/obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 4 }, -/obj/effect/floor_decal/corner/yellow/border{ +/turf/simulated/floor/tiled, +/area/engineering/atmos) +"tdu" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 6 - }, -/obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 6 - }, -/turf/simulated/floor/tiled/steel_dirty/virgo3b{ - outdoors = 0 +/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ + dir = 1 }, -/area/tether/surfacebase/old_tram) +/turf/simulated/floor/tiled, +/area/engineering/atmos) "tdD" = ( /obj/effect/floor_decal/rust, /obj/machinery/portable_atmospherics/canister/phoron, @@ -35890,8 +36107,14 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/maintDorm3) "ttR" = ( -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) +/obj/machinery/atmospherics/pipe/simple/visible/green{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/engineering/atmos) "ttV" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/multi_tile/metal/mait{ @@ -35909,6 +36132,9 @@ dir = 4 }, /obj/machinery/meter, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 5 + }, /turf/simulated/floor/tiled, /area/engineering/atmos) "twy" = ( @@ -35977,6 +36203,7 @@ dir = 8 }, /obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/research) "tyN" = ( @@ -36007,9 +36234,6 @@ /obj/item/storage/fancy/markers, /turf/simulated/floor/plating, /area/crew_quarters/sleep/maintDorm1) -"tAe" = ( -/turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/tether/surfacebase/tunnel) "tAB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -36063,6 +36287,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "tCu" = ( @@ -36082,6 +36309,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "tCv" = ( @@ -36224,6 +36452,7 @@ /obj/machinery/atmospherics/pipe/zpipe/up/scrubbers{ dir = 1 }, +/obj/machinery/atmospherics/pipe/zpipe/up/aux, /turf/simulated/floor/plating, /area/engineering/atmos) "tEf" = ( @@ -36259,6 +36488,9 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "tEH" = ( @@ -36497,6 +36729,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/research) "tNc" = ( @@ -36825,6 +37060,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "tWp" = ( @@ -37057,11 +37293,7 @@ /turf/simulated/floor/tiled/techmaint, /area/holodeck_control) "ubB" = ( -/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/phoronlock{ - frequency = 1379; - scrub_id = "rnd_s_airlock_scrubber" - }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/mineral, /area/rnd/external) "ubM" = ( /obj/machinery/light/small{ @@ -37199,6 +37431,9 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernortheva) "ufQ" = ( @@ -37712,12 +37947,6 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) -"uvN" = ( -/obj/machinery/atmospherics/component/unary/heater{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/engineering/atmos) "uwj" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 4 @@ -38009,10 +38238,6 @@ /obj/machinery/camera/network/civilian, /turf/simulated/floor/tiled, /area/crew_quarters/showers) -"uHx" = ( -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plating, -/area/maintenance/lower/xenoflora) "uHG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -38101,6 +38326,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "uKW" = ( @@ -38155,6 +38383,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/storage/surface_eva) "uLV" = ( @@ -38278,6 +38509,10 @@ /obj/effect/floor_decal/steeldecal/steel_decals3{ dir = 6 }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/high_power{ + dir = 4 + }, +/obj/map_helper/airlock/atmos/scrubber, /turf/simulated/floor/tiled, /area/rnd/external) "uOz" = ( @@ -38468,9 +38703,6 @@ ignore_mapgen = 1 }, /area/tether/surfacebase/outside/outside1) -"uWt" = ( -/turf/simulated/floor/plating, -/area/vacant/vacant_bar) "uWz" = ( /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/plating, @@ -38689,9 +38921,6 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/firedoor{ - dir = 8 - }, /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -38699,6 +38928,7 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 4 }, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/rnd/hallway) "vbT" = ( @@ -38902,16 +39132,15 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos/processing) "vie" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ - dir = 4 - }, -/obj/machinery/meter, /obj/effect/floor_decal/borderfloor{ dir = 8 }, /obj/effect/floor_decal/corner/yellow/border{ dir = 8 }, +/obj/machinery/atmospherics/component/binary/heat_pump{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/engineering/atmos) "viB" = ( @@ -39703,6 +39932,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "vCj" = ( @@ -39838,6 +40068,9 @@ dir = 4 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "vFy" = ( @@ -40299,6 +40532,9 @@ /obj/machinery/atmospherics/pipe/simple/visible/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/research) "vPh" = ( @@ -40515,6 +40751,10 @@ /obj/machinery/light{ dir = 8 }, +/obj/machinery/atmospherics/portables_connector{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "vTu" = ( @@ -40646,21 +40886,18 @@ /obj/effect/floor_decal/steeldecal/steel_decals3{ dir = 5 }, -/obj/machinery/light_switch{ - pixel_y = 25 - }, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 8; frequency = 1379; id_tag = "rnd_s_airlock_pump" }, /obj/map_helper/airlock/atmos/chamber_pump, +/obj/structure/sign/nosmoking_2{ + pixel_y = 30 + }, /turf/simulated/floor/tiled, /area/rnd/external) "vXJ" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 9 - }, /obj/effect/floor_decal/borderfloor{ dir = 8 }, @@ -41880,6 +42117,7 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/rnd/hallway) "wEY" = ( @@ -41926,11 +42164,10 @@ /turf/simulated/floor/tiled, /area/engineering/atmos) "wGt" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/steel_dirty/virgo3b{ - outdoors = 0 - }, -/area/tether/surfacebase/old_tram) +/obj/machinery/atmospherics/pipe/manifold/visible/cyan, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/turf/simulated/floor/tiled, +/area/engineering/atmos) "wGP" = ( /obj/machinery/atmospherics/portables_connector, /obj/effect/floor_decal/corner/purple{ @@ -41984,24 +42221,19 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 10 - }, /obj/structure/cable{ icon_state = "1-2" }, /obj/structure/cable{ icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernortheva) "wJB" = ( -/obj/machinery/air_alarm{ - pixel_y = 22 - }, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/air_alarm/east_mount, /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "wKf" = ( @@ -42059,7 +42291,7 @@ "wLI" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/white/border, -/obj/machinery/atmospherics/component/binary/pump/high_power/on, +/obj/machinery/atmospherics/pipe/simple/visible/black, /turf/simulated/floor/tiled, /area/engineering/atmos) "wLU" = ( @@ -42265,6 +42497,7 @@ /obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "wRB" = ( @@ -42526,6 +42759,9 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/hallway) "wXS" = ( @@ -42554,6 +42790,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "wYh" = ( @@ -42648,6 +42887,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "wZP" = ( @@ -42673,6 +42915,7 @@ icon_state = "1-4" }, /obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/research) "xaC" = ( @@ -42700,6 +42943,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, /obj/machinery/atmospherics/pipe/simple/visible/supply, /obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/research) "xbO" = ( @@ -42819,6 +43063,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden, /obj/map_helper/airlock/door/int_door, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/steel_grid, /area/rnd/external) "xgV" = ( @@ -43169,12 +43414,12 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "xqC" = ( -/obj/structure/grille, -/obj/structure/railing{ - dir = 8 +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 5 }, -/turf/simulated/floor/tiled/techmaint, -/area/rnd/external) +/turf/simulated/floor/plating, +/area/maintenance/lower/research) "xqE" = ( /obj/structure/cable/yellow{ icon_state = "1-4" @@ -43429,11 +43674,11 @@ /turf/simulated/floor/tiled/dark, /area/storage/surface_eva) "xxB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/first_west) "xxM" = ( /obj/effect/floor_decal/borderfloor, /obj/machinery/light/small, @@ -43471,6 +43716,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "xyi" = ( @@ -43497,9 +43745,6 @@ /obj/item/radio, /turf/simulated/floor/tiled, /area/rnd/testingroom) -"xyG" = ( -/turf/simulated/floor/virgo3b, -/area/tether/surfacebase/outside/outside1) "xyK" = ( /obj/structure/cable/heavyduty{ icon_state = "4-8" @@ -43758,7 +44003,6 @@ /turf/simulated/floor/tiled/steel_dirty, /area/rnd/outpost/storage) "xHn" = ( -/obj/structure/grille, /obj/structure/railing{ dir = 4 }, @@ -43768,6 +44012,9 @@ frequency = 1379; id_tag = "northciv_airlock_pump" }, +/obj/structure/sign/nosmoking_2{ + pixel_x = -32 + }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/lowernortheva) "xHo" = ( @@ -44270,11 +44517,17 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "ych" = ( -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, +/turf/simulated/floor/tiled/steel_dirty/virgo3b, +/area/storage/surface_eva/external) "ycD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/spline/plain{ @@ -44551,9 +44804,10 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/rnd/external) "ylH" = ( @@ -59549,13 +59803,13 @@ elP elP elP aEl -gkS -aFc -aFc -aFc -aFc -sUU -aFc +eGo +eGo +eGo +eGo +eGo +eGo +eGo bre his his @@ -59565,7 +59819,7 @@ nLH kPz ikt jCv -jCv +ych fyZ wtA his @@ -59743,13 +59997,13 @@ elP elP elP aEl -aFc -sUU -aFc eGo eGo -aFc -gkS +eGo +eGo +eGo +eGo +eGo bre his his @@ -59937,9 +60191,9 @@ elP elP elP aEl -aFc -aFc -iCc +eGo +eGo +eGo eGo eGo eGo @@ -59950,7 +60204,7 @@ his isQ tXK qpi -sOa +qpi dmT cYq dTb @@ -60131,8 +60385,8 @@ elP elP elP aEl -aFc -aFc +eGo +eGo eGo eGo eGo @@ -60144,7 +60398,7 @@ his isQ tXK qpi -nkP +qpi aMg kFT eOM @@ -60325,13 +60579,13 @@ elP elP elP aEl -aFc eGo eGo -iCc eGo eGo -aFc +eGo +eGo +eGo bre his his @@ -60519,13 +60773,13 @@ elP elP elP aEl -gkS -aFc eGo eGo eGo -aFc -aFc +eGo +eGo +eGo +eGo bre ivS baG @@ -60713,13 +60967,13 @@ puQ aEl mkH aEl -sUU -aFc +eGo +eGo vAW fqB wuH -gkS -sUU +eGo +eGo bre ivS baG @@ -61733,10 +61987,10 @@ his his his his -fZN -fZN -fZN -fZN +his +his +his +his his his his @@ -61927,10 +62181,10 @@ his his his his -fZN -ubB -ubB -fZN +his +his +his +his his his his @@ -62123,7 +62377,7 @@ his his fZN hHF -sqw +fZN fZN his his @@ -62485,7 +62739,7 @@ eGv xOq pUj xOq -xOq +xxB xOq xOq vEz @@ -62513,7 +62767,7 @@ rki ksX jXH pgC -xvt +mgO uXC uXC uXC @@ -62644,11 +62898,11 @@ his rly aNj pRR -pUq ifV ifV ifV -jih +ifV +kaz cni bre bre @@ -62891,7 +63145,7 @@ ctQ rOR cbm kwE -qpe +sqw omk omk omk @@ -63062,16 +63316,16 @@ sua sua sua gzN -mdc +phe jTk -mdc +phe cfZ tIU lLU qMs dIB gHZ -dIB +eYN pvV qnR rJU @@ -63092,8 +63346,8 @@ aVp rJf gOa fZN -mgO -xqC +fZN +fZN fZN his his @@ -63253,13 +63507,13 @@ fLr kkn cqs phe -mdc -mdc -mdc -mdc -mdc -mdc -mdc +phe +phe +phe +phe +phe +phe +phe tIU gHN gHN @@ -63279,7 +63533,7 @@ flx pFz rft jbN -qpe +sqw omk tOS aph @@ -63444,16 +63698,16 @@ oMb xOq fAY wGb -mdc -mdc -mdc -mdc -mdc +phe +phe +phe +phe +phe jTk -mdc phe -mdc -mdc +phe +phe +phe tIU oHb oHb @@ -63473,7 +63727,7 @@ vRZ ycJ rJU sUO -qpe +sqw aVW aVW aVW @@ -63618,7 +63872,7 @@ iTc eSi oiD rly -jih +kaz kaz rly ceM @@ -63642,12 +63896,12 @@ alC alC fae dvD -mdc -mdc -mdc -mdc -mdc -mdc +phe +phe +phe +phe +phe +phe tIU tIU tIU @@ -63667,7 +63921,7 @@ gNF tBd cbm uQD -qpe +sqw aVW bUw aVW @@ -63813,7 +64067,7 @@ lfF oiD cni cni -quN +cmk xJL dBk qJd @@ -63835,12 +64089,12 @@ wbf fcZ fcZ wvB -mdc -mdc -mdc -mdc -mdc -mdc +phe +phe +phe +phe +phe +phe cJi sua sua @@ -64028,13 +64282,13 @@ wXZ wGb jTk jTk -mdc -mdc phe -mdc -mdc -mdc -mdc +phe +phe +phe +phe +phe +phe sua sua sua @@ -64221,19 +64475,19 @@ kYj jta fLr acR -mdc -mdc -mdc phe -mdc -mdc -mdc +phe +phe +phe +phe +phe +phe irV sua sua sua tIU -spN +sUU juN juN oln @@ -64417,17 +64671,17 @@ fLr sua sua sua -mdc -mdc -mdc -mdc -mdc +phe +phe +phe +phe +phe sua sua sua sua tIU -spN +sUU juN jFt jFt @@ -64612,16 +64866,16 @@ sua sua sua sua -mdc -mdc -mdc +phe +phe +phe guo sua sua sua sua tIU -spN +sUU juN bvO bvO @@ -64806,7 +65060,7 @@ sua sua sua sua -mdc +phe jTk jTk emA @@ -64815,7 +65069,7 @@ sua sua sua tIU -spN +sUU juN cLP cLP @@ -65009,7 +65263,7 @@ sua sua sua tIU -spN +sUU juN lvK bvO @@ -65025,7 +65279,7 @@ hJR oMB oMB fTb -qpe +sqw aVW aVW aVW @@ -65203,7 +65457,7 @@ sua sua sua tIU -spN +sUU juN cLP cLP @@ -65397,7 +65651,7 @@ sua sua sua tIU -spN +sUU juN bvO bvO @@ -65413,7 +65667,7 @@ bSX uEC bSX axa -qpe +sqw omk bLp bLp @@ -65591,7 +65845,7 @@ sua sua sua tIU -spN +sUU juN xcr xcr @@ -65610,7 +65864,7 @@ imB dDu dvR xaq -sBb +xqC bLp uCh uCh @@ -65765,7 +66019,7 @@ snl ibH bdi sBd -nGT +sBd rkZ fLr xAe @@ -65785,7 +66039,7 @@ sua sua sua tIU -spN +sUU juN xcr xcr @@ -65954,12 +66208,12 @@ mkS rfR pkY hzA -mvN -mvN -mvN -mvN -mvN -mvN +lZe +lZe +lZe +lZe +lZe +lZe lZe rey eeR @@ -66001,7 +66255,7 @@ fuf pTX dQJ opX -xxB +dQJ dQJ kGI dQJ @@ -66355,11 +66609,11 @@ oXQ vES rey oMr -uHx +oMr oMr mXi -iDS -iDS +bVo +bVo bVo tZw mga @@ -66549,7 +66803,7 @@ jMI uKU fLr iyH -iDS +bVo bVo huJ oMr @@ -66570,7 +66824,7 @@ tZw tZw tZw bLp -sRo +vOr uYR wrk pJV @@ -66759,9 +67013,9 @@ mNR tZw ggb hYH -iDS -iDS -iDS +bVo +bVo +bVo aCJ bLp fey @@ -67560,14 +67814,14 @@ iGi drN tFg mIF -qSU +hNQ bOd -qSU -qSU -aoc +nnD +nnD +sRo fDu mSt -hNQ +kMt tkj oSm pZm @@ -67575,7 +67829,7 @@ pZm pZm pZm vGE -ych +pYC sic vGE his @@ -67754,7 +68008,7 @@ moV oiY qAN oiY -oiY +qEb mPX tHp tHp @@ -67769,7 +68023,7 @@ pZm pZm pZm vGE -ych +pYC vMv vGE vGE @@ -67948,7 +68202,7 @@ qSU qSU qSU qSU -qSU +tdn qSU qSU qSU @@ -67963,16 +68217,16 @@ pZm pZm pZm vGE -ych +pYC wVw vGE dvi lJo mry -hqx -ych -ych -ych +pYC +pYC +pYC +pYC vGE his his @@ -68094,7 +68348,7 @@ jFz jFz jFz jFz -sEn +mvN sEn pby kSh @@ -68122,7 +68376,7 @@ qqd qqd mCf bLp -mCS +fey bLp uCh uCh @@ -68142,7 +68396,7 @@ qSU qSU qSU qSU -qSU +tdn pFp keb qZv @@ -68157,16 +68411,16 @@ oSm pZm pZm vGE -ych +pYC eGl vGE nTk -ych +pYC khn -ych -ych -hqx -ych +pYC +pYC +pYC +pYC vGE his his @@ -68316,7 +68570,7 @@ djJ lOQ lfi bLp -sRo +vOr bLp uCh uCh @@ -68336,7 +68590,7 @@ qSU qSU qSU qSU -qSU +tdn pkD pkD pkD @@ -68351,16 +68605,16 @@ oSm pZm pZm vGE -ych +pYC cWT vGE dvi -ych +pYC iZr -hqx -ych -ych -ych +pYC +pYC +pYC +pYC vGE his his @@ -68510,7 +68764,7 @@ eDq lOQ ucF vno -sRo +vOr bLp uCh uCh @@ -68530,7 +68784,7 @@ rga rga rga rga -rga +cSI bEs wKQ bEs @@ -68545,16 +68799,16 @@ oSm pZm pZm vGE -ych +pYC nYA vGE oQP -ych +pYC rEa nSb -hqx -ych -ych +pYC +pYC +pYC vGE his his @@ -68692,7 +68946,7 @@ tZw tZw ryX xTb -iDS +bVo rOS jEh hLB @@ -68724,7 +68978,7 @@ nqp dLW iua qSU -qSU +tdn nqp ldK eXL @@ -68739,7 +68993,7 @@ oSm vGE vGE vGE -ych +pYC ozq vGE vGE @@ -68849,10 +69103,10 @@ isQ nLH pMm nLH -eGP -eGP -eGP -eGP +jFz +fli +sBd +sBd wJB lho nwj @@ -68886,7 +69140,7 @@ uWW tZw ryX tZw -iDS +bVo rOS jEh hLB @@ -68918,7 +69172,7 @@ laB oSm eMp eMp -eMp +jih eMp oSm xQw @@ -68930,18 +69184,18 @@ lpU oSm oSm oSm -ych -ych +pYC +pYC xVh -ych -ych -ych +pYC +pYC +pYC ttV -ych +pYC crA -ych -ych -ych +pYC +pYC +pYC gju vGE his @@ -69023,7 +69277,7 @@ uXC ijH "} (127,1,1) = {" -hYQ +iDK iDK iDK wMH @@ -69044,8 +69298,8 @@ jTS ykP fpK eGP -saV -qKh +eGP +eGP eGP jJw jJw @@ -69080,7 +69334,7 @@ uWW tZw ryX tZw -iDS +bVo rOS jEh hLB @@ -69110,10 +69364,10 @@ nsD plD hLP vTc -uvN -aTK -xlc xlc +aTK +qKh +olq eMp iEZ xDs @@ -69124,18 +69378,18 @@ jyB cst cst oSm -ych pYC -ych -ych pYC -ych +pYC +pYC +pYC +pYC jIl -ych +pYC nSb sYr tPg -ych +pYC gju vGE his @@ -69217,7 +69471,7 @@ ujj ujj "} (128,1,1) = {" -hYQ +iDK iDK iDK wMH @@ -69238,7 +69492,7 @@ xtl bvK tNc eGP -xHn +quN xHn eGP eTu @@ -69319,7 +69573,7 @@ luN uTF oSm pYC -ych +pYC vGE vGE vGE @@ -69411,7 +69665,7 @@ osh qbg "} (129,1,1) = {" -hYQ +iDK iDK iDK iDK @@ -69499,8 +69753,8 @@ kgX lPH lPH cfb -qSU -qSU +hNQ +sjS qSU eMp aoc @@ -69512,8 +69766,8 @@ oui pgI pgI oSm -ych -ych +pYC +pYC vGE fVb dqk @@ -69523,8 +69777,8 @@ svy eif bxB ilY -uWt -sjS +dZL +dZL hfw yas dWg @@ -69605,7 +69859,7 @@ osh qbg "} (130,1,1) = {" -hYQ +iDK iDK iDK iDK @@ -69624,7 +69878,7 @@ wMH wMH wMH iDK -iDK +nGT qog geY ufe @@ -69675,7 +69929,7 @@ vny aqB oou sse -lcn +xbu xbu xbu tyn @@ -69693,7 +69947,7 @@ kgX agK fCg fVL -qSU +mCS qSU nqp eMp @@ -69706,8 +69960,8 @@ cUL oSm oSm oSm -ych -ych +pYC +pYC vGE vdG kfM @@ -69799,7 +70053,7 @@ osh qbg "} (131,1,1) = {" -hYQ +iDK iDK iDK iDK @@ -69839,7 +70093,7 @@ nTv hWK rkE uyB -mvN +lZe wLp ioI cBT @@ -69881,14 +70135,14 @@ igQ ipX mcv sDb -qSU -qSU -lPH +lcn +lcn +gkS twr +iCc +nYu +nUw xOF -qSU -qSU -qSU iEU oSm nMw @@ -69901,7 +70155,7 @@ sXS sXS oSm fTt -ych +pYC vGE rdj dEy @@ -69911,7 +70165,7 @@ oBS cKH cKH kfM -uWt +dZL qun aqJ diV @@ -69993,7 +70247,7 @@ osh qbg "} (132,1,1) = {" -hYQ +iDK iDK iDK iDK @@ -70065,7 +70319,7 @@ cCq bLp bLp bLp -dSQ +mas pub bLp bLp @@ -70078,10 +70332,10 @@ bzF oQx vsp nUw -vJA -qSU +ttR qSU qSU +gkc qSU rOk eMp @@ -70094,8 +70348,8 @@ qfH luN uTF oSm -ych -ych +pYC +pYC vGE nrR mRH @@ -70105,7 +70359,7 @@ ygD pyc amW kfM -uWt +dZL kfM kfM vqX @@ -70187,7 +70441,7 @@ osh qbg "} (133,1,1) = {" -hYQ +iDK iDK iDK iDK @@ -70272,10 +70526,10 @@ qSU qSU qSU gkc -vJA -qSU -qSU -qSU +tdu +lcn +mGD +aFc qSU qSU eMp @@ -70288,7 +70542,7 @@ oui wwN wwN oSm -ych +pYC bmM vGE hfw @@ -70381,7 +70635,7 @@ osh qbg "} (134,1,1) = {" -hYQ +iDK iDK iDK iDK @@ -70482,17 +70736,17 @@ qwg oSm oSm oSm -ych -ttR +pYC +pYC vGE cCl cCl hfw -uWt +dZL wWb kfM -uWt -uWt +dZL +dZL dZL kfM kfM @@ -70575,7 +70829,7 @@ osh qbg "} (135,1,1) = {" -hYQ +iDK iDK iDK wMH @@ -70659,8 +70913,8 @@ gja rMX tEe iuc -nUw -bPU +wGt +mdc cfw qwg qwg @@ -70674,22 +70928,22 @@ lZW thY stQ dVP -ych -ych -ych -ych +pYC +pYC +pYC +pYC vGE uqL cCl hfw kfM wWb -uWt +dZL kfM kfM kfM kfM -uWt +dZL hfw hfw hfw @@ -70769,7 +71023,7 @@ osh qbg "} (136,1,1) = {" -hYQ +iDK iDK iDK wMH @@ -70841,7 +71095,7 @@ rOS uCh uCh bLp -dSQ +mas pub bLp uCh @@ -70870,7 +71124,7 @@ aKB oSm dqb xDr -ych +pYC eBz vGE cCl @@ -71035,7 +71289,7 @@ rOS uCh uCh bLp -dSQ +mas fBj bLp uCh @@ -71236,7 +71490,7 @@ uCh bLp sZP ppA -pms +vUu cxs dLf qSU @@ -71265,7 +71519,7 @@ bxd uKS kwf csQ -kMt +bgm vqX oZY mRU @@ -71429,7 +71683,7 @@ bLp uCh bLp bLp -dSQ +mas wgQ oSm dBT @@ -71623,7 +71877,7 @@ bLp uCh uCh bLp -dSQ +mas vUu oSm vUe @@ -71653,7 +71907,7 @@ ppD uKS kwf xNq -kMt +bgm vqX vqX vqX @@ -71847,7 +72101,7 @@ uzS fDs kwf xNq -kMt +bgm pmc iQx bUa @@ -72429,7 +72683,7 @@ ppD jSj kwf xNq -kMt +bgm pmc lzW wne @@ -72623,7 +72877,7 @@ uzS lBd kwf fWO -kMt +bgm pmc jxE xNZ @@ -72817,7 +73071,7 @@ bxd jSj kwf xNq -kMt +bgm pmc pmc pmc @@ -73011,7 +73265,7 @@ gvB sqj kwf xNq -kMt +bgm jii mZE pjU @@ -73019,7 +73273,7 @@ npe pUR mCD vUS -hDZ +yhs vjj tSu wqT @@ -73213,7 +73467,7 @@ uHG dwF dwF mzX -hDZ +yhs pUR tSu wqT @@ -73399,7 +73653,7 @@ kwf kwf kwf fcm -kMt +bgm jii jii uPD @@ -73593,7 +73847,7 @@ pAF dkN kwf nvz -kMt +bgm jii ylH cjT @@ -73706,7 +73960,7 @@ xtx uMB hSy gbY -hSe +pbi jgC dyl saP @@ -73787,7 +74041,7 @@ sXj aFK kwf xNq -kMt +bgm jii mwQ maD @@ -73899,9 +74153,9 @@ lMb xtx cIA hSy -cSI +jgC xbO -hSe +pbi xtZ oVc xpO @@ -73981,7 +74235,7 @@ xVK vQH kwf xNq -kMt +bgm jii jii jii @@ -74095,7 +74349,7 @@ rPl hSy jgC edI -cSI +jgC rIZ bbo xpO @@ -74870,7 +75124,7 @@ iMm sQq sQq fJF -htC +fJF dlE dlE pRN @@ -75064,7 +75318,7 @@ muj uIE sQq nDL -bCl +nDL dlE bOD vLe @@ -75270,7 +75524,7 @@ uXk ruq mWX vdT -fli +iMe jDD cHG cdU @@ -75853,7 +76107,7 @@ naP fmy pDO jUZ -qEb +dJw aeX wOt bxQ @@ -76884,7 +77138,7 @@ his his uaU lgC -lOC +eJo uXC uXC qDA @@ -77015,7 +77269,7 @@ uFy eBH xtJ smX -rzR +bOD lwd jgC mxP @@ -77071,10 +77325,10 @@ his his his his -lOC eJo eJo -lOC +eJo +eJo srn eJo eJo @@ -77082,7 +77336,7 @@ fyK uXC fyK srn -lOC +eJo his his his @@ -77260,7 +77514,7 @@ eJo uXC uXC srn -lOC +eJo gFo his his @@ -77271,7 +77525,7 @@ srn eJo eJo fyK -ndc +uXC uXC uXC uXC @@ -77280,7 +77534,7 @@ eJo eJo eJo eJo -lOC +eJo eJo eJo uXC @@ -77414,7 +77668,7 @@ upn upn aAw aAw -eYN +qOj qOj qOj qOj @@ -77462,14 +77716,14 @@ uXC fyK eJo eJo -ndc +uXC uXC eJo eJo fyK srn eJo -lOC +eJo fyK eJo srn @@ -77645,7 +77899,7 @@ srn uXC uXC uXC -lOC +eJo eJo uXC fyK @@ -77653,7 +77907,7 @@ uXC eJo srn eJo -ndc +uXC uXC uXC eJo @@ -77670,7 +77924,7 @@ uXC eJo eJo srn -lOC +eJo eJo fyK uXC @@ -77842,10 +78096,10 @@ cgG cgG cgG fhP -tdn +mHr cgG cgG -tdn +mHr cgG cgG atJ @@ -77855,7 +78109,7 @@ fhP cgG fhP srn -tdn +mHr srn cgG atJ @@ -77869,7 +78123,7 @@ cgG fyK srn xee -tdn +mHr aFY fyK aFY @@ -77883,12 +78137,12 @@ aFY aFY aFY aFY -mGD -mGD -mGD uWf -mGD -mGD +uWf +uWf +uWf +uWf +uWf osh osh osh @@ -77954,50 +78208,50 @@ uFC uFC uFC uFC -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr sxt csJ csJ @@ -78028,33 +78282,33 @@ csJ csJ csJ sxt -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr ijF -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr ijF -tdn -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr +mHr fyK -tdn +mHr srn ijF srn @@ -78071,18 +78325,18 @@ aFY aFY fyK aFY -tdn +mHr aFY aFY aFY -tdn +mHr aFY -mGD +uWf fyK -mGD -mGD -mGD -mGD +uWf +uWf +uWf +uWf pII osh osh @@ -78148,50 +78402,50 @@ uFC uFC uFC uFC -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr sxt csJ csJ @@ -78222,10 +78476,10 @@ csJ csJ csJ sxt -tdn +mHr ijF -tdn -tdn +mHr +mHr tQo tQo qeS @@ -78244,25 +78498,25 @@ tQo tQo tQo kTm -tdn mHr -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr +mHr srn ijF fyK -tdn +mHr isQ eJo xee aFY aFY aFY -tdn +mHr aFY -tdn +mHr fyK aFY aFY @@ -78271,13 +78525,13 @@ aFY aFY fyK aFY -mGD -mGD -tdn -mGD -tdn -mGD -mGD +uWf +uWf +mHr +uWf +mHr +uWf +uWf osh osh osh @@ -78452,26 +78706,26 @@ isQ eJo xee aFY -tdn +mHr aFY aFY fyK -tdn +mHr aFY -tdn +mHr aFY -tdn -tdn +mHr +mHr aFY aFY aFY -mGD -mGD +uWf +uWf fyK -mGD -mGD +uWf +uWf fyK -mGD +uWf osh osh osh @@ -78536,50 +78790,50 @@ uFC uFC uFC uFC -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr sxt csJ csJ @@ -78610,9 +78864,9 @@ csJ csJ csJ sxt -tdn -tdn -tdn +mHr +mHr +mHr sSa tQo mAA @@ -78632,26 +78886,26 @@ lWm yhp xcL srn -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr fyK srn -tdn +mHr fyK ijF -tdn +mHr isQ uXC xee aFY aFY fyK -tdn +mHr fyK aFY -tdn +mHr aFY fyK aFY @@ -78660,10 +78914,10 @@ aFY fyK aFY fyK -tdn -mGD -mGD -mGD +mHr +uWf +uWf +uWf uWf osh osh @@ -78730,50 +78984,50 @@ uFC uFC uFC uFC -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr sxt csJ csJ @@ -78804,13 +79058,13 @@ csJ csJ csJ sxt -tdn -tdn -tdn +mHr +mHr +mHr ijF tQo aQV -eEA +wrE thm ufR sZU @@ -78821,18 +79075,18 @@ uQO tQo vEy thm -tdu +xmT dwq muw xcL -tdn -tdn -tdn +mHr +mHr +mHr srn mHr -tdn -tdn -tdn +mHr +mHr +mHr fyK fyK ijF @@ -78842,24 +79096,24 @@ pDZ fyK aFY aFY -tdn +mHr aFY aFY aFY aFY -tdn +mHr aFY aFY aFY aFY aFY -mGD -mGD +uWf +uWf fyK -mGD -mGD -mGD -mGD +uWf +uWf +uWf +uWf osh osh osh @@ -78924,50 +79178,50 @@ uFC uFC uFC uFC -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr sxt csJ csJ @@ -78998,13 +79252,13 @@ csJ csJ csJ sxt -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr tQo aQV -wGt +uoX thm uoX sZU @@ -79021,14 +79275,14 @@ tQo tQo iKy srn -tdn +mHr srn -tdn +mHr fyK -tdn +mHr srn -tdn -tdn +mHr +mHr fyK mHr uXC @@ -79039,22 +79293,22 @@ aFY aFY aFY aFY -tdn +mHr aFY aFY aFY aFY -tdn +mHr fyK aFY uWf -mGD -mGD -mGD +uWf +uWf +uWf ter -mGD -tdn -mGD +uWf +mHr +uWf osh osh osh @@ -79118,50 +79372,50 @@ uFC uFC uFC uFC -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr sxt csJ csJ @@ -79192,10 +79446,10 @@ csJ csJ csJ sxt -tdn +mHr ijF -tdn -tdn +mHr +mHr tQo aQV uoX @@ -79212,15 +79466,15 @@ thm myX xcL srn -tdn -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr +mHr srn -tdn +mHr srn -tdn +mHr fyK srn ijF @@ -79229,26 +79483,26 @@ fyK pDZ aFY aFY -tdn +mHr aFY -tdn +mHr fyK aFY -tdn +mHr aFY fyK aFY aFY aFY aFY -tdn -mGD +mHr +uWf fyK -mGD -mGD -mGD -mGD -mGD +uWf +uWf +uWf +uWf +uWf osh osh osh @@ -79312,50 +79566,50 @@ uFC uFC uFC uFC -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr sxt csJ csJ @@ -79386,9 +79640,9 @@ csJ csJ csJ sxt -tdn -tdn -tdn +mHr +mHr +mHr sSa tQo aQV @@ -79405,43 +79659,43 @@ thm thm uYO xcL -tdn -tdn -tdn -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr +mHr +mHr +mHr fyK -tdn -tdn -tdn +mHr +mHr +mHr ijF fyK isQ uXC pDZ aFY -tdn +mHr aFY aFY -tdn +mHr aFY aFY -tdn +mHr aFY aFY -tdn +mHr aFY aFY aFY -mGD -mGD -mGD +uWf +uWf +uWf fyK -mGD -tdn -mGD +uWf +mHr +uWf osh osh osh @@ -79630,11 +79884,11 @@ fyK fyK aFY fyK -mGD -mGD -mGD -mGD -mGD +uWf +uWf +uWf +uWf +uWf uWf osh osh @@ -79700,50 +79954,50 @@ uFC uFC uFC uFC -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr sxt csJ csJ @@ -79774,10 +80028,10 @@ csJ csJ csJ sxt -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr tQo tQo hvt @@ -79795,40 +80049,40 @@ tQo tQo iKy srn -tdn -tdn -tdn -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr +mHr +mHr +mHr srn ijF fyK -tdn +mHr isQ srn pDZ aFY -tdn +mHr aFY -tdn -tdn +mHr +mHr aFY aFY fyK aFY aFY -tdn +mHr aFY aFY aFY -mGD -mGD -tdn -mGD -mGD -mGD +uWf +uWf +mHr +uWf +uWf +uWf osh osh osh @@ -79894,50 +80148,50 @@ uFC uFC uFC uFC -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr sxt csJ csJ @@ -79968,37 +80222,37 @@ csJ csJ csJ sxt -tdn -tdn +mHr +mHr ijF -tdn -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr +mHr ijF -tdn -tdn -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr +mHr +mHr ijF -tdn -tdn +mHr +mHr srn -tdn -tdn +mHr +mHr mHr srn -tdn +mHr fyK -tdn +mHr srn ijF ijF -tdn -xyG +mHr +fyK fyK gIy srn @@ -80017,12 +80271,12 @@ fyK aFY aFY fyK -mGD -tdn -mGD -mGD +uWf +mHr +uWf +uWf kBj -mGD +uWf osh osh osh @@ -80182,7 +80436,7 @@ uEq uEq uEq uEq -tdn +mHr srn uEq srn @@ -80202,20 +80456,20 @@ aFY aFY aFY aFY -tdn +mHr aFY aFY aFY fyK aFY -tdn +mHr aFY aFY -mGD -mGD uWf -mGD -mGD +uWf +uWf +uWf +uWf pII osh osh @@ -80472,7 +80726,7 @@ qbg qbg onC emW -tAe +emW onC isQ kEx @@ -80665,8 +80919,8 @@ qbg (187,1,1) = {" qbg onC -tAe -tAe +emW +emW onC isQ kEx diff --git a/maps/tether/levels/surface2.dmm b/maps/tether/levels/surface2.dmm index 6be758fd1955..792c40148282 100644 --- a/maps/tether/levels/surface2.dmm +++ b/maps/tether/levels/surface2.dmm @@ -132,6 +132,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/south) "agl" = ( @@ -409,13 +412,6 @@ /obj/item/reagent_containers/glass/bottle/eznutrient, /turf/simulated/mineral/floor/virgo3b, /area/tether/surfacebase/outside/outside2) -"arf" = ( -/obj/structure/catwalk, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/bar) "arm" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -1304,15 +1300,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tcomsat) "aZT" = ( /obj/structure/bed/chair{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "0-4" - }, /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 }, @@ -2249,6 +2245,9 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 }, +/obj/machinery/camera/network/medbay{ + dir = 10 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralstairwell) "bKL" = ( @@ -2595,6 +2594,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tcomsat) "bVk" = ( @@ -2817,12 +2819,6 @@ }, /turf/simulated/floor/water/indoors, /area/tether/surfacebase/fish_farm) -"cep" = ( -/obj/structure/railing{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) "cex" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/multi_tile/glass{ @@ -3000,14 +2996,19 @@ /area/maintenance/lower/north) "chj" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "chl" = ( @@ -3224,18 +3225,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) -"cmH" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/effect/floor_decal/techfloor{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/black{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) "cmK" = ( /turf/simulated/floor/grass, /area/maintenance/lower/south) @@ -3473,29 +3462,17 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/armory) "cxu" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 5 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 5 - }, -/obj/effect/floor_decal/borderfloorwhite/corner2{ - dir = 5 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner2{ - dir = 5 - }, -/obj/machinery/bodyscanner{ - dir = 4 - }, -/obj/effect/floor_decal/corner_steel_grid{ +/obj/effect/floor_decal/corner/paleblue/diagonal, +/obj/structure/flora/pottedplant/orientaltree, +/obj/machinery/camera/network/medbay{ dir = 10 }, -/obj/machinery/light{ - dir = 1 +/obj/machinery/status_display{ + level = 4; + pixel_y = -32 }, /turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/recoveryward) +/area/tether/surfacebase/medical/breakroom) "cxA" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -3616,11 +3593,13 @@ pixel_x = 24 }, /obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/structure/table/standard, -/obj/item/storage/single_use/mre/random, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ +/obj/structure/disposalpipe/trunk{ dir = 8 }, +/obj/machinery/disposal, +/obj/machinery/camera/network/medbay{ + dir = 10 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "cEd" = ( @@ -3654,8 +3633,18 @@ /turf/simulated/floor/outdoors/dirt/virgo3b, /area/tether/surfacebase/outside/outside2) "cFv" = ( -/turf/simulated/mineral/floor/virgo3b, -/area/tether/surfacebase/outside/outside2) +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/atmospherics/pipe/simple/visible/supply, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/south) "cFG" = ( /obj/machinery/power/smes/buildable{ RCon_tag = "Substation - Research"; @@ -3753,10 +3742,15 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 1 }, -/obj/effect/floor_decal/steeldecal/steel_decals10, /obj/structure/sign/poster{ pixel_y = 32 }, +/obj/effect/floor_decal/corner_steel_grid{ + dir = 10 + }, +/obj/machinery/body_scanconsole{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) "cIl" = ( @@ -4053,6 +4047,7 @@ dir = 5 }, /obj/effect/floor_decal/rust, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/south) "cST" = ( @@ -4704,6 +4699,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/table/glass, +/obj/item/storage/single_use/mre/random, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "dtU" = ( @@ -4720,10 +4716,12 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) "duD" = ( -/obj/structure/catwalk, -/obj/effect/floor_decal/rust, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) +/area/maintenance/lower/south) "dvE" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled, @@ -4786,10 +4784,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techfloor, /area/maintenance/asmaint2) -"dAG" = ( -/obj/structure/stairs/spawner/west, -/turf/simulated/floor/tiled/techfloor, -/area/chapel/main) "dBJ" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -5041,6 +5035,9 @@ /obj/machinery/atmospherics/pipe/zpipe/down/scrubbers{ dir = 1 }, +/obj/machinery/atmospherics/pipe/zpipe/down/aux{ + dir = 1 + }, /turf/simulated/open, /area/engineering/atmos) "dLp" = ( @@ -5958,6 +5955,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tcomsat) "etm" = ( @@ -6136,6 +6136,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tcomsat) "eBG" = ( @@ -6246,6 +6249,7 @@ opacity = 0; open_layer = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/engineering/atmos) "eEq" = ( @@ -6617,11 +6621,6 @@ /obj/machinery/camera/network/engineering, /turf/simulated/floor/plating, /area/maintenance/substation/command) -"eUc" = ( -/obj/effect/floor_decal/borderfloorwhite, -/obj/effect/floor_decal/corner/paleblue/border, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/recoveryward) "eUq" = ( /obj/structure/table/standard, /obj/item/stock_parts/subspace/transmitter, @@ -6685,9 +6684,6 @@ /obj/structure/sign/poster{ pixel_x = -32 }, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 4 - }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "eWF" = ( @@ -7170,9 +7166,6 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) -"fmr" = ( -/turf/simulated/floor/plating, -/area/maintenance/lower/bar) "fmD" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -7257,6 +7250,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/tcommsat/computer) "fun" = ( @@ -7443,6 +7439,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/south) "fAy" = ( @@ -7713,6 +7712,7 @@ }, /obj/machinery/atmospherics/pipe/simple/visible/supply, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/south) "fKx" = ( @@ -7967,11 +7967,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/north) -"fQD" = ( -/obj/structure/catwalk, -/obj/effect/floor_decal/rust, -/turf/simulated/floor/plating, -/area/maintenance/lower/public_garden_maintenance/upper) "fQP" = ( /turf/simulated/shuttle/wall/voidcraft, /area/tether/surfacebase/old_shelter) @@ -8710,25 +8705,9 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/middlehall) "gpO" = ( -/obj/machinery/power/apc/east_mount, -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 4 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloorwhite/corner2{ - dir = 6 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner2{ - dir = 6 - }, -/obj/structure/flora/pottedplant/stoutbush, +/obj/structure/window/reinforced, /turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/recoveryward) +/area/tether/surfacebase/medical/uppersouthstairwell) "gqK" = ( /obj/structure/sign/deck/second, /turf/simulated/wall/r_wall/prepainted/science, @@ -9753,6 +9732,7 @@ "gYG" = ( /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, /obj/machinery/atmospherics/pipe/simple/visible/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/south) "gYL" = ( @@ -9777,6 +9757,9 @@ dir = 4 }, /obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tcommsat/entrance) "gZb" = ( @@ -9802,12 +9785,8 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/medical/resleeving) "hag" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/south) "hal" = ( @@ -9834,12 +9813,6 @@ /obj/effect/floor_decal/rust, /turf/simulated/shuttle/floor/voidcraft, /area/tether/surfacebase/old_shelter) -"hbc" = ( -/obj/effect/floor_decal/techfloor, -/obj/structure/catwalk, -/obj/effect/floor_decal/rust, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) "hbM" = ( /obj/structure/stairs/spawner/south, /turf/simulated/floor/tiled, @@ -9856,8 +9829,8 @@ dir = 2; icon_state = "pipe-c" }, -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 4 +/obj/effect/floor_decal/corner_steel_grid{ + dir = 5 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) @@ -10287,8 +10260,12 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_two) "hvD" = ( +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, -/area/maintenance/lower/atmos) +/area/maintenance/lower/south) "hvF" = ( /obj/structure/bookcase, /turf/simulated/floor/wood, @@ -10421,6 +10398,9 @@ /obj/structure/cable/cyan{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/engineering/atmos) "hBi" = ( @@ -11137,20 +11117,11 @@ /turf/simulated/floor/tiled, /area/tcommsat/computer) "iav" = ( -/obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/item/radio/intercom/department/medbay{ - dir = 4; - pixel_x = 24 - }, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/machinery/disposal, -/obj/machinery/camera/network/medbay{ - dir = 10 +/obj/structure/sign/poster{ + pixel_y = -32 }, /turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/breakroom) +/area/tether/surfacebase/medical/uppersouthstairwell) "iaC" = ( /obj/machinery/door/blast/regular{ density = 0; @@ -11173,6 +11144,7 @@ "ibp" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/structure/table/glass, +/obj/random/medical, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "ibB" = ( @@ -11544,6 +11516,7 @@ /obj/structure/catwalk, /obj/machinery/atmospherics/pipe/simple/visible/supply, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/south) "iri" = ( @@ -11560,6 +11533,9 @@ /obj/machinery/atmospherics/pipe/simple/visible/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/south) "irk" = ( @@ -12024,13 +12000,7 @@ /area/tether/surfacebase/security/outfitting/storage) "iEC" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/structure/reagent_dispensers/water_cooler/full{ - dir = 4 - }, -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/breakroom) "iEH" = ( /obj/machinery/door/airlock/security{ @@ -12240,15 +12210,6 @@ /obj/machinery/camera/network/research, /turf/simulated/floor/wood, /area/rnd/breakroom) -"iLx" = ( -/obj/structure/table/standard, -/obj/structure/bedsheetbin, -/obj/random/soap, -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/recoveryward) "iLA" = ( /obj/machinery/button/remote/blast_door{ id = "xenobiodiv1"; @@ -12355,22 +12316,15 @@ /area/tether/surfacebase/medical/resleeving) "iNF" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 5 }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 8 }, -/obj/structure/disposalpipe/sortjunction{ - dir = 1; - name = "Medical Breakroom"; - sortType = "Medical Breakroom" +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/maintenance/medical{ + name = "Medical Maintenance Access" }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) @@ -12465,6 +12419,7 @@ /obj/structure/railing, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "iSt" = ( @@ -12495,8 +12450,15 @@ /area/tcommsat/computer) "iTp" = ( /obj/structure/catwalk, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/atmospherics/pipe/simple/visible/supply, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/turf/simulated/floor/plating, +/area/maintenance/lower/south) "iTw" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -12676,6 +12638,7 @@ /obj/random/maintenance/clean, /obj/random/maintenance/clean, /obj/random/maintenance/engineering, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/south) "jcA" = ( @@ -12825,6 +12788,9 @@ /area/engineering/atmos) "jhB" = ( /obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/atmospherics/pipe/zpipe/up/aux{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/south) "jhE" = ( @@ -12837,22 +12803,8 @@ /turf/simulated/floor/tiled/techfloor, /area/server) "jiF" = ( -/obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/extinguisher_cabinet{ - dir = 1; - pixel_y = -32 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/breakroom) +/turf/simulated/mineral, +/area/tether/surfacebase/medical/recoveryward) "jiV" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -13064,10 +13016,13 @@ /area/maintenance/lower/bar) "jra" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/machinery/power/apc/south_mount, -/obj/structure/cable/green, -/obj/structure/table/standard, -/obj/random/medical, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "jri" = ( @@ -13585,8 +13540,12 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/evastorage) "jJe" = ( -/turf/simulated/floor/outdoors/grass/sif/virgo3b, -/area/tether/surfacebase/outside/outside2) +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 5 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/south) "jKw" = ( /obj/structure/table/glass, /obj/machinery/fire_alarm/west_mount{ @@ -13605,17 +13564,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/patient_c) -"jLb" = ( -/obj/structure/catwalk, -/obj/effect/floor_decal/rust, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/north) "jLf" = ( /obj/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -14263,6 +14211,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tcommsat/entrance) "kmq" = ( @@ -14540,9 +14491,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) -"kyL" = ( -/turf/simulated/floor, -/area/maintenance/lower/north) "kzz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -14589,9 +14537,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/middlehall) -"kCm" = ( -/turf/simulated/floor, -/area/maintenance/lower/north) "kCZ" = ( /obj/machinery/door/airlock/security{ id_tag = "bathroomlock9"; @@ -14676,14 +14621,16 @@ /area/tether/surfacebase/surface_two_hall) "kHg" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/item/deck/cah/black{ pixel_x = 5; pixel_y = 29 }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/structure/flora/skeleton{ + name = "\proper Sheb" + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "kHB" = ( @@ -15103,11 +15050,18 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/fish_farm) "kWG" = ( -/obj/structure/railing{ - dir = 1 +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/atmospherics/pipe/simple/visible/supply, +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/north) +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 10 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/south) "kWN" = ( /obj/effect/floor_decal/borderfloor{ dir = 9 @@ -15267,6 +15221,9 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tcommsat/entrance) "lde" = ( @@ -15315,14 +15272,20 @@ /area/tether/surfacebase/security/interrogation) "lfa" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/table/glass, /obj/item/deck/cah, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "lfi" = ( -/turf/simulated/floor/tiled/dark, +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ + dir = 1 + }, +/turf/simulated/floor/plating, /area/maintenance/lower/south) "lfl" = ( /obj/structure/cable{ @@ -15347,10 +15310,6 @@ /obj/structure/table/wooden_reinforced, /turf/simulated/floor/carpet/turcarpet, /area/bridge/meeting_room) -"lgE" = ( -/obj/structure/bed/chair, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) "lhm" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -15486,6 +15445,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tcomsat) "lpW" = ( @@ -15524,12 +15486,15 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 1 }, -/obj/machinery/body_scanconsole{ - dir = 4 - }, /obj/effect/floor_decal/corner_steel_grid{ dir = 10 }, +/obj/machinery/bodyscanner{ + dir = 4 + }, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) "lra" = ( @@ -15880,6 +15845,9 @@ /obj/machinery/atmospherics/pipe/simple/visible/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/south) "lFn" = ( @@ -15969,6 +15937,9 @@ pixel_y = 22 }, /obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/south) "lIC" = ( @@ -16217,6 +16188,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/south) "lSe" = ( @@ -16370,16 +16344,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) -"lYE" = ( -/obj/structure/bookcase/manuals/medical, -/obj/item/book/manual/resleeving, -/obj/item/book/manual/stasis, -/obj/item/book/manual/medical_diagnostics_manual{ - pixel_y = 7 - }, -/obj/effect/floor_decal/corner/paleblue/diagonal, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/breakroom) "lYP" = ( /turf/simulated/floor/plating, /area/vacant/vacant_bar_upper) @@ -16691,17 +16655,17 @@ /turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/outside/outside2) "miX" = ( -/obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/machinery/camera/network/medbay{ - dir = 10 +/obj/structure/mirror{ + dir = 4; + pixel_x = -25 }, -/obj/machinery/status_display{ - level = 4; - pixel_y = -32 +/obj/structure/sink{ + dir = 8; + pixel_x = -12; + pixel_y = 2 }, -/obj/structure/flora/pottedplant/orientaltree, /turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/breakroom) +/area/tether/surfacebase/medical/recoveryward) "mjL" = ( /obj/effect/floor_decal/corner/yellow{ dir = 1 @@ -17047,12 +17011,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 10 +/obj/machinery/door/airlock{ + id_tag = "bathroomlock7"; + name = "Restroom" }, -/obj/effect/floor_decal/steeldecal/steel_decals4, -/obj/effect/floor_decal/corner_steel_grid{ - dir = 5 +/obj/machinery/door/firedoor/glass{ + dir = 8 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) @@ -17232,16 +17196,6 @@ /obj/landmark/spawnpoint/job/security_officer, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/outfitting) -"mEJ" = ( -/obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/structure/flora/skeleton{ - name = "\proper Sheb" - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/breakroom) "mFl" = ( /obj/effect/floor_decal/corner_techfloor_grid, /obj/effect/floor_decal/corner_techfloor_grid{ @@ -17335,6 +17289,9 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/red, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/engineering/atmos) "mKH" = ( @@ -17643,6 +17600,7 @@ "mUL" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/machinery/door/firedoor, +/obj/machinery/door/airlock/maintenance/medical, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "mUT" = ( @@ -18137,6 +18095,9 @@ req_access = list(61) }, /obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tcomsat) "nmb" = ( @@ -18535,6 +18496,9 @@ /obj/structure/cable{ icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/south) "nxi" = ( @@ -18731,6 +18695,9 @@ /obj/structure/cable{ icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/south) "nIQ" = ( @@ -18945,14 +18912,9 @@ /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_slimepens) "nOX" = ( -/obj/machinery/door/airlock{ - id_tag = "bathroomlock7"; - name = "Restroom" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -19637,10 +19599,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/engineering/pumpstation) -"onI" = ( -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) "ooX" = ( /obj/machinery/light/small{ dir = 1 @@ -19810,6 +19768,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/engineering/lower/lobby) "owe" = ( @@ -19836,6 +19797,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tcommsat/entrance) "oxn" = ( @@ -20245,9 +20209,6 @@ /turf/simulated/floor/tiled/dark, /area/maintenance/lower/south) "oPZ" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/structure/stairs/spawner/south, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_two) @@ -20344,17 +20305,19 @@ /area/engineering/atmos) "oSY" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/structure/cable/green{ - icon_state = "1-8" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, /obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" + dir = 4 + }, +/obj/structure/extinguisher_cabinet{ + dir = 1; + pixel_y = -32 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "oTC" = ( @@ -20592,18 +20555,8 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/south) "pcj" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/holoplant, -/obj/effect/floor_decal/corner/paleblue{ - dir = 9 - }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 6 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/uppersouthstairwell) +/turf/simulated/floor/outdoors/grass/sif/virgo3b, +/area/tether/surfacebase/medical/recoveryward) "pcu" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -20686,14 +20639,11 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/north) "phQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/railing{ + dir = 8 }, -/turf/simulated/floor/tiled/dark, -/area/maintenance/lower/south) +/turf/simulated/open, +/area/tether/surfacebase/public_garden_two) "phS" = ( /obj/effect/floor_decal/borderfloor/shifted, /obj/effect/floor_decal/corner/white/border/shifted, @@ -21214,6 +21164,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/supply, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, /obj/effect/floor_decal/rust, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/south) "pBY" = ( @@ -21439,6 +21390,12 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/structure/table/standard, +/obj/structure/bedsheetbin, +/obj/random/soap, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) "pLC" = ( @@ -21569,15 +21526,6 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppersouthstairwell) "pRb" = ( -/obj/structure/mirror{ - dir = 4; - pixel_x = -25 - }, -/obj/structure/sink{ - dir = 8; - pixel_x = -12; - pixel_y = 2 - }, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 }, @@ -21813,6 +21761,9 @@ /obj/structure/catwalk, /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/maintenance/common, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/south) "pZt" = ( @@ -22332,10 +22283,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/north) -"qtM" = ( -/obj/machinery/camera/network/medbay, -/turf/simulated/open, -/area/tether/surfacebase/medical/centralstairwell) "qut" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/air_alarm{ @@ -22363,6 +22310,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/engineering/atmos) "quR" = ( @@ -22394,6 +22344,9 @@ /obj/structure/cable/cyan{ icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/engineering/atmos) "qvD" = ( @@ -23113,6 +23066,7 @@ }, /obj/machinery/atmospherics/pipe/simple/visible/supply, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/south) "rcx" = ( @@ -23157,12 +23111,16 @@ /area/tether/surfacebase/medical/examroom) "rev" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/structure/disposalpipe/sortjunction{ + dir = 1; + name = "Medical Breakroom"; + sortType = "Medical Breakroom" }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) @@ -23346,6 +23304,9 @@ dir = 4 }, /obj/landmark/spawnpoint/job/medical_doctor, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "rkD" = ( @@ -23579,7 +23540,20 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "rrk" = ( -/turf/simulated/floor/tiled/dark, +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, +/turf/simulated/floor/plating, /area/maintenance/lower/south) "rrQ" = ( /obj/structure/table/steel, @@ -24147,6 +24121,9 @@ dir = 1 }, /obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 + }, /turf/simulated/floor/plating, /area/maintenance/lower/south) "rRK" = ( @@ -24188,6 +24165,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/red{ dir = 9 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/engineering/atmos) "rTQ" = ( @@ -24774,6 +24752,9 @@ /obj/machinery/atmospherics/pipe/simple/visible/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/south) "soc" = ( @@ -24802,9 +24783,8 @@ /area/tcomsat) "spN" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/structure/cable/green{ - icon_state = "2-4" - }, +/obj/structure/table/glass, +/obj/machinery/recharger, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "sqi" = ( @@ -24961,10 +24941,9 @@ /turf/simulated/floor/plating, /area/maintenance/readingrooms) "ssQ" = ( -/obj/machinery/atmospherics/component/unary/freezer{ - icon_state = "freezer_1"; - set_temperature = 73; - use_power = 1 +/obj/machinery/atmospherics/component/binary/heat_pump{ + use_power = 1; + target_temp = 80 }, /turf/simulated/floor/tiled/dark, /area/tcommsat/computer) @@ -25104,6 +25083,9 @@ dir = 1 }, /obj/machinery/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tcomsat) "swP" = ( @@ -25240,6 +25222,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tcommsat/computer) "sBb" = ( @@ -25311,6 +25296,9 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/engineering/atmos) "sDf" = ( @@ -25764,11 +25752,9 @@ /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) "sVc" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/public_garden_two) +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/turf/simulated/floor/plating, +/area/maintenance/lower/south) "sVB" = ( /obj/structure/catwalk, /obj/machinery/fire_alarm/north_mount, @@ -26099,6 +26085,9 @@ /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 5 + }, /turf/simulated/floor/plating, /area/maintenance/lower/south) "tju" = ( @@ -26134,15 +26123,12 @@ /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) "tkx" = ( -/obj/machinery/door/airlock/maintenance/medical{ - name = "Medical Maintenance Access" - }, -/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/techfloor, -/area/tether/surfacebase/medical/breakroom) +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/maintenance/lower/mining) "tlq" = ( /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ id = "ward_tint"; @@ -26182,6 +26168,7 @@ /obj/machinery/door/firedoor/glass, /obj/structure/catwalk, /obj/machinery/door/airlock/maintenance/common, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/south) "tnO" = ( @@ -26391,6 +26378,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/engineering/lower/breakroom) "twA" = ( @@ -27032,9 +27022,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/bathroom) -"uhr" = ( -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) "uhO" = ( /obj/machinery/air_alarm{ dir = 4; @@ -27079,6 +27066,9 @@ /obj/structure/cable/cyan{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/engineering/atmos) "uiV" = ( @@ -27196,12 +27186,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/east_stairs_two) -"unR" = ( -/obj/structure/bed/double/padded, -/obj/item/bedsheet/double, -/obj/structure/curtain/open/privacy, -/turf/simulated/floor/wood, -/area/vacant/vacant_bar_upper) "uoh" = ( /obj/structure/bed/chair{ dir = 1 @@ -27561,18 +27545,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/east_stairs_two) -"uDc" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/floor_decal/techfloor{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/visible/purple{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) "uDh" = ( /obj/structure/table/rack/shelf/steel, /obj/machinery/fire_alarm/west_mount{ @@ -27698,6 +27670,9 @@ /obj/machinery/camera/network/engineering{ dir = 4 }, +/obj/structure/railing{ + dir = 4 + }, /turf/simulated/open, /area/engineering/atmos) "uFm" = ( @@ -27760,6 +27735,9 @@ /obj/structure/railing{ dir = 1 }, +/obj/structure/railing{ + dir = 4 + }, /turf/simulated/open, /area/rnd/staircase/secondfloor) "uGA" = ( @@ -28106,6 +28084,9 @@ /obj/structure/railing{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/south) "uTF" = ( @@ -28279,14 +28260,15 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, -/obj/machinery/light{ - dir = 4 - }, /obj/item/storage/box/cups{ pixel_x = 8; pixel_y = 8 }, /obj/item/storage/box/donkpockets, +/obj/machinery/power/apc/east_mount, +/obj/structure/cable/green{ + icon_state = "0-8" + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "vbZ" = ( @@ -28535,9 +28517,9 @@ /turf/simulated/floor/tiled/steel_dirty, /area/maintenance/asmaint2) "vkz" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/engineering/lower/breakroom) "vkN" = ( @@ -28609,21 +28591,6 @@ /obj/item/reagent_containers/food/drinks/teapot, /turf/simulated/floor/wood, /area/maintenance/lower/atmos) -"voy" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 9 - }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 6 - }, -/obj/structure/sign/poster{ - pixel_y = -32 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/uppersouthstairwell) "voF" = ( /obj/machinery/holopad, /turf/simulated/floor/carpet/turcarpet, @@ -28717,12 +28684,6 @@ /obj/machinery/shieldgen, /turf/simulated/floor/plating, /area/engineering/atmos/storage) -"vqa" = ( -/obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/structure/table/standard, -/obj/machinery/recharger, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/breakroom) "vqk" = ( /obj/structure/cable{ icon_state = "16-0" @@ -29069,6 +29030,7 @@ pixel_x = -5; pixel_y = 24 }, +/obj/effect/floor_decal/steeldecal/steel_decals10, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) "vDa" = ( @@ -29098,9 +29060,6 @@ /obj/structure/railing, /turf/simulated/open, /area/tether/surfacebase/medical/centralstairwell) -"vEo" = ( -/turf/simulated/floor/plating, -/area/maintenance/lower/bar) "vEx" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -29225,6 +29184,7 @@ /obj/random/maintenance/clean, /obj/random/maintenance/clean, /obj/random/maintenance/clean, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/south) "vKx" = ( @@ -29306,9 +29266,21 @@ /turf/simulated/floor/tiled, /area/tcommsat/computer) "vNL" = ( -/obj/structure/cable/green{ - icon_state = "1-4" +/obj/machinery/power/apc/east_mount, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 4 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorwhite/corner2{ + dir = 6 + }, +/obj/effect/floor_decal/corner/paleblue/bordercorner2{ + dir = 6 }, +/obj/structure/flora/pottedplant/stoutbush, +/obj/structure/cable/green, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) "vOq" = ( @@ -29327,6 +29299,9 @@ /obj/machinery/door/firedoor{ dir = 8 }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) "vOs" = ( @@ -29549,10 +29524,6 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_two_hall) -"vZe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/dark, -/area/maintenance/lower/south) "vZp" = ( /obj/machinery/door/blast/regular{ id = "xenobiodiv7"; @@ -29593,6 +29564,10 @@ dir = 4 }, /obj/effect/floor_decal/corner/paleblue/diagonal, +/obj/item/radio/intercom/department/medbay{ + dir = 4; + pixel_x = 24 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "waY" = ( @@ -29750,6 +29725,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/red{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/engineering/atmos) "weP" = ( @@ -29796,9 +29772,15 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/south) "wgc" = ( -/obj/machinery/fire_alarm/east_mount, +/obj/effect/floor_decal/corner/paleblue/diagonal, +/obj/structure/bookcase/manuals/medical, +/obj/item/book/manual/medical_diagnostics_manual{ + pixel_y = 7 + }, +/obj/item/book/manual/stasis, +/obj/item/book/manual/resleeving, /turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/recoveryward) +/area/tether/surfacebase/medical/breakroom) "wgA" = ( /obj/structure/bed/chair/comfy/brown, /turf/simulated/floor/wood, @@ -29932,14 +29914,9 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "wno" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/effect/floor_decal/techfloor{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/supply, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/structure/catwalk, +/obj/effect/floor_decal/rust, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/south) "wnq" = ( @@ -29978,6 +29955,9 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tcommsat/computer) "wqy" = ( @@ -30466,6 +30446,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/engineering/lower/lobby) "wFz" = ( @@ -30619,11 +30602,11 @@ /obj/structure/cable/green{ icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tcomsat) -"wLg" = ( -/turf/simulated/floor/plating, -/area/maintenance/asmaint2) "wLo" = ( /obj/machinery/door/blast/regular{ density = 0; @@ -30770,6 +30753,9 @@ /obj/structure/railing{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 + }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/south) "wSF" = ( @@ -31410,6 +31396,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/engineering/lower/lobby) "xqg" = ( @@ -32002,8 +31991,11 @@ /turf/simulated/open/virgo3b, /area/tether/surfacebase/outside/outside2) "xOk" = ( -/obj/machinery/door/airlock/maintenance/medical, -/turf/simulated/floor/tiled/techfloor, +/obj/effect/floor_decal/corner/paleblue/diagonal, +/obj/structure/reagent_dispensers/water_cooler/full{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "xOY" = ( /turf/simulated/floor, @@ -32147,9 +32139,6 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/outfitting) -"xSX" = ( -/turf/simulated/floor/plating, -/area/maintenance/lower/rnd) "xTm" = ( /obj/effect/floor_decal/corner_techfloor_grid{ dir = 9 @@ -33238,10 +33227,10 @@ fQP uUP fQP gbr -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -33251,8 +33240,8 @@ vFJ vFJ vFJ vFJ -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -33263,23 +33252,23 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -33432,49 +33421,49 @@ shS uBs hMi gEU -jJe -jJe fxm -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -33626,55 +33615,55 @@ pMA bLg bLg krO -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -33820,31 +33809,31 @@ qip dlA haY sMR -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -33859,19 +33848,19 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -34014,28 +34003,28 @@ gbr scM fQP gbr -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -34053,20 +34042,20 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm bwy bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -34208,28 +34197,28 @@ vFJ vFJ vFJ vFJ -jJe fxm -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -34254,19 +34243,19 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -34401,28 +34390,28 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -34451,23 +34440,23 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -34594,28 +34583,28 @@ tXE vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm lbt -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -34652,16 +34641,16 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -34788,27 +34777,27 @@ tXE vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -34850,13 +34839,13 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -34981,27 +34970,27 @@ tXE tXE vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -35047,10 +35036,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -35175,25 +35164,25 @@ tXE tXE vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -35242,10 +35231,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -35369,24 +35358,24 @@ tXE tXE vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm lbt -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -35437,10 +35426,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -35563,24 +35552,24 @@ tXE tXE vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -35632,10 +35621,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -35758,23 +35747,23 @@ tXE vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -35826,10 +35815,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -35952,23 +35941,23 @@ tXE vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm lbt -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -36020,10 +36009,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -36146,23 +36135,23 @@ tXE vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -36214,10 +36203,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -36340,23 +36329,23 @@ tXE vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm lbt -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -36409,9 +36398,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -36534,22 +36523,22 @@ tXE vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm lbt -jJe +fxm bwy bwy bwy @@ -36603,9 +36592,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -36728,22 +36717,22 @@ tXE vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm lbt -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -36797,9 +36786,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -36922,22 +36911,22 @@ tXE vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -36991,9 +36980,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -37116,22 +37105,22 @@ tXE vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -37186,8 +37175,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -37310,22 +37299,22 @@ tXE vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -37380,10 +37369,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -37504,22 +37493,22 @@ tXE vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm lbt -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -37574,10 +37563,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -37698,21 +37687,21 @@ tXE vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -37768,10 +37757,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -37891,22 +37880,22 @@ tXE tXE vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -37962,11 +37951,11 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -38085,22 +38074,22 @@ tXE tXE vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -38156,11 +38145,11 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -38279,22 +38268,22 @@ tXE tXE vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -38350,11 +38339,11 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -38473,21 +38462,21 @@ tXE tXE vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -38544,11 +38533,11 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -38667,21 +38656,21 @@ tXE tXE vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -38738,11 +38727,11 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -38861,21 +38850,21 @@ tXE tXE vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm lbt -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm lbt -jJe +fxm bwy bwy bwy @@ -38933,10 +38922,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -39057,19 +39046,19 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -39127,10 +39116,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -39250,20 +39239,20 @@ tXE vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -39321,10 +39310,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -39444,20 +39433,20 @@ tXE vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -39516,10 +39505,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -39637,21 +39626,21 @@ tXE tXE vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -39710,10 +39699,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -39831,21 +39820,21 @@ tXE tXE vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm lbt -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -39904,10 +39893,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -40025,20 +40014,20 @@ tXE tXE vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -40099,10 +40088,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -40219,20 +40208,20 @@ tXE tXE vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -40293,10 +40282,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -40373,10 +40362,10 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -40413,20 +40402,20 @@ tXE tXE vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm lbt -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -40487,10 +40476,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -40566,14 +40555,14 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -40607,20 +40596,20 @@ tXE tXE vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -40682,10 +40671,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -40758,20 +40747,20 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -40801,19 +40790,19 @@ tXE tXE vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -40876,16 +40865,16 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ vFJ vFJ -jJe +fxm vFJ vFJ vFJ @@ -40952,20 +40941,20 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -40995,17 +40984,17 @@ tXE tXE vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -41070,25 +41059,25 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -41146,7 +41135,7 @@ vFJ vFJ vFJ vFJ -jJe +fxm bwy bwy bwy @@ -41156,20 +41145,20 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -41189,14 +41178,14 @@ tXE tXE vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -41265,26 +41254,26 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -41339,8 +41328,8 @@ vFJ vFJ vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -41354,17 +41343,17 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -41382,12 +41371,12 @@ tXE (46,1,1) = {" tXE vFJ -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -41459,10 +41448,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy @@ -41475,12 +41464,12 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -41533,8 +41522,8 @@ vFJ vFJ vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -41555,11 +41544,11 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -41576,11 +41565,11 @@ tXE (47,1,1) = {" tXE vFJ -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -41670,11 +41659,11 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -41727,8 +41716,8 @@ vFJ vFJ vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -41750,10 +41739,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -41770,10 +41759,10 @@ tXE (48,1,1) = {" tXE vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy @@ -41865,10 +41854,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -41920,9 +41909,9 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -41946,10 +41935,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -41964,10 +41953,10 @@ tXE (49,1,1) = {" tXE vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy @@ -42059,10 +42048,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -42114,9 +42103,9 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -42141,10 +42130,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -42158,10 +42147,10 @@ tXE (50,1,1) = {" tXE vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy @@ -42254,10 +42243,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -42307,10 +42296,10 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy @@ -42337,9 +42326,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -42352,10 +42341,10 @@ tXE (51,1,1) = {" tXE vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy @@ -42448,10 +42437,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -42501,10 +42490,10 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy @@ -42532,9 +42521,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -42546,10 +42535,10 @@ tXE (52,1,1) = {" tXE vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy @@ -42642,10 +42631,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -42695,9 +42684,9 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -42727,8 +42716,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -42740,10 +42729,10 @@ tXE (53,1,1) = {" tXE vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy @@ -42836,10 +42825,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -42888,10 +42877,10 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy @@ -42921,8 +42910,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -42934,10 +42923,10 @@ tXE (54,1,1) = {" tXE vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy @@ -43030,10 +43019,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -43082,10 +43071,10 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy @@ -43115,8 +43104,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -43128,10 +43117,10 @@ tXE (55,1,1) = {" tXE vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy @@ -43225,9 +43214,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -43276,9 +43265,9 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -43309,8 +43298,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -43322,10 +43311,10 @@ tXE (56,1,1) = {" tXE vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy @@ -43419,9 +43408,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -43470,9 +43459,9 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -43503,8 +43492,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -43516,10 +43505,10 @@ tXE (57,1,1) = {" tXE vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy @@ -43613,17 +43602,17 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -43664,9 +43653,9 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -43697,8 +43686,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -43710,10 +43699,10 @@ tXE (58,1,1) = {" tXE vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy @@ -43808,22 +43797,22 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -43858,9 +43847,9 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -43891,8 +43880,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -43904,10 +43893,10 @@ tXE (59,1,1) = {" tXE vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy @@ -44003,22 +43992,22 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -44051,10 +44040,10 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy @@ -44085,8 +44074,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -44098,10 +44087,10 @@ tXE (60,1,1) = {" tXE vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy @@ -44205,14 +44194,14 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -44245,9 +44234,9 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -44279,8 +44268,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -44292,9 +44281,9 @@ tXE (61,1,1) = {" tXE vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -44400,19 +44389,19 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -44439,9 +44428,9 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -44472,9 +44461,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -44486,9 +44475,9 @@ tXE (62,1,1) = {" tXE vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -44600,18 +44589,18 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -44633,9 +44622,9 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -44666,9 +44655,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -44680,9 +44669,9 @@ tXE (63,1,1) = {" tXE vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -44800,14 +44789,14 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -44827,9 +44816,9 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -44859,10 +44848,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -44874,9 +44863,9 @@ tXE (64,1,1) = {" tXE vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -44999,10 +44988,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -45019,11 +45008,11 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -45053,10 +45042,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -45068,9 +45057,9 @@ tXE (65,1,1) = {" tXE vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -45195,10 +45184,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -45213,9 +45202,9 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -45250,7 +45239,7 @@ nee nee nee nee -jJe +fxm vFJ vFJ vFJ @@ -45262,9 +45251,9 @@ tXE (66,1,1) = {" tXE vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -45391,10 +45380,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -45407,9 +45396,9 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -45444,7 +45433,7 @@ izs izs izs nee -jJe +fxm vFJ vFJ vFJ @@ -45456,9 +45445,9 @@ tXE (67,1,1) = {" tXE vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -45586,10 +45575,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -45601,8 +45590,8 @@ vFJ vFJ vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -45638,7 +45627,7 @@ izs izs izs nee -jJe +fxm vFJ vFJ vFJ @@ -45650,9 +45639,9 @@ tXE (68,1,1) = {" tXE vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -45782,21 +45771,21 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -45832,7 +45821,7 @@ izs izs izs nee -jJe +fxm vFJ vFJ vFJ @@ -45845,8 +45834,8 @@ tXE tXE vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -45976,19 +45965,19 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -46026,7 +46015,7 @@ izs izs izs nee -jJe +fxm vFJ vFJ vFJ @@ -46039,8 +46028,8 @@ tXE tXE vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -46169,17 +46158,17 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -46220,7 +46209,7 @@ izs izs izs nee -jJe +fxm vFJ vFJ vFJ @@ -46233,8 +46222,8 @@ tXE tXE vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -46414,7 +46403,7 @@ izs izs izs nee -jJe +fxm vFJ vFJ vFJ @@ -46427,8 +46416,8 @@ tXE tXE vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -46608,7 +46597,7 @@ izs izs izs nee -jJe +fxm vFJ vFJ vFJ @@ -46621,8 +46610,8 @@ tXE tXE vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -46802,7 +46791,7 @@ izs izs izs nee -jJe +fxm vFJ vFJ vFJ @@ -46815,8 +46804,8 @@ tXE tXE vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -46996,7 +46985,7 @@ izs izs izs nee -jJe +fxm vFJ vFJ vFJ @@ -47009,8 +46998,8 @@ tXE tXE vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -47190,7 +47179,7 @@ izs izs izs nee -jJe +fxm vFJ vFJ vFJ @@ -47203,8 +47192,8 @@ tXE tXE vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -47384,7 +47373,7 @@ izs izs izs nee -jJe +fxm vFJ vFJ vFJ @@ -47397,8 +47386,8 @@ tXE tXE vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -47578,7 +47567,7 @@ izs izs izs nee -jJe +fxm vFJ vFJ vFJ @@ -47591,8 +47580,8 @@ tXE tXE vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -47772,7 +47761,7 @@ izs izs izs nee -jJe +fxm vFJ vFJ vFJ @@ -47784,9 +47773,9 @@ tXE (79,1,1) = {" tXE vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -47966,7 +47955,7 @@ izs izs izs nee -jJe +fxm vFJ vFJ vFJ @@ -47978,9 +47967,9 @@ tXE (80,1,1) = {" tXE vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -48160,9 +48149,9 @@ izs izs izs nee -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -48172,9 +48161,9 @@ tXE (81,1,1) = {" tXE vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -48354,9 +48343,9 @@ izs izs izs nee -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -48366,8 +48355,8 @@ tXE (82,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -48548,9 +48537,9 @@ izs izs izs nee -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -48560,8 +48549,8 @@ tXE (83,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -48742,9 +48731,9 @@ izs izs izs nee -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -48754,8 +48743,8 @@ tXE (84,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -48936,9 +48925,9 @@ izs izs izs nee -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -48948,8 +48937,8 @@ tXE (85,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -49130,9 +49119,9 @@ izs izs izs nee -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -49143,7 +49132,7 @@ tXE tXE vFJ vFJ -jJe +fxm bwy bwy bwy @@ -49324,9 +49313,9 @@ nee nee nee nee -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -49337,7 +49326,7 @@ tXE tXE vFJ vFJ -jJe +fxm bwy bwy bwy @@ -49352,7 +49341,7 @@ bwy bwy bwy bwy -jJe +fxm wFz wFz wFz @@ -49518,9 +49507,9 @@ izs izs izs nee -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -49531,7 +49520,7 @@ tXE tXE vFJ vFJ -jJe +fxm bwy bwy bwy @@ -49545,7 +49534,7 @@ bwy bwy bwy bwy -jJe +fxm wFz wFz wFz @@ -49712,9 +49701,9 @@ izs izs izs nee -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -49724,8 +49713,8 @@ tXE (89,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -49739,8 +49728,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm wFz wFz wFz @@ -49906,9 +49895,9 @@ izs izs izs nee -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -49918,8 +49907,8 @@ tXE (90,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -49933,7 +49922,7 @@ bwy bwy bwy bwy -jJe +fxm wFz wFz wFz @@ -49948,7 +49937,7 @@ gcA rdu tto mkT -sVc +tto oPZ lKQ pCm @@ -50100,9 +50089,9 @@ nee nee nee nee -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -50112,8 +50101,8 @@ tXE (91,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -50127,7 +50116,7 @@ bwy bwy bwy bwy -jJe +fxm wFz wFz wFz @@ -50142,7 +50131,7 @@ gkc uGJ tto gLy -oYn +phQ oYn nnL pCm @@ -50294,9 +50283,9 @@ izs izs izs nee -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -50305,8 +50294,8 @@ tXE "} (92,1,1) = {" tXE -jJe -jJe +fxm +fxm bwy bwy bwy @@ -50320,8 +50309,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm wFz wFz wFz @@ -50488,9 +50477,9 @@ izs izs izs nee -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -50499,8 +50488,8 @@ tXE "} (93,1,1) = {" tXE -jJe -jJe +fxm +fxm bwy bwy bwy @@ -50514,9 +50503,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm wFz wFz wFz @@ -50566,7 +50555,7 @@ xJt xJt xJt xJt -uDc +xJt ctM ctM xJt @@ -50682,9 +50671,9 @@ izs izs izs nee -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -50693,8 +50682,8 @@ tXE "} (94,1,1) = {" tXE -jJe -jJe +fxm +fxm bwy bwy bwy @@ -50705,12 +50694,12 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm wFz wFz wFz @@ -50733,7 +50722,7 @@ ixp wcm rAZ wcm -fQD +rAZ rAZ fXN aUF @@ -50747,33 +50736,33 @@ jhE nkX vht hSr -iTp +hTu cZv -iTp -duD -iTp -iTp -iTp -iTp +hTu +cZv +hTu +hTu +hTu +hTu sdA -iTp -iTp -duD -iTp -iTp -iTp hTu -iTp -iTp +hTu +cZv +hTu +hTu +hTu +hTu +hTu +hTu dKt -duD -iTp -iTp -iTp -iTp -iTp +cZv +hTu +hTu +hTu +hTu +hTu +hTu hTu -iTp jqg jRP wFz @@ -50876,9 +50865,9 @@ izs izs izs nee -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -50888,8 +50877,8 @@ tXE (95,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -50898,13 +50887,13 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm wFz wFz wFz @@ -50942,32 +50931,32 @@ npR fGw eRZ hjS -duD -iTp -iTp +cZv +hTu +hTu epY -iTp -iTp -iTp +hTu +hTu +hTu fsz hTu -iTp -iTp -iTp -iTp -iTp -duD -iTp -iTp +hTu +hTu +hTu +hTu +hTu +cZv +hTu +hTu fsz -iTp +hTu fsz -iTp -iTp -iTp -iTp -duD -iTp +hTu +hTu +hTu +hTu +cZv +hTu lfz jRP wFz @@ -51070,8 +51059,8 @@ nee nee nee nee -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -51082,8 +51071,8 @@ tXE (96,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -51091,14 +51080,14 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm wFz wFz wFz @@ -51141,26 +51130,26 @@ nzI bxo xeM osU -cmH +kSO wdg lBA -cmH +kSO qsa oEL biW kSO -cmH -cmH +kSO +kSO rsZ -cmH +kSO sZS -cmH +kSO fBg iJf hBF gho aoQ -iTp +hTu sve kqP jRP @@ -51264,8 +51253,8 @@ nee izs izs nee -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -51276,8 +51265,8 @@ tXE (97,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -51285,14 +51274,14 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm wFz wFz wFz @@ -51458,8 +51447,8 @@ nee izs izs nee -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -51470,8 +51459,8 @@ tXE (98,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -51479,13 +51468,13 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm wFz wFz wFz @@ -51541,7 +51530,7 @@ veN cUl pwF ylZ -wLg +lvu oEd ylZ kSm @@ -51652,8 +51641,8 @@ nee izs izs nee -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -51665,7 +51654,7 @@ tXE tXE vFJ vFJ -jJe +fxm bwy bwy bwy @@ -51673,13 +51662,13 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm wFz wFz wFz @@ -51736,9 +51725,9 @@ tMO pwF kSm ixI -wLg -wLg -wLg +lvu +lvu +lvu gdE iHu hLa @@ -51846,9 +51835,9 @@ nee nee nee nee -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -51859,7 +51848,7 @@ tXE tXE vFJ vFJ -jJe +fxm bwy bwy bwy @@ -51867,11 +51856,11 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm fav fav fav @@ -51928,10 +51917,10 @@ pbv jii bUE pwF -wLg -wLg -wLg -wLg +lvu +lvu +lvu +lvu ixI jRP feD @@ -52039,10 +52028,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -52053,7 +52042,7 @@ tXE tXE vFJ vFJ -jJe +fxm bwy bwy bwy @@ -52061,11 +52050,11 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm xYa bsm eIW @@ -52107,7 +52096,7 @@ pkL pkL viD kiI -xSX +kYf caQ mJS fwL @@ -52124,9 +52113,9 @@ wEh pwF glB ylZ -wLg +lvu vBU -wLg +lvu jRP cgg jRP @@ -52234,9 +52223,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -52247,7 +52236,7 @@ tXE tXE vFJ vFJ -jJe +fxm bwy bwy bwy @@ -52255,11 +52244,11 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm xYa gXt ged @@ -52428,10 +52417,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -52440,8 +52429,8 @@ tXE (103,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -52449,11 +52438,11 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm xYa fkm rZb @@ -52527,8 +52516,8 @@ jRP jRP jRP wFz -jJe -jJe +fxm +fxm bwy bwy bwy @@ -52623,10 +52612,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ tXE @@ -52634,8 +52623,8 @@ tXE (104,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -52644,10 +52633,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm fav nth rmF @@ -52690,8 +52679,8 @@ rGe xcr xcr jsJ -xSX -xSX +kYf +kYf mJS kEs gzB @@ -52721,9 +52710,9 @@ dOK yez jRP wFz -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -52818,17 +52807,17 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ tXE "} (105,1,1) = {" tXE vFJ -jJe +fxm bwy bwy bwy @@ -52839,9 +52828,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm xYa xta dtu @@ -52884,7 +52873,7 @@ pkL pkL xcr xcr -xSX +kYf caQ mJS qwm @@ -52915,9 +52904,9 @@ gwx tvc jRP wFz -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -53012,18 +53001,18 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ tXE "} (106,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -53035,7 +53024,7 @@ bwy bwy bwy bwy -jJe +fxm xYa aii skQ @@ -53109,9 +53098,9 @@ jRP wkn jRP wFz -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -53207,17 +53196,17 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ tXE "} (107,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -53273,7 +53262,7 @@ pkL xcr xcr eUG -xSX +kYf mJS akY aBA @@ -53401,18 +53390,18 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ tXE "} (108,1,1) = {" tXE vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -53595,9 +53584,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ tXE "} @@ -53605,8 +53594,8 @@ tXE tXE vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -53663,7 +53652,7 @@ eCd eCd vdC xDK -xSX +kYf neA kix cFG @@ -53789,9 +53778,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ tXE "} @@ -53800,7 +53789,7 @@ tXE vFJ vFJ vFJ -jJe +fxm bwy bwy bwy @@ -53855,9 +53844,9 @@ pkL xcr eCd eCd -xSX -xSX -xSX +kYf +kYf +kYf neA dNA bOF @@ -53984,8 +53973,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ tXE "} @@ -53994,7 +53983,7 @@ tXE vFJ vFJ vFJ -jJe +fxm bwy bwy bwy @@ -54049,9 +54038,9 @@ xcr xcr eCd dHP -xSX -xSX -xSX +kYf +kYf +kYf neA lfl iRG @@ -54178,8 +54167,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ tXE "} @@ -54188,7 +54177,7 @@ tXE vFJ vFJ vFJ -jJe +fxm bwy bwy bwy @@ -54244,8 +54233,8 @@ eUG eCd qJh kYf -xSX -xSX +kYf +kYf wDT vQz neA @@ -54372,17 +54361,17 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm tXE "} (113,1,1) = {" tXE vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -54415,7 +54404,7 @@ lPT dpc tkd rWu -kCm +chK xUE gzA sYE @@ -54467,9 +54456,9 @@ wLH eCq ctv vMH -uhr +yeu crD -hvD +yeu vMH rgv iHY @@ -54490,8 +54479,8 @@ bwy wFz wFz wFz -jJe -jJe +fxm +fxm bwy bwy bwy @@ -54575,8 +54564,8 @@ uBb tXE vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -54609,7 +54598,7 @@ pwO oTC tkd rWu -kCm +chK xUE gzA pdg @@ -54632,7 +54621,7 @@ eUG eCd eCd fEl -xSX +kYf tIz jdi adx @@ -54651,19 +54640,19 @@ gYL ntm jaI uHS -wLg -wLg +lvu +lvu qAD lvu eCq -wLg +lvu wLH aVH ekL vMH -uhr -uhr -uhr +yeu +yeu +yeu vMH tJL mMJ @@ -54684,8 +54673,8 @@ wFz wFz wFz wFz -jJe -jJe +fxm +fxm bwy bwy bwy @@ -54769,8 +54758,8 @@ uBb tXE vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -54803,7 +54792,7 @@ uBU ngy tkd rWu -kCm +chK xUE gzA gzA @@ -54826,7 +54815,7 @@ eCd eCd eCd fEl -xSX +kYf tIz gcP qqB @@ -54855,17 +54844,17 @@ uQs dGK dGK alM -onI xRn -onI +xRn +xRn vMH dcg mMJ vMH qFt -uhr +yeu aDr -uhr +yeu vMH wFz wFz @@ -54879,7 +54868,7 @@ wFz wFz wFz wFz -jJe +fxm bwy bwy bwy @@ -54962,8 +54951,8 @@ uBb (116,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -54997,7 +54986,7 @@ uBU dUM tkd rWu -kCm +chK xUE tfu gzA @@ -55041,7 +55030,7 @@ cfb uHS lvu hgc -wLg +lvu pjh pjh pjh @@ -55051,14 +55040,14 @@ pjh pjh rRK ntX -onI +xRn vMH ust rrQ vMH btT -uhr -uhr +yeu +yeu iHY vMH wFz @@ -55073,8 +55062,8 @@ wFz wFz wFz wFz -jJe -jJe +fxm +fxm bwy bwy bwy @@ -55156,8 +55145,8 @@ uBb (117,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -55209,8 +55198,8 @@ pOQ xbU wcp kIy -xSX -xSX +kYf +kYf eUG eUG eUG @@ -55245,7 +55234,7 @@ pVt pjh pjh oRy -onI +xRn vMH vMH vMH @@ -55258,8 +55247,8 @@ vMH vMH vMH vMH -onI -onI +xRn +xRn qJx iXe vMH @@ -55349,9 +55338,9 @@ uBb "} (118,1,1) = {" tXE -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -55384,7 +55373,7 @@ tkd tkd tkd tkd -kCm +chK rWu xUE gzA @@ -55393,7 +55382,7 @@ gzA sYE xUE gXq -kCm +chK chK xbU jCJ @@ -55403,7 +55392,7 @@ rzZ xbU wcp kIy -xSX +kYf eUG eUG eUG @@ -55439,31 +55428,31 @@ jcK fWd pjh pVC -onI +xRn vMH rtZ aNo vMH ffO -uhr -uhr +yeu +yeu vMH pQj iVZ bsh -onI -onI -onI -onI -onI -onI +xRn +xRn +xRn +xRn +xRn +xRn hLz jri nKr bsh uOu raZ -onI +xRn kim yas bwy @@ -55578,7 +55567,7 @@ bdR msN eeg dbW -kCm +chK rWu xUE gzA @@ -55586,7 +55575,7 @@ gzA xxJ sYE xUE -kCm +chK chK gzA xbU @@ -55597,7 +55586,7 @@ mRe xbU wcp kIy -xSX +kYf eUG eUG eUG @@ -55633,31 +55622,31 @@ oFb fWd pjh laP -onI +xRn vMH vMH vMH vMH -onI -onI -onI +xRn +xRn +xRn alM -onI +xRn xRn rPd -onI +xRn ozi -cep +rRK rRK jRs -onI -onI -onI -onI +xRn +xRn +xRn +xRn uTL -onI -onI -onI +xRn +xRn +xRn kim yas wFz @@ -55772,7 +55761,7 @@ lzF hKR uiV dbW -kCm +chK rWu xUE sYE @@ -55780,8 +55769,8 @@ sYE sYE sYE xUE -kyL -kCm +chK +chK snd xbU vYI @@ -55827,12 +55816,12 @@ bRO mgD pjh rPW -onI -onI -onI -onI -onI -onI +xRn +xRn +xRn +xRn +xRn +xRn ozi rRK vMH @@ -55851,7 +55840,7 @@ vMH vMH vMH vMH -onI +xRn seB vMH wFz @@ -55966,7 +55955,7 @@ kNW jkL jIT dbW -kCm +chK rWu xUE xUE @@ -55981,7 +55970,7 @@ xbU qaV oiE xbU -xSX +kYf xDB amr fUb @@ -56020,13 +56009,13 @@ jap aEr wXZ pjh -uhr +yeu ntX -onI +xRn ayZ jRs -onI -onI +xRn +xRn jzp vMH vMH @@ -56038,7 +56027,7 @@ kTO vMH vMH mYS -uhr +yeu rny fmf kIC @@ -56160,7 +56149,7 @@ knU knU knU knU -kCm +chK opH fAH qtA @@ -56219,27 +56208,27 @@ xGk vKx xGk xGk -onI -onI +xRn +xRn eMe vMH dhc nqH erz yeu -uhr -uhr +yeu +yeu uPG vMH uva -uhr -lgE +yeu +rny fmf kIC kIC kIC vMH -onI +xRn tTc vMH wFz @@ -56357,7 +56346,7 @@ knU trr opH wmV -kWG +cVV bTH xUE epf @@ -56413,27 +56402,27 @@ gdv hwF oWy xGk -onI -onI +xRn +xRn btW vMH jSv nqH -uhr -uhr -uhr +yeu +yeu +yeu kDx nzP vMH -uhr -uhr +yeu +yeu rMv fmf kIC kIC kIC vMH -onI +xRn pzk vMH wFz @@ -56549,9 +56538,9 @@ lSe knU knU wjg -jLb +xrG wmV -kWG +cVV ioh xUE wEK @@ -56565,7 +56554,7 @@ pXi yiY fCy hKp -xSX +kYf kIy qvW eCd @@ -56607,8 +56596,8 @@ cJb hwF hwF xGk -uhr -onI +yeu +xRn jzp vMH vOs @@ -56616,7 +56605,7 @@ nqH aIP kDx ffO -uhr +yeu tpJ vMH wQB @@ -56627,7 +56616,7 @@ kIC kIC kIC vMH -onI +xRn syt vMH wFz @@ -56757,7 +56746,7 @@ uBd cLE nDD yiY -xSX +kYf wcp kYf kIy @@ -56801,7 +56790,7 @@ hWE rXq hwF xGk -uhr +yeu xRn vMH vMH @@ -56810,7 +56799,7 @@ gBu wvN cgx mOK -uhr +yeu vMH vMH vMH @@ -56822,7 +56811,7 @@ vMH vMH vMH xRn -onI +xRn vMH wFz wFz @@ -56995,10 +56984,10 @@ hWE cJb kTQ xGk -uhr -onI -onI -onI +yeu +xRn +xRn +xRn vMH vMH vMH @@ -57014,9 +57003,9 @@ kIC kIC kIC kIC -uhr -onI -onI +yeu +xRn +xRn vMH wFz wFz @@ -57145,9 +57134,9 @@ fFu sVL xpn yiY -xSX +kYf vqk -xSX +kYf kIy eCd eCd @@ -57189,16 +57178,16 @@ hWE cJb hwF xGk -uhr -onI -onI -onI +yeu +xRn +xRn +xRn hLz nKr nKr dtn vMH -uhr +yeu vMH nLj nLj @@ -57208,9 +57197,9 @@ kIC kIC kIC kIC -uhr -onI -onI +yeu +xRn +xRn vMH wFz wFz @@ -57339,9 +57328,9 @@ nFz wWD mLj wDn -xSX +kYf vuJ -xSX +kYf kIy epZ jdR @@ -57384,15 +57373,15 @@ cJb hwF xGk kqI -onI -onI -onI -onI -onI -onI +xRn +xRn +xRn +xRn +xRn +xRn wMT vMH -uhr +yeu cFa cFa cFa @@ -57477,8 +57466,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm uBb "} (129,1,1) = {" @@ -57586,7 +57575,7 @@ vMH vMH vMH vMH -uhr +yeu cFa dFL dFL @@ -57670,9 +57659,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm tXE "} (130,1,1) = {" @@ -57772,15 +57761,15 @@ cJb hwF xGk kqI -onI +xRn sxo vMH qgY qFQ ffO -uhr +yeu jPo -uhr +yeu cFa eBn eBn @@ -57864,8 +57853,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ tXE "} @@ -57966,11 +57955,11 @@ cJb baa xGk cwF -onI +xRn gUy vMH -uhr -uhr +yeu +yeu aIP uEH vMH @@ -57985,7 +57974,7 @@ cfY eBn cfY eBn -unR +cfY cFa wFz bwy @@ -58056,10 +58045,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ tXE "} @@ -58160,8 +58149,8 @@ cJb hwF xGk cwF -onI -hbc +xRn +ikB vMH sxe vgC @@ -58249,10 +58238,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ tXE @@ -58354,13 +58343,13 @@ cJb hwF xGk cwF -onI +xRn eUR dyu -uhr +yeu ffO asf -uhr +yeu vMH nLj cFa @@ -58441,10 +58430,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -58548,13 +58537,13 @@ cJb hwF xGk lAt -onI +xRn ixv vMH fiE -uhr -uhr -uhr +yeu +yeu +yeu vMH nLj cFa @@ -58634,9 +58623,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -58828,8 +58817,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -59022,8 +59011,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -59136,7 +59125,7 @@ rRh iqG fKt pBU -wno +rbK rbK vJr tjt @@ -59215,9 +59204,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -59229,9 +59218,9 @@ tXE "} (138,1,1) = {" tXE -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -59260,7 +59249,7 @@ eks eks eks eks -eks +xUE xUE phg uvM @@ -59409,9 +59398,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -59424,8 +59413,8 @@ tXE (139,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -59454,7 +59443,7 @@ mIX rke eWt mUL -xOk +hJZ hJZ kww hJZ @@ -59603,8 +59592,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -59618,8 +59607,8 @@ tXE (140,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -59647,8 +59636,8 @@ uBq dtz lfa kHg -mEJ -eks +iEC +hJZ hJZ aYa hJZ @@ -59755,26 +59744,26 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -59797,8 +59786,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -59813,8 +59802,8 @@ tXE tXE vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -59840,9 +59829,9 @@ azR jmA uEv uEv -nen -lYE -eks +wgc +iEC +xUE xUE bvU uvM @@ -59946,31 +59935,31 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -59991,8 +59980,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -60007,8 +59996,8 @@ tXE tXE vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -60034,13 +60023,13 @@ wWu bkP dPX dPX -nen +xOk iEC -eks +eoE sCb bHM sCb -kWG +cVV xUE sYE xbU @@ -60088,10 +60077,10 @@ rTA eEe gYG cRZ -tOr -tOr -iPR -fkn +sVc +sVc +wno +jJe fkn snw pmH @@ -60139,33 +60128,33 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ vFJ vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -60185,8 +60174,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -60201,8 +60190,8 @@ tXE tXE vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -60227,10 +60216,10 @@ eks byl bkP ibp -ibp -nen -miX -eks +spN +cxu +iEC +ckW eCL cmO yhc @@ -60285,7 +60274,7 @@ ecI tOr tOr hVT -fkn +hvD qqM snw tOr @@ -60332,9 +60321,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -60359,9 +60348,9 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -60379,8 +60368,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -60395,8 +60384,8 @@ tXE tXE vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -60423,8 +60412,8 @@ eXv iIZ shc nen -vqa -eks +iEC +ckW ckW oiB bGd @@ -60479,7 +60468,7 @@ nhv mcX mcX mcX -fkn +hvD sku snw snw @@ -60526,7 +60515,7 @@ bwy bwy bwy bwy -jJe +fxm vFJ vFJ vFJ @@ -60554,9 +60543,9 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -60573,8 +60562,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -60588,9 +60577,9 @@ tXE (145,1,1) = {" tXE vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -60616,9 +60605,9 @@ pxm bkP cjR cjR -spN -jra -eks +nen +iEC +ckW ckW agZ ion @@ -60673,7 +60662,7 @@ bMb kUo glL mcX -fkn +hvD tUS snw nmb @@ -60719,8 +60708,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -60750,9 +60739,9 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -60766,9 +60755,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -60782,8 +60771,8 @@ tXE (146,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -60809,7 +60798,7 @@ eks imh bkP nen -nen +jra rev iNF tkx @@ -60913,9 +60902,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -60945,9 +60934,9 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -60960,8 +60949,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -60976,8 +60965,8 @@ tXE (147,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -61005,9 +60994,9 @@ hOc wDz chj oSY -jiF -eks +iEC scr +ckW cqh tos kyu @@ -61061,7 +61050,7 @@ lcp idy rTQ mcX -fkn +hvD tUS snw tOr @@ -61072,7 +61061,7 @@ snw dfA dfA snw -feb +rrk snw std std @@ -61107,9 +61096,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -61140,9 +61129,9 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -61153,9 +61142,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -61169,9 +61158,9 @@ tXE "} (148,1,1) = {" tXE -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -61199,8 +61188,8 @@ boR waC vbK cDL -iav -eks +iEC +ckW ckW svv ckW @@ -61255,7 +61244,7 @@ gtR wOd wOd mcX -fkn +hvD cCy snw dXW @@ -61266,7 +61255,7 @@ snw snw snw snw -feb +rrk snw dfA dfA @@ -61301,9 +61290,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -61335,9 +61324,9 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -61346,10 +61335,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -61363,8 +61352,8 @@ tXE "} (149,1,1) = {" tXE -jJe -jJe +fxm +fxm bwy bwy bwy @@ -61449,7 +61438,7 @@ tfp idy idy mcX -fkn +hvD ciL snw snw @@ -61495,8 +61484,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -61530,20 +61519,20 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -61557,8 +61546,8 @@ tXE "} (150,1,1) = {" tXE -jJe -jJe +fxm +fxm bwy bwy bwy @@ -61643,17 +61632,17 @@ tfp foH foH mcX -fkn -fkn +lfi +hag tna -fkn -fkn -fkn -fkn +hag +hag +hag +hag tna -fkn +hag jco -uMt +duD wSE snw dfA @@ -61689,8 +61678,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -61725,18 +61714,18 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -61752,7 +61741,7 @@ tXE (151,1,1) = {" tXE vFJ -jJe +fxm bwy bwy bwy @@ -61766,7 +61755,7 @@ bwy mAy mAy mAy -jJe +fxm eCv tCY yjH @@ -61837,7 +61826,7 @@ tfp bYv bYv mcX -fkn +hvD uth snw ism @@ -61883,8 +61872,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -61920,14 +61909,14 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -61946,8 +61935,8 @@ tXE (152,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -61959,8 +61948,8 @@ bwy bwy bwy mAy -jJe -jJe +fxm +fxm eCv fSf dIs @@ -62031,7 +62020,7 @@ tfp dfA snw lSX -fkn +hvD tUS snw snw @@ -62078,8 +62067,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -62115,11 +62104,11 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -62140,8 +62129,8 @@ tXE (153,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -62153,8 +62142,8 @@ bwy bwy bwy mAy -jJe -jJe +fxm +fxm eCv ctt pXB @@ -62225,7 +62214,7 @@ tfp dfA snw avZ -fkn +hvD wRV snw dfA @@ -62272,8 +62261,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -62335,7 +62324,7 @@ tXE tXE vFJ vFJ -jJe +fxm bwy bwy bwy @@ -62348,7 +62337,7 @@ bwy bwy mAy mAy -jJe +fxm lFn lFn lFn @@ -62381,8 +62370,8 @@ fah mUT fah daS -dAG -dAG +dox +dox sYA fah mSY @@ -62419,7 +62408,7 @@ tfp dfA snw aYe -fkn +hvD tUS snw dfA @@ -62466,8 +62455,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -62529,7 +62518,7 @@ tXE tXE vFJ vFJ -jJe +fxm bwy bwy bwy @@ -62542,7 +62531,7 @@ bwy bwy mAy mAy -jJe +fxm hAs fjg bTU @@ -62613,7 +62602,7 @@ dfA dfA snw qxM -fkn +hvD tUS snw snw @@ -62660,9 +62649,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -62723,7 +62712,7 @@ tXE tXE vFJ vFJ -jJe +fxm bwy bwy bwy @@ -62735,8 +62724,8 @@ bwy bwy bwy mAy -jJe -jJe +fxm +fxm hAs uTQ mIc @@ -62754,7 +62743,7 @@ nLH nOJ qyx ipR -pcj +uEI uEI liF gYw @@ -62855,8 +62844,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -62916,8 +62905,8 @@ tXE (157,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -62930,7 +62919,7 @@ bwy bwy mAy mAy -jJe +fxm hAs jBO aNi @@ -62947,8 +62936,8 @@ sIY rxm sQs uuj -rxm -voy +iav +uEI uEI liF gYw @@ -62972,7 +62961,7 @@ xZX tOr cmK ioL -rrk +aEs rlf tOr snw @@ -63001,10 +62990,10 @@ jZT jZT jZT jZT -jZT -jZT -jZT -jZT +kWG +iTp +iTp +cFv jZT qdO snw @@ -63049,8 +63038,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -63110,8 +63099,8 @@ tXE (158,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -63123,8 +63112,8 @@ bwy bwy bwy mAy -jJe -jJe +fxm +fxm jXk jXk jXk @@ -63134,12 +63123,12 @@ qMz vCf ujn rYi -qtM +etM qsf jQW rTT xmy -rxm +gpO rXt rXt uDW @@ -63166,8 +63155,8 @@ snw fsS tOr snw -rrk -hag +aEs +rlf tOr xZX tSk @@ -63243,8 +63232,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -63303,8 +63292,8 @@ tXE "} (159,1,1) = {" tXE -jJe -jJe +fxm +fxm bwy bwy bwy @@ -63318,7 +63307,7 @@ bwy bwy mAy mAy -jJe +fxm alC jKw jAo @@ -63362,7 +63351,7 @@ xZX snw tOr pmb -rrk +aEs snw xZX xZX @@ -63421,7 +63410,7 @@ pTA fhQ pYv jOP -jJe +fxm bwy bwy bwy @@ -63437,8 +63426,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -63497,8 +63486,8 @@ tXE "} (160,1,1) = {" tXE -jJe -jJe +fxm +fxm bwy bwy bwy @@ -63615,7 +63604,7 @@ cyp ouj yjT jOP -jJe +fxm bwy bwy bwy @@ -63630,8 +63619,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -63691,8 +63680,8 @@ tXE "} (161,1,1) = {" uBb -jJe -jJe +fxm +fxm bwy bwy bwy @@ -63726,7 +63715,7 @@ whe mZm omx uEI -arf +uQP rMt pAU kMx @@ -63744,11 +63733,11 @@ shL qVF qVF sGi -rrk +aEs tOr -lfi +aEs tOr -rrk +aEs gvS sPt jrt @@ -63809,7 +63798,7 @@ yjT yjT yjT qIe -jJe +fxm bwy bwy bwy @@ -63824,8 +63813,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -63885,8 +63874,8 @@ tXE "} (162,1,1) = {" uBb -jJe -jJe +fxm +fxm bwy bwy bwy @@ -63941,13 +63930,13 @@ fah snw tOr tOr -rrk +aEs jUY -phQ +doA maf -rrk +aEs jUY -rrk +aEs snw snw snw @@ -64003,7 +63992,7 @@ qIe scX scX qIe -jJe +fxm bwy bwy bwy @@ -64018,9 +64007,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -64079,8 +64068,8 @@ tXE "} (163,1,1) = {" uBb -jJe -jJe +fxm +fxm bwy bwy bwy @@ -64114,7 +64103,7 @@ pxA rga lZN uEI -arf +uQP rMt ylr vIt @@ -64142,7 +64131,7 @@ kXz tOr jUY tOr -rrk +aEs abF snw dfA @@ -64197,7 +64186,7 @@ qIe gPy gPy qIe -jJe +fxm bwy bwy bwy @@ -64212,7 +64201,7 @@ bwy bwy bwy bwy -jJe +fxm vFJ vFJ vFJ @@ -64273,9 +64262,9 @@ tXE "} (164,1,1) = {" uBb -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -64303,12 +64292,12 @@ wWc qcl oDp xay -eUc +hUI pxA vpG stt stt -arf +uQP rMt rMt rMt @@ -64319,7 +64308,7 @@ rMt rMt rMt rMt -arf +uQP fah ahi inU @@ -64330,12 +64319,12 @@ snw tOr vIG iHj -vZe +oPN cVu tOr tOr -lfi -rrk +aEs +aEs snw sNE snw @@ -64391,7 +64380,7 @@ fOm gPy gPy pQm -jJe +fxm bwy bwy bwy @@ -64406,7 +64395,7 @@ bwy bwy bwy bwy -jJe +fxm vFJ vFJ vFJ @@ -64467,9 +64456,9 @@ tXE "} (165,1,1) = {" tXE -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -64494,10 +64483,10 @@ oEY lqt eEy vNL -rOp -rOp -rOp -hUI +eVD +eVD +lxQ +qpB pxA yeV hJZ @@ -64529,9 +64518,9 @@ iGQ fsU tOr fsU -rrk -rrk -rrk +aEs +aEs +aEs snw dfA snw @@ -64585,7 +64574,7 @@ wis eSc pvM pQm -jJe +fxm bwy bwy bwy @@ -64599,8 +64588,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -64662,9 +64651,9 @@ tXE (166,1,1) = {" tXE wFz -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -64685,13 +64674,13 @@ fIx kUc sAb oEY -cxu +pxA myH -gpO -eVD -eVD -lxQ -qpB +pxA +pxA +pxA +pxA +pxA pxA xUE xUE @@ -64720,10 +64709,10 @@ bOp xjC sPt idB -rrk +aEs tOr -rrk -rrk +aEs +aEs snw snw snw @@ -64757,13 +64746,13 @@ wFz wFz wFz wFz -jJe -jJe -jJe +fxm +fxm +fxm wFz -jJe -jJe -jJe +fxm +fxm +fxm wFz ndx dDB @@ -64779,7 +64768,7 @@ sNL gPy poo pQm -jJe +fxm bwy bwy bwy @@ -64792,9 +64781,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -64857,8 +64846,8 @@ tXE tXE wFz wFz -jJe -jJe +fxm +fxm bwy bwy bwy @@ -64879,13 +64868,13 @@ cUi oEY oEY oEY -pxA +miX nOX +gwS pxA -pxA -pxA -pxA -pxA +npE +thk +xly pxA gRB eeE @@ -64915,9 +64904,9 @@ fsU kXz hTV jUY -rrk +aEs maf -rrk +aEs snw wFz wFz @@ -64947,18 +64936,18 @@ wFz wFz wFz wFz -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy -jJe -jJe +fxm +fxm ndx bnH ndx @@ -64973,7 +64962,7 @@ qIe pQm qIe qIe -jJe +fxm bwy bwy bwy @@ -64985,9 +64974,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -65052,8 +65041,8 @@ tXE wFz wFz wFz -jJe -jJe +fxm +fxm bwy bwy bwy @@ -65076,10 +65065,10 @@ wyh pRb nGn edL -pxA -npE -thk -xly +pEs +jux +naz +biO pxA oGS uCO @@ -65096,20 +65085,20 @@ ydu fah uCO fah -vEo +nkd nxW aOU -vEo -vEo +nkd +nkd wkK snw -rrk -rrk -rrk +aEs +aEs +aEs kXz qkb jUY -rrk +aEs kXz tOr snw @@ -65128,20 +65117,20 @@ wFz wFz wFz wFz -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm wFz wFz wFz wFz wFz -jJe -jJe -jJe +fxm +fxm +fxm wFz -jJe +fxm bwy bwy bwy @@ -65151,8 +65140,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm ndx sqq iZM @@ -65163,11 +65152,11 @@ ndx wUq iZM ndx -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -65178,9 +65167,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -65265,15 +65254,15 @@ wFz wFz wFz pxA -gwS +rOp aKe mVl pLq hoH -pEs -jux -naz -biO +pxA +cBj +gcV +pxA pxA iue uCO @@ -65290,22 +65279,22 @@ ydu fah ooX reD -vEo +nkd nkd nxW nkd -vEo +nkd nkd aUm tOr -rrk +aEs tOr tOr gUe iHj oPN caT -rrk +aEs snw cFu cFu @@ -65321,21 +65310,21 @@ snw wFz wFz wFz -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -65346,7 +65335,7 @@ bwy bwy bwy bwy -jJe +fxm ndx iOU apo @@ -65357,8 +65346,8 @@ ndx iOU apo ndx -jJe -jJe +fxm +fxm bwy bwy bwy @@ -65372,9 +65361,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -65459,15 +65448,15 @@ wFz wFz wFz pxA -rOp -wgc -rOp -iLx -rOp +tBO +pxA +vul +pxA +hCY pxA cBj gcV -pxA +xly pxA xAg uCO @@ -65484,26 +65473,26 @@ fah fah uCO fah -vEo +nkd nxW nxW lJC nxW -vEo +nkd snw lQq -rrk +aEs lDH aEs -rrk -rrk +aEs +aEs lDH -rrk +aEs iAL snw -jJe -jJe -jJe +fxm +fxm +fxm snw gCr snw @@ -65522,8 +65511,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm bwy bwy bwy @@ -65540,7 +65529,7 @@ bwy bwy bwy bwy -jJe +fxm ndx cGM cGM @@ -65551,8 +65540,8 @@ ndx cGM cGM ndx -jJe -jJe +fxm +fxm bwy bwy bwy @@ -65566,9 +65555,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -65653,15 +65642,15 @@ wFz wFz wFz pxA -tBO +gBM pxA -vul +tuv pxA -hCY +dtX pxA -cBj -gcV -xly +rtt +jwq +biO pxA nRA iNS @@ -65678,12 +65667,12 @@ mAy fah upb fah -fmr -vEo -vEo +nkd +nkd +nkd pYe -vEo -vEo +nkd +nkd snw gCr gCr @@ -65695,20 +65684,20 @@ snw gCr gCr snw -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm mAy mAy bwy @@ -65734,18 +65723,18 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -65847,15 +65836,15 @@ wFz wFz wFz pxA -gBM pxA -tuv pxA -dtX pxA -rtt -jwq -biO +pxA +pxA +pxA +pxA +pxA +pxA pxA fah upb @@ -65872,37 +65861,37 @@ mAy mAy mAy fah -vEo +nkd nkd nxW izp -vEo -vEo +nkd +nkd fah -jJe -jJe +fxm +fxm oHZ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm mAy mAy bwy @@ -65932,10 +65921,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy @@ -66040,16 +66029,16 @@ bwy wFz wFz wFz -pxA -pxA -pxA -pxA -pxA -pxA -pxA -pxA -pxA -pxA +jiF +jiF +jiF +pcj +pcj +pcj +pcj +pcj +pcj +pcj pxA bwy bwy @@ -66066,37 +66055,37 @@ rnc vnb mAy fah -vEo +nkd nkd nxW riz -vEo +nkd pyd fah -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm mAy mAy bwy @@ -66236,13 +66225,13 @@ bwy wFz wFz wFz -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -66267,30 +66256,30 @@ fah fah fah fah -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm uNr uNr -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm mAy mAy bwy @@ -66428,12 +66417,12 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -66458,32 +66447,32 @@ mAy wFz wFz wFz -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm uNr uNr -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm uNr uNr -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm mAy mAy mAy @@ -66541,7 +66530,7 @@ xza xWR fKG vFJ -cFv +jOP jOP jOP vFJ @@ -66647,37 +66636,37 @@ bwy bwy bwy rnc -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm mAy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm uNr uNr -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm mAy mAy mAy @@ -66842,35 +66831,35 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm mAy mAy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm mAy mAy mAy @@ -67037,34 +67026,34 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm mAy mAy mAy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm mAy mAy mAy @@ -67122,7 +67111,7 @@ azT wCU wCU fKG -cFv +jOP jOP vFJ vFJ @@ -67232,32 +67221,32 @@ bwy bwy bwy bwy -jJe +fxm mAy mAy mAy mAy mAy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm mAy -jJe -jJe +fxm +fxm mAy mAy mAy @@ -67318,7 +67307,7 @@ mAy fKG jOP jOP -cFv +jOP vFJ vFJ vFJ @@ -67426,7 +67415,7 @@ bwy bwy bwy bwy -jJe +fxm mAy mAy mAy @@ -67434,19 +67423,19 @@ mAy mAy uNr uNr -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm mAy mAy mAy @@ -67620,7 +67609,7 @@ bwy bwy bwy bwy -jJe +fxm mAy mAy mAy @@ -67628,17 +67617,17 @@ mAy mAy uNr uNr -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm mAy -jJe -jJe +fxm +fxm mAy mAy mAy @@ -67814,7 +67803,7 @@ bwy bwy bwy bwy -jJe +fxm mAy mAy mAy @@ -67824,11 +67813,11 @@ mAy mAy mAy mAy -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm mAy mAy mAy @@ -68017,12 +68006,12 @@ mAy mAy mAy mAy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm mAy -jJe +fxm mAy mAy mAy @@ -68932,8 +68921,8 @@ tXE wFz wFz wFz -jJe -jJe +fxm +fxm bwy bwy bwy @@ -69127,9 +69116,9 @@ wFz wFz wFz wFz -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -69322,9 +69311,9 @@ wFz wFz wFz wFz -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -69517,9 +69506,9 @@ wFz wFz wFz wFz -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy diff --git a/maps/tether/levels/surface3.dmm b/maps/tether/levels/surface3.dmm index 4e18771f12c5..d24d3000b8aa 100644 --- a/maps/tether/levels/surface3.dmm +++ b/maps/tether/levels/surface3.dmm @@ -209,6 +209,7 @@ dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals5, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "adP" = ( @@ -336,7 +337,7 @@ "afT" = ( /obj/structure/flora/pottedplant/unusual, /obj/machinery/fire_alarm/east_mount, -/obj/machinery/camera/network/research{ +/obj/machinery/camera/network/research/xenobio{ dir = 1 }, /turf/simulated/floor/wood, @@ -411,12 +412,11 @@ /area/tether/surfacebase/outside/outside3) "aiC" = ( /obj/structure/railing, -/obj/structure/grille, -/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ - frequency = 1379; - id_tag = "southciv_airlock_pump" +/obj/structure/sign/nosmoking_2{ + pixel_y = 30 }, -/obj/map_helper/airlock/atmos/chamber_pump, +/obj/machinery/atmospherics/component/unary/env_heat_pump, +/obj/map_helper/airlock/atmos/chamber_temperature_adjuster, /turf/simulated/floor/tiled, /area/tether/surfacebase/topairlock) "aiJ" = ( @@ -468,11 +468,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) -"akq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "akz" = ( /obj/structure/table/bench/steel, /obj/effect/floor_decal/borderfloor{ @@ -536,12 +531,6 @@ /obj/machinery/power/apc/east_mount, /turf/simulated/floor/bluegrid, /area/rnd/robotics/mechbay) -"amn" = ( -/obj/structure/railing{ - dir = 1 - }, -/turf/simulated/open, -/area/tether/surfacebase/medical/uppersouthstairwell) "amw" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -920,18 +909,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/research) -"avu" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 9 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 9 - }, -/obj/machinery/vending/medical{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/storage) "avK" = ( /obj/machinery/power/apc/north_mount, /obj/structure/cable/orange{ @@ -1169,14 +1146,12 @@ /turf/simulated/floor/tiled/techfloor, /area/rnd/workshop) "aCE" = ( -/obj/structure/table/rack, -/obj/random/maintenance/medical, -/obj/random/maintenance/clean, -/obj/random/medical/lite, -/obj/random/maintenance/medical, -/obj/random/toy, -/turf/simulated/floor/plating, -/area/maintenance/lower/medsec_maintenance) +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/triage) "aCO" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/freezer, @@ -1230,13 +1205,10 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aDP" = ( -/obj/effect/floor_decal/techfloor{ - dir = 6 - }, -/obj/random/maintenance/medical, -/obj/random/maintenance/medical, /obj/random/maintenance/medical, /obj/structure/closet/firecloset, +/obj/effect/floor_decal/techfloor, +/obj/random/maintenance/medical, /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/lower/medsec_maintenance) "aEt" = ( @@ -1363,10 +1335,6 @@ /obj/effect/floor_decal/steeldecal/steel_decals4, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) -"aHd" = ( -/obj/machinery/holopad, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "aHg" = ( /obj/effect/floor_decal/industrial/loading{ dir = 4 @@ -1409,20 +1377,14 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "aHM" = ( -/obj/machinery/atmospherics/portables_connector{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 10 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 }, -/obj/item/radio/intercom{ - pixel_y = -24 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/area/rnd/xenobiology/xenoflora) "aIi" = ( /obj/structure/sign/nanotrasen, /turf/simulated/wall/prepainted/science, @@ -1557,7 +1519,7 @@ dir = 8 }, /turf/simulated/floor/tiled/techfloor, -/area/vacant/vacant_shop) +/area/tether/surfacebase/barbackmaintenance) "aLt" = ( /obj/structure/table/wooden_reinforced, /obj/item/radio/phone, @@ -1627,14 +1589,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 1 +/obj/effect/floor_decal/techfloor{ + dir = 5 }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 6 +/obj/effect/floor_decal/techfloor/corner{ + dir = 4 }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) +/turf/simulated/floor/tiled/techfloor/grid, +/area/maintenance/lower/medsec_maintenance) "aNO" = ( /obj/machinery/light{ dir = 8 @@ -1749,20 +1711,12 @@ /turf/simulated/floor/wood, /area/rnd/outpost/xenobiology/outpost_office) "aSf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ - dir = 5 +/obj/machinery/light/small{ + dir = 8 }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/turf/simulated/floor/wood, +/area/tether/surfacebase/barbackmaintenance) "aSh" = ( /obj/effect/floor_decal/borderfloorblack/corner{ dir = 8 @@ -1792,6 +1746,11 @@ dir = 4 }, /obj/structure/disposalpipe/junction, +/obj/structure/table/steel, +/obj/item/defib_kit/loaded, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "aSE" = ( @@ -1872,28 +1831,7 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"aUW" = ( -/obj/machinery/door/window/brigdoor/southright{ - dir = 4; - req_access = list(30,35,47,77); - req_one_access = list() - }, -/obj/machinery/door/window/brigdoor/southright{ - dir = 8; - req_access = list(30,35,47,77); - req_one_access = list() - }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "aUY" = ( -/obj/machinery/portable_atmospherics/canister/oxygen/prechilled, -/obj/machinery/atmospherics/portables_connector, -/obj/item/tool/wrench, -/obj/machinery/door/window/brigdoor/southright{ - req_access = list(); - req_one_access = list(5) - }, /obj/machinery/air_alarm{ pixel_y = 25 }, @@ -1903,6 +1841,9 @@ /obj/effect/floor_decal/corner/paleblue{ dir = 6 }, +/obj/machinery/atmospherics/pipe/simple/hidden/universal{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "aVs" = ( @@ -1979,6 +1920,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppersouthstairwell) "aZw" = ( @@ -2116,9 +2058,6 @@ /turf/simulated/floor/tiled/techfloor, /area/rnd/workshop) "bcG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4 - }, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -2128,6 +2067,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/cyan, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "bcW" = ( @@ -2217,6 +2157,7 @@ /obj/structure/cable/green{ icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "bfL" = ( @@ -2264,9 +2205,6 @@ /turf/simulated/floor/tiled, /area/hallway/primary/port) "bgt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 9 - }, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -2331,7 +2269,9 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 1 }, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "bhB" = ( @@ -2343,15 +2283,20 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "bhO" = ( -/obj/machinery/light, -/obj/machinery/portable_atmospherics/hydroponics, -/obj/machinery/camera/network/civilian{ - dir = 1 +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 }, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lime/border, /turf/simulated/floor/tiled, -/area/tether/surfacebase/botanystorage) +/area/hallway/lower/third_south) "biu" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -2397,12 +2342,6 @@ /turf/simulated/floor/tiled/eris/cafe, /area/hydroponics) "bjO" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 8 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 8 - }, /obj/item/radio/intercom/department/medbay{ dir = 8; pixel_x = -24 @@ -2411,6 +2350,12 @@ dir = 4 }, /obj/machinery/disposal, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 9 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 9 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "bkm" = ( @@ -2424,6 +2369,9 @@ dir = 10 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "blA" = ( @@ -2448,10 +2396,6 @@ /turf/simulated/floor/carpet, /area/library) "bmh" = ( -/obj/structure/closet/l3closet/scientist, -/obj/machinery/light{ - dir = 1 - }, /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -2464,15 +2408,10 @@ /obj/effect/floor_decal/corner/mauve/bordercorner2{ dir = 1 }, +/obj/machinery/portable_atmospherics/hydroponics, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "bmn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 10 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/effect/floor_decal/corner/paleblue{ dir = 9 }, @@ -2480,6 +2419,11 @@ dir = 6 }, /obj/machinery/camera/network/medbay, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 6 + }, +/obj/structure/table/steel, +/obj/item/reagent_containers/glass/beaker/cryoxadone, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "bmE" = ( @@ -2666,19 +2610,16 @@ /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "brh" = ( -/obj/machinery/camera/network/tether, /obj/effect/floor_decal/borderfloor{ dir = 1 }, /obj/effect/floor_decal/corner/mauve/border{ dir = 1 }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/machinery/camera/network/research, +/obj/structure/closet/firecloset, /turf/simulated/floor/tiled, -/area/hallway/primary/starboard) +/area/rnd/xenobiology/xenoflora) "brA" = ( /turf/simulated/open, /area/rnd/staircase/thirdfloor) @@ -2774,29 +2715,7 @@ /obj/effect/paint_stripe/bottlegreen, /turf/simulated/floor/plating, /area/crew_quarters/bar) -"but" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass/research{ - name = "Xenoflora Research"; - req_one_access = list(30,35,47,77) - }, -/turf/simulated/floor/tiled/steel_grid, -/area/rnd/xenobiology/xenoflora_storage) "buF" = ( -/obj/item/storage/firstaid/o2{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/storage/firstaid/o2, /obj/effect/floor_decal/corner/blue/full{ dir = 8 }, @@ -2804,6 +2723,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/table/standard, +/obj/machinery/lathe/medical/stocked, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "buX" = ( @@ -2871,9 +2791,6 @@ pixel_x = 5 }, /obj/structure/curtain/open/shower, -/obj/machinery/camera/network/research/xenobio{ - dir = 10 - }, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_south_airlock) "bww" = ( @@ -2882,13 +2799,6 @@ }, /turf/simulated/floor/wood, /area/triumph/surfacebase/sauna) -"bwH" = ( -/obj/machinery/biogenerator, -/obj/effect/floor_decal/borderfloor{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) "bxs" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -2922,12 +2832,10 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 1 }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, /obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/structure/closet/l3closet/scientist, /turf/simulated/floor/tiled, -/area/hallway/primary/starboard) +/area/rnd/xenobiology/xenoflora) "bxM" = ( /obj/structure/toilet{ dir = 8 @@ -2946,6 +2854,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/wood, /area/tether/surfacebase/barbackmaintenance) "byD" = ( @@ -2959,18 +2868,8 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "bzg" = ( -/obj/structure/window/reinforced, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 10 - }, -/obj/machinery/light{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) @@ -3035,11 +2934,8 @@ "bBk" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/mauve/border, -/obj/machinery/door/firedoor{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/hallway/primary/starboard) +/turf/simulated/wall/prepainted/science, +/area/rnd/xenobiology/xenoflora) "bBs" = ( /obj/machinery/portable_atmospherics/hydroponics/soil, /obj/machinery/camera/network/civilian, @@ -3049,6 +2945,10 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "bBD" = ( @@ -3143,15 +3043,14 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "bCF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lime/border, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/botanystorage) "bCV" = ( /obj/structure/bed/chair/shuttle{ dir = 1 @@ -3287,12 +3186,13 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) "bHT" = ( -/obj/machinery/chem_master, /obj/effect/floor_decal/borderfloorwhite, /obj/item/radio/intercom{ pixel_y = -28 }, /obj/effect/floor_decal/corner/orange/border, +/obj/structure/table/reinforced, +/obj/machinery/chemical_dispenser/full, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) "bIe" = ( @@ -3376,16 +3276,17 @@ dir = 1; pixel_y = -28 }, +/obj/machinery/camera/network/research/xenobio{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_first_aid) "bLf" = ( -/obj/machinery/atmospherics/component/binary/pump{ - dir = 4; - name = "Isolation to Waste" +/obj/machinery/atmospherics/pipe/simple/visible/universal{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/turf/simulated/floor/tiled/steel_dirty/virgo3b, +/area/tether/surfacebase/outside/outside3) "bLy" = ( /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics) @@ -3639,15 +3540,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_hallway) -"bTv" = ( -/obj/structure/table/glass, -/obj/random/medical, -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 8 - }, -/obj/item/tool/screwdriver, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) "bTM" = ( /obj/structure/sign/directions/evac{ dir = 1 @@ -3890,6 +3782,9 @@ name = "Surface EVA" }, /obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/topairlock) "caF" = ( @@ -3901,6 +3796,9 @@ /area/rnd/research_storage) "caI" = ( /obj/machinery/holopad, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "caX" = ( @@ -3961,6 +3859,7 @@ dir = 4; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "cdd" = ( @@ -4012,7 +3911,7 @@ name = "Fire/Phoron Shelter" }, /turf/simulated/floor/tiled/techfloor/grid, -/area/vacant/vacant_shop) +/area/tether/surfacebase/barbackmaintenance) "ceB" = ( /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 8 @@ -4024,26 +3923,21 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 10 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/topairlock) "cfG" = ( /obj/effect/floor_decal/borderfloor{ - dir = 5 + dir = 1 }, /obj/effect/floor_decal/corner/mauve/border{ - dir = 5 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 5 - }, -/obj/effect/floor_decal/corner/mauve/bordercorner2{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 + dir = 1 }, +/obj/machinery/portable_atmospherics/hydroponics, /turf/simulated/floor/tiled, -/area/hallway/primary/starboard) +/area/rnd/xenobiology/xenoflora) "cfT" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, @@ -4231,6 +4125,9 @@ }, /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "ckA" = ( @@ -4240,6 +4137,7 @@ dir = 4; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "ckD" = ( @@ -4325,6 +4223,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 5 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "cou" = ( @@ -4430,17 +4331,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"csz" = ( -/obj/structure/reagent_dispensers/watertank, -/obj/item/reagent_containers/glass/bucket, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) "csF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -4497,7 +4387,6 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "ctR" = ( -/obj/machinery/botany/extractor, /obj/machinery/light{ dir = 8 }, @@ -4507,6 +4396,8 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 8 }, +/obj/structure/reagent_dispensers/watertank, +/obj/item/reagent_containers/glass/bucket, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "ctU" = ( @@ -4528,7 +4419,7 @@ /obj/item/slime_scanner, /obj/item/multitool, /obj/machinery/camera/network/research/xenobio{ - dir = 10 + dir = 1 }, /turf/simulated/floor/tiled/techmaint, /area/rnd/outpost/xenobiology/outpost_storage) @@ -4626,12 +4517,14 @@ /turf/simulated/wall/prepainted/science, /area/rnd/staircase/thirdfloor) "cwf" = ( -/obj/item/radio/intercom{ - dir = 1; - pixel_y = 24 +/obj/machinery/vending/medical{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/triage) "cwy" = ( /obj/machinery/door/airlock{ name = "Internal Affairs"; @@ -4854,14 +4747,26 @@ /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_south_airlock) "cBN" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/light{ +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 8 }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/area/rnd/xenobiology/xenoflora) "cBT" = ( /obj/structure/table/steel, /obj/item/integrated_circuit_printer, @@ -4924,7 +4829,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ +/obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, /turf/simulated/floor/tiled, @@ -4940,6 +4845,7 @@ dir = 8 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "cDs" = ( @@ -4968,12 +4874,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/surgery1) -"cEO" = ( -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "cEQ" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -5057,16 +4957,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) -"cGJ" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/airlock/glass/research{ - name = "Xenoflora Research"; - req_one_access = list(30,35,47,77) - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "cGO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -5117,13 +5007,14 @@ /turf/simulated/floor/bluegrid, /area/rnd/robotics/mechbay) "cKI" = ( -/obj/structure/table/glass, -/obj/effect/floor_decal/steeldecal/steel_decals10{ +/obj/structure/window/reinforced{ dir = 8 }, -/obj/item/defib_kit/loaded, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology/xenoflora_storage) "cKJ" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/effect/paint_stripe/purplegray, @@ -5177,7 +5068,6 @@ /turf/simulated/wall/prepainted/civilian, /area/tether/surfacebase/shuttle_pad) "cOu" = ( -/obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment{ dir = 8 }, @@ -5190,9 +5080,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/door/airlock/glass/research{ - name = "Xenoflora Research"; - req_one_access = list(30,35,47,77) +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) @@ -5600,14 +5489,22 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/tourbus/general) "dcU" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 4 +/obj/structure/catwalk, +/obj/structure/railing{ + dir = 1 }, -/obj/machinery/camera/network/research/xenobio{ - dir = 9 +/obj/structure/table/standard, +/obj/item/reagent_containers/food/drinks/teapot, +/obj/item/reagent_containers/food/drinks/tea{ + pixel_x = 9; + pixel_y = -6 }, -/turf/simulated/floor/tiled, -/area/rnd/outpost/xenobiology/outpost_hallway) +/obj/item/reagent_containers/food/drinks/tea{ + pixel_x = -7; + pixel_y = 6 + }, +/turf/simulated/open, +/area/rnd/outpost/xenobiology/outpost_stairs) "dda" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, @@ -5634,19 +5531,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) -"ddu" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/machinery/fire_alarm/south_mount{ - pixel_y = -24 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 10 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/botanystorage) "ddX" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/zpipe/down{ @@ -5665,16 +5549,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/open, /area/rnd/research_storage) -"dea" = ( -/obj/structure/bed/padded, -/obj/effect/floor_decal/techfloor{ - dir = 8 - }, -/obj/machinery/vending/wallmed1/public{ - pixel_x = -28 - }, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/panic_shelter) "def" = ( /obj/effect/floor_decal/spline/plain, /turf/simulated/floor/water/deep/pool, @@ -5712,6 +5586,9 @@ dir = 2; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "dia" = ( @@ -5787,12 +5664,15 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "dln" = ( @@ -5820,7 +5700,7 @@ dir = 4 }, /turf/simulated/floor/tiled/techmaint, -/area/vacant/vacant_shop) +/area/tether/surfacebase/barbackmaintenance) "dna" = ( /obj/machinery/newscaster{ pixel_y = 30 @@ -5977,12 +5857,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) -"drE" = ( -/obj/machinery/camera/network/research/xenobio{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/rnd/outpost/xenobiology/outpost_main) "drY" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -6209,16 +6083,10 @@ /turf/simulated/floor/grass, /area/hydroponics/cafegarden) "dyy" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/machinery/atmospherics/portables_connector, -/obj/effect/floor_decal/borderfloor{ - dir = 5 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 5 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/area/rnd/xenobiology/xenoflora) "dyJ" = ( /turf/simulated/wall/r_wall/prepainted/command, /area/crew_quarters/captain) @@ -6262,18 +6130,19 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/lower/medsec_maintenance) "dzs" = ( -/obj/item/radio/intercom{ - dir = 1; - pixel_y = 24 - }, /obj/effect/floor_decal/borderfloor{ - dir = 1 + dir = 5 }, /obj/effect/floor_decal/corner/mauve/border{ - dir = 1 + dir = 5 + }, +/obj/machinery/portable_atmospherics/hydroponics, +/obj/machinery/atmospherics/portables_connector, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 9 }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "dAe" = ( /obj/structure/closet/hydrant{ pixel_y = -32 @@ -6355,13 +6224,14 @@ /turf/simulated/floor/plating, /area/hallway/lower/third_south) "dBH" = ( -/obj/machinery/botany/editor, /obj/effect/floor_decal/borderfloor{ dir = 8 }, /obj/effect/floor_decal/corner/mauve/border{ dir = 8 }, +/obj/structure/reagent_dispensers/watertank, +/obj/item/reagent_containers/glass/bucket, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "dBP" = ( @@ -6410,6 +6280,9 @@ id_tag = "southciv_airlock_outer"; locked = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/universal{ + dir = 4 + }, /turf/simulated/floor/tiled/steel_grid, /area/tether/surfacebase/topairlock) "dCm" = ( @@ -6608,6 +6481,9 @@ dir = 4; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "dIO" = ( @@ -6690,6 +6566,7 @@ "dLp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/shuttle_pad) "dLw" = ( @@ -6986,6 +6863,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) "dVr" = ( @@ -7043,6 +6921,7 @@ dir = 8; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "dXD" = ( @@ -7080,13 +6959,6 @@ /obj/structure/cable/green, /turf/simulated/floor/lino, /area/tether/surfacebase/entertainment/stage) -"dXU" = ( -/obj/machinery/atmospherics/component/binary/pump{ - dir = 4; - name = "Port to Isolation" - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "dXZ" = ( /obj/machinery/light, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -7254,17 +7126,9 @@ /turf/simulated/floor/tiled, /area/teleporter/departing) "eet" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 1 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 1 - }, -/obj/structure/flora/pottedplant/stoutbush, -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, +/obj/effect/paint_stripe/babyblue, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/turf/simulated/floor/plating, /area/tether/surfacebase/medical/storage) "eez" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -7346,6 +7210,9 @@ name = "Surface EVA" }, /obj/effect/floor_decal/steeldecal/steel_decals_central1, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled/monofloor, /area/tether/surfacebase/topairlock) "eha" = ( @@ -7356,6 +7223,7 @@ dir = 8 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "eho" = ( @@ -7400,13 +7268,22 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "eiR" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/area/rnd/xenobiology/xenoflora) "eiX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) "ejU" = ( @@ -7440,10 +7317,9 @@ /obj/machinery/power/apc/south_mount, /obj/random/maintenance/medical, /obj/random/maintenance/medical, -/obj/random/maintenance/clean, -/obj/random/maintenance/medical, /obj/structure/closet, /obj/effect/floor_decal/techfloor, +/obj/random/maintenance/medical, /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/lower/medsec_maintenance) "elj" = ( @@ -7499,6 +7375,7 @@ dir = 1 }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "enf" = ( @@ -7608,17 +7485,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/carpet/blue, /area/tether/surfacebase/security/breakroom) -"eqo" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/machinery/atmospherics/portables_connector, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "eqR" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -7778,6 +7644,14 @@ dir = 4 }, /obj/structure/table/standard, +/obj/item/storage/firstaid/o2{ + pixel_x = -7; + pixel_y = 15 + }, +/obj/item/storage/firstaid/o2{ + pixel_y = 10; + pixel_x = -12 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "euI" = ( @@ -7824,18 +7698,10 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) "evK" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/machinery/atmospherics/portables_connector, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 1 - }, -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/tiled, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/turf/simulated/floor/plating, /area/rnd/xenobiology/xenoflora_storage) "ewg" = ( /obj/machinery/photocopier, @@ -7858,6 +7724,7 @@ /obj/machinery/door/airlock/glass, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "ewD" = ( @@ -8160,7 +8027,7 @@ }, /obj/machinery/door/airlock/research{ name = "Research Department"; - req_access = list(7) + req_access = list(47) }, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) @@ -8299,6 +8166,11 @@ /obj/effect/floor_decal/techfloor{ dir = 4 }, +/obj/structure/closet, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/panic_shelter) "eKA" = ( @@ -8355,12 +8227,12 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 1 }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 +/obj/structure/closet/secure_closet/hydroponics{ + req_access = list(); + req_one_access = list(30,35,47,77) }, -/obj/effect/floor_decal/steeldecal/steel_decals7, /turf/simulated/floor/tiled, -/area/hallway/primary/starboard) +/area/rnd/xenobiology/xenoflora) "eMK" = ( /obj/effect/floor_decal/techfloor{ dir = 1 @@ -8383,10 +8255,10 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_main) "eMY" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/effect/floor_decal/corner/mauve/full, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/effect/paint_stripe/purplegray, +/turf/simulated/floor/plating, +/area/rnd/xenobiology/xenoflora_storage) "eNU" = ( /obj/machinery/air_alarm{ dir = 8; @@ -8415,11 +8287,18 @@ /turf/simulated/floor/tiled/dark, /area/rnd/research/testingrange) "eOE" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/door/airlock/maintenance/medical{ + name = "Medical Maintenance Access"; + req_access = list(5) + }, +/obj/machinery/door/firedoor/glass{ + dir = 8 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) @@ -8468,11 +8347,11 @@ /turf/simulated/floor/plating, /area/tether/surfacebase/security/hos) "ePT" = ( -/obj/structure/flora/ausbushes/sunnybush, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/grass, -/area/hydroponics) +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, +/obj/machinery/botany/extractor, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology/xenoflora) "eQc" = ( /turf/simulated/wall/prepainted/science, /area/rnd/xenobiology/xenoflora) @@ -8722,12 +8601,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) -"eWa" = ( -/obj/structure/closet/l3closet/scientist, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/mauve/border, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) "eWp" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -8760,16 +8633,6 @@ /obj/effect/floor_decal/corner/red/border, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/processing) -"eWA" = ( -/obj/machinery/portable_atmospherics/canister/nitrogen, -/obj/effect/floor_decal/industrial/warning{ - dir = 9 - }, -/obj/machinery/fire_alarm/south_mount{ - pixel_y = -24 - }, -/turf/simulated/floor/tiled/white, -/area/rnd/xenobiology/xenoflora_storage) "eWB" = ( /obj/machinery/button/remote/blast_door{ dir = 8; @@ -8792,7 +8655,7 @@ /area/hallway/primary/starboard) "eXn" = ( /obj/machinery/vending/hydronutrients{ - dir = 8 + dir = 1 }, /turf/simulated/floor/grass, /area/hydroponics) @@ -8826,15 +8689,6 @@ icon_state = "techmaint" }, /area/tether/surfacebase/security/upperhall) -"eZy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "eZH" = ( /obj/structure/disposalpipe/segment, /turf/simulated/wall/prepainted/science, @@ -8971,21 +8825,11 @@ /turf/simulated/floor/wood, /area/crew_quarters/captain) "fgp" = ( -/obj/structure/table/glass, -/obj/effect/floor_decal/borderfloor{ - dir = 6 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 6 - }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/machinery/light_switch{ - pixel_x = 25 +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 10 }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/turf/simulated/floor/tiled/steel_dirty/virgo3b, +/area/tether/surfacebase/outside/outside3) "fgP" = ( /obj/machinery/light{ dir = 4 @@ -9236,11 +9080,11 @@ icon_state = "1-2" }, /turf/simulated/floor/tiled/techfloor, -/area/vacant/vacant_shop) +/area/tether/surfacebase/barbackmaintenance) "fnK" = ( -/obj/machinery/camera/network/research, +/obj/structure/closet/firecloset, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/area/rnd/xenobiology/xenoflora) "fnZ" = ( /obj/effect/floor_decal/spline/plain{ dir = 8 @@ -9280,12 +9124,6 @@ }, /turf/simulated/floor/carpet, /area/tether/surfacebase/security/hos) -"fpW" = ( -/obj/structure/closet/firecloset, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/mauve/border, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) "fqA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -9396,23 +9234,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) -"fuT" = ( -/obj/effect/floor_decal/techfloor{ - dir = 4 - }, -/obj/effect/floor_decal/techfloor/hole{ - dir = 4 - }, -/obj/effect/floor_decal/techfloor/hole/right{ - dir = 4 - }, -/obj/machinery/shower{ - dir = 8; - pixel_x = -2 - }, -/obj/effect/floor_decal/industrial/outline/blue, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/panic_shelter) "fvy" = ( /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/borderfloor/corner, @@ -9607,13 +9428,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/panic_shelter) -"fBW" = ( -/obj/machinery/portable_atmospherics/canister/nitrous_oxide, -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "fCh" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -9718,8 +9532,11 @@ /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) "fEn" = ( -/turf/simulated/wall, -/area/tether/surfacebase/topairlock) +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/southhall) "fEA" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -9835,7 +9652,7 @@ /obj/random/maintenance/clean, /obj/random/maintenance/clean, /turf/simulated/floor/tiled/techfloor, -/area/vacant/vacant_shop) +/area/tether/surfacebase/barbackmaintenance) "fIr" = ( /obj/machinery/papershredder, /obj/effect/floor_decal/borderfloor, @@ -9912,12 +9729,11 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/cafeteria) "fJV" = ( -/obj/structure/cable/green{ - icon_state = "1-8" +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 }, -/obj/structure/flora/ausbushes/ppflowers, -/turf/simulated/floor/grass, -/area/hydroponics) +/turf/simulated/floor/tiled, +/area/rnd/xenobiology/xenoflora_storage) "fKc" = ( /obj/structure/table/glass, /obj/machinery/light{ @@ -9943,9 +9759,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/door/firedoor{ - dir = 1 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) "fKZ" = ( @@ -10137,6 +9951,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) "fPc" = ( @@ -10149,15 +9964,8 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 1 }, -/obj/effect/floor_decal/borderfloorwhite/corner2{ - dir = 1 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner2{ - dir = 1 - }, /obj/machinery/button/remote/airlock{ desc = "A remote control switch for the medbay foyer."; - dir = 1; id = "MedbayFoyer"; name = "Medbay Doors Control"; pixel_x = -10; @@ -10178,6 +9986,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "fPn" = ( @@ -10304,6 +10115,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) "fUa" = ( @@ -10435,15 +10247,9 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/cafeteria) "fWO" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/botanystorage) +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/turf/simulated/floor/wood, +/area/tether/surfacebase/barbackmaintenance) "fWV" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -10574,19 +10380,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "fZm" = ( -/obj/machinery/atmospherics/component/unary/heater{ - icon_state = "heater" - }, -/obj/effect/floor_decal/corner/green{ - dir = 10 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 1 - }, -/turf/simulated/floor/tiled, +/turf/simulated/wall/prepainted/civilian, /area/rnd/xenobiology/xenoflora_storage) "fZp" = ( /obj/structure/disposalpipe/segment{ @@ -10626,9 +10420,6 @@ /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "fZO" = ( -/obj/machinery/atmospherics/component/unary/freezer{ - dir = 4 - }, /obj/effect/floor_decal/corner/paleblue{ dir = 6 }, @@ -10638,10 +10429,22 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/portable_atmospherics/canister/oxygen/prechilled, +/obj/machinery/atmospherics/portables_connector, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/item/tool/wrench, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "fZS" = ( /obj/structure/lattice, +/obj/machinery/atmospherics/pipe/zpipe/down/aux{ + dir = 1 + }, /turf/simulated/open, /area/tether/surfacebase/barbackmaintenance) "gaD" = ( @@ -10657,6 +10460,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "gbb" = ( @@ -10772,15 +10576,29 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "gig" = ( -/obj/machinery/camera/network/research, /obj/effect/floor_decal/borderfloor{ dir = 1 }, /obj/effect/floor_decal/corner/mauve/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 8 + }, +/obj/structure/table/glass, +/obj/item/pipe_dispenser, +/obj/item/storage/toolbox/mechanical, +/obj/item/clothing/mask/gas, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/obj/machinery/power/apc/north_mount, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 6 + }, +/obj/machinery/camera/network/research, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "gjg" = ( /obj/structure/bed/chair{ dir = 8 @@ -10886,6 +10704,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/shuttle_pad) "gmw" = ( @@ -11125,17 +10944,10 @@ dir = 1 }, /turf/simulated/wall/prepainted, -/area/vacant/vacant_shop) +/area/tether/surfacebase/barbackmaintenance) "gtb" = ( /turf/simulated/wall/prepainted/security, /area/tether/surfacebase/security/iaa/officecommon) -"gtl" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 - }, -/obj/machinery/meter, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "gty" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -11400,17 +11212,18 @@ /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "gzy" = ( -/obj/machinery/light_switch{ - pixel_x = 25 - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/medsec_maintenance) +/obj/machinery/reagentgrinder, +/obj/structure/table/glass, +/obj/effect/floor_decal/borderfloor, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology/xenoflora) "gzG" = ( /obj/structure/cable/green{ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) "gzU" = ( @@ -11484,12 +11297,13 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "gEL" = ( -/obj/machinery/portable_atmospherics/canister/phoron, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 }, +/obj/machinery/portable_atmospherics/hydroponics, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/area/rnd/xenobiology/xenoflora) "gEQ" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -11591,6 +11405,7 @@ }, /obj/machinery/door/airlock/glass_external/public, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "gKp" = ( @@ -11618,6 +11433,7 @@ "gKL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "gLd" = ( @@ -11661,16 +11477,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) -"gMB" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/botanystorage) "gMY" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/machinery/door/blast/regular{ @@ -11755,16 +11561,17 @@ }, /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/steeldecal/steel_decals6, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "gPL" = ( /obj/structure/cable/green{ icon_state = "1-4" }, -/obj/machinery/camera/network/research{ +/obj/structure/closet/l3closet/scientist, +/obj/machinery/camera/network/research/xenobio{ dir = 1 }, -/obj/structure/closet/l3closet/scientist, /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_decon) "gQS" = ( @@ -11814,7 +11621,7 @@ dir = 4 }, /turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_three_hall) +/area/tether/surfacebase/barbackmaintenance) "gSM" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -11915,7 +11722,7 @@ dir = 4 }, /turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_three_hall) +/area/tether/surfacebase/barbackmaintenance) "gUM" = ( /obj/machinery/air_alarm{ dir = 4; @@ -11944,11 +11751,6 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/wood, /area/triumph/surfacebase/sauna) -"gWY" = ( -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, -/obj/structure/catwalk, -/turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/tether/surfacebase/outside/outside3) "gXa" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -12127,8 +11929,7 @@ icon_state = "0-8" }, /obj/machinery/door/window/southright{ - dir = 1; - req_one_access = list(19,43,67) + dir = 1 }, /turf/simulated/floor/plating, /area/shuttle/tourbus/general) @@ -12155,12 +11956,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) -"hbO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/panic_shelter) "hcd" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -12326,16 +12121,14 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "hip" = ( -/obj/machinery/atmospherics/pipe/simple/visible, -/obj/machinery/meter, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 4 +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lime/border, +/obj/machinery/light, +/obj/machinery/camera/network/civilian{ + dir = 1 }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/area/tether/surfacebase/botanystorage) "hjV" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/machinery/power/apc/east_mount, @@ -12382,56 +12175,14 @@ /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 1 }, -/obj/machinery/door/firedoor{ - dir = 1 - }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) "hkJ" = ( -/obj/structure/table/glass, -/obj/item/packageWrap, -/obj/item/hand_labeler, -/obj/machinery/power/apc/west_mount{ - cell_type = /obj/item/cell/super - }, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 8 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 8 - }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ +/obj/effect/floor_decal/techfloor{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "0-4" - }, -/obj/effect/floor_decal/borderfloorwhite/corner2{ - dir = 8 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner2{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) -"hle" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 5 - }, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 1 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) +/turf/simulated/floor/tiled/techfloor/grid, +/area/maintenance/lower/medsec_maintenance) "hmR" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/cable/green{ @@ -12451,6 +12202,12 @@ /obj/item/clothing/gloves/sterile/nitrile, /obj/item/clothing/gloves/sterile/nitrile, /obj/item/defib_kit/loaded, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 1 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "hoA" = ( @@ -12462,6 +12219,9 @@ id_tag = "southciv_airlock_inner"; locked = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_grid, /area/tether/surfacebase/topairlock) "hoE" = ( @@ -12596,10 +12356,10 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/vending/medical, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "hsO" = ( -/obj/machinery/chem_master, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -12615,6 +12375,8 @@ /obj/effect/floor_decal/corner/orange/border{ dir = 1 }, +/obj/structure/table/reinforced, +/obj/machinery/chemical_dispenser/full, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) "hty" = ( @@ -12663,6 +12425,9 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/topairlock) "huZ" = ( @@ -12750,19 +12515,17 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "hyb" = ( -/obj/machinery/door/airlock/maintenance/medical{ - name = "Medical Maintenance Access"; - req_access = list(5) - }, -/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, /turf/simulated/floor/tiled/techfloor/grid, -/area/tether/surfacebase/medical/triage) +/area/maintenance/lower/medsec_maintenance) "hyk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -12841,6 +12604,12 @@ /obj/random/tetheraid, /obj/random/tetheraid, /obj/item/storage/secure/briefcase/ml3m_pack_med, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 1 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "hBL" = ( @@ -12871,13 +12640,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"hCH" = ( -/obj/machinery/portable_atmospherics/canister/nitrous_oxide, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "hDB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -12903,12 +12665,6 @@ }, /turf/simulated/floor/water/pool, /area/triumph/surfacebase/sauna) -"hEA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/panic_shelter) "hEQ" = ( /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) @@ -13059,18 +12815,11 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/upperhall) "hLe" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 11 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 4 +/obj/machinery/atmospherics/component/binary/pump{ + dir = 1 }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "hLj" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -13173,13 +12922,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/breakroom) -"hNC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "hNS" = ( /obj/machinery/light, /obj/machinery/media/jukebox, @@ -13206,7 +12948,7 @@ dir = 5 }, /turf/simulated/floor/tiled/techfloor, -/area/vacant/vacant_shop) +/area/tether/surfacebase/barbackmaintenance) "hPw" = ( /obj/machinery/door/airlock{ name = "Unisex Restrooms" @@ -13284,13 +13026,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) -"hRu" = ( -/obj/item/radio/intercom{ - dir = 8; - pixel_x = -24 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "hRE" = ( /obj/effect/floor_decal/steeldecal/steel_decals6, /obj/structure/disposalpipe/segment{ @@ -13336,15 +13071,18 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) "hTs" = ( -/obj/machinery/seed_extractor, -/obj/effect/floor_decal/borderfloor{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/tether/surfacebase/surface_three_hall) "hTV" = ( /obj/machinery/light/small, /obj/effect/floor_decal/techfloor, @@ -13358,6 +13096,7 @@ dir = 2; icon_state = "pipe-j2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) "hUG" = ( @@ -13448,16 +13187,10 @@ /turf/simulated/floor/tiled, /area/hallway/primary/port) "hXb" = ( -/obj/machinery/portable_atmospherics/canister/nitrogen, -/obj/effect/floor_decal/industrial/warning{ - dir = 5 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) -"hXr" = ( -/obj/machinery/atmospherics/pipe/manifold/visible, -/obj/machinery/meter, -/turf/simulated/floor/tiled, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, +/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/turf/simulated/floor/plating, /area/rnd/xenobiology/xenoflora_storage) "hXB" = ( /obj/effect/floor_decal/corner/grey/diagonal, @@ -13515,21 +13248,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) -"hYE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "hYJ" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -13595,17 +13313,16 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "ick" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 5 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/botanystorage) +/area/rnd/xenobiology/xenoflora_storage) "icq" = ( /obj/machinery/door/airlock/multi_tile/glass{ name = "Internal Affairs" @@ -13639,19 +13356,13 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "icV" = ( -/obj/structure/closet/secure_closet/hydroponics, -/obj/machinery/camera/network/civilian, /obj/effect/floor_decal/borderfloor{ dir = 5 }, /obj/effect/floor_decal/corner/lime/border{ dir = 5 }, -/obj/item/shovel/spade, -/obj/item/storage/belt/utility, -/obj/item/stack/material/sandstone{ - amount = 5 - }, +/obj/machinery/portable_atmospherics/hydroponics, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "idP" = ( @@ -13942,9 +13653,6 @@ /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 4 }, -/obj/machinery/door/firedoor{ - dir = 1 - }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "inl" = ( @@ -14013,27 +13721,12 @@ /turf/simulated/floor/wood, /area/crew_quarters/captain) "ioX" = ( -/obj/structure/medical_stand, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 10 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 10 - }, -/obj/effect/floor_decal/borderfloorwhite/corner2{ - dir = 9 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner2{ - dir = 9 - }, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 4 - }, -/obj/machinery/fire_alarm/west_mount{ - pixel_x = -24 +/obj/effect/floor_decal/techfloor{ + dir = 6 }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) +/obj/random/trash_pile, +/turf/simulated/floor/tiled/techfloor/grid, +/area/maintenance/lower/medsec_maintenance) "ioZ" = ( /obj/structure/table/marble, /obj/machinery/chemical_dispenser/catering/bar_alc{ @@ -14072,6 +13765,7 @@ /obj/structure/cable/orange{ icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) "iqj" = ( @@ -14131,9 +13825,18 @@ /turf/simulated/floor/wood, /area/triumph/surfacebase/sauna) "irb" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) "irO" = ( @@ -14227,6 +13930,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) "iub" = ( @@ -14265,21 +13969,27 @@ /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "iuy" = ( -/obj/machinery/portable_atmospherics/hydroponics, /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/floor_decal/corner/mauve{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 8 + }, +/obj/machinery/door/airlock/glass/research{ + name = "Xenoflora Research"; + req_one_access = list(30,35,47,77) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, +/obj/machinery/door/firedoor{ + dir = 8 }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "iuD" = ( /obj/structure/bed/chair/wood, /turf/simulated/floor/tiled/eris/cafe, @@ -14343,12 +14053,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) -"iwu" = ( -/obj/machinery/air_alarm{ - pixel_y = 25 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "iwC" = ( /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) @@ -14445,16 +14149,8 @@ /turf/simulated/floor/tiled, /area/crew_quarters/heads/hop) "izr" = ( -/obj/structure/window/basic/full, -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/basic, -/obj/structure/window/basic{ - dir = 1 - }, -/obj/structure/window/basic{ - dir = 8 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_storage) "iBt" = ( @@ -14571,11 +14267,8 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/effect/floor_decal/techfloor{ - dir = 8 - }, /turf/simulated/floor/tiled/techfloor, -/area/vacant/vacant_shop) +/area/tether/surfacebase/barbackmaintenance) "iDZ" = ( /obj/effect/floor_decal/corner/lightgrey{ dir = 9 @@ -14634,8 +14327,13 @@ /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_north_airlock) "iGh" = ( -/turf/simulated/wall/r_wall/prepainted/science, -/area/crew_quarters/panic_shelter) +/obj/structure/table/glass, +/obj/item/storage/box/botanydisk, +/obj/item/storage/box/botanydisk, +/obj/item/material/minihoe, +/obj/item/reagent_containers/glass/bucket, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology/xenoflora) "iGD" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -14691,24 +14389,11 @@ /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "iIx" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 8 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 8 - }, -/obj/structure/table/glass, -/obj/item/storage/box/gloves{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/storage/box/masks, -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -22 +/obj/machinery/light_switch{ + pixel_x = 25 }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) +/turf/simulated/floor/wood, +/area/maintenance/lower/medsec_maintenance) "iIJ" = ( /obj/structure/curtain/open/shower, /obj/machinery/shower{ @@ -14725,6 +14410,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/wood, /area/tether/surfacebase/barbackmaintenance) "iIW" = ( @@ -14839,15 +14525,6 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_first_aid) -"iLL" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/fire_alarm/east_mount, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "iLO" = ( /obj/structure/closet/wardrobe/xenos, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -14897,15 +14574,15 @@ /area/tether/surfacebase/surface_three_hall) "iNx" = ( /obj/structure/railing, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/obj/structure/grille, -/obj/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ frequency = 1379; id_tag = "southciv_airlock_pump" }, +/obj/map_helper/airlock/atmos/chamber_pump, +/obj/machinery/power/apc/north_mount, +/obj/structure/cable/orange{ + icon_state = "0-2" + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/topairlock) "iNJ" = ( @@ -14964,10 +14641,8 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "iOA" = ( -/obj/structure/window/reinforced, -/obj/machinery/atmospherics/component/unary/vent_pump/on, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/turf/simulated/floor/tiled/techfloor, +/area/tether/surfacebase/barbackmaintenance) "iOE" = ( /obj/machinery/vending/boozeomat, /turf/simulated/floor/wood, @@ -14979,6 +14654,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "iOW" = ( @@ -15056,20 +14732,12 @@ /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/topairlock) "iRw" = ( -/obj/structure/table/glass, -/obj/item/storage/box/beakers{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/storage/box/syringes, -/obj/item/storage/box/gloves{ - pixel_x = 4; - pixel_y = 4 +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 4 }, -/obj/effect/floor_decal/borderfloor/corner, -/obj/effect/floor_decal/corner/mauve/bordercorner, +/obj/machinery/meter, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "iRQ" = ( /obj/machinery/door/window{ dir = 4; @@ -15156,7 +14824,6 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppersouthstairwell) "iTS" = ( @@ -15542,12 +15209,9 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/effect/floor_decal/techfloor{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techfloor, -/area/vacant/vacant_shop) +/area/tether/surfacebase/barbackmaintenance) "jeM" = ( /obj/machinery/fire_alarm/north_mount, /obj/machinery/vending/loadout/accessory, @@ -15728,15 +15392,7 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/iaa) -"jkg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/grass, -/area/hydroponics) "jko" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, @@ -15799,6 +15455,9 @@ /obj/machinery/status_display{ pixel_x = -32 }, +/obj/machinery/camera/network/medbay{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "jlw" = ( @@ -15872,12 +15531,12 @@ /turf/simulated/floor/tiled, /area/hallway/primary/port) "jmm" = ( -/obj/structure/window/reinforced, -/obj/machinery/atmospherics/portables_connector{ - dir = 1 +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/triage) "jnl" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, @@ -15979,7 +15638,7 @@ pixel_y = -10 }, /turf/simulated/wall/prepainted, -/area/tether/surfacebase/surface_three_hall) +/area/tether/surfacebase/barbackmaintenance) "jrv" = ( /obj/structure/bed/chair/sofa/brown/right{ dir = 1 @@ -16076,30 +15735,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/staircase/thirdfloor) -"jtm" = ( -/obj/item/roller, -/obj/item/roller{ - pixel_y = 8 - }, -/obj/item/roller{ - pixel_y = 16 - }, -/obj/structure/table/glass, -/obj/machinery/light{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 8 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 8 - }, -/obj/structure/extinguisher_cabinet{ - dir = 4; - pixel_x = -30 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) "jtN" = ( /obj/structure/table/woodentable, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -16148,13 +15783,13 @@ /obj/structure/railing{ dir = 1 }, -/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/phoronlock{ - frequency = 1379; - scrub_id = "southciv_airlock_scrubber" - }, /obj/structure/sign/fire{ pixel_y = -32 }, +/obj/map_helper/airlock/atmos/scrubber, +/obj/machinery/atmospherics/component/unary/vent_scrubber/high_power{ + dir = 1 + }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/topairlock) "jvB" = ( @@ -16165,13 +15800,8 @@ /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) "jvD" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ - id = "medbayfoyer"; - name = "medbayfoyer" - }, -/obj/effect/paint_stripe/babyblue, -/turf/simulated/floor/plating, -/area/tether/surfacebase/medical/triage) +/turf/simulated/wall/prepainted/medical, +/area/maintenance/lower/medsec_maintenance) "jvH" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -16239,24 +15869,15 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/north_stairs_three) "jwU" = ( -/obj/structure/closet/secure_closet/hydroponics{ - req_access = list(); - req_one_access = list(30,35,47,77) - }, -/obj/effect/floor_decal/borderfloor{ - dir = 10 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 10 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 8 - }, -/obj/effect/floor_decal/corner/mauve/bordercorner2{ +/obj/structure/disposalpipe/segment, +/obj/random/medical, +/obj/machinery/recharger, +/obj/structure/table/steel, +/obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 8 }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/triage) "jxr" = ( /obj/effect/floor_decal/spline/plain{ dir = 1 @@ -16327,7 +15948,7 @@ /area/teleporter/departing) "jBw" = ( /turf/simulated/wall/prepainted, -/area/vacant/vacant_shop) +/area/tether/surfacebase/barbackmaintenance) "jBy" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -16512,15 +16133,15 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/cafeteria) "jGP" = ( -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 4 - }, -/obj/landmark/spawnpoint/job/medical_doctor, +/obj/machinery/vending/blood, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "jHu" = ( +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super + }, /obj/structure/cable/green{ - icon_state = "4-8" + icon_state = "0-4" }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) @@ -16534,6 +16155,7 @@ /obj/structure/railing{ dir = 1 }, +/obj/random/cutout, /turf/simulated/open, /area/rnd/outpost/xenobiology/outpost_stairs) "jIV" = ( @@ -16583,20 +16205,6 @@ /obj/structure/lattice, /turf/simulated/open, /area/hallway/primary/fore) -"jJW" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloorwhite, -/obj/effect/floor_decal/corner/paleblue/border, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/firedoor{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/uppersouthstairwell) "jKO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, @@ -16784,10 +16392,10 @@ /turf/simulated/floor/tiled, /area/hallway/primary/fore) "jQd" = ( -/obj/structure/window/reinforced, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/obj/effect/paint_stripe/bottlegreen, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/tether/surfacebase/botanystorage) "jQZ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -16979,11 +16587,20 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "jWi" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/grass, -/area/hydroponics) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "jWP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -17160,6 +16777,10 @@ /obj/structure/cable/green{ icon_state = "1-4" }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "kdz" = ( @@ -17168,14 +16789,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/research) -"kdK" = ( -/obj/machinery/fire_alarm/south_mount{ - pixel_y = -24 - }, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/mauve/border, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) "kdQ" = ( /obj/machinery/atmospherics/component/unary/engine, /turf/simulated/floor/tiled/techmaint, @@ -17235,7 +16848,6 @@ /turf/simulated/wall/r_wall/prepainted/command, /area/tether/surfacebase/surface_three_hall) "khZ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/cyan, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -17245,6 +16857,12 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, +/obj/machinery/camera/network/medbay{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 5 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "kia" = ( @@ -17296,6 +16914,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled/monofloor, /area/crew_quarters/bar) "kiZ" = ( @@ -17520,12 +17141,18 @@ /turf/simulated/floor/grass, /area/hydroponics) "kqR" = ( -/obj/machinery/door/window/brigdoor/southright{ - req_access = null; - req_one_access = list(30,35,47,77) +/obj/structure/table/glass, +/obj/item/storage/box/beakers{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/storage/box/syringes, +/obj/item/storage/box/gloves{ + pixel_x = 4; + pixel_y = 4 }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/area/rnd/xenobiology/xenoflora) "krj" = ( /obj/machinery/light, /turf/simulated/floor/tiled/freezer/cold, @@ -17572,11 +17199,11 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/structure/cable/green{ - icon_state = "1-8" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "ktl" = ( @@ -17814,15 +17441,9 @@ /area/tether/surfacebase/bar_backroom) "kCv" = ( /obj/machinery/holopad, -/obj/machinery/camera/network/research/xenobio{ - dir = 9 - }, /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_first_aid) "kCR" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, @@ -17838,6 +17459,9 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner2{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 10 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "kDm" = ( @@ -17888,18 +17512,6 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/surfacebase/outside/outside3) -"kFn" = ( -/obj/machinery/vending/hydronutrients{ - req_one_access = list(30,35,47,77) - }, -/obj/effect/floor_decal/borderfloor{ - dir = 5 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 5 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) "kFx" = ( /turf/simulated/wall/shull, /area/shuttle/tourbus/general) @@ -18105,23 +17717,18 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "kOG" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 11 + }, /obj/effect/floor_decal/borderfloor{ - dir = 6 + dir = 4 }, /obj/effect/floor_decal/corner/mauve/border{ - dir = 6 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 6 - }, -/obj/effect/floor_decal/corner/mauve/bordercorner2{ - dir = 6 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 + dir = 4 }, /turf/simulated/floor/tiled, -/area/hallway/primary/starboard) +/area/rnd/xenobiology/xenoflora_storage) "kPZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -18366,22 +17973,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) -"kXW" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 8 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloorwhite/corner2{ - dir = 8 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner2{ - dir = 8 - }, -/obj/machinery/vending/blood, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) "kYg" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -18412,7 +18003,7 @@ icon_state = "pipe-j2" }, /obj/machinery/camera/network/research/xenobio{ - dir = 10 + dir = 1 }, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_main) @@ -18442,19 +18033,6 @@ }, /turf/simulated/floor/tiled, /area/teleporter/departing) -"kZr" = ( -/obj/structure/window/basic/full, -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/basic, -/obj/structure/window/basic{ - dir = 1 - }, -/obj/structure/window/basic{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/rnd/outpost/xenobiology/outpost_storage) "kZR" = ( /obj/machinery/computer/secure_data{ dir = 4 @@ -18532,17 +18110,17 @@ /turf/simulated/floor/wood, /area/rnd/outpost/xenobiology/outpost_office) "lbF" = ( -/obj/effect/floor_decal/corner_steel_grid{ - dir = 5 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, +/obj/effect/floor_decal/steeldecal/steel_decals10, +/obj/landmark/spawnpoint/job/medical_doctor, /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 1; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) @@ -18642,6 +18220,9 @@ /obj/machinery/light{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) "lgl" = ( @@ -18655,12 +18236,12 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/security/hos) "lgu" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/structure/flora/ausbushes/ppflowers, -/turf/simulated/floor/grass, -/area/hydroponics) +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, +/obj/machinery/botany/editor, +/obj/machinery/light, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology/xenoflora) "lgD" = ( /obj/structure/table/marble, /turf/simulated/floor/carpet/purcarpet, @@ -18976,27 +18557,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/port) -"lpk" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) "lpH" = ( /obj/machinery/door/firedoor, /obj/structure/table/reinforced, @@ -19028,20 +18588,11 @@ /turf/simulated/floor/plating, /area/tether/surfacebase/medical/storage) "lqQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/structure/railing{ + dir = 8 }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/turf/simulated/floor/outdoors/grass/sif/virgo3b, +/area/tether/surfacebase/outside/outside3) "lrz" = ( /obj/machinery/librarycomp, /obj/structure/table/woodentable, @@ -19071,6 +18622,9 @@ /obj/machinery/camera/network/civilian{ dir = 4 }, +/obj/machinery/vending/wallmed1/public{ + pixel_x = -28 + }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/panic_shelter) "lsn" = ( @@ -19139,24 +18693,9 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) "lth" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/power/apc/south_mount{ - req_access = list(67) - }, -/obj/effect/floor_decal/borderfloorwhite, -/obj/effect/floor_decal/corner/paleblue/border, -/obj/effect/floor_decal/borderfloorwhite/corner2, -/obj/effect/floor_decal/corner/paleblue/bordercorner2, +/obj/machinery/vending/blood, /turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/uppersouthstairwell) +/area/tether/surfacebase/medical/storage) "ltI" = ( /obj/item/stool/padded, /turf/simulated/floor/tiled/white, @@ -19242,21 +18781,14 @@ /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) "lwr" = ( -/obj/machinery/portable_atmospherics/hydroponics, /obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 + icon_state = "1-8" }, -/obj/effect/floor_decal/corner/mauve{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 9 }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "lwv" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -19320,11 +18852,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_breakroom) -"lxQ" = ( -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/manifold/visible/yellow, -/turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/tether/surfacebase/outside/outside3) "lxW" = ( /obj/effect/floor_decal/borderfloor{ dir = 9 @@ -19351,8 +18878,20 @@ /turf/simulated/floor/outdoors/grass/sif/virgo3b, /area/tether/surfacebase/outside/outside3) "lAa" = ( -/turf/simulated/wall/prepainted/civilian, -/area/vacant/vacant_shop) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) "lAH" = ( /obj/structure/sign/nosmoking_1, /turf/simulated/wall/prepainted/medical, @@ -19642,6 +19181,7 @@ dir = 2; icon_state = "pipe-j2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "lJu" = ( @@ -19663,9 +19203,9 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "lJy" = ( -/obj/machinery/power/apc/north_mount, -/obj/structure/cable/green{ - icon_state = "0-2" +/obj/item/radio/intercom{ + dir = 1; + pixel_y = 24 }, /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -19673,8 +19213,16 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 1 }, +/obj/machinery/portable_atmospherics/hydroponics, +/obj/machinery/atmospherics/portables_connector, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 8 + }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "lJJ" = ( /obj/machinery/fire_alarm/south_mount{ pixel_y = -24 @@ -19715,6 +19263,9 @@ dir = 8; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "lLp" = ( @@ -19747,7 +19298,7 @@ /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, /obj/machinery/door/firedoor{ - dir = 1 + dir = 8 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) @@ -19790,6 +19341,9 @@ /obj/machinery/camera/network/civilian{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 5 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "lOu" = ( @@ -19961,6 +19515,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "lVY" = ( @@ -19968,18 +19523,21 @@ /turf/simulated/floor/tiled, /area/rnd/research/testingrange) "lWj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ - dir = 4 +/obj/structure/closet/secure_closet/hydroponics, +/obj/machinery/camera/network/civilian, +/obj/item/shovel/spade, +/obj/item/storage/belt/utility, +/obj/item/stack/material/sandstone{ + amount = 5 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/effect/floor_decal/borderfloor{ + dir = 1 }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/effect/floor_decal/corner/lime/border{ + dir = 1 }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/area/tether/surfacebase/botanystorage) "lWn" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -19993,9 +19551,6 @@ req_one_access = list(35,28) }, /obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "lWD" = ( @@ -20447,6 +20002,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "mjl" = ( @@ -20472,7 +20028,12 @@ /turf/simulated/floor/plating, /area/rnd/research_storage) "mjF" = ( -/obj/landmark/spawnpoint/job/medical_doctor, +/obj/machinery/vending/wallmed1{ + pixel_x = -30 + }, +/obj/structure/filingcabinet/chestdrawer{ + name = "Scan Records" + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "mkj" = ( @@ -20512,7 +20073,20 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "mkR" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 1 + }, +/obj/machinery/portable_atmospherics/hydroponics, +/obj/machinery/atmospherics/portables_connector, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) "mlC" = ( @@ -20536,6 +20110,7 @@ "mlP" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/door/airlock/maintenance/common, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/barbackmaintenance) "mmA" = ( @@ -20581,16 +20156,9 @@ /turf/simulated/floor/grass, /area/tether/surfacebase/public_garden_three) "mon" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/mauve/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, +/obj/structure/closet/l3closet/scientist, /turf/simulated/floor/tiled, -/area/hallway/primary/starboard) +/area/rnd/xenobiology/xenoflora) "mow" = ( /obj/structure/table/marble, /turf/simulated/floor/carpet/turcarpet, @@ -20682,6 +20250,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/wood, /area/tether/surfacebase/barbackmaintenance) "msB" = ( @@ -21010,11 +20580,15 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/recreation_area_restroom) "mCv" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/orange{ + icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/area/tether/surfacebase/southhall) "mCW" = ( /obj/structure/table/woodentable, /obj/item/flame/candle, @@ -21057,9 +20631,11 @@ /area/rnd/robotics) "mEK" = ( /obj/machinery/power/apc/south_mount, -/obj/structure/cable/green, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lime/border, +/obj/structure/cable/green{ + icon_state = "0-8" + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "mEP" = ( @@ -21254,19 +20830,11 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "mKu" = ( -/obj/structure/window/basic/full, -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, -/obj/structure/window/basic, -/obj/structure/window/basic{ - dir = 1 - }, -/obj/structure/window/basic{ - dir = 4 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_first_aid) "mKy" = ( @@ -21352,9 +20920,12 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "mLY" = ( -/obj/structure/table/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, +/obj/machinery/portable_atmospherics/canister/nitrogen, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "mMd" = ( /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/borderfloor{ @@ -21416,25 +20987,28 @@ /area/tether/surfacebase/security/lobby) "mNV" = ( /obj/structure/table/reinforced, +/obj/machinery/button/remote/airlock{ + name = "Vault Bolt controll"; + layer = 2.8 + }, /obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/folder/blue, /obj/item/folder/red, +/obj/item/folder/blue, /obj/item/pen/multi, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hop) "mOi" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/effect/floor_decal/borderfloor{ - dir = 10 +/obj/machinery/atmospherics/portables_connector{ + dir = 1 }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 10 +/obj/structure/window/reinforced{ + dir = 8 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/botanystorage) +/area/rnd/xenobiology/xenoflora_storage) "mOr" = ( /obj/machinery/gibber, /obj/machinery/light{ @@ -21541,6 +21115,7 @@ name = "Xenobotany"; sortType = "Xenobotany" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "mQM" = ( @@ -21626,6 +21201,7 @@ /obj/machinery/door/airlock{ name = "Game Room" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/wood, /area/tether/surfacebase/barbackmaintenance) "mTf" = ( @@ -21743,7 +21319,7 @@ /area/rnd/outpost/xenobiology/outpost_decon) "mXz" = ( /turf/simulated/wall/r_wall/prepainted, -/area/vacant/vacant_shop) +/area/tether/surfacebase/barbackmaintenance) "mXI" = ( /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_breakroom) @@ -21827,6 +21403,7 @@ pixel_x = 24 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "naT" = ( @@ -21973,7 +21550,9 @@ /obj/structure/cable/orange{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/hidden, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/topairlock) "nff" = ( @@ -22163,30 +21742,11 @@ /turf/simulated/floor/tiled/techfloor, /area/rnd/workshop) "nlx" = ( -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/admin) -"nlz" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/power/apc/east_mount, -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/obj/machinery/light{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/admin) "nml" = ( /turf/simulated/open, /area/bridge/bridge_hallway) @@ -22214,10 +21774,6 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "nnn" = ( -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 1 - }, -/obj/landmark/spawnpoint/job/medical_doctor, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -22227,6 +21783,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/sleeper{ + dir = 4 + }, +/obj/effect/floor_decal/corner_steel_grid{ + dir = 10 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "nno" = ( @@ -22300,6 +21862,7 @@ /obj/structure/cable/orange{ icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "npn" = ( @@ -22314,7 +21877,6 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "nps" = ( -/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppersouthstairwell) "npQ" = ( @@ -22412,14 +21974,11 @@ /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_autopsy) "nsl" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/panic_shelter) +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, +/obj/machinery/biogenerator, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology/xenoflora) "nsp" = ( /obj/structure/bed/chair{ dir = 4 @@ -22476,6 +22035,7 @@ /obj/structure/cable/orange{ icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "ntl" = ( @@ -22515,6 +22075,7 @@ /obj/structure/cable/orange{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) "ntE" = ( @@ -22544,33 +22105,11 @@ }, /turf/simulated/wall/prepainted/civilian, /area/crew_quarters/kitchen) -"nvE" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 9 - }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 6 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/obj/structure/table/glass, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = -4 - }, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = 7; - pixel_y = 1 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) "nvP" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "nvU" = ( @@ -22659,33 +22198,25 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "nxm" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/cyan, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, /obj/effect/floor_decal/corner/paleblue/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 9 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "nyb" = ( +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/effect/paint_stripe/bottlegreen, /obj/structure/cable/green{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 + icon_state = "4-8" }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/plating, /area/tether/surfacebase/botanystorage) -"nyB" = ( -/obj/effect/floor_decal/corner/mauve{ - dir = 9 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) "nyK" = ( /obj/structure/flora/pottedplant/stoutbush, /obj/effect/floor_decal/borderfloor{ @@ -22763,9 +22294,6 @@ dir = 8 }, /obj/structure/table/standard, -/obj/machinery/camera/network/medbay{ - dir = 4 - }, /obj/item/sleevemate, /obj/item/storage/box/nifsofts_medical{ pixel_x = 7; @@ -23252,6 +22780,7 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "nMQ" = ( @@ -23479,6 +23008,12 @@ dir = 2; icon_state = "pipe-j2" }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "nTK" = ( @@ -23650,7 +23185,16 @@ /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_south_airlock) "nYN" = ( -/obj/effect/floor_decal/steeldecal/steel_decals10, +/obj/machinery/air_alarm{ + dir = 4; + pixel_x = -22 + }, +/obj/structure/table/steel, +/obj/item/storage/box/masks, +/obj/item/storage/box/gloves{ + pixel_x = 4; + pixel_y = 4 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "nZi" = ( @@ -23686,25 +23230,6 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) -"oaE" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 6 - }, -/obj/machinery/meter, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 8 - }, -/obj/effect/floor_decal/corner/mauve/bordercorner2{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "obf" = ( /obj/structure/extinguisher_cabinet{ pixel_y = 30 @@ -23875,6 +23400,7 @@ /obj/structure/cable/green{ icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) "oeS" = ( @@ -23897,24 +23423,6 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"ofn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "ofB" = ( /obj/structure/table/glass, /obj/structure/window/reinforced{ @@ -24099,10 +23607,13 @@ /obj/machinery/camera/network/civilian{ dir = 9 }, -/obj/map_helper/airlock/sensor/ext_sensor, /obj/machinery/airlock_sensor/phoron/airlock_exterior{ pixel_x = 25 }, +/obj/machinery/atmospherics/pipe/vent{ + dir = 1 + }, +/obj/map_helper/airlock/sensor/ext_sensor, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/surfacebase/topairlock) "okA" = ( @@ -24161,18 +23672,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) -"omw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) "omJ" = ( /obj/effect/floor_decal/borderfloor{ dir = 10 @@ -24255,8 +23754,9 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "onT" = ( -/turf/simulated/wall/r_wall/prepainted/science, -/area/rnd/xenobiology/xenoflora_storage) +/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/turf/simulated/floor/tiled/steel_dirty/virgo3b, +/area/tether/surfacebase/outside/outside3) "oos" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 4 @@ -24426,21 +23926,15 @@ /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/bar) "otb" = ( -/obj/structure/closet/secure_closet/hydroponics{ - req_access = list(); - req_one_access = list(30,35,47,77) - }, /obj/effect/floor_decal/borderfloor{ - dir = 9 + dir = 1 }, /obj/effect/floor_decal/corner/mauve/border{ - dir = 9 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 10 + dir = 1 }, -/obj/effect/floor_decal/corner/mauve/bordercorner2{ - dir = 10 +/obj/machinery/portable_atmospherics/hydroponics, +/obj/machinery/light{ + dir = 1 }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) @@ -24458,10 +23952,7 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) "otW" = ( -/obj/structure/sign/directions/engineering{ - dir = 10; - pixel_y = -10 - }, +/obj/structure/sign/directions/engineering, /turf/simulated/wall/prepainted, /area/tether/surfacebase/north_stairs_three) "oua" = ( @@ -24484,6 +23975,13 @@ /obj/structure/table/marble, /turf/simulated/floor/carpet/sblucarpet, /area/crew_quarters/bar) +"ovx" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/open, +/area/rnd/staircase/thirdfloor) "ovP" = ( /obj/structure/bed/chair{ dir = 8 @@ -24501,6 +23999,7 @@ icon_state = "1-4" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "owg" = ( @@ -24530,6 +24029,7 @@ }, /obj/machinery/door/airlock/glass_external/public, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "owF" = ( @@ -24548,6 +24048,9 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) "oxs" = ( @@ -24617,12 +24120,6 @@ /obj/machinery/atmospherics/pipe/tank/air, /turf/simulated/floor/plating, /area/tether/surfacebase/topairlock) -"ozw" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "ozC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -24669,20 +24166,6 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, /area/rnd/research_storage) -"oBc" = ( -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "oBv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -24747,8 +24230,6 @@ /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) "oDf" = ( -/obj/machinery/chemical_dispenser/full, -/obj/structure/table/reinforced, /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 }, @@ -24758,6 +24239,8 @@ /obj/effect/floor_decal/corner/orange/border{ dir = 5 }, +/obj/structure/table/reinforced, +/obj/machinery/chem_master, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) "oDl" = ( @@ -24771,6 +24254,9 @@ icon_state = "4-8" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "oDC" = ( @@ -24840,10 +24326,6 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge) -"oEG" = ( -/obj/machinery/holopad, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/panic_shelter) "oEM" = ( /obj/structure/closet/firecloset, /turf/simulated/shuttle/floor/black, @@ -24898,6 +24380,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "oGT" = ( @@ -25031,6 +24514,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "oKJ" = ( @@ -25145,13 +24629,6 @@ "oNi" = ( /turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_north_airlock) -"oNq" = ( -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 10 - }, -/obj/structure/catwalk, -/turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/tether/surfacebase/outside/outside3) "oNP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -25290,6 +24767,9 @@ /obj/effect/floor_decal/corner/lime/bordercorner2{ dir = 8 }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "oRD" = ( @@ -25333,11 +24813,11 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) "oSE" = ( -/obj/machinery/atmospherics/pipe/manifold/visible{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 6 }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/turf/simulated/floor/tiled/steel_dirty/virgo3b, +/area/tether/surfacebase/outside/outside3) "oSJ" = ( /obj/structure/disposalpipe/segment, /obj/machinery/light{ @@ -25345,16 +24825,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/shuttle_pad) -"oSY" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/effect/floor_decal/borderfloor/corner{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lime/bordercorner{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/botanystorage) "oTr" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -25497,18 +24967,12 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) "oYs" = ( -/obj/machinery/door/firedoor, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/airlock/glass/research{ - name = "Xenoflora Research"; - req_one_access = list(30,35,47,77) - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/obj/effect/floor_decal/techfloor, +/obj/structure/closet/firecloset, +/obj/random/maintenance/medical, +/obj/random/maintenance/medical, +/turf/simulated/floor/tiled/techfloor/grid, +/area/maintenance/lower/medsec_maintenance) "oYS" = ( /obj/machinery/door/morgue{ name = "Private Study"; @@ -25582,6 +25046,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "paU" = ( @@ -25726,6 +25191,9 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 1 }, +/obj/structure/sink{ + pixel_y = 22 + }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "pek" = ( @@ -26047,6 +25515,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "pkZ" = ( @@ -26105,10 +25574,6 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_first_aid) -"pnr" = ( -/obj/machinery/light, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "pnK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, @@ -26330,6 +25795,7 @@ /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/borderfloor/corner, /obj/effect/floor_decal/corner/mauve/bordercorner, +/obj/machinery/portable_atmospherics/hydroponics, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "ptc" = ( @@ -26399,21 +25865,6 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar) -"pvf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "pvn" = ( /obj/structure/cable{ icon_state = "1-2" @@ -26433,8 +25884,7 @@ }, /obj/effect/floor_decal/industrial/outline/red, /obj/machinery/door/window/southleft{ - dir = 1; - req_one_access = list(19,43,67) + dir = 1 }, /turf/simulated/floor/plating, /area/shuttle/tourbus/general) @@ -26565,6 +26015,7 @@ dir = 8; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "pAM" = ( @@ -26713,8 +26164,11 @@ /turf/simulated/open, /area/tether/surfacebase/surface_three_hall) "pDC" = ( -/obj/effect/paint_stripe/purplegray, /obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 9 + }, /turf/simulated/floor/plating, /area/rnd/xenobiology/xenoflora_storage) "pDG" = ( @@ -27092,6 +26546,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "pPF" = ( @@ -27120,9 +26577,9 @@ /obj/structure/railing{ dir = 1 }, -/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/phoronlock{ - frequency = 1379; - scrub_id = "southciv_airlock_scrubber" +/obj/map_helper/airlock/atmos/scrubber, +/obj/machinery/atmospherics/component/unary/vent_scrubber/high_power{ + dir = 1 }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/topairlock) @@ -27217,18 +26674,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"pRx" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 5 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 5 - }, -/obj/machinery/atmospherics/component/unary/vent_pump/on, -/obj/structure/closet/secure_closet/medical3, -/obj/item/soap/nanotrasen, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/storage) "pSv" = ( /obj/structure/table/wooden_reinforced, /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -27304,17 +26749,8 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) "pVR" = ( -/obj/effect/floor_decal/corner/lightgrey{ - dir = 6 - }, -/obj/effect/floor_decal/corner/lightgrey{ - dir = 9 - }, -/obj/machinery/door/firedoor{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/turf/simulated/floor/outdoors/grass/sif/virgo3b, +/area/tether/surfacebase/topairlock) "pWy" = ( /obj/machinery/transhuman/synthprinter, /turf/simulated/floor/tiled/dark, @@ -27326,9 +26762,6 @@ /turf/simulated/floor/tiled/dark, /area/rnd/research/testingrange) "pWN" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 4 - }, /obj/effect/floor_decal/borderfloorwhite{ dir = 8 }, @@ -27341,11 +26774,8 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner2{ dir = 10 }, -/obj/machinery/vending/medical{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) +/turf/simulated/wall/prepainted, +/area/maintenance/lower/medsec_maintenance) "pWS" = ( /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 8 @@ -27358,15 +26788,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) -"pWX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "pXd" = ( /obj/structure/table/glass, /obj/effect/floor_decal/spline/plain{ @@ -27435,18 +26856,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) -"pYn" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 27 - }, -/obj/effect/floor_decal/techfloor{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/panic_shelter) "pYp" = ( /obj/machinery/power/breakerbox/activated{ RCon_tag = "Surface Civilian Substation Bypass" @@ -27569,6 +26978,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "qbX" = ( @@ -27608,34 +27020,16 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "qcU" = ( -/obj/machinery/atmospherics/portables_connector{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/mauve/border, -/obj/machinery/camera/network/research{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 5 }, +/turf/simulated/floor/tiled/steel_dirty/virgo3b, +/area/tether/surfacebase/outside/outside3) +"qdY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) -"qdY" = ( -/obj/effect/floor_decal/borderfloorwhite/corner{ - dir = 4 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 4 - }, -/obj/machinery/camera/network/medbay{ - dir = 4 - }, -/obj/structure/flora/pottedplant{ - icon_state = "plant-21" - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) "qei" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -27691,12 +27085,14 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "qgC" = ( -/obj/machinery/portable_atmospherics/canister/carbon_dioxide, -/obj/effect/floor_decal/industrial/warning{ - dir = 5 - }, -/turf/simulated/floor/tiled/white, -/area/rnd/xenobiology/xenoflora_storage) +/obj/structure/table/rack, +/obj/random/toy, +/obj/random/maintenance/medical, +/obj/random/medical/lite, +/obj/random/maintenance/clean, +/obj/random/maintenance/medical, +/turf/simulated/floor/plating, +/area/maintenance/lower/medsec_maintenance) "qgL" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -27831,7 +27227,6 @@ /area/tether/surfacebase/public_garden_three) "qkn" = ( /obj/structure/bed/chair/comfy, -/obj/machinery/camera/network/civilian, /obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) @@ -27882,6 +27277,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "qlA" = ( @@ -27994,6 +27390,7 @@ }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "qoB" = ( @@ -28282,24 +27679,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/rnd/research_storage) -"qxA" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 8 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 8 - }, -/obj/structure/table/glass, -/obj/machinery/recharger, -/obj/random/medical{ - pixel_x = -4; - pixel_y = 5 - }, -/obj/machinery/vending/wallmed1{ - pixel_x = -30 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) "qxD" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -28326,9 +27705,6 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 8 }, -/obj/machinery/camera/network/research/xenobio{ - dir = 4 - }, /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_hallway) "qyj" = ( @@ -28527,6 +27903,7 @@ /obj/structure/disposalpipe/junction{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "qGh" = ( @@ -28569,22 +27946,6 @@ /obj/landmark/spawnpoint/job/xenobiologist, /turf/simulated/floor/wood, /area/rnd/outpost/xenobiology/outpost_office) -"qIn" = ( -/obj/structure/table/standard{ - name = "plastic table frame" - }, -/obj/item/reagent_containers/glass/bucket, -/obj/item/material/minihoe, -/obj/item/storage/box/botanydisk, -/obj/item/storage/box/botanydisk, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) "qJG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -28803,7 +28164,7 @@ "qSA" = ( /obj/structure/sign/department/chapel, /turf/simulated/wall/prepainted, -/area/vacant/vacant_shop) +/area/tether/surfacebase/barbackmaintenance) "qTe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -28868,6 +28229,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "qUd" = ( @@ -28936,8 +28298,7 @@ }, /obj/effect/floor_decal/industrial/outline/red, /obj/machinery/door/window/southright{ - dir = 1; - req_one_access = list(19,43,67) + dir = 1 }, /turf/simulated/floor/plating, /area/shuttle/tourbus/general) @@ -28979,12 +28340,23 @@ /turf/simulated/floor/grass, /area/hydroponics) "qWk" = ( -/obj/structure/catwalk, -/obj/machinery/atmospherics/component/binary/passive_gate{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/tether/surfacebase/outside/outside3) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/corner_steel_grid{ + dir = 10 + }, +/obj/machinery/sleep_console{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/triage) "qWl" = ( /obj/structure/bookcase, /obj/item/book/manual/security_space_law, @@ -28999,13 +28371,14 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/security/hos) "qWo" = ( -/obj/effect/floor_decal/borderfloor{ +/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ dir = 1 }, -/obj/effect/floor_decal/industrial/danger{ - dir = 1 +/obj/machinery/door/window/brigdoor/southright{ + req_access = null; + req_one_access = list(30,35,47,77); + dir = 8 }, -/obj/machinery/camera/network/research, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) "qWC" = ( @@ -29102,17 +28475,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "ral" = ( -/obj/machinery/atmospherics/portables_connector{ +/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ dir = 1 }, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/mauve/border, -/obj/machinery/light, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/turf/simulated/floor/tiled/steel_dirty/virgo3b, +/area/tether/surfacebase/outside/outside3) "rav" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -29223,6 +28594,9 @@ dir = 6 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "rdd" = ( @@ -29323,18 +28697,13 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "rgg" = ( -/obj/structure/closet/secure_closet/hydroponics, /obj/effect/floor_decal/borderfloor{ dir = 4 }, /obj/effect/floor_decal/corner/lime/border{ dir = 4 }, -/obj/item/shovel/spade, -/obj/item/storage/belt/utility, -/obj/item/stack/material/sandstone{ - amount = 5 - }, +/obj/machinery/portable_atmospherics/hydroponics, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "rgh" = ( @@ -29469,7 +28838,7 @@ dir = 8 }, /turf/simulated/floor/tiled/techfloor, -/area/vacant/vacant_shop) +/area/tether/surfacebase/barbackmaintenance) "rkU" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 1 @@ -29518,17 +28887,12 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) "rmG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) -"rnj" = ( -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/simple/visible/universal, -/turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/tether/surfacebase/outside/outside3) +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology/xenoflora_storage) "rnF" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -29577,19 +28941,11 @@ /turf/simulated/wall/prepainted/civilian, /area/crew_quarters/bar) "rqi" = ( -/obj/structure/window/reinforced{ +/obj/structure/disposalpipe/junction/yjunction{ dir = 1 }, -/obj/effect/floor_decal/borderfloorwhite, -/obj/effect/floor_decal/corner/paleblue/border, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/flora/pottedplant{ - icon_state = "plant-21" - }, /turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/uppersouthstairwell) +/area/tether/surfacebase/medical/admin) "rqm" = ( /obj/structure/cable{ icon_state = "4-8" @@ -29608,14 +28964,14 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "rqu" = ( -/obj/effect/floor_decal/borderfloor/corner{ +/obj/structure/window/reinforced{ dir = 8 }, -/obj/effect/floor_decal/corner/mauve/bordercorner{ - dir = 8 +/obj/machinery/atmospherics/component/binary/heat_pump{ + dir = 4 }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "rqV" = ( /obj/structure/table/reinforced, /obj/machinery/cell_charger, @@ -29764,16 +29120,17 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/breakroom) "rvP" = ( -/obj/machinery/reagentgrinder, -/obj/structure/table/glass, +/obj/machinery/light{ + dir = 4 + }, /obj/effect/floor_decal/borderfloor{ - dir = 6 + dir = 4 }, /obj/effect/floor_decal/corner/mauve/border{ - dir = 6 + dir = 4 }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "rwh" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -29818,6 +29175,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 8 }, +/obj/machinery/honey_extractor, /turf/simulated/floor/grass, /area/hydroponics) "rwX" = ( @@ -29958,19 +29316,13 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/surgery2) "rDc" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 1 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ +/obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 4 }, -/obj/effect/floor_decal/borderfloorwhite/corner2{ - dir = 4 +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 9 }, -/obj/effect/floor_decal/corner/paleblue/bordercorner2{ +/obj/structure/disposalpipe/segment{ dir = 4 }, /turf/simulated/floor/tiled/white, @@ -29982,15 +29334,13 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "rDo" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/effect/floor_decal/corner/mauve{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/visible, +/obj/machinery/meter, +/obj/structure/window/reinforced{ + dir = 8 }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "rDG" = ( /obj/effect/floor_decal/spline/plain{ dir = 4 @@ -30013,6 +29363,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "rET" = ( @@ -30057,6 +29410,9 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "rGF" = ( @@ -30074,6 +29430,7 @@ /obj/machinery/door/firedoor{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/southhall) "rHx" = ( @@ -30302,10 +29659,11 @@ dir = 1; pixel_y = -24 }, +/obj/structure/medical_stand/anesthetic, /obj/structure/disposalpipe/segment{ - dir = 8 + dir = 1; + icon_state = "pipe-c" }, -/obj/structure/medical_stand/anesthetic, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "rPr" = ( @@ -30401,9 +29759,11 @@ /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/bar) "rQI" = ( -/obj/structure/flora/ausbushes/genericbush, -/turf/simulated/floor/grass, -/area/hydroponics) +/obj/effect/floor_decal/steeldecal/steel_decals10, +/obj/landmark/spawnpoint/job/medical_doctor, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/triage) "rQN" = ( /obj/structure/table/woodentable, /obj/machinery/recharger, @@ -30692,6 +30052,9 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "rYO" = ( @@ -30948,6 +30311,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) "sgl" = ( @@ -31067,6 +30431,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "siR" = ( @@ -31105,13 +30470,14 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "siU" = ( -/obj/machinery/seed_storage/xenobotany{ - dir = 1 +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 6 }, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/mauve/border, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "siX" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/medical{ @@ -31166,6 +30532,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 10 + }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "skn" = ( @@ -31240,6 +30609,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "snx" = ( @@ -31690,6 +31060,7 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 8 }, +/obj/machinery/seed_extractor, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "sBU" = ( @@ -31783,20 +31154,11 @@ /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "sEU" = ( -/obj/machinery/atmospherics/component/unary/freezer{ - icon_state = "freezer" - }, -/obj/effect/floor_decal/corner/green{ - dir = 10 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 9 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 9 +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/turf/simulated/floor/carpet/bcarpet, +/area/tether/surfacebase/barbackmaintenance) "sFc" = ( /obj/effect/floor_decal/techfloor{ dir = 6 @@ -31805,6 +31167,11 @@ /obj/machinery/light_switch{ pixel_x = 25 }, +/obj/machinery/shower{ + dir = 8; + pixel_x = -2 + }, +/obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/panic_shelter) "sFg" = ( @@ -31875,11 +31242,13 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "sGB" = ( -/obj/effect/floor_decal/borderfloor/corner{ - dir = 8 +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 }, -/obj/effect/floor_decal/corner/lime/bordercorner{ - dir = 8 +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lime/border, +/obj/machinery/fire_alarm/south_mount{ + pixel_y = -24 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) @@ -32002,10 +31371,9 @@ /turf/simulated/floor/wood, /area/library) "sKX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "sLb" = ( /obj/effect/floor_decal/spline/plain{ dir = 6 @@ -32084,25 +31452,10 @@ }, /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/techfloor, -/area/vacant/vacant_shop) +/area/tether/surfacebase/barbackmaintenance) "sMI" = ( -/obj/item/radio/intercom{ - dir = 8; - pixel_x = -24 - }, -/obj/structure/table/glass, -/obj/machinery/recharger, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 8 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) +/turf/simulated/floor/wood, +/area/maintenance/lower/medsec_maintenance) "sNk" = ( /obj/machinery/holopad, /turf/simulated/floor/tiled/techfloor, @@ -32182,18 +31535,10 @@ /turf/simulated/open/virgo3b, /area/tether/surfacebase/outside/outside3) "sQe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) +/obj/structure/disposalpipe/segment, +/obj/machinery/portable_atmospherics/hydroponics, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology/xenoflora) "sQg" = ( /obj/machinery/door/firedoor/glass, /obj/structure/disposalpipe/segment{ @@ -32225,7 +31570,6 @@ /area/tether/surfacebase/surface_three_hall) "sQo" = ( /obj/structure/lattice, -/obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/zpipe/down/scrubbers{ dir = 1 }, @@ -32235,33 +31579,25 @@ /obj/structure/cable/green{ icon_state = "32-1" }, -/obj/structure/window/basic/full, -/obj/structure/grille, -/obj/structure/window/basic, -/obj/structure/window/basic{ - dir = 8 - }, -/obj/structure/window/basic{ - dir = 1 - }, -/obj/structure/window/basic{ - dir = 4 - }, /obj/structure/disposalpipe/down{ dir = 1 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/open, /area/rnd/outpost/xenobiology/outpost_stairs) "sQL" = ( /turf/simulated/wall/prepainted/science, /area/rnd/staircase/thirdfloor) "sRl" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/effect/floor_decal/industrial/warning{ +/obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 4 }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/triage) "sRp" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -32297,22 +31633,15 @@ dir = 4; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) "sSW" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, -/obj/structure/disposalpipe/junction/yjunction{ - dir = 1 - }, +/obj/structure/medical_stand, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppersouthstairwell) -"sTj" = ( -/obj/structure/flora/ausbushes/fullgrass, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/grass, -/area/hydroponics) "sTo" = ( /obj/machinery/button/remote/airlock{ id = "barbackdoor"; @@ -32484,13 +31813,17 @@ /turf/simulated/floor/tiled, /area/hallway/primary/fore) "taq" = ( -/obj/structure/closet/firecloset, /obj/effect/floor_decal/borderfloor{ dir = 1 }, /obj/effect/floor_decal/corner/mauve/border{ dir = 1 }, +/obj/machinery/portable_atmospherics/hydroponics, +/obj/machinery/power/apc/north_mount, +/obj/structure/cable/green{ + icon_state = "0-2" + }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "taB" = ( @@ -32626,10 +31959,6 @@ }, /turf/simulated/floor/wood, /area/tether/surfacebase/security/hos) -"tdp" = ( -/obj/machinery/portable_atmospherics/canister/phoron, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "tdw" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 @@ -32739,12 +32068,16 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "tiw" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/effect/floor_decal/corner/mauve{ - dir = 10 +/obj/effect/floor_decal/borderfloor{ + dir = 4 }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible, +/obj/machinery/meter, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "tjb" = ( /obj/effect/floor_decal/corner/beige{ dir = 10 @@ -32882,14 +32215,20 @@ /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "tns" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/effect/floor_decal/borderfloor{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +/obj/effect/floor_decal/corner/lime/border{ + dir = 1 }, +/obj/structure/closet/secure_closet/hydroponics, +/obj/item/shovel/spade, +/obj/item/stack/material/sandstone{ + amount = 5 + }, +/obj/item/storage/belt/utility, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/area/tether/surfacebase/botanystorage) "tnx" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 4 @@ -33069,16 +32408,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) -"tuh" = ( -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 4 - }, -/obj/structure/catwalk, -/turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/tether/surfacebase/outside/outside3) "tvl" = ( /obj/machinery/air_alarm{ pixel_y = 28 @@ -33116,14 +32445,11 @@ /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) "tvQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "twj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -33134,18 +32460,11 @@ /turf/simulated/floor/wood, /area/shuttle/tourbus/general) "txh" = ( -/obj/structure/table/glass, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/mauve/border, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 - }, -/obj/machinery/air_alarm{ - dir = 1; - pixel_y = -22 +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 8 }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/turf/simulated/floor/tiled/steel_dirty/virgo3b, +/area/tether/surfacebase/outside/outside3) "txq" = ( /obj/item/radio/intercom/department/security{ dir = 4; @@ -33282,21 +32601,9 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "tBR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/holopad, +/obj/machinery/smartfridge/drying_rack, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/area/rnd/xenobiology/xenoflora) "tCk" = ( /obj/machinery/door/blast/regular{ density = 0; @@ -33351,7 +32658,6 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) "tEa" = ( -/obj/structure/railing, /obj/machinery/light, /turf/simulated/open, /area/tether/surfacebase/medical/uppernorthstairwell) @@ -33374,19 +32680,6 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/captain) -"tFl" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 1 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 1 - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/flora/pottedplant/stoutbush, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/storage) "tFM" = ( /obj/structure/window/reinforced, /obj/effect/floor_decal/steeldecal/steel_decals6{ @@ -33461,6 +32754,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "tHQ" = ( @@ -33596,6 +32890,7 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 }, +/obj/machinery/beehive, /turf/simulated/floor/grass, /area/hydroponics) "tLs" = ( @@ -33651,18 +32946,13 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/topairlock) "tMg" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/machinery/atmospherics/component/binary/passive_gate{ + dir = 8; + name = "Waste Purge Valve"; + target_pressure = 4500 }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/turf/simulated/floor/tiled/steel_dirty/virgo3b, +/area/tether/surfacebase/outside/outside3) "tMl" = ( /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled/dark, @@ -33673,9 +32963,15 @@ /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/surfacebase/outside/outside3) "tMA" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/panic_shelter) +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lime/border{ + dir = 1 + }, +/obj/machinery/portable_atmospherics/hydroponics, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/botanystorage) "tMI" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -33737,6 +33033,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "tOm" = ( @@ -33949,6 +33246,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "tTd" = ( @@ -34194,21 +33494,21 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "tXm" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/effect/floor_decal/corner/mauve/full{ +/obj/effect/floor_decal/borderfloor{ dir = 4 }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) -"tYC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 +/obj/effect/floor_decal/corner/mauve/border{ + dir = 4 }, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 }, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/panic_shelter) +/turf/simulated/floor/tiled, +/area/rnd/xenobiology/xenoflora_storage) +"tYC" = ( +/obj/machinery/camera/network/civilian, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/servicebackroom) "tYL" = ( /obj/structure/bed/chair/wood{ dir = 8 @@ -34222,9 +33522,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/topairlock) "tZe" = ( @@ -34367,6 +33665,9 @@ /obj/structure/cable/green{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 + }, /turf/simulated/floor/wood, /area/tether/surfacebase/barbackmaintenance) "uaI" = ( @@ -34478,18 +33779,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) -"ugO" = ( -/obj/machinery/light, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/mauve/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/hallway/primary/starboard) "ugQ" = ( /obj/machinery/air_alarm{ alarm_id = "pen_nine"; @@ -34528,11 +33817,18 @@ /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/bar) "uhL" = ( -/obj/structure/cable/green{ - icon_state = "2-4" +/obj/machinery/fire_alarm/west_mount{ + pixel_x = -24 }, -/turf/simulated/floor/grass, -/area/hydroponics) +/obj/machinery/disposal, +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/triage) "uih" = ( /turf/simulated/wall/prepainted/command, /area/crew_quarters/captain) @@ -34608,11 +33904,6 @@ /obj/item/bone/skull{ name = "Yo'rick" }, -/obj/item/paper{ - desc = ""; - info = "The Silence Into Laughter program works to place hard working, studied, accomplished, hardworking, homebrewed, diplomaholding, or otherwise clowns and mimes into the workforce! The Head Clowncellor and the Director at Mime have finally worked together to bring this titan of a workers' union! If you have a background in silence or laughter, please apply at our exonet site at: https://forum.vore-station.net/viewforum.php?f=45"; - name = "Clowns and Mimes Wanted!" - }, /obj/machinery/camera/network/civilian{ dir = 4 }, @@ -34738,18 +34029,16 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/machinery/camera/network/research/xenobio, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_south_airlock) "umH" = ( -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/machinery/light{ - dir = 8 +/obj/landmark/spawnpoint/job/medical_doctor, +/obj/effect/floor_decal/corner_steel_grid{ + dir = 5 }, -/obj/machinery/fire_alarm/west_mount{ - pixel_x = -24 +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) @@ -34788,10 +34077,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lobby) -"uoL" = ( -/obj/structure/railing, -/turf/simulated/open, -/area/tether/surfacebase/medical/uppernorthstairwell) "upe" = ( /obj/structure/table/reinforced, /obj/machinery/recharger/wallcharger{ @@ -34831,6 +34116,7 @@ dir = 8; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "upx" = ( @@ -34936,16 +34222,11 @@ /turf/simulated/wall/prepainted/civilian, /area/hydroponics) "urk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 9 +/obj/structure/railing{ + dir = 8 }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/turf/simulated/open, +/area/tether/surfacebase/public_garden_three) "urz" = ( /obj/machinery/vending/boozeomat, /turf/simulated/floor/lino, @@ -34973,6 +34254,12 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/topairlock) "urO" = ( @@ -35005,8 +34292,15 @@ /obj/machinery/door/firedoor{ dir = 8 }, +/obj/machinery/door/airlock/glass/research{ + name = "Xenoflora Research"; + req_one_access = list(30,35,47,77) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, -/area/hallway/primary/starboard) +/area/rnd/xenobiology/xenoflora) "usd" = ( /obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ @@ -35015,11 +34309,9 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/barbackmaintenance) "usi" = ( -/obj/machinery/smartfridge/drying_rack, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/mauve/border, +/obj/machinery/atmospherics/portables_connector, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "usw" = ( /obj/structure/table/standard, /obj/item/storage/box/syringes, @@ -35059,11 +34351,14 @@ /turf/simulated/floor/tiled/dark, /area/bridge) "usU" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/atmospherics/portables_connector{ + dir = 4 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/botanystorage) +/area/rnd/xenobiology/xenoflora_storage) "usX" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -35076,11 +34371,11 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lobby) "utB" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/turf/simulated/floor/tiled/steel_dirty/virgo3b, +/area/tether/surfacebase/outside/outside3) "utK" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -35094,6 +34389,7 @@ dir = 2; icon_state = "pipe-j2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "uvj" = ( @@ -35320,9 +34616,6 @@ /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 1 }, -/obj/machinery/door/firedoor{ - dir = 1 - }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "uCB" = ( @@ -35345,9 +34638,12 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/surgery2) "uDD" = ( -/obj/machinery/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/portable_atmospherics/canister/oxygen, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "uDM" = ( /obj/machinery/mech_recharger, /turf/simulated/floor/bluegrid, @@ -35457,6 +34753,7 @@ dir = 4 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "uIN" = ( @@ -35523,25 +34820,14 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "uJT" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_south_airlock) "uKK" = ( @@ -35675,6 +34961,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "uMB" = ( @@ -35719,8 +35006,11 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/topairlock) "uOn" = ( @@ -35806,11 +35096,17 @@ /turf/simulated/floor/tiled, /area/hallway/primary/port) "uRH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 +/obj/effect/floor_decal/borderfloor{ + dir = 1 }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) +/obj/effect/floor_decal/corner/mauve/border{ + dir = 1 + }, +/obj/machinery/vending/hydronutrients{ + req_one_access = list(30,35,47,77) + }, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology/xenoflora) "uRQ" = ( /obj/structure/table/woodentable, /turf/simulated/floor/carpet, @@ -35906,26 +35202,19 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) -"uUT" = ( -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 1 - }, -/obj/landmark/spawnpoint/job/medical_doctor, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) "uVb" = ( /obj/machinery/status_display{ pixel_x = 32 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/closet/secure_closet/medical3, +/obj/item/soap/nanotrasen, +/obj/machinery/atmospherics/component/unary/vent_pump/on, /obj/effect/floor_decal/borderfloorwhite{ - dir = 4 + dir = 5 }, /obj/effect/floor_decal/corner/paleblue/border{ - dir = 4 + dir = 5 }, -/obj/structure/closet/secure_closet/medical3, -/obj/item/soap/nanotrasen, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "uVs" = ( @@ -36050,20 +35339,26 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "uYD" = ( -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 4 +/obj/item/roller, +/obj/item/roller{ + pixel_y = 8 }, -/obj/landmark/spawnpoint/job/medical_doctor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/item/roller{ + pixel_y = 16 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/light{ dir = 8 }, -/obj/structure/disposalpipe/segment{ +/obj/structure/table/steel, +/obj/structure/extinguisher_cabinet{ + dir = 4; + pixel_x = -30 + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 }, /turf/simulated/floor/tiled/white, @@ -36157,11 +35452,17 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) @@ -36278,13 +35579,15 @@ /turf/simulated/open/virgo3b, /area/tether/surfacebase/outside/outside3) "vfe" = ( -/obj/machinery/botany/extractor, -/obj/effect/floor_decal/borderfloor{ +/obj/effect/floor_decal/borderfloor/corner{ dir = 8 }, -/obj/effect/floor_decal/corner/mauve/border{ +/obj/effect/floor_decal/corner/mauve/bordercorner{ dir = 8 }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "vfH" = ( @@ -36292,13 +35595,6 @@ /obj/item/paper_bin, /turf/simulated/floor/carpet/blue, /area/tether/surfacebase/security/breakroom) -"vgg" = ( -/obj/machinery/portable_atmospherics/canister/nitrogen, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "vgh" = ( /obj/machinery/fire_alarm/west_mount{ pixel_x = -26 @@ -36317,6 +35613,7 @@ dir = 8; icon_state = "pipe-c" }, +/obj/machinery/portable_atmospherics/hydroponics/soil, /turf/simulated/floor/grass, /area/hydroponics) "vhg" = ( @@ -36427,9 +35724,8 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 1 }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled, -/area/hallway/primary/starboard) +/turf/simulated/wall/prepainted/science, +/area/rnd/xenobiology/xenoflora) "vkE" = ( /obj/structure/table/steel, /obj/item/paper_bin{ @@ -36550,13 +35846,6 @@ }, /turf/simulated/floor/outdoors/grass/sif/virgo3b, /area/tether/surfacebase/outside/outside3) -"vpN" = ( -/obj/machinery/portable_atmospherics/canister/carbon_dioxide, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "vqg" = ( /obj/structure/table/wooden_reinforced, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -36583,8 +35872,20 @@ /turf/simulated/floor/carpet/sblucarpet, /area/crew_quarters/bar) "vrb" = ( -/obj/effect/floor_decal/steeldecal/steel_decals10, /obj/machinery/holopad, +/obj/item/radio/intercom{ + dir = 8; + pixel_x = -24 + }, +/obj/structure/table/steel, +/obj/machinery/recharger, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 + }, +/obj/random/medical{ + pixel_x = -4; + pixel_y = 5 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "vrU" = ( @@ -36651,14 +35952,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/hallway/primary/port) -"vvl" = ( -/obj/machinery/atmospherics/portables_connector{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/mauve/border, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "vvn" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 4 @@ -36696,6 +35989,9 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "vxb" = ( @@ -36711,7 +36007,6 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/cafeteria) "vyj" = ( -/obj/machinery/chemical_dispenser/full, /obj/structure/table/reinforced, /obj/structure/sign/poster{ pixel_x = 32 @@ -36722,27 +36017,9 @@ /obj/effect/floor_decal/corner/orange/border{ dir = 6 }, +/obj/machinery/chem_master, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) -"vyD" = ( -/obj/structure/window/reinforced, -/obj/machinery/atmospherics/portables_connector{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 5 - }, -/obj/machinery/status_display{ - pixel_x = 32 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "vyS" = ( /obj/structure/bed/chair{ dir = 8 @@ -36844,11 +36121,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) -"vBf" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/babyblue, -/turf/simulated/floor/plating, -/area/tether/surfacebase/medical/triage) "vBN" = ( /obj/machinery/computer/operating, /turf/simulated/floor/tiled/white, @@ -36958,14 +36230,10 @@ /obj/machinery/air_alarm{ pixel_y = 25 }, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/effect/paint_stripe/purplegray, +/turf/simulated/floor/plating, +/area/rnd/xenobiology/xenoflora_storage) "vFb" = ( /obj/structure/table/glass, /obj/item/radio{ @@ -37248,6 +36516,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/monofloor{ dir = 4 }, @@ -37278,15 +36547,6 @@ /mob/living/simple_mob/animal/passive/chicken, /turf/simulated/floor/grass, /area/hydroponics/cafegarden) -"vMH" = ( -/obj/structure/table/glass, -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 8 - }, -/obj/machinery/recharger, -/obj/random/medical, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) "vMR" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ @@ -37303,9 +36563,8 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/door/firedoor{ - dir = 8 - }, +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppersouthstairwell) "vNg" = ( @@ -37490,6 +36749,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "vRG" = ( @@ -37908,25 +37168,6 @@ "vZg" = ( /turf/simulated/floor/tiled/techmaint, /area/rnd/outpost/xenobiology/outpost_storage) -"vZr" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/hallway/primary/starboard) "wan" = ( /obj/structure/disposalpipe/sortjunction{ dir = 4; @@ -38025,6 +37266,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "wcp" = ( @@ -38059,20 +37301,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) -"wcS" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "wcT" = ( /obj/structure/bed/chair/office/dark, /turf/simulated/floor/carpet, @@ -38242,6 +37470,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "wjd" = ( @@ -38341,6 +37570,7 @@ /obj/effect/floor_decal/corner/mauve/bordercorner2{ dir = 4 }, +/obj/machinery/seed_storage/xenobotany, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "won" = ( @@ -38758,10 +37988,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ - id = "iaar"; - name = "iaar" - }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officeb) "wyP" = ( @@ -38805,18 +38031,6 @@ }, /turf/simulated/floor/carpet, /area/library) -"wzT" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 5 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "wzX" = ( /obj/structure/table/woodentable, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -38833,13 +38047,15 @@ /turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/surgery2) "wAO" = ( -/obj/machinery/light, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, /obj/effect/floor_decal/borderfloorwhite/corner2, /obj/effect/floor_decal/corner/paleblue/bordercorner2, -/obj/structure/filingcabinet/chestdrawer{ - name = "Scan Records" +/obj/machinery/fire_alarm/west_mount{ + pixel_x = -24 + }, +/obj/machinery/light{ + dir = 8 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) @@ -38858,19 +38074,15 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) "wBv" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/structure/cable/green{ - icon_state = "1-4" - }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 8 }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 5 }, +/obj/structure/cable/green, +/obj/machinery/power/apc/east_mount, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppersouthstairwell) "wBV" = ( @@ -38878,7 +38090,7 @@ dir = 1 }, /obj/machinery/camera/network/research/xenobio{ - dir = 10 + dir = 1 }, /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_breakroom) @@ -38955,6 +38167,9 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/topairlock) "wDq" = ( @@ -39106,6 +38321,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "wHu" = ( @@ -39126,7 +38342,7 @@ dir = 8 }, /turf/simulated/open, -/area/vacant/vacant_shop) +/area/tether/surfacebase/barbackmaintenance) "wJt" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -39196,7 +38412,7 @@ /area/rnd/workshop) "wLU" = ( /obj/structure/loot_pile/maint/trash, -/turf/simulated/floor/plating, +/turf/simulated/floor/wood, /area/maintenance/lower/medsec_maintenance) "wMm" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -39220,6 +38436,9 @@ name = "Medical Storage"; sortType = "Medical Storage" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "wNv" = ( @@ -39311,7 +38530,7 @@ /area/hydroponics) "wRs" = ( /obj/machinery/door/airlock/glass{ - req_one_access = list(19,43,67) + req_one_access = list(19,67) }, /obj/structure/cable{ icon_state = "1-2" @@ -39369,21 +38588,6 @@ /obj/structure/sign/department/xenolab, /turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_hallway) -"wSx" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/primary/starboard) "wTy" = ( /turf/simulated/wall/prepainted/civilian, /area/tether/surfacebase/north_stairs_three) @@ -39400,9 +38604,6 @@ /turf/simulated/floor/plating, /area/shuttle/tourbus/general) "wUf" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/steeldecal/steel_decals4{ @@ -39433,11 +38634,8 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/effect/floor_decal/corner/paleblue/diagonal, -/turf/simulated/floor/tiled/white, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/triage) "wVh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -39453,7 +38651,7 @@ /obj/random/maintenance/clean, /obj/random/maintenance/clean, /turf/simulated/floor/tiled/techfloor, -/area/vacant/vacant_shop) +/area/tether/surfacebase/barbackmaintenance) "wVQ" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -39672,6 +38870,7 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "xdQ" = ( @@ -39756,11 +38955,14 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "xhp" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ +/obj/structure/window/reinforced{ dir = 8 }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 + }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "xhR" = ( /obj/machinery/light{ dir = 1 @@ -39870,14 +39072,11 @@ /turf/simulated/floor/wood, /area/rnd/outpost/xenobiology/outpost_office) "xkN" = ( -/obj/effect/floor_decal/techfloor{ - dir = 4 - }, -/obj/effect/floor_decal/techfloor/corner{ - dir = 4 +/obj/machinery/atmospherics/portables_connector{ + dir = 1 }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/lower/medsec_maintenance) +/turf/simulated/floor/tiled, +/area/rnd/xenobiology/xenoflora_storage) "xlw" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -40063,19 +39262,17 @@ /turf/simulated/floor/bluegrid, /area/rnd/robotics/mechbay) "xrg" = ( -/obj/structure/reagent_dispensers/watertank, -/obj/item/reagent_containers/glass/bucket, -/obj/machinery/light{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/floor_decal/borderfloor{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/tether/surfacebase/surface_three_hall) "xrE" = ( /obj/structure/cable/green{ icon_state = "2-4" @@ -40090,6 +39287,12 @@ dir = 2; icon_state = "pipe-j2" }, +/obj/random/medical, +/obj/item/tool/screwdriver, +/obj/structure/table/steel, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "xrM" = ( @@ -40367,18 +39570,14 @@ /turf/simulated/floor/lino, /area/crew_quarters/bar) "xxq" = ( -/obj/structure/bed/padded, -/obj/effect/floor_decal/techfloor{ - dir = 9 - }, -/obj/machinery/fire_alarm/west_mount{ - pixel_x = -24 - }, -/obj/machinery/status_display{ - pixel_y = 30 +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, +/obj/structure/closet/secure_closet/hydroponics{ + req_access = list(); + req_one_access = list(30,35,47,77) }, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/panic_shelter) +/turf/simulated/floor/tiled, +/area/rnd/xenobiology/xenoflora) "xxQ" = ( /obj/machinery/computer/rdconsole/robotics{ dir = 8 @@ -40506,6 +39705,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "xCi" = ( @@ -40518,8 +39720,9 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 1 }, +/obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "xCs" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -40622,23 +39825,13 @@ dir = 5 }, /turf/simulated/floor/tiled/techfloor, -/area/vacant/vacant_shop) +/area/tether/surfacebase/barbackmaintenance) "xDw" = ( /turf/simulated/floor/tiled/techfloor, /area/rnd/workshop) "xDB" = ( /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_main) -"xFl" = ( -/obj/structure/sign/nosmoking_2{ - pixel_y = 30 - }, -/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/phoronlock{ - frequency = 1379; - scrub_id = "southciv_airlock_scrubber" - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/topairlock) "xFU" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 @@ -40775,6 +39968,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 1 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "xII" = ( @@ -40849,13 +40048,6 @@ }, /turf/simulated/floor/carpet, /area/tether/surfacebase/security/hos) -"xJx" = ( -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/tether/surfacebase/outside/outside3) "xKc" = ( /obj/machinery/fire_alarm/east_mount, /obj/effect/floor_decal/borderfloor{ @@ -40878,17 +40070,14 @@ layer = 4; pixel_y = 32 }, -/obj/machinery/portable_atmospherics/canister/oxygen/prechilled, -/obj/machinery/atmospherics/portables_connector, /obj/effect/floor_decal/corner/paleblue{ dir = 9 }, /obj/effect/floor_decal/corner/paleblue{ dir = 6 }, -/obj/machinery/door/window/brigdoor/southright{ - req_access = list(); - req_one_access = list(5,24) +/obj/machinery/atmospherics/component/binary/heat_pump{ + dir = 8 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) @@ -40951,6 +40140,12 @@ pixel_y = -40 }, /obj/map_helper/airlock/sensor/chamber_sensor, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/topairlock) "xLl" = ( @@ -40965,9 +40160,9 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/barbackmaintenance) "xLS" = ( -/obj/machinery/fire_alarm/north_mount, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/obj/structure/closet/firecloset/full, +/turf/simulated/floor/tiled/techfloor, +/area/tether/surfacebase/barbackmaintenance) "xMN" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -41112,14 +40307,16 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "xQJ" = ( -/obj/structure/closet, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, /obj/effect/floor_decal/techfloor{ - dir = 8 + dir = 9 }, +/obj/machinery/fire_alarm/west_mount{ + pixel_x = -24 + }, +/obj/machinery/status_display{ + pixel_y = 30 + }, +/obj/structure/bed/padded, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/panic_shelter) "xQL" = ( @@ -41206,14 +40403,11 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "xSf" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/corner/mauve{ - dir = 10 +/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ + dir = 8 }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "xSs" = ( /obj/machinery/light{ dir = 4 @@ -41336,16 +40530,8 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) "xWL" = ( -/obj/structure/window/basic/full, -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/basic, -/obj/structure/window/basic{ - dir = 1 - }, -/obj/structure/window/basic{ - dir = 8 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_first_aid) "xWN" = ( @@ -41493,11 +40679,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 9 +/obj/effect/floor_decal/borderfloorwhite{ + dir = 1 }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 4 +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 1 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) @@ -41632,29 +40818,25 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) "ygy" = ( -/obj/effect/floor_decal/corner/mauve{ - dir = 6 +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 4 + }, +/obj/machinery/atmospherics/portables_connector{ + dir = 1 }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "ygY" = ( /obj/structure/cable/green{ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) -"yhk" = ( -/obj/machinery/power/apc/north_mount, -/obj/structure/cable/orange{ - icon_state = "0-2" - }, -/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/phoronlock{ - frequency = 1379; - scrub_id = "southciv_airlock_scrubber" - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/topairlock) "yhO" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, @@ -41667,6 +40849,9 @@ /obj/machinery/camera/network/medbay{ dir = 1 }, +/obj/structure/table/steel, +/obj/item/packageWrap, +/obj/item/hand_labeler, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "yhZ" = ( @@ -41689,16 +40874,6 @@ "yja" = ( /turf/simulated/wall/prepainted/civilian, /area/tether/surfacebase/barbackmaintenance) -"yjc" = ( -/obj/machinery/atmospherics/portables_connector, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "yjJ" = ( /obj/spawner/window/low_wall/full/nogrille/firelocks, /obj/effect/paint_stripe/bottlegreen, @@ -41752,6 +40927,9 @@ dir = 4; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "ylC" = ( @@ -59268,7 +58446,7 @@ xiZ mcN oxB tAS -tAS +urk nFK wdH uLN @@ -59343,7 +58521,7 @@ jSF aAR aNO xDB -drE +xDB eto xDB xmi @@ -59549,7 +58727,7 @@ sQo pQk wAF wAF -jHZ +dcU qyl dOV xCK @@ -59708,7 +58886,7 @@ dRr qZR ndL dRr -dcU +dRr arO dRr dRr @@ -60321,7 +59499,7 @@ ogU ftd nQQ eMX -kZr +izr for oWB lgT @@ -62024,7 +61202,7 @@ wKZ dMn brA brA -fin +ovx wfe iXl eQn @@ -67109,7 +66287,7 @@ eGm eGm myj dPd -dPd +utB okq eGm eGm @@ -67299,7 +66477,7 @@ eGm eGm eGm eGm -fFk +pVR fFk fFk akS @@ -67493,8 +66671,8 @@ eGm eGm eGm eGm +pVR fFk -xFl aiC tYY urJ @@ -67687,8 +66865,8 @@ eGm eGm eGm eGm +pVR fFk -yhk iNx neW xLb @@ -67881,7 +67059,7 @@ qnw qnw eGm eGm -fFk +pVR fFk fFk odx @@ -67998,7 +67176,7 @@ hxW xQe qqn ekZ -hyt +jvD hyt hyt hyt @@ -68076,7 +67254,7 @@ fFk fFk fFk fFk -fEn +fFk hqw uqp huc @@ -68184,15 +67362,15 @@ eGm eGm hxW nKi -aCE gHJ -gzy +gHJ +gHJ wLU hxW eMK -xkN +qqn aDP -hyt +jvD uKK qTK ade @@ -68373,20 +67551,20 @@ bYs eGm eGm eGm -vBf -vBf -vBf -ncQ -ncQ -ncQ -ncQ -ncQ -ncQ -ncQ +eGm +eGm +eGm +hxW +qgC +gHJ +sMI +sMI +sMI +hxW hyb -ncQ -ncQ -ncQ +qqn +oYs +jvD tAn leN pPj @@ -68567,15 +67745,15 @@ bYs eGm eGm eGm -vBf -nvE -qdY -umH -kXW +eGm +eGm +eGm +hxW +gHJ +sMI sMI -qxA iIx -jtm +sMI pWN aNw hkJ @@ -68762,19 +67940,19 @@ gGi gGi gGi ncQ -iDI -hle -ryH -qgz -bCF -rmG -rmG -sQe -uRH +ncQ +ncQ +ncQ +ncQ +ncQ +ncQ +ncQ +ncQ +ncQ eOE -omw +ncQ wUV -bLR +ncQ xZX vnq wUr @@ -68958,17 +68136,17 @@ cHD ncQ iDI khZ -nYN +uhL jGP vrb mjF nYN uYD -hEQ +cwf qJG jHu wAO -jvD +bLR rDc cAA mie @@ -69152,13 +68330,13 @@ tEa ncQ fZO bcG -cxO -tpu -oRj -hEQ -cxO +ryH +rQI +jmm +rQI +qgz lbF -hEQ +sRl vPr aIJ yhO @@ -69243,7 +68421,7 @@ lIJ lIJ iDb tDV -lIJ +fEn loy pdv pGm @@ -69342,17 +68520,17 @@ dOV dOV gGi cHD -uoL +cHD vKj bmn nxm -dAL -tpu -pmZ hEQ -dAL -lbF +cxO +tpu +oRj hEQ +qWk +tpu wMm oQR duF @@ -69435,7 +68613,7 @@ sgg dVi sgg sRR -owK +mCv ntv owK jFG @@ -69539,14 +68717,14 @@ uvB oIn ncQ xKh -nxm -vMH -uUT -bTv -mjF -cKI -nnn +bgt hEQ +dAL +tpu +pmZ +hEQ +nnn +umH ccI bfh gOY @@ -69735,8 +68913,8 @@ ncQ aUY bgt iSD -qgz -qgz +jwU +aCE xrE ghR aSy @@ -69752,7 +68930,7 @@ kLr lGe mIe gnX -kiZ +jWi pIo lRV dHP @@ -69792,7 +68970,7 @@ qEy jsq bRh qTX -woF +lAa rBT xYd oVB @@ -69946,7 +69124,7 @@ lAH hyt hyt kzD -kiZ +jWi pIo lRV lRV @@ -69986,7 +69164,7 @@ qEy qEy bRh qTX -woF +lAa iCu xYd lLy @@ -70140,7 +69318,7 @@ uTj fET nFz oho -kiZ +jWi pIo lRV aon @@ -70180,7 +69358,7 @@ jgu knh bRh qTX -woF +lAa rBT xYd xYd @@ -70528,7 +69706,7 @@ xzG xZS pZi oeS -dPz +hTs fVH lRV dHP @@ -70722,7 +69900,7 @@ oYg vVS elj bGk -kiZ +jWi vNH kTG kTG @@ -70762,7 +69940,7 @@ cbH sGH nMb dAN -sjh +bhO lQF mYh lff @@ -71110,7 +70288,7 @@ uTj fUX laF bGk -szv +xrg kuE siS owg @@ -71312,12 +70490,12 @@ fAs neE fAs gsY -pVR -pVR -ptF +jBw +jBw +jBw gRV jrd -lAa +yja aTx aQY aTx @@ -71506,12 +70684,12 @@ fAs hRM mHM qSA -sHq -sHq -ptF +xLS +xLS +jBw gUy -ptF -lAa +jBw +yja cTe eHz fEa @@ -71668,7 +70846,7 @@ eGm eGm wcw bYs -lqG +dPd jSJ jSJ jSJ @@ -71700,12 +70878,12 @@ bbe ukr gjZ jBw -pDy -pDy +iOA +iOA jBw dmb jBw -lAa +yja pFk eHz fEa @@ -71862,8 +71040,8 @@ dPd eGm kFF bYs +dPd lqG -avu bjO uXv siZ @@ -71877,9 +71055,9 @@ aHH wtZ nlx ogM -amn seh -lth +seh +fFS fFS bnV ykZ @@ -71931,9 +71109,9 @@ yja vun eez lYy -noU -jNp -dQk +sEU +fWO +aSf mlP fZS yja @@ -72056,8 +71234,8 @@ tZk eGm kFF bYs -lqG -iSZ +dPd +eet xIm nUc rsb @@ -72071,16 +71249,16 @@ uCx hbo nlx eBj -amn seh -rqi +seh +fFS fFS vjk urR bBk -pjB -pjB -pjB +eQc +eQc +ijD pjB pjB pjB @@ -72093,7 +71271,7 @@ aLn wIR rky fIl -lAa +yja maT vLc fEa @@ -72250,8 +71428,8 @@ tZk tZk kFF bYs -lqG -tFl +dPd +eet hBf sDe eAP @@ -72267,14 +71445,14 @@ caI tmV seh seh -jJW +fFS fFS eMD -wSx +cOu mon -pjB +fnK xxq -dea +ijD xQJ lsk sql @@ -72444,33 +71622,33 @@ tZk tZk eCd bYs -lqG +dPd eet hou tRu afz hJl eun -nUc +lth nUc adu unp olW fWV -uMB +rqi nps iTu iTu sSW fxY brh -wSx -ugO -pjB +cOu +lLp +lLp +lgu +ijD mwV lmA -lmA -lmA wUl cxt shZ @@ -72638,10 +71816,10 @@ tZk tZk eCd bYs -lqG +dPd +eet iSZ nUc -nUc afz hdj elR @@ -72653,17 +71831,17 @@ jhw wbQ kcM uMw -nlx -nlx +uMB +uMB rOz fxY bxG -wSx -mon -pjB +cOu +lLp +lLp +ePT +ijD lTa -tMA -hEA lmA hTV pjB @@ -72832,8 +72010,8 @@ tZk tZk eCd bYs -lqG -pRx +dPd +eet uVb kBG vSh @@ -72852,13 +72030,13 @@ hhO wCb fxY cfG -vZr -kOG -pjB +cOu +lLp +hck +kDm +ijD lKq lmA -hbO -lmA wfN pjB mvE @@ -73026,7 +72204,7 @@ tZk tZk eCd bYs -lqG +dPd lqG lqG lqG @@ -73045,14 +72223,14 @@ fxY fxY fxY fxY -eQc +cfG cOu -eQc -iGh +lLp +rrA +oWK +ijD ktJ lmA -hbO -lmA fBE pjB pjB @@ -73220,32 +72398,32 @@ tZk tZk eCd bYs -bYs -bYs -bYs -bYs -bYs dPd dPd -guv -xLS -cBN -eiR -guv -hRu -vgg -mkR -fBW -yiU -tdp -guv +dPd +dPd +dPd +dPd +dPd +dPd +dPd +dPd +dPd +dPd +dPd +dPd +dPd +dPd +dPd +dPd +eQc otb -lpk -jwU +cOu +lLp iGh +rDi +ijD wrI -oEG -hbO xNT kpb cxt @@ -73414,32 +72592,32 @@ tZk tZk tZk kvC -lUf -lUf -scG -bYs -bYs -bYs +lqQ +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm dPd -guv -cwf -pWX -tns -guv -fnK -hXb -sRl -hCH -vpN -gEL -guv +dPd +dPd +dPd +dPd +dPd +dPd +eQc taq -vcz -fpW -iGh +cBN +lLp +rrA +oWK +ijD dVr -nsl -tYC hNv baR bak @@ -73611,29 +72789,29 @@ tZk eGm eGm eGm -scG -bYs -bYs +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm dPd -guv -iwu -ozw -eZy -guv -iwu -eiR -utB -irb -eiR -eiR -guv +dPd +nGW bmh -vcz -eWa -iGh +cOu +lLp +kqR +gzy +ijD wDv -pYn -fuT eKr sFc cxt @@ -73805,32 +72983,32 @@ tZk eGm eGm eGm -wcw -bYs -bYs +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm dPd -guv -fnK -aHd -hYE -cGJ -urk -akq -hNC -oBc -iLL -wcS -oYs +dPd +nGW wUf ksc -kdK -ijD +lLp +tBR +nsl ijD ijD ijD ijD ijD -iGh wDv uSg rrx @@ -73998,27 +73176,27 @@ tZk tZk eGm eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm dPd -kFF -bYs -bYs dPd -onT -pDC -aUW -pDC -onT -guv -guv -guv -but -guv -guv -guv +nGW wnG -vcz -rqu -dBH +cOu +lLp +biA vfe dBH ctR @@ -74190,30 +73368,30 @@ tZk tZk tZk tZk -tZk eGm eGm -kFF -bYs -bYs +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm dPd -onT -mCv -mCv -mCv -onT -sEU -wzT -bzg -ofn -oaE -aHM -guv -pea +dPd +eQc +uRH vcz -lLp -lLp -lLp +dyy +eiR +aHM lLp lLp lLp @@ -74230,7 +73408,7 @@ mva tCB prj jZr -prj +uSd mbp rYa dKA @@ -74384,32 +73562,32 @@ tZk tZk tZk tZk -tZk eGm eGm -kFF -bYs -bYs -bYs -onT -cEO -eiR -eiR -onT -fZm -hXr -jQd -aSf -dXU -eWA -guv +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +dPd +dPd +eQc pea dli bbg -bbg -bbg -bbg -bbg +gEL +gEL +sQe +sQe psA cWU jdA @@ -74578,34 +73756,34 @@ tZk tZk tZk tZk -tZk eGm eGm eGm -scG -bYs -bYs -onT -eiR -eiR -eiR -onT -yjc -lGr -iOA -lWj -gtl -qgC +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +dPd +dPd guv vEE iuy -nyB eMY -lLp -lLp -hck -kDm -jdA +eMY +eMY +eMY +eMY +eMY +eMY jdA prj bes @@ -74775,31 +73953,31 @@ tZk tZk eGm eGm -dPd eGm -scG -bYs -onT -eiR -eiR -eiR -onT -qWo -eiR -kqR -tBR -oSE -ral +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +dPd +dPd guv xCi -iuy -lLp -tiw -biA -lLp -rrA -oWK -jdA +irb +qdY +qdY +qdY +rmG +ick +fJV +eMY xhR prj wQV @@ -74970,20 +74148,20 @@ tZk eGm eGm eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +dPd dPd -kFF -bYs -onT -iwu -eiR -eiR -onT -eqo -nuD -jmm -pvf -oSE -vvl guv gig lwr @@ -74992,17 +74170,17 @@ xSf tvQ uDD mLY -rDi -jdA -uSd +yiU +eMY +prj kev -lgu -qWg -jkg -sTj -ePT -jWi -tmg +ikm +tRs +xSs +eFm +lal +hxw +prj elV geu ptE @@ -75165,39 +74343,39 @@ tZk eGm eGm eGm -kFF -bYs -onT -xLS -eiR -pnr -onT -evK -nuD -jmm -pvf +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm oSE qcU -eQc +guv lJy rDo -lLp -tiw +mOi +qWo xhp -lLp -rrA -oWK -jdA -uSd -prj -wQV -wpq -prj -prj -prj -hyk -uhL -fJV +cKI +rqu +usU +eMY +xSZ +yjJ +bBD +yjJ +xSZ +yjJ +bMg +yjJ +lWr +nyb bFS aoO bFS @@ -75359,39 +74537,39 @@ tZk tZk tZk eGm -kFF -bYs -onT -onT -onT -onT -onT -eqo -nuD -jmm -lqQ +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm bLf txh guv -pea -tiw -lLp -tiw -lLp -lLp +mkR +nuD +xkN +bzg +usi +hLe iRw -rvP -jdA -rQI -prj -ikm -tRs -xSs -eFm -lal -hxw -qFU -prj +lGr +eMY +uDV +oqa +eGZ +ugQ +xSZ +eUn +hLZ +kaq +jko +oRr bFS oEm eaa @@ -75553,39 +74731,39 @@ tZk tZk tZk tZk -eCd -bYs -dOV -dOV -dOV -bYs -guv -dyy -hip -vyD -nlz +tZk +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm tMg fgp -guv +evK dzs tiw ygy tXm -lLp -lLp +rvP +kOG siU -nGW -eQc -xSZ -yjJ -bBD -yjJ +wEu +fZm +uDV +aDG +iNJ +fxy xSZ -yjJ -bMg -yjJ -lWr -yjJ +gqH +qYU +qZj +iNJ +mEK bFS bsT bqs @@ -75748,38 +74926,38 @@ tZk tZk tZk tZk -kvC -kvC -kvC -szm -bYs -guv -guv -guv -guv -guv +tZk +tZk +eGm +eGm +eGm +eGm +eGm +eGm +eGm +kFF +ral +onT +hXb +hXb +hXb +hXb +pDC +wEu +wEu +wEu wEu -guv -guv -xCi -lLp -lLp -lLp -lLp -lLp -usi -nGW dOV uDV -oqa -eGZ -ugQ -xSZ -eUn -hLZ -kaq -jko -oRr +xvH +nLY +kvq +yjJ +fXX +qYU +nZm +vDg +bCF bFS vKs rFM @@ -75945,41 +75123,41 @@ tZk tZk tZk tZk -eCd -bYs -bYs -bYs -xJx -gWY -gWY -tuh -bYs -nGW -kFn -hTs -qIn -csz -xrg -hLe -bwH -nGW +tZk +tZk +tZk +eGm +eGm +eGm +kFF +dCz +dPd +dOV +dOV +dOV +dOV +dOV +dOV +dOV +dOV +dOV dOV uDV -aDG -iNJ -fxy -xSZ -gqH +gyl +aIw +hAD +yjJ +oML qYU -qZj -nyb -mEK -bFS +gxR +wwu +bCF bFS oVJ bqs bqs bqs +bqs aHu bqs iSb @@ -76140,36 +75318,36 @@ tZk tZk tZk tZk +tZk +tZk +tZk +tZk +tZk +tZk +kvC +kvC +kvC +kvC +kvC +kvC +kvC +kvC kvC kvC szm -oNq -rnj -qWk -lxQ -bYs -nGW -nGW -nGW -nGW -nGW -nGW -nGW -nGW -nGW dOV uDV -xvH -nLY -kvq +nTo +aIw +sKb yjJ -fXX +uiX qYU -nZm -vDg +vzy +qbj sGB -ddu -bFS +xSZ +tYC qkn mxM ykO @@ -76336,33 +75514,33 @@ tZk tZk tZk tZk +tZk +tZk +tZk +tZk +tZk +tZk +tZk +tZk +tZk +tZk +tZk +tZk +tZk +tZk eCd -bYs -bYs -bYs -dCz -bYs -dOV -dOV -dOV -dOV -dOV -dOV -dOV -dOV -dOV dOV uDV -gyl -aIw -hAD +tPS +bKH +euf yjJ -oML +tns qYU -gxR -wwu qYU -bhO +qYU +hip +xSZ bFS bFS bFS @@ -76531,35 +75709,35 @@ tZk tZk tZk tZk -kvC -kvC -kvC -kvC -kvC -kvC -kvC -kvC -kvC -kvC -kvC -kvC -kvC -ail +tZk +tZk +tZk +tZk +tZk +tZk +tZk +tZk +tZk +tZk +tZk +tZk +tZk +eCd dOV uDV -nTo -aIw -sKb -yjJ -uiX -qYU -vzy -qbj -usU -oSY -fWO -mOi uDV +uDV +uDV +xSZ +lWj +qYU +qYU +lPs +aMa +xSZ +dOV +dOV +dOV dOV dOV dOV @@ -76740,20 +75918,17 @@ tZk tZk eCd dOV -uDV -tPS -bKH -euf -yjJ -nTo -qYU -qYU -qYU -qYU +dOV +dOV +dOV +dOV +jQd +tMA +lPs lPs lPs aMa -uDV +xSZ dOV biw kvC @@ -76766,6 +75941,9 @@ kvC kvC kvC kvC +kvC +kvC +kvC tZk tZk tZk @@ -76932,22 +76110,19 @@ tZk tZk tZk tZk -eCd +tZk +kvC +kvC +kvC +ail dOV -uDV -uDV -uDV -uDV -xSZ +jQd icV rgg -ick -ick -gMB -gMB -gMB +rgg +rgg akk -uDV +xSZ dOV xCK tZk @@ -77022,6 +76197,9 @@ tZk tZk tZk tZk +tZk +tZk +tZk eGm eGm eGm @@ -77126,17 +76304,14 @@ tZk tZk tZk tZk +tZk +tZk +tZk +tZk eCd dOV -dOV -dOV -dOV -dOV -uDV -uDV -uDV -uDV uDV +jQd uDV uDV uDV @@ -77216,6 +76391,9 @@ tZk tZk tZk tZk +tZk +tZk +tZk eGm eGm eGm @@ -77321,13 +76499,10 @@ tZk tZk tZk tZk -kvC -kvC -kvC -szm -dOV -dOV -dOV +tZk +tZk +tZk +eCd dOV dOV dOV @@ -77410,6 +76585,9 @@ tZk tZk tZk tZk +tZk +tZk +tZk eGm eGm eGm @@ -77528,9 +76706,9 @@ kvC kvC kvC kvC -kvC -kvC -kvC +tZk +tZk +tZk tZk tZk tZk diff --git a/maps/tether/levels/underdark.dmm b/maps/tether/levels/underdark.dmm index 0682c61267f4..d52b94fbb302 100644 --- a/maps/tether/levels/underdark.dmm +++ b/maps/tether/levels/underdark.dmm @@ -15,18 +15,6 @@ "f" = ( /turf/simulated/floor/outdoors/dirt/virgo3b, /area/mine/explored/underdark) -"g" = ( -/obj/structure/railing{ - dir = 8 - }, -/turf/simulated/floor/outdoors/dirt/virgo3b, -/area/mine/explored/underdark) -"h" = ( -/obj/item/newspaper{ - pixel_x = 4 - }, -/turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/mine/explored/underdark) "j" = ( /obj/effect/decal/remains/deer, /turf/simulated/mineral/floor/virgo3b{ @@ -48,10 +36,6 @@ }, /turf/simulated/floor/outdoors/dirt/virgo3b, /area/mine/explored/underdark) -"o" = ( -/obj/structure/railing, -/turf/simulated/floor/outdoors/dirt/virgo3b, -/area/mine/explored/underdark) "q" = ( /turf/simulated/mineral/floor/virgo3b, /area/mine/unexplored/underdark) @@ -75,10 +59,7 @@ /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/mine/explored/underdark) "v" = ( -/obj/effect/step_trigger/teleporter/from_underdark{ - dir = 4; - pixel_x = -16 - }, +/obj/structure/stairs/spawner/east, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/mine/explored/underdark) "w" = ( @@ -98,9 +79,6 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/structure/railing{ - dir = 8 - }, /turf/simulated/floor/outdoors/dirt/virgo3b, /area/mine/explored/underdark) "A" = ( @@ -120,6 +98,7 @@ /obj/machinery/power/apc/north_mount{ alarms_hidden = 1 }, +/obj/structure/railing, /turf/simulated/floor/outdoors/dirt/virgo3b, /area/mine/explored/underdark) "D" = ( @@ -35543,7 +35522,7 @@ k C u u -f +K P u u @@ -35734,10 +35713,10 @@ X X X k -o +f v v -K +f P T y @@ -35928,10 +35907,10 @@ X X X k -o -h -u -K +f +f +f +f P P P @@ -36124,7 +36103,7 @@ X k f z -g +f f f f diff --git a/maps/tether/tether.dm b/maps/tether/tether.dm index 1339aa52f5e8..ed89fb68119b 100644 --- a/maps/tether/tether.dm +++ b/maps/tether/tether.dm @@ -165,6 +165,8 @@ link_above = /datum/map_level/tether/station/surface_mid flags = LEGACY_LEVEL_STATION|LEGACY_LEVEL_CONTACT|LEGACY_LEVEL_PLAYER|LEGACY_LEVEL_CONSOLES|LEGACY_LEVEL_SEALED base_turf = /turf/simulated/floor/outdoors/rocks/virgo3b + link_north = /datum/map_level/tether/mine + link_south = /datum/map_level/tether/plains // holomap_offset_x = TETHER_HOLOMAP_MARGIN_X // holomap_offset_y = TETHER_HOLOMAP_MARGIN_Y + TETHER_MAP_SIZE*0 @@ -267,6 +269,8 @@ ) flags = LEGACY_LEVEL_CONTACT|LEGACY_LEVEL_PLAYER|LEGACY_LEVEL_SEALED base_turf = /turf/simulated/floor/outdoors/rocks/virgo3b + link_below = /datum/map_level/tether/underdark + link_south = /datum/map_level/tether/station/surface_low /datum/map_level/tether/mine/on_loaded_immediate(z_index, list/datum/callback/additional_generation) . = ..() @@ -294,6 +298,7 @@ ) flags = LEGACY_LEVEL_CONTACT|LEGACY_LEVEL_PLAYER|LEGACY_LEVEL_SEALED base_turf = /turf/simulated/mineral/floor/virgo3b + link_above = /datum/map_level/tether/mine /datum/map_level/tether/underdark/on_loaded_immediate(z_index, list/datum/callback/additional_generation) . = ..() @@ -321,6 +326,7 @@ ) flags = LEGACY_LEVEL_CONTACT|LEGACY_LEVEL_PLAYER|LEGACY_LEVEL_SEALED base_turf = /turf/simulated/mineral/floor/virgo3b + link_north = /datum/map_level/tether/station/surface_low /datum/map_level/tether/plains/on_loaded_immediate(z_index, list/datum/callback/additional_generation) . = ..() diff --git a/maps/triumph/levels/deck2.dmm b/maps/triumph/levels/deck2.dmm index be1a3c30623e..1888991cd2ba 100644 --- a/maps/triumph/levels/deck2.dmm +++ b/maps/triumph/levels/deck2.dmm @@ -1207,6 +1207,7 @@ /obj/machinery/light{ dir = 8 }, +/obj/item/reagent_containers/glass/rag/sponge, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) "dt" = ( @@ -13103,6 +13104,8 @@ /obj/item/mop, /obj/item/storage/bag/trash, /obj/item/lightreplacer, +/obj/item/reagent_containers/glass/rag/sponge, +/obj/item/reagent_containers/glass/rag/sponge, /turf/simulated/floor/tiled/dark, /area/janitor) "NW" = ( @@ -14966,7 +14969,6 @@ /obj/machinery/computer/security/telescreen{ pixel_x = 32 }, -/obj/machinery/vending/mre, /turf/simulated/floor/wood, /area/crew_quarters/bar) "Ty" = ( diff --git a/maps/triumph/levels/deck3.dmm b/maps/triumph/levels/deck3.dmm index 40c3b49ac1e2..54f45a1f291d 100644 --- a/maps/triumph/levels/deck3.dmm +++ b/maps/triumph/levels/deck3.dmm @@ -2045,9 +2045,6 @@ }, /turf/simulated/floor/tiled, /area/medical/surgeryprep) -"bPc" = ( -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2) "bPE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -2717,8 +2714,7 @@ "csx" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/voidcraft/vertical{ - frequency = 1380; - id_tag = null + frequency = 1380 }, /obj/structure/cable/green{ icon_state = "1-2" @@ -2985,7 +2981,6 @@ dir = 1; frequency = 1445; id = "burn_in"; - req_access = null; volume_rate = 700 }, /turf/simulated/floor/reinforced, @@ -4642,9 +4637,6 @@ /obj/item/clothing/under/rank/medical/scrubs, /turf/simulated/floor/tiled/white, /area/crew_quarters/medbreak/surgery) -"dYb" = ( -/turf/simulated/floor/plating, -/area/maintenance/medbay/aft) "dYB" = ( /obj/structure/cable/green{ icon_state = "1-8" @@ -6073,10 +6065,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/ward) -"ffL" = ( -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/research) "fhj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -6467,7 +6455,6 @@ /obj/machinery/power/emitter{ anchored = 1; dir = 1; - id = null; pixel_y = 8; state = 2 }, @@ -10627,10 +10614,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology) -"iNs" = ( -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/medbay/aft) "iNI" = ( /obj/effect/floor_decal/techfloor, /obj/structure/disposalpipe/segment{ @@ -10813,7 +10796,6 @@ dir = 8; frequency = 1445; id = "burn_in"; - req_access = null; volume_rate = 700 }, /turf/simulated/floor/reinforced, @@ -15124,9 +15106,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/hallway) -"mIO" = ( -/turf/simulated/floor/plating, -/area/maintenance/medbay/aft) "mKe" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/shuttle/wall/voidcraft/blue, @@ -15237,9 +15216,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/aft) -"mPq" = ( -/turf/simulated/floor/plating, -/area/maintenance/medbay/fore) "mQm" = ( /obj/machinery/light{ dir = 8 @@ -16114,13 +16090,6 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/rnd/test_area) -"nBw" = ( -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -22 - }, -/turf/simulated/floor/plating, -/area/maintenance/medbay/aft) "nCp" = ( /obj/machinery/door/window/brigdoor/southright{ req_access = list(55); @@ -18270,9 +18239,7 @@ "pky" = ( /obj/machinery/door/airlock/multi_tile/glass{ id_tag = "MedbayFoyer"; - name = "General Wing"; - req_access = null; - req_one_access = null + name = "General Wing" }, /obj/machinery/door/firedoor/glass, /obj/effect/floor_decal/borderfloor{ @@ -18502,8 +18469,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/voidcraft/vertical{ - frequency = 1380; - id_tag = null + frequency = 1380 }, /obj/machinery/access_button{ dir = 1; @@ -18571,7 +18537,6 @@ /obj/machinery/power/emitter{ anchored = 1; dir = 1; - id = null; pixel_y = 8; state = 2 }, @@ -19447,6 +19412,9 @@ /obj/item/bodybag/cryobag, /obj/structure/table/steel_reinforced, /obj/effect/floor_decal/industrial/outline/blue, +/obj/item/stack/nanopaste{ + amount = 30 + }, /turf/simulated/floor/tiled/white, /area/medical/sleeper) "qak" = ( @@ -20356,13 +20324,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/resleeving) -"qOi" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2) "qOj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -20680,7 +20641,6 @@ dir = 1; frequency = 1445; id = "burn_in"; - req_access = null; volume_rate = 700 }, /turf/simulated/floor/wood, @@ -21778,8 +21738,7 @@ /obj/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 8; - frequency = 1380; - id_tag = null + frequency = 1380 }, /turf/simulated/floor/plating, /area/medical/patient_wing) @@ -22872,10 +22831,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) -"sVE" = ( -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/medbay/fore) "sVF" = ( /obj/machinery/light{ dir = 4 @@ -24947,10 +24902,8 @@ /area/maintenance/substation/medical_science) "uFV" = ( /obj/structure/table/steel_reinforced, -/obj/item/stack/nanopaste{ - amount = 30 - }, /obj/effect/floor_decal/industrial/outline/blue, +/obj/machinery/lathe/medical/stocked, /turf/simulated/floor/tiled/white, /area/medical/sleeper) "uGR" = ( @@ -25066,6 +25019,9 @@ /obj/item/tank/oxygen{ pixel_y = -4 }, +/obj/item/hardsuit/medical{ + pixel_y = -4 + }, /obj/structure/table/rack, /turf/simulated/floor/tiled, /area/medical/medbay_emt_bay) @@ -26275,8 +26231,7 @@ /obj/machinery/door/airlock/multi_tile/glass{ dir = 4; name = "Chem & Offices"; - req_access = list(5); - req_one_access = null + req_access = list(5) }, /obj/structure/cable/green{ icon_state = "4-8" @@ -26826,8 +26781,7 @@ /obj/machinery/door/firedoor/glass, /obj/map_helper/airlock/door/int_door, /obj/machinery/door/airlock/voidcraft/vertical{ - frequency = 1380; - id_tag = null + frequency = 1380 }, /turf/simulated/floor/tiled/white, /area/shuttle/emt/general) @@ -26873,8 +26827,7 @@ /obj/machinery/door/firedoor/glass, /obj/map_helper/airlock/door/ext_door, /obj/machinery/door/airlock/voidcraft/vertical{ - frequency = 1380; - id_tag = null + frequency = 1380 }, /turf/simulated/floor/tiled/white, /area/shuttle/emt/general) @@ -27104,9 +27057,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/medbay/fore) -"wxx" = ( -/turf/simulated/floor/plating, -/area/maintenance/medbay/aft) "wxE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -28591,13 +28541,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay4) -"xJM" = ( -/obj/structure/catwalk, -/obj/machinery/light/small{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/medbay/fore) "xJN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 4 @@ -28878,9 +28821,6 @@ }, /turf/simulated/floor/tiled, /area/medical/sleeper) -"xVR" = ( -/turf/simulated/floor/plating, -/area/maintenance/medbay/aft) "xXp" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -28891,9 +28831,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/test_area) -"xXR" = ( -/turf/simulated/floor/plating, -/area/maintenance/research) "xYe" = ( /obj/structure/bed/chair/wheelchair, /obj/effect/floor_decal/industrial/outline/blue, @@ -28914,8 +28851,7 @@ /obj/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 8; - frequency = 1380; - id_tag = null + frequency = 1380 }, /turf/simulated/floor/plating, /area/medical/patient_wing) @@ -37192,7 +37128,7 @@ xZt bQa axl cXl -xXR +cpA cpA axl xOh @@ -37203,10 +37139,10 @@ aDe kxT qPj mWG -nBw +djF +mWG mWG mWG -xVR eXE jMj bBu @@ -37384,11 +37320,11 @@ suI bTp bTp cpA -xXR -xXR -xXR -xXR -xXR +cpA +cpA +cpA +cpA +cpA eaK suI mDp @@ -37398,9 +37334,9 @@ kxT pps vmM mWG -wxx mWG -dYb +mWG +mWG eXE jMj eVl @@ -37576,10 +37512,10 @@ suI suI bmt bTp -ffL -xXR -xXR -xXR +bTp +cpA +cpA +cpA cpA fSv tAg @@ -37593,7 +37529,7 @@ tAg tAg fcw mWG -mIO +mWG mWG eXE jMj @@ -37786,9 +37722,9 @@ jzz cew tAg xFt -xVR +mWG vmM -dYb +mWG mGW jMj jMj @@ -37988,7 +37924,7 @@ piP trY trY trY -mIO +mWG djF kpp kxT @@ -38153,12 +38089,12 @@ vnY vnY suI bTp -ffL +bTp bTp bTp wWi bTp -ffL +bTp bTp oSx bTp @@ -38177,7 +38113,7 @@ kpp jMj jMj jMj -iNs +jMj jMj jMj uCv @@ -38347,17 +38283,17 @@ tKG tKG suI bTp -xXR +cpA tji fij -xXR +cpA qOV oXx -xXR +cpA vLK fcA bTp -xXR +cpA tAg mRv lwt @@ -38928,8 +38864,8 @@ bTp tys bTp bTp -ffL -xXR +bTp +cpA cNb meR nAu @@ -39121,7 +39057,7 @@ rOo tji sXB oSV -xXR +cpA bTp jgN ejI @@ -39352,7 +39288,7 @@ nel utr mWG jMj -mIO +mWG toD xcx kxG @@ -39544,7 +39480,7 @@ dbh yde dAV utr -mIO +mWG jMj mWG uYk @@ -39740,7 +39676,7 @@ jgb utr mWG jMj -mIO +mWG toD mIe kxG @@ -40481,7 +40417,7 @@ soU eWW xIf bTp -xXR +cpA uEl jPQ cbF @@ -40675,7 +40611,7 @@ pdP eWW xIf fNX -xXR +cpA uEl pGO xkX @@ -40696,7 +40632,7 @@ ieR ofg duZ iPU -sVE +fVB rsU kfN afR @@ -41062,8 +40998,8 @@ qhW jam sZy xIf -ffL -xXR +bTp +cpA uEl uEl tbn @@ -41277,7 +41213,7 @@ tYf meR fmZ duZ -sVE +fVB wwu pNX sUJ @@ -41447,7 +41383,7 @@ lui cIp qpQ pgB -xXR +cpA gyl xIf oZk @@ -41471,7 +41407,7 @@ rkN meR oDD duZ -sVE +fVB mKr pNX pNX @@ -41641,7 +41577,7 @@ lui cIp qpQ tua -xXR +cpA cpA ipX bTp @@ -41666,14 +41602,14 @@ meR toX duZ kzb -sVE +fVB duZ dht jZr chM duZ uHQ -mPq +nXk tWY nyz twF @@ -41839,7 +41775,7 @@ nZB eec xIf bTp -xXR +cpA uJh ogl geD @@ -41860,10 +41796,10 @@ rIr qIz qIz qIz -sVE +fVB duZ dht -mPq +nXk nXk duZ duZ @@ -42029,7 +41965,7 @@ lui cIp qpQ aZk -xXR +cpA fMM xIf bTp @@ -42054,16 +41990,16 @@ nAQ hBs cny xGm -sVE +fVB duZ rbF nXk -mPq +nXk geo -mPq +nXk crH -sVE -sVE +fVB +fVB wlz aFA hLb @@ -42248,16 +42184,16 @@ iEr hBs cny xGm -sVE +fVB crH -mPq -mPq -mPq -mPq +nXk +nXk +nXk +nXk gwo duZ mKr -sVE +fVB wlz iWo ufn @@ -42442,7 +42378,7 @@ sBd qIz qIz qIz -sVE +fVB duZ rbF rbF @@ -42450,8 +42386,8 @@ dht nXk eUu duZ -mPq -sVE +nXk +fVB uvd uvd uvd @@ -42636,7 +42572,7 @@ ieJ eBe qIz mKr -sVE +fVB duZ duZ duZ @@ -42645,7 +42581,7 @@ duZ duZ duZ mKr -sVE +fVB uvd dic tGx @@ -42830,16 +42766,16 @@ eaq aHX qIz mKr -sVE +fVB rRb -sVE -sVE -sVE -sVE -sVE -sVE -xJM -sVE +fVB +fVB +fVB +fVB +fVB +fVB +rRb +fVB uvd dFm pBq @@ -43391,11 +43327,11 @@ bKl ocU fcW xuX -xXR +cpA dFC -xXR +cpA iKj -xXR +cpA dFC knh mxb @@ -43587,7 +43523,7 @@ xIf rFp bTp bTp -ffL +bTp bTp bTp bTp @@ -52532,7 +52468,7 @@ oZA nnJ tYH pkD -bPc +pkD rbc itd iKx @@ -52728,7 +52664,7 @@ wMp cDA rMs iyp -qOi +fzF fzF mZv mNh diff --git a/maps/triumph/levels/deck4.dmm b/maps/triumph/levels/deck4.dmm index a2dbaf1377d0..2a46fc53a9fd 100644 --- a/maps/triumph/levels/deck4.dmm +++ b/maps/triumph/levels/deck4.dmm @@ -833,9 +833,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/security) -"aDG" = ( -/turf/simulated/floor/plating, -/area/maintenance/chapel) "aDH" = ( /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 4 @@ -4123,13 +4120,6 @@ }, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) -"cVd" = ( -/obj/structure/catwalk, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/maintenance/central) "cVf" = ( /obj/effect/floor_decal/sign/dock/three, /turf/simulated/wall/r_wall/prepainted, @@ -4307,10 +4297,6 @@ }, /turf/simulated/floor/tiled/old_cargo/white, /area/security/forensics) -"dcn" = ( -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/security/starboard) "dcL" = ( /obj/structure/closet/secure_closet/security, /obj/effect/floor_decal/industrial/outline/yellow, @@ -4745,9 +4731,6 @@ }, /turf/simulated/floor/tiled/dark, /area/security/security_equiptment_storage) -"dlg" = ( -/turf/simulated/floor/plating, -/area/maintenance/security/port) "dlH" = ( /obj/effect/floor_decal/techfloor{ dir = 10 @@ -7326,9 +7309,6 @@ "eZe" = ( /turf/simulated/wall/prepainted/security, /area/security/hallway) -"eZM" = ( -/turf/simulated/floor/plating, -/area/maintenance/security/starboard) "faa" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -10013,13 +9993,6 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/hop) -"gUz" = ( -/obj/structure/catwalk, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/maintenance/security/starboard) "gUA" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -14732,9 +14705,6 @@ /obj/structure/wall_frame/prepainted, /turf/simulated/floor/plating, /area/exploration/pathfinder_office) -"kbl" = ( -/turf/simulated/floor/plating, -/area/maintenance/security/starboard) "kbw" = ( /obj/structure/grille, /obj/machinery/door/firedoor/glass, @@ -15690,13 +15660,6 @@ }, /turf/simulated/floor/tiled, /area/exploration/explorer_prep) -"kIq" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/central) "kIs" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -16099,12 +16062,6 @@ /obj/machinery/computer/secure_data, /turf/simulated/floor/tiled/old_cargo/red, /area/security/security_processing) -"kWe" = ( -/obj/structure/railing{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/maintenance/security/starboard) "kWo" = ( /obj/effect/floor_decal/spline/plain{ dir = 1 @@ -16269,10 +16226,6 @@ }, /turf/simulated/floor/tiled, /area/exploration) -"lbc" = ( -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/central) "lbH" = ( /obj/machinery/computer/ship/navigation{ dir = 1 @@ -17021,9 +16974,6 @@ }, /turf/simulated/floor/tiled, /area/security/security_lockerroom) -"lMv" = ( -/turf/simulated/floor/plating, -/area/maintenance/security/starboard) "lMU" = ( /obj/machinery/holopad, /obj/effect/floor_decal/corner/blue{ @@ -17159,10 +17109,6 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/shuttle/courser/cockpit) -"lPI" = ( -/obj/structure/table/rack, -/turf/simulated/floor/plating, -/area/maintenance/chapel) "lPJ" = ( /obj/effect/floor_decal/techfloor{ dir = 5 @@ -17320,13 +17266,6 @@ }, /turf/simulated/floor/bluegrid, /area/ai) -"lXu" = ( -/obj/structure/catwalk, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/maintenance/central) "lXS" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/simple/hidden{ @@ -18288,9 +18227,6 @@ }, /turf/simulated/floor/tiled/dark, /area/hallway/primary/aft) -"mIv" = ( -/turf/space, -/area/space) "mID" = ( /obj/structure/table/borosilicate, /turf/simulated/floor/wood, @@ -19007,10 +18943,6 @@ "nlv" = ( /turf/simulated/wall/r_wall, /area/prison/cell_block) -"nlD" = ( -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/security/starboard) "nmp" = ( /obj/structure/ladder, /obj/structure/railing{ @@ -20011,12 +19943,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/hallway/primary/aft) -"nRY" = ( -/obj/machinery/air_alarm{ - pixel_y = 22 - }, -/turf/simulated/floor/plating, -/area/maintenance/security/starboard) "nSi" = ( /obj/machinery/ai_slipper, /obj/machinery/turretid/stun{ @@ -22801,13 +22727,6 @@ }, /turf/simulated/floor/tiled/dark, /area/security/riot_control) -"pNr" = ( -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -22 - }, -/turf/simulated/floor/plating, -/area/maintenance/central) "pNt" = ( /obj/spawner/window/low_wall/borosillicate/reinforced/full, /obj/effect/paint_stripe/commandblue, @@ -24026,9 +23945,6 @@ }, /turf/simulated/floor/tiled, /area/bridge/hallway) -"qKv" = ( -/turf/simulated/floor/plating, -/area/security/brig) "qKF" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -25395,9 +25311,6 @@ "rKA" = ( /turf/simulated/wall/r_wall/prepainted/exploration, /area/exploration/showers) -"rKE" = ( -/turf/simulated/floor/wood, -/area/maintenance/security/starboard) "rKO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -25445,9 +25358,6 @@ }, /turf/simulated/shuttle/wall/voidcraft/hard_corner, /area/shuttle/excursion/cargo) -"rNn" = ( -/turf/simulated/floor/wood, -/area/maintenance/security/starboard) "rOm" = ( /obj/effect/floor_decal/chapel{ dir = 4 @@ -27285,9 +27195,6 @@ }, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/civilian_hallway_mid) -"tjq" = ( -/turf/simulated/floor/plating, -/area/maintenance/security/starboard) "tjQ" = ( /obj/structure/catwalk, /obj/structure/cable{ @@ -27461,9 +27368,6 @@ /obj/random/tech_supply, /turf/simulated/floor/tiled, /area/maintenance/tool_storage) -"tqE" = ( -/turf/simulated/floor/wood/broken, -/area/maintenance/central) "trn" = ( /obj/structure/shuttle/engine/heater{ dir = 4 @@ -31841,12 +31745,6 @@ }, /turf/simulated/floor/tiled/dark, /area/security/riot_control) -"wsX" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/maintenance/chapel) "wtl" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -32198,9 +32096,15 @@ /turf/simulated/floor/grass, /area/hydroponics/garden) "wFu" = ( -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/chapel) +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 8 + }, +/obj/machinery/vending/mre, +/turf/simulated/floor/tiled, +/area/exploration) "wFM" = ( /obj/machinery/light/small/emergency{ dir = 8 @@ -34018,10 +33922,6 @@ }, /turf/simulated/floor/tiled/dark, /area/security/hallway) -"xJr" = ( -/obj/structure/table/rack, -/turf/simulated/floor/plating, -/area/maintenance/chapel) "xJO" = ( /obj/effect/shuttle_landmark/triumph/deck4/excursion_space, /turf/space, @@ -34384,9 +34284,6 @@ }, /turf/simulated/floor/wood, /area/hallway/secondary/docking_hallway) -"ybN" = ( -/turf/simulated/floor/plating, -/area/maintenance/central) "ybW" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -40199,7 +40096,7 @@ jNg jNg jNg jNg -mIv +jNg jNg jNg jNg @@ -43261,7 +43158,7 @@ jCz jCz eEE fCV -qKv +izv izv uTN xDy @@ -46509,7 +46406,7 @@ qfY uCu mKg jPL -jPL +wFu iBx bAB rju @@ -49252,7 +49149,7 @@ eQL iAm xwU aNK -dlg +oYj eoX eAT lxz @@ -49820,8 +49717,8 @@ plb pdu oxc dIm -aDG -wsX +uze +lhZ dhZ bjg vNz @@ -49834,7 +49731,7 @@ vOV sXI xwU aNK -dlg +oYj sMV eAT quW @@ -50011,9 +49908,9 @@ eOl shJ dsD vca -wFu +pdu umY -aDG +uze cIC trR odY @@ -50028,7 +49925,7 @@ qOz okH jFO aNK -dlg +oYj uhE eAT siW @@ -50204,13 +50101,13 @@ eOl eOl eOl iEX -aDG +uze pdu oxc -aDG +uze dhZ kFr -aDG +uze bjg kiQ bjg @@ -50222,7 +50119,7 @@ nNR ebA xtc aNK -dlg +oYj eoX eAT isn @@ -50401,7 +50298,7 @@ dsD dYN pdu oxc -aDG +uze jfr obp cCy @@ -50416,7 +50313,7 @@ tVO iAm clz aNK -dlg +oYj nvI eAT eAT @@ -50610,7 +50507,7 @@ eQL xdl mIj aNK -dlg +oYj nvI xsh rwg @@ -50786,11 +50683,11 @@ kjF jnZ bnw dsD -aDG +uze pdu oxc xmw -aDG +uze pMT xmw eNi @@ -50983,10 +50880,10 @@ dsD dIm pdu bMJ -aDG +uze obb dvF -aDG +uze kMv kfP oxc @@ -50998,7 +50895,7 @@ wim xgP oWB aNK -dlg +oYj nvI ucf lSW @@ -51192,7 +51089,7 @@ oHN iRB kPv aNK -dlg +oYj nvI ucf wcN @@ -51386,7 +51283,7 @@ qZT tMU gbt aNK -dlg +oYj nvI eZe gUB @@ -51581,7 +51478,7 @@ nRX ftM aNK oYj -dlg +oYj xwP xjZ xGF @@ -51774,7 +51671,7 @@ byY bZl hbS aNK -dlg +oYj eoX nvI nOk @@ -52339,7 +52236,7 @@ eWd mID nQR gkR -wFu +pdu mYb bHQ cri @@ -53104,16 +53001,16 @@ xxb fSv dIm rGu -aDG uze -lPI -aDG +uze +xxb +uze kST uze -aDG -aDG +uze +uze upZ -aDG +uze ujK pdu mYb @@ -53502,7 +53399,7 @@ rxu wGN nEa nnP -wsX +lhZ pdu mYb tep @@ -53915,8 +53812,8 @@ oAT kSZ kSZ tMx -tjq -tjq +cyD +cyD lzA nTl bzJ @@ -54302,8 +54199,8 @@ rBP nMY nQj dth -nlD -tjq +dNv +cyD own own stV @@ -54312,14 +54209,14 @@ own dlI jQB cJh -tjq +cyD puF tOv jdj glq jdj -tjq -tjq +cyD +cyD mOV mOV mOV @@ -54472,7 +54369,7 @@ gJj uKB ciK nnP -wsX +lhZ pdu mYb hGB @@ -54496,8 +54393,8 @@ qLQ yjr gPm dth -nlD -tjq +dNv +cyD own qTR kPs @@ -54506,19 +54403,19 @@ own jdj tyN jKU -tjq +cyD +sEA sEA -rNn coK oVo jdj -tjq -tjq -tjq -tjq -tjq -tjq -tjq +cyD +cyD +cyD +cyD +cyD +cyD +cyD iwC kSZ lft @@ -54667,7 +54564,7 @@ uKB ojm nnP mfu -wFu +pdu mYb uMq sQf @@ -54698,22 +54595,22 @@ qfo iyz own vRr -rNn +sEA cJh -rNn +sEA xjI -tjq +cyD jdj jdj jdj jdj jdj jdj -tjq -tjq -tjq -tjq -tjq +cyD +cyD +cyD +cyD +cyD pDd lft jNg @@ -54861,7 +54758,7 @@ uKB ojm nnP keD -xJr +xxb mYb jfm lcR @@ -54884,22 +54781,22 @@ dth dth qHn dth -nlD -tjq +dNv +cyD own oIG gPV fMf own lsb -tjq -rKE -rNn +cyD +sEA +sEA aka cJh lID jdj -tjq +cyD oDQ kSZ jdj @@ -55055,7 +54952,7 @@ uKB ojm nnP gMJ -aDG +uze mYb xUy mpL @@ -55078,8 +54975,8 @@ sly dth rEd dth -nlD -tjq +dNv +cyD own own caS @@ -55094,8 +54991,8 @@ jdj jdj jdj kSZ -tjq -tjq +cyD +cyD kSZ jdj uHE @@ -55272,28 +55169,28 @@ lhL oeW oeW oeW -nlD -tjq +dNv +cyD kSZ oDQ bAz vde kSZ -tjq -nlD -tjq -tjq +cyD +dNv +cyD +cyD vde fOY vte jdj -tjq -tjq -tjq -tjq +cyD +cyD +cyD +cyD oQY -rNn -rNn +sEA +sEA rgW rBw biu @@ -55466,28 +55363,28 @@ loX ujD qoX oeW -nlD -nlD -nlD -nlD +dNv +dNv +dNv +dNv bAz -nlD -nlD -nlD -nlD -nlD -nlD -nlD -nlD -nlD +dNv +dNv +dNv +dNv +dNv +dNv +dNv +dNv +dNv xmE -nlD -nlD -nlD -nlD +dNv +dNv +dNv +dNv jdj pPX -rNn +sEA rgW khQ blv @@ -55661,7 +55558,7 @@ oeW nVc oeW dRO -tjq +cyD jdj vte bAz @@ -55676,12 +55573,12 @@ jdj jdj jdj kSZ -nlD -tjq -nlD +dNv +cyD +dNv jdj lOX -rNn +sEA rgW ciW kJp @@ -55854,7 +55751,7 @@ oeW oeW oeW oeW -nlD +dNv jdj jdj jdj @@ -55862,17 +55759,17 @@ bAz jdj cyD oDQ -tjq -tjq +cyD +cyD lAI -tjq +cyD oDQ -tjq +cyD wzh wzh qXp wzh -nlD +dNv jdj ctY mak @@ -56047,19 +55944,19 @@ hCV dNv nRe wFM -nlD -nlD -tjq +dNv +dNv +cyD jdj -tjq +cyD bAz jdj -tjq cyD cyD -tjq +cyD +cyD bQO -tjq +cyD wzh wzh wzh @@ -56214,7 +56111,7 @@ vMW twI cvL cUk -kIq +xvw hvp dDx nUC @@ -56242,27 +56139,27 @@ pcK pcK pcK pcK -nlD -nlD -nlD -nlD +dNv +dNv +dNv +dNv bAz jdj -tjq -tjq -tjq -kbl +cyD +cyD +cyD +cyD bQO -tjq +cyD wzh ulS eMF eaR eUD wzh -nlD -tjq -tjq +dNv +cyD +cyD lft lft lft @@ -56442,12 +56339,12 @@ jdj jdj eBJ jdj -tjq -tjq -tjq -tjq +cyD +cyD +cyD +cyD bQO -tjq +cyD wzh tPy vTh @@ -56455,8 +56352,8 @@ ckU mha wzh dRO -tjq -kbl +cyD +cyD lft lft jNg @@ -56602,7 +56499,7 @@ bpS twI jah cHn -kIq +xvw hvp hVk dqo @@ -56639,18 +56536,18 @@ jdj bQO bQO bQO -tjq +cyD lAI -tjq +cyD wzh weh weh weh eUD wzh -nlD -tjq -tjq +dNv +cyD +cyD lft lft jNg @@ -56794,8 +56691,8 @@ twI twI twI twI -ybN -ybN +hlO +hlO xvw hvp czv @@ -56831,20 +56728,20 @@ vjJ bAz jdj lzA -tjq -tjq cyD cyD -tjq +cyD +cyD +cyD wzh tci esm tPH dBa wzh -nlD +dNv lAI -tjq +cyD lft tFU cgo @@ -56989,7 +56886,7 @@ bjw kXr twI lhx -ybN +hlO ykw hvp jBQ @@ -57025,10 +56922,10 @@ jdj bAz jdj lzA -tjq -tjq -tjq -tjq +cyD +cyD +cyD +cyD cyD wzh oxx @@ -57036,8 +56933,8 @@ esm fmm eUD wzh -nlD -tjq +dNv +cyD wne lft lft @@ -57184,7 +57081,7 @@ atV twI wqS hlO -cVd +bNR hvp vNu waj @@ -57219,22 +57116,22 @@ jdj bAz jdj wxk -tjq -tjq -tjq +cyD +cyD +cyD jdj -tjq +cyD wzh wzh wzh wzh qXp wzh -nlD +dNv jdj jdj jdj -tjq +cyD lft bph jNg @@ -57376,9 +57273,9 @@ vkl bjw ihi twI -ybN -ybN -cVd +hlO +hlO +bNR hvp hvp hvp @@ -57414,22 +57311,22 @@ bAz jdj jdj teS -tjq -tjq +cyD +cyD jdj -tjq -tjq -tjq +cyD +cyD +cyD jdj lAI -nlD +dNv kSZ -nlD +dNv jdj -tjq +cyD vde -tjq -tjq +cyD +cyD bph rUF jNg @@ -57571,8 +57468,8 @@ gjv cbS twI hzc -ybN -cVd +hlO +bNR uTr xBE iOd @@ -57601,30 +57498,30 @@ sGG ctD pcK bWH -tjq -tjq +cyD +cyD jdj bAz tUY jdj cyD -kbl -tjq +cyD +cyD jdj -tjq cyD -kbl +cyD +cyD jdj phr -nlD -nlD -nlD +dNv +dNv +dNv fnF -tjq -tjq -tjq -tjq -tjq +cyD +cyD +cyD +cyD +cyD rUF rUF psc @@ -57765,8 +57662,8 @@ wZQ wZQ wZQ hlO -ybN -cVd +hlO +bNR xzG tKm lkp @@ -57799,26 +57696,26 @@ piB piB viO jRq -nlD +dNv fnF -tjq -tjq +cyD +cyD cyD jdj -tjq -tjq -tjq +cyD +cyD +cyD jdj -tjq -nlD -tjq +cyD +dNv +cyD jdj jdj -kbl -tjq -tjq -tjq -tjq +cyD +cyD +cyD +cyD +cyD dqg rUF jNg @@ -57959,7 +57856,7 @@ hJE gvL wZQ lhx -ybN +hlO bNR uTr xrR @@ -57989,30 +57886,30 @@ kkT dtm pcK vde -tjq +cyD nmp jdj xgT -nlD +dNv jdj xgT -tjq -tjq +cyD +cyD jdj -tjq +cyD xgT cyD jdj kSZ -nlD -tjq +dNv +cyD jdj xRc -tjq -tjq -tjq -tjq -tjq +cyD +cyD +cyD +cyD +cyD dqg rUF jNg @@ -58153,8 +58050,8 @@ izy okP wZQ oZE -ybN -cVd +hlO +bNR uTr uTr uTr @@ -58187,7 +58084,7 @@ jdj jdj jdj jdj -nlD +dNv jdj jdj jdj @@ -58197,16 +58094,16 @@ jdj jdj jdj jdj -tjq -dcn -tjq +cyD +dNv +cyD jdj teS -tjq -tjq -tjq +cyD +cyD +cyD ksB -tjq +cyD dqg rUF jNg @@ -58347,8 +58244,8 @@ xvm sve wZQ qtd -ybN -cVd +hlO +bNR uTr kXy ygA @@ -58357,7 +58254,7 @@ njW hcC uTr ehT -ybN +hlO wPz byt fop @@ -58381,7 +58278,7 @@ kSZ kSZ xkf jdj -nlD +dNv nTl vde cyD @@ -58389,11 +58286,11 @@ fOY gXA jdj cyD -tjq +cyD kSZ -tjq -nlD -tjq +cyD +dNv +cyD jdj lAI jdj @@ -58541,8 +58438,8 @@ pgF izz wZQ qYe -ybN -cVd +hlO +bNR uTr uKO ygA @@ -58554,7 +58451,7 @@ byt byt byt byt -ybN +hlO qJG jBm izO @@ -58571,31 +58468,31 @@ eaB nEf xCr wIY -nlD -nlD -nlD +dNv +dNv +dNv kAa -nlD -nlD -nlD -nlD -nlD -nlD -nlD -nlD -nlD -nlD -nlD -nlD -tjq +dNv +dNv +dNv +dNv +dNv +dNv +dNv +dNv +dNv +dNv +dNv +dNv +cyD jdj -tjq -tjq -tjq -tjq -rNn -rNn -rNn +cyD +cyD +cyD +cyD +sEA +sEA +sEA rUF jNg klc @@ -58734,14 +58631,14 @@ bRC pgF oAh wZQ -ybN -ybN +hlO +hlO tot uTr ygA abL tEj -tqE +njW njW uTr byt @@ -58765,31 +58662,31 @@ gvc wzN nuL wIY -nlD +dNv phr jdj jdj -tjq -tjq -tjq +cyD +cyD +cyD jdj kSZ -tjq +cyD cyD kSZ lAI jdj cyD -nlD +dNv kSZ jdj oGE -tjq -tjq -tjq +cyD +cyD +cyD wLx mUO -rNn +sEA rUF jNg klc @@ -58929,8 +58826,8 @@ hgn dnu wZQ qLs -ybN -cVd +hlO +bNR uTr uTr uTr @@ -58939,7 +58836,7 @@ sXj njW uTr byt -ybN +hlO ugo tnA mBh @@ -58974,16 +58871,16 @@ jdj jdj jdj jdj -nlD -kWe +dNv +dkf jdj jdj jdj eXv -tjq +cyD rku mGw -rNn +sEA rUF jNg psc @@ -59123,8 +59020,8 @@ cVE xIb wZQ ehT -ybN -cVd +hlO +bNR uTr xpv jVj @@ -59153,16 +59050,16 @@ bkP ljJ dDm wIY -nlD -tjq +dNv +cyD jdj -tjq -eZM +cyD +cyD iwC -tjq +cyD jdj tvy -lMv +cyD kBR jdj fDQ @@ -59172,12 +59069,12 @@ vIe jdj jdj teS -tjq -kbl -tjq +cyD +cyD +cyD pQg jhs -rNn +sEA rUF jNg psc @@ -59347,7 +59244,7 @@ qzE fUE hJp wIY -nlD +dNv tUY jdj bWZ @@ -59362,15 +59259,15 @@ jdj mYH cyD wbu -nlD +dNv lAI jdj xRc -tjq -tjq -tjq -rNn -rNn +cyD +cyD +cyD +sEA +sEA rUF rUF psc @@ -59511,7 +59408,7 @@ nTC nTC nTC nTC -ybN +hlO bNR uTr uTr @@ -59542,28 +59439,28 @@ woe cdx wIY dRO -kbl +cyD jdj cta rjP qBJ -tjq +cyD jdj sYf bVS sZk jdj fNJ -tjq +cyD jdj dRO -nlD +dNv uEN -nlD -nlD -nlD -nlD -rNn +dNv +dNv +dNv +dNv +sEA bph rUF jNg @@ -59706,12 +59603,12 @@ djp nTC nTC rUV -cVd +bNR +byt byt byt byt byt -lbc rdF byt byt @@ -59735,13 +59632,13 @@ fLD rpb bEg wIY -nlD +dNv aRg jdj iwC mmA iwC -eZM +cyD jdj veF aYQ @@ -59750,13 +59647,13 @@ jdj qOl xCy jdj -nlD +dNv dkf jdj wne phr -tjq -tjq +cyD +cyD lft bph xRj @@ -59900,14 +59797,14 @@ lgi nTC eYO jah -cVd +bNR tkR dBP ehT abL vOz rUV -ybN +hlO byt vEl ugo @@ -59929,8 +59826,8 @@ rCH jDn piy wIY -nlD -kbl +dNv +cyD jdj jdj jdj @@ -60093,8 +59990,8 @@ eaK gCd nTC nTC -ybN -cVd +hlO +bNR aLV aLV aLV @@ -60123,24 +60020,24 @@ wIY wIY wIY wIY -nlD +dNv eFX -tjq +cyD jdj acq ssZ -tjq -tjq +cyD +cyD dvz kSZ pop -tjq +cyD dJe jdj -tjq -nlD -kbl -tjq +cyD +dNv +cyD +cyD cyD ssZ mhR @@ -60295,11 +60192,11 @@ kYE oZB aLV rZy -ybN +hlO byt xFb hcC -pNr +kXy ehT hlO xZS @@ -60318,25 +60215,25 @@ yfy jPM jdj rlA -nlD -dcn +dNv +dNv kNs -nlD -dcn -nlD -nlD -nlD -dcn -nlD -nlD -nlD +dNv +dNv +dNv +dNv +dNv +dNv +dNv +dNv +dNv kNs -nlD -dcn -nlD -nlD -nlD -tjq +dNv +dNv +dNv +dNv +dNv +cyD aKv kRj jNg @@ -60492,7 +60389,7 @@ byt byt byt byt -lbc +byt byt byt byt @@ -60505,33 +60402,33 @@ kgu jRj gKk tjQ -gUz +tjQ tjQ tjQ jRq bAb jdj -nlD -tjq -tjq +dNv +cyD +cyD wCb -tjq -nlD -tjq -kbl -tjq -tjq -dcn -tjq -tjq +cyD +dNv +cyD +cyD +cyD +cyD +dNv +cyD +cyD wCb -tjq +cyD kSZ kSZ aMc lzA -tjq -tjq +cyD +cyD kRj jNg jNg @@ -60683,7 +60580,7 @@ bLT qXL aLV byt -ybN +hlO jYs jYs jYs @@ -60700,14 +60597,14 @@ fnO wWq vde gJD -tjq -tjq -nlD +cyD +cyD +dNv mRK jdj -dcn -tjq -tjq +dNv +cyD +cyD jdj jdj wni @@ -60870,14 +60767,14 @@ lcW nTC eYO jah -lXu +sMo aLV aLV aLV aLV aLV byt -ybN +hlO jYs dXG eSO @@ -60895,21 +60792,21 @@ vRx wWq wWq wWq -nRY -dcn -nlD +teS +dNv +dNv fnF -nlD -tjq -tjq +dNv +cyD +cyD jdj -tjq +cyD wFM cex -kbl +cyD cyD rUP -nlD +dNv dfS qwz qwz @@ -61068,7 +60965,7 @@ sMo tQS fZF byt -lbc +byt byt byt byt @@ -61089,21 +60986,21 @@ brF iDg iDg wWq -tjq -tjq +cyD +cyD uEM jdj -tjq -tjq +cyD +cyD cyD jdj cyD -nlD -nlD -nlD -nlD -dcn -nlD +dNv +dNv +dNv +dNv +dNv +dNv dfS qwz pcl @@ -61257,12 +61154,12 @@ nTC ecK nTC nTC -ybN +hlO sMo uTr ehT qXW -ybN +hlO xpH xpH gMn @@ -61284,19 +61181,19 @@ iDg iDg wWq tve -kbl +cyD egZ jdj -tjq +cyD tUY -tjq +cyD jdj kSZ -tjq +cyD oni lzA bIg -tjq +cyD kSZ dfS qwz diff --git a/maps/triumph/levels/flagship.dmm b/maps/triumph/levels/flagship.dmm index 487e4c446f3d..b0e44847bd9c 100644 --- a/maps/triumph/levels/flagship.dmm +++ b/maps/triumph/levels/flagship.dmm @@ -585,7 +585,8 @@ /obj/machinery/vending/cigarette, /obj/machinery/light{ dir = 8; - use_power = 0 + use_power = 0; + old_wall = 1 }, /turf/simulated/shuttle/floor/darkred, /area/shuttle/escape) @@ -1989,7 +1990,9 @@ }, /area/centcom/medical) "gf" = ( -/obj/machinery/vending/cigarette, +/obj/machinery/vending/mre{ + emagged = 1 + }, /turf/unsimulated/floor/wood, /area/centcom/restaurant) "gh" = ( @@ -2636,6 +2639,14 @@ icon_state = "white" }, /area/centcom/control) +"in" = ( +/obj/machinery/light{ + dir = 4; + use_power = 0; + old_wall = 1 + }, +/turf/simulated/shuttle/floor/white, +/area/shuttle/escape) "ip" = ( /obj/machinery/porta_turret/crescent{ density = 1 @@ -4699,6 +4710,12 @@ }, /turf/unsimulated/floor/steel, /area/centcom/control) +"pa" = ( +/obj/structure/handrail{ + dir = 4 + }, +/turf/simulated/shuttle/floor/white, +/area/shuttle/escape) "pb" = ( /obj/machinery/status_display{ pixel_y = 29 @@ -9707,7 +9724,8 @@ }, /obj/machinery/light{ dir = 4; - use_power = 0 + use_power = 0; + old_wall = 1 }, /turf/simulated/shuttle/floor/darkred, /area/shuttle/escape) @@ -9907,6 +9925,10 @@ icon_state = "white" }, /area/centcom/medical) +"Gg" = ( +/obj/structure/handrail, +/turf/simulated/shuttle/floor/black, +/area/shuttle/escape) "Gh" = ( /obj/machinery/mecha_part_fabricator, /turf/unsimulated/floor/steel, @@ -10852,6 +10874,12 @@ /obj/structure/table/woodentable, /turf/unsimulated/floor/wood, /area/centcom/restaurant) +"Jg" = ( +/obj/structure/handrail{ + dir = 1 + }, +/turf/simulated/shuttle/floor/black, +/area/shuttle/escape) "Ji" = ( /obj/effect/floor_decal/corner/blue{ dir = 6 @@ -12167,7 +12195,8 @@ /obj/machinery/vending/medical, /obj/machinery/light{ dir = 8; - use_power = 0 + use_power = 0; + old_wall = 1 }, /turf/simulated/shuttle/floor, /area/shuttle/escape) @@ -12605,11 +12634,16 @@ }, /turf/unsimulated/floor/steel, /area/centcom/evac) +"Ox" = ( +/obj/structure/handrail, +/turf/simulated/shuttle/floor, +/area/shuttle/escape) "Oz" = ( /obj/machinery/vending/fitness, /obj/machinery/light{ dir = 8; - use_power = 0 + use_power = 0; + old_wall = 1 }, /turf/simulated/shuttle/floor/darkred, /area/shuttle/escape) @@ -13569,7 +13603,10 @@ }, /area/centcom/security) "Rx" = ( -/obj/machinery/light, +/obj/machinery/light{ + old_wall = 1; + use_power = 0 + }, /turf/simulated/shuttle/floor/black, /area/shuttle/escape) "Ry" = ( @@ -14357,7 +14394,8 @@ "Ui" = ( /obj/machinery/light{ dir = 8; - use_power = 0 + use_power = 0; + old_wall = 1 }, /turf/simulated/shuttle/floor/white, /area/shuttle/escape) @@ -15216,7 +15254,8 @@ }, /obj/machinery/light{ dir = 4; - use_power = 0 + use_power = 0; + old_wall = 1 }, /turf/simulated/shuttle/floor, /area/shuttle/escape) @@ -29440,7 +29479,7 @@ jQ wG Pn yz -Pn +in wG jQ jQ @@ -29823,15 +29862,15 @@ AF AF AF jQ -CG +Gg yz Ui +pa yz -yz -yz +pa Ui yz -CG +Jg jQ AF AF @@ -30987,7 +31026,7 @@ AF AF AF jQ -CG +Gg yz Pn yz @@ -30995,7 +31034,7 @@ yz yz yz Pn -CG +Jg jQ AF AF @@ -31379,8 +31418,8 @@ Ne AA OZ jQ -CG -CG +Gg +Jg jQ ze lM @@ -31763,7 +31802,7 @@ AF AF AF jQ -Sp +Ox Sp dx mE @@ -31961,8 +32000,8 @@ mA Sp dx jQ -CG -CG +Gg +Jg jQ nb lM @@ -32349,8 +32388,8 @@ Sp Sp Sp jQ -CG -CG +Gg +Jg jQ lM lM diff --git a/tgui/packages/common/README.md b/tgui/packages/common/README.md new file mode 100644 index 000000000000..a2d3121989ef --- /dev/null +++ b/tgui/packages/common/README.md @@ -0,0 +1,3 @@ +# Common + +This is explicitly only for functions and other helpers. diff --git a/tgui/packages/tgui-panel/ping/PingIndicator.js b/tgui/packages/tgui-panel/ping/PingIndicator.tsx similarity index 100% rename from tgui/packages/tgui-panel/ping/PingIndicator.js rename to tgui/packages/tgui-panel/ping/PingIndicator.tsx diff --git a/tgui/packages/tgui-panel/ping/constants.js b/tgui/packages/tgui-panel/ping/constants.ts similarity index 100% rename from tgui/packages/tgui-panel/ping/constants.js rename to tgui/packages/tgui-panel/ping/constants.ts diff --git a/tgui/packages/tgui/assets.js b/tgui/packages/tgui/assets.ts similarity index 100% rename from tgui/packages/tgui/assets.js rename to tgui/packages/tgui/assets.ts diff --git a/tgui/packages/tgui/components/Sprite.tsx b/tgui/packages/tgui/components/Sprite.tsx index 465e968606fe..9aab94cefe75 100644 --- a/tgui/packages/tgui/components/Sprite.tsx +++ b/tgui/packages/tgui/components/Sprite.tsx @@ -25,3 +25,5 @@ export const Sprite = (props: SpriteProps) => { ])} /> ); }; + +// todo: this is all kind of terrible; we need a way to autodetect sizeKeys too so it's more friendly to users. diff --git a/tgui/packages/tgui/interfaces/JoinMenu.tsx b/tgui/packages/tgui/interfaces/JoinMenu.tsx index 007bdbbe9ab6..efba4d6385f3 100644 --- a/tgui/packages/tgui/interfaces/JoinMenu.tsx +++ b/tgui/packages/tgui/interfaces/JoinMenu.tsx @@ -58,17 +58,27 @@ export const JoinMenu = (props, context) => {
- Security Level: {data.security_level} - {!!data.evacuated && ( -