diff --git a/.github/add_labels.py b/.github/add_labels.py
index 3e903c362d82..764f90df0c50 100644
--- a/.github/add_labels.py
+++ b/.github/add_labels.py
@@ -1,19 +1,19 @@
import os, re
-from github import Github
+from github import Github, GithubException
# Format - Key: Array[Label, [StringsToIgnore]]
changelogToPrefix = {
- 'fix': ["Fix", ["fixed a few things"]],
- 'qol': ["Quality of Life", ["made something easier to use"]],
- 'add': ["Feature", ["Added new mechanics or gameplay changes", "Added more things"]],
- 'del': ["Removal", ["Removed old things"]],
- 'spellcheck': ["Grammar and Formatting", ["fixed a few typos"]],
- 'balance': ["Balance", ["rebalanced something"]],
- 'code': ["Code Improvement", ["changed some code"]],
- 'refactor': ["Refactor", ["refactored some code"]],
- 'config': ["Config", ["changed some config setting"]],
- 'admin': ["Admin", ["messed with admin stuff"]],
- 'server': ["Server", ["something server ops should know"]],
+ 'fix': ["Fix", ["fixed a few things"]],
+ 'qol': ["Quality of Life", ["made something easier to use"]],
+ 'add': ["Feature", ["Added new mechanics or gameplay changes", "Added more things"]],
+ 'del': ["Removal", ["Removed old things"]],
+ 'spellcheck': ["Grammar and Formatting", ["fixed a few typos"]],
+ 'balance': ["Balance", ["rebalanced something"]],
+ 'code': ["Code Improvement", ["changed some code"]],
+ 'refactor': ["Refactor", ["refactored some code"]],
+ 'config': ["Config", ["changed some config setting"]],
+ 'admin': ["Admin", ["messed with admin stuff"]],
+ 'server': ["Server", ["something server ops should know"]],
'soundadd': ["Sound", ["added a new sound thingy"]],
'sounddel': ["Sound", ["removed an old sound thingy"]],
'imageadd': ["Sprites", ["added some icons and images"]],
@@ -24,78 +24,96 @@
}
fileToPrefix = {
- 'wav': 'Sound',
- 'ogg': 'Sound',
+ 'wav': 'Sound',
+ 'ogg': 'Sound',
'mp3': 'Sound', ## Can't believe they forgot about the best sound format
- 'dmm': 'Mapping',
+ 'dmm': 'Mapping',
- 'js': 'UI',
- 'tsx': 'UI',
- 'ts': 'UI',
- 'jsx': 'UI',
- 'scss': 'UI',
+ 'js': 'UI',
+ 'tsx': 'UI',
+ 'ts': 'UI',
+ 'jsx': 'UI',
+ 'scss': 'UI',
- 'dmi': "Sprites",
+ 'dmi': "Sprites",
}
githubLabel = "Github"
+missingLogLabel = "Missing Changelog"
def get_labels(pr):
- labels = {}
-
- files = pr.get_files()
- for file in files:
- prefix = file.filename.split(".")[-1]
- if file.filename.startswith(".github"):
- labels[githubLabel] = True
- if not prefix in fileToPrefix:
- continue
- labels[fileToPrefix[prefix]] = True
-
- changelog_match = re.search(r"🆑(.*)/🆑", pr.body, re.S | re.M)
- if changelog_match is None:
- changelog_match = re.search(r":cl:(.*)/:cl:", pr.body, re.S | re.M)
- if changelog_match is None:
- return labels
- lines = changelog_match.group(1).split('\n')
- for line in lines:
- line = line.strip()
- if not line:
- continue
-
- contentSplit = line.split(":")
-
- key = contentSplit.pop(0).strip()
- content = ":".join(contentSplit).strip()
-
- if not key in changelogToPrefix:
- continue
-
- if content in changelogToPrefix[key][1]:
- continue
-
- labels[changelogToPrefix[key][0]] = True
-
- return list(labels)
+ labels = {}
+ failed = False
+
+ files = pr.get_files()
+ for file in files:
+ prefix = file.filename.split(".")[-1]
+ if file.filename.startswith(".github"):
+ labels[githubLabel] = True
+ if not prefix in fileToPrefix:
+ continue
+ labels[fileToPrefix[prefix]] = True
+
+ changelog_match = re.search(r"🆑(.*)/🆑", pr.body, re.S | re.M)
+ if changelog_match is None:
+ changelog_match = re.search(r":cl:(.*)/:cl:", pr.body, re.S | re.M)
+ if changelog_match is None:
+ print("::warning ::No changelog detected.")
+ labels[missingLogLabel] = True
+ return labels, False
+
+ lines = changelog_match.group(1).split('\n')
+ failed = len(lines) <= 2 # Make sure its not an empty changelog
+ if failed:
+ print("::error ::Empty changelog.")
+
+ for line in lines[1:-1]: # Skip first line with authors and last
+ line = line.strip()
+ if not line:
+ continue
+
+ contentSplit = line.split(":")
+
+ key = contentSplit.pop(0).strip()
+ content = ":".join(contentSplit).strip()
+
+ if not key in changelogToPrefix: # Some key that we didn't expect
+ print(f"::error ::Invalid changelog entry: {line}")
+ failed = True
+ continue
+
+ if content in changelogToPrefix[key][1]: # They left the template entry in
+ print(f"::error ::Invalid changelog entry: {line}")
+ failed = True
+ continue
+
+ labels[changelogToPrefix[key][0]] = True
+
+ return list(labels), failed
def main():
- g = Github(os.environ["TOKEN"])
- repo = g.get_repo(os.environ['REPO'])
+ g = Github(os.environ["TOKEN"])
+ repo = g.get_repo(os.environ['REPO'])
- pr = repo.get_pull(int(os.environ["PR_NUMBER"]))
- if not pr:
- print("Not a PR.")
- return
+ pr = repo.get_pull(int(os.environ["PR_NUMBER"]))
+ if not pr:
+ print("::warning ::Not a PR.")
+ return
- labels = get_labels(pr)
+ labels, failed = get_labels(pr)
- if labels is None: # no labels to add
- print("No labels to add.")
- return
+ if not missingLogLabel in labels:
+ try:
+ pr.remove_from_labels(missingLogLabel)
+ except GithubException as e:
+ if e.status == 404:
+ pass # 404 if we try to remove a label that isn't set
- for label in labels:
- pr.add_to_labels(label)
+ for label in labels:
+ pr.add_to_labels(label)
+ if failed:
+ exit(1)
if __name__ == '__main__':
- main()
+ main()
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
index 8a688f207f11..cdf7ce11784e 100644
--- a/.github/workflows/labeler.yml
+++ b/.github/workflows/labeler.yml
@@ -1,7 +1,7 @@
-name: Labeling
+name: Labeling and Verification
on:
pull_request_target:
- types: [opened]
+ types: [opened, edited]
jobs:
label:
runs-on: ubuntu-latest
@@ -13,7 +13,7 @@ jobs:
run: |
unset SECRET_EXISTS
if [ -n "$ENABLER_SECRET" ]; then SECRET_EXISTS=true ; fi
- echo "::set-output name=ACTIONS_ENABLED::$SECRET_EXISTS"
+ echo "ACTIONS_ENABLED=$SECRET_EXISTS" >> $GITHUB_OUTPUT
- name: Get The Script
if: steps.value_holder.outputs.ACTIONS_ENABLED
run: |
@@ -29,7 +29,7 @@ jobs:
python -m pip install --upgrade pip
python -m pip install pygithub
sudo apt-get install dos2unix
- - name: Add Labels
+ - name: Add and verify labels
if: steps.value_holder.outputs.ACTIONS_ENABLED
run: |
python add_labels.py
diff --git a/code/__DEFINES/ARES.dm b/code/__DEFINES/ARES.dm
index 7eee073aca51..55aa68f97309 100644
--- a/code/__DEFINES/ARES.dm
+++ b/code/__DEFINES/ARES.dm
@@ -15,7 +15,7 @@
/// High Command, can read the deletion log.
#define ARES_ACCESS_HIGH 9
#define ARES_ACCESS_WY_COMMAND 10
-/// Debugging. Allows me to view everything without using a high command rank. Unlikely to stay in a full merge.
+/// Debugging. Allows me to view everything without using a high command rank.
#define ARES_ACCESS_DEBUG 11
#define ARES_RECORD_ANNOUNCE "Announcement Record"
@@ -78,6 +78,7 @@
/// Cooldowns
#define COOLDOWN_ARES_SENSOR 60 SECONDS
#define COOLDOWN_ARES_ACCESS_CONTROL 20 SECONDS
+#define COOLDOWN_ARES_VENT 60 SECONDS
/// Time until someone can respawn as Working Joe
#define JOE_JOIN_DEAD_TIME (15 MINUTES)
diff --git a/code/__DEFINES/__game.dm b/code/__DEFINES/__game.dm
index 6a9e9f1d4623..6617c5aafcee 100644
--- a/code/__DEFINES/__game.dm
+++ b/code/__DEFINES/__game.dm
@@ -78,6 +78,8 @@
#define SEE_INVISIBLE_LEVEL_TWO 45 //Used by some other stuff in code. It's really poorly organized.
#define INVISIBILITY_LEVEL_TWO 45 //Used by some other stuff in code. It's really poorly organized.
+#define HIDE_INVISIBLE_OBSERVER 59 // define for when we want to hide all observer mobs.
+
#define INVISIBILITY_OBSERVER 60
#define SEE_INVISIBLE_OBSERVER 60
diff --git a/code/__DEFINES/_math.dm b/code/__DEFINES/_math.dm
index d7c068237987..ec225515650b 100644
--- a/code/__DEFINES/_math.dm
+++ b/code/__DEFINES/_math.dm
@@ -17,7 +17,7 @@
#define ROUND_UP(x) ( -round(-(x)))
// round() acts like floor(x, 1) by default but can't handle other values
-#define FLOOR(x, y) ( round((x) / (y)) * (y) )
+#define FLOOR(x, y) ( floor((x) / (y)) * (y) )
// Real modulus that handles decimals
#define MODULUS(x, y) ( (x) - (y) * round((x) / (y)) )
diff --git a/code/__DEFINES/admin.dm b/code/__DEFINES/admin.dm
index 31103fee93ee..3137088d1c90 100644
--- a/code/__DEFINES/admin.dm
+++ b/code/__DEFINES/admin.dm
@@ -17,12 +17,10 @@
#define NOTE_ADMIN 1
///This note is used by staff for positive record keeping.
#define NOTE_MERIT 2
-///These notes are used by respective whitelist councils for record keeping.
-#define NOTE_COMMANDER 3
-#define NOTE_SYNTHETIC 4
-#define NOTE_YAUTJA 5
+///These notes are automatically applied by the Whitelist Panel.
+#define NOTE_WHITELIST 3
///Note categories in text form, in order of their numerical #defines.
-GLOBAL_LIST_INIT(note_categories, list("Admin", "Merit", "Commanding Officer", "Synthetic", "Yautja"))
+GLOBAL_LIST_INIT(note_categories, list("Admin", "Merit", "Whitelist"))
#define ADMIN_FLW(user) "(FLW)"
#define ADMIN_PP(user) "(PP)"
diff --git a/code/__DEFINES/dcs/signals/atom/signals_item.dm b/code/__DEFINES/dcs/signals/atom/signals_item.dm
index f038d4c5dbce..5ba79960657b 100644
--- a/code/__DEFINES/dcs/signals/atom/signals_item.dm
+++ b/code/__DEFINES/dcs/signals/atom/signals_item.dm
@@ -29,8 +29,10 @@
#define COMSIG_ITEM_PICKUP "item_pickup"
-///from /obj/item/device/camera/broadcasting/attack_self
+///from /obj/item/device/camera/broadcasting
#define COMSIG_BROADCAST_GO_LIVE "broadcast_live"
+#define COMSIG_BROADCAST_HEAR_TALK "broadcast_hear_talk"
+#define COMSIG_BROADCAST_SEE_EMOTE "broadcast_see_emote"
/// from /obj/item/proc/mob_can_equip
#define COMSIG_ITEM_ATTEMPTING_EQUIP "item_attempting_equip"
diff --git a/code/__DEFINES/dcs/signals/atom/signals_obj.dm b/code/__DEFINES/dcs/signals/atom/signals_obj.dm
index ed27c26b2115..c850b2a52e03 100644
--- a/code/__DEFINES/dcs/signals/atom/signals_obj.dm
+++ b/code/__DEFINES/dcs/signals/atom/signals_obj.dm
@@ -30,8 +30,16 @@
#define COMSIG_TENT_COLLAPSING "tent_collapsing"
/// from /obj/proc/afterbuckle()
-#define COSMIG_OBJ_AFTER_BUCKLE "signal_obj_after_buckle"
+#define COMSIG_OBJ_AFTER_BUCKLE "signal_obj_after_buckle"
+/// from /datum/cm_objective/retrieve_data/disk/process()
+#define COMSIG_INTEL_DISK_LOST_POWER "intel_disk_lost_power"
+
+/// from /datum/cm_objective/retrieve_data/disk/complete()
+#define COMSIG_INTEL_DISK_COMPLETED "intel_disk_completed"
+
+/// from /obj/vehicle/multitile/arc/toggle_antenna()
+#define COMSIG_ARC_ANTENNA_TOGGLED "arc_antenna_toggled"
/// from /obj/structure/machinery/cryopod/go_out()
#define COMSIG_CRYOPOD_GO_OUT "cryopod_go_out"
diff --git a/code/__DEFINES/dcs/signals/signals_global.dm b/code/__DEFINES/dcs/signals/signals_global.dm
index 378948347a81..306f37deb8cb 100644
--- a/code/__DEFINES/dcs/signals/signals_global.dm
+++ b/code/__DEFINES/dcs/signals/signals_global.dm
@@ -69,9 +69,15 @@
/// From /proc/biohazard_lockdown()
#define COMSIG_GLOB_RESEARCH_LOCKDOWN "!research_lockdown_closed"
#define COMSIG_GLOB_RESEARCH_LIFT "!research_lockdown_opened"
+/// From /proc/aicore_lockdown()
+#define COMSIG_GLOB_AICORE_LOCKDOWN "!aicore_lockdown_closed"
+#define COMSIG_GLOB_AICORE_LIFT "!aicore_lockdown_opened"
/// From /obj/structure/machinery/power/reactor/proc/set_overloading() : (set_overloading)
#define COMSIG_GLOB_GENERATOR_SET_OVERLOADING "!generator_set_overloading"
#define COMSIG_GLOB_HIJACK_IMPACTED "!hijack_impacted"
#define COMSIG_GLOB_HIJACK_LANDED "!hijack_landed"
+
+/// From /datum/controller/subsystem/hijack/fire()
+#define COMSIG_GLOB_FUEL_PUMP_UPDATE "!fuel_pump_update"
diff --git a/code/__DEFINES/equipment.dm b/code/__DEFINES/equipment.dm
index 375dd0db540d..7ed2658bba21 100644
--- a/code/__DEFINES/equipment.dm
+++ b/code/__DEFINES/equipment.dm
@@ -44,6 +44,8 @@
#define USES_HEARING (1<<17)
/// Should we use the initial icon for display? Mostly used by overlay only objects
#define HTML_USE_INITAL_ICON (1<<18)
+// Whether or not the object sees emotes
+#define USES_SEEING (1<<19)
//==========================================================================================
@@ -82,6 +84,10 @@
#define ANIMATED_SURGICAL_TOOL (1<<12)
/// Has heat source but isn't 'on fire' and thus can be stored
#define IGNITING_ITEM (1<<13)
+/// Overrides NODROP in some cases (stripping)
+#define FORCEDROP_CONDITIONAL (1<<14)
+/// Overrides smartgunner not being able to wear backpacks
+#define SMARTGUNNER_BACKPACK_OVERRIDE (1<<15)
//==========================================================================================
diff --git a/code/__DEFINES/job.dm b/code/__DEFINES/job.dm
index 1b2907cf57ce..f869357efd1b 100644
--- a/code/__DEFINES/job.dm
+++ b/code/__DEFINES/job.dm
@@ -206,6 +206,7 @@ GLOBAL_LIST_INIT(job_command_roles, JOB_COMMAND_ROLES_LIST)
//-------- WY Goons --------//
#define JOB_WY_GOON "WY Corporate Security"
+#define JOB_WY_GOON_TECH "WY Corporate Security Technician"
#define JOB_WY_GOON_LEAD "WY Corporate Security Lead"
#define JOB_WY_GOON_RESEARCHER "WY Research Consultant"
diff --git a/code/__DEFINES/layers.dm b/code/__DEFINES/layers.dm
index 63e79cdf676d..ee958d87f580 100644
--- a/code/__DEFINES/layers.dm
+++ b/code/__DEFINES/layers.dm
@@ -11,6 +11,9 @@
//#define AREA_LAYER 1
+#define DISPLACEMENT_PLATE_RENDER_LAYER 1
+#define DISPLACEMENT_PLATE_RENDER_TARGET "*DISPLACEMENT_PLATE_RENDER_TARGET"
+
#define UNDER_TURF_LAYER 1.99
#define TURF_LAYER 2
diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm
index e2bd868f9a80..dbd8dbe7ce41 100644
--- a/code/__DEFINES/mobs.dm
+++ b/code/__DEFINES/mobs.dm
@@ -120,6 +120,7 @@
#define CANDAZE (1<<18)
#define CANSLOW (1<<19)
#define NO_PERMANENT_DAMAGE (1<<20)
+#define CORRUPTED_ALLY (1<<21)
// =============================
// hive types
diff --git a/code/__DEFINES/strippable.dm b/code/__DEFINES/strippable.dm
new file mode 100644
index 000000000000..f62c4d6c1b76
--- /dev/null
+++ b/code/__DEFINES/strippable.dm
@@ -0,0 +1,30 @@
+// All of these must be matched in StripMenu.js.
+#define STRIPPABLE_ITEM_HEAD "head"
+#define STRIPPABLE_ITEM_BACK "back"
+#define STRIPPABLE_ITEM_MASK "wear_mask"
+#define STRIPPABLE_ITEM_EYES "glasses"
+#define STRIPPABLE_ITEM_L_EAR "wear_l_ear"
+#define STRIPPABLE_ITEM_R_EAR "wear_r_ear"
+#define STRIPPABLE_ITEM_JUMPSUIT "w_uniform"
+#define STRIPPABLE_ITEM_SUIT "wear_suit"
+#define STRIPPABLE_ITEM_GLOVES "gloves"
+#define STRIPPABLE_ITEM_FEET "shoes"
+#define STRIPPABLE_ITEM_SUIT_STORAGE "j_store"
+#define STRIPPABLE_ITEM_ID "id"
+#define STRIPPABLE_ITEM_BELT "belt"
+#define STRIPPABLE_ITEM_LPOCKET "l_store"
+#define STRIPPABLE_ITEM_RPOCKET "r_store"
+#define STRIPPABLE_ITEM_LHAND "l_hand"
+#define STRIPPABLE_ITEM_RHAND "r_hand"
+#define STRIPPABLE_ITEM_HANDCUFFS "handcuffs"
+#define STRIPPABLE_ITEM_LEGCUFFS "legcuffs"
+
+
+/// This slot is not obscured.
+#define STRIPPABLE_OBSCURING_NONE 0
+
+/// This slot is completely obscured, and cannot be accessed.
+#define STRIPPABLE_OBSCURING_COMPLETELY 1
+
+/// This slot can't be seen, but can be accessed.
+#define STRIPPABLE_OBSCURING_HIDDEN 2
diff --git a/code/__DEFINES/vehicle.dm b/code/__DEFINES/vehicle.dm
index 8a1617229926..5eb6a824d8ac 100644
--- a/code/__DEFINES/vehicle.dm
+++ b/code/__DEFINES/vehicle.dm
@@ -7,7 +7,7 @@
#define HDPT_TURRET "turret"
#define HDPT_SPECIAL "special" //special pre-installed hardpoints with unique behaviour
-#define HDPT_LAYER_WHEELS 1
+#define HDPT_LAYER_WHEELS 0.01 // so it appears below xenomorphs and other mobs
#define HDPT_LAYER_SUPPORT 2
#define HDPT_LAYER_ARMOR 3
#define HDPT_LAYER_TURRET 4
diff --git a/code/__HELPERS/#maths.dm b/code/__HELPERS/#maths.dm
index f8a9292d3806..a9b7a527d6cf 100644
--- a/code/__HELPERS/#maths.dm
+++ b/code/__HELPERS/#maths.dm
@@ -18,7 +18,6 @@ GLOBAL_LIST_INIT(sqrtTable, list(1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 4,
#define Csc(x) (1 / sin(x))
#define Default(a, b) ((a) ? (a) : (b))
-#define Floor(x) (round(x))
// Greatest Common Divisor - Euclid's algorithm
#define Gcd(a, b) ((b) ? Gcd((b), (a) % (b)) : (a))
@@ -26,7 +25,7 @@ GLOBAL_LIST_INIT(sqrtTable, list(1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 4,
#define Inverse(x) (1 / (x))
#define IsEven(x) ((x) % 2 == 0)
-#define IsInteger(x) (Floor(x) == (x))
+#define IsInteger(x) (floor(x) == (x))
#define IsOdd(x) (!IsEven(x))
#define IsMultiple(x, y) ((x) % (y) == 0)
diff --git a/code/__HELPERS/_lists.dm b/code/__HELPERS/_lists.dm
index fe15e6d84c79..dd92b9be1295 100644
--- a/code/__HELPERS/_lists.dm
+++ b/code/__HELPERS/_lists.dm
@@ -176,3 +176,4 @@
for(var/i in 1 to inserted_list.len - 1)
inserted_list.Swap(i, rand(i, inserted_list.len))
+
diff --git a/code/__HELPERS/_time.dm b/code/__HELPERS/_time.dm
index 733ca659501b..0831ab50d6e0 100644
--- a/code/__HELPERS/_time.dm
+++ b/code/__HELPERS/_time.dm
@@ -91,21 +91,21 @@ GLOBAL_VAR_INIT(rollovercheck_last_timeofday, 0)
return "right now"
if(second < 60)
return "[second] second[(second != 1)? "s":""]"
- var/minute = Floor(second / 60)
+ var/minute = floor(second / 60)
second = FLOOR(MODULUS(second, 60), round_seconds_to)
var/secondT
if(second)
secondT = " and [second] second[(second != 1)? "s":""]"
if(minute < 60)
return "[minute] minute[(minute != 1)? "s":""][secondT]"
- var/hour = Floor(minute / 60)
+ var/hour = floor(minute / 60)
minute = MODULUS(minute, 60)
var/minuteT
if(minute)
minuteT = " and [minute] minute[(minute != 1)? "s":""]"
if(hour < 24)
return "[hour] hour[(hour != 1)? "s":""][minuteT][secondT]"
- var/day = Floor(hour / 24)
+ var/day = floor(hour / 24)
hour = MODULUS(hour, 24)
var/hourT
if(hour)
diff --git a/code/__HELPERS/lists.dm b/code/__HELPERS/lists.dm
index 9a8528aabcc3..a1b38b48f754 100644
--- a/code/__HELPERS/lists.dm
+++ b/code/__HELPERS/lists.dm
@@ -597,7 +597,7 @@
if(L.len <= 1)
return L
- var/middle = Floor(L.len / 2)
+ var/middle = floor(L.len / 2)
var/list/left = custom_mergesort(L.Copy(1, middle + 1))
var/list/right = custom_mergesort(L.Copy(middle + 1))
var/list/result = list()
diff --git a/code/__HELPERS/logging.dm b/code/__HELPERS/logging.dm
index 59e4c7710992..1e72f51a8d60 100644
--- a/code/__HELPERS/logging.dm
+++ b/code/__HELPERS/logging.dm
@@ -125,11 +125,11 @@ GLOBAL_VAR_INIT(log_end, world.system_type == UNIX ? ascii2text(13) : "")
GLOB.STUI.admin.Add("\[[time]]OVERWATCH: [text]")
GLOB.STUI.processing |= STUI_LOG_ADMIN
-/proc/log_idmod(obj/item/card/id/target_id, msg)
+/proc/log_idmod(obj/item/card/id/target_id, msg, changer)
var/time = time_stamp()
if (CONFIG_GET(flag/log_idmod))
- WRITE_LOG(GLOB.world_game_log, "ID MOD: [msg]")
- LOG_REDIS("idmod", "\[[time]\] [msg]")
+ WRITE_LOG(GLOB.world_game_log, "ID MOD: ([changer]) [msg]")
+ LOG_REDIS("idmod", "\[[time]\] ([changer]) [msg]")
target_id.modification_log += "\[[time]]: [msg]"
/proc/log_vote(text)
diff --git a/code/_macros.dm b/code/_macros.dm
index ec4f559f0bfc..075d098e3d50 100644
--- a/code/_macros.dm
+++ b/code/_macros.dm
@@ -67,6 +67,11 @@
#define LAZYREMOVEASSOC(L, K, V) if(L) { if(L[K]) { L[K] -= V; if(!length(L[K])) L -= K; } if(!length(L)) L = null; }
///Accesses an associative list, returns null if nothing is found
#define LAZYACCESSASSOC(L, I, K) L ? L[I] ? L[I][K] ? L[I][K] : null : null : null
+///Performs an insertion on the given lazy list with the given key and value. If the value already exists, a new one will not be made.
+#define LAZYORASSOCLIST(lazy_list, key, value) \
+ LAZYINITLIST(lazy_list); \
+ LAZYINITLIST(lazy_list[key]); \
+ lazy_list[key] |= value;
// Insert an object A into a sorted list using cmp_proc (/code/_helpers/cmp.dm) for comparison.
#define ADD_SORTED(list, A, cmp_proc) if(!list.len) {list.Add(A)} else {list.Insert(FindElementIndex(A, list, cmp_proc), A)}
diff --git a/code/_onclick/click_hold.dm b/code/_onclick/click_hold.dm
index 2a766580e366..41e2be147d85 100644
--- a/code/_onclick/click_hold.dm
+++ b/code/_onclick/click_hold.dm
@@ -97,7 +97,6 @@
/client/MouseDrop(datum/src_object, datum/over_object, src_location, over_location, src_control, over_control, params)
. = ..()
-
if(over_object)
SEND_SIGNAL(over_object, COMSIG_ATOM_DROPPED_ON, src_object, src)
diff --git a/code/_onclick/drag_drop.dm b/code/_onclick/drag_drop.dm
index fff5e9200de7..4dcc0d646816 100644
--- a/code/_onclick/drag_drop.dm
+++ b/code/_onclick/drag_drop.dm
@@ -7,6 +7,7 @@
*/
/atom/MouseDrop(atom/over)
if(!usr || !over) return
+
if(!Adjacent(usr) || !over.Adjacent(usr)) return // should stop you from dragging through windows
spawn(0)
diff --git a/code/_onclick/hud/rendering/plane_master.dm b/code/_onclick/hud/rendering/plane_master.dm
index 6625120d1514..c4f070bdd842 100644
--- a/code/_onclick/hud/rendering/plane_master.dm
+++ b/code/_onclick/hud/rendering/plane_master.dm
@@ -189,3 +189,10 @@
plane = ESCAPE_MENU_PLANE
appearance_flags = PLANE_MASTER|NO_CLIENT_COLOR
render_relay_plane = RENDER_PLANE_MASTER
+
+/atom/movable/screen/plane_master/displacement
+ name = "displacement plane"
+ mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+ plane = DISPLACEMENT_PLATE_RENDER_LAYER
+ render_target = DISPLACEMENT_PLATE_RENDER_TARGET
+ render_relay_plane = null
diff --git a/code/_onclick/hud/rendering/render_plate.dm b/code/_onclick/hud/rendering/render_plate.dm
index 18236c6ee759..cb579eb4ff6a 100644
--- a/code/_onclick/hud/rendering/render_plate.dm
+++ b/code/_onclick/hud/rendering/render_plate.dm
@@ -39,6 +39,10 @@
plane = RENDER_PLANE_GAME
render_relay_plane = RENDER_PLANE_MASTER
+/atom/movable/screen/plane_master/rendering_plate/game_world/Initialize(mapload, datum/hud/hud_owner)
+ . = ..()
+ add_filter("displacer", 1, displacement_map_filter(render_source = DISPLACEMENT_PLATE_RENDER_TARGET, size = 10))
+
///render plate for OOC stuff like ghosts, hud-screen effects, etc
/atom/movable/screen/plane_master/rendering_plate/non_game
name = "non-game rendering plate"
diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm
index 8d77920a59cc..71fc9162dcaa 100644
--- a/code/_onclick/item_attack.dm
+++ b/code/_onclick/item_attack.dm
@@ -16,7 +16,8 @@
return FALSE
/atom/movable/attackby(obj/item/W, mob/living/user)
- if(W)
+ . = ..()
+ if(W && !.)
if(!(W.flags_item & NOBLUDGEON))
visible_message(SPAN_DANGER("[src] has been hit by [user] with [W]."), null, null, 5, CHAT_TYPE_MELEE_HIT)
user.animation_attack_on(src)
diff --git a/code/controllers/configuration/entries/general.dm b/code/controllers/configuration/entries/general.dm
index e2572e5e2d61..1cf93e998a4e 100644
--- a/code/controllers/configuration/entries/general.dm
+++ b/code/controllers/configuration/entries/general.dm
@@ -640,3 +640,27 @@ This maintains a list of ip addresses that are able to bypass topic filtering.
splitter = "|"
key_mode = KEY_MODE_TEXT_UNALTERED
value_mode = VALUE_MODE_TEXT
+
+/datum/config_entry/number/client_warn_version
+ default = null
+ min_val = 500
+
+/datum/config_entry/number/client_warn_build
+ default = null
+ min_val = 0
+
+/datum/config_entry/string/client_warn_message
+ default = "Your version of BYOND may have issues or be blocked from accessing this server in the future."
+
+/datum/config_entry/flag/client_warn_popup
+
+/datum/config_entry/number/client_error_version
+ default = null
+ min_val = 500
+
+/datum/config_entry/number/client_error_build
+ default = null
+ min_val = 0
+
+/datum/config_entry/string/client_error_message
+ default = "Your version of BYOND is too old, may have issues, and is blocked from accessing this server."
diff --git a/code/controllers/subsystem/hijack.dm b/code/controllers/subsystem/hijack.dm
index 8ae313587038..6a2f63023ca2 100644
--- a/code/controllers/subsystem/hijack.dm
+++ b/code/controllers/subsystem/hijack.dm
@@ -105,6 +105,7 @@ SUBSYSTEM_DEF(hijack)
if(hijack_status < HIJACK_OBJECTIVES_STARTED)
hijack_status = HIJACK_OBJECTIVES_STARTED
+ SEND_GLOBAL_SIGNAL(COMSIG_GLOB_FUEL_PUMP_UPDATE)
if(current_progress >= required_progress)
if(hijack_status < HIJACK_OBJECTIVES_COMPLETE)
@@ -157,6 +158,7 @@ SUBSYSTEM_DEF(hijack)
if(current_progress >= announce_checkpoint)
announce_progress()
announce_checkpoint += initial(announce_checkpoint)
+ SEND_GLOBAL_SIGNAL(COMSIG_GLOB_FUEL_PUMP_UPDATE)
current_run_progress_additive = 0
current_run_progress_multiplicative = 1
diff --git a/code/controllers/subsystem/minimap.dm b/code/controllers/subsystem/minimap.dm
index ff250625043f..8c2cbc7c5ee7 100644
--- a/code/controllers/subsystem/minimap.dm
+++ b/code/controllers/subsystem/minimap.dm
@@ -88,8 +88,8 @@ SUBSYSTEM_DEF(minimaps)
else if(yval < smallest_y)
smallest_y = yval
- minimaps_by_z["[level]"].x_offset = Floor((SCREEN_PIXEL_SIZE-largest_x-smallest_x) / MINIMAP_SCALE)
- minimaps_by_z["[level]"].y_offset = Floor((SCREEN_PIXEL_SIZE-largest_y-smallest_y) / MINIMAP_SCALE)
+ minimaps_by_z["[level]"].x_offset = floor((SCREEN_PIXEL_SIZE-largest_x-smallest_x) / MINIMAP_SCALE)
+ minimaps_by_z["[level]"].y_offset = floor((SCREEN_PIXEL_SIZE-largest_y-smallest_y) / MINIMAP_SCALE)
icon_gen.Shift(EAST, minimaps_by_z["[level]"].x_offset)
icon_gen.Shift(NORTH, minimaps_by_z["[level]"].y_offset)
diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm
index f265315460e3..40400f2a151c 100644
--- a/code/controllers/subsystem/ticker.dm
+++ b/code/controllers/subsystem/ticker.dm
@@ -50,7 +50,7 @@ SUBSYSTEM_DEF(ticker)
var/totalPlayers = 0 //used for pregame stats on statpanel
var/totalPlayersReady = 0 //used for pregame stats on statpanel
- var/tutorial_disabled = FALSE //zonenote
+ var/tutorial_disabled = FALSE
/datum/controller/subsystem/ticker/Initialize(timeofday)
load_mode()
diff --git a/code/datums/ammo/bullet/arc.dm b/code/datums/ammo/bullet/arc.dm
new file mode 100644
index 000000000000..5e74508e04b2
--- /dev/null
+++ b/code/datums/ammo/bullet/arc.dm
@@ -0,0 +1,14 @@
+/datum/ammo/bullet/re700
+ name = "rotary cannon bullet"
+ icon_state = "autocannon"
+ damage_falloff = 0
+ flags_ammo_behavior = AMMO_BALLISTIC
+
+ accuracy = HIT_ACCURACY_TIER_7
+ scatter = 0
+ damage = 30
+ damage_var_high = PROJECTILE_VARIANCE_TIER_8
+ penetration = ARMOR_PENETRATION_TIER_2
+ accurate_range = 10
+ max_range = 12
+ shell_speed = AMMO_SPEED_TIER_6
diff --git a/code/datums/ammo/bullet/revolver.dm b/code/datums/ammo/bullet/revolver.dm
index 0688e615378e..def0a8e31952 100644
--- a/code/datums/ammo/bullet/revolver.dm
+++ b/code/datums/ammo/bullet/revolver.dm
@@ -7,14 +7,13 @@
/datum/ammo/bullet/revolver
name = "revolver bullet"
headshot_state = HEADSHOT_OVERLAY_MEDIUM
-
- damage = 55
+ damage = 72
penetration = ARMOR_PENETRATION_TIER_1
accuracy = HIT_ACCURACY_TIER_1
/datum/ammo/bullet/revolver/marksman
name = "marksman revolver bullet"
-
+ damage = 55
shrapnel_chance = 0
damage_falloff = 0
accurate_range = 12
diff --git a/code/datums/autocells/explosion.dm b/code/datums/autocells/explosion.dm
index 367567a6d40d..ecc6f9925800 100644
--- a/code/datums/autocells/explosion.dm
+++ b/code/datums/autocells/explosion.dm
@@ -282,6 +282,9 @@ as having entered the turf.
if(QDELETED(E))
return
+ if(power >= 150) //shockwave for anything over 150 power
+ new /obj/effect/shockwave(epicenter, power/60)
+
E.power = power
E.power_falloff = falloff
E.falloff_shape = falloff_shape
diff --git a/code/datums/components/disk_reader.dm b/code/datums/components/disk_reader.dm
new file mode 100644
index 000000000000..6292519893e9
--- /dev/null
+++ b/code/datums/components/disk_reader.dm
@@ -0,0 +1,87 @@
+/datum/component/disk_reader
+ dupe_mode = COMPONENT_DUPE_UNIQUE
+ /// Ref to the inserted disk
+ var/obj/item/disk/objective/disk
+
+/datum/component/disk_reader/Initialize()
+ . = ..()
+ if(!istype(parent, /obj/structure/machinery))
+ return COMPONENT_INCOMPATIBLE
+
+/datum/component/disk_reader/Destroy(force, silent)
+ handle_qdel()
+ return ..()
+
+/datum/component/disk_reader/RegisterWithParent()
+ ..()
+ RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(on_disk_insert))
+ RegisterSignal(parent, COMSIG_PARENT_QDELETING, PROC_REF(handle_qdel))
+ RegisterSignal(parent, COMSIG_INTEL_DISK_COMPLETED, PROC_REF(on_disk_complete))
+ RegisterSignal(parent, COMSIG_INTEL_DISK_LOST_POWER, PROC_REF(on_power_lost))
+
+/datum/component/disk_reader/UnregisterFromParent()
+ ..()
+ handle_qdel()
+
+/datum/component/disk_reader/proc/handle_qdel()
+ SIGNAL_HANDLER
+ QDEL_NULL(disk)
+
+/datum/component/disk_reader/proc/on_disk_insert(datum/source, obj/item/disk/objective/potential_disk, mob/living/inserter, params)
+ SIGNAL_HANDLER
+
+ if(!istype(potential_disk) || !potential_disk.objective)
+ return
+
+ if(disk)
+ to_chat(inserter, SPAN_WARNING("There's already a disk inside [parent], wait for it to finish first!"))
+ return COMPONENT_NO_AFTERATTACK
+
+ if(potential_disk.objective.state == OBJECTIVE_COMPLETE)
+ to_chat(inserter, SPAN_WARNING("The reader displays a message stating this disk has already been read and refuses to accept it."))
+ return COMPONENT_NO_AFTERATTACK
+
+ INVOKE_ASYNC(src, PROC_REF(handle_disk_insert), potential_disk, inserter)
+ return COMPONENT_NO_AFTERATTACK
+
+/datum/component/disk_reader/proc/handle_disk_insert(obj/item/disk/objective/potential_disk, mob/living/inserter)
+ if(tgui_input_text(inserter, "Enter the encryption key", "Decrypting [potential_disk]", "") != potential_disk.objective.decryption_password)
+ to_chat(inserter, SPAN_WARNING("The reader buzzes, ejecting the disk."))
+ return
+
+ if(disk)
+ to_chat(inserter, SPAN_WARNING("There's already a disk inside [parent], wait for it to finish first!"))
+ return
+
+ if(!(potential_disk in inserter.contents))
+ return
+
+ potential_disk.objective.activate()
+
+ inserter.drop_inv_item_to_loc(potential_disk, parent)
+ disk = potential_disk
+ to_chat(inserter, SPAN_NOTICE("You insert [potential_disk] and enter the decryption key."))
+ inserter.count_niche_stat(STATISTICS_NICHE_DISK)
+
+/datum/component/disk_reader/proc/on_disk_complete(datum/source)
+ SIGNAL_HANDLER
+ var/atom/atom_parent = parent
+
+ atom_parent.visible_message("[atom_parent] pings softly as the upload finishes and ejects [disk].")
+ playsound(atom_parent, 'sound/machines/screen_output1.ogg', 25, 1)
+ disk.forceMove(get_turf(atom_parent))
+ disk.name = "[disk.name] (complete)"
+ disk.objective.award_points()
+ disk.retrieve_objective.state = OBJECTIVE_ACTIVE
+ disk.retrieve_objective.activate()
+ disk = null
+
+/datum/component/disk_reader/proc/on_power_lost(datum/source)
+ SIGNAL_HANDLER
+ var/atom/atom_parent = parent
+
+ atom_parent.visible_message(SPAN_WARNING("[atom_parent] powers down mid-operation as the area loses power."))
+ playsound(atom_parent, 'sound/machines/terminal_shutdown.ogg', 25, 1)
+ SSobjectives.stop_processing_objective(src)
+ disk.forceMove(get_turf(atom_parent))
+ disk = null
diff --git a/code/datums/components/weed_food.dm b/code/datums/components/weed_food.dm
index 8737fba08db9..ce6fe35e4a28 100644
--- a/code/datums/components/weed_food.dm
+++ b/code/datums/components/weed_food.dm
@@ -87,7 +87,7 @@
parent_buckle = null
/datum/component/weed_food/RegisterWithParent()
- RegisterSignal(parent_mob, COMSIG_MOVABLE_MOVED, PROC_REF(on_move))
+ RegisterSignal(parent_mob, COMSIG_MOVABLE_TURF_ENTERED, PROC_REF(on_move))
RegisterSignal(parent_mob, list(COMSIG_LIVING_REJUVENATED, COMSIG_HUMAN_REVIVED), PROC_REF(on_rejuv))
RegisterSignal(parent_mob, COMSIG_HUMAN_SET_UNDEFIBBABLE, PROC_REF(on_update))
RegisterSignal(parent_mob, COMSIG_LIVING_PREIGNITION, PROC_REF(on_preignition))
@@ -98,7 +98,7 @@
/datum/component/weed_food/UnregisterFromParent()
if(parent_mob)
UnregisterSignal(parent_mob, list(
- COMSIG_MOVABLE_MOVED,
+ COMSIG_MOVABLE_TURF_ENTERED,
COMSIG_LIVING_REJUVENATED,
COMSIG_HUMAN_REVIVED,
COMSIG_HUMAN_SET_UNDEFIBBABLE,
@@ -109,12 +109,12 @@
if(parent_turf)
UnregisterSignal(parent_turf, COMSIG_WEEDNODE_GROWTH)
if(parent_buckle)
- UnregisterSignal(parent_buckle, COSMIG_OBJ_AFTER_BUCKLE)
+ UnregisterSignal(parent_buckle, COMSIG_OBJ_AFTER_BUCKLE)
if(parent_nest)
UnregisterSignal(parent_nest, COMSIG_PARENT_QDELETING)
UnregisterSignal(SSdcs, COMSIG_GLOB_GROUNDSIDE_FORSAKEN_HANDLING)
-/// SIGNAL_HANDLER for COMSIG_MOVABLE_MOVED
+/// SIGNAL_HANDLER for COMSIG_MOVABLE_TURF_ENTERED
/datum/component/weed_food/proc/on_move()
SIGNAL_HANDLER
@@ -148,7 +148,7 @@
qdel(src)
-/// SIGNAL_HANDLER for COSMIG_OBJ_AFTER_BUCKLE
+/// SIGNAL_HANDLER for COMSIG_OBJ_AFTER_BUCKLE
/datum/component/weed_food/proc/on_after_buckle(obj/source, mob/buckled)
SIGNAL_HANDLER
@@ -220,12 +220,12 @@
return FALSE // Still buckled to the same thing
if(!istype(parent_mob.buckled, /obj/structure/bed/nest))
if(parent_buckle) // Still have a lingering reference somehow?
- UnregisterSignal(parent_buckle, COSMIG_OBJ_AFTER_BUCKLE)
+ UnregisterSignal(parent_buckle, COMSIG_OBJ_AFTER_BUCKLE)
parent_buckle = parent_mob.buckled
- RegisterSignal(parent_mob.buckled, COSMIG_OBJ_AFTER_BUCKLE, PROC_REF(on_after_buckle))
+ RegisterSignal(parent_mob.buckled, COMSIG_OBJ_AFTER_BUCKLE, PROC_REF(on_after_buckle))
return FALSE
if(parent_buckle)
- UnregisterSignal(parent_buckle, COSMIG_OBJ_AFTER_BUCKLE)
+ UnregisterSignal(parent_buckle, COMSIG_OBJ_AFTER_BUCKLE)
parent_buckle = null
if(parent_mob.is_xeno_grabbable())
@@ -282,16 +282,16 @@
return FALSE // Still buckled to the same thing somehow?
if(!istype(parent_mob.buckled, /obj/structure/bed/nest))
if(parent_buckle) // Still have a lingering reference somehow?
- UnregisterSignal(parent_buckle, COSMIG_OBJ_AFTER_BUCKLE)
+ UnregisterSignal(parent_buckle, COMSIG_OBJ_AFTER_BUCKLE)
parent_buckle = parent_mob.buckled
- RegisterSignal(parent_mob.buckled, COSMIG_OBJ_AFTER_BUCKLE, PROC_REF(on_after_buckle))
+ RegisterSignal(parent_mob.buckled, COMSIG_OBJ_AFTER_BUCKLE, PROC_REF(on_after_buckle))
return FALSE
else
parent_nest = parent_mob.buckled
RegisterSignal(parent_nest, COMSIG_PARENT_QDELETING, PROC_REF(on_nest_deletion))
if(parent_buckle)
- UnregisterSignal(parent_buckle, COSMIG_OBJ_AFTER_BUCKLE)
+ UnregisterSignal(parent_buckle, COMSIG_OBJ_AFTER_BUCKLE)
parent_buckle = null
if(SEND_SIGNAL(parent_mob, COMSIG_ATTEMPT_MOB_PULL) & COMPONENT_CANCEL_MOB_PULL)
diff --git a/code/datums/effects/bleeding.dm b/code/datums/effects/bleeding.dm
index 2171580a94db..f56efbb3c69d 100644
--- a/code/datums/effects/bleeding.dm
+++ b/code/datums/effects/bleeding.dm
@@ -71,6 +71,11 @@
if(affected_mob.reagents.get_reagent_amount("thwei"))
blood_loss -= THWEI_BLOOD_REDUCTION
+ if(affected_mob.bodytemperature < T0C && (affected_mob.reagents.get_reagent_amount("cryoxadone") || affected_mob.reagents.get_reagent_amount("clonexadone")))
+ var/obj/structure/machinery/cryo_cell/cryo = affected_mob.loc
+ if(istype(cryo) && cryo.on && cryo.operable())
+ blood_loss -= CRYO_BLOOD_REDUCTION
+
var/mob/living/carbon/human/affected_human = affected_mob
if(istype(affected_human))
if(affected_human.chem_effect_flags & CHEM_EFFECT_NO_BLEEDING)
@@ -95,18 +100,19 @@
if(affected_mob.in_stasis == STASIS_IN_BAG)
return FALSE
- if(affected_mob.bodytemperature < T0C && (affected_mob.reagents && affected_mob.reagents.get_reagent_amount("cryoxadone") || affected_mob.reagents.get_reagent_amount("clonexadone")))
- blood_loss -= CRYO_BLOOD_REDUCTION
-
if(affected_mob.reagents) // Annoying QC check
if(affected_mob.reagents.get_reagent_amount("thwei"))
blood_loss -= THWEI_BLOOD_REDUCTION
+ if(affected_mob.bodytemperature < T0C && (affected_mob.reagents.get_reagent_amount("cryoxadone") || affected_mob.reagents.get_reagent_amount("clonexadone")))
+ blood_loss -= CRYO_BLOOD_REDUCTION
+
var/mob/living/carbon/human/affected_human = affected_mob
if(istype(affected_human))
if(affected_human.chem_effect_flags & CHEM_EFFECT_NO_BLEEDING)
return FALSE
+ blood_loss = max(blood_loss, 0) // Bleeding shouldn't give extra blood even if its only 1 tick
affected_mob.blood_volume = max(affected_mob.blood_volume - blood_loss, 0)
return TRUE
diff --git a/code/datums/effects/neurotoxin.dm b/code/datums/effects/neurotoxin.dm
index 490ed213292b..b7402ca370fd 100644
--- a/code/datums/effects/neurotoxin.dm
+++ b/code/datums/effects/neurotoxin.dm
@@ -37,6 +37,10 @@
return FALSE
if(affected_mob.stat == DEAD)
return
+
+ if(issynth(affected_atom))
+ return
+
// General effects
affected_mob.last_damage_data = cause_data
affected_mob.apply_stamina_damage(stam_dam)
diff --git a/code/datums/elements/bullet_trait/iff.dm b/code/datums/elements/bullet_trait/iff.dm
index ab48b29f4812..cee36acbed80 100644
--- a/code/datums/elements/bullet_trait/iff.dm
+++ b/code/datums/elements/bullet_trait/iff.dm
@@ -46,7 +46,7 @@
// The cache is reset when the user drops their ID
/datum/element/bullet_trait_iff/proc/get_user_iff_group(mob/living/carbon/human/user)
if(!ishuman(user))
- return user.faction_group
+ return user?.faction_group
var/iff_group = LAZYACCESS(iff_group_cache, user)
if(isnull(iff_group))
diff --git a/code/datums/elements/strippable.dm b/code/datums/elements/strippable.dm
new file mode 100644
index 000000000000..e0daaee74a8c
--- /dev/null
+++ b/code/datums/elements/strippable.dm
@@ -0,0 +1,536 @@
+/// An element for atoms that, when dragged and dropped onto a mob, opens a strip panel.
+/datum/element/strippable
+ element_flags = ELEMENT_BESPOKE | ELEMENT_DETACH
+ id_arg_index = 2
+
+ /// An assoc list of keys to /datum/strippable_item
+ var/list/items
+
+ /// A proc path that returns TRUE/FALSE if we should show the strip panel for this entity.
+ /// If it does not exist, the strip menu will always show.
+ /// Will be called with (mob/user).
+ var/should_strip_proc_path
+
+ /// An existing strip menus
+ var/list/strip_menus
+
+/datum/element/strippable/Attach(datum/target, list/items, should_strip_proc_path)
+ . = ..()
+ if (!isatom(target))
+ return ELEMENT_INCOMPATIBLE
+
+ RegisterSignal(target, COMSIG_ATOM_DROP_ON, PROC_REF(mouse_drop_onto))
+
+ src.items = items
+ src.should_strip_proc_path = should_strip_proc_path
+
+/datum/element/strippable/Detach(datum/source, force)
+ . = ..()
+
+ UnregisterSignal(source, COMSIG_ATOM_DROP_ON)
+
+ if (!isnull(strip_menus))
+ QDEL_NULL(strip_menus[source])
+
+/datum/element/strippable/proc/mouse_drop_onto(datum/source, atom/over, mob/user)
+ SIGNAL_HANDLER
+ if (user == source)
+ return
+
+ if (over == source)
+ return
+
+ var/mob/overmob = over
+ if (!ishuman(overmob))
+ return
+
+ if (!overmob.Adjacent(source))
+ return
+
+ if (!overmob.client)
+ return
+
+ if (overmob.client != user)
+ return
+
+ if (!isnull(should_strip_proc_path) && !call(source, should_strip_proc_path)(overmob))
+ return
+
+ var/datum/strip_menu/strip_menu
+
+ if (isnull(strip_menu))
+ strip_menu = new(source, src)
+ LAZYSET(strip_menus, source, strip_menu)
+
+ INVOKE_ASYNC(strip_menu, PROC_REF(tgui_interact), overmob)
+
+/// A representation of an item that can be stripped down
+/datum/strippable_item
+ /// The STRIPPABLE_ITEM_* key
+ var/key
+
+ /// Should we warn about dangerous clothing?
+ var/warn_dangerous_clothing = TRUE
+
+/// Gets the item from the given source.
+/datum/strippable_item/proc/get_item(atom/source)
+
+/// Tries to equip the item onto the given source.
+/// Returns TRUE/FALSE depending on if it is allowed.
+/// This should be used for checking if an item CAN be equipped.
+/// It should not perform the equipping itself.
+/datum/strippable_item/proc/try_equip(atom/source, obj/item/equipping, mob/user)
+ if ((equipping.flags_item & ITEM_ABSTRACT))
+ return FALSE
+ if ((equipping.flags_item & NODROP))
+ to_chat(user, SPAN_WARNING("You can't put [equipping] on [source], it's stuck to your hand!"))
+ return FALSE
+ if (ishuman(source))
+ var/mob/living/carbon/human/sourcehuman = source
+ if(HAS_TRAIT(sourcehuman, TRAIT_UNSTRIPPABLE) && !sourcehuman.is_mob_incapacitated())
+ to_chat(src, SPAN_DANGER("[sourcehuman] is too strong to force [equipping] onto them!"))
+ return
+ return TRUE
+
+/// Start the equipping process. This is the proc you should yield in.
+/// Returns TRUE/FALSE depending on if it is allowed.
+/datum/strippable_item/proc/start_equip(atom/source, obj/item/equipping, mob/user)
+ source.visible_message(
+ SPAN_NOTICE("[user] tries to put [equipping] on [source]."),
+ SPAN_NOTICE("[user] tries to put [equipping] on you.")
+ )
+
+ if (ismob(source))
+ var/mob/sourcemob = source
+ sourcemob.attack_log += text("\[[time_stamp()]\] [key_name(sourcemob)] is having [equipping] put on them by [key_name(user)]")
+ user.attack_log += text("\[[time_stamp()]\] [key_name(user)] is putting [equipping] on [key_name(sourcemob)]")
+
+ return TRUE
+
+/// The proc that places the item on the source. This should not yield.
+/datum/strippable_item/proc/finish_equip(atom/source, obj/item/equipping, mob/user)
+ SHOULD_NOT_SLEEP(TRUE)
+
+/// Tries to unequip the item from the given source.
+/// Returns TRUE/FALSE depending on if it is allowed.
+/// This should be used for checking if it CAN be unequipped.
+/// It should not perform the unequipping itself.
+/datum/strippable_item/proc/try_unequip(atom/source, mob/user)
+ SHOULD_NOT_SLEEP(TRUE)
+
+ var/obj/item/item = get_item(source)
+ if (isnull(item))
+ return FALSE
+
+ if (user.action_busy && !skillcheck(user, SKILL_POLICE, SKILL_POLICE_SKILLED))
+ to_chat(user, SPAN_WARNING("You can't do this right now."))
+ return FALSE
+
+ if ((item.flags_inventory & CANTSTRIP) || ((item.flags_item & NODROP) && !(item.flags_item & FORCEDROP_CONDITIONAL)) || (item.flags_item & ITEM_ABSTRACT))
+ return FALSE
+
+ if (ishuman(source))
+ var/mob/living/carbon/human/sourcehuman = source
+ if(MODE_HAS_TOGGLEABLE_FLAG(MODE_NO_STRIPDRAG_ENEMY) && (sourcehuman.stat == DEAD || sourcehuman.health < HEALTH_THRESHOLD_CRIT) && !sourcehuman.get_target_lock(user.faction_group))
+ to_chat(user, SPAN_WARNING("You can't strip items of a crit or dead member of another faction!"))
+ return FALSE
+
+ if(HAS_TRAIT(sourcehuman, TRAIT_UNSTRIPPABLE) && !sourcehuman.is_mob_incapacitated())
+ to_chat(src, SPAN_DANGER("[sourcehuman] has an unbreakable grip on their equipment!"))
+ return
+
+ return TRUE
+
+/// Start the unequipping process. This is the proc you should yield in.
+/// Returns TRUE/FALSE depending on if it is allowed.
+/datum/strippable_item/proc/start_unequip(atom/source, mob/user)
+ var/obj/item/item = get_item(source)
+ if (isnull(item))
+ return FALSE
+
+ source.visible_message(
+ SPAN_WARNING("[user] tries to remove [source]'s [item]."),
+ SPAN_DANGER("[user] tries to remove your [item].")
+ )
+
+ if (ismob(source))
+ var/mob/sourcemob = source
+ sourcemob.attack_log += text("\[[time_stamp()]\] [key_name(sourcemob)] is being stripped of [item] by [key_name(user)]")
+ user.attack_log += text("\[[time_stamp()]\] [key_name(user)] is stripping [key_name(sourcemob)] of [item]")
+
+ item.add_fingerprint(user)
+
+ return TRUE
+
+/// The proc that unequips the item from the source. This should not yield.
+/datum/strippable_item/proc/finish_unequip(atom/source, mob/user)
+
+/// Returns a STRIPPABLE_OBSCURING_* define to report on whether or not this is obscured.
+/datum/strippable_item/proc/get_obscuring(atom/source)
+ SHOULD_NOT_SLEEP(TRUE)
+ return STRIPPABLE_OBSCURING_NONE
+
+/// Returns the ID of this item's strippable action.
+/// Return `null` if there is no alternate action.
+/// Any return value of this must be in StripMenu.
+/datum/strippable_item/proc/get_alternate_action(atom/source, mob/user)
+ return null
+
+/// Performs an alternative action on this strippable_item.
+/// `has_alternate_action` needs to be TRUE.
+/datum/strippable_item/proc/alternate_action(atom/source, mob/user)
+
+/// Returns whether or not this item should show.
+/datum/strippable_item/proc/should_show(atom/source, mob/user)
+ return TRUE
+
+/// A preset for equipping items onto mob slots
+/datum/strippable_item/mob_item_slot
+ /// The ITEM_SLOT_* to equip to.
+ var/item_slot
+
+/datum/strippable_item/proc/has_no_item_alt_action()
+ return FALSE
+
+/datum/strippable_item/mob_item_slot/get_item(atom/source)
+ if (!ismob(source))
+ return null
+
+ var/mob/mob_source = source
+ return mob_source.get_item_by_slot(key)
+
+/datum/strippable_item/mob_item_slot/try_equip(atom/source, obj/item/equipping, mob/user)
+ . = ..()
+ if (!.)
+ return
+
+ if (!ismob(source))
+ return FALSE
+ if (user.action_busy)
+ to_chat(user, SPAN_WARNING("You can't do this right now."))
+ return FALSE
+ if (!equipping.mob_can_equip(
+ source,
+ key
+ ))
+ to_chat(user, SPAN_WARNING("\The [equipping] doesn't fit in that place!"))
+ return FALSE
+ if(equipping.flags_item & WIELDED)
+ equipping.unwield(user)
+ return TRUE
+
+/datum/strippable_item/mob_item_slot/start_equip(atom/source, obj/item/equipping, mob/user)
+ . = ..()
+ if (!.)
+ return
+
+ if (!ismob(source))
+ return FALSE
+
+ var/time_to_strip = HUMAN_STRIP_DELAY
+ var/mob/sourcemob = source
+
+ if (ishuman(sourcemob) && ishuman(user))
+ var/mob/living/carbon/human/sourcehuman = sourcemob
+ var/mob/living/carbon/human/userhuman = user
+ time_to_strip = userhuman.get_strip_delay(userhuman, sourcehuman)
+
+ if (!do_after(user, time_to_strip, INTERRUPT_ALL, BUSY_ICON_FRIENDLY, source, INTERRUPT_MOVED, BUSY_ICON_FRIENDLY))
+ return FALSE
+
+ if (!equipping.mob_can_equip(
+ sourcemob,
+ key
+ ))
+ return FALSE
+
+ if (!user.temp_drop_inv_item(equipping))
+ return FALSE
+
+ return TRUE
+
+/datum/strippable_item/mob_item_slot/finish_equip(atom/source, obj/item/equipping, mob/user)
+ if (!ismob(source))
+ return FALSE
+
+ var/mob/sourcemob = source
+ sourcemob.equip_to_slot_if_possible(equipping, key)
+
+/datum/strippable_item/mob_item_slot/get_obscuring(atom/source)
+ return FALSE
+
+/datum/strippable_item/mob_item_slot/start_unequip(atom/source, mob/user)
+ . = ..()
+ if (!.)
+ return
+
+ return start_unequip_mob(get_item(source), source, user)
+
+/datum/strippable_item/mob_item_slot/finish_unequip(atom/source, mob/user)
+ var/obj/item/item = get_item(source)
+ if (isnull(item))
+ return FALSE
+
+ if (!ismob(source))
+ return FALSE
+
+ return finish_unequip_mob(item, source, user)
+
+/// A utility function for `/datum/strippable_item`s to start unequipping an item from a mob.
+/datum/strippable_item/mob_item_slot/proc/start_unequip_mob(obj/item/item, mob/living/carbon/human/source, mob/living/carbon/human/user)
+ var/time_to_strip = HUMAN_STRIP_DELAY
+
+ if (istype(source) && istype(user))
+ time_to_strip = user.get_strip_delay(user, source)
+
+ if (!do_after(user, time_to_strip, INTERRUPT_ALL, BUSY_ICON_HOSTILE, source, INTERRUPT_MOVED, BUSY_ICON_HOSTILE))
+ return FALSE
+
+ return TRUE
+
+/// A utility function for `/datum/strippable_item`s to finish unequipping an item from a mob.
+/datum/strippable_item/mob_item_slot/proc/finish_unequip_mob(obj/item/item, mob/source, mob/user)
+ if (!source.drop_inv_item_on_ground(item, force = (item.flags_item & FORCEDROP_CONDITIONAL))) //force if we can drop the item in this case
+ return FALSE
+
+ if (ismob(source))
+ var/mob/sourcemob = source
+ sourcemob.attack_log += text("\[[time_stamp()]\] [key_name(sourcemob)] has been stripped of [item] by [key_name(user)]")
+ user.attack_log += text("\[[time_stamp()]\] [key_name(user)] has been stripped of [key_name(sourcemob)] of [item]")
+
+ // Updates speed in case stripped speed affecting item
+ source.recalculate_move_delay = TRUE
+
+/// A representation of the stripping UI
+/datum/strip_menu
+ /// The owner who has the element /datum/element/strippable
+ var/atom/movable/owner
+
+ /// The strippable element itself
+ var/datum/element/strippable/strippable
+
+ /// A lazy list of user mobs to a list of strip menu keys that they're interacting with
+ var/list/interactions
+
+/datum/strip_menu/New(atom/movable/owner, datum/element/strippable/strippable)
+ . = ..()
+ src.owner = owner
+ src.strippable = strippable
+
+/datum/strip_menu/Destroy()
+ owner = null
+ strippable = null
+
+ return ..()
+
+/datum/strip_menu/tgui_interact(mob/user, datum/tgui/ui)
+ . = ..()
+ ui = SStgui.try_update_ui(user, src, ui)
+ if (!ui)
+ ui = new(user, src, "StripMenu")
+ ui.open()
+
+
+/datum/strip_menu/ui_assets(mob/user)
+ return list(
+ get_asset_datum(/datum/asset/simple/inventory),
+ )
+
+/datum/strip_menu/ui_data(mob/user)
+ var/list/data = list()
+
+ var/list/items = list()
+
+ for (var/strippable_key in strippable.items)
+ var/datum/strippable_item/item_data = strippable.items[strippable_key]
+
+ if (!item_data.should_show(owner, user))
+ continue
+
+ var/list/result
+
+ if(strippable_key in LAZYACCESS(interactions, user))
+ LAZYSET(result, "interacting", TRUE)
+
+ var/obscuring = item_data.get_obscuring(owner)
+ if (obscuring != STRIPPABLE_OBSCURING_NONE)
+ LAZYSET(result, "obscured", obscuring)
+ items[strippable_key] = result
+ continue
+
+ var/obj/item/item = item_data.get_item(owner)
+ if (isnull(item))
+ if (item_data.has_no_item_alt_action())
+ LAZYINITLIST(result)
+ result["no_item_action"] = item_data.get_alternate_action(owner, user)
+ items[strippable_key] = result
+ continue
+
+ LAZYINITLIST(result)
+
+ result["icon"] = icon2base64(icon(item.icon, item.icon_state, frame = 1))
+ result["name"] = item.name
+ result["alternate"] = item_data.get_alternate_action(owner, user)
+
+ items[strippable_key] = result
+
+ data["items"] = items
+
+ // While most `\the`s are implicit, this one is not.
+ // In this case, `\The` would otherwise be used.
+ // This doesn't match with what it's used for, which is to say "Stripping the alien drone",
+ // as opposed to "Stripping The alien drone".
+ // Human names will still show without "the", as they are proper nouns.
+ data["name"] = "\the [owner]"
+
+ return data
+
+/datum/strip_menu/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
+ . = ..()
+ if (.)
+ return
+
+ . = TRUE
+
+ var/mob/user = ui.user
+
+ switch (action)
+ if ("equip")
+ var/key = params["key"]
+ var/datum/strippable_item/strippable_item = strippable.items[key]
+
+ if (isnull(strippable_item))
+ return
+
+ if (!strippable_item.should_show(owner, user))
+ return
+
+ if (strippable_item.get_obscuring(owner) == STRIPPABLE_OBSCURING_COMPLETELY)
+ return
+
+ var/item = strippable_item.get_item(owner)
+ if (!isnull(item))
+ return
+
+ var/obj/item/held_item = user.get_held_item()
+ if (isnull(held_item))
+ return
+
+ if (!strippable_item.try_equip(owner, held_item, user))
+ return
+
+ LAZYORASSOCLIST(interactions, user, key)
+
+ // Yielding call
+ var/should_finish = strippable_item.start_equip(owner, held_item, user)
+
+ LAZYREMOVEASSOC(interactions, user, key)
+
+ if (!should_finish)
+ return
+
+ if (QDELETED(src) || QDELETED(owner))
+ return
+
+ // They equipped an item in the meantime
+ if (!isnull(strippable_item.get_item(owner)))
+ return
+
+ if (!user.Adjacent(owner))
+ return
+
+ strippable_item.finish_equip(owner, held_item, user)
+ if ("strip")
+ var/key = params["key"]
+ var/datum/strippable_item/strippable_item = strippable.items[key]
+
+ if (isnull(strippable_item))
+ return
+
+ if (!strippable_item.should_show(owner, user))
+ return
+
+ if (strippable_item.get_obscuring(owner) == STRIPPABLE_OBSCURING_COMPLETELY)
+ return
+
+ var/item = strippable_item.get_item(owner)
+ if (isnull(item))
+ return
+
+ if (!strippable_item.try_unequip(owner, user))
+ return
+
+ LAZYORASSOCLIST(interactions, user, key)
+
+ var/should_unequip = strippable_item.start_unequip(owner, user)
+
+ LAZYREMOVEASSOC(interactions, user, key)
+
+ // Yielding call
+ if (!should_unequip)
+ return
+
+ if (QDELETED(src) || QDELETED(owner))
+ return
+
+ // They changed the item in the meantime
+ if (strippable_item.get_item(owner) != item)
+ return
+
+ if (!user.Adjacent(owner))
+ return
+
+ strippable_item.finish_unequip(owner, user)
+ if ("alt")
+ var/key = params["key"]
+ var/datum/strippable_item/strippable_item = strippable.items[key]
+
+ if (isnull(strippable_item))
+ return
+
+ if (!strippable_item.should_show(owner, user))
+ return
+
+ if (strippable_item.get_obscuring(owner) == STRIPPABLE_OBSCURING_COMPLETELY)
+ return
+
+ var/item = strippable_item.get_item(owner)
+ if (isnull(item) && !strippable_item.has_no_item_alt_action())
+ return
+
+ if (isnull(strippable_item.get_alternate_action(owner, user)))
+ return
+
+ LAZYORASSOCLIST(interactions, user, key)
+
+ // Potentially yielding
+ strippable_item.alternate_action(owner, user)
+
+ LAZYREMOVEASSOC(interactions, user, key)
+
+/datum/strip_menu/ui_host(mob/user)
+ return owner
+
+/datum/strip_menu/ui_status(mob/user, datum/ui_state/state)
+ . = ..()
+
+ if (isliving(user))
+ var/mob/living/living_user = user
+
+ if (
+ . == UI_UPDATE \
+ && user.stat == CONSCIOUS \
+ && living_user.body_position == LYING_DOWN \
+ && user.Adjacent(owner)
+ )
+ return UI_INTERACTIVE
+
+/// Creates an assoc list of keys to /datum/strippable_item
+/proc/create_strippable_list(types)
+ var/list/strippable_items = list()
+
+ for (var/strippable_type in types)
+ var/datum/strippable_item/strippable_item = new strippable_type
+ strippable_items[strippable_item.key] = strippable_item
+
+ return strippable_items
diff --git a/code/datums/emotes.dm b/code/datums/emotes.dm
index b691d87a2169..6e84052720d4 100644
--- a/code/datums/emotes.dm
+++ b/code/datums/emotes.dm
@@ -112,6 +112,7 @@
var/paygrade = user.get_paygrade()
var/formatted_message = "[paygrade][user] [msg]"
var/user_turf = get_turf(user)
+ var/list/seeing_obj = list()
if (user.client)
for(var/mob/ghost as anything in GLOB.dead_mob_list)
if(!ghost.client || isnewplayer(ghost))
@@ -132,12 +133,18 @@
if(emote_type & EMOTE_VISIBLE)
var/list/viewers = get_mobs_in_view(7, user)
for(var/mob/current_mob in viewers)
+ for(var/obj/object in current_mob.contents)
+ if((object.flags_atom & USES_SEEING))
+ seeing_obj |= object
if(!(current_mob.client?.prefs.toggles_langchat & LANGCHAT_SEE_EMOTES))
viewers -= current_mob
run_langchat(user, viewers)
else if(emote_type & EMOTE_AUDIBLE)
var/list/heard = get_mobs_in_view(7, user)
for(var/mob/current_mob in heard)
+ for(var/obj/object in current_mob.contents)
+ if((object.flags_atom & USES_HEARING))
+ seeing_obj |= object
if(current_mob.ear_deaf)
heard -= current_mob
continue
@@ -145,6 +152,9 @@
heard -= current_mob
run_langchat(user, heard)
+ for(var/obj/object as anything in seeing_obj)
+ object.see_emote(user, msg, (emote_type & EMOTE_AUDIBLE))
+
SEND_SIGNAL(user, COMSIG_MOB_EMOTED(key))
diff --git a/code/datums/entities/player.dm b/code/datums/entities/player.dm
index aefa81672b54..a62e663ba21c 100644
--- a/code/datums/entities/player.dm
+++ b/code/datums/entities/player.dm
@@ -90,11 +90,12 @@ BSQL_PROTECT_DATUM(/datum/entity/player)
/datum/entity/player/proc/add_note(note_text, is_confidential, note_category = NOTE_ADMIN, is_ban = FALSE, duration = null)
var/client/admin = usr.client
// do all checks here, especially for sensitive stuff like this
- if(!admin || !admin.player_data)
- return FALSE
- if(note_category == NOTE_ADMIN || is_confidential)
- if (!AHOLD_IS_MOD(admin.admin_holder))
+ if(!(note_category == NOTE_WHITELIST))
+ if(!admin || !admin.player_data)
return FALSE
+ if(note_category == NOTE_ADMIN || is_confidential)
+ if (!AHOLD_IS_MOD(admin.admin_holder))
+ return FALSE
// this is here for a short transition period when we still are testing DB notes and constantly deleting the file
if(CONFIG_GET(flag/duplicate_notes_to_file))
@@ -119,7 +120,7 @@ BSQL_PROTECT_DATUM(/datum/entity/player)
note.note_category = note_category
note.is_ban = is_ban
note.ban_time = duration
- note.admin_rank = admin.admin_holder.rank
+ note.admin_rank = admin.admin_holder ? admin.admin_holder.rank : "Non-Staff"
// since admin is in game, their player_data has to be populated. This is also checked above
note.admin_id = admin.player_data.id
note.admin = admin.player_data
@@ -134,13 +135,17 @@ BSQL_PROTECT_DATUM(/datum/entity/player)
notes.Add(note)
return TRUE
-/datum/entity/player/proc/remove_note(note_id)
+/datum/entity/player/proc/remove_note(note_id, whitelist = FALSE)
+ if(IsAdminAdvancedProcCall())
+ return PROC_BLOCKED
var/client/admin = usr.client
// do all checks here, especially for sensitive stuff like this
if(!admin || !admin.player_data)
return FALSE
- if (!AHOLD_IS_MOD(admin.admin_holder))
+ if((!AHOLD_IS_MOD(admin.admin_holder)) && !whitelist)
+ return FALSE
+ if(whitelist && !(isSenator(admin) || CLIENT_HAS_RIGHTS(admin, R_PERMISSIONS)))
return FALSE
// this is here for a short transition period when we still are testing DB notes and constantly deleting the file
diff --git a/code/datums/entities/player_times.dm b/code/datums/entities/player_times.dm
index 2bbd4a3bc39e..4fc28ba2fa5e 100644
--- a/code/datums/entities/player_times.dm
+++ b/code/datums/entities/player_times.dm
@@ -61,7 +61,7 @@ BSQL_PROTECT_DATUM(/datum/entity/player_time)
return list(
"job" = role_id,
"playtime" = round(total_minutes MINUTES_TO_HOURS, 0.1),
- "bgcolor" = "rgb(0, [Floor(128 * playtime_percentage)], [Floor(255 * playtime_percentage)])",
+ "bgcolor" = "rgb(0, [floor(128 * playtime_percentage)], [floor(255 * playtime_percentage)])",
"textcolor" = "#FFFFFF",
"icondisplay" = icon_display
)
diff --git a/code/datums/mob_hud.dm b/code/datums/mob_hud.dm
index 5e57b8f5616c..437d0e6a662d 100644
--- a/code/datums/mob_hud.dm
+++ b/code/datums/mob_hud.dm
@@ -422,6 +422,16 @@ GLOBAL_LIST_INIT_TYPED(huds, /datum/mob_hud, list(
if(hive && hive.color)
holder3.color = hive.color
+ if(stat == DEAD || status_flags & FAKEDEATH)
+ holder2.alpha = 100
+ holder3.alpha = 100
+ else
+ holder2.alpha = 255
+ holder3.alpha = 255
+ if(status_flags & CORRUPTED_ALLY)
+ holder4.color = "#80ff80"
+ holder4.icon_state = "hudalien_ally"
+
if(stat == DEAD || status_flags & FAKEDEATH)
if(revive_enabled)
if(!client)
diff --git a/code/datums/skills/uscm.dm b/code/datums/skills/uscm.dm
index 8a6d2fd2c8c2..9c56e7f62a88 100644
--- a/code/datums/skills/uscm.dm
+++ b/code/datums/skills/uscm.dm
@@ -239,7 +239,8 @@ COMMAND STAFF
SKILL_JTAC = SKILL_JTAC_MASTER,
SKILL_SPEC_WEAPONS = SKILL_SPEC_ALL,
SKILL_EXECUTION = SKILL_EXECUTION_TRAINED, //can BE people
- SKILL_INTEL = SKILL_INTEL_EXPERT
+ SKILL_INTEL = SKILL_INTEL_EXPERT,
+ SKILL_VEHICLE = SKILL_VEHICLE_LARGE,
)
/datum/skills/commander
@@ -261,7 +262,8 @@ COMMAND STAFF
SKILL_JTAC = SKILL_JTAC_MASTER,
SKILL_EXECUTION = SKILL_EXECUTION_TRAINED, //can BE people
SKILL_INTEL = SKILL_INTEL_EXPERT,
- SKILL_NAVIGATIONS = SKILL_NAVIGATIONS_TRAINED //can change ship alt
+ SKILL_NAVIGATIONS = SKILL_NAVIGATIONS_TRAINED, //can change ship alt
+ SKILL_VEHICLE = SKILL_VEHICLE_LARGE,
)
/datum/skills/XO
@@ -282,6 +284,7 @@ COMMAND STAFF
SKILL_JTAC = SKILL_JTAC_MASTER,
SKILL_INTEL = SKILL_INTEL_EXPERT,
SKILL_NAVIGATIONS = SKILL_NAVIGATIONS_TRAINED,
+ SKILL_VEHICLE = SKILL_VEHICLE_LARGE,
)
/datum/skills/SO
@@ -292,12 +295,14 @@ COMMAND STAFF
SKILL_LEADERSHIP = SKILL_LEAD_EXPERT,
SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED,
SKILL_MEDICAL = SKILL_MEDICAL_MEDIC,
+ SKILL_SURGERY = SKILL_SURGERY_NOVICE,
SKILL_POLICE = SKILL_POLICE_FLASH,
SKILL_FIREMAN = SKILL_FIREMAN_TRAINED,
SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
SKILL_POWERLOADER = SKILL_POWERLOADER_TRAINED,
SKILL_JTAC = SKILL_JTAC_EXPERT,
SKILL_INTEL = SKILL_INTEL_TRAINED,
+ SKILL_VEHICLE = SKILL_VEHICLE_LARGE,
)
/datum/skills/SEA
diff --git a/code/datums/skills/wygoons.dm b/code/datums/skills/wygoons.dm
new file mode 100644
index 000000000000..2d2c247bd1ea
--- /dev/null
+++ b/code/datums/skills/wygoons.dm
@@ -0,0 +1,36 @@
+/datum/skills/wy_goon
+ name = "Corporate Security"
+ skills = list(
+ SKILL_CQC = SKILL_CQC_SKILLED,
+ SKILL_POLICE = SKILL_POLICE_SKILLED,
+ SKILL_FIREMAN = SKILL_FIREMAN_SKILLED,
+ SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
+ SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED,
+ )
+
+/datum/skills/wy_goon_tech
+ name = "Corporate Security Support Technician"
+ skills = list(
+ SKILL_CQC = SKILL_CQC_SKILLED,
+ SKILL_POLICE = SKILL_POLICE_SKILLED,
+ SKILL_FIREMAN = SKILL_FIREMAN_TRAINED,
+ SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
+ SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED,
+ SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
+ SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
+ SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
+ )
+
+/datum/skills/wy_goon_lead
+ name = "Corporate Security Leader"
+ skills = list(
+ SKILL_CQC = SKILL_CQC_SKILLED,
+ SKILL_POLICE = SKILL_POLICE_SKILLED,
+ SKILL_FIREMAN = SKILL_FIREMAN_SKILLED,
+ SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
+ SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED,
+ SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
+ SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
+ SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
+ SKILL_LEADERSHIP = SKILL_LEAD_TRAINED,
+ )
diff --git a/code/datums/supply_packs/ammo.dm b/code/datums/supply_packs/ammo.dm
index 0929f24f7c95..2e81d8fed164 100644
--- a/code/datums/supply_packs/ammo.dm
+++ b/code/datums/supply_packs/ammo.dm
@@ -135,7 +135,7 @@
group = "Ammo"
/datum/supply_packs/ammo_m4ra_mag_box_ap
- name = "Magazine box (MRRA, 16x AP mags)"
+ name = "Magazine box (M4RA, 16x AP mags)"
contains = list(
/obj/item/ammo_box/magazine/m4ra/ap,
)
diff --git a/code/datums/supply_packs/gear.dm b/code/datums/supply_packs/gear.dm
index 54a2ae221c9d..5343b93dabbd 100644
--- a/code/datums/supply_packs/gear.dm
+++ b/code/datums/supply_packs/gear.dm
@@ -63,3 +63,32 @@
containertype = /obj/structure/closet/crate/ammo
containername = "fulton recovery device crate"
group = "Gear"
+
+/datum/supply_packs/parachute
+ name = "parachute crate (x20)"
+ contains = list(
+ /obj/item/parachute,
+ /obj/item/parachute,
+ /obj/item/parachute,
+ /obj/item/parachute,
+ /obj/item/parachute,
+ /obj/item/parachute,
+ /obj/item/parachute,
+ /obj/item/parachute,
+ /obj/item/parachute,
+ /obj/item/parachute,
+ /obj/item/parachute,
+ /obj/item/parachute,
+ /obj/item/parachute,
+ /obj/item/parachute,
+ /obj/item/parachute,
+ /obj/item/parachute,
+ /obj/item/parachute,
+ /obj/item/parachute,
+ /obj/item/parachute,
+ /obj/item/parachute,
+ )
+ cost = 40
+ containertype = /obj/structure/closet/crate/supply
+ containername = "parachute crate"
+ group = "Gear"
diff --git a/code/datums/supply_packs/vehicle_ammo.dm b/code/datums/supply_packs/vehicle_ammo.dm
index 5dad91d27ed4..43ce36ec2b64 100644
--- a/code/datums/supply_packs/vehicle_ammo.dm
+++ b/code/datums/supply_packs/vehicle_ammo.dm
@@ -148,3 +148,15 @@
containertype = /obj/structure/closet/crate/ammo
containername = "M-87F Flare Launcher ammo crate"
group = "Vehicle Ammo"
+
+/datum/supply_packs/ammo_arcsentry
+ name = "RE700 Rotary Cannon magazines (x3)"
+ contains = list(
+ /obj/item/ammo_magazine/hardpoint/arc_sentry,
+ /obj/item/ammo_magazine/hardpoint/arc_sentry,
+ /obj/item/ammo_magazine/hardpoint/arc_sentry,
+ )
+ cost = 20
+ containertype = /obj/structure/closet/crate/ammo
+ containername = "RE700 Rotary Cannon ammo crate"
+ group = "Vehicle Ammo"
diff --git a/code/datums/supply_packs/vehicle_equipment.dm b/code/datums/supply_packs/vehicle_equipment.dm
new file mode 100644
index 000000000000..df106761d467
--- /dev/null
+++ b/code/datums/supply_packs/vehicle_equipment.dm
@@ -0,0 +1,9 @@
+/datum/supply_packs/arcsentry_replacement
+ name = "Replacement RE700 Rotary Cannon (x1)"
+ contains = list(
+ /obj/item/hardpoint/primary/arc_sentry,
+ )
+ cost = 25
+ containertype = /obj/structure/closet/crate/weapon
+ containername = "RE700 Rotary Cannon crate"
+ group = "Vehicle Equipment"
diff --git a/code/datums/tutorial/xenomorph/xenomorph_basic.dm b/code/datums/tutorial/xenomorph/xenomorph_basic.dm
index 965f7b55d3c0..276d2ac824f0 100644
--- a/code/datums/tutorial/xenomorph/xenomorph_basic.dm
+++ b/code/datums/tutorial/xenomorph/xenomorph_basic.dm
@@ -160,7 +160,16 @@
add_highlight(hugger, COLOR_YELLOW)
message_to_player("This is a facehugger, highlighted in yellow. Pick up the facehugger by clicking it.")
message_to_player("Stand next to the downed human and click them to apply the facehugger. Or drop the facehugger near them to see it leap onto their face automatically.")
- RegisterSignal(human_dummy, COMSIG_HUMAN_IMPREGNATE, PROC_REF(nest_cap_phase))
+ RegisterSignal(hugger, COMSIG_PARENT_QDELETING, PROC_REF(on_hugger_deletion))
+ RegisterSignal(human_dummy, COMSIG_HUMAN_IMPREGNATE, PROC_REF(nest_cap_phase), override = TRUE)
+
+/datum/tutorial/xenomorph/basic/proc/on_hugger_deletion(hugger)
+ SIGNAL_HANDLER
+ TUTORIAL_ATOM_FROM_TRACKING(/obj/effect/alien/resin/special/eggmorph, morpher)
+ morpher.stored_huggers = 1
+ add_highlight(morpher, COLOR_YELLOW)
+ message_to_player("Click the egg morpher to take a facehugger.")
+ RegisterSignal(xeno, COMSIG_XENO_TAKE_HUGGER_FROM_MORPHER, PROC_REF(take_facehugger_phase))
/datum/tutorial/xenomorph/basic/proc/nest_cap_phase()
SIGNAL_HANDLER
@@ -168,6 +177,7 @@
TUTORIAL_ATOM_FROM_TRACKING(/obj/item/clothing/mask/facehugger, hugger)
UnregisterSignal(human_dummy, COMSIG_MOB_TAKE_DAMAGE)
UnregisterSignal(human_dummy, COMSIG_HUMAN_IMPREGNATE)
+ UnregisterSignal(hugger, COMSIG_PARENT_QDELETING)
remove_highlight(hugger)
message_to_player("We should nest the infected human to make sure they don't get away.")
diff --git a/code/datums/vehicles.dm b/code/datums/vehicles.dm
index 36ac96938c6b..67070dd04c0b 100644
--- a/code/datums/vehicles.dm
+++ b/code/datums/vehicles.dm
@@ -37,3 +37,7 @@
/datum/map_template/interior/van
name = "Van"
interior_id = "van"
+
+/datum/map_template/interior/arc
+ name = "ARC"
+ interior_id = "arc"
diff --git a/code/defines/procs/announcement.dm b/code/defines/procs/announcement.dm
index 2ebba6a774e8..bad07104db22 100644
--- a/code/defines/procs/announcement.dm
+++ b/code/defines/procs/announcement.dm
@@ -42,14 +42,19 @@
continue
if(is_mainship_level(H.z)) // People on ship see everything
continue
+
+ // If they have iff AND a marine headset they will recieve announcements
+ if ((FACTION_MARINE in H.wear_id?.faction_group) && (istype(H.wear_l_ear, /obj/item/device/radio/headset/almayer) || istype(H.wear_r_ear, /obj/item/device/radio/headset/almayer)))
+ continue
+
if((H.faction != faction_to_display && !add_PMCs) || (H.faction != faction_to_display && add_PMCs && !(H.faction in FACTION_LIST_WY)) && !(faction_to_display in H.faction_group)) //faction checks
targets.Remove(H)
switch(logging)
if(ARES_LOG_MAIN)
- log_ares_announcement(title, message)
+ log_ares_announcement(title, message, signature)
if(ARES_LOG_SECURITY)
- log_ares_security(title, message)
+ log_ares_security(title, message, signature)
else if(faction_to_display == "Everyone (-Yautja)")
for(var/mob/M in targets)
@@ -98,9 +103,9 @@
switch(logging)
if(ARES_LOG_MAIN)
- log_ares_announcement("[MAIN_AI_SYSTEM] Comms Update", message)
+ log_ares_announcement("Comms Update", message, MAIN_AI_SYSTEM)
if(ARES_LOG_SECURITY)
- log_ares_security("[MAIN_AI_SYSTEM] Security Update", message)
+ log_ares_security("Security Update", message, MAIN_AI_SYSTEM)
/proc/ai_silent_announcement(message, channel_prefix, bypass_cooldown = FALSE)
if(!message)
@@ -133,9 +138,9 @@
message += "
Signed by,
[signature]"
switch(ares_logging)
if(ARES_LOG_MAIN)
- log_ares_announcement(title, message)
+ log_ares_announcement(title, message, signature)
if(ARES_LOG_SECURITY)
- log_ares_security(title, message)
+ log_ares_security(title, message, signature)
announcement_helper(message, title, targets, sound_to_play)
@@ -148,7 +153,7 @@
if(!ishuman(T) || isyautja(T) || !is_mainship_level((get_turf(T))?.z))
targets.Remove(T)
- log_ares_announcement("[title] Shipwide Update", message)
+ log_ares_announcement("Shipwide Update", message, title)
announcement_helper(message, title, targets, sound_to_play)
diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm
index 21f7b6b0a9be..52a35b715b1a 100644
--- a/code/game/atoms_movable.dm
+++ b/code/game/atoms_movable.dm
@@ -45,7 +45,10 @@
if(orbiting)
orbiting.end_orbit(src)
orbiting = null
- vis_contents.Cut()
+
+ vis_locs = null //clears this atom out of all viscontents
+ if(length(vis_contents))
+ vis_contents.Cut()
. = ..()
moveToNullspace() //so we move into null space. Must be after ..() b/c atom's Dispose handles deleting our lighting stuff
diff --git a/code/game/cas_manager/datums/cas_fire_envelope.dm b/code/game/cas_manager/datums/cas_fire_envelope.dm
index cc38b034c764..864d7f23a3e8 100644
--- a/code/game/cas_manager/datums/cas_fire_envelope.dm
+++ b/code/game/cas_manager/datums/cas_fire_envelope.dm
@@ -3,7 +3,10 @@
var/list/datum/cas_fire_mission/missions
var/fire_length
var/grace_period //how much time you have after initiating fire mission and before you can't change firemissions
- var/flyto_period //how much time it takes from sound alarm start to first hit. CAS is vulnerable here
+ var/first_warning
+ var/second_warning
+ var/third_warning
+ var/execution_start
var/flyoff_period //how much time it takes after shots fired to get off the map. CAS is vulnerable here
var/cooldown_period //how much time you have to wait before new Fire Mission run
var/soundeffect //what sound effect to play
@@ -36,10 +39,6 @@
for(var/datum/cas_fire_mission/mission in missions)
.["missions"] += list(mission.ui_data(user))
-
-/datum/cas_fire_envelope/proc/get_total_duration()
- return grace_period+flyto_period+flyoff_period
-
/datum/cas_fire_envelope/proc/update_weapons(list/obj/structure/dropship_equipment/weapon/weapons)
for(var/datum/cas_fire_mission/mission in missions)
mission.update_weapons(weapons, fire_length)
@@ -242,14 +241,60 @@
/datum/cas_fire_envelope/proc/check_firemission_loc(datum/cas_signal/target_turf)
return TRUE //redefined in child class
-/**
- * Execute firemission.
- */
+/// Step 1: Sets the stat to FIRE_MISSION_STATE_ON_TARGET and starts the sound effect for the fire mission.
+/datum/cas_fire_envelope/proc/play_sound(atom/target_turf)
+ stat = FIRE_MISSION_STATE_ON_TARGET
+ change_current_loc(target_turf)
+ playsound(target_turf, soundeffect, vol = 70, vary = TRUE, sound_range = 50, falloff = 8)
+
+/// Step 2, 3, 4: Warns nearby mobs of the incoming fire mission. Warning as 1 is non-precise, whereas 2 and 3 are precise.
+/datum/cas_fire_envelope/proc/chat_warning(atom/target_turf, range = 10, warning_number = 1)
+ var/ds_identifier = "LARGE BIRD"
+ var/fm_identifier = "SPIT FIRE"
+ var/relative_dir
+ for(var/mob/mob in range(15, target_turf))
+ if (mob.mob_flags & KNOWS_TECHNOLOGY)
+ ds_identifier = "DROPSHIP"
+ fm_identifier = "FIRE"
+ if(get_turf(mob) == target_turf)
+ relative_dir = 0
+ else
+ relative_dir = Get_Compass_Dir(mob, target_turf)
+ switch(warning_number)
+ if(1)
+ mob.show_message( \
+ SPAN_HIGHDANGER("YOU HEAR THE [ds_identifier] ROAR AS IT PREPARES TO [fm_identifier] NEAR YOU!"),SHOW_MESSAGE_VISIBLE, \
+ SPAN_HIGHDANGER("YOU HEAR SOMETHING FLYING CLOSER TO YOU!") , SHOW_MESSAGE_AUDIBLE \
+ )
+ if(2)
+ mob.show_message( \
+ SPAN_HIGHDANGER("A [ds_identifier] FLIES [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), SHOW_MESSAGE_VISIBLE, \
+ SPAN_HIGHDANGER("YOU HEAR SOMETHING GO [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), SHOW_MESSAGE_AUDIBLE \
+ )
+ if(3)
+ mob.show_message( \
+ SPAN_HIGHDANGER("A [ds_identifier] FLIES [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), SHOW_MESSAGE_VISIBLE, \
+ SPAN_HIGHDANGER("YOU HEAR SOMETHING GO [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), SHOW_MESSAGE_AUDIBLE \
+ )
+
+/// Step 5: Actually executes the fire mission updating stat to FIRE_MISSION_STATE_FIRING and then FIRE_MISSION_STATE_OFF_TARGET
+/datum/cas_fire_envelope/proc/open_fire(atom/target_turf,datum/cas_fire_mission/mission,dir)
+ stat = FIRE_MISSION_STATE_FIRING
+ mission.execute_firemission(linked_console, target_turf, dir, fire_length, step_delay, src)
+ stat = FIRE_MISSION_STATE_OFF_TARGET
+
+/// Step 6: Sets the fire mission stat to FIRE_MISSION_STATE_COOLDOWN
+/datum/cas_fire_envelope/proc/flyoff()
+ stat = FIRE_MISSION_STATE_COOLDOWN
+
+/// Step 7: Sets the fire mission stat to FIRE_MISSION_STATE_IDLE
+/datum/cas_fire_envelope/proc/end_cooldown()
+ stat = FIRE_MISSION_STATE_IDLE
+
+
/datum/cas_fire_envelope/proc/execute_firemission_unsafe(datum/cas_signal/signal, turf/target_turf, dir, datum/cas_fire_mission/mission)
stat = FIRE_MISSION_STATE_IN_TRANSIT
to_chat(usr, SPAN_ALERT("Firemission underway!"))
- sleep(grace_period)
- stat = FIRE_MISSION_STATE_ON_TARGET
if(!target_turf)
stat = FIRE_MISSION_STATE_IDLE
mission_error = "Target Lost."
@@ -258,29 +303,27 @@
stat = FIRE_MISSION_STATE_IDLE
mission_error = "Target is off bounds or obstructed."
return
- change_current_loc(target_turf)
- playsound(source = target_turf, soundin = soundeffect, vol = 70, vary = TRUE, sound_range = 50, falloff = 8)
- for(var/mob/mob in range(15, target_turf))
- var/ds_identifier = "LARGE BIRD"
- var/fm_identifier = "SPIT FIRE"
- if (mob.mob_flags & KNOWS_TECHNOLOGY)
- ds_identifier = "DROPSHIP"
- fm_identifier = "FIRE"
+ var/obj/effect/firemission_effect = new(target_turf)
- mob.show_message( \
- SPAN_HIGHDANGER("YOU HEAR THE [ds_identifier] ROAR AS IT PREPARES TO [fm_identifier] NEAR YOU!"),SHOW_MESSAGE_VISIBLE, \
- SPAN_HIGHDANGER("YOU HEAR SOMETHING FLYING CLOSER TO YOU!") , SHOW_MESSAGE_AUDIBLE \
- )
+ firemission_effect.icon = 'icons/obj/items/weapons/projectiles.dmi'
+ firemission_effect.icon_state = "laser_target2"
+ firemission_effect.mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+ firemission_effect.invisibility = INVISIBILITY_MAXIMUM
+ QDEL_IN(firemission_effect, 12 SECONDS)
- sleep(flyto_period)
- stat = FIRE_MISSION_STATE_FIRING
- mission.execute_firemission(linked_console, target_turf, dir, fire_length, step_delay, src)
- stat = FIRE_MISSION_STATE_OFF_TARGET
- sleep(flyoff_period)
- stat = FIRE_MISSION_STATE_COOLDOWN
- sleep(cooldown_period)
- stat = FIRE_MISSION_STATE_IDLE
+
+ notify_ghosts(header = "CAS Fire Mission", message = "[usr ? usr : "Someone"] is launching Fire Mission '[mission.name]' at [get_area(target_turf)].", source = firemission_effect)
+ msg_admin_niche("[usr ? key_name(usr) : "Someone"] is launching Fire Mission '[mission.name]' at ([target_turf.x],[target_turf.y],[target_turf.z]) [ADMIN_JMP(target_turf)]")
+
+
+ addtimer(CALLBACK(src, PROC_REF(play_sound), target_turf), grace_period)
+ addtimer(CALLBACK(src, PROC_REF(chat_warning), target_turf, 15, 1), first_warning)
+ addtimer(CALLBACK(src, PROC_REF(chat_warning), target_turf, 15, 2), second_warning)
+ addtimer(CALLBACK(src, PROC_REF(chat_warning), target_turf, 10, 3), third_warning)
+ addtimer(CALLBACK(src, PROC_REF(open_fire), target_turf, mission,dir), execution_start)
+ addtimer(CALLBACK(src, PROC_REF(flyoff)), flyoff_period)
+ addtimer(CALLBACK(src, PROC_REF(end_cooldown)), cooldown_period)
/**
* Change attack vector for firemission
@@ -324,10 +367,13 @@
/datum/cas_fire_envelope/uscm_dropship
fire_length = 12
- grace_period = 5 SECONDS
- flyto_period = 4 SECONDS //sleep in the FM itself has been increased by one more second
- flyoff_period = 5 SECONDS
- cooldown_period = 10 SECONDS
+ grace_period = 5 SECONDS
+ first_warning = 6 SECONDS
+ second_warning = 8 SECONDS
+ third_warning = 9 SECONDS
+ execution_start = 10 SECONDS
+ flyoff_period = 15 SECONDS
+ cooldown_period = 25 SECONDS
soundeffect = 'sound/weapons/dropship_sonic_boom.ogg' //BOOM~WOOOOOSH~HSOOOOOW~BOOM
step_delay = 3
max_offset = 12
diff --git a/code/game/cas_manager/datums/cas_fire_mission.dm b/code/game/cas_manager/datums/cas_fire_mission.dm
index 927dded210f0..dc55e057edcd 100644
--- a/code/game/cas_manager/datums/cas_fire_mission.dm
+++ b/code/game/cas_manager/datums/cas_fire_mission.dm
@@ -164,51 +164,6 @@
if(initial_turf == null || check(linked_console) != FIRE_MISSION_ALL_GOOD)
return FIRE_MISSION_NOT_EXECUTABLE
- var/obj/effect/firemission_effect = new(initial_turf)
-
- firemission_effect.icon = 'icons/obj/items/weapons/projectiles.dmi'
- firemission_effect.icon_state = "laser_target2"
- firemission_effect.mouse_opacity = MOUSE_OPACITY_TRANSPARENT
- firemission_effect.invisibility = INVISIBILITY_MAXIMUM
- QDEL_IN(firemission_effect, 5 SECONDS)
-
- notify_ghosts(header = "CAS Fire Mission", message = "[usr ? usr : "Someone"] is launching Fire Mission '[name]' at [get_area(initial_turf)].", source = firemission_effect)
- msg_admin_niche("[usr ? key_name(usr) : "Someone"] is launching Fire Mission '[name]' at ([initial_turf.x],[initial_turf.y],[initial_turf.z]) [ADMIN_JMP(initial_turf)]")
-
- var/relative_dir
- for(var/mob/mob in range(15, initial_turf))
- if(get_turf(mob) == initial_turf)
- relative_dir = 0
- else
- relative_dir = Get_Compass_Dir(mob, initial_turf)
-
- var/ds_identifier = "LARGE BIRD"
- if (mob.mob_flags & KNOWS_TECHNOLOGY)
- ds_identifier = "DROPSHIP"
-
- mob.show_message( \
- SPAN_HIGHDANGER("A [ds_identifier] FLIES [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), SHOW_MESSAGE_VISIBLE, \
- SPAN_HIGHDANGER("YOU HEAR SOMETHING GO [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), SHOW_MESSAGE_AUDIBLE \
- )
-
- // Xenos have time to react to the first message
- sleep(1.5 SECONDS)
-
- for(var/mob/mob in range(10, initial_turf))
- if(get_turf(mob) == initial_turf)
- relative_dir = 0
- else
- relative_dir = Get_Compass_Dir(mob, initial_turf)
-
- var/ds_identifier = "LARGE BIRD"
- if (mob.mob_flags & KNOWS_TECHNOLOGY)
- ds_identifier = "DROPSHIP"
-
- mob.show_message( \
- SPAN_HIGHDANGER("A [ds_identifier] FIRES [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), 1, \
- SPAN_HIGHDANGER("YOU HEAR SOMETHING FIRE [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), 2 \
- )
-
var/turf/current_turf = initial_turf
var/tally_step = steps / mission_length //how much shots we need before moving to next turf
var/next_step = tally_step //when we move to next turf
diff --git a/code/game/gamemodes/cm_initialize.dm b/code/game/gamemodes/cm_initialize.dm
index 400acdcb122a..af63b99e4e57 100644
--- a/code/game/gamemodes/cm_initialize.dm
+++ b/code/game/gamemodes/cm_initialize.dm
@@ -175,7 +175,7 @@ Additional game mode variables.
if(pred_candidate) pred_candidate.moveToNullspace() //Nullspace it for garbage collection later.
-#define calculate_pred_max (Floor(length(GLOB.player_list) / pred_per_players) + pred_additional_max + pred_start_count)
+#define calculate_pred_max (floor(length(GLOB.player_list) / pred_per_players) + pred_additional_max + pred_start_count)
/datum/game_mode/proc/check_predator_late_join(mob/pred_candidate, show_warning = 1)
diff --git a/code/game/jobs/whitelist.dm b/code/game/jobs/whitelist.dm
index 09db84fec2c2..8cd91a494c83 100644
--- a/code/game/jobs/whitelist.dm
+++ b/code/game/jobs/whitelist.dm
@@ -24,6 +24,8 @@
if(isSenator(src))
add_verb(src, /client/proc/whitelist_panel)
+ if(isCouncil(src))
+ add_verb(src, /client/proc/other_records)
/client
var/datum/whitelist_panel/wl_panel
@@ -144,8 +146,10 @@ GLOBAL_LIST_INIT(misc_flags, list(
/datum/whitelist_panel/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
- return
+ return FALSE
var/mob/user = ui.user
+ if(!isSenator(user.client) && !CLIENT_HAS_RIGHTS(user.client, R_PERMISSIONS))
+ return FALSE
switch(action)
if("go_back")
go_back()
@@ -165,6 +169,7 @@ GLOBAL_LIST_INIT(misc_flags, list(
return
var/datum/entity/player/player = get_player_from_key(player_key)
player.set_whitelist_status(new_rights)
+ player.add_note("Whitelists updated by [user.key]. Reason: '[reason]'.", FALSE, NOTE_WHITELIST)
to_chat(user, SPAN_HELPFUL("Whitelists for [player_key] updated."))
message_admins("Whitelists for [player_key] updated by [key_name(user)]. Reason: '[reason]'.")
log_admin("WHITELISTS: Flags for [player_key] changed from [target_rights] to [new_rights]. Reason: '[reason]'.")
diff --git a/code/game/machinery/ARES/ARES_interface.dm b/code/game/machinery/ARES/ARES_interface.dm
index d6f58f371715..04547d079664 100644
--- a/code/game/machinery/ARES/ARES_interface.dm
+++ b/code/game/machinery/ARES/ARES_interface.dm
@@ -214,6 +214,8 @@
data["active_ref"] = active_ref
data["conversations"] = logged_convos
+ data["security_vents"] = link.get_ares_vents()
+
return data
/obj/structure/machinery/computer/ares_console/ui_status(mob/user, datum/ui_state/state)
@@ -227,19 +229,19 @@
. = ..()
if(.)
return
-
- playsound(src, "keyboard_alt", 15, 1)
- var/mob/living/carbon/human/operator = ui.user
+ var/mob/user = ui.user
+ var/playsound = TRUE
switch (action)
if("go_back")
if(!last_menu)
- return to_chat(operator, SPAN_WARNING("Error, no previous page detected."))
+ return to_chat(user, SPAN_WARNING("Error, no previous page detected."))
var/temp_holder = current_menu
current_menu = last_menu
last_menu = temp_holder
if("login")
+ var/mob/living/carbon/human/operator = user
var/obj/item/card/id/idcard = operator.get_active_hand()
if(istype(idcard))
authentication = get_ares_access(idcard)
@@ -250,7 +252,7 @@
authentication = get_ares_access(idcard)
last_login = idcard.registered_name
else
- to_chat(operator, SPAN_WARNING("You require an ID card to access this terminal!"))
+ to_chat(user, SPAN_WARNING("You require an ID card to access this terminal!"))
playsound(src, 'sound/machines/buzz-two.ogg', 15, 1)
return FALSE
if(authentication)
@@ -258,14 +260,14 @@
current_menu = "main"
if("sudo")
- var/new_user = tgui_input_text(operator, "Enter Sudo Username", "Sudo User", encode = FALSE)
+ var/new_user = tgui_input_text(user, "Enter Sudo Username", "Sudo User", encode = FALSE)
if(new_user)
if(new_user == sudo_holder)
last_login = sudo_holder
sudo_holder = null
return FALSE
if(new_user == last_login)
- to_chat(operator, SPAN_WARNING("Already remote logged in as this user."))
+ to_chat(user, SPAN_WARNING("Already remote logged in as this user."))
playsound(src, 'sound/machines/buzz-two.ogg', 15, 1)
return FALSE
sudo_holder = last_login
@@ -331,6 +333,9 @@
if("page_tech")
last_menu = current_menu
current_menu = "tech_log"
+ if("page_core_sec")
+ last_menu = current_menu
+ current_menu = "core_security"
// -- Delete Button -- //
if("delete_record")
@@ -363,6 +368,10 @@
new_title = "[record.title] at [record.time]"
new_details = record.details
datacore.records_tech -= record
+ if(ARES_RECORD_FLIGHT)
+ new_title = "[record.title] at [record.time]"
+ new_details = record.details
+ datacore.records_flight -= record
new_delete.details = new_details
new_delete.user = last_login
@@ -388,9 +397,9 @@
datacore.records_talking -= conversation
if("message_ares")
- var/message = tgui_input_text(operator, "What do you wish to say to ARES?", "ARES Message", encode = FALSE)
+ var/message = tgui_input_text(user, "What do you wish to say to ARES?", "ARES Message", encode = FALSE)
if(message)
- message_ares(message, operator, params["active_convo"])
+ message_ares(message, user, params["active_convo"])
if("read_record")
var/datum/ares_record/deleted_talk/conversation = locate(params["record"])
@@ -403,64 +412,64 @@
// -- Emergency Buttons -- //
if("general_quarters")
if(!COOLDOWN_FINISHED(datacore, ares_quarters_cooldown))
- to_chat(operator, SPAN_WARNING("It has not been long enough since the last General Quarters call!"))
+ to_chat(user, SPAN_WARNING("It has not been long enough since the last General Quarters call!"))
playsound(src, 'sound/machines/buzz-two.ogg', 15, 1)
return FALSE
if(GLOB.security_level < SEC_LEVEL_RED)
set_security_level(SEC_LEVEL_RED, no_sound = TRUE, announce = FALSE)
shipwide_ai_announcement("ATTENTION! GENERAL QUARTERS. ALL HANDS, MAN YOUR BATTLESTATIONS.", MAIN_AI_SYSTEM, 'sound/effects/GQfullcall.ogg')
- log_game("[key_name(operator)] has called for general quarters via ARES.")
- message_admins("[key_name_admin(operator)] has called for general quarters via ARES.")
- log_ares_security("General Quarters", "[last_login] has called for general quarters via ARES.")
+ log_game("[key_name(user)] has called for general quarters via ARES.")
+ message_admins("[key_name_admin(user)] has called for general quarters via ARES.")
+ log_ares_security("General Quarters", "Called for general quarters via ARES.", last_login)
COOLDOWN_START(datacore, ares_quarters_cooldown, 10 MINUTES)
. = TRUE
if("evacuation_start")
if(GLOB.security_level < SEC_LEVEL_RED)
- to_chat(operator, SPAN_WARNING("The ship must be under red alert in order to enact evacuation procedures."))
+ to_chat(user, SPAN_WARNING("The ship must be under red alert in order to enact evacuation procedures."))
playsound(src, 'sound/machines/buzz-two.ogg', 15, 1)
return FALSE
if(SShijack.evac_admin_denied)
- to_chat(operator, SPAN_WARNING("The USCM has placed a lock on deploying the evacuation pods."))
+ to_chat(user, SPAN_WARNING("The USCM has placed a lock on deploying the evacuation pods."))
playsound(src, 'sound/machines/buzz-two.ogg', 15, 1)
return FALSE
if(!SShijack.initiate_evacuation())
- to_chat(operator, SPAN_WARNING("You are unable to initiate an evacuation procedure right now!"))
+ to_chat(user, SPAN_WARNING("You are unable to initiate an evacuation procedure right now!"))
playsound(src, 'sound/machines/buzz-two.ogg', 15, 1)
return FALSE
- log_game("[key_name(operator)] has called for an emergency evacuation via ARES.")
- message_admins("[key_name_admin(operator)] has called for an emergency evacuation via ARES.")
- log_ares_security("Initiate Evacuation", "[last_login] has called for an emergency evacuation via ARES.")
+ log_game("[key_name(user)] has called for an emergency evacuation via ARES.")
+ message_admins("[key_name_admin(user)] has called for an emergency evacuation via ARES.")
+ log_ares_security("Initiate Evacuation", "Called for an emergency evacuation via ARES.", last_login)
. = TRUE
if("distress")
if(!SSticker.mode)
return FALSE //Not a game mode?
if(world.time < DISTRESS_TIME_LOCK)
- to_chat(operator, SPAN_WARNING("You have been here for less than six minutes... what could you possibly have done!"))
+ to_chat(user, SPAN_WARNING("You have been here for less than six minutes... what could you possibly have done!"))
playsound(src, 'sound/machines/buzz-two.ogg', 15, 1)
return FALSE
if(!COOLDOWN_FINISHED(datacore, ares_distress_cooldown))
- to_chat(operator, SPAN_WARNING("The distress launcher is cooling down!"))
+ to_chat(user, SPAN_WARNING("The distress launcher is cooling down!"))
playsound(src, 'sound/machines/buzz-two.ogg', 15, 1)
return FALSE
if(GLOB.security_level == SEC_LEVEL_DELTA)
- to_chat(operator, SPAN_WARNING("The ship is already undergoing self destruct procedures!"))
+ to_chat(user, SPAN_WARNING("The ship is already undergoing self destruct procedures!"))
playsound(src, 'sound/machines/buzz-two.ogg', 15, 1)
return FALSE
if(GLOB.security_level < SEC_LEVEL_RED)
- to_chat(operator, SPAN_WARNING("The ship must be under red alert to launch a distress beacon!"))
+ to_chat(user, SPAN_WARNING("The ship must be under red alert to launch a distress beacon!"))
playsound(src, 'sound/machines/buzz-two.ogg', 15, 1)
return FALSE
for(var/client/admin in GLOB.admins)
if((R_ADMIN|R_MOD) & admin.admin_holder.rights)
playsound_client(admin,'sound/effects/sos-morse-code.ogg',10)
- SSticker.mode.request_ert(operator, TRUE)
- to_chat(operator, SPAN_NOTICE("A distress beacon request has been sent to USCM High Command."))
+ SSticker.mode.request_ert(user, TRUE)
+ to_chat(user, SPAN_NOTICE("A distress beacon request has been sent to USCM High Command."))
COOLDOWN_START(datacore, ares_distress_cooldown, COOLDOWN_COMM_REQUEST)
return TRUE
@@ -468,28 +477,57 @@
if(!SSticker.mode)
return FALSE //Not a game mode?
if(world.time < NUCLEAR_TIME_LOCK)
- to_chat(operator, SPAN_WARNING("It is too soon to request Nuclear Ordnance!"))
+ to_chat(user, SPAN_WARNING("It is too soon to request Nuclear Ordnance!"))
playsound(src, 'sound/machines/buzz-two.ogg', 15, 1)
return FALSE
if(!COOLDOWN_FINISHED(datacore, ares_nuclear_cooldown))
- to_chat(operator, SPAN_WARNING("The ordnance request frequency is garbled, wait for reset!"))
+ to_chat(user, SPAN_WARNING("The ordnance request frequency is garbled, wait for reset!"))
playsound(src, 'sound/machines/buzz-two.ogg', 15, 1)
return FALSE
if(GLOB.security_level == SEC_LEVEL_DELTA || SSticker.mode.is_in_endgame)
- to_chat(operator, SPAN_WARNING("The mission has failed catastrophically, what do you want a nuke for?!"))
+ to_chat(user, SPAN_WARNING("The mission has failed catastrophically, what do you want a nuke for?!"))
playsound(src, 'sound/machines/buzz-two.ogg', 15, 1)
return FALSE
- var/reason = tgui_input_text(operator, "Please enter reason nuclear ordnance is required.", "Reason for Nuclear Ordnance")
+ var/reason = tgui_input_text(user, "Please enter reason nuclear ordnance is required.", "Reason for Nuclear Ordnance")
if(!reason)
return FALSE
for(var/client/admin in GLOB.admins)
if((R_ADMIN|R_MOD) & admin.admin_holder.rights)
playsound_client(admin,'sound/effects/sos-morse-code.ogg',10)
- message_admins("[key_name(operator)] has requested use of Nuclear Ordnance (via ARES)! Reason: [reason] [CC_MARK(operator)] (APPROVE) (DENY) [ADMIN_JMP_USER(operator)] [CC_REPLY(operator)]")
- to_chat(operator, SPAN_NOTICE("A nuclear ordnance request has been sent to USCM High Command for the following reason: [reason]"))
- log_ares_security("Nuclear Ordnance Request", "[last_login] has sent a request for nuclear ordnance for the following reason: [reason]")
+ message_admins("[key_name(user)] has requested use of Nuclear Ordnance (via ARES)! Reason: [reason] [CC_MARK(user)] (APPROVE) (DENY) [ADMIN_JMP_USER(user)] [CC_REPLY(user)]")
+ to_chat(user, SPAN_NOTICE("A nuclear ordnance request has been sent to USCM High Command for the following reason: [reason]"))
+ log_ares_security("Nuclear Ordnance Request", "Sent a request for nuclear ordnance for the following reason: [reason]", last_login)
if(ares_can_interface())
ai_silent_announcement("[last_login] has sent a request for nuclear ordnance to USCM High Command.", ".V")
ai_silent_announcement("Reason given: [reason].", ".V")
COOLDOWN_START(datacore, ares_nuclear_cooldown, COOLDOWN_COMM_DESTRUCT)
return TRUE
+
+ if("trigger_vent")
+ playsound = FALSE
+ var/obj/structure/pipes/vents/pump/no_boom/gas/sec_vent = locate(params["vent"])
+ if(!istype(sec_vent) || sec_vent.welded)
+ to_chat(user, SPAN_WARNING("ERROR: Gas release failure."))
+ playsound(src, 'sound/machines/buzz-two.ogg', 15, 1)
+ return FALSE
+ if(!COOLDOWN_FINISHED(sec_vent, vent_trigger_cooldown))
+ to_chat(user, SPAN_WARNING("ERROR: Insufficient gas reserve for this vent."))
+ playsound(src, 'sound/machines/buzz-two.ogg', 15, 1)
+ return FALSE
+ to_chat(user, SPAN_WARNING("Initiating gas release from [sec_vent.vent_tag]."))
+ playsound(src, 'sound/machines/chime.ogg', 15, 1)
+ COOLDOWN_START(sec_vent, vent_trigger_cooldown, COOLDOWN_ARES_VENT)
+ ares_apollo_talk("Nerve Gas release imminent from [sec_vent.vent_tag].")
+ log_ares_security("Nerve Gas Release", "Released Nerve Gas from Vent '[sec_vent.vent_tag]'.", last_login)
+ sec_vent.create_gas(VENT_GAS_CN20_XENO, 6, 5 SECONDS)
+ log_admin("[key_name(user)] released nerve gas from Vent '[sec_vent.vent_tag]' via ARES.")
+
+ if("security_lockdown")
+ if(!COOLDOWN_FINISHED(datacore, aicore_lockdown))
+ to_chat(user, SPAN_BOLDWARNING("AI Core Lockdown procedures are on cooldown! They will be ready in [COOLDOWN_SECONDSLEFT(datacore, aicore_lockdown)] seconds!"))
+ return FALSE
+ aicore_lockdown(user)
+ return TRUE
+
+ if(playsound)
+ playsound(src, "keyboard_alt", 15, 1)
diff --git a/code/game/machinery/ARES/ARES_interface_admin.dm b/code/game/machinery/ARES/ARES_interface_admin.dm
index 5ca7a9ba171d..758ba9fbb5e7 100644
--- a/code/game/machinery/ARES/ARES_interface_admin.dm
+++ b/code/game/machinery/ARES/ARES_interface_admin.dm
@@ -231,6 +231,8 @@
logged_access += list(current_ticket)
data["access_tickets"] = logged_access
+ data["security_vents"] = get_ares_vents()
+
return data
@@ -321,6 +323,9 @@
if("page_tech")
admin_interface.last_menu = admin_interface.current_menu
admin_interface.current_menu = "tech_log"
+ if("page_core_sec")
+ admin_interface.last_menu = admin_interface.current_menu
+ admin_interface.current_menu = "core_security"
if("page_access_management")
admin_interface.last_menu = admin_interface.current_menu
admin_interface.current_menu = "access_management"
@@ -491,3 +496,21 @@
ares_apollo_talk("Priority [ticket.ticket_type] [ticket.ticket_id] has been [choice] by [MAIN_AI_SYSTEM].")
to_chat(user, SPAN_NOTICE("[ticket.ticket_type] [ticket.ticket_id] marked as [choice]."))
return TRUE
+
+ if("trigger_vent")
+ var/obj/structure/pipes/vents/pump/no_boom/gas/sec_vent = locate(params["vent"])
+ if(!istype(sec_vent) || sec_vent.welded)
+ to_chat(user, SPAN_WARNING("ERROR: Gas release failure."))
+ playsound(src, 'sound/machines/buzz-two.ogg', 15, 1)
+ return FALSE
+ if(!COOLDOWN_FINISHED(sec_vent, vent_trigger_cooldown))
+ to_chat(user, SPAN_WARNING("ERROR: Insufficient gas reserve for this vent."))
+ playsound(src, 'sound/machines/buzz-two.ogg', 15, 1)
+ return FALSE
+ to_chat(user, SPAN_WARNING("Initiating gas release from [sec_vent.vent_tag]."))
+ playsound(src, 'sound/machines/chime.ogg', 15, 1)
+ COOLDOWN_START(sec_vent, vent_trigger_cooldown, COOLDOWN_ARES_VENT)
+ ares_apollo_talk("Nerve Gas release imminent from [sec_vent.vent_tag].")
+ log_ares_security("Nerve Gas Release", "Released Nerve Gas from Vent '[sec_vent.vent_tag]'.", MAIN_AI_SYSTEM)
+ sec_vent.create_gas(VENT_GAS_CN20_XENO, 6, 5 SECONDS)
+ log_admin("[key_name(user)] released nerve gas from Vent '[sec_vent.vent_tag]' via ARES.")
diff --git a/code/game/machinery/ARES/ARES_interface_apollo.dm b/code/game/machinery/ARES/ARES_interface_apollo.dm
index c1c936676dc5..243ecdf1355f 100644
--- a/code/game/machinery/ARES/ARES_interface_apollo.dm
+++ b/code/game/machinery/ARES/ARES_interface_apollo.dm
@@ -141,6 +141,8 @@
requesting_access += access_ticket.ticket_name
data["access_tickets"] = logged_access
+ data["security_vents"] = link.get_ares_vents()
+
return data
/obj/structure/machinery/computer/working_joe/ui_status(mob/user, datum/ui_state/state)
@@ -156,29 +158,29 @@
return
var/playsound = TRUE
- var/mob/living/carbon/human/operator = ui.user
+ var/mob/living/carbon/human/user = ui.user
switch (action)
if("go_back")
if(!last_menu)
- return to_chat(operator, SPAN_WARNING("Error, no previous page detected."))
+ return to_chat(user, SPAN_WARNING("Error, no previous page detected."))
var/temp_holder = current_menu
current_menu = last_menu
last_menu = temp_holder
if("login")
- var/obj/item/card/id/idcard = operator.get_active_hand()
+ var/obj/item/card/id/idcard = user.get_active_hand()
if(istype(idcard))
authentication = get_ares_access(idcard)
last_login = idcard.registered_name
- else if(operator.wear_id)
- idcard = operator.wear_id
+ else if(user.wear_id)
+ idcard = user.wear_id
if(istype(idcard))
authentication = get_ares_access(idcard)
last_login = idcard.registered_name
else
- to_chat(operator, SPAN_WARNING("You require an ID card to access this terminal!"))
+ to_chat(user, SPAN_WARNING("You require an ID card to access this terminal!"))
playsound(src, 'sound/machines/buzz-two.ogg', 15, 1)
return FALSE
if(authentication)
@@ -211,29 +213,32 @@
if("page_maintenance")
last_menu = current_menu
current_menu = "maint_claim"
+ if("page_core_gas")
+ last_menu = current_menu
+ current_menu = "core_security_gas"
if("toggle_sound")
notify_sounds = !notify_sounds
if("new_report")
var/priority_report = FALSE
- var/maint_type = tgui_input_list(operator, "What is the type of maintenance item you wish to report?", "Report Category", GLOB.maintenance_categories, 30 SECONDS)
+ var/maint_type = tgui_input_list(user, "What is the type of maintenance item you wish to report?", "Report Category", GLOB.maintenance_categories, 30 SECONDS)
switch(maint_type)
if("Major Structural Damage", "Fire", "Communications Failure", "Power Generation Failure")
priority_report = TRUE
if(!maint_type)
return FALSE
- var/details = tgui_input_text(operator, "What are the details for this report?", "Ticket Details", encode = FALSE)
+ var/details = tgui_input_text(user, "What are the details for this report?", "Ticket Details", encode = FALSE)
if(!details)
return FALSE
if((authentication >= APOLLO_ACCESS_REPORTER) && !priority_report)
- var/is_priority = tgui_alert(operator, "Is this a priority report?", "Priority designation", list("Yes", "No"))
+ var/is_priority = tgui_alert(user, "Is this a priority report?", "Priority designation", list("Yes", "No"))
if(is_priority == "Yes")
priority_report = TRUE
- var/confirm = alert(operator, "Please confirm the submission of your maintenance report. \n\n Priority: [priority_report ? "Yes" : "No"]\n Category: '[maint_type]'\n Details: '[details]'\n\n Is this correct?", "Confirmation", "Yes", "No")
+ var/confirm = alert(user, "Please confirm the submission of your maintenance report. \n\n Priority: [priority_report ? "Yes" : "No"]\n Category: '[maint_type]'\n Details: '[details]'\n\n Is this correct?", "Confirmation", "Yes", "No")
if(confirm == "Yes")
if(link)
var/datum/ares_ticket/maintenance/maint_ticket = new(last_login, maint_type, details, priority_report)
@@ -242,7 +247,7 @@
ares_apollo_talk("Priority Maintenance Report: [maint_type] - ID [maint_ticket.ticket_id]. Seek and resolve.")
else
send_notifcation()
- log_game("ARES: Maintenance Ticket '\ref[maint_ticket]' created by [key_name(operator)] as [last_login] with Category '[maint_type]' and Details of '[details]'.")
+ log_game("ARES: Maintenance Ticket '\ref[maint_ticket]' created by [key_name(user)] as [last_login] with Category '[maint_type]' and Details of '[details]'.")
return TRUE
return FALSE
@@ -254,14 +259,14 @@
var/assigned = ticket.ticket_assignee
if(assigned)
if(assigned == last_login)
- var/prompt = tgui_alert(operator, "You already claimed this ticket! Do you wish to drop your claim?", "Unclaim ticket", list("Yes", "No"))
+ var/prompt = tgui_alert(user, "You already claimed this ticket! Do you wish to drop your claim?", "Unclaim ticket", list("Yes", "No"))
if(prompt != "Yes")
return FALSE
/// set ticket back to pending
ticket.ticket_assignee = null
ticket.ticket_status = TICKET_PENDING
return claim
- var/choice = tgui_alert(operator, "This ticket has already been claimed by [assigned]! Do you wish to override their claim?", "Claim Override", list("Yes", "No"))
+ var/choice = tgui_alert(user, "This ticket has already been claimed by [assigned]! Do you wish to override their claim?", "Claim Override", list("Yes", "No"))
if(choice != "Yes")
claim = FALSE
if(claim)
@@ -274,9 +279,9 @@
if(!istype(ticket))
return FALSE
if(ticket.ticket_submitter != last_login)
- to_chat(operator, SPAN_WARNING("You cannot cancel a ticket that does not belong to you!"))
+ to_chat(user, SPAN_WARNING("You cannot cancel a ticket that does not belong to you!"))
return FALSE
- to_chat(operator, SPAN_WARNING("[ticket.ticket_type] [ticket.ticket_id] has been cancelled."))
+ to_chat(user, SPAN_WARNING("[ticket.ticket_type] [ticket.ticket_id] has been cancelled."))
ticket.ticket_status = TICKET_CANCELLED
if(ticket.ticket_priority)
ares_apollo_talk("Priority [ticket.ticket_type] [ticket.ticket_id] has been cancelled.")
@@ -289,9 +294,9 @@
if(!istype(ticket))
return FALSE
if(ticket.ticket_assignee != last_login && ticket.ticket_assignee) //must be claimed by you or unclaimed.)
- to_chat(operator, SPAN_WARNING("You cannot update a ticket that is not assigned to you!"))
+ to_chat(user, SPAN_WARNING("You cannot update a ticket that is not assigned to you!"))
return FALSE
- var/choice = tgui_alert(operator, "What do you wish to mark the ticket as?", "Mark", list(TICKET_COMPLETED, TICKET_REJECTED), 20 SECONDS)
+ var/choice = tgui_alert(user, "What do you wish to mark the ticket as?", "Mark", list(TICKET_COMPLETED, TICKET_REJECTED), 20 SECONDS)
switch(choice)
if(TICKET_COMPLETED)
ticket.ticket_status = TICKET_COMPLETED
@@ -303,39 +308,39 @@
ares_apollo_talk("Priority [ticket.ticket_type] [ticket.ticket_id] has been [choice] by [last_login].")
else
send_notifcation()
- to_chat(operator, SPAN_NOTICE("[ticket.ticket_type] [ticket.ticket_id] marked as [choice]."))
+ to_chat(user, SPAN_NOTICE("[ticket.ticket_type] [ticket.ticket_id] marked as [choice]."))
return TRUE
if("new_access")
- var/obj/item/card/id/idcard = operator.get_active_hand()
+ var/obj/item/card/id/idcard = user.get_active_hand()
var/has_id = FALSE
if(istype(idcard))
has_id = TRUE
- else if(operator.wear_id)
- idcard = operator.wear_id
+ else if(user.wear_id)
+ idcard = user.wear_id
if(istype(idcard))
has_id = TRUE
if(!has_id)
- to_chat(operator, SPAN_WARNING("You require an ID card to request an access ticket!"))
+ to_chat(user, SPAN_WARNING("You require an ID card to request an access ticket!"))
playsound(src, 'sound/machines/buzz-two.ogg', 15, 1)
return FALSE
if(idcard.registered_name != last_login)
- to_chat(operator, SPAN_WARNING("This ID card does not match the active login!"))
+ to_chat(user, SPAN_WARNING("This ID card does not match the active login!"))
playsound(src, 'sound/machines/buzz-two.ogg', 15, 1)
return FALSE
- var/details = tgui_input_text(operator, "What is the purpose of this access ticket?", "Ticket Details", encode = FALSE)
+ var/details = tgui_input_text(user, "What is the purpose of this access ticket?", "Ticket Details", encode = FALSE)
if(!details)
return FALSE
- var/confirm = alert(operator, "Please confirm the submission of your access ticket request.\n\nHolder: '[last_login]'\nDetails: '[details]'\n\nIs this correct?", "Confirmation", "Yes", "No")
+ var/confirm = alert(user, "Please confirm the submission of your access ticket request.\n\nHolder: '[last_login]'\nDetails: '[details]'\n\nIs this correct?", "Confirmation", "Yes", "No")
if(confirm != "Yes" || !link)
return FALSE
var/datum/ares_ticket/access/access_ticket = new(last_login, details, FALSE, idcard.registered_gid)
link.waiting_ids += idcard
link.tickets_access += access_ticket
- log_game("ARES: Access Ticket '\ref[access_ticket]' created by [key_name(operator)] as [last_login] with Details of '[details]'.")
- message_admins(SPAN_STAFF_IC("[key_name_admin(operator)] created a new ARES Access Ticket."), 1)
+ log_game("ARES: Access Ticket '\ref[access_ticket]' created by [key_name(user)] as [last_login] with Details of '[details]'.")
+ message_admins(SPAN_STAFF_IC("[key_name_admin(user)] created a new ARES Access Ticket."), 1)
ares_apollo_talk("Access Ticket [access_ticket.ticket_id]: [access_ticket.ticket_submitter] requesting access for '[details].")
return TRUE
@@ -356,9 +361,9 @@
access_ticket.ticket_status = TICKET_RETURNED
identification.access -= ACCESS_MARINE_AI_TEMP
- identification.modification_log += "Temporary AI Access self-returned by [key_name(operator)]."
+ identification.modification_log += "Temporary AI Access self-returned by [key_name(user)]."
- to_chat(operator, SPAN_NOTICE("Temporary Access Ticket surrendered."))
+ to_chat(user, SPAN_NOTICE("Temporary Access Ticket surrendered."))
playsound(src, 'sound/machines/chime.ogg', 15, 1)
ares_apollo_talk("Access Ticket [access_ticket.ticket_id]: [access_ticket.ticket_submitter] surrendered their access.")
@@ -367,7 +372,7 @@
datacore.apollo_login_list += "[last_login] at [worldtime2text()], Surrendered Temporary Access Ticket."
return TRUE
- to_chat(operator, SPAN_WARNING("This ID card does not have an access ticket!"))
+ to_chat(user, SPAN_WARNING("This ID card does not have an access ticket!"))
playsound(src, 'sound/machines/buzz-two.ogg', 15, 1)
return FALSE
@@ -379,7 +384,7 @@
for(var/obj/item/card/id/identification in link.waiting_ids)
if(identification.registered_gid != access_ticket.user_id_num)
continue
- identification.handle_ares_access(last_login, operator)
+ identification.handle_ares_access(last_login, user)
access_ticket.ticket_status = TICKET_GRANTED
playsound(src, 'sound/machines/chime.ogg', 15, 1)
ares_apollo_talk("Access Ticket [access_ticket.ticket_id]: [access_ticket.ticket_submitter] was granted access by [last_login].")
@@ -387,7 +392,7 @@
for(var/obj/item/card/id/identification in link.active_ids)
if(identification.registered_gid != access_ticket.user_id_num)
continue
- identification.handle_ares_access(last_login, operator)
+ identification.handle_ares_access(last_login, user)
access_ticket.ticket_status = TICKET_REVOKED
playsound(src, 'sound/machines/chime.ogg', 15, 1)
ares_apollo_talk("Access Ticket [access_ticket.ticket_id]: [access_ticket.ticket_submitter] had access revoked by [last_login].")
@@ -399,10 +404,10 @@
if(!istype(access_ticket))
return FALSE
if(access_ticket.ticket_assignee != last_login && access_ticket.ticket_assignee) //must be claimed by you or unclaimed.)
- to_chat(operator, SPAN_WARNING("You cannot update a ticket that is not assigned to you!"))
+ to_chat(user, SPAN_WARNING("You cannot update a ticket that is not assigned to you!"))
return FALSE
access_ticket.ticket_status = TICKET_REJECTED
- to_chat(operator, SPAN_NOTICE("[access_ticket.ticket_type] [access_ticket.ticket_id] marked as rejected."))
+ to_chat(user, SPAN_NOTICE("[access_ticket.ticket_type] [access_ticket.ticket_id] marked as rejected."))
ares_apollo_talk("Access Ticket [access_ticket.ticket_id]: [access_ticket.ticket_submitter] was rejected access by [last_login].")
for(var/obj/item/card/id/identification in link.waiting_ids)
if(identification.registered_gid != access_ticket.user_id_num)
@@ -413,21 +418,45 @@
playsound_client(id_owner?.client, 'sound/machines/pda_ping.ogg', src, 25, 0)
return TRUE
+ if("trigger_vent")
+ playsound = FALSE
+ var/obj/structure/pipes/vents/pump/no_boom/gas/sec_vent = locate(params["vent"])
+ if(!istype(sec_vent) || sec_vent.welded)
+ to_chat(user, SPAN_WARNING("ERROR: Gas release failure."))
+ playsound(src, 'sound/machines/buzz-two.ogg', 15, 1)
+ return FALSE
+ if(!COOLDOWN_FINISHED(sec_vent, vent_trigger_cooldown))
+ to_chat(user, SPAN_WARNING("ERROR: Insufficient gas reserve for this vent."))
+ playsound(src, 'sound/machines/buzz-two.ogg', 15, 1)
+ return FALSE
+ to_chat(user, SPAN_WARNING("Initiating gas release from [sec_vent.vent_tag]."))
+ playsound(src, 'sound/machines/chime.ogg', 15, 1)
+ COOLDOWN_START(sec_vent, vent_trigger_cooldown, COOLDOWN_ARES_VENT)
+ ares_apollo_talk("Nerve Gas release imminent from [sec_vent.vent_tag].")
+ log_ares_security("Nerve Gas Release", "Released Nerve Gas from Vent '[sec_vent.vent_tag]'.", last_login)
+ sec_vent.create_gas(VENT_GAS_CN20_XENO, 6, 5 SECONDS)
+ log_admin("[key_name(user)] released nerve gas from Vent '[sec_vent.vent_tag]' via ARES.")
+
+ if("security_lockdown")
+ if(!COOLDOWN_FINISHED(datacore, aicore_lockdown))
+ to_chat(user, SPAN_BOLDWARNING("AI Core Lockdown procedures are on cooldown! They will be ready in [COOLDOWN_SECONDSLEFT(datacore, aicore_lockdown)] seconds!"))
+ return FALSE
+ aicore_lockdown(user)
+ return TRUE
+
if(playsound)
playsound(src, "keyboard_alt", 15, 1)
/obj/item/card/id/proc/handle_ares_access(logged_in = MAIN_AI_SYSTEM, mob/user)
- var/operator = key_name(user)
+ var/changer = logged_in
+ if(user)
+ changer = key_name(user)
var/datum/ares_link/link = GLOB.ares_link
- if(logged_in == MAIN_AI_SYSTEM)
- if(!user)
- operator = "[MAIN_AI_SYSTEM] (Automated)"
- else
- operator = "[user.ckey]/([MAIN_AI_SYSTEM])"
+
if(ACCESS_MARINE_AI_TEMP in access)
access -= ACCESS_MARINE_AI_TEMP
link.active_ids -= src
- modification_log += "Temporary AI access revoked by [operator]"
+ log_idmod(src, "Temporary AI access revoked by [logged_in]", changer)
to_chat(user, SPAN_NOTICE("Access revoked from [registered_name]."))
var/mob/living/carbon/human/id_owner = registered_ref?.resolve()
if(id_owner)
@@ -435,7 +464,7 @@
playsound_client(id_owner?.client, 'sound/machines/pda_ping.ogg', src, 25, 0)
else
access += ACCESS_MARINE_AI_TEMP
- modification_log += "Temporary AI access granted by [operator]"
+ log_idmod(src, "Temporary AI access granted by [logged_in]", changer)
to_chat(user, SPAN_NOTICE("Access granted to [registered_name]."))
link.waiting_ids -= src
link.active_ids += src
diff --git a/code/game/machinery/ARES/ARES_procs.dm b/code/game/machinery/ARES/ARES_procs.dm
index 1212d1509a01..ef1b836a3d4b 100644
--- a/code/game/machinery/ARES/ARES_procs.dm
+++ b/code/game/machinery/ARES/ARES_procs.dm
@@ -29,6 +29,10 @@ GLOBAL_LIST_INIT(maintenance_categories, list(
var/datum/ares_datacore/datacore
var/list/obj/structure/machinery/computer/working_joe/ticket_computers = list()
+ /// Linked security gas vents.
+ var/list/linked_vents = list()
+ /// The tag number for generated vent labels, if none is manually set.
+ var/tag_num = 1
/// Working Joe stuff
var/list/tickets_maintenance = list()
@@ -50,6 +54,23 @@ GLOBAL_LIST_INIT(maintenance_categories, list(
alert.delink()
..()
+/datum/ares_link/proc/get_ares_vents()
+ var/list/security_vents = list()
+ var/datum/ares_link/link = GLOB.ares_link
+ for(var/obj/structure/pipes/vents/pump/no_boom/gas/vent in link.linked_vents)
+ if(!vent.vent_tag)
+ vent.vent_tag = "Security Vent #[link.tag_num]"
+ link.tag_num++
+
+ var/list/current_vent = list()
+ var/is_available = COOLDOWN_FINISHED(vent, vent_trigger_cooldown)
+ current_vent["vent_tag"] = vent.vent_tag
+ current_vent["ref"] = "\ref[vent]"
+ current_vent["available"] = is_available
+ security_vents += list(current_vent)
+ return security_vents
+
+
/* BELOW ARE IN AdminAres.dm
/datum/ares_link/tgui_interact(mob/user, datum/tgui/ui)
/datum/ares_link/ui_data(mob/user)
@@ -85,9 +106,13 @@ GLOBAL_LIST_INIT(maintenance_categories, list(
/// Is nuke request usable or not?
var/nuke_available = TRUE
+ /// Status of the AI Core Lockdown
+ var/ai_lockdown_active = FALSE
+
COOLDOWN_DECLARE(ares_distress_cooldown)
COOLDOWN_DECLARE(ares_nuclear_cooldown)
COOLDOWN_DECLARE(ares_quarters_cooldown)
+ COOLDOWN_DECLARE(aicore_lockdown)
// ------ ARES Logging Procs ------ //
/proc/ares_is_active()
@@ -144,17 +169,20 @@ GLOBAL_LIST_INIT(maintenance_categories, list(
var/datum/ares_datacore/datacore = GLOB.ares_datacore
datacore.records_bioscan.Add(new /datum/ares_record/bioscan(title, input))
-/proc/log_ares_bombardment(user_name, ob_name, coordinates)
+/proc/log_ares_bombardment(user_name, ob_name, message)
if(!ares_can_log())
return FALSE
var/datum/ares_datacore/datacore = GLOB.ares_datacore
- datacore.records_bombardment.Add(new /datum/ares_record/bombardment(ob_name, "Bombardment fired at [coordinates].", user_name))
+ datacore.records_bombardment.Add(new /datum/ares_record/bombardment(ob_name, message, user_name))
-/proc/log_ares_announcement(title, message)
+/proc/log_ares_announcement(title, message, signature)
if(!ares_can_log())
return FALSE
+ var/final_msg = message
+ if(signature)
+ final_msg = "[signature]: - [final_msg]"
var/datum/ares_datacore/datacore = GLOB.ares_datacore
- datacore.records_announcement.Add(new /datum/ares_record/announcement(title, message))
+ datacore.records_announcement.Add(new /datum/ares_record/announcement(title, final_msg))
/proc/log_ares_requisition(source, details, user_name)
if(!ares_can_log())
@@ -162,11 +190,14 @@ GLOBAL_LIST_INIT(maintenance_categories, list(
var/datum/ares_datacore/datacore = GLOB.ares_datacore
datacore.records_asrs.Add(new /datum/ares_record/requisition_log(source, details, user_name))
-/proc/log_ares_security(title, details)
+/proc/log_ares_security(title, details, signature)
if(!ares_can_log())
return FALSE
+ var/final_msg = details
+ if(signature)
+ final_msg = "[signature]: - [final_msg]"
var/datum/ares_datacore/datacore = GLOB.ares_datacore
- datacore.records_security.Add(new /datum/ares_record/security(title, details))
+ datacore.records_security.Add(new /datum/ares_record/security(title, final_msg))
/proc/log_ares_antiair(details)
if(!ares_can_log())
diff --git a/code/game/machinery/ARES/apollo_pda.dm b/code/game/machinery/ARES/apollo_pda.dm
index 69e774cf0da3..787b194ffb44 100644
--- a/code/game/machinery/ARES/apollo_pda.dm
+++ b/code/game/machinery/ARES/apollo_pda.dm
@@ -166,6 +166,8 @@
requesting_access += access_ticket.ticket_name
data["access_tickets"] = logged_access
+ data["security_vents"] = link.get_ares_vents()
+
return data
/obj/item/device/working_joe_pda/ui_status(mob/user, datum/ui_state/state)
@@ -179,29 +181,29 @@
return
var/playsound = TRUE
- var/mob/living/carbon/human/operator = ui.user
+ var/mob/living/carbon/human/user = ui.user
switch (action)
if("go_back")
if(!last_menu)
- return to_chat(operator, SPAN_WARNING("Error, no previous page detected."))
+ return to_chat(user, SPAN_WARNING("Error, no previous page detected."))
var/temp_holder = current_menu
current_menu = last_menu
last_menu = temp_holder
if("login")
- var/obj/item/card/id/idcard = operator.get_active_hand()
+ var/obj/item/card/id/idcard = user.get_active_hand()
if(istype(idcard))
authentication = get_ares_access(idcard)
last_login = idcard.registered_name
- else if(operator.wear_id)
- idcard = operator.wear_id
+ else if(user.wear_id)
+ idcard = user.wear_id
if(istype(idcard))
authentication = get_ares_access(idcard)
last_login = idcard.registered_name
else
- to_chat(operator, SPAN_WARNING("You require an ID card to access this terminal!"))
+ to_chat(user, SPAN_WARNING("You require an ID card to access this terminal!"))
playsound(src, 'sound/machines/buzz-two.ogg', 15, 1)
return FALSE
if(authentication)
@@ -237,29 +239,32 @@
if("page_maintenance")
last_menu = current_menu
current_menu = "maint_claim"
+ if("page_core_gas")
+ last_menu = current_menu
+ current_menu = "core_security_gas"
if("toggle_sound")
notify_sounds = !notify_sounds
if("new_report")
var/priority_report = FALSE
- var/maint_type = tgui_input_list(operator, "What is the type of maintenance item you wish to report?", "Report Category", GLOB.maintenance_categories, 30 SECONDS)
+ var/maint_type = tgui_input_list(user, "What is the type of maintenance item you wish to report?", "Report Category", GLOB.maintenance_categories, 30 SECONDS)
switch(maint_type)
if("Major Structural Damage", "Fire", "Communications Failure", "Power Generation Failure")
priority_report = TRUE
if(!maint_type)
return FALSE
- var/details = tgui_input_text(operator, "What are the details for this report?", "Ticket Details", encode = FALSE)
+ var/details = tgui_input_text(user, "What are the details for this report?", "Ticket Details", encode = FALSE)
if(!details)
return FALSE
if((authentication >= APOLLO_ACCESS_REPORTER) && !priority_report)
- var/is_priority = tgui_alert(operator, "Is this a priority report?", "Priority designation", list("Yes", "No"))
+ var/is_priority = tgui_alert(user, "Is this a priority report?", "Priority designation", list("Yes", "No"))
if(is_priority == "Yes")
priority_report = TRUE
- var/confirm = alert(operator, "Please confirm the submission of your maintenance report. \n\n Priority: [priority_report ? "Yes" : "No"]\n Category: '[maint_type]'\n Details: '[details]'\n\n Is this correct?", "Confirmation", "Yes", "No")
+ var/confirm = alert(user, "Please confirm the submission of your maintenance report. \n\n Priority: [priority_report ? "Yes" : "No"]\n Category: '[maint_type]'\n Details: '[details]'\n\n Is this correct?", "Confirmation", "Yes", "No")
if(confirm == "Yes")
if(link)
var/datum/ares_ticket/maintenance/maint_ticket = new(last_login, maint_type, details, priority_report)
@@ -268,7 +273,7 @@
ares_apollo_talk("Priority Maintenance Report: [maint_type] - ID [maint_ticket.ticket_id]. Seek and resolve.")
else
send_notifcation()
- log_game("ARES: Maintenance Ticket '\ref[maint_ticket]' created by [key_name(operator)] as [last_login] with Category '[maint_type]' and Details of '[details]'.")
+ log_game("ARES: Maintenance Ticket '\ref[maint_ticket]' created by [key_name(user)] as [last_login] with Category '[maint_type]' and Details of '[details]'.")
return TRUE
return FALSE
@@ -280,14 +285,14 @@
var/assigned = ticket.ticket_assignee
if(assigned)
if(assigned == last_login)
- var/prompt = tgui_alert(operator, "You already claimed this ticket! Do you wish to drop your claim?", "Unclaim ticket", list("Yes", "No"))
+ var/prompt = tgui_alert(user, "You already claimed this ticket! Do you wish to drop your claim?", "Unclaim ticket", list("Yes", "No"))
if(prompt != "Yes")
return FALSE
/// set ticket back to pending
ticket.ticket_assignee = null
ticket.ticket_status = TICKET_PENDING
return claim
- var/choice = tgui_alert(operator, "This ticket has already been claimed by [assigned]! Do you wish to override their claim?", "Claim Override", list("Yes", "No"))
+ var/choice = tgui_alert(user, "This ticket has already been claimed by [assigned]! Do you wish to override their claim?", "Claim Override", list("Yes", "No"))
if(choice != "Yes")
claim = FALSE
if(claim)
@@ -300,9 +305,9 @@
if(!istype(ticket))
return FALSE
if(ticket.ticket_submitter != last_login)
- to_chat(operator, SPAN_WARNING("You cannot cancel a ticket that does not belong to you!"))
+ to_chat(user, SPAN_WARNING("You cannot cancel a ticket that does not belong to you!"))
return FALSE
- to_chat(operator, SPAN_WARNING("[ticket.ticket_type] [ticket.ticket_id] has been cancelled."))
+ to_chat(user, SPAN_WARNING("[ticket.ticket_type] [ticket.ticket_id] has been cancelled."))
ticket.ticket_status = TICKET_CANCELLED
if(ticket.ticket_priority)
ares_apollo_talk("Priority [ticket.ticket_type] [ticket.ticket_id] has been cancelled.")
@@ -315,9 +320,9 @@
if(!istype(ticket))
return FALSE
if(ticket.ticket_assignee != last_login && ticket.ticket_assignee) //must be claimed by you or unclaimed.)
- to_chat(operator, SPAN_WARNING("You cannot update a ticket that is not assigned to you!"))
+ to_chat(user, SPAN_WARNING("You cannot update a ticket that is not assigned to you!"))
return FALSE
- var/choice = tgui_alert(operator, "What do you wish to mark the ticket as?", "Mark", list(TICKET_COMPLETED, TICKET_REJECTED), 20 SECONDS)
+ var/choice = tgui_alert(user, "What do you wish to mark the ticket as?", "Mark", list(TICKET_COMPLETED, TICKET_REJECTED), 20 SECONDS)
switch(choice)
if(TICKET_COMPLETED)
ticket.ticket_status = TICKET_COMPLETED
@@ -329,39 +334,39 @@
ares_apollo_talk("Priority [ticket.ticket_type] [ticket.ticket_id] has been [choice] by [last_login].")
else
send_notifcation()
- to_chat(operator, SPAN_NOTICE("[ticket.ticket_type] [ticket.ticket_id] marked as [choice]."))
+ to_chat(user, SPAN_NOTICE("[ticket.ticket_type] [ticket.ticket_id] marked as [choice]."))
return TRUE
if("new_access")
- var/obj/item/card/id/idcard = operator.get_active_hand()
+ var/obj/item/card/id/idcard = user.get_active_hand()
var/has_id = FALSE
if(istype(idcard))
has_id = TRUE
- else if(operator.wear_id)
- idcard = operator.wear_id
+ else if(user.wear_id)
+ idcard = user.wear_id
if(istype(idcard))
has_id = TRUE
if(!has_id)
- to_chat(operator, SPAN_WARNING("You require an ID card to request an access ticket!"))
+ to_chat(user, SPAN_WARNING("You require an ID card to request an access ticket!"))
playsound(src, 'sound/machines/buzz-two.ogg', 15, 1)
return FALSE
if(idcard.registered_name != last_login)
- to_chat(operator, SPAN_WARNING("This ID card does not match the active login!"))
+ to_chat(user, SPAN_WARNING("This ID card does not match the active login!"))
playsound(src, 'sound/machines/buzz-two.ogg', 15, 1)
return FALSE
- var/details = tgui_input_text(operator, "What is the purpose of this access ticket?", "Ticket Details", encode = FALSE)
+ var/details = tgui_input_text(user, "What is the purpose of this access ticket?", "Ticket Details", encode = FALSE)
if(!details)
return FALSE
- var/confirm = alert(operator, "Please confirm the submission of your access ticket request.\n\nHolder: '[last_login]'\nDetails: '[details]'\n\nIs this correct?", "Confirmation", "Yes", "No")
+ var/confirm = alert(user, "Please confirm the submission of your access ticket request.\n\nHolder: '[last_login]'\nDetails: '[details]'\n\nIs this correct?", "Confirmation", "Yes", "No")
if(confirm != "Yes" || !link)
return FALSE
var/datum/ares_ticket/access/access_ticket = new(last_login, details, FALSE, idcard.registered_gid)
link.waiting_ids += idcard
link.tickets_access += access_ticket
- log_game("ARES: Access Ticket '\ref[access_ticket]' created by [key_name(operator)] as [last_login] with Details of '[details]'.")
- message_admins(SPAN_STAFF_IC("[key_name_admin(operator)] created a new ARES Access Ticket."), 1)
+ log_game("ARES: Access Ticket '\ref[access_ticket]' created by [key_name(user)] as [last_login] with Details of '[details]'.")
+ message_admins(SPAN_STAFF_IC("[key_name_admin(user)] created a new ARES Access Ticket."), 1)
ares_apollo_talk("Access Ticket [access_ticket.ticket_id]: [access_ticket.ticket_submitter] requesting access for '[details].")
return TRUE
@@ -382,9 +387,9 @@
access_ticket.ticket_status = TICKET_RETURNED
identification.access -= ACCESS_MARINE_AI_TEMP
- identification.modification_log += "Temporary AI Access self-returned by [key_name(operator)]."
+ identification.modification_log += "Temporary AI Access self-returned by [key_name(user)]."
- to_chat(operator, SPAN_NOTICE("Temporary Access Ticket surrendered."))
+ to_chat(user, SPAN_NOTICE("Temporary Access Ticket surrendered."))
playsound(src, 'sound/machines/chime.ogg', 15, 1)
ares_apollo_talk("Access Ticket [access_ticket.ticket_id]: [access_ticket.ticket_submitter] surrendered their access.")
@@ -393,7 +398,7 @@
datacore.apollo_login_list += "[last_login] at [worldtime2text()], Surrendered Temporary Access Ticket."
return TRUE
- to_chat(operator, SPAN_WARNING("This ID card does not have an access ticket!"))
+ to_chat(user, SPAN_WARNING("This ID card does not have an access ticket!"))
playsound(src, 'sound/machines/buzz-two.ogg', 15, 1)
return FALSE
@@ -405,7 +410,7 @@
for(var/obj/item/card/id/identification in link.waiting_ids)
if(identification.registered_gid != access_ticket.user_id_num)
continue
- identification.handle_ares_access(last_login, operator)
+ identification.handle_ares_access(last_login, user)
access_ticket.ticket_status = TICKET_GRANTED
playsound(src, 'sound/machines/chime.ogg', 15, 1)
ares_apollo_talk("Access Ticket [access_ticket.ticket_id]: [access_ticket.ticket_submitter] was granted access by [last_login].")
@@ -413,7 +418,7 @@
for(var/obj/item/card/id/identification in link.active_ids)
if(identification.registered_gid != access_ticket.user_id_num)
continue
- identification.handle_ares_access(last_login, operator)
+ identification.handle_ares_access(last_login, user)
access_ticket.ticket_status = TICKET_REVOKED
playsound(src, 'sound/machines/chime.ogg', 15, 1)
ares_apollo_talk("Access Ticket [access_ticket.ticket_id]: [access_ticket.ticket_submitter] had access revoked by [last_login].")
@@ -425,10 +430,10 @@
if(!istype(access_ticket))
return FALSE
if(access_ticket.ticket_assignee != last_login && access_ticket.ticket_assignee) //must be claimed by you or unclaimed.)
- to_chat(operator, SPAN_WARNING("You cannot update a ticket that is not assigned to you!"))
+ to_chat(user, SPAN_WARNING("You cannot update a ticket that is not assigned to you!"))
return FALSE
access_ticket.ticket_status = TICKET_REJECTED
- to_chat(operator, SPAN_NOTICE("[access_ticket.ticket_type] [access_ticket.ticket_id] marked as rejected."))
+ to_chat(user, SPAN_NOTICE("[access_ticket.ticket_type] [access_ticket.ticket_id] marked as rejected."))
ares_apollo_talk("Access Ticket [access_ticket.ticket_id]: [access_ticket.ticket_submitter] was rejected access by [last_login].")
for(var/obj/item/card/id/identification in link.waiting_ids)
if(identification.registered_gid != access_ticket.user_id_num)
@@ -439,6 +444,32 @@
playsound_client(id_owner?.client, 'sound/machines/pda_ping.ogg', src, 25, 0)
return TRUE
+ if("trigger_vent")
+ playsound = FALSE
+ var/obj/structure/pipes/vents/pump/no_boom/gas/sec_vent = locate(params["vent"])
+ if(!istype(sec_vent) || sec_vent.welded)
+ to_chat(user, SPAN_WARNING("ERROR: Gas release failure."))
+ playsound(src, 'sound/machines/buzz-two.ogg', 15, 1)
+ return FALSE
+ if(!COOLDOWN_FINISHED(sec_vent, vent_trigger_cooldown))
+ to_chat(user, SPAN_WARNING("ERROR: Insufficient gas reserve for this vent."))
+ playsound(src, 'sound/machines/buzz-two.ogg', 15, 1)
+ return FALSE
+ to_chat(user, SPAN_WARNING("Initiating gas release from [sec_vent.vent_tag]."))
+ playsound(src, 'sound/machines/chime.ogg', 15, 1)
+ COOLDOWN_START(sec_vent, vent_trigger_cooldown, COOLDOWN_ARES_VENT)
+ ares_apollo_talk("Nerve Gas release imminent from [sec_vent.vent_tag].")
+ log_ares_security("Nerve Gas Release", "Released Nerve Gas from Vent '[sec_vent.vent_tag]'.", last_login)
+ sec_vent.create_gas(VENT_GAS_CN20_XENO, 6, 5 SECONDS)
+ log_admin("[key_name(user)] released nerve gas from Vent '[sec_vent.vent_tag]' via ARES.")
+
+ if("security_lockdown")
+ if(!COOLDOWN_FINISHED(datacore, aicore_lockdown))
+ to_chat(user, SPAN_BOLDWARNING("AI Core Lockdown procedures are on cooldown! They will be ready in [COOLDOWN_SECONDSLEFT(datacore, aicore_lockdown)] seconds!"))
+ return FALSE
+ aicore_lockdown(user)
+ return TRUE
+
if(playsound)
var/sound = pick('sound/machines/pda_button1.ogg', 'sound/machines/pda_button2.ogg')
playsound(src, sound, 15, TRUE)
diff --git a/code/game/machinery/aicore_lockdown.dm b/code/game/machinery/aicore_lockdown.dm
new file mode 100644
index 000000000000..8120e98977dc
--- /dev/null
+++ b/code/game/machinery/aicore_lockdown.dm
@@ -0,0 +1,119 @@
+/obj/structure/machinery/aicore_lockdown
+ name = "AI Core Lockdown"
+ icon_state = "big_red_button_tablev"
+ unslashable = TRUE
+ unacidable = TRUE
+
+/obj/structure/machinery/aicore_lockdown/ex_act(severity)
+ return FALSE
+
+/obj/structure/machinery/aicore_lockdown/attack_remote(mob/user as mob)
+ return FALSE
+
+/obj/structure/machinery/aicore_lockdown/attack_alien(mob/user as mob)
+ return FALSE
+
+/obj/structure/machinery/aicore_lockdown/attackby(obj/item/attacking_item, mob/user)
+ return attack_hand(user)
+
+/obj/structure/machinery/aicore_lockdown/attack_hand(mob/living/user)
+ if(isxeno(user))
+ return FALSE
+ if(!allowed(user))
+ to_chat(user, SPAN_DANGER("Access Denied"))
+ flick(initial(icon_state) + "-denied", src)
+ return FALSE
+
+ if(!COOLDOWN_FINISHED(GLOB.ares_datacore, aicore_lockdown))
+ to_chat(user, SPAN_BOLDWARNING("AI Core Lockdown procedures are on cooldown! They will be ready in [COOLDOWN_SECONDSLEFT(GLOB.ares_datacore, aicore_lockdown)] seconds!"))
+ return FALSE
+
+ add_fingerprint(user)
+ aicore_lockdown(user)
+
+/obj/structure/machinery/door/poddoor/almayer/blended/ai_lockdown
+ name = "ARES Emergency Lockdown Shutter"
+ density = FALSE
+ open_layer = 1.9
+ plane = FLOOR_PLANE
+
+/obj/structure/machinery/door/poddoor/almayer/blended/ai_lockdown/aicore
+ icon_state = "aidoor1"
+ base_icon_state = "aidoor"
+
+/obj/structure/machinery/door/poddoor/almayer/blended/ai_lockdown/aicore/white
+ icon_state = "w_aidoor1"
+ base_icon_state = "w_aidoor"
+
+/obj/structure/machinery/door/poddoor/almayer/blended/ai_lockdown/white
+ icon_state = "w_almayer_pdoor1"
+ base_icon_state = "w_almayer_pdoor"
+
+/obj/structure/machinery/door/poddoor/almayer/blended/ai_lockdown/Initialize()
+ . = ..()
+ RegisterSignal(SSdcs, COMSIG_GLOB_AICORE_LOCKDOWN, PROC_REF(close))
+ RegisterSignal(SSdcs, COMSIG_GLOB_AICORE_LIFT, PROC_REF(open))
+
+
+/client/proc/admin_aicore_alert()
+ set name = "AI Core Lockdown"
+ set category = "Admin.Ship"
+
+ if(!admin_holder ||!check_rights(R_EVENT))
+ return FALSE
+
+ var/prompt = "Are you sure you want to trigger an AI Core lockdown? This will raise to red alert, and lockdown the AI Core."
+
+ if(GLOB.ares_datacore.ai_lockdown_active == TRUE)
+ prompt = "Are you sure you want to lift the AI Core lockdown? This will lower to blue alert."
+
+ var/choice = tgui_alert(src, prompt, "Choose.", list("Yes", "No"), 20 SECONDS)
+ if(choice != "Yes")
+ return FALSE
+
+ choice = tgui_alert(src, "Do you want to use a custom announcement?", "Choose.", list("Yes", "No"), 20 SECONDS)
+ if(choice == "Yes")
+ var/message = tgui_input_text(src, "Please enter announcement text.", "what?")
+ aicore_lockdown(usr, message, admin = TRUE)
+ else
+ aicore_lockdown(usr, admin = TRUE)
+ return TRUE
+
+/proc/aicore_lockdown(mob/user, message, admin = FALSE)
+ if(IsAdminAdvancedProcCall())
+ return PROC_BLOCKED
+
+ var/log = "[key_name(user)] triggered AI core lockdown!"
+ var/ares_log = "Triggered triggered AI Core Emergency Lockdown."
+ var/person = user.name
+ if(message)
+ log = "[key_name(user)] triggered AI core emergency lockdown! (Using a custom announcement)."
+ if(admin)
+ log += " (Admin Triggered)."
+ person = MAIN_AI_SYSTEM
+
+ if(GLOB.ares_datacore.ai_lockdown_active)
+ GLOB.ares_datacore.ai_lockdown_active = FALSE
+ if(!message)
+ message = "ATTENTION! \n\nAI CORE EMERGENCY LOCKDOWN LIFTED."
+ log = "[key_name(user)] lifted AI core lockdown!"
+ ares_log = "Lifted AI Core Emergency Lockdown."
+ if(admin)
+ log += " (Admin Triggered)."
+ person = MAIN_AI_SYSTEM
+
+ if(GLOB.security_level > SEC_LEVEL_GREEN)
+ set_security_level(SEC_LEVEL_BLUE, TRUE, FALSE)
+ SEND_GLOBAL_SIGNAL(COMSIG_GLOB_AICORE_LIFT)
+ else
+ GLOB.ares_datacore.ai_lockdown_active = TRUE
+ if(!message)
+ message = "ATTENTION! \n\nCORE SECURITY ALERT. \n\nAI CORE UNDER LOCKDOWN."
+ if(GLOB.security_level < SEC_LEVEL_RED)
+ set_security_level(SEC_LEVEL_RED, TRUE, FALSE)
+ SEND_GLOBAL_SIGNAL(COMSIG_GLOB_AICORE_LOCKDOWN)
+
+ COOLDOWN_START(GLOB.ares_datacore, aicore_lockdown, 2 MINUTES)
+ shipwide_ai_announcement(message, MAIN_AI_SYSTEM, 'sound/effects/biohazard.ogg')
+ message_admins(log)
+ log_ares_security("AI Core Lockdown", ares_log, person)
diff --git a/code/game/machinery/autolathe_datums.dm b/code/game/machinery/autolathe_datums.dm
index 01a40b3638f6..78a8e46b64aa 100644
--- a/code/game/machinery/autolathe_datums.dm
+++ b/code/game/machinery/autolathe_datums.dm
@@ -269,7 +269,7 @@
/datum/autolathe/recipe/handcuffs
name = "handcuffs"
- path = /obj/item/handcuffs
+ path = /obj/item/restraint/handcuffs
hidden = TRUE
category = AUTOLATHE_CATEGORY_GENERAL
@@ -331,6 +331,11 @@
path = /obj/item/ammo_magazine/flamer_tank/custom/large
category = AUTOLATHE_CATEGORY_EXPLOSIVES
+/datum/autolathe/recipe/armylathe/smoke_tank
+ name = "Custom M240A1 Smoke Tank"
+ path = /obj/item/ammo_magazine/flamer_tank/smoke
+ category = AUTOLATHE_CATEGORY_EXPLOSIVES
+
//Medilathe recipes
/datum/autolathe/recipe/medilathe
category = AUTOLATHE_CATEGORY_MEDICAL
diff --git a/code/game/machinery/biohazard_lockdown.dm b/code/game/machinery/biohazard_lockdown.dm
index 2e3cbf6de234..bb2674ccca6f 100644
--- a/code/game/machinery/biohazard_lockdown.dm
+++ b/code/game/machinery/biohazard_lockdown.dm
@@ -1,6 +1,6 @@
#define LOCKDOWN_READY 0
#define LOCKDOWN_ACTIVE 1
-GLOBAL_VAR_INIT(lockdown_state, LOCKDOWN_READY)
+GLOBAL_VAR_INIT(med_lockdown_state, LOCKDOWN_READY)
/obj/structure/machinery/biohazard_lockdown
name = "Emergency Containment Breach"
@@ -51,7 +51,7 @@ GLOBAL_VAR_INIT(lockdown_state, LOCKDOWN_READY)
base_icon_state = "w_almayer_pdoor"
/client/proc/admin_biohazard_alert()
- set name = "Containment Breach Alert"
+ set name = "Research Containment Lockdown"
set category = "Admin.Ship"
if(!admin_holder ||!check_rights(R_EVENT))
@@ -63,8 +63,8 @@ GLOBAL_VAR_INIT(lockdown_state, LOCKDOWN_READY)
prompt = tgui_alert(src, "Do you want to use a custom announcement?", "Choose.", list("Yes", "No"), 20 SECONDS)
if(prompt == "Yes")
- var/whattoannounce = tgui_input_text(src, "Please enter announcement text.", "what?")
- biohazard_lockdown(usr, whattoannounce, TRUE)
+ var/message = tgui_input_text(src, "Please enter announcement text.", "what?")
+ biohazard_lockdown(usr, message, admin = TRUE)
else
biohazard_lockdown(usr, admin = TRUE)
return TRUE
@@ -74,35 +74,38 @@ GLOBAL_VAR_INIT(lockdown_state, LOCKDOWN_READY)
return PROC_BLOCKED
var/log = "[key_name(user)] triggered research bio lockdown!"
- var/ares_log = "[user.name] triggered Medical Research Biohazard Containment Lockdown."
+ var/ares_log = "Triggered Medical Research Biohazard Containment Lockdown."
+ var/person = user.name
if(!message)
message = "ATTENTION! \n\nBIOHAZARD CONTAINMENT BREACH. \n\nRESEARCH DEPARTMENT UNDER LOCKDOWN."
else
log = "[key_name(user)] triggered research bio lockdown! (Using a custom announcement)."
if(admin)
log += " (Admin Triggered)."
- ares_log = "[MAIN_AI_SYSTEM] triggered Medical Research Biohazard Containment Lockdown."
+ person = MAIN_AI_SYSTEM
- switch(GLOB.lockdown_state)
+ switch(GLOB.med_lockdown_state)
if(LOCKDOWN_READY)
- GLOB.lockdown_state = LOCKDOWN_ACTIVE
- set_security_level(SEC_LEVEL_RED, TRUE, FALSE)
+ GLOB.med_lockdown_state = LOCKDOWN_ACTIVE
+ if(GLOB.security_level < SEC_LEVEL_RED)
+ set_security_level(SEC_LEVEL_RED, TRUE, FALSE)
SEND_GLOBAL_SIGNAL(COMSIG_GLOB_RESEARCH_LOCKDOWN)
if(LOCKDOWN_ACTIVE)
- GLOB.lockdown_state = LOCKDOWN_READY
+ GLOB.med_lockdown_state = LOCKDOWN_READY
message = "ATTENTION! \n\nBIOHAZARD CONTAINMENT LOCKDOWN LIFTED."
log = "[key_name(user)] lifted research bio lockdown!"
- ares_log = "[user.name] lifted Medical Research Biohazard Containment Lockdown."
+ ares_log = "Lifted Medical Research Biohazard Containment Lockdown."
if(admin)
log += " (Admin Triggered)."
- ares_log = "[MAIN_AI_SYSTEM] lifted Medical Research Biohazard Containment Lockdown."
+ person = MAIN_AI_SYSTEM
- set_security_level(SEC_LEVEL_BLUE, TRUE, FALSE)
+ if(GLOB.security_level > SEC_LEVEL_GREEN)
+ set_security_level(SEC_LEVEL_BLUE, TRUE, FALSE)
SEND_GLOBAL_SIGNAL(COMSIG_GLOB_RESEARCH_LIFT)
shipwide_ai_announcement(message, MAIN_AI_SYSTEM, 'sound/effects/biohazard.ogg')
message_admins(log)
- log_ares_security("Containment Lockdown", ares_log)
+ log_ares_security("Containment Lockdown", ares_log, person)
#undef LOCKDOWN_READY
#undef LOCKDOWN_ACTIVE
diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm
index 948d83e76148..6943544e30d4 100644
--- a/code/game/machinery/camera/camera.dm
+++ b/code/game/machinery/camera/camera.dm
@@ -312,8 +312,8 @@ GLOBAL_LIST_EMPTY_TYPED(all_cameras, /obj/structure/machinery/camera)
. = ..()
if(!camera_item)
return INITIALIZE_HINT_QDEL
- c_tag = camera_item.get_broadcast_name()
linked_broadcasting = camera_item
+ c_tag = linked_broadcasting.get_broadcast_name()
/obj/structure/machinery/camera/mortar
alpha = 0
diff --git a/code/game/machinery/computer/almayer_control.dm b/code/game/machinery/computer/almayer_control.dm
index 1f3338e15bf7..0090a6673961 100644
--- a/code/game/machinery/computer/almayer_control.dm
+++ b/code/game/machinery/computer/almayer_control.dm
@@ -108,33 +108,34 @@
. = ..()
if(.)
return
+ var/mob/user = ui.user
switch(action)
if("award")
- open_medal_panel(usr, src)
+ open_medal_panel(user, src)
. = TRUE
// evac stuff start \\
if("evacuation_start")
if(GLOB.security_level < SEC_LEVEL_RED)
- to_chat(usr, SPAN_WARNING("The ship must be under red alert in order to enact evacuation procedures."))
+ to_chat(user, SPAN_WARNING("The ship must be under red alert in order to enact evacuation procedures."))
return FALSE
if(SShijack.evac_admin_denied)
- to_chat(usr, SPAN_WARNING("The USCM has placed a lock on deploying the evacuation pods."))
+ to_chat(user, SPAN_WARNING("The USCM has placed a lock on deploying the evacuation pods."))
return FALSE
if(!SShijack.initiate_evacuation())
- to_chat(usr, SPAN_WARNING("You are unable to initiate an evacuation procedure right now!"))
+ to_chat(user, SPAN_WARNING("You are unable to initiate an evacuation procedure right now!"))
return FALSE
- log_game("[key_name(usr)] has called for an emergency evacuation.")
- message_admins("[key_name_admin(usr)] has called for an emergency evacuation.")
- log_ares_security("Initiate Evacuation", "[usr] has called for an emergency evacuation.")
+ log_game("[key_name(user)] has called for an emergency evacuation.")
+ message_admins("[key_name_admin(user)] has called for an emergency evacuation.")
+ log_ares_security("Initiate Evacuation", "Called for an emergency evacuation.", user)
. = TRUE
if("evacuation_cancel")
- var/mob/living/carbon/human/human_user = usr
+ var/mob/living/carbon/human/human_user = user
var/obj/item/card/id/idcard = human_user.get_active_hand()
var/bio_fail = FALSE
if(!istype(idcard))
@@ -148,12 +149,12 @@
return FALSE
if(!SShijack.cancel_evacuation())
- to_chat(usr, SPAN_WARNING("You are unable to cancel the evacuation right now!"))
+ to_chat(user, SPAN_WARNING("You are unable to cancel the evacuation right now!"))
return FALSE
- log_game("[key_name(usr)] has canceled the emergency evacuation.")
- message_admins("[key_name_admin(usr)] has canceled the emergency evacuation.")
- log_ares_security("Cancel Evacuation", "[usr] has cancelled the emergency evacuation.")
+ log_game("[key_name(user)] has canceled the emergency evacuation.")
+ message_admins("[key_name_admin(user)] has canceled the emergency evacuation.")
+ log_ares_security("Cancel Evacuation", "Cancelled the emergency evacuation.", user)
. = TRUE
// evac stuff end \\
@@ -168,32 +169,32 @@
if(SEC_LEVEL_DELTA)
return
- var/level_selected = tgui_input_list(usr, "What alert would you like to set it as?", "Alert Level", alert_list)
+ var/level_selected = tgui_input_list(user, "What alert would you like to set it as?", "Alert Level", alert_list)
if(!level_selected)
return
set_security_level(seclevel2num(level_selected), log = ARES_LOG_NONE)
- log_game("[key_name(usr)] has changed the security level to [get_security_level()].")
- message_admins("[key_name_admin(usr)] has changed the security level to [get_security_level()].")
- log_ares_security("Manual Security Update", "[usr] has changed the security level to [get_security_level()].")
+ log_game("[key_name(user)] has changed the security level to [get_security_level()].")
+ message_admins("[key_name_admin(user)] has changed the security level to [get_security_level()].")
+ log_ares_security("Manual Security Update", "Changed the security level to [get_security_level()].", user)
. = TRUE
if("messageUSCM")
if(!COOLDOWN_FINISHED(src, cooldown_central))
- to_chat(usr, SPAN_WARNING("Arrays are re-cycling. Please stand by."))
+ to_chat(user, SPAN_WARNING("Arrays are re-cycling. Please stand by."))
return FALSE
- var/input = stripped_input(usr, "Please choose a message to transmit to USCM. Please be aware that this process is very expensive, and abuse will lead to termination. Transmission does not guarantee a response. There is a small delay before you may send another message. Be clear and concise.", "To abort, send an empty message.", "")
- if(!input || !(usr in view(1,src)) || !COOLDOWN_FINISHED(src, cooldown_central))
+ var/input = stripped_input(user, "Please choose a message to transmit to USCM. Please be aware that this process is very expensive, and abuse will lead to termination. Transmission does not guarantee a response. There is a small delay before you may send another message. Be clear and concise.", "To abort, send an empty message.", "")
+ if(!input || !(user in view(1,src)) || !COOLDOWN_FINISHED(src, cooldown_central))
return FALSE
- high_command_announce(input, usr)
- to_chat(usr, SPAN_NOTICE("Message transmitted."))
- log_announcement("[key_name(usr)] has made an USCM announcement: [input]")
+ high_command_announce(input, user)
+ to_chat(user, SPAN_NOTICE("Message transmitted."))
+ log_announcement("[key_name(user)] has made an USCM announcement: [input]")
COOLDOWN_START(src, cooldown_central, COOLDOWN_COMM_CENTRAL)
. = TRUE
if("ship_announce")
- var/mob/living/carbon/human/human_user = usr
+ var/mob/living/carbon/human/human_user = user
var/obj/item/card/id/idcard = human_user.get_active_hand()
var/bio_fail = FALSE
if(!istype(idcard))
@@ -207,10 +208,10 @@
return FALSE
if(!COOLDOWN_FINISHED(src, cooldown_message))
- to_chat(usr, SPAN_WARNING("Please allow at least [COOLDOWN_TIMELEFT(src, cooldown_message)/10] second\s to pass between announcements."))
+ to_chat(user, SPAN_WARNING("Please allow at least [COOLDOWN_TIMELEFT(src, cooldown_message)/10] second\s to pass between announcements."))
return FALSE
- var/input = stripped_multiline_input(usr, "Please write a message to announce to the station crew.", "Priority Announcement", "")
- if(!input || !COOLDOWN_FINISHED(src, cooldown_message) || !(usr in view(1,src)))
+ var/input = stripped_multiline_input(user, "Please write a message to announce to the station crew.", "Priority Announcement", "")
+ if(!input || !COOLDOWN_FINISHED(src, cooldown_message) || !(user in view(1,src)))
return FALSE
var/signed = null
@@ -219,35 +220,35 @@
COOLDOWN_START(src, cooldown_message, COOLDOWN_COMM_MESSAGE)
shipwide_ai_announcement(input, COMMAND_SHIP_ANNOUNCE, signature = signed)
- message_admins("[key_name(usr)] has made a shipwide annoucement.")
- log_announcement("[key_name(usr)] has announced the following to the ship: [input]")
+ message_admins("[key_name(user)] has made a shipwide annoucement.")
+ log_announcement("[key_name(user)] has announced the following to the ship: [input]")
. = TRUE
if("distress")
if(world.time < DISTRESS_TIME_LOCK)
- to_chat(usr, SPAN_WARNING("The distress beacon cannot be launched this early in the operation. Please wait another [time_left_until(DISTRESS_TIME_LOCK, world.time, 1 MINUTES)] minutes before trying again."))
+ to_chat(user, SPAN_WARNING("The distress beacon cannot be launched this early in the operation. Please wait another [time_left_until(DISTRESS_TIME_LOCK, world.time, 1 MINUTES)] minutes before trying again."))
return FALSE
if(!SSticker.mode)
return FALSE //Not a game mode?
if(SSticker.mode.force_end_at == 0)
- to_chat(usr, SPAN_WARNING("ARES has denied your request for operational security reasons."))
+ to_chat(user, SPAN_WARNING("ARES has denied your request for operational security reasons."))
return FALSE
if(!COOLDOWN_FINISHED(src, cooldown_request))
- to_chat(usr, SPAN_WARNING("The distress beacon has recently broadcast a message. Please wait."))
+ to_chat(user, SPAN_WARNING("The distress beacon has recently broadcast a message. Please wait."))
return FALSE
if(GLOB.security_level == SEC_LEVEL_DELTA)
- to_chat(usr, SPAN_WARNING("The ship is already undergoing self-destruct procedures!"))
+ to_chat(user, SPAN_WARNING("The ship is already undergoing self-destruct procedures!"))
return FALSE
for(var/client/admin_client as anything in GLOB.admins)
if((R_ADMIN|R_MOD) & admin_client.admin_holder.rights)
admin_client << 'sound/effects/sos-morse-code.ogg'
- SSticker.mode.request_ert(usr)
- to_chat(usr, SPAN_NOTICE("A distress beacon request has been sent to USCM Central Command."))
+ SSticker.mode.request_ert(user)
+ to_chat(user, SPAN_NOTICE("A distress beacon request has been sent to USCM Central Command."))
COOLDOWN_START(src, cooldown_request, COOLDOWN_COMM_REQUEST)
. = TRUE
@@ -256,29 +257,29 @@
if("destroy")
if(world.time < DISTRESS_TIME_LOCK)
- to_chat(usr, SPAN_WARNING("The self-destruct cannot be activated this early in the operation. Please wait another [time_left_until(DISTRESS_TIME_LOCK, world.time, 1 MINUTES)] minutes before trying again."))
+ to_chat(user, SPAN_WARNING("The self-destruct cannot be activated this early in the operation. Please wait another [time_left_until(DISTRESS_TIME_LOCK, world.time, 1 MINUTES)] minutes before trying again."))
return FALSE
if(!SSticker.mode)
return FALSE //Not a game mode?
if(SSticker.mode.force_end_at == 0)
- to_chat(usr, SPAN_WARNING("ARES has denied your request for operational security reasons."))
+ to_chat(user, SPAN_WARNING("ARES has denied your request for operational security reasons."))
return FALSE
if(!COOLDOWN_FINISHED(src, cooldown_destruct))
- to_chat(usr, SPAN_WARNING("A self-destruct request has already been sent to high command. Please wait."))
+ to_chat(user, SPAN_WARNING("A self-destruct request has already been sent to high command. Please wait."))
return FALSE
if(get_security_level() == "delta")
- to_chat(usr, SPAN_WARNING("The [MAIN_SHIP_NAME]'s self-destruct is already activated."))
+ to_chat(user, SPAN_WARNING("The [MAIN_SHIP_NAME]'s self-destruct is already activated."))
return FALSE
for(var/client/admin_client as anything in GLOB.admins)
if((R_ADMIN|R_MOD) & admin_client.admin_holder.rights)
admin_client << 'sound/effects/sos-morse-code.ogg'
- message_admins("[key_name(usr)] has requested Self-Destruct! [CC_MARK(usr)] (GRANT) (DENY) [ADMIN_JMP_USER(usr)] [CC_REPLY(usr)]")
- to_chat(usr, SPAN_NOTICE("A self-destruct request has been sent to USCM Central Command."))
+ message_admins("[key_name(user)] has requested Self-Destruct! [CC_MARK(user)] (GRANT) (DENY) [ADMIN_JMP_USER(user)] [CC_REPLY(user)]")
+ to_chat(user, SPAN_NOTICE("A self-destruct request has been sent to USCM Central Command."))
COOLDOWN_START(src, cooldown_destruct, COOLDOWN_COMM_DESTRUCT)
. = TRUE
diff --git a/code/game/machinery/computer/camera_console.dm b/code/game/machinery/computer/camera_console.dm
index cd0ee780f478..1e2cb427cab4 100644
--- a/code/game/machinery/computer/camera_console.dm
+++ b/code/game/machinery/computer/camera_console.dm
@@ -17,6 +17,7 @@
var/colony_camera_mapload = TRUE
var/admin_console = FALSE
+ var/stay_connected = FALSE
/obj/structure/machinery/computer/cameras/Initialize(mapload)
. = ..()
@@ -33,7 +34,7 @@
/obj/structure/machinery/computer/cameras/Destroy()
SStgui.close_uis(src)
- QDEL_NULL(current)
+ current = null
UnregisterSignal(src, COMSIG_CAMERA_MAPNAME_ASSIGNED)
last_camera_turf = null
concurrent_users = null
@@ -147,7 +148,7 @@
// Unregister map objects
SEND_SIGNAL(src, COMSIG_CAMERA_UNREGISTER_UI, user)
// Turn off the console
- if(length(concurrent_users) == 0 && is_living)
+ if(length(concurrent_users) == 0 && is_living && !stay_connected)
current = null
SEND_SIGNAL(src, COMSIG_CAMERA_CLEAR)
last_camera_turf = null
@@ -206,6 +207,8 @@
name = "Television Set"
desc = "An old TV hooked up to a video cassette recorder, you can even use it to time shift WOW."
network = list(CAMERA_NET_CORRESPONDENT)
+ stay_connected = TRUE
+ circuit = /obj/item/circuitboard/computer/cameras/tv
var/obj/item/device/camera/broadcasting/broadcastingcamera = null
/obj/structure/machinery/computer/cameras/wooden_tv/broadcast/Destroy()
@@ -213,38 +216,76 @@
return ..()
/obj/structure/machinery/computer/cameras/wooden_tv/broadcast/ui_state(mob/user)
- return GLOB.default_state
+ return GLOB.in_view
/obj/structure/machinery/computer/cameras/wooden_tv/broadcast/ui_act(action, params)
. = ..()
if(action != "switch_camera")
return
- broadcastingcamera = null
- if (!istype(current, /obj/structure/machinery/camera/correspondent))
+ if(broadcastingcamera)
+ clear_camera()
+ if(!istype(current, /obj/structure/machinery/camera/correspondent))
return
var/obj/structure/machinery/camera/correspondent/corr_cam = current
- if (!corr_cam.linked_broadcasting)
+ if(!corr_cam.linked_broadcasting)
return
broadcastingcamera = corr_cam.linked_broadcasting
RegisterSignal(broadcastingcamera, COMSIG_BROADCAST_GO_LIVE, PROC_REF(go_back_live))
+ RegisterSignal(broadcastingcamera, COMSIG_COMPONENT_ADDED, PROC_REF(handle_rename))
RegisterSignal(broadcastingcamera, COMSIG_PARENT_QDELETING, PROC_REF(clear_camera))
+ RegisterSignal(broadcastingcamera, COMSIG_BROADCAST_HEAR_TALK, PROC_REF(transfer_talk))
+ RegisterSignal(broadcastingcamera, COMSIG_BROADCAST_SEE_EMOTE, PROC_REF(transfer_emote))
/obj/structure/machinery/computer/cameras/wooden_tv/broadcast/ui_close(mob/user)
. = ..()
- if (!current && broadcastingcamera)
+ if(!broadcastingcamera)
+ return
+ if(!current)
clear_camera()
/obj/structure/machinery/computer/cameras/wooden_tv/broadcast/proc/clear_camera()
SIGNAL_HANDLER
- UnregisterSignal(broadcastingcamera, list(COMSIG_BROADCAST_GO_LIVE, COMSIG_PARENT_QDELETING))
+ UnregisterSignal(broadcastingcamera, list(COMSIG_BROADCAST_GO_LIVE, COMSIG_PARENT_QDELETING, COMSIG_COMPONENT_ADDED, COMSIG_BROADCAST_HEAR_TALK, COMSIG_BROADCAST_SEE_EMOTE))
broadcastingcamera = null
/obj/structure/machinery/computer/cameras/wooden_tv/broadcast/proc/go_back_live(obj/item/device/camera/broadcasting/broadcastingcamera)
SIGNAL_HANDLER
- if (current.c_tag == broadcastingcamera.get_broadcast_name())
+ if(current.c_tag == broadcastingcamera.get_broadcast_name())
current = broadcastingcamera.linked_cam
SEND_SIGNAL(src, COMSIG_CAMERA_SET_TARGET, broadcastingcamera.linked_cam, broadcastingcamera.linked_cam.view_range, broadcastingcamera.linked_cam.view_range)
+/obj/structure/machinery/computer/cameras/wooden_tv/broadcast/proc/transfer_talk(obj/item/camera, mob/living/sourcemob, message, verb = "says", datum/language/language, italics = FALSE, show_message_above_tv = FALSE)
+ SIGNAL_HANDLER
+ if(inoperable())
+ return
+ if(show_message_above_tv)
+ langchat_speech(message, get_mobs_in_view(7, src), language, sourcemob.langchat_color, FALSE, LANGCHAT_FAST_POP, list(sourcemob.langchat_styles))
+ for(var/datum/weakref/user_ref in concurrent_users)
+ var/mob/user = user_ref.resolve()
+ if(user?.client?.prefs && !user.client.prefs.lang_chat_disabled && !user.ear_deaf && user.say_understands(sourcemob, language))
+ sourcemob.langchat_display_image(user)
+
+/obj/structure/machinery/computer/cameras/wooden_tv/broadcast/proc/transfer_emote(obj/item/camera, mob/living/sourcemob, emote, audible = FALSE, show_message_above_tv = FALSE)
+ SIGNAL_HANDLER
+ if(inoperable())
+ return
+ if(show_message_above_tv)
+ langchat_speech(emote, get_mobs_in_view(7, src), null, null, TRUE, LANGCHAT_FAST_POP, list("emote"))
+ for(var/datum/weakref/user_ref in concurrent_users)
+ var/mob/user = user_ref.resolve()
+ if(user?.client?.prefs && (user.client.prefs.toggles_langchat & LANGCHAT_SEE_EMOTES) && (!audible || !user.ear_deaf))
+ sourcemob.langchat_display_image(user)
+
+/obj/structure/machinery/computer/cameras/wooden_tv/broadcast/examine(mob/user)
+ . = ..()
+ attack_hand(user) //watch tv on examine
+
+/obj/structure/machinery/computer/cameras/wooden_tv/broadcast/proc/handle_rename(obj/item/camera, datum/component/label)
+ SIGNAL_HANDLER
+ if(!istype(label, /datum/component/label))
+ return
+ current.c_tag = broadcastingcamera.get_broadcast_name()
+
/obj/structure/machinery/computer/cameras/wooden_tv/ot
name = "Mortar Monitoring Set"
desc = "A Console linked to Mortar launched cameras."
diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm
index beed3610b53f..6ed2a8c7be64 100644
--- a/code/game/machinery/computer/communications.dm
+++ b/code/game/machinery/computer/communications.dm
@@ -161,7 +161,7 @@
log_game("[key_name(usr)] has called for an emergency evacuation.")
message_admins("[key_name_admin(usr)] has called for an emergency evacuation.")
- log_ares_security("Initiate Evacuation", "[usr] has called for an emergency evacuation.")
+ log_ares_security("Initiate Evacuation", "Called for an emergency evacuation.", usr)
return TRUE
state = STATE_EVACUATION
@@ -187,7 +187,7 @@
log_game("[key_name(usr)] has canceled the emergency evacuation.")
message_admins("[key_name_admin(usr)] has canceled the emergency evacuation.")
- log_ares_security("Cancel Evacuation", "[usr] has cancelled the emergency evacuation.")
+ log_ares_security("Cancel Evacuation", "Cancelled the emergency evacuation.", usr)
return TRUE
state = STATE_EVACUATION_CANCEL
diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm
index c33517796271..f6efe6edb5e2 100644
--- a/code/game/machinery/computer/computer.dm
+++ b/code/game/machinery/computer/computer.dm
@@ -126,7 +126,7 @@
src.attack_alien(user)
return
src.attack_hand(user)
- return
+ return ..()
/obj/structure/machinery/computer/attack_hand()
. = ..()
diff --git a/code/game/machinery/computer/dropship_weapons.dm b/code/game/machinery/computer/dropship_weapons.dm
index dce026f4ce33..5d61ed536618 100644
--- a/code/game/machinery/computer/dropship_weapons.dm
+++ b/code/game/machinery/computer/dropship_weapons.dm
@@ -453,6 +453,61 @@
initiate_firemission(user, fm_tag, direction, text2num(offset_x_value), text2num(offset_y_value))
return TRUE
+ if("paradrop-lock")
+ var/obj/docking_port/mobile/marine_dropship/linked_shuttle = SSshuttle.getShuttle(shuttle_tag)
+ if(!linked_shuttle)
+ return FALSE
+ if(linked_shuttle.mode != SHUTTLE_CALL)
+ return FALSE
+ if(linked_shuttle.paradrop_signal)
+ clear_locked_turf_and_lock_aft()
+ return TRUE
+ var/datum/cas_signal/sig = get_cas_signal(camera_target_id)
+ if(!sig)
+ to_chat(user, SPAN_WARNING("No signal chosen."))
+ return FALSE
+ var/turf/location = get_turf(sig.signal_loc)
+ var/area/location_area = get_area(location)
+ if(CEILING_IS_PROTECTED(location_area.ceiling, CEILING_PROTECTION_TIER_1))
+ to_chat(user, SPAN_WARNING("Target is obscured."))
+ return FALSE
+ var/equipment_tag = params["equipment_id"]
+ for(var/obj/structure/dropship_equipment/equipment as anything in shuttle.equipments)
+ var/mount_point = equipment.ship_base.attach_id
+ if(mount_point != equipment_tag)
+ continue
+ if(istype(equipment, /obj/structure/dropship_equipment/paradrop_system))
+ var/obj/structure/dropship_equipment/paradrop_system/paradrop_system = equipment
+ if(paradrop_system.system_cooldown > world.time)
+ to_chat(user, SPAN_WARNING("You toggled the system too recently."))
+ return
+ paradrop_system.system_cooldown = world.time + 5 SECONDS
+ paradrop_system.visible_message(SPAN_NOTICE("[equipment] hums as it locks to a signal."))
+ break
+ linked_shuttle.paradrop_signal = sig
+ addtimer(CALLBACK(src, PROC_REF(open_aft_for_paradrop)), 2 SECONDS)
+ RegisterSignal(linked_shuttle.paradrop_signal, COMSIG_PARENT_QDELETING, PROC_REF(clear_locked_turf_and_lock_aft))
+ RegisterSignal(linked_shuttle, COMSIG_SHUTTLE_SETMODE, PROC_REF(clear_locked_turf_and_lock_aft))
+ return TRUE
+
+/obj/structure/machinery/computer/dropship_weapons/proc/open_aft_for_paradrop()
+ var/obj/docking_port/mobile/marine_dropship/shuttle = SSshuttle.getShuttle(shuttle_tag)
+ if(!shuttle || !shuttle.paradrop_signal || shuttle.mode != SHUTTLE_CALL)
+ return
+ shuttle.door_control.control_doors("force-unlock", "aft", TRUE)
+
+/obj/structure/machinery/computer/dropship_weapons/proc/clear_locked_turf_and_lock_aft()
+ SIGNAL_HANDLER
+ var/obj/docking_port/mobile/marine_dropship/shuttle = SSshuttle.getShuttle(shuttle_tag)
+ if(!shuttle)
+ return
+ shuttle.door_control.control_doors("force-lock", "aft", TRUE)
+ visible_message(SPAN_WARNING("[src] displays an alert as it loses the paradrop target."))
+ for(var/obj/structure/dropship_equipment/paradrop_system/parad in shuttle.equipments)
+ parad.visible_message(SPAN_WARNING("[parad] displays an alert as it loses the paradrop target."))
+ UnregisterSignal(shuttle.paradrop_signal, COMSIG_PARENT_QDELETING)
+ UnregisterSignal(shuttle, COMSIG_SHUTTLE_SETMODE)
+ shuttle.paradrop_signal = null
/obj/structure/machinery/computer/dropship_weapons/proc/get_weapon(eqp_tag)
var/obj/docking_port/mobile/marine_dropship/dropship = SSshuttle.getShuttle(shuttle_tag)
@@ -754,7 +809,7 @@
if (!dropship.in_flyby || dropship.mode != SHUTTLE_CALL)
to_chat(user, SPAN_WARNING("Has to be in Fly By mode"))
return FALSE
- if (dropship.timer && dropship.timeLeft(1) < firemission_envelope.get_total_duration())
+ if (dropship.timer && dropship.timeLeft(1) < firemission_envelope.flyoff_period)
to_chat(user, SPAN_WARNING("Not enough time to complete the Fire Mission"))
return FALSE
var/datum/cas_signal/recorded_loc = firemission_envelope.recorded_loc
diff --git a/code/game/machinery/computer/research.dm b/code/game/machinery/computer/research.dm
index d5158cb76451..3a8292ec7d07 100644
--- a/code/game/machinery/computer/research.dm
+++ b/code/game/machinery/computer/research.dm
@@ -179,7 +179,7 @@
if("purchase_document")
if(!photocopier)
return
- var/purchase_tier = Floor(text2num(params["purchase_document"]))
+ var/purchase_tier = floor(text2num(params["purchase_document"]))
if(purchase_tier <= 0 || purchase_tier > 5)
return
if(purchase_tier > GLOB.chemical_data.clearance_level)
diff --git a/code/game/machinery/doors/multi_tile.dm b/code/game/machinery/doors/multi_tile.dm
index 1e7fcbf40155..f95ef09e812f 100644
--- a/code/game/machinery/doors/multi_tile.dm
+++ b/code/game/machinery/doors/multi_tile.dm
@@ -279,8 +279,8 @@
return
..()
-/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/unlock()
- if(is_reserved_level(z))
+/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/unlock(forced=FALSE)
+ if(is_reserved_level(z) && !forced)
return // in orbit
..()
@@ -294,6 +294,9 @@
if(xeno.action_busy)
return
+ if(is_reserved_level(z)) //no prying in space even though it's funny
+ return
+
var/direction
switch(id)
if("starboard_door")
diff --git a/code/game/machinery/kitchen/gibber.dm b/code/game/machinery/kitchen/gibber.dm
index 3fa96ca0bc3a..4b68b397116e 100644
--- a/code/game/machinery/kitchen/gibber.dm
+++ b/code/game/machinery/kitchen/gibber.dm
@@ -105,15 +105,28 @@
to_chat(user, SPAN_WARNING("You need a better grip to do that!"))
return
- if(victim.abiotic(1))
+ if(victim.abiotic(TRUE))
to_chat(user, SPAN_WARNING("Subject may not have abiotic items on."))
return
user.visible_message(SPAN_DANGER("[user] starts to put [victim] into the gibber!"))
add_fingerprint(user)
+ ///If synth is getting gibbed, we will 'soft gib' them, but this is still pretty LRP so let admin know.
+ if(issynth(victim) && ishuman_strict(user) && !occupant)
+ var/turf/turf_ref = get_turf(user)
+ var/area/area = get_area(user)
+ message_admins("ALERT: [user] ([user.key]) is trying to shove [victim] in a gibber! (They are a synth, so this will delimb them) ([victim.key]) in [area.name] [ADMIN_JMP(turf_ref)]")
+ log_attack("[key_name(user)] tried to delimb [victim] using a gibber ([victim.key]) in [area.name]")
+ to_chat(user, SPAN_DANGER("What are you doing..."))
+ if(do_after(user, 30 SECONDS, INTERRUPT_ALL, BUSY_ICON_HOSTILE && grabbed && grabbed.grabbed_thing && !occupant))
+ user.visible_message(SPAN_DANGER("[user] stuffs [victim] into the gibber!"))
+ victim.forceMove(src)
+ occupant = victim
+ update_icon()
+
///If someone's being LRP and doing funny chef shit, this lets admins know. This *shouldn't* flag preds, though.
- if(ishuman(victim) && ishuman_strict(user) && !occupant)
+ else if(ishuman(victim) && ishuman_strict(user) && !occupant)
var/turf/turf_ref = get_turf(user)
var/area/area = get_area(user)
message_admins("ALERT: [user] ([user.key]) is trying to gib [victim] ([victim.key]) in [area.name] [ADMIN_JMP(turf_ref)]")
@@ -142,18 +155,23 @@
add_fingerprint(usr)
return
-/obj/structure/machinery/gibber/proc/go_out()
+/obj/structure/machinery/gibber/proc/go_out(launch = FALSE)
if (!occupant)
- return
+ return FALSE
for(var/obj/O in src)
O.forceMove(loc)
if (occupant.client)
occupant.client.eye = occupant.client.mob
occupant.client.perspective = MOB_PERSPECTIVE
occupant.forceMove(loc)
+ if(launch)
+ // yeet them out of the gibber
+ visible_message(SPAN_DANGER("[occupant] suddenly is launched out of the [src]!"))
+ var/turf/Tx = locate(x - 3, y, z)
+ occupant.throw_atom(Tx, 3, SPEED_FAST, src, TRUE)
occupant = null
update_icon()
- return
+ return TRUE
/obj/structure/machinery/gibber/proc/startgibbing(mob/user as mob)
@@ -162,13 +180,18 @@
if(!occupant)
visible_message(SPAN_DANGER("You hear a loud metallic grinding sound."))
return
+ var/synthetic = issynth(occupant)
use_power(1000)
- visible_message(SPAN_DANGER("You hear a loud squelchy grinding sound."))
- operating = 1
+ if(synthetic)
+ visible_message(SPAN_BOLDWARNING("[src] begins to emitt sparks out the top as a banging noise can be heard!"), SPAN_BOLDWARNING("You hear a myriad of loud bangs!"))
+ else
+ visible_message(SPAN_DANGER("You hear a loud squelchy grinding sound."))
+ operating = TRUE
update_icon()
var/totalslabs = 2
+
var/obj/item/reagent_container/food/snacks/meat/meat_template = /obj/item/reagent_container/food/snacks/meat/monkey
if(istype(occupant, /mob/living/carbon/xenomorph))
var/mob/living/carbon/xenomorph/X = occupant
@@ -186,6 +209,35 @@
meat_template = /obj/item/reagent_container/food/snacks/meat/human
totalslabs = 3
+ // Synths only get delimbed from this. 1 meat per limb
+ if(synthetic)
+ meat_template = /obj/item/reagent_container/food/snacks/meat/synthmeat/synthflesh
+ totalslabs = 0
+ var/mob/living/carbon/human/victim = occupant
+
+ // Remove all limbs to allow synth to park closer at the supermarket
+ var/obj/limb/limb
+
+ if(victim.has_limb("l_leg"))
+ limb = victim.get_limb("r_leg")
+ totalslabs += 1
+ limb.droplimb(FALSE, TRUE, "gibber")
+
+ if(victim.has_limb("l_leg"))
+ limb = victim.get_limb("l_leg")
+ totalslabs += 1
+ limb.droplimb(FALSE, TRUE, "gibber")
+
+ if(victim.has_limb("r_arm"))
+ limb = victim.get_limb("r_arm")
+ totalslabs += 1
+ limb.droplimb(FALSE, TRUE, "gibber")
+
+ if(victim.has_limb("l_arm"))
+ limb = victim.get_limb("l_arm")
+ totalslabs += 1
+ limb.droplimb(FALSE, TRUE, "gibber")
+
var/obj/item/reagent_container/food/snacks/meat/allmeat[totalslabs]
for(var/i in 1 to totalslabs)
var/obj/item/reagent_container/food/snacks/meat/newmeat
@@ -194,26 +246,38 @@
newmeat.name = newmeat.made_from_player + newmeat.name
allmeat[i] = newmeat
- if(src.occupant.client) // Gibbed a cow with a client in it? log that shit
- src.occupant.attack_log += "\[[time_stamp()]\] Was gibbed by [key_name(user)]"
+ // Synths wont die to this (on it's own at least), dont log as a gib
+ if(synthetic)
+ if(occupant.client) // Log still
+ occupant.attack_log += "\[[time_stamp()]\] Was delimbed by [key_name(user)]"
+ user.attack_log += "\[[time_stamp()]\] delimbed [key_name(occupant)]"
+ msg_admin_attack("[key_name(user)] delimbed [key_name(occupant)] with a gibber in [user.loc.name]([user.x], [user.y], [user.z]).", user.x, user.y, user.z)
+ continue
+
+ if(occupant.client) // Gibbed a cow with a client in it? log that shit
+ occupant.attack_log += "\[[time_stamp()]\] Was gibbed by [key_name(user)]"
user.attack_log += "\[[time_stamp()]\] Gibbed [key_name(occupant)]"
msg_admin_attack("[key_name(user)] gibbed [key_name(occupant)] in [user.loc.name] ([user.x], [user.y], [user.z]).", user.x, user.y, user.z)
- src.occupant.death(create_cause_data("gibber", user), TRUE)
- src.occupant.ghostize()
+ occupant.death(create_cause_data("gibber", user), TRUE)
+ occupant.ghostize()
- QDEL_NULL(occupant)
+ if(synthetic)
+ to_chat(occupant, SPAN_HIGHDANGER("You can detect your limbs being ripped off your body, but it begins to malfunction as it reaches your torso!"))
+ addtimer(CALLBACK(src, PROC_REF(create_gibs), totalslabs, allmeat), gibtime)
+ addtimer(CALLBACK(src, PROC_REF(go_out), TRUE), gibtime)
+ return
- addtimer(CALLBACK(src, PROC_REF(create_gibs), totalslabs, allmeat), gibtime)
+ QDEL_NULL(occupant)
/obj/structure/machinery/gibber/proc/create_gibs(totalslabs, list/obj/item/reagent_container/food/snacks/allmeat)
playsound(loc, 'sound/effects/splat.ogg', 25, 1)
operating = FALSE
+ var/turf/Tx = locate(x - 1, y, z)
for (var/i in 1 to totalslabs)
var/obj/item/meatslab = allmeat[i]
- var/turf/Tx = locate(x - i, y, z)
meatslab.forceMove(loc)
- meatslab.throw_atom(Tx, i, SPEED_FAST, src)
+ meatslab.throw_atom(Tx, 1, SPEED_FAST, src)
if (!Tx.density)
if(istype(meatslab, /obj/item/reagent_container/food/snacks/meat/xenomeat))
new /obj/effect/decal/cleanable/blood/gibs/xeno(Tx)
diff --git a/code/game/machinery/kitchen/microwave.dm b/code/game/machinery/kitchen/microwave.dm
index 220772e98b17..5a7e690fc3ca 100644
--- a/code/game/machinery/kitchen/microwave.dm
+++ b/code/game/machinery/kitchen/microwave.dm
@@ -229,8 +229,9 @@
//************************************/
/obj/structure/machinery/microwave/proc/cook(time_multiplier = 1)
- if(inoperable())
+ if(inoperable() || operating)
return
+
start()
if (reagents.total_volume==0 && !(locate(/obj) in contents)) //dry run
if (!wzhzhzh(10 * time_multiplier))
diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm
index a04dcd4d9212..f835ecaa424c 100644
--- a/code/game/machinery/machinery.dm
+++ b/code/game/machinery/machinery.dm
@@ -355,3 +355,72 @@ Class Procs:
icon_state = "autolathe"
density = TRUE
anchored = TRUE
+
+/obj/structure/machinery/fuelpump
+ name = "\improper Fuel Pump"
+ layer = ABOVE_MOB_LAYER
+ desc = "It is a machine that pumps fuel around the ship."
+ icon = 'icons/obj/structures/machinery/fuelpump.dmi'
+ icon_state = "fuelpump_off"
+ health = null
+ indestructible = TRUE
+ density = TRUE
+ anchored = TRUE
+ unslashable = TRUE
+ unacidable = TRUE
+ wrenchable = FALSE
+
+/obj/structure/machinery/fuelpump/ex_act(severity)
+ return
+
+/obj/structure/machinery/fuelpump/Initialize(mapload, ...)
+ . = ..()
+ RegisterSignal(SSdcs, COMSIG_GLOB_FUEL_PUMP_UPDATE, PROC_REF(on_pump_update))
+
+/obj/structure/machinery/fuelpump/proc/on_pump_update()
+ SIGNAL_HANDLER
+ playsound(src, 'sound/machines/resource_node/node_idle.ogg', 60, TRUE)
+ update_icon()
+
+/obj/structure/machinery/fuelpump/update_icon()
+ if(stat & NOPOWER)
+ icon_state = "fuelpump_off"
+ return
+ if(SShijack.hijack_status < HIJACK_OBJECTIVES_STARTED)
+ icon_state = "fuelpump_on"
+ return
+ switch(SShijack.current_progress)
+ if(-INFINITY to 24)
+ icon_state = "fuelpump_0"
+ if(25 to 49)
+ icon_state = "fuelpump_25"
+ if(50 to 74)
+ icon_state = "fuelpump_50"
+ if(75 to 99)
+ icon_state = "fuelpump_75"
+ if(100 to INFINITY)
+ icon_state = "fuelpump_100"
+ else
+ icon_state = "fuelpump_on" // Never should happen
+
+/obj/structure/machinery/fuelpump/get_examine_text(mob/user)
+ . = ..()
+ if(get_dist(user, src) > 2 && user != loc)
+ return
+ if(inoperable())
+ return
+ if(SShijack.hijack_status < HIJACK_OBJECTIVES_STARTED)
+ return
+ switch(SShijack.current_progress)
+ if(-INFINITY to 24)
+ . += SPAN_NOTICE("It looks like it barely has any fuel yet.")
+ if(25 to 49)
+ . += SPAN_NOTICE("It looks like it has accumulated some fuel.")
+ if(50 to 74)
+ . += SPAN_NOTICE("It looks like the fuel tank is a little over half full.")
+ if(75 to 99)
+ . += SPAN_NOTICE("It looks like the fuel tank is almost full.")
+ if(100 to INFINITY)
+ . += SPAN_NOTICE("It looks like the fuel tank is full.")
+ else
+ . += SPAN_NOTICE("It looks like something is wrong!") // Never should happen
diff --git a/code/game/machinery/vending/vending_types.dm b/code/game/machinery/vending/vending_types.dm
index 92ba81af4d94..b69773dbf8bf 100644
--- a/code/game/machinery/vending/vending_types.dm
+++ b/code/game/machinery/vending/vending_types.dm
@@ -234,8 +234,9 @@
icon_deny = "sec-deny"
req_access = list(ACCESS_MARINE_BRIG)
products = list(
- /obj/item/handcuffs = 8,
- /obj/item/handcuffs/zip = 10,
+ /obj/item/restraint/handcuffs = 8,
+ /obj/item/restraint/handcuffs/zip = 10,
+ /obj/item/restraint/legcuffs = 3,
/obj/item/explosive/grenade/flashbang = 4,
/obj/item/weapon/gun/energy/taser = 4,
/obj/item/reagent_container/spray/pepper = 4,
@@ -263,7 +264,7 @@
hacking_safety = TRUE
wrenchable = FALSE
products = list(
- /obj/item/handcuffs/zip = 40,
+ /obj/item/restraint/handcuffs/zip = 40,
/obj/item/explosive/grenade/flashbang = 20,
/obj/item/explosive/grenade/custom/teargas = 40,
/obj/item/ammo_magazine/smg/m39/rubber = 40,
diff --git a/code/game/machinery/vending/vendor_types/crew/sea.dm b/code/game/machinery/vending/vendor_types/crew/sea.dm
index 44f530271037..37cacfd14a6f 100644
--- a/code/game/machinery/vending/vendor_types/crew/sea.dm
+++ b/code/game/machinery/vending/vendor_types/crew/sea.dm
@@ -29,17 +29,20 @@ GLOBAL_LIST_INIT(cm_vending_gear_sea, list(
GLOBAL_LIST_INIT(cm_vending_clothing_sea, list(
list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null),
list("Officer Uniform", 0, /obj/item/clothing/under/marine/dress, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY),
- list("Marine Combat Gloves", 0, /obj/item/clothing/gloves/marine, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY),
list("Headset", 0, /obj/item/device/radio/headset/almayer/mcom/cdrcom, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY),
list("Satchel", 0, /obj/item/storage/backpack/satchel/lockable, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY),
list("MRE", 0, /obj/item/storage/box/MRE, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY),
list("Marine Combat Boots", 0, /obj/item/clothing/shoes/marine/knife, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_MANDATORY),
+ list("GLOVES (CHOOSE 1)", 0, null, null, null),
+ list("Insulated Gloves", 0, /obj/item/clothing/gloves/yellow, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_REGULAR),
+ list("Marine Combat Gloves", 0, /obj/item/clothing/gloves/marine, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_REGULAR),
+
list("BELT (CHOOSE 1)", 0, null, null, null),
list("G8-A General Utility Pouch", 0, /obj/item/storage/backpack/general_belt, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("M276 Lifesaver Bag (Full)", 0, /obj/item/storage/belt/medical/lifesaver/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED),
list("M276 Toolbelt Rig (Full)", 0, /obj/item/storage/belt/utility/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
- list("M276 Combat Toolbelt Rig (Full)", 0, /obj/item/storage/belt/gun/utility, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
+ list("M276 Combat Toolbelt Rig (Full)", 0, /obj/item/storage/belt/gun/utility/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
list("POUCHES (CHOOSE 2)", 0, null, null, null),
list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
@@ -58,6 +61,12 @@ GLOBAL_LIST_INIT(cm_vending_clothing_sea, list(
list("Bulletproof Vest", 0, /obj/item/clothing/suit/armor/bulletproof, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR),
list("USCM Service Jacket", 0, /obj/item/clothing/suit/storage/jacket/marine/service, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR),
+ list("EYEWEAR (CHOOSE 1)", 0, null, null, null),
+ list("Welding Goggles", 0, /obj/item/clothing/glasses/welding, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_REGULAR),
+ list("Medical HUD Glasses", 0, /obj/item/clothing/glasses/hud/health, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_REGULAR),
+ list("Prescription Medical HUD Glasses", 0, /obj/item/clothing/glasses/hud/health/prescription, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_REGULAR),
+ list("Sunglasses", 0, /obj/item/clothing/glasses/sunglasses, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_REGULAR),
+
list("ACCESSORIES (CHOOSE 1)", 0, null, null, null),
list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR),
@@ -68,9 +77,6 @@ GLOBAL_LIST_INIT(cm_vending_clothing_sea, list(
list("HEADWEAR (CHOOSE 1)", 0, null, null, null),
list("Drill Hat", 0, /obj/item/clothing/head/drillhat, MARINE_CAN_BUY_MASK, VENDOR_ITEM_RECOMMENDED),
list("M10 Helmet", 0, /obj/item/clothing/head/helmet/marine, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR),
-
- list("TOOLS OF THE TRADE", 0, null, null, null),
- list("CPR Dummy", 5, /obj/item/cpr_dummy, null, VENDOR_ITEM_REGULAR)
))
/obj/structure/machinery/cm_vending/clothing/sea
diff --git a/code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm b/code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm
index 6877c2b4b5b3..0586f4b72fa5 100644
--- a/code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm
+++ b/code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm
@@ -76,6 +76,9 @@
else
display_list = GLOB.cm_vending_vehicle_crew_tank_spare
+ else if(selected_vehicle == "ARC")
+ display_list = GLOB.cm_vending_vehicle_crew_arc
+
else if(selected_vehicle == "APC")
if(available_categories)
display_list = GLOB.cm_vending_vehicle_crew_apc
@@ -245,6 +248,11 @@ GLOBAL_LIST_INIT(cm_vending_vehicle_crew_apc_spare, list(
list("WHEELS", 0, null, null, null),
list("APC Wheels", 200, /obj/item/hardpoint/locomotion/apc_wheels, null, VENDOR_ITEM_REGULAR)))
+GLOBAL_LIST_INIT(cm_vending_vehicle_crew_arc, list(
+ list("STARTING KIT SELECTION:", 0, null, null, null),
+
+ list("WHEELS", 0, null, null, null),
+ list("Replacement ARC Wheels", 0, /obj/item/hardpoint/locomotion/arc_wheels, VEHICLE_TREADS_AVAILABLE, VENDOR_ITEM_MANDATORY)))
//------------WEAPONS RACK---------------
diff --git a/code/game/machinery/vending/vendor_types/requisitions.dm b/code/game/machinery/vending/vendor_types/requisitions.dm
index 6eb5a333ec81..29199ed741fb 100644
--- a/code/game/machinery/vending/vendor_types/requisitions.dm
+++ b/code/game/machinery/vending/vendor_types/requisitions.dm
@@ -77,6 +77,7 @@
list("Technician Welder-Satchel", round(scale * 5), /obj/item/storage/backpack/marine/engineerpack/satchel, VENDOR_ITEM_REGULAR),
list("IMP Ammo Rack", round(scale * 2), /obj/item/storage/backpack/marine/ammo_rack, VENDOR_ITEM_REGULAR),
list("Radio Telephone Pack", round(scale * 2), /obj/item/storage/backpack/marine/satchel/rto, VENDOR_ITEM_REGULAR),
+ list("Parachute", round(scale * 20), /obj/item/parachute, VENDOR_ITEM_REGULAR),
list("BELTS", -1, null, null),
list("G8-A General Utility Pouch", round(scale * 2), /obj/item/storage/backpack/general_belt, VENDOR_ITEM_REGULAR),
@@ -89,7 +90,6 @@
list("M276 M82F Holster Rig", round(scale * 2), /obj/item/storage/belt/gun/flaregun, VENDOR_ITEM_REGULAR),
list("M276 Shotgun Shell Loading Rig", round(scale * 10), /obj/item/storage/belt/shotgun, VENDOR_ITEM_REGULAR),
list("M276 Mortar Operator Belt", round(scale * 2), /obj/item/storage/belt/gun/mortarbelt, VENDOR_ITEM_REGULAR),
- list("Rappel Harness", round(scale * 20), /obj/item/rappel_harness, VENDOR_ITEM_REGULAR),
list("POUCHES", -1, null, null),
list("Autoinjector Pouch", round(scale * 1), /obj/item/storage/pouch/autoinjector, VENDOR_ITEM_REGULAR),
diff --git a/code/game/objects/effects/effect_system/foam.dm b/code/game/objects/effects/effect_system/foam.dm
index 525cb8c731a9..7a06fa50619c 100644
--- a/code/game/objects/effects/effect_system/foam.dm
+++ b/code/game/objects/effects/effect_system/foam.dm
@@ -20,6 +20,7 @@
var/expand = 1
animate_movement = 0
var/metal = FOAM_NOT_METAL
+ var/time_to_solidify = 4 SECONDS
/obj/effect/particle_effect/foam/Initialize(mapload, ismetal=0)
@@ -28,7 +29,7 @@
metal = ismetal
playsound(src, 'sound/effects/bubbles2.ogg', 25, 1, 5)
addtimer(CALLBACK(src, PROC_REF(foam_react)), 3 + metal*3)
- addtimer(CALLBACK(src, PROC_REF(foam_metal_final_react)), 40)
+ addtimer(CALLBACK(src, PROC_REF(foam_metal_final_react)), time_to_solidify)
/obj/effect/particle_effect/foam/proc/foam_react()
process()
diff --git a/code/game/objects/effects/effect_system/smoke.dm b/code/game/objects/effects/effect_system/smoke.dm
index c9e404ae5b60..6e3869f563a4 100644
--- a/code/game/objects/effects/effect_system/smoke.dm
+++ b/code/game/objects/effects/effect_system/smoke.dm
@@ -240,9 +240,9 @@
if(isyautja(M) || isxeno(M))
burn_damage *= xeno_yautja_reduction
+ var/reagent = new /datum/reagent/napalm/ut()
M.burn_skin(burn_damage)
- M.adjust_fire_stacks(applied_fire_stacks)
- M.fire_reagent = new /datum/reagent/napalm/ut()
+ M.adjust_fire_stacks(applied_fire_stacks, reagent)
M.IgniteMob()
M.updatehealth()
@@ -316,7 +316,7 @@
if(xeno_affecting)
stun_chance = 35
if(prob(stun_chance))
- creature.apply_effect(1, WEAKEN)
+ creature.apply_effect(2, WEAKEN)
//Topical damage (neurotoxin on exposed skin)
if(xeno_creature)
diff --git a/code/game/objects/effects/landmarks/survivor_spawner.dm b/code/game/objects/effects/landmarks/survivor_spawner.dm
index 803d73151aeb..4a6e5272ed05 100644
--- a/code/game/objects/effects/landmarks/survivor_spawner.dm
+++ b/code/game/objects/effects/landmarks/survivor_spawner.dm
@@ -201,8 +201,8 @@
//CMB Survivors//
/obj/effect/landmark/survivor_spawner/fiorina_armory_cmb
- equipment = /datum/equipment_preset/survivor/colonial_marshal
- synth_equipment = /datum/equipment_preset/synth/survivor/cmb_synth
+ equipment = /datum/equipment_preset/survivor/cmb/standard
+ synth_equipment = /datum/equipment_preset/synth/survivor/cmb/synth
intro_text = list("
You are a CMB Deputy!
",\
"You are aware of the 'alien' threat.",\
"Your primary objective is to survive the infestation.")
@@ -211,8 +211,8 @@
spawn_priority = SPAWN_PRIORITY_VERY_HIGH
/obj/effect/landmark/survivor_spawner/fiorina_armory_riot_control
- equipment = /datum/equipment_preset/survivor/colonial_marshal/fiorina
- synth_equipment = /datum/equipment_preset/synth/survivor/cmb_synth
+ equipment = /datum/equipment_preset/survivor/cmb/ua
+ synth_equipment = /datum/equipment_preset/synth/survivor/cmb/ua_synth
intro_text = list("You are a United Americas Riot Control Officer!
",\
"You are aware of the 'alien' threat.",\
"Your primary objective is to survive the infestation.")
diff --git a/code/game/objects/effects/temporary_visuals.dm b/code/game/objects/effects/temporary_visuals.dm
index 4dc07b76f3cb..d05e7789b1d5 100644
--- a/code/game/objects/effects/temporary_visuals.dm
+++ b/code/game/objects/effects/temporary_visuals.dm
@@ -96,3 +96,26 @@
splatter_type = "csplatter"
color = BLOOD_COLOR_SYNTHETIC
+//------------------------------------------
+//Shockwaves
+//------------------------------------------
+
+/obj/effect/shockwave
+ icon = 'icons/effects/light_overlays/shockwave.dmi'
+ icon_state = "shockwave"
+ plane = DISPLACEMENT_PLATE_RENDER_LAYER
+ pixel_x = -496
+ pixel_y = -496
+
+/obj/effect/shockwave/Initialize(mapload, radius, speed, easing_type = LINEAR_EASING, y_offset, x_offset)
+ . = ..()
+ if(!speed)
+ speed = 1
+ if(y_offset)
+ pixel_y += y_offset
+ if(x_offset)
+ pixel_x += x_offset
+ QDEL_IN(src, 0.5 * radius * speed)
+ transform = matrix().Scale(32 / 1024, 32 / 1024)
+ animate(src, time = 0.5 * radius * speed, transform=matrix().Scale((32 / 1024) * radius * 1.5, (32 / 1024) * radius * 1.5), easing = easing_type)
+
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index fb0103876301..1a632569eccb 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -668,13 +668,13 @@ cases. Override_icon_state should be a list.*/
if(WEAR_HANDCUFFS)
if(human.handcuffed)
return FALSE
- if(!istype(src, /obj/item/handcuffs))
+ if(!istype(src, /obj/item/restraint))
return FALSE
return TRUE
if(WEAR_LEGCUFFS)
if(human.legcuffed)
return FALSE
- if(!istype(src, /obj/item/legcuffs))
+ if(!istype(src, /obj/item/restraint))
return FALSE
return TRUE
if(WEAR_IN_ACCESSORY)
diff --git a/code/game/objects/items/devices/binoculars.dm b/code/game/objects/items/devices/binoculars.dm
index 84da7d9acff4..b39526e231b5 100644
--- a/code/game/objects/items/devices/binoculars.dm
+++ b/code/game/objects/items/devices/binoculars.dm
@@ -354,13 +354,16 @@
/obj/item/device/binoculars/range/designator/scout
name = "scout laser designator"
desc = "An improved laser designator, issued to USCM scouts, with two modes: target marking for CAS with IR laser and rangefinding. Ctrl + Click turf to target something. Ctrl + Click designator to stop lasing. Alt + Click designator to switch modes."
+ unacidable = TRUE
+ indestructible = TRUE
cooldown_duration = 80
target_acquisition_delay = 30
/obj/item/device/binoculars/range/designator/spotter
name = "spotter's laser designator"
desc = "A specially-designed laser designator, issued to USCM spotters, with two modes: target marking for CAS with IR laser and rangefinding. Ctrl + Click turf to target something. Ctrl + Click designator to stop lasing. Alt + Click designator to switch modes. Additionally, a trained spotter can laze targets for a USCM marksman, increasing the speed of target acquisition. A targeting beam will connect the binoculars to the target, but it may inherit the user's cloak, if possible."
-
+ unacidable = TRUE
+ indestructible = TRUE
var/is_spotting = FALSE
var/spotting_time = 10 SECONDS
var/spotting_cooldown_delay = 5 SECONDS
diff --git a/code/game/objects/items/devices/cictablet.dm b/code/game/objects/items/devices/cictablet.dm
index 664054fb59e2..de03f1779f2b 100644
--- a/code/game/objects/items/devices/cictablet.dm
+++ b/code/game/objects/items/devices/cictablet.dm
@@ -91,43 +91,43 @@
. = ..()
if(.)
return
-
+ var/mob/user = ui.user
switch(action)
if("announce")
- if(usr.client.prefs.muted & MUTE_IC)
- to_chat(usr, SPAN_DANGER("You cannot send Announcements (muted)."))
+ if(user.client.prefs.muted & MUTE_IC)
+ to_chat(user, SPAN_DANGER("You cannot send Announcements (muted)."))
return
if(!COOLDOWN_FINISHED(src, announcement_cooldown))
- to_chat(usr, SPAN_WARNING("Please wait [COOLDOWN_TIMELEFT(src, announcement_cooldown)/10] second\s before making your next announcement."))
+ to_chat(user, SPAN_WARNING("Please wait [COOLDOWN_TIMELEFT(src, announcement_cooldown)/10] second\s before making your next announcement."))
return FALSE
- var/input = stripped_multiline_input(usr, "Please write a message to announce to the [MAIN_SHIP_NAME]'s crew and all groundside personnel.", "Priority Announcement", "")
- if(!input || !COOLDOWN_FINISHED(src, announcement_cooldown) || !(usr in view(1, src)))
+ var/input = stripped_multiline_input(user, "Please write a message to announce to the [MAIN_SHIP_NAME]'s crew and all groundside personnel.", "Priority Announcement", "")
+ if(!input || !COOLDOWN_FINISHED(src, announcement_cooldown) || !(user in view(1, src)))
return FALSE
var/signed = null
- if(ishuman(usr))
- var/mob/living/carbon/human/H = usr
- var/obj/item/card/id/id = H.wear_id
+ if(ishuman(user))
+ var/mob/living/carbon/human/human_user = user
+ var/obj/item/card/id/id = human_user.wear_id
if(istype(id))
- var/paygrade = get_paygrades(id.paygrade, FALSE, H.gender)
+ var/paygrade = get_paygrades(id.paygrade, FALSE, human_user.gender)
signed = "[paygrade] [id.registered_name]"
marine_announcement(input, announcement_title, faction_to_display = announcement_faction, add_PMCs = add_pmcs, signature = signed)
- message_admins("[key_name(usr)] has made a command announcement.")
- log_announcement("[key_name(usr)] has announced the following: [input]")
+ message_admins("[key_name(user)] has made a command announcement.")
+ log_announcement("[key_name(user)] has announced the following: [input]")
COOLDOWN_START(src, announcement_cooldown, cooldown_between_messages)
. = TRUE
if("award")
if(announcement_faction != FACTION_MARINE)
return
- open_medal_panel(usr, src)
+ open_medal_panel(user, src)
. = TRUE
if("mapview")
- tacmap.tgui_interact(usr)
+ tacmap.tgui_interact(user)
. = TRUE
if("evacuation_start")
@@ -135,20 +135,20 @@
return
if(GLOB.security_level < SEC_LEVEL_RED)
- to_chat(usr, SPAN_WARNING("The ship must be under red alert in order to enact evacuation procedures."))
+ to_chat(user, SPAN_WARNING("The ship must be under red alert in order to enact evacuation procedures."))
return FALSE
if(SShijack.evac_admin_denied)
- to_chat(usr, SPAN_WARNING("The USCM has placed a lock on deploying the evacuation pods."))
+ to_chat(user, SPAN_WARNING("The USCM has placed a lock on deploying the evacuation pods."))
return FALSE
if(!SShijack.initiate_evacuation())
- to_chat(usr, SPAN_WARNING("You are unable to initiate an evacuation procedure right now!"))
+ to_chat(user, SPAN_WARNING("You are unable to initiate an evacuation procedure right now!"))
return FALSE
- log_game("[key_name(usr)] has called for an emergency evacuation.")
- message_admins("[key_name_admin(usr)] has called for an emergency evacuation.")
- log_ares_security("Initiate Evacuation", "[usr] has called for an emergency evacuation.")
+ log_game("[key_name(user)] has called for an emergency evacuation.")
+ message_admins("[key_name_admin(user)] has called for an emergency evacuation.")
+ log_ares_security("Initiate Evacuation", "Called for an emergency evacuation.", user)
. = TRUE
if("distress")
@@ -156,14 +156,14 @@
return FALSE //Not a game mode?
if(GLOB.security_level == SEC_LEVEL_DELTA)
- to_chat(usr, SPAN_WARNING("The ship is already undergoing self destruct procedures!"))
+ to_chat(user, SPAN_WARNING("The ship is already undergoing self destruct procedures!"))
return FALSE
for(var/client/C in GLOB.admins)
if((R_ADMIN|R_MOD) & C.admin_holder.rights)
playsound_client(C,'sound/effects/sos-morse-code.ogg',10)
- SSticker.mode.request_ert(usr)
- to_chat(usr, SPAN_NOTICE("A distress beacon request has been sent to USCM Central Command."))
+ SSticker.mode.request_ert(user)
+ to_chat(user, SPAN_NOTICE("A distress beacon request has been sent to USCM Central Command."))
COOLDOWN_START(src, distress_cooldown, COOLDOWN_COMM_REQUEST)
return TRUE
diff --git a/code/game/objects/items/devices/data_detector.dm b/code/game/objects/items/devices/data_detector.dm
index 6a358ec09bd8..fe4b9cde0ab5 100644
--- a/code/game/objects/items/devices/data_detector.dm
+++ b/code/game/objects/items/devices/data_detector.dm
@@ -17,7 +17,6 @@
/obj/structure/machinery/computer/objective,
/obj/item/limb/head/synth,
)
- var/detect_empty_vial_boxes = FALSE
/obj/item/device/motiondetector/intel/get_help_text()
. = "Green indicators on your HUD will show the location of intelligence objects detected by the scanner. Has two modes: slow long-range [SPAN_HELPFUL("(14 tiles)")] and fast short-range [SPAN_HELPFUL("(7 tiles)")]."
@@ -43,22 +42,21 @@
var/detected
for(var/DT in objects_to_detect)
if(istype(I, DT))
- if(!detect_empty_vial_boxes && istype(I, /obj/item/storage/fancy/vials/random))
- if(!I.contents)
- continue
+ if(istype(I, /obj/item/storage/fancy/vials/random) && !length(I.contents))
+ break //We don't need to ping already looted containers
+ if(istype(I, /obj/item/reagent_container/glass/beaker/vial/random) && !I.reagents?.total_volume)
+ break //We don't need to ping already looted containers
detected = TRUE
if(I.contents)
for(var/obj/item/CI in I.contents)
if(istype(CI, DT))
- if(!detect_empty_vial_boxes && istype(I, /obj/item/storage/fancy/vials/random))
- if(!I.contents)
- continue
+ if(istype(CI, /obj/item/storage/fancy/vials/random) && !length(CI.contents))
+ break
+ if(istype(CI, /obj/item/reagent_container/glass/beaker/vial/random) && !CI.reagents?.total_volume)
+ break
detected = TRUE
- break
if(human_user && detected)
show_blip(human_user, I)
- if(detected)
- break
if(detected)
detected_sound = TRUE
@@ -76,13 +74,11 @@
for(var/obj/I in M.contents_twice())
for(var/DT in objects_to_detect)
if(istype(I, DT))
- if(!detect_empty_vial_boxes && istype(I, /obj/item/storage/fancy/vials/random))
- if(!I.contents)
- continue
+ if(istype(I, /obj/item/storage/fancy/vials/random) && !length(I.contents))
+ break
+ if(istype(I, /obj/item/reagent_container/glass/beaker/vial/random) && !I.reagents?.total_volume)
+ break
detected = TRUE
- break
- if(detected)
- break
if(human_user && detected)
show_blip(human_user, M)
diff --git a/code/game/objects/items/frames/table_rack.dm b/code/game/objects/items/frames/table_rack.dm
index c7aa53a2c4c1..eda9b9c5749b 100644
--- a/code/game/objects/items/frames/table_rack.dm
+++ b/code/game/objects/items/frames/table_rack.dm
@@ -100,6 +100,7 @@
desc = "A kit for a table, including a large, flat wooden surface and four legs. Some assembly required."
icon_state = "wood_tableparts"
flags_atom = FPRINT
+ matter = null
table_type = /obj/structure/surface/table/woodentable
/obj/item/frame/table/wood/attackby(obj/item/W, mob/user)
@@ -140,6 +141,7 @@
desc = "A kit for a table, including a large, flat wooden and carpet surface and four legs. Some assembly required."
icon_state = "gamble_tableparts"
flags_atom = null
+ matter = null
table_type = /obj/structure/surface/table/gamblingtable
/obj/item/frame/table/gambling/attackby(obj/item/W as obj, mob/user as mob)
diff --git a/code/game/objects/items/fulton.dm b/code/game/objects/items/fulton.dm
index 664c7871ba7f..9cdc2b78b609 100644
--- a/code/game/objects/items/fulton.dm
+++ b/code/game/objects/items/fulton.dm
@@ -143,8 +143,8 @@ GLOBAL_LIST_EMPTY(deployed_fultons)
reservation = SSmapping.request_turf_block_reservation(3, 3, 1, turf_type_override = /turf/open/space)
var/turf/bottom_left_turf = reservation.bottom_left_turfs[1]
var/turf/top_right_turf = reservation.top_right_turfs[1]
- var/middle_x = bottom_left_turf.x + Floor((top_right_turf.x - bottom_left_turf.x) / 2)
- var/middle_y = bottom_left_turf.y + Floor((top_right_turf.y - bottom_left_turf.y) / 2)
+ var/middle_x = bottom_left_turf.x + floor((top_right_turf.x - bottom_left_turf.x) / 2)
+ var/middle_y = bottom_left_turf.y + floor((top_right_turf.y - bottom_left_turf.y) / 2)
var/turf/space_tile = locate(middle_x, middle_y, bottom_left_turf.z)
if(!space_tile)
visible_message(SPAN_WARNING("[src] begins beeping like crazy. Something is wrong!"))
diff --git a/code/game/objects/items/handcuffs.dm b/code/game/objects/items/handcuffs.dm
index 2137b41d86bf..af71b806ed42 100644
--- a/code/game/objects/items/handcuffs.dm
+++ b/code/game/objects/items/handcuffs.dm
@@ -1,124 +1,162 @@
-/obj/item/handcuffs
- name = "handcuffs"
- desc = "Use this to keep prisoners in line."
- gender = PLURAL
- icon = 'icons/obj/items/items.dmi'
- icon_state = "handcuff"
- flags_atom = FPRINT|CONDUCT
- flags_equip_slot = SLOT_WAIST
- throwforce = 5
- w_class = SIZE_SMALL
- throw_speed = SPEED_SLOW
- throw_range = 5
- matter = list("metal" = 500)
-
- var/dispenser = 0
+/obj/item/restraint
+ /// SLOT_HANDS or SLOT_LEGS, for handcuffs or legcuffs
+ var/target_zone = SLOT_HANDS
+ /// How long to break out
var/breakouttime = 1 MINUTES
/// determines if handcuffs will be deleted on removal
var/single_use = 0
var/cuff_sound = 'sound/weapons/handcuffs.ogg'
/// how many deciseconds it takes to cuff someone
var/cuff_delay = 4 SECONDS
+ /// If can be applied to people manually
+ var/manual = TRUE
-/obj/item/handcuffs/attack(mob/living/carbon/C, mob/user)
- if(!istype(C))
+/obj/item/restraint/attack(mob/living/carbon/attacked_carbon, mob/user)
+ if(!istype(attacked_carbon) || !manual)
return ..()
- if (!istype(user, /mob/living/carbon/human))
+ if (!ishuman(user))
to_chat(user, SPAN_DANGER("You don't have the dexterity to do this!"))
return
- if(!C.handcuffed)
- place_handcuffs(C, user)
-
-/obj/item/handcuffs/get_mob_overlay(mob/user_mob, slot)
- var/image/ret = ..()
-
- var/image/handcuffs = overlay_image('icons/mob/mob.dmi', "handcuff1", color, RESET_COLOR)
- ret.overlays += handcuffs
-
- return ret
-
-/obj/item/handcuffs/proc/place_handcuffs(mob/living/carbon/target, mob/user)
+ switch(target_zone)
+ if(SLOT_HANDS)
+ if(!attacked_carbon.handcuffed)
+ place_handcuffs(attacked_carbon, user)
+ if(SLOT_LEGS)
+ if(!attacked_carbon.legcuffed)
+ apply_legcuffs(attacked_carbon, user)
+
+/obj/item/restraint/proc/place_handcuffs(mob/living/carbon/target, mob/user)
playsound(src.loc, cuff_sound, 25, 1, 4)
if(user.action_busy)
return
- if (ishuman(target))
- var/mob/living/carbon/human/H = target
+ if(ishuman(target))
+ var/mob/living/carbon/human/human_mob = target
- if (!H.has_limb_for_slot(WEAR_HANDCUFFS))
- to_chat(user, SPAN_DANGER("\The [H] needs at least two wrists before you can cuff them together!"))
+ if(!human_mob.has_limb_for_slot(WEAR_HANDCUFFS))
+ to_chat(user, SPAN_DANGER("\The [human_mob] needs at least two wrists before you can cuff them together!"))
return
- H.attack_log += text("\[[time_stamp()]\] Has been handcuffed (attempt) by [key_name(user)]")
- user.attack_log += text("\[[time_stamp()]\] Attempted to handcuff [key_name(H)]")
- msg_admin_attack("[key_name(user)] attempted to handcuff [key_name(H)] in [get_area(src)] ([src.loc.x],[src.loc.y],[src.loc.z]).", src.loc.x, src.loc.y, src.loc.z)
+ human_mob.attack_log += text("\[[time_stamp()]\] Has been handcuffed (attempt) by [key_name(user)]")
+ user.attack_log += text("\[[time_stamp()]\] Attempted to handcuff [key_name(human_mob)]")
+ msg_admin_attack("[key_name(user)] attempted to handcuff [key_name(human_mob)] in [get_area(src)] ([loc.x],[loc.y],[loc.z]).", loc.x, loc.y, loc.z)
- user.visible_message(SPAN_NOTICE("[user] tries to put [src] on [H]."))
- if(do_after(user, cuff_delay, INTERRUPT_MOVED, BUSY_ICON_HOSTILE, H, INTERRUPT_MOVED, BUSY_ICON_GENERIC))
- if(src == user.get_active_hand() && !H.handcuffed && Adjacent(user))
- if(iscarbon(H))
- if(istype(H.buckled, /obj/structure/bed/roller))
+ user.visible_message(SPAN_NOTICE("[user] tries to put [src] on [human_mob]."))
+ if(do_after(user, cuff_delay, INTERRUPT_MOVED, BUSY_ICON_HOSTILE, human_mob, INTERRUPT_MOVED, BUSY_ICON_GENERIC))
+ if(src == user.get_active_hand() && !human_mob.handcuffed && Adjacent(user))
+ if(iscarbon(human_mob))
+ if(istype(human_mob.buckled, /obj/structure/bed/roller))
to_chat(user, SPAN_DANGER("You cannot handcuff someone who is buckled onto a roller bed."))
return
- if(H.has_limb_for_slot(WEAR_HANDCUFFS))
+ if(human_mob.has_limb_for_slot(WEAR_HANDCUFFS))
user.drop_inv_item_on_ground(src)
- H.equip_to_slot_if_possible(src, WEAR_HANDCUFFS, 1, 0, 1, 1)
+ human_mob.equip_to_slot_if_possible(src, WEAR_HANDCUFFS, 1, 0, 1, 1)
user.count_niche_stat(STATISTICS_NICHE_HANDCUFF)
- else if (ismonkey(target))
+ else if(ismonkey(target))
user.visible_message(SPAN_NOTICE("[user] tries to put [src] on [target]."))
if(do_after(user, 30, INTERRUPT_MOVED, BUSY_ICON_HOSTILE, target, INTERRUPT_MOVED, BUSY_ICON_GENERIC))
if(src == user.get_active_hand() && !target.handcuffed && Adjacent(user))
user.drop_inv_item_on_ground(src)
target.equip_to_slot_if_possible(src, WEAR_HANDCUFFS, 1, 0, 1, 1)
+/obj/item/restraint/handcuffs
+ name = "handcuffs"
+ desc = "Use this to keep prisoners in line."
+ gender = PLURAL
+ icon = 'icons/obj/items/items.dmi'
+ icon_state = "handcuff"
+ flags_atom = FPRINT|CONDUCT
+ flags_equip_slot = SLOT_WAIST
+ throwforce = 5
+ w_class = SIZE_SMALL
+ throw_speed = SPEED_SLOW
+ throw_range = 5
+ matter = list("metal" = 500)
+
+/obj/item/restraint/handcuffs/get_mob_overlay(mob/user_mob, slot)
+ var/image/ret = ..()
+
+ var/image/handcuffs = overlay_image('icons/mob/mob.dmi', "handcuff1", color, RESET_COLOR)
+ ret.overlays += handcuffs
+
+ return ret
-/obj/item/handcuffs/zip
+/obj/item/restraint/handcuffs/zip
name = "zip cuffs"
desc = "Single-use plastic zip tie handcuffs."
w_class = SIZE_TINY
icon_state = "cuff_zip"
- breakouttime = 600 //Deciseconds = 60s
+ breakouttime = 60 SECONDS
cuff_sound = 'sound/weapons/cablecuff.ogg'
cuff_delay = 20
-/obj/item/handcuffs/zip/place_handcuffs(mob/living/carbon/target, mob/user)
+/obj/item/restraint/handcuffs/zip/place_handcuffs(mob/living/carbon/target, mob/user)
..()
flags_item |= DELONDROP
-/obj/item/handcuffs/cable
+/obj/item/restraint/adjustable/verb/adjust_restraints()
+ set category = "Object"
+ set name = "Adjust Restraints"
+ set desc = "Adjust the restraint size for wrists or ankles."
+ set src = usr.contents
+
+ if(!ishuman(usr))
+ return FALSE
+
+ if(usr.is_mob_incapacitated())
+ to_chat(usr, "Not right now.")
+ return FALSE
+
+ switch(target_zone)
+ if(SLOT_HANDS)
+ target_zone = SLOT_LEGS
+ to_chat(usr, SPAN_NOTICE("[src] has been adjusted to tie around a subject's ankles."))
+ if(SLOT_LEGS)
+ target_zone = SLOT_HANDS
+ to_chat(usr, SPAN_NOTICE("[src] has been adjusted to tie around a subject's wrists."))
+
+/obj/item/restraint/adjustable/get_examine_text(mob/user)
+ . = ..()
+ switch(target_zone)
+ if(SLOT_HANDS)
+ . += SPAN_RED("Sized for human hands.")
+ if(SLOT_LEGS)
+ . += SPAN_RED("Sized for human ankles.")
+
+/obj/item/restraint/adjustable/cable
name = "cable restraints"
desc = "Looks like some cables tied together. Could be used to tie something up."
icon_state = "cuff_white"
- breakouttime = 300 //Deciseconds = 30s
+ breakouttime = 30 SECONDS
cuff_sound = 'sound/weapons/cablecuff.ogg'
-/obj/item/handcuffs/cable/red
+/obj/item/restraint/adjustable/cable/red
color = "#DD0000"
-/obj/item/handcuffs/cable/yellow
+/obj/item/restraint/adjustable/cable/yellow
color = "#DDDD00"
-/obj/item/handcuffs/cable/blue
+/obj/item/restraint/adjustable/cable/blue
color = "#0000DD"
-/obj/item/handcuffs/cable/green
+/obj/item/restraint/adjustable/cable/green
color = "#00DD00"
-/obj/item/handcuffs/cable/pink
+/obj/item/restraint/adjustable/cable/pink
color = "#DD00DD"
-/obj/item/handcuffs/cable/orange
+/obj/item/restraint/adjustable/cable/orange
color = "#DD8800"
-/obj/item/handcuffs/cable/cyan
+/obj/item/restraint/adjustable/cable/cyan
color = "#00DDDD"
-/obj/item/handcuffs/cable/white
+/obj/item/restraint/adjustable/cable/white
color = "#FFFFFF"
-/obj/item/handcuffs/cable/attackby(obj/item/I, mob/user as mob)
+/obj/item/restraint/adjustable/cable/attackby(obj/item/I, mob/user as mob)
..()
if(istype(I, /obj/item/stack/rods))
var/obj/item/stack/rods/R = I
@@ -130,34 +168,30 @@
qdel(src)
update_icon(user)
-
-/obj/item/handcuffs/cyborg
- dispenser = 1
-
-/obj/item/handcuffs/cyborg/attack(mob/living/carbon/C as mob, mob/user as mob)
- if(!C.handcuffed)
+/obj/item/restraint/handcuffs/cyborg/attack(mob/living/carbon/carbon_mob as mob, mob/user as mob)
+ if(!carbon_mob.handcuffed)
var/turf/p_loc = user.loc
- var/turf/p_loc_m = C.loc
- playsound(src.loc, cuff_sound, 25, 1, 4)
- user.visible_message(SPAN_DANGER("[user] is trying to put handcuffs on [C]!"))
-
- if (ishuman(C))
- var/mob/living/carbon/human/H = C
- if (!H.has_limb_for_slot(WEAR_HANDCUFFS))
- to_chat(user, SPAN_DANGER("\The [H] needs at least two wrists before you can cuff them together!"))
+ var/turf/p_loc_m = carbon_mob.loc
+ playsound(loc, cuff_sound, 25, 1, 4)
+ user.visible_message(SPAN_DANGER("[user] is trying to put handcuffs on [carbon_mob]!"))
+
+ if(ishuman(carbon_mob))
+ var/mob/living/carbon/human/human_mob = carbon_mob
+ if (!human_mob.has_limb_for_slot(WEAR_HANDCUFFS))
+ to_chat(user, SPAN_DANGER("\The [human_mob] needs at least two wrists before you can cuff them together!"))
return
spawn(30)
- if(!C) return
- if(p_loc == user.loc && p_loc_m == C.loc)
- C.handcuffed = new /obj/item/handcuffs(C)
- C.handcuff_update()
+ if(!carbon_mob) return
+ if(p_loc == user.loc && p_loc_m == carbon_mob.loc)
+ carbon_mob.handcuffed = new /obj/item/restraint/handcuffs(carbon_mob)
+ carbon_mob.handcuff_update()
-/obj/item/restraints
+/obj/item/xeno_restraints
name = "xeno restraints"
desc = "Use this to hold xenomorphic creatures safely."
gender = PLURAL
@@ -171,10 +205,9 @@
throw_range = 5
matter = list("metal" = 500)
- var/dispenser = 0
var/breakouttime = 2 MINUTES
-/obj/item/restraints/attack(mob/living/carbon/C as mob, mob/user as mob)
+/obj/item/xeno_restraints/attack(mob/living/carbon/C as mob, mob/user as mob)
if(!istype(C, /mob/living/carbon/xenomorph))
to_chat(user, SPAN_DANGER("The cuffs do not fit!"))
return
@@ -187,7 +220,7 @@
spawn(30)
if(!C) return
if(p_loc == user.loc && p_loc_m == C.loc)
- C.handcuffed = new /obj/item/restraints(C)
+ C.handcuffed = new /obj/item/xeno_restraints(C)
C.handcuff_update()
C.visible_message(SPAN_DANGER("[C] has been successfully restrained by [user]!"))
qdel(src)
diff --git a/code/game/objects/items/legcuffs.dm b/code/game/objects/items/legcuffs.dm
index c0dfe44728f0..1d216e6556e2 100644
--- a/code/game/objects/items/legcuffs.dm
+++ b/code/game/objects/items/legcuffs.dm
@@ -1,4 +1,4 @@
-/obj/item/legcuffs
+/obj/item/restraint/legcuffs
name = "legcuffs"
desc = "Use this to keep prisoners in line."
gender = PLURAL
@@ -8,24 +8,66 @@
throwforce = 0
w_class = SIZE_MEDIUM
- var/breakouttime = 15 SECONDS
+ target_zone = SLOT_LEGS
-/obj/item/legcuffs/beartrap
+/obj/item/restraint/proc/apply_legcuffs(mob/living/carbon/target, mob/user)
+ playsound(loc, 'sound/weapons/handcuffs.ogg', 25, 1, 4)
+
+ if(user.action_busy)
+ return FALSE
+
+ if (ishuman(target))
+ var/mob/living/carbon/human/human_target = target
+
+ if (!human_target.has_limb_for_slot(WEAR_LEGCUFFS))
+ to_chat(user, SPAN_DANGER("\The [human_target] needs two ankles before you can cuff them together!"))
+ return FALSE
+
+ human_target.attack_log += text("\[[time_stamp()]\] Has been legcuffed (attempt) by [key_name(user)]")
+ user.attack_log += text("\[[time_stamp()]\] Attempted to legcuff [key_name(human_target)]")
+ msg_admin_attack("[key_name(user)] attempted to legcuff [key_name(human_target)] in [get_area(src)] ([loc.x],[loc.y],[loc.z]).", loc.x, loc.y, loc.z)
+
+ user.visible_message(SPAN_NOTICE("[user] tries to put [src] on [human_target]."))
+ if(do_after(user, cuff_delay, INTERRUPT_MOVED, BUSY_ICON_HOSTILE, human_target, INTERRUPT_MOVED, BUSY_ICON_GENERIC))
+ if(src == user.get_active_hand() && !human_target.legcuffed && Adjacent(user))
+ if(iscarbon(human_target))
+ if(istype(human_target.buckled, /obj/structure/bed/roller))
+ to_chat(user, SPAN_DANGER("You cannot legcuff someone who is buckled onto a roller bed."))
+ return FALSE
+ if(human_target.has_limb_for_slot(WEAR_LEGCUFFS))
+ user.drop_inv_item_on_ground(src)
+ human_target.equip_to_slot_if_possible(src, WEAR_LEGCUFFS, 1, 0, 1, 1)
+ user.count_niche_stat(STATISTICS_NICHE_HANDCUFF)
+
+ else if (ismonkey(target))
+ user.visible_message(SPAN_NOTICE("[user] tries to put [src] on [target]."))
+ if(do_after(user, 30, INTERRUPT_MOVED, BUSY_ICON_HOSTILE, target, INTERRUPT_MOVED, BUSY_ICON_GENERIC))
+ if(src == user.get_active_hand() && !target.legcuffed && Adjacent(user))
+ user.drop_inv_item_on_ground(src)
+ target.equip_to_slot_if_possible(src, WEAR_LEGCUFFS, 1, 0, 1, 1)
+ return TRUE
+
+/obj/item/restraint/legcuffs/beartrap
name = "bear trap"
throw_speed = SPEED_FAST
throw_range = 1
icon_state = "beartrap0"
desc = "A trap used to catch bears and other legged creatures."
+ breakouttime = 20 SECONDS
var/armed = FALSE
+ manual = FALSE
+
+/obj/item/restraint/legcuffs/beartrap/apply_legcuffs(mob/living/carbon/target, mob/user)
+ return FALSE
-/obj/item/legcuffs/beartrap/attack_self(mob/user as mob)
+/obj/item/restraint/legcuffs/beartrap/attack_self(mob/user as mob)
..()
if(ishuman(user) && !user.stat && !user.is_mob_restrained())
armed = !armed
icon_state = "beartrap[armed]"
to_chat(user, SPAN_NOTICE("[src] is now [armed ? "armed" : "disarmed"]"))
-/obj/item/legcuffs/beartrap/Crossed(atom/movable/AM)
+/obj/item/restraint/legcuffs/beartrap/Crossed(atom/movable/AM)
if(armed)
if(ismob(AM))
var/mob/M = AM
diff --git a/code/game/objects/items/misc.dm b/code/game/objects/items/misc.dm
index 1699cb24ef39..8c0f88ddb7ca 100644
--- a/code/game/objects/items/misc.dm
+++ b/code/game/objects/items/misc.dm
@@ -56,13 +56,13 @@
..()
if(!gripped)
user.visible_message(SPAN_NOTICE("[user] grips [src] tightly."), SPAN_NOTICE("You grip [src] tightly."))
- flags_item |= NODROP
+ flags_item |= NODROP|FORCEDROP_CONDITIONAL
ADD_TRAIT(user, TRAIT_HOLDS_CANE, TRAIT_SOURCE_ITEM)
user.AddComponent(/datum/component/footstep, 6, 35, 4, 1, "cane_step")
gripped = TRUE
else
user.visible_message(SPAN_NOTICE("[user] loosens \his grip on [src]."), SPAN_NOTICE("You loosen your grip on [src]."))
- flags_item &= ~NODROP
+ flags_item &= ~(NODROP|FORCEDROP_CONDITIONAL)
REMOVE_TRAIT(user, TRAIT_HOLDS_CANE, TRAIT_SOURCE_ITEM)
// Ideally, this would be something like a component added onto every mob that prioritizes certain sounds, such as stomping over canes.
var/component = user.GetComponent(/datum/component/footstep)
@@ -292,11 +292,12 @@
new /obj/item/evidencebag(src)
new /obj/item/evidencebag(src)
-/obj/item/rappel_harness
- name = "rappel harness"
- desc = "A simple, uncomfortable rappel harness with just enough safety straps to make RnD pass health and safety. It comes with an in-built descender, but has no pouches for ammunition."
- icon = 'icons/obj/items/clothing/belts.dmi'
- icon_state = "rappel_harness"
- item_state = "rappel_harness"
+/obj/item/parachute
+ name = "parachute"
+ desc = "A surprisingly small yet bulky pack with just enough safety straps to make RnD pass health and safety. The label says the pack comes with two parachutes - main and reserve, but you doubt the pack can fit even one."
+ icon = 'icons/obj/items/clothing/backpacks.dmi'
+ icon_state = "parachute_pack"
+ item_state = "parachute_pack"
w_class = SIZE_MASSIVE
- flags_equip_slot = SLOT_WAIST
+ flags_equip_slot = SLOT_BACK
+ flags_item = SMARTGUNNER_BACKPACK_OVERRIDE
diff --git a/code/game/objects/items/reagent_containers/food/snacks/meat.dm b/code/game/objects/items/reagent_containers/food/snacks/meat.dm
index f68f488f268d..f541986112e5 100644
--- a/code/game/objects/items/reagent_containers/food/snacks/meat.dm
+++ b/code/game/objects/items/reagent_containers/food/snacks/meat.dm
@@ -28,7 +28,8 @@
name = "synthetic meat"
desc = "A synthetic slab of flesh."
-/obj/item/reagent_container/food/snacks/meat/synthmeat/synthflesh //meat made from synthetics. Slightly toxic
+/// Meat made from synthetics. Slightly toxic
+/obj/item/reagent_container/food/snacks/meat/synthmeat/synthflesh
name = "synthetic flesh"
desc = "A slab of artificial, inorganic 'flesh' that resembles human meat. Probably came from a synth."
icon_state = "synthmeat"
diff --git a/code/game/objects/items/reagent_containers/glass.dm b/code/game/objects/items/reagent_containers/glass.dm
index fc8d03f5d24d..e0f432bd5b09 100644
--- a/code/game/objects/items/reagent_containers/glass.dm
+++ b/code/game/objects/items/reagent_containers/glass.dm
@@ -365,6 +365,14 @@
ground_offset_x = 9
ground_offset_y = 8
+/obj/item/reagent_container/glass/beaker/vial/epinephrine
+ name = "epinephrine vial"
+
+/obj/item/reagent_container/glass/beaker/vial/epinephrine/Initialize()
+ . = ..()
+ reagents.add_reagent("adrenaline", 30)
+ update_icon()
+
/obj/item/reagent_container/glass/beaker/vial/tricordrazine
name = "tricordrazine vial"
diff --git a/code/game/objects/items/reagent_containers/glass/bottle.dm b/code/game/objects/items/reagent_containers/glass/bottle.dm
index 9e0215b535b6..61cdee01c8f8 100644
--- a/code/game/objects/items/reagent_containers/glass/bottle.dm
+++ b/code/game/objects/items/reagent_containers/glass/bottle.dm
@@ -396,3 +396,13 @@
. = ..()
reagents.add_reagent("tricordrazine", 60)
update_icon()
+
+/obj/item/reagent_container/glass/bottle/epinephrine
+ name = "\improper Epinephrine bottle"
+ desc = "A small bottle. Contains epinephrine - Used to increase a patients arterial blood pressure, amongst other actions, to assist in cardiopulmonary resuscitation." //"I can't lie to you about your odds of a successful resuscitation, but you have my sympathies"
+ volume = 60
+
+/obj/item/reagent_container/glass/bottle/epinephrine/Initialize()
+ . = ..()
+ reagents.add_reagent("adrenaline", 60)
+ update_icon()
diff --git a/code/game/objects/items/reagent_containers/hypospray.dm b/code/game/objects/items/reagent_containers/hypospray.dm
index 5e268d35a33d..05b76568d702 100644
--- a/code/game/objects/items/reagent_containers/hypospray.dm
+++ b/code/game/objects/items/reagent_containers/hypospray.dm
@@ -237,6 +237,9 @@
/obj/item/reagent_container/hypospray/tricordrazine
starting_vial = /obj/item/reagent_container/glass/beaker/vial/tricordrazine
+/obj/item/reagent_container/hypospray/epinephrine
+ starting_vial = /obj/item/reagent_container/glass/beaker/vial/epinephrine
+
/obj/item/reagent_container/hypospray/sedative
name = "Sedative Hypospray"
starting_vial = /obj/item/reagent_container/glass/beaker/vial/sedative
diff --git a/code/game/objects/items/stacks/cable_coil.dm b/code/game/objects/items/stacks/cable_coil.dm
index 077cb801c90d..1dd95464ddd5 100644
--- a/code/game/objects/items/stacks/cable_coil.dm
+++ b/code/game/objects/items/stacks/cable_coil.dm
@@ -70,7 +70,7 @@
if(src.amount <= 14)
to_chat(usr, SPAN_WARNING("You need at least 15 lengths to make restraints!"))
return
- var/obj/item/handcuffs/cable/B = new /obj/item/handcuffs/cable(usr.loc)
+ var/obj/item/restraint/adjustable/cable/B = new /obj/item/restraint/adjustable/cable(usr.loc)
B.color = color
to_chat(usr, SPAN_NOTICE("You wind some cable together to make some restraints."))
src.use(15)
diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm
index 5e4bc8c726bd..4882db3b83ea 100644
--- a/code/game/objects/items/storage/backpack.dm
+++ b/code/game/objects/items/storage/backpack.dm
@@ -729,6 +729,8 @@ GLOBAL_LIST_EMPTY_TYPED(radio_packs, /obj/item/storage/backpack/marine/satchel/r
name = "\improper M68 Thermal Cloak"
desc = "The lightweight thermal dampeners and optical camouflage provided by this cloak are weaker than those found in standard USCM ghillie suits. In exchange, the cloak can be worn over combat armor and offers the wearer high maneuverability and adaptability to many environments."
icon_state = "scout_cloak"
+ unacidable = TRUE
+ indestructible = TRUE
uniform_restricted = list(/obj/item/clothing/suit/storage/marine/M3S) //Need to wear Scout armor and helmet to equip this.
has_gamemode_skin = FALSE //same sprite for all gamemode.
var/camo_active = FALSE
diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm
index a977eb880ff5..385c22d3a713 100644
--- a/code/game/objects/items/storage/belt.dm
+++ b/code/game/objects/items/storage/belt.dm
@@ -319,6 +319,29 @@
new /obj/item/storage/pill_bottle/inaprovaline(src)
new /obj/item/storage/pill_bottle/tramadol(src)
+/obj/item/storage/belt/medical/lifesaver/upp/synth/fill_preset_inventory()
+ new /obj/item/storage/pill_bottle/bicaridine(src)
+ new /obj/item/storage/pill_bottle/bicaridine(src)
+ new /obj/item/storage/pill_bottle/kelotane(src)
+ new /obj/item/storage/pill_bottle/kelotane(src)
+ new /obj/item/storage/pill_bottle/tramadol(src)
+ new /obj/item/storage/pill_bottle/tramadol(src)
+ new /obj/item/storage/pill_bottle/antitox(src)
+ new /obj/item/storage/pill_bottle/alkysine(src)
+ new /obj/item/storage/pill_bottle/imidazoline(src)
+ new /obj/item/stack/medical/advanced/bruise_pack(src)
+ new /obj/item/stack/medical/advanced/bruise_pack(src)
+ new /obj/item/stack/medical/advanced/bruise_pack(src)
+ new /obj/item/stack/medical/advanced/ointment(src)
+ new /obj/item/stack/medical/advanced/ointment(src)
+ new /obj/item/stack/medical/advanced/ointment(src)
+ new /obj/item/stack/medical/splint(src)
+ new /obj/item/stack/medical/splint(src)
+ new /obj/item/stack/medical/splint(src)
+ new /obj/item/reagent_container/hypospray/autoinjector/dexalinp(src)
+ new /obj/item/reagent_container/hypospray/autoinjector/oxycodone(src)
+ new /obj/item/device/healthanalyzer(src)
+
/obj/item/storage/belt/security
name = "\improper M276 pattern security rig"
desc = "The M276 is the standard load-bearing equipment of the USCM. It consists of a modular belt with various clips. This configuration is commonly seen among USCM Military Police and peacekeepers, though it can hold some light munitions."
@@ -334,7 +357,7 @@
/obj/item/explosive/grenade/flashbang,
/obj/item/explosive/grenade/custom/teargas,
/obj/item/reagent_container/spray/pepper,
- /obj/item/handcuffs,
+ /obj/item/restraint/handcuffs,
/obj/item/device/flash,
/obj/item/clothing/glasses,
/obj/item/ammo_magazine/pistol,
@@ -379,10 +402,17 @@
new /obj/item/weapon/gun/energy/taser(src)
new /obj/item/device/flash(src)
new /obj/item/weapon/baton(src)
- new /obj/item/handcuffs(src)
+ new /obj/item/restraint/handcuffs(src)
new /obj/item/reagent_container/spray/pepper(src)
new /obj/item/device/clue_scanner(src)
+/obj/item/storage/belt/security/MP/full/synth/fill_preset_inventory()
+ new /obj/item/explosive/grenade/flashbang(src)
+ new /obj/item/device/flash(src)
+ new /obj/item/weapon/baton(src)
+ new /obj/item/reagent_container/spray/pepper(src)
+ new /obj/item/device/clue_scanner(src)
+ new /obj/item/restraint/handcuffs(src)
/obj/item/storage/belt/security/MP/UPP
name = "\improper Type 43 military police rig"
@@ -392,7 +422,7 @@
new /obj/item/weapon/gun/energy/taser(src)
new /obj/item/device/flash(src)
new /obj/item/weapon/baton(src)
- new /obj/item/handcuffs(src)
+ new /obj/item/restraint/handcuffs(src)
new /obj/item/reagent_container/spray/pepper(src)
new /obj/item/ammo_magazine/revolver/upp/shrapnel(src)
@@ -409,8 +439,8 @@
new /obj/item/weapon/baton(src)
new /obj/item/reagent_container/spray/pepper(src)
new /obj/item/device/clue_scanner(src)
- new /obj/item/handcuffs(src)
- new /obj/item/handcuffs(src)
+ new /obj/item/restraint/handcuffs(src)
+ new /obj/item/restraint/handcuffs(src)
new /obj/item/explosive/grenade/flashbang(src)
/obj/item/storage/belt/security/MP/CMB/synth/fill_preset_inventory()
@@ -419,8 +449,8 @@
new /obj/item/weapon/baton(src)
new /obj/item/reagent_container/spray/pepper(src)
new /obj/item/device/clue_scanner(src)
- new /obj/item/handcuffs(src)
- new /obj/item/handcuffs(src)
+ new /obj/item/restraint/handcuffs(src)
+ new /obj/item/restraint/handcuffs(src)
new /obj/item/explosive/grenade/flashbang(src)
/obj/item/storage/belt/marine
diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm
index 4b7ecc4c5599..3f5e56f85517 100644
--- a/code/game/objects/items/storage/boxes.dm
+++ b/code/game/objects/items/storage/boxes.dm
@@ -345,14 +345,28 @@
icon_state = "handcuff"
/obj/item/storage/box/handcuffs/fill_preset_inventory()
- new /obj/item/handcuffs(src)
- new /obj/item/handcuffs(src)
- new /obj/item/handcuffs(src)
- new /obj/item/handcuffs(src)
- new /obj/item/handcuffs(src)
- new /obj/item/handcuffs(src)
- new /obj/item/handcuffs(src)
+ new /obj/item/restraint/handcuffs(src)
+ new /obj/item/restraint/handcuffs(src)
+ new /obj/item/restraint/handcuffs(src)
+ new /obj/item/restraint/handcuffs(src)
+ new /obj/item/restraint/handcuffs(src)
+ new /obj/item/restraint/handcuffs(src)
+ new /obj/item/restraint/handcuffs(src)
+
+
+/obj/item/storage/box/legcuffs
+ name = "box of legcuffs"
+ desc = "A box full of legcuffs."
+ icon_state = "handcuff"
+/obj/item/storage/box/legcuffs/fill_preset_inventory()
+ new /obj/item/restraint/legcuffs(src)
+ new /obj/item/restraint/legcuffs(src)
+ new /obj/item/restraint/legcuffs(src)
+ new /obj/item/restraint/legcuffs(src)
+ new /obj/item/restraint/legcuffs(src)
+ new /obj/item/restraint/legcuffs(src)
+ new /obj/item/restraint/legcuffs(src)
/obj/item/storage/box/zipcuffs
name = "box of zip cuffs"
@@ -360,20 +374,20 @@
icon_state = "handcuff"
/obj/item/storage/box/zipcuffs/fill_preset_inventory()
- new /obj/item/handcuffs/zip(src)
- new /obj/item/handcuffs/zip(src)
- new /obj/item/handcuffs/zip(src)
- new /obj/item/handcuffs/zip(src)
- new /obj/item/handcuffs/zip(src)
- new /obj/item/handcuffs/zip(src)
- new /obj/item/handcuffs/zip(src)
- new /obj/item/handcuffs/zip(src)
- new /obj/item/handcuffs/zip(src)
- new /obj/item/handcuffs/zip(src)
- new /obj/item/handcuffs/zip(src)
- new /obj/item/handcuffs/zip(src)
- new /obj/item/handcuffs/zip(src)
- new /obj/item/handcuffs/zip(src)
+ new /obj/item/restraint/handcuffs/zip(src)
+ new /obj/item/restraint/handcuffs/zip(src)
+ new /obj/item/restraint/handcuffs/zip(src)
+ new /obj/item/restraint/handcuffs/zip(src)
+ new /obj/item/restraint/handcuffs/zip(src)
+ new /obj/item/restraint/handcuffs/zip(src)
+ new /obj/item/restraint/handcuffs/zip(src)
+ new /obj/item/restraint/handcuffs/zip(src)
+ new /obj/item/restraint/handcuffs/zip(src)
+ new /obj/item/restraint/handcuffs/zip(src)
+ new /obj/item/restraint/handcuffs/zip(src)
+ new /obj/item/restraint/handcuffs/zip(src)
+ new /obj/item/restraint/handcuffs/zip(src)
+ new /obj/item/restraint/handcuffs/zip(src)
/obj/item/storage/box/zipcuffs/small
name = "small box of zip cuffs"
@@ -381,13 +395,13 @@
w_class = SIZE_MEDIUM
/obj/item/storage/box/zipcuffs/fill_preset_inventory()
- new /obj/item/handcuffs/zip(src)
- new /obj/item/handcuffs/zip(src)
- new /obj/item/handcuffs/zip(src)
- new /obj/item/handcuffs/zip(src)
- new /obj/item/handcuffs/zip(src)
- new /obj/item/handcuffs/zip(src)
- new /obj/item/handcuffs/zip(src)
+ new /obj/item/restraint/handcuffs/zip(src)
+ new /obj/item/restraint/handcuffs/zip(src)
+ new /obj/item/restraint/handcuffs/zip(src)
+ new /obj/item/restraint/handcuffs/zip(src)
+ new /obj/item/restraint/handcuffs/zip(src)
+ new /obj/item/restraint/handcuffs/zip(src)
+ new /obj/item/restraint/handcuffs/zip(src)
/obj/item/storage/box/tapes
name = "box of regulation tapes"
diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm
index 3e7c00f3d0ff..201e34654624 100644
--- a/code/game/objects/items/storage/firstaid.dm
+++ b/code/game/objects/items/storage/firstaid.dm
@@ -510,6 +510,34 @@
/obj/item/storage/pill_bottle/proc/error_idlock(mob/user)
to_chat(user, SPAN_WARNING("It must have some kind of ID lock..."))
+/obj/item/storage/pill_bottle/proc/choose_color(mob/user)
+ if(!user)
+ user = usr
+ var/static/list/possible_colors = list(
+ "Orange" = "",
+ "Blue" = "1",
+ "Yellow" = "2",
+ "Light Purple" = "3",
+ "Light Grey" = "4",
+ "White" = "5",
+ "Light Green" = "6",
+ "Cyan" = "7",
+ "Bordeaux" = "8",
+ "Aquamarine" = "9",
+ "Grey" = "10",
+ "Red" = "11",
+ "Black" = "12",
+ )
+ var/selected_color = tgui_input_list(user, "Select a color.", "Color choice", possible_colors)
+ if(!selected_color)
+ return
+
+ selected_color = possible_colors[selected_color]
+
+ icon_state = "pill_canister" + selected_color
+ to_chat(user, SPAN_NOTICE("You color [src]."))
+ update_icon()
+
/obj/item/storage/pill_bottle/verb/set_maptext()
set category = "Object"
set name = "Set short label (on-sprite)"
diff --git a/code/game/objects/items/storage/pouch.dm b/code/game/objects/items/storage/pouch.dm
index c3df7547776d..1b75a1a7d89d 100644
--- a/code/game/objects/items/storage/pouch.dm
+++ b/code/game/objects/items/storage/pouch.dm
@@ -1272,6 +1272,21 @@
new /obj/item/explosive/plastic(src)
new /obj/item/explosive/plastic(src)
+/obj/item/storage/pouch/tools/tactical/upp
+ name = "synthetic tools pouch"
+ desc = "Special issue tools pouch for UPP synthetics. Due to the enhanced strength of the synthetic and its inability to feel discomfort, this pouch is designed to maximize internal space with no concern for its wearer's comfort."
+ icon_state = "tools"
+ storage_slots = 7
+
+/obj/item/storage/pouch/tools/tactical/upp/fill_preset_inventory()
+ new /obj/item/tool/wrench(src)
+ new /obj/item/tool/crowbar(src)
+ new /obj/item/tool/wirecutters(src)
+ new /obj/item/device/multitool(src)
+ new /obj/item/tool/weldingtool(src)
+ new /obj/item/stack/cable_coil(src)
+ new /obj/item/stack/cable_coil(src)
+
/obj/item/storage/pouch/tools/uppsynth/fill_preset_inventory()
new /obj/item/tool/crowbar(src)
new /obj/item/tool/wirecutters(src)
diff --git a/code/game/objects/items/tools/maintenance_tools.dm b/code/game/objects/items/tools/maintenance_tools.dm
index 574d08e6a15b..de85ad682731 100644
--- a/code/game/objects/items/tools/maintenance_tools.dm
+++ b/code/game/objects/items/tools/maintenance_tools.dm
@@ -141,7 +141,7 @@
icon_state = "tac_cutters"
/obj/item/tool/wirecutters/attack(mob/living/carbon/C, mob/user)
- if((C.handcuffed) && (istype(C.handcuffed, /obj/item/handcuffs/cable)))
+ if((C.handcuffed) && (istype(C.handcuffed, /obj/item/restraint/adjustable/cable)))
user.visible_message("\The [usr] cuts \the [C]'s restraints with \the [src]!",\
"You cut \the [C]'s restraints with \the [src]!",\
"You hear cable being cut.")
diff --git a/code/game/objects/items/tools/misc_tools.dm b/code/game/objects/items/tools/misc_tools.dm
index 06f42aacd56c..b016f0e67b33 100644
--- a/code/game/objects/items/tools/misc_tools.dm
+++ b/code/game/objects/items/tools/misc_tools.dm
@@ -58,6 +58,10 @@
if(isturf(A))
to_chat(user, SPAN_WARNING("The label won't stick to that."))
return
+ if(istype(A, /obj/item/storage/pill_bottle))
+ var/obj/item/storage/pill_bottle/target_pill_bottle = A
+ target_pill_bottle.choose_color(user)
+
if(!label || !length(label))
remove_label(A, user)
return
diff --git a/code/game/objects/items/toys/cards.dm b/code/game/objects/items/toys/cards.dm
index 39584b2bbb89..f63efd61a615 100644
--- a/code/game/objects/items/toys/cards.dm
+++ b/code/game/objects/items/toys/cards.dm
@@ -462,7 +462,7 @@
overlays += I
return
- var/offset = Floor(80/cards_length)
+ var/offset = floor(80/cards_length)
var/matrix/M = matrix()
if(direction)
@@ -482,13 +482,13 @@
var/image/I = new(src.icon, (concealed ? P.back_icon : P.card_icon))
switch(direction)
if(SOUTH)
- I.pixel_x = 8 - Floor(offset*i/4)
+ I.pixel_x = 8 - floor(offset*i/4)
if(WEST)
- I.pixel_y = -6 + Floor(offset*i/4)
+ I.pixel_y = -6 + floor(offset*i/4)
if(EAST)
- I.pixel_y = 8 - Floor(offset*i/4)
+ I.pixel_y = 8 - floor(offset*i/4)
else
- I.pixel_x = -7 + Floor(offset*i/4)
+ I.pixel_x = -7 + floor(offset*i/4)
I.transform = M
overlays += I
i++
diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm
index 0497a410a373..92400e2d3184 100644
--- a/code/game/objects/items/weapons/shields.dm
+++ b/code/game/objects/items/weapons/shields.dm
@@ -89,7 +89,7 @@
/obj/item/weapon/shield/riot/attackby(obj/item/W as obj, mob/user as mob)
if(cooldown < world.time - 25)
- if(istype(W, /obj/item/weapon/baton) || istype(W, /obj/item/weapon/sword) || istype(W, /obj/item/weapon/baseballbat) || istype(W, /obj/item/weapon/twohanded/fireaxe) || istype(W, /obj/item/weapon/chainofcommand))
+ if(istype(W, /obj/item/weapon/baton) || istype(W, /obj/item/weapon/sword) || istype(W, /obj/item/weapon/telebaton) || istype(W, /obj/item/weapon/baseballbat) || istype(W, /obj/item/weapon/classic_baton) || istype(W, /obj/item/weapon/twohanded/fireaxe) || istype(W, /obj/item/weapon/chainofcommand))
user.visible_message(SPAN_WARNING("[user] bashes [src] with [W]!"))
playsound(user.loc, 'sound/effects/shieldbash.ogg', 25, 1)
cooldown = world.time
diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm
index be7571fa84a1..36e0ea702a95 100644
--- a/code/game/objects/items/weapons/twohanded.dm
+++ b/code/game/objects/items/weapons/twohanded.dm
@@ -101,7 +101,7 @@
w_class = SIZE_HUGE
icon_state = "offhand"
name = "offhand"
- flags_item = DELONDROP|TWOHANDED|WIELDED
+ flags_item = DELONDROP|TWOHANDED|WIELDED|CANTSTRIP
/obj/item/weapon/twohanded/offhand/unwield(mob/user)
if(flags_item & WIELDED)
diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm
index f589e9c5a52a..70dc5ff1786d 100644
--- a/code/game/objects/objs.dm
+++ b/code/game/objects/objs.dm
@@ -208,6 +208,9 @@
/obj/proc/hear_talk(mob/living/M as mob, msg, verb="says", datum/language/speaking, italics = 0)
return
+/obj/proc/see_emote(mob/living/M as mob, emote, audible = FALSE)
+ return
+
/obj/attack_hand(mob/user)
if(can_buckle) manual_unbuckle(user)
else . = ..()
@@ -231,7 +234,7 @@
/obj/proc/afterbuckle(mob/M as mob) // Called after somebody buckled / unbuckled
handle_rotation() // To be removed when we have full dir support in set_buckled
- SEND_SIGNAL(src, COSMIG_OBJ_AFTER_BUCKLE, buckled_mob)
+ SEND_SIGNAL(src, COMSIG_OBJ_AFTER_BUCKLE, buckled_mob)
if(!buckled_mob)
UnregisterSignal(M, COMSIG_PARENT_QDELETING)
else
@@ -303,9 +306,9 @@
if (M.mob_size <= MOB_SIZE_XENO)
if ((M.stat == DEAD && istype(src, /obj/structure/bed/roller) || HAS_TRAIT(M, TRAIT_OPPOSABLE_THUMBS)))
do_buckle(M, user)
- else if ((M.mob_size > MOB_SIZE_HUMAN))
- to_chat(user, SPAN_WARNING("[M] is too big to buckle in."))
- return
+ if ((M.mob_size > MOB_SIZE_HUMAN))
+ to_chat(user, SPAN_WARNING("[M] is too big to buckle in."))
+ return
do_buckle(M, user)
// the actual buckling proc
diff --git a/code/game/objects/structures/blocker.dm b/code/game/objects/structures/blocker.dm
index f85b1e65fff5..33f79d7e9d32 100644
--- a/code/game/objects/structures/blocker.dm
+++ b/code/game/objects/structures/blocker.dm
@@ -125,3 +125,11 @@
icon_state = "purple_line"
visible = TRUE
+
+// for fuel pump since it's a large sprite.
+
+/obj/structure/blocker/fuelpump
+ name = "\improper Fuel Pump"
+ desc = "It is a machine that pumps fuel around the ship."
+ invisibility = 101
+ mouse_opacity = MOUSE_OPACITY_TRANSPARENT
diff --git a/code/game/objects/structures/bookcase.dm b/code/game/objects/structures/bookcase.dm
index b310bd00aa07..a6fc95fa0d73 100644
--- a/code/game/objects/structures/bookcase.dm
+++ b/code/game/objects/structures/bookcase.dm
@@ -7,6 +7,24 @@
density = TRUE
opacity = TRUE
+/obj/structure/bookcase/deconstruct(disassembled)
+ new /obj/item/stack/sheet/metal(loc)
+ return ..()
+
+/obj/structure/bookcase/attack_alien(mob/living/carbon/xenomorph/xeno)
+ if(xeno.a_intent == INTENT_HARM)
+ if(unslashable)
+ return
+ xeno.animation_attack_on(src)
+ playsound(loc, 'sound/effects/metalhit.ogg', 25, 1)
+ xeno.visible_message(SPAN_DANGER("[xeno] slices [src] apart!"),
+ SPAN_DANGER("We slice [src] apart!"), null, 5, CHAT_TYPE_XENO_COMBAT)
+ deconstruct(FALSE)
+ return XENO_ATTACK_ACTION
+ else
+ attack_hand(xeno)
+ return XENO_NONCOMBAT_ACTION
+
/obj/structure/bookcase/Initialize()
. = ..()
for(var/obj/item/I in loc)
@@ -20,12 +38,18 @@
O.forceMove(src)
update_icon()
else if(HAS_TRAIT(O, TRAIT_TOOL_PEN))
- var/newname = stripped_input(usr, "What would you like to title this bookshelf?")
+ var/newname = stripped_input(user, "What would you like to title this bookshelf?")
if(!newname)
return
else
name = ("bookcase ([strip_html(newname)])")
playsound(src, "paper_writing", 15, TRUE)
+ else if(HAS_TRAIT(O, TRAIT_TOOL_WRENCH))
+ playsound(loc, 'sound/items/Ratchet.ogg', 25, 1)
+ if(do_after(user, 1 SECONDS, INTERRUPT_MOVED, BUSY_ICON_FRIENDLY, src))
+ user.visible_message("[user] deconstructs [src].", \
+ "You deconstruct [src].", "You hear a noise.")
+ deconstruct(FALSE)
else
..()
@@ -33,7 +57,7 @@
if(contents.len)
var/obj/item/book/choice = input("Which book would you like to remove from the shelf?") as null|obj in contents
if(choice)
- if(usr.is_mob_incapacitated() || !in_range(loc, usr))
+ if(user.is_mob_incapacitated() || !in_range(loc, user))
return
if(ishuman(user))
if(!user.get_active_hand())
@@ -67,7 +91,7 @@
/obj/structure/bookcase/manuals/medical
- name = "Medical Manuals bookcase"
+ name = "medical manuals bookcase"
/obj/structure/bookcase/manuals/medical/Initialize()
. = ..()
@@ -78,7 +102,7 @@
/obj/structure/bookcase/manuals/engineering
- name = "Engineering Manuals bookcase"
+ name = "engineering manuals bookcase"
/obj/structure/bookcase/manuals/engineering/Initialize()
. = ..()
@@ -90,7 +114,7 @@
update_icon()
/obj/structure/bookcase/manuals/research_and_development
- name = "R&D Manuals bookcase"
+ name = "\improper R&D manuals bookcase"
/obj/structure/bookcase/manuals/research_and_development/Initialize()
. = ..()
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cm_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/cm_closets.dm
index 6c711a7bcabe..baa9e9bd8cc9 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/cm_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/cm_closets.dm
@@ -170,7 +170,7 @@ GLOBAL_LIST_EMPTY(co_secure_boxes)
new /obj/item/weapon/gun/energy/taser(src)
new /obj/item/weapon/baton(src)
new /obj/item/device/flash(src)
- new /obj/item/handcuffs(src)
+ new /obj/item/restraint/handcuffs(src)
new /obj/item/reagent_container/spray/pepper(src)
new /obj/item/storage/pouch/general/medium(src)
if(prob(50))
@@ -205,7 +205,7 @@ GLOBAL_LIST_EMPTY(co_secure_boxes)
new /obj/item/storage/backpack/satchel/sec(src)
new /obj/item/device/flash(src)
new /obj/item/reagent_container/spray/pepper(src)
- new /obj/item/handcuffs(src)
+ new /obj/item/restraint/handcuffs(src)
new /obj/item/storage/pouch/general/large(src)
/obj/structure/closet/secure_closet/military_officer_spare
diff --git a/code/game/objects/structures/fence.dm b/code/game/objects/structures/fence.dm
index 60a8682a4930..9476f6385ae3 100644
--- a/code/game/objects/structures/fence.dm
+++ b/code/game/objects/structures/fence.dm
@@ -3,6 +3,7 @@
desc = "A large metal mesh strewn between two poles. Intended as a cheap way to separate areas, while allowing one to see through it."
icon = 'icons/obj/structures/props/fence.dmi'
icon_state = "fence0"
+ throwpass = TRUE
density = TRUE
anchored = TRUE
layer = WINDOW_LAYER
diff --git a/code/game/objects/structures/pipes/vents/pump_scrubber.dm b/code/game/objects/structures/pipes/vents/pump_scrubber.dm
index a4565c610ad5..acc8b4784af9 100644
--- a/code/game/objects/structures/pipes/vents/pump_scrubber.dm
+++ b/code/game/objects/structures/pipes/vents/pump_scrubber.dm
@@ -21,6 +21,35 @@
name = "Reinforced Air Vent"
explodey = FALSE
+/// Vents that are linked to ARES Security Protocols, allowing the ARES Interface to trigger security measures.
+/obj/structure/pipes/vents/pump/no_boom/gas
+ name = "Security Air Vent"
+ var/datum/ares_link/link
+ var/vent_tag
+ COOLDOWN_DECLARE(vent_trigger_cooldown)
+
+/obj/structure/pipes/vents/pump/no_boom/gas/Initialize()
+ link_systems(override = FALSE)
+ . = ..()
+
+/obj/structure/pipes/vents/pump/no_boom/gas/Destroy()
+ delink()
+ return ..()
+
+/obj/structure/pipes/vents/pump/no_boom/gas/proc/link_systems(datum/ares_link/new_link = GLOB.ares_link, override)
+ if(link && !override)
+ return FALSE
+ delink()
+ if(new_link)
+ link = new_link
+ new_link.linked_vents += src
+ return TRUE
+
+/obj/structure/pipes/vents/pump/no_boom/gas/proc/delink()
+ if(link)
+ link.linked_vents -= src
+ link = null
+
/obj/structure/pipes/vents/pump/on
icon_state = "on"
diff --git a/code/game/objects/structures/platforms.dm b/code/game/objects/structures/platforms.dm
index cfffbc90fb7c..5510d319ee1e 100644
--- a/code/game/objects/structures/platforms.dm
+++ b/code/game/objects/structures/platforms.dm
@@ -142,7 +142,6 @@
icon_state = "kutjevo_platform"
name = "raised metal edge"
desc = "A raised level of metal, often used to elevate areas above others, or construct bridges. You could probably climb it."
- climb_delay = 10
/obj/structure/platform_decoration/kutjevo
name = "raised metal corner"
diff --git a/code/game/objects/structures/reagent_dispensers.dm b/code/game/objects/structures/reagent_dispensers.dm
index a89f35ce38f3..d0f9f513e7f8 100644
--- a/code/game/objects/structures/reagent_dispensers.dm
+++ b/code/game/objects/structures/reagent_dispensers.dm
@@ -129,6 +129,25 @@
if(N)
amount_per_transfer_from_this = N
+/obj/structure/reagent_dispensers/clicked(mob/user, list/mods)
+ if(!Adjacent(user))
+ return ..()
+
+ if(!ishuman(user))
+ return ..()
+
+ if(!reagents || reagents.locked)
+ return ..()
+
+ if(mods["alt"])
+ dispensing = !dispensing
+ if(dispensing)
+ to_chat(user, SPAN_NOTICE("[src] is now dispensing"))
+ else
+ to_chat(user, SPAN_NOTICE("[src] is now filling"))
+ return TRUE
+ return ..()
+
/obj/structure/reagent_dispensers/attackby(obj/item/hit_item, mob/living/user)
if(istype(hit_item, /obj/item/reagent_container))
return
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index 81d7f24f054e..341fcb657080 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -618,6 +618,28 @@
basestate = "w_ai_rwindow"
window_frame = /obj/structure/window_frame/almayer/aicore/white
+/obj/structure/window/framed/almayer/aicore/black
+ icon_state = "alm_ai_rwindow0"
+ basestate = "alm_ai_rwindow"
+ window_frame = /obj/structure/window_frame/almayer/aicore/black
+
+/obj/structure/window/framed/almayer/aicore/hull/black
+ icon_state = "alm_ai_rwindow0"
+ basestate = "alm_ai_rwindow"
+ window_frame = /obj/structure/window_frame/almayer/aicore/black
+ not_damageable = TRUE
+ not_deconstructable = TRUE
+ unslashable = TRUE
+ unacidable = TRUE
+ health = 1000000 //Failsafe, shouldn't matter
+
+/obj/structure/window/framed/almayer/aicore/hull/black/hijack_bustable //I exist to explode after hijack, that is all.
+
+/obj/structure/window/framed/almayer/aicore/hull/black/hijack_bustable/Initialize()
+ . = ..()
+ if(is_mainship_level(z))
+ RegisterSignal(SSdcs, COMSIG_GLOB_HIJACK_IMPACTED, PROC_REF(deconstruct))
+
/obj/structure/window/framed/almayer/aicore/white/hull
name = "hull window"
desc = "An ultra-reinforced window designed to protect the AI Core. Made out of exotic materials to prevent hull breaches, nothing will get through here."
diff --git a/code/game/objects/structures/window_frame.dm b/code/game/objects/structures/window_frame.dm
index 460a11af1000..ae40be1472ad 100644
--- a/code/game/objects/structures/window_frame.dm
+++ b/code/game/objects/structures/window_frame.dm
@@ -184,6 +184,11 @@
basestate = "w_ai_window"
window_type = /obj/structure/window/framed/almayer/aicore/white
+/obj/structure/window_frame/almayer/aicore/black
+ icon_state = "alm_window0_frame"
+ basestate = "alm_window"
+ window_type = /obj/structure/window/framed/almayer/aicore/black
+
/obj/structure/window_frame/almayer/requisitions/attackby(obj/item/W, mob/living/user)
if(istype(W, sheet_type))
to_chat(user, SPAN_WARNING("You can't repair this window."))
diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm
index 482139c03707..03c554af3426 100644
--- a/code/game/supplyshuttle.dm
+++ b/code/game/supplyshuttle.dm
@@ -412,6 +412,7 @@ GLOBAL_DATUM_INIT(supply_controller, /datum/controller/supply, new())
"Operations",
"Weapons",
"Vehicle Ammo",
+ "Vehicle Equipment",
"Attachments",
"Ammo",
"Weapons Specialist Ammo",
@@ -1367,6 +1368,13 @@ GLOBAL_DATUM_INIT(supply_controller, /datum/controller/supply, new())
name = "Barebones M577 Armored Personal Carrier"
ordered_vehicle = /obj/effect/vehicle_spawner/apc/unarmed/broken
+/datum/vehicle_order/arc
+ name = "M540-B Armored Recon Carrier"
+ ordered_vehicle = /obj/effect/vehicle_spawner/arc
+
+/datum/vehicle_order/arc/has_vehicle_lock()
+ return
+
/obj/structure/machinery/computer/supplycomp/vehicle/Initialize()
. = ..()
diff --git a/code/game/turfs/floor_types.dm b/code/game/turfs/floor_types.dm
index 8a8698d0c047..0a1842134480 100644
--- a/code/game/turfs/floor_types.dm
+++ b/code/game/turfs/floor_types.dm
@@ -325,12 +325,21 @@
/turf/open/floor/almayer/aicore/glowing
icon_state = "ai_floor2"
light_color = "#d69c46"
- light_range = 2
+ light_range = 3
/turf/open/floor/almayer/aicore/glowing/Initialize(mapload, ...)
. = ..()
set_light_on(TRUE)
+ RegisterSignal(SSdcs, COMSIG_GLOB_AICORE_LOCKDOWN, PROC_REF(start_emergency_light_on))
+ RegisterSignal(SSdcs, COMSIG_GLOB_AICORE_LIFT, PROC_REF(start_emergency_light_off))
+
+/turf/open/floor/almayer/aicore/glowing/proc/start_emergency_light_on()
+ set_light(l_color = "#c70f0f")
+
+/turf/open/floor/almayer/aicore/glowing/proc/start_emergency_light_off()
+ set_light(l_color = "#d69c46")
+
/turf/open/floor/almayer/aicore/no_build
allow_construction = FALSE
hull_floor = TRUE
diff --git a/code/game/turfs/transit.dm b/code/game/turfs/transit.dm
index dd6a8d920f6f..00175ac5e365 100644
--- a/code/game/turfs/transit.dm
+++ b/code/game/turfs/transit.dm
@@ -11,7 +11,7 @@
if(isobserver(crosser) || crosser.anchored)
return
- if(!isitem(crosser) && !isliving(crosser))
+ if(!isobj(crosser) && !isliving(crosser))
return
if(!istype(old_loc, /turf/open/space))
@@ -24,6 +24,8 @@
/turf/open/space/transit/proc/handle_crosser(atom/movable/crosser)
if(QDELETED(crosser))
return
+ if(crosser.can_paradrop()) //let's not delete people who arent meant to be deleted... This shouldn't happen normally, but if it does, congratulations, you gamed the system
+ return
qdel(crosser)
/turf/open/space/transit/dropship
@@ -39,14 +41,42 @@
if(!istype(dropship) || dropship.mode != SHUTTLE_CALL)
return ..()
- if(dropship.destination.id != DROPSHIP_LZ1 && dropship.destination.id != DROPSHIP_LZ2)
- return ..() // we're not heading towards the LZs
-
// you just jumped out of a dropship heading towards the LZ, have fun living on the way down!
var/list/ground_z_levels = SSmapping.levels_by_trait(ZTRAIT_GROUND)
if(!length(ground_z_levels))
return ..()
+ if(dropship.paradrop_signal) //if dropship in paradrop mode, drop them near the signal. Whether they have a parachute or not
+ var/list/valid_turfs = list()
+ var/turf/location = get_turf(dropship.paradrop_signal.signal_loc)
+ for(var/turf/turf as anything in RANGE_TURFS(crosser.get_paradrop_scatter(), location))
+ var/area/turf_area = get_area(turf)
+ if(!turf_area || CEILING_IS_PROTECTED(turf_area.ceiling, CEILING_PROTECTION_TIER_1))
+ continue
+ if(turf.density)
+ continue
+ var/found_dense = FALSE
+ for(var/atom/turf_atom in turf)
+ if(turf_atom.density && turf_atom.can_block_movement)
+ found_dense = TRUE
+ break
+ if(found_dense)
+ continue
+ if(protected_by_pylon(TURF_PROTECTION_MORTAR, turf))
+ continue
+ valid_turfs += turf
+ var/turf/deploy_turf
+ if(length(valid_turfs)) //if we found a fitting place near the landing zone...
+ deploy_turf = pick(valid_turfs)
+ else //if we somehow did not. Drop them right on the signal then, there is nothing we can do
+ deploy_turf = location
+ if(crosser.can_paradrop())
+ INVOKE_ASYNC(crosser, TYPE_PROC_REF(/atom/movable, handle_paradrop), deploy_turf, dropship.name)
+ return
+ INVOKE_ASYNC(crosser, TYPE_PROC_REF(/atom/movable, handle_airdrop), deploy_turf, dropship.name)
+ return
+
+ //find a random spot to drop them
var/list/area/potential_areas = shuffle(SSmapping.areas_in_z["[ground_z_levels[1]]"])
for(var/area/maybe_this_area in potential_areas)
@@ -67,53 +97,141 @@
continue // couldnt find one in 10 loops, check another area
// we found a good turf, lets drop em
- INVOKE_ASYNC(src, PROC_REF(handle_drop), crosser, possible_turf, dropship.name)
+ if(crosser.can_paradrop())
+ INVOKE_ASYNC(crosser, TYPE_PROC_REF(/atom/movable, handle_paradrop), possible_turf, dropship.name)
+ return
+ INVOKE_ASYNC(crosser, TYPE_PROC_REF(/atom/movable, handle_airdrop), possible_turf, dropship.name)
return
+ //we didn't find a turf to drop them... This shouldn't happen usually
+ if(crosser.can_paradrop()) //don't delete them if they were supposed to paradrop
+ to_chat(crosser, SPAN_BOLDWARNING("Your harness got stuck and you got thrown back in the dropship."))
+ var/turf/projected = get_ranged_target_turf(crosser.loc, turn(dir, 180), 15)
+ INVOKE_ASYNC(crosser, TYPE_PROC_REF(/atom/movable, throw_atom), projected, 50, SPEED_FAST, null, TRUE)
+ return
return ..() // they couldn't be dropped, just delete them
-/turf/open/space/transit/dropship/proc/handle_drop(atom/movable/crosser, turf/target, dropship_name)
- if(QDELETED(crosser))
- return
- ADD_TRAIT(crosser, TRAIT_IMMOBILIZED, TRAIT_SOURCE_DROPSHIP_INTERACTION)
+/atom/movable/proc/can_paradrop()
+ return FALSE
+
+/atom/movable/proc/get_paradrop_scatter()
+ return 7
+
+/mob/living/carbon/human/can_paradrop()
+ if(istype(back, /obj/item/parachute))
+ return TRUE
+ return ..()
+
+/obj/structure/closet/crate/can_paradrop() //for now all crates can be paradropped
+ return TRUE
+
+/obj/structure/closet/crate/get_paradrop_scatter() //crates land closer to the signal
+ return 4
- crosser.pixel_z = 360
- crosser.forceMove(target)
- crosser.visible_message(SPAN_WARNING("[crosser] falls out of the sky."), SPAN_HIGHDANGER("As you fall out of the [dropship_name], you plummet towards the ground."))
- animate(crosser, time = 6, pixel_z = 0, flags = ANIMATION_PARALLEL)
+/obj/structure/largecrate/can_paradrop()
+ return TRUE
- REMOVE_TRAIT(crosser, TRAIT_IMMOBILIZED, TRAIT_SOURCE_DROPSHIP_INTERACTION)
- if(isitem(crosser))
- var/obj/item/item = crosser
- item.explosion_throw(200) // give it a bit of a kick
+/obj/structure/largecrate/get_paradrop_scatter()
+ return 4
+
+/atom/movable/proc/handle_paradrop(turf/target, dropship_name)
+ clear_active_explosives()
+ ADD_TRAIT(src, TRAIT_IMMOBILIZED, TRAIT_SOURCE_DROPSHIP_INTERACTION)
+ ADD_TRAIT(src, TRAIT_UNDENSE, TRAIT_SOURCE_DROPSHIP_INTERACTION)
+ var/image/cables = image('icons/obj/structures/droppod_32x64.dmi', src, "chute_cables_static")
+ overlays += cables
+ var/image/chute = image('icons/obj/structures/droppod_64x64.dmi', src, "chute_static")
+
+ chute.pixel_x -= 16
+ chute.pixel_y += 16
+
+ overlays += chute
+ pixel_z = 360
+ forceMove(target)
+ playsound(src, 'sound/items/fulton.ogg', 30, 1)
+ animate(src, time = 3.5 SECONDS, pixel_z = 0, flags = ANIMATION_PARALLEL)
+ addtimer(CALLBACK(target, TYPE_PROC_REF(/turf, ceiling_debris)), 2 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(clear_parachute), cables, chute), 3.5 SECONDS)
+
+/mob/living/carbon/handle_paradrop(turf/target, dropship_name)
+ ..()
+ if(client)
+ playsound_client(client, 'sound/items/fulton.ogg', src, 50, 1) //for some reason you don't hear the sound while dropping, maybe because of force move?
+
+/atom/movable/proc/clear_parachute(image/cables, image/chute)
+ if(QDELETED(src))
return
+ REMOVE_TRAIT(src, TRAIT_IMMOBILIZED, TRAIT_SOURCE_DROPSHIP_INTERACTION)
+ REMOVE_TRAIT(src, TRAIT_UNDENSE, TRAIT_SOURCE_DROPSHIP_INTERACTION)
+ overlays -= cables
+ overlays -= chute
+
+/atom/movable/proc/clear_active_explosives()
+ for(var/obj/item/explosive/explosive in contents)
+ if(!explosive.active)
+ continue
+ explosive.deconstruct(FALSE)
+
+/atom/movable/proc/handle_airdrop(turf/target, dropship_name)
+ clear_active_explosives()
+ ADD_TRAIT(src, TRAIT_IMMOBILIZED, TRAIT_SOURCE_DROPSHIP_INTERACTION)
+ pixel_z = 360
+ forceMove(target)
+ animate(src, time = 6, pixel_z = 0, flags = ANIMATION_PARALLEL)
+ INVOKE_ASYNC(target, TYPE_PROC_REF(/turf, ceiling_debris))
+ REMOVE_TRAIT(src, TRAIT_IMMOBILIZED, TRAIT_SOURCE_DROPSHIP_INTERACTION)
+
+/obj/handle_airdrop(turf/target, dropship_name)
+ ..()
+ if(!indestructible && prob(30)) // throwing objects from the air is not always a good idea
+ deconstruct(FALSE)
+
+/obj/structure/closet/handle_airdrop(turf/target, dropship_name) // good idea but no
+ if(!opened)
+ for(var/atom/movable/content in src)
+ INVOKE_ASYNC(content, TYPE_PROC_REF(/atom/movable, handle_airdrop), target, dropship_name)
+ open()
+ . = ..()
- if(!isliving(crosser))
- return // don't know how you got here, but you shouldnt be here.
- var/mob/living/fallen_mob = crosser
+/obj/item/handle_airdrop(turf/target, dropship_name)
+ ..()
+ if(QDELETED(src))
+ return
+ if(!indestructible && w_class < SIZE_MEDIUM) //tiny and small items will be lost, good riddance
+ deconstruct(FALSE)
+ return
+ explosion_throw(200) // give it a bit of a kick
+
+/obj/item/explosive/handle_airdrop(turf/target, dropship_name)
+ if(active)
+ deconstruct(FALSE)
+ return
+ ..()
+/mob/living/handle_airdrop(turf/target, dropship_name)
+ ..()
playsound(target, "punch", rand(20, 70), TRUE)
playsound(target, "punch", rand(20, 70), TRUE)
playsound(target, "bone_break", rand(20, 70), TRUE)
playsound(target, "bone_break", rand(20, 70), TRUE)
- fallen_mob.KnockDown(10) // 10 seconds
- fallen_mob.Stun(3) // 3 seconds
-
-
- if(ishuman(fallen_mob))
- var/mob/living/carbon/human/human = fallen_mob
- human.last_damage_data = create_cause_data("falling from [dropship_name]", human)
- // I'd say falling from space is pretty much like getting hit by an explosion
- human.take_overall_armored_damage(300, ARMOR_BOMB, limb_damage_chance = 100)
- // but just in case, you will still take a ton of damage.
- human.take_overall_damage(200, used_weapon = "falling", limb_damage_chance = 100)
- if(human.stat != DEAD)
- human.death(human.last_damage_data)
- fallen_mob.status_flags |= PERMANENTLY_DEAD
- return
+ KnockDown(10)
+ Stun(3)
// take a little bit more damage otherwise
- fallen_mob.take_overall_damage(400, used_weapon = "falling", limb_damage_chance = 100)
+ take_overall_damage(400, used_weapon = "falling", limb_damage_chance = 100)
+ visible_message(SPAN_WARNING("[src] falls out of the sky."), SPAN_HIGHDANGER("As you fall out of the [dropship_name], you plummet towards the ground."))
+
+/mob/living/carbon/human/handle_airdrop(turf/target, dropship_name)
+ ..()
+ last_damage_data = create_cause_data("falling from [dropship_name]", src)
+ // I'd say falling from space is pretty much like getting hit by an explosion
+ take_overall_armored_damage(300, ARMOR_BOMB, limb_damage_chance = 100)
+ // but just in case, you will still take a ton of damage.
+ take_overall_damage(200, used_weapon = "falling", limb_damage_chance = 100)
+ if(stat < DEAD)
+ death(last_damage_data)
+ status_flags |= PERMANENTLY_DEAD
+
/turf/open/space/transit/dropship/alamo
shuttle_tag = DROPSHIP_ALAMO
diff --git a/code/game/turfs/walls/walls.dm b/code/game/turfs/walls/walls.dm
index 251b23ad9c57..1781739176b7 100644
--- a/code/game/turfs/walls/walls.dm
+++ b/code/game/turfs/walls/walls.dm
@@ -9,7 +9,7 @@
var/hull = 0
var/walltype = WALL_METAL
/// when walls smooth with one another, the type of junction each wall is.
- var/junctiontype
+ var/junctiontype
var/thermite = 0
var/melting = FALSE
var/claws_minimum = CLAW_TYPE_SHARP
@@ -24,7 +24,7 @@
var/damage = 0
/// Wall will break down to girders if damage reaches this point
- var/damage_cap = HEALTH_WALL
+ var/damage_cap = HEALTH_WALL
var/damage_overlay
var/global/damage_overlays[8]
@@ -38,7 +38,7 @@
var/d_state = 0 //Normal walls are now as difficult to remove as reinforced walls
/// the acid hole inside the wall
- var/obj/effect/acid_hole/acided_hole
+ var/obj/effect/acid_hole/acided_hole
var/acided_hole_dir = SOUTH
var/special_icon = 0
@@ -178,7 +178,7 @@
switch(d_state)
if(WALL_STATE_WELD)
- . += SPAN_INFO("The outer plating is intact. A blowtorch should slice it open.")
+ . += SPAN_INFO("The outer plating is intact. If you are not on help intent, a blowtorch should slice it open.")
if(WALL_STATE_SCREW)
. += SPAN_INFO("The outer plating has been sliced open. A screwdriver should remove the support lines.")
if(WALL_STATE_WIRECUTTER)
@@ -482,6 +482,8 @@
/turf/closed/wall/proc/try_weldingtool_usage(obj/item/W, mob/user)
if(!damage || !iswelder(W))
return FALSE
+ if(user.a_intent != INTENT_HELP)
+ return FALSE
var/obj/item/tool/weldingtool/WT = W
if(WT.remove_fuel(0, user))
@@ -504,6 +506,8 @@
if(!(WT.remove_fuel(0, user)))
to_chat(user, SPAN_WARNING("You need more welding fuel!"))
return
+ if(user.a_intent == INTENT_HELP)
+ return
playsound(src, 'sound/items/Welder.ogg', 25, 1)
user.visible_message(SPAN_NOTICE("[user] begins slicing through the outer plating."),
diff --git a/code/game/verbs/records.dm b/code/game/verbs/records.dm
index 05506804790a..3810bf7e99cb 100644
--- a/code/game/verbs/records.dm
+++ b/code/game/verbs/records.dm
@@ -1,10 +1,8 @@
-//CO Whitelist is '1', Synthetic Whitelist is '2', Yautja Whitelist is '3'.
-
/client/verb/own_records()
set name = "View Own Records"
set category = "OOC.Records"
- var/list/options = list("Admin", "Merit", "Commanding Officer", "Synthetic", "Yautja")
+ var/list/options = list("Admin", "Merit", "Whitelist")
var/choice = tgui_input_list(usr, "What record do you wish to view?", "Record Choice", options)
switch(choice)
@@ -12,12 +10,8 @@
show_own_notes(NOTE_ADMIN, choice)
if("Merit")
show_own_notes(NOTE_MERIT, choice)
- if("Commanding Officer")
- show_own_notes(NOTE_COMMANDER, choice)
- if("Synthetic")
- show_own_notes(NOTE_SYNTHETIC, choice)
- if("Yautja")
- show_own_notes(NOTE_YAUTJA, choice)
+ if("Whitelist")
+ show_own_notes(NOTE_WHITELIST, choice)
else
return
to_chat(usr, SPAN_NOTICE("Displaying your [choice] Record."))
@@ -46,12 +40,8 @@
switch(note_category)
if(NOTE_MERIT)
color = "#9e3dff"
- if(NOTE_COMMANDER)
+ if(NOTE_WHITELIST)
color = "#324da5"
- if(NOTE_SYNTHETIC)
- color = "#39e7a4"
- if(NOTE_YAUTJA)
- color = "#114e11"
dat += "[N.text] by [admin_ckey] ([N.admin_rank]) on [N.date] [NOTE_ROUND_ID(N)] "
dat += "
"
@@ -69,16 +59,15 @@
//Contributions and suggestions are welcome.
//Kindly, forest2001
-/client/verb/other_records()
+/client/proc/other_records()
set name = "View Target Records"
set category = "OOC.Records"
///Management Access
- var/MA
+ var/manager = FALSE
///Edit Access
- var/edit_C = FALSE
- var/edit_S = FALSE
- var/edit_Y = FALSE
+ var/add_wl = FALSE
+ var/del_wl = FALSE
///Note category options
var/list/options = list()
@@ -86,7 +75,7 @@
if(CLIENT_IS_STAFF(src))
options = GLOB.note_categories.Copy()
if(admin_holder.rights & R_PERMISSIONS)
- MA = TRUE
+ manager = TRUE
else if(!isCouncil(src))
to_chat(usr, SPAN_WARNING("Error: you are not authorised to view the records of another player!"))
return
@@ -97,15 +86,11 @@
return
target = ckey(target)
- if(check_whitelist_status(WHITELIST_COMMANDER_COUNCIL))
- options |= "Commanding Officer"
- edit_C = TRUE
- if(check_whitelist_status(WHITELIST_SYNTHETIC_COUNCIL))
- options |= "Synthetic"
- edit_S = TRUE
- if(check_whitelist_status(WHITELIST_YAUTJA_COUNCIL))
- options |= "Yautja"
- edit_Y = TRUE
+ if(manager || isCouncil(src))
+ options |= "Whitelist"
+ add_wl = TRUE
+ if(manager || isSenator(src))
+ del_wl = TRUE
var/choice = tgui_input_list(usr, "What record do you wish to view?", "Record Choice", options)
if(!choice)
@@ -115,21 +100,8 @@
show_other_record(NOTE_ADMIN, choice, target, TRUE)
if("Merit")
show_other_record(NOTE_MERIT, choice, target, TRUE)
- if("Commanding Officer")
- if(MA || check_whitelist_status(WHITELIST_COMMANDER_LEADER))
- show_other_record(NOTE_COMMANDER, choice, target, TRUE, TRUE)
- else
- show_other_record(NOTE_COMMANDER, choice, target, edit_C)
- if("Synthetic")
- if(MA || check_whitelist_status(WHITELIST_SYNTHETIC_LEADER))
- show_other_record(NOTE_SYNTHETIC, choice, target, TRUE, TRUE)
- else
- show_other_record(NOTE_SYNTHETIC, choice, target, edit_S)
- if("Yautja")
- if(MA || check_whitelist_status(WHITELIST_YAUTJA_LEADER))
- show_other_record(NOTE_YAUTJA, choice, target, TRUE, TRUE)
- else
- show_other_record(NOTE_YAUTJA, choice, target, edit_Y)
+ if("Whitelist")
+ show_other_record(NOTE_WHITELIST, choice, target, add_wl, del_wl)
to_chat(usr, SPAN_NOTICE("Displaying [target]'s [choice] notes."))
@@ -148,15 +120,9 @@
if(NOTE_MERIT)
color = "#9e3dff"
add_dat = "Add Merit Note
"
- if(NOTE_COMMANDER)
+ if(NOTE_WHITELIST)
color = "#324da5"
- add_dat = "Add Commander Note
"
- if(NOTE_SYNTHETIC)
- color = "#39e7a4"
- add_dat = "Add Synthetic Note
"
- if(NOTE_YAUTJA)
- color = "#114e11"
- add_dat = "Add Yautja Note
"
+ add_dat = "Add Whitelist Note
"
var/list/datum/view_record/note_view/NL = DB_VIEW(/datum/view_record/note_view, DB_COMP("player_ckey", DB_EQUALS, target))
for(var/datum/view_record/note_view/N as anything in NL)
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index 4194627262a4..979217019f0c 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -95,12 +95,8 @@
color = "#AA0055"
else if(N.note_category == NOTE_MERIT)
color = "#9e3dff"
- else if(N.note_category == NOTE_COMMANDER)
+ else if(N.note_category == NOTE_WHITELIST)
color = "#324da5"
- else if(N.note_category == NOTE_SYNTHETIC)
- color = "#39e7a4"
- else if(N.note_category == NOTE_YAUTJA)
- color = "#114e11"
dat += "[N.text] by [admin_ckey] ([N.admin_rank])[confidential_text] on [N.date] [NOTE_ROUND_ID(N)] "
if(admin_ckey == usr.ckey || admin_ckey == "Adminbot" || check_for_rights(R_PERMISSIONS))
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 626758fc2a5a..aa87f157173c 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -72,6 +72,7 @@ GLOBAL_LIST_INIT(admin_verbs_default, list(
/client/proc/cmd_admin_say, /*staff-only ooc chat*/
/client/proc/cmd_mod_say, /* alternate way of typing asay, no different than cmd_admin_say */
/client/proc/cmd_admin_tacmaps_panel,
+ /client/proc/other_records,
))
GLOBAL_LIST_INIT(admin_verbs_admin, list(
@@ -138,6 +139,7 @@ GLOBAL_LIST_INIT(admin_verbs_minor_event, list(
/client/proc/adminpanelweapons,
/client/proc/admin_general_quarters,
/client/proc/admin_biohazard_alert,
+ /client/proc/admin_aicore_alert,
/client/proc/toggle_hardcore_perma,
/client/proc/toggle_bypass_joe_restriction,
/client/proc/toggle_joe_respawns,
diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm
index ce02cdb59e20..84298faaa3a1 100644
--- a/code/modules/admin/verbs/adminhelp.dm
+++ b/code/modules/admin/verbs/adminhelp.dm
@@ -543,27 +543,28 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
log_ahelp(id, "Defer", "Deferred to mentors by [usr.key]", null, usr.ckey)
Close(silent = TRUE)
-/datum/admin_help/proc/mark_ticket()
+/datum/admin_help/proc/mark_ticket(mob/marking_admin)
+ var/mob/user = marking_admin || usr
if(marked_admin)
- if(marked_admin == usr.ckey)
+ if(marked_admin == user.ckey)
unmark_ticket()
return
- to_chat(usr, SPAN_WARNING("This ticket has already been marked by [marked_admin]."))
- var/unmark_option = tgui_alert(usr, "This message has been marked by [marked_admin]. Do you want to override?", "Marked Ticket", list("Overwrite Mark", "Unmark", "Cancel"))
+ to_chat(user, SPAN_WARNING("This ticket has already been marked by [marked_admin]."))
+ var/unmark_option = tgui_alert(user, "This message has been marked by [marked_admin]. Do you want to override?", "Marked Ticket", list("Overwrite Mark", "Unmark", "Cancel"))
if(unmark_option == "Unmark")
unmark_ticket()
return
if(unmark_option != "Overwrite Mark")
return
- var/key_name = key_name_admin(usr)
+ var/key_name = key_name_admin(user)
AddInteraction("Marked by [key_name].", player_message = "Ticket marked!")
to_chat(initiator, SPAN_ADMINHELP("An admin is preparing to respond to your ticket."))
var/msg = "Ticket [TicketHref("#[id]")] marked by [key_name]."
message_admins(msg)
log_admin_private(msg)
- log_ahelp(id, "Marked", "Marked by [usr.key]", sender = usr.ckey)
- marked_admin = usr.ckey
+ log_ahelp(id, "Marked", "Marked by [user.key]", sender = user.ckey)
+ marked_admin = user.ckey
/datum/admin_help/proc/unmark_ticket()
var/key_name = key_name_admin(usr)
diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm
index 76525b2cae96..a6cf0f02a3de 100644
--- a/code/modules/admin/verbs/adminpm.dm
+++ b/code/modules/admin/verbs/adminpm.dm
@@ -60,6 +60,9 @@
var/message_prompt = "Message:"
+ if(AH && !AH.marked_admin)
+ AH.mark_ticket()
+
if((AH?.opening_responders && length(AH.ticket_interactions) == 1 ) || ((AH?.marked_admin && AH?.marked_admin != usr.ckey) && length(AH.ticket_interactions) == 2))
SEND_SOUND(src, sound('sound/machines/buzz-sigh.ogg', volume=30))
message_prompt += "\n\n**This ticket is already being responded to by: [length(AH.opening_responders) ? english_list(AH.opening_responders) : AH.marked_admin]**"
diff --git a/code/modules/almayer/machinery.dm b/code/modules/almayer/machinery.dm
index 74ce9a81eb88..9411c229d2f3 100644
--- a/code/modules/almayer/machinery.dm
+++ b/code/modules/almayer/machinery.dm
@@ -73,7 +73,7 @@
/obj/structure/machinery/prop/almayer/CICmap
name = "map table"
- desc = "A table that displays a map of the current target location"
+ desc = "A table that displays a map of the current operation location."
icon = 'icons/obj/structures/machinery/computer.dmi'
icon_state = "maptable"
anchored = TRUE
@@ -103,6 +103,11 @@
map.tgui_interact(user)
+/obj/structure/machinery/prop/almayer/CICmap/computer
+ name = "map terminal"
+ desc = "A terminal that displays a map of the current operation location."
+ icon_state = "security"
+
/obj/structure/machinery/prop/almayer/CICmap/upp
minimap_type = MINIMAP_FLAG_UPP
faction = FACTION_UPP
diff --git a/code/modules/asset_cache/asset_list.dm b/code/modules/asset_cache/asset_list.dm
index 8e19a1905300..1d88df0b6a6b 100644
--- a/code/modules/asset_cache/asset_list.dm
+++ b/code/modules/asset_cache/asset_list.dm
@@ -341,3 +341,25 @@ GLOBAL_LIST_EMPTY(asset_datums)
if (!item_filename)
return
. = list("[item_filename]" = SSassets.transport.get_asset_url(item_filename))
+
+/datum/asset/simple/inventory
+ assets = list(
+ "inventory-glasses.png" = 'icons/ui_Icons/inventory/glasses.png',
+ "inventory-head.png" = 'icons/ui_Icons/inventory/head.png',
+ "inventory-neck.png" = 'icons/ui_Icons/inventory/neck.png',
+ "inventory-mask.png" = 'icons/ui_Icons/inventory/mask.png',
+ "inventory-ears.png" = 'icons/ui_Icons/inventory/ears.png',
+ "inventory-uniform.png" = 'icons/ui_Icons/inventory/uniform.png',
+ "inventory-suit.png" = 'icons/ui_Icons/inventory/suit.png',
+ "inventory-gloves.png" = 'icons/ui_Icons/inventory/gloves.png',
+ "inventory-hand_l.png" = 'icons/ui_Icons/inventory/hand_l.png',
+ "inventory-hand_r.png" = 'icons/ui_Icons/inventory/hand_r.png',
+ "inventory-shoes.png" = 'icons/ui_Icons/inventory/shoes.png',
+ "inventory-suit_storage.png" = 'icons/ui_Icons/inventory/suit_storage.png',
+ "inventory-id.png" = 'icons/ui_Icons/inventory/id.png',
+ "inventory-belt.png" = 'icons/ui_Icons/inventory/belt.png',
+ "inventory-back.png" = 'icons/ui_Icons/inventory/back.png',
+ "inventory-pocket.png" = 'icons/ui_Icons/inventory/pocket.png',
+ "inventory-collar.png" = 'icons/ui_Icons/inventory/collar.png',
+ )
+
diff --git a/code/modules/buildmode/buildmode.dm b/code/modules/buildmode/buildmode.dm
index bc20a714027d..4b6d84a5ae40 100644
--- a/code/modules/buildmode/buildmode.dm
+++ b/code/modules/buildmode/buildmode.dm
@@ -80,7 +80,7 @@
var/pos_idx = 0
for(var/thing in elements)
var/x = pos_idx % switch_width
- var/y = Floor(pos_idx / switch_width)
+ var/y = floor(pos_idx / switch_width)
var/atom/movable/screen/buildmode/B = new buttontype(src, thing)
// extra .5 for a nice offset look
B.screen_loc = "NORTH-[(1 + 0.5 + y*1.5)],WEST+[0.5 + x*1.5]"
diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index 63cdcfd8716c..6afbfa695db2 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -5,8 +5,6 @@
#define UPLOAD_LIMIT 10485760 //Restricts client uploads to the server to 10MB //Boosted this thing. What's the worst that can happen?
#define MIN_CLIENT_VERSION 0 //Just an ambiguously low version for now, I don't want to suddenly stop people playing.
//I would just like the code ready should it ever need to be used.
-#define GOOD_BYOND_MAJOR 513
-#define GOOD_BYOND_MINOR 1500
GLOBAL_LIST_INIT(blacklisted_builds, list(
"1407" = "bug preventing client display overrides from working leads to clients being able to see things/mobs they shouldn't be able to see",
@@ -189,39 +187,21 @@ GLOBAL_LIST_INIT(whitelisted_client_procs, list(
var/datum/entity/player/P = get_player_from_key(key)
P.add_note(add, FALSE, NOTE_MERIT)
- if(href_list["add_wl_info_1"])
- var/key = href_list["add_wl_info_1"]
- var/add = input("Add Commander Note") as null|message
+ if(href_list["add_wl_info"])
+ var/key = href_list["add_wl_info"]
+ var/add = input("Add Whitelist Note") as null|message
if(!add)
return
var/datum/entity/player/P = get_player_from_key(key)
- P.add_note(add, FALSE, NOTE_COMMANDER)
-
- if(href_list["add_wl_info_2"])
- var/key = href_list["add_wl_info_2"]
- var/add = input("Add Synthetic Note") as null|message
- if(!add)
- return
-
- var/datum/entity/player/P = get_player_from_key(key)
- P.add_note(add, FALSE, NOTE_SYNTHETIC)
-
- if(href_list["add_wl_info_3"])
- var/key = href_list["add_wl_info_3"]
- var/add = input("Add Yautja Note") as null|message
- if(!add)
- return
-
- var/datum/entity/player/P = get_player_from_key(key)
- P.add_note(add, FALSE, NOTE_YAUTJA)
+ P.add_note(add, FALSE, NOTE_WHITELIST)
if(href_list["remove_wl_info"])
var/key = href_list["remove_wl_info"]
var/index = text2num(href_list["remove_index"])
var/datum/entity/player/P = get_player_from_key(key)
- P.remove_note(index)
+ P.remove_note(index, whitelist = TRUE)
switch(href_list["_src_"])
if("admin_holder")
@@ -364,14 +344,34 @@ GLOBAL_LIST_INIT(whitelisted_client_procs, list(
INVOKE_ASYNC(src, /client/proc/set_macros)
// Version check below if we ever need to start checking against BYOND versions again.
-
- /*if((byond_version < world.byond_version) || ((byond_version == world.byond_version) && (byond_build < world.byond_build)))
- src << "Your version of Byond (v[byond_version].[byond_build]) differs from the server (v[world.byond_version].[world.byond_build]). You may experience graphical glitches, crashes, or other errors. You will be disconnected until your version matches or exceeds the server version.
\
- Direct Download (Windows Installer): http://www.byond.com/download/build/[world.byond_version]/[world.byond_version].[world.byond_build]_byond.exe
\
- Other versions (search for [world.byond_build] or higher): http://www.byond.com/download/build/[world.byond_version]"
+ var/breaking_version = CONFIG_GET(number/client_error_version)
+ var/breaking_build = CONFIG_GET(number/client_error_build)
+ var/warn_version = CONFIG_GET(number/client_warn_version)
+ var/warn_build = CONFIG_GET(number/client_warn_build)
+
+ if (byond_version < breaking_version || (byond_version == breaking_version && byond_build < breaking_build)) //Out of date client.
+ to_chat_immediate(src, SPAN_DANGER("Your version of BYOND is too old:"))
+ to_chat_immediate(src, CONFIG_GET(string/client_error_message))
+ to_chat_immediate(src, "Your version: [byond_version].[byond_build]")
+ to_chat_immediate(src, "Required version: [breaking_version].[breaking_build] or later")
+ to_chat_immediate(src, "Visit BYOND's website to get the latest version of BYOND.")
qdel(src)
- return*/
- //hardcode for now
+ return
+
+ if (byond_version < warn_version || (byond_version == warn_version && byond_build < warn_build)) //We have words for this client.
+ if(CONFIG_GET(flag/client_warn_popup))
+ var/msg = "Your version of BYOND may be getting out of date:
"
+ msg += CONFIG_GET(string/client_warn_message) + "
"
+ msg += "Your version: [byond_version].[byond_build]
"
+ msg += "Required version to remove this message: [warn_version].[warn_build] or later
"
+ msg += "Visit BYOND's website to get the latest version of BYOND.
"
+ src << browse(msg, "window=warning_popup")
+ else
+ to_chat(src, SPAN_DANGER("Your version of BYOND may be getting out of date:"))
+ to_chat(src, CONFIG_GET(string/client_warn_message))
+ to_chat(src, "Your version: [byond_version].[byond_build]")
+ to_chat(src, "Required version to remove this message: [warn_version].[warn_build] or later")
+ to_chat(src, "Visit BYOND's website to get the latest version of BYOND.")
if (num2text(byond_build) in GLOB.blacklisted_builds)
log_access("Failed login: [key] - blacklisted byond build ([byond_version].[byond_build])")
@@ -382,10 +382,6 @@ GLOBAL_LIST_INIT(whitelisted_client_procs, list(
qdel(src)
return
- //do this check after the blacklist check to avoid confusion
- if((byond_version < GOOD_BYOND_MAJOR) || ((byond_version == GOOD_BYOND_MAJOR) && (byond_build < GOOD_BYOND_MINOR)))
- to_chat(src, FONT_SIZE_HUGE(SPAN_BOLDNOTICE("YOUR BYOND VERSION IS NOT WELL SUITED FOR THIS SERVER. Download latest BETA build or you may suffer random crashes or disconnects.")))
-
// Initialize tgui panel
stat_panel.initialize(
inline_html = file("html/statbrowser.html"),
diff --git a/code/modules/clothing/shoes/colour.dm b/code/modules/clothing/shoes/colour.dm
index 4318e1a3b184..7d6c8ed3d5dc 100644
--- a/code/modules/clothing/shoes/colour.dm
+++ b/code/modules/clothing/shoes/colour.dm
@@ -68,32 +68,47 @@
/obj/item/clothing/shoes/orange
name = "orange shoes"
icon_state = "orange"
- var/obj/item/handcuffs/chained = null
+ var/obj/item/restraint/handcuffs/chained = null
-/obj/item/clothing/shoes/orange/proc/attach_cuffs(obj/item/handcuffs/cuffs, mob/user as mob)
- if (src.chained) return
+/obj/item/clothing/shoes/orange/proc/attach_cuffs(obj/item/restraint/cuffs, mob/user as mob)
+ if(chained)
+ return FALSE
user.drop_held_item()
cuffs.forceMove(src)
- src.chained = cuffs
- src.slowdown = 15
- src.icon_state = "orange1"
+ chained = cuffs
+ slowdown = 15
+ icon_state = "orange1"
+ time_to_equip = (cuffs.breakouttime / 4)
+ time_to_unequip = cuffs.breakouttime
+ return TRUE
/obj/item/clothing/shoes/orange/proc/remove_cuffs(mob/user as mob)
- if (!src.chained) return
+ if(!chained)
+ return FALSE
- user.put_in_hands(src.chained)
- src.chained.add_fingerprint(user)
+ user.put_in_hands(chained)
+ chained.add_fingerprint(user)
- src.slowdown = initial(slowdown)
- src.icon_state = "orange"
- src.chained = null
+ slowdown = initial(slowdown)
+ icon_state = "orange"
+ chained = null
+ time_to_equip = initial(time_to_equip)
+ time_to_unequip = initial(time_to_unequip)
+ return TRUE
/obj/item/clothing/shoes/orange/attack_self(mob/user as mob)
..()
remove_cuffs(user)
-/obj/item/clothing/shoes/orange/attackby(H as obj, mob/user as mob)
+/obj/item/clothing/shoes/orange/attackby(attacking_object as obj, mob/user as mob)
..()
- if (istype(H, /obj/item/handcuffs))
- attach_cuffs(H, user)
+ if(istype(attacking_object, /obj/item/restraint))
+ var/obj/item/restraint/cuffs = attacking_object
+ if(cuffs.target_zone == SLOT_LEGS)
+ attach_cuffs(cuffs, user)
+
+/obj/item/clothing/shoes/orange/get_examine_text(mob/user)
+ . = ..()
+ if(chained)
+ . += SPAN_RED("They are chained with [chained].")
diff --git a/code/modules/clothing/spacesuits/captain.dm b/code/modules/clothing/spacesuits/captain.dm
index 26bc03eed608..2643e43b2b6a 100644
--- a/code/modules/clothing/spacesuits/captain.dm
+++ b/code/modules/clothing/spacesuits/captain.dm
@@ -24,7 +24,7 @@
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.02
flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_FEET|BODY_FLAG_ARMS
- allowed = list(/obj/item/tank/emergency_oxygen, /obj/item/device/flashlight,/obj/item/weapon/gun, /obj/item/ammo_magazine, /obj/item/weapon/baton,/obj/item/handcuffs)
+ allowed = list(/obj/item/tank/emergency_oxygen, /obj/item/device/flashlight,/obj/item/weapon/gun, /obj/item/ammo_magazine, /obj/item/weapon/baton,/obj/item/restraint/handcuffs)
slowdown = 1.5
armor_melee = CLOTHING_ARMOR_MEDIUMHIGH
armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH
diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm
index dd540033b2a2..36dd5f4f04c8 100644
--- a/code/modules/clothing/spacesuits/miscellaneous.dm
+++ b/code/modules/clothing/spacesuits/miscellaneous.dm
@@ -43,7 +43,7 @@
icon_state = "pirate"
item_state = "pirate"
w_class = SIZE_MEDIUM
- allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/baton,/obj/item/handcuffs,/obj/item/tank/emergency_oxygen)
+ allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/baton,/obj/item/restraint/handcuffs,/obj/item/tank/emergency_oxygen)
slowdown = 0
armor_melee = CLOTHING_ARMOR_MEDIUM
armor_bullet = CLOTHING_ARMOR_MEDIUM
@@ -93,7 +93,7 @@
/obj/item/clothing/suit/space/compression/uscm
name = "\improper MK.50 compression suit"
desc = "A heavy, bulky civilian space suit, fitted with armored plates. This specific suit has found its way into the ragtag inventory of the USCM's patrol boat requisitions system."
- allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/baton,/obj/item/handcuffs,/obj/item/tank)
+ allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/baton,/obj/item/restraint/handcuffs,/obj/item/tank)
// Souto man
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index 82d461c5ca55..7e9a41c6becc 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -47,7 +47,7 @@
/obj/item/device/flashlight,
/obj/item/ammo_magazine/,
/obj/item/weapon/baton,
- /obj/item/handcuffs,
+ /obj/item/restraint/handcuffs,
/obj/item/device/binoculars,
/obj/item/storage/large_holster/machete,
/obj/item/storage/belt/gun/m4a3,
@@ -81,7 +81,7 @@
/obj/item/storage/fancy/cigarettes,
/obj/item/tool/lighter,
/obj/item/weapon/baton,
- /obj/item/handcuffs,
+ /obj/item/restraint/handcuffs,
/obj/item/explosive/grenade,
/obj/item/device/binoculars,
/obj/item/attachable/bayonet,
@@ -250,7 +250,7 @@
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.01
flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_FEET|BODY_FLAG_ARMS
- allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/baton,/obj/item/handcuffs,/obj/item/tank/emergency_oxygen)
+ allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/baton,/obj/item/restraint/handcuffs,/obj/item/tank/emergency_oxygen)
slowdown = 1
armor_melee = CLOTHING_ARMOR_HIGH
armor_bullet = CLOTHING_ARMOR_HIGH
@@ -355,7 +355,7 @@
item_state = "centcom"
w_class = SIZE_LARGE//bulky item
flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_FEET|BODY_FLAG_ARMS|BODY_FLAG_HANDS
- allowed = list(/obj/item/weapon/gun,/obj/item/weapon/baton,/obj/item/handcuffs,/obj/item/tank/emergency_oxygen)
+ allowed = list(/obj/item/weapon/gun,/obj/item/weapon/baton,/obj/item/restraint/handcuffs,/obj/item/tank/emergency_oxygen)
flags_inventory = NO_FLAGS
flags_inv_hide = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
flags_cold_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_FEET|BODY_FLAG_ARMS|BODY_FLAG_HANDS
diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm
index 59e0918550ed..eb99005328bc 100644
--- a/code/modules/clothing/suits/bio.dm
+++ b/code/modules/clothing/suits/bio.dm
@@ -51,7 +51,7 @@
item_state = "bio_suit"
allowed = list(
/obj/item/weapon/baton,
- /obj/item/handcuffs,
+ /obj/item/restraint/handcuffs,
/obj/item/device/binoculars,
/obj/item/attachable/bayonet,
diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm
index 5b97051852a6..589fb3b97221 100644
--- a/code/modules/clothing/suits/jobs.dm
+++ b/code/modules/clothing/suits/jobs.dm
@@ -181,11 +181,11 @@
/obj/item/ammo_magazine,
/obj/item/ammo_casing,
/obj/item/weapon/baton,
- /obj/item/handcuffs,
+ /obj/item/restraint/handcuffs,
/obj/item/storage/fancy/cigarettes,
/obj/item/tool/lighter,
/obj/item/weapon/baton,
- /obj/item/handcuffs,
+ /obj/item/restraint/handcuffs,
/obj/item/device/binoculars,
/obj/item/attachable/bayonet,
/obj/item/storage/belt/gun/m4a3,
@@ -245,7 +245,7 @@
/obj/item/ammo_magazine,
/obj/item/ammo_casing,
/obj/item/weapon/baton,
- /obj/item/handcuffs,
+ /obj/item/restraint/handcuffs,
/obj/item/device/binoculars,
/obj/item/attachable/bayonet,
/obj/item/storage/belt/gun/m4a3,
@@ -310,7 +310,7 @@
/obj/item/storage/fancy/cigarettes,
/obj/item/tool/lighter,
/obj/item/weapon/baton,
- /obj/item/handcuffs,
+ /obj/item/restraint/handcuffs,
/obj/item/device/binoculars,
/obj/item/attachable/bayonet,
/obj/item/storage/belt/gun/m4a3,
@@ -409,7 +409,7 @@
/obj/item/storage/fancy/cigarettes,
/obj/item/tool/lighter,
/obj/item/weapon/baton,
- /obj/item/handcuffs,
+ /obj/item/restraint/handcuffs,
/obj/item/device/binoculars,
/obj/item/attachable/bayonet,
diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm
index 1bdb4ca31176..d0f6d1cc868a 100644
--- a/code/modules/clothing/suits/labcoat.dm
+++ b/code/modules/clothing/suits/labcoat.dm
@@ -20,7 +20,7 @@
/obj/item/storage/fancy/cigarettes,
/obj/item/tool/lighter,
/obj/item/weapon/baton,
- /obj/item/handcuffs,
+ /obj/item/restraint/handcuffs,
/obj/item/device/binoculars,
/obj/item/attachable/bayonet,
@@ -185,7 +185,7 @@
/obj/item/storage/fancy/cigarettes,
/obj/item/tool/lighter,
/obj/item/weapon/baton,
- /obj/item/handcuffs,
+ /obj/item/restraint/handcuffs,
/obj/item/device/binoculars,
/obj/item/attachable/bayonet,
/obj/item/storage/belt/gun/m4a3,
diff --git a/code/modules/clothing/suits/marine_armor/_marine_armor.dm b/code/modules/clothing/suits/marine_armor/_marine_armor.dm
index 6e1133a4dcc1..15340bc1aae2 100644
--- a/code/modules/clothing/suits/marine_armor/_marine_armor.dm
+++ b/code/modules/clothing/suits/marine_armor/_marine_armor.dm
@@ -191,7 +191,7 @@
if(. != CHECKS_PASSED)
return
set_light_range(initial(light_range))
- set_light_power(Floor(initial(light_power) * 0.5))
+ set_light_power(floor(initial(light_power) * 0.5))
set_light_on(toggle_on)
flags_marine_armor ^= ARMOR_LAMP_ON
@@ -270,7 +270,7 @@
/obj/item/storage/fancy/cigarettes,
/obj/item/tool/lighter,
/obj/item/weapon/baton,
- /obj/item/handcuffs,
+ /obj/item/restraint/handcuffs,
/obj/item/explosive/grenade,
/obj/item/device/binoculars,
/obj/item/attachable/bayonet,
@@ -483,7 +483,7 @@
/obj/item/clothing/suit/storage/marine/light/synvest
name = "\improper M3A1 Synthetic Utility Vest"
- desc = "This variant of the ubiquitous M3 pattern ballistics vest has been extensively modified, providing no protection in exchange for maximum mobility and storage space. Synthetic programming compliant."
+ desc = "This variant of the ubiquitous M3 pattern vest has been extensively modified, providing no protection in exchange for maximum mobility and added storage. Synthetic programming compliant."
icon_state = "VL_syn_camo"
flags_atom = NO_NAME_OVERRIDE
flags_marine_armor = ARMOR_LAMP_OVERLAY|SYNTH_ALLOWED //No squad colors + can be worn by synths.
@@ -496,7 +496,7 @@
armor_rad = CLOTHING_ARMOR_NONE
armor_internaldamage = CLOTHING_ARMOR_NONE
storage_slots = 3
- slowdown = SLOWDOWN_ARMOR_VERY_LIGHT
+ slowdown = SLOWDOWN_ARMOR_SUPER_LIGHT
time_to_unequip = 0.5 SECONDS
time_to_equip = 1 SECONDS
uniform_restricted = null
diff --git a/code/modules/clothing/suits/marine_armor/ert.dm b/code/modules/clothing/suits/marine_armor/ert.dm
index 6d2ad9934a40..90fb962ffa93 100644
--- a/code/modules/clothing/suits/marine_armor/ert.dm
+++ b/code/modules/clothing/suits/marine_armor/ert.dm
@@ -41,7 +41,7 @@
/obj/item/device/flashlight,
/obj/item/ammo_magazine/,
/obj/item/weapon/baton,
- /obj/item/handcuffs,
+ /obj/item/restraint/handcuffs,
/obj/item/storage/fancy/cigarettes,
/obj/item/tool/lighter,
/obj/item/explosive/grenade,
@@ -287,6 +287,22 @@
armor_rad = CLOTHING_ARMOR_MEDIUMLOW
armor_internaldamage = CLOTHING_ARMOR_HIGH
+/obj/item/clothing/suit/storage/marine/faction/UPP/support/synth
+ name = "\improper UL6 Synthetic personal armor"
+ desc = "Modified variant of the UL6 personel armor system intended to be useable by Synthetic units. Offers no protection but very little movement impairment."
+ flags_marine_armor = ARMOR_LAMP_OVERLAY|SYNTH_ALLOWED
+ armor_melee = CLOTHING_ARMOR_NONE
+ armor_bullet = CLOTHING_ARMOR_NONE
+ armor_laser = CLOTHING_ARMOR_NONE
+ armor_energy = CLOTHING_ARMOR_NONE
+ armor_bomb = CLOTHING_ARMOR_NONE
+ armor_bio = CLOTHING_ARMOR_NONE
+ armor_rad = CLOTHING_ARMOR_NONE
+ armor_internaldamage = CLOTHING_ARMOR_NONE
+ slowdown = SLOWDOWN_ARMOR_VERY_LIGHT
+ time_to_unequip = 0.5 SECONDS
+ time_to_equip = 1 SECONDS
+
/obj/item/clothing/suit/storage/marine/faction/UPP/commando
name = "\improper UM5CU personal armor"
desc = "A modification of the UM5, designed for stealth operations."
@@ -499,7 +515,7 @@
/obj/item/storage/fancy/cigarettes,
/obj/item/tool/lighter,
/obj/item/weapon/baton,
- /obj/item/handcuffs,
+ /obj/item/restraint/handcuffs,
/obj/item/device/binoculars,
/obj/item/attachable/bayonet,
/obj/item/device/flashlight,
@@ -560,7 +576,7 @@
/obj/item/device/flashlight,
/obj/item/ammo_magazine/,
/obj/item/weapon/baton,
- /obj/item/handcuffs,
+ /obj/item/restraint/handcuffs,
/obj/item/storage/fancy/cigarettes,
/obj/item/tool/lighter,
/obj/item/explosive/grenade,
@@ -595,7 +611,7 @@
/obj/item/device/flashlight,
/obj/item/ammo_magazine/,
/obj/item/weapon/baton,
- /obj/item/handcuffs,
+ /obj/item/restraint/handcuffs,
/obj/item/storage/fancy/cigarettes,
/obj/item/tool/lighter,
/obj/item/explosive/grenade,
@@ -698,7 +714,7 @@
/obj/item/storage/fancy/cigarettes,
/obj/item/tool/lighter,
/obj/item/weapon/baton,
- /obj/item/handcuffs,
+ /obj/item/restraint/handcuffs,
/obj/item/explosive/grenade,
/obj/item/device/binoculars,
/obj/item/attachable/bayonet,
@@ -731,6 +747,22 @@
uniform_restricted = list(/obj/item/clothing/under/marine/ua_riot)
flags_atom = NO_SNOW_TYPE
+/obj/item/clothing/suit/storage/marine/veteran/ua_riot/synth
+ name = "\improper UA-M1S Synthetic body armor"
+ desc = "Based on the M-3 pattern employed by the USCM, the UA-M1 body armor is employed by UA security, riot control and union-busting teams. The UA-1MS modification is Synthetic programming compliant, sacrificing protection for speed and carrying capacity."
+ armor_melee = CLOTHING_ARMOR_NONE
+ armor_bullet = CLOTHING_ARMOR_NONE
+ armor_laser = CLOTHING_ARMOR_NONE
+ armor_energy = CLOTHING_ARMOR_NONE
+ armor_bomb = CLOTHING_ARMOR_NONE
+ armor_bio = CLOTHING_ARMOR_NONE
+ armor_rad = CLOTHING_ARMOR_NONE
+ armor_internaldamage = CLOTHING_ARMOR_NONE
+ slowdown = SLOWDOWN_ARMOR_SUPER_LIGHT
+ storage_slots = 3
+ flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE
+ flags_marine_armor = ARMOR_SQUAD_OVERLAY|ARMOR_LAMP_OVERLAY|SYNTH_ALLOWED
+
//================//=ROYAL MARINES=\\====================================\\
//=======================================================================\\
@@ -746,7 +778,7 @@
/obj/item/device/flashlight,
/obj/item/ammo_magazine/,
/obj/item/weapon/baton,
- /obj/item/handcuffs,
+ /obj/item/restraint/handcuffs,
/obj/item/storage/fancy/cigarettes,
/obj/item/tool/lighter,
/obj/item/explosive/grenade,
diff --git a/code/modules/clothing/suits/marine_armor/smartgunner.dm b/code/modules/clothing/suits/marine_armor/smartgunner.dm
index 430942fbbef8..8f39ef83045c 100644
--- a/code/modules/clothing/suits/marine_armor/smartgunner.dm
+++ b/code/modules/clothing/suits/marine_armor/smartgunner.dm
@@ -32,7 +32,7 @@
/obj/item/clothing/suit/storage/marine/smartgunner/mob_can_equip(mob/equipping_mob, slot, disable_warning = FALSE)
. = ..()
- if(equipping_mob.back)
+ if(equipping_mob.back && !(equipping_mob.back.flags_item & SMARTGUNNER_BACKPACK_OVERRIDE))
to_chat(equipping_mob, SPAN_WARNING("You can't equip [src] while wearing a backpack."))
return FALSE
@@ -48,6 +48,9 @@
if(slot != WEAR_BACK)
return
+ if(equipping_item.flags_item & SMARTGUNNER_BACKPACK_OVERRIDE)
+ return
+
. = COMPONENT_HUMAN_CANCEL_ATTEMPT_EQUIP
if(equipping_item.flags_equip_slot == SLOT_BACK)
diff --git a/code/modules/clothing/suits/marine_coat.dm b/code/modules/clothing/suits/marine_coat.dm
index 2dd93eb66aee..78c8154e1810 100644
--- a/code/modules/clothing/suits/marine_coat.dm
+++ b/code/modules/clothing/suits/marine_coat.dm
@@ -24,7 +24,7 @@
/obj/item/storage/fancy/cigarettes,
/obj/item/tool/lighter,
/obj/item/weapon/baton,
- /obj/item/handcuffs,
+ /obj/item/restraint/handcuffs,
/obj/item/device/binoculars,
/obj/item/attachable/bayonet,
/obj/item/storage/belt/gun/m4a3,
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index 54148d4f7076..252b99e124bc 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -128,7 +128,7 @@
/obj/item/ammo_magazine,
/obj/item/ammo_casing,
/obj/item/weapon/baton,
- /obj/item/handcuffs,
+ /obj/item/restraint/handcuffs,
/obj/item/storage/fancy/cigarettes,
/obj/item/tool/lighter,
/obj/item/device/taperecorder,
@@ -153,7 +153,7 @@
/obj/item/ammo_magazine,
/obj/item/ammo_casing,
/obj/item/weapon/baton,
- /obj/item/handcuffs,
+ /obj/item/restraint/handcuffs,
/obj/item/storage/fancy/cigarettes,
/obj/item/tool/lighter,
/obj/item/device/taperecorder,
@@ -290,7 +290,7 @@
item_state = "webbing"
allowed = list(
/obj/item/weapon/baton,
- /obj/item/handcuffs,
+ /obj/item/restraint/handcuffs,
/obj/item/device/binoculars,
/obj/item/attachable/bayonet,
@@ -318,7 +318,7 @@
item_state = "synth_utility_vest"
allowed = list(
/obj/item/weapon/baton,
- /obj/item/handcuffs,
+ /obj/item/restraint/handcuffs,
/obj/item/device/binoculars,
/obj/item/attachable/bayonet,
@@ -455,7 +455,7 @@
/obj/item/storage/fancy/cigarettes,
/obj/item/tool/lighter,
/obj/item/weapon/baton,
- /obj/item/handcuffs,
+ /obj/item/restraint/handcuffs,
/obj/item/device/binoculars,
/obj/item/attachable/bayonet,
diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm
index 133265b34b7e..3b415cf0f9e8 100644
--- a/code/modules/clothing/suits/utility.dm
+++ b/code/modules/clothing/suits/utility.dm
@@ -112,7 +112,7 @@
allowed = list(
/obj/item/weapon/gun,
/obj/item/weapon/baton,
- /obj/item/handcuffs,
+ /obj/item/restraint/handcuffs,
/obj/item/device/flashlight,
/obj/item/device/healthanalyzer,
diff --git a/code/modules/clothing/under/ties.dm b/code/modules/clothing/under/ties.dm
index 413c2edda0c7..d95c0a593d34 100644
--- a/code/modules/clothing/under/ties.dm
+++ b/code/modules/clothing/under/ties.dm
@@ -676,6 +676,25 @@
/obj/item/clothing/accessory/storage/surg_vest/drop_green/equipped
hold = /obj/item/storage/internal/accessory/surg_vest/equipped
+/obj/item/clothing/accessory/storage/surg_vest/drop_green/upp
+ hold = /obj/item/storage/internal/accessory/surg_vest/drop_green/upp
+
+/obj/item/storage/internal/accessory/surg_vest/drop_green/upp/fill_preset_inventory()
+ new /obj/item/tool/surgery/scalpel(src)
+ new /obj/item/tool/surgery/hemostat(src)
+ new /obj/item/tool/surgery/retractor(src)
+ new /obj/item/tool/surgery/cautery(src)
+ new /obj/item/tool/surgery/circular_saw(src)
+ new /obj/item/tool/surgery/surgicaldrill(src)
+ new /obj/item/tool/surgery/scalpel/pict_system(src)
+ new /obj/item/tool/surgery/bonesetter(src)
+ new /obj/item/tool/surgery/FixOVein(src)
+ new /obj/item/stack/medical/advanced/bruise_pack(src)
+ new /obj/item/stack/nanopaste(src)
+ new /obj/item/tool/surgery/bonegel(src)
+ new /obj/item/tool/surgery/bonegel(src)
+ new /obj/item/reagent_container/blood/OMinus(src)
+
/obj/item/clothing/accessory/storage/surg_vest/drop_black
name = "black surgical drop pouch"
desc = "A tactical black synthcotton drop pouch purpose-made for holding surgical tools."
diff --git a/code/modules/cm_aliens/structures/special/pylon_core.dm b/code/modules/cm_aliens/structures/special/pylon_core.dm
index add9646c56ac..7f0124fa5033 100644
--- a/code/modules/cm_aliens/structures/special/pylon_core.dm
+++ b/code/modules/cm_aliens/structures/special/pylon_core.dm
@@ -66,7 +66,7 @@
for(var/mob/living/carbon/xenomorph/lesser_drone/lesser in linked_hive.totalXenos)
lesser_count++
- . += "Currently holding [SPAN_NOTICE("[Floor(lesser_drone_spawns)]")]/[SPAN_NOTICE("[lesser_drone_spawn_limit]")] lesser drones."
+ . += "Currently holding [SPAN_NOTICE("[floor(lesser_drone_spawns)]")]/[SPAN_NOTICE("[lesser_drone_spawn_limit]")] lesser drones."
. += "There are currently [SPAN_NOTICE("[lesser_count]")] lesser drones in the hive. The hive can support [SPAN_NOTICE("[linked_hive.lesser_drone_limit]")] lesser drones."
/obj/effect/alien/resin/special/pylon/attack_ghost(mob/dead/observer/user)
diff --git a/code/modules/cm_marines/dropship_equipment.dm b/code/modules/cm_marines/dropship_equipment.dm
index bd40076ea500..1ddee8e85d20 100644
--- a/code/modules/cm_marines/dropship_equipment.dm
+++ b/code/modules/cm_marines/dropship_equipment.dm
@@ -524,12 +524,6 @@
if(light_on)
set_light(0)
-/obj/structure/dropship_equipment/electronics/spotlights/on_launch()
- set_light(0)
-
-/obj/structure/dropship_equipment/electronics/spotlights/on_arrival()
- set_light(brightness)
-
/obj/structure/dropship_equipment/electronics/spotlights/ui_data(mob/user)
. = list()
var/is_deployed = light_on
@@ -1296,130 +1290,29 @@
fulton_cooldown = world.time + 50
// Rappel deployment system
-/obj/structure/dropship_equipment/rappel_system
- name = "\improper HPU-1 Rappel Deployment System"
- shorthand = "Rappel"
+/obj/structure/dropship_equipment/paradrop_system
+ name = "\improper HPU-1 Paradrop Deployment System"
+ shorthand = "PDS"
equip_categories = list(DROPSHIP_CREW_WEAPON)
icon_state = "rappel_module_packaged"
point_cost = 50
combat_equipment = FALSE
+ var/system_cooldown
- var/harness = /obj/item/rappel_harness
+/obj/structure/dropship_equipment/paradrop_system/ui_data(mob/user)
+ . = list()
+ .["signal"] = "[linked_shuttle.paradrop_signal]"
+ .["locked"] = !!linked_shuttle.paradrop_signal
-/obj/structure/dropship_equipment/rappel_system/update_equipment()
+/obj/structure/dropship_equipment/paradrop_system/update_equipment()
if(ship_base)
icon_state = "rappel_hatch_closed"
density = FALSE
else
icon_state = "rappel_module_packaged"
-/obj/effect/warning/rappel
- color = "#17d17a"
-
-/obj/structure/dropship_equipment/rappel_system/attack_hand(mob/living/carbon/human/user)
- var/datum/cas_iff_group/cas_group = GLOB.cas_groups[FACTION_MARINE]
- var/list/targets = cas_group.cas_signals
-
- if(!LAZYLEN(targets))
- to_chat(user, SPAN_NOTICE("No CAS signals found."))
- return
-
- if(!can_use(user))
- return
-
- var/user_input = tgui_input_list(user, "Choose a target to jump to.", name, targets)
- if(!user_input)
- return
-
- if(!can_use(user))
- return
-
- var/datum/cas_signal/LT = user_input
- if(!istype(LT) || !LT.valid_signal())
- return
-
- var/turf/location = get_turf(LT.signal_loc)
- var/area/location_area = get_area(location)
- if(CEILING_IS_PROTECTED(location_area.ceiling, CEILING_PROTECTION_TIER_1))
- to_chat(user, SPAN_WARNING("You cannot jump to the target. It is probably underground."))
- return
-
- var/list/valid_turfs = list()
- for(var/turf/T as anything in RANGE_TURFS(2, location))
- var/area/t_area = get_area(T)
- if(!t_area || CEILING_IS_PROTECTED(t_area.ceiling, CEILING_PROTECTION_TIER_1))
- continue
- if(T.density)
- continue
- var/found_dense = FALSE
- for(var/atom/A in T)
- if(A.density && A.can_block_movement)
- found_dense = TRUE
- break
- if(found_dense)
- continue
- if(protected_by_pylon(TURF_PROTECTION_MORTAR, T))
- continue
- valid_turfs += T
-
- if(!length(valid_turfs))
- to_chat(user, SPAN_WARNING("There's nowhere safe for you to land, the landing zone is too congested."))
- return
-
- var/turf/deploy_turf = pick(valid_turfs)
-
- var/obj/effect/warning/rappel/warning_zone = new(deploy_turf)
- flick("rappel_hatch_opening", src)
- icon_state = "rappel_hatch_open"
- user.forceMove(loc)
- user.client?.perspective = EYE_PERSPECTIVE
- user.client?.eye = deploy_turf
-
- if(!do_after(user, 4 SECONDS, INTERRUPT_NO_NEEDHAND, BUSY_ICON_FRIENDLY, user, INTERRUPT_MOVED) || !can_use(user) || protected_by_pylon(TURF_PROTECTION_MORTAR, deploy_turf))
- qdel(warning_zone)
- flick("rappel_hatch_closing", src)
- icon_state = "rappel_hatch_closed"
- user.client?.perspective = MOB_PERSPECTIVE
- user.client?.eye = user
- return
-
- new /obj/effect/rappel_rope(deploy_turf)
- user.forceMove(deploy_turf)
- INVOKE_ASYNC(user, TYPE_PROC_REF(/mob/living/carbon/human, animation_rappel))
- user.client?.perspective = MOB_PERSPECTIVE
- user.client?.eye = user
- deploy_turf.ceiling_debris_check(2)
- playsound(deploy_turf, 'sound/items/rappel.ogg', 50, TRUE)
-
- flick("rappel_hatch_closing", src)
- icon_state = "rappel_hatch_closed"
- qdel(warning_zone)
-
-/obj/structure/dropship_equipment/rappel_system/proc/can_use(mob/living/carbon/human/user)
- if(linked_shuttle.mode != SHUTTLE_CALL)
- to_chat(user, SPAN_WARNING("\The [src] can only be used while in flight."))
- return FALSE
-
- if(!linked_shuttle.in_flyby)
- to_chat(user, SPAN_WARNING("\The [src] requires a flyby flight to be used."))
- return FALSE
-
- if(user.buckled)
- to_chat(user, SPAN_WARNING("You cannot rappel while buckled!"))
- return FALSE
-
- if(user.is_mob_incapacitated())
- to_chat(user, SPAN_WARNING("You are in no state to do that!"))
- return FALSE
-
- if(!istype(user.belt, harness))
- to_chat(user, SPAN_WARNING("You must have a rappel harness equipped in order to use \the [src]!"))
- return FALSE
-
- if(user.action_busy)
- return FALSE
-
- return TRUE
+/obj/structure/dropship_equipment/paradrop_system/attack_hand(mob/living/carbon/human/user)
+ return
// used in the simulation room for cas runs, removed the sound and ammo depletion methods.
// copying code is definitely bad, but adding an unnecessary sim or not sim boolean check in the open_fire_firemission just doesn't seem right.
diff --git a/code/modules/cm_marines/marines_consoles.dm b/code/modules/cm_marines/marines_consoles.dm
index 7e57430f081a..e02bb930d416 100644
--- a/code/modules/cm_marines/marines_consoles.dm
+++ b/code/modules/cm_marines/marines_consoles.dm
@@ -43,12 +43,12 @@
ui = new(user, src, "CardMod", name)
ui.open()
-/obj/structure/machinery/computer/card/ui_act(action, params)
+/obj/structure/machinery/computer/card/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
- var/mob/user = usr
+ var/mob/user = ui.user
playsound(src, pick('sound/machines/computer_typing4.ogg', 'sound/machines/computer_typing5.ogg', 'sound/machines/computer_typing6.ogg'), 5, 1)
switch(action)
@@ -91,18 +91,11 @@
printing = TRUE
playsound(src.loc, 'sound/machines/fax.ogg', 15, 1)
sleep(40)
- var/faction = "N/A"
- if(target_id_card.faction_group && islist(target_id_card.faction_group))
- faction = jointext(target_id_card.faction_group, ", ")
- if(isnull(target_id_card.faction_group))
- target_id_card.faction_group = list()
- else
- faction = target_id_card.faction_group
var/contents = {"Access Report
Prepared By: [user_id_card?.registered_name ? user_id_card.registered_name : "Unknown"]
For: [target_id_card.registered_name ? target_id_card.registered_name : "Unregistered"]
- Faction: [faction]
+ Faction: [target_id_card.faction ? target_id_card.faction : "N/A"]
Assignment: [target_id_card.assignment]
Account Number: #[target_id_card.associated_account_number]
Blood Type: [target_id_card.blood_type]
@@ -112,7 +105,10 @@
var/known_access_rights = get_access(ACCESS_LIST_MARINE_ALL)
for(var/A in target_id_card.access)
if(A in known_access_rights)
- contents += " [get_access_desc(A)]"
+ contents += " [get_access_desc(A)]
"
+ contents += "
Modification Log:
"
+ for(var/change in target_id_card.modification_log)
+ contents += " [change]
"
var/obj/item/paper/P = new /obj/item/paper(src.loc)
P.name = "Access Report"
@@ -139,9 +135,9 @@
GLOB.data_core.manifest_modify(target_id_card.registered_name, target_id_card.registered_ref, target_id_card.assignment, target_id_card.rank)
target_id_card.name = text("[target_id_card.registered_name]'s ID Card ([target_id_card.assignment])")
if(target_id_card.registered_name != origin_name)
- log_idmod(target_id_card, " [key_name_admin(usr)] changed the registered name of the ID to '[target_id_card.registered_name]'. ")
+ log_idmod(target_id_card, " [user.real_name] changed the registered name of the ID to '[target_id_card.registered_name]'. ", key_name_admin(user))
if(target_id_card.assignment != origin_assignment)
- log_idmod(target_id_card, " [key_name_admin(usr)] changed the assignment of the ID to the custom position '[target_id_card.assignment]'. ")
+ log_idmod(target_id_card, " [user.real_name] changed the assignment of the ID to the custom position '[target_id_card.assignment]'. ", key_name_admin(user))
if(ishuman(user))
target_id_card.forceMove(user.loc)
if(!user.get_active_hand())
@@ -170,8 +166,8 @@
target_id_card.assignment = "Terminated"
target_id_card.access = list()
- log_idmod(target_id_card, " [key_name_admin(usr)] terminated the ID. ")
- message_admins("[key_name_admin(usr)] terminated the ID of [target_id_card.registered_name].")
+ log_idmod(target_id_card, " [user.real_name] terminated the ID. ", key_name_admin(user))
+ message_admins("[user.real_name] terminated the ID of [target_id_card.registered_name].", key_name_admin(user))
return TRUE
if("PRG_edit")
if(!authenticated || !target_id_card)
@@ -221,19 +217,19 @@
target_id_card.faction_group = list()
if(params["access_target"] in target_id_card.faction_group)
target_id_card.faction_group -= params["access_target"]
- log_idmod(target_id_card, " [key_name_admin(usr)] revoked [access_type] IFF. ")
+ log_idmod(target_id_card, " [user.real_name] revoked [access_type] IFF. ", key_name_admin(user))
else
target_id_card.faction_group |= params["access_target"]
- log_idmod(target_id_card, " [key_name_admin(usr)] granted [access_type] IFF. ")
+ log_idmod(target_id_card, " [user.real_name] granted [access_type] IFF. ", key_name_admin(user))
return TRUE
access_type = text2num(params["access_target"])
if(access_type in (is_centcom ? get_access(ACCESS_LIST_WY_ALL) : get_access(ACCESS_LIST_MARINE_MAIN)))
if(access_type in target_id_card.access)
target_id_card.access -= access_type
- log_idmod(target_id_card, " [key_name_admin(usr)] revoked access '[access_type]'. ")
+ log_idmod(target_id_card, " [user.real_name] revoked access '[get_access_desc(access_type)]'. ", key_name_admin(user))
else
target_id_card.access |= access_type
- log_idmod(target_id_card, " [key_name_admin(usr)] granted access '[access_type]'. ")
+ log_idmod(target_id_card, " [user.real_name] granted access '[get_access_desc(access_type)]'. ", key_name_admin(user))
return TRUE
if("PRG_grantall")
if(!authenticated || !target_id_card)
@@ -241,7 +237,7 @@
target_id_card.access |= (is_centcom ? get_access(ACCESS_LIST_WY_ALL) : get_access(ACCESS_LIST_MARINE_MAIN))
target_id_card.faction_group |= factions
- log_idmod(target_id_card, " [key_name_admin(usr)] granted the ID all access and USCM IFF. ")
+ log_idmod(target_id_card, " [user.real_name] granted the ID all access and USCM IFF. ", key_name_admin(user))
return TRUE
if("PRG_denyall")
if(!authenticated || !target_id_card)
@@ -250,7 +246,7 @@
var/list/access = target_id_card.access
access.Cut()
target_id_card.faction_group -= factions
- log_idmod(target_id_card, " [key_name_admin(usr)] removed all accesses and USCM IFF. ")
+ log_idmod(target_id_card, " [user.real_name] removed all accesses and USCM IFF. ", key_name_admin(user))
return TRUE
if("PRG_grantregion")
if(!authenticated || !target_id_card)
@@ -258,14 +254,14 @@
if(params["region"] == "Faction (IFF system)")
target_id_card.faction_group |= factions
- log_idmod(target_id_card, " [key_name_admin(usr)] granted USCM IFF. ")
+ log_idmod(target_id_card, " [user.real_name] granted USCM IFF. ", key_name_admin(user))
return TRUE
var/region = text2num(params["region"])
if(isnull(region))
return
target_id_card.access |= get_region_accesses(region)
var/additions = get_region_accesses_name(region)
- log_idmod(target_id_card, " [key_name_admin(usr)] granted all [additions] accesses. ")
+ log_idmod(target_id_card, " [user.real_name] granted all [additions] accesses. ", key_name_admin(user))
return TRUE
if("PRG_denyregion")
if(!authenticated || !target_id_card)
@@ -273,14 +269,14 @@
if(params["region"] == "Faction (IFF system)")
target_id_card.faction_group -= factions
- log_idmod(target_id_card, " [key_name_admin(usr)] revoked USCM IFF. ")
+ log_idmod(target_id_card, " [user.real_name] revoked USCM IFF. ", key_name_admin(user))
return TRUE
var/region = text2num(params["region"])
if(isnull(region))
return
target_id_card.access -= get_region_accesses(region)
var/additions = get_region_accesses_name(region)
- log_idmod(target_id_card, " [key_name_admin(usr)] revoked all [additions] accesses. ")
+ log_idmod(target_id_card, " [user.real_name] revoked all [additions] accesses. ", key_name_admin(user))
return TRUE
if("PRG_account")
if(!authenticated || !target_id_card)
@@ -288,7 +284,7 @@
var/account = text2num(params["account"])
target_id_card.associated_account_number = account
- log_idmod(target_id_card, " [key_name_admin(usr)] changed the account number to '[account]'. ")
+ log_idmod(target_id_card, " [user.real_name] changed the account number to '[account]'. ", key_name_admin(user))
return TRUE
/obj/structure/machinery/computer/card/ui_static_data(mob/user)
@@ -1084,6 +1080,7 @@ GLOBAL_LIST_EMPTY_TYPED(crewmonitor, /datum/crewmonitor)
// 50-59: Engineering
JOB_UPP_COMBAT_SYNTH = 50,
JOB_UPP_CREWMAN = 51,
+ JOB_UPP_SUPPORT_SYNTH = 52,
// 60-69: Soldiers
JOB_UPP_LEADER = 60,
JOB_UPP_SPECIALIST = 61,
diff --git a/code/modules/cm_marines/orbital_cannon.dm b/code/modules/cm_marines/orbital_cannon.dm
index 23bce06fdc1a..ce69115cee48 100644
--- a/code/modules/cm_marines/orbital_cannon.dm
+++ b/code/modules/cm_marines/orbital_cannon.dm
@@ -184,9 +184,12 @@ GLOBAL_LIST(ob_type_fuel_requirements)
chambered_tray = TRUE
var/misfuel = get_misfuel_amount()
var/message = "[key_name(user)] chambered the Orbital Bombardment cannon."
+ var/ares_message = "Shell chambered."
if(misfuel)
message += " It is misfueled by [misfuel] units!"
+ ares_message += " Fuel imbalance detected!"
message_admins(message, x, y, z)
+ log_ares_bombardment(user, lowertext(tray.warhead.name), ares_message)
update_icon()
diff --git a/code/modules/cm_marines/overwatch.dm b/code/modules/cm_marines/overwatch.dm
index 489a7e528832..500d575c053f 100644
--- a/code/modules/cm_marines/overwatch.dm
+++ b/code/modules/cm_marines/overwatch.dm
@@ -800,7 +800,7 @@
notify_ghosts(header = "Bombardment Inbound", message = "\A [ob_name] targeting [get_area(T)] has been fired!", source = T, alert_overlay = warhead_appearance, extra_large = TRUE)
/// Project ARES interface log.
- log_ares_bombardment(user.name, ob_name, "X[x_bomb], Y[y_bomb] in [get_area(T)]")
+ log_ares_bombardment(user.name, ob_name, "Bombardment fired at X[x_bomb], Y[y_bomb] in [get_area(T)]")
busy = FALSE
if(istype(T))
@@ -867,6 +867,9 @@
/obj/structure/machinery/computer/overwatch/almayer/broken
name = "Broken Overwatch Console"
+/obj/structure/machinery/computer/overwatch/almayer/small
+ icon_state = "engineering_terminal"
+
/obj/structure/machinery/computer/overwatch/clf
faction = FACTION_CLF
/obj/structure/machinery/computer/overwatch/upp
diff --git a/code/modules/cm_tech/droppod/lz_effect.dm b/code/modules/cm_tech/droppod/lz_effect.dm
index 6a73916c7b3f..7ab955d8a00c 100644
--- a/code/modules/cm_tech/droppod/lz_effect.dm
+++ b/code/modules/cm_tech/droppod/lz_effect.dm
@@ -34,6 +34,7 @@
/obj/effect/warning/explosive/proc/disappear()
qdel(src)
+
/obj/effect/warning/explosive/gas
name = "gas warning"
color = "#42acd6"
diff --git a/code/modules/cm_tech/techs/marine/tier1/arc.dm b/code/modules/cm_tech/techs/marine/tier1/arc.dm
new file mode 100644
index 000000000000..dc02762cc5f0
--- /dev/null
+++ b/code/modules/cm_tech/techs/marine/tier1/arc.dm
@@ -0,0 +1,40 @@
+/datum/tech/arc
+ name = "M540-B Armored Recon Carrier"
+ desc = "Purchase an M540-B Armored Recon Carrier, specialized in assisting groundside command. Able to be driven by Staff Officers, Executive Officers, and Commanding Officers."
+ icon_state = "upgrade"
+
+ required_points = 5
+
+ tier = /datum/tier/one
+
+ announce_name = "M540-B ARC ACQUIRED"
+ announce_message = "An M540-B Armored Recon Carrier has been authorized and will be delivered in the vehicle bay."
+
+ flags = TREE_FLAG_MARINE
+
+/datum/tech/arc/on_unlock()
+ . = ..()
+
+ var/obj/structure/machinery/computer/supplycomp/vehicle/comp = GLOB.VehicleElevatorConsole
+ var/obj/structure/machinery/cm_vending/gear/vehicle_crew/gearcomp = GLOB.VehicleGearConsole
+
+ if(!comp || !gearcomp)
+ return FALSE
+
+ comp.spent = FALSE
+ QDEL_NULL_LIST(comp.vehicles)
+ comp.vehicles = list(
+ new /datum/vehicle_order/arc()
+ )
+ comp.allowed_roles = list(JOB_SYNTH, JOB_SEA, JOB_SO, JOB_XO, JOB_CO, JOB_GENERAL)
+ comp.req_access = list(ACCESS_MARINE_COMMAND)
+ comp.req_one_access = list()
+ comp.spent = FALSE
+
+ gearcomp.req_access = list(ACCESS_MARINE_COMMAND)
+ gearcomp.req_one_access = list()
+ gearcomp.vendor_role = list()
+ gearcomp.selected_vehicle = "ARC"
+ gearcomp.available_categories = VEHICLE_ALL_AVAILABLE
+
+ return TRUE
diff --git a/code/modules/defenses/sentry.dm b/code/modules/defenses/sentry.dm
index a02e4e7808c9..954e6adca7ec 100644
--- a/code/modules/defenses/sentry.dm
+++ b/code/modules/defenses/sentry.dm
@@ -365,7 +365,7 @@
targets.Remove(A)
continue
- if(M.get_target_lock(faction_group) || M.invisibility || HAS_TRAIT(M, TRAIT_ABILITY_BURROWED))
+ if(M.get_target_lock(faction_group) || M.invisibility || HAS_TRAIT(M, TRAIT_ABILITY_BURROWED) || M.is_ventcrawling)
if(M == target)
target = null
targets.Remove(M)
diff --git a/code/modules/gear_presets/clf.dm b/code/modules/gear_presets/clf.dm
index 9c05ff8fa5fc..bb168f22457b 100644
--- a/code/modules/gear_presets/clf.dm
+++ b/code/modules/gear_presets/clf.dm
@@ -71,6 +71,7 @@
new_human.equip_to_slot_or_del(new /obj/item/storage/belt/shotgun/full/random(new_human), WEAR_WAIST)
new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb(new_human), WEAR_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/attachable/bayonet/upp(new_human), WEAR_FACE)
if(prob(50))
spawn_rebel_smg(new_human)
else
@@ -176,6 +177,7 @@
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/welding, WEAR_HEAD)
new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_human), WEAR_WAIST)
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CLF/cct, WEAR_L_EAR)
+ new_human.equip_to_slot_or_del(new /obj/item/attachable/bayonet/upp(new_human), WEAR_FACE)
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/engineerpack/ert, WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_BACK)
@@ -300,6 +302,7 @@
new_human.equip_to_slot_or_del(new /obj/item/roller, WEAR_IN_BELT)
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CLF/medic(new_human), WEAR_L_EAR)
+ new_human.equip_to_slot_or_del(new /obj/item/attachable/bayonet/upp(new_human), WEAR_FACE)
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack(new_human), WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/ied(new_human), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv(new_human), WEAR_IN_BACK)
@@ -455,6 +458,7 @@
//clothing
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/militia(new_human), WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/swat(new_human), WEAR_HEAD)
+ new_human.equip_to_slot_or_del(new /obj/item/attachable/bayonet/upp(new_human), WEAR_FACE)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(new_human), WEAR_FEET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(new_human), WEAR_HANDS)
new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/mod88(new_human), WEAR_WAIST)
@@ -574,6 +578,7 @@
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/clf(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/militia(new_human), WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/sec/hos(new_human), WEAR_HEAD)
+ new_human.equip_to_slot_or_del(new /obj/item/attachable/bayonet/upp(new_human), WEAR_FACE)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(new_human), WEAR_FEET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(new_human), WEAR_HANDS)
new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine(new_human), WEAR_WAIST)
@@ -900,6 +905,54 @@
list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR),
)
+/datum/equipment_preset/clf/synth/combat
+ name = "CLF Combat Synthetic"
+ flags = EQUIPMENT_PRESET_EXTRA
+
+/datum/equipment_preset/clf/synth/combat/load_skills(mob/living/carbon/human/new_human)
+ . = ..()
+ new_human.allow_gun_usage = TRUE
+
+/datum/equipment_preset/clf/synth/combat/load_gear(mob/living/carbon/human/new_human)
+ //back
+ new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/engineerpack/ert, WEAR_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/roller, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK)
+ //face
+ new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CLF/command(new_human), WEAR_L_EAR)
+ new_human.equip_to_slot_or_del(new /obj/item/attachable/bayonet/upp, WEAR_FACE)
+ if(new_human.disabilities & NEARSIGHTED)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health/prescription(new_human), WEAR_EYES)
+ else
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(new_human), WEAR_EYES)
+ //head
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/jan, WEAR_HEAD)
+ //body
+ var/obj/item/clothing/under/colonist/clf/CLF = new()
+ var/obj/item/clothing/accessory/storage/webbing/webbing = new()
+ CLF.attach_accessory(new_human, webbing)
+ new_human.equip_to_slot_or_del(CLF, WEAR_BODY)
+ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/extended, WEAR_IN_ACCESSORY)
+ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/extended, WEAR_IN_ACCESSORY)
+ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/extended, WEAR_IN_ACCESSORY)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/militia, WEAR_JACKET)
+ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/extended, WEAR_IN_JACKET)
+ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/extended, WEAR_IN_JACKET)
+ new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/mar40/carbine, WEAR_J_STORE)
+ //waist
+ new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/full/with_suture_and_graft, WEAR_WAIST)
+ new_human.equip_to_slot_or_del(new /obj/item/device/healthanalyzer(new_human), WEAR_IN_BELT)
+ //limbs
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat, WEAR_HANDS)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat, WEAR_FEET)
+ //pockets
+ new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/synth, WEAR_L_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full_barbed_wire, WEAR_R_STORE)
+
//*****************************************************************************************************/
/datum/equipment_preset/clf/commander
diff --git a/code/modules/gear_presets/cmb.dm b/code/modules/gear_presets/cmb.dm
index d568e2838ae2..8be44f94a2e8 100644
--- a/code/modules/gear_presets/cmb.dm
+++ b/code/modules/gear_presets/cmb.dm
@@ -96,7 +96,7 @@
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb/normalpoint, WEAR_IN_ACCESSORY)
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb/normalpoint, WEAR_IN_ACCESSORY)
new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, WEAR_J_STORE)
- new_human.equip_to_slot_or_del(new /obj/item/handcuffs/zip, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs/zip, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/large, WEAR_R_STORE)
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE)
@@ -112,7 +112,7 @@
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, WEAR_IN_ACCESSORY)
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, WEAR_IN_ACCESSORY)
new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, WEAR_J_STORE)
- new_human.equip_to_slot_or_del(new /obj/item/handcuffs/zip, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs/zip, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge/rubber, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/large, WEAR_R_STORE)
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE)
@@ -128,7 +128,7 @@
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb/normalpoint, WEAR_IN_ACCESSORY)
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb/normalpoint, WEAR_IN_ACCESSORY)
new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/mp5, WEAR_J_STORE)
- new_human.equip_to_slot_or_del(new /obj/item/handcuffs/zip, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs/zip, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/device/motiondetector, WEAR_L_HAND)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large, WEAR_R_STORE)
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/mp5, WEAR_IN_R_STORE)
@@ -278,8 +278,8 @@
new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/full, WEAR_L_HAND)
//pouches
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large, WEAR_L_STORE)
- new_human.equip_to_slot_or_del(new /obj/item/handcuffs/zip, WEAR_IN_L_STORE)
- new_human.equip_to_slot_or_del(new /obj/item/handcuffs/zip, WEAR_IN_L_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs/zip, WEAR_IN_L_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs/zip, WEAR_IN_L_STORE)
new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang, WEAR_IN_L_STORE)
new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas, WEAR_IN_L_STORE)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/tactical, WEAR_R_STORE)
diff --git a/code/modules/gear_presets/survivors/fiorina_sciannex/riot_in_progress_insert_fiorina_nightmare.dm b/code/modules/gear_presets/survivors/fiorina_sciannex/riot_in_progress_insert_fiorina_nightmare.dm
new file mode 100644
index 000000000000..3fdbe72c05be
--- /dev/null
+++ b/code/modules/gear_presets/survivors/fiorina_sciannex/riot_in_progress_insert_fiorina_nightmare.dm
@@ -0,0 +1,276 @@
+// loadouts for riot_in_progress.dmm nightmare, thematic survivor preset.
+
+/datum/equipment_preset/survivor/cmb
+ name = "Survivor - Colonial Marshal"
+ faction = FACTION_MARSHAL
+ faction_group = list(FACTION_MARSHAL, FACTION_MARINE, FACTION_SURVIVOR)
+ languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE)
+ var/human_versus_human = FALSE
+ access = list(
+ ACCESS_LIST_UA,
+ )
+
+//*************************************************CMB****************************************************/
+
+/datum/equipment_preset/survivor/cmb/standard
+ name = "Survivor - Colonial Marshal Deputy(Riot Response)"
+ paygrade = PAY_SHORT_CMBD
+ role_comm_title = "CMB DEP"
+ flags = EQUIPMENT_PRESET_EXTRA
+ assignment = "CMB Deputy"
+ rank = JOB_CMB
+ skills = /datum/skills/cmb
+
+/datum/equipment_preset/survivor/cmb/standard/load_gear(mob/living/carbon/human/new_human)
+
+ var/choice = rand(1,10)
+ new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CMB/limited, WEAR_L_EAR)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/under/CM_uniform, WEAR_BODY)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/holobadge/cord, WEAR_ACCESSORY)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette, WEAR_FACE)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/CMB, WEAR_JACKET)
+ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/holdout, WEAR_IN_JACKET)
+ new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/m15/rubber, WEAR_IN_JACKET)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/CMB/full, WEAR_WAIST)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/head/CMB, WEAR_HEAD)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud, WEAR_EYES)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/survival/full, WEAR_L_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec, WEAR_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/holdout, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/device/flashlight, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/device/camera, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/device/taperecorder, WEAR_IN_BACK)
+
+ switch(choice)
+ if(1 to 6)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY)
+ new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/revolver/cmb, WEAR_IN_ACCESSORY)
+ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb/normalpoint, WEAR_IN_ACCESSORY)
+ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb/normalpoint, WEAR_IN_ACCESSORY)
+ new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, WEAR_J_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun, WEAR_R_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun, WEAR_IN_R_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/beanbag, WEAR_IN_R_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/beanbag, WEAR_IN_R_STORE)
+ if(7 to 8)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY)
+ new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/highpower, WEAR_IN_ACCESSORY)
+ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, WEAR_IN_ACCESSORY)
+ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, WEAR_IN_ACCESSORY)
+ new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, WEAR_J_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge/rubber, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun, WEAR_R_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun, WEAR_IN_R_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/beanbag, WEAR_IN_R_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/beanbag, WEAR_IN_R_STORE)
+ if(9 to 10)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY)
+ new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/revolver/cmb, WEAR_IN_ACCESSORY)
+ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb/normalpoint, WEAR_IN_ACCESSORY)
+ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb/normalpoint, WEAR_IN_ACCESSORY)
+ new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/mp5, WEAR_J_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/device/motiondetector, WEAR_L_HAND)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine, WEAR_R_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/mp5, WEAR_IN_R_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/mp5, WEAR_IN_R_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/mp5, WEAR_IN_R_STORE)
+
+// cmb synth
+/datum/equipment_preset/synth/survivor/cmb/synth
+ name = "Survivor - Synthetic - CMB Investigative Synthetic(Riot Response)"
+ paygrade = PAY_SHORT_CMBS
+ idtype = /obj/item/card/id/deputy
+ role_comm_title = "CMB Syn"
+ flags = EQUIPMENT_PRESET_EXTRA
+ assignment = "CMB Investigative Synthetic"
+ rank = JOB_CMB_SYN
+ languages = ALL_SYNTH_LANGUAGES
+ skills = /datum/skills/synthetic/cmb
+
+/datum/equipment_preset/synth/survivor/cmb/synth/load_race(mob/living/carbon/human/new_human)
+ new_human.set_species(SYNTH_COLONY)
+
+/datum/equipment_preset/synth/survivor/cmb/synth/load_gear(mob/living/carbon/human/new_human)
+ //backpack
+ new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/security, WEAR_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb/normalpoint, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb/normalpoint, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/device/autopsy_scanner, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge/rubber, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/device/camera, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/device/taperecorder, WEAR_IN_BACK)
+ //face
+ new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CMB/limited, WEAR_L_EAR)
+ new_human.equip_to_slot_or_del(new /obj/item/device/flashlight/pen, WEAR_R_EAR)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud, WEAR_EYES)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/head/CMB, WEAR_HEAD)
+ //uniform
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/under/CM_uniform, WEAR_BODY)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/holobadge/cord, WEAR_ACCESSORY)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/droppouch, WEAR_ACCESSORY)
+ new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator/upgraded, WEAR_IN_ACCESSORY)
+ new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs, WEAR_IN_ACCESSORY)
+ new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs, WEAR_IN_ACCESSORY)
+ new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/candy, WEAR_IN_ACCESSORY)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/pill_bottle/imidazoline, WEAR_IN_ACCESSORY)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/CMB, WEAR_JACKET)
+ new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range/designator, WEAR_IN_JACKET)
+ new_human.equip_to_slot_or_del(new /obj/item/weapon/telebaton, WEAR_IN_JACKET)
+ //belt
+ new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/CMB/synth, WEAR_WAIST)
+ //holding
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS)
+ //pouches
+ new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/survival/synth/full, WEAR_L_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/tactical, WEAR_R_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/tool/screwdriver/tactical, WEAR_IN_R_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical, WEAR_IN_R_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/tool/wirecutters/tactical, WEAR_IN_R_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/tool/wrench, WEAR_IN_R_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/device/multitool, WEAR_IN_R_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/stack/cable_coil, WEAR_IN_R_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/tool/weldingtool/hugetank, WEAR_IN_R_STORE)
+
+//************************************************UA RIOT POLICE****************************************************/
+
+/datum/equipment_preset/survivor/cmb/ua
+ name = "Survivor - United Americas Riot Officer(Riot Response)"
+ paygrade = PAY_SHORT_CPO
+ role_comm_title = "UA RCP"
+ flags = EQUIPMENT_PRESET_EXTRA
+ assignment = "United Americas Police Officer"
+ skills = /datum/skills/civilian/survivor/marshal
+ idtype = /obj/item/card/id/silver
+
+/datum/equipment_preset/survivor/cmb/ua/load_gear(mob/living/carbon/human/new_human)
+
+ var/choice = rand(1,10)
+ new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CMB/limited, WEAR_L_EAR)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/ua_riot, WEAR_BODY)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/ua_riot, WEAR_JACKET)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/ua_riot, WEAR_HEAD)
+ new_human.equip_to_slot_or_del(new /obj/item/prop/helmetgarb/riot_shield, WEAR_IN_HELMET)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec, WEAR_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/device/flashlight, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/full, WEAR_WAIST)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine, WEAR_HANDS)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots, WEAR_FEET)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud, WEAR_EYES)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/survival/full, WEAR_L_STORE)
+
+ switch(choice)
+ if(1 to 6)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY)
+ new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/b92fs, WEAR_IN_ACCESSORY)
+ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/b92fs, WEAR_IN_ACCESSORY)
+ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/b92fs, WEAR_IN_ACCESSORY)
+ new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m16, WEAR_J_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine, WEAR_R_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, WEAR_IN_R_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, WEAR_IN_R_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/weapon/classic_baton, WEAR_R_HAND)
+ if(7)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY)
+ new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/highpower, WEAR_IN_ACCESSORY)
+ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, WEAR_IN_ACCESSORY)
+ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, WEAR_IN_ACCESSORY)
+ new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/combat/riot, WEAR_J_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun, WEAR_R_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/beanbag, WEAR_IN_R_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/beanbag, WEAR_IN_R_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/beanbag, WEAR_IN_R_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/beanbag, WEAR_IN_R_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/weapon/classic_baton, WEAR_R_HAND)
+ new_human.equip_to_slot_or_del(new /obj/item/weapon/shield/riot, WEAR_L_HAND)
+ if(8)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY)
+ new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/m4a3, WEAR_IN_ACCESSORY)
+ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol, WEAR_IN_ACCESSORY)
+ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/rubber, WEAR_IN_ACCESSORY)
+ new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/launcher/grenade/m81/riot, WEAR_J_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/explosive, WEAR_R_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/slug/baton, WEAR_IN_R_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/slug/baton, WEAR_IN_R_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/slug/baton, WEAR_IN_R_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/slug/baton, WEAR_IN_R_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas, WEAR_IN_R_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas, WEAR_IN_R_STORE)
+ if(9 to 10)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY)
+ new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/highpower/black, WEAR_IN_ACCESSORY)
+ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, WEAR_IN_ACCESSORY)
+ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower, WEAR_IN_ACCESSORY)
+ new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge/rubber, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/mp5, WEAR_J_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/device/motiondetector, WEAR_L_HAND)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine, WEAR_R_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/mp5, WEAR_IN_R_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/mp5, WEAR_IN_R_STORE)
+
+// ua synth
+/datum/equipment_preset/synth/survivor/cmb/ua_synth
+ name = "Survivor - Synthetic - UA Police Synthetic(Riot Response)"
+ paygrade = PAY_SHORT_CMBS
+ role_comm_title = "UA Syn"
+ flags = EQUIPMENT_PRESET_EXTRA
+ assignment = "UA Police Synthetic"
+ languages = ALL_SYNTH_LANGUAGES
+ skills = /datum/skills/colonial_synthetic
+ idtype = /obj/item/card/id/silver
+
+/datum/equipment_preset/synth/survivor/cmb/ua_synth/load_race(mob/living/carbon/human/new_human)
+ new_human.set_species(SYNTH_COLONY)
+
+/datum/equipment_preset/synth/survivor/cmb/ua_synth/load_gear(mob/living/carbon/human/new_human)
+ //backpack
+ new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec, WEAR_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/baton_slug, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m16, WEAR_IN_BACK)
+ //face
+ new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CMB/limited, WEAR_L_EAR)
+ new_human.equip_to_slot_or_del(new /obj/item/device/flashlight/pen, WEAR_R_EAR)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud, WEAR_EYES)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/ua_riot, WEAR_HEAD)
+ new_human.equip_to_slot_or_del(new /obj/item/prop/helmetgarb/riot_shield, WEAR_IN_HELMET)
+ //uniform
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/ua_riot, WEAR_BODY)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/holobadge/cord, WEAR_ACCESSORY)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/droppouch, WEAR_ACCESSORY)
+ new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs, WEAR_IN_ACCESSORY)
+ new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs, WEAR_IN_ACCESSORY)
+ new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs, WEAR_IN_ACCESSORY)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/box/flashbangs, WEAR_IN_ACCESSORY)
+ new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas, WEAR_IN_ACCESSORY)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/ua_riot/synth, WEAR_JACKET)
+ new_human.equip_to_slot_or_del(new /obj/item/weapon/telebaton, WEAR_IN_JACKET)
+ new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/flashbang, WEAR_IN_JACKET)
+ //belt
+ new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/full/synth, WEAR_WAIST)
+ //holding
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine, WEAR_HANDS)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots, WEAR_FEET)
+ new_human.equip_to_slot_or_del(new /obj/item/weapon/classic_baton, WEAR_R_HAND)
+ new_human.equip_to_slot_or_del(new /obj/item/weapon/shield/riot, WEAR_L_HAND)
+ //pouches
+ new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/survival/synth/full, WEAR_L_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full, WEAR_R_STORE)
diff --git a/code/modules/gear_presets/survivors/solaris/crashlanding-offices_insert_bigred.dm b/code/modules/gear_presets/survivors/solaris/crashlanding-offices_insert_bigred.dm
index 8cd72c58ad80..44d029d44c87 100644
--- a/code/modules/gear_presets/survivors/solaris/crashlanding-offices_insert_bigred.dm
+++ b/code/modules/gear_presets/survivors/solaris/crashlanding-offices_insert_bigred.dm
@@ -159,7 +159,7 @@
new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/droppouch, WEAR_ACCESSORY)
new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/scalpel/manager, WEAR_IN_ACCESSORY)
new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/drinks/flask/weylandyutani, WEAR_IN_ACCESSORY)
- new_human.equip_to_slot_or_del(new /obj/item/handcuffs/zip, WEAR_IN_ACCESSORY)
+ new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs/zip, WEAR_IN_ACCESSORY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/synth, WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/weapon/telebaton, WEAR_IN_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/nailgun, WEAR_IN_JACKET)
diff --git a/code/modules/gear_presets/synths.dm b/code/modules/gear_presets/synths.dm
index 30daac203a18..9bfa2335e94a 100644
--- a/code/modules/gear_presets/synths.dm
+++ b/code/modules/gear_presets/synths.dm
@@ -418,7 +418,7 @@
WEAR_IN_BACK = /obj/item/device/taperecorder,
WEAR_JACKET = /obj/item/clothing/suit/storage/det_suit/black,
WEAR_IN_JACKET = /obj/item/weapon/telebaton,
- WEAR_WAIST = /obj/item/storage/belt/security/MP/full,
+ WEAR_WAIST = /obj/item/storage/belt/security/MP/full/synth,
WEAR_HANDS = /obj/item/clothing/gloves/black,
WEAR_R_HAND = /obj/item/device/camera,
WEAR_FEET = /obj/item/clothing/shoes/marine/knife,
@@ -461,11 +461,11 @@
WEAR_EYES = /obj/item/clothing/glasses/sunglasses/sechud,
WEAR_BODY = /obj/item/clothing/under/colonist/white_service,
WEAR_BACK = /obj/item/storage/backpack/satchel/sec,
- WEAR_IN_BACK = /obj/item/handcuffs/zip,
- WEAR_IN_BACK = /obj/item/handcuffs/zip,
+ WEAR_IN_BACK = /obj/item/restraint/handcuffs,
+ WEAR_IN_BACK = /obj/item/restraint/handcuffs,
WEAR_JACKET = /obj/item/clothing/suit/storage/webbing,
+ WEAR_WAIST = /obj/item/storage/belt/security/MP/full/synth,
WEAR_IN_JACKET = /obj/item/weapon/telebaton,
- WEAR_WAIST = /obj/item/storage/belt/security/MP/full,
WEAR_HANDS = /obj/item/clothing/gloves/black,
WEAR_R_STORE = /obj/item/storage/pouch/tools/full,
WEAR_FEET = /obj/item/clothing/shoes/marine/knife,
@@ -800,7 +800,7 @@
new_human.equip_to_slot_or_del(new /obj/item/stack/nanopaste(new_human), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/stack/nanopaste(new_human), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar(new_human), WEAR_IN_BACK)
- new_human.equip_to_slot_or_del(new /obj/item/handcuffs/zip(new_human), WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs/zip(new_human), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/tranquilizer(new_human), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset(new_human), WEAR_L_EAR)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full(new_human), WEAR_R_STORE)
diff --git a/code/modules/gear_presets/upp.dm b/code/modules/gear_presets/upp.dm
index 324fd8b77aa6..450662ba25c3 100644
--- a/code/modules/gear_presets/upp.dm
+++ b/code/modules/gear_presets/upp.dm
@@ -2600,8 +2600,8 @@
languages = ALL_SYNTH_LANGUAGES_UPP
skills = /datum/skills/synthetic
- assignment = JOB_UPP_COMBAT_SYNTH
- rank = JOB_UPP_COMBAT_SYNTH
+ assignment = JOB_UPP_SUPPORT_SYNTH
+ rank = JOB_UPP_SUPPORT_SYNTH
paygrade = PAY_SHORT_SYN
idtype = /obj/item/card/id/dogtag
@@ -2648,14 +2648,15 @@
/datum/equipment_preset/upp/synth/load_gear(mob/living/carbon/human/new_human)
//back
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/upp, WEAR_BACK)
- new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator/compact, WEAR_IN_BACK) //1
- new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv, WEAR_IN_BACK) //2
- new_human.equip_to_slot_or_del(new /obj/item/roller, WEAR_IN_BACK) //2.33
- new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) //2.66
- new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) //3
- new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) //3.33
+ new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator/compact, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/reagent_container/blood/OMinus, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/reagent_container/blood/OMinus, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/roller/surgical, WEAR_IN_BACK)
//face
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/command, WEAR_L_EAR)
+ new_human.equip_to_slot_or_del(new /obj/item/tool/screwdriver, WEAR_R_EAR)
if(new_human.disabilities & NEARSIGHTED)
new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health/prescription(new_human), WEAR_EYES)
else
@@ -2665,25 +2666,29 @@
new_human.equip_to_slot_or_del(new hat, WEAR_HEAD)
//body
var/obj/item/clothing/under/marine/veteran/UPP/medic/UPP = new()
- var/obj/item/clothing/accessory/storage/tool_webbing/equipped/webbing = new()
+ var/obj/item/clothing/accessory/storage/surg_vest/drop_green/upp/webbing = new()
UPP.attach_accessory(new_human, webbing)
new_human.equip_to_slot_or_del(UPP, WEAR_BODY)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/support/synth, WEAR_JACKET)
+ new_human.equip_to_slot_or_del(new /obj/item/weapon/telebaton, WEAR_IN_JACKET)
+ new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs, WEAR_IN_JACKET)
+ new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs, WEAR_IN_JACKET)
+ new_human.equip_to_slot_or_del(new /obj/item/device/motiondetector/hacked, WEAR_J_STORE)
new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp, WEAR_ACCESSORY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp/naval, WEAR_ACCESSORY)
- new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/support, WEAR_JACKET)
- new_human.equip_to_slot_or_del(new /obj/item/reagent_container/glass/bottle/tricordrazine, WEAR_IN_JACKET)
//waist
- new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/upp/full, WEAR_WAIST)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/upp/synth, WEAR_WAIST)
//limbs
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp/knife, WEAR_FEET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/upp, WEAR_HANDS)
//pockets
- new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/medical/full/pills, WEAR_R_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/tactical/upp, WEAR_R_STORE)
+
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/medical, WEAR_L_STORE)
new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/surgical_line, WEAR_IN_L_STORE)
new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_L_STORE)
- new_human.equip_to_slot_or_del(new /obj/item/device/healthanalyzer, WEAR_IN_L_STORE)
- new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/tricordrazine, WEAR_IN_L_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/epinephrine, WEAR_IN_L_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/reagent_container/glass/bottle/epinephrine, WEAR_IN_L_STORE)
/datum/equipment_preset/upp/synth/get_antag_clothing_equipment()
return list(
@@ -2801,6 +2806,62 @@
list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR),
)
+
+/datum/equipment_preset/upp/synth/combat
+ name = "UPP Combat Synthetic"
+ flags = EQUIPMENT_PRESET_EXTRA
+
+ assignment = JOB_UPP_COMBAT_SYNTH
+ rank = JOB_UPP_COMBAT_SYNTH
+
+/datum/equipment_preset/upp/synth/combat/load_skills(mob/living/carbon/human/new_human)
+ . = ..()
+ new_human.allow_gun_usage = TRUE
+
+/datum/equipment_preset/upp/synth/combat/load_gear(mob/living/carbon/human/new_human)
+ //back
+ new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/upp, WEAR_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/surgical_line, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator/compact, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/reagent_container/hypospray/epinephrine, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/reagent_container/glass/bottle/epinephrine, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/reagent_container/blood/OMinus, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/roller/surgical, WEAR_IN_BACK)
+ //face
+ new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/command, WEAR_L_EAR)
+ new_human.equip_to_slot_or_del(new /obj/item/tool/screwdriver, WEAR_R_EAR)
+ if(new_human.disabilities & NEARSIGHTED)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health/prescription(new_human), WEAR_EYES)
+ else
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(new_human), WEAR_EYES)
+ //head
+ var/hat = pick(/obj/item/clothing/head/uppcap, /obj/item/clothing/head/uppcap/beret, /obj/item/clothing/head/uppcap/ushanka)
+ new_human.equip_to_slot_or_del(new hat, WEAR_HEAD)
+ //body
+ var/obj/item/clothing/under/marine/veteran/UPP/UPP = new()
+ var/obj/item/clothing/accessory/storage/surg_vest/drop_green/upp/webbing = new()
+ UPP.attach_accessory(new_human, webbing)
+ new_human.equip_to_slot_or_del(UPP, WEAR_BODY)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/support, WEAR_JACKET)
+ new_human.equip_to_slot_or_del(new /obj/item/weapon/telebaton, WEAR_IN_JACKET)
+ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/bizon, WEAR_IN_JACKET)
+ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/bizon, WEAR_IN_JACKET)
+ new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/bizon/upp, WEAR_J_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp, WEAR_ACCESSORY)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp/naval, WEAR_ACCESSORY)
+ //waist
+ new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/upp/synth, WEAR_WAIST)
+ //limbs
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp/knife, WEAR_FEET)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/upp, WEAR_HANDS)
+ //pockets
+ var/obj/item/storage/pouch/magazine/large/ppouch = new()
+ new_human.equip_to_slot_or_del(ppouch, WEAR_L_STORE)
+ for(var/i = 1 to ppouch.storage_slots)
+ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/bizon, WEAR_IN_L_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/tactical/upp, WEAR_R_STORE)
+
//*****************************************************************************************************/
/datum/equipment_preset/upp/conscript
@@ -2953,8 +3014,8 @@
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large, WEAR_R_STORE)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_L_STORE)
- new_human.equip_to_slot_or_del(new /obj/item/handcuffs, WEAR_IN_BACK)
- new_human.equip_to_slot_or_del(new /obj/item/handcuffs, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs, WEAR_IN_BACK)
spawn_weapon(/obj/item/weapon/gun/rifle/type71/carbine/commando, /obj/item/ammo_magazine/rifle/type71, new_human, 0, 8)
@@ -3082,8 +3143,8 @@
new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/explosive/C4, WEAR_L_STORE)
- new_human.equip_to_slot_or_del(new /obj/item/handcuffs, WEAR_IN_JACKET)
- new_human.equip_to_slot_or_del(new /obj/item/handcuffs, WEAR_IN_JACKET)
+ new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs, WEAR_IN_JACKET)
+ new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs, WEAR_IN_JACKET)
spawn_weapon(/obj/item/weapon/gun/rifle/type71/carbine/commando, /obj/item/ammo_magazine/rifle/type71, new_human, 0, 5)
@@ -3243,8 +3304,8 @@
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large, WEAR_R_STORE)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/explosive/C4, WEAR_L_STORE)
- new_human.equip_to_slot_or_del(new /obj/item/handcuffs, WEAR_IN_BACK)
- new_human.equip_to_slot_or_del(new /obj/item/handcuffs, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/storage/box/handcuffs, WEAR_IN_BACK)
spawn_weapon(/obj/item/weapon/gun/rifle/type71/carbine/commando, /obj/item/ammo_magazine/rifle/type71, new_human, 0, 7)
@@ -3384,8 +3445,8 @@
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large, WEAR_R_STORE)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_L_STORE)
- new_human.equip_to_slot_or_del(new /obj/item/handcuffs, WEAR_IN_BACK)
- new_human.equip_to_slot_or_del(new /obj/item/handcuffs, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs, WEAR_IN_BACK)
spawn_weapon(/obj/item/weapon/gun/rifle/type71/carbine/commando, /obj/item/ammo_magazine/rifle/type71, new_human, 0, 8)
@@ -3424,8 +3485,8 @@
new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/explosive/C4, WEAR_L_STORE)
- new_human.equip_to_slot_or_del(new /obj/item/handcuffs, WEAR_IN_JACKET)
- new_human.equip_to_slot_or_del(new /obj/item/handcuffs, WEAR_IN_JACKET)
+ new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs, WEAR_IN_JACKET)
+ new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs, WEAR_IN_JACKET)
spawn_weapon(/obj/item/weapon/gun/rifle/type71/carbine/commando, /obj/item/ammo_magazine/rifle/type71, new_human, 0, 5)
@@ -3457,8 +3518,8 @@
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large, WEAR_R_STORE)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/explosive/C4, WEAR_L_STORE)
- new_human.equip_to_slot_or_del(new /obj/item/handcuffs, WEAR_IN_BACK)
- new_human.equip_to_slot_or_del(new /obj/item/handcuffs, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/storage/box/handcuffs, WEAR_IN_BACK)
//*****************************************************************************************************/
diff --git a/code/modules/gear_presets/uscm_event.dm b/code/modules/gear_presets/uscm_event.dm
index dc6eb34161ee..eb206c8259bf 100644
--- a/code/modules/gear_presets/uscm_event.dm
+++ b/code/modules/gear_presets/uscm_event.dm
@@ -98,7 +98,7 @@
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/MP/general(new_human.back), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/device/cotablet(new_human.back), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/storage/mateba_case/general(new_human.back), WEAR_IN_BACK)
- new_human.equip_to_slot_or_del(new /obj/item/handcuffs(new_human.back), WEAR_IN_JACKET)
+ new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs(new_human.back), WEAR_IN_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/weapon/telebaton, WEAR_IN_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/device/flash, WEAR_IN_JACKET)
@@ -174,7 +174,7 @@
//TODO: preload all of those items before equipping the backpack
//Otherwise, if you spawn the spy next to other people
//they will see messages for them putting guns and explosives into their backpack...
- new_human.equip_to_slot_or_del(new /obj/item/handcuffs(new_human.back), WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs(new_human.back), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/np92/suppressed/tranq(new_human.back), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/np92/tranq(new_human.back), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/np92/tranq(new_human.back), WEAR_IN_BACK)
@@ -241,7 +241,7 @@
new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas(new_human), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas(new_human), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/device/flash(new_human), WEAR_IN_JACKET)
- new_human.equip_to_slot_or_del(new /obj/item/handcuffs(new_human), WEAR_IN_JACKET)
+ new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs(new_human), WEAR_IN_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/combat(new_human), WEAR_J_STORE)
/datum/equipment_preset/uscm_event/provost/tml
@@ -288,7 +288,7 @@
new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas(new_human), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas(new_human), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/device/flash(new_human), WEAR_IN_JACKET)
- new_human.equip_to_slot_or_del(new /obj/item/handcuffs(new_human), WEAR_IN_JACKET)
+ new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs(new_human), WEAR_IN_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/combat(new_human), WEAR_J_STORE)
/datum/equipment_preset/uscm_event/provost/inspector
@@ -329,7 +329,7 @@
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/MP/provost/light/flexi(new_human.back), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/device/flash(new_human), WEAR_IN_JACKET)
- new_human.equip_to_slot_or_del(new /obj/item/handcuffs(new_human), WEAR_IN_JACKET)
+ new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs(new_human), WEAR_IN_JACKET)
/datum/equipment_preset/uscm_event/provost/inspector/advisor
name = "Provost Advisor"
@@ -375,6 +375,7 @@
new_human.equip_to_slot_or_del(new /obj/item/device/taperecorder(new_human), WEAR_L_STORE)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/pistol/pmc_mateba(new_human), WEAR_R_STORE)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/MP/provost/marshal(new_human.back), WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/device/cotablet(new_human.back), WEAR_IN_BACK)
/datum/equipment_preset/uscm_event/provost/marshal/sector
name = "Provost Sector Marshal (MO7)"
diff --git a/code/modules/gear_presets/uscm_police.dm b/code/modules/gear_presets/uscm_police.dm
index 14e35d990348..76df4d6de2be 100644
--- a/code/modules/gear_presets/uscm_police.dm
+++ b/code/modules/gear_presets/uscm_police.dm
@@ -226,8 +226,8 @@
new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas(new_human.back), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas(new_human.back), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/custom/teargas(new_human.back), WEAR_IN_BACK)
- new_human.equip_to_slot_or_del(new /obj/item/handcuffs(new_human.back), WEAR_IN_BACK)
- new_human.equip_to_slot_or_del(new /obj/item/handcuffs(new_human.back), WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs(new_human.back), WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs(new_human.back), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/large/beanbag/riot(new_human), WEAR_L_STORE)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/large/beanbag/riot(new_human), WEAR_R_STORE)
if(new_human.disabilities & NEARSIGHTED)
diff --git a/code/modules/gear_presets/wy_goons.dm b/code/modules/gear_presets/wy_goons.dm
index a8f3a443311e..9207b9d55a2d 100644
--- a/code/modules/gear_presets/wy_goons.dm
+++ b/code/modules/gear_presets/wy_goons.dm
@@ -62,7 +62,7 @@
assignment = JOB_WY_GOON
rank = JOB_WY_GOON
paygrade = PAY_SHORT_CPO
- skills = /datum/skills/MP
+ skills = /datum/skills/wy_goon
/datum/equipment_preset/goon/standard/load_gear(mob/living/carbon/human/new_human)
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY, WEAR_L_EAR)
@@ -74,9 +74,9 @@
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/weapon/baton, WEAR_IN_BACK)
- new_human.equip_to_slot_or_del(new /obj/item/handcuffs/zip, WEAR_IN_BACK)
- new_human.equip_to_slot_or_del(new /obj/item/handcuffs/zip, WEAR_IN_BACK)
- new_human.equip_to_slot_or_del(new /obj/item/handcuffs/zip, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs/zip, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs/zip, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs/zip, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/mod88, WEAR_WAIST)
@@ -88,6 +88,40 @@
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, WEAR_IN_BACK)
+/datum/equipment_preset/goon/engineer
+ name = "Weyland-Yutani Corporate Security Technician (Goon Engineer)"
+ flags = EQUIPMENT_PRESET_EXTRA
+
+ assignment = JOB_WY_GOON_TECH
+ rank = JOB_WY_GOON_TECH
+ paygrade = PAY_SHORT_CPO
+ skills = /datum/skills/wy_goon_tech
+
+/datum/equipment_preset/goon/engineer/load_gear(mob/living/carbon/human/new_human)
+ new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY, WEAR_L_EAR)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc/corporate, WEAR_BODY)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/corporate, WEAR_JACKET)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/corporate, WEAR_HEAD)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding, WEAR_EYES)
+ new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate, WEAR_FEET)
+
+ new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/engineerpack/ert, WEAR_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/weapon/baton, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle, WEAR_IN_BACK)
+
+ new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full, WEAR_WAIST)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_R_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full, WEAR_L_STORE)
+
+ new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41a/corporate, WEAR_J_STORE)
+ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, WEAR_IN_JACKET)
+ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, WEAR_IN_JACKET)
+
+
/datum/equipment_preset/goon/lead
name = "Weyland-Yutani Corporate Security Lead (Goon Lead)"
flags = EQUIPMENT_PRESET_EXTRA
@@ -95,7 +129,7 @@
assignment = JOB_WY_GOON_LEAD
rank = JOB_WY_GOON_LEAD
paygrade = PAY_SHORT_CSPO
- skills = /datum/skills/MP
+ skills = /datum/skills/wy_goon_lead
/datum/equipment_preset/goon/lead/New()
. = ..()
@@ -111,9 +145,9 @@
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/weapon/baton, WEAR_IN_BACK)
- new_human.equip_to_slot_or_del(new /obj/item/handcuffs/zip, WEAR_IN_BACK)
- new_human.equip_to_slot_or_del(new /obj/item/handcuffs/zip, WEAR_IN_BACK)
- new_human.equip_to_slot_or_del(new /obj/item/handcuffs/zip, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs/zip, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs/zip, WEAR_IN_BACK)
+ new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs/zip, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/mod88, WEAR_WAIST)
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index 4f9493cfdf49..d13d5aa94053 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -37,6 +37,7 @@
/// If the observer is an admin, are they excluded from the xeno queue?
var/admin_larva_protection = TRUE // Enabled by default
var/ghostvision = TRUE
+ var/self_visibility = TRUE
var/can_reenter_corpse
var/started_as_observer //This variable is set to 1 when you enter the game as an observer.
//If you died in the game and are a ghost - this will remain as null.
@@ -71,10 +72,10 @@
set desc = "Toggles your ability to see things only ghosts can see, like other ghosts"
set category = "Ghost.Settings"
ghostvision = !ghostvision
- if(hud_used)
- var/atom/movable/screen/plane_master/lighting/lighting = hud_used.plane_masters["[GHOST_PLANE]"]
- if (lighting)
- lighting.alpha = ghostvision? 255 : 0
+ if(ghostvision)
+ see_invisible = INVISIBILITY_OBSERVER
+ else
+ see_invisible = HIDE_INVISIBLE_OBSERVER
to_chat(usr, SPAN_NOTICE("You [(ghostvision?"now":"no longer")] have ghost vision."))
/mob/dead/observer/Initialize(mapload, mob/body)
@@ -845,11 +846,12 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
/mob/dead/observer/verb/toggle_self_visibility()
set name = "Toggle Self Visibility"
set category = "Ghost.Settings"
-
- if (alpha)
- alpha = 0
- else
+ self_visibility = !self_visibility
+ if (self_visibility)
alpha = initial(alpha)
+ else
+ alpha = 0
+ to_chat(usr, SPAN_NOTICE("You are now [(self_visibility?"visible":"invisible")]."))
/mob/dead/observer/verb/view_manifest()
set name = "View Crew Manifest"
@@ -1189,7 +1191,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
if(!SSticker.HasRoundStarted())
var/time_remaining = SSticker.GetTimeLeft()
if(time_remaining > 0)
- . += "Time To Start: [round(time_remaining)]s"
+ . += "Time To Start: [round(time_remaining)]s[SSticker.delay_start ? " (DELAYED)" : ""]"
else if(time_remaining == -10)
. += "Time To Start: DELAYED"
else
diff --git a/code/modules/mob/dead/observer/orbit.dm b/code/modules/mob/dead/observer/orbit.dm
index 173de5338196..d6b104398f99 100644
--- a/code/modules/mob/dead/observer/orbit.dm
+++ b/code/modules/mob/dead/observer/orbit.dm
@@ -110,7 +110,7 @@
if(isliving(M))
var/mob/living/player = M
- serialized["health"] = Floor(player.health / player.maxHealth * 100)
+ serialized["health"] = floor(player.health / player.maxHealth * 100)
if(isxeno(player))
var/mob/living/carbon/xenomorph/xeno = player
@@ -126,7 +126,7 @@
var/obj/item/card/id/id_card = human.get_idcard()
var/datum/species/human_species = human.species
var/max_health = human_species.total_health != human.maxHealth ? human_species.total_health : human.maxHealth
- serialized["health"] = Floor(player.health / max_health * 100)
+ serialized["health"] = floor(player.health / max_health * 100)
serialized["job"] = id_card?.assignment ? id_card.assignment : human.job
serialized["nickname"] = human.real_name
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 08daa5348022..2a197dadc2b1 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -399,23 +399,6 @@
bodytemperature = max(bodytemperature, BODYTEMP_HEAT_DAMAGE_LIMIT+10)
recalculate_move_delay = TRUE
-
-/mob/living/carbon/show_inv(mob/living/carbon/user as mob)
- user.set_interaction(src)
- var/dat = {"
-
[name]
-
-
Head(Mask): [(wear_mask ? wear_mask : "Nothing")]
-
Left Hand: [(l_hand ? l_hand : "Nothing")]
-
Right Hand: [(r_hand ? r_hand : "Nothing")]
-
Back: [(back ? back : "Nothing")] [((istype(wear_mask, /obj/item/clothing/mask) && istype(back, /obj/item/tank) && !( internal )) ? " Set Internal" : "")]
-
[(handcuffed ? "Handcuffed" : "Not Handcuffed")]
-
[(internal ? "Remove Internal" : "")]
-
Refresh
-
Close
-
"}
- show_browser(user, dat, name, "mob[name]")
-
/**
* Called by [/mob/dead/observer/proc/do_observe] when a carbon mob is observed by a ghost with [/datum/preferences/var/auto_observe] enabled.
*
diff --git a/code/modules/mob/living/carbon/carbon_defines.dm b/code/modules/mob/living/carbon/carbon_defines.dm
index 6ff2a96b72f0..03a8abef22af 100644
--- a/code/modules/mob/living/carbon/carbon_defines.dm
+++ b/code/modules/mob/living/carbon/carbon_defines.dm
@@ -5,7 +5,7 @@
var/life_tick = 0 // The amount of life ticks that have processed on this mob.
- var/obj/item/handcuffs/handcuffed = null //Whether or not the mob is handcuffed
+ var/obj/item/restraint/handcuffs/handcuffed = null //Whether or not the mob is handcuffed
var/overeat_cooldown = 0
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 0f52b75106a5..bc7d11c25e1f 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -13,7 +13,7 @@
create_reagents(1000)
if(!real_name || !name)
change_real_name(src, "unknown")
-
+ AddElement(/datum/element/strippable, GLOB.strippable_human_items, TYPE_PROC_REF(/mob/living/carbon/human, should_strip))
. = ..()
prev_gender = gender // Debug for plural genders
@@ -272,45 +272,6 @@
-/mob/living/carbon/human/show_inv(mob/living/user)
- var/obj/item/clothing/under/suit = null
- if(istype(w_uniform, /obj/item/clothing/under))
- suit = w_uniform
-
- user.set_interaction(src)
- var/dat = {"
-
[name]
-
-
(Exo)Suit: [(wear_suit ? wear_suit : "Nothing")]
-
Suit Storage: [(s_store ? s_store : "Nothing")] [((istype(wear_mask, /obj/item/clothing/mask) && istype(s_store, /obj/item/tank) && !( internal )) ? " Set Internal" : "")]
-
Back: [(back ? back : "Nothing")] [((istype(wear_mask, /obj/item/clothing/mask) && istype(back, /obj/item/tank) && !( internal )) ? " Set Internal" : "")]
-
Head(Mask): [(wear_mask ? wear_mask : "Nothing")]
-
Left Hand: [(l_hand ? l_hand : "Nothing")]
-
Right Hand: [(r_hand ? r_hand : "Nothing")]
-
Gloves: [(gloves ? gloves : "Nothing")]
-
Eyes: [(glasses ? glasses : "Nothing")]
-
Left Ear: [(wear_l_ear ? wear_l_ear : "Nothing")]
-
Right Ear: [(wear_r_ear ? wear_r_ear : "Nothing")]
-
Head: [(head ? head : "Nothing")]
-
Shoes: [(shoes ? shoes : "Nothing")]
-
Belt: [(belt ? belt : "Nothing")] [((istype(wear_mask, /obj/item/clothing/mask) && istype(belt, /obj/item/tank) && !internal) ? " Set Internal" : "")]
-
Uniform: [(w_uniform ? w_uniform : "Nothing")] [(suit) ? ((suit.has_sensor == UNIFORM_HAS_SENSORS) ? " Sensors" : "") : null]
-
ID: [(wear_id ? wear_id : "Nothing")]
-
Left Pocket: [(l_store ? l_store : "Nothing")]
-
Right Pocket: [(r_store ? r_store : "Nothing")]
-
- [handcuffed ? "
Handcuffed" : ""]
- [legcuffed ? "
Legcuffed" : ""]
- [suit && LAZYLEN(suit.accessories) ? "
Remove Accessory" : ""]
- [internal ? "
Remove Internal" : ""]
- [istype(wear_id, /obj/item/card/id/dogtag) ? "
Retrieve Info Tag" : ""]
-
Remove Splints
-
-
Refresh
-
Close
-
"}
- show_browser(user, dat, name, "mob[name]")
-
/**
* Handles any storage containers that the human is looking inside when auto-observed.
*/
@@ -426,9 +387,6 @@
/mob/living/carbon/human/Topic(href, href_list)
- if(href_list["refresh"])
- if(interactee&&(in_range(src, usr)))
- show_inv(interactee)
if(href_list["mach_close"])
var/t1 = text("window=[]", href_list["mach_close"])
@@ -473,76 +431,6 @@
what = usr.get_active_hand()
usr.stripPanelEquip(what,src,slot)
- if(href_list["internal"])
-
- if(!usr.action_busy && !usr.is_mob_incapacitated() && Adjacent(usr))
- attack_log += text("\[[time_stamp()]\] Has had their internals toggled by [key_name(usr)]")
- usr.attack_log += text("\[[time_stamp()]\] Attempted to toggle [key_name(src)]'s' internals")
- if(internal)
- usr.visible_message(SPAN_DANGER("[usr] is trying to disable [src]'s internals"), null, null, 3)
- else
- usr.visible_message(SPAN_DANGER("[usr] is trying to enable [src]'s internals."), null, null, 3)
-
- if(do_after(usr, POCKET_STRIP_DELAY, INTERRUPT_ALL, BUSY_ICON_GENERIC, src, INTERRUPT_MOVED, BUSY_ICON_GENERIC))
- if(internal)
- internal.add_fingerprint(usr)
- internal = null
- visible_message("[src] is no longer running on internals.", null, null, 1)
- else
- if(istype(wear_mask, /obj/item/clothing/mask))
- if(istype(back, /obj/item/tank))
- internal = back
- else if(istype(s_store, /obj/item/tank))
- internal = s_store
- else if(istype(belt, /obj/item/tank))
- internal = belt
- if(internal)
- visible_message(SPAN_NOTICE("[src] is now running on internals."), null, null, 1)
- internal.add_fingerprint(usr)
-
- // Update strip window
- if(usr.interactee == src && Adjacent(usr))
- show_inv(usr)
-
-
- if(href_list["splints"])
- if(!usr.action_busy && !usr.is_mob_incapacitated() && Adjacent(usr))
- if(MODE_HAS_TOGGLEABLE_FLAG(MODE_NO_STRIPDRAG_ENEMY) && (stat == DEAD || health < HEALTH_THRESHOLD_CRIT) && !get_target_lock(usr.faction_group))
- to_chat(usr, SPAN_WARNING("You can't strip a crit or dead member of another faction!"))
- return
- attack_log += text("\[[time_stamp()]\] Has had their splints removed by [key_name(usr)]")
- usr.attack_log += text("\[[time_stamp()]\] Attempted to remove [key_name(src)]'s' splints ")
- remove_splints(usr)
-
- if(href_list["tie"])
- if(!usr.action_busy && !usr.is_mob_incapacitated() && Adjacent(usr))
- if(MODE_HAS_TOGGLEABLE_FLAG(MODE_NO_STRIPDRAG_ENEMY) && (stat == DEAD || health < HEALTH_THRESHOLD_CRIT) && !get_target_lock(usr.faction_group))
- to_chat(usr, SPAN_WARNING("You can't strip a crit or dead member of another faction!"))
- return
- if(w_uniform && istype(w_uniform, /obj/item/clothing))
- var/obj/item/clothing/under/U = w_uniform
- if(!LAZYLEN(U.accessories))
- return FALSE
- var/obj/item/clothing/accessory/A = LAZYACCESS(U.accessories, 1)
- if(LAZYLEN(U.accessories) > 1)
- A = tgui_input_list(usr, "Select an accessory to remove from [U]", "Remove accessory", U.accessories)
- if(!istype(A))
- return
- attack_log += text("\[[time_stamp()]\] Has had their accessory ([A]) removed by [key_name(usr)]")
- usr.attack_log += text("\[[time_stamp()]\] Attempted to remove [key_name(src)]'s' accessory ([A])")
- if(istype(A, /obj/item/clothing/accessory/holobadge) || istype(A, /obj/item/clothing/accessory/medal))
- visible_message(SPAN_DANGER("[usr] tears off \the [A] from [src]'s [U]!"), null, null, 5)
- if(U == w_uniform)
- U.remove_accessory(usr, A)
- else
- if(HAS_TRAIT(src, TRAIT_UNSTRIPPABLE) && !is_mob_incapacitated()) //Can't strip the unstrippable!
- to_chat(usr, SPAN_DANGER("[src] has an unbreakable grip on their equipment!"))
- return
- visible_message(SPAN_DANGER("[usr] is trying to take off \a [A] from [src]'s [U]!"), null, null, 5)
- if(do_after(usr, get_strip_delay(usr, src), INTERRUPT_ALL, BUSY_ICON_GENERIC, src, INTERRUPT_MOVED, BUSY_ICON_GENERIC))
- if(U == w_uniform)
- U.remove_accessory(usr, A)
-
if(href_list["sensor"])
if(!usr.action_busy && !usr.is_mob_incapacitated() && Adjacent(usr))
if(MODE_HAS_TOGGLEABLE_FLAG(MODE_NO_STRIPDRAG_ENEMY) && (stat == DEAD || health < HEALTH_THRESHOLD_CRIT) && !get_target_lock(usr.faction_group))
@@ -1799,3 +1687,11 @@
INVOKE_ASYNC(target, TYPE_PROC_REF(/mob/living/carbon/human, regenerate_icons))
INVOKE_ASYNC(target, TYPE_PROC_REF(/mob/living/carbon/human, update_body), 1, 0)
INVOKE_ASYNC(target, TYPE_PROC_REF(/mob/living/carbon/human, update_hair))
+
+/mob/living/carbon/human/point_to_atom(atom/A, turf/T)
+ if(isitem(A))
+ var/obj/item/item = A
+ if(item == get_active_hand() || item == get_inactive_hand())
+ item.showoff(src)
+ return TRUE
+ return ..()
diff --git a/code/modules/mob/living/carbon/human/human_abilities.dm b/code/modules/mob/living/carbon/human/human_abilities.dm
index a568e93df5c0..76ebbed06de6 100644
--- a/code/modules/mob/living/carbon/human/human_abilities.dm
+++ b/code/modules/mob/living/carbon/human/human_abilities.dm
@@ -250,7 +250,7 @@ CULT
to_send_to = list(H)
message_admins("[key_name_admin(H)] called a tech droppod down at [get_area(assigned_droppod)].", T.x, T.y, T.z)
for(var/M in to_send_to)
- to_chat(M, SPAN_BLUE("SUPPLY DROP REQUEST: Droppod requested at LONGITUDE: [obfuscate_x(T.x)], LATITUDE: [obfuscate_y(T.y)]. ETA [Floor(land_time*0.1)] seconds."))
+ to_chat(M, SPAN_BLUE("SUPPLY DROP REQUEST: Droppod requested at LONGITUDE: [obfuscate_x(T.x)], LATITUDE: [obfuscate_y(T.y)]. ETA [floor(land_time*0.1)] seconds."))
RegisterSignal(assigned_droppod, COMSIG_PARENT_QDELETING, PROC_REF(handle_droppod_deleted))
*/
@@ -605,3 +605,26 @@ CULT
var/mob/living/carbon/human/human_user = owner
SEND_SIGNAL(human_user, COMSIG_MOB_MG_EXIT)
+
+/datum/action/human_action/toggle_arc_antenna
+ name = "Toggle Sensor Antenna"
+ action_icon_state = "recoil_compensation"
+
+/datum/action/human_action/toggle_arc_antenna/give_to(mob/user)
+ . = ..()
+ RegisterSignal(user, COMSIG_MOB_RESET_VIEW, PROC_REF(remove_from))
+
+/datum/action/human_action/toggle_arc_antenna/remove_from(mob/user)
+ . = ..()
+ UnregisterSignal(user, COMSIG_MOB_RESET_VIEW)
+
+/datum/action/human_action/toggle_arc_antenna/action_activate()
+ if(!can_use_action())
+ return
+
+ var/mob/living/carbon/human/human_user = owner
+ if(istype(human_user.buckled, /obj/structure/bed/chair/comfy/vehicle))
+ var/obj/structure/bed/chair/comfy/vehicle/vehicle_chair = human_user.buckled
+ if(istype(vehicle_chair.vehicle, /obj/vehicle/multitile/arc))
+ var/obj/vehicle/multitile/arc/vehicle = vehicle_chair.vehicle
+ vehicle.toggle_antenna(human_user)
diff --git a/code/modules/mob/living/carbon/human/human_stripping.dm b/code/modules/mob/living/carbon/human/human_stripping.dm
new file mode 100644
index 000000000000..e346a0a7368b
--- /dev/null
+++ b/code/modules/mob/living/carbon/human/human_stripping.dm
@@ -0,0 +1,272 @@
+GLOBAL_LIST_INIT(strippable_human_items, create_strippable_list(list(
+ /datum/strippable_item/mob_item_slot/head,
+ /datum/strippable_item/mob_item_slot/back,
+ /datum/strippable_item/mob_item_slot/mask,
+ /datum/strippable_item/mob_item_slot/eyes,
+ /datum/strippable_item/mob_item_slot/r_ear,
+ /datum/strippable_item/mob_item_slot/l_ear,
+ /datum/strippable_item/mob_item_slot/jumpsuit,
+ /datum/strippable_item/mob_item_slot/suit,
+ /datum/strippable_item/mob_item_slot/gloves,
+ /datum/strippable_item/mob_item_slot/feet,
+ /datum/strippable_item/mob_item_slot/suit_storage,
+ /datum/strippable_item/mob_item_slot/id,
+ /datum/strippable_item/mob_item_slot/belt,
+ /datum/strippable_item/mob_item_slot/pocket/left,
+ /datum/strippable_item/mob_item_slot/pocket/right,
+ /datum/strippable_item/mob_item_slot/hand/left,
+ /datum/strippable_item/mob_item_slot/hand/right,
+ /datum/strippable_item/mob_item_slot/cuffs/handcuffs,
+ /datum/strippable_item/mob_item_slot/cuffs/legcuffs,
+)))
+
+/mob/living/carbon/human/proc/should_strip(mob/user)
+ if (user.pulling == src && user.grab_level == GRAB_AGGRESSIVE && (user.a_intent & INTENT_GRAB))
+ return FALSE //to not interfere with fireman carry
+ return TRUE
+
+/datum/strippable_item/mob_item_slot/head
+ key = STRIPPABLE_ITEM_HEAD
+ item_slot = SLOT_HEAD
+
+/datum/strippable_item/mob_item_slot/back
+ key = STRIPPABLE_ITEM_BACK
+ item_slot = SLOT_BACK
+
+/datum/strippable_item/mob_item_slot/mask
+ key = STRIPPABLE_ITEM_MASK
+ item_slot = SLOT_FACE
+
+/datum/strippable_item/mob_item_slot/mask/get_alternate_action(atom/source, mob/user)
+ var/obj/item/clothing/mask = get_item(source)
+ if (!istype(mask))
+ return
+ if (!ishuman(source))
+ return
+ var/mob/living/carbon/human/sourcehuman = source
+ if (istype(sourcehuman.s_store, /obj/item/tank))
+ return "toggle_internals"
+ if (istype(sourcehuman.back, /obj/item/tank))
+ return "toggle_internals"
+ if (istype(sourcehuman.belt, /obj/item/tank))
+ return "toggle_internals"
+ return
+
+/datum/strippable_item/mob_item_slot/mask/alternate_action(atom/source, mob/user)
+ if(!ishuman(source))
+ return
+ var/mob/living/carbon/human/sourcehuman = source
+ if(user.action_busy || user.is_mob_incapacitated() || !source.Adjacent(user))
+ return
+ if(MODE_HAS_TOGGLEABLE_FLAG(MODE_NO_STRIPDRAG_ENEMY) && (sourcehuman.stat == DEAD || sourcehuman.health < HEALTH_THRESHOLD_CRIT) && !sourcehuman.get_target_lock(user.faction_group))
+ to_chat(user, SPAN_WARNING("You can't toggle internals of a crit or dead member of another faction!"))
+ return
+
+ sourcehuman.attack_log += text("\[[time_stamp()]\] Has had their internals toggled by [key_name(user)]")
+ user.attack_log += text("\[[time_stamp()]\] Attempted to toggle [key_name(src)]'s' internals")
+ if(sourcehuman.internal)
+ user.visible_message(SPAN_DANGER("[user] is trying to disable [sourcehuman]'s internals"), null, null, 3)
+ else
+ user.visible_message(SPAN_DANGER("[user] is trying to enable [sourcehuman]'s internals."), null, null, 3)
+
+ if(!do_after(user, POCKET_STRIP_DELAY, INTERRUPT_ALL, BUSY_ICON_GENERIC, sourcehuman, INTERRUPT_MOVED, BUSY_ICON_GENERIC))
+ return
+
+ if(sourcehuman.internal)
+ sourcehuman.internal.add_fingerprint(user)
+ sourcehuman.internal = null
+ sourcehuman.visible_message("[sourcehuman] is no longer running on internals.", max_distance = 1)
+ return
+
+ if(!istype(sourcehuman.wear_mask, /obj/item/clothing/mask))
+ return
+
+ if(istype(sourcehuman.back, /obj/item/tank))
+ sourcehuman.internal = sourcehuman.back
+ else if(istype(sourcehuman.s_store, /obj/item/tank))
+ sourcehuman.internal = sourcehuman.s_store
+ else if(istype(sourcehuman.belt, /obj/item/tank))
+ sourcehuman.internal = sourcehuman.belt
+
+ if(!sourcehuman.internal)
+ return
+
+ sourcehuman.visible_message(SPAN_NOTICE("[sourcehuman] is now running on internals."), max_distance = 1)
+ sourcehuman.internal.add_fingerprint(user)
+
+/datum/strippable_item/mob_item_slot/eyes
+ key = STRIPPABLE_ITEM_EYES
+ item_slot = SLOT_EYES
+
+/datum/strippable_item/mob_item_slot/r_ear
+ key = STRIPPABLE_ITEM_R_EAR
+ item_slot = SLOT_EAR
+
+/datum/strippable_item/mob_item_slot/l_ear
+ key = STRIPPABLE_ITEM_L_EAR
+ item_slot = SLOT_EAR
+
+/datum/strippable_item/mob_item_slot/jumpsuit
+ key = STRIPPABLE_ITEM_JUMPSUIT
+ item_slot = SLOT_ICLOTHING
+
+/datum/strippable_item/mob_item_slot/jumpsuit/get_alternate_action(atom/source, mob/user)
+ var/obj/item/clothing/under/uniform = get_item(source)
+ if (!istype(uniform))
+ return null
+ return uniform?.accessories ? "remove_accessory" : null
+
+/datum/strippable_item/mob_item_slot/jumpsuit/alternate_action(atom/source, mob/user)
+ if(!ishuman(source))
+ return
+ var/mob/living/carbon/human/sourcemob = source
+ if(user.action_busy || user.is_mob_incapacitated() || !source.Adjacent(user))
+ return
+ if(MODE_HAS_TOGGLEABLE_FLAG(MODE_NO_STRIPDRAG_ENEMY) && (sourcemob.stat == DEAD || sourcemob.health < HEALTH_THRESHOLD_CRIT) && !sourcemob.get_target_lock(user.faction_group))
+ to_chat(user, SPAN_WARNING("You can't strip a crit or dead member of another faction!"))
+ return
+ if(!sourcemob.w_uniform || !istype(sourcemob.w_uniform, /obj/item/clothing))
+ return
+
+ var/obj/item/clothing/under/uniform = sourcemob.w_uniform
+ if(!LAZYLEN(uniform.accessories))
+ return FALSE
+ var/obj/item/clothing/accessory/accessory = LAZYACCESS(uniform.accessories, 1)
+ if(LAZYLEN(uniform.accessories) > 1)
+ accessory = tgui_input_list(user, "Select an accessory to remove from [uniform]", "Remove accessory", uniform.accessories)
+ if(!istype(accessory))
+ return
+ sourcemob.attack_log += text("\[[time_stamp()]\] Has had their accessory ([accessory]) removed by [key_name(user)]")
+ user.attack_log += text("\[[time_stamp()]\] Attempted to remove [key_name(sourcemob)]'s' accessory ([accessory])")
+ if(istype(accessory, /obj/item/clothing/accessory/holobadge) || istype(accessory, /obj/item/clothing/accessory/medal))
+ sourcemob.visible_message(SPAN_DANGER("[user] tears off [accessory] from [sourcemob]'s [uniform]!"), null, null, 5)
+ if(uniform == sourcemob.w_uniform)
+ uniform.remove_accessory(user, accessory)
+ return
+
+ if(HAS_TRAIT(sourcemob, TRAIT_UNSTRIPPABLE) && !sourcemob.is_mob_incapacitated()) //Can't strip the unstrippable!
+ to_chat(user, SPAN_DANGER("[sourcemob] has an unbreakable grip on their equipment!"))
+ return
+ sourcemob.visible_message(SPAN_DANGER("[user] is trying to take off \a [accessory] from [source]'s [uniform]!"), null, null, 5)
+
+ if(!do_after(user, sourcemob.get_strip_delay(user, sourcemob), INTERRUPT_ALL, BUSY_ICON_GENERIC, sourcemob, INTERRUPT_MOVED, BUSY_ICON_GENERIC))
+ return
+
+ if(uniform != sourcemob.w_uniform)
+ return
+
+ uniform.remove_accessory(user, accessory)
+
+/datum/strippable_item/mob_item_slot/suit
+ key = STRIPPABLE_ITEM_SUIT
+ item_slot = SLOT_OCLOTHING
+
+/datum/strippable_item/mob_item_slot/suit/has_no_item_alt_action()
+ return TRUE
+
+/datum/strippable_item/mob_item_slot/suit/get_alternate_action(atom/source, mob/user)
+ if(!ishuman(source))
+ return
+ var/mob/living/carbon/human/sourcemob = source
+ for(var/bodypart in list("l_leg","r_leg","l_arm","r_arm","r_hand","l_hand","r_foot","l_foot","chest","head","groin"))
+ var/obj/limb/limb = sourcemob.get_limb(bodypart)
+ if(limb && (limb.status & LIMB_SPLINTED))
+ return "remove_splints"
+ return
+
+/datum/strippable_item/mob_item_slot/suit/alternate_action(atom/source, mob/user)
+ if(!ishuman(source))
+ return
+ var/mob/living/carbon/human/sourcemob = source
+ if(user.action_busy || user.is_mob_incapacitated() || !source.Adjacent(user))
+ return
+ if(MODE_HAS_TOGGLEABLE_FLAG(MODE_NO_STRIPDRAG_ENEMY) && (sourcemob.stat == DEAD || sourcemob.health < HEALTH_THRESHOLD_CRIT) && !sourcemob.get_target_lock(user.faction_group))
+ to_chat(user, SPAN_WARNING("You can't remove splints of a crit or dead member of another faction!"))
+ return
+ sourcemob.attack_log += text("\[[time_stamp()]\] Has had their splints removed by [key_name(user)]")
+ user.attack_log += text("\[[time_stamp()]\] Attempted to remove [key_name(sourcemob)]'s' splints ")
+ sourcemob.remove_splints(user)
+
+/datum/strippable_item/mob_item_slot/gloves
+ key = STRIPPABLE_ITEM_GLOVES
+ item_slot = SLOT_HANDS
+
+/datum/strippable_item/mob_item_slot/feet
+ key = STRIPPABLE_ITEM_FEET
+ item_slot = SLOT_FEET
+
+/datum/strippable_item/mob_item_slot/suit_storage
+ key = STRIPPABLE_ITEM_SUIT_STORAGE
+ item_slot = SLOT_SUIT_STORE
+
+/datum/strippable_item/mob_item_slot/id
+ key = STRIPPABLE_ITEM_ID
+ item_slot = SLOT_ID
+
+/datum/strippable_item/mob_item_slot/id/get_alternate_action(atom/source, mob/user)
+ var/obj/item/card/id/dogtag/tag = get_item(source)
+ if(!ishuman(source))
+ return
+ var/mob/living/carbon/human/sourcemob = source
+ if (!istype(tag))
+ return
+ if (!sourcemob.undefibbable && (!skillcheck(user, SKILL_POLICE, SKILL_POLICE_SKILLED) || sourcemob.stat != DEAD))
+ return
+ return tag.dogtag_taken ? null : "retrieve_tag"
+
+/datum/strippable_item/mob_item_slot/id/alternate_action(atom/source, mob/user)
+ if(!ishuman(source))
+ return
+ var/mob/living/carbon/human/sourcemob = source
+ if(user.action_busy || user.is_mob_incapacitated() || !source.Adjacent(user))
+ return
+ if(MODE_HAS_TOGGLEABLE_FLAG(MODE_NO_STRIPDRAG_ENEMY) && (sourcemob.stat == DEAD || sourcemob.health < HEALTH_THRESHOLD_CRIT) && !sourcemob.get_target_lock(user.faction_group))
+ to_chat(user, SPAN_WARNING("You can't strip a crit or dead member of another faction!"))
+ return
+ if(!istype(sourcemob.wear_id, /obj/item/card/id/dogtag))
+ return
+ if (!sourcemob.undefibbable && !skillcheck(user, SKILL_POLICE, SKILL_POLICE_SKILLED))
+ return
+ var/obj/item/card/id/dogtag/tag = sourcemob.wear_id
+ if(tag.dogtag_taken)
+ to_chat(user, SPAN_WARNING("Someone's already taken [sourcemob]'s information tag."))
+ return
+
+ if(sourcemob.stat != DEAD)
+ to_chat(user, SPAN_WARNING("You can't take a dogtag's information tag while its owner is alive."))
+ return
+
+ to_chat(user, SPAN_NOTICE("You take [sourcemob]'s information tag, leaving the ID tag"))
+ tag.dogtag_taken = TRUE
+ tag.icon_state = "dogtag_taken"
+ var/obj/item/dogtag/newtag = new(sourcemob.loc)
+ newtag.fallen_names = list(tag.registered_name)
+ newtag.fallen_assgns = list(tag.assignment)
+ newtag.fallen_blood_types = list(tag.blood_type)
+ user.put_in_hands(newtag)
+
+
+
+/datum/strippable_item/mob_item_slot/belt
+ key = STRIPPABLE_ITEM_BELT
+ item_slot = SLOT_WAIST
+
+/datum/strippable_item/mob_item_slot/pocket/left
+ key = STRIPPABLE_ITEM_LPOCKET
+ item_slot = SLOT_STORE
+
+/datum/strippable_item/mob_item_slot/pocket/right
+ key = STRIPPABLE_ITEM_RPOCKET
+ item_slot = SLOT_STORE
+
+/datum/strippable_item/mob_item_slot/hand/left
+ key = STRIPPABLE_ITEM_LHAND
+
+/datum/strippable_item/mob_item_slot/hand/right
+ key = STRIPPABLE_ITEM_RHAND
+
+/datum/strippable_item/mob_item_slot/cuffs/handcuffs
+ key = STRIPPABLE_ITEM_HANDCUFFS
+
+/datum/strippable_item/mob_item_slot/cuffs/legcuffs
+ key = STRIPPABLE_ITEM_LEGCUFFS
diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm
index 7e6bd4231171..3f419333d218 100644
--- a/code/modules/mob/living/carbon/human/inventory.dm
+++ b/code/modules/mob/living/carbon/human/inventory.dm
@@ -504,72 +504,6 @@
/// Final result is overall delay * speed multiplier
return target_delay * user_speed
-/mob/living/carbon/human/stripPanelUnequip(obj/item/interact_item, mob/target_mob, slot_to_process)
- if(HAS_TRAIT(target_mob, TRAIT_UNSTRIPPABLE) && !target_mob.is_mob_incapacitated()) //Can't strip the unstrippable!
- to_chat(src, SPAN_DANGER("[target_mob] has an unbreakable grip on their equipment!"))
- return
- if(interact_item.flags_item & ITEM_ABSTRACT)
- return
- if(interact_item.flags_item & NODROP)
- to_chat(src, SPAN_WARNING("You can't remove \the [interact_item.name], it appears to be stuck!"))
- return
- if(interact_item.flags_inventory & CANTSTRIP)
- to_chat(src, SPAN_WARNING("You're having difficulty removing \the [interact_item.name]."))
- return
- target_mob.attack_log += "\[[time_stamp()]\] Has had their [interact_item.name] ([slot_to_process]) attempted to be removed by [key_name(src)]"
- attack_log += "\[[time_stamp()]\] Attempted to remove [key_name(target_mob)]'s [interact_item.name] ([slot_to_process])"
- log_interact(src, target_mob, "[key_name(src)] tried to remove [key_name(target_mob)]'s [interact_item.name] ([slot_to_process]).")
-
- src.visible_message(SPAN_DANGER("[src] tries to remove [target_mob]'s [interact_item.name]."), \
- SPAN_DANGER("You are trying to remove [target_mob]'s [interact_item.name]."), null, 5)
- interact_item.add_fingerprint(src)
- if(do_after(src, get_strip_delay(src, target_mob), INTERRUPT_ALL, BUSY_ICON_GENERIC, target_mob, INTERRUPT_MOVED, BUSY_ICON_GENERIC))
- if(interact_item && Adjacent(target_mob) && interact_item == target_mob.get_item_by_slot(slot_to_process))
- if(interact_item.light_on)
- interact_item.turn_light(toggle_on = FALSE)
- target_mob.drop_inv_item_on_ground(interact_item)
- log_interact(src, target_mob, "[key_name(src)] removed [key_name(target_mob)]'s [interact_item.name] ([slot_to_process]) successfully.")
-
- if(target_mob)
- if(interactee == target_mob && Adjacent(target_mob))
- target_mob.show_inv(src)
-
-
-/mob/living/carbon/human/stripPanelEquip(obj/item/interact_item, mob/target_mob, slot_to_process)
- if(HAS_TRAIT(target_mob, TRAIT_UNSTRIPPABLE) && !target_mob.is_mob_incapacitated())
- to_chat(src, SPAN_DANGER("[target_mob] is too strong to force [interact_item.name] onto them!"))
- return
- if(interact_item && !(interact_item.flags_item & ITEM_ABSTRACT))
- if(interact_item.flags_item & NODROP)
- to_chat(src, SPAN_WARNING("You can't put \the [interact_item.name] on [target_mob], it's stuck to your hand!"))
- return
- if(interact_item.flags_inventory & CANTSTRIP)
- to_chat(src, SPAN_WARNING("You're having difficulty putting \the [interact_item.name] on [target_mob]."))
- return
- if(interact_item.flags_item & WIELDED)
- interact_item.unwield(src)
- if(!interact_item.mob_can_equip(target_mob, slot_to_process, TRUE))
- to_chat(src, SPAN_WARNING("You can't put \the [interact_item.name] on [target_mob]!"))
- return
- visible_message(SPAN_NOTICE("[src] tries to put \the [interact_item.name] on [target_mob]."), null, null, 5)
- log_interact(src, target_mob, "[key_name(src)] attempted to put [interact_item.name] on [key_name(target_mob)]'s ([slot_to_process]).")
- if(do_after(src, get_strip_delay(src, target_mob), INTERRUPT_ALL, BUSY_ICON_GENERIC, target_mob, INTERRUPT_MOVED, BUSY_ICON_GENERIC))
- if(interact_item == get_active_hand() && !target_mob.get_item_by_slot(slot_to_process) && Adjacent(target_mob))
- if(interact_item.flags_item & WIELDED) //to prevent re-wielding it during the do_after
- interact_item.unwield(src)
- if(interact_item.mob_can_equip(target_mob, slot_to_process, TRUE))//Placing an item on the mob
- drop_inv_item_on_ground(interact_item)
- if(interact_item && !QDELETED(interact_item)) //Might be self-deleted?
- target_mob.equip_to_slot_if_possible(interact_item, slot_to_process, 1, 0, 1, 1)
- log_interact(src, target_mob, "[key_name(src)] put [interact_item.name] on [key_name(target_mob)]'s ([slot_to_process]) successfully.")
- if(ishuman(target_mob) && target_mob.stat == DEAD)
- var/mob/living/carbon/human/human_target = target_mob
- human_target.disable_lights() // take that powergamers -spookydonut
-
- if(target_mob)
- if(interactee == target_mob && Adjacent(target_mob))
- target_mob.show_inv(src)
-
/mob/living/carbon/human/drop_inv_item_on_ground(obj/item/I, nomoveupdate, force)
remember_dropped_object(I)
return ..()
diff --git a/code/modules/mob/living/carbon/xenomorph/Abilities.dm b/code/modules/mob/living/carbon/xenomorph/Abilities.dm
index 3bf0c67ef721..ec024c3b5605 100644
--- a/code/modules/mob/living/carbon/xenomorph/Abilities.dm
+++ b/code/modules/mob/living/carbon/xenomorph/Abilities.dm
@@ -142,7 +142,7 @@
playsound(xeno.loc, pick(xeno.screech_sound_effect_list), 75, 0, status = 0)
xeno.visible_message(SPAN_XENOHIGHDANGER("[xeno] emits an ear-splitting guttural roar!"))
- xeno.create_shriekwave() //Adds the visual effect. Wom wom wom
+ xeno.create_shriekwave(14) //Adds the visual effect. Wom wom wom, 14 shriekwaves
for(var/mob/mob in view())
if(mob && mob.client)
diff --git a/code/modules/mob/living/carbon/xenomorph/Facehuggers.dm b/code/modules/mob/living/carbon/xenomorph/Facehuggers.dm
index df272387f001..9a87f10d74a3 100644
--- a/code/modules/mob/living/carbon/xenomorph/Facehuggers.dm
+++ b/code/modules/mob/living/carbon/xenomorph/Facehuggers.dm
@@ -38,6 +38,9 @@
/// the nearest human before dying
var/jumps_left = 2
+ var/time_to_live = 30 SECONDS
+ var/death_timer
+
var/icon_xeno = 'icons/mob/xenos/effects.dmi'
var/icon_xenonid = 'icons/mob/xenonids/xenonid_crab.dmi'
@@ -55,6 +58,9 @@
set_hive_data(src, hivenumber)
go_active()
+ if (hivenumber != XENO_HIVE_TUTORIAL)
+ death_timer = addtimer(CALLBACK(src, PROC_REF(end_lifecycle)), time_to_live, TIMER_OVERRIDE|TIMER_STOPPABLE|TIMER_UNIQUE)
+
/obj/item/clothing/mask/facehugger/Destroy()
. = ..()
@@ -75,6 +81,10 @@
if(QDESTROYING(src))
return
addtimer(CALLBACK(src, PROC_REF(check_turf)), 0.2 SECONDS)
+
+ if(!death_timer && hivenumber != XENO_HIVE_TUTORIAL)
+ death_timer = addtimer(CALLBACK(src, PROC_REF(end_lifecycle)), time_to_live, TIMER_OVERRIDE|TIMER_STOPPABLE|TIMER_UNIQUE)
+
if(stat == CONSCIOUS && loc) //Make sure we're conscious and not idle or dead.
go_idle()
if(attached)
@@ -173,9 +183,18 @@
if(exposed_temperature > 300)
die()
-/obj/item/clothing/mask/facehugger/equipped(mob/M)
+/obj/item/clothing/mask/facehugger/equipped(mob/holder)
SHOULD_CALL_PARENT(FALSE) // ugh equip sounds
// So picking up a hugger does not prematurely kill it
+ if (!isxeno(holder))
+ return
+
+ var/mob/living/carbon/xenomorph/xeno = holder
+
+ if ((xeno.caste.hugger_nurturing || hivenumber == XENO_HIVE_TUTORIAL) && death_timer)
+ deltimer(death_timer)
+ death_timer = null
+
go_idle()
/obj/item/clothing/mask/facehugger/Crossed(atom/target)
@@ -262,7 +281,7 @@
if(isturf(human.loc))
forceMove(human.loc)//Just checkin
- if(!human.handle_hugger_attachment(src))
+ if(!human.handle_hugger_attachment(src, hugger))
return FALSE
attached = TRUE
@@ -394,9 +413,6 @@
M.stored_huggers++
qdel(src)
return
- // Tutorial facehuggers never time out
- if(hivenumber == XENO_HIVE_TUTORIAL)
- return
die()
/obj/item/clothing/mask/facehugger/proc/die()
@@ -410,6 +426,10 @@
deltimer(jump_timer)
jump_timer = null
+ if(death_timer)
+ deltimer(death_timer)
+ death_timer = null
+
if(!impregnated)
icon_state = "[initial(icon_state)]_dead"
stat = DEAD
@@ -418,12 +438,15 @@
playsound(src.loc, 'sound/voice/alien_facehugger_dies.ogg', 25, 1)
if(ismob(loc)) //Make it fall off the person so we can update their icons. Won't update if they're in containers thou
- var/mob/M = loc
- M.drop_inv_item_on_ground(src)
+ var/mob/holder_mob = loc
+ holder_mob.drop_inv_item_on_ground(src)
layer = TURF_LAYER //so dead hugger appears below live hugger if stacked on same tile. (and below nested hosts)
- addtimer(CALLBACK(src, PROC_REF(decay)), 3 MINUTES)
+ if(hivenumber == XENO_HIVE_TUTORIAL)
+ addtimer(CALLBACK(src, PROC_REF(decay)), 5 SECONDS)
+ else
+ addtimer(CALLBACK(src, PROC_REF(decay)), 3 MINUTES)
/obj/item/clothing/mask/facehugger/proc/decay()
visible_message("[icon2html(src, viewers(src))] \The [src] decays into a mass of acid and chitin.")
@@ -468,15 +491,14 @@
/**
* Human hugger handling
*/
-
-/mob/living/carbon/human/proc/handle_hugger_attachment(obj/item/clothing/mask/facehugger/hugger)
+/mob/living/carbon/human/proc/handle_hugger_attachment(obj/item/clothing/mask/facehugger/hugger, mob/living/carbon/xenomorph/facehugger/mob_hugger)
var/can_infect = TRUE
if(!has_limb("head"))
hugger.visible_message(SPAN_WARNING("[hugger] looks for a face to hug on [src], but finds none!"))
hugger.go_idle()
return FALSE
- if(species && !species.handle_hugger_attachment(src, hugger))
+ if(species && !species.handle_hugger_attachment(src, hugger, mob_hugger))
return FALSE
if(head && !(head.flags_item & NODROP))
@@ -523,10 +545,10 @@
return can_infect
-/datum/species/proc/handle_hugger_attachment(mob/living/carbon/human/target, obj/item/clothing/mask/facehugger/hugger)
+/datum/species/proc/handle_hugger_attachment(mob/living/carbon/human/target, obj/item/clothing/mask/facehugger/hugger, mob/living/carbon/xenomorph/facehugger/mob_hugger)
return TRUE
-/datum/species/yautja/handle_hugger_attachment(mob/living/carbon/human/target, obj/item/clothing/mask/facehugger/hugger)
+/datum/species/yautja/handle_hugger_attachment(mob/living/carbon/human/target, obj/item/clothing/mask/facehugger/hugger, mob/living/carbon/xenomorph/facehugger/mob_hugger)
var/catch_chance = 50
if(target.dir == GLOB.reverse_dir[hugger.dir])
catch_chance += 20
@@ -540,7 +562,10 @@
if(!target.stat && target.dir != hugger.dir && prob(catch_chance)) //Not facing away
target.visible_message(SPAN_NOTICE("[target] snatches [hugger] out of the air and squashes it!"))
- hugger.die()
+ if(mob_hugger)
+ mob_hugger.death(create_cause_data("squished"))
+ else
+ hugger.die()
return FALSE
return TRUE
diff --git a/code/modules/mob/living/carbon/xenomorph/XenoOverwatch.dm b/code/modules/mob/living/carbon/xenomorph/XenoOverwatch.dm
index 0b0efbc0f34f..0da2b61142e8 100644
--- a/code/modules/mob/living/carbon/xenomorph/XenoOverwatch.dm
+++ b/code/modules/mob/living/carbon/xenomorph/XenoOverwatch.dm
@@ -93,6 +93,10 @@
to_chat(src, SPAN_XENOWARNING("Our sister's psychic connection is cut off!"))
return
+ if(HAS_TRAIT(src, TRAIT_ABILITY_BURROWED))
+ to_chat(src, SPAN_XENOWARNING("We cannot do this in our current state!"))
+ return
+
if(observed_xeno && targetXeno && observed_xeno == targetXeno)
if(istype(targetXeno, /obj/effect/alien/resin/marker))
to_chat(src, SPAN_XENOWARNING("We are already watching that mark!"))
diff --git a/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm b/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm
index 10f2af57b719..a09380db7664 100644
--- a/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm
+++ b/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm
@@ -262,9 +262,6 @@
move_delay = .
-/mob/living/carbon/xenomorph/show_inv(mob/user)
- return
-
/mob/living/carbon/xenomorph/proc/pounced_mob(mob/living/L)
// This should only be called back by a mob that has pounce, so no need to check
var/datum/action/xeno_action/activable/pounce/pounceAction = get_xeno_action_by_type(src, /datum/action/xeno_action/activable/pounce)
diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/ability_helper_procs.dm b/code/modules/mob/living/carbon/xenomorph/abilities/ability_helper_procs.dm
index 9bfc98a7091d..0990df678f61 100644
--- a/code/modules/mob/living/carbon/xenomorph/abilities/ability_helper_procs.dm
+++ b/code/modules/mob/living/carbon/xenomorph/abilities/ability_helper_procs.dm
@@ -195,6 +195,10 @@
client.pixel_x = -viewoffset
client.pixel_y = 0
+ for (var/datum/action/xeno_action/onclick/toggle_long_range/action in actions)
+ action.on_zoom_in()
+ return
+
/mob/living/carbon/xenomorph/proc/zoom_out()
if(!client)
return
diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/burrower/burrower_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/burrower/burrower_powers.dm
index f854272365d0..ee084e77a5a0 100644
--- a/code/modules/mob/living/carbon/xenomorph/abilities/burrower/burrower_powers.dm
+++ b/code/modules/mob/living/carbon/xenomorph/abilities/burrower/burrower_powers.dm
@@ -126,7 +126,7 @@
return
var/area/A = get_area(T)
- if(A.flags_area & AREA_NOTUNNEL)
+ if(A.flags_area & AREA_NOTUNNEL || get_dist(src, T) > 15)
to_chat(src, SPAN_XENOWARNING("There's no way to tunnel over there."))
return
diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/defender/defender_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/defender/defender_powers.dm
index 98c0c19f68f7..d7a4f987623a 100644
--- a/code/modules/mob/living/carbon/xenomorph/abilities/defender/defender_powers.dm
+++ b/code/modules/mob/living/carbon/xenomorph/abilities/defender/defender_powers.dm
@@ -17,7 +17,6 @@
if(xeno.crest_defense)
to_chat(xeno, SPAN_XENOWARNING("We lower our crest."))
- xeno.balloon_alert(xeno, "crest lowered")
xeno.ability_speed_modifier += speed_debuff
xeno.armor_deflection_buff += armor_buff
@@ -26,7 +25,6 @@
xeno.update_icons()
else
to_chat(xeno, SPAN_XENOWARNING("We raise our crest."))
- xeno.balloon_alert(xeno, "crest raised")
xeno.ability_speed_modifier -= speed_debuff
xeno.armor_deflection_buff -= armor_buff
diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/facehugger/facehugger_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/facehugger/facehugger_abilities.dm
index ee1fed3094a7..d60d292cba25 100644
--- a/code/modules/mob/living/carbon/xenomorph/abilities/facehugger/facehugger_abilities.dm
+++ b/code/modules/mob/living/carbon/xenomorph/abilities/facehugger/facehugger_abilities.dm
@@ -17,3 +17,8 @@
freeze_time = 5
freeze_play_sound = FALSE
can_be_shield_blocked = TRUE
+
+/datum/action/xeno_action/onclick/toggle_long_range/facehugger
+ handles_movement = FALSE
+ should_delay = FALSE
+ ability_primacy = XENO_PRIMARY_ACTION_3
diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/facehugger/facehugger_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/facehugger/facehugger_powers.dm
index 054762b3c7d4..6eef21c6d5af 100644
--- a/code/modules/mob/living/carbon/xenomorph/abilities/facehugger/facehugger_powers.dm
+++ b/code/modules/mob/living/carbon/xenomorph/abilities/facehugger/facehugger_powers.dm
@@ -25,4 +25,22 @@
if(current_airlock.density) //if its CLOSED YOU'RE SCUTTLING AND CANNOT POUNCE!!!
to_chat(owner, SPAN_WARNING("We cannot do that while squeezing and scuttling!"))
return FALSE
+
+ if(HAS_TRAIT(owner, TRAIT_IMMOBILIZED))
+ to_chat(owner, SPAN_WARNING("We cannot do that while immobilized!"))
+ return FALSE
+
return ..()
+
+/datum/action/xeno_action/onclick/toggle_long_range/facehugger/on_zoom_out()
+ . = ..()
+
+ var/mob/living/carbon/xenomorph/facehugger/facehugger = owner
+ REMOVE_TRAIT(facehugger, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Long-Range Sight"))
+
+/datum/action/xeno_action/onclick/toggle_long_range/facehugger/on_zoom_in()
+ . = ..()
+
+ var/mob/living/carbon/xenomorph/facehugger/facehugger = owner
+ ADD_TRAIT(facehugger, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Long-Range Sight"))
+
diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/general_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/general_abilities.dm
index 0e897335cf10..39b05b964648 100644
--- a/code/modules/mob/living/carbon/xenomorph/abilities/general_abilities.dm
+++ b/code/modules/mob/living/carbon/xenomorph/abilities/general_abilities.dm
@@ -295,7 +295,9 @@
/datum/action/xeno_action/onclick/toggle_long_range/use_ability(atom/target)
var/mob/living/carbon/xenomorph/xeno = owner
- xeno.speed_modifier = initial(xeno.speed_modifier)// Reset the speed modifier should you be disrupted while zooming or whatnot
+
+ if (!xeno.check_state())
+ return
if(xeno.observed_xeno)
return
@@ -327,6 +329,9 @@
xeno.recalculate_speed()
button.icon_state = "template"
+/datum/action/xeno_action/onclick/toggle_long_range/proc/on_zoom_in()
+ return
+
/datum/action/xeno_action/onclick/toggle_long_range/proc/handle_mob_move_or_look(mob/living/carbon/xenomorph/xeno, actually_moving, direction, specific_direction)
SIGNAL_HANDLER
movement_buffer--
diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_abilities.dm
index 8a829d8d6bc0..17677c8427af 100644
--- a/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_abilities.dm
+++ b/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_abilities.dm
@@ -18,8 +18,6 @@
macro_path = /datum/action/xeno_action/verb/verb_lurker_invisibility
ability_primacy = XENO_PRIMARY_ACTION_2
action_type = XENO_ACTION_CLICK
- xeno_cooldown = 1 // This ability never goes off cooldown 'naturally'. Cooldown is applied manually as a super-large value in the use_ability proc
- // and reset by the behavior_delegate whenever the ability ends (because it can be ended by things like slashes, that we can't easily track here)
plasma_cost = 20
var/duration = 30 SECONDS // 30 seconds base
diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_powers.dm
index 0d1bcc99281a..51f23f22a09f 100644
--- a/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_powers.dm
+++ b/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_powers.dm
@@ -1,8 +1,10 @@
-/datum/action/xeno_action/activable/pounce/lurker/additional_effects_always()
+/datum/action/xeno_action/activable/pounce/lurker/additional_effects(mob/living/living_mob)
var/mob/living/carbon/xenomorph/xeno = owner
if(!istype(xeno))
return
+ RegisterSignal(xeno, COMSIG_XENO_SLASH_ADDITIONAL_EFFECTS_SELF, PROC_REF(remove_freeze), TRUE) // Suppresses runtime ever we pounce again before slashing
+
var/found = FALSE
for(var/mob/living/carbon/human/human in get_turf(xeno))
if(human.stat == DEAD)
@@ -12,14 +14,8 @@
if(found)
var/datum/action/xeno_action/onclick/lurker_invisibility/lurker_invis = get_xeno_action_by_type(xeno, /datum/action/xeno_action/onclick/lurker_invisibility)
- lurker_invis.invisibility_off()
-
-/datum/action/xeno_action/activable/pounce/lurker/additional_effects(mob/living/living_mob)
- var/mob/living/carbon/xenomorph/xeno = owner
- if(!istype(xeno))
- return
-
- RegisterSignal(xeno, COMSIG_XENO_SLASH_ADDITIONAL_EFFECTS_SELF, PROC_REF(remove_freeze), TRUE) // Suppresses runtime ever we pounce again before slashing
+ if(lurker_invis)
+ lurker_invis.invisibility_off() // Full cooldown
/datum/action/xeno_action/activable/pounce/lurker/proc/remove_freeze(mob/living/carbon/xenomorph/xeno)
SIGNAL_HANDLER
@@ -29,21 +25,33 @@
UnregisterSignal(xeno, COMSIG_XENO_SLASH_ADDITIONAL_EFFECTS_SELF)
end_pounce_freeze()
+/datum/action/xeno_action/onclick/lurker_invisibility/can_use_action()
+ if(!..())
+ return FALSE
+ var/mob/living/carbon/xenomorph/xeno = owner
+ return xeno.deselect_timer < world.time // We clicked the same ability in a very short time
+
/datum/action/xeno_action/onclick/lurker_invisibility/use_ability(atom/targeted_atom)
var/mob/living/carbon/xenomorph/xeno = owner
- if (!istype(xeno))
+ if(!istype(xeno))
return
-
- if (!action_cooldown_check())
+ if(!action_cooldown_check())
return
-
- if (!check_and_use_plasma_owner())
+ if(!check_and_use_plasma_owner())
return
- animate(xeno, alpha = alpha_amount, time = 0.1 SECONDS, easing = QUAD_EASING)
+ xeno.deselect_timer = world.time + 5 // Half a second to prevent double clicks
+
+ if(xeno.stealth)
+ invisibility_off(0.9) // Near full refund of remaining time
+ return ..()
+
+ button.icon_state = "template_active"
xeno.update_icons() // callback to make the icon_state indicate invisibility is in lurker/update_icon
+ animate(xeno, alpha = alpha_amount, time = 0.1 SECONDS, easing = QUAD_EASING)
+
xeno.speed_modifier -= speed_buff
xeno.recalculate_speed()
@@ -53,31 +61,44 @@
// if we go off early, this also works fine.
invis_timer_id = addtimer(CALLBACK(src, PROC_REF(invisibility_off)), duration, TIMER_STOPPABLE)
- // Only resets when invisibility ends
- apply_cooldown_override(1000000000)
return ..()
-/datum/action/xeno_action/onclick/lurker_invisibility/proc/invisibility_off()
- if(!owner || owner.alpha == initial(owner.alpha))
+/// Implementation for disabling invisibility.
+/// (refund_multiplier) indicates how much cooldown to refund based on time remaining
+/// 0 indicates full cooldown; 0.5 indicates 50% of remaining time is refunded
+/datum/action/xeno_action/onclick/lurker_invisibility/proc/invisibility_off(refund_multiplier = 0.0)
+ var/mob/living/carbon/xenomorph/xeno = owner
+
+ if(!istype(xeno))
+ return
+ if(owner.alpha == initial(owner.alpha) && !xeno.stealth)
return
- if (invis_timer_id != TIMER_ID_NULL)
+ if(invis_timer_id != TIMER_ID_NULL)
deltimer(invis_timer_id)
invis_timer_id = TIMER_ID_NULL
- var/mob/living/carbon/xenomorph/xeno = owner
- if (istype(xeno))
- animate(xeno, alpha = initial(xeno.alpha), time = 0.1 SECONDS, easing = QUAD_EASING)
- to_chat(xeno, SPAN_XENOHIGHDANGER("We feel our invisibility end!"))
+ animate(xeno, alpha = initial(xeno.alpha), time = 0.1 SECONDS, easing = QUAD_EASING)
+ to_chat(xeno, SPAN_XENOHIGHDANGER("We feel our invisibility end!"))
- xeno.update_icons()
+ button.icon_state = "template"
+ xeno.update_icons()
+
+ xeno.speed_modifier += speed_buff
+ xeno.recalculate_speed()
+
+ var/datum/behavior_delegate/lurker_base/behavior = xeno.behavior_delegate
+ if(!istype(behavior))
+ CRASH("lurker_base behavior_delegate missing/invalid for [xeno]!")
- xeno.speed_modifier += speed_buff
- xeno.recalculate_speed()
+ var/recharge_time = behavior.invis_recharge_time
+ if(behavior.invis_start_time > 0) // Sanity
+ refund_multiplier = clamp(refund_multiplier, 0, 1)
+ var/remaining = 1 - (world.time - behavior.invis_start_time) / behavior.invis_duration
+ recharge_time = behavior.invis_recharge_time - remaining * refund_multiplier * behavior.invis_recharge_time
+ apply_cooldown_override(recharge_time)
- var/datum/behavior_delegate/lurker_base/behavior = xeno.behavior_delegate
- if (istype(behavior))
- behavior.on_invisibility_off()
+ behavior.on_invisibility_off()
/datum/action/xeno_action/onclick/lurker_invisibility/ability_cooldown_over()
to_chat(owner, SPAN_XENOHIGHDANGER("We are ready to use our invisibility again!"))
diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/predalien/predalien_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/predalien/predalien_powers.dm
index 6e6fef86a2f4..3ec4855f9c3a 100644
--- a/code/modules/mob/living/carbon/xenomorph/abilities/predalien/predalien_powers.dm
+++ b/code/modules/mob/living/carbon/xenomorph/abilities/predalien/predalien_powers.dm
@@ -12,8 +12,7 @@
playsound(xeno.loc, pick(predalien_roar), 75, 0, status = 0)
xeno.visible_message(SPAN_XENOHIGHDANGER("[xeno] emits a guttural roar!"))
- xeno.create_shriekwave(color = "#FF0000")
-
+ xeno.create_shriekwave(7) //Adds the visual effect. Wom wom wom, 7 shriekwaves
for(var/mob/living/carbon/carbon in view(7, xeno))
if(ishuman(carbon))
var/mob/living/carbon/human/human = carbon
diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/queen/queen_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/queen/queen_powers.dm
index 1f37651b2c8e..f5adf2940d6b 100644
--- a/code/modules/mob/living/carbon/xenomorph/abilities/queen/queen_powers.dm
+++ b/code/modules/mob/living/carbon/xenomorph/abilities/queen/queen_powers.dm
@@ -371,10 +371,17 @@
xeno.use_plasma(plasma_cost_jelly)
return
/datum/action/xeno_action/onclick/manage_hive/use_ability(atom/Atom)
- var/mob/living/carbon/xenomorph/queen/queenbanish = owner
+ var/mob/living/carbon/xenomorph/queen/queen_manager = owner
plasma_cost = 0
-
- var/choice = tgui_input_list(queenbanish, "Manage The Hive", "Hive Management", list("Banish (500)", "Re-Admit (100)", "De-evolve (500)", "Reward Jelly (500)", "Exchange larva for evolution (100)",), theme="hive_status")
+ var/list/options = list("Banish (500)", "Re-Admit (100)", "De-evolve (500)", "Reward Jelly (500)", "Exchange larva for evolution (100)",)
+ if(queen_manager.hive.hivenumber == XENO_HIVE_CORRUPTED)
+ var/datum/hive_status/corrupted/hive = queen_manager.hive
+ options += "Add Personal Ally"
+ if(length(hive.personal_allies))
+ options += "Remove Personal Ally"
+ options += "Clear Personal Allies"
+
+ var/choice = tgui_input_list(queen_manager, "Manage The Hive", "Hive Management", options, theme="hive_status")
switch(choice)
if("Banish (500)")
banish()
@@ -383,9 +390,118 @@
if("De-evolve (500)")
de_evolve_other()
if("Reward Jelly (500)")
- give_jelly_reward(queenbanish.hive)
+ give_jelly_reward(queen_manager.hive)
if("Exchange larva for evolution (100)")
give_evo_points()
+ if("Add Personal Ally")
+ add_personal_ally()
+ if("Remove Personal Ally")
+ remove_personal_ally()
+ if("Clear Personal Allies")
+ clear_personal_allies()
+
+/datum/action/xeno_action/onclick/manage_hive/proc/add_personal_ally()
+ var/mob/living/carbon/xenomorph/queen/user_xeno = owner
+ if(user_xeno.hive.hivenumber != XENO_HIVE_CORRUPTED)
+ return
+
+ if(!user_xeno.check_state())
+ return
+
+ var/datum/hive_status/corrupted/hive = user_xeno.hive
+ var/list/target_list = list()
+ if(!user_xeno.client)
+ return
+ for(var/mob/living/carbon/human/possible_target in range(7, user_xeno.client.eye))
+ if(possible_target.stat == DEAD)
+ continue
+ if(possible_target.status_flags & CORRUPTED_ALLY)
+ continue
+ if(possible_target.hivenumber)
+ continue
+ target_list += possible_target
+
+ if(!length(target_list))
+ to_chat(user_xeno, SPAN_WARNING("No talls in view."))
+ return
+ var/mob/living/target_mob = tgui_input_list(usr, "Target", "Set Up a Personal Alliance With...", target_list, theme="hive_status")
+
+ if(!user_xeno.check_state(TRUE))
+ return
+
+ if(!target_mob)
+ return
+
+ if(target_mob.hivenumber)
+ to_chat(user_xeno, SPAN_WARNING("We cannot set up a personal alliance with a hive cultist."))
+ return
+
+ hive.add_personal_ally(target_mob)
+
+/datum/action/xeno_action/onclick/manage_hive/proc/remove_personal_ally()
+ var/mob/living/carbon/xenomorph/queen/user_xeno = owner
+ if(user_xeno.hive.hivenumber != XENO_HIVE_CORRUPTED)
+ return
+
+ if(!user_xeno.check_state())
+ return
+
+ var/datum/hive_status/corrupted/hive = user_xeno.hive
+
+ if(!length(hive.personal_allies))
+ to_chat(user_xeno, SPAN_WARNING("We don't have personal allies."))
+ return
+
+ var/list/mob/living/allies = list()
+ var/list/datum/weakref/dead_refs = list()
+ for(var/datum/weakref/ally_ref as anything in hive.personal_allies)
+ var/mob/living/ally = ally_ref.resolve()
+ if(ally)
+ allies += ally
+ continue
+ dead_refs += ally_ref
+
+ hive.personal_allies -= dead_refs
+
+ if(!length(allies))
+ to_chat(user_xeno, SPAN_WARNING("We don't have personal allies."))
+ return
+
+ var/mob/living/target_mob = tgui_input_list(usr, "Target", "Break the Personal Alliance With...", allies, theme="hive_status")
+
+ if(!target_mob)
+ return
+
+ var/target_mob_ref = WEAKREF(target_mob)
+
+ if(!(target_mob_ref in hive.personal_allies))
+ return
+
+ if(!user_xeno.check_state(TRUE))
+ return
+
+ hive.remove_personal_ally(target_mob_ref)
+
+/datum/action/xeno_action/onclick/manage_hive/proc/clear_personal_allies()
+ var/mob/living/carbon/xenomorph/queen/user_xeno = owner
+ if(user_xeno.hive.hivenumber != XENO_HIVE_CORRUPTED)
+ return
+
+ if(!user_xeno.check_state())
+ return
+
+ var/datum/hive_status/corrupted/hive = user_xeno.hive
+ if(!length(hive.personal_allies))
+ to_chat(user_xeno, SPAN_WARNING("We don't have personal allies."))
+ return
+
+ if(tgui_alert(user_xeno, "Are you sure you want to clear personal allies?", "Clear Personal Allies", list("No", "Yes"), 10 SECONDS) != "Yes")
+ return
+
+ if(!length(hive.personal_allies))
+ return
+
+ hive.clear_personal_allies()
/datum/action/xeno_action/onclick/manage_hive/proc/banish()
@@ -703,7 +819,7 @@
return
var/list/alerts = list()
- for(var/i in RANGE_TURFS(Floor(width/2), T))
+ for(var/i in RANGE_TURFS(floor(width/2), T))
alerts += new /obj/effect/warning/alien(i)
if(!do_after(Q, time_taken, INTERRUPT_NO_NEEDHAND, BUSY_ICON_FRIENDLY))
@@ -717,7 +833,7 @@
if(!check_and_use_plasma_owner())
return
- var/turf/new_turf = locate(max(T.x - Floor(width/2), 1), max(T.y - Floor(height/2), 1), T.z)
+ var/turf/new_turf = locate(max(T.x - floor(width/2), 1), max(T.y - floor(height/2), 1), T.z)
to_chat(Q, SPAN_XENONOTICE("You raise a blockade!"))
var/obj/effect/alien/resin/resin_pillar/RP = new pillar_type(new_turf)
RP.start_decay(brittle_time, decay_time)
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Lurker.dm b/code/modules/mob/living/carbon/xenomorph/castes/Lurker.dm
index b9bde4c78992..5196be26f3d7 100644
--- a/code/modules/mob/living/carbon/xenomorph/castes/Lurker.dm
+++ b/code/modules/mob/living/carbon/xenomorph/castes/Lurker.dm
@@ -67,15 +67,14 @@
name = "Base Lurker Behavior Delegate"
// Config
- var/invis_recharge_time = 150 // 15 seconds to recharge invisibility.
+ var/invis_recharge_time = 20 SECONDS
var/invis_start_time = -1 // Special value for when we're not invisible
- var/invis_duration = 300 // so we can display how long the lurker is invisible to it
+ var/invis_duration = 30 SECONDS // so we can display how long the lurker is invisible to it
var/buffed_slash_damage_ratio = 1.2
var/slash_slow_duration = 35
// State
var/next_slash_buffed = FALSE
- var/can_go_invisible = TRUE
/datum/behavior_delegate/lurker_base/melee_attack_modify_damage(original_damage, mob/living/carbon/target_carbon)
if (!isxeno_human(target_carbon))
@@ -116,55 +115,57 @@
var/datum/action/xeno_action/onclick/lurker_invisibility/lurker_invis_action = get_xeno_action_by_type(bound_xeno, /datum/action/xeno_action/onclick/lurker_invisibility)
if (lurker_invis_action)
- lurker_invis_action.invisibility_off()
+ lurker_invis_action.invisibility_off() // Full cooldown
/datum/behavior_delegate/lurker_base/proc/decloak_handler(mob/source)
SIGNAL_HANDLER
var/datum/action/xeno_action/onclick/lurker_invisibility/lurker_invis_action = get_xeno_action_by_type(bound_xeno, /datum/action/xeno_action/onclick/lurker_invisibility)
if(istype(lurker_invis_action))
- lurker_invis_action.invisibility_off()
+ lurker_invis_action.invisibility_off(0.5) // Partial refund of remaining time
-// What to do when we go invisible
+/// Implementation for enabling invisibility.
/datum/behavior_delegate/lurker_base/proc/on_invisibility()
var/datum/action/xeno_action/activable/pounce/lurker/lurker_pounce_action = get_xeno_action_by_type(bound_xeno, /datum/action/xeno_action/activable/pounce/lurker)
- if (lurker_pounce_action)
+ if(lurker_pounce_action)
lurker_pounce_action.knockdown = TRUE // pounce knocks down
lurker_pounce_action.freeze_self = TRUE
ADD_TRAIT(bound_xeno, TRAIT_CLOAKED, TRAIT_SOURCE_ABILITY("cloak"))
RegisterSignal(bound_xeno, COMSIG_MOB_EFFECT_CLOAK_CANCEL, PROC_REF(decloak_handler))
bound_xeno.stealth = TRUE
- can_go_invisible = FALSE
invis_start_time = world.time
+/// Implementation for disabling invisibility.
/datum/behavior_delegate/lurker_base/proc/on_invisibility_off()
var/datum/action/xeno_action/activable/pounce/lurker/lurker_pounce_action = get_xeno_action_by_type(bound_xeno, /datum/action/xeno_action/activable/pounce/lurker)
- if (lurker_pounce_action)
+ if(lurker_pounce_action)
lurker_pounce_action.knockdown = FALSE // pounce no longer knocks down
lurker_pounce_action.freeze_self = FALSE
bound_xeno.stealth = FALSE
REMOVE_TRAIT(bound_xeno, TRAIT_CLOAKED, TRAIT_SOURCE_ABILITY("cloak"))
UnregisterSignal(bound_xeno, COMSIG_MOB_EFFECT_CLOAK_CANCEL)
+ invis_start_time = -1
- // SLIGHTLY hacky because we need to maintain lots of other state on the lurker
- // whenever invisibility is on/off CD and when it's active.
- addtimer(CALLBACK(src, PROC_REF(regen_invisibility)), invis_recharge_time)
+/datum/behavior_delegate/lurker_base/append_to_stat()
+ . = list()
- invis_start_time = -1
+ // Invisible
+ if(invis_start_time != -1)
+ var/time_left = (invis_duration-(world.time - invis_start_time)) / 10
+ . += "Invisibility Remaining: [time_left] second\s."
+ return
-/datum/behavior_delegate/lurker_base/proc/regen_invisibility()
- if (can_go_invisible)
+ var/datum/action/xeno_action/onclick/lurker_invisibility/lurker_invisibility_action = get_xeno_action_by_type(bound_xeno, /datum/action/xeno_action/onclick/lurker_invisibility)
+ if(!lurker_invisibility_action)
return
- can_go_invisible = TRUE
- if(bound_xeno)
- var/datum/action/xeno_action/onclick/lurker_invisibility/lurker_invisibility_action = get_xeno_action_by_type(bound_xeno, /datum/action/xeno_action/onclick/lurker_invisibility)
- if(lurker_invisibility_action)
- lurker_invisibility_action.end_cooldown()
+ // Recharged
+ if(lurker_invisibility_action.cooldown_timer_id == TIMER_ID_NULL)
+ . += "Invisibility Recharge: Ready."
+ return
-/datum/behavior_delegate/lurker_base/append_to_stat()
- . = list()
- var/invis_message = (invis_start_time == -1) ? "N/A" : "[(invis_duration-(world.time - invis_start_time))/10] seconds."
- . += "Invisibility Time Left: [invis_message]"
+ // Recharging
+ var/time_left = timeleft(lurker_invisibility_action.cooldown_timer_id) / 10
+ . += "Invisibility Recharge: [time_left] second\s."
/datum/behavior_delegate/lurker_base/on_collide(atom/movable/movable_atom)
. = ..()
@@ -184,4 +185,4 @@
return
to_chat(bound_xeno, SPAN_XENOHIGHDANGER("We bumped into someone and lost our invisibility!"))
- lurker_invisibility_action.invisibility_off()
+ lurker_invisibility_action.invisibility_off(0.5) // partial refund of remaining time
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/lesser_drone.dm b/code/modules/mob/living/carbon/xenomorph/castes/lesser_drone.dm
index 8b268ebfce62..9be9e21fd983 100644
--- a/code/modules/mob/living/carbon/xenomorph/castes/lesser_drone.dm
+++ b/code/modules/mob/living/carbon/xenomorph/castes/lesser_drone.dm
@@ -16,9 +16,10 @@
can_be_revived = FALSE
build_time_mult = BUILD_TIME_MULT_LESSER_DRONE
+ behavior_delegate_type = /datum/behavior_delegate/lesser_drone_base
caste_desc = "A builder of hives."
- can_hold_facehuggers = 1
+ can_hold_facehuggers = TRUE
can_hold_eggs = CAN_HOLD_TWO_HANDS
acid_level = 1
weed_level = WEED_LEVEL_STANDARD
@@ -118,3 +119,10 @@
/mob/living/carbon/xenomorph/lesser_drone/handle_ghost_message()
return
+
+/datum/behavior_delegate/lesser_drone_base
+ name = "Base Lesser Drone Behavior Delegate"
+
+/datum/behavior_delegate/lesser_drone_base/on_life()
+ if(bound_xeno.body_position == STANDING_UP && !(locate(/obj/effect/alien/weeds) in get_turf(bound_xeno)))
+ bound_xeno.adjustBruteLoss(5)
diff --git a/code/modules/mob/living/carbon/xenomorph/hive_status.dm b/code/modules/mob/living/carbon/xenomorph/hive_status.dm
index 22b061715892..19416e7af0aa 100644
--- a/code/modules/mob/living/carbon/xenomorph/hive_status.dm
+++ b/code/modules/mob/living/carbon/xenomorph/hive_status.dm
@@ -832,7 +832,7 @@
if(cycled_xeno.counts_for_slots)
countable_xeno_iterator++
- playable_hugger_limit = max(Floor(countable_xeno_iterator / playable_hugger_max_divisor), playable_hugger_minimum)
+ playable_hugger_limit = max(floor(countable_xeno_iterator / playable_hugger_max_divisor), playable_hugger_minimum)
/datum/hive_status/proc/can_spawn_as_hugger(mob/dead/observer/user)
if(!GLOB.hive_datum || ! GLOB.hive_datum[hivenumber])
@@ -888,7 +888,7 @@
if(cycled_xeno.counts_for_slots)
countable_xeno_iterator++
- lesser_drone_limit = max(Floor(countable_xeno_iterator / playable_lesser_drones_max_divisor), lesser_drone_minimum)
+ lesser_drone_limit = max(floor(countable_xeno_iterator / playable_lesser_drones_max_divisor), lesser_drone_minimum)
/datum/hive_status/proc/can_spawn_as_lesser_drone(mob/dead/observer/user, obj/effect/alien/resin/special/pylon/spawning_pylon)
if(!GLOB.hive_datum || ! GLOB.hive_datum[hivenumber])
@@ -979,6 +979,7 @@
need_round_end_check = TRUE
var/list/defectors = list()
+ var/list/datum/weakref/personal_allies = list()
/datum/hive_status/corrupted/add_xeno(mob/living/carbon/xenomorph/xeno)
. = ..()
@@ -1253,9 +1254,9 @@
if(living_xeno_queen)
if(allies[faction])
- xeno_message(SPAN_XENOANNOUNCE("Your Queen set up an alliance with [faction]!"), 3, hivenumber)
+ xeno_message(SPAN_XENOANNOUNCE("Our Queen set up an alliance with [faction]!"), 3, hivenumber)
else
- xeno_message(SPAN_XENOANNOUNCE("Your Queen broke the alliance with [faction]!"), 3, hivenumber)
+ xeno_message(SPAN_XENOANNOUNCE("Our Queen broke the alliance with [faction]!"), 3, hivenumber)
for(var/number in GLOB.hive_datum)
var/datum/hive_status/target_hive = GLOB.hive_datum[number]
@@ -1291,14 +1292,14 @@
addtimer(CALLBACK(src, PROC_REF(handle_defectors), faction), 11 SECONDS)
/datum/hive_status/corrupted/proc/give_defection_choice(mob/living/carbon/xenomorph/xeno, faction)
- if(tgui_alert(xeno, "Your Queen has broken the alliance with the [faction]. The device inside your carapace begins to suppress your connection with the Hive. Do you remove it and stay loyal to her?", "Alliance broken!", list("Stay loyal", "Obey the talls"), 10 SECONDS) == "Obey the talls")
+ if(tgui_alert(xeno, "Our Queen has broken the alliance with the [faction]. The device inside our carapace begins to suppress our connection with the Hive. Do we remove it and stay loyal to her?", "Alliance broken!", list("Stay loyal", "Obey the talls"), 10 SECONDS) == "Obey the talls")
if(!xeno.iff_tag)
to_chat(xeno, SPAN_XENOWARNING("It's too late now. The device is gone and our service to the Queen continues."))
return
defectors += xeno
xeno.set_hive_and_update(XENO_HIVE_RENEGADE)
to_chat(xeno, SPAN_XENOANNOUNCE("You lost the connection with your Hive. Now you have no Queen, only your masters."))
- to_chat(xeno, SPAN_NOTICE("Our instincts have changed, we seem compelled to protect [english_list(xeno.iff_tag.faction_groups, "no one")]."))
+ to_chat(xeno, SPAN_NOTICE("Your instincts have changed, you seem compelled to protect [english_list(xeno.iff_tag.faction_groups, "no one")]."))
return
xeno.visible_message(SPAN_XENOWARNING("[xeno] rips out [xeno.iff_tag]!"), SPAN_XENOWARNING("We rip out [xeno.iff_tag]! For the Hive!"))
xeno.adjustBruteLoss(50)
@@ -1313,20 +1314,58 @@
continue
if(!(faction in xeno.iff_tag.faction_groups))
continue
- xeno.visible_message(SPAN_XENOWARNING("[xeno] rips out [xeno.iff_tag]!"), SPAN_XENOWARNING("You rip out [xeno.iff_tag]! For the hive!"))
+ xeno.visible_message(SPAN_XENOWARNING("[xeno] rips out [xeno.iff_tag]!"), SPAN_XENOWARNING("We rip out [xeno.iff_tag]! For the hive!"))
xeno.adjustBruteLoss(50)
xeno.iff_tag.forceMove(get_turf(xeno))
xeno.iff_tag = null
if(!length(defectors))
return
- xeno_message(SPAN_XENOANNOUNCE("You sense that [english_list(defectors)] turned their backs against their sisters and the Queen in favor of their slavemasters!"), 3, hivenumber)
+ xeno_message(SPAN_XENOANNOUNCE("We sense that [english_list(defectors)] turned their backs against their sisters and the Queen in favor of their slavemasters!"), 3, hivenumber)
defectors.Cut()
+/datum/hive_status/corrupted/proc/add_personal_ally(mob/living/ally)
+ personal_allies += WEAKREF(ally)
+ ally.status_flags |= CORRUPTED_ALLY
+ ally.med_hud_set_status()
+ xeno_message(SPAN_XENOANNOUNCE("Our Queen proclaimed [ally] our ally! We must not harm them."), 3, hivenumber)
+
+/datum/hive_status/corrupted/proc/remove_personal_ally(datum/weakref/ally_ref)
+ personal_allies -= ally_ref
+ var/mob/living/ally = ally_ref.resolve()
+ if(ally)
+ ally.status_flags &= ~CORRUPTED_ALLY
+ ally.med_hud_set_status()
+ xeno_message(SPAN_XENOANNOUNCE("Our Queen has declared that [ally] is no longer our ally!"), 3, hivenumber)
+
+/datum/hive_status/corrupted/proc/clear_personal_allies(death = FALSE)
+ for(var/datum/weakref/ally_ref in personal_allies)
+ var/mob/living/ally = ally_ref.resolve()
+ if(!ally)
+ continue
+ ally.status_flags &= ~CORRUPTED_ALLY
+ ally.med_hud_set_status()
+ personal_allies.Cut()
+ if(!death)
+ xeno_message(SPAN_XENOANNOUNCE("Our Queen has broken all personal alliances with the talls! Favoritism is no more."), 3, hivenumber)
+ return
+ xeno_message(SPAN_XENOWARNING("With the death of the Queen, her friends no longer matter to us."), 3, hivenumber)
+
+/datum/hive_status/corrupted/is_ally(mob/living/living_mob)
+ if(living_mob.status_flags & CORRUPTED_ALLY)
+ return TRUE
+ return ..()
+
/datum/hive_status/proc/override_evilution(evil, override)
if(SSxevolution)
SSxevolution.override_power(hivenumber, evil, override)
+/datum/hive_status/corrupted/on_queen_death()
+ ..()
+ if(!length(personal_allies))
+ return
+ clear_personal_allies(TRUE)
+
//Xeno Resin Mark Shit, the very best place for it too :0)
//Defines at the bottom of this list here will show up at the top in the mark menu
/datum/xeno_mark_define
diff --git a/code/modules/mob/living/carbon/xenomorph/life.dm b/code/modules/mob/living/carbon/xenomorph/life.dm
index bbd59a74d8b5..45d0d53a040a 100644
--- a/code/modules/mob/living/carbon/xenomorph/life.dm
+++ b/code/modules/mob/living/carbon/xenomorph/life.dm
@@ -291,7 +291,7 @@
if(hud_used.alien_armor_display)
var/armor_stacks = min((get_armor_integrity_percentage() * 0.01) * HUD_ARMOR_STATES_XENO, HUD_ARMOR_STATES_XENO)
- hud_used.alien_armor_display.icon_state = "armor_[Floor(armor_stacks)]0"
+ hud_used.alien_armor_display.icon_state = "armor_[floor(armor_stacks)]0"
return TRUE
diff --git a/code/modules/mob/living/carbon/xenomorph/strains/castes/boiler/trapper.dm b/code/modules/mob/living/carbon/xenomorph/strains/castes/boiler/trapper.dm
index e6c8061bd0fe..f64bfd6b500f 100644
--- a/code/modules/mob/living/carbon/xenomorph/strains/castes/boiler/trapper.dm
+++ b/code/modules/mob/living/carbon/xenomorph/strains/castes/boiler/trapper.dm
@@ -1,7 +1,7 @@
/datum/xeno_strain/trapper
name = BOILER_TRAPPER
- description = "You trade your ability to bombard, lance, and dump your acid in order to gain some speed and the ability to create acid explosions and restrain talls within them. With your longer-range vision, set up traps that immobilize your opponents and place acid mines which deal damage to talls and barricades and reduce the cooldown of your trap deployment for every tall hit. Finally, hit talls with your Acid Shotgun ability which adds a stack of insight to empower the next trap you place once you reach a maximum of ten insight. A point-blank shot or a shot on a stunned target will instantly apply ten stacks."
- flavor_description = "Hsss, I love the smell of burnin' tallhost flesh in the mornin'."
+ description = "You trade your ability to bombard, lance, and dump your acid in order to gain some speed and the ability to create acid explosions and restrain enemies within them. With your longer-range vision, set up traps that immobilize your opponents and place acid mines which deal damage to enemies and barricades and reduce the cooldown of your trap deployment for every enemy hit. Finally, hit enemies with your Acid Shotgun ability which adds a stack of insight to empower the next trap you place once you reach a maximum of ten insight. A point-blank shot or a shot on a stunned target will instantly apply ten stacks."
+ flavor_description = "The battlefield is my canvas, this one, my painter. Melt them where they stand."
actions_to_remove = list(
/datum/action/xeno_action/activable/xeno_spit/bombard,
diff --git a/code/modules/mob/living/carbon/xenomorph/strains/castes/crusher/charger.dm b/code/modules/mob/living/carbon/xenomorph/strains/castes/crusher/charger.dm
index 84877b43571e..55e459cc6dde 100644
--- a/code/modules/mob/living/carbon/xenomorph/strains/castes/crusher/charger.dm
+++ b/code/modules/mob/living/carbon/xenomorph/strains/castes/crusher/charger.dm
@@ -14,8 +14,8 @@
/datum/xeno_strain/charger
name = CRUSHER_CHARGER
- description = "In exchange for your shield, a little bit of your armor and damage, your slowdown resist from autospitters, your influence under frenzy pheromones, your stomp no longer knocking down talls, and your ability to lock your direction, you gain a considerable amount of health, some speed, your stomp does extra damage when stomping over a grounded tall, and your charge is now manually-controlled and momentum-based; the further you go, the more damage and speed you will gain until you achieve maximum momentum, indicated by your roar. In addition, your armor is now directional, being the toughest on the front, weaker on the sides, and weakest from the back. In return, you gain an ability to tumble to pass through talls and avoid enemy fire, and an ability to forcefully move enemies via ramming into them."
- flavor_description = "We're just getting started. Nothing stops this train. Nothing."
+ description = "In exchange for your shield, a little bit of your armor and damage, your slowdown resist from turrets, your influence under frenzy pheromones, your stomp no longer knocking down talls, and your ability to lock your direction, you gain a considerable amount of health, some speed, your stomp does extra damage when stomping over a grounded tall, and your charge is now manually-controlled and momentum-based; the further you go, the more damage and speed you will gain until you achieve maximum momentum, indicated by your roar. In addition, your armor is now directional, being the toughest on the front, weaker on the sides, and weakest from the back. In return, you gain an ability to tumble to pass through enemies and avoid enemy fire, and an ability to forcefully move enemies via ramming into them."
+ flavor_description = "Nothing stops this hive. This one will become both the immovable object and the unstoppable force."
actions_to_remove = list(
/datum/action/xeno_action/activable/pounce/crusher_charge,
diff --git a/code/modules/mob/living/carbon/xenomorph/strains/castes/defender/steel_crest.dm b/code/modules/mob/living/carbon/xenomorph/strains/castes/defender/steel_crest.dm
index f84566e9c841..cfbf85de299d 100644
--- a/code/modules/mob/living/carbon/xenomorph/strains/castes/defender/steel_crest.dm
+++ b/code/modules/mob/living/carbon/xenomorph/strains/castes/defender/steel_crest.dm
@@ -1,7 +1,7 @@
/datum/xeno_strain/steel_crest
name = DEFENDER_STEELCREST
description = "You trade your tail sweep and a small amount of your slash damage for slightly increased headbutt knockback and damage and the ability to slowly move and headbutt while fortified. Along with this, you gain a unique ability to accumulate damage, and use it to recover a slight amount of health and refresh your tail slam."
- flavor_description = "To handle yourself, use your head. To handle others, use your head."
+ flavor_description = "This one, like my will, is indomitable. It will become my steel crest against all that defy me."
icon_state_prefix = "Steelcrest"
actions_to_remove = list(
diff --git a/code/modules/mob/living/carbon/xenomorph/strains/castes/drone/healer.dm b/code/modules/mob/living/carbon/xenomorph/strains/castes/drone/healer.dm
index 0fcbb2ecf09a..5ebafc88eaef 100644
--- a/code/modules/mob/living/carbon/xenomorph/strains/castes/drone/healer.dm
+++ b/code/modules/mob/living/carbon/xenomorph/strains/castes/drone/healer.dm
@@ -1,7 +1,7 @@
/datum/xeno_strain/healer
name = DRONE_HEALER
- description = "You lose your choice of resin secretions, a chunk of your slash damage, and you will experience a slighty-increased difficulty in tackling tallhosts in exchange for strong pheromones, the ability to use a bit of your health to plant a maximum of three lesser resin fruits, and the ability to heal your sisters' wounds by secreting a regenerative resin salve by using your vital fluids and a fifth of your plasma. Be wary, this is a dangerous process; overexert yourself and you may exhaust yourself to unconsciousness, or die..."
- flavor_description = "To the very last drop, your blood belongs to The Hive; share it with your sisters to keep them fighting."
+ description = "You lose your choice of resin secretions, a chunk of your slash damage, and you will experience a slighty-increased difficulty in tackling hosts in exchange for strong pheromones, the ability to use a bit of your health to plant a maximum of three lesser resin fruits, and the ability to heal your sisters' wounds by secreting a regenerative resin salve by using your vital fluids and a fifth of your plasma. Be wary, this is a dangerous process; overexert yourself and you may exhaust yourself to unconsciousness, or die..."
+ flavor_description = "Divided we fall, united we win. We live for the hive, we die for the hive."
icon_state_prefix = "Healer"
actions_to_remove = list(
diff --git a/code/modules/mob/living/carbon/xenomorph/strains/castes/facehugger/watcher.dm b/code/modules/mob/living/carbon/xenomorph/strains/castes/facehugger/watcher.dm
index 7fba30b6f352..c5e1cff29c63 100644
--- a/code/modules/mob/living/carbon/xenomorph/strains/castes/facehugger/watcher.dm
+++ b/code/modules/mob/living/carbon/xenomorph/strains/castes/facehugger/watcher.dm
@@ -1,13 +1,13 @@
/datum/xeno_strain/watcher
name = FACEHUGGER_WATCHER
- description = "You lose your ability to hide in exchange to see further and the ability to no longer take damage outside of weeds. This enables you to stalk your host from a distance and wait for the perfect oppertunity to strike."
+ description = "You lose your ability to hide in exchange to see further. This enables you to stalk your host from a distance and wait for the perfect oppertunity to strike."
flavor_description = "No need to hide when you can see the danger."
actions_to_remove = list(
/datum/action/xeno_action/onclick/xenohide,
)
actions_to_add = list(
- /datum/action/xeno_action/onclick/toggle_long_range/runner,
+ /datum/action/xeno_action/onclick/toggle_long_range/facehugger,
)
behavior_delegate_type = /datum/behavior_delegate/facehugger_watcher
@@ -19,3 +19,13 @@
// This has no special effects, it's just here to skip `/datum/behavior_delegate/facehugger_base/on_life()`.
/datum/behavior_delegate/facehugger_watcher
name = "Watcher Facehugger Behavior Delegate"
+
+/datum/behavior_delegate/facehugger_watcher/on_life()
+ // Sap health if we're standing, not on weeds, and not zoomed out
+ if(bound_xeno.body_position != STANDING_UP)
+ return
+ if(bound_xeno.is_zoomed)
+ return
+ if(locate(/obj/effect/alien/weeds) in get_turf(bound_xeno))
+ return
+ bound_xeno.adjustBruteLoss(1)
diff --git a/code/modules/mob/living/carbon/xenomorph/strains/castes/hivelord/resin_whisperer.dm b/code/modules/mob/living/carbon/xenomorph/strains/castes/hivelord/resin_whisperer.dm
index cf1cafde9267..538aacc63722 100644
--- a/code/modules/mob/living/carbon/xenomorph/strains/castes/hivelord/resin_whisperer.dm
+++ b/code/modules/mob/living/carbon/xenomorph/strains/castes/hivelord/resin_whisperer.dm
@@ -1,7 +1,7 @@
/datum/xeno_strain/resin_whisperer
name = HIVELORD_RESIN_WHISPERER
description = "You lose your corrosive acid, your ability to secrete thick resin, your ability to reinforce resin secretions, sacrifice your ability to plant weed nodes outside of weeds, and you sacrifice a fifth of your plasma reserves to enhance your vision and gain a stronger connection to the resin. You can now remotely place resin secretions including weed nodes up to a distance of twelve paces!"
- flavor_description = "Let the resin guide you. It whispers, so listen closely."
+ flavor_description = "We let the resin guide us. It whispers, so listen closely."
icon_state_prefix = "Resin Whisperer"
actions_to_remove = list(
diff --git a/code/modules/mob/living/carbon/xenomorph/strains/castes/praetorian/dancer.dm b/code/modules/mob/living/carbon/xenomorph/strains/castes/praetorian/dancer.dm
index f9a5dbedb614..7de4b93aad19 100644
--- a/code/modules/mob/living/carbon/xenomorph/strains/castes/praetorian/dancer.dm
+++ b/code/modules/mob/living/carbon/xenomorph/strains/castes/praetorian/dancer.dm
@@ -1,8 +1,8 @@
/datum/xeno_strain/dancer
// My name is Cuban Pete, I'm the King of the Rumba Beat
name = PRAETORIAN_DANCER
- description = "You lose all of your acid-based abilities and a small amount of your armor in exchange for increased movement speed, evasion, and unparalleled agility that gives you an ability to move even more quickly, dodge bullets, and phase through tallhosts. By slashing tallhosts, you temporarily increase your movement speed and you also you apply a tag that changes how your two new tail abilities function. By tagging hosts, you will make Impale hit twice instead of once and make Tail Trip knock hosts down instead of stunning them."
- flavor_description = "Demonstrate to the talls what 'there is beauty in death' truly symbolizes, then dance upon their graves!"
+ description = "You lose all of your acid-based abilities and a small amount of your armor in exchange for increased movement speed, evasion, and unparalleled agility that gives you an ability to move even more quickly, dodge bullets, and phase through enemies and allies alike. By slashing enemies, you temporarily increase your movement speed and you also you apply a tag that changes how your two new tail abilities function. By tagging enemies, you will make Impale hit twice instead of once and make Tail Trip knock enemies down instead of stunning them."
+ flavor_description = "A performance fit for a Queen, this one will become my instrument of death."
icon_state_prefix = "Dancer"
actions_to_remove = list(
diff --git a/code/modules/mob/living/carbon/xenomorph/strains/castes/praetorian/oppressor.dm b/code/modules/mob/living/carbon/xenomorph/strains/castes/praetorian/oppressor.dm
index 91ea59661462..b9541a13ca80 100644
--- a/code/modules/mob/living/carbon/xenomorph/strains/castes/praetorian/oppressor.dm
+++ b/code/modules/mob/living/carbon/xenomorph/strains/castes/praetorian/oppressor.dm
@@ -1,8 +1,8 @@
/datum/xeno_strain/oppressor
// Dread it, run from it, destiny still arrives... or should I say, I do
name = PRAETORIAN_OPPRESSOR
- description = "You abandon all of your acid-based abilities, your dash, some speed, and a bit of your slash damage for some resistance against small explosives, slashes that deal extra damage to prone targets, and a powerful hook ability that pulls up to three talls towards you, slows them, and has varying effects depending on how many talls you pull. You also gain a powerful punch that reduces your other abilities' cooldowns, pierces through armor, and does double damage in addition to rooting slowed targets. You can also knock talls back and slow them with your new Tail Lash and quickly grab a tall, slow it, and pull it towards you with your unique Tail Stab."
- flavor_description = "Dread it. Run from it. The Hive arrives all the same, or, more accurately, you do."
+ description = "You abandon all of your acid-based abilities, your dash, some speed, and a bit of your slash damage for some resistance against small explosives, slashes that deal extra damage to prone targets, and a powerful hook ability that pulls up to three enemies towards you, slows them, and has varying effects depending on how many enemies you pull. You also gain a powerful punch that reduces your other abilities' cooldowns, pierces through armor, and does double damage in addition to rooting slowed targets. You can also knock enemies back and slow them with your new Tail Lash and quickly grab a tall, slow it, and pull it towards you with your unique Tail Stab."
+ flavor_description = "My reach is endless, this one will pull down the heavens."
icon_state_prefix = "Oppressor"
actions_to_remove = list(
diff --git a/code/modules/mob/living/carbon/xenomorph/strains/castes/praetorian/vanguard.dm b/code/modules/mob/living/carbon/xenomorph/strains/castes/praetorian/vanguard.dm
index 2a344523e974..310db35ab370 100644
--- a/code/modules/mob/living/carbon/xenomorph/strains/castes/praetorian/vanguard.dm
+++ b/code/modules/mob/living/carbon/xenomorph/strains/castes/praetorian/vanguard.dm
@@ -1,7 +1,7 @@
/datum/xeno_strain/vanguard
name = PRAETORIAN_VANGUARD
- description = "You forfeit all of your acid-based abilities and some health for some extra speed and a rechargable shield that can block one attack. Use your Pierce from up to three paces away to stab through talls, while stabbing through several will completely recharge your shield. Use your charge to plow through enemies and use it again to unleash a powerful AoE slash that reaches up to three paces. You also have a Cleave ability, amplified by your shield, which you can toggle to either immobilize or fling a target away."
- flavor_description = "They are my bulwark against the tallhosts. They are my Vanguard and they shall know no fear."
+ description = "You forfeit all of your acid-based abilities and some health for some extra speed and a rechargable shield that can block one attack. Use your Pierce from up to three paces away to stab through talls, while stabbing through two or more will completely recharge your shield. Use your charge to plow through enemies and use it again to unleash a powerful AoE slash that reaches up to three paces. You also have a Cleave ability, amplified by your shield, which you can toggle to either immobilize or fling a target away."
+ flavor_description = "Fearless you are born, fearless you serve, fearless you die. This one will become my Vanguard"
icon_state_prefix = "Vanguard"
actions_to_remove = list(
diff --git a/code/modules/mob/living/carbon/xenomorph/strains/castes/praetorian/warden.dm b/code/modules/mob/living/carbon/xenomorph/strains/castes/praetorian/warden.dm
index 313778baf038..9dc9404ee498 100644
--- a/code/modules/mob/living/carbon/xenomorph/strains/castes/praetorian/warden.dm
+++ b/code/modules/mob/living/carbon/xenomorph/strains/castes/praetorian/warden.dm
@@ -1,8 +1,8 @@
/datum/xeno_strain/warden
// i mean so basically im braum
name = PRAETORIAN_WARDEN
- description = "You trade your acid ball, acid spray, dash, and a small bit of your slash damage and speed to become an effective medic. You gain the ability to emit strong pheromones, an ability that retrieves endangered, knocked-down or sitting allies and pulls them to your location, and you gain an internal hitpoint pool that fills with every slash against your enemies, which can be spent to aid your allies and yourself by healing them or curing their ailments."
- flavor_description = "Only in death does your sisters' service to the Queen end. They will be untouched by plague or disease; no sickness will blight them."
+ description = "You trade your acid ball, acid spray, dash, and a small bit of your slash damage and speed to become an effective medic. You gain the ability to emit strong pheromones, an ability that retrieves endangered, knocked-down or resting allies and pulls them to your location, and you gain an internal hitpoint pool that fills with every slash against your enemies, which can be spent to aid your allies and yourself by healing them or curing their ailments."
+ flavor_description = "This one will deny her sisters' deaths until they earn it. Fight or be forgotten."
icon_state_prefix = "Warden"
actions_to_remove = list(
diff --git a/code/modules/mob/living/carbon/xenomorph/strains/castes/ravager/berserker.dm b/code/modules/mob/living/carbon/xenomorph/strains/castes/ravager/berserker.dm
index c12324aa5b2a..5b8981157bda 100644
--- a/code/modules/mob/living/carbon/xenomorph/strains/castes/ravager/berserker.dm
+++ b/code/modules/mob/living/carbon/xenomorph/strains/castes/ravager/berserker.dm
@@ -1,7 +1,7 @@
/datum/xeno_strain/berserker
name = RAVAGER_BERSERKER
- description = "You lose your empower, charge, and scissor cut, decrease your health, and sacrifice a bit of your influence under frenzy pheromones to increase your movement speed, slightly increase your armor, and gain a new set of abilities that make you a terrifying melee monster. By slashing, you heal yourself and gain a stack of rage that increases your armor, movement speed, attack speed, and your heals per slash, to a maximum of six rage. Use your new Appehend ability to increase your movement speed and apply a slow on the next target you slash and use your Clothesline ability to fling your target to heal yourself, even more-so if you have a rage stack that will be used up. Finally, use your Eviscerate to unleash a devastating windmill attack that heals you for every host you hit after an immobilizing wind-up."
- flavor_description = "They shall be my finest warriors. They will rend and tear, crush and butcher, and maim and rage until every tallhost falls."
+ description = "You lose your empower, charge, and scissor cut, decrease your health, and sacrifice a bit of your influence under frenzy pheromones to increase your movement speed, slightly increase your armor, and gain a new set of abilities that make you a terrifying melee monster. By slashing, you heal yourself and gain a stack of rage that increases your armor, movement speed, attack speed, and your heals per slash, to a maximum of six rage. Use your new Appehend ability to increase your movement speed and apply a slow on the next target you slash and use your Clothesline ability to fling your target to heal yourself, even more-so if you have a rage stack that will be used up. Finally, use your Eviscerate to unleash a devastating windmill attack that heals you for every enemy you hit after an immobilizing wind-up."
+ flavor_description = "Unbridled fury fills this one. You will become an extension of my rage."
icon_state_prefix = "Berserker"
actions_to_remove = list(
@@ -41,7 +41,7 @@
// Eviscerate config
var/rage_lock_duration = 10 SECONDS // 10 seconds of max rage
- var/rage_cooldown_duration = 8 SECONDS // 8 seconds of NO rage.
+ var/rage_cooldown_duration = 10 SECONDS // 10 seconds of NO rage.
// State for tracking rage
var/rage = 0
diff --git a/code/modules/mob/living/carbon/xenomorph/strains/castes/ravager/hedgehog.dm b/code/modules/mob/living/carbon/xenomorph/strains/castes/ravager/hedgehog.dm
index e1d6dc583416..b88df4068cec 100644
--- a/code/modules/mob/living/carbon/xenomorph/strains/castes/ravager/hedgehog.dm
+++ b/code/modules/mob/living/carbon/xenomorph/strains/castes/ravager/hedgehog.dm
@@ -1,7 +1,7 @@
/datum/xeno_strain/hedgehog
name = RAVAGER_HEDGEHOG
- description = "You lose your empower, charge, scissor cut and some slash damage, for a bit more explosive resistance, immunity to small explosions, and you gain several new abilities that allow you to become a spiky tank. You build up shards internally over time and also when taking damage that increase your armor's resilience. You can use these shards to power three new abilities: Spike Shield, which gives you a temporary shield that spits bone shards around you when damaged, Fire Spikes, which launches spikes at your target that slows them and does extra damage if they move, and finally, Spike Shed, which launches spikes all around yourself and gives you a temporary speed boost as an escape plan at the cost of all your stored shards and being unable to gain shards for thirty seconds."
- flavor_description = "They will be of iron will and steely muscle. In great armor shall they be clad, and with the mightiest spikes will they be armed."
+ description = "You lose your empower, charge, scissor cut, and some slash damage in exchange for more explosive resistance. Your resistance scales with your shard count and at 50% grants you immunity to some explosive stuns. You accumulate shards over time and when taking damage. You can use these shards to power three new abilities: Spike Shield which gives you a temporary shield that spits bone shards around you when damaged; Fire Spikes which launches spikes at your target to slow them and deal damage when they move; and Spike Shed which launches all your spikes, grants a temporary speed boost, and disables shard generation for thirty seconds."
+ flavor_description = "You will pierce them a million times, show them what it feels like. This one will become my shield."
icon_state_prefix = "Hedgehog"
actions_to_remove = list(
@@ -19,7 +19,7 @@
/datum/xeno_strain/hedgehog/apply_strain(mob/living/carbon/xenomorph/ravager/ravager)
ravager.plasma_max = 0
- ravager.small_explosives_stun = FALSE
+ ravager.small_explosives_stun = TRUE
ravager.explosivearmor_modifier += XENO_EXPOSIVEARMOR_MOD_SMALL
ravager.damage_modifier -= XENO_DAMAGE_MOD_SMALL
@@ -72,7 +72,6 @@
bound_xeno.speed_modifier += shard_lock_speed_mod
bound_xeno.recalculate_speed()
-
shards_locked = FALSE
// Return true if we have enough shards, false otherwise
@@ -103,6 +102,15 @@
var/percentage_shards = round((shards / max_shards) * 100, 10)
if(percentage_shards)
holder.overlays += image('icons/mob/hud/hud.dmi', "xenoenergy[percentage_shards]")
+
+ if(percentage_shards >= 50)
+ bound_xeno.small_explosives_stun = FALSE
+ bound_xeno.add_filter("hedge_unstunnable", 1, list("type" = "outline", "color" = "#421313", "size" = 1))
+ else
+ bound_xeno.small_explosives_stun = TRUE
+ bound_xeno.remove_filter("hedge_unstunnable", 1, list("type" = "outline", "color" = "#421313", "size" = 1))
+
+
return
diff --git a/code/modules/mob/living/carbon/xenomorph/strains/castes/runner/acid.dm b/code/modules/mob/living/carbon/xenomorph/strains/castes/runner/acid.dm
index 7b9bafadeb7b..f98263871707 100644
--- a/code/modules/mob/living/carbon/xenomorph/strains/castes/runner/acid.dm
+++ b/code/modules/mob/living/carbon/xenomorph/strains/castes/runner/acid.dm
@@ -1,7 +1,7 @@
/datum/xeno_strain/acider
name = RUNNER_ACIDER
description = "At the cost of a little bit of your speed and all of your current abilities, you gain a considerable amount of health, some armor, and a new organ that fills with volatile acid over time. Your Tail Stab and slashes apply acid to living lifeforms that slowly burns them, and slashes against targets with acid stacks fill your acid glands. You also gain Corrosive Acid equivalent to that of a boiler that you can deploy more quickly than any other caste, at the cost of a chunk of your acid reserves with each use. Finally, after a twenty second windup, you can force your body to explode, covering everything near you with acid. The more acid you have stored, the more devastating the explosion will be, but during those twenty seconds before detonation you are slowed and give off several warning signals which give talls an opportunity to end you before you can detonate. If you successfully explode, you will reincarnate as a larva again!"
- flavor_description = "Burn their walls, maim their faces! Your life, for The Hive!"
+ flavor_description = "This one will be the last thing they hear. A martyr."
icon_state_prefix = "Acider"
actions_to_remove = list(
diff --git a/code/modules/mob/living/carbon/xenomorph/update_icons.dm b/code/modules/mob/living/carbon/xenomorph/update_icons.dm
index cf84312657a3..ac0c381f5ed4 100644
--- a/code/modules/mob/living/carbon/xenomorph/update_icons.dm
+++ b/code/modules/mob/living/carbon/xenomorph/update_icons.dm
@@ -207,31 +207,46 @@
overlays_standing[X_LEGCUFF_LAYER] = image("icon" = 'icons/mob/xenos/effects.dmi', "icon_state" = "legcuff", "layer" =-X_LEGCUFF_LAYER)
apply_overlay(X_LEGCUFF_LAYER)
-/mob/living/carbon/xenomorph/proc/create_shriekwave(color = null)
- var/image/screech_image
-
- var/offset_x = 0
- var/offset_y = 0
- if(mob_size <= MOB_SIZE_XENO)
- offset_x = -7
- offset_y = -10
-
- if (color)
- screech_image = image("icon"='icons/mob/xenos/overlay_effects64x64.dmi', "icon_state" = "shriek_waves_greyscale") // For Praetorian screech
- screech_image.color = color
- else
- screech_image = image("icon"='icons/mob/xenos/overlay_effects64x64.dmi', "icon_state" = "shriek_waves") //Ehh, suit layer's not being used.
-
- screech_image.pixel_x = offset_x
- screech_image.pixel_y = offset_y
-
- screech_image.appearance_flags |= RESET_COLOR
-
- remove_suit_layer()
-
- overlays_standing[X_SUIT_LAYER] = screech_image
- apply_overlay(X_SUIT_LAYER)
- addtimer(CALLBACK(src, PROC_REF(remove_overlay), X_SUIT_LAYER), 30)
+/mob/living/carbon/xenomorph/proc/create_shriekwave(shriekwaves_left)
+ var/offset_y = 8
+ if(mob_size == MOB_SIZE_XENO)
+ offset_y = 24
+ if(mob_size == MOB_SIZE_IMMOBILE)
+ offset_y = 28
+
+ //the shockwave center is updated eachtime shockwave is called and offset relative to the mob_size.
+ //due to the speed of the shockwaves, it isn't required to be tied to the exact mob movements
+ var/epicenter = loc //center of the shockwave, set at the center of the tile that the mob is currently standing on
+ var/easing = QUAD_EASING | EASE_OUT
+ var/stage1_radius = rand(11, 12)
+ var/stage2_radius = rand(9, 11)
+ var/stage3_radius = rand(8, 10)
+ var/stage4_radius = 7.5
+
+ //shockwaves are iterated, counting down once per shriekwave, with the total amount being determined on the respective xeno ability tile
+ if(shriekwaves_left > 12)
+ shriekwaves_left--
+ new /obj/effect/shockwave(epicenter, stage1_radius, 0.5, easing, offset_y)
+ addtimer(CALLBACK(src, PROC_REF(create_shriekwave), shriekwaves_left), 2)
+ return
+ if(shriekwaves_left > 8)
+ shriekwaves_left--
+ new /obj/effect/shockwave(epicenter, stage2_radius, 0.5, easing, offset_y)
+ addtimer(CALLBACK(src, PROC_REF(create_shriekwave), shriekwaves_left), 3)
+ return
+ if(shriekwaves_left > 4)
+ shriekwaves_left--
+ new /obj/effect/shockwave(epicenter, stage3_radius, 0.5, easing, offset_y)
+ addtimer(CALLBACK(src, PROC_REF(create_shriekwave), shriekwaves_left), 3)
+ return
+ if(shriekwaves_left > 1)
+ shriekwaves_left--
+ new /obj/effect/shockwave(epicenter, stage4_radius, 0.5, easing, offset_y)
+ addtimer(CALLBACK(src, PROC_REF(create_shriekwave), shriekwaves_left), 3)
+ return
+ if(shriekwaves_left == 1)
+ shriekwaves_left--
+ new /obj/effect/shockwave(epicenter, 10.5, 0.6, easing, offset_y)
/mob/living/carbon/xenomorph/proc/create_stomp()
remove_suit_layer()
diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm
index dcab9f70cbb5..14f220b3a77f 100644
--- a/code/modules/mob/living/simple_animal/parrot.dm
+++ b/code/modules/mob/living/simple_animal/parrot.dm
@@ -107,23 +107,6 @@
walk(src,0)
. = ..()
-/*
- * Inventory
- */
-/mob/living/simple_animal/parrot/show_inv(mob/user as mob)
- user.set_interaction(src)
- if(user.stat) return
-
- var/dat = "Inventory of [name]
"
- if(ears)
- dat += "
Headset: [ears] (Remove)"
- else
- dat += "
Headset: Nothing"
-
- user << browse(dat, text("window=mob[];size=325x500", name))
- onclose(user, "mob[real_name]")
- return
-
/mob/living/simple_animal/parrot/Topic(href, href_list)
//Can the usr physically do this?
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index ec8aee36859f..13408be2096e 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -372,25 +372,6 @@
SIGNAL_HANDLER
reset_view(null)
-/mob/proc/show_inv(mob/user)
- user.set_interaction(src)
- var/dat = {"
-
[name]
-
-
Head(Mask): [(wear_mask ? wear_mask : "Nothing")]
-
Left Hand: [(l_hand ? l_hand : "Nothing")]
-
Right Hand: [(r_hand ? r_hand : "Nothing")]
-
Back: [(back ? back : "Nothing")] [((istype(wear_mask, /obj/item/clothing/mask) && istype(back, /obj/item/tank) && !( internal )) ? text(" Set Internal", src) : "")]
-
[(internal ? text("Remove Internal") : "")]
-
Empty Pockets
-
Refresh
-
Close
-
"}
- show_browser(user, dat, name, "mob[name]")
- return
-
-
-
/mob/proc/point_to_atom(atom/A, turf/T)
//Squad Leaders and above have reduced cooldown and get a bigger arrow
if(check_improved_pointing())
@@ -448,21 +429,6 @@
update_flavor_text()
return
-
-/mob/MouseDrop(mob/M)
- ..()
- if(M != usr) return
- if(usr == src) return
- if(!Adjacent(usr)) return
- if(!ishuman(M) && !ismonkey(M)) return
- if(!ishuman(src) && !ismonkey(src)) return
- if(M.is_mob_incapacitated())
- return
- if(M.pulling == src && (M.a_intent & INTENT_GRAB) && M.grab_level == GRAB_AGGRESSIVE)
- return
-
- show_inv(M)
-
/mob/proc/swap_hand()
hand = !hand
SEND_SIGNAL(src, COMSIG_MOB_SWAPPED_HAND)
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index 44286b5fabe0..4b3d2257eb9e 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -163,7 +163,7 @@
var/datum/skills/skills = null //the knowledge you have about certain abilities and actions (e.g. do you how to do surgery?)
//see skills.dm in #define folder and code/datums/skills.dm for more info
- var/obj/item/legcuffs/legcuffed = null //Same as handcuffs but for legs. Bear traps use this.
+ var/obj/item/restraint/legcuffs/legcuffed = null //Same as handcuffs but for legs. Bear traps use this.
var/list/viruses = list() //List of active diseases
diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm
index bd7370f4806f..b6f2871e0370 100644
--- a/code/modules/mob/mob_grab.dm
+++ b/code/modules/mob/mob_grab.dm
@@ -132,6 +132,7 @@
if(user.action_busy)
to_chat(xeno, SPAN_WARNING("We are already busy with something."))
return
+ SEND_SIGNAL(xeno, COMSIG_MOB_EFFECT_CLOAK_CANCEL)
xeno.visible_message(SPAN_DANGER("[xeno] starts to devour [pulled]!"), \
SPAN_DANGER("We start to devour [pulled]!"), null, 5)
if(HAS_TRAIT(xeno, TRAIT_CLOAKED)) //cloaked don't show the visible message, so we gotta work around
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index cb36e919e82a..db6f9c120591 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -331,7 +331,7 @@ GLOBAL_LIST_INIT(limb_types_by_name, list(
while(i < steps)
animate(pixel_x = old_X + rand(-(strength), strength), pixel_y = old_y + rand(-(strength), strength), easing = JUMP_EASING, time = time_per_step)
i++
- animate(pixel_x = old_X, pixel_y = old_y,time = clamp(Floor(strength/PIXELS_PER_STRENGTH_VAL),2,4))//ease it back
+ animate(pixel_x = old_X, pixel_y = old_y,time = clamp(floor(strength/PIXELS_PER_STRENGTH_VAL),2,4))//ease it back
#undef PIXELS_PER_STRENGTH_VAL
@@ -342,7 +342,7 @@ GLOBAL_LIST_INIT(limb_types_by_name, list(
return FALSE
-/mob/proc/abiotic(full_body = 0)
+/mob/proc/abiotic(full_body = FALSE)
if(full_body && ((src.l_hand && !( src.l_hand.flags_item & ITEM_ABSTRACT )) || (src.r_hand && !( src.r_hand.flags_item & ITEM_ABSTRACT )) || (src.back || src.wear_mask)))
return TRUE
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index 7917394df830..f436863b2f2f 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -451,7 +451,7 @@
var/time_remaining = SSticker.GetTimeLeft()
if(time_remaining > 0)
- . += "Time To Start: [round(time_remaining)]s"
+ . += "Time To Start: [round(time_remaining)]s[SSticker.delay_start ? " (DELAYED)" : ""]"
else if(time_remaining == -10)
. += "Time To Start: DELAYED"
else
diff --git a/code/modules/movement/launching/launching.dm b/code/modules/movement/launching/launching.dm
index 3e188abb1067..778c452a3240 100644
--- a/code/modules/movement/launching/launching.dm
+++ b/code/modules/movement/launching/launching.dm
@@ -182,17 +182,21 @@
add_temp_pass_flags(pass_flags)
+ var/turf/start_turf = get_step_towards(src, LM.target)
+ var/list/turf/path = get_line(start_turf, LM.target)
var/last_loc = loc
var/early_exit = FALSE
LM.dist = 0
- while (src && throwing && loc == last_loc && isturf(src.loc)) // While looks scary at first but it's basically just a for until LM.dist reaches LM.range
+ for (var/turf/T in path)
+ if (!src || !throwing || loc != last_loc || !isturf(src.loc))
+ break
if (!LM || QDELETED(LM))
early_exit = TRUE
break
if (LM.dist >= LM.range)
break
- if (!Move(get_step_towards(src, LM.target))) // If this returns FALSE, then a collision happened
+ if (!Move(T)) // If this returns FALSE, then a collision happened
break
last_loc = loc
if (++LM.dist >= LM.range)
diff --git a/code/modules/objectives/data_retrieval.dm b/code/modules/objectives/data_retrieval.dm
index f66c578f48fb..ee5053f26c4b 100644
--- a/code/modules/objectives/data_retrieval.dm
+++ b/code/modules/objectives/data_retrieval.dm
@@ -117,29 +117,14 @@
/datum/cm_objective/retrieve_data/disk/process()
var/obj/structure/machinery/computer/disk_reader/reader = disk.loc
if(!reader.powered())
- reader.visible_message(SPAN_WARNING("\The [reader] powers down mid-operation as the area looses power."))
- playsound(reader, 'sound/machines/terminal_shutdown.ogg', 25, 1)
- SSobjectives.stop_processing_objective(src)
- disk.forceMove(reader.loc)
- reader.disk = null
+ SEND_SIGNAL(reader, COMSIG_INTEL_DISK_LOST_POWER)
return
..()
/datum/cm_objective/retrieve_data/disk/complete()
state = OBJECTIVE_COMPLETE
- var/obj/structure/machinery/computer/disk_reader/reader = disk.loc
- reader.visible_message("\The [reader] pings softly as the upload finishes and ejects the disk.")
- playsound(reader, 'sound/machines/screen_output1.ogg', 25, 1)
- disk.forceMove(reader.loc)
- disk.name = "[disk.name] (complete)"
- reader.disk = null
- award_points()
-
- // Now enable the objective to store this disk in the lab.
- disk.retrieve_objective.state = OBJECTIVE_ACTIVE
- disk.retrieve_objective.activate()
-
+ SEND_SIGNAL(disk.loc, COMSIG_INTEL_DISK_COMPLETED)
..()
/datum/cm_objective/retrieve_data/disk/get_tgui_data()
@@ -295,34 +280,6 @@
unslashable = TRUE
unacidable = TRUE
-/obj/structure/machinery/computer/disk_reader/attack_hand(mob/living/user)
- if(isxeno(user))
- return
- if(disk)
- to_chat(user, SPAN_NOTICE("[disk] is currently being uploaded to ARES."))
-
-/obj/structure/machinery/computer/disk_reader/attackby(obj/item/W, mob/living/user)
- if(istype(W, /obj/item/disk/objective))
- if(istype(disk))
- to_chat(user, SPAN_WARNING("There is a disk in the drive being uploaded already!"))
- return FALSE
- var/obj/item/disk/objective/newdisk = W
- if(newdisk.objective.state == OBJECTIVE_COMPLETE)
- to_chat(user, SPAN_WARNING("The reader displays a message stating this disk has already been read and refuses to accept it."))
- return FALSE
- if(input(user,"Enter the encryption key","Decrypting [newdisk]","") != newdisk.objective.decryption_password)
- to_chat(user, SPAN_WARNING("The reader asks for the encryption key for this disk, not having the correct key you eject the disk."))
- return FALSE
- if(istype(disk))
- to_chat(user, SPAN_WARNING("There is a disk in the drive being uploaded already!"))
- return FALSE
-
- if(!(newdisk in user.contents))
- return FALSE
-
- newdisk.objective.activate()
-
- user.drop_inv_item_to_loc(W, src)
- disk = W
- to_chat(user, SPAN_NOTICE("You insert \the [W] and enter the decryption key."))
- user.count_niche_stat(STATISTICS_NICHE_DISK)
+/obj/structure/machinery/computer/disk_reader/Initialize()
+ . = ..()
+ AddComponent(/datum/component/disk_reader)
diff --git a/code/modules/objectives/objective_memory_storage.dm b/code/modules/objectives/objective_memory_storage.dm
index 161c78d4d1ba..de2ab30691cc 100644
--- a/code/modules/objectives/objective_memory_storage.dm
+++ b/code/modules/objectives/objective_memory_storage.dm
@@ -218,6 +218,15 @@ GLOBAL_DATUM_INIT(intel_system, /datum/intel_system, new())
GLOB.intel_system.store_single_objective(O)
return 1
+/obj/structure/machinery/computer/intel/disk_reader // ARC computer to save on tile space
+ name = "\improper SIGINT terminal"
+ desc = "An USCM computer capable of uploading data to the intelligence database. It has a disk reader slot built into the bottom, as well."
+ icon_state = "terminal"
+
+/obj/structure/machinery/computer/intel/disk_reader/Initialize()
+ . = ..()
+ AddComponent(/datum/component/disk_reader)
+
// --------------------------------------------
// *** View objectives with the computer ***
// --------------------------------------------
diff --git a/code/modules/organs/limbs.dm b/code/modules/organs/limbs.dm
index 4c3954575245..3cf8dae2a2c6 100644
--- a/code/modules/organs/limbs.dm
+++ b/code/modules/organs/limbs.dm
@@ -1513,7 +1513,7 @@ treat_grafted var tells it to apply to grafted but unsalved wounds, for burn kit
/obj/limb/head/limb_delimb(damage_source)
var/obj/item/clothing/head/helmet/owner_helmet = owner.head
- if(!istype(owner_helmet) || !owner.allow_gun_usage)
+ if(!istype(owner_helmet) || (issynth(owner) && !owner.allow_gun_usage))
droplimb(0, 0, damage_source)
return
diff --git a/code/modules/paperwork/desk_bell.dm b/code/modules/paperwork/desk_bell.dm
index 6e7de1101ae7..ddd4a9dc5d58 100644
--- a/code/modules/paperwork/desk_bell.dm
+++ b/code/modules/paperwork/desk_bell.dm
@@ -93,3 +93,12 @@
flick("desk_bell_activate", src)
times_rang++
return TRUE
+
+/obj/item/desk_bell/ares
+ name = "AI core reception bell"
+
+/obj/item/desk_bell/ares/ring_bell(mob/living/user)
+ if(broken_ringer)
+ return FALSE
+ ares_apollo_talk("Attendence requested at AI Core Reception.")
+ return ..()
diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm
index 08711f295085..0d5eca1dd9a1 100644
--- a/code/modules/paperwork/photocopier.dm
+++ b/code/modules/paperwork/photocopier.dm
@@ -1,7 +1,9 @@
+/// Normal Photocopier, made by Seegson
/obj/structure/machinery/photocopier
name = "photocopier"
icon = 'icons/obj/structures/machinery/library.dmi'
icon_state = "bigscanner"
+ desc = "A photocopier used for copying... you know, photos! Also useful for copying documents on paper. This specific model has been manufactured by Seegson in a cheaper frame than most modern photocopiers. It uses more primitive copying technology resulting in more toner waste and less printing capabilities. Nonetheless, its cheap construction means cheaper costs, and for people that only need to print a paper or two most of the time, it becomes cost-effective."
anchored = TRUE
density = TRUE
use_power = USE_POWER_IDLE
@@ -11,9 +13,15 @@
var/obj/item/paper/copy = null //what's in the copier!
var/obj/item/photo/photocopy = null
var/obj/item/paper_bundle/bundle = null
- var/copies = 1 //how many copies to print!
- var/toner = 30 //how much toner is left! woooooo~
- var/maxcopies = 10 //how many copies can be copied at once- idea shamelessly stolen from bs12's copier!
+ ///how many copies to print!
+ var/copies = 1
+ ///how much toner is left! woooooo~
+ var/toner = 45
+ ///how many copies can be copied at once- idea shamelessly stolen from bs12's copier!
+ var/maxcopies = 10
+ ///the flick state to use when inserting paper into the machine
+ var/animate_state = "bigscanner1"
+
/obj/structure/machinery/photocopier/attack_remote(mob/user as mob)
return attack_hand(user)
@@ -116,7 +124,7 @@
if(user.drop_inv_item_to_loc(O, src))
copy = O
to_chat(user, SPAN_NOTICE("You insert the paper into \the [src]."))
- flick("bigscanner1", src)
+ flick(animate_state, src)
updateUsrDialog()
else
to_chat(user, SPAN_NOTICE("There is already something in \the [src]."))
@@ -125,7 +133,7 @@
if(user.drop_inv_item_to_loc(O, src))
photocopy = O
to_chat(user, SPAN_NOTICE("You insert the photo into \the [src]."))
- flick("bigscanner1", src)
+ flick(animate_state, src)
updateUsrDialog()
else
to_chat(user, SPAN_NOTICE("There is already something in \the [src]."))
@@ -134,13 +142,13 @@
if(user.drop_inv_item_to_loc(O, src))
bundle = O
to_chat(user, SPAN_NOTICE("You insert the bundle into \the [src]."))
- flick("bigscanner1", src)
+ flick(animate_state, src)
updateUsrDialog()
else if(istype(O, /obj/item/device/toner))
if(toner == 0)
if(user.temp_drop_inv_item(O))
qdel(O)
- toner = 30
+ toner = initial(toner)
to_chat(user, SPAN_NOTICE("You insert the toner cartridge into \the [src]."))
updateUsrDialog()
else
@@ -239,6 +247,21 @@
return p
+/// Upgraded photocopier, straight upgrade from the normal photocopier, made by Weyland-Yutani
+/obj/structure/machinery/photocopier/wyphotocopier
+ name = "photocopier"
+ icon = 'icons/obj/structures/machinery/library.dmi'
+ icon_state = "bigscannerpro"
+ desc = "A photocopier used for copying... you know, photos! Also useful for copying documents on paper. This specific model has been manufactured by Weyland-Yutani in a more modern and robust frame than the average photocopiers you see from smaller companies. It uses some of the most advanced technologies in the area of paper-printing such as bigger toner economy and much higher printing capabilities. All that makes it the favorite among consumers that need to print high amounts of paperwork for their daily duties."
+ idle_power_usage = 50
+ active_power_usage = 300
+ copies = 1
+ toner = 180
+ maxcopies = 30
+ animate_state = "bigscannerpro1"
+
+
+/// The actual toner cartridge used in photcopiers
/obj/item/device/toner
name = "toner cartridge"
icon_state = "tonercartridge"
diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm
index 5614a4ffe52b..df39248e343a 100644
--- a/code/modules/paperwork/photography.dm
+++ b/code/modules/paperwork/photography.dm
@@ -359,6 +359,12 @@
flags_equip_slot = NO_FLAGS //cannot be equiped
var/obj/structure/machinery/camera/correspondent/linked_cam
+/obj/item/device/camera/broadcasting/Initialize(mapload, ...)
+ . = ..()
+ linked_cam = new(loc, src)
+ linked_cam.status = FALSE
+ RegisterSignal(src, COMSIG_COMPONENT_ADDED, PROC_REF(handle_rename))
+
/obj/item/device/camera/broadcasting/Destroy()
clear_broadcast()
return ..()
@@ -367,13 +373,25 @@
. = ..()
if(!.)
return
- linked_cam = new(loc, src)
+ flags_atom |= (USES_HEARING|USES_SEEING)
+ if(!linked_cam || QDELETED(linked_cam))
+ linked_cam = new(loc, src)
+ else
+ linked_cam.status = TRUE
+ linked_cam.forceMove(loc)
SEND_SIGNAL(src, COMSIG_BROADCAST_GO_LIVE)
to_chat(user, SPAN_NOTICE("[src] begins to buzz softly as you go live."))
/obj/item/device/camera/broadcasting/unwield(mob/user)
. = ..()
- clear_broadcast()
+ flags_atom &= ~(USES_HEARING|USES_SEEING)
+ linked_cam.status = FALSE
+
+/obj/item/device/camera/broadcasting/proc/handle_rename(obj/item/camera, datum/component/label)
+ SIGNAL_HANDLER
+ if(!istype(label, /datum/component/label))
+ return
+ linked_cam.c_tag = get_broadcast_name()
/obj/item/device/camera/broadcasting/proc/clear_broadcast()
if(!QDELETED(linked_cam))
@@ -385,6 +403,12 @@
return src_label_component.label_name
return "Broadcast [serial_number]"
+/obj/item/device/camera/broadcasting/hear_talk(mob/living/sourcemob, message, verb = "says", datum/language/language, italics = FALSE)
+ SEND_SIGNAL(src, COMSIG_BROADCAST_HEAR_TALK, sourcemob, message, verb, language, italics, get_dist(sourcemob, src) < 3)
+
+/obj/item/device/camera/broadcasting/see_emote(mob/living/sourcemob, emote, audible = FALSE)
+ SEND_SIGNAL(src, COMSIG_BROADCAST_SEE_EMOTE, sourcemob, emote, audible, get_dist(sourcemob, src) < 3 && audible)
+
/obj/item/photo/proc/construct(datum/picture/P)
icon = P.fields["icon"]
tiny = P.fields["tiny"]
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index 76550fbe079b..8ec24526fc1e 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -1372,3 +1372,7 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list(
crash_break_probability = 0
#undef APC_UPDATE_ICON_COOLDOWN
+
+// apc that start at zero charge.
+/obj/structure/machinery/power/apc/nocharge
+ start_charge = 0
diff --git a/code/modules/projectiles/gun_attachables.dm b/code/modules/projectiles/gun_attachables.dm
index f875af99bb43..711b53f0fc77 100644
--- a/code/modules/projectiles/gun_attachables.dm
+++ b/code/modules/projectiles/gun_attachables.dm
@@ -1761,8 +1761,6 @@ Defined in conflicts.dm of the #defines folder.
//but at the same time you are slow when 2 handed
aim_speed_mod = CONFIG_GET(number/slowdown_med)
- matter = list("wood" = 2000)
-
select_gamemode_skin(type)
/obj/item/attachable/stock/double
@@ -2502,7 +2500,7 @@ Defined in conflicts.dm of the #defines folder.
/obj/item/attachable/stock/smg/collapsible/brace/apply_on_weapon(obj/item/weapon/gun/G)
if(stock_activated)
- G.flags_item |= NODROP
+ G.flags_item |= NODROP|FORCEDROP_CONDITIONAL
accuracy_mod = -HIT_ACCURACY_MULT_TIER_3
scatter_mod = SCATTER_AMOUNT_TIER_8
recoil_mod = RECOIL_AMOUNT_TIER_2 //Hurts pretty bad if it's wielded.
@@ -2513,7 +2511,7 @@ Defined in conflicts.dm of the #defines folder.
icon_state = "smg_brace_on"
attach_icon = "smg_brace_a_on"
else
- G.flags_item &= ~NODROP
+ G.flags_item &= ~(NODROP|FORCEDROP_CONDITIONAL)
accuracy_mod = 0
scatter_mod = 0
recoil_mod = 0
@@ -3221,6 +3219,14 @@ Defined in conflicts.dm of the #defines folder.
to_chat(user, SPAN_WARNING("\The [gun] doesn't have enough fuel to launch a projectile!"))
return
+ if(istype(flamer_reagent, /datum/reagent/foaming_agent/stabilized))
+ to_chat(user, SPAN_WARNING("This chemical will clog the nozzle!"))
+ return
+
+ if(istype(gun.current_mag, /obj/item/ammo_magazine/flamer_tank/smoke)) // you can't fire smoke like a projectile!
+ to_chat(user, SPAN_WARNING("[src] can't be used with this fuel tank!"))
+ return
+
gun.last_fired = world.time
gun.current_mag.reagents.remove_reagent(flamer_reagent.id, FLAME_REAGENT_USE_AMOUNT * fuel_per_projectile)
diff --git a/code/modules/projectiles/guns/flamer/flamer.dm b/code/modules/projectiles/guns/flamer/flamer.dm
index 5daef0bdff74..0388f5be7aef 100644
--- a/code/modules/projectiles/guns/flamer/flamer.dm
+++ b/code/modules/projectiles/guns/flamer/flamer.dm
@@ -136,7 +136,13 @@
click_empty(user)
else
user.track_shot(initial(name))
- unleash_flame(target, user)
+ if(istype(current_mag, /obj/item/ammo_magazine/flamer_tank/smoke))
+ unleash_smoke(target, user)
+ else
+ if(current_mag.reagents.has_reagent("stablefoam"))
+ unleash_foam(target, user)
+ else
+ unleash_flame(target, user)
return AUTOFIRE_CONTINUE
return NONE
@@ -226,6 +232,119 @@
new /obj/flamer_fire(to_fire, create_cause_data(initial(name), user), R, max_range, current_mag.reagents, flameshape, target, CALLBACK(src, PROC_REF(show_percentage), user), fuel_pressure, fire_type)
+/obj/item/weapon/gun/flamer/proc/unleash_smoke(atom/target, mob/living/user)
+ last_fired = world.time
+ if(!current_mag || !current_mag.reagents || !current_mag.reagents.reagent_list.len)
+ return
+
+ var/source_turf = get_turf(user)
+ var/smoke_range = 5 // the max range the smoke will travel
+ var/distance = 0 // the distance traveled
+ var/use_multiplier = 3 // if you want to increase the ammount of units drained from the tank
+ var/units_in_smoke = 35 // the smoke overlaps a little so this much is probably already good
+
+ var/datum/reagent/chemical = current_mag.reagents.reagent_list[1]
+ var/datum/reagents/to_disperse = new() // this is the chemholder that will be used by the chemsmoke
+ to_disperse.add_reagent(chemical.id, units_in_smoke)
+ to_disperse.my_atom = src
+
+ var/turf/turfs[] = get_line(user, target, FALSE)
+ var/turf/first_turf = turfs[1]
+ var/turf/second_turf = turfs[2]
+ var/ammount_required = (min(turfs.len, smoke_range) * use_multiplier) // the ammount of units that this click requires
+ for(var/turf/turf in turfs)
+
+ if(chemical.volume < ammount_required)
+ smoke_range = round(chemical.volume / use_multiplier)
+
+ if(distance >= smoke_range)
+ break
+
+ if(turf.density)
+ break
+ else
+ var/obj/effect/particle_effect/smoke/chem/checker = new()
+ var/atom/blocked = LinkBlocked(checker, source_turf, turf)
+ if(blocked)
+ break
+
+ playsound(turf, 'sound/effects/smoke.ogg', 25, 1)
+ if(turf != first_turf && turf != second_turf) // we skip the first tile and make it small on the second so the smoke doesn't touch the user
+ var/datum/effect_system/smoke_spread/chem/smoke = new()
+ smoke.set_up(to_disperse, 5, loca = turf)
+ smoke.start()
+ if(turf == second_turf)
+ var/datum/effect_system/smoke_spread/chem/smoke = new()
+ smoke.set_up(to_disperse, 1, loca = turf)
+ smoke.start()
+ sleep(2)
+
+ distance++
+
+ var/ammount_used = distance * use_multiplier // the actual ammount of units that we used
+
+ chemical.volume = max(chemical.volume - ammount_used, 0)
+
+ current_mag.reagents.total_volume = chemical.volume // this is needed for show_percentage to work
+
+ if(chemical.volume < use_multiplier) // there aren't enough units left for a single tile of smoke, empty the tank
+ current_mag.reagents.clear_reagents()
+
+ show_percentage(user)
+
+/obj/item/weapon/gun/flamer/proc/unleash_foam(atom/target, mob/living/user)
+ last_fired = world.time
+ if(!current_mag || !current_mag.reagents || !current_mag.reagents.reagent_list.len)
+ return
+
+ var/source_turf = get_turf(user)
+ var/foam_range = 6 // the max range the foam will travel
+ var/distance = 0 // the distance traveled
+ var/use_multiplier = 3 // if you want to increase the ammount of foam drained from the tank
+ var/datum/reagent/chemical = current_mag.reagents.reagent_list[1]
+
+ var/turf/turfs[] = get_line(user, target, FALSE)
+ var/turf/first_turf = turfs[1]
+ var/ammount_required = (min(turfs.len, foam_range) * use_multiplier) // the ammount of units that this click requires
+ for(var/turf/turf in turfs)
+
+ if(chemical.volume < ammount_required)
+ foam_range = round(chemical.volume / use_multiplier)
+
+ if(distance >= foam_range)
+ break
+
+ if(turf.density)
+ break
+ else
+ var/obj/effect/particle_effect/foam/checker = new()
+ var/atom/blocked = LinkBlocked(checker, source_turf, turf)
+ if(blocked)
+ break
+
+ if(turf == first_turf) // this is so the first foam tile doesn't expand and touch the user
+ var/datum/effect_system/foam_spread/foam = new()
+ foam.set_up(0.5, turf, metal_foam = FOAM_METAL_TYPE_IRON)
+ foam.start()
+ else
+ var/datum/effect_system/foam_spread/foam = new()
+ foam.set_up(1, turf, metal_foam = FOAM_METAL_TYPE_IRON)
+ foam.start()
+ sleep(2)
+
+ distance++
+
+ var/ammount_used = distance * use_multiplier // the actual ammount of units that we used
+
+ chemical.volume = max(chemical.volume - ammount_used, 0)
+
+ current_mag.reagents.total_volume = chemical.volume // this is needed for show_percentage to work
+
+ if(chemical.volume < use_multiplier) // there aren't enough units left for a single tile of foam, empty the tank
+ current_mag.reagents.clear_reagents()
+
+ show_percentage(user)
+
/obj/item/weapon/gun/flamer/proc/show_percentage(mob/living/user)
if(current_mag)
to_chat(user, SPAN_WARNING("The gauge reads: [round(current_mag.get_ammo_percent())]% fuel remains!"))
diff --git a/code/modules/projectiles/guns/flamer/flameshape.dm b/code/modules/projectiles/guns/flamer/flameshape.dm
index 3e5e398c91e8..0b7c01ed0b0b 100644
--- a/code/modules/projectiles/guns/flamer/flameshape.dm
+++ b/code/modules/projectiles/guns/flamer/flameshape.dm
@@ -67,7 +67,7 @@
return GLOB.alldirs
/datum/flameshape/star/handle_fire_spread(obj/flamer_fire/F, fire_spread_amount, burn_dam, fuel_pressure = 1)
- fire_spread_amount = Floor(fire_spread_amount * 1.5) // branch 'length'
+ fire_spread_amount = floor(fire_spread_amount * 1.5) // branch 'length'
var/turf/source_turf = get_turf(F.loc)
var/list/dirs = dirs_to_use()
diff --git a/code/modules/projectiles/guns/specialist/launcher/grenade_launcher.dm b/code/modules/projectiles/guns/specialist/launcher/grenade_launcher.dm
index 0f767d679d03..f1d951324930 100644
--- a/code/modules/projectiles/guns/specialist/launcher/grenade_launcher.dm
+++ b/code/modules/projectiles/guns/specialist/launcher/grenade_launcher.dm
@@ -317,7 +317,7 @@
/obj/item/weapon/gun/launcher/grenade/m81/riot
name = "\improper M81 riot grenade launcher"
desc = "A lightweight, single-shot low-angle grenade launcher to launch tear gas grenades. Used by the Colonial Marines Military Police during riots."
- valid_munitions = list(/obj/item/explosive/grenade/custom/teargas)
+ valid_munitions = list(/obj/item/explosive/grenade/custom/teargas, /obj/item/explosive/grenade/slug/baton)
preload = /obj/item/explosive/grenade/custom/teargas
//-------------------------------------------------------
diff --git a/code/modules/projectiles/guns/specialist/launcher/rocket_launcher.dm b/code/modules/projectiles/guns/specialist/launcher/rocket_launcher.dm
index 356d0e6c3b48..1f0ae4aed571 100644
--- a/code/modules/projectiles/guns/specialist/launcher/rocket_launcher.dm
+++ b/code/modules/projectiles/guns/specialist/launcher/rocket_launcher.dm
@@ -189,12 +189,18 @@
smoke.set_up(1, 0, backblast_loc, turn(user.dir, 180))
smoke.start()
playsound(src, 'sound/weapons/gun_rocketlauncher.ogg', 100, TRUE, 10)
- for(var/mob/living/carbon/C in backblast_loc)
- if(C.body_position == STANDING_UP && !HAS_TRAIT(C, TRAIT_EAR_PROTECTION)) //Have to be standing up to get the fun stuff
- C.apply_damage(15, BRUTE) //The shockwave hurts, quite a bit. It can knock unarmored targets unconscious in real life
- C.apply_effect(4, STUN) //For good measure
- C.apply_effect(6, STUTTER)
- C.emote("pain")
+ for(var/mob/living/carbon/mob in backblast_loc)
+ if(mob.body_position != STANDING_UP || HAS_TRAIT(mob, TRAIT_EAR_PROTECTION)) //Have to be standing up to get the fun stuff
+ continue
+ to_chat(mob, SPAN_BOLDWARNING("You got hit by the backblast!"))
+ mob.apply_damage(15, BRUTE) //The shockwave hurts, quite a bit. It can knock unarmored targets unconscious in real life
+ var/knockdown_amount = 6
+ if(isxeno(mob))
+ var/mob/living/carbon/xenomorph/xeno = mob
+ knockdown_amount = knockdown_amount * (1 - xeno.caste?.xeno_explosion_resistance / 100)
+ mob.KnockDown(knockdown_amount)
+ mob.apply_effect(6, STUTTER)
+ mob.emote("pain")
//-------------------------------------------------------
//M5 RPG'S MEAN FUCKING COUSIN
diff --git a/code/modules/projectiles/magazines/flamer.dm b/code/modules/projectiles/magazines/flamer.dm
index 7fba325177c6..bf5663cad069 100644
--- a/code/modules/projectiles/magazines/flamer.dm
+++ b/code/modules/projectiles/magazines/flamer.dm
@@ -90,7 +90,7 @@
to_chat(user, SPAN_WARNING("You can't mix fuel mixtures!"))
return
- if(!to_add.intensityfire)
+ if(!to_add.intensityfire && to_add.id != "stablefoam" && !istype(src, /obj/item/ammo_magazine/flamer_tank/smoke))
to_chat(user, SPAN_WARNING("This chemical is not potent enough to be used in a flamethrower!"))
return
@@ -236,3 +236,9 @@
max_intensity = 60
max_range = 8
max_duration = 50
+
+/obj/item/ammo_magazine/flamer_tank/smoke
+ name = "Custom incinerator smoke tank"
+ desc = "A tank holding powdered smoke that expands when exposed to an open flame and carries any chemicals along with it."
+ matter = list("metal" = 3750)
+ flamer_chem = null
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index edb565158185..cd69c1940aba 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -358,14 +358,7 @@
SEND_SIGNAL(src, COMSIG_BULLET_TERMINAL)
// Check we can reach the turf at all based on pathed grid
- var/proj_dir = get_dir(current_turf, next_turf)
- if((proj_dir & (proj_dir - 1)) && !current_turf.Adjacent(next_turf))
- ammo.on_hit_turf(current_turf, src)
- current_turf.bullet_act(src)
- return TRUE
-
- // Check for hits that would occur when moving to turf, such as a blocking cade
- if(scan_a_turf(next_turf, proj_dir))
+ if(check_canhit(current_turf, next_turf))
return TRUE
// Actually move
@@ -533,7 +526,8 @@
else
direct_hit = TRUE
- SEND_SIGNAL(firer, COMSIG_BULLET_DIRECT_HIT, L)
+ if(firer)
+ SEND_SIGNAL(firer, COMSIG_BULLET_DIRECT_HIT, L)
// At present, Xenos have no inherent effects or localized damage stemming from limb targeting
// Therefore we exempt the shooter from direct hit accuracy penalties as well,
@@ -600,6 +594,19 @@
if(SEND_SIGNAL(src, COMSIG_BULLET_POST_HANDLE_MOB, L, .) & COMPONENT_BULLET_PASS_THROUGH)
return FALSE
+/obj/projectile/proc/check_canhit(turf/current_turf, turf/next_turf)
+ var/proj_dir = get_dir(current_turf, next_turf)
+ if((proj_dir & (proj_dir - 1)) && !current_turf.Adjacent(next_turf))
+ ammo.on_hit_turf(current_turf, src)
+ current_turf.bullet_act(src)
+ return TRUE
+
+ // Check for hits that would occur when moving to turf, such as a blocking cade
+ if(scan_a_turf(next_turf, proj_dir))
+ return TRUE
+
+ return FALSE
+
//----------------------------------------------------------
// \\
// HITTING THE TARGET \\
diff --git a/code/modules/reagents/chemistry_machinery/chem_master.dm b/code/modules/reagents/chemistry_machinery/chem_master.dm
index dc5206bb2df5..5b145f75940f 100644
--- a/code/modules/reagents/chemistry_machinery/chem_master.dm
+++ b/code/modules/reagents/chemistry_machinery/chem_master.dm
@@ -141,7 +141,15 @@
if(length(label) < 3)
loaded_pill_bottle.maptext_label = label
loaded_pill_bottle.update_icon()
+ else if(href_list["setcolor"])
+ // Checking for state changes
+ if(!loaded_pill_bottle)
+ return
+
+ if(!Adjacent(usr))
+ return
+ loaded_pill_bottle.choose_color()
else if(href_list["close"])
close_browser(user, "chemmaster")
@@ -355,7 +363,8 @@
if(pill_maker)
if(loaded_pill_bottle)
dat += "Eject [loaded_pill_bottle] \[[loaded_pill_bottle.contents.len]/[loaded_pill_bottle.max_storage_space]\]
"
- dat += "Add label to [loaded_pill_bottle] \[[loaded_pill_bottle.contents.len]/[loaded_pill_bottle.max_storage_space]\]
"
+ dat += "Add label to [loaded_pill_bottle] \[[loaded_pill_bottle.contents.len]/[loaded_pill_bottle.max_storage_space]\]
"
+ dat += "Set color to [loaded_pill_bottle] \[[loaded_pill_bottle.contents.len]/[loaded_pill_bottle.max_storage_space]\]
"
dat += "Transfer [loaded_pill_bottle] \[[loaded_pill_bottle.contents.len]/[loaded_pill_bottle.max_storage_space]\] to the smartfridge
"
else
dat += "No pill bottle inserted.
"
diff --git a/code/modules/reagents/chemistry_reactions/other.dm b/code/modules/reagents/chemistry_reactions/other.dm
index 24a8563e0848..28250aa38803 100644
--- a/code/modules/reagents/chemistry_reactions/other.dm
+++ b/code/modules/reagents/chemistry_reactions/other.dm
@@ -360,6 +360,12 @@
required_reagents = list("fluorine" = 2, "carbon" = 2, "sulphuric acid" = 1)
result_amount = 5
+/datum/chemical_reaction/stablefoam
+ name = "Stabilized metallic foam"
+ id = "stablefoam"
+ result = "stablefoam"
+ required_reagents = list("fluorosurfactant" = 1, "iron" = 1, "sulphuric acid" = 1)
+ result_amount = 1
/datum/chemical_reaction/foam
name = "Foam"
diff --git a/code/modules/reagents/chemistry_reagents/other.dm b/code/modules/reagents/chemistry_reagents/other.dm
index 786a58857830..dc70d65452fe 100644
--- a/code/modules/reagents/chemistry_reagents/other.dm
+++ b/code/modules/reagents/chemistry_reagents/other.dm
@@ -613,6 +613,15 @@
color = "#664B63" // rgb: 102, 75, 99
chemclass = CHEM_CLASS_UNCOMMON
+/datum/reagent/foaming_agent/stabilized
+ name = "Stabilized metallic foam"
+ id = "stablefoam"
+ description = "Stabilized metallic foam that solidifies when exposed to an open flame"
+ reagent_state = LIQUID
+ color = "#d4b8d1"
+ chemclass = CHEM_CLASS_UNCOMMON
+ properties = list(PROPERTY_TOXIC = 8)
+
/datum/reagent/nicotine
name = "Nicotine"
id = "nicotine"
@@ -696,9 +705,11 @@
description = "A custom napalm mix, stickier and lasts longer but lower damage"
reagent_state = LIQUID
color = "#f8e3b2"
- chemfiresupp = FALSE
burncolor = "#f8e3b2"
burn_sprite = "dynamic"
+ intensitymod = -1.5
+ durationmod = -5
+ radiusmod = -0.5
properties = list(
PROPERTY_INTENSITY = BURN_LEVEL_TIER_2,
PROPERTY_DURATION = BURN_TIME_TIER_5,
@@ -710,10 +721,12 @@
id = "highdamagenapalm"
description = "A custom napalm mix, higher damage but not as sticky"
reagent_state = LIQUID
- color = "#742424"
- chemfiresupp = FALSE
- burncolor = "#742424"
+ color = "#c51c1c"
+ burncolor = "#c51c1c"
burn_sprite = "dynamic"
+ intensitymod = -4.5
+ durationmod = -1
+ radiusmod = -0.5
properties = list(
PROPERTY_INTENSITY = BURN_LEVEL_TIER_8,
PROPERTY_DURATION = BURN_TIME_TIER_1,
diff --git a/code/modules/shuttle/shuttles/dropship.dm b/code/modules/shuttle/shuttles/dropship.dm
index cb04d9a81ddb..86e869b3361e 100644
--- a/code/modules/shuttle/shuttles/dropship.dm
+++ b/code/modules/shuttle/shuttles/dropship.dm
@@ -29,6 +29,7 @@
var/automated_lz_id
var/automated_delay
var/automated_timer
+ var/datum/cas_signal/paradrop_signal
/obj/docking_port/mobile/marine_dropship/Initialize(mapload)
diff --git a/code/modules/tgui/states.dm b/code/modules/tgui/states.dm
index 0ec570ca9244..d826840dc495 100644
--- a/code/modules/tgui/states.dm
+++ b/code/modules/tgui/states.dm
@@ -105,3 +105,26 @@
return UI_DISABLED
// Otherwise, we got nothing.
return UI_CLOSE
+
+/**
+ * public
+ *
+ * Check if in view. Can interact only if adjacent, updates within max distance, otherwise closes
+ *
+ * required src_object atom/movable The object which owns the UI.
+ *
+ * return UI_state The state of the UI.
+ */
+/mob/living/proc/shared_living_ui_in_view(atom/movable/src_object, viewcheck = TRUE, max_distance = 7)
+ // If the object is obscured, close it.
+ if(viewcheck && !(src_object in view(src)))
+ return UI_CLOSE
+ var/dist = get_dist(src_object, src)
+ // Open and interact if 1-0 tiles away.
+ if(dist <= 1)
+ return UI_INTERACTIVE
+ // View only if within distance.
+ else if(dist <= max_distance)
+ return UI_UPDATE
+ // Otherwise, we got nothing.
+ return UI_CLOSE
diff --git a/code/modules/tgui/states/in_view.dm b/code/modules/tgui/states/in_view.dm
new file mode 100644
index 000000000000..76ab16e8c794
--- /dev/null
+++ b/code/modules/tgui/states/in_view.dm
@@ -0,0 +1,15 @@
+//If in view and within view distance
+GLOBAL_DATUM_INIT(in_view, /datum/ui_state/in_view, new)
+/datum/ui_state/in_view/can_use_topic(src_object, mob/user)
+ return user.in_view_can_use_topic(src_object) // Call the individual mob-overridden procs.
+
+/mob/proc/in_view_can_use_topic(src_object)
+ return UI_CLOSE // Don't allow interaction by default.
+
+/mob/ghost/in_view_can_use_topic(src_object)
+ return UI_UPDATE //ghost can just watch
+
+/mob/living/in_view_can_use_topic(src_object)
+ . = shared_ui_interaction(src_object)
+ if(. > UI_CLOSE && loc) //must not be in nullspace.
+ . = min(., shared_living_ui_in_view(src_object)) // Check the distance and view...
diff --git a/code/modules/vehicles/apc/apc_command.dm b/code/modules/vehicles/apc/apc_command.dm
index e0862ae4f2ab..54647279ec3b 100644
--- a/code/modules/vehicles/apc/apc_command.dm
+++ b/code/modules/vehicles/apc/apc_command.dm
@@ -43,8 +43,6 @@
return ..()
/obj/vehicle/multitile/apc/command/process()
- . = ..()
-
var/turf/apc_turf = get_turf(src)
if(health == 0 || !visible_in_tacmap || !is_ground_level(apc_turf.z))
return
diff --git a/code/modules/vehicles/arc/arc.dm b/code/modules/vehicles/arc/arc.dm
new file mode 100644
index 000000000000..feee097c3638
--- /dev/null
+++ b/code/modules/vehicles/arc/arc.dm
@@ -0,0 +1,271 @@
+/obj/vehicle/multitile/arc
+ name = "\improper M540-B Armored Recon Carrier"
+ desc = "An M540-B Armored Recon Carrier. A lightly armored reconnaissance and intelligence vehicle. Entrances on the sides."
+
+ icon = 'icons/obj/vehicles/arc.dmi'
+ icon_state = "arc_base"
+ pixel_x = -48
+ pixel_y = -48
+
+ bound_width = 96
+ bound_height = 96
+
+ bound_x = -32
+ bound_y = -32
+
+ health = 800
+
+ interior_map = /datum/map_template/interior/arc
+
+ passengers_slots = 3
+ xenos_slots = 5
+
+ entrances = list(
+ "left" = list(2, 0),
+ "right" = list(-2, 0),
+ )
+
+ entrance_speed = 0.5 SECONDS
+
+ required_skill = SKILL_VEHICLE_LARGE
+
+ movement_sound = 'sound/vehicles/tank_driving.ogg'
+
+ luminosity = 7
+
+ hardpoints_allowed = list(
+ /obj/item/hardpoint/locomotion/arc_wheels,
+ /obj/item/hardpoint/primary/arc_sentry,
+ /obj/item/hardpoint/support/arc_antenna,
+ )
+
+ seats = list(
+ VEHICLE_DRIVER = null,
+ )
+
+ active_hp = list(
+ VEHICLE_DRIVER = null,
+ )
+
+ vehicle_flags = VEHICLE_CLASS_LIGHT
+
+ mob_size_required_to_hit = MOB_SIZE_XENO
+
+ dmg_multipliers = list(
+ "all" = 1,
+ "acid" = 1.8,
+ "slash" = 1.1,
+ "bullet" = 0.6,
+ "explosive" = 0.8,
+ "blunt" = 0.8,
+ "abstract" = 1,
+ )
+
+ move_max_momentum = 2.2
+ move_momentum_build_factor = 1.5
+ move_turn_momentum_loss_factor = 0.8
+
+ vehicle_ram_multiplier = VEHICLE_TRAMPLE_DAMAGE_APC_REDUCTION
+
+ /// If the ARC has its antenna up, making it unable to move but enabling the turret and sensor wallhack
+ var/antenna_deployed = FALSE
+ /// How long it takes to deploy or retract the antenna
+ var/antenna_toggle_time = 10 SECONDS
+ /// Range of the ARC's xenomorph wallhacks
+ var/sensor_radius = 45
+ /// weakrefs of xenos temporarily added to the marine minimap
+ var/list/minimap_added = list()
+
+/obj/vehicle/multitile/arc/Initialize()
+ . = ..()
+
+ var/turf/gotten_turf = get_turf(src)
+ if(gotten_turf?.z)
+ SSminimaps.add_marker(src, gotten_turf.z, MINIMAP_FLAG_USCM, "arc", 'icons/ui_icons/map_blips_large.dmi')
+
+ RegisterSignal(src, COMSIG_ARC_ANTENNA_TOGGLED, PROC_REF(on_antenna_toggle))
+
+/obj/vehicle/multitile/arc/crew_mousedown(datum/source, atom/object, turf/location, control, params)
+ var/list/modifiers = params2list(params)
+ if(modifiers[SHIFT_CLICK] || modifiers[MIDDLE_CLICK] || modifiers[RIGHT_CLICK]) //don't step on examine, point, etc
+ return
+
+ switch(get_mob_seat(source))
+ if(VEHICLE_DRIVER)
+ if(modifiers[LEFT_CLICK] && modifiers[CTRL_CLICK])
+ activate_horn()
+
+/obj/vehicle/multitile/arc/get_examine_text(mob/user)
+ . = ..()
+ if(!isxeno(user))
+ return
+
+ if(health > 0)
+ . += SPAN_XENO("[src] can be crawled under once destroyed.")
+ else
+ . += SPAN_XENO("[src] can be crawled under by dragging our sprite to it.")
+
+/obj/vehicle/multitile/arc/proc/on_antenna_toggle(datum/source)
+ SIGNAL_HANDLER
+
+ if(antenna_deployed)
+ START_PROCESSING(SSslowobj, src)
+
+ else
+ STOP_PROCESSING(SSslowobj, src)
+
+/obj/vehicle/multitile/arc/process()
+ var/turf/arc_turf = get_turf(src)
+ if((health <= 0) || !visible_in_tacmap || !is_ground_level(arc_turf.z))
+ return
+
+ var/obj/item/hardpoint/support/arc_antenna/antenna = locate() in hardpoints
+ if(!antenna || (antenna.health <= 0))
+ for(var/datum/weakref/xeno as anything in minimap_added)
+ SSminimaps.remove_marker(xeno.resolve())
+ minimap_added.Remove(xeno)
+ return
+
+ for(var/mob/living/carbon/xenomorph/current_xeno as anything in GLOB.living_xeno_list)
+ var/turf/xeno_turf = get_turf(current_xeno)
+ if(!is_ground_level(xeno_turf.z))
+ continue
+
+ var/datum/weakref/xeno_weakref = WEAKREF(current_xeno)
+
+ if(get_dist(src, current_xeno) <= sensor_radius)
+ if(xeno_weakref in minimap_added)
+ continue
+
+ SSminimaps.remove_marker(current_xeno)
+ current_xeno.add_minimap_marker(MINIMAP_FLAG_USCM|MINIMAP_FLAG_XENO)
+ minimap_added += xeno_weakref
+ else if(xeno_weakref in minimap_added)
+ SSminimaps.remove_marker(current_xeno)
+ current_xeno.add_minimap_marker()
+ minimap_added -= xeno_weakref
+
+/obj/vehicle/multitile/arc/relaymove(mob/user, direction)
+ if(antenna_deployed)
+ return FALSE
+
+ return ..()
+
+/obj/vehicle/multitile/arc/load_role_reserved_slots()
+ var/datum/role_reserved_slots/RRS = new
+ RRS.category_name = "CIC Officer"
+ RRS.roles = list(JOB_SO, JOB_SEA, JOB_XO, JOB_CO, JOB_GENERAL)
+ RRS.total = 2
+ role_reserved_slots += RRS
+
+ RRS = new
+ RRS.category_name = "Intelligence Officer"
+ RRS.roles = list(JOB_INTEL)
+ RRS.total = 1
+ role_reserved_slots += RRS
+
+/obj/vehicle/multitile/arc/set_seated_mob(seat, mob/living/M)
+ . = ..()
+ if(!.)
+ return
+
+ give_action(M, /datum/action/human_action/toggle_arc_antenna)
+
+/obj/vehicle/multitile/arc/add_seated_verbs(mob/living/M, seat)
+ if(!M.client)
+ return
+ add_verb(M.client, list(
+ /obj/vehicle/multitile/proc/get_status_info,
+ /obj/vehicle/multitile/arc/proc/open_arc_controls_guide,
+ /obj/vehicle/multitile/proc/toggle_door_lock,
+ /obj/vehicle/multitile/proc/activate_horn,
+ /obj/vehicle/multitile/proc/name_vehicle,
+ /obj/vehicle/multitile/arc/proc/toggle_antenna,
+ ))
+
+/obj/vehicle/multitile/arc/remove_seated_verbs(mob/living/M, seat)
+ if(!M.client)
+ return
+ remove_verb(M.client, list(
+ /obj/vehicle/multitile/proc/get_status_info,
+ /obj/vehicle/multitile/arc/proc/open_arc_controls_guide,
+ /obj/vehicle/multitile/proc/toggle_door_lock,
+ /obj/vehicle/multitile/proc/activate_horn,
+ /obj/vehicle/multitile/proc/name_vehicle,
+ /obj/vehicle/multitile/arc/proc/toggle_antenna,
+ ))
+ SStgui.close_user_uis(M, src)
+
+/obj/vehicle/multitile/arc/initialize_cameras(change_tag = FALSE)
+ if(!camera)
+ camera = new /obj/structure/machinery/camera/vehicle(src)
+ if(change_tag)
+ camera.c_tag = "#[rand(1,100)] M540-B \"[nickname]\" ARC"
+ if(camera_int)
+ camera_int.c_tag = camera.c_tag + " interior"
+ else
+ camera.c_tag = "#[rand(1,100)] M540-B ARC"
+ if(camera_int)
+ camera_int.c_tag = camera.c_tag + " interior"
+
+/obj/vehicle/multitile/arc/MouseDrop_T(mob/M, mob/user)
+ . = ..()
+ if((M != user) || !isxeno(user))
+ return
+
+ if(health > 0)
+ to_chat(user, SPAN_XENO("We can't go under [src] until it is destroyed!"))
+ return
+
+ var/turf/current_turf = get_turf(user)
+ var/dir_to_go = get_dir(current_turf, src)
+ for(var/i in 1 to 3)
+ current_turf = get_step(current_turf, dir_to_go)
+ if(!(current_turf in locs))
+ break
+
+ if(current_turf.density)
+ to_chat(user, SPAN_XENO("The path under [src] is obstructed!"))
+ return
+
+ // Now we check to make sure the turf on the other side of the ARC isn't dense too
+ current_turf = get_step(current_turf, dir_to_go)
+ if(current_turf.density)
+ to_chat(user, SPAN_XENO("The path under [src] is obstructed!"))
+ return
+
+ to_chat(user, SPAN_XENO("We begin to crawl under [src]..."))
+ if(!do_after(user, 3 SECONDS, INTERRUPT_ALL, BUSY_ICON_HOSTILE))
+ to_chat(user, SPAN_XENO("We stop crawling under [src]."))
+ return
+
+ user.forceMove(current_turf)
+ to_chat(user, SPAN_XENO("We crawl to the other side of [src]."))
+
+/*
+** PRESETS SPAWNERS
+*/
+/obj/effect/vehicle_spawner/arc
+ name = "ARC Transport Spawner"
+ icon = 'icons/obj/vehicles/apc.dmi'
+ icon_state = "apc_base"
+ pixel_x = -48
+ pixel_y = -48
+
+/obj/effect/vehicle_spawner/arc/Initialize()
+ . = ..()
+ spawn_vehicle()
+ return INITIALIZE_HINT_QDEL
+
+/obj/effect/vehicle_spawner/arc/spawn_vehicle()
+ var/obj/vehicle/multitile/arc/ARC = new (loc)
+
+ load_misc(ARC)
+ load_hardpoints(ARC)
+ handle_direction(ARC)
+ ARC.update_icon()
+
+/obj/effect/vehicle_spawner/arc/load_hardpoints(obj/vehicle/multitile/arc/vehicle)
+ vehicle.add_hardpoint(new /obj/item/hardpoint/locomotion/arc_wheels)
+ vehicle.add_hardpoint(new /obj/item/hardpoint/primary/arc_sentry)
+ vehicle.add_hardpoint(new /obj/item/hardpoint/support/arc_antenna)
diff --git a/code/modules/vehicles/arc/verbs.dm b/code/modules/vehicles/arc/verbs.dm
new file mode 100644
index 000000000000..3b866236e77d
--- /dev/null
+++ b/code/modules/vehicles/arc/verbs.dm
@@ -0,0 +1,121 @@
+/obj/vehicle/multitile/arc/proc/toggle_antenna(mob/toggler)
+ set name = "Toggle Sensor Antenna"
+ set desc = "Raises or lowers the external sensor antenna. While raised, the ARC cannot move."
+ set category = "Vehicle"
+
+ var/mob/user = toggler || usr
+ if(!user || !istype(user))
+ return
+
+ var/obj/vehicle/multitile/arc/vehicle = user.interactee
+ if(!istype(vehicle))
+ return
+
+ var/seat
+ for(var/vehicle_seat in vehicle.seats)
+ if(vehicle.seats[vehicle_seat] == user)
+ seat = vehicle_seat
+ break
+
+ if(!seat)
+ return
+
+ if(vehicle.health < initial(vehicle.health) * 0.5)
+ to_chat(user, SPAN_WARNING("[vehicle]'s hull is too damaged to operate!"))
+ return
+
+ var/obj/item/hardpoint/support/arc_antenna/antenna = locate() in vehicle.hardpoints
+ if(!antenna)
+ to_chat(user, SPAN_WARNING("[vehicle] has no antenna mounted!"))
+ return
+
+ if(antenna.deploying)
+ return
+
+ if(antenna.health <= 0)
+ to_chat(user, SPAN_WARNING("[antenna] is broken!"))
+ return
+
+ if(vehicle.antenna_deployed)
+ to_chat(user, SPAN_NOTICE("You begin to retract [antenna]..."))
+ antenna.deploying = TRUE
+ if(!do_after(user, max(vehicle.antenna_toggle_time - antenna.deploy_animation_time, 1 SECONDS), target = vehicle))
+ to_chat(user, SPAN_NOTICE("You stop retracting [antenna]."))
+ antenna.deploying = FALSE
+ return
+
+ antenna.retract_antenna()
+ addtimer(CALLBACK(vehicle, PROC_REF(finish_antenna_retract), user), antenna.deploy_animation_time)
+
+ else
+ to_chat(user, SPAN_NOTICE("You begin to extend [antenna]..."))
+ antenna.deploying = TRUE
+ if(!do_after(user, max(vehicle.antenna_toggle_time - antenna.deploy_animation_time, 1 SECONDS), target = vehicle))
+ to_chat(user, SPAN_NOTICE("You stop extending [antenna]."))
+ antenna.deploying = FALSE
+ return
+
+ antenna.deploy_antenna()
+ addtimer(CALLBACK(vehicle, PROC_REF(finish_antenna_deploy), user), antenna.deploy_animation_time)
+
+/obj/vehicle/multitile/arc/proc/finish_antenna_retract(mob/user)
+ var/obj/item/hardpoint/support/arc_antenna/antenna = locate() in hardpoints
+ if(!antenna)
+ antenna.deploying = FALSE
+ return
+
+ if(user)
+ to_chat(user, SPAN_NOTICE("You retract [antenna], enabling the ARC to move again."))
+ playsound(user, 'sound/machines/hydraulics_2.ogg', 80, TRUE)
+ antenna_deployed = !antenna_deployed
+ antenna.deploying = FALSE
+ update_icon()
+ SEND_SIGNAL(src, COMSIG_ARC_ANTENNA_TOGGLED)
+
+/obj/vehicle/multitile/arc/proc/finish_antenna_deploy(mob/user)
+ var/obj/item/hardpoint/support/arc_antenna/antenna = locate() in hardpoints
+ if(!antenna)
+ antenna.deploying = FALSE
+ return
+
+ if(user)
+ to_chat(user, SPAN_NOTICE("You extend [antenna], locking the ARC in place."))
+ playsound(user, 'sound/machines/hydraulics_2.ogg', 80, TRUE)
+ antenna_deployed = !antenna_deployed
+ antenna.deploying = FALSE
+ update_icon()
+ SEND_SIGNAL(src, COMSIG_ARC_ANTENNA_TOGGLED)
+
+/obj/vehicle/multitile/arc/proc/open_arc_controls_guide()
+ set name = "Vehicle Controls Guide"
+ set desc = "MANDATORY FOR FIRST PLAY AS VEHICLE CREWMAN OR AFTER UPDATES."
+ set category = "Vehicle"
+
+ var/mob/user = usr
+ if(!istype(user))
+ return
+
+ var/obj/vehicle/multitile/arc/vehicle = user.interactee
+ if(!istype(vehicle))
+ return
+
+ var/seat
+ for(var/vehicle_seat in vehicle.seats)
+ if(vehicle.seats[vehicle_seat] == user)
+ seat = vehicle_seat
+ break
+
+ if(!seat)
+ return
+
+ var/dat = "Common verbs:
\
+ 1. \"G: Name Vehicle\" - used to add a custom name to the vehicle. Single use. 26 characters maximum.
\
+ 2. \"I: Get Status Info\" - brings up \"Vehicle Status Info\" window with all available information about your vehicle.
\
+ 3. \"G: Toggle Sensor Antenna\" - extend or retract the ARC's sensor antenna. While extended, all unknown lifeforms within a large range can be seen by all on the tacmap, but the ARC cannot move. Additionally enables the automated RE700 cannon.
\
+ Driver verbs:
1. \"G: Activate Horn\" - activates vehicle horn. Keep in mind, that vehicle horn is very loud and can be heard from afar by both allies and foes.
\
+ 2. \"G: Toggle Door Locks\" - toggles vehicle's access restrictions. Crewman, Brig and Command accesses bypass these restrictions.
\
+ Driver shortcuts:
1. \"CTRL + Click\" - activates vehicle horn.
"
+
+ show_browser(user, dat, "Vehicle Controls Guide", "vehicle_help", "size=900x500")
+ onclose(user, "vehicle_help")
+ return
diff --git a/code/modules/vehicles/hardpoints/hardpoint.dm b/code/modules/vehicles/hardpoints/hardpoint.dm
index 21e3e4b29f89..9b69308a47a0 100644
--- a/code/modules/vehicles/hardpoints/hardpoint.dm
+++ b/code/modules/vehicles/hardpoints/hardpoint.dm
@@ -125,6 +125,8 @@
/// Currently selected target to fire at. Set with set_target().
var/atom/target
+ /// The type of projectile to fire
+ var/projectile_type = /obj/projectile
//-----------------------------
//------GENERAL PROCS----------
@@ -149,7 +151,7 @@
if(owner || indestructible)
return
- health = max(0, health - severity / 2)
+ take_damage(severity / 2)
if(health <= 0)
visible_message(SPAN_WARNING("\The [src] disintegrates into useless pile of scrap under the damage it suffered."))
deconstruct(TRUE)
@@ -159,7 +161,7 @@
return
/obj/item/hardpoint/proc/generate_bullet(mob/user, turf/origin_turf)
- var/obj/projectile/P = new(origin_turf, create_cause_data(initial(name), user))
+ var/obj/projectile/P = new projectile_type(origin_turf, create_cause_data(initial(name), user))
P.generate_bullet(new ammo.default_ammo)
// Apply bullet traits from gun
for(var/entry in traits_to_give)
@@ -180,7 +182,14 @@
return TRUE
/obj/item/hardpoint/proc/take_damage(damage)
+ if(health <= 0)
+ return
health = max(0, health - damage * damage_multiplier)
+ if(!health)
+ on_destroy()
+
+/obj/item/hardpoint/proc/on_destroy()
+ return
/obj/item/hardpoint/proc/is_activatable()
if(health <= 0)
@@ -581,7 +590,6 @@
/// Wrapper proc for the autofire system to ensure the important args aren't null.
/obj/item/hardpoint/proc/fire_wrapper(atom/target, mob/living/user, params)
- SHOULD_NOT_OVERRIDE(TRUE)
if(!target)
target = src.target
if(!user)
@@ -717,7 +725,9 @@
var/is_broken = health <= 0
var/image/I = image(icon = disp_icon, icon_state = "[disp_icon_state]_[is_broken ? "1" : "0"]", pixel_x = x_offset, pixel_y = y_offset, dir = new_dir)
switch(round((health / initial(health)) * 100))
- if(0 to 20)
+ if(0)
+ I.color = "#888888"
+ if(1 to 20)
I.color = "#4e4e4e"
if(21 to 40)
I.color = "#6e6e6e"
@@ -792,3 +802,11 @@
/obj/item/hardpoint/get_applying_acid_time()
return 10 SECONDS //you are not supposed to be able to easily combat-melt irreplaceable things.
+
+/// Proc to be overridden if you want to have special conditions preventing the removal of the hardpoint. Add chat messages in this proc if you want to tell the player why
+/obj/item/hardpoint/proc/can_be_removed(mob/remover)
+ SHOULD_CALL_PARENT(TRUE)
+
+ if(remover.stat > CONSCIOUS)
+ return FALSE
+ return TRUE
diff --git a/code/modules/vehicles/hardpoints/hardpoint_ammo/arc_sentry_ammo.dm b/code/modules/vehicles/hardpoints/hardpoint_ammo/arc_sentry_ammo.dm
new file mode 100644
index 000000000000..f9c28e151514
--- /dev/null
+++ b/code/modules/vehicles/hardpoints/hardpoint_ammo/arc_sentry_ammo.dm
@@ -0,0 +1,16 @@
+/obj/item/ammo_magazine/hardpoint/arc_sentry
+ name = "\improper RE700 Rotary Cannon Magazine"
+ desc = "A magazine for RE700 Rotary Cannon filled with 20mm rounds. Supports IFF."
+ caliber = "20mm"
+ icon_state = "ace_autocannon"
+ w_class = SIZE_LARGE
+ default_ammo = /datum/ammo/bullet/re700
+ max_rounds = 500
+ gun_type = /obj/item/hardpoint/primary/arc_sentry
+
+/obj/item/ammo_magazine/hardpoint/arc_sentry/update_icon()
+ if(current_rounds > 0)
+ icon_state = "ace_autocannon"
+ else
+ icon_state = "ace_autocannon_empty"
+
diff --git a/code/modules/vehicles/hardpoints/primary/arc_sentry.dm b/code/modules/vehicles/hardpoints/primary/arc_sentry.dm
new file mode 100644
index 000000000000..4b5087b2e608
--- /dev/null
+++ b/code/modules/vehicles/hardpoints/primary/arc_sentry.dm
@@ -0,0 +1,229 @@
+// APC cannons
+/obj/item/hardpoint/primary/arc_sentry
+ name = "\improper RE700 Rotary Cannon"
+ desc = "A primary two-barrel cannon for the ARC that shoots 12.7mm IFF-compatible rounds."
+ icon = 'icons/obj/vehicles/hardpoints/arc.dmi'
+
+ icon_state = "autocannon"
+ disp_icon = "arc"
+ disp_icon_state = "autocannon"
+ activation_sounds = list('sound/weapons/gun_m60.ogg')
+
+ damage_multiplier = 0.1
+ health = 125
+
+ origins = list(0, 0)
+
+ ammo = new /obj/item/ammo_magazine/hardpoint/arc_sentry
+ max_clips = 2
+
+ use_muzzle_flash = TRUE
+ angle_muzzleflash = FALSE
+ muzzleflash_icon_state = "muzzle_flash_double"
+
+ muzzle_flash_pos = list(
+ "1" = list(1, 4),
+ "2" = list(1, -29),
+ "4" = list(16, 3),
+ "8" = list(-16, 3)
+ )
+ gun_firemode = GUN_FIREMODE_BURSTFIRE
+ gun_firemode_list = list(
+ GUN_FIREMODE_BURSTFIRE,
+ )
+ burst_delay = 2
+ burst_amount = 3
+ projectile_type = /obj/projectile/arc_sentry
+
+ /// Potential targets the turret can shoot at
+ var/list/targets = list()
+ /// The currently focused sentry target
+ var/atom/movable/sentry_target = null
+ /// The range that this turret can shoot at the furthest
+ var/turret_range = 5
+ /// What factions this sentry is aligned with
+ var/faction_group = FACTION_LIST_MARINE
+
+/obj/item/hardpoint/primary/arc_sentry/on_install(obj/vehicle/multitile/vehicle)
+ . = ..()
+ RegisterSignal(owner, COMSIG_ARC_ANTENNA_TOGGLED, PROC_REF(toggle_processing))
+ toggle_processing() // We can't know that the antenna is in the same position as when the gun was removed
+
+/obj/item/hardpoint/primary/arc_sentry/on_uninstall(obj/vehicle/multitile/vehicle)
+ . = ..()
+ UnregisterSignal(owner, COMSIG_ARC_ANTENNA_TOGGLED)
+ STOP_PROCESSING(SSfastobj, src)
+
+/obj/item/hardpoint/primary/arc_sentry/Destroy()
+ STOP_PROCESSING(SSfastobj, src)
+ sentry_target = null
+ return ..()
+
+/obj/item/hardpoint/primary/arc_sentry/proc/toggle_processing()
+ SIGNAL_HANDLER
+ if(!owner)
+ return
+
+ var/obj/vehicle/multitile/arc/vehicle = owner
+ if(vehicle.antenna_deployed)
+ START_PROCESSING(SSfastobj, src)
+
+ else
+ STOP_PROCESSING(SSfastobj, src)
+
+/obj/item/hardpoint/primary/arc_sentry/process()
+ for(var/mob/living/in_range_mob in range(turret_range, owner))
+ targets |= in_range_mob
+
+ if(!length(targets))
+ return FALSE
+
+ if(!sentry_target)
+ sentry_target = pick(targets)
+
+ get_target(sentry_target)
+ return TRUE
+
+/obj/item/hardpoint/primary/arc_sentry/set_bullet_traits()
+ LAZYADD(traits_to_give, list(
+ BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_iff, faction_group)
+ ))
+
+/obj/item/hardpoint/primary/arc_sentry/fire_wrapper(atom/target, mob/living/user, params)
+ if(!target)
+ target = src.target
+ if(!target)
+ return NONE
+
+ return try_fire(target, null, params)
+
+
+/obj/item/hardpoint/primary/arc_sentry/generate_bullet(mob/user, turf/origin_turf)
+ var/obj/projectile/arc_sentry/made_projectile = ..()
+ made_projectile.permutated += owner
+ return made_projectile
+
+/obj/item/hardpoint/primary/arc_sentry/start_fire(datum/source, atom/object, turf/location, control, params)
+ if(QDELETED(object))
+ return
+ if(!COOLDOWN_FINISHED(src, fire_cooldown))
+ return
+
+ set_target(object)
+ SEND_SIGNAL(src, COMSIG_GUN_FIRE)
+
+/obj/item/hardpoint/primary/arc_sentry/proc/get_target(atom/movable/new_target)
+ if(QDELETED(new_target))
+ sentry_target = null
+ return
+
+ if(!targets.Find(new_target))
+ targets.Add(new_target)
+
+ if(!length(targets))
+ return
+
+ var/list/conscious_targets = list()
+ var/list/unconscious_targets = list()
+
+ for(var/mob/living/living_mob as anything in targets) // orange allows sentry to fire through gas and darkness
+ if(living_mob.stat == DEAD)
+ purge_target(living_mob)
+ continue
+
+ if(living_mob.get_target_lock(faction_group) || living_mob.invisibility || HAS_TRAIT(living_mob, TRAIT_ABILITY_BURROWED))
+ purge_target(living_mob)
+ continue
+
+ var/list/turf/path = get_line(get_turf(src), living_mob)
+ if(!length(path) || get_dist(get_turf(src), living_mob) > turret_range)
+ purge_target(living_mob)
+ continue
+
+ var/blocked = FALSE
+ for(var/turf/tile as anything in path)
+ if(tile.density || tile.opacity)
+ blocked = TRUE
+ break
+
+ for(var/obj/structure/struct in tile)
+ if(struct.opacity)
+ blocked = TRUE
+ break
+
+ for(var/obj/vehicle/multitile/vehicle in tile)
+ if(vehicle == owner) // Some of the tiles will inevitably be the ARC itself
+ continue
+ blocked = TRUE
+ break
+
+ if(locate(/obj/effect/particle_effect/smoke) in tile)
+ blocked = TRUE
+ break
+
+ if(blocked)
+ purge_target(living_mob)
+ continue
+
+ if(living_mob.stat & UNCONSCIOUS)
+ unconscious_targets += living_mob
+ else
+ conscious_targets += living_mob
+
+ if((sentry_target in conscious_targets) || (sentry_target in unconscious_targets))
+ sentry_target = sentry_target
+
+ else if(length(conscious_targets))
+ sentry_target = pick(conscious_targets)
+
+ else if(length(unconscious_targets))
+ sentry_target = pick(unconscious_targets)
+
+ if(!sentry_target) //No targets, don't bother firing
+ return
+
+ start_fire(object = sentry_target)
+
+/obj/item/hardpoint/primary/arc_sentry/proc/purge_target(mob/target)
+ if(target == sentry_target)
+ sentry_target = null
+ targets.Remove(target)
+
+/obj/item/hardpoint/primary/arc_sentry/can_be_removed(mob/remover)
+ var/obj/vehicle/multitile/arc/arc_owner = owner
+ if(!istype(arc_owner))
+ return TRUE
+
+ if(arc_owner.antenna_deployed)
+ to_chat(remover, SPAN_WARNING("[src] cannot be removed from [owner] while its antenna is deployed."))
+ return FALSE
+
+ return ..()
+
+/obj/projectile/arc_sentry/Initialize(mapload, datum/cause_data/cause_data)
+ . = ..()
+ RegisterSignal(src, COMSIG_BULLET_POST_HANDLE_OBJ, PROC_REF(check_passthrough))
+
+/obj/projectile/arc_sentry/check_canhit(turf/current_turf, turf/next_turf)
+ var/proj_dir = get_dir(current_turf, next_turf)
+ var/obj/item/hardpoint/arc_sentry = shot_from
+ if(!(arc_sentry.owner in current_turf) && !(arc_sentry.owner in next_turf) && (proj_dir & (proj_dir - 1)) && !current_turf.Adjacent(next_turf))
+ ammo.on_hit_turf(current_turf, src)
+ current_turf.bullet_act(src)
+ return TRUE
+
+ // Check for hits that would occur when moving to turf, such as a blocking cade
+ if(scan_a_turf(next_turf, proj_dir))
+ return TRUE
+
+ return FALSE
+
+/obj/projectile/arc_sentry/proc/check_passthrough(datum/source, obj/hit_obj, bool)
+ SIGNAL_HANDLER
+
+ if(!istype(shot_from, /obj/item/hardpoint))
+ return
+
+ var/obj/item/hardpoint/sentry = shot_from
+ if(sentry.owner == hit_obj)
+ return COMPONENT_BULLET_PASS_THROUGH
diff --git a/code/modules/vehicles/hardpoints/primary/minigun.dm b/code/modules/vehicles/hardpoints/primary/minigun.dm
index 03d1e7be0077..81b383b3fbc2 100644
--- a/code/modules/vehicles/hardpoints/primary/minigun.dm
+++ b/code/modules/vehicles/hardpoints/primary/minigun.dm
@@ -77,8 +77,8 @@
return
spin_stage = clamp(spin_stage, 1, stage_rate_len)
- var/old_stage_rate = stage_rate[Floor(old_spin_stage)]
- var/new_stage_rate = stage_rate[Floor(spin_stage)]
+ var/old_stage_rate = stage_rate[floor(old_spin_stage)]
+ var/new_stage_rate = stage_rate[floor(spin_stage)]
if(old_stage_rate != new_stage_rate)
stage_delay_mult = 1 / new_stage_rate
diff --git a/code/modules/vehicles/hardpoints/support/antenna.dm b/code/modules/vehicles/hardpoints/support/antenna.dm
new file mode 100644
index 000000000000..11fd50a9506e
--- /dev/null
+++ b/code/modules/vehicles/hardpoints/support/antenna.dm
@@ -0,0 +1,94 @@
+/obj/item/hardpoint/support/arc_antenna
+ name = "\improper U-56 Radar Antenna"
+ desc = "A heavy-duty antenna built for the ARC."
+ icon = 'icons/obj/vehicles/hardpoints/arc.dmi'
+
+ icon_state = "antenna"
+ disp_icon = "arc"
+ disp_icon_state = "antenna"
+
+ damage_multiplier = 0.1
+
+ health = 500
+
+ /// How long the antenna deploy/retract animation is, keep accurate to the sprite in the dmi
+ var/deploy_animation_time = 1.2 SECONDS
+ /// If the antenna is already deploying
+ var/deploying = FALSE
+
+/obj/item/hardpoint/support/arc_antenna/proc/deploy_antenna()
+ set waitfor = FALSE
+
+ disp_icon_state = ""
+ if(owner)
+ owner.update_icon()
+ var/obj/dummy_obj = new()
+ dummy_obj.icon = 'icons/obj/vehicles/arc.dmi'
+ dummy_obj.icon_state = "antenna_cover_0"
+ dummy_obj.dir = owner.dir
+ dummy_obj.vis_flags = VIS_INHERIT_ID | VIS_INHERIT_LAYER | VIS_INHERIT_PLANE
+ owner.vis_contents += dummy_obj
+ flick("antenna_extending", dummy_obj)
+ sleep(deploy_animation_time)
+ qdel(dummy_obj)
+ disp_icon_state = initial(disp_icon_state)
+
+/obj/item/hardpoint/support/arc_antenna/proc/retract_antenna()
+ set waitfor = FALSE
+
+ disp_icon_state = ""
+ if(owner)
+ owner.update_icon()
+ var/obj/dummy_obj = new()
+ dummy_obj.icon = 'icons/obj/vehicles/arc.dmi'
+ dummy_obj.icon_state = "antenna_cover_0"
+ dummy_obj.dir = owner.dir
+ dummy_obj.vis_flags = VIS_INHERIT_ID | VIS_INHERIT_LAYER | VIS_INHERIT_PLANE
+ owner.vis_contents += dummy_obj
+ flick("antenna_retracting", dummy_obj)
+ sleep(deploy_animation_time)
+ qdel(dummy_obj)
+ disp_icon_state = initial(disp_icon_state)
+
+/obj/item/hardpoint/support/arc_antenna/get_icon_image(x_offset, y_offset, new_dir)
+ var/is_broken = health <= 0
+ var/antenna_extended = FALSE
+ if(istype(owner, /obj/vehicle/multitile/arc))
+ var/obj/vehicle/multitile/arc/arc_owner = owner
+ antenna_extended = arc_owner.antenna_deployed
+
+ var/image/antenna_img = image(icon = disp_icon, icon_state = "[disp_icon_state]_[antenna_extended ? "extended" : "cover"]_[is_broken ? "1" : "0"]", pixel_x = x_offset, pixel_y = y_offset, dir = new_dir)
+ switch(round((health / initial(health)) * 100))
+ if(0)
+ antenna_img.color = "#888888"
+ if(1 to 20)
+ antenna_img.color = "#4e4e4e"
+ if(21 to 40)
+ antenna_img.color = "#6e6e6e"
+ if(41 to 60)
+ antenna_img.color = "#8b8b8b"
+ if(61 to 80)
+ antenna_img.color = "#bebebe"
+ else
+ antenna_img.color = null
+ return antenna_img
+
+/obj/item/hardpoint/support/arc_antenna/can_be_removed(mob/remover)
+ var/obj/vehicle/multitile/arc/arc_owner = owner
+ if(!istype(arc_owner))
+ return TRUE
+
+ if(arc_owner.antenna_deployed)
+ to_chat(remover, SPAN_WARNING("[src] cannot be removed from [owner] while it is deployed."))
+ return FALSE
+
+ return ..()
+
+/obj/item/hardpoint/support/arc_antenna/on_destroy()
+ var/obj/vehicle/multitile/arc/arc_owner = owner
+ if(!istype(arc_owner))
+ return
+
+ if(arc_owner.antenna_deployed)
+ retract_antenna()
+ addtimer(CALLBACK(arc_owner, TYPE_PROC_REF(/obj/vehicle/multitile/arc, finish_antenna_retract)), deploy_animation_time)
diff --git a/code/modules/vehicles/hardpoints/wheels/arc_wheels.dm b/code/modules/vehicles/hardpoints/wheels/arc_wheels.dm
new file mode 100644
index 000000000000..9bb6c31746e0
--- /dev/null
+++ b/code/modules/vehicles/hardpoints/wheels/arc_wheels.dm
@@ -0,0 +1,17 @@
+/obj/item/hardpoint/locomotion/arc_wheels
+ name = "ARC Wheels"
+ desc = "Integral to the movement of the ARC."
+ icon = 'icons/obj/vehicles/hardpoints/arc.dmi'
+
+ damage_multiplier = 0.15
+
+ icon_state = "tires"
+ disp_icon = "arc"
+ disp_icon_state = "arc_wheels"
+
+ health = 500
+
+ move_delay = VEHICLE_SPEED_SUPERFAST
+ move_max_momentum = 2
+ move_momentum_build_factor = 1.5
+ move_turn_momentum_loss_factor = 0.5
diff --git a/code/modules/vehicles/interior/areas.dm b/code/modules/vehicles/interior/areas.dm
index 254bcb6b26ea..399e55e11450 100644
--- a/code/modules/vehicles/interior/areas.dm
+++ b/code/modules/vehicles/interior/areas.dm
@@ -29,5 +29,9 @@
name = "van interior"
icon_state = "van"
+/area/interior/vehicle/arc
+ name = "\improper ARC interior"
+ icon_state = "arc"
+
/area/interior/fancylocker
name = "closet interior"
diff --git a/code/modules/vehicles/interior/interactable/vendors.dm b/code/modules/vehicles/interior/interactable/vendors.dm
index d78764da4d73..c37eb6a5d9ef 100644
--- a/code/modules/vehicles/interior/interactable/vendors.dm
+++ b/code/modules/vehicles/interior/interactable/vendors.dm
@@ -330,7 +330,7 @@
to_chat(user, SPAN_WARNING("\The [S] are being stored in [SPAN_HELPFUL("stacks of 5")] for convenience. You need \the [S] stack of at least 5 to restock it."))
return FALSE
else
- stack_restock = Floor(S.amount / 5)
+ stack_restock = floor(S.amount / 5)
//for the ease of finding enough materials to stack, it will be stored in stacks of 10 sheets just like they come in engie vendor
else
if(S.amount < 10)
@@ -338,7 +338,7 @@
to_chat(user, SPAN_WARNING("\The [S] are being stored in [SPAN_HELPFUL("stacks of 10")] for convenience. You need \the [S] stack of at least 10 to restock it."))
return FALSE
else
- stack_restock = Floor(S.amount / 10)
+ stack_restock = floor(S.amount / 10)
//item we are restocking is a stack and we need to conveniently restock it
//instead of demanding user to split it into stacks of appropriate amount
diff --git a/code/modules/vehicles/interior/interior.dm b/code/modules/vehicles/interior/interior.dm
index 8fb65602c9b3..240c59e46fc5 100644
--- a/code/modules/vehicles/interior/interior.dm
+++ b/code/modules/vehicles/interior/interior.dm
@@ -309,12 +309,12 @@
/datum/interior/proc/get_middle_coords()
var/turf/min = reservation.bottom_left_turfs[1]
var/turf/max = reservation.top_right_turfs[1]
- return list(Floor(min.x + (max.x - min.x)/2), Floor(min.y + (max.y - min.y)/2), min.z)
+ return list(floor(min.x + (max.x - min.x)/2), floor(min.y + (max.y - min.y)/2), min.z)
/datum/interior/proc/get_middle_turf()
var/list/turf/bounds = get_bound_turfs()
- var/turf/middle = locate(Floor(bounds[1].x + (bounds[2].x - bounds[1].x)/2), Floor(bounds[1].y + (bounds[2].y - bounds[1].y)/2), bounds[1].z)
+ var/turf/middle = locate(floor(bounds[1].x + (bounds[2].x - bounds[1].x)/2), floor(bounds[1].y + (bounds[2].y - bounds[1].y)/2), bounds[1].z)
return middle
diff --git a/code/modules/vehicles/interior/interior_landmarks.dm b/code/modules/vehicles/interior/interior_landmarks.dm
index 90284682d2d4..fa1eee8651ac 100644
--- a/code/modules/vehicles/interior/interior_landmarks.dm
+++ b/code/modules/vehicles/interior/interior_landmarks.dm
@@ -227,7 +227,7 @@
Phone.pixel_x = pixel_x
Phone.pixel_y = pixel_y
Phone.phone_category = "Vehicles"
- Phone.phone_id = I.exterior.name
+ Phone.phone_id = replacetext(Phone.phone_id, "\improper", "") // this has to be done because phone IDs need to be the same as their display name (\improper doesn't display, obviously)
qdel(src)
diff --git a/code/modules/vehicles/multitile/multitile.dm b/code/modules/vehicles/multitile/multitile.dm
index f3b7be510b08..18dade67b834 100644
--- a/code/modules/vehicles/multitile/multitile.dm
+++ b/code/modules/vehicles/multitile/multitile.dm
@@ -334,11 +334,12 @@
// Checked here because we want to be able to null the mob in a seat
if(!istype(M))
- return
+ return FALSE
M.set_interaction(src)
M.reset_view(src)
give_action(M, /datum/action/human_action/vehicle_unbuckle)
+ return TRUE
/// Get crewmember of seat.
/obj/vehicle/multitile/proc/get_seat_mob(seat)
diff --git a/code/modules/vehicles/multitile/multitile_bump.dm b/code/modules/vehicles/multitile/multitile_bump.dm
index 79789af054fa..70416537ba99 100644
--- a/code/modules/vehicles/multitile/multitile_bump.dm
+++ b/code/modules/vehicles/multitile/multitile_bump.dm
@@ -744,7 +744,7 @@
return TRUE
else if (mob_moved)
if(momentum_penalty)
- V.move_momentum = Floor(V.move_momentum*0.8)
+ V.move_momentum = floor(V.move_momentum*0.8)
V.update_next_move()
playsound(loc, "punch", 25, 1)
return TRUE
@@ -769,7 +769,7 @@
visible_message(SPAN_DANGER("[src] digs it's claws into the ground, slowing [V]'s movement!"),
SPAN_DANGER("You dig your claws into the ground, slowing [V]'s movement!"))
var/mob_moved = step(src, V.last_move_dir)
- V.move_momentum = Floor(V.move_momentum/3)
+ V.move_momentum = floor(V.move_momentum/3)
V.update_next_move()
return mob_moved
diff --git a/code/modules/vehicles/multitile/multitile_hardpoints.dm b/code/modules/vehicles/multitile/multitile_hardpoints.dm
index 2a6f97dda06f..b94b8459890f 100644
--- a/code/modules/vehicles/multitile/multitile_hardpoints.dm
+++ b/code/modules/vehicles/multitile/multitile_hardpoints.dm
@@ -149,7 +149,7 @@
hps += H
var/chosen_hp = tgui_input_list(usr, "Select a hardpoint to remove", "Hardpoint Removal", (hps + "Cancel"))
- if(chosen_hp == "Cancel" || !chosen_hp || !in_range(src, user))
+ if(chosen_hp == "Cancel" || !chosen_hp || (get_dist(src, user) > 2)) //get_dist uses 2 because the vehicle is 3x3
return
var/obj/item/hardpoint/old = chosen_hp
@@ -158,6 +158,9 @@
to_chat(user, SPAN_WARNING("There is nothing installed there."))
return
+ if(!old.can_be_removed(user))
+ return
+
// It's in a holder
if(!(old in hardpoints))
for(var/obj/item/hardpoint/holder/H in hardpoints)
diff --git a/code/modules/vehicles/multitile/multitile_movement.dm b/code/modules/vehicles/multitile/multitile_movement.dm
index b5f308144707..9e2e652c7610 100644
--- a/code/modules/vehicles/multitile/multitile_movement.dm
+++ b/code/modules/vehicles/multitile/multitile_movement.dm
@@ -159,7 +159,7 @@
// Crashed with something that stopped us
if(!can_move)
- move_momentum = Floor(move_momentum/2)
+ move_momentum = floor(move_momentum/2)
update_next_move()
interior_crash_effect()
diff --git a/code/modules/vehicles/vehicle.dm b/code/modules/vehicles/vehicle.dm
index 8632159b4f6d..c78be6fa57ec 100644
--- a/code/modules/vehicles/vehicle.dm
+++ b/code/modules/vehicles/vehicle.dm
@@ -159,10 +159,11 @@
// Checked here because we want to be able to null the mob in a seat
if(!istype(M))
- return
+ return FALSE
M.forceMove(src)
M.set_interaction(src)
+ return TRUE
/obj/vehicle/proc/turn_on()
if(stat)
diff --git a/config/example/config.txt b/config/example/config.txt
index f055a5d65bff..0aff7ee6def9 100644
--- a/config/example/config.txt
+++ b/config/example/config.txt
@@ -241,3 +241,15 @@ GAMEMODE_DEFAULT Extended
## How long the mob will take to chestburst, in seconds
#EMBRYO_BURST_TIMER 450
+
+## CLIENT VERSION CONTROL
+## This allows you to configure the minimum required client version, as well as a warning version, and message for both.
+## These trigger for any version below (non-inclusive) the given version, so 510 triggers on 509 or lower.
+## These messages will be followed by one stating the clients current version and the required version for clarity.
+#CLIENT_WARN_VERSION 514
+#CLIENT_WARN_BUILD 1589
+#CLIENT_WARN_MESSAGE Your version of BYOND may have issues or be blocked from accessing this server in the future.
+#CLIENT_WARN_POPUP
+CLIENT_ERROR_VERSION 514
+#CLIENT_ERROR_BUILD 1589
+#CLIENT_ERROR_MESSAGE Your version of BYOND is too old, may have issues, and is blocked from accessing this server.
diff --git a/html/changelogs/archive/2024-04.yml b/html/changelogs/archive/2024-04.yml
index b219e3359816..bf3a3c8de208 100644
--- a/html/changelogs/archive/2024-04.yml
+++ b/html/changelogs/archive/2024-04.yml
@@ -219,3 +219,137 @@
on the server, yet
realforest2001:
- bugfix: Fixes praetorian acid ball harming the prae and other xenos.
+2024-04-15:
+ LTNTS:
+ - maptweak: moves APC in Chance's Claim LZ1 to where it can actually be fixed
+2024-04-16:
+ Huffie56, Zenith, esselnek/sleepynecrons, samy/nauticall, drulikar.:
+ - rscadd: Added fuel pump as machinery on the almayer sprite will change when power
+ is on or off.
+ - rscadd: Fuel pumps are animated when activated and have different state depending
+ on how full the lifeboats are.
+ - imageadd: added the fuel pump icon. updated by esselnek /sleepynecrons and Zenith,
+ they where originally made by nauticall.
+ - maptweak: added the fuel pump to the proper locations.
+ ihatethisengine2:
+ - rscadd: ported stripping menu from TG
+2024-04-17:
+ QuickLode:
+ - balance: M3A1 Synthetic Utility Vest only has a 10% slowdown.
+ iloveloopers:
+ - bugfix: You can no longer buckle xenos onto chairs
+ realforest2001:
+ - rscadd: Added Nerve Gas Release control buttons to the ARES and APOLLO interfaces,
+ allowing the AI core to be secured from large groups or xenomorphs. Built in
+ cooldowns should prevent fatalities.
+ - maptweak: Remodelled the AI Core Reception and WJ spawn area.
+ - maptweak: Switches AI Core cameras over to manual naming.
+ - imageadd: Added sprites for AI Core windows on black Almayer frames.
+ usnpeepoo:
+ - balance: Berserker's rage lock-out duration increased slightly
+2024-04-18:
+ InsaneRed:
+ - balance: Hedgehog now gains explosion immunity to nades if you have above half
+ shard amount.
+ MrStonedOne, LemonInTheDark:
+ - server: config now allows you to warn players to upgrade their byond version,
+ or bar them based on their byond version
+ Steelpoint:
+ - balance: UPP Synthetic's loadout has been reworked to account for its new status
+ as a non-combatant.
+2024-04-19:
+ QuickLode:
+ - rscadd: Adds 3 variations of CMB Marshal and 4 variations of a UA Riot Police
+ Officer to Fiorina Prison Riot nightmare. These are fine men and women in uniform
+ prepared to engage what they suspect is a riot(or in the case of CMB, assisting
+ their underfunded and understaffed colleagues) however, they find something
+ much more sinister going on..
+ - rscadd: Adds a CMB Investigative Synthetic(r) and a UA Police Synthetic.
+ - rscadd: Allows police baton and telescopic baton to shield clash for intimidation
+ and riot tactics.
+ - rscadd: Allows M81 launcher to utilize less lethal baton round
+ - qol: removes taser from some security synthetics belts, replaced with a more synthetic
+ friendly version
+2024-04-20:
+ Huffie56:
+ - balance: Increase damage of standard revolver ammo from 55 to 72.
+ - balance: Marksman ammo remains 55 damage.
+ iloveloopers:
+ - rscadd: adds new flamer fuel type, stabilized metallic foam
+ - rscadd: Incinerator tanks can now hold stabilized metallic foam
+ - balance: High-Combustion napalm fuel is now easier to see on the ground
+2024-04-21:
+ 567Turtle:
+ - balance: ' SO can now do basic surgeries'
+ Ben10083:
+ - rscadd: Synthetics when shoved into meat gibber will not be delimbed and spawn
+ their own flesh, but would not die (they are spat out as a torso and head)
+ - admin: Adjustment to meatgibber code to notify admins when a synthetic is being
+ shoved into gibber
+ Git-Nivrak:
+ - bugfix: You can no longer infinitely extend facehugger's lifetime by REDACTED
+ - balance: Lessers now lose 5 hp every 2 seconds off weeds
+ - bugfix: Fixed a bug which made boilers go way faster than they should
+ LTNTS:
+ - rscadd: Adds Command Tablets to Provost Marshal+
+ iloveloopers:
+ - bugfix: White phosphorus will no longer forcefully set a mob's fire_reagent to
+ be UT napthal
+ realforest2001:
+ - rscadd: Added an ARES Log for chambering the OB Cannon.
+ vero5123:
+ - bugfix: toggling ghost vision now keeps the user's mob visible.
+2024-04-22:
+ Git-Nivrak:
+ - rscdel: Reverted back to old throw logic
+ GrrrKitten:
+ - rscadd: Adds shockwave VFX to powerful explosions
+ - rscadd: Adds shockwave VFX to Queen + Predalien screech
+ LC4492:
+ - rscadd: Adds a new, better variation of the normal photocopier.
+ - imageadd: Adds a new sprite to the new photocopier variation and updates the sprites
+ of both normal, and new photocopiers to look slightly better.
+ - maptweak: Adds the new photocopiers to the CC and CL offices.
+ Zonespace27:
+ - admin: Unmarked tickets now mark themselves when an admin starts responding to
+ one
+ harryob:
+ - bugfix: you can bind to space again
+ iloveloopers:
+ - bugfix: custom flamer fuels no longer work for increasing OT assembly's caps
+ realforest2001:
+ - bugfix: Delaying round start now shows on the timer again.
+ - rscadd: Added ID Modification Log to the Access Report printout from an ID Console.
+2024-04-23:
+ Drulikar:
+ - balance: Cryotubes now also cure external bleeding
+ - bugfix: Fixed internal bleeding granting blood on its last tick
+2024-04-24:
+ Git-Nivrak:
+ - bugfix: Fixes boilers slowing themselves by using long range sight while resting.
+ iloveloopers:
+ - qol: Alt clicking a reagent tank will now toggle whether its dispensing or filling
+2024-04-25:
+ Drathek:
+ - bugfix: 'Fixed hugger handling in drone tutorial: Now the hugger dying will put
+ another hugger into the tutorial morpher.'
+ Steelpoint:
+ - rscadd: UPP and CLF Combat Synthetic preset is now available for admins to spawn
+ them in.
+ ihatethisengine:
+ - bugfix: spotlight no longer breaks after every flight
+ - rscadd: Combat Correspondent can broadcast speech and emotes.
+ - rscadd: Speech close enough to the camera will be shown above connected TVs as
+ abovehead messages
+ realforest2001:
+ - bugfix: You can delete flight logs from ARES Interface again as intended.
+2024-04-26:
+ Git-Nivrak:
+ - qol: You can now change the color of pill bottles in the chem master or with a
+ hand labeler.
+ realforest2001:
+ - spellcheck: Fixes a typo for M4RA AP Ammo in the ASRS menu.
+2024-04-27:
+ Lagomorphica:
+ - balance: The spotter laser designators, scout laser designators, and scout cloak
+ are now unmeltable and indestructible to explosions.
diff --git a/html/changelogs/archive/2024-05.yml b/html/changelogs/archive/2024-05.yml
new file mode 100644
index 000000000000..9dd1a6b71965
--- /dev/null
+++ b/html/changelogs/archive/2024-05.yml
@@ -0,0 +1,117 @@
+2024-05-02:
+ Drathek:
+ - balance: Lurker invisibility recharge time is now 20s (up from 15s)
+ - balance: Lurker invisibility now ends when devouring but refunds 50% of time unused
+ - balance: Lurker invisibility bump now refunds 50% of time unused
+ - balance: Lurker invisibility can now be toggled refunding 90% of time unused (with
+ dbl click prevention)
+ - rscdel: Removed defender crest toggle balloon alerts
+ - bugfix: Lurker invisibility code is refactored to properly use cooldowns and now
+ doesn't incorrectly get interrupted by bump code
+ - rscadd: Lurker invisibility recharge time is now displayed in status tab
+ - maptweak: Added medlinks to WO
+ - maptweak: Added a medlink to each ground map
+ Git-Nivrak:
+ - rscadd: Survivors can now receive command announcements with IFF and a marine
+ headset.
+ Huffie56:
+ - maptweak: Officer cafeteria added back missing emergency shutters and move the
+ pipes from bellow the windows.
+ - maptweak: Starboard aft hull removed the two walls.
+ - maptweak: Upper engi area around lobby remove pipping going bellow window also
+ rework the area to better fit aestetic of almayer.
+ - maptweak: some apc are a bit moved around to avoid them having a small light on
+ them.
+ HumiliatedGoblin:
+ - qol: Now needs help intent to repair walls
+ - qol: Now needs disarm, grab and harm intent to deconstruct walls
+ cuberound:
+ - balance: FM sound is 4 seconds before CAS open fire from 5
+ - balance: FM direction warning is 1 seconds before CAS open fire from 1.5
+ ihatethisengine:
+ - rscadd: Corrupted Queen can set up personal alliances with humans
+ realforest2001:
+ - rscadd: Changed the AI Core Lockdown to the same system as Research Lockdown.
+ - rscadd: Added a subtype of desk bell for the AI Core reception desk that sends
+ an alert over APOLLO Link.
+ - imageadd: Added directional blast door sprites from Thwomper for blended black
+ shutters.
+ - code_imp: Renamed operator var in apollo console code to user.
+2024-05-03:
+ InsaneRed:
+ - spellcheck: New flavor text and better strain information
+ realforest2001:
+ - rscadd: Added the name of an announcement sender, if one exists, to ARES logs.
+2024-05-04:
+ AndroBetel:
+ - qol: Pointing at an item in your hands shows it off.
+ BasilHerb:
+ - rscadd: 'Type 80 bayonet to the mouths of the following mobs: CLF Soldier, CLF
+ Specialist, CLF Medic, CLF Engineer, CLF Leader.'
+ Drathek:
+ - bugfix: Fixed weeded corpses staying weeded if they were transported by shuttle
+ Git-Nivrak:
+ - bugfix: Synths no longer get affected by boiler's neurotoxin
+ coldironwarrior:
+ - rscadd: Added eyewear options, more glove options to the SEA vendor
+ - rscadd: SEAs now get full versions of the utility holster belt
+ - rscdel: Removed the CPR dummy from the SEA vendor
+ iloveloopers:
+ - qol: Bookcases can now be wrenched or slashed to be deconstructed
+ - balance: Kutjevo ledges now take only 0.2 seconds to climb instead of 1 whole
+ second
+ kivts:
+ - bugfix: Infinite metal oversight fix.
+ realforest2001:
+ - bugfix: Whitelist notes now work properly. Council can add notes to players regarding
+ whitelist issues.
+ - rscadd: Changing whitelist flags with the Whitelist Panel now automatically adds
+ a note with the reason.
+ - rscadd: Added skillsets specific to WY Goons.
+ - rscadd: Added a WY Goon Engineer preset.
+ vero5123:
+ - bugfix: Fixes microwave food duplication
+ - bugfix: Fixes scout being able to be decapitated with a helmet on while cloaked.
+ - bugfix: Fixes sentries firing at xenos while vent crawling.
+ - bugfix: fixes hugger not dying when squished by predator
+ - bugfix: Burrower can no longer tunnel across the map.
+2024-05-06:
+ Git-Nivrak:
+ - balance: Watcher is now immobilized when zoomed out and loses health off weeds
+ when not zoomed out
+ ihatethisengine:
+ - balance: SADAR backblast now knockdowns and is reduced by xeno explosion resistance
+ s5nt:
+ - rscadd: Added more materials to pred ship including more sandstone, wood, table
+ parts, etc for lodge construction, along with more pred specific food to the
+ pred kitchen.
+ - maptweak: Slightly expanded pred ship material storage area by moving bracer storage
+ over to the left side of the ship.
+2024-05-07:
+ Zonespace, d.1.n.a. (original sprites), esselnek (new sprites):
+ - rscadd: Added the M540-B Armored Recon Carrier as a t1 intel purchase.
+2024-05-10:
+ realforest2001:
+ - code_imp: Repaths handcuffs and legcuffs to have a shared parent.
+ - code_imp: Repaths xeno restraints to reduce confusion from the typepath.
+ - rscadd: Legcuffs work appropriately now, and can be found in small numbers within
+ security vendors.
+ - rscadd: Cable restraints can now be adjusted via right-click to fit on wrists
+ or ankles.
+ - rscadd: Prison shoe chains now require ankle restraints rather than handcuffs.
+ - rscadd: Prison shoes that have been chained now have an equp and unequip delay
+ to account for the chains, proportionate to the breakout time of the item used
+ in the chains.
+2024-05-11:
+ Tyranicranger4:
+ - qol: Emptied randomchem vials no longer show up on the data detector
+ - bugfix: Fixes empty vial storage boxes showing up on the data detector
+ cuberound:
+ - balance: projectiles can pass fences
+ ihatethisengine:
+ - rscadd: Added paradropping
+ - rscdel: Removed rappeling
+ - rscadd: Infection icon now has lower alpha if the human is dead
+ iloveloopers:
+ - rscadd: Adds in a new incinerator smoke tank that turns any reagent inside it
+ into chemsmoke when fired.
diff --git a/icons/mob/hud/hud.dmi b/icons/mob/hud/hud.dmi
index 507ec0dd485b..8d89fb781264 100644
Binary files a/icons/mob/hud/hud.dmi and b/icons/mob/hud/hud.dmi differ
diff --git a/icons/mob/humans/onmob/back.dmi b/icons/mob/humans/onmob/back.dmi
index 42d46bcc9abe..128b05455d6e 100644
Binary files a/icons/mob/humans/onmob/back.dmi and b/icons/mob/humans/onmob/back.dmi differ
diff --git a/icons/mob/humans/onmob/items_lefthand_0.dmi b/icons/mob/humans/onmob/items_lefthand_0.dmi
index 4e8c1d59a41a..7d887799815b 100644
Binary files a/icons/mob/humans/onmob/items_lefthand_0.dmi and b/icons/mob/humans/onmob/items_lefthand_0.dmi differ
diff --git a/icons/mob/humans/onmob/items_righthand_0.dmi b/icons/mob/humans/onmob/items_righthand_0.dmi
index b8285acc65ad..184946a13f0b 100644
Binary files a/icons/mob/humans/onmob/items_righthand_0.dmi and b/icons/mob/humans/onmob/items_righthand_0.dmi differ
diff --git a/icons/obj/items/clothing/backpacks.dmi b/icons/obj/items/clothing/backpacks.dmi
index be2602f76c57..99240596a9da 100644
Binary files a/icons/obj/items/clothing/backpacks.dmi and b/icons/obj/items/clothing/backpacks.dmi differ
diff --git a/icons/obj/structures/doors/blastdoors_shutters.dmi b/icons/obj/structures/doors/blastdoors_shutters.dmi
index 8c63d0580922..1fe1df44b23a 100644
Binary files a/icons/obj/structures/doors/blastdoors_shutters.dmi and b/icons/obj/structures/doors/blastdoors_shutters.dmi differ
diff --git a/icons/obj/structures/machinery/fuelpump.dmi b/icons/obj/structures/machinery/fuelpump.dmi
new file mode 100644
index 000000000000..a63fbab88019
Binary files /dev/null and b/icons/obj/structures/machinery/fuelpump.dmi differ
diff --git a/icons/obj/structures/machinery/library.dmi b/icons/obj/structures/machinery/library.dmi
index 3efeeef8b9f5..b2e62dc1bb93 100644
Binary files a/icons/obj/structures/machinery/library.dmi and b/icons/obj/structures/machinery/library.dmi differ
diff --git a/icons/obj/vehicles/arc.dmi b/icons/obj/vehicles/arc.dmi
new file mode 100644
index 000000000000..f662d5475ac0
Binary files /dev/null and b/icons/obj/vehicles/arc.dmi differ
diff --git a/icons/obj/vehicles/hardpoints/arc.dmi b/icons/obj/vehicles/hardpoints/arc.dmi
new file mode 100644
index 000000000000..b971efecff5e
Binary files /dev/null and b/icons/obj/vehicles/hardpoints/arc.dmi differ
diff --git a/icons/turf/areas_interiors.dmi b/icons/turf/areas_interiors.dmi
index 47a95da322ea..6fc30badd763 100644
Binary files a/icons/turf/areas_interiors.dmi and b/icons/turf/areas_interiors.dmi differ
diff --git a/icons/turf/walls/windows.dmi b/icons/turf/walls/windows.dmi
index 2904c8d5fa9a..c162b83e661c 100644
Binary files a/icons/turf/walls/windows.dmi and b/icons/turf/walls/windows.dmi differ
diff --git a/icons/ui_icons/inventory/back.png b/icons/ui_icons/inventory/back.png
new file mode 100644
index 000000000000..736b9d64bf99
Binary files /dev/null and b/icons/ui_icons/inventory/back.png differ
diff --git a/icons/ui_icons/inventory/belt.png b/icons/ui_icons/inventory/belt.png
new file mode 100644
index 000000000000..1be89d450a8f
Binary files /dev/null and b/icons/ui_icons/inventory/belt.png differ
diff --git a/icons/ui_icons/inventory/collar.png b/icons/ui_icons/inventory/collar.png
new file mode 100644
index 000000000000..71803b1b6c6b
Binary files /dev/null and b/icons/ui_icons/inventory/collar.png differ
diff --git a/icons/ui_icons/inventory/ears.png b/icons/ui_icons/inventory/ears.png
new file mode 100644
index 000000000000..e9a8f3c23c4b
Binary files /dev/null and b/icons/ui_icons/inventory/ears.png differ
diff --git a/icons/ui_icons/inventory/glasses.png b/icons/ui_icons/inventory/glasses.png
new file mode 100644
index 000000000000..6e6f1ad098f6
Binary files /dev/null and b/icons/ui_icons/inventory/glasses.png differ
diff --git a/icons/ui_icons/inventory/gloves.png b/icons/ui_icons/inventory/gloves.png
new file mode 100644
index 000000000000..2c8a16cbdb7a
Binary files /dev/null and b/icons/ui_icons/inventory/gloves.png differ
diff --git a/icons/ui_icons/inventory/hand_l.png b/icons/ui_icons/inventory/hand_l.png
new file mode 100644
index 000000000000..b09228d65f6d
Binary files /dev/null and b/icons/ui_icons/inventory/hand_l.png differ
diff --git a/icons/ui_icons/inventory/hand_r.png b/icons/ui_icons/inventory/hand_r.png
new file mode 100644
index 000000000000..0e05a487e070
Binary files /dev/null and b/icons/ui_icons/inventory/hand_r.png differ
diff --git a/icons/ui_icons/inventory/head.png b/icons/ui_icons/inventory/head.png
new file mode 100644
index 000000000000..11e2d2254cd0
Binary files /dev/null and b/icons/ui_icons/inventory/head.png differ
diff --git a/icons/ui_icons/inventory/id.png b/icons/ui_icons/inventory/id.png
new file mode 100644
index 000000000000..4469591d36f5
Binary files /dev/null and b/icons/ui_icons/inventory/id.png differ
diff --git a/icons/ui_icons/inventory/mask.png b/icons/ui_icons/inventory/mask.png
new file mode 100644
index 000000000000..82e510893796
Binary files /dev/null and b/icons/ui_icons/inventory/mask.png differ
diff --git a/icons/ui_icons/inventory/neck.png b/icons/ui_icons/inventory/neck.png
new file mode 100644
index 000000000000..78ad3ce3b1c7
Binary files /dev/null and b/icons/ui_icons/inventory/neck.png differ
diff --git a/icons/ui_icons/inventory/pocket.png b/icons/ui_icons/inventory/pocket.png
new file mode 100644
index 000000000000..f42399dca0f5
Binary files /dev/null and b/icons/ui_icons/inventory/pocket.png differ
diff --git a/icons/ui_icons/inventory/shoes.png b/icons/ui_icons/inventory/shoes.png
new file mode 100644
index 000000000000..d20f7ef4d106
Binary files /dev/null and b/icons/ui_icons/inventory/shoes.png differ
diff --git a/icons/ui_icons/inventory/suit.png b/icons/ui_icons/inventory/suit.png
new file mode 100644
index 000000000000..e9c48e8069f7
Binary files /dev/null and b/icons/ui_icons/inventory/suit.png differ
diff --git a/icons/ui_icons/inventory/suit_storage.png b/icons/ui_icons/inventory/suit_storage.png
new file mode 100644
index 000000000000..9722eb10297a
Binary files /dev/null and b/icons/ui_icons/inventory/suit_storage.png differ
diff --git a/icons/ui_icons/inventory/uniform.png b/icons/ui_icons/inventory/uniform.png
new file mode 100644
index 000000000000..292b3324b5bd
Binary files /dev/null and b/icons/ui_icons/inventory/uniform.png differ
diff --git a/icons/ui_icons/map_blips_large.dmi b/icons/ui_icons/map_blips_large.dmi
index 0cf41b52a4dc..f03433c8c8ef 100644
Binary files a/icons/ui_icons/map_blips_large.dmi and b/icons/ui_icons/map_blips_large.dmi differ
diff --git a/maps/interiors/arc.dmm b/maps/interiors/arc.dmm
new file mode 100644
index 000000000000..4da63cbff383
--- /dev/null
+++ b/maps/interiors/arc.dmm
@@ -0,0 +1,296 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"aD" = (
+/obj/effect/landmark/interior/spawn/weapons_loader,
+/turf/open/shuttle/vehicle{
+ icon_state = "floor_3_12"
+ },
+/area/interior/vehicle/arc)
+"be" = (
+/obj/structure/interior_wall/apc{
+ icon_state = "door_back"
+ },
+/turf/open/void/vehicle,
+/area/space)
+"cJ" = (
+/obj/structure/interior_wall/apc{
+ icon_state = "rear_1"
+ },
+/turf/open/void/vehicle,
+/area/space)
+"dM" = (
+/obj/structure/interior_wall/apc{
+ icon_state = "rear_2"
+ },
+/turf/open/void/vehicle,
+/area/space)
+"dU" = (
+/obj/effect/landmark/interior/spawn/vehicle_driver_seat/armor{
+ dir = 4
+ },
+/obj/structure/machinery/cm_vending/sorted/medical/wall_med/vehicle{
+ pixel_x = 6;
+ pixel_y = 28
+ },
+/obj/item/device/megaphone,
+/turf/open/shuttle/vehicle{
+ icon_state = "floor_3_9_1"
+ },
+/area/interior/vehicle/arc)
+"jb" = (
+/turf/open/shuttle/vehicle{
+ icon_state = "floor_3_11"
+ },
+/area/interior/vehicle/arc)
+"ml" = (
+/obj/structure/interior_wall/apc{
+ icon_state = "wall"
+ },
+/obj/effect/landmark/interior/spawn/telephone,
+/turf/open/void/vehicle,
+/area/space)
+"mR" = (
+/obj/structure/interior_wall/apc{
+ icon_state = "front_wheel_R"
+ },
+/turf/open/void/vehicle,
+/area/space)
+"ro" = (
+/obj/structure/interior_wall/apc{
+ alpha = 100;
+ icon_state = "wall_door_front";
+ layer = 5.2;
+ pixel_y = 32
+ },
+/turf/open/void/vehicle,
+/area/space)
+"ru" = (
+/turf/open/shuttle/vehicle{
+ icon_state = "floor_1_6"
+ },
+/area/interior/vehicle/arc)
+"tD" = (
+/obj/structure/interior_wall/apc{
+ icon_state = "rear_6"
+ },
+/turf/open/void/vehicle,
+/area/space)
+"vt" = (
+/obj/structure/interior_wall/apc{
+ icon_state = "rear_wheel_L"
+ },
+/turf/open/void/vehicle,
+/area/space)
+"we" = (
+/obj/structure/interior_wall/apc{
+ alpha = 100;
+ icon_state = "door_front";
+ layer = 5.2;
+ pixel_y = 32
+ },
+/turf/open/void/vehicle,
+/area/space)
+"wK" = (
+/obj/structure/interior_wall/apc{
+ icon_state = "wheel_front_top_1";
+ pixel_x = 1;
+ pixel_y = -4
+ },
+/turf/open/void/vehicle,
+/area/space)
+"ym" = (
+/obj/structure/interior_wall/apc{
+ icon_state = "rear_wheel_R";
+ opacity = 0
+ },
+/turf/open/void/vehicle,
+/area/space)
+"yX" = (
+/turf/open/shuttle/vehicle{
+ icon_state = "floor_3_8_1"
+ },
+/area/interior/vehicle/arc)
+"CB" = (
+/obj/structure/interior_wall/apc{
+ icon_state = "wall";
+ opacity = 0
+ },
+/turf/open/void/vehicle,
+/area/space)
+"Dn" = (
+/obj/structure/machinery/prop/almayer/CICmap/computer{
+ dir = 4;
+ pixel_y = 8
+ },
+/obj/structure/surface/table/reinforced/prison{
+ pixel_y = -3
+ },
+/obj/structure/machinery/computer/overwatch/almayer/small{
+ dir = 4;
+ layer = 3.01;
+ pixel_y = -5
+ },
+/turf/open/shuttle/vehicle{
+ icon_state = "floor_3_10_1"
+ },
+/area/interior/vehicle/arc)
+"Gy" = (
+/obj/structure/interior_wall/apc{
+ icon_state = "front_1"
+ },
+/turf/open/void/vehicle,
+/area/space)
+"HB" = (
+/obj/structure/interior_wall/apc{
+ icon_state = "corner_small_L"
+ },
+/obj/structure/interior_wall/apc{
+ icon_state = "rear_5"
+ },
+/turf/open/void/vehicle,
+/area/space)
+"HJ" = (
+/obj/structure/interior_wall/apc{
+ icon_state = "front_6"
+ },
+/turf/open/void/vehicle,
+/area/space)
+"Jc" = (
+/obj/structure/interior_wall/apc{
+ icon_state = "corner_small_R"
+ },
+/obj/structure/interior_wall/apc{
+ icon_state = "front_5"
+ },
+/turf/open/void/vehicle,
+/area/space)
+"Ng" = (
+/obj/structure/interior_wall/apc{
+ icon_state = "wall"
+ },
+/turf/open/void/vehicle,
+/area/space)
+"NS" = (
+/obj/structure/bed/chair/comfy{
+ dir = 8
+ },
+/turf/open/shuttle/vehicle{
+ icon_state = "floor_3_5"
+ },
+/area/interior/vehicle/arc)
+"Ol" = (
+/obj/effect/landmark/interior/spawn/entrance{
+ alpha = 50;
+ exit_type = /obj/structure/interior_exit/vehicle/apc;
+ name = "Right APC door";
+ tag = "right"
+ },
+/obj/effect/landmark/interior/spawn/interior_viewport{
+ dir = 8;
+ pixel_x = 5;
+ pixel_y = 1
+ },
+/turf/open/shuttle/vehicle{
+ icon_state = "floor_1_12"
+ },
+/area/interior/vehicle/arc)
+"Po" = (
+/obj/structure/surface/table/reinforced/prison{
+ pixel_y = -3
+ },
+/obj/structure/machinery/computer/intel/disk_reader{
+ dir = 4;
+ pixel_y = 6
+ },
+/obj/structure/machinery/computer/groundside_operations{
+ dir = 4;
+ pixel_y = -7
+ },
+/turf/open/shuttle/vehicle{
+ icon_state = "floor_3_8_1"
+ },
+/area/interior/vehicle/arc)
+"Rb" = (
+/turf/open/void/vehicle,
+/area/space)
+"Rf" = (
+/obj/structure/interior_wall/apc{
+ icon_state = "front_2"
+ },
+/turf/open/void/vehicle,
+/area/space)
+"Zs" = (
+/obj/structure/bed/chair/comfy{
+ dir = 8
+ },
+/turf/open/shuttle/vehicle{
+ icon_state = "floor_3_8_1"
+ },
+/area/interior/vehicle/arc)
+"ZF" = (
+/obj/effect/landmark/interior/spawn/interior_viewport{
+ dir = 8;
+ pixel_x = 5;
+ pixel_y = 8
+ },
+/obj/effect/landmark/interior/spawn/entrance{
+ alpha = 50;
+ dir = 1;
+ exit_type = /obj/structure/interior_exit/vehicle/apc;
+ name = "Left APC door";
+ pixel_y = 32;
+ tag = "left"
+ },
+/turf/open/shuttle/vehicle{
+ icon_state = "floor_1_11"
+ },
+/area/interior/vehicle/arc)
+
+(1,1,1) = {"
+tD
+HB
+dM
+cJ
+Rb
+"}
+(2,1,1) = {"
+Ng
+Po
+Dn
+vt
+Rb
+"}
+(3,1,1) = {"
+ml
+Zs
+NS
+ym
+Rb
+"}
+(4,1,1) = {"
+Ng
+jb
+yX
+aD
+ro
+"}
+(5,1,1) = {"
+be
+ZF
+ru
+Ol
+we
+"}
+(6,1,1) = {"
+wK
+CB
+dU
+mR
+Rb
+"}
+(7,1,1) = {"
+HJ
+Jc
+Rf
+Gy
+Rb
+"}
diff --git a/maps/map_files/BigRed/BigRed.dmm b/maps/map_files/BigRed/BigRed.dmm
index 70e8e14bf78c..90bda5d104e5 100644
--- a/maps/map_files/BigRed/BigRed.dmm
+++ b/maps/map_files/BigRed/BigRed.dmm
@@ -228,12 +228,6 @@
icon_state = "dark"
},
/area/bigredv2/outside/space_port)
-"aaM" = (
-/obj/structure/machinery/vending/snack,
-/turf/open/floor{
- icon_state = "whitegreenfull"
- },
-/area/bigredv2/outside/medical)
"aaN" = (
/obj/structure/surface/table,
/obj/effect/spawner/random/powercell,
@@ -386,17 +380,6 @@
icon_state = "asteroidfloor"
},
/area/bigredv2/outside/space_port)
-"abj" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/landinglight/ds1/delaytwo{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor{
- dir = 8;
- icon_state = "asteroidwarning"
- },
-/area/bigredv2/outside/space_port)
"abk" = (
/obj/structure/cargo_container/arious/leftmid,
/turf/open/floor/plating,
@@ -488,10 +471,6 @@
icon_state = "dark"
},
/area/bigredv2/landing/console)
-"abz" = (
-/obj/structure/window_frame/solaris,
-/turf/open/floor/plating,
-/area/bigredv2/outside/medical)
"abA" = (
/obj/structure/bed/chair/office/dark,
/obj/effect/decal/cleanable/blood/gibs/core,
@@ -766,14 +745,6 @@
/obj/effect/landmark/crap_item,
/turf/open/floor/plating,
/area/bigredv2/outside/space_port)
-"acy" = (
-/obj/structure/machinery/botany,
-/obj/item/seeds/goldappleseed,
-/turf/open/floor{
- dir = 1;
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/marshal_office)
"acz" = (
/turf/open/floor{
dir = 1;
@@ -783,12 +754,6 @@
"acA" = (
/turf/closed/wall/solaris/reinforced,
/area/bigredv2/outside/telecomm)
-"acB" = (
-/obj/effect/landmark/hunter_primary,
-/turf/open/floor/plating{
- icon_state = "platebot"
- },
-/area/bigredv2/outside/space_port)
"acC" = (
/turf/open/floor{
icon_state = "white"
@@ -846,26 +811,12 @@
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/space_port)
-"acL" = (
-/obj/structure/machinery/camera/autoname,
-/obj/structure/bed,
-/turf/open/floor{
- icon_state = "white"
- },
-/area/bigredv2/outside/marshal_office)
"acM" = (
/obj/structure/surface/table,
/turf/open/floor{
icon_state = "white"
},
/area/bigredv2/outside/marshal_office)
-"acO" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/tool/plantspray/weeds,
-/turf/open/floor{
- icon_state = "white"
- },
-/area/bigredv2/outside/marshal_office)
"acP" = (
/turf/open/mars,
/area/bigredv2/outside/n)
@@ -1026,22 +977,6 @@
icon_state = "white"
},
/area/bigredv2/outside/marshal_office)
-"ado" = (
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor{
- icon_state = "white"
- },
-/area/bigredv2/outside/marshal_office)
-"adp" = (
-/obj/structure/machinery/light{
- dir = 4
- },
-/obj/structure/bed,
-/turf/open/floor{
- dir = 4;
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/marshal_office)
"adr" = (
/obj/structure/machinery/light{
dir = 4
@@ -1136,19 +1071,6 @@
icon_state = "freezerfloor"
},
/area/bigredv2/outside/marshal_office)
-"adF" = (
-/obj/structure/mirror{
- icon_state = "mirror_broke";
- pixel_x = 30
- },
-/obj/item/tool/soap/deluxe{
- pixel_y = -7;
- pixel_x = -9
- },
-/turf/open/floor{
- icon_state = "freezerfloor"
- },
-/area/bigredv2/outside/marshal_office)
"adG" = (
/obj/item/shard,
/obj/effect/decal/cleanable/blood{
@@ -1230,18 +1152,6 @@
icon_state = "floor4"
},
/area/bigredv2/outside/marshal_office)
-"adU" = (
-/obj/structure/surface/table,
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/effect/landmark/objective_landmark/close,
-/obj/item/paper/bigred/crazy{
- pixel_x = 8;
- pixel_y = 13
- },
-/turf/open/floor,
-/area/bigredv2/outside/marshal_office)
"adW" = (
/turf/open/floor{
icon_state = "wood"
@@ -1404,16 +1314,6 @@
icon_state = "wood"
},
/area/bigredv2/outside/marshal_office)
-"aet" = (
-/obj/structure/bed/chair/comfy,
-/obj/effect/decal/cleanable/blood,
-/obj/item/ammo_casing/bullet{
- icon_state = "cartridge_10_1"
- },
-/turf/open/floor{
- icon_state = "wood"
- },
-/area/bigredv2/outside/marshal_office)
"aeu" = (
/obj/item/clothing/accessory/storage/holster/armpit,
/turf/open/floor{
@@ -1649,13 +1549,6 @@
/obj/structure/pipes/standard/simple/hidden/green,
/turf/open/floor/plating,
/area/bigredv2/outside/space_port)
-"afh" = (
-/obj/item/stack/sheet/metal{
- pixel_y = -3;
- pixel_x = -8
- },
-/turf/open/floor/plating,
-/area/bigredv2/outside/space_port)
"afi" = (
/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
name = "\improper Marshal Office Isolation"
@@ -1706,43 +1599,6 @@
icon_state = "vault"
},
/area/bigredv2/outside/marshal_office)
-"afo" = (
-/obj/structure/surface/rack,
-/obj/item/trash/wy_chips_pepper{
- pixel_y = -13;
- pixel_x = 24
- },
-/obj/item/explosive/grenade/high_explosive{
- pixel_x = -1;
- pixel_y = -2
- },
-/turf/open/floor{
- dir = 8;
- icon_state = "vault"
- },
-/area/bigredv2/outside/marshal_office)
-"afp" = (
-/obj/structure/surface/rack,
-/turf/open/floor{
- dir = 8;
- icon_state = "vault"
- },
-/area/bigredv2/outside/marshal_office)
-"afq" = (
-/obj/structure/surface/rack,
-/obj/structure/machinery/light{
- dir = 1
- },
-/obj/item/ammo_magazine/revolver/cmb{
- pixel_y = -7;
- pixel_x = -7
- },
-/obj/item/ammo_magazine/revolver/cmb,
-/turf/open/floor{
- dir = 8;
- icon_state = "vault"
- },
-/area/bigredv2/outside/marshal_office)
"afr" = (
/obj/structure/machinery/camera/autoname{
dir = 4
@@ -1923,12 +1779,6 @@
icon_state = "delivery"
},
/area/bigredv2/outside/marshal_office)
-"afR" = (
-/turf/open/floor{
- dir = 8;
- icon_state = "vault"
- },
-/area/bigredv2/outside/marshal_office)
"afS" = (
/turf/open/floor{
icon_state = "dark"
@@ -2093,14 +1943,6 @@
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/n)
-"agr" = (
-/obj/structure/pipes/standard/manifold/hidden/green{
- dir = 1
- },
-/turf/open/asphalt/cement{
- icon_state = "cement12"
- },
-/area/bigredv2/outside/space_port)
"ags" = (
/turf/open/floor{
dir = 5;
@@ -2182,44 +2024,6 @@
icon_state = "dark"
},
/area/bigredv2/outside/marshal_office)
-"agE" = (
-/obj/structure/surface/rack,
-/obj/item/ammo_magazine/shotgun/slugs{
- pixel_y = -9;
- pixel_x = -7
- },
-/obj/item/ammo_magazine/shotgun/slugs{
- pixel_y = -2
- },
-/turf/open/floor{
- icon_state = "dark"
- },
-/area/bigredv2/outside/marshal_office)
-"agF" = (
-/obj/structure/surface/rack,
-/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb{
- pixel_y = -9
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb{
- pixel_y = 1
- },
-/turf/open/floor{
- icon_state = "dark"
- },
-/area/bigredv2/outside/marshal_office)
-"agG" = (
-/obj/structure/surface/rack,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/ammo_magazine/shotgun/buckshot,
-/obj/item/ammo_magazine/shotgun/buckshot{
- pixel_y = -8;
- pixel_x = -6
- },
-/turf/open/floor{
- icon_state = "dark"
- },
-/area/bigredv2/outside/marshal_office)
"agH" = (
/obj/structure/pipes/vents/pump,
/obj/effect/decal/cleanable/dirt,
@@ -2227,14 +2031,6 @@
icon_state = "dark"
},
/area/bigredv2/outside/marshal_office)
-"agI" = (
-/obj/structure/surface/table/reinforced,
-/obj/structure/machinery/door/window/brigdoor/eastleft,
-/turf/open/floor{
- dir = 8;
- icon_state = "vault"
- },
-/area/bigredv2/outside/marshal_office)
"agJ" = (
/obj/structure/machinery/door/airlock/almayer/security/glass/colony{
dir = 1;
@@ -2402,16 +2198,6 @@
/obj/structure/surface/table,
/turf/open/floor,
/area/bigredv2/outside/general_offices)
-"ahg" = (
-/obj/item/stack/sheet/metal{
- pixel_x = 7;
- pixel_y = 6
- },
-/turf/open/floor/plating{
- dir = 8;
- icon_state = "platingdmg3"
- },
-/area/bigredv2/outside/space_port)
"ahi" = (
/obj/effect/landmark/crap_item,
/turf/open/mars,
@@ -2448,15 +2234,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor,
/area/bigredv2/outside/marshal_office)
-"aho" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 10
- },
-/obj/structure/barricade/wooden{
- pixel_y = -10
- },
-/turf/open/floor,
-/area/bigredv2/outside/marshal_office)
"ahp" = (
/obj/structure/machinery/camera/autoname{
dir = 1
@@ -2465,15 +2242,6 @@
icon_state = "dark"
},
/area/bigredv2/outside/marshal_office)
-"ahq" = (
-/obj/structure/surface/table,
-/obj/structure/pipes/vents/pump{
- dir = 8
- },
-/turf/open/floor{
- icon_state = "dark"
- },
-/area/bigredv2/outside/general_offices)
"ahr" = (
/obj/structure/pipes/standard/simple/hidden/green,
/turf/open/floor{
@@ -2655,60 +2423,15 @@
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/nw)
-"ahU" = (
-/obj/structure/lz_sign/solaris_sign,
-/turf/open/floor{
- dir = 10;
- icon_state = "asteroidwarning"
- },
-/area/bigredv2/outside/nw)
"ahV" = (
/turf/open/mars{
icon_state = "mars_dirt_12"
},
/area/bigredv2/outside/nw)
-"ahW" = (
-/obj/item/stack/rods{
- pixel_x = 9;
- pixel_y = 10
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor{
- icon_state = "asteroidwarning"
- },
-/area/bigredv2/outside/nw)
"ahX" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/mars,
/area/bigredv2/outside/nw)
-"ahY" = (
-/obj/item/stack/sheet/metal{
- pixel_y = 9;
- pixel_x = 9
- },
-/obj/item/stack/rods{
- pixel_y = 4;
- pixel_x = -13
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor{
- icon_state = "asteroidwarning"
- },
-/area/bigredv2/outside/nw)
-"ahZ" = (
-/obj/item/stack/rods{
- pixel_x = -11;
- pixel_y = -8
- },
-/obj/item/stack/rods{
- pixel_y = 13;
- pixel_x = 17
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor{
- icon_state = "asteroidwarning"
- },
-/area/bigredv2/outside/nw)
"aia" = (
/obj/structure/machinery/door_control{
id = "Marshal Offices";
@@ -2799,20 +2522,6 @@
icon_state = "freezerfloor"
},
/area/bigredv2/caves/lambda/xenobiology)
-"aim" = (
-/obj/structure/surface/table,
-/obj/structure/extinguisher_cabinet{
- pixel_x = -27
- },
-/obj/item/storage/box/beakers{
- pixel_y = -1;
- pixel_x = 4
- },
-/turf/open/floor{
- dir = 1;
- icon_state = "whitepurplecorner"
- },
-/area/bigredv2/outside/medical)
"ain" = (
/obj/structure/machinery/door/airlock/almayer/maint/colony{
dir = 1;
@@ -2828,22 +2537,6 @@
icon_state = "darkpurplecorners2"
},
/area/bigredv2/caves/lambda/xenobiology)
-"aip" = (
-/obj/structure/surface/table,
-/obj/structure/pipes/vents/pump,
-/obj/item/device/flashlight/lamp{
- pixel_y = 8;
- pixel_x = 8
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/item/ashtray/glass{
- icon_state = "ashtray_half_gl";
- pixel_x = -5
- },
-/turf/open/floor{
- icon_state = "white"
- },
-/area/bigredv2/outside/medical)
"aiq" = (
/obj/structure/largecrate/random,
/turf/open/floor{
@@ -2894,19 +2587,6 @@
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/nw)
-"aix" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/nw)
-"aiy" = (
-/obj/item/trash/kepler{
- pixel_y = 14;
- pixel_x = 15
- },
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached1"
- },
-/area/bigredv2/outside/nw)
"aiz" = (
/turf/open/mars{
icon_state = "mars_dirt_13"
@@ -2942,48 +2622,6 @@
icon_state = "dark"
},
/area/bigredv2/outside/marshal_office)
-"aiF" = (
-/obj/structure/surface/table,
-/obj/structure/machinery/power/apc{
- dir = 1;
- start_charge = 0
- },
-/turf/open/floor{
- icon_state = "dark"
- },
-/area/bigredv2/outside/marshal_office)
-"aiG" = (
-/obj/structure/surface/table,
-/obj/item/handcuffs{
- pixel_x = 9;
- pixel_y = 8
- },
-/obj/structure/transmitter/colony_net/rotary{
- phone_category = "Solaris Ridge";
- phone_color = "red";
- phone_id = "Marshal Office"
- },
-/turf/open/floor{
- icon_state = "dark"
- },
-/area/bigredv2/outside/marshal_office)
-"aiH" = (
-/obj/structure/surface/table,
-/obj/structure/machinery/camera/autoname,
-/obj/item/ammo_magazine/shotgun/slugs,
-/turf/open/floor{
- icon_state = "dark"
- },
-/area/bigredv2/outside/marshal_office)
-"aiI" = (
-/obj/structure/surface/table,
-/obj/item/clothing/head/beret/sec/warden{
- pixel_y = 5
- },
-/turf/open/floor{
- icon_state = "dark"
- },
-/area/bigredv2/outside/marshal_office)
"aiJ" = (
/obj/structure/machinery/light{
dir = 1
@@ -2999,30 +2637,6 @@
icon_state = "dark"
},
/area/bigredv2/outside/marshal_office)
-"aiL" = (
-/obj/structure/surface/table,
-/obj/item/clothing/suit/storage/CMB{
- pixel_x = 7;
- pixel_y = 6
- },
-/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
-/turf/open/floor,
-/area/bigredv2/outside/marshal_office)
-"aiM" = (
-/obj/structure/surface/table,
-/obj/item/handcuffs{
- pixel_x = -8
- },
-/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
-/turf/open/floor,
-/area/bigredv2/outside/marshal_office)
-"aiN" = (
-/obj/structure/surface/table,
-/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot{
- pixel_x = 3
- },
-/turf/open/floor,
-/area/bigredv2/outside/marshal_office)
"aiO" = (
/obj/structure/bed/chair,
/turf/open/floor,
@@ -3091,16 +2705,6 @@
icon_state = "bcircuit"
},
/area/bigredv2/outside/marshal_office)
-"aiY" = (
-/obj/structure/surface/table,
-/obj/structure/machinery/light{
- dir = 4
- },
-/obj/effect/landmark/objective_landmark/medium,
-/turf/open/floor{
- icon_state = "whitegreenfull"
- },
-/area/bigredv2/outside/medical)
"aiZ" = (
/obj/structure/machinery/computer/cameras,
/obj/structure/surface/table,
@@ -3145,37 +2749,6 @@
/obj/structure/pipes/vents/pump/on,
/turf/open/floor,
/area/bigredv2/outside/marshal_office)
-"ajf" = (
-/obj/structure/surface/table,
-/obj/item/trash/kepler{
- pixel_x = -5;
- pixel_y = 8
- },
-/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
-/turf/open/floor,
-/area/bigredv2/outside/marshal_office)
-"ajg" = (
-/obj/structure/surface/table,
-/obj/item/evidencebag{
- pixel_y = 12
- },
-/turf/open/floor,
-/area/bigredv2/outside/marshal_office)
-"ajh" = (
-/obj/structure/surface/table,
-/obj/item/clothing/suit/armor/det_suit{
- pixel_x = 8
- },
-/turf/open/floor,
-/area/bigredv2/outside/marshal_office)
-"aji" = (
-/obj/structure/surface/table,
-/obj/item/explosive/grenade/flashbang{
- pixel_x = 3;
- pixel_y = -7
- },
-/turf/open/floor,
-/area/bigredv2/outside/marshal_office)
"ajj" = (
/obj/structure/machinery/light{
dir = 4
@@ -3305,15 +2878,6 @@
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/nw)
-"ajA" = (
-/obj/effect/decal/strata_decals/grime/grime1,
-/obj/effect/decal/cleanable/ash{
- pixel_y = 19
- },
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached9"
- },
-/area/bigredv2/outside/nw)
"ajB" = (
/obj/structure/machinery/camera/autoname{
dir = 4
@@ -3351,23 +2915,6 @@
icon_state = "dark"
},
/area/bigredv2/outside/marshal_office)
-"ajH" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/frame/rack,
-/turf/open/floor{
- icon_state = "dark"
- },
-/area/bigredv2/outside/marshal_office)
-"ajI" = (
-/obj/structure/pipes/standard/manifold/hidden/green{
- dir = 8
- },
-/obj/item/frame/table,
-/turf/open/floor{
- icon_state = "dark"
- },
-/area/bigredv2/outside/marshal_office)
"ajJ" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
@@ -3376,18 +2923,6 @@
icon_state = "dark"
},
/area/bigredv2/outside/marshal_office)
-"ajK" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/structure/machinery/door/airlock/almayer/security/glass/colony{
- name = "\improper Marshal Office Armory";
- locked = 1
- },
-/turf/open/floor{
- icon_state = "delivery"
- },
-/area/bigredv2/outside/marshal_office)
"ajL" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
@@ -3398,33 +2933,11 @@
/obj/structure/pipes/standard/manifold/hidden/green,
/turf/open/floor,
/area/bigredv2/outside/marshal_office)
-"ajN" = (
-/obj/structure/surface/table,
-/obj/item/reagent_container/spray/cleaner{
- pixel_x = 13;
- pixel_y = 13
- },
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
-/turf/open/floor,
-/area/bigredv2/outside/marshal_office)
"ajO" = (
/obj/structure/machinery/prop/almayer/computer/PC,
/obj/structure/surface/table/woodentable/fancy,
/turf/open/floor/carpet,
/area/bigredv2/caves/lambda/breakroom)
-"ajP" = (
-/obj/structure/surface/table,
-/obj/item/trash/kepler{
- pixel_y = 3
- },
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/turf/open/floor,
-/area/bigredv2/outside/marshal_office)
"ajQ" = (
/obj/structure/surface/table,
/obj/structure/machinery/recharger,
@@ -3476,30 +2989,6 @@
icon_state = "delivery"
},
/area/bigredv2/caves/lambda/xenobiology)
-"ajX" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 5
- },
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/nw)
-"ajY" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/limb/head,
-/obj/effect/decal/cleanable/blood,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached3"
- },
-/area/bigredv2/outside/nw)
-"ajZ" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 10
- },
-/obj/effect/decal/cleanable/generic,
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/nw)
"aka" = (
/obj/structure/machinery/faxmachine,
/obj/structure/surface/table/woodentable/fancy,
@@ -3509,12 +2998,6 @@
/obj/structure/window/framed/solaris,
/turf/open/floor/plating,
/area/bigredv2/outside/marshal_office)
-"akd" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached1"
- },
-/area/bigredv2/outside/nw)
"ake" = (
/obj/structure/surface/table,
/obj/item/ore/uranium,
@@ -3528,15 +3011,6 @@
icon_state = "asteroidfloor"
},
/area/bigredv2/outside/telecomm/n_cave)
-"aki" = (
-/obj/item/clothing/mask/gas{
- pixel_y = 9
- },
-/obj/structure/machinery/deployable/barrier,
-/turf/open/floor{
- icon_state = "dark"
- },
-/area/bigredv2/outside/marshal_office)
"akj" = (
/obj/structure/window/framed/solaris,
/obj/structure/machinery/door/poddoor/shutters/almayer{
@@ -3763,11 +3237,6 @@
/obj/structure/window/framed/solaris/reinforced,
/turf/open/floor/plating,
/area/bigredv2/outside/general_offices)
-"akV" = (
-/obj/effect/landmark/hunter_primary,
-/obj/structure/flora/grass/desert/lightgrass_7,
-/turf/open/mars,
-/area/bigredv2/outside/n)
"akW" = (
/turf/open/mars{
icon_state = "mars_dirt_13"
@@ -3864,12 +3333,6 @@
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/telecomm)
-"alm" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached1"
- },
-/area/bigredv2/outside/nw)
"aln" = (
/turf/open/mars{
icon_state = "mars_dirt_3"
@@ -4061,16 +3524,6 @@
icon_state = "whitepurplefull"
},
/area/bigredv2/caves/lambda/xenobiology)
-"alT" = (
-/obj/structure/surface/table/woodentable,
-/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot{
- pixel_y = 4;
- pixel_x = 4
- },
-/turf/open/floor{
- icon_state = "wood"
- },
-/area/bigredv2/outside/dorms)
"alU" = (
/turf/open/floor{
dir = 8;
@@ -4124,12 +3577,6 @@
/obj/structure/window_frame/solaris,
/turf/open/floor/plating,
/area/bigredv2/outside/marshal_office)
-"amc" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 6
- },
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/nw)
"amd" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
@@ -4163,10 +3610,6 @@
},
/turf/closed/wall/solaris,
/area/bigredv2/outside/general_offices)
-"ami" = (
-/obj/structure/pipes/standard/manifold/fourway/hidden/green,
-/turf/open/floor,
-/area/bigredv2/outside/marshal_office)
"amj" = (
/obj/structure/window/framed/solaris,
/turf/open/floor/plating,
@@ -4186,13 +3629,6 @@
"amn" = (
/turf/closed/wall/solaris,
/area/bigredv2/outside/dorms)
-"amo" = (
-/obj/structure/pipes/standard/manifold/hidden/green,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/ammo_casing/bullet,
-/obj/item/ammo_casing/bullet,
-/turf/open/floor,
-/area/bigredv2/outside/marshal_office)
"amp" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/pipes/standard/manifold/hidden/green{
@@ -4226,32 +3662,6 @@
icon_state = "red"
},
/area/bigredv2/outside/marshal_office)
-"amt" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/structure/machinery/door/airlock/almayer/security/glass/colony{
- name = "\improper Marshal Office Courtroom";
- welded = 1
- },
-/turf/open/floor{
- icon_state = "delivery"
- },
-/area/bigredv2/outside/marshal_office)
-"amu" = (
-/obj/structure/bed/chair{
- dir = 4
- },
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/effect/landmark/survivor_spawner,
-/obj/item/handcuffs{
- pixel_x = 14;
- pixel_y = 18
- },
-/turf/open/floor,
-/area/bigredv2/outside/marshal_office)
"amw" = (
/obj/structure/bed/chair{
dir = 4
@@ -4453,18 +3863,6 @@
/obj/structure/pipes/standard/simple/hidden/green,
/turf/closed/wall/solaris,
/area/bigredv2/outside/general_offices)
-"ana" = (
-/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
- name = "\improper Marshal Office";
- welded = 1;
- dir = 2;
- density = 0;
- icon_state = "door_open"
- },
-/turf/open/floor{
- icon_state = "delivery"
- },
-/area/bigredv2/outside/marshal_office)
"anb" = (
/obj/structure/pipes/vents/pump{
dir = 1
@@ -4490,17 +3888,6 @@
icon_state = "redcorner"
},
/area/bigredv2/outside/marshal_office)
-"ane" = (
-/obj/structure/machinery/cm_vending/sorted/medical/wall_med/limited{
- name = "Emergency NanoMed";
- pixel_x = 30
- },
-/obj/item/shard,
-/turf/open/floor{
- dir = 6;
- icon_state = "red"
- },
-/area/bigredv2/outside/marshal_office)
"anf" = (
/obj/structure/bed/chair{
dir = 4
@@ -4577,15 +3964,6 @@
icon_state = "whitepurple"
},
/area/bigredv2/caves/lambda/xenobiology)
-"ans" = (
-/obj/structure/surface/table,
-/obj/item/storage/box/gloves{
- pixel_y = 8
- },
-/turf/open/floor{
- icon_state = "whitegreencorner"
- },
-/area/bigredv2/outside/medical)
"ant" = (
/obj/structure/window/framed/solaris,
/obj/structure/machinery/door/poddoor/shutters/almayer{
@@ -4639,17 +4017,6 @@
icon_state = "delivery"
},
/area/bigredv2/outside/marshal_office)
-"anz" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/green,
-/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
- name = "\improper Marshal Office";
- welded = 1
- },
-/turf/open/floor{
- icon_state = "delivery"
- },
-/area/bigredv2/outside/marshal_office)
"anB" = (
/obj/structure/machinery/light{
dir = 8
@@ -4657,15 +4024,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor,
/area/bigredv2/outside/marshal_office)
-"anC" = (
-/obj/effect/decal/cleanable/blood/gibs/body,
-/obj/effect/decal/cleanable/blood/drip,
-/obj/item/weapon/baton/damaged{
- pixel_y = 20;
- pixel_x = 16
- },
-/turf/open/floor,
-/area/bigredv2/outside/marshal_office)
"anD" = (
/obj/effect/decal/cleanable/blood,
/turf/open/floor,
@@ -4916,17 +4274,6 @@
icon_state = "dark"
},
/area/bigredv2/outside/general_offices)
-"aow" = (
-/obj/structure/machinery/light{
- dir = 1
- },
-/obj/structure/machinery/suit_storage_unit/carbon_unit{
- icon_state = "open"
- },
-/turf/open/floor{
- icon_state = "dark"
- },
-/area/bigredv2/outside/general_offices)
"aox" = (
/obj/structure/machinery/suit_storage_unit/carbon_unit,
/obj/structure/machinery/camera/autoname,
@@ -5027,10 +4374,6 @@
icon_state = "whitegreenfull"
},
/area/bigredv2/caves/lambda/xenobiology)
-"aoN" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/nw)
"aoO" = (
/turf/open/floor{
dir = 9;
@@ -5130,46 +4473,12 @@
/obj/structure/pipes/standard/simple/hidden/green,
/turf/open/floor,
/area/bigredv2/outside/general_offices)
-"ape" = (
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor{
- icon_state = "freezerfloor"
- },
-/area/bigredv2/outside/general_offices)
-"apg" = (
-/obj/item/clothing/under/lightbrown{
- pixel_x = -7;
- pixel_y = -4
- },
-/turf/open/floor{
- icon_state = "freezerfloor"
- },
-/area/bigredv2/outside/general_offices)
"aph" = (
/obj/structure/machinery/light{
dir = 8
},
/turf/open/floor/plating,
/area/bigredv2/outside/general_offices)
-"api" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 6
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/bigredv2/outside/general_offices)
-"apj" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/structure/machinery/door/airlock/almayer/maint/colony{
- name = "\improper Dormitories EVA Maintenance";
- welded = 1
- },
-/turf/open/floor{
- icon_state = "delivery"
- },
-/area/bigredv2/outside/general_offices)
"apk" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
@@ -5186,20 +4495,6 @@
icon_state = "dark"
},
/area/bigredv2/outside/general_offices)
-"apm" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/structure/machinery/door/airlock/almayer/engineering/colony{
- name = "\improper Dormitories EVA";
- icon_state = "door_open";
- density = 0
- },
-/obj/item/stack/sheet/wood,
-/turf/open/floor{
- icon_state = "delivery"
- },
-/area/bigredv2/outside/general_offices)
"apn" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 10
@@ -5357,27 +4652,6 @@
/obj/structure/bed/chair,
/turf/open/floor,
/area/bigredv2/outside/general_offices)
-"apL" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 5
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor,
-/area/bigredv2/outside/general_offices)
-"apM" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/structure/machinery/door/airlock/almayer/medical/glass/colony{
- name = "\improper Dormitories Lavatory";
- density = 0;
- icon_state = "door_open"
- },
-/obj/effect/decal/cleanable/blood/xeno,
-/turf/open/floor{
- icon_state = "delivery"
- },
-/area/bigredv2/outside/general_offices)
"apN" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
@@ -5392,19 +4666,6 @@
icon_state = "freezerfloor"
},
/area/bigredv2/outside/general_offices)
-"apP" = (
-/obj/structure/surface/table,
-/obj/structure/bedsheetbin{
- pixel_y = 10;
- pixel_x = 4
- },
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/turf/open/floor{
- icon_state = "freezerfloor"
- },
-/area/bigredv2/outside/general_offices)
"apQ" = (
/obj/structure/window/framed/solaris,
/turf/open/floor/plating,
@@ -5437,17 +4698,6 @@
icon_state = "dark"
},
/area/bigredv2/outside/general_offices)
-"apV" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot{
- pixel_x = -11;
- pixel_y = 12
- },
-/turf/open/floor{
- icon_state = "dark"
- },
-/area/bigredv2/outside/general_offices)
"apW" = (
/obj/structure/pipes/standard/simple/hidden/green,
/obj/effect/decal/cleanable/dirt,
@@ -5644,17 +4894,6 @@
icon_state = "whitepurplecorner"
},
/area/bigredv2/outside/medical)
-"aqv" = (
-/obj/structure/bed,
-/obj/item/prop/colony/usedbandage{
- dir = 9;
- pixel_x = 5;
- pixel_y = 15
- },
-/turf/open/floor{
- icon_state = "whitegreenfull"
- },
-/area/bigredv2/outside/medical)
"aqw" = (
/turf/open/floor{
icon_state = "white"
@@ -5691,13 +4930,6 @@
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/n)
-"aqI" = (
-/obj/effect/decal/cleanable/blood/drip,
-/turf/open/floor{
- dir = 6;
- icon_state = "asteroidwarning"
- },
-/area/bigredv2/outside/n)
"aqJ" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/mars_cave{
@@ -5737,10 +4969,6 @@
/obj/structure/barricade/wooden,
/turf/open/mars,
/area/bigredv2/outside/n)
-"aqP" = (
-/obj/effect/decal/cleanable/blood/gibs/body,
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/se)
"aqQ" = (
/obj/structure/machinery/light{
dir = 4
@@ -5753,37 +4981,6 @@
icon_state = "freezerfloor"
},
/area/bigredv2/outside/general_offices)
-"aqS" = (
-/obj/item/clothing/under/brown{
- pixel_x = 4;
- pixel_y = -5
- },
-/turf/open/floor{
- icon_state = "freezerfloor"
- },
-/area/bigredv2/outside/general_offices)
-"aqT" = (
-/obj/item/device/radio/intercom{
- freerange = 1;
- frequency = 1469;
- name = "General Listening Channel";
- pixel_x = 30
- },
-/obj/structure/bed/bedroll{
- dir = 10
- },
-/obj/item/prop/colony/usedbandage{
- dir = 4;
- pixel_x = -1;
- pixel_y = -4
- },
-/obj/effect/decal/cleanable/blood,
-/obj/effect/landmark/corpsespawner/colonist,
-/obj/effect/decal/cleanable/blood/gibs/body,
-/turf/open/floor{
- icon_state = "freezerfloor"
- },
-/area/bigredv2/outside/general_offices)
"aqU" = (
/obj/structure/window/framed/solaris,
/obj/structure/machinery/door/poddoor/shutters/almayer{
@@ -5792,11 +4989,6 @@
},
/turf/open/floor/plating,
/area/bigredv2/outside/hydroponics)
-"aqV" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/bigredv2/outside/general_offices)
"aqW" = (
/obj/structure/dispenser/oxygen,
/turf/open/floor{
@@ -5863,17 +5055,6 @@
icon_state = "mars_dirt_4"
},
/area/bigredv2/outside/nw)
-"are" = (
-/obj/structure/surface/table,
-/obj/item/storage/fancy/vials/random{
- pixel_y = 6;
- pixel_x = -4
- },
-/turf/open/floor{
- dir = 1;
- icon_state = "whitepurplecorner"
- },
-/area/bigredv2/outside/medical)
"arf" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/landmark/objective_landmark/science,
@@ -5897,42 +5078,11 @@
icon_state = "white"
},
/area/bigredv2/outside/medical)
-"arj" = (
-/obj/item/trash/chips{
- pixel_y = 4;
- pixel_x = -8
- },
-/obj/structure/pipes/standard/simple/hidden/green,
-/turf/open/floor{
- dir = 8;
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
-"ark" = (
-/obj/structure/bed/roller,
-/obj/structure/closet/bodybag,
-/turf/open/floor{
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
"arl" = (
/turf/open/floor{
icon_state = "whitegreenfull"
},
/area/bigredv2/outside/medical)
-"arm" = (
-/obj/structure/bed/chair/office/light,
-/obj/effect/landmark/corpsespawner/doctor,
-/obj/effect/decal/cleanable/blood,
-/obj/effect/decal/cleanable/vomit{
- icon_state = "vomit_2"
- },
-/obj/item/reagent_container/pill/happy,
-/obj/item/reagent_container/pill/happy,
-/turf/open/floor{
- icon_state = "white"
- },
-/area/bigredv2/outside/medical)
"arp" = (
/turf/open/mars{
icon_state = "mars_dirt_3"
@@ -5954,45 +5104,6 @@
/obj/structure/machinery/power/apc,
/turf/open/floor/plating,
/area/bigredv2/outside/general_offices)
-"arx" = (
-/obj/structure/surface/table,
-/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot{
- pixel_y = 6;
- pixel_x = 16
- },
-/turf/open/floor{
- icon_state = "dark"
- },
-/area/bigredv2/outside/general_offices)
-"ary" = (
-/obj/structure/surface/table,
-/obj/item/paper_bin,
-/obj/structure/pipes/standard/manifold/hidden/green{
- dir = 8
- },
-/turf/open/floor{
- icon_state = "dark"
- },
-/area/bigredv2/outside/general_offices)
-"arA" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/surface/rack,
-/obj/item/stack/sheet/mineral/uranium{
- amount = 50;
- pixel_x = 3
- },
-/turf/open/floor{
- icon_state = "dark"
- },
-/area/bigredv2/outside/general_offices)
-"arB" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/obj/item/stack/sheet/plasteel,
-/obj/effect/decal/cleanable/blood/drip,
-/turf/open/floor{
- icon_state = "dark"
- },
-/area/bigredv2/outside/general_offices)
"arC" = (
/obj/structure/machinery/light{
dir = 4
@@ -6075,16 +5186,6 @@
icon_state = "purple"
},
/area/bigredv2/caves/lambda/research)
-"arO" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/explosive/grenade/custom/large{
- pixel_x = 6;
- pixel_y = 9
- },
-/turf/open/floor{
- icon_state = "whitepurplefull"
- },
-/area/bigredv2/outside/medical)
"arP" = (
/obj/structure/pipes/vents/pump,
/obj/effect/decal/cleanable/dirt,
@@ -6107,19 +5208,6 @@
icon_state = "white"
},
/area/bigredv2/outside/medical)
-"arS" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 6
- },
-/obj/item/stack/sheet/metal{
- pixel_y = 9;
- pixel_x = 9
- },
-/turf/open/floor/plating{
- dir = 8;
- icon_state = "platingdmg3"
- },
-/area/bigredv2/outside/medical)
"arT" = (
/obj/structure/window/framed/solaris,
/turf/open/floor/plating,
@@ -6130,15 +5218,6 @@
icon_state = "white"
},
/area/bigredv2/outside/medical)
-"arV" = (
-/obj/item/trash/popcorn{
- pixel_y = 9
- },
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
- },
-/area/bigredv2/outside/nw)
"arW" = (
/obj/structure/surface/table,
/obj/structure/machinery/light{
@@ -6226,17 +5305,6 @@
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/n)
-"asi" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/obj/structure/machinery/door/airlock/almayer/maint/colony{
- dir = 1;
- name = "\improper Dormitories Tool Storage Maintenance";
- welded = 1
- },
-/turf/open/floor{
- icon_state = "delivery"
- },
-/area/bigredv2/outside/general_offices)
"asj" = (
/obj/structure/window/framed/solaris,
/obj/structure/machinery/door/poddoor/shutters/almayer{
@@ -6339,19 +5407,6 @@
/obj/effect/glowshroom,
/turf/open/mars_cave,
/area/bigredv2/caves_lambda)
-"asy" = (
-/obj/structure/surface/table,
-/obj/structure/machinery/light{
- dir = 8
- },
-/obj/item/tool/surgery/circular_saw{
- pixel_x = 10
- },
-/turf/open/floor{
- dir = 1;
- icon_state = "whitepurplecorner"
- },
-/area/bigredv2/outside/medical)
"asz" = (
/obj/item/device/reagent_scanner,
/turf/open/floor{
@@ -6374,33 +5429,6 @@
icon_state = "whitepurplecorner"
},
/area/bigredv2/outside/medical)
-"asC" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/clothing/gloves/latex{
- pixel_x = 3
- },
-/turf/open/floor{
- icon_state = "white"
- },
-/area/bigredv2/outside/medical)
-"asD" = (
-/obj/effect/landmark/crap_item,
-/obj/structure/pipes/standard/simple/hidden/green,
-/turf/open/floor{
- icon_state = "whitegreenfull"
- },
-/area/bigredv2/outside/medical)
-"asE" = (
-/obj/structure/bed/chair{
- dir = 1
- },
-/obj/structure/pipes/standard/simple/hidden/green,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_container/pill/happy,
-/turf/open/floor{
- icon_state = "white"
- },
-/area/bigredv2/outside/medical)
"asF" = (
/obj/structure/bed/chair{
dir = 1
@@ -6430,16 +5458,6 @@
"asK" = (
/turf/closed/wall/solaris,
/area/bigredv2/outside/cargo)
-"asM" = (
-/obj/structure/machinery/light{
- dir = 1
- },
-/obj/effect/spawner/random/tool{
- pixel_x = -8;
- pixel_y = -6
- },
-/turf/open/floor,
-/area/bigredv2/outside/general_offices)
"asN" = (
/obj/structure/machinery/cm_vending/sorted/tech/electronics_storage,
/turf/open/floor,
@@ -6452,23 +5470,6 @@
/obj/structure/machinery/cm_vending/sorted/tech/tool_storage,
/turf/open/floor,
/area/bigredv2/outside/general_offices)
-"asQ" = (
-/obj/structure/surface/table,
-/obj/effect/spawner/random/toolbox,
-/obj/item/stack/cable_coil/blue{
- pixel_y = 10
- },
-/turf/open/floor,
-/area/bigredv2/outside/general_offices)
-"asR" = (
-/obj/structure/surface/table,
-/obj/effect/spawner/random/toolbox{
- pixel_x = 6;
- pixel_y = 5
- },
-/obj/structure/pipes/vents/pump,
-/turf/open/floor,
-/area/bigredv2/outside/general_offices)
"asS" = (
/obj/structure/closet/toolcloset,
/turf/open/floor,
@@ -6612,16 +5613,6 @@
icon_state = "mars_cave_5"
},
/area/bigredv2/caves_lambda)
-"atl" = (
-/obj/item/stack/sheet/wood{
- pixel_y = 5;
- pixel_x = -4
- },
-/turf/open/floor{
- dir = 8;
- icon_state = "asteroidwarning"
- },
-/area/bigredv2/outside/n)
"atm" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor{
@@ -6642,12 +5633,6 @@
icon_state = "whitepurplecorner"
},
/area/bigredv2/outside/medical)
-"atq" = (
-/obj/structure/machinery/cm_vending/sorted/medical/no_access,
-/turf/open/floor{
- icon_state = "whitegreenfull"
- },
-/area/bigredv2/outside/medical)
"atr" = (
/obj/structure/pipes/standard/simple/hidden/green,
/turf/open/floor{
@@ -6696,17 +5681,6 @@
icon_state = "wood"
},
/area/bigredv2/outside/dorms)
-"atC" = (
-/obj/structure/surface/table,
-/obj/structure/machinery/light{
- dir = 8
- },
-/obj/item/reagent_container/food/snacks/wrapped/booniebars{
- pixel_y = 7;
- pixel_x = -2
- },
-/turf/open/floor,
-/area/bigredv2/outside/general_offices)
"atD" = (
/obj/structure/surface/rack,
/obj/effect/spawner/random/tool,
@@ -6828,25 +5802,6 @@
icon_state = "whitepurplecorner"
},
/area/bigredv2/outside/medical)
-"atT" = (
-/obj/structure/surface/table,
-/obj/item/tool/pen{
- pixel_x = 4;
- pixel_y = 3
- },
-/obj/structure/machinery/light{
- dir = 4
- },
-/obj/item/tool/hand_labeler{
- pixel_x = -6;
- pixel_y = 5
- },
-/obj/effect/landmark/objective_landmark/science,
-/turf/open/floor{
- dir = 4;
- icon_state = "whitepurplecorner"
- },
-/area/bigredv2/outside/medical)
"atU" = (
/obj/structure/window_frame/solaris,
/turf/open/floor/plating,
@@ -6916,14 +5871,6 @@
icon_state = "dark"
},
/area/bigredv2/outside/general_offices)
-"auf" = (
-/obj/structure/surface/rack,
-/obj/item/stack/sheet/mineral/gold,
-/obj/effect/decal/cleanable/blood/drip,
-/turf/open/floor{
- icon_state = "dark"
- },
-/area/bigredv2/outside/general_offices)
"aug" = (
/obj/item/stack/sheet/plasteel,
/obj/structure/machinery/camera/autoname{
@@ -7112,16 +6059,6 @@
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/nw)
-"auG" = (
-/obj/effect/spawner/random/bomb_supply{
- pixel_x = 6;
- pixel_y = -3
- },
-/turf/open/floor{
- dir = 1;
- icon_state = "whitepurplecorner"
- },
-/area/bigredv2/outside/medical)
"auH" = (
/obj/structure/bed/chair,
/obj/structure/pipes/standard/simple/hidden/green,
@@ -7130,31 +6067,6 @@
icon_state = "whitepurplecorner"
},
/area/bigredv2/outside/medical)
-"auI" = (
-/obj/structure/surface/table,
-/obj/item/storage/box/bodybags{
- pixel_y = 4
- },
-/turf/open/floor{
- dir = 4;
- icon_state = "whitepurplecorner"
- },
-/area/bigredv2/outside/medical)
-"auK" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/bed/bedroll{
- dir = 5
- },
-/obj/item/prop/colony/usedbandage{
- dir = 4;
- pixel_x = -2;
- pixel_y = 7
- },
-/turf/open/floor{
- dir = 1;
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
"auL" = (
/turf/open/floor{
dir = 1;
@@ -7168,29 +6080,6 @@
icon_state = "whitegreen"
},
/area/bigredv2/outside/medical)
-"auN" = (
-/obj/structure/machinery/light{
- dir = 1
- },
-/obj/structure/sign/nosmoking_1{
- pixel_y = 32
- },
-/turf/open/floor{
- dir = 1;
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
-"auP" = (
-/obj/item/shard,
-/obj/item/stack/sheet/wood{
- layer = 2.7;
- pixel_y = 8
- },
-/turf/open/floor{
- dir = 9;
- icon_state = "whiteblue"
- },
-/area/bigredv2/outside/medical)
"auU" = (
/obj/structure/machinery/door/airlock/almayer/generic{
dir = 1;
@@ -7367,11 +6256,6 @@
icon_state = "darkpurplecorners2"
},
/area/bigredv2/caves/lambda/breakroom)
-"avr" = (
-/obj/structure/window_frame/solaris,
-/obj/item/shard,
-/turf/open/floor/plating,
-/area/bigredv2/outside/office_complex)
"avt" = (
/obj/structure/pipes/standard/simple/hidden/green,
/turf/open/floor{
@@ -7412,25 +6296,6 @@
icon_state = "whitegreen"
},
/area/bigredv2/outside/medical)
-"avz" = (
-/obj/effect/decal/cleanable/blood/gibs/body,
-/obj/structure/barricade/wooden{
- desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
- dir = 8;
- health = 25000
- },
-/turf/open/floor{
- dir = 10;
- icon_state = "whiteblue"
- },
-/area/bigredv2/outside/medical)
-"avA" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/ammo_casing/shell,
-/turf/open/floor{
- icon_state = "whiteblue"
- },
-/area/bigredv2/outside/medical)
"avB" = (
/obj/structure/machinery/camera/autoname{
dir = 8
@@ -7453,6 +6318,13 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor,
/area/bigredv2/outside/dorms)
+"avE" = (
+/obj/item/bodybag/cryobag,
+/turf/open/floor{
+ dir = 1;
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
"avF" = (
/obj/structure/machinery/power/apc{
dir = 1;
@@ -7467,11 +6339,6 @@
},
/turf/open/floor,
/area/bigredv2/outside/dorms)
-"avH" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/green,
-/turf/open/floor,
-/area/bigredv2/outside/general_offices)
"avI" = (
/obj/structure/machinery/light{
dir = 1
@@ -7560,13 +6427,6 @@
icon_state = "whitegreen"
},
/area/bigredv2/outside/medical)
-"avY" = (
-/obj/structure/pipes/standard/manifold/hidden/green,
-/turf/open/floor{
- dir = 1;
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
"avZ" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
@@ -7588,29 +6448,6 @@
icon_state = "whitegreen"
},
/area/bigredv2/outside/medical)
-"awb" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/structure/barricade/wooden{
- desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
- dir = 8;
- health = 25000
- },
-/turf/open/floor{
- dir = 1;
- icon_state = "whitegreencorner"
- },
-/area/bigredv2/outside/medical)
-"awc" = (
-/obj/structure/pipes/standard/manifold/hidden/green{
- dir = 1
- },
-/turf/open/floor{
- dir = 4;
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
"awd" = (
/turf/closed/wall/solaris/reinforced,
/area/bigredv2/outside/se)
@@ -7622,37 +6459,6 @@
icon_state = "purple"
},
/area/bigredv2/caves/lambda/research)
-"awg" = (
-/obj/effect/decal/cleanable/blood,
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/turf/open/floor{
- dir = 1;
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
-"awh" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor{
- dir = 1;
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
-"awi" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 10
- },
-/obj/item/reagent_container/spray/cleaner,
-/turf/open/floor{
- dir = 8;
- icon_state = "whitegreencorner"
- },
-/area/bigredv2/outside/medical)
"awk" = (
/obj/structure/machinery/medical_pod/sleeper,
/turf/open/floor{
@@ -7682,38 +6488,12 @@
icon_state = "grimy"
},
/area/bigredv2/outside/dorms)
-"awr" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 6
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor{
- icon_state = "grimy"
- },
-/area/bigredv2/outside/dorms)
"aws" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
},
/turf/open/floor,
/area/bigredv2/outside/dorms)
-"awt" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/structure/barricade/wooden{
- desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
- dir = 8;
- health = 25000;
- layer = 2.8
- },
-/obj/structure/machinery/vending/snack{
- pixel_x = 5;
- pixel_y = -1;
- layer = 2.9
- },
-/turf/open/floor,
-/area/bigredv2/outside/general_offices)
"awu" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
@@ -7822,12 +6602,6 @@
icon_state = "darkish"
},
/area/bigredv2/caves/lambda/breakroom)
-"awL" = (
-/turf/open/floor{
- dir = 1;
- icon_state = "whitegreencorner"
- },
-/area/bigredv2/outside/medical)
"awM" = (
/turf/closed/wall/solaris/reinforced/hull,
/area/bigredv2/outside/filtration_plant)
@@ -7854,16 +6628,6 @@
icon_state = "white"
},
/area/bigredv2/outside/medical)
-"awR" = (
-/obj/structure/machinery/iv_drip,
-/obj/effect/landmark/corpsespawner/chef,
-/obj/effect/decal/cleanable/blood,
-/obj/effect/decal/cleanable/blood/drip,
-/obj/effect/decal/cleanable/blood/gibs/body,
-/turf/open/floor{
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
"awS" = (
/obj/structure/machinery/door_control{
id = "Medical";
@@ -7880,14 +6644,6 @@
icon_state = "whitegreencorner"
},
/area/bigredv2/outside/medical)
-"awU" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/vomit,
-/turf/open/floor{
- icon_state = "white"
- },
-/area/bigredv2/outside/medical)
"awV" = (
/obj/effect/decal/cleanable/blood,
/obj/structure/pipes/standard/simple/hidden/green,
@@ -7895,22 +6651,6 @@
icon_state = "white"
},
/area/bigredv2/outside/medical)
-"awW" = (
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor{
- dir = 1;
- icon_state = "whiteblue"
- },
-/area/bigredv2/outside/medical)
-"awX" = (
-/obj/item/trash/used_stasis_bag{
- pixel_y = 5
- },
-/turf/open/floor{
- dir = 5;
- icon_state = "whiteblue"
- },
-/area/bigredv2/outside/medical)
"awY" = (
/obj/structure/bed/chair{
dir = 4
@@ -7926,22 +6666,6 @@
/obj/item/ashtray/bronze,
/turf/open/floor,
/area/bigredv2/outside/dorms)
-"axb" = (
-/obj/structure/surface/table,
-/obj/item/device/radio{
- pixel_x = -10;
- pixel_y = 9
- },
-/turf/open/floor,
-/area/bigredv2/outside/dorms)
-"axc" = (
-/obj/structure/surface/table,
-/obj/effect/spawner/random/toolbox{
- pixel_x = 1;
- pixel_y = -7
- },
-/turf/open/floor,
-/area/bigredv2/outside/dorms)
"axd" = (
/obj/structure/bed/chair{
dir = 8
@@ -7955,70 +6679,10 @@
icon_state = "grimy"
},
/area/bigredv2/outside/dorms)
-"axh" = (
-/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
- dir = 1;
- name = "\improper Dormitories";
- welded = 1
- },
-/turf/open/floor{
- icon_state = "delivery"
- },
-/area/bigredv2/outside/dorms)
"axi" = (
/obj/structure/machinery/light,
/turf/open/floor,
/area/bigredv2/outside/general_offices)
-"axj" = (
-/obj/structure/machinery/light,
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 5
- },
-/obj/structure/largecrate/random/mini/small_case{
- pixel_x = 4;
- pixel_y = -3
- },
-/obj/structure/barricade/wooden{
- dir = 4;
- pixel_y = 2;
- pixel_x = -20
- },
-/turf/open/floor,
-/area/bigredv2/outside/general_offices)
-"axk" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 10
- },
-/obj/structure/machinery/vending/cola{
- pixel_x = 8;
- pixel_y = -7;
- layer = 2.84
- },
-/obj/structure/largecrate/random/mini/wooden{
- pixel_x = -12;
- pixel_y = -4
- },
-/obj/structure/largecrate/random/mini/wooden{
- pixel_x = -18;
- pixel_y = 7
- },
-/turf/open/floor,
-/area/bigredv2/outside/general_offices)
-"axl" = (
-/obj/structure/largecrate/random/mini/small_case{
- pixel_x = -7;
- pixel_y = -4
- },
-/obj/structure/largecrate/random/mini/small_case{
- pixel_x = 8;
- pixel_y = -3
- },
-/obj/structure/largecrate/random/mini/small_case{
- pixel_x = -1;
- pixel_y = 4
- },
-/turf/open/floor,
-/area/bigredv2/outside/general_offices)
"axn" = (
/obj/structure/window/reinforced/toughened{
dir = 1;
@@ -8095,26 +6759,6 @@
icon_state = "delivery"
},
/area/bigredv2/outside/nw/ceiling)
-"axw" = (
-/obj/structure/surface/table,
-/obj/item/storage/firstaid/adv{
- pixel_y = 13;
- pixel_x = 7
- },
-/turf/open/floor{
- icon_state = "whitegreencorner"
- },
-/area/bigredv2/outside/medical)
-"axx" = (
-/obj/item/trash/cigbutt{
- pixel_x = 7;
- pixel_y = 7
- },
-/turf/open/floor{
- dir = 4;
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
"axy" = (
/obj/structure/pipes/standard/simple/hidden/green,
/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor/colony{
@@ -8160,31 +6804,6 @@
/obj/structure/pipes/standard/simple/hidden/green,
/turf/open/floor,
/area/bigredv2/outside/dorms)
-"axH" = (
-/obj/structure/bed/chair{
- dir = 4
- },
-/obj/effect/landmark/survivor_spawner,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor,
-/area/bigredv2/outside/dorms)
-"axI" = (
-/obj/structure/surface/table,
-/obj/effect/spawner/random/tool{
- pixel_y = 7;
- pixel_x = 13
- },
-/turf/open/floor,
-/area/bigredv2/outside/dorms)
-"axJ" = (
-/obj/structure/surface/table,
-/obj/effect/spawner/random/powercell{
- pixel_x = 4;
- pixel_y = 2
- },
-/obj/structure/pipes/vents/pump,
-/turf/open/floor,
-/area/bigredv2/outside/dorms)
"axK" = (
/obj/structure/surface/table,
/obj/item/trash/plate,
@@ -8219,21 +6838,6 @@
icon_state = "grimy"
},
/area/bigredv2/outside/dorms)
-"axP" = (
-/obj/structure/largecrate/random/mini{
- pixel_x = -6;
- pixel_y = 7;
- layer = 3.1
- },
-/turf/open/floor,
-/area/bigredv2/outside/general_offices)
-"axQ" = (
-/obj/structure/bed/chair{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor,
-/area/bigredv2/outside/general_offices)
"axR" = (
/obj/structure/machinery/door/airlock/almayer/generic{
dir = 1;
@@ -8243,16 +6847,6 @@
icon_state = "delivery"
},
/area/bigredv2/outside/general_offices)
-"axS" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
- name = "\improper Dormitories";
- welded = 1
- },
-/turf/open/floor{
- icon_state = "delivery"
- },
-/area/bigredv2/outside/general_offices)
"axT" = (
/obj/effect/landmark/xeno_spawn,
/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
@@ -8333,20 +6927,6 @@
"ayf" = (
/turf/closed/wall/solaris/reinforced,
/area/bigredv2/outside/space_port_lz2)
-"ayg" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 9
- },
-/obj/structure/barricade/wooden{
- dir = 8;
- pixel_y = -5;
- pixel_x = -9
- },
-/obj/structure/machinery/cm_vending/sorted/medical/no_access,
-/turf/open/floor{
- icon_state = "white"
- },
-/area/bigredv2/outside/medical)
"ayh" = (
/obj/structure/machinery/cm_vending/sorted/medical/no_access,
/turf/open/floor{
@@ -8363,17 +6943,6 @@
icon_state = "whitegreen"
},
/area/bigredv2/outside/medical)
-"ayj" = (
-/obj/structure/pipes/unary/freezer{
- icon_state = "freezer_1"
- },
-/obj/structure/sign/safety/med_cryo{
- pixel_x = -16
- },
-/turf/open/floor{
- icon_state = "white"
- },
-/area/bigredv2/outside/medical)
"ayk" = (
/obj/structure/machinery/cryo_cell,
/obj/structure/pipes/standard/cap,
@@ -8387,22 +6956,6 @@
icon_state = "white"
},
/area/bigredv2/outside/medical)
-"aym" = (
-/obj/structure/sign/safety/autodoc{
- pixel_x = -32
- },
-/obj/effect/decal/medical_decals{
- icon_state = "triagedecalbottomleft"
- },
-/obj/structure/barricade/handrail/medical,
-/obj/structure/sign/safety/med_cryo{
- pixel_x = -16
- },
-/turf/open/floor{
- dir = 8;
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
"ayn" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/machinery/light{
@@ -8476,12 +7029,6 @@
},
/turf/open/floor,
/area/bigredv2/outside/dorms)
-"ayw" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor{
- icon_state = "wood"
- },
-/area/bigredv2/outside/general_offices)
"ayx" = (
/obj/structure/surface/table,
/turf/open/floor{
@@ -8526,20 +7073,6 @@
/obj/structure/window/framed/solaris,
/turf/open/floor/plating,
/area/bigredv2/outside/filtration_plant)
-"ayG" = (
-/obj/structure/bed/roller,
-/obj/effect/decal/cleanable/blood/xeno,
-/obj/structure/barricade/wooden{
- dir = 1;
- layer = 3.2;
- pixel_x = 2;
- pixel_y = -3
- },
-/turf/open/floor{
- dir = 8;
- icon_state = "whitegreencorner"
- },
-/area/bigredv2/outside/medical)
"ayH" = (
/obj/structure/machinery/light{
dir = 8
@@ -8578,18 +7111,6 @@
icon_state = "whitebluefull"
},
/area/bigredv2/outside/medical)
-"ayM" = (
-/obj/structure/pipes/standard/simple/visible{
- dir = 9
- },
-/obj/effect/decal/medical_decals{
- icon_state = "cryotop"
- },
-/turf/open/floor{
- dir = 5;
- icon_state = "whitebluefull"
- },
-/area/bigredv2/outside/medical)
"ayN" = (
/turf/open/floor{
icon_state = "delivery"
@@ -8602,13 +7123,6 @@
icon_state = "white"
},
/area/bigredv2/outside/medical)
-"ayP" = (
-/obj/item/weapon/broken_bottle,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor{
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
"ayQ" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor{
@@ -8623,45 +7137,6 @@
icon_state = "whitegreen"
},
/area/bigredv2/outside/medical)
-"ayS" = (
-/obj/structure/surface/table,
-/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot{
- pixel_x = 7;
- pixel_y = 7
- },
-/turf/open/floor{
- dir = 1;
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
-"ayT" = (
-/obj/structure/surface/table,
-/obj/item/bodybag/cryobag{
- pixel_y = -3;
- pixel_x = 10
- },
-/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot{
- pixel_y = 3;
- pixel_x = 7
- },
-/obj/structure/sign/nosmoking_1{
- pixel_y = 32
- },
-/turf/open/floor{
- dir = 1;
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
-"ayU" = (
-/obj/structure/surface/table,
-/obj/structure/machinery/light{
- dir = 4
- },
-/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
-/turf/open/floor{
- icon_state = "whitegreenfull"
- },
-/area/bigredv2/outside/medical)
"ayV" = (
/turf/open/floor/plating,
/area/bigredv2/outside/medical)
@@ -8769,13 +7244,6 @@
/obj/structure/cargo_container/horizontal/blue/top,
/turf/open/floor/plating,
/area/bigredv2/outside/nw/ceiling)
-"azp" = (
-/obj/structure/bed/roller,
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor{
- icon_state = "whitegreenfull"
- },
-/area/bigredv2/outside/medical)
"azq" = (
/obj/structure/machinery/camera/autoname{
dir = 1
@@ -8784,29 +7252,6 @@
icon_state = "whitegreen"
},
/area/bigredv2/outside/medical)
-"azr" = (
-/obj/structure/bed/roller,
-/obj/item/trash/cigbutt{
- pixel_x = -10;
- pixel_y = 7
- },
-/turf/open/floor{
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
-"azs" = (
-/obj/item/trash/cigbutt{
- pixel_x = -10;
- pixel_y = 16
- },
-/obj/item/trash/cigbutt{
- pixel_x = -6;
- pixel_y = -2
- },
-/turf/open/floor{
- icon_state = "whitegreenfull"
- },
-/area/bigredv2/outside/medical)
"azt" = (
/obj/structure/pipes/standard/manifold/hidden/green{
dir = 8
@@ -8833,19 +7278,6 @@
icon_state = "white"
},
/area/bigredv2/outside/medical)
-"azw" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/item/trash/semki{
- pixel_x = 6;
- pixel_y = -5
- },
-/turf/open/floor{
- dir = 8;
- icon_state = "warnwhite"
- },
-/area/bigredv2/outside/medical)
"azx" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
@@ -8855,45 +7287,6 @@
icon_state = "whitebluefull"
},
/area/bigredv2/outside/medical)
-"azy" = (
-/obj/effect/decal/cleanable/blood,
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/effect/decal/medical_decals{
- icon_state = "cryocell1decal"
- },
-/turf/open/floor{
- dir = 5;
- icon_state = "whitebluefull"
- },
-/area/bigredv2/outside/medical)
-"azz" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor/colony{
- dir = 1;
- name = "\improper Medical Clinic Treatment";
- density = 0;
- icon_state = "door_open"
- },
-/turf/open/floor{
- icon_state = "delivery"
- },
-/area/bigredv2/outside/medical)
-"azA" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/drip,
-/turf/open/floor{
- dir = 1;
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
"azB" = (
/obj/structure/window/framed/solaris/reinforced,
/obj/structure/machinery/door/poddoor/shutters/almayer{
@@ -8903,16 +7296,6 @@
},
/turf/open/floor/plating,
/area/bigredv2/outside/engineering)
-"azD" = (
-/obj/effect/decal/cleanable/blood,
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor{
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
"azE" = (
/obj/item/shard,
/obj/effect/decal/cleanable/blood/xeno,
@@ -8935,15 +7318,6 @@
},
/turf/open/floor/plating,
/area/bigredv2/outside/filtration_plant)
-"azH" = (
-/obj/structure/machinery/door/airlock/almayer/maint/colony{
- name = "\improper Medical Clinic Power Station";
- locked = 1
- },
-/turf/open/floor{
- icon_state = "delivery"
- },
-/area/bigredv2/outside/medical)
"azK" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/mars,
@@ -9043,38 +7417,6 @@
},
/turf/open/floor,
/area/bigredv2/outside/dorms)
-"aAf" = (
-/obj/structure/machinery/light{
- dir = 1
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/crate/trashcart{
- pixel_x = -6;
- pixel_y = 6
- },
-/obj/item/prop{
- desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
- icon = 'icons/obj/janitor.dmi';
- icon_state = "trashbag3";
- name = "trash bag";
- pixel_x = 2;
- pixel_y = 1
- },
-/turf/open/floor/plating,
-/area/bigredv2/outside/bar)
-"aAg" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/prop{
- desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
- icon = 'icons/obj/janitor.dmi';
- icon_state = "trashbag3";
- name = "trash bag";
- pixel_x = -6;
- pixel_y = -4;
- layer = 3.1
- },
-/turf/open/floor/plating,
-/area/bigredv2/outside/bar)
"aAi" = (
/turf/open/floor{
dir = 8;
@@ -9126,33 +7468,6 @@
/obj/structure/cargo_container/horizontal/blue/middle,
/turf/open/floor/plating,
/area/bigredv2/outside/nw/ceiling)
-"aAr" = (
-/obj/structure/airlock_assembly,
-/obj/item/stack/rods{
- pixel_y = -2
- },
-/turf/open/floor{
- icon_state = "delivery"
- },
-/area/bigredv2/outside/medical)
-"aAs" = (
-/obj/effect/decal/medical_decals{
- icon_state = "triagedecalbottomright"
- },
-/turf/open/floor{
- dir = 10;
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
-"aAt" = (
-/obj/structure/machinery/medical_pod/bodyscanner,
-/obj/effect/decal/medical_decals{
- icon_state = "triagedecalbottomleft"
- },
-/turf/open/floor{
- icon_state = "white"
- },
-/area/bigredv2/outside/medical)
"aAu" = (
/obj/structure/machinery/body_scanconsole,
/turf/open/floor{
@@ -9172,21 +7487,6 @@
icon_state = "white"
},
/area/bigredv2/outside/medical)
-"aAx" = (
-/obj/effect/decal/cleanable/vomit,
-/turf/open/floor{
- dir = 1;
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
-"aAy" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/green,
-/turf/open/floor{
- dir = 8;
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
"aAz" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/machinery/camera/autoname{
@@ -9228,16 +7528,6 @@
icon_state = "delivery"
},
/area/bigredv2/outside/dorms)
-"aAH" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/item/trash/cigbutt{
- pixel_x = 4
- },
-/turf/open/floor/plating,
-/area/bigredv2/outside/bar)
"aAI" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
@@ -9381,14 +7671,6 @@
icon_state = "darkish"
},
/area/bigredv2/outside/medical)
-"aBc" = (
-/obj/item/stack/rods{
- pixel_y = -2
- },
-/turf/open/floor{
- icon_state = "darkish"
- },
-/area/bigredv2/outside/medical)
"aBd" = (
/obj/structure/bed/chair,
/obj/structure/machinery/light{
@@ -9414,23 +7696,6 @@
icon_state = "whitegreencorner"
},
/area/bigredv2/outside/medical)
-"aBg" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/iv_drip,
-/turf/open/floor{
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
-"aBh" = (
-/obj/structure/sign/safety/galley{
- pixel_x = 32
- },
-/obj/item/storage/box/gloves,
-/turf/open/floor{
- dir = 4;
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
"aBi" = (
/obj/structure/machinery/light{
dir = 4
@@ -9488,15 +7753,6 @@
icon_state = "freezerfloor"
},
/area/bigredv2/outside/dorms)
-"aBo" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor{
- icon_state = "freezerfloor"
- },
-/area/bigredv2/outside/dorms)
"aBp" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 9
@@ -9514,15 +7770,19 @@
icon_state = "freezerfloor"
},
/area/bigredv2/outside/dorms)
-"aBr" = (
-/obj/item/toy/beach_ball{
- pixel_x = -6;
- pixel_y = -10
+"aBs" = (
+/obj/structure/surface/table/woodentable,
+/obj/effect/spawner/random/tool{
+ pixel_x = -6
+ },
+/obj/item/reagent_container/food/drinks/bottle/beer/craft/partypopper{
+ pixel_x = 10;
+ pixel_y = 10
},
/turf/open/floor{
icon_state = "wood"
},
-/area/bigredv2/outside/dorms)
+/area/bigredv2/outside/bar)
"aBu" = (
/turf/open/floor{
icon_state = "asteroidwarning"
@@ -9535,13 +7795,6 @@
/obj/structure/window/framed/solaris/reinforced,
/turf/open/floor/plating,
/area/bigredv2/caves/eta/research)
-"aBx" = (
-/obj/effect/decal/cleanable/generic,
-/turf/open/floor{
- dir = 4;
- icon_state = "asteroidwarning"
- },
-/area/bigredv2/outside/ne)
"aBy" = (
/obj/structure/window/framed/solaris/reinforced,
/turf/open/floor/plating,
@@ -9632,19 +7885,6 @@
icon_state = "white"
},
/area/bigredv2/outside/medical)
-"aBN" = (
-/obj/structure/surface/table,
-/obj/structure/pipes/vents/pump,
-/obj/structure/transmitter/colony_net{
- phone_category = "Solaris Ridge";
- phone_color = "green";
- phone_id = "Clinic";
- pixel_y = 24
- },
-/turf/open/floor{
- icon_state = "white"
- },
-/area/bigredv2/outside/medical)
"aBO" = (
/obj/structure/surface/table,
/obj/structure/machinery/recharger,
@@ -9713,12 +7953,6 @@
icon_state = "wood"
},
/area/bigredv2/outside/dorms)
-"aCb" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/flour,
-/turf/open/floor/plating,
-/area/bigredv2/outside/bar)
"aCc" = (
/turf/open/mars_cave{
icon_state = "mars_dirt_4"
@@ -9897,28 +8131,6 @@
icon_state = "delivery"
},
/area/bigredv2/outside/medical)
-"aCD" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor{
- icon_state = "whitegreencorner"
- },
-/area/bigredv2/outside/medical)
-"aCE" = (
-/obj/item/clothing/glasses/meson{
- pixel_x = 3;
- pixel_y = 4
- },
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor{
- icon_state = "whitegreencorner"
- },
-/area/bigredv2/outside/medical)
"aCF" = (
/obj/item/reagent_container/pill/happy,
/obj/structure/pipes/standard/simple/hidden/green{
@@ -9940,32 +8152,6 @@
/obj/structure/window/framed/solaris/reinforced,
/turf/open/floor/plating,
/area/bigredv2/caves/eta/xenobiology)
-"aCI" = (
-/obj/item/stack/sheet/metal{
- pixel_x = 3;
- pixel_y = -11
- },
-/turf/open/floor{
- icon_state = "panelscorched"
- },
-/area/bigredv2/outside/medical)
-"aCJ" = (
-/obj/item/stack/tile/plasteel{
- pixel_x = 1;
- pixel_y = 9
- },
-/turf/open/floor/plating{
- icon_state = "panelscorched"
- },
-/area/bigredv2/outside/medical)
-"aCK" = (
-/obj/structure/bed/chair,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor{
- dir = 1;
- icon_state = "whitegreencorner"
- },
-/area/bigredv2/outside/medical)
"aCL" = (
/turf/closed/wall/solaris,
/area/bigredv2/caves/eta/xenobiology)
@@ -10011,13 +8197,6 @@
icon_state = "wood"
},
/area/bigredv2/outside/dorms)
-"aCT" = (
-/obj/effect/landmark/crap_item,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor{
- icon_state = "wood"
- },
-/area/bigredv2/outside/dorms)
"aCU" = (
/obj/structure/pipes/standard/simple/hidden/green,
/obj/structure/machinery/door/airlock/almayer/maint/colony{
@@ -10170,60 +8349,12 @@
/obj/structure/window/framed/solaris,
/turf/open/floor/plating,
/area/bigredv2/caves/eta/living)
-"aDw" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached14"
- },
-/area/bigredv2/outside/nw)
-"aDx" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 5
- },
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/nw)
-"aDy" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
- },
-/area/bigredv2/outside/e)
-"aDz" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/nw)
-"aDA" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 10
- },
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached1"
- },
-/area/bigredv2/outside/nw)
"aDB" = (
/turf/open/floor{
dir = 5;
icon_state = "whitegreen"
},
/area/bigredv2/caves/lambda/virology)
-"aDC" = (
-/obj/structure/surface/table,
-/obj/item/tool/surgery/bonesetter{
- pixel_y = 6;
- pixel_x = -7
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor{
- dir = 5;
- icon_state = "whitebluefull"
- },
-/area/bigredv2/outside/medical)
"aDD" = (
/obj/structure/surface/table,
/obj/item/storage/box/masks,
@@ -10233,32 +8364,6 @@
icon_state = "whitebluefull"
},
/area/bigredv2/outside/medical)
-"aDE" = (
-/obj/structure/surface/table,
-/obj/item/tool/surgery/FixOVein{
- pixel_x = -7;
- pixel_y = -6
- },
-/turf/open/floor{
- dir = 5;
- icon_state = "whitebluefull"
- },
-/area/bigredv2/outside/medical)
-"aDF" = (
-/obj/structure/surface/table,
-/obj/item/tool/surgery/cautery{
- pixel_y = 9;
- pixel_x = 9
- },
-/obj/item/reagent_container/spray/cleaner{
- pixel_y = 4;
- pixel_x = -8
- },
-/turf/open/floor{
- dir = 5;
- icon_state = "whitebluefull"
- },
-/area/bigredv2/outside/medical)
"aDG" = (
/obj/structure/sign/safety/medical{
pixel_x = 32
@@ -10279,39 +8384,12 @@
icon_state = "whitegreencorner"
},
/area/bigredv2/outside/medical)
-"aDI" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/tool/extinguisher{
- pixel_y = 15;
- pixel_x = -7
- },
-/turf/open/floor{
- icon_state = "whitegreencorner"
- },
-/area/bigredv2/outside/medical)
"aDJ" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor{
icon_state = "whitegreencorner"
},
/area/bigredv2/outside/medical)
-"aDK" = (
-/obj/structure/curtain/medical,
-/obj/effect/decal/medical_decals{
- icon_state = "triagedecaltopleft"
- },
-/turf/open/floor{
- dir = 8;
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
-"aDL" = (
-/obj/structure/curtain/open/medical,
-/obj/effect/decal/cleanable/blood/drip,
-/turf/open/floor{
- icon_state = "white"
- },
-/area/bigredv2/outside/medical)
"aDM" = (
/obj/structure/curtain/medical,
/turf/open/floor{
@@ -10319,33 +8397,12 @@
icon_state = "whitegreen"
},
/area/bigredv2/outside/medical)
-"aDN" = (
-/obj/effect/decal/cleanable/blood/xeno,
-/turf/open/floor{
- dir = 4;
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
"aDO" = (
/obj/effect/decal/cleanable/blood,
/turf/open/floor{
icon_state = "whitegreenfull"
},
/area/bigredv2/outside/medical)
-"aDP" = (
-/obj/effect/decal/cleanable/blood{
- layer = 3;
- pixel_x = 24
- },
-/obj/item/trash/chips{
- pixel_y = -6;
- pixel_x = -3
- },
-/obj/structure/pipes/standard/simple/hidden/green,
-/turf/open/floor{
- icon_state = "white"
- },
-/area/bigredv2/outside/medical)
"aDQ" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/machinery/door_control{
@@ -10364,32 +8421,6 @@
icon_state = "wood"
},
/area/bigredv2/outside/dorms)
-"aDV" = (
-/obj/structure/machinery/light{
- dir = 1
- },
-/obj/item/prop{
- desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
- icon = 'icons/obj/janitor.dmi';
- icon_state = "trashbag3";
- name = "trash bag";
- pixel_x = -6;
- pixel_y = 3
- },
-/obj/effect/decal/cleanable/generic,
-/turf/open/floor{
- icon_state = "wood"
- },
-/area/bigredv2/outside/bar)
-"aDW" = (
-/obj/structure/pipes/standard/manifold/hidden/green{
- dir = 8
- },
-/obj/effect/decal/cleanable/generic,
-/turf/open/floor{
- icon_state = "wood"
- },
-/area/bigredv2/outside/bar)
"aDX" = (
/turf/closed/wall/solaris,
/area/bigredv2/caves/eta/living)
@@ -10416,18 +8447,6 @@
icon_state = "wood"
},
/area/bigredv2/outside/bar)
-"aEb" = (
-/obj/structure/machinery/power/apc{
- dir = 1;
- name = "Bar APC"
- },
-/obj/item/reagent_container/food/drinks/cup{
- pixel_x = -11
- },
-/turf/open/floor{
- icon_state = "wood"
- },
-/area/bigredv2/outside/bar)
"aEc" = (
/obj/structure/reagent_dispensers/beerkeg,
/turf/open/floor{
@@ -10513,12 +8532,6 @@
"aEu" = (
/turf/closed/wall/solaris/rock,
/area/bigredv2/outside)
-"aEv" = (
-/obj/effect/landmark/crap_item,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
- },
-/area/bigredv2/outside/nw)
"aEw" = (
/obj/structure/surface/table,
/obj/item/tool/surgery/scalpel/manager,
@@ -10575,29 +8588,6 @@
"aEF" = (
/turf/closed/wall/solaris/rock,
/area/bigredv2/caves/lambda/research)
-"aEG" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/xtracks,
-/obj/item/explosive/grenade/custom/large{
- pixel_x = 6;
- pixel_y = 9
- },
-/turf/open/floor/plating{
- dir = 8;
- icon_state = "platingdmg2"
- },
-/area/bigredv2/outside/medical)
-"aEH" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/effect/landmark/corpsespawner/doctor,
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor/plating,
-/area/bigredv2/outside/medical)
"aEK" = (
/obj/structure/pipes/vents/pump,
/turf/open/floor,
@@ -10841,20 +8831,6 @@
icon_state = "whitebluefull"
},
/area/bigredv2/outside/medical)
-"aFy" = (
-/obj/structure/machinery/optable,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/organ/heart/prosthetic{
- pixel_x = 6;
- pixel_y = -7
- },
-/obj/effect/landmark/corpsespawner/colonist,
-/obj/effect/decal/cleanable/blood,
-/obj/effect/decal/cleanable/blood/gibs/body,
-/turf/open/floor{
- icon_state = "white"
- },
-/area/bigredv2/outside/medical)
"aFz" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 5
@@ -10884,15 +8860,6 @@
icon_state = "whitegreen"
},
/area/bigredv2/outside/medical)
-"aFC" = (
-/obj/structure/pipes/standard/manifold/hidden/green{
- dir = 4
- },
-/obj/effect/decal/cleanable/blood/drip,
-/turf/open/floor{
- icon_state = "white"
- },
-/area/bigredv2/outside/medical)
"aFE" = (
/obj/item/reagent_container/pill/happy,
/turf/open/floor{
@@ -10922,25 +8889,6 @@
icon_state = "whitegreenfull"
},
/area/bigredv2/outside/medical)
-"aFI" = (
-/obj/structure/surface/table/reinforced,
-/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
-/turf/open/floor{
- icon_state = "white"
- },
-/area/bigredv2/outside/medical)
-"aFK" = (
-/obj/structure/machinery/door/airlock/almayer/medical/glass/colony{
- dir = 1;
- id_tag = "mbayexit";
- name = "Medbay Reception";
- req_one_access_txt = "2;8;19"
- },
-/turf/open/floor{
- dir = 4;
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
"aFL" = (
/obj/effect/landmark/crap_item,
/turf/open/mars,
@@ -10975,19 +8923,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor,
/area/bigredv2/outside/dorms)
-"aFT" = (
-/obj/structure/surface/table/woodentable,
-/obj/item/device/radio{
- pixel_x = 10
- },
-/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot{
- pixel_y = 1;
- pixel_x = -6
- },
-/turf/open/floor{
- icon_state = "wood"
- },
-/area/bigredv2/outside/dorms)
"aFU" = (
/obj/structure/machinery/door_control{
id = "Dormitories";
@@ -11010,40 +8945,6 @@
icon_state = "whitegreen"
},
/area/bigredv2/caves/lambda/virology)
-"aFW" = (
-/obj/structure/surface/table/woodentable,
-/obj/item/trash/cigbutt{
- pixel_x = 4
- },
-/turf/open/floor{
- icon_state = "wood"
- },
-/area/bigredv2/outside/bar)
-"aFX" = (
-/obj/structure/pipes/vents/pump{
- dir = 1
- },
-/obj/item/trash/crushed_cup{
- pixel_x = -10;
- pixel_y = 1
- },
-/turf/open/floor{
- icon_state = "wood"
- },
-/area/bigredv2/outside/bar)
-"aFY" = (
-/obj/structure/reagent_dispensers/beerkeg,
-/obj/structure/machinery/light{
- dir = 4
- },
-/obj/item/trash/crushed_cup{
- pixel_x = -3;
- pixel_y = 11
- },
-/turf/open/floor{
- icon_state = "wood"
- },
-/area/bigredv2/outside/bar)
"aGa" = (
/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
dir = 1;
@@ -11185,35 +9086,6 @@
icon_state = "mars_dirt_10"
},
/area/bigredv2/outside/virology)
-"aGs" = (
-/obj/structure/machinery/light{
- dir = 4
- },
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached20"
- },
-/area/bigredv2/outside/virology)
-"aGt" = (
-/obj/item/reagent_container/spray/cleaner{
- desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back.";
- name = "Surgery Cleaner";
- pixel_y = 7;
- pixel_x = -5
- },
-/turf/open/floor{
- icon_state = "white"
- },
-/area/bigredv2/outside/medical)
-"aGu" = (
-/obj/item/clothing/mask/breath/medical{
- pixel_y = -3;
- pixel_x = -7
- },
-/obj/effect/decal/cleanable/blood/gibs/limb,
-/turf/open/floor{
- icon_state = "white"
- },
-/area/bigredv2/outside/medical)
"aGv" = (
/obj/effect/decal/cleanable/vomit,
/turf/open/floor{
@@ -11246,15 +9118,6 @@
icon_state = "whitegreen"
},
/area/bigredv2/outside/medical)
-"aGz" = (
-/obj/structure/surface/table,
-/obj/structure/machinery/light{
- dir = 8
- },
-/turf/open/floor{
- icon_state = "whitegreencorner"
- },
-/area/bigredv2/outside/medical)
"aGB" = (
/obj/structure/bed,
/obj/structure/machinery/light{
@@ -11265,19 +9128,6 @@
icon_state = "whitegreen"
},
/area/bigredv2/outside/medical)
-"aGC" = (
-/obj/structure/bed/chair{
- dir = 4
- },
-/obj/item/trash/kepler{
- pixel_y = 9;
- pixel_x = 12
- },
-/turf/open/floor{
- dir = 8;
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
"aGD" = (
/obj/structure/surface/table,
/obj/structure/machinery/computer/objective,
@@ -11285,15 +9135,6 @@
icon_state = "white"
},
/area/bigredv2/outside/admin_building)
-"aGE" = (
-/obj/structure/bed/chair/office/light{
- dir = 8
- },
-/turf/open/floor{
- dir = 8;
- icon_state = "whitegreencorner"
- },
-/area/bigredv2/outside/medical)
"aGF" = (
/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
name = "\improper Dormitories"
@@ -11340,6 +9181,16 @@
icon_state = "white"
},
/area/bigredv2/outside/virology)
+"aGR" = (
+/obj/item/reagent_container/glass/bucket{
+ pixel_x = 6;
+ pixel_y = 6
+ },
+/turf/open/floor{
+ dir = 1;
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/marshal_office)
"aGT" = (
/obj/structure/surface/table,
/turf/open/floor{
@@ -11441,30 +9292,6 @@
icon_state = "mars_cave_13"
},
/area/bigredv2/outside/virology)
-"aHg" = (
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached19"
- },
-/area/bigredv2/outside/virology)
-"aHh" = (
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached18"
- },
-/area/bigredv2/outside/virology)
-"aHj" = (
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/virology)
-"aHl" = (
-/obj/effect/decal/cleanable/blood/gibs/body,
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/nw)
-"aHm" = (
-/obj/effect/decal/cleanable/blood,
-/obj/structure/pipes/standard/simple/hidden/green,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached1"
- },
-/area/bigredv2/outside/nw)
"aHn" = (
/obj/effect/decal/cleanable/blood,
/turf/open/mars,
@@ -11500,66 +9327,6 @@
icon_state = "whitegreen"
},
/area/bigredv2/outside/medical)
-"aHs" = (
-/obj/structure/machinery/body_scanconsole,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood,
-/obj/effect/decal/cleanable/blood/gibs/body,
-/turf/open/floor{
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
-"aHt" = (
-/obj/structure/machinery/light,
-/obj/structure/largecrate/random/barrel/white,
-/turf/open/floor{
- dir = 6;
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
-"aHu" = (
-/obj/structure/surface/table,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor{
- icon_state = "whitegreencorner"
- },
-/area/bigredv2/outside/medical)
-"aHv" = (
-/obj/structure/surface/table,
-/obj/item/storage/firstaid/toxin{
- pixel_y = 6;
- pixel_x = -7
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor{
- icon_state = "white"
- },
-/area/bigredv2/outside/medical)
-"aHw" = (
-/obj/structure/surface/table,
-/obj/item/storage/firstaid/regular{
- pixel_y = 3;
- pixel_x = 6
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor{
- icon_state = "white"
- },
-/area/bigredv2/outside/medical)
-"aHy" = (
-/obj/structure/surface/table,
-/turf/open/floor{
- icon_state = "whitegreencorner"
- },
-/area/bigredv2/outside/medical)
-"aHz" = (
-/obj/structure/bed,
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor{
- dir = 10;
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
"aHA" = (
/obj/structure/bed,
/obj/effect/landmark/monkey_spawn,
@@ -11579,6 +9346,10 @@
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/c)
+"aHE" = (
+/obj/structure/flora/grass/desert/lightgrass_8,
+/turf/open/mars,
+/area/bigredv2/outside/w)
"aHF" = (
/turf/open/floor{
dir = 1;
@@ -11600,28 +9371,6 @@
icon_state = "carpet15-15"
},
/area/bigredv2/outside/bar)
-"aHI" = (
-/obj/item/weapon/dart/green{
- pixel_y = -11
- },
-/turf/open/floor{
- dir = 8;
- icon_state = "carpet11-12"
- },
-/area/bigredv2/outside/bar)
-"aHJ" = (
-/obj/structure/machinery/reagentgrinder{
- pixel_x = 7
- },
-/obj/structure/surface/table/woodentable,
-/obj/item/weapon/gun/shotgun/double/sawn{
- pixel_x = 1;
- pixel_y = 10
- },
-/turf/open/floor{
- icon_state = "wood"
- },
-/area/bigredv2/outside/bar)
"aHK" = (
/obj/structure/surface/table,
/obj/item/toy/sword,
@@ -11752,22 +9501,6 @@
icon_state = "mars_dirt_3"
},
/area/bigredv2/outside/virology)
-"aIa" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 6
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached3"
- },
-/area/bigredv2/outside/virology)
-"aIb" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/effect/decal/cleanable/generic,
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/virology)
"aIc" = (
/obj/structure/closet/wardrobe/virology_white,
/obj/effect/landmark/objective_landmark/science,
@@ -11796,40 +9529,6 @@
icon_state = "delivery"
},
/area/bigredv2/outside/virology)
-"aIi" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 9
- },
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached1"
- },
-/area/bigredv2/outside/nw)
-"aIj" = (
-/obj/structure/bed/chair{
- dir = 4
- },
-/turf/open/floor{
- dir = 8;
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
-"aIk" = (
-/obj/structure/machinery/light,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor{
- dir = 10;
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
-"aIl" = (
-/obj/item/reagent_container/glass/rag{
- pixel_x = -9;
- pixel_y = -7
- },
-/turf/open/floor{
- icon_state = "whitegreenfull"
- },
-/area/bigredv2/outside/medical)
"aIm" = (
/turf/open/mars{
icon_state = "mars_dirt_8"
@@ -11840,15 +9539,6 @@
icon_state = "mars_dirt_4"
},
/area/bigredv2/outside/c)
-"aIo" = (
-/obj/structure/machinery/light{
- dir = 4
- },
-/obj/item/tool/wrench{
- pixel_x = -5
- },
-/turf/open/floor,
-/area/bigredv2/outside/office_complex)
"aIp" = (
/turf/open/mars{
icon_state = "mars_dirt_9"
@@ -11864,16 +9554,6 @@
icon_state = "carpet15-15"
},
/area/bigredv2/outside/bar)
-"aIr" = (
-/obj/structure/bed/chair/wood/normal{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor{
- dir = 8;
- icon_state = "carpet15-15"
- },
-/area/bigredv2/outside/bar)
"aIs" = (
/obj/effect/decal/cleanable/blood,
/turf/open/floor{
@@ -11881,14 +9561,6 @@
icon_state = "carpet15-15"
},
/area/bigredv2/outside/bar)
-"aIt" = (
-/obj/effect/decal/cleanable/blood/gibs/body,
-/obj/structure/pipes/standard/simple/hidden/green,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor{
- icon_state = "wood"
- },
-/area/bigredv2/outside/bar)
"aIu" = (
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor{
@@ -12170,47 +9842,6 @@
icon_state = "whitegreen"
},
/area/bigredv2/caves/lambda/virology)
-"aJg" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached3"
- },
-/area/bigredv2/outside/virology)
-"aJh" = (
-/obj/item/trash/pistachios{
- pixel_x = -11;
- pixel_y = -9
- },
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached1"
- },
-/area/bigredv2/outside/virology)
-"aJi" = (
-/obj/item/trash/popcorn,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
- },
-/area/bigredv2/outside/virology)
-"aJj" = (
-/obj/structure/machinery/light{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached17"
- },
-/area/bigredv2/outside/virology)
-"aJl" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor/colony{
- name = "\improper Medical Clinic";
- icon_state = "door_open";
- density = 0
- },
-/turf/open/floor{
- icon_state = "delivery"
- },
-/area/bigredv2/outside/medical)
"aJm" = (
/obj/effect/decal/cleanable/blood/gibs/limb,
/turf/open/mars{
@@ -12223,23 +9854,6 @@
icon_state = "carpet13-5"
},
/area/bigredv2/outside/bar)
-"aJo" = (
-/obj/effect/landmark/crap_item,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor{
- dir = 8;
- icon_state = "carpet13-5"
- },
-/area/bigredv2/outside/bar)
-"aJp" = (
-/obj/item/weapon/dart{
- pixel_x = 10
- },
-/turf/open/floor{
- dir = 8;
- icon_state = "carpet9-4"
- },
-/area/bigredv2/outside/bar)
"aJq" = (
/obj/structure/bed/chair/wood/normal{
dir = 1
@@ -12383,6 +9997,11 @@
icon_state = "darkpurple2"
},
/area/bigredv2/caves/lambda/research)
+"aJK" = (
+/obj/effect/decal/cleanable/blood/drip,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor,
+/area/bigredv2/outside/dorms)
"aJL" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 4
@@ -12581,10 +10200,15 @@
icon_state = "whitegreen"
},
/area/bigredv2/caves/lambda/virology)
-"aKg" = (
-/obj/effect/landmark/hunter_secondary,
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/virology)
+"aKh" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/turf/open/floor{
+ dir = 1;
+ icon_state = "darkred2"
+ },
+/area/bigredv2/outside/admin_building)
"aKi" = (
/turf/open/floor{
icon_state = "dark"
@@ -12608,13 +10232,6 @@
icon_state = "asteroidfloor"
},
/area/bigredv2/outside/c)
-"aKn" = (
-/obj/item/frame/table,
-/turf/open/floor/plating{
- dir = 8;
- icon_state = "platingdmg2"
- },
-/area/bigredv2/outside/office_complex)
"aKo" = (
/obj/structure/pipes/standard/simple/hidden/green,
/turf/open/floor{
@@ -12659,21 +10276,6 @@
icon_state = "wood"
},
/area/bigredv2/outside/bar)
-"aKy" = (
-/obj/structure/surface/table/woodentable,
-/obj/item/ashtray/glass,
-/obj/item/trash/cigbutt{
- pixel_x = -10;
- pixel_y = 16
- },
-/obj/item/trash/cigbutt/cigarbutt{
- pixel_x = 7;
- pixel_y = 12
- },
-/turf/open/floor{
- icon_state = "wood"
- },
-/area/bigredv2/outside/bar)
"aKz" = (
/obj/structure/machinery/cm_vending/sorted/boozeomat,
/turf/open/floor{
@@ -12868,16 +10470,6 @@
icon_state = "mars_dirt_13"
},
/area/bigredv2/outside/c)
-"aLe" = (
-/obj/structure/machinery/door/airlock/almayer/medical/glass/colony{
- name = "\improper Medical Command Complex";
- density = 0;
- icon_state = "door_open"
- },
-/turf/open/floor{
- icon_state = "delivery"
- },
-/area/bigredv2/outside/admin_building)
"aLf" = (
/obj/structure/surface/table,
/obj/item/clothing/mask/cigarette,
@@ -12930,13 +10522,6 @@
icon_state = "wood"
},
/area/bigredv2/outside/bar)
-"aLq" = (
-/obj/structure/pipes/vents/pump,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor{
- icon_state = "wood"
- },
-/area/bigredv2/outside/bar)
"aLr" = (
/obj/structure/bed/chair/wood/normal{
dir = 8
@@ -13120,38 +10705,11 @@
icon_state = "whitegreen"
},
/area/bigredv2/caves/lambda/virology)
-"aLT" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached18"
- },
-/area/bigredv2/outside/virology)
-"aLU" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
- },
-/area/bigredv2/outside/virology)
-"aLV" = (
-/obj/structure/sign/safety/biohazard{
- pixel_x = 7;
- pixel_y = -24
- },
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
- },
-/area/bigredv2/outside/virology)
"aLW" = (
/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
- },
-/area/bigredv2/outside/virology)
-"aLX" = (
-/obj/structure/machinery/light,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidfloor"
},
/area/bigredv2/outside/virology)
"aLY" = (
@@ -13209,19 +10767,6 @@
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/c)
-"aMi" = (
-/obj/structure/surface/table/woodentable,
-/obj/effect/spawner/random/tool{
- pixel_x = -6
- },
-/obj/item/reagent_container/food/drinks/bottle/beer/craft/partypopper{
- pixel_x = 10;
- pixel_y = 10
- },
-/turf/open/floor{
- icon_state = "wood"
- },
-/area/bigredv2/outside/bar)
"aMj" = (
/obj/effect/landmark/survivor_spawner,
/turf/open/floor{
@@ -13393,28 +10938,6 @@
icon_state = "darkyellow2"
},
/area/bigredv2/caves/eta/research)
-"aMH" = (
-/obj/structure/machinery/light{
- dir = 8
- },
-/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
-/turf/open/floor{
- icon_state = "wood"
- },
-/area/bigredv2/outside/bar)
-"aMI" = (
-/obj/structure/surface/table/woodentable,
-/obj/item/trash/sosjerky{
- pixel_x = 14;
- pixel_y = -4
- },
-/obj/item/trash/cigbutt{
- pixel_x = 4
- },
-/turf/open/floor{
- icon_state = "wood"
- },
-/area/bigredv2/outside/bar)
"aMJ" = (
/obj/structure/machinery/chem_dispenser/soda{
density = 0;
@@ -13621,6 +11144,19 @@
"aNo" = (
/turf/open/floor,
/area/bigredv2/outside/general_store)
+"aNp" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/trash/cigbutt{
+ pixel_x = -6;
+ pixel_y = -9
+ },
+/obj/item/reagent_container/food/drinks/bottle/beer/craft/mono{
+ pixel_x = 18;
+ pixel_y = -9
+ },
+/turf/open/floor/plating,
+/area/bigredv2/outside/bar)
"aNq" = (
/obj/structure/barricade/wooden{
desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
@@ -13686,23 +11222,6 @@
icon_state = "white"
},
/area/bigredv2/outside/admin_building)
-"aNz" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/obj/structure/barricade/metal{
- dir = 1
- },
-/turf/open/floor{
- icon_state = "white"
- },
-/area/bigredv2/outside/admin_building)
-"aNA" = (
-/obj/structure/barricade/metal{
- dir = 1
- },
-/turf/open/floor{
- icon_state = "white"
- },
-/area/bigredv2/outside/admin_building)
"aNB" = (
/obj/structure/machinery/computer/cameras,
/obj/structure/surface/table,
@@ -13772,15 +11291,6 @@
icon_state = "darkred2"
},
/area/bigredv2/outside/admin_building)
-"aNJ" = (
-/obj/structure/barricade/metal{
- dir = 4
- },
-/turf/open/floor{
- dir = 5;
- icon_state = "darkred2"
- },
-/area/bigredv2/outside/admin_building)
"aNK" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor{
@@ -13835,15 +11345,6 @@
icon_state = "wood"
},
/area/bigredv2/outside/admin_building)
-"aNR" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 5
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor{
- icon_state = "wood"
- },
-/area/bigredv2/outside/bar)
"aNS" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
@@ -13852,16 +11353,6 @@
icon_state = "wood"
},
/area/bigredv2/outside/bar)
-"aNU" = (
-/obj/structure/pipes/standard/manifold/hidden/green,
-/obj/item/reagent_container/food/drinks/bottle/beer/craft{
- pixel_x = 7;
- pixel_y = -7
- },
-/turf/open/floor{
- icon_state = "wood"
- },
-/area/bigredv2/outside/bar)
"aNV" = (
/obj/structure/pipes/standard/manifold/hidden/green{
dir = 1
@@ -13879,33 +11370,6 @@
icon_state = "wood"
},
/area/bigredv2/outside/bar)
-"aNX" = (
-/obj/structure/surface/table/woodentable,
-/obj/structure/pipes/vents/pump{
- dir = 8
- },
-/obj/item/reagent_container/food/drinks/bottle/beer/craft/ganucci{
- pixel_x = -4;
- pixel_y = 8
- },
-/obj/item/trash/cigbutt{
- pixel_x = -14;
- pixel_y = -6
- },
-/turf/open/floor{
- icon_state = "wood"
- },
-/area/bigredv2/outside/bar)
-"aNY" = (
-/obj/structure/surface/table/woodentable,
-/obj/item/trash/raisins{
- pixel_x = 9;
- pixel_y = 11
- },
-/turf/open/floor{
- icon_state = "wood"
- },
-/area/bigredv2/outside/bar)
"aNZ" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/landmark/crap_item,
@@ -14216,14 +11680,6 @@
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/c)
-"aOS" = (
-/obj/item/trash/cheesie,
-/obj/item/trash/pistachios,
-/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
-/turf/open/floor{
- icon_state = "wood"
- },
-/area/bigredv2/outside/bar)
"aOU" = (
/obj/structure/machinery/door/airlock/almayer/medical/glass/colony{
dir = 1;
@@ -14617,6 +12073,21 @@
icon_state = "darkred2"
},
/area/bigredv2/caves/eta/research)
+"aPU" = (
+/obj/structure/bed/chair/office/dark{
+ dir = 4
+ },
+/obj/structure/transmitter/colony_net{
+ phone_category = "Solaris Ridge";
+ phone_color = "blue";
+ phone_id = "Operations";
+ pixel_y = 24
+ },
+/turf/open/floor{
+ dir = 1;
+ icon_state = "darkblue2"
+ },
+/area/bigredv2/outside/admin_building)
"aPV" = (
/obj/structure/pipes/vents/pump{
dir = 8
@@ -14648,15 +12119,6 @@
icon_state = "wood"
},
/area/bigredv2/outside/admin_building)
-"aPY" = (
-/obj/effect/decal/cleanable/blood{
- icon_state = "gib6"
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor{
- icon_state = "wood"
- },
-/area/bigredv2/outside/bar)
"aPZ" = (
/obj/structure/surface/table,
/obj/effect/landmark/objective_landmark/science,
@@ -15111,25 +12573,6 @@
icon_state = "wood"
},
/area/bigredv2/outside/bar)
-"aRk" = (
-/obj/structure/machinery/light,
-/obj/structure/bed/chair/wood/normal{
- dir = 1
- },
-/turf/open/floor{
- icon_state = "wood"
- },
-/area/bigredv2/outside/bar)
-"aRl" = (
-/obj/structure/barricade/wooden,
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 6
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor{
- icon_state = "wood"
- },
-/area/bigredv2/outside/bar)
"aRm" = (
/obj/structure/barricade/wooden,
/obj/structure/pipes/standard/simple/hidden/green{
@@ -15428,16 +12871,6 @@
icon_state = "delivery"
},
/area/bigredv2/outside/admin_building)
-"aSc" = (
-/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
- name = "\improper Bar";
- density = 0;
- icon_state = "door_open"
- },
-/turf/open/floor{
- icon_state = "delivery"
- },
-/area/bigredv2/outside/bar)
"aSe" = (
/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
name = "\improper Kitchen"
@@ -15470,14 +12903,6 @@
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/e)
-"aSl" = (
-/obj/structure/machinery/light{
- dir = 8
- },
-/turf/open/asphalt/cement{
- icon_state = "cement3"
- },
-/area/bigredv2/caves_lambda)
"aSm" = (
/turf/open/floor{
dir = 5;
@@ -15780,15 +13205,6 @@
icon_state = "darkred2"
},
/area/bigredv2/outside/admin_building)
-"aSV" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/turf/open/floor{
- dir = 1;
- icon_state = "darkred2"
- },
-/area/bigredv2/outside/admin_building)
"aSW" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 9
@@ -15842,31 +13258,6 @@
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/c)
-"aTe" = (
-/obj/effect/decal/cleanable/blood/gibs/xeno/limb,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached2"
- },
-/area/bigredv2/outside/c)
-"aTf" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 5
- },
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
- },
-/area/bigredv2/outside/c)
-"aTg" = (
-/obj/structure/sign/double/barsign{
- pixel_y = 32
- },
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
- },
-/area/bigredv2/outside/c)
"aTh" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
@@ -15875,23 +13266,6 @@
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/c)
-"aTi" = (
-/obj/structure/pipes/standard/manifold/hidden/green{
- dir = 1
- },
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
- },
-/area/bigredv2/outside/c)
-"aTj" = (
-/obj/effect/decal/cleanable/blood,
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached9"
- },
-/area/bigredv2/outside/c)
"aTk" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
@@ -15900,15 +13274,6 @@
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/e)
-"aTl" = (
-/obj/effect/decal/cleanable/blood/xeno,
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached2"
- },
-/area/bigredv2/outside/e)
"aTp" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor{
@@ -15933,29 +13298,12 @@
icon_state = "delivery"
},
/area/bigred/ground/garage_workshop)
-"aTt" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/green,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
- },
-/area/bigredv2/outside/e)
"aTu" = (
/turf/open/floor{
dir = 8;
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/e)
-"aTv" = (
-/turf/open/asphalt/cement{
- icon_state = "cement14"
- },
-/area/bigredv2/caves_lambda)
-"aTw" = (
-/turf/open/asphalt/cement{
- icon_state = "cement2"
- },
-/area/bigredv2/caves_lambda)
"aTC" = (
/obj/structure/bed,
/obj/item/bedsheet/medical,
@@ -16178,7 +13526,10 @@
/area/bigredv2/outside/c)
"aUi" = (
/obj/effect/decal/cleanable/blood/xeno,
-/turf/open/asphalt/cement_sunbleached,
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidfloor"
+ },
/area/bigredv2/outside/c)
"aUk" = (
/turf/open/mars{
@@ -16191,28 +13542,6 @@
icon_state = "mars_dirt_4"
},
/area/bigredv2/outside/e)
-"aUm" = (
-/obj/effect/decal/cleanable/blood{
- layer = 3
- },
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
- },
-/area/bigredv2/outside/e)
-"aUn" = (
-/obj/effect/decal/cleanable/blood/gibs/limb,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
- },
-/area/bigredv2/outside/e)
-"aUv" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/turf/open/asphalt/cement{
- icon_state = "cement1"
- },
-/area/bigredv2/outside/lambda_cave_cas)
"aUD" = (
/obj/structure/bed,
/obj/item/bedsheet/medical,
@@ -16284,10 +13613,6 @@
icon_state = "white"
},
/area/bigredv2/outside/virology)
-"aUQ" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/w)
"aUS" = (
/obj/structure/surface/table,
/obj/item/reagent_container/food/snacks/bun,
@@ -16462,12 +13787,6 @@
icon_state = "darkred2"
},
/area/bigredv2/outside/admin_building)
-"aVn" = (
-/obj/effect/landmark/hunter_primary,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached2"
- },
-/area/bigredv2/outside/c)
"aVo" = (
/turf/open/mars{
icon_state = "mars_dirt_10"
@@ -16561,24 +13880,6 @@
icon_state = "white"
},
/area/bigredv2/outside/virology)
-"aVF" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached2"
- },
-/area/bigredv2/outside/w)
-"aVG" = (
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
- },
-/area/bigredv2/outside/w)
-"aVI" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/flora/grass/desert/lightgrass_3,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached3"
- },
-/area/bigredv2/outside/w)
"aVJ" = (
/obj/structure/machinery/door/airlock/almayer/medical/glass/colony{
name = "\improper General Store"
@@ -16593,11 +13894,6 @@
},
/turf/open/floor,
/area/bigredv2/outside/general_store)
-"aVL" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/handcuffs/cable,
-/turf/open/floor,
-/area/bigredv2/outside/general_store)
"aVM" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/machinery/camera/autoname{
@@ -16668,21 +13964,6 @@
icon_state = "darkblue2"
},
/area/bigredv2/outside/admin_building)
-"aVW" = (
-/obj/structure/bed/chair/office/dark{
- dir = 4
- },
-/obj/structure/transmitter/colony_net{
- phone_category = "Solaris Ridge";
- phone_color = "blue";
- phone_id = "Operations";
- pixel_y = 24
- },
-/turf/open/floor{
- dir = 1;
- icon_state = "darkblue2"
- },
-/area/bigredv2/outside/admin_building)
"aVX" = (
/obj/structure/machinery/computer/cameras{
dir = 8
@@ -17017,12 +14298,6 @@
icon_state = "freezerfloor"
},
/area/bigredv2/outside/virology)
-"aWV" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached1"
- },
-/area/bigredv2/outside/w)
"aWW" = (
/obj/effect/landmark/crap_item,
/turf/open/floor{
@@ -17039,11 +14314,6 @@
icon_state = "whitebluefull"
},
/area/bigredv2/outside/general_store)
-"aWY" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/handcuffs/cable/cyan,
-/turf/open/floor,
-/area/bigredv2/outside/general_store)
"aXb" = (
/obj/structure/machinery/power/apc{
dir = 1;
@@ -17252,11 +14522,6 @@
icon_state = "darkblue2"
},
/area/bigredv2/outside/admin_building)
-"aXO" = (
-/turf/open/floor{
- icon_state = "darkblue2"
- },
-/area/bigredv2/outside/admin_building)
"aXP" = (
/obj/structure/surface/table,
/obj/item/tool/pen,
@@ -17390,17 +14655,6 @@
icon_state = "freezerfloor"
},
/area/bigredv2/outside/admin_building)
-"aYr" = (
-/obj/structure/toilet{
- dir = 8
- },
-/obj/structure/machinery/light{
- dir = 4
- },
-/turf/open/floor{
- icon_state = "freezerfloor"
- },
-/area/bigredv2/outside/admin_building)
"aYs" = (
/obj/structure/machinery/vending/cola,
/turf/open/floor,
@@ -17836,18 +15090,12 @@
icon_state = "darkred2"
},
/area/bigredv2/outside/admin_building)
-"aZZ" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 10
- },
-/obj/structure/barricade/metal,
-/turf/open/floor{
- icon_state = "dark"
- },
-/area/bigredv2/outside/admin_building)
"baa" = (
/obj/effect/decal/cleanable/blood,
-/turf/open/asphalt/cement_sunbleached,
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidfloor"
+ },
/area/bigredv2/outside/c)
"bac" = (
/obj/effect/decal/cleanable/dirt,
@@ -18102,15 +15350,6 @@
icon_state = "chapel"
},
/area/bigredv2/outside/chapel)
-"bba" = (
-/obj/effect/decal/cleanable/blood{
- dir = 4;
- icon_state = "gib6"
- },
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached1"
- },
-/area/bigredv2/outside/w)
"bbb" = (
/obj/effect/decal/cleanable/blood{
dir = 4;
@@ -18379,12 +15618,6 @@
icon_state = "mars_dirt_14"
},
/area/bigredv2/outside/w)
-"bbL" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
- },
-/area/bigredv2/outside/se)
"bbM" = (
/obj/structure/machinery/camera/autoname{
dir = 4
@@ -18553,14 +15786,6 @@
icon_state = "chapel"
},
/area/bigredv2/outside/chapel)
-"bcm" = (
-/obj/structure/platform/kutjevo/rock{
- dir = 8;
- layer = 2.9;
- pixel_x = -3
- },
-/turf/closed/wall/solaris/rock,
-/area/bigredv2/caves)
"bcn" = (
/obj/effect/landmark/crap_item,
/turf/open/mars_cave{
@@ -18575,12 +15800,6 @@
icon_state = "white"
},
/area/bigredv2/outside/virology)
-"bcq" = (
-/obj/effect/landmark/crap_item,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
- },
-/area/bigredv2/outside/w)
"bct" = (
/obj/structure/barricade/wooden{
desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
@@ -18664,13 +15883,6 @@
icon_state = "delivery"
},
/area/bigredv2/outside/cargo)
-"bcE" = (
-/obj/structure/surface/table,
-/obj/structure/pipes/vents/pump{
- dir = 4
- },
-/turf/open/floor/carpet,
-/area/bigredv2/outside/admin_building)
"bcF" = (
/obj/structure/bed/chair/comfy/blue{
dir = 8
@@ -18828,14 +16040,6 @@
/obj/structure/machinery/camera/autoname,
/turf/open/floor,
/area/bigredv2/outside/office_complex)
-"bdb" = (
-/obj/structure/surface/table,
-/obj/item/storage/fancy/cigar/matchbook/brown{
- pixel_x = 7;
- pixel_y = 9
- },
-/turf/open/floor,
-/area/bigredv2/outside/office_complex)
"bdd" = (
/turf/open/floor{
icon_state = "rampbottom"
@@ -18900,13 +16104,6 @@
icon_state = "darkred2"
},
/area/bigredv2/outside/admin_building)
-"bdp" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor{
- dir = 6;
- icon_state = "darkred2"
- },
-/area/bigredv2/outside/admin_building)
"bdq" = (
/obj/structure/surface/table,
/obj/item/trash/snack_bowl,
@@ -18978,19 +16175,6 @@
icon_state = "delivery"
},
/area/bigredv2/outside/office_complex)
-"bdD" = (
-/obj/structure/machinery/light{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/drip,
-/obj/effect/decal/cleanable/blood/drip,
-/obj/item/trash/cigbutt/cigarbutt{
- pixel_x = -7;
- pixel_y = 4
- },
-/turf/open/floor,
-/area/bigredv2/outside/office_complex)
"bdE" = (
/obj/structure/machinery/door_control{
id = "Chapel";
@@ -19052,51 +16236,20 @@
icon_state = "wood"
},
/area/bigredv2/outside/admin_building)
-"bdU" = (
-/obj/structure/machinery/door_control{
- id = "Office Complex 1";
- name = "Storm Shutters";
- pixel_x = -32
+"bdV" = (
+/obj/structure/machinery/cm_vending/sorted/medical/no_access{
+ layer = 3.5
},
-/obj/structure/pipes/standard/simple/hidden/green,
-/obj/effect/decal/cleanable/blood/xeno,
/turf/open/floor{
- dir = 8;
- icon_state = "redcorner"
+ icon_state = "white"
},
-/area/bigredv2/outside/office_complex)
+/area/bigredv2/outside/medical)
"bdW" = (
/obj/structure/bed/chair{
dir = 1
},
/turf/open/floor,
/area/bigredv2/outside/office_complex)
-"bdX" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/obj/structure/barricade/wooden{
- desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
- dir = 1;
- health = 25000;
- pixel_y = 20
- },
-/obj/structure/machinery/vending/cigarette/colony{
- layer = 3.1;
- pixel_y = 9
- },
-/obj/structure/largecrate/random/mini/chest/b{
- layer = 3.2;
- pixel_y = -4
- },
-/turf/open/floor,
-/area/bigredv2/outside/general_offices)
-"bdY" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/stack/sheet/metal{
- pixel_x = -2;
- pixel_y = 3
- },
-/turf/open/floor,
-/area/bigredv2/outside/office_complex)
"bdZ" = (
/turf/open/floor{
dir = 1;
@@ -19203,18 +16356,6 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/caves_east)
-"beu" = (
-/obj/effect/landmark/hunter_primary,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
- },
-/area/bigredv2/outside/w)
-"bev" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
- },
-/area/bigredv2/outside/w)
"bex" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 6
@@ -19248,22 +16389,6 @@
icon_state = "asteroidfloor"
},
/area/bigredv2/outside/c)
-"beE" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 9
- },
-/obj/effect/decal/strata_decals/grime/grime4,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached2"
- },
-/area/bigredv2/outside/c)
-"beF" = (
-/obj/structure/barricade/wooden,
-/turf/open/floor{
- dir = 10;
- icon_state = "asteroidwarning"
- },
-/area/bigredv2/outside/c)
"beG" = (
/obj/structure/barricade/wooden,
/turf/open/floor{
@@ -19461,15 +16586,6 @@
icon_state = "redcorner"
},
/area/bigredv2/outside/office_complex)
-"bfq" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/gibs/xeno,
-/obj/effect/decal/cleanable/blood/xeno,
-/turf/open/floor,
-/area/bigredv2/outside/office_complex)
"bfr" = (
/obj/structure/pipes/standard/manifold/hidden/green{
dir = 1
@@ -19477,15 +16593,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor,
/area/bigredv2/outside/office_complex)
-"bfs" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/item/stack/rods,
-/turf/open/floor{
- icon_state = "redcorner"
- },
-/area/bigredv2/outside/office_complex)
"bft" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
@@ -19587,15 +16694,6 @@
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/c)
-"bfJ" = (
-/obj/item/trash/raisins{
- pixel_y = 9;
- pixel_x = -7
- },
-/turf/open/floor{
- icon_state = "dark"
- },
-/area/bigredv2/outside/office_complex)
"bfK" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 6
@@ -19767,12 +16865,6 @@
icon_state = "redcorner"
},
/area/bigredv2/outside/office_complex)
-"bgl" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/turf/open/floor{
- icon_state = "redcorner"
- },
-/area/bigredv2/outside/office_complex)
"bgm" = (
/obj/structure/janitorialcart,
/obj/effect/decal/cleanable/dirt,
@@ -19796,16 +16888,6 @@
icon_state = "whiteyellowfull"
},
/area/bigredv2/outside/office_complex)
-"bgp" = (
-/obj/item/reagent_container/glass/bucket/mopbucket{
- pixel_x = 7;
- pixel_y = 9
- },
-/turf/open/floor{
- dir = 4;
- icon_state = "whiteyellowfull"
- },
-/area/bigredv2/outside/office_complex)
"bgq" = (
/obj/structure/closet/emcloset,
/turf/open/floor{
@@ -19824,32 +16906,11 @@
icon_state = "dark"
},
/area/bigredv2/outside/office_complex)
-"bgt" = (
-/obj/structure/surface/table,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/trash/syndi_cakes{
- pixel_y = -4
- },
-/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
-/turf/open/floor{
- icon_state = "dark"
- },
-/area/bigredv2/outside/office_complex)
"bgu" = (
/turf/open/floor{
icon_state = "grimy"
},
/area/bigredv2/outside/office_complex)
-"bgv" = (
-/obj/structure/surface/table,
-/obj/item/tool/pen/blue{
- pixel_y = -8;
- pixel_x = 3
- },
-/turf/open/floor{
- icon_state = "grimy"
- },
-/area/bigredv2/outside/office_complex)
"bgw" = (
/obj/structure/bed/chair/office/light{
dir = 8
@@ -19899,12 +16960,6 @@
icon_state = "whiteyellowfull"
},
/area/bigredv2/outside/office_complex)
-"bgD" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/green,
-/obj/effect/decal/cleanable/blood/drip,
-/turf/open/floor,
-/area/bigredv2/outside/cargo)
"bgE" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor{
@@ -19912,29 +16967,6 @@
icon_state = "bot"
},
/area/bigredv2/outside/cargo)
-"bgF" = (
-/obj/structure/barricade/wooden{
- desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
- dir = 4;
- health = 25000
- },
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached3"
- },
-/area/bigredv2/outside/c)
-"bgI" = (
-/obj/structure/surface/table,
-/obj/item/trash/semki{
- pixel_x = 11;
- pixel_y = 9
- },
-/obj/structure/pipes/vents/pump{
- dir = 4
- },
-/turf/open/floor{
- icon_state = "dark"
- },
-/area/bigredv2/outside/office_complex)
"bgJ" = (
/obj/structure/surface/table/reinforced,
/turf/open/floor{
@@ -20009,23 +17041,6 @@
icon_state = "redcorner"
},
/area/bigredv2/outside/office_complex)
-"bgS" = (
-/obj/structure/machinery/light{
- dir = 8
- },
-/obj/structure/surface/table,
-/obj/item/storage/box/m94{
- pixel_x = 5;
- pixel_y = 3
- },
-/obj/structure/pipes/vents/pump{
- dir = 1
- },
-/turf/open/floor{
- dir = 4;
- icon_state = "whiteyellowfull"
- },
-/area/bigredv2/outside/office_complex)
"bgT" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/landmark/crap_item,
@@ -20034,16 +17049,6 @@
icon_state = "whiteyellowfull"
},
/area/bigredv2/outside/office_complex)
-"bgU" = (
-/obj/item/clothing/shoes/galoshes{
- pixel_x = 4;
- pixel_y = -6
- },
-/turf/open/floor{
- dir = 4;
- icon_state = "whiteyellowfull"
- },
-/area/bigredv2/outside/office_complex)
"bgV" = (
/obj/item/device/radio/intercom{
freerange = 1;
@@ -20113,28 +17118,6 @@
icon_state = "redcorner"
},
/area/bigredv2/outside/office_complex)
-"bhm" = (
-/obj/structure/surface/table,
-/obj/item/trash/kepler{
- pixel_y = 9
- },
-/obj/effect/landmark/objective_landmark/medium,
-/turf/open/floor{
- dir = 4;
- icon_state = "whiteyellowfull"
- },
-/area/bigredv2/outside/office_complex)
-"bhn" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/tool/lighter/random{
- pixel_x = -9;
- pixel_y = 2
- },
-/turf/open/floor{
- dir = 4;
- icon_state = "whiteyellowfull"
- },
-/area/bigredv2/outside/office_complex)
"bhp" = (
/obj/structure/closet/jcloset,
/obj/item/clothing/head/beret/jan,
@@ -20209,21 +17192,6 @@
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/space_port_lz2)
-"bhD" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor{
- icon_state = "floor4"
- },
-/area/bigredv2/outside/cargo)
-"bhE" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/obj/structure/machinery/light{
- dir = 4
- },
-/obj/effect/decal/cleanable/blood/drip,
-/turf/open/floor,
-/area/bigredv2/outside/cargo)
"bhI" = (
/obj/item/stack/sheet/metal/med_small_stack,
/turf/open/mars_cave{
@@ -20294,18 +17262,6 @@
icon_state = "wood"
},
/area/bigredv2/outside/office_complex)
-"bhZ" = (
-/obj/structure/surface/table,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/paper/janitor{
- pixel_x = 3;
- pixel_y = 7
- },
-/turf/open/floor{
- dir = 4;
- icon_state = "whiteyellowfull"
- },
-/area/bigredv2/outside/office_complex)
"bia" = (
/obj/structure/noticeboard{
dir = 1;
@@ -20333,15 +17289,6 @@
"bie" = (
/turf/open/floor/plating,
/area/bigredv2/outside/space_port_lz2)
-"bik" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor{
- icon_state = "floor4"
- },
-/area/bigredv2/outside/cargo)
"biq" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/pipes/standard/simple/hidden/green{
@@ -20382,21 +17329,6 @@
icon_state = "freezerfloor"
},
/area/bigredv2/outside/hydroponics)
-"biy" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 10
- },
-/obj/item/trash/cigbutt{
- pixel_x = -6;
- pixel_y = -9
- },
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/c)
-"biz" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/c)
"biA" = (
/obj/structure/machinery/door_control{
id = "Marshal Offices";
@@ -20438,12 +17370,6 @@
},
/turf/open/floor/plating,
/area/bigredv2/outside/space_port_lz2)
-"biK" = (
-/obj/effect/landmark/corpsespawner/security/marshal,
-/obj/effect/decal/cleanable/blood/gibs/body,
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor,
-/area/bigredv2/outside/cargo)
"biL" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/device/megaphone,
@@ -20454,52 +17380,12 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor,
/area/bigredv2/outside/cargo)
-"biO" = (
-/obj/effect/decal/cleanable/blood/drip,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor,
-/area/bigredv2/outside/general_offices)
"biQ" = (
/obj/structure/machinery/light{
dir = 4
},
/turf/open/floor/greengrid,
/area/bigredv2/outside/telecomm)
-"biR" = (
-/obj/structure/barricade/wooden{
- desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
- health = 25000
- },
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached14"
- },
-/area/bigredv2/outside/c)
-"biS" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 5
- },
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
- },
-/area/bigredv2/outside/c)
-"biT" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
- },
-/area/bigredv2/outside/c)
-"biU" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
- },
-/area/bigredv2/outside/c)
"biV" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 10
@@ -20507,13 +17393,6 @@
/obj/item/stack/cable_coil/cut,
/turf/open/floor/plating,
/area/bigredv2/outside/c)
-"biY" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
- },
-/area/bigredv2/outside/c)
"bja" = (
/turf/open/floor{
icon_state = "asteroidwarning"
@@ -20631,31 +17510,6 @@
icon_state = "mars_dirt_4"
},
/area/bigredv2/outside/s)
-"bjE" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/effect/decal/cleanable/blood/oil/streak,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached3"
- },
-/area/bigredv2/outside/s)
-"bjF" = (
-/obj/structure/pipes/standard/manifold/hidden/green{
- dir = 1
- },
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached1"
- },
-/area/bigredv2/outside/s)
-"bjG" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 9
- },
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached3"
- },
-/area/bigredv2/outside/s)
"bjH" = (
/turf/open/mars{
icon_state = "mars_dirt_10"
@@ -20708,22 +17562,6 @@
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/space_port_lz2)
-"bjQ" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/trash/syndi_cakes{
- pixel_y = -11;
- pixel_x = 9
- },
-/obj/item/trash/crushed_cup{
- pixel_y = 12
- },
-/obj/item/trash/semki{
- pixel_y = -14
- },
-/turf/open/floor{
- icon_state = "dark"
- },
-/area/bigredv2/outside/marshal_office)
"bjR" = (
/obj/structure/pipes/standard/simple/hidden/green,
/obj/structure/machinery/door/airlock/almayer/engineering/colony{
@@ -20739,12 +17577,6 @@
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/s)
-"bjZ" = (
-/obj/structure/barricade/wooden,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached9"
- },
-/area/bigredv2/outside/c)
"bka" = (
/turf/open/mars{
icon_state = "mars_dirt_3"
@@ -20756,12 +17588,6 @@
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/s)
-"bkc" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached1"
- },
-/area/bigredv2/outside/s)
"bkd" = (
/turf/open/floor{
dir = 9;
@@ -21056,16 +17882,6 @@
},
/turf/open/floor,
/area/bigredv2/outside/cargo)
-"blk" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
- },
-/area/bigredv2/outside/e)
"bll" = (
/obj/structure/surface/table,
/obj/effect/spawner/random/tool,
@@ -21113,23 +17929,6 @@
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/s)
-"bls" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/camera/autoname{
- dir = 1
- },
-/turf/open/floor{
- dir = 5;
- icon_state = "asteroidwarning"
- },
-/area/bigredv2/outside/s)
-"blt" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached15"
- },
-/area/bigredv2/outside/s)
"blu" = (
/turf/open/floor{
dir = 5;
@@ -21219,16 +18018,6 @@
},
/turf/open/floor/plating,
/area/bigredv2/outside/filtration_plant)
-"blP" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/effect/decal/cleanable/blood/xeno,
-/turf/open/floor{
- dir = 1;
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
"blT" = (
/obj/structure/bed/chair/office/light{
dir = 8
@@ -22043,6 +18832,16 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/engineering)
+"boo" = (
+/obj/structure/surface/table,
+/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot{
+ pixel_y = 6;
+ pixel_x = 16
+ },
+/turf/open/floor{
+ icon_state = "dark"
+ },
+/area/bigredv2/outside/general_offices)
"boq" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 5
@@ -22520,12 +19319,6 @@
icon_state = "dark"
},
/area/bigredv2/outside/filtration_plant)
-"bpT" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached3"
- },
-/area/bigredv2/outside/c)
"bpU" = (
/obj/structure/machinery/portable_atmospherics/powered/scrubber/huge/stationary,
/obj/effect/decal/warning_stripes,
@@ -22544,29 +19337,12 @@
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/se)
-"bpY" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached3"
- },
-/area/bigredv2/outside/se)
-"bpZ" = (
-/obj/structure/fence,
-/turf/open/asphalt/cement,
-/area/bigredv2/outside/filtration_cave_cas)
"bqa" = (
/turf/open/floor{
dir = 1;
icon_state = "asteroidfloor"
},
/area/bigredv2/outside/se)
-"bqb" = (
-/obj/effect/landmark/crap_item,
-/turf/open/asphalt/cement{
- icon_state = "cement1";
- dir = 1
- },
-/area/bigredv2/outside/filtration_cave_cas)
"bqc" = (
/obj/effect/decal/cleanable/blood/drip{
pixel_y = 6
@@ -22621,6 +19397,15 @@
icon_state = "dark"
},
/area/bigredv2/outside/engineering)
+"bqr" = (
+/obj/item/trash/sosjerky{
+ pixel_x = 8;
+ pixel_y = 12
+ },
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached4"
+ },
+/area/bigredv2/outside/w)
"bqv" = (
/obj/effect/decal/warning_stripes{
icon_state = "W"
@@ -23057,6 +19842,20 @@
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/space_port_lz2)
+"bsl" = (
+/obj/effect/decal/cleanable/blood{
+ icon_state = "gib6"
+ },
+/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor/colony{
+ name = "\improper Medical Clinic";
+ icon_state = "door_open";
+ density = 0
+ },
+/obj/structure/pipes/standard/simple/hidden/green,
+/turf/open/floor{
+ icon_state = "delivery"
+ },
+/area/bigredv2/outside/medical)
"bsm" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/stack/sheet/metal{
@@ -23288,12 +20087,6 @@
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/s)
-"bto" = (
-/obj/item/tool/warning_cone,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached15"
- },
-/area/bigredv2/outside/se)
"btr" = (
/turf/open/floor{
dir = 8;
@@ -23378,6 +20171,13 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/engineering)
+"btO" = (
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidfloor"
+ },
+/area/bigredv2/outside/ne)
"bua" = (
/obj/structure/pipes/standard/simple/hidden/green,
/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
@@ -23402,12 +20202,6 @@
icon_state = "mars_cave_19"
},
/area/bigredv2/outside/s)
-"buh" = (
-/obj/structure/flora/bush/desert{
- icon_state = "tree_3"
- },
-/turf/open/mars,
-/area/bigredv2/outside/se)
"buj" = (
/turf/open/mars_cave{
icon_state = "mars_cave_5"
@@ -23426,12 +20220,6 @@
icon_state = "asteroidfloor"
},
/area/bigredv2/outside/s)
-"bus" = (
-/obj/effect/decal/strata_decals/grime/grime3,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached3"
- },
-/area/bigredv2/outside/s)
"buu" = (
/turf/open/mars_cave{
icon_state = "mars_cave_17"
@@ -23462,6 +20250,10 @@
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/s)
+"buO" = (
+/obj/structure/flora/grass/desert/lightgrass_2,
+/turf/open/mars,
+/area/bigredv2/outside/s)
"buQ" = (
/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
/turf/open/mars_cave{
@@ -23474,12 +20266,6 @@
icon_state = "mars_dirt_4"
},
/area/bigredv2/outside/lz2_south_cas)
-"buX" = (
-/obj/structure/flora/grass/desert/lightgrass_10,
-/turf/open/mars_cave{
- icon_state = "mars_dirt_4"
- },
-/area/bigredv2/outside/nw)
"buY" = (
/obj/effect/decal/cleanable/blood{
icon_state = "xgib1"
@@ -23506,12 +20292,6 @@
icon_state = "mars_dirt_4"
},
/area/bigredv2/outside/lz2_south_cas)
-"bvy" = (
-/obj/structure/flora/grass/desert/lightgrass_6,
-/turf/open/mars{
- icon_state = "mars_dirt_11"
- },
-/area/bigredv2/outside/space_port_lz2)
"bvz" = (
/obj/structure/pipes/standard/simple/hidden/green,
/obj/structure/machinery/door/poddoor/almayer/closed{
@@ -24137,15 +20917,6 @@
icon_state = "darkgreencorners2"
},
/area/bigredv2/caves/eta/research)
-"bxZ" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/structure/bed/chair/wood/normal,
-/turf/open/floor{
- icon_state = "wood"
- },
-/area/bigredv2/outside/bar)
"bya" = (
/turf/open/floor{
icon_state = "darkgreencorners2"
@@ -25024,11 +21795,6 @@
icon_state = "darkyellow2"
},
/area/bigredv2/caves/eta/research)
-"bAt" = (
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached9"
- },
-/area/bigredv2/outside/c)
"bAu" = (
/obj/structure/surface/table,
/obj/item/storage/box/wy_mre,
@@ -25387,14 +22153,6 @@
icon_state = "darkred2"
},
/area/bigredv2/caves/eta/xenobiology)
-"bBu" = (
-/obj/effect/decal/strata_decals/grime/grime1{
- dir = 1
- },
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
- },
-/area/bigredv2/outside/nw)
"bBv" = (
/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
/turf/open/floor/plating,
@@ -25430,16 +22188,6 @@
icon_state = "grass_impenetrable"
},
/area/bigredv2/caves/eta/research)
-"bBE" = (
-/obj/item/clothing/mask/gas{
- pixel_y = 7;
- pixel_x = 7
- },
-/obj/structure/barricade/deployable,
-/turf/open/floor{
- icon_state = "dark"
- },
-/area/bigredv2/outside/marshal_office)
"bBH" = (
/obj/structure/machinery/door/airlock/almayer/research/glass/colony{
name = "\improper Eta Lab Cell"
@@ -26605,28 +23353,44 @@
icon_state = "delivery"
},
/area/bigredv2/outside/office_complex)
+"bFe" = (
+/obj/structure/surface/table/reinforced,
+/obj/structure/transmitter/colony_net/rotary{
+ phone_category = "Solaris Ridge";
+ phone_id = "Clinic Reception";
+ pixel_y = 9;
+ pixel_x = 6
+ },
+/turf/open/floor{
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
"bFw" = (
/turf/closed/wall/solaris/reinforced,
/area/bigredv2/outside/telecomm/warehouse)
-"bFV" = (
-/obj/structure/closet/crate/trashcart{
- pixel_x = 4;
- pixel_y = 3
- },
-/obj/item/reagent_container/food/drinks/bottle/beer/craft/ganucci,
-/obj/item/stack/sheet/cardboard{
- pixel_x = 7;
- pixel_y = -2
+"bFJ" = (
+/obj/structure/barricade/wooden{
+ desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
+ dir = 4;
+ health = 25000
},
-/obj/item/trash/eat{
- pixel_x = -9;
- pixel_y = -5
+/turf/open/floor{
+ dir = 6;
+ icon_state = "asteroidwarning"
},
+/area/bigredv2/outside/c)
+"bFO" = (
+/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
+ icon_state = "wood"
},
-/area/bigredv2/outside/ne)
+/area/bigredv2/outside/bar)
+"bFW" = (
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached3"
+ },
+/area/bigredv2/outside/nw)
"bGp" = (
/obj/structure/surface/table/reinforced/prison,
/obj/effect/spawner/random/tool,
@@ -26644,36 +23408,34 @@
icon_state = "asteroidfloor"
},
/area/bigredv2/outside/lz2_south_cas)
-"bHp" = (
-/obj/structure/machinery/light,
-/obj/effect/landmark/survivor_spawner,
-/turf/open/floor{
- icon_state = "dark"
+"bHt" = (
+/obj/structure/closet/bodybag,
+/obj/structure/bed/bedroll{
+ dir = 10
},
-/area/bigredv2/outside/marshal_office)
-"bHw" = (
-/obj/effect/decal/cleanable/dirt,
/turf/open/floor{
- dir = 4;
- icon_state = "asteroidwarning"
+ icon_state = "whitegreenfull"
},
-/area/bigredv2/outside/e)
-"bHX" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
+/area/bigredv2/outside/medical)
+"bHH" = (
+/obj/structure/curtain/medical,
+/obj/effect/decal/medical_decals{
+ icon_state = "triagedecaltopleft"
},
-/area/bigredv2/outside/nw)
-"bIt" = (
-/obj/structure/surface/table,
-/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot{
- pixel_y = 8;
- pixel_x = -11
+/turf/open/floor{
+ dir = 8;
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
+"bIC" = (
+/obj/effect/decal/cleanable/blood{
+ icon_state = "xgib4"
},
/turf/open/floor{
- icon_state = "dark"
+ dir = 4;
+ icon_state = "asteroidwarning"
},
-/area/bigredv2/outside/general_offices)
+/area/bigredv2/outside/c)
"bII" = (
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
@@ -26681,23 +23443,22 @@
icon_state = "mars_dirt_4"
},
/area/bigredv2/caves/mining)
-"bIZ" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor{
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
-"bJh" = (
-/obj/item/trash/semki{
- pixel_y = -14
+"bIK" = (
+/obj/structure/flora/bush/desert{
+ icon_state = "tree_3"
},
+/turf/open/mars,
+/area/bigredv2/outside/se)
+"bJc" = (
+/obj/effect/landmark/crap_item,
/turf/open/asphalt/cement_sunbleached{
icon_state = "cement_sunbleached4"
},
-/area/bigredv2/outside/virology)
+/area/bigredv2/outside/w)
+"bJe" = (
+/obj/effect/acid_hole,
+/turf/closed/wall/solaris,
+/area/bigredv2/outside/general_offices)
"bJz" = (
/obj/structure/bed/chair{
dir = 8;
@@ -26709,19 +23470,6 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"bJJ" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/obj/structure/machinery/door/airlock/almayer/medical/glass/colony{
- dir = 1;
- name = "\improper Medical Clinic";
- density = 0;
- icon_state = "door_open"
- },
-/obj/effect/decal/cleanable/blood/drip,
-/turf/open/floor{
- icon_state = "delivery"
- },
-/area/bigredv2/outside/medical)
"bJQ" = (
/turf/open/mars{
icon_state = "mars_dirt_10"
@@ -26732,14 +23480,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/bigredv2/caves/mining)
-"bKJ" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/xeno,
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
- },
-/area/bigredv2/outside/n)
"bKY" = (
/obj/structure/fence,
/obj/structure/blocker/forcefield/multitile_vehicles,
@@ -26747,6 +23487,17 @@
icon_state = "mars_cave_16"
},
/area/bigredv2/outside/filtration_cave_cas)
+"bLd" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/obj/item/reagent_container/food/drinks/bottle/beer/craft/reaper,
+/obj/item/reagent_container/food/drinks/bottle/beer/craft/reaper{
+ pixel_y = 8;
+ pixel_x = 17
+ },
+/turf/open/floor{
+ icon_state = "wood"
+ },
+/area/bigredv2/outside/bar)
"bLA" = (
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
@@ -26754,11 +23505,6 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/caves_se)
-"bLB" = (
-/turf/open/asphalt/cement{
- icon_state = "cement9"
- },
-/area/bigredv2/outside/lambda_cave_cas)
"bMa" = (
/obj/structure/surface/rack,
/obj/item/weapon/gun/pistol/mod88,
@@ -26768,11 +23514,29 @@
icon_state = "redcorner"
},
/area/bigredv2/outside/admin_building)
+"bMb" = (
+/obj/structure/machinery/light/small{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement{
+ icon_state = "cement14"
+ },
+/area/bigredv2/caves_lambda)
"bMf" = (
/turf/open/floor{
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/filtration_plant)
+"bMv" = (
+/obj/structure/pipes/standard/manifold/hidden/green{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/generic,
+/turf/open/floor{
+ icon_state = "wood"
+ },
+/area/bigredv2/outside/bar)
"bMz" = (
/turf/open/floor{
dir = 5;
@@ -26784,39 +23548,57 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/caves/lambda/xenobiology)
-"bNA" = (
-/obj/structure/surface/table,
-/obj/effect/landmark/objective_landmark/close{
- pixel_x = 8
+"bND" = (
+/obj/structure/barricade/wooden{
+ dir = 4;
+ pixel_x = 4
},
-/turf/open/floor,
-/area/bigredv2/outside/dorms)
+/turf/open/floor{
+ dir = 4;
+ icon_state = "redcorner"
+ },
+/area/bigredv2/outside/marshal_office)
"bNE" = (
/obj/structure/closet/secure_closet/brig,
/turf/open/floor{
icon_state = "dark"
},
/area/bigredv2/outside/marshal_office)
-"bNO" = (
-/obj/item/prop{
- desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
- icon = 'icons/obj/janitor.dmi';
- icon_state = "trashbag3";
- name = "trash bag";
- pixel_x = -2;
- pixel_y = -4
+"bNR" = (
+/obj/effect/landmark/crap_item,
+/turf/open/asphalt/cement{
+ icon_state = "cement9"
},
+/area/bigredv2/outside/space_port)
+"bNU" = (
+/obj/structure/barricade/deployable,
/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
+ icon_state = "dark"
},
-/area/bigredv2/outside/ne)
-"bPn" = (
-/obj/effect/decal/cleanable/blood/gibs/body,
+/area/bigredv2/outside/marshal_office)
+"bOg" = (
+/obj/effect/decal/strata_decals/grime/grime3,
/turf/open/asphalt/cement_sunbleached{
icon_state = "cement_sunbleached3"
},
-/area/bigredv2/outside/s)
+/area/bigredv2/outside/space_port_lz2)
+"bOk" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/barricade/handrail{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor{
+ dir = 8;
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/c)
+"bOW" = (
+/obj/structure/flora/grass/desert/lightgrass_1,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached3"
+ },
+/area/bigredv2/outside/nw)
"bPy" = (
/obj/effect/landmark/structure_spawner/setup/distress/xeno_nest,
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest,
@@ -26824,6 +23606,20 @@
icon_state = "mars_cave_17"
},
/area/bigredv2/caves/mining)
+"bPM" = (
+/obj/structure/bed/chair/wheelchair{
+ pixel_y = 5;
+ pixel_x = 5
+ },
+/obj/structure/machinery/iv_drip{
+ pixel_y = 20;
+ pixel_x = -13
+ },
+/turf/open/floor{
+ dir = 1;
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
"bQb" = (
/turf/open/mars_cave{
icon_state = "mars_cave_18"
@@ -26843,16 +23639,27 @@
icon_state = "darkish"
},
/area/bigredv2/caves/lambda/virology)
+"bQk" = (
+/obj/structure/closet/crate/trashcart,
+/turf/open/mars_cave{
+ icon_state = "mars_dirt_4"
+ },
+/area/bigredv2/outside/nw)
+"bQt" = (
+/obj/structure/surface/table,
+/obj/item/storage/firstaid/adv{
+ pixel_y = 13;
+ pixel_x = 7
+ },
+/turf/open/floor{
+ icon_state = "whitegreencorner"
+ },
+/area/bigredv2/outside/medical)
"bQG" = (
/turf/open/mars_cave{
icon_state = "mars_dirt_6"
},
/area/bigredv2/caves_lambda)
-"bQN" = (
-/obj/effect/decal/cleanable/blood/drip,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor,
-/area/bigredv2/outside/dorms)
"bRd" = (
/obj/structure/cable{
icon_state = "1-4"
@@ -26924,40 +23731,17 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
+"bTM" = (
+/obj/effect/decal/cleanable/generic,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached4"
+ },
+/area/bigredv2/outside/virology)
"bTW" = (
/turf/open/mars_cave{
icon_state = "mars_cave_7"
},
/area/bigredv2/caves_se)
-"bUt" = (
-/obj/item/trash/syndi_cakes{
- pixel_y = -11;
- pixel_x = 9
- },
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/nw)
-"bVk" = (
-/obj/effect/decal/cleanable/vomit,
-/turf/open/floor{
- icon_state = "whitegreenfull"
- },
-/area/bigredv2/outside/medical)
-"bVy" = (
-/obj/effect/decal/cleanable/blood/drip,
-/turf/open/floor{
- dir = 8;
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
-"bVC" = (
-/obj/structure/platform/kutjevo/rock{
- dir = 8;
- layer = 2.9;
- pixel_x = -3
- },
-/obj/effect/decal/cleanable/blood/drip,
-/turf/closed/wall/solaris/rock,
-/area/bigredv2/caves)
"bVX" = (
/obj/structure/barricade/wooden{
desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
@@ -26969,16 +23753,6 @@
icon_state = "mars_cave_13"
},
/area/bigredv2/caves_north)
-"bWf" = (
-/obj/structure/platform/kutjevo/rock,
-/obj/item/trash/used_stasis_bag{
- pixel_y = 8;
- pixel_x = 9
- },
-/turf/open/mars_cave{
- icon_state = "mars_cave_9"
- },
-/area/bigredv2/outside/nw)
"bWk" = (
/turf/open/floor{
dir = 1;
@@ -26992,22 +23766,46 @@
icon_state = "asteroidfloor"
},
/area/bigred/ground/garage_workshop)
+"bWp" = (
+/obj/structure/machinery/power/apc{
+ dir = 1;
+ name = "Bar APC"
+ },
+/obj/item/reagent_container/food/drinks/cup{
+ pixel_x = -11
+ },
+/turf/open/floor{
+ icon_state = "wood"
+ },
+/area/bigredv2/outside/bar)
"bXe" = (
/obj/structure/closet/crate/freezer/rations,
/obj/effect/landmark/objective_landmark/medium,
/turf/open/floor/plating,
/area/bigredv2/caves/lambda/xenobiology)
+"bXD" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/floor,
+/area/bigredv2/outside/cargo)
"bYa" = (
/obj/item/reagent_container/spray/cleaner,
/turf/open/floor,
/area/bigredv2/outside/cargo)
-"bYC" = (
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/w)
-"bYE" = (
-/obj/effect/decal/cleanable/blood/xeno,
-/turf/open/floor/plating,
-/area/bigredv2/outside/medical)
+"bYz" = (
+/obj/effect/decal/cleanable/generic,
+/obj/effect/decal/cleanable/ash{
+ pixel_y = 19
+ },
+/turf/open/mars_cave{
+ icon_state = "mars_cave_14"
+ },
+/area/bigredv2/outside/nw)
+"bYQ" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
+/turf/open/asphalt/cement,
+/area/bigredv2/caves_lambda)
"bYW" = (
/obj/structure/pipes/vents/pump,
/turf/open/floor{
@@ -27021,6 +23819,16 @@
},
/turf/open/floor/plating,
/area/bigredv2/outside/nw/ceiling)
+"bZF" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached4"
+ },
+/area/bigredv2/outside/e)
"bZJ" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/clothing/suit/radiation,
@@ -27036,12 +23844,22 @@
icon_state = "whitepurplefull"
},
/area/bigredv2/caves/lambda/research)
-"cab" = (
-/obj/effect/decal/cleanable/blood/oil,
-/turf/open/floor/plating{
- icon_state = "platingdmg1"
+"cac" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/trash/cigbutt{
+ pixel_x = -10;
+ pixel_y = 13
},
-/area/bigredv2/outside/office_complex)
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached3"
+ },
+/area/bigredv2/outside/c)
+"caC" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement{
+ icon_state = "cement3"
+ },
+/area/bigredv2/caves_lambda)
"caD" = (
/obj/effect/landmark/crap_item,
/turf/open/floor{
@@ -27049,22 +23867,37 @@
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/s)
+"caG" = (
+/obj/effect/decal/strata_decals/grime/grime1,
+/obj/effect/decal/cleanable/generic,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached4"
+ },
+/area/bigredv2/outside/c)
"caN" = (
/obj/structure/surface/table,
/obj/effect/landmark/objective_landmark/close,
/turf/open/floor/carpet,
/area/bigredv2/outside/admin_building)
-"cbe" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/flora/grass/desert/lightgrass_1,
+"caY" = (
+/obj/item/trash/cigbutt,
/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached3"
+ icon_state = "cement_sunbleached12"
},
-/area/bigredv2/outside/s)
-"cbh" = (
-/obj/structure/bed/roller,
-/turf/open/mars,
/area/bigredv2/outside/nw)
+"ccd" = (
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached15"
+ },
+/area/bigredv2/outside/space_port_lz2)
+"ccv" = (
+/obj/structure/barricade/deployable{
+ dir = 8
+ },
+/turf/open/floor{
+ icon_state = "dark"
+ },
+/area/bigredv2/outside/marshal_office)
"ccI" = (
/obj/structure/machinery/power/apc{
dir = 1;
@@ -27107,12 +23940,6 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/caves/mining)
-"cef" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
- },
-/area/bigredv2/outside/virology)
"ceA" = (
/obj/structure/machinery/light{
dir = 4
@@ -27121,54 +23948,10 @@
icon_state = "mars_dirt_4"
},
/area/bigredv2/outside/e)
-"ceC" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/barricade/wooden{
- desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
- dir = 8;
- health = 25000;
- pixel_y = 6;
- pixel_x = 7
- },
-/turf/open/floor{
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
-"ceR" = (
-/obj/structure/barricade/handrail/medical{
- dir = 1
- },
-/turf/open/floor{
- dir = 4;
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
-"cfc" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/trash/burger{
- pixel_y = 12;
- pixel_x = -8
- },
-/turf/open/floor{
- icon_state = "white"
- },
-/area/bigredv2/outside/medical)
-"cfg" = (
+"ceO" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/drip,
-/turf/open/floor{
- dir = 8;
- icon_state = "asteroidwarning"
- },
-/area/bigredv2/outside/c)
-"cfk" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/turf/open/asphalt/cement{
- icon_state = "cement15"
- },
-/area/bigredv2/outside/space_port)
+/turf/open/floor/plating,
+/area/bigredv2/caves_north)
"cfr" = (
/obj/item/explosive/grenade/baton{
dir = 8
@@ -27177,28 +23960,19 @@
icon_state = "mars_dirt_4"
},
/area/bigredv2/caves/mining)
-"cgq" = (
-/obj/item/trash/cigbutt{
- pixel_x = -10;
- pixel_y = 7
- },
+"cfs" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/reagent_container/pill/happy,
+/obj/item/reagent_container/pill/happy,
/turf/open/floor{
- dir = 1;
- icon_state = "asteroidwarning"
+ icon_state = "whitegreenfull"
},
-/area/bigredv2/outside/n)
+/area/bigredv2/outside/medical)
"cgt" = (
/turf/open/floor{
icon_state = "delivery"
},
/area/bigredv2/outside/dorms)
-"cgO" = (
-/obj/effect/decal/cleanable/blood/drip,
-/turf/open/floor{
- dir = 5;
- icon_state = "asteroidwarning"
- },
-/area/bigredv2/outside/telecomm/n_cave)
"chq" = (
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
@@ -27206,25 +23980,35 @@
icon_state = "mars_cave_18"
},
/area/bigredv2/caves_lambda)
-"chr" = (
-/obj/structure/flora/bush/desert{
- icon_state = "tree_3"
+"chx" = (
+/obj/effect/decal/cleanable/blood{
+ layer = 3
},
-/turf/open/mars{
- icon_state = "mars_dirt_14"
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor{
+ dir = 8;
+ icon_state = "redcorner"
},
-/area/bigredv2/outside/c)
-"cie" = (
-/obj/structure/flora/grass/desert/lightgrass_5,
-/obj/effect/decal/cleanable/blood,
-/turf/open/mars,
-/area/bigredv2/outside/n)
+/area/bigredv2/outside/lambda_cave_cas)
"ciG" = (
/obj/effect/landmark/hunter_secondary,
/turf/open/mars_cave{
icon_state = "mars_cave_7"
},
/area/bigredv2/outside/n)
+"ciU" = (
+/obj/effect/decal/cleanable/blood,
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/effect/decal/medical_decals{
+ icon_state = "cryocell1decal"
+ },
+/turf/open/floor{
+ dir = 5;
+ icon_state = "whitebluefull"
+ },
+/area/bigredv2/outside/medical)
"ciY" = (
/obj/structure/machinery/light/small{
dir = 1
@@ -27233,59 +24017,73 @@
icon_state = "mars_dirt_4"
},
/area/bigredv2/caves/mining)
-"cjd" = (
-/obj/item/trash/cigbutt{
- pixel_x = -10;
- pixel_y = 16
- },
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
- },
+"cjR" = (
+/obj/item/ammo_casing/bullet,
+/obj/item/ammo_casing/bullet,
+/obj/item/ammo_casing/bullet,
+/turf/open/mars,
/area/bigredv2/outside/c)
-"ckz" = (
-/obj/item/reagent_container/glass/bucket{
- pixel_x = 6;
- pixel_y = 6
+"cks" = (
+/obj/item/trash/popcorn,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached12"
},
-/turf/open/floor{
- dir = 1;
- icon_state = "whitegreen"
+/area/bigredv2/outside/virology)
+"ckZ" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/generic,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached12"
},
-/area/bigredv2/outside/marshal_office)
-"ckE" = (
+/area/bigredv2/outside/nw)
+"cla" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
},
-/obj/item/trash/uscm_mre{
- pixel_y = 13;
- pixel_x = 6
+/turf/open/floor{
+ icon_state = "dark"
},
+/area/bigredv2/outside/engineering)
+"clv" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/ammo_casing/bullet,
+/obj/item/ammo_casing/bullet,
/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
+ icon_state = "dark"
},
-/area/bigredv2/outside/ne)
-"cla" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
+/area/bigredv2/outside/general_offices)
+"cly" = (
+/obj/structure/surface/rack,
+/obj/item/clothing/under/lightbrown{
+ pixel_x = 10;
+ pixel_y = -5
},
/turf/open/floor{
- icon_state = "dark"
+ icon_state = "freezerfloor"
},
-/area/bigredv2/outside/engineering)
+/area/bigredv2/outside/general_offices)
"clB" = (
/turf/open/floor{
dir = 1;
icon_state = "asteroidfloor"
},
/area/bigred/ground/garage_workshop)
-"cmo" = (
-/obj/effect/decal/cleanable/blood/drip,
+"cma" = (
+/obj/effect/decal/cleanable/generic,
/turf/open/floor{
- dir = 1;
+ dir = 4;
icon_state = "asteroidwarning"
},
-/area/bigredv2/outside/eta)
+/area/bigredv2/outside/ne)
+"cms" = (
+/obj/effect/decal/cleanable/blood/gibs/body,
+/obj/effect/decal/cleanable/blood/drip,
+/obj/item/weapon/baton/damaged{
+ pixel_y = 20;
+ pixel_x = 16
+ },
+/turf/open/floor,
+/area/bigredv2/outside/marshal_office)
"cmC" = (
/obj/effect/decal/cleanable/blood/drip{
pixel_x = -1;
@@ -27304,6 +24102,15 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/caves/mining)
+"cmL" = (
+/obj/structure/platform/kutjevo/rock{
+ dir = 8;
+ layer = 2.9;
+ pixel_x = -3
+ },
+/obj/effect/decal/cleanable/blood/drip,
+/turf/closed/wall/solaris/rock,
+/area/bigredv2/caves)
"cnk" = (
/obj/structure/platform/kutjevo/rock{
dir = 8
@@ -27353,6 +24160,16 @@
icon_state = "mars_cave_6"
},
/area/bigredv2/caves_se)
+"cpq" = (
+/obj/item/trash/cheesie{
+ pixel_y = -1;
+ pixel_x = -11
+ },
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidfloor"
+ },
+/area/bigredv2/outside/ne)
"cpQ" = (
/obj/structure/machinery/camera/autoname{
dir = 1
@@ -27367,6 +24184,12 @@
icon_state = "dark"
},
/area/bigredv2/caves/eta/storage)
+"cqB" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached3"
+ },
+/area/bigredv2/outside/space_port_lz2)
"cqZ" = (
/obj/effect/decal/cleanable/blood/drip,
/turf/open/mars_cave{
@@ -27383,14 +24206,6 @@
icon_state = "chapel"
},
/area/bigredv2/outside/chapel)
-"crk" = (
-/obj/structure/bed,
-/obj/effect/decal/cleanable/blood/gibs/body,
-/turf/open/floor{
- dir = 4;
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
"crl" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
@@ -27411,26 +24226,20 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"cry" = (
-/obj/structure/surface/table/reinforced,
-/obj/item/handcuffs,
+"crH" = (
+/obj/effect/decal/cleanable/blood/drip,
+/obj/item/stack/sheet/wood{
+ pixel_y = -2
+ },
/turf/open/floor{
- dir = 9;
- icon_state = "redfull"
+ icon_state = "white"
},
-/area/bigredv2/outside/lambda_cave_cas)
+/area/bigredv2/outside/medical)
"crQ" = (
/turf/open/mars_cave{
icon_state = "mars_cave_18"
},
/area/bigredv2/caves_virology)
-"crZ" = (
-/obj/item/device/flashlight/lamp/tripod{
- layer = 6;
- pixel_y = 11
- },
-/turf/closed/wall/solaris/rock,
-/area/bigredv2/caves)
"csB" = (
/obj/structure/prop/dam/crane/damaged,
/turf/open/floor/plating{
@@ -27450,6 +24259,15 @@
icon_state = "mars_cave_6"
},
/area/bigredv2/outside/lz1_telecomm_cas)
+"cte" = (
+/obj/item/trash/cigbutt{
+ pixel_x = -10;
+ pixel_y = 16
+ },
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached1"
+ },
+/area/bigredv2/outside/s)
"ctT" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
@@ -27468,12 +24286,46 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/engineering)
+"cuC" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/machinery/botany,
+/turf/open/floor{
+ icon_state = "redcorner"
+ },
+/area/bigredv2/outside/marshal_office)
+"cuD" = (
+/obj/effect/decal/medical_decals{
+ icon_state = "triagedecaltopleft"
+ },
+/obj/structure/barricade/handrail/medical{
+ dir = 1
+ },
+/turf/open/floor{
+ dir = 8;
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
"cuG" = (
/obj/structure/pipes/standard/simple/hidden/green,
/turf/open/floor{
icon_state = "dark"
},
/area/bigredv2/outside/chapel)
+"cuO" = (
+/obj/item/clothing/under/color/orange{
+ pixel_y = -7;
+ pixel_x = 6
+ },
+/turf/closed/wall/solaris/rock,
+/area/bigredv2/caves)
+"cva" = (
+/obj/effect/decal/cleanable/blood/drip,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor{
+ icon_state = "red"
+ },
+/area/bigredv2/outside/lambda_cave_cas)
"cvi" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/tunnel{
@@ -27483,6 +24335,28 @@
icon_state = "dark"
},
/area/bigredv2/caves/eta/xenobiology)
+"cwQ" = (
+/obj/structure/surface/table,
+/obj/structure/transmitter/colony_net/rotary{
+ phone_category = "Solaris Ridge";
+ phone_color = "red";
+ phone_id = "Marshal Office"
+ },
+/obj/structure/surface/table,
+/obj/item/restraint/handcuffs,
+/turf/open/floor{
+ icon_state = "dark"
+ },
+/area/bigredv2/outside/marshal_office)
+"cxb" = (
+/obj/item/trash/cigbutt{
+ pixel_x = -7;
+ pixel_y = 13
+ },
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached12"
+ },
+/area/bigredv2/outside/virology)
"cxi" = (
/obj/structure/machinery/light{
dir = 4
@@ -27492,6 +24366,25 @@
icon_state = "grass_impenetrable"
},
/area/bigredv2/caves/eta/xenobiology)
+"cxs" = (
+/obj/item/clothing/mask/gas{
+ pixel_x = 10;
+ pixel_y = -12
+ },
+/obj/structure/barricade/deployable{
+ dir = 8
+ },
+/turf/open/floor{
+ icon_state = "dark"
+ },
+/area/bigredv2/outside/marshal_office)
+"cxy" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
+/turf/open/asphalt/cement{
+ icon_state = "cement9"
+ },
+/area/bigredv2/caves_lambda)
"cyv" = (
/obj/structure/machinery/prop/almayer/computer/PC{
pixel_x = 3;
@@ -27500,27 +24393,22 @@
/obj/structure/surface/table/reinforced/prison,
/turf/open/floor/plating,
/area/bigredv2/caves/mining)
-"czd" = (
-/turf/closed/wall/solaris{
- damage = 1870;
- damage_overlay = 5;
- current_bulletholes = 3
- },
-/area/bigredv2/outside/medical)
-"czm" = (
-/obj/effect/decal/cleanable/blood/xeno,
-/turf/open/floor/plating{
- icon_state = "platingdmg1"
+"cyG" = (
+/obj/structure/flora/grass/desert/lightgrass_1,
+/turf/open/mars,
+/area/bigredv2/outside/n)
+"czB" = (
+/obj/structure/surface/table,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/paper/janitor{
+ pixel_x = 3;
+ pixel_y = 7
},
-/area/bigredv2/outside/office_complex)
-"czN" = (
-/obj/effect/decal/cleanable/blood/xeno,
-/obj/item/ammo_casing/bullet,
-/obj/item/ammo_casing/bullet,
/turf/open/floor{
- icon_state = "dark"
+ dir = 4;
+ icon_state = "whiteyellowfull"
},
-/area/bigredv2/outside/general_offices)
+/area/bigredv2/outside/office_complex)
"czS" = (
/obj/effect/landmark/objective_landmark/medium,
/turf/open/floor/plating,
@@ -27531,28 +24419,31 @@
icon_state = "mars_dirt_6"
},
/area/bigredv2/caves/mining)
+"cAc" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/nw)
"cAf" = (
/obj/item/stack/sheet/wood,
/turf/open/mars_cave{
icon_state = "mars_dirt_4"
},
/area/bigredv2/caves_north)
-"cAs" = (
-/turf/open/asphalt/cement{
- icon_state = "cement4"
- },
-/area/bigredv2/outside/filtration_cave_cas)
"cAN" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/blood/oil,
/turf/open/floor/plating,
/area/bigredv2/caves/mining)
-"cBb" = (
-/obj/structure/flora/grass/desert/lightgrass_1,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached17"
+"cBo" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/weapon/dart/green{
+ pixel_y = -10;
+ pixel_x = -11
},
-/area/bigredv2/outside/nw)
+/turf/open/floor{
+ icon_state = "wood"
+ },
+/area/bigredv2/outside/bar)
"cBq" = (
/obj/structure/machinery/camera/autoname{
dir = 1
@@ -27562,6 +24453,23 @@
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/n)
+"cBC" = (
+/obj/item/trash/uscm_mre,
+/turf/open/floor{
+ icon_state = "dark"
+ },
+/area/bigredv2/outside/marshal_office)
+"cBI" = (
+/obj/structure/pipes/standard/manifold/hidden/green{
+ dir = 1
+ },
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/e)
+"cCd" = (
+/obj/structure/bed/chair,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor,
+/area/bigredv2/outside/general_offices)
"cCr" = (
/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
/turf/open/mars_cave{
@@ -27574,10 +24482,6 @@
icon_state = "mars_dirt_6"
},
/area/bigredv2/caves/mining)
-"cCN" = (
-/obj/effect/decal/cleanable/blood/drip,
-/turf/open/mars,
-/area/bigredv2/outside/n)
"cDx" = (
/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
dir = 1;
@@ -27588,52 +24492,25 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"cEG" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/trash/cigbutt{
- pixel_x = -9;
- pixel_y = -6
+"cFg" = (
+/obj/structure/mirror{
+ icon_state = "mirror_broke";
+ pixel_x = 30
},
-/obj/item/trash/cigbutt{
- pixel_x = 7;
- pixel_y = 7
+/obj/item/tool/soap/deluxe{
+ pixel_y = -7;
+ pixel_x = -9
},
/turf/open/floor{
- icon_state = "dark"
+ icon_state = "freezerfloor"
},
/area/bigredv2/outside/marshal_office)
-"cEI" = (
-/obj/item/trash/snack_bowl{
- pixel_y = 5;
- pixel_x = -8
- },
-/turf/open/floor{
- icon_state = "wood"
- },
-/area/bigredv2/outside/bar)
-"cET" = (
-/obj/effect/landmark/corpsespawner/scientist,
-/obj/effect/decal/cleanable/blood/gibs/body,
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
- },
-/area/bigredv2/outside/eta)
-"cFn" = (
-/obj/effect/decal/cleanable/blood,
-/obj/effect/decal/cleanable/blood/gibs/body,
-/turf/open/floor{
- icon_state = "wood"
- },
-/area/bigredv2/outside/general_offices)
-"cGc" = (
-/obj/structure/machinery/botany,
-/obj/item/seeds/goldappleseed,
-/turf/open/floor{
- icon_state = "white"
+"cFy" = (
+/obj/structure/flora/grass/desert/lightgrass_6,
+/turf/open/mars{
+ icon_state = "mars_dirt_12"
},
-/area/bigredv2/outside/marshal_office)
+/area/bigredv2/outside/w)
"cGi" = (
/obj/effect/decal/warning_stripes{
icon_state = "E";
@@ -27644,11 +24521,6 @@
icon_state = "red"
},
/area/bigredv2/outside/marshal_office)
-"cGK" = (
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
- },
-/area/bigredv2/outside/se)
"cGT" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/machinery/power/apc{
@@ -27666,6 +24538,15 @@
icon_state = "mars_cave_20"
},
/area/bigredv2/outside/lz1_north_cas)
+"cHc" = (
+/obj/item/stack/sheet/metal{
+ pixel_x = 3;
+ pixel_y = -11
+ },
+/turf/open/floor{
+ icon_state = "panelscorched"
+ },
+/area/bigredv2/outside/medical)
"cHn" = (
/turf/open/floor{
dir = 8;
@@ -27703,6 +24584,12 @@
icon_state = "wood"
},
/area/bigredv2/outside/dorms)
+"cIh" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/nw)
"cIP" = (
/obj/item/paper/bigred/smuggling,
/turf/open/floor,
@@ -27737,6 +24624,16 @@
icon_state = "mars_cave_13"
},
/area/bigredv2/caves/mining)
+"cJr" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/ammo_box/rounds/empty{
+ pixel_x = 3;
+ pixel_y = -6
+ },
+/obj/effect/decal/cleanable/blood/gibs/body,
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor,
+/area/bigredv2/outside/office_complex)
"cJA" = (
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_core,
/turf/open/mars_cave{
@@ -27763,6 +24660,16 @@
},
/turf/open/floor,
/area/bigredv2/outside/marshal_office)
+"cLA" = (
+/obj/effect/decal/cleanable/generic,
+/turf/open/asphalt/cement,
+/area/bigredv2/caves_lambda)
+"cLN" = (
+/obj/structure/fence,
+/turf/open/asphalt/cement{
+ icon_state = "cement4"
+ },
+/area/bigredv2/outside/filtration_cave_cas)
"cLZ" = (
/obj/structure/closet/secure_closet/brig,
/obj/effect/landmark/objective_landmark/close,
@@ -27770,15 +24677,6 @@
icon_state = "dark"
},
/area/bigredv2/outside/marshal_office)
-"cMu" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/trash/cigbutt{
- pixel_x = 4
- },
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
- },
-/area/bigredv2/outside/nw)
"cNb" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/machinery/light{
@@ -27788,19 +24686,31 @@
icon_state = "dark"
},
/area/bigredv2/outside/engineering)
-"cNg" = (
-/obj/structure/barricade/wooden{
- pixel_y = -4
+"cNl" = (
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached2"
},
+/area/bigredv2/outside/c)
+"cNG" = (
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor,
-/area/bigredv2/outside/general_offices)
+/turf/open/asphalt/cement{
+ icon_state = "cement12"
+ },
+/area/bigredv2/caves_lambda)
"cNH" = (
/obj/structure/pipes/standard/simple/hidden/green,
/turf/open/floor{
icon_state = "delivery"
},
/area/bigredv2/outside/bar)
+"cNV" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/shard,
+/turf/open/floor{
+ dir = 1;
+ icon_state = "whitepurplecorner"
+ },
+/area/bigredv2/outside/medical)
"cOa" = (
/obj/structure/bed/chair{
dir = 4
@@ -27811,18 +24721,20 @@
icon_state = "dark"
},
/area/bigredv2/outside/engineering)
+"cOk" = (
+/obj/item/reagent_container/glass/rag{
+ pixel_x = -9;
+ pixel_y = -7
+ },
+/turf/open/floor{
+ icon_state = "whitegreenfull"
+ },
+/area/bigredv2/outside/medical)
"cOl" = (
/turf/open/mars_cave{
icon_state = "mars_cave_18"
},
/area/bigredv2/caves_research)
-"cOs" = (
-/obj/effect/decal/cleanable/blood/drip,
-/turf/open/floor{
- dir = 4;
- icon_state = "asteroidwarning"
- },
-/area/bigredv2/outside/n)
"cOt" = (
/obj/structure/sign/poster/clf,
/turf/closed/wall/solaris/reinforced,
@@ -27833,12 +24745,6 @@
icon_state = "yellowfull"
},
/area/bigredv2/outside/hydroponics)
-"cOE" = (
-/obj/structure/flora/grass/desert/lightgrass_11,
-/turf/open/mars_cave{
- icon_state = "mars_dirt_4"
- },
-/area/bigredv2/outside/n)
"cOJ" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
@@ -27847,18 +24753,40 @@
icon_state = "delivery"
},
/area/bigredv2/caves/eta/research)
-"cOS" = (
-/obj/item/tool/wirecutters/clippers,
-/turf/open/floor{
- icon_state = "white"
- },
-/area/bigredv2/outside/marshal_office)
"cPg" = (
/obj/effect/landmark/crap_item,
/turf/open/mars_cave{
icon_state = "mars_cave_2"
},
/area/bigredv2/outside/n)
+"cPH" = (
+/obj/structure/sign/nosmoking_1{
+ pixel_x = -32
+ },
+/turf/open/floor{
+ dir = 8;
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
+"cPS" = (
+/obj/effect/decal/strata_decals/grime/grime3,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached4"
+ },
+/area/bigredv2/outside/nw)
+"cPW" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/barricade/wooden{
+ desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
+ dir = 8;
+ health = 25000;
+ pixel_y = 6;
+ pixel_x = 7
+ },
+/turf/open/floor{
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
"cPZ" = (
/obj/structure/window/framed/solaris/reinforced,
/obj/effect/decal/cleanable/dirt,
@@ -27876,6 +24804,20 @@
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/c)
+"cQF" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/bigredv2/outside/general_offices)
+"cQL" = (
+/obj/structure/bed,
+/obj/item/bedsheet/medical,
+/obj/item/prop/alien/hugger,
+/turf/open/floor{
+ dir = 8;
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
"cQO" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/machinery/light{
@@ -27883,13 +24825,6 @@
},
/turf/open/floor,
/area/bigredv2/outside/general_offices)
-"cQX" = (
-/obj/item/trash/cigbutt{
- pixel_x = -10;
- pixel_y = 16
- },
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/nw)
"cRb" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/machinery/camera/autoname{
@@ -27897,11 +24832,6 @@
},
/turf/open/floor,
/area/bigredv2/outside/cargo)
-"cRc" = (
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
- },
-/area/bigredv2/outside/se)
"cRP" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/blood/splatter,
@@ -27910,6 +24840,15 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
+"cRT" = (
+/obj/effect/decal/cleanable/blood/xeno,
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/c)
+"cRX" = (
+/obj/structure/flora/grass/desert/lightgrass_4,
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/mars,
+/area/bigredv2/outside/n)
"cSu" = (
/obj/structure/prop/invuln/minecart_tracks{
desc = "A heavy duty power cable for high voltage applications";
@@ -27925,12 +24864,78 @@
icon_state = "mars_dirt_7"
},
/area/bigredv2/caves/mining)
-"cUr" = (
-/obj/effect/decal/cleanable/blood/drip,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached3"
+"cSO" = (
+/obj/item/trash/cigbutt{
+ pixel_x = 1;
+ pixel_y = 5
},
-/area/bigredv2/outside/nw)
+/obj/item/trash/cigbutt{
+ pixel_x = -7;
+ pixel_y = 13
+ },
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidfloor"
+ },
+/area/bigredv2/outside/ne)
+"cTv" = (
+/obj/item/trash/crushed_cup{
+ pixel_x = -7;
+ pixel_y = -8
+ },
+/turf/open/floor{
+ dir = 4;
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/ne)
+"cTC" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating/plating_catwalk,
+/area/bigredv2/outside/space_port)
+"cTD" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/structure/machinery/door/airlock/almayer/maint/colony{
+ name = "\improper Dormitories EVA Maintenance";
+ welded = 1
+ },
+/turf/open/floor{
+ icon_state = "delivery"
+ },
+/area/bigredv2/outside/general_offices)
+"cTP" = (
+/obj/item/trash/cigbutt{
+ pixel_x = 1;
+ pixel_y = 5
+ },
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidfloor"
+ },
+/area/bigredv2/outside/c)
+"cUH" = (
+/obj/structure/surface/table,
+/obj/structure/pipes/vents/pump,
+/obj/item/device/flashlight/lamp{
+ pixel_y = 8;
+ pixel_x = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/item/ashtray/glass{
+ icon_state = "ashtray_half_gl";
+ pixel_x = -5
+ },
+/turf/open/floor{
+ icon_state = "white"
+ },
+/area/bigredv2/outside/medical)
+"cUO" = (
+/obj/structure/window/framed/solaris,
+/turf/open/floor{
+ icon_state = "white"
+ },
+/area/bigredv2/outside/medical)
"cVd" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
@@ -27943,12 +24948,6 @@
},
/turf/open/floor/plating,
/area/bigredv2/caves/mining)
-"cVF" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached1"
- },
-/area/bigredv2/outside/se)
"cVL" = (
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
@@ -27959,25 +24958,39 @@
"cVY" = (
/turf/open/mars,
/area/bigredv2/outside/space_port_lz2)
-"cWd" = (
-/obj/item/trash/cigbutt{
- pixel_x = -9;
- pixel_y = -6
- },
+"cWh" = (
+/obj/effect/decal/cleanable/dirt,
/turf/open/floor{
dir = 1;
- icon_state = "asteroidfloor"
- },
-/area/bigredv2/outside/ne)
-"cXr" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
+ icon_state = "whitegreencorner"
},
+/area/bigredv2/outside/medical)
+"cWi" = (
+/obj/effect/decal/cleanable/blood,
+/turf/open/mars,
+/area/bigredv2/outside/c)
+"cWH" = (
+/obj/structure/flora/grass/desert/lightgrass_5,
+/turf/open/mars,
+/area/bigredv2/outside/nw)
+"cXe" = (
/obj/effect/decal/cleanable/dirt,
+/obj/item/tool/weldingtool{
+ pixel_x = 2;
+ pixel_y = 10
+ },
/turf/open/floor{
- icon_state = "dark"
+ icon_state = "redcorner"
},
-/area/bigredv2/outside/general_offices)
+/area/bigredv2/outside/marshal_office)
+"cXf" = (
+/obj/effect/decal/cleanable/vomit{
+ icon_state = "vomit_4"
+ },
+/turf/open/floor{
+ icon_state = "wood"
+ },
+/area/bigredv2/outside/bar)
"cXG" = (
/obj/structure/machinery/light{
dir = 8
@@ -27986,13 +24999,31 @@
icon_state = "wood"
},
/area/bigredv2/outside/admin_building)
-"cYy" = (
-/obj/structure/pipes/standard/manifold/hidden/green{
- dir = 8
+"cYt" = (
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/mars_cave{
+ icon_state = "mars_cave_15"
},
+/area/bigredv2/outside/n)
+"cYz" = (
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/bigredv2/outside/bar)
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/item/tool/warning_cone{
+ pixel_x = -2;
+ pixel_y = 5
+ },
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached12"
+ },
+/area/bigredv2/outside/c)
+"cYG" = (
+/obj/effect/decal/cleanable/generic,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached1"
+ },
+/area/bigredv2/outside/c)
"cYI" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
@@ -28006,16 +25037,6 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/outside/lz2_west_cas)
-"cZc" = (
-/obj/effect/decal/cleanable/blood,
-/obj/item/stack/sheet/metal{
- amount = 3
- },
-/turf/open/floor/plating{
- dir = 8;
- icon_state = "platingdmg3"
- },
-/area/bigredv2/outside/medical)
"cZj" = (
/obj/structure/filingcabinet,
/obj/effect/landmark/objective_landmark/medium,
@@ -28033,16 +25054,6 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/caves_sw)
-"daz" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/effect/decal/cleanable/blood/xeno,
-/obj/effect/decal/cleanable/blood{
- icon_state = "xgib4"
- },
-/turf/open/floor,
-/area/bigredv2/outside/general_offices)
"daB" = (
/obj/structure/surface/table/reinforced,
/obj/structure/transmitter/colony_net/rotary{
@@ -28054,20 +25065,45 @@
icon_state = "whitepurple"
},
/area/bigredv2/caves/lambda/xenobiology)
+"daT" = (
+/obj/structure/pipes/standard/manifold/visible,
+/obj/effect/decal/medical_decals{
+ icon_state = "cryotop"
+ },
+/turf/open/floor{
+ dir = 5;
+ icon_state = "whitebluefull"
+ },
+/area/bigredv2/outside/medical)
"dbi" = (
/turf/closed/wall/solaris/reinforced/hull,
/area/bigredv2/outside/telecomm/lz2_cave)
-"dcu" = (
-/turf/open/asphalt/cement,
-/area/bigredv2/outside/lambda_cave_cas)
-"dde" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
+"dbF" = (
+/obj/effect/decal/strata_decals/grime/grime3,
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidwarning"
},
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached1"
+/area/bigredv2/outside/nw)
+"dbT" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood/gibs/limb,
+/turf/open/floor{
+ icon_state = "white"
},
-/area/bigredv2/outside/virology)
+/area/bigredv2/outside/medical)
+"dcq" = (
+/obj/effect/decal/remains/human,
+/turf/open/asphalt/cement{
+ icon_state = "cement15"
+ },
+/area/bigredv2/caves_lambda)
+"ddp" = (
+/turf/closed/wall/solaris{
+ damage = 1000;
+ damage_overlay = 3
+ },
+/area/bigredv2/outside/office_complex)
"ddt" = (
/obj/structure/machinery/light/small{
dir = 1
@@ -28076,47 +25112,99 @@
icon_state = "mars_cave_3"
},
/area/bigredv2/caves/mining)
-"deT" = (
-/obj/structure/bed/bedroll{
- dir = 10
+"ddw" = (
+/obj/effect/decal/cleanable/blood,
+/obj/item/shard/shrapnel/bone_chips,
+/turf/open/floor{
+ icon_state = "freezerfloor"
},
-/obj/item/weapon/baseballbat{
- pixel_x = -17;
- pixel_y = 10
+/area/bigredv2/outside/general_offices)
+"ddF" = (
+/obj/structure/flora/grass/desert/lightgrass_3,
+/turf/open/mars,
+/area/bigredv2/outside/space_port_lz2)
+"deg" = (
+/obj/item/reagent_container/glass/fertilizer/ez,
+/turf/open/floor{
+ icon_state = "white"
},
-/obj/item/prop/colony/usedbandage{
- dir = 9;
- pixel_x = 5;
- pixel_y = 15
+/area/bigredv2/outside/marshal_office)
+"deh" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/prop{
+ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
+ icon = 'icons/obj/janitor.dmi';
+ icon_state = "trashbag3";
+ name = "trash bag";
+ pixel_x = -6;
+ pixel_y = -4;
+ layer = 3.1
+ },
+/turf/open/floor/plating,
+/area/bigredv2/outside/bar)
+"deK" = (
+/obj/structure/flora/pottedplant{
+ icon_state = "pottedplant_22"
},
/turf/open/floor{
dir = 1;
- icon_state = "asteroidfloor"
+ icon_state = "whitegreencorner"
},
-/area/bigredv2/outside/nw)
-"dff" = (
+/area/bigredv2/outside/medical)
+"dfa" = (
+/obj/structure/bed/chair,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/drip,
/turf/open/floor{
- icon_state = "white"
+ dir = 1;
+ icon_state = "whitegreencorner"
},
/area/bigredv2/outside/medical)
-"dge" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
+"dfb" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached4"
+ },
+/area/bigredv2/outside/c)
+"dfp" = (
+/obj/item/stack/sheet/metal{
+ pixel_x = 4
},
+/turf/open/floor,
+/area/bigredv2/outside/office_complex)
+"dfq" = (
+/obj/effect/decal/cleanable/blood/drip,
/turf/open/floor{
dir = 6;
icon_state = "asteroidwarning"
},
-/area/bigredv2/outside/c)
-"dgn" = (
-/obj/effect/decal/cleanable/blood/xeno,
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
+/area/bigredv2/outside/n)
+"dfr" = (
+/obj/structure/surface/table,
+/obj/item/evidencebag{
+ pixel_y = 12
},
-/area/bigredv2/outside/c)
+/turf/open/floor,
+/area/bigredv2/outside/marshal_office)
+"dfB" = (
+/obj/structure/surface/table,
+/obj/effect/spawner/random/tool{
+ pixel_x = 4;
+ pixel_y = 13
+ },
+/turf/open/floor,
+/area/bigredv2/outside/dorms)
+"dfJ" = (
+/obj/item/tool/weldingtool{
+ pixel_x = 9;
+ pixel_y = 1
+ },
+/obj/structure/barricade/wooden{
+ dir = 8;
+ pixel_x = 2;
+ pixel_y = 6
+ },
+/turf/open/floor,
+/area/bigredv2/outside/general_offices)
"dgy" = (
/obj/structure/barricade/handrail/wire{
dir = 4
@@ -28125,24 +25213,44 @@
icon_state = "delivery"
},
/area/bigredv2/outside/c)
+"dgD" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/barricade/deployable{
+ dir = 4
+ },
+/turf/open/floor{
+ icon_state = "dark"
+ },
+/area/bigredv2/outside/marshal_office)
"dgH" = (
/turf/open/floor{
icon_state = "asteroidwarning"
},
/area/bigredv2/caves_north)
-"dgK" = (
-/obj/item/trash/uscm_mre,
-/turf/open/floor{
- icon_state = "dark"
+"dhi" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/item/prop{
+ desc = "A blood bag with a hole in it. The rats must have gotten to it first.";
+ icon = 'icons/obj/items/bloodpack.dmi';
+ icon_state = "bloodpack";
+ name = "blood bag";
+ pixel_x = -2;
+ pixel_y = 10
},
-/area/bigredv2/outside/marshal_office)
-"dht" = (
-/obj/effect/decal/cleanable/dirt,
/turf/open/floor{
- dir = 1;
- icon_state = "whitegreencorner"
+ dir = 4;
+ icon_state = "whitegreen"
},
/area/bigredv2/outside/medical)
+"dhq" = (
+/obj/item/trash/eat{
+ pixel_x = 12;
+ pixel_y = -13
+ },
+/turf/open/floor,
+/area/bigredv2/outside/hydroponics)
"dhN" = (
/obj/structure/window/framed/solaris,
/obj/structure/machinery/door/poddoor/almayer{
@@ -28176,54 +25284,46 @@
icon_state = "podhatchfloor"
},
/area/bigredv2/outside/admin_building)
-"djo" = (
-/obj/structure/surface/table/reinforced,
-/obj/structure/machinery/recharger,
-/obj/structure/blocker/forcefield/multitile_vehicles,
+"diU" = (
+/obj/structure/window_frame/solaris,
+/obj/item/stack/rods{
+ pixel_y = 4;
+ pixel_x = -13
+ },
+/obj/item/shard,
+/obj/effect/decal/cleanable/blood/xeno,
+/turf/open/floor/plating,
+/area/bigredv2/outside/medical)
+"djl" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached1"
+ },
+/area/bigredv2/outside/virology)
+"djY" = (
/obj/effect/decal/cleanable/dirt,
+/obj/structure/surface/rack,
+/obj/item/stack/sheet/mineral/uranium{
+ amount = 50;
+ pixel_x = 3
+ },
/turf/open/floor{
- dir = 9;
- icon_state = "redfull"
+ icon_state = "dark"
},
-/area/bigredv2/outside/lambda_cave_cas)
+/area/bigredv2/outside/general_offices)
"dka" = (
/obj/effect/landmark/crap_item,
/turf/open/mars_cave{
icon_state = "mars_dirt_4"
},
/area/bigredv2/outside/n)
-"dke" = (
-/obj/item/trash/sosjerky{
- pixel_x = -12;
- pixel_y = 17
- },
-/turf/open/mars_cave{
- icon_state = "mars_dirt_4"
- },
-/area/bigredv2/outside/nw)
-"dky" = (
+"dkW" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot{
- pixel_y = 9;
- pixel_x = -15
- },
/turf/open/floor{
- icon_state = "dark"
- },
-/area/bigredv2/outside/general_offices)
-"dkE" = (
-/obj/effect/acid_hole{
- dir = 4
- },
-/turf/closed/wall/solaris,
-/area/bigredv2/outside/medical)
-"dkT" = (
-/obj/structure/barricade/wooden{
- dir = 8;
- pixel_y = 12;
- pixel_x = 2
+ icon_state = "freezerfloor"
},
-/turf/open/floor,
/area/bigredv2/outside/general_offices)
"dkY" = (
/obj/structure/platform,
@@ -28233,47 +25333,44 @@
},
/area/bigredv2/outside/telecomm/n_cave)
"dlr" = (
-/obj/structure/flora/grass/desert/lightgrass_4,
-/turf/open/mars_cave{
- icon_state = "mars_dirt_4"
+/obj/structure/machinery/iv_drip,
+/obj/item/prop{
+ desc = "A blood bag with a hole in it. The rats must have gotten to it first.";
+ icon = 'icons/obj/items/bloodpack.dmi';
+ icon_state = "bloodpack";
+ name = "blood bag";
+ pixel_x = -5;
+ pixel_y = 2;
+ layer = 2.8
},
-/area/bigredv2/outside/n)
-"dmB" = (
-/obj/item/tool/pickaxe,
-/turf/open/mars,
-/area/bigredv2/outside/filtration_plant)
-"dmO" = (
-/obj/structure/machinery/fuelcell_recycler,
-/turf/open/floor/plating,
-/area/bigredv2/caves/eta/storage)
-"dnd" = (
/obj/effect/decal/cleanable/blood,
-/turf/open/mars{
- icon_state = "mars_dirt_11"
- },
-/area/bigredv2/outside/eta)
-"dnj" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached3"
- },
-/area/bigredv2/outside/nw)
-"dnv" = (
-/obj/structure/flora/bush/desert{
- icon_state = "tree_3"
+/turf/open/floor{
+ dir = 8;
+ icon_state = "whitegreen"
},
+/area/bigredv2/outside/medical)
+"dmB" = (
+/obj/item/tool/pickaxe,
/turf/open/mars,
-/area/bigredv2/caves_north)
-"dnN" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/obj/structure/barricade/wooden{
- dir = 8
+/area/bigredv2/outside/filtration_plant)
+"dmJ" = (
+/obj/item/trash/snack_bowl{
+ pixel_x = 1;
+ pixel_y = -12
},
-/obj/structure/machinery/cm_vending/sorted/medical/no_access{
- pixel_x = 12
+/turf/open/mars{
+ icon_state = "mars_dirt_10"
},
+/area/bigredv2/outside/virology)
+"dmO" = (
+/obj/structure/machinery/fuelcell_recycler,
+/turf/open/floor/plating,
+/area/bigredv2/caves/eta/storage)
+"dnC" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood/xtracks,
/turf/open/floor{
- icon_state = "white"
+ icon_state = "whitepurplefull"
},
/area/bigredv2/outside/medical)
"dnV" = (
@@ -28283,14 +25380,14 @@
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/filtration_plant)
-"doh" = (
-/obj/structure/prop/invuln/overhead_pipe{
- dir = 4;
- pixel_x = 27;
- pixel_y = 9
+"dor" = (
+/obj/effect/decal/strata_decals/grime/grime1{
+ dir = 4
},
-/turf/closed/wall/solaris,
-/area/bigredv2/outside/bar)
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached4"
+ },
+/area/bigredv2/outside/c)
"dot" = (
/obj/structure/barricade/wooden{
desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
@@ -28305,6 +25402,23 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/outside/filtration_cave_cas)
+"doE" = (
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/n)
+"doY" = (
+/obj/structure/flora/grass/desert/lightgrass_9,
+/turf/open/mars,
+/area/bigredv2/outside/n)
+"dpN" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/turf/open/floor{
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
"dqy" = (
/obj/structure/prop/invuln/minecart_tracks{
dir = 8
@@ -28313,12 +25427,54 @@
icon_state = "mars_dirt_7"
},
/area/bigredv2/caves/mining)
-"dqJ" = (
-/obj/effect/decal/cleanable/blood/drip,
-/turf/open/mars_cave{
- icon_state = "mars_dirt_4"
+"dqO" = (
+/obj/structure/sink{
+ dir = 8;
+ pixel_x = -12;
+ pixel_y = 2
},
-/area/bigredv2/outside/eta)
+/obj/structure/mirror{
+ pixel_x = -28
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor{
+ icon_state = "freezerfloor"
+ },
+/area/bigredv2/outside/dorms)
+"dqY" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/device/healthanalyzer{
+ pixel_y = 10;
+ pixel_x = 6
+ },
+/turf/open/floor{
+ icon_state = "whitegreencorner"
+ },
+/area/bigredv2/outside/medical)
+"drf" = (
+/obj/effect/decal/strata_decals/grime/grime1{
+ dir = 1
+ },
+/obj/effect/decal/strata_decals/grime/grime4,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached15"
+ },
+/area/bigredv2/outside/space_port_lz2)
+"drg" = (
+/obj/structure/largecrate/random/mini/small_case{
+ pixel_x = -7;
+ pixel_y = -4
+ },
+/obj/structure/largecrate/random/mini/small_case{
+ pixel_x = 8;
+ pixel_y = -3
+ },
+/obj/structure/largecrate/random/mini/small_case{
+ pixel_x = -1;
+ pixel_y = 4
+ },
+/turf/open/floor,
+/area/bigredv2/outside/general_offices)
"drq" = (
/obj/item/weapon/twohanded/folded_metal_chair,
/turf/open/mars_cave{
@@ -28340,6 +25496,17 @@
icon_state = "wood"
},
/area/bigredv2/outside/library)
+"drC" = (
+/obj/structure/pipes/standard/manifold/fourway/hidden/green,
+/turf/open/floor,
+/area/bigredv2/outside/marshal_office)
+"drM" = (
+/obj/structure/bed/stool,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor{
+ icon_state = "wood"
+ },
+/area/bigredv2/outside/bar)
"drT" = (
/obj/structure/disposalpipe/broken{
dir = 4
@@ -28348,20 +25515,6 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/caves/mining)
-"drX" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/turf/open/asphalt/cement,
-/area/bigredv2/caves_lambda)
-"drZ" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor{
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
"dsh" = (
/obj/effect/decal/cleanable/blood,
/obj/item/weapon/gun/pistol/m1911,
@@ -28390,6 +25543,16 @@
},
/turf/open/gm/river,
/area/bigredv2/outside/engineering)
+"dsU" = (
+/obj/item/trash/semki{
+ layer = 2;
+ pixel_x = -13;
+ pixel_y = 14
+ },
+/turf/open/mars_cave{
+ icon_state = "mars_dirt_4"
+ },
+/area/bigredv2/outside/w)
"dtf" = (
/obj/structure/prop/server_equipment/broken,
/turf/open/floor{
@@ -28397,12 +25560,6 @@
icon_state = "podhatch"
},
/area/bigredv2/caves/lambda/research)
-"dtz" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached1"
- },
-/area/bigredv2/outside/space_port_lz2)
"dtX" = (
/obj/structure/barricade/wooden{
desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
@@ -28443,6 +25600,20 @@
icon_state = "test_floor4"
},
/area/bigredv2/outside/engineering)
+"dwk" = (
+/obj/structure/bed/roller,
+/obj/effect/decal/cleanable/blood/xeno,
+/obj/structure/barricade/wooden{
+ dir = 1;
+ layer = 3.2;
+ pixel_x = 2;
+ pixel_y = -3
+ },
+/turf/open/floor{
+ dir = 8;
+ icon_state = "whitegreencorner"
+ },
+/area/bigredv2/outside/medical)
"dws" = (
/obj/effect/decal/warning_stripes{
icon_state = "NW-out";
@@ -28454,6 +25625,21 @@
icon_state = "warnplate"
},
/area/bigredv2/outside/telecomm/warehouse)
+"dwy" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached1"
+ },
+/area/bigredv2/outside/se)
+"dwJ" = (
+/obj/structure/machinery/light{
+ dir = 4
+ },
+/turf/open/floor{
+ dir = 10;
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/w)
"dwL" = (
/obj/structure/bed/chair{
buckling_y = 5;
@@ -28482,15 +25668,6 @@
"dyv" = (
/turf/open/mars,
/area/bigredv2/caves/eta/xenobiology)
-"dyG" = (
-/obj/effect/decal/cleanable/generic,
-/obj/effect/decal/cleanable/ash{
- pixel_y = 19
- },
-/turf/open/mars_cave{
- icon_state = "mars_cave_14"
- },
-/area/bigredv2/outside/nw)
"dyH" = (
/obj/structure/machinery/computer/area_atmos{
dir = 1
@@ -28501,19 +25678,13 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/engineering)
-"dzY" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/c)
-"dAd" = (
-/obj/structure/surface/table/reinforced,
-/obj/structure/machinery/recharger,
+"dzE" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor{
dir = 9;
- icon_state = "redfull"
+ icon_state = "asteroidwarning"
},
-/area/bigredv2/outside/lambda_cave_cas)
+/area/bigredv2/outside/s)
"dAi" = (
/obj/effect/landmark/objective_landmark/close,
/turf/open/floor/plating,
@@ -28542,15 +25713,29 @@
},
/area/bigredv2/outside/admin_building)
"dBu" = (
-/obj/item/stack/sheet/cardboard{
- pixel_x = 8;
- pixel_y = -1
+/obj/item/stack/sheet/wood{
+ layer = 2.7;
+ pixel_x = -13
+ },
+/obj/item/stack/rods{
+ pixel_y = 11;
+ pixel_x = -11
},
/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
+ dir = 10;
+ icon_state = "whitegreen"
},
-/area/bigredv2/outside/ne)
+/area/bigredv2/outside/medical)
+"dBw" = (
+/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
+ name = "\improper Bar";
+ density = 0;
+ icon_state = "door_open"
+ },
+/turf/open/floor{
+ icon_state = "delivery"
+ },
+/area/bigredv2/outside/bar)
"dBE" = (
/obj/item/trash/cigbutt/cigarbutt{
pixel_x = 2;
@@ -28567,6 +25752,17 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
+"dBG" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/item/ammo_casing/bullet,
+/obj/item/ammo_casing/bullet,
+/turf/open/floor{
+ dir = 4;
+ icon_state = "redcorner"
+ },
+/area/bigredv2/outside/marshal_office)
"dBU" = (
/obj/structure/barricade/handrail{
dir = 1;
@@ -28594,26 +25790,16 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"dCg" = (
-/obj/item/prop{
- desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
- icon = 'icons/obj/janitor.dmi';
- icon_state = "trashbag3";
- name = "trash bag";
- pixel_x = -8;
- pixel_y = -4
- },
-/obj/effect/decal/cleanable/generic,
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
- },
-/area/bigredv2/outside/ne)
"dCA" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/weapon/twohanded/folded_metal_chair,
/turf/open/floor/plating,
/area/bigredv2/caves/mining)
+"dCC" = (
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached14"
+ },
+/area/bigredv2/outside/nw)
"dCU" = (
/obj/structure/cargo_container/horizontal/blue/middle,
/turf/open/mars,
@@ -28631,19 +25817,31 @@
icon_state = "mars_cave_7"
},
/area/bigredv2/caves_se)
-"dEE" = (
-/obj/structure/flora/grass/desert/lightgrass_8,
-/turf/open/mars,
+"dEL" = (
+/obj/structure/barricade/wooden,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached4"
+ },
/area/bigredv2/outside/c)
"dEV" = (
/turf/open/mars_cave{
icon_state = "mars_dirt_7"
},
/area/bigredv2/outside/lz2_south_cas)
-"dFf" = (
-/obj/structure/flora/grass/desert/lightgrass_3,
-/turf/open/mars,
-/area/bigredv2/outside/ne)
+"dFi" = (
+/obj/item/trash/cheesie{
+ pixel_y = -4
+ },
+/turf/open/floor{
+ icon_state = "wood"
+ },
+/area/bigredv2/outside/bar)
+"dFu" = (
+/obj/effect/decal/strata_decals/grime/grime3,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached1"
+ },
+/area/bigredv2/outside/space_port_lz2)
"dFz" = (
/obj/item/tool/pickaxe{
pixel_x = -18;
@@ -28656,15 +25854,18 @@
icon_state = "mars_dirt_4"
},
/area/bigredv2/caves/mining)
-"dFL" = (
-/obj/effect/landmark/corpsespawner/security,
-/obj/effect/decal/cleanable/blood{
- layer = 3
+"dFE" = (
+/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
+ name = "\improper Marshal Office";
+ welded = 1;
+ dir = 2;
+ density = 0;
+ icon_state = "door_open"
},
-/obj/effect/decal/cleanable/blood/gibs/body,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor,
-/area/bigredv2/outside/lambda_cave_cas)
+/turf/open/floor{
+ icon_state = "delivery"
+ },
+/area/bigredv2/outside/marshal_office)
"dFR" = (
/obj/item/stack/sheet/wood{
pixel_y = -8
@@ -28673,20 +25874,18 @@
icon_state = "mars_cave_16"
},
/area/bigredv2/caves/mining)
-"dHb" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement{
- icon_state = "cement1"
+"dGe" = (
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached14"
},
-/area/bigredv2/caves_lambda)
-"dHq" = (
-/obj/effect/landmark/corpsespawner/scientist,
-/obj/effect/decal/cleanable/blood/gibs/body,
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor{
- icon_state = "asteroidwarning"
+/area/bigredv2/outside/s)
+"dGM" = (
+/obj/structure/flora/grass/desert/lightgrass_12,
+/obj/structure/flora/bush/desert{
+ icon_state = "tree_3"
},
-/area/bigredv2/outside/eta)
+/turf/open/mars,
+/area/bigredv2/outside/s)
"dHr" = (
/obj/effect/decal/cleanable/blood{
icon_state = "gib6";
@@ -28694,25 +25893,33 @@
},
/turf/open/mars_cave,
/area/bigredv2/caves/mining)
-"dHC" = (
-/obj/item/trash/sosjerky{
- pixel_x = -12;
- pixel_y = 17
- },
-/turf/open/floor{
- icon_state = "dark"
+"dHv" = (
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached4"
},
-/area/bigredv2/outside/marshal_office)
+/area/bigredv2/outside/space_port_lz2)
"dHH" = (
/obj/effect/landmark/crap_item,
/turf/open/mars_cave{
icon_state = "mars_cave_2"
},
/area/bigredv2/caves/mining)
-"dHW" = (
-/obj/structure/flora/grass/desert/lightgrass_12,
-/turf/open/mars,
-/area/bigredv2/outside/sw)
+"dHS" = (
+/obj/effect/decal/cleanable/vomit{
+ icon_state = "vomit_2"
+ },
+/obj/item/reagent_container/food/drinks/bottle/beer/craft/mono{
+ pixel_x = -11;
+ pixel_y = 8
+ },
+/obj/item/reagent_container/food/drinks/bottle/beer/craft/partypopper{
+ pixel_x = 17;
+ pixel_y = 16
+ },
+/turf/open/floor{
+ icon_state = "wood"
+ },
+/area/bigredv2/outside/bar)
"dIb" = (
/turf/open/floor,
/area/bigredv2/caves)
@@ -28721,6 +25928,14 @@
icon_state = "mars_cave_8"
},
/area/bigredv2/caves_virology)
+"dID" = (
+/obj/effect/decal/strata_decals/grime/grime2{
+ dir = 4
+ },
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached3"
+ },
+/area/bigredv2/outside/s)
"dIG" = (
/obj/structure/machinery/light{
dir = 8
@@ -28745,18 +25960,26 @@
icon_state = "asteroidfloor"
},
/area/bigredv2/outside/space_port_lz2)
+"dJb" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor{
+ dir = 6;
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/se)
"dJc" = (
/obj/structure/surface/table,
/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
/turf/open/floor,
/area/bigredv2/outside/dorms)
-"dJr" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
-/turf/open/asphalt/cement{
- icon_state = "cement9"
+"dJF" = (
+/obj/effect/decal/strata_decals/grime/grime2{
+ dir = 8
},
-/area/bigredv2/caves_lambda)
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached1"
+ },
+/area/bigredv2/outside/nw)
"dJM" = (
/obj/structure/surface/rack,
/obj/item/storage/pouch/shotgun,
@@ -28766,16 +25989,23 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"dKk" = (
-/obj/effect/decal/cleanable/blood{
- layer = 3
+"dJT" = (
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached15"
+ },
+/area/bigredv2/outside/nw)
+"dKd" = (
+/obj/structure/surface/table,
+/obj/effect/decal/cleanable/blood,
+/obj/effect/decal/cleanable/blood/gibs/limb,
+/obj/item/tool/kitchen/knife/butcher{
+ pixel_x = -4;
+ pixel_y = -10
},
-/obj/effect/decal/cleanable/dirt,
/turf/open/floor{
- dir = 8;
- icon_state = "redcorner"
+ icon_state = "wood"
},
-/area/bigredv2/outside/lambda_cave_cas)
+/area/bigredv2/outside/general_offices)
"dKo" = (
/obj/item/ore/iron{
pixel_x = 6;
@@ -28788,6 +26018,23 @@
/obj/item/ore/iron,
/turf/open/floor/plating,
/area/bigredv2/caves/mining)
+"dKF" = (
+/obj/structure/machinery/light{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor,
+/area/bigredv2/outside/general_offices)
+"dKQ" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/medical_decals{
+ icon_state = "triagedecalbottom"
+ },
+/turf/open/floor{
+ dir = 10;
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
"dKR" = (
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest,
/obj/effect/landmark/structure_spawner/setup/distress/xeno_nest,
@@ -28795,6 +26042,12 @@
icon_state = "mars_cave_5"
},
/area/bigredv2/caves_lambda)
+"dLq" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor{
+ icon_state = "wood"
+ },
+/area/bigredv2/outside/general_offices)
"dLS" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/flora/pottedplant{
@@ -28809,15 +26062,21 @@
icon_state = "wood"
},
/area/bigredv2/outside/library)
-"dNb" = (
-/obj/item/tool/warning_cone{
- pixel_x = -14;
- pixel_y = 10
+"dLV" = (
+/obj/effect/decal/medical_decals{
+ icon_state = "triagedecalleft"
},
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
+/turf/open/floor{
+ icon_state = "whitegreen"
},
-/area/bigredv2/outside/c)
+/area/bigredv2/outside/medical)
+"dMu" = (
+/obj/structure/bed/chair{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor,
+/area/bigredv2/outside/lambda_cave_cas)
"dNd" = (
/obj/item/stack/cable_coil/cut,
/turf/open/mars_cave{
@@ -28842,19 +26101,6 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"dNL" = (
-/obj/structure/machinery/light{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor{
- icon_state = "wood"
- },
-/area/bigredv2/outside/general_offices)
-"dNN" = (
-/obj/structure/flora/grass/desert/lightgrass_6,
-/turf/open/mars,
-/area/bigredv2/outside/n)
"dNX" = (
/obj/effect/landmark/crap_item,
/turf/open/floor/carpet,
@@ -28871,33 +26117,11 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"dOw" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/trash/cigbutt{
- pixel_x = -10;
- pixel_y = 16
- },
-/turf/open/floor{
- icon_state = "asteroidwarning"
- },
-/area/bigredv2/outside/c)
-"dOL" = (
-/obj/effect/decal/strata_decals/grime/grime1{
- dir = 4
- },
-/obj/effect/decal/cleanable/generic,
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
- },
-/area/bigredv2/outside/nw)
-"dOV" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
+"dOF" = (
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached2"
},
-/turf/open/asphalt/cement,
-/area/bigredv2/outside/lambda_cave_cas)
+/area/bigredv2/outside/virology)
"dOZ" = (
/obj/effect/landmark/crap_item,
/turf/open/mars_cave{
@@ -28910,6 +26134,34 @@
icon_state = "mars_cave_15"
},
/area/bigredv2/caves/mining)
+"dPe" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/turf/open/floor{
+ dir = 9;
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
+"dPm" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/item/weapon/gun/revolver/small{
+ pixel_x = -11;
+ pixel_y = 13
+ },
+/turf/open/floor,
+/area/bigredv2/outside/marshal_office)
+"dPn" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/stack/sheet/metal{
+ pixel_x = 1;
+ pixel_y = -2
+ },
+/turf/open/floor,
+/area/bigredv2/outside/general_offices)
"dPs" = (
/obj/effect/landmark/monkey_spawn,
/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
@@ -28927,43 +26179,9 @@
icon_state = "mars_cave_23"
},
/area/bigredv2/caves/mining)
-"dPF" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/bigredv2/outside/bar)
-"dPI" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/obj/structure/barricade/wooden,
-/turf/open/floor{
- dir = 1;
- icon_state = "whitegreencorner"
- },
-/area/bigredv2/outside/medical)
"dPJ" = (
/turf/closed/wall/r_wall/unmeltable,
/area/bigredv2/outside/c)
-"dPP" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/stack/sheet/cardboard{
- pixel_x = -6;
- pixel_y = -2
- },
-/obj/item/reagent_container/food/drinks/bottle/beer/craft{
- pixel_x = 7;
- pixel_y = -7
- },
-/obj/effect/decal/cleanable/generic,
-/turf/open/floor/plating,
-/area/bigredv2/outside/bar)
-"dQi" = (
-/obj/effect/decal/strata_decals/grime/grime3,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
- },
-/area/bigredv2/outside/nw)
"dQw" = (
/obj/structure/blocker/forcefield/multitile_vehicles,
/turf/open/mars_cave{
@@ -28997,6 +26215,17 @@
icon_state = "delivery"
},
/area/bigredv2/outside/lambda_cave_cas)
+"dRs" = (
+/obj/effect/decal/cleanable/vomit,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached4"
+ },
+/area/bigredv2/outside/nw)
+"dRZ" = (
+/obj/effect/landmark/hunter_primary,
+/obj/structure/flora/grass/desert/lightgrass_7,
+/turf/open/mars,
+/area/bigredv2/outside/n)
"dSg" = (
/obj/effect/landmark/crap_item,
/obj/effect/decal/cleanable/dirt,
@@ -29005,33 +26234,29 @@
},
/turf/open/floor/plating,
/area/bigredv2/caves/mining)
-"dSL" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement{
- icon_state = "cement4"
- },
-/area/bigredv2/caves_lambda)
"dTi" = (
/obj/item/stack/sheet/wood,
/turf/open/mars_cave{
icon_state = "mars_cave_9"
},
/area/bigredv2/caves_north)
+"dTx" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/tool/plantspray/weeds,
+/turf/open/floor{
+ icon_state = "white"
+ },
+/area/bigredv2/outside/marshal_office)
"dTB" = (
/turf/closed/wall/solaris/reinforced,
/area/bigredv2/outside/lambda_cave_cas)
-"dTJ" = (
-/obj/item/trash/eat{
- pixel_x = 2;
- pixel_y = 10
- },
+"dTX" = (
+/obj/structure/machinery/landinglight/ds1/delayone,
+/obj/effect/decal/cleanable/dirt,
/turf/open/floor{
- icon_state = "wood"
+ icon_state = "asteroidwarning"
},
-/area/bigredv2/outside/bar)
+/area/bigredv2/outside/space_port)
"dUj" = (
/obj/effect/decal/cleanable/blood/drip{
pixel_x = -8;
@@ -29041,6 +26266,23 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/caves/mining)
+"dUv" = (
+/obj/structure/machinery/light{
+ dir = 8
+ },
+/obj/structure/surface/table,
+/obj/item/storage/box/m94{
+ pixel_x = 5;
+ pixel_y = 3
+ },
+/obj/structure/pipes/vents/pump{
+ dir = 1
+ },
+/turf/open/floor{
+ dir = 4;
+ icon_state = "whiteyellowfull"
+ },
+/area/bigredv2/outside/office_complex)
"dUz" = (
/obj/effect/landmark/corpsespawner/miner,
/obj/effect/decal/cleanable/blood/splatter,
@@ -29048,6 +26290,28 @@
icon_state = "mars_cave_6"
},
/area/bigredv2/caves/mining)
+"dUC" = (
+/turf/open/floor{
+ dir = 10;
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/caves_lambda)
+"dUY" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/clothing/suit/armor/riot{
+ pixel_y = 5;
+ pixel_x = 7
+ },
+/turf/open/floor{
+ icon_state = "dark"
+ },
+/area/bigredv2/outside/marshal_office)
+"dVf" = (
+/obj/structure/flora/grass/desert/lightgrass_1,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached12"
+ },
+/area/bigredv2/outside/c)
"dVp" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -29084,6 +26348,14 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/engineering)
+"dXq" = (
+/obj/effect/decal/cleanable/ash{
+ pixel_y = -21
+ },
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached4"
+ },
+/area/bigredv2/outside/nw)
"dXs" = (
/obj/item/tool/pickaxe{
pixel_y = 12
@@ -29093,48 +26365,35 @@
icon_state = "mars_dirt_5"
},
/area/bigredv2/caves/mining)
-"dXu" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/obj/structure/blocker/forcefield/multitile_vehicles,
-/obj/effect/landmark/corpsespawner/scientist,
-/obj/effect/decal/cleanable/blood/gibs/body,
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
+"dXD" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/trash/crushed_cup{
+ pixel_x = 3;
+ pixel_y = 14
},
-/area/bigredv2/outside/eta)
+/obj/structure/largecrate/random/barrel/red{
+ pixel_y = -1;
+ pixel_x = 3
+ },
+/obj/effect/decal/cleanable/generic,
+/obj/effect/decal/cleanable/cobweb2,
+/turf/open/floor/plating,
+/area/bigredv2/outside/bar)
"dXK" = (
/turf/open/mars_cave{
icon_state = "mars_cave_13"
},
/area/bigredv2/outside/n)
-"dYj" = (
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached1"
- },
-/area/bigredv2/outside/nw)
-"dYs" = (
-/obj/item/stack/rods{
- pixel_y = -2
- },
-/turf/open/floor{
- icon_state = "redcorner"
- },
-/area/bigredv2/outside/marshal_office)
-"dYw" = (
-/obj/structure/bed/stool,
+"dYn" = (
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor{
- icon_state = "wood"
- },
-/area/bigredv2/outside/bar)
-"dZm" = (
-/obj/effect/decal/strata_decals/grime/grime3,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
+/turf/open/asphalt/cement,
+/area/bigredv2/outside/filtration_cave_cas)
+"dYB" = (
+/obj/effect/decal/remains/human,
+/turf/open/asphalt/cement{
+ icon_state = "cement2"
},
-/area/bigredv2/outside/c)
+/area/bigredv2/outside/lambda_cave_cas)
"dZO" = (
/obj/effect/decal/cleanable/blood{
dir = 8;
@@ -29147,12 +26406,22 @@
icon_state = "mars_cave_14"
},
/area/bigredv2/caves/mining)
-"ear" = (
-/obj/effect/decal/cleanable/blood/drip,
+"eal" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/surface/table,
+/turf/open/floor,
+/area/bigredv2/outside/marshal_office)
+"eao" = (
+/obj/item/stack/sheet/wood,
+/obj/effect/decal/cleanable/blood,
/turf/open/floor{
- icon_state = "white"
+ icon_state = "dark"
},
-/area/bigredv2/outside/medical)
+/area/bigredv2/outside/general_offices)
+"eaQ" = (
+/obj/structure/flora/grass/desert/lightgrass_5,
+/turf/open/mars,
+/area/bigredv2/outside/space_port_lz2)
"eaW" = (
/obj/structure/disposalpipe/segment,
/obj/item/frame/rack,
@@ -29181,47 +26450,31 @@
icon_state = "darkyellowcorners2"
},
/area/bigredv2/outside/engineering)
-"ebG" = (
+"ebP" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/tool/weldingtool{
- pixel_x = 2;
- pixel_y = 10
- },
+/obj/item/bodybag,
/turf/open/floor{
- icon_state = "redcorner"
- },
-/area/bigredv2/outside/marshal_office)
-"ebH" = (
-/obj/effect/decal/cleanable/blood/gibs/robot{
- pixel_y = 7;
- pixel_x = -4;
- name = "door debris"
+ icon_state = "white"
},
-/obj/effect/decal/cleanable/blood/oil,
-/obj/item/stack/rods,
+/area/bigredv2/outside/medical)
+"ebR" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/ammo_casing/bullet,
+/obj/effect/decal/cleanable/blood/drip,
/turf/open/floor{
- icon_state = "delivery"
+ icon_state = "dark"
},
-/area/bigredv2/outside/office_complex)
+/area/bigredv2/outside/general_offices)
"ebZ" = (
/turf/open/floor{
icon_state = "darkgreencorners2"
},
/area/bigredv2/caves/eta/storage)
-"ech" = (
-/obj/structure/flora/grass/desert/lightgrass_3,
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/nw)
"eci" = (
/turf/open/mars_cave{
icon_state = "mars_cave_11"
},
/area/bigredv2/outside/lz1_telecomm_cas)
-"ecm" = (
-/turf/open/gm/river/desert/deep{
- icon = 'icons/turf/floors/desert_water_toxic.dmi'
- },
-/area/bigredv2/outside/c)
"ecy" = (
/obj/structure/prop/invuln/minecart_tracks{
desc = "A heavy duty power cable for high voltage applications";
@@ -29252,19 +26505,30 @@
icon_state = "asteroidfloor"
},
/area/bigred/ground/garage_workshop)
-"eet" = (
-/obj/item/trash/cigbutt{
- pixel_x = -6;
+"edm" = (
+/obj/item/trash/pistachios{
+ pixel_x = -11;
pixel_y = -9
},
-/obj/item/trash/cigbutt{
- pixel_x = 4
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached1"
+ },
+/area/bigredv2/outside/virology)
+"edv" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached12"
},
+/area/bigredv2/outside/c)
+"edC" = (
+/obj/structure/surface/table,
+/obj/structure/machinery/camera/autoname,
+/obj/item/ammo_magazine/shotgun/slugs,
/turf/open/floor{
- dir = 1;
- icon_state = "asteroidwarning"
+ icon_state = "dark"
},
-/area/bigredv2/outside/n)
+/area/bigredv2/outside/marshal_office)
"eeI" = (
/obj/structure/machinery/light,
/obj/structure/window{
@@ -29279,49 +26543,12 @@
icon_state = "wood"
},
/area/bigredv2/outside/library)
-"efC" = (
-/obj/structure/flora/grass/desert/lightgrass_3,
-/turf/open/mars,
-/area/bigredv2/outside/nw)
-"efK" = (
-/obj/structure/machinery/computer/crew{
- density = 0;
- pixel_y = 16
- },
-/obj/item/reagent_container/pill/happy,
-/turf/open/floor{
- icon_state = "whitegreenfull"
- },
-/area/bigredv2/outside/medical)
-"efX" = (
-/obj/structure/barricade/wooden{
- desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
- dir = 4;
- health = 25000
- },
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached2"
- },
-/area/bigredv2/outside/c)
-"egf" = (
+"efv" = (
+/obj/effect/decal/cleanable/dirt,
/turf/open/asphalt/cement_sunbleached{
icon_state = "cement_sunbleached1"
},
-/area/bigredv2/outside/virology)
-"egg" = (
-/obj/structure/barricade/deployable,
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
- },
-/area/bigredv2/outside/nw)
-"egk" = (
-/obj/structure/girder/reinforced,
-/turf/open/floor/plating{
- dir = 8;
- icon_state = "platingdmg2"
- },
-/area/bigredv2/outside/space_port)
+/area/bigredv2/outside/s)
"egI" = (
/obj/item/ore,
/obj/item/ore{
@@ -29344,30 +26571,52 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/plating,
/area/bigredv2/caves/mining)
-"ehp" = (
-/obj/structure/barricade/deployable,
-/turf/open/mars,
-/area/bigredv2/outside/c)
+"ehT" = (
+/obj/item/trash/cigbutt{
+ pixel_x = -10;
+ pixel_y = 13
+ },
+/obj/item/trash/cigbutt{
+ icon_state = "ucigbutt";
+ pixel_x = 2;
+ pixel_y = 8
+ },
+/obj/item/trash/cigbutt{
+ pixel_x = -6;
+ pixel_y = -9
+ },
+/turf/open/floor{
+ dir = 8;
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/nw)
"ehW" = (
-/obj/structure/surface/table,
-/obj/item/reagent_container/food/snacks/packaged_burrito{
- pixel_x = 5;
- pixel_y = 9
+/obj/item/clothing/under/lightbrown{
+ pixel_x = -7;
+ pixel_y = -4
+ },
+/turf/open/floor{
+ icon_state = "freezerfloor"
},
-/turf/open/floor,
/area/bigredv2/outside/general_offices)
-"eiw" = (
+"eiU" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
},
-/obj/effect/decal/medical_decals{
- icon_state = "cryocell2deval"
- },
+/obj/item/shard/shrapnel/bone_chips,
/turf/open/floor{
- dir = 5;
- icon_state = "whitebluefull"
+ icon_state = "freezerfloor"
},
-/area/bigredv2/outside/medical)
+/area/bigredv2/outside/general_offices)
+"ejh" = (
+/obj/structure/machinery/light{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached17"
+ },
+/area/bigredv2/outside/virology)
"ejp" = (
/obj/effect/landmark/nightmare{
insert_tag = "filtration_restored"
@@ -29385,14 +26634,14 @@
icon_state = "mars_dirt_7"
},
/area/bigredv2/caves/mining)
-"ejP" = (
-/turf/closed/wall/solaris,
-/area/bigredv2/outside/se)
-"eke" = (
+"ejx" = (
/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached15"
+ icon_state = "cement_sunbleached3"
},
/area/bigredv2/outside/se)
+"ejP" = (
+/turf/closed/wall/solaris,
+/area/bigredv2/outside/se)
"ekV" = (
/obj/effect/decal/cleanable/blood{
dir = 8;
@@ -29419,6 +26668,14 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/caves/mining)
+"elt" = (
+/obj/effect/decal/cleanable/vomit{
+ icon_state = "vomit_4"
+ },
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached12"
+ },
+/area/bigredv2/outside/c)
"elM" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
@@ -29428,13 +26685,22 @@
icon_state = "darkyellowcorners2"
},
/area/bigredv2/caves/eta/living)
-"eme" = (
-/obj/structure/pipes/standard/simple/hidden/green,
+"eml" = (
+/obj/structure/pipes/vents/pump,
/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached1"
+/turf/open/floor{
+ icon_state = "wood"
},
-/area/bigredv2/outside/nw)
+/area/bigredv2/outside/bar)
+"emB" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/structure/bed/chair/wood/normal,
+/turf/open/floor{
+ icon_state = "wood"
+ },
+/area/bigredv2/outside/bar)
"emC" = (
/obj/effect/decal/cleanable/ash,
/turf/open/floor/plating{
@@ -29442,6 +26708,14 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
+"emD" = (
+/obj/structure/bed,
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor{
+ dir = 10;
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
"ene" = (
/obj/structure/surface/table,
/obj/item/reagent_container/food/drinks/cans/souto/diet/blue{
@@ -29451,6 +26725,16 @@
/obj/item/reagent_container/food/snacks/cookie,
/turf/open/mars_cave,
/area/bigredv2/caves/mining)
+"enl" = (
+/obj/structure/platform/kutjevo/rock,
+/obj/item/trash/used_stasis_bag{
+ pixel_y = 8;
+ pixel_x = 9
+ },
+/turf/open/mars_cave{
+ icon_state = "mars_cave_9"
+ },
+/area/bigredv2/outside/nw)
"enD" = (
/obj/item/trash/cigbutt/ucigbutt,
/obj/item/trash/cigbutt/cigarbutt{
@@ -29474,40 +26758,24 @@
icon_state = "delivery"
},
/area/bigredv2/outside/dorms)
-"eoB" = (
-/obj/effect/decal/cleanable/blood/xeno,
-/turf/open/floor{
- icon_state = "dark"
- },
-/area/bigredv2/outside/general_offices)
"eoU" = (
/turf/open/floor/almayer{
dir = 1;
icon_state = "w-y2"
},
/area/bigredv2/outside/admin_building)
+"epa" = (
+/obj/structure/flora/grass/desert/lightgrass_2,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached2"
+ },
+/area/bigredv2/outside/nw)
"epe" = (
/turf/open/floor{
dir = 1;
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/eta)
-"eps" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/e)
-"epw" = (
-/obj/structure/flora/grass/desert/lightgrass_6,
-/turf/open/mars,
-/area/bigredv2/outside/nw)
-"epE" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/drip,
-/turf/open/floor{
- dir = 8;
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
"eql" = (
/turf/open/mars_cave{
icon_state = "mars_cave_9"
@@ -29522,21 +26790,15 @@
icon_state = "delivery"
},
/area/bigredv2/outside/dorms)
-"eqX" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/trash/buritto{
- pixel_y = 12;
- pixel_x = -7
+"erm" = (
+/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot{
+ pixel_y = 8;
+ pixel_x = -2
},
-/obj/item/stack/tile/plasteel{
- pixel_x = 16
+/turf/open/floor{
+ icon_state = "wood"
},
-/turf/open/floor/plating,
-/area/bigredv2/outside/medical)
-"eri" = (
-/turf/open/floor/plating/plating_catwalk,
-/area/bigredv2/outside/space_port)
+/area/bigredv2/outside/dorms)
"erA" = (
/obj/item/ore,
/turf/open/mars_cave{
@@ -29551,23 +26813,32 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"erJ" = (
-/obj/effect/decal/cleanable/blood/drip,
-/turf/open/floor{
- dir = 8;
- icon_state = "asteroidwarning"
+"erQ" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/trash/plate{
+ pixel_x = -13;
+ pixel_y = 12
},
-/area/bigredv2/outside/eta)
-"erV" = (
-/obj/structure/flora/grass/desert/lightgrass_8,
-/turf/open/mars,
-/area/bigredv2/outside/e)
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached3"
+ },
+/area/bigredv2/outside/space_port_lz2)
"erX" = (
/obj/structure/machinery/light/small,
/turf/open/mars_cave{
icon_state = "mars_cave_20"
},
/area/bigredv2/caves/mining)
+"esn" = (
+/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
+ dir = 1;
+ name = "\improper Dormitories";
+ welded = 1
+ },
+/turf/open/floor{
+ icon_state = "delivery"
+ },
+/area/bigredv2/outside/dorms)
"esS" = (
/obj/structure/machinery/light{
dir = 4
@@ -29577,30 +26848,21 @@
icon_state = "wood"
},
/area/bigredv2/outside/library)
-"etc" = (
-/obj/effect/decal/cleanable/vomit{
- icon_state = "vomit_2"
- },
-/obj/item/reagent_container/food/drinks/bottle/beer/craft/mono{
- pixel_x = -11;
- pixel_y = 8
- },
-/obj/item/reagent_container/food/drinks/bottle/beer/craft/partypopper{
- pixel_x = 17;
- pixel_y = 16
+"etf" = (
+/obj/item/weapon/shield/riot{
+ pixel_x = -3;
+ pixel_y = -7
},
/turf/open/floor{
- icon_state = "wood"
- },
-/area/bigredv2/outside/bar)
-"euf" = (
-/obj/effect/decal/cleanable/vomit{
- icon_state = "vomit_4"
+ icon_state = "dark"
},
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
+/area/bigredv2/outside/marshal_office)
+"etv" = (
+/obj/structure/flora/bush/desert{
+ icon_state = "tree_3"
},
-/area/bigredv2/outside/c)
+/turf/open/mars,
+/area/bigredv2/outside/space_port_lz2)
"eup" = (
/obj/structure/bed/chair,
/obj/item/trash/cigbutt,
@@ -29630,6 +26892,17 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/caves_sw)
+"evr" = (
+/obj/structure/machinery/light{
+ dir = 8
+ },
+/obj/structure/bed/chair{
+ dir = 4
+ },
+/turf/open/floor{
+ icon_state = "white"
+ },
+/area/bigredv2/outside/marshal_office)
"evA" = (
/obj/structure/platform_decoration/shiva{
dir = 8
@@ -29639,16 +26912,36 @@
icon_state = "bcircuitoff"
},
/area/bigredv2/caves/lambda/research)
-"evB" = (
-/obj/effect/decal/strata_decals/grime/grime4,
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/w)
+"evW" = (
+/obj/item/prop{
+ icon = 'icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi';
+ icon_state = "m41ae2";
+ name = "M41AE2 Heavy Pulse Rifle";
+ desc = "A large claw mark across this weapon indicates it is inoperable.";
+ pixel_x = 4;
+ pixel_y = 7
+ },
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor,
+/area/bigredv2/outside/office_complex)
"evX" = (
/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
/turf/open/mars_cave{
icon_state = "mars_cave_2"
},
/area/bigredv2/caves/mining)
+"ewb" = (
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached19"
+ },
+/area/bigredv2/outside/virology)
+"ewr" = (
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/n)
"ewv" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/curtain/red,
@@ -29656,41 +26949,48 @@
icon_state = "freezerfloor"
},
/area/bigredv2/outside/engineering)
-"ewF" = (
-/obj/item/trash/cigbutt{
- pixel_x = -1;
- pixel_y = 17
+"ewG" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/obj/structure/bed/chair/wood/normal{
+ dir = 8
},
+/obj/effect/decal/cleanable/dirt,
/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
+ icon_state = "wood"
},
-/area/bigredv2/outside/c)
+/area/bigredv2/outside/bar)
"exc" = (
/turf/open/floor{
dir = 4;
icon_state = "asteroidwarning"
},
/area/bigred/ground/garage_workshop)
+"exe" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood/gibs/xeno,
+/obj/effect/decal/cleanable/blood/xeno,
+/turf/open/floor,
+/area/bigredv2/outside/office_complex)
"exP" = (
-/obj/effect/decal/cleanable/blood/drip,
-/turf/open/mars_cave{
- icon_state = "mars_dirt_4"
+/obj/structure/pipes/standard/simple/hidden/green,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached4"
},
-/area/bigredv2/outside/n)
-"eze" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
+/area/bigredv2/outside/c)
+"eyj" = (
+/obj/structure/flora/grass/desert/lightgrass_1,
+/turf/open/mars,
+/area/bigredv2/outside/e)
+"eyz" = (
+/obj/effect/decal/cleanable/blood{
+ dir = 4;
+ icon_state = "gib6"
},
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/virology)
-"ezK" = (
-/turf/closed/wall/solaris{
- damage = 500;
- damage_overlay = 2;
- current_bulletholes = 1
+/turf/open/asphalt/cement{
+ icon_state = "cement12"
},
-/area/bigredv2/outside/office_complex)
+/area/bigredv2/outside/lambda_cave_cas)
"ezQ" = (
/obj/structure/largecrate/supply/supplies/flares,
/turf/open/floor/plating{
@@ -29698,37 +26998,29 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"eAs" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/ammo_casing/bullet,
-/obj/item/ammo_casing/bullet,
+"eAk" = (
+/obj/structure/machinery/light,
+/obj/structure/barricade/wooden{
+ desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
+ dir = 4;
+ health = 25000
+ },
/turf/open/floor{
- icon_state = "dark"
+ icon_state = "redcorner"
},
-/area/bigredv2/outside/general_offices)
-"eAy" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/trash/cigbutt{
- pixel_x = -6;
- pixel_y = -9
+/area/bigredv2/outside/marshal_office)
+"eAM" = (
+/obj/effect/decal/cleanable/blood/gibs/body,
+/obj/structure/barricade/wooden{
+ desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
+ dir = 8;
+ health = 25000
},
-/obj/item/reagent_container/food/drinks/bottle/beer/craft/mono{
- pixel_x = 18;
- pixel_y = -9
+/turf/open/floor{
+ dir = 10;
+ icon_state = "whiteblue"
},
-/turf/open/floor/plating,
-/area/bigredv2/outside/bar)
-"eAO" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/obj/structure/bed/chair/wood/normal{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor{
- icon_state = "wood"
- },
-/area/bigredv2/outside/bar)
+/area/bigredv2/outside/medical)
"eAU" = (
/turf/open/floor{
dir = 4;
@@ -29753,16 +27045,39 @@
icon_state = "wood"
},
/area/bigredv2/outside/library)
-"eCI" = (
-/obj/structure/flora/grass/desert/lightgrass_5,
-/turf/open/mars,
-/area/bigredv2/outside/e)
-"eCV" = (
-/obj/structure/surface/table{
- flipped = 1
+"eCl" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
},
-/turf/open/floor,
-/area/bigredv2/outside/office_complex)
+/turf/open/asphalt/cement,
+/area/bigredv2/outside/lambda_cave_cas)
+"eCt" = (
+/obj/item/prop/colony/usedbandage{
+ dir = 5;
+ pixel_y = 8
+ },
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor{
+ icon_state = "white"
+ },
+/area/bigredv2/outside/medical)
+"eDi" = (
+/obj/structure/blocker/forcefield/multitile_vehicles,
+/obj/effect/decal/cleanable/blood,
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidfloor"
+ },
+/area/bigredv2/outside/eta)
+"eDr" = (
+/obj/item/trash/cigbutt{
+ pixel_x = 7;
+ pixel_y = 7
+ },
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/nw)
"eDQ" = (
/obj/structure/closet/secure_closet/engineering_personal,
/obj/effect/landmark/objective_landmark/medium,
@@ -29772,13 +27087,16 @@
/obj/effect/decal/cleanable/dirt,
/turf/closed/wall/solaris/rock,
/area/bigredv2/caves)
-"eDW" = (
-/obj/effect/decal/medical_decals{
- icon_state = "triagedecalbottomleft"
+"eEj" = (
+/obj/structure/sink{
+ dir = 4;
+ pixel_x = 9;
+ pixel_y = -3
},
+/obj/effect/decal/cleanable/blood/drip,
+/obj/effect/decal/cleanable/blood/gibs/limb,
/turf/open/floor{
- dir = 8;
- icon_state = "whitegreen"
+ icon_state = "white"
},
/area/bigredv2/outside/medical)
"eEm" = (
@@ -29799,11 +27117,6 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"eEZ" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/strata_decals/grime/grime3,
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/nw)
"eFh" = (
/turf/open/mars_cave{
icon_state = "mars_cave_5"
@@ -29819,11 +27132,6 @@
icon_state = "red"
},
/area/bigredv2/outside/marshal_office)
-"eFM" = (
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached2"
- },
-/area/bigredv2/outside/se)
"eGa" = (
/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb,
/turf/open/mars_cave{
@@ -29860,6 +27168,16 @@
icon_state = "dark"
},
/area/bigredv2/caves/eta/xenobiology)
+"eHO" = (
+/obj/structure/barricade/wooden{
+ desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
+ dir = 4;
+ health = 25000
+ },
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached2"
+ },
+/area/bigredv2/outside/c)
"eIN" = (
/obj/structure/machinery/power/port_gen/pacman,
/obj/effect/decal/cleanable/dirt,
@@ -29868,45 +27186,12 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/engineering)
-"eJc" = (
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached3"
- },
-/area/bigredv2/outside/s)
"eJE" = (
/turf/open/floor{
dir = 4;
icon_state = "darkpurplecorners2"
},
/area/bigredv2/caves/lambda/breakroom)
-"eJK" = (
-/obj/item/prop/colony/canister{
- pixel_y = -10
- },
-/obj/effect/decal/cleanable/generic,
-/turf/open/mars_cave{
- icon_state = "mars_cave_19"
- },
-/area/bigredv2/outside/nw)
-"eJU" = (
-/obj/structure/surface/table,
-/obj/structure/bedsheetbin{
- pixel_y = 8;
- pixel_x = 7
- },
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/effect/landmark/objective_landmark/far,
-/turf/open/floor{
- icon_state = "freezerfloor"
- },
-/area/bigredv2/outside/general_offices)
-"eKc" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/generic,
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/w)
"eKm" = (
/obj/structure/pipes/vents/pump,
/turf/open/floor{
@@ -29926,6 +27211,16 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/filtration_plant)
+"eKY" = (
+/obj/item/trash/raisins{
+ pixel_y = -5;
+ pixel_x = -8
+ },
+/obj/effect/decal/cleanable/generic,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached3"
+ },
+/area/bigredv2/outside/nw)
"eKZ" = (
/obj/structure/surface/table/reinforced,
/obj/structure/machinery/computer/cameras/wooden_tv{
@@ -29936,6 +27231,30 @@
icon_state = "redfull"
},
/area/bigredv2/outside/lambda_cave_cas)
+"eLb" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor/colony{
+ dir = 1;
+ name = "\improper Medical Clinic Treatment";
+ density = 0;
+ icon_state = "door_open"
+ },
+/turf/open/floor{
+ icon_state = "delivery"
+ },
+/area/bigredv2/outside/medical)
+"eLe" = (
+/obj/structure/machinery/light{
+ dir = 1
+ },
+/obj/effect/spawner/random/tool{
+ pixel_x = -8;
+ pixel_y = -6
+ },
+/turf/open/floor,
+/area/bigredv2/outside/general_offices)
"eLp" = (
/obj/structure/closet/secure_closet/brig,
/obj/effect/landmark/objective_landmark/medium,
@@ -29952,30 +27271,36 @@
/obj/effect/spawner/random/tool,
/turf/open/floor,
/area/bigredv2/outside/cargo)
-"eLK" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/se)
"eLQ" = (
/turf/open/mars_cave{
icon_state = "mars_dirt_5"
},
/area/bigredv2/outside/filtration_plant)
+"eMf" = (
+/obj/structure/barricade/wooden{
+ desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
+ dir = 8;
+ health = 25000
+ },
+/turf/open/floor{
+ icon_state = "dark"
+ },
+/area/bigredv2/outside/general_offices)
+"eMg" = (
+/obj/effect/decal/cleanable/vomit,
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/w)
"eMX" = (
/turf/open/mars_cave{
icon_state = "mars_cave_23"
},
/area/bigredv2/caves_lambda)
-"eNe" = (
-/obj/item/clothing/under/darkred{
- pixel_y = 7;
- pixel_x = 10
- },
-/obj/structure/surface/rack,
-/turf/open/floor{
- icon_state = "freezerfloor"
+"eNn" = (
+/obj/effect/decal/strata_decals/grime/grime3,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached1"
},
-/area/bigredv2/outside/general_offices)
+/area/bigredv2/outside/c)
"eNx" = (
/obj/effect/landmark/nightmare{
insert_tag = "lambda-cave-mushroom"
@@ -29995,36 +27320,58 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/outside/lz1_telecomm_cas)
-"eOz" = (
-/obj/effect/decal/strata_decals/grime/grime4,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
+"eOy" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
},
-/area/bigredv2/outside/space_port_lz2)
-"eOV" = (
-/obj/effect/decal/cleanable/blood/xtracks,
-/turf/open/floor{
+/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor/colony{
dir = 1;
- icon_state = "asteroidfloor"
+ name = "\improper Medical Clinic";
+ locked = 1
+ },
+/turf/open/floor{
+ icon_state = "delivery"
+ },
+/area/bigredv2/outside/medical)
+"eOG" = (
+/obj/item/stack/sheet/metal{
+ pixel_y = 9;
+ pixel_x = 9
+ },
+/obj/item/stack/rods{
+ pixel_y = 4;
+ pixel_x = -13
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor{
+ icon_state = "asteroidwarning"
},
/area/bigredv2/outside/nw)
"ePk" = (
/obj/structure/prop/server_equipment/broken,
/turf/open/floor/greengrid,
/area/bigredv2/caves/lambda/research)
-"ePB" = (
-/obj/effect/decal/strata_decals/grime/grime4,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached3"
+"ePU" = (
+/obj/item/shard,
+/turf/open/floor{
+ icon_state = "white"
+ },
+/area/bigredv2/outside/medical)
+"eQZ" = (
+/obj/structure/toilet{
+ dir = 8
+ },
+/obj/structure/machinery/light{
+ dir = 4
},
-/area/bigredv2/outside/s)
-"ePV" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood,
/turf/open/floor{
icon_state = "freezerfloor"
},
-/area/bigredv2/outside/dorms)
+/area/bigredv2/outside/admin_building)
+"eRa" = (
+/obj/effect/landmark/hunter_secondary,
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/virology)
"eRc" = (
/turf/open/floor{
dir = 6;
@@ -30037,46 +27384,28 @@
},
/turf/open/floor,
/area/bigredv2/outside/cargo)
-"eRh" = (
-/obj/structure/surface/rack,
-/obj/item/weapon/gun/revolver/cmb{
- pixel_y = -11;
- pixel_x = 5
- },
-/obj/item/weapon/gun/revolver/cmb{
- pixel_y = -1;
- pixel_x = -3
- },
-/turf/open/floor{
- dir = 8;
- icon_state = "vault"
- },
-/area/bigredv2/outside/marshal_office)
-"eRF" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/trash/crushed_cup{
- pixel_x = 3;
- pixel_y = 14
- },
-/obj/structure/largecrate/random/barrel/red{
- pixel_y = -1;
- pixel_x = 3
- },
-/obj/effect/decal/cleanable/generic,
-/obj/effect/decal/cleanable/cobweb2,
-/turf/open/floor/plating,
-/area/bigredv2/outside/bar)
"eRI" = (
/turf/open/floor{
icon_state = "delivery"
},
/area/bigredv2/outside/c)
-"eRK" = (
-/obj/structure/girder,
-/turf/open/floor/plating{
- icon_state = "platingdmg3"
+"eRT" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/device/defibrillator{
+ pixel_x = 6;
+ pixel_y = 12
+ },
+/turf/open/floor{
+ icon_state = "white"
},
/area/bigredv2/outside/medical)
+"eSd" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement{
+ icon_state = "cement12"
+ },
+/area/bigredv2/outside/lambda_cave_cas)
"eSm" = (
/obj/structure/pipes/standard/simple/hidden/green,
/turf/open/floor{
@@ -30084,6 +27413,13 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/engineering)
+"eSt" = (
+/obj/structure/pipes/standard/manifold/hidden/green{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/bigredv2/outside/bar)
"eSu" = (
/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
/turf/open/mars_cave{
@@ -30105,20 +27441,12 @@
icon_state = "mars_dirt_14"
},
/area/bigredv2/outside/c)
-"eTA" = (
-/obj/effect/decal/cleanable/generic,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached1"
- },
-/area/bigredv2/outside/virology)
-"eTF" = (
-/obj/item/trash/cigbutt{
- pixel_x = 4
- },
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
+"eTV" = (
+/obj/structure/machinery/light,
+/turf/open/asphalt/cement{
+ icon_state = "cement12"
},
-/area/bigredv2/outside/e)
+/area/bigredv2/outside/lambda_cave_cas)
"eUs" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/surface/table/reinforced/prison,
@@ -30129,26 +27457,6 @@
},
/turf/open/floor/plating,
/area/bigredv2/caves/mining)
-"eUF" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/effect/decal/cleanable/generic,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached1"
- },
-/area/bigredv2/outside/e)
-"eUJ" = (
-/obj/effect/decal/cleanable/blood,
-/obj/item/tool/hatchet{
- pixel_x = -6;
- pixel_y = -9
- },
-/turf/open/floor{
- dir = 1;
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/marshal_office)
"eVo" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/weapon/gun/pistol/m4a3,
@@ -30167,6 +27475,19 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
+"eVJ" = (
+/obj/structure/bed/chair{
+ dir = 4
+ },
+/obj/item/trash/kepler{
+ pixel_y = 9;
+ pixel_x = 12
+ },
+/turf/open/floor{
+ dir = 8;
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
"eVM" = (
/obj/structure/largecrate/random/barrel/true_random,
/turf/open/floor{
@@ -30222,16 +27543,11 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"eWN" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/trash/eat{
- pixel_y = -2
- },
-/turf/open/floor{
- dir = 4;
- icon_state = "asteroidwarning"
+"eWI" = (
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached3"
},
-/area/bigredv2/outside/ne)
+/area/bigredv2/outside/c)
"eWP" = (
/obj/structure/surface/table,
/obj/effect/spawner/random/bomb_supply,
@@ -30242,10 +27558,39 @@
},
/turf/open/floor,
/area/bigredv2/outside/cargo)
-"eXo" = (
-/obj/structure/flora/grass/desert/lightgrass_11,
+"eWZ" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/floor{
+ dir = 4;
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/n)
+"eXe" = (
+/obj/structure/flora/grass/desert/lightgrass_3,
/turf/open/mars,
-/area/bigredv2/outside/sw)
+/area/bigredv2/outside/n)
+"eXy" = (
+/obj/structure/surface/table/woodentable,
+/obj/item/trash/sosjerky{
+ pixel_x = 14;
+ pixel_y = -4
+ },
+/obj/item/trash/cigbutt{
+ pixel_x = 4
+ },
+/turf/open/floor{
+ icon_state = "wood"
+ },
+/area/bigredv2/outside/bar)
+"eXK" = (
+/obj/item/trash/cheesie,
+/obj/item/trash/pistachios,
+/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
+/turf/open/floor{
+ icon_state = "wood"
+ },
+/area/bigredv2/outside/bar)
"eYy" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/machinery/fuelcell_recycler/full,
@@ -30262,10 +27607,6 @@
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/e)
-"eYG" = (
-/obj/structure/flora/grass/desert/lightgrass_10,
-/turf/open/mars,
-/area/bigredv2/outside/space_port_lz2)
"eYH" = (
/obj/structure/machinery/camera/autoname{
dir = 4
@@ -30280,31 +27621,6 @@
icon_state = "floor4"
},
/area/bigredv2/outside/cargo)
-"eZb" = (
-/obj/item/trash/cigbutt{
- pixel_x = -10;
- pixel_y = 13
- },
-/obj/item/trash/cigbutt{
- icon_state = "ucigbutt";
- pixel_x = 2;
- pixel_y = 8
- },
-/obj/item/trash/cigbutt{
- pixel_x = -6;
- pixel_y = -9
- },
-/turf/open/floor{
- dir = 8;
- icon_state = "asteroidwarning"
- },
-/area/bigredv2/outside/nw)
-"eZl" = (
-/obj/structure/platform/kutjevo/rock{
- dir = 1
- },
-/turf/closed/wall/solaris/rock,
-/area/bigredv2/caves)
"eZw" = (
/obj/effect/decal/warning_stripes{
icon_state = "N"
@@ -30315,31 +27631,69 @@
},
/turf/open/floor/plating,
/area/bigredv2/caves/mining)
-"fad" = (
+"fai" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/trash/cigbutt{
+ pixel_x = 4
+ },
/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached14"
+ icon_state = "cement_sunbleached12"
},
-/area/bigredv2/outside/space_port_lz2)
+/area/bigredv2/outside/nw)
+"faV" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood,
+/obj/effect/decal/cleanable/blood/gibs/body,
+/turf/open/floor{
+ icon_state = "grimy"
+ },
+/area/bigredv2/outside/dorms)
+"fbe" = (
+/obj/item/trash/cigbutt{
+ pixel_x = 1;
+ pixel_y = 5
+ },
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/e)
"fbf" = (
/turf/open/mars{
icon_state = "mars_dirt_8"
},
/area/bigredv2/outside/sw)
+"fbo" = (
+/obj/structure/surface/table/woodentable,
+/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot{
+ pixel_y = 4;
+ pixel_x = 4
+ },
+/turf/open/floor{
+ icon_state = "wood"
+ },
+/area/bigredv2/outside/dorms)
"fbB" = (
/obj/effect/landmark/nightmare{
insert_tag = "crashlanding-eva"
},
/turf/closed/wall/solaris,
/area/bigredv2/outside/bar)
-"fbM" = (
-/obj/item/device/healthanalyzer{
- pixel_x = 3;
- pixel_y = 8
- },
+"fcb" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/vomit,
/turf/open/floor{
icon_state = "white"
},
/area/bigredv2/outside/medical)
+"fcl" = (
+/obj/structure/flora/grass/desert/lightgrass_6,
+/turf/open/mars,
+/area/bigredv2/outside/c)
+"fcu" = (
+/obj/item/clothing/mask/gas,
+/turf/open/floor{
+ icon_state = "dark"
+ },
+/area/bigredv2/outside/marshal_office)
"fcG" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/firecloset,
@@ -30357,13 +27711,20 @@
"fdy" = (
/turf/open/floor,
/area/bigredv2/caves/eta/living)
-"feH" = (
-/obj/item/clothing/suit/armor/riot{
- pixel_y = -5;
- pixel_x = -4
+"fed" = (
+/obj/structure/flora/grass/desert/lightgrass_8,
+/turf/open/mars,
+/area/bigredv2/outside/c)
+"feM" = (
+/obj/structure/bed/chair{
+ dir = 4
},
-/turf/closed/wall/solaris/rock,
-/area/bigredv2/caves)
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/effect/landmark/survivor_spawner,
+/turf/open/floor,
+/area/bigredv2/outside/marshal_office)
"feN" = (
/turf/open/floor{
dir = 9;
@@ -30375,6 +27736,13 @@
icon_state = "mars_cave_5"
},
/area/bigredv2/caves_sw)
+"ffG" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/ammo_casing/bullet,
+/turf/open/floor{
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
"fgD" = (
/obj/structure/machinery/door/airlock/almayer/research/glass/colony{
name = "\improper Lambda Lab Server Room"
@@ -30393,11 +27761,34 @@
icon_state = "podhatchfloor"
},
/area/bigredv2/outside/engineering)
-"fgT" = (
-/obj/item/shard,
-/obj/structure/window_frame/solaris,
-/turf/open/floor/plating,
+"fgF" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/trash/cigbutt{
+ pixel_x = 1;
+ pixel_y = 5
+ },
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/se)
+"fgN" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/machinery/door_control{
+ id = "Medical";
+ name = "Storm Shutters";
+ pixel_y = -32
+ },
+/turf/open/floor{
+ icon_state = "whitegreen"
+ },
/area/bigredv2/outside/medical)
+"fhr" = (
+/obj/item/reagent_container/food/drinks/bottle/beer/craft/ganucci{
+ pixel_x = -6;
+ pixel_y = -8
+ },
+/turf/open/floor{
+ icon_state = "wood"
+ },
+/area/bigredv2/outside/bar)
"fhy" = (
/obj/structure/bed/chair/comfy/blue{
dir = 8
@@ -30407,58 +27798,19 @@
icon_state = "carpet15-15"
},
/area/bigredv2/outside/admin_building)
-"fhD" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/effect/decal/cleanable/blood/drip,
-/turf/open/floor{
- icon_state = "floor4"
- },
-/area/bigredv2/outside/cargo)
+"fhA" = (
+/obj/effect/landmark/survivor_spawner,
+/turf/open/floor,
+/area/bigredv2/outside/office_complex)
"fhI" = (
/obj/effect/landmark/hunter_secondary,
/turf/open/mars_cave{
icon_state = "mars_cave_16"
},
/area/bigredv2/caves_north)
-"fhO" = (
-/obj/effect/decal/cleanable/blood/drip,
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidwarning"
- },
-/area/bigredv2/outside/n)
-"fig" = (
-/obj/effect/decal/medical_decals{
- icon_state = "triagedecalleft"
- },
-/turf/open/floor{
- dir = 8;
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
"fin" = (
/turf/open/floor/plating,
/area/bigredv2/caves/eta/xenobiology)
-"fiM" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/structure/largecrate/random/barrel{
- layer = 3.3;
- pixel_x = -15;
- pixel_y = -9
- },
-/obj/structure/largecrate/random/barrel{
- pixel_x = -4;
- pixel_y = 10;
- layer = 3.2
- },
-/turf/open/floor{
- icon_state = "white"
- },
-/area/bigredv2/outside/medical)
"fjz" = (
/obj/structure/surface/table,
/obj/structure/machinery/computer/objective{
@@ -30479,38 +27831,20 @@
icon_state = "delivery"
},
/area/bigredv2/caves)
-"fks" = (
-/obj/structure/barricade/handrail{
- dir = 8
- },
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor{
- dir = 8;
- icon_state = "asteroidwarning"
- },
-/area/bigredv2/outside/c)
-"flB" = (
-/obj/structure/window_frame/solaris,
-/obj/structure/curtain,
-/turf/open/floor/plating,
-/area/bigredv2/outside/medical)
-"flY" = (
-/obj/effect/decal/strata_decals/grime/grime3,
-/turf/open/asphalt/cement{
- icon_state = "cement4"
+"fkl" = (
+/obj/structure/largecrate/random/barrel/true_random,
+/turf/open/floor/plating{
+ icon_state = "platebotc"
},
/area/bigredv2/outside/space_port)
-"fma" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/trash/crushed_cup{
- pixel_x = 7;
- pixel_y = -5
+"fkt" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 10
},
/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
+ icon_state = "whitegreenfull"
},
-/area/bigredv2/outside/ne)
+/area/bigredv2/outside/medical)
"fmd" = (
/obj/structure/machinery/light{
dir = 1
@@ -30525,6 +27859,11 @@
icon_state = "mars_cave_23"
},
/area/bigredv2/caves_virology)
+"fmA" = (
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached14"
+ },
+/area/bigredv2/outside/se)
"fmL" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/device/camera/oldcamera,
@@ -30533,6 +27872,21 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
+"fmW" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/prop{
+ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
+ icon = 'icons/obj/janitor.dmi';
+ icon_state = "trashbag3";
+ name = "trash bag";
+ pixel_x = -6;
+ pixel_y = -4
+ },
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidfloor"
+ },
+/area/bigredv2/outside/ne)
"fnh" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
@@ -30543,19 +27897,39 @@
icon_state = "darkyellowcorners2"
},
/area/bigredv2/caves/eta/living)
-"fni" = (
-/obj/structure/machinery/door/airlock/almayer/medical{
- name = "\improper Medical Clinic Morgue";
- locked = 1
+"fnm" = (
+/obj/effect/decal/strata_decals/grime/grime1{
+ dir = 1
},
-/turf/open/floor{
- icon_state = "delivery"
+/turf/open/mars_cave{
+ icon_state = "mars_dirt_4"
},
-/area/bigredv2/outside/medical)
+/area/bigredv2/outside/c)
"fnv" = (
/obj/structure/bed/chair/comfy,
/turf/open/floor/carpet,
/area/bigredv2/caves/lambda/breakroom)
+"fnD" = (
+/obj/structure/surface/table,
+/obj/item/bodybag,
+/obj/item/bodybag,
+/obj/item/bodybag{
+ pixel_y = 5;
+ pixel_x = -5
+ },
+/turf/open/floor{
+ dir = 1;
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
+"fnI" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/shard,
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidfloor"
+ },
+/area/bigredv2/outside/ne)
"fnO" = (
/turf/open/mars_cave{
icon_state = "mars_cave_13"
@@ -30566,6 +27940,15 @@
icon_state = "mars_cave_22"
},
/area/bigredv2/caves_east)
+"foK" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor{
+ icon_state = "wood"
+ },
+/area/bigredv2/outside/bar)
"fpa" = (
/obj/effect/decal/cleanable/blood/drip{
pixel_x = -8;
@@ -30573,35 +27956,34 @@
},
/turf/closed/wall/wood,
/area/bigredv2/caves/mining)
-"fpw" = (
+"fpj" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/ammo_box/rounds/empty{
- pixel_x = 3;
- pixel_y = -6
- },
-/obj/effect/decal/cleanable/blood/gibs/body,
-/obj/effect/decal/cleanable/blood,
/turf/open/floor,
-/area/bigredv2/outside/office_complex)
-"fqA" = (
-/obj/item/stack/sheet/wood{
- pixel_y = -13;
- pixel_x = 12
- },
-/obj/structure/barricade/wooden{
- dir = 4
+/area/bigredv2/outside/lambda_cave_cas)
+"fpo" = (
+/obj/structure/surface/table,
+/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot{
+ pixel_x = 3
},
+/turf/open/floor,
+/area/bigredv2/outside/marshal_office)
+"fpt" = (
+/obj/structure/flora/grass/desert/lightgrass_11,
/turf/open/mars,
/area/bigredv2/outside/n)
-"fqE" = (
-/obj/item/trash/barcardine{
- pixel_y = 5;
- pixel_x = 17
+"fpX" = (
+/obj/structure/machinery/cm_vending/sorted/medical/no_access,
+/turf/open/floor{
+ icon_state = "whitegreenfull"
},
-/turf/open/mars_cave{
- icon_state = "mars_dirt_4"
+/area/bigredv2/outside/medical)
+"fqt" = (
+/obj/structure/machinery/light,
+/obj/effect/landmark/survivor_spawner,
+/turf/open/floor{
+ icon_state = "dark"
},
-/area/bigredv2/outside/nw)
+/area/bigredv2/outside/marshal_office)
"fsT" = (
/turf/open/mars_cave{
icon_state = "mars_dirt_7"
@@ -30612,14 +27994,16 @@
icon_state = "mars_dirt_6"
},
/area/bigredv2/outside/space_port_lz2)
-"ftU" = (
-/obj/effect/decal/cleanable/blood/gibs/limb,
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
+"fta" = (
+/obj/structure/flora/grass/desert/lightgrass_12,
+/turf/open/mars_cave{
+ icon_state = "mars_dirt_4"
},
-/area/bigredv2/outside/s)
+/area/bigredv2/outside/space_port_lz2)
+"ftc" = (
+/obj/structure/flora/grass/desert/lightgrass_12,
+/turf/open/mars,
+/area/bigredv2/outside/c)
"ftY" = (
/turf/open/mars_cave{
icon_state = "mars_dirt_7"
@@ -30630,13 +28014,6 @@
icon_state = "mars_cave_7"
},
/area/bigredv2/outside/lz2_south_cas)
-"fuv" = (
-/obj/effect/decal/cleanable/blood/xtracks,
-/turf/open/floor{
- dir = 8;
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
"fvb" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/prop/invuln/minecart_tracks{
@@ -30647,31 +28024,48 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
+"fvo" = (
+/obj/structure/platform/kutjevo/rock{
+ dir = 4
+ },
+/turf/open/mars_cave{
+ icon_state = "mars_cave_17"
+ },
+/area/bigredv2/outside/nw)
"fvu" = (
/obj/structure/machinery/light/double,
/turf/open/mars_cave{
icon_state = "mars_cave_5"
},
/area/bigredv2/outside/lz2_south_cas)
-"fvw" = (
-/obj/structure/largecrate/random/secure{
- pixel_x = -9;
- pixel_y = 20
- },
-/obj/structure/largecrate/supply/supplies/tables_racks{
- pixel_y = 1;
- pixel_x = -6;
- layer = 3.1
- },
-/turf/open/floor{
- icon_state = "white"
- },
-/area/bigredv2/outside/medical)
"fwa" = (
/turf/open/mars_cave{
icon_state = "mars_cave_7"
},
/area/bigredv2/caves_virology)
+"fwl" = (
+/obj/item/trash/cigbutt{
+ pixel_x = -10;
+ pixel_y = 7
+ },
+/obj/item/trash/cigbutt{
+ pixel_x = 4
+ },
+/obj/item/trash/cigbutt{
+ pixel_x = -10;
+ pixel_y = 13
+ },
+/obj/item/trash/cigbutt{
+ icon_state = "ucigbutt";
+ pixel_x = 2;
+ pixel_y = 8
+ },
+/obj/structure/bed/chair{
+ dir = 4;
+ layer = 3.06
+ },
+/turf/open/mars,
+/area/bigredv2/outside/nw)
"fwD" = (
/obj/structure/barricade/wooden{
desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
@@ -30696,6 +28090,15 @@
icon_state = "floor5"
},
/area/bigredv2/oob)
+"fwQ" = (
+/obj/effect/decal/medical_decals{
+ icon_state = "triagedecalbottomleft"
+ },
+/turf/open/floor{
+ dir = 8;
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
"fwV" = (
/obj/structure/surface/table,
/turf/open/floor,
@@ -30715,6 +28118,17 @@
icon_state = "warnplate"
},
/area/bigredv2/oob)
+"fxr" = (
+/obj/structure/flora/grass/desert/lightgrass_3,
+/turf/open/mars,
+/area/bigredv2/outside/ne)
+"fxs" = (
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/floor{
+ dir = 8;
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/eta)
"fxK" = (
/turf/open/mars_cave{
icon_state = "mars_cave_10"
@@ -30760,6 +28174,41 @@
icon_state = "redfull"
},
/area/bigredv2/outside/lambda_cave_cas)
+"fzd" = (
+/obj/item/ammo_casing/bullet,
+/obj/effect/decal/cleanable/blood/xtracks,
+/turf/open/floor{
+ dir = 4;
+ icon_state = "whitegreencorner"
+ },
+/area/bigredv2/outside/medical)
+"fzy" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached4"
+ },
+/area/bigredv2/outside/w)
+"fAn" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/c)
+"fAu" = (
+/obj/item/ammo_casing/bullet,
+/turf/open/floor{
+ dir = 4;
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/c)
+"fAP" = (
+/obj/item/reagent_container/glass/bucket/mopbucket{
+ pixel_x = -5;
+ pixel_y = 11
+ },
+/turf/open/floor{
+ dir = 4;
+ icon_state = "whiteyellowfull"
+ },
+/area/bigredv2/outside/office_complex)
"fBc" = (
/obj/structure/pipes/standard/tank/phoron,
/turf/open/floor/plating,
@@ -30772,20 +28221,22 @@
"fCb" = (
/turf/open/floor,
/area/bigredv2/outside/filtration_cave_cas)
-"fCG" = (
-/obj/effect/decal/cleanable/blood/drip,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
+"fCF" = (
+/obj/structure/flora/grass/desert/lightgrass_12,
+/turf/open/mars,
+/area/bigredv2/outside/e)
+"fCY" = (
+/obj/structure/surface/table,
+/obj/item/reagent_container/spray/cleaner{
+ pixel_x = 13;
+ pixel_y = 13
},
-/area/bigredv2/outside/nw)
-"fCQ" = (
-/obj/structure/largecrate/random/mini{
- pixel_x = -8;
- pixel_y = -7;
- layer = 2.9
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
},
+/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
/turf/open/floor,
-/area/bigredv2/outside/general_offices)
+/area/bigredv2/outside/marshal_office)
"fDf" = (
/obj/structure/pipes/standard/simple/hidden/green,
/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
@@ -30801,17 +28252,6 @@
icon_state = "darkred2"
},
/area/bigredv2/caves/eta/research)
-"fDs" = (
-/obj/item/storage/toolbox{
- pixel_x = 4;
- pixel_y = 9
- },
-/obj/item/ammo_casing/bullet,
-/turf/open/floor{
- dir = 4;
- icon_state = "redcorner"
- },
-/area/bigredv2/outside/marshal_office)
"fEv" = (
/obj/structure/machinery/door/airlock/almayer/secure/colony{
name = "\improper Engine Reactor"
@@ -30820,53 +28260,61 @@
icon_state = "delivery"
},
/area/bigredv2/outside/engineering)
-"fEx" = (
-/obj/structure/flora/grass/desert/lightgrass_12,
-/turf/open/mars,
-/area/bigredv2/outside/w)
+"fEC" = (
+/obj/structure/bed/chair/office/light,
+/obj/effect/landmark/corpsespawner/doctor,
+/obj/effect/decal/cleanable/blood,
+/obj/effect/decal/cleanable/vomit{
+ icon_state = "vomit_2"
+ },
+/obj/item/reagent_container/pill/happy,
+/obj/item/reagent_container/pill/happy,
+/turf/open/floor{
+ icon_state = "white"
+ },
+/area/bigredv2/outside/medical)
"fEE" = (
/turf/open/mars_cave{
icon_state = "mars_cave_15"
},
/area/bigredv2/outside/ne)
-"fER" = (
-/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
-/obj/item/ammo_casing/shell,
-/obj/effect/decal/cleanable/blood/gibs/body,
+"fFh" = (
/obj/effect/decal/cleanable/blood,
-/turf/open/floor{
- icon_state = "wood"
- },
-/area/bigredv2/outside/bar)
-"fFt" = (
-/obj/structure/surface/table,
-/obj/item/ammo_magazine/rifle/lmg/heap{
- pixel_x = -8;
- pixel_y = -2;
- max_rounds = 0
+/turf/open/mars{
+ icon_state = "mars_dirt_12"
},
-/obj/item/clothing/mask/cigarette/cigar{
- pixel_x = 9;
- pixel_y = 5
+/area/bigredv2/outside/n)
+"fFm" = (
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/mars_cave{
+ icon_state = "mars_dirt_4"
},
-/turf/open/floor,
-/area/bigredv2/outside/office_complex)
+/area/bigredv2/outside/n)
"fFG" = (
/obj/structure/largecrate/random/barrel,
/turf/open/mars_cave{
icon_state = "mars_cave_13"
},
/area/bigredv2/caves/mining)
-"fFL" = (
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached9"
- },
-/area/bigredv2/outside/se)
"fFO" = (
/turf/open/mars{
icon_state = "mars_dirt_3"
},
/area/bigredv2/outside/space_port_lz2)
+"fGo" = (
+/obj/structure/bed/chair{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/blood/drip,
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor{
+ icon_state = "dark"
+ },
+/area/bigredv2/outside/marshal_office)
+"fGD" = (
+/obj/structure/cargo_container/arious/right,
+/turf/open/floor/plating/plating_catwalk,
+/area/bigredv2/outside/space_port)
"fGK" = (
/obj/effect/decal/warning_stripes{
icon_state = "E-corner"
@@ -30897,23 +28345,18 @@
icon_state = "mars_cave_3"
},
/area/bigredv2/caves/mining)
-"fIb" = (
+"fJP" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
},
-/obj/item/trash/cigbutt/cigarbutt,
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
- },
-/area/bigredv2/outside/ne)
-"fJH" = (
-/obj/effect/decal/cleanable/blood/drip,
-/turf/open/floor{
- dir = 10;
- icon_state = "asteroidwarning"
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/barricade/wooden{
+ dir = 4;
+ pixel_y = -1;
+ pixel_x = -4
},
-/area/bigredv2/outside/eta)
+/turf/open/floor,
+/area/bigredv2/outside/marshal_office)
"fJW" = (
/obj/structure/window,
/obj/structure/surface/table/woodentable,
@@ -30922,12 +28365,6 @@
icon_state = "wood"
},
/area/bigredv2/outside/library)
-"fKe" = (
-/obj/effect/decal/strata_decals/grime/grime3,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached1"
- },
-/area/bigredv2/outside/c)
"fKO" = (
/obj/structure/barricade/wooden{
desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
@@ -30973,20 +28410,24 @@
icon_state = "mars_dirt_7"
},
/area/bigredv2/caves/mining)
-"fMi" = (
-/obj/item/stack/sheet/metal{
- pixel_x = -5;
- pixel_y = 2
+"fLZ" = (
+/obj/structure/barricade/metal{
+ dir = 1
},
-/obj/effect/decal/cleanable/blood/xeno,
-/turf/open/floor,
-/area/bigredv2/outside/office_complex)
+/turf/open/floor{
+ icon_state = "white"
+ },
+/area/bigredv2/outside/admin_building)
"fMl" = (
/obj/item/device/flashlight/lantern,
/turf/open/mars_cave{
icon_state = "mars_dirt_6"
},
/area/bigredv2/caves/mining)
+"fMw" = (
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/floor,
+/area/bigredv2/outside/cargo)
"fML" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/surface/table/reinforced/prison,
@@ -31002,12 +28443,6 @@
icon_state = "mars_dirt_4"
},
/area/bigredv2/caves/mining)
-"fMV" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
- },
-/area/bigredv2/outside/e)
"fMZ" = (
/obj/structure/machinery/light{
dir = 4
@@ -31021,11 +28456,22 @@
icon_state = "dark"
},
/area/bigredv2/caves/lambda/xenobiology)
+"fNv" = (
+/obj/structure/fence,
+/turf/open/asphalt/cement,
+/area/bigredv2/outside/filtration_cave_cas)
"fOc" = (
/turf/open/mars_cave{
icon_state = "mars_cave_3"
},
/area/bigredv2/caves_virology)
+"fOk" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/floor{
+ icon_state = "white"
+ },
+/area/bigredv2/outside/medical)
"fOo" = (
/obj/effect/decal/warning_stripes{
icon_state = "N"
@@ -31065,6 +28511,12 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/bigredv2/caves/mining)
+"fOO" = (
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor{
+ icon_state = "freezerfloor"
+ },
+/area/bigredv2/outside/general_offices)
"fPe" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor{
@@ -31076,6 +28528,14 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/bigredv2/outside/admin_building)
+"fQm" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood/xeno,
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidfloor"
+ },
+/area/bigredv2/outside/n)
"fQv" = (
/obj/structure/prop/invuln/minecart_tracks{
desc = "A heavy duty power cable for high voltage applications";
@@ -31091,15 +28551,19 @@
icon_state = "mars_cave_17"
},
/area/bigredv2/caves/mining)
-"fQI" = (
-/obj/item/prop/helmetgarb/rosary{
- pixel_y = 7;
- pixel_x = 12
+"fRa" = (
+/obj/item/trash/cigbutt{
+ pixel_x = -6;
+ pixel_y = -9
},
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
+/obj/item/trash/cigbutt{
+ pixel_x = 4
},
-/area/bigredv2/outside/nw)
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/n)
"fRo" = (
/obj/item/tool/pickaxe/drill,
/turf/open/mars_cave{
@@ -31111,103 +28575,63 @@
icon_state = "mars_cave_10"
},
/area/bigredv2/caves_se)
-"fRP" = (
-/obj/item/stack/sheet/cardboard{
- pixel_x = -6;
- pixel_y = -2
- },
-/turf/open/floor{
- icon_state = "wood"
- },
-/area/bigredv2/outside/bar)
"fRW" = (
/obj/structure/machinery/light/small,
/turf/open/mars_cave{
icon_state = "mars_dirt_4"
},
/area/bigredv2/caves/mining)
-"fRZ" = (
-/obj/structure/flora/grass/desert/lightgrass_8,
-/turf/open/mars_cave{
- icon_state = "mars_dirt_4"
- },
-/area/bigredv2/outside/nw)
-"fSr" = (
-/obj/structure/prop/invuln/overhead_pipe{
- dir = 4;
- pixel_x = 2;
- pixel_y = 9
- },
-/obj/structure/prop/invuln/pipe_water{
- pixel_x = 9;
- pixel_y = -1
- },
-/obj/item/reagent_container/glass/bucket/janibucket{
- pixel_y = -19;
- pixel_x = 7
- },
+"fSt" = (
+/obj/effect/landmark/corpsespawner/doctor,
+/obj/effect/decal/cleanable/blood,
/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
+ icon_state = "white"
},
-/area/bigredv2/outside/ne)
+/area/bigredv2/outside/medical)
"fSJ" = (
/obj/structure/pipes/standard/simple/hidden/green,
/turf/open/floor{
icon_state = "delivery"
},
/area/bigredv2/outside/space_port)
-"fSK" = (
-/obj/item/shard/shrapnel,
-/turf/open/floor{
- icon_state = "white"
- },
-/area/bigredv2/outside/marshal_office)
"fST" = (
/obj/structure/machinery/light,
/turf/open/floor{
icon_state = "wood"
},
/area/bigredv2/outside/admin_building)
-"fSW" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor{
- icon_state = "red"
- },
-/area/bigredv2/outside/lambda_cave_cas)
-"fSX" = (
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor{
- icon_state = "asteroidwarning"
- },
-/area/bigredv2/outside/n)
"fSY" = (
/turf/open/mars_cave{
icon_state = "mars_cave_10"
},
/area/bigredv2/outside/lz2_west_cas)
-"fTg" = (
-/obj/effect/decal/warning_stripes{
- icon_state = "NE-out";
- pixel_x = 1;
- pixel_y = 1
+"fTb" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached3"
},
+/area/bigredv2/outside/w)
+"fTz" = (
/turf/open/floor{
- dir = 8;
+ dir = 9;
icon_state = "asteroidwarning"
},
-/area/bigredv2/outside/c)
-"fTC" = (
-/obj/structure/flora/grass/desert/lightgrass_1,
-/turf/open/asphalt/cement_sunbleached,
/area/bigredv2/outside/w)
-"fTO" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/computer/arcade,
+"fTD" = (
+/obj/structure/surface/table,
+/obj/item/tool/surgery/cautery{
+ pixel_y = 9;
+ pixel_x = 9
+ },
+/obj/item/reagent_container/spray/cleaner{
+ pixel_y = 4;
+ pixel_x = -8
+ },
/turf/open/floor{
- icon_state = "wood"
+ dir = 5;
+ icon_state = "whitebluefull"
},
-/area/bigredv2/outside/dorms)
+/area/bigredv2/outside/medical)
"fUk" = (
/obj/structure/surface/table,
/obj/item/clothing/head/hardhat,
@@ -31229,17 +28653,37 @@
icon_state = "delivery"
},
/area/bigredv2/outside/engineering)
-"fUH" = (
+"fUB" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/trash/eat{
- pixel_x = -2;
- pixel_y = 10
+/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
+/turf/open/floor{
+ icon_state = "wood"
+ },
+/area/bigredv2/outside/dorms)
+"fUS" = (
+/obj/item/prop{
+ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
+ icon = 'icons/obj/janitor.dmi';
+ icon_state = "trashbag3";
+ name = "trash bag";
+ pixel_x = -6;
+ pixel_y = -4;
+ layer = 3.1
+ },
+/obj/item/prop{
+ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
+ icon = 'icons/obj/janitor.dmi';
+ icon_state = "trashbag3";
+ name = "trash bag";
+ pixel_x = 8;
+ layer = 3.01;
+ pixel_y = 17
},
/turf/open/floor{
dir = 1;
icon_state = "asteroidfloor"
},
-/area/bigredv2/outside/ne)
+/area/bigredv2/outside/nw)
"fVt" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/surface/table,
@@ -31251,21 +28695,33 @@
},
/turf/open/floor,
/area/bigredv2/outside/cargo)
-"fWk" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
+"fWo" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/trash/burger{
+ pixel_y = 12;
+ pixel_x = -8
},
-/obj/structure/barricade/metal,
/turf/open/floor{
- icon_state = "dark"
+ icon_state = "white"
},
-/area/bigredv2/outside/admin_building)
+/area/bigredv2/outside/medical)
"fWw" = (
/turf/open/jungle{
bushes_spawn = 0;
icon_state = "grass_impenetrable"
},
/area/bigredv2/caves/eta/xenobiology)
+"fWV" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/item/reagent_container/spray/cleaner{
+ pixel_x = 6
+ },
+/turf/open/floor{
+ icon_state = "white"
+ },
+/area/bigredv2/outside/medical)
"fWY" = (
/obj/structure/window,
/obj/structure/window{
@@ -31278,6 +28734,14 @@
icon_state = "wood"
},
/area/bigredv2/outside/library)
+"fXd" = (
+/obj/item/trash/popcorn{
+ pixel_y = 9
+ },
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached4"
+ },
+/area/bigredv2/outside/nw)
"fXm" = (
/obj/effect/decal/warning_stripes{
icon_state = "E";
@@ -31288,17 +28752,14 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/engineering)
-"fXF" = (
-/obj/structure/machinery/light{
- dir = 8
- },
-/obj/structure/bed/chair{
- dir = 4
- },
+"fXA" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/obj/effect/decal/cleanable/blood,
/turf/open/floor{
- icon_state = "white"
+ dir = 1;
+ icon_state = "asteroidfloor"
},
-/area/bigredv2/outside/marshal_office)
+/area/bigredv2/outside/eta)
"fXR" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/machinery/portable_atmospherics/hydroponics,
@@ -31306,6 +28767,16 @@
icon_state = "whitegreenfull"
},
/area/bigredv2/outside/hydroponics)
+"fYG" = (
+/obj/structure/bed/chair/wood/normal{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor{
+ dir = 8;
+ icon_state = "carpet15-15"
+ },
+/area/bigredv2/outside/bar)
"fYH" = (
/turf/closed/wall/solaris/reinforced/hull,
/area/bigredv2/caves/mining)
@@ -31318,16 +28789,24 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"fYL" = (
+"fYM" = (
+/obj/effect/decal/medical_decals{
+ icon_state = "triagedecalbottomleft"
+ },
/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
+/obj/item/ammo_casing/bullet,
+/turf/open/floor{
+ icon_state = "whitegreen"
},
-/area/bigredv2/outside/c)
-"fYO" = (
-/obj/item/tool/shovel,
-/turf/open/mars,
-/area/bigredv2/outside/nw)
+/area/bigredv2/outside/medical)
+"fZd" = (
+/obj/structure/machinery/light{
+ dir = 8
+ },
+/turf/open/asphalt/cement{
+ icon_state = "cement3"
+ },
+/area/bigredv2/caves_lambda)
"fZg" = (
/obj/structure/window/framed/solaris/reinforced,
/obj/effect/decal/cleanable/dirt,
@@ -31345,30 +28824,27 @@
},
/area/bigredv2/outside/eta)
"fZG" = (
-/obj/structure/barricade/deployable{
+/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
},
-/turf/open/floor{
- icon_state = "dark"
+/obj/item/prop{
+ desc = "A blood bag with a hole in it. The rats must have gotten to it first.";
+ icon = 'icons/obj/items/bloodpack.dmi';
+ icon_state = "bloodpack";
+ name = "blood bag";
+ pixel_x = -2;
+ pixel_y = 10
},
-/area/bigredv2/outside/marshal_office)
-"fZP" = (
-/obj/item/shard,
/turf/open/floor{
- icon_state = "dark"
+ dir = 1;
+ icon_state = "whitegreen"
},
-/area/bigredv2/outside/general_offices)
+/area/bigredv2/outside/medical)
"gad" = (
/turf/open/floor/almayer{
icon_state = "test_floor4"
},
/area/bigredv2/outside/filtration_plant)
-"gag" = (
-/obj/structure/barricade/deployable,
-/turf/open/floor{
- icon_state = "dark"
- },
-/area/bigredv2/outside/marshal_office)
"gan" = (
/obj/structure/platform_decoration/shiva{
dir = 1
@@ -31380,26 +28856,11 @@
icon_state = "bcircuitoff"
},
/area/bigredv2/caves/lambda/research)
-"gaO" = (
-/obj/item/storage/firstaid/adv/empty{
- pixel_y = -6;
- pixel_x = -8
- },
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor{
- icon_state = "white"
- },
-/area/bigredv2/outside/medical)
-"gbs" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/trash/cigbutt{
- pixel_x = -10;
- pixel_y = 14
- },
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
+"gbl" = (
+/turf/open/asphalt/cement{
+ icon_state = "cement1"
},
-/area/bigredv2/outside/nw)
+/area/bigredv2/caves_lambda)
"gbA" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor{
@@ -31407,12 +28868,28 @@
icon_state = "asteroidfloor"
},
/area/bigredv2/outside/ne)
+"gcg" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/generic,
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidfloor"
+ },
+/area/bigredv2/outside/c)
+"gcm" = (
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/mars_cave{
+ icon_state = "mars_dirt_4"
+ },
+/area/bigredv2/outside/eta)
"gcO" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/obj/effect/decal/cleanable/blood,
-/obj/item/ammo_casing/bullet,
+/obj/structure/surface/table,
+/obj/item/clothing/under/brown{
+ pixel_y = 7;
+ pixel_x = 12
+ },
/turf/open/floor{
- icon_state = "dark"
+ icon_state = "freezerfloor"
},
/area/bigredv2/outside/general_offices)
"gcR" = (
@@ -31424,17 +28901,36 @@
"gda" = (
/turf/open/mars_cave,
/area/bigredv2/outside/lz1_telecomm_cas)
+"gdf" = (
+/obj/structure/flora/grass/desert/lightgrass_5,
+/turf/open/mars,
+/area/bigredv2/outside/e)
+"gdr" = (
+/obj/effect/decal/strata_decals/grime/grime3,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached12"
+ },
+/area/bigredv2/outside/w)
"gdx" = (
/turf/open/floor{
dir = 6;
icon_state = "darkyellow2"
},
/area/bigredv2/outside/engineering)
-"gdF" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/flora/grass/desert/lightgrass_1,
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/se)
+"gdz" = (
+/obj/item/trash/sosjerky{
+ pixel_x = -12;
+ pixel_y = 17
+ },
+/turf/open/mars_cave{
+ icon_state = "mars_dirt_4"
+ },
+/area/bigredv2/outside/nw)
+"gdH" = (
+/turf/open/asphalt/cement{
+ icon_state = "cement9"
+ },
+/area/bigredv2/outside/filtration_cave_cas)
"gdK" = (
/turf/open/mars_cave{
icon_state = "mars_dirt_6"
@@ -31444,39 +28940,38 @@
/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
/turf/open/mars,
/area/bigredv2/caves/eta/xenobiology)
-"gej" = (
-/obj/effect/decal/cleanable/blood/gibs/xeno/body,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/ammo_casing/shell,
-/turf/open/floor{
- dir = 6;
- icon_state = "whiteblue"
+"gex" = (
+/obj/item/stack/sheet/wood{
+ pixel_x = 1;
+ pixel_y = 6
},
-/area/bigredv2/outside/medical)
-"gep" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/obj/effect/decal/cleanable/blood,
-/obj/effect/landmark/corpsespawner/colonist,
-/obj/effect/decal/cleanable/blood/gibs/body,
/turf/open/floor{
- icon_state = "dark"
- },
-/area/bigredv2/outside/general_offices)
-"gev" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/trash/cigbutt{
- pixel_x = -10;
- pixel_y = 16
- },
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached1"
+ icon_state = "white"
},
-/area/bigredv2/outside/c)
+/area/bigredv2/outside/marshal_office)
"geC" = (
/turf/open/mars_cave{
icon_state = "mars_dirt_6"
},
/area/bigredv2/outside/lz1_north_cas)
+"geN" = (
+/obj/structure/machinery/light{
+ dir = 1
+ },
+/obj/structure/sign/nosmoking_1{
+ pixel_y = 32
+ },
+/turf/open/floor{
+ dir = 1;
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
+"gfj" = (
+/obj/effect/decal/cleanable/generic,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached14"
+ },
+/area/bigredv2/outside/space_port_lz2)
"gfX" = (
/obj/structure/sign/safety/hazard{
pixel_y = -32
@@ -31485,12 +28980,6 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/engineering)
-"ggi" = (
-/obj/effect/decal/cleanable/blood/xtracks,
-/turf/open/floor{
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
"ggC" = (
/obj/structure/surface/rack,
/obj/effect/landmark/good_item,
@@ -31500,23 +28989,67 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
+"ggL" = (
+/obj/effect/landmark/hunter_primary,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached12"
+ },
+/area/bigredv2/outside/w)
"ggW" = (
/turf/open/floor{
dir = 4;
icon_state = "whitepurple"
},
/area/bigredv2/caves/lambda/research)
-"ghv" = (
+"ghj" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/turf/open/floor{
+ dir = 10;
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/e)
+"ghT" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
+/obj/effect/decal/cleanable/generic,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached3"
+ },
+/area/bigredv2/outside/s)
+"ghY" = (
+/obj/structure/surface/table,
+/obj/item/bodybag{
+ pixel_y = 1;
+ pixel_x = -2
+ },
+/obj/item/bodybag{
+ pixel_y = -2;
+ pixel_x = 9
+ },
+/obj/item/bodybag{
+ pixel_y = 8;
+ pixel_x = -7
+ },
/turf/open/floor{
- icon_state = "wood"
+ icon_state = "whitegreenfull"
},
-/area/bigredv2/outside/dorms)
-"ghw" = (
-/obj/structure/flora/grass/desert/lightgrass_5,
-/turf/open/mars,
-/area/bigredv2/outside/n)
+/area/bigredv2/outside/medical)
+"ghZ" = (
+/obj/item/stack/sheet/metal{
+ pixel_y = 5;
+ pixel_x = 7
+ },
+/turf/open/floor/plating,
+/area/bigredv2/outside/space_port)
+"gib" = (
+/obj/effect/decal/strata_decals/grime/grime2{
+ dir = 4
+ },
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached3"
+ },
+/area/bigredv2/outside/nw)
"gio" = (
/turf/open/mars_cave,
/area/bigredv2/outside/filtration_cave_cas)
@@ -31524,10 +29057,6 @@
/obj/structure/blocker/forcefield/multitile_vehicles,
/turf/open/mars_cave,
/area/bigredv2/caves_sw)
-"giO" = (
-/obj/structure/flora/grass/desert/lightgrass_2,
-/turf/open/mars,
-/area/bigredv2/outside/n)
"giY" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
@@ -31539,18 +29068,20 @@
icon_state = "mars_dirt_4"
},
/area/bigredv2/outside/s)
-"gja" = (
+"gjl" = (
+/obj/effect/decal/cleanable/blood{
+ layer = 3
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor,
+/area/bigredv2/outside/lambda_cave_cas)
+"gkc" = (
/obj/structure/pipes/standard/simple/hidden/green,
-/obj/structure/machinery/deployable/barrier,
/turf/open/floor{
- icon_state = "dark"
- },
-/area/bigredv2/outside/marshal_office)
-"gjE" = (
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
+ dir = 6;
+ icon_state = "whitegreen"
},
-/area/bigredv2/outside/w)
+/area/bigredv2/outside/medical)
"gke" = (
/obj/item/tool/warning_cone,
/turf/open/mars_cave{
@@ -31565,16 +29096,6 @@
icon_state = "mars_dirt_4"
},
/area/bigredv2/caves/mining)
-"gkq" = (
-/obj/item/trash/cigbutt{
- pixel_x = 1;
- pixel_y = 5
- },
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
- },
-/area/bigredv2/outside/c)
"gkD" = (
/obj/structure/barricade/wooden{
desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
@@ -31585,22 +29106,42 @@
icon_state = "delivery"
},
/area/bigredv2/outside/cargo)
+"gkK" = (
+/obj/effect/decal/cleanable/blood,
+/obj/effect/decal/cleanable/blood/gibs/body,
+/obj/effect/landmark/corpsespawner/colonist/random,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached12"
+ },
+/area/bigredv2/outside/nw)
"glB" = (
/obj/structure/blocker/forcefield/multitile_vehicles,
/turf/closed/wall/solaris/reinforced,
/area/bigredv2/outside/lz2_south_cas)
-"gmb" = (
-/obj/effect/decal/strata_decals/grime/grime4,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached1"
+"glN" = (
+/obj/item/trash/cigbutt{
+ pixel_x = -10;
+ pixel_y = 13
},
-/area/bigredv2/outside/c)
-"gmh" = (
-/obj/structure/flora/bush/desert{
- icon_state = "tree_3"
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidfloor"
},
-/turf/open/mars,
-/area/bigredv2/outside/sw)
+/area/bigredv2/outside/filtration_plant)
+"glU" = (
+/obj/item/weapon/gun/smg/mp5{
+ current_mag = null;
+ pixel_y = 8;
+ pixel_x = -18
+ },
+/obj/effect/decal/cleanable/blood,
+/obj/item/ammo_casing/bullet,
+/obj/item/ammo_casing/bullet,
+/obj/item/ammo_casing/bullet,
+/turf/open/floor{
+ icon_state = "dark"
+ },
+/area/bigredv2/outside/general_offices)
"gmm" = (
/obj/structure/window/framed/solaris,
/obj/effect/decal/cleanable/molten_item,
@@ -31610,29 +29151,22 @@
},
/turf/open/floor/plating,
/area/bigredv2/outside/engineering)
-"gms" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/obj/item/trash/cigbutt{
- pixel_x = -6;
- pixel_y = -9
- },
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/nw)
-"gmx" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/obj/item/clothing/suit/armor/riot{
- pixel_y = -9;
- pixel_x = -12
- },
-/turf/open/floor{
- icon_state = "dark"
- },
-/area/bigredv2/outside/marshal_office)
"gmN" = (
/turf/open/mars_cave{
icon_state = "mars_cave_18"
},
/area/bigredv2/caves_lambda)
+"gni" = (
+/obj/structure/flora/grass/desert/lightgrass_10,
+/turf/open/mars,
+/area/bigredv2/outside/nw)
+"gnA" = (
+/obj/effect/decal/cleanable/blood/xtracks,
+/turf/open/floor{
+ dir = 8;
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
"gnR" = (
/obj/structure/largecrate/random/barrel/red,
/obj/effect/decal/cleanable/dirt,
@@ -31641,13 +29175,21 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"gnS" = (
-/obj/item/clothing/mask/gas{
- pixel_x = -10;
- pixel_y = 4
+"goi" = (
+/obj/effect/decal/cleanable/blood/gibs/limb,
+/turf/open/floor{
+ icon_state = "whitegreenfull"
},
-/turf/closed/wall/solaris/rock,
-/area/bigredv2/caves)
+/area/bigredv2/outside/medical)
+"gox" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached4"
+ },
+/area/bigredv2/outside/e)
"gpg" = (
/turf/open/mars_cave,
/area/bigredv2/caves_east)
@@ -31660,10 +29202,6 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"gpt" = (
-/obj/effect/landmark/crap_item,
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/c)
"gpA" = (
/obj/structure/surface/table,
/obj/structure/machinery/light,
@@ -31686,31 +29224,103 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/outside/lz2_south_cas)
+"gqd" = (
+/obj/effect/decal/strata_decals/grime/grime2{
+ dir = 1
+ },
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/nw)
+"gqE" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/tool/lighter/random{
+ pixel_x = -9;
+ pixel_y = 2
+ },
+/turf/open/floor{
+ dir = 4;
+ icon_state = "whiteyellowfull"
+ },
+/area/bigredv2/outside/office_complex)
+"gqL" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 6
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor{
+ icon_state = "grimy"
+ },
+/area/bigredv2/outside/dorms)
+"gqR" = (
+/obj/item/prop{
+ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
+ icon = 'icons/obj/janitor.dmi';
+ icon_state = "trashbag3";
+ name = "trash bag";
+ pixel_x = 10;
+ pixel_y = 6
+ },
+/obj/item/stack/sheet/cardboard{
+ pixel_x = 2;
+ pixel_y = -5;
+ layer = 3.01
+ },
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidfloor"
+ },
+/area/bigredv2/outside/c)
"gqS" = (
/obj/structure/surface/table/reinforced/prison,
/obj/effect/spawner/random/tool,
/obj/structure/machinery/light,
/turf/open/floor,
/area/bigred/ground/garage_workshop)
+"grh" = (
+/obj/effect/decal/strata_decals/grime/grime4,
+/obj/item/prop{
+ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
+ icon = 'icons/obj/janitor.dmi';
+ icon_state = "trashbag3";
+ name = "trash bag";
+ pixel_x = 9;
+ layer = 3.01;
+ pixel_y = 1
+ },
+/obj/item/trash/hotdog{
+ pixel_x = -5;
+ pixel_y = 1
+ },
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidfloor"
+ },
+/area/bigredv2/outside/nw)
"gri" = (
/obj/effect/landmark/nightmare{
insert_tag = "containerroom_xenos"
},
/turf/closed/wall/solaris/reinforced,
/area/bigredv2/outside/nw/ceiling)
-"grz" = (
-/obj/item/paper{
- info = "god save us, I take this end over that at the hands of those monsters";
- name = "scribbled note"
+"grP" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached3"
},
-/obj/item/tool/pen{
- pixel_x = 10;
- pixel_y = 14
+/area/bigredv2/outside/filtration_plant)
+"grR" = (
+/obj/structure/surface/table,
+/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot{
+ pixel_x = 7;
+ pixel_y = 7
},
/turf/open/floor{
- icon_state = "dark"
+ dir = 1;
+ icon_state = "whitegreen"
},
-/area/bigredv2/outside/general_offices)
+/area/bigredv2/outside/medical)
"grU" = (
/obj/structure/machinery/door/poddoor/almayer/closed{
dir = 4;
@@ -31721,6 +29331,31 @@
icon_state = "delivery"
},
/area/bigredv2/outside/virology)
+"gsg" = (
+/turf/closed/wall/solaris{
+ damage = 2677;
+ damage_overlay = 8;
+ current_bulletholes = 3
+ },
+/area/bigredv2/outside/medical)
+"gsF" = (
+/obj/item/trash/cigbutt{
+ pixel_x = 7;
+ pixel_y = 7
+ },
+/turf/open/mars_cave{
+ icon_state = "mars_dirt_4"
+ },
+/area/bigredv2/outside/n)
+"gsI" = (
+/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb,
+/obj/item/ammo_casing/shell,
+/obj/item/ammo_casing/shell,
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor{
+ icon_state = "wood"
+ },
+/area/bigredv2/outside/bar)
"gsW" = (
/obj/structure/platform/kutjevo/rock,
/obj/structure/platform/kutjevo/rock{
@@ -31742,17 +29377,23 @@
icon_state = "whiteblue"
},
/area/bigredv2/outside/medical)
-"gtO" = (
-/obj/structure/pipes/standard/manifold/hidden/green,
-/obj/effect/decal/cleanable/blood/xeno,
-/turf/open/floor{
- dir = 1;
- icon_state = "whitegreen"
+"gtA" = (
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached12"
},
-/area/bigredv2/outside/medical)
+/area/bigredv2/outside/nw)
"gtX" = (
/turf/open/mars_cave,
/area/bigredv2/caves_se)
+"gur" = (
+/obj/structure/pipes/vents/pump{
+ dir = 8
+ },
+/turf/open/asphalt/cement{
+ icon_state = "cement1"
+ },
+/area/bigredv2/caves_lambda)
"guu" = (
/obj/structure/machinery/light,
/turf/open/floor{
@@ -31772,18 +29413,6 @@
icon_state = "delivery"
},
/area/bigredv2/caves/lambda/breakroom)
-"gvz" = (
-/obj/effect/decal/cleanable/generic,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
- },
-/area/bigredv2/outside/w)
-"gvD" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/turf/open/floor{
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
"gvI" = (
/obj/structure/transmitter/colony_net{
dir = 4;
@@ -31805,43 +29434,60 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/engineering)
-"gwD" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/weapon/gun/smg/mp5{
- current_mag = null;
- pixel_y = 8;
- pixel_x = -18
- },
-/obj/item/ammo_casing/bullet,
-/obj/item/ammo_casing/bullet,
-/obj/item/ammo_casing/bullet,
-/obj/item/ammo_casing/bullet,
-/obj/item/ammo_casing/bullet,
-/obj/effect/landmark/corpsespawner/security/marshal,
-/obj/effect/decal/cleanable/blood,
-/obj/effect/decal/cleanable/blood/gibs/body,
-/turf/open/floor{
- icon_state = "whitegreenfull"
+"gwt" = (
+/obj/structure/platform/kutjevo/rock{
+ dir = 1
},
-/area/bigredv2/outside/medical)
+/turf/closed/wall/solaris/rock,
+/area/bigredv2/caves)
"gxJ" = (
/turf/open/mars_cave{
icon_state = "mars_cave_18"
},
/area/bigredv2/caves_sw)
-"gyJ" = (
-/obj/structure/machinery/power/port_gen/pacman/super,
-/turf/open/mars_cave{
- icon_state = "mars_cave_2"
- },
-/area/bigredv2/caves/mining)
-"gyL" = (
-/obj/item/ore{
- pixel_x = 13;
- pixel_y = 12
+"gyj" = (
+/obj/structure/machinery/light{
+ dir = 4
},
-/turf/open/mars_cave{
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood/drip,
+/obj/effect/decal/cleanable/blood/drip,
+/obj/item/trash/cigbutt/cigarbutt{
+ pixel_x = -7;
+ pixel_y = 4
+ },
+/turf/open/floor,
+/area/bigredv2/outside/office_complex)
+"gym" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 10
+ },
+/obj/item/trash/cigbutt{
+ pixel_x = -6;
+ pixel_y = -9
+ },
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/c)
+"gyq" = (
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor{
+ dir = 8;
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/eta)
+"gyJ" = (
+/obj/structure/machinery/power/port_gen/pacman/super,
+/turf/open/mars_cave{
+ icon_state = "mars_cave_2"
+ },
+/area/bigredv2/caves/mining)
+"gyL" = (
+/obj/item/ore{
+ pixel_x = 13;
+ pixel_y = 12
+ },
+/turf/open/mars_cave{
icon_state = "mars_dirt_7"
},
/area/bigredv2/caves/mining)
@@ -31854,15 +29500,6 @@
icon_state = "mars_dirt_7"
},
/area/bigredv2/caves/mining)
-"gzs" = (
-/obj/effect/decal/strata_decals/grime/grime2{
- dir = 8
- },
-/turf/open/floor{
- dir = 8;
- icon_state = "asteroidwarning"
- },
-/area/bigredv2/outside/nw)
"gzG" = (
/obj/effect/decal/cleanable/blood/drip{
pixel_x = -9;
@@ -31872,16 +29509,29 @@
icon_state = "mars_cave_14"
},
/area/bigredv2/caves/mining)
-"gzL" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/corpsespawner/security,
-/obj/effect/decal/cleanable/blood/gibs/body,
+"gzU" = (
/obj/effect/decal/cleanable/blood,
/turf/open/floor{
- dir = 4;
- icon_state = "redcorner"
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/n)
+"gAn" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
},
+/obj/effect/decal/cleanable/blood/gibs/xeno/body,
+/turf/open/floor,
/area/bigredv2/outside/marshal_office)
+"gAA" = (
+/obj/effect/spawner/random/bomb_supply{
+ pixel_x = 6;
+ pixel_y = -3
+ },
+/turf/open/floor{
+ dir = 1;
+ icon_state = "whitepurplecorner"
+ },
+/area/bigredv2/outside/medical)
"gAE" = (
/obj/structure/sink{
dir = 1;
@@ -31895,22 +29545,6 @@
},
/turf/closed/wall/solaris,
/area/bigredv2/outside/chapel)
-"gAN" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached1"
- },
-/area/bigredv2/outside/nw)
-"gAS" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
- },
-/area/bigredv2/outside/c)
"gAX" = (
/obj/structure/pipes/standard/manifold/hidden/green{
dir = 8
@@ -31919,6 +29553,23 @@
icon_state = "dark"
},
/area/bigredv2/outside/office_complex)
+"gBk" = (
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/virology)
+"gBp" = (
+/obj/structure/window_frame/solaris,
+/obj/item/shard,
+/turf/open/floor/plating,
+/area/bigredv2/outside/medical)
+"gCg" = (
+/obj/item/trash/pistachios{
+ pixel_x = -11;
+ pixel_y = -9
+ },
+/turf/open/mars_cave{
+ icon_state = "mars_dirt_4"
+ },
+/area/bigredv2/outside/nw)
"gCx" = (
/obj/structure/surface/table,
/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
@@ -31953,29 +29604,27 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/caves_east)
-"gDe" = (
-/obj/item/prop/magazine/dirty/torn/alt{
- pixel_x = -11;
- pixel_y = 4
+"gCU" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/stack/sheet/cardboard{
+ pixel_x = -6;
+ pixel_y = -2
},
-/obj/item/reagent_container/food/drinks/cup{
+/obj/item/reagent_container/food/drinks/bottle/beer/craft{
pixel_x = 7;
- pixel_y = -18
- },
-/turf/open/mars_cave{
- icon_state = "mars_cave_20"
+ pixel_y = -7
},
-/area/bigredv2/outside/ne)
-"gEs" = (
-/obj/structure/flora/grass/desert/lightgrass_9,
-/turf/open/mars,
-/area/bigredv2/outside/c)
-"gEy" = (
-/obj/effect/decal/strata_decals/grime/grime3,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached3"
+/obj/effect/decal/cleanable/generic,
+/turf/open/floor/plating,
+/area/bigredv2/outside/bar)
+"gDN" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/obj/effect/decal/cleanable/blood,
+/obj/item/ammo_casing/bullet,
+/turf/open/floor{
+ icon_state = "dark"
},
-/area/bigredv2/outside/space_port_lz2)
+/area/bigredv2/outside/general_offices)
"gEM" = (
/obj/structure/machinery/vending/security,
/obj/structure/blocker/forcefield/multitile_vehicles,
@@ -31997,37 +29646,36 @@
icon_state = "platingdmg2"
},
/area/bigredv2/caves/mining)
-"gHu" = (
-/obj/item/trash/burger{
- pixel_y = -10;
- pixel_x = 8
- },
+"gHk" = (
/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached15"
+ icon_state = "cement_sunbleached14"
},
-/area/bigredv2/outside/nw)
-"gHD" = (
-/obj/structure/flora/grass/desert/lightgrass_6,
-/turf/open/mars,
/area/bigredv2/outside/c)
+"gHx" = (
+/obj/item/trash/crushed_cup{
+ pixel_x = -7;
+ pixel_y = -8
+ },
+/turf/open/mars_cave{
+ icon_state = "mars_dirt_6"
+ },
+/area/bigredv2/outside/ne)
+"gHz" = (
+/obj/structure/flora/grass/desert/lightgrass_4,
+/turf/open/mars_cave{
+ icon_state = "mars_dirt_4"
+ },
+/area/bigredv2/outside/n)
"gHH" = (
/obj/structure/largecrate/random/barrel/white,
/turf/open/mars_cave{
icon_state = "mars_cave_2"
},
/area/bigredv2/caves/mining)
-"gHI" = (
-/turf/open/floor/plating{
- icon_state = "platebotc"
- },
-/area/bigredv2/outside/space_port)
-"gHP" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating{
- dir = 8;
- icon_state = "platingdmg3"
- },
-/area/bigredv2/outside/medical)
+"gHS" = (
+/obj/structure/flora/grass/desert/lightgrass_8,
+/turf/open/mars,
+/area/bigredv2/outside/e)
"gHV" = (
/obj/structure/surface/table,
/turf/open/floor{
@@ -32035,6 +29683,21 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/engineering)
+"gIo" = (
+/obj/structure/surface/table,
+/obj/item/storage/fancy/vials/random{
+ pixel_y = 6;
+ pixel_x = -4
+ },
+/turf/open/floor{
+ dir = 1;
+ icon_state = "whitepurplecorner"
+ },
+/area/bigredv2/outside/medical)
+"gIP" = (
+/obj/item/paper,
+/turf/open/floor,
+/area/bigredv2/outside/office_complex)
"gIT" = (
/obj/structure/machinery/door/poddoor/almayer/closed{
dir = 4;
@@ -32045,45 +29708,49 @@
icon_state = "delivery"
},
/area/bigredv2/caves_north)
+"gJk" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/storage/firstaid/fire/empty,
+/turf/open/floor{
+ icon_state = "whitegreencorner"
+ },
+/area/bigredv2/outside/medical)
"gJw" = (
/obj/structure/blocker/forcefield/multitile_vehicles,
/turf/open/mars_cave,
/area/bigredv2/caves_virology)
-"gJF" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/item/prop/helmetgarb/spent_buckshot{
- pixel_y = 8
- },
-/obj/effect/decal/cleanable/dirt,
+"gKd" = (
+/obj/structure/surface/rack,
/turf/open/floor{
- icon_state = "freezerfloor"
+ dir = 8;
+ icon_state = "vault"
},
-/area/bigredv2/outside/general_offices)
+/area/bigredv2/outside/marshal_office)
"gKk" = (
/obj/structure/blocker/forcefield/multitile_vehicles,
/turf/open/mars_cave{
icon_state = "mars_cave_4"
},
/area/bigredv2/caves_virology)
-"gKH" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
+"gKD" = (
+/obj/structure/machinery/light{
+ dir = 1
},
-/obj/effect/decal/strata_decals/grime/grime3,
-/obj/item/trash/cigbutt{
- pixel_x = -10;
- pixel_y = 13
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/crate/trashcart{
+ pixel_x = -6;
+ pixel_y = 6
},
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
+/obj/item/prop{
+ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
+ icon = 'icons/obj/janitor.dmi';
+ icon_state = "trashbag3";
+ name = "trash bag";
+ pixel_x = 2;
+ pixel_y = 1
},
-/area/bigredv2/outside/e)
-"gLp" = (
-/obj/item/shard,
/turf/open/floor/plating,
-/area/bigredv2/outside/medical)
+/area/bigredv2/outside/bar)
"gMj" = (
/obj/effect/decal/warning_stripes{
icon_state = "NW-out";
@@ -32107,14 +29774,13 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/engineering)
-"gMX" = (
+"gNp" = (
+/obj/structure/bed/stool,
/obj/effect/decal/cleanable/dirt,
-/obj/item/ammo_casing/bullet,
-/obj/effect/decal/cleanable/blood,
/turf/open/floor{
- icon_state = "redcorner"
+ icon_state = "wood"
},
-/area/bigredv2/outside/marshal_office)
+/area/bigredv2/outside/dorms)
"gNz" = (
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
@@ -32125,6 +29791,23 @@
"gNH" = (
/turf/closed/wall/solaris/reinforced,
/area/bigredv2/caves)
+"gNM" = (
+/obj/effect/decal/cleanable/blood,
+/obj/item/stack/sheet/cardboard{
+ pixel_x = -6;
+ pixel_y = -11
+ },
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidfloor"
+ },
+/area/bigredv2/outside/ne)
+"gOk" = (
+/obj/effect/decal/cleanable/blood/xeno,
+/turf/open/floor{
+ icon_state = "redcorner"
+ },
+/area/bigredv2/outside/marshal_office)
"gOr" = (
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
@@ -32132,6 +29815,16 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/caves_research)
+"gOU" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/trash/cigbutt{
+ pixel_x = -10;
+ pixel_y = 16
+ },
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached1"
+ },
+/area/bigredv2/outside/c)
"gPc" = (
/turf/open/floor{
dir = 4;
@@ -32147,17 +29840,6 @@
icon_state = "delivery"
},
/area/bigredv2/outside/engineering)
-"gPm" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/trash/sosjerky{
- pixel_x = -12;
- pixel_y = 17
- },
-/turf/open/floor{
- icon_state = "whitegreenfull"
- },
-/area/bigredv2/outside/medical)
"gPE" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/device/flashlight/lantern,
@@ -32166,52 +29848,119 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
+"gQa" = (
+/obj/structure/flora/grass/desert/lightgrass_5,
+/obj/effect/decal/cleanable/blood,
+/turf/open/mars,
+/area/bigredv2/outside/n)
"gQj" = (
/obj/structure/cargo_container/horizontal/blue/top,
/turf/open/mars,
/area/bigredv2/outside/space_port_lz2)
-"gQl" = (
-/obj/structure/machinery/landinglight/ds1/delaytwo{
+"gQw" = (
+/obj/structure/pipes/unary/freezer{
+ icon_state = "freezer_1"
+ },
+/obj/structure/sign/safety/med_cryo{
+ pixel_x = -16
+ },
+/turf/open/floor{
+ icon_state = "white"
+ },
+/area/bigredv2/outside/medical)
+"gQG" = (
+/obj/structure/bed/chair{
dir = 8
},
/obj/effect/decal/cleanable/dirt,
+/turf/open/floor,
+/area/bigredv2/outside/general_offices)
+"gQR" = (
+/obj/item/stack/folding_barricade,
/turf/open/floor{
- dir = 8;
- icon_state = "asteroidwarning"
+ dir = 1;
+ icon_state = "asteroidfloor"
},
-/area/bigredv2/outside/space_port)
-"gRK" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/generic,
+/area/bigredv2/outside/nw)
+"gQT" = (
/turf/open/floor{
- dir = 8;
- icon_state = "asteroidwarning"
+ dir = 1;
+ icon_state = "whitegreencorner"
},
-/area/bigredv2/outside/s)
+/area/bigredv2/outside/medical)
+"gRC" = (
+/turf/open/floor{
+ dir = 5;
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
"gSB" = (
/obj/structure/sign/safety/restrictedarea{
pixel_x = 8
},
/turf/closed/wall/solaris/reinforced,
/area/bigredv2/caves/mining)
-"gTb" = (
+"gSG" = (
+/obj/effect/decal/cleanable/vomit,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached4"
+ },
+/area/bigredv2/outside/e)
+"gSY" = (
+/obj/structure/pipes/standard/manifold/hidden/green{
+ dir = 1
+ },
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached4"
+ },
+/area/bigredv2/outside/c)
+"gTa" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/filtration_plant)
+"gTe" = (
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached4"
+ },
+/area/bigredv2/outside/nw)
+"gTh" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
},
-/obj/item/ammo_casing/bullet,
-/obj/item/ammo_casing/bullet,
+/obj/structure/barricade/metal,
/turf/open/floor{
- dir = 4;
- icon_state = "redcorner"
+ icon_state = "dark"
},
-/area/bigredv2/outside/marshal_office)
-"gTH" = (
-/obj/structure/machinery/landinglight/ds1/delaytwo,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor{
- icon_state = "asteroidwarning"
+/area/bigredv2/outside/admin_building)
+"gTt" = (
+/obj/structure/girder,
+/turf/open/floor/plating{
+ dir = 8;
+ icon_state = "platingdmg3"
},
-/area/bigredv2/outside/space_port)
+/area/bigredv2/outside/office_complex)
+"gTG" = (
+/obj/item/trash/snack_bowl{
+ pixel_x = 1;
+ pixel_y = -12
+ },
+/obj/item/trash/raisins{
+ pixel_y = 8;
+ pixel_x = -2
+ },
+/obj/item/trash/uscm_mre{
+ pixel_y = 3;
+ pixel_x = 10
+ },
+/obj/effect/decal/cleanable/generic,
+/obj/effect/decal/cleanable/ash{
+ pixel_y = 19
+ },
+/turf/open/mars_cave{
+ icon_state = "mars_cave_16"
+ },
+/area/bigredv2/outside/nw)
"gTJ" = (
/obj/structure/machinery/autolathe,
/turf/open/floor/plating,
@@ -32224,13 +29973,6 @@
icon_state = "platingdmg3"
},
/area/bigredv2/oob)
-"gTR" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor,
-/area/bigredv2/outside/dorms)
"gTS" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/shard{
@@ -32241,6 +29983,20 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
+"gTT" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/strata_decals/grime/grime3,
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/nw)
+"gUz" = (
+/obj/structure/machinery/light{
+ dir = 4
+ },
+/turf/open/floor{
+ dir = 9;
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/e)
"gUD" = (
/obj/structure/barricade/handrail{
dir = 1;
@@ -32269,55 +30025,35 @@
icon_state = "darkblue2"
},
/area/bigredv2/caves/eta/research)
-"gVF" = (
-/obj/effect/decal/strata_decals/grime/grime4,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
- },
-/area/bigredv2/outside/e)
-"gVI" = (
-/obj/item/stack/sheet/metal{
- pixel_x = 4;
- pixel_y = -9
- },
-/obj/effect/decal/cleanable/blood/xeno,
+"gVx" = (
+/obj/effect/decal/cleanable/blood/gibs/xeno,
/turf/open/floor,
/area/bigredv2/outside/office_complex)
-"gVQ" = (
-/obj/item/reagent_container/food/drinks/bottle/beer/craft{
- pixel_y = -9;
- pixel_x = -7
- },
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
+"gWr" = (
+/obj/effect/decal/cleanable/generic,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached15"
},
-/area/bigredv2/outside/ne)
+/area/bigredv2/outside/c)
"gWv" = (
/obj/effect/landmark/nightmare{
insert_tag = "eta_carp"
},
/turf/closed/wall/solaris/reinforced,
/area/bigredv2/caves/eta/xenobiology)
+"gWw" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/medical_decals{
+ icon_state = "triagedecaldir"
+ },
+/turf/open/floor{
+ icon_state = "white"
+ },
+/area/bigredv2/outside/medical)
"gWD" = (
/turf/closed/wall/solaris,
/area/bigredv2/outside/space_port_lz2)
-"gWG" = (
-/obj/item/trash/waffles{
- pixel_x = -19;
- pixel_y = -5
- },
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
- },
-/area/bigredv2/outside/nw)
-"gWJ" = (
-/obj/structure/bed/chair{
- dir = 1
- },
-/obj/effect/decal/cleanable/blood/xeno,
-/turf/open/floor,
-/area/bigredv2/outside/office_complex)
"gWU" = (
/obj/effect/decal/warning_stripes{
icon_state = "N";
@@ -32331,11 +30067,12 @@
icon_state = "dark"
},
/area/bigredv2/outside/admin_building)
-"gXj" = (
-/turf/open/asphalt/cement{
- icon_state = "cement2"
+"gWW" = (
+/obj/item/ammo_casing/shell,
+/turf/open/floor{
+ icon_state = "dark"
},
-/area/bigredv2/outside/space_port)
+/area/bigredv2/outside/marshal_office)
"gXp" = (
/turf/open/mars_cave{
icon_state = "mars_cave_6"
@@ -32360,6 +30097,10 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/caves_sw)
+"gYW" = (
+/obj/structure/flora/grass/desert/lightgrass_2,
+/turf/open/mars,
+/area/bigredv2/outside/ne)
"gZc" = (
/obj/structure/machinery/light{
dir = 8
@@ -32372,16 +30113,14 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/engineering)
-"gZj" = (
-/obj/item/trash/cheesie{
- pixel_y = -1;
- pixel_x = -11
+"gZn" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 5
},
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached4"
},
-/area/bigredv2/outside/ne)
+/area/bigredv2/outside/c)
"hah" = (
/obj/structure/machinery/light{
dir = 8
@@ -32398,26 +30137,6 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/filtration_plant)
-"hbm" = (
-/obj/effect/decal/cleanable/vomit,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
- },
-/area/bigredv2/outside/e)
-"hbx" = (
-/obj/structure/machinery/light{
- dir = 8
- },
-/obj/structure/bed/roller,
-/obj/structure/closet/bodybag,
-/turf/open/floor{
- icon_state = "whitegreenfull"
- },
-/area/bigredv2/outside/medical)
-"hca" = (
-/obj/item/clothing/accessory/storage/holster/armpit,
-/turf/closed/wall/solaris/rock,
-/area/bigredv2/caves)
"hcb" = (
/obj/effect/landmark/hunter_secondary,
/turf/open/mars_cave{
@@ -32433,6 +30152,13 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/engineering)
+"hcI" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor{
+ dir = 4;
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/e)
"hdc" = (
/obj/structure/bed/chair{
dir = 1
@@ -32442,13 +30168,19 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/engineering)
-"hde" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/obj/item/ammo_casing/bullet,
+"hdK" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached12"
+ },
+/area/bigredv2/outside/se)
+"hes" = (
+/obj/structure/bed/roller,
+/obj/effect/decal/cleanable/blood/gibs/body,
/turf/open/floor{
- icon_state = "dark"
+ icon_state = "white"
},
-/area/bigredv2/outside/general_offices)
+/area/bigredv2/outside/medical)
"heD" = (
/obj/structure/machinery/light{
dir = 8
@@ -32471,6 +30203,18 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
+"hfo" = (
+/obj/effect/decal/cleanable/generic,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached3"
+ },
+/area/bigredv2/outside/nw)
+"hfq" = (
+/obj/item/tool/wrench,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached4"
+ },
+/area/bigredv2/outside/c)
"hfB" = (
/obj/item/ore{
pixel_x = -5;
@@ -32480,19 +30224,59 @@
icon_state = "mars_dirt_6"
},
/area/bigredv2/caves/mining)
-"hgb" = (
-/obj/effect/decal/cleanable/generic,
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidwarning"
+"hfH" = (
+/obj/structure/pipes/standard/manifold/hidden/green,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/ammo_casing/bullet,
+/obj/item/ammo_casing/bullet,
+/turf/open/floor,
+/area/bigredv2/outside/marshal_office)
+"hfK" = (
+/obj/structure/surface/table,
+/obj/item/explosive/grenade/flashbang{
+ pixel_x = 3;
+ pixel_y = -7
},
-/area/bigredv2/outside/ne)
-"hgr" = (
-/obj/structure/blocker/forcefield/multitile_vehicles,
-/turf/open/mars_cave{
- icon_state = "mars_cave_16"
+/turf/open/floor,
+/area/bigredv2/outside/marshal_office)
+"hfS" = (
+/obj/item/tool/warning_cone,
+/obj/structure/flora/grass/desert/lightgrass_1,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached12"
},
-/area/bigredv2/outside/ne)
+/area/bigredv2/outside/c)
+"hfU" = (
+/obj/effect/decal/strata_decals/grime/grime3,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached1"
+ },
+/area/bigredv2/outside/s)
+"hgc" = (
+/obj/structure/surface/table,
+/obj/item/ammo_magazine/rifle/lmg/heap{
+ pixel_x = -8;
+ pixel_y = -2;
+ max_rounds = 0
+ },
+/obj/item/clothing/mask/cigarette/cigar{
+ pixel_x = 9;
+ pixel_y = 5
+ },
+/turf/open/floor,
+/area/bigredv2/outside/office_complex)
+"hgr" = (
+/obj/structure/blocker/forcefield/multitile_vehicles,
+/turf/open/mars_cave{
+ icon_state = "mars_cave_16"
+ },
+/area/bigredv2/outside/ne)
+"hgA" = (
+/obj/item/clothing/under/darkred,
+/turf/open/floor{
+ icon_state = "freezerfloor"
+ },
+/area/bigredv2/outside/general_offices)
"hgO" = (
/obj/structure/blocker/forcefield/multitile_vehicles,
/turf/open/mars_cave{
@@ -32504,6 +30288,13 @@
icon_state = "mars_dirt_7"
},
/area/bigredv2/outside/lz1_north_cas)
+"hhn" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/effect/decal/strata_decals/grime/grime4,
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/e)
"hho" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/bed/chair/wood/normal{
@@ -32513,64 +30304,28 @@
icon_state = "wood"
},
/area/bigredv2/outside/library)
-"hhv" = (
-/obj/structure/pipes/standard/manifold/hidden/green{
- dir = 8
- },
+"hhA" = (
/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood,
+/obj/effect/landmark/corpsespawner/colonist,
+/obj/effect/decal/cleanable/blood/gibs/body,
/turf/open/floor{
- icon_state = "wood"
- },
-/area/bigredv2/outside/bar)
-"hhC" = (
-/obj/item/frame/table/reinforced,
-/turf/open/floor{
- dir = 4;
- icon_state = "whitegreen"
+ icon_state = "dark"
},
-/area/bigredv2/outside/medical)
+/area/bigredv2/outside/general_offices)
"hhK" = (
/turf/open/floor{
dir = 1;
icon_state = "darkyellow2"
},
/area/bigredv2/outside/engineering)
-"hhM" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/effect/decal/cleanable/blood/xeno,
-/turf/open/floor{
- dir = 4;
- icon_state = "redcorner"
- },
-/area/bigredv2/outside/marshal_office)
-"hhX" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 10
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/crate/trashcart{
- pixel_x = -2;
- pixel_y = -1
- },
-/obj/item/prop{
- desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
- icon = 'icons/obj/janitor.dmi';
- icon_state = "trashbag3";
- name = "trash bag";
- pixel_x = -3;
- pixel_y = 2
- },
-/turf/open/floor/plating,
-/area/bigredv2/outside/bar)
-"hiL" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/ammo_casing/bullet,
-/turf/open/floor{
- icon_state = "redcorner"
+"hij" = (
+/turf/closed/wall/solaris{
+ damage = 1870;
+ damage_overlay = 5;
+ current_bulletholes = 3
},
-/area/bigredv2/outside/marshal_office)
+/area/bigredv2/outside/medical)
"hiP" = (
/obj/structure/sign/safety/one{
pixel_x = 16
@@ -32582,10 +30337,48 @@
icon_state = "mars_cave_15"
},
/area/bigredv2/caves_sw)
+"hjl" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached18"
+ },
+/area/bigredv2/outside/virology)
+"hjz" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/blood/xeno,
+/turf/open/floor{
+ dir = 1;
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
+"hkc" = (
+/obj/item/device/defibrillator{
+ pixel_x = -9;
+ pixel_y = -9
+ },
+/obj/item/reagent_container/hypospray/autoinjector/adrenaline{
+ pixel_y = 6;
+ pixel_x = 9
+ },
+/turf/open/floor{
+ icon_state = "white"
+ },
+/area/bigredv2/outside/medical)
"hkv" = (
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/plating,
/area/bigredv2/caves/eta/storage)
+"hkI" = (
+/obj/structure/blocker/forcefield/multitile_vehicles,
+/obj/effect/decal/cleanable/blood/gibs/limb,
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidfloor"
+ },
+/area/bigredv2/outside/eta)
"hkY" = (
/obj/structure/machinery/light{
dir = 4
@@ -32595,17 +30388,19 @@
icon_state = "darkred2"
},
/area/bigredv2/outside/admin_building)
-"hlU" = (
-/obj/effect/decal/cleanable/blood,
-/obj/structure/barricade/wooden{
- desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
- dir = 8;
- health = 25000
+"hmb" = (
+/obj/item/clothing/glasses/meson{
+ pixel_x = 3;
+ pixel_y = 4
+ },
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
},
+/obj/effect/decal/cleanable/dirt,
/turf/open/floor{
- icon_state = "wood"
+ icon_state = "whitegreencorner"
},
-/area/bigredv2/outside/bar)
+/area/bigredv2/outside/medical)
"hmm" = (
/turf/open/floor{
icon_state = "delivery"
@@ -32624,16 +30419,6 @@
icon_state = "mars_dirt_7"
},
/area/bigredv2/caves/mining)
-"hmS" = (
-/obj/effect/decal/medical_decals{
- icon_state = "triagedecalbottomleft"
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/item/ammo_casing/bullet,
-/turf/open/floor{
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
"hnh" = (
/obj/structure/machinery/light/small{
dir = 1
@@ -32642,35 +30427,6 @@
icon_state = "mars_cave_17"
},
/area/bigredv2/caves_research)
-"hnC" = (
-/obj/structure/flora/grass/desert/lightgrass_6,
-/turf/open/mars,
-/area/bigredv2/caves_north)
-"hof" = (
-/obj/item/weapon/gun/smg/mp5{
- current_mag = null;
- pixel_y = 8;
- pixel_x = -18
- },
-/obj/effect/decal/cleanable/blood,
-/obj/item/ammo_casing/bullet,
-/obj/item/ammo_casing/bullet,
-/obj/item/ammo_casing/bullet,
-/turf/open/floor{
- icon_state = "dark"
- },
-/area/bigredv2/outside/general_offices)
-"hor" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/door_control{
- id = "Medical";
- name = "Storm Shutters";
- pixel_y = -32
- },
-/turf/open/floor{
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
"hoQ" = (
/obj/effect/landmark/hunter_secondary,
/turf/open/mars_cave{
@@ -32692,22 +30448,17 @@
icon_state = "mars_dirt_13"
},
/area/bigredv2/outside/space_port_lz2)
-"hpv" = (
-/obj/structure/bed/chair,
+"hph" = (
+/obj/structure/flora/grass/desert/lightgrass_10,
+/turf/open/mars,
+/area/bigredv2/outside/space_port_lz2)
+"hpu" = (
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor,
-/area/bigredv2/outside/general_offices)
-"hqy" = (
-/obj/effect/decal/cleanable/blood/drip,
-/obj/item/trash/crushed_cup{
- pixel_x = -7;
- pixel_y = -8
- },
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
+/turf/open/floor/plating{
+ dir = 8;
+ icon_state = "platingdmg3"
},
-/area/bigredv2/outside/ne)
+/area/bigredv2/outside/medical)
"hqC" = (
/obj/item/ammo_magazine/rifle/mar40/lmg,
/turf/open/mars_cave{
@@ -32720,24 +30471,19 @@
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/lz2_south_cas)
+"hqG" = (
+/obj/item/prop/colony/canister{
+ pixel_y = -10
+ },
+/obj/effect/decal/cleanable/generic,
+/turf/open/mars_cave{
+ icon_state = "mars_cave_19"
+ },
+/area/bigredv2/outside/nw)
"hqO" = (
/obj/structure/blocker/forcefield/multitile_vehicles,
/turf/open/mars,
/area/bigredv2/caves_north)
-"hqQ" = (
-/obj/item/trash/cigbutt{
- pixel_x = -1;
- pixel_y = 17
- },
-/obj/item/newspaper{
- pixel_x = 7;
- pixel_y = -12
- },
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
- },
-/area/bigredv2/outside/ne)
"hqS" = (
/obj/effect/decal/warning_stripes{
icon_state = "E-corner"
@@ -32746,15 +30492,58 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/outside/filtration_cave_cas)
-"hro" = (
-/obj/item/trash/cigbutt{
- pixel_x = -10;
+"hrh" = (
+/obj/effect/decal/cleanable/blood/gibs/body,
+/obj/effect/decal/cleanable/blood,
+/obj/effect/decal/cleanable/blood/drip,
+/obj/item/clothing/head/helmet/marine/desert{
+ pixel_x = 10;
pixel_y = 7
},
-/turf/open/mars{
- icon_state = "mars_dirt_5"
+/turf/open/floor,
+/area/bigredv2/outside/office_complex)
+"hrp" = (
+/obj/item/tool/warning_cone{
+ pixel_x = 16;
+ pixel_y = 14
+ },
+/obj/structure/flora/grass/desert/lightgrass_4,
+/turf/open/mars,
+/area/bigredv2/outside/n)
+"hrA" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/obj/item/trash/cigbutt{
+ pixel_x = -6;
+ pixel_y = -9
},
+/turf/open/asphalt/cement_sunbleached,
/area/bigredv2/outside/nw)
+"hrC" = (
+/turf/open/asphalt/cement{
+ icon_state = "cement1"
+ },
+/area/bigredv2/outside/lambda_cave_cas)
+"hrD" = (
+/obj/structure/barricade/wooden{
+ pixel_y = 2
+ },
+/turf/open/floor,
+/area/bigredv2/outside/general_offices)
+"hrP" = (
+/turf/closed/wall/solaris{
+ damage = 500;
+ damage_overlay = 2;
+ current_bulletholes = 1
+ },
+/area/bigredv2/outside/medical)
+"hsz" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/barricade/wooden,
+/turf/open/floor,
+/area/bigredv2/outside/marshal_office)
"hsF" = (
/obj/structure/closet/firecloset/full,
/obj/effect/landmark/objective_landmark/close,
@@ -32769,24 +30558,86 @@
icon_state = "asteroidfloor"
},
/area/bigredv2/outside/filtration_plant)
-"htn" = (
-/obj/structure/cargo_container/arious/right,
-/turf/open/floor/plating/plating_catwalk,
-/area/bigredv2/outside/space_port)
-"htu" = (
-/obj/effect/decal/cleanable/dirt,
+"hsR" = (
/obj/item/trash/cigbutt{
pixel_x = 1;
pixel_y = 5
},
/turf/open/floor{
+ dir = 1;
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/c)
-"htN" = (
-/obj/structure/flora/grass/desert/lightgrass_4,
-/turf/open/mars,
-/area/bigredv2/outside/se)
+"hsT" = (
+/obj/item/trash/cigbutt{
+ pixel_x = 1;
+ pixel_y = 5
+ },
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached9"
+ },
+/area/bigredv2/outside/c)
+"hsY" = (
+/obj/effect/decal/medical_decals{
+ icon_state = "triagedecalleft"
+ },
+/turf/open/floor{
+ dir = 8;
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
+"htl" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/machinery/botany,
+/turf/open/floor{
+ icon_state = "white"
+ },
+/area/bigredv2/outside/marshal_office)
+"htn" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood/gibs/xeno,
+/obj/effect/decal/cleanable/blood/xeno,
+/turf/open/floor,
+/area/bigredv2/outside/office_complex)
+"htq" = (
+/obj/item/storage/firstaid/o2/empty{
+ pixel_y = 4;
+ pixel_x = -11
+ },
+/turf/open/floor{
+ icon_state = "whitegreencorner"
+ },
+/area/bigredv2/outside/medical)
+"htZ" = (
+/obj/effect/decal/strata_decals/grime/grime1{
+ dir = 8
+ },
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached4"
+ },
+/area/bigredv2/outside/c)
+"huh" = (
+/obj/item/tool/mop{
+ pixel_y = 19;
+ pixel_x = 10
+ },
+/obj/effect/decal/cleanable/generic,
+/obj/effect/decal/cleanable/blood/gibs/body,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached1"
+ },
+/area/bigredv2/outside/nw)
+"huE" = (
+/obj/item/stack/rods{
+ pixel_y = -2
+ },
+/turf/open/floor{
+ icon_state = "darkish"
+ },
+/area/bigredv2/outside/medical)
"hvQ" = (
/obj/structure/machinery/light/small{
dir = 8
@@ -32802,12 +30653,6 @@
icon_state = "mars_cave_17"
},
/area/bigredv2/caves/mining)
-"hwo" = (
-/obj/effect/decal/cleanable/blood/gibs/body,
-/turf/open/gm/river{
- color = "#995555"
- },
-/area/bigredv2/outside/c)
"hwy" = (
/obj/effect/landmark/crap_item,
/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
@@ -32815,6 +30660,15 @@
icon_state = "dark"
},
/area/bigredv2/caves/lambda/research)
+"hwM" = (
+/obj/structure/machinery/light{
+ dir = 1
+ },
+/turf/open/floor{
+ dir = 1;
+ icon_state = "whitegreencorner"
+ },
+/area/bigredv2/outside/medical)
"hxs" = (
/obj/structure/closet/secure_closet/personal/cabinet,
/obj/effect/landmark/objective_landmark/far,
@@ -32822,12 +30676,18 @@
icon_state = "wood"
},
/area/bigredv2/outside/admin_building)
-"hxz" = (
-/obj/effect/decal/cleanable/blood/gibs/limb,
+"hxP" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/vomit{
+ icon_state = "vomit_4"
+ },
/turf/open/floor{
- icon_state = "asteroidwarning"
+ icon_state = "wood"
},
-/area/bigredv2/outside/n)
+/area/bigredv2/outside/bar)
"hyv" = (
/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
@@ -32840,14 +30700,18 @@
icon_state = "bcircuit"
},
/area/bigredv2/outside/telecomm/warehouse)
-"hyK" = (
+"hyI" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/shard,
-/turf/open/floor{
- dir = 1;
- icon_state = "whitepurplecorner"
+/obj/item/trash/pistachios{
+ pixel_y = -21;
+ pixel_x = -6
},
-/area/bigredv2/outside/medical)
+/obj/item/stack/sheet/cardboard{
+ pixel_x = -1;
+ pixel_y = 6
+ },
+/turf/open/floor/plating,
+/area/bigredv2/outside/bar)
"hzg" = (
/obj/structure/cable{
icon_state = "1-6"
@@ -32875,41 +30739,60 @@
/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
/turf/open/mars_cave,
/area/bigredv2/caves_research)
-"hAy" = (
-/obj/effect/decal/strata_decals/grime/grime2{
- dir = 8
+"hAp" = (
+/obj/structure/machinery/cm_vending/sorted/medical/wall_med/limited{
+ name = "Emergency NanoMed";
+ pixel_x = 30
},
-/obj/item/stack/sheet/cardboard{
- pixel_x = -9;
- pixel_y = -5
+/obj/item/shard,
+/turf/open/floor{
+ dir = 6;
+ icon_state = "red"
+ },
+/area/bigredv2/outside/marshal_office)
+"hAE" = (
+/obj/structure/surface/table,
+/obj/item/clothing/suit/storage/CMB{
+ pixel_x = 7;
+ pixel_y = 6
+ },
+/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
+/turf/open/floor,
+/area/bigredv2/outside/marshal_office)
+"hAQ" = (
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached9"
},
+/area/bigredv2/outside/c)
+"hBD" = (
+/obj/structure/bed/chair,
+/turf/open/floor,
+/area/bigred/ground/garage_workshop)
+"hBI" = (
+/obj/effect/decal/cleanable/blood/drip,
/turf/open/floor{
dir = 1;
icon_state = "asteroidfloor"
},
-/area/bigredv2/outside/nw)
-"hBa" = (
-/obj/item/trash/crushed_cup{
- pixel_x = -7;
- pixel_y = -8
+/area/bigredv2/outside/c)
+"hBV" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/obj/structure/barricade/wooden{
+ desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
+ dir = 1;
+ health = 25000;
+ pixel_y = 20
},
-/turf/open/floor{
- dir = 4;
- icon_state = "asteroidwarning"
+/obj/structure/machinery/vending/cigarette/colony{
+ layer = 3.1;
+ pixel_y = 9
},
-/area/bigredv2/outside/ne)
-"hBl" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/botany,
-/turf/open/floor{
- icon_state = "redcorner"
+/obj/structure/largecrate/random/mini/chest/b{
+ layer = 3.2;
+ pixel_y = -4
},
-/area/bigredv2/outside/marshal_office)
-"hBD" = (
-/obj/structure/bed/chair,
/turf/open/floor,
-/area/bigred/ground/garage_workshop)
+/area/bigredv2/outside/general_offices)
"hCT" = (
/obj/structure/surface/rack,
/obj/item/clothing/head/hardhat/dblue{
@@ -32931,6 +30814,11 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
+"hCV" = (
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached12"
+ },
+/area/bigredv2/outside/c)
"hDK" = (
/obj/structure/largecrate/supply,
/obj/effect/decal/cleanable/dirt,
@@ -32939,17 +30827,6 @@
icon_state = "asteroidfloor"
},
/area/bigredv2/outside/n)
-"hDU" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/trash/hotdog{
- pixel_x = -9;
- pixel_y = 1
- },
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
- },
-/area/bigredv2/outside/ne)
"hEz" = (
/turf/open/mars_cave{
icon_state = "mars_cave_6"
@@ -32971,6 +30848,14 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
+"hEW" = (
+/obj/item/trash/cigbutt{
+ pixel_x = 4
+ },
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached4"
+ },
+/area/bigredv2/outside/e)
"hFg" = (
/obj/effect/landmark/crap_item,
/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
@@ -32978,6 +30863,24 @@
icon_state = "mars_cave_6"
},
/area/bigredv2/caves_lambda)
+"hFi" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/obj/structure/barricade/wooden{
+ dir = 1;
+ pixel_y = 7
+ },
+/obj/structure/largecrate/supply/medicine/iv{
+ pixel_y = -7;
+ pixel_x = 3
+ },
+/obj/structure/largecrate/random/mini/med{
+ pixel_x = 5;
+ pixel_y = 6
+ },
+/turf/open/floor{
+ icon_state = "whitegreencorner"
+ },
+/area/bigredv2/outside/medical)
"hFv" = (
/obj/structure/platform{
dir = 4
@@ -32987,12 +30890,12 @@
icon_state = "asteroidfloor"
},
/area/bigredv2/outside/telecomm/n_cave)
-"hFA" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached2"
+"hFN" = (
+/obj/effect/decal/cleanable/generic,
+/turf/open/floor{
+ icon_state = "wood"
},
-/area/bigredv2/outside/se)
+/area/bigredv2/outside/bar)
"hFP" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/landmark/item_pool_spawner/survivor_ammo,
@@ -33007,16 +30910,21 @@
icon_state = "mars_cave_9"
},
/area/bigredv2/outside/n)
-"hGg" = (
-/obj/structure/reagent_dispensers/beerkeg,
-/obj/item/reagent_container/food/drinks/cup{
- pixel_x = -3;
- pixel_y = 12
+"hFW" = (
+/obj/structure/flora/grass/desert/lightgrass_4,
+/turf/open/mars,
+/area/bigredv2/outside/nw)
+"hFZ" = (
+/obj/structure/prop/wooden_cross,
+/turf/open/mars_cave{
+ icon_state = "mars_cave_2"
},
-/turf/open/floor{
- icon_state = "wood"
+/area/bigredv2/outside/nw)
+"hGs" = (
+/turf/open/mars{
+ icon_state = "mars_dirt_5"
},
-/area/bigredv2/outside/bar)
+/area/bigredv2/outside/nw)
"hGv" = (
/obj/structure/machinery/light,
/turf/open/floor{
@@ -33024,6 +30932,18 @@
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/n)
+"hGH" = (
+/obj/structure/machinery/door/airlock/almayer/medical/glass/colony{
+ dir = 1;
+ id_tag = "mbayexit";
+ name = "Medbay Reception";
+ req_one_access_txt = "2;8;19"
+ },
+/turf/open/floor{
+ dir = 4;
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
"hHa" = (
/obj/structure/fence,
/turf/open/floor{
@@ -33035,67 +30955,42 @@
/obj/structure/sign/safety/ladder,
/turf/closed/wall/solaris/reinforced/hull,
/area/bigredv2/oob)
+"hHl" = (
+/obj/effect/landmark/hunter_primary,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidfloor"
+ },
+/area/bigredv2/outside/ne)
"hHG" = (
/obj/structure/machinery/power/reactor/colony,
/turf/open/floor/plating,
/area/bigredv2/caves/eta/storage)
-"hIC" = (
-/obj/effect/decal/strata_decals/grime/grime4,
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidwarning"
- },
-/area/bigredv2/outside/nw)
-"hIH" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/trash/hotdog{
- pixel_x = -12;
- pixel_y = -11
- },
-/obj/item/trash/cigbutt{
- pixel_x = 7
- },
-/turf/open/floor{
- icon_state = "dark"
- },
-/area/bigredv2/outside/marshal_office)
-"hIL" = (
-/obj/effect/decal/cleanable/dirt,
+"hIY" = (
/turf/open/asphalt/cement{
- icon_state = "cement4"
+ icon_state = "cement14"
},
/area/bigredv2/outside/filtration_cave_cas)
-"hJd" = (
-/obj/structure/barricade/handrail{
- dir = 4
- },
-/obj/effect/decal/cleanable/generic,
-/turf/open/floor{
- dir = 4;
- icon_state = "asteroidwarning"
+"hIZ" = (
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached3"
},
-/area/bigredv2/outside/c)
-"hJr" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/oil/streak,
-/turf/open/floor,
-/area/bigredv2/outside/office_complex)
+/area/bigredv2/outside/nw)
"hJH" = (
/obj/effect/landmark/static_comms/net_one,
/turf/open/floor{
icon_state = "podhatchfloor"
},
/area/bigredv2/outside/telecomm/n_cave)
-"hKj" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot{
- pixel_x = 7;
- pixel_y = -9
- },
-/turf/open/floor{
- icon_state = "dark"
+"hJO" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
},
-/area/bigredv2/outside/general_offices)
+/turf/open/asphalt/cement,
+/area/bigredv2/caves_lambda)
"hKl" = (
/obj/structure/surface/rack,
/obj/item/reagent_container/food/drinks/bottle/goldschlager,
@@ -33132,44 +31027,33 @@
icon_state = "red"
},
/area/bigredv2/outside/lambda_cave_cas)
-"hKV" = (
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached2"
- },
-/area/bigredv2/outside/c)
-"hLn" = (
-/obj/structure/machinery/suit_storage_unit/carbon_unit{
- icon_state = "open"
- },
+"hLk" = (
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor,
+/area/bigredv2/outside/dorms)
+"hLl" = (
+/obj/structure/barricade/deployable,
/turf/open/floor{
- icon_state = "dark"
+ dir = 1;
+ icon_state = "asteroidfloor"
},
-/area/bigredv2/outside/general_offices)
+/area/bigredv2/outside/nw)
+"hLm" = (
+/obj/structure/surface/table,
+/obj/effect/spawner/random/toolbox{
+ pixel_x = 1;
+ pixel_y = -7
+ },
+/turf/open/floor,
+/area/bigredv2/outside/dorms)
"hLp" = (
/obj/effect/landmark/corpsespawner/ua_riot,
/turf/open/mars_cave,
/area/bigredv2/caves/mining)
-"hLs" = (
-/turf/open/asphalt/cement{
- icon_state = "cement4"
- },
-/area/bigredv2/outside/lambda_cave_cas)
"hLS" = (
/obj/structure/sign/poster/safety,
/turf/closed/wall/wood,
/area/bigredv2/caves/mining)
-"hLT" = (
-/obj/structure/flora/grass/desert/lightgrass_6,
-/turf/open/mars,
-/area/bigredv2/outside/se)
-"hMC" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 10
- },
-/turf/open/floor{
- icon_state = "whitegreenfull"
- },
-/area/bigredv2/outside/medical)
"hNg" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/landmark/crap_item,
@@ -33178,27 +31062,34 @@
icon_state = "dark"
},
/area/bigredv2/caves/eta/research)
-"hNy" = (
-/obj/structure/prop/invuln/rope{
- pixel_x = -5;
- pixel_y = 26
+"hOh" = (
+/obj/effect/decal/strata_decals/grime/grime2{
+ dir = 8
},
-/obj/effect/decal/cleanable/blood/drip,
-/obj/item/prop/colony/usedbandage{
- dir = 4;
- pixel_x = 10;
- pixel_y = -4
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached12"
},
-/turf/open/mars_cave{
- icon_state = "mars_cave_7"
+/area/bigredv2/outside/c)
+"hOo" = (
+/obj/item/trash/cigbutt{
+ pixel_x = -10;
+ pixel_y = 16
},
-/area/bigredv2/outside/n)
-"hNW" = (
-/obj/structure/machinery/light,
-/turf/open/asphalt/cement{
- icon_state = "cement12"
+/obj/item/trash/cigbutt{
+ pixel_x = -6;
+ pixel_y = -2
},
-/area/bigredv2/outside/lambda_cave_cas)
+/turf/open/floor{
+ icon_state = "whitegreenfull"
+ },
+/area/bigredv2/outside/medical)
+"hOp" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood/xeno,
+/turf/open/floor{
+ icon_state = "redcorner"
+ },
+/area/bigredv2/outside/marshal_office)
"hOx" = (
/obj/structure/machinery/portable_atmospherics/powered/scrubber/huge/stationary,
/turf/open/floor{
@@ -33206,10 +31097,14 @@
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/filtration_plant)
-"hOI" = (
-/obj/effect/decal/strata_decals/grime/grime3,
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/c)
+"hOR" = (
+/obj/item/stack/sheet/metal{
+ pixel_x = 2;
+ pixel_y = 6
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor,
+/area/bigredv2/outside/general_offices)
"hOS" = (
/obj/structure/surface/table,
/obj/item/clothing/head/collectable/tophat/super,
@@ -33218,13 +31113,42 @@
icon_state = "whitebluefull"
},
/area/bigredv2/outside/general_store)
-"hPb" = (
-/obj/item/trash/cheesie,
+"hPd" = (
+/obj/effect/decal/strata_decals/grime/grime2{
+ dir = 1
+ },
+/obj/structure/flora/grass/desert/lightgrass_2,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached12"
+ },
+/area/bigredv2/outside/nw)
+"hPi" = (
+/obj/item/prop{
+ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
+ icon = 'icons/obj/janitor.dmi';
+ icon_state = "trashbag3";
+ name = "trash bag";
+ pixel_x = 2;
+ pixel_y = -4
+ },
/turf/open/floor{
- dir = 4;
- icon_state = "redcorner"
+ dir = 1;
+ icon_state = "asteroidfloor"
},
-/area/bigredv2/outside/office_complex)
+/area/bigredv2/outside/ne)
+"hPq" = (
+/obj/item/prop/magazine/dirty/torn/alt{
+ pixel_x = -11;
+ pixel_y = 4
+ },
+/obj/item/reagent_container/food/drinks/cup{
+ pixel_x = 7;
+ pixel_y = -18
+ },
+/turf/open/mars_cave{
+ icon_state = "mars_cave_20"
+ },
+/area/bigredv2/outside/ne)
"hPS" = (
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
@@ -33233,30 +31157,17 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/caves_se)
-"hPU" = (
-/obj/item/trash/cigbutt{
- pixel_x = -14;
- pixel_y = -6
+"hQl" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor{
+ icon_state = "redcorner"
},
-/turf/open/floor,
-/area/bigredv2/outside/hydroponics)
+/area/bigredv2/outside/lambda_cave_cas)
"hQO" = (
/turf/open/mars_cave{
icon_state = "mars_cave_14"
},
/area/bigredv2/outside/n)
-"hQP" = (
-/obj/structure/surface/table,
-/obj/effect/decal/cleanable/blood,
-/obj/effect/decal/cleanable/blood/gibs/limb,
-/obj/item/tool/kitchen/knife/butcher{
- pixel_x = -4;
- pixel_y = -10
- },
-/turf/open/floor{
- icon_state = "wood"
- },
-/area/bigredv2/outside/general_offices)
"hRy" = (
/obj/structure/surface/rack,
/turf/open/floor/plating{
@@ -33264,19 +31175,20 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"hRR" = (
-/obj/structure/surface/table/reinforced,
-/turf/open/floor{
- dir = 4;
- icon_state = "whitegreen"
+"hRD" = (
+/obj/structure/flora/grass/desert/lightgrass_6,
+/turf/open/mars{
+ icon_state = "mars_dirt_11"
},
-/area/bigredv2/outside/medical)
-"hSD" = (
-/obj/structure/flora/grass/desert/lightgrass_1,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached1"
+/area/bigredv2/outside/space_port_lz2)
+"hRQ" = (
+/obj/effect/landmark/corpsespawner/scientist,
+/obj/effect/decal/cleanable/blood/gibs/body,
+/obj/effect/decal/cleanable/blood,
+/turf/open/mars_cave{
+ icon_state = "mars_dirt_4"
},
-/area/bigredv2/outside/c)
+/area/bigredv2/outside/eta)
"hSP" = (
/obj/structure/machinery/vending/cigarette/colony,
/turf/open/mars_cave{
@@ -33294,6 +31206,14 @@
icon_state = "delivery"
},
/area/bigredv2/outside/virology)
+"hTT" = (
+/obj/effect/landmark/corpsespawner/scientist,
+/obj/effect/decal/cleanable/blood/gibs/body,
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor{
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/eta)
"hUh" = (
/obj/item/spacecash/c1,
/turf/open/floor/plating{
@@ -33301,29 +31221,18 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"hUr" = (
+"hUm" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/trash/cigbutt{
- pixel_x = -6;
- pixel_y = -2
- },
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/e)
+"hUM" = (
+/obj/effect/decal/cleanable/blood/drip,
+/obj/effect/decal/cleanable/generic,
/turf/open/floor{
- dir = 8;
- icon_state = "asteroidwarning"
- },
-/area/bigredv2/outside/c)
-"hUF" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/bigredv2/outside/space_port)
-"hVx" = (
-/obj/item/trash/cigbutt{
- pixel_x = 4
- },
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached9"
+ dir = 1;
+ icon_state = "asteroidfloor"
},
-/area/bigredv2/outside/c)
+/area/bigredv2/outside/ne)
"hVP" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
@@ -33338,17 +31247,25 @@
icon_state = "dark"
},
/area/bigredv2/caves/lambda/research)
-"hWI" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/obj/item/reagent_container/food/drinks/bottle/beer/craft/reaper,
-/obj/item/reagent_container/food/drinks/bottle/beer/craft/reaper{
- pixel_y = 8;
- pixel_x = 17
+"hWC" = (
+/obj/structure/surface/table/woodentable,
+/obj/item/trash/cigbutt{
+ pixel_x = 4
},
/turf/open/floor{
icon_state = "wood"
},
/area/bigredv2/outside/bar)
+"hWI" = (
+/obj/structure/bed/roller,
+/obj/item/trash/cigbutt{
+ pixel_x = -10;
+ pixel_y = 7
+ },
+/turf/open/floor{
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
"hWM" = (
/obj/structure/machinery/filtration/console{
pixel_y = 15
@@ -33357,21 +31274,30 @@
icon_state = "mars_cave_15"
},
/area/bigredv2/caves/mining)
-"hWP" = (
-/obj/item/ashtray/glass,
+"hXw" = (
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor{
- icon_state = "wood"
+/obj/item/prop{
+ desc = "A bunch of tiny bits of shattered metal.";
+ icon = 'icons/obj/items/shards.dmi';
+ icon_state = "shrapnelsmall";
+ name = "piece of shrapnel";
+ pixel_x = -1;
+ pixel_y = 24
},
-/area/bigredv2/outside/bar)
-"hXA" = (
-/obj/effect/decal/strata_decals/grime/grime1{
- dir = 1
+/turf/open/floor{
+ icon_state = "white"
},
+/area/bigredv2/outside/medical)
+"hXJ" = (
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor/plating,
+/area/bigredv2/outside/medical)
+"hYz" = (
+/obj/effect/decal/cleanable/generic,
/turf/open/asphalt/cement_sunbleached{
icon_state = "cement_sunbleached12"
},
-/area/bigredv2/outside/c)
+/area/bigredv2/outside/filtration_plant)
"hYB" = (
/obj/structure/platform{
dir = 1
@@ -33423,6 +31349,29 @@
/obj/structure/platform,
/turf/open/gm/river,
/area/bigredv2/outside/engineering)
+"iaD" = (
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/floor{
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/n)
+"iaJ" = (
+/obj/effect/landmark/corpsespawner/security/marshal,
+/obj/item/weapon/gun/revolver/cmb{
+ pixel_x = 7;
+ pixel_y = -13
+ },
+/obj/effect/decal/cleanable/blood,
+/obj/effect/decal/cleanable/blood/gibs/body,
+/obj/item/explosive/grenade/high_explosive{
+ pixel_x = -11;
+ pixel_y = 17
+ },
+/turf/open/floor{
+ dir = 1;
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
"iaN" = (
/obj/structure/largecrate/random/barrel/red,
/obj/effect/decal/cleanable/dirt,
@@ -33443,21 +31392,17 @@
icon_state = "mars_cave_16"
},
/area/bigredv2/caves/mining)
-"ibj" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/obj/structure/machinery/botany,
-/turf/open/floor{
- icon_state = "white"
- },
-/area/bigredv2/outside/marshal_office)
-"ibH" = (
-/obj/item/prop/colony/usedbandage{
- dir = 5;
- pixel_y = 8
+"ibt" = (
+/obj/structure/flora/grass/desert/lightgrass_6,
+/turf/open/mars,
+/area/bigredv2/outside/e)
+"ibK" = (
+/obj/structure/bed/chair/office/light{
+ dir = 8
},
-/obj/effect/decal/cleanable/blood,
/turf/open/floor{
- icon_state = "white"
+ dir = 8;
+ icon_state = "whitegreencorner"
},
/area/bigredv2/outside/medical)
"ibP" = (
@@ -33484,45 +31429,44 @@
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/space_port_lz2)
-"icf" = (
-/obj/structure/flora/grass/desert/lightgrass_7,
-/turf/open/mars,
-/area/bigredv2/outside/s)
-"icA" = (
-/obj/structure/window_frame/solaris,
-/obj/item/stack/rods{
- pixel_y = 4;
- pixel_x = -13
+"icC" = (
+/obj/item/prop/helmetgarb/rosary{
+ pixel_y = 7;
+ pixel_x = 12
},
-/obj/item/shard,
-/obj/effect/decal/cleanable/blood/xeno,
-/turf/open/floor/plating,
-/area/bigredv2/outside/medical)
-"icE" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/stack/sheet/metal{
- pixel_x = 1;
- pixel_y = -2
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached12"
},
-/turf/open/floor,
-/area/bigredv2/outside/general_offices)
+/area/bigredv2/outside/nw)
"icQ" = (
/turf/open/mars_cave{
icon_state = "mars_cave_6"
},
/area/bigredv2/caves_sw)
+"idf" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/medical_decals{
+ icon_state = "triagedecalbottom"
+ },
+/turf/open/floor{
+ dir = 6;
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
+"idm" = (
+/obj/item/trash/cigbutt{
+ pixel_x = -10;
+ pixel_y = 16
+ },
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/nw)
"idn" = (
/obj/structure/blocker/forcefield/multitile_vehicles,
/turf/open/mars_cave{
icon_state = "mars_dirt_4"
},
/area/bigredv2/outside/n)
-"idy" = (
-/obj/structure/flora/grass/desert/lightgrass_1,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
- },
-/area/bigredv2/outside/c)
"idM" = (
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor{
@@ -33530,21 +31474,35 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/engineering)
+"idQ" = (
+/obj/structure/flora/grass/desert/lightgrass_7,
+/turf/open/mars,
+/area/bigredv2/outside/s)
"idT" = (
/turf/open/mars_cave{
icon_state = "mars_cave_9"
},
/area/bigredv2/caves_lambda)
-"ied" = (
-/obj/structure/surface/table,
-/obj/item/clothing/under/brown{
- pixel_y = 7;
- pixel_x = 12
+"iee" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/structure/surface/table/woodentable{
+ flipped = 1
},
/turf/open/floor{
- icon_state = "freezerfloor"
+ icon_state = "wood"
},
-/area/bigredv2/outside/general_offices)
+/area/bigredv2/outside/bar)
+"iem" = (
+/obj/item/trash/cigbutt{
+ pixel_x = -1;
+ pixel_y = 17
+ },
+/turf/open/mars_cave{
+ icon_state = "mars_dirt_4"
+ },
+/area/bigredv2/outside/c)
"iep" = (
/obj/structure/surface/rack,
/obj/item/clothing/head/hardhat/dblue{
@@ -33562,6 +31520,17 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/caves/mining)
+"iex" = (
+/obj/item/trash/cigbutt{
+ pixel_x = -10;
+ pixel_y = 16
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidfloor"
+ },
+/area/bigredv2/outside/ne)
"ieD" = (
/obj/structure/surface/rack,
/obj/item/stack/sheet/copper{
@@ -33578,15 +31547,33 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"ift" = (
-/obj/structure/bed/chair{
- dir = 4;
- layer = 3.06
+"ifc" = (
+/obj/effect/decal/cleanable/generic,
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidfloor"
},
-/turf/open/mars_cave{
- icon_state = "mars_cave_2"
+/area/bigredv2/outside/c)
+"iff" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/weapon/gun/smg/mp5{
+ current_mag = null;
+ pixel_y = 8;
+ pixel_x = -18
},
-/area/bigredv2/outside/ne)
+/obj/item/ammo_casing/bullet,
+/obj/item/ammo_casing/bullet,
+/obj/item/ammo_casing/bullet,
+/obj/item/ammo_casing/bullet,
+/obj/item/ammo_casing/bullet,
+/obj/effect/landmark/corpsespawner/security/marshal,
+/obj/effect/decal/cleanable/blood,
+/obj/effect/decal/cleanable/blood/gibs/body,
+/turf/open/floor{
+ icon_state = "whitegreenfull"
+ },
+/area/bigredv2/outside/medical)
"ifF" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -33600,13 +31587,16 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"ifH" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
+"ifW" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/barricade/handrail/medical{
+ dir = 1
},
-/obj/effect/decal/cleanable/generic,
-/turf/open/floor,
-/area/bigredv2/outside/hydroponics)
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/nw)
"igM" = (
/obj/effect/decal/cleanable/blood/drip{
pixel_x = 6
@@ -33624,13 +31614,15 @@
icon_state = "mars_cave_16"
},
/area/bigredv2/caves/mining)
-"ihm" = (
-/turf/closed/wall/solaris{
- damage = 500;
- damage_overlay = 2;
- current_bulletholes = 1
+"ihG" = (
+/obj/item/trash/cigbutt{
+ pixel_x = -6;
+ pixel_y = -9
},
-/area/bigredv2/outside/medical)
+/turf/open/asphalt/cement{
+ icon_state = "cement4"
+ },
+/area/bigredv2/outside/space_port)
"ihW" = (
/turf/open/mars_cave{
icon_state = "mars_dirt_7"
@@ -33650,6 +31642,11 @@
icon_state = "red"
},
/area/bigredv2/outside/marshal_office)
+"ijS" = (
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached12"
+ },
+/area/bigredv2/outside/virology)
"ijU" = (
/obj/structure/prop/almayer/cannon_cables{
name = "\improper Cables"
@@ -33663,28 +31660,6 @@
icon_state = "floor1"
},
/area/bigredv2/oob)
-"ikj" = (
-/obj/structure/flora/grass/desert/lightgrass_7,
-/turf/open/mars,
-/area/bigredv2/outside/eta)
-"ikm" = (
-/obj/structure/platform/kutjevo/rock{
- dir = 4;
- layer = 2.9;
- pixel_x = 4
- },
-/turf/closed/wall/solaris/rock,
-/area/bigredv2/caves)
-"ilf" = (
-/obj/effect/decal/strata_decals/grime/grime3,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached1"
- },
-/area/bigredv2/outside/s)
-"ily" = (
-/obj/structure/flora/grass/desert/lightgrass_8,
-/turf/open/mars,
-/area/bigredv2/outside/nw)
"ilH" = (
/obj/structure/machinery/light,
/obj/structure/machinery/portable_atmospherics/hydroponics,
@@ -33700,12 +31675,6 @@
icon_state = "mars_cave_20"
},
/area/bigredv2/caves/mining)
-"ima" = (
-/obj/item/ammo_casing/bullet,
-/turf/open/floor{
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
"iml" = (
/obj/effect/landmark/crap_item,
/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
@@ -33719,6 +31688,15 @@
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/filtration_plant)
+"inY" = (
+/turf/open/asphalt/cement{
+ icon_state = "cement3"
+ },
+/area/bigredv2/caves_lambda)
+"ioq" = (
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/c)
"ioA" = (
/obj/item/tool/pickaxe{
pixel_y = -7
@@ -33739,11 +31717,30 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
+"ioR" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 10
+ },
+/obj/structure/barricade/metal,
+/turf/open/floor{
+ icon_state = "dark"
+ },
+/area/bigredv2/outside/admin_building)
"ioS" = (
/turf/open/floor{
icon_state = "dark"
},
/area/bigredv2/caves/eta/living)
+"ioU" = (
+/obj/item/reagent_container/glass/bucket/mopbucket{
+ pixel_x = 7;
+ pixel_y = 9
+ },
+/turf/open/floor{
+ dir = 4;
+ icon_state = "whiteyellowfull"
+ },
+/area/bigredv2/outside/office_complex)
"ipf" = (
/obj/item/device/flashlight/lantern{
pixel_x = -6
@@ -33769,47 +31766,39 @@
icon_state = "mars_dirt_4"
},
/area/bigredv2/caves_north)
-"ipL" = (
-/obj/structure/surface/table/woodentable{
- dir = 8;
- flipped = 1
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor{
- icon_state = "wood"
+"ipQ" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
},
-/area/bigredv2/outside/bar)
-"iqb" = (
-/obj/item/shard,
-/turf/open/floor{
- icon_state = "whitegreencorner"
- },
-/area/bigredv2/outside/medical)
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/floor,
+/area/bigredv2/outside/general_offices)
"iqF" = (
/obj/structure/prop/invuln/minecart_tracks,
/turf/open/mars_cave{
icon_state = "mars_dirt_7"
},
/area/bigredv2/caves/mining)
-"iqG" = (
-/obj/structure/flora/grass/desert/lightgrass_2,
-/turf/open/mars{
- icon_state = "mars_dirt_10"
- },
-/area/bigredv2/outside/nw)
-"iqT" = (
-/obj/structure/surface/rack,
-/obj/effect/spawner/random/tool,
-/turf/open/floor,
-/area/bigredv2/outside/general_offices)
-"irE" = (
+"irp" = (
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/bigredv2/outside/general_offices)
+/obj/item/trash/cigbutt{
+ pixel_x = 1;
+ pixel_y = 5
+ },
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached4"
+ },
+/area/bigredv2/outside/se)
"irK" = (
-/obj/structure/flora/grass/desert/lightgrass_12,
-/turf/open/mars,
-/area/bigredv2/outside/nw)
+/obj/structure/surface/table,
+/obj/structure/machinery/light{
+ dir = 4
+ },
+/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
+/turf/open/floor{
+ icon_state = "whitegreenfull"
+ },
+/area/bigredv2/outside/medical)
"irM" = (
/obj/item/weapon/shield/riot,
/turf/open/mars_cave{
@@ -33821,24 +31810,11 @@
/turf/open/floor/plating,
/area/bigredv2/outside/filtration_plant)
"irO" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/xeno,
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
- },
-/area/bigredv2/outside/c)
-"irT" = (
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
+/obj/structure/flora/grass/desert/lightgrass_1,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached12"
},
-/area/bigredv2/outside/c)
-"irU" = (
-/obj/structure/flora/grass/desert/lightgrass_11,
-/turf/open/mars,
-/area/bigredv2/outside/ne)
+/area/bigredv2/outside/filtration_plant)
"irZ" = (
/obj/structure/machinery/light{
dir = 4
@@ -33848,6 +31824,51 @@
icon_state = "red"
},
/area/bigredv2/outside/lambda_cave_cas)
+"isp" = (
+/obj/item/ammo_casing/bullet,
+/obj/item/ammo_casing/bullet,
+/turf/open/floor{
+ dir = 4;
+ icon_state = "redcorner"
+ },
+/area/bigredv2/outside/marshal_office)
+"isK" = (
+/obj/structure/surface/table,
+/obj/item/clothing/under/color/orange,
+/turf/open/floor{
+ icon_state = "white"
+ },
+/area/bigredv2/outside/marshal_office)
+"isP" = (
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/floor{
+ dir = 5;
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/telecomm/n_cave)
+"itq" = (
+/obj/structure/surface/table,
+/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot{
+ pixel_y = 8;
+ pixel_x = -11
+ },
+/turf/open/floor{
+ icon_state = "dark"
+ },
+/area/bigredv2/outside/general_offices)
+"itK" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/item/trash/semki{
+ pixel_x = 6;
+ pixel_y = -5
+ },
+/turf/open/floor{
+ dir = 8;
+ icon_state = "warnwhite"
+ },
+/area/bigredv2/outside/medical)
"itL" = (
/obj/structure/closet/l3closet/virology,
/obj/effect/landmark/objective_landmark/science,
@@ -33855,47 +31876,72 @@
icon_state = "white"
},
/area/bigredv2/outside/virology)
-"iul" = (
-/obj/effect/spawner/random/claymore/highchance,
-/turf/closed/wall/solaris/rock,
-/area/bigredv2/caves)
"iuu" = (
/turf/open/mars_cave{
icon_state = "mars_cave_16"
},
/area/bigredv2/outside/lz1_north_cas)
-"ivf" = (
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached15"
- },
-/area/bigredv2/outside/w)
-"ivg" = (
-/obj/effect/decal/cleanable/blood/drip,
-/turf/open/floor,
-/area/bigredv2/outside/cargo)
+"ivz" = (
+/obj/structure/flora/grass/desert/lightgrass_12,
+/turf/open/mars,
+/area/bigredv2/outside/n)
"ivW" = (
/turf/open/mars_cave{
icon_state = "mars_cave_9"
},
/area/bigredv2/outside/ne)
+"iwx" = (
+/obj/effect/decal/strata_decals/grime/grime3,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached3"
+ },
+/area/bigredv2/outside/se)
"iwG" = (
/obj/effect/landmark/crap_item,
/turf/open/mars_cave{
icon_state = "mars_cave_2"
},
/area/bigredv2/caves_virology)
+"iwJ" = (
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached1"
+ },
+/area/bigredv2/outside/nw)
"ixA" = (
/obj/item/ore,
/turf/open/mars_cave{
icon_state = "mars_dirt_6"
},
/area/bigredv2/caves/mining)
-"ixN" = (
-/obj/structure/flora/bush/desert{
- icon_state = "tree_3"
+"ixM" = (
+/obj/effect/decal/cleanable/blood,
+/obj/item/stack/sheet/wood{
+ pixel_y = -6
},
-/turf/open/mars,
-/area/bigredv2/outside/ne)
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor,
+/area/bigredv2/outside/general_offices)
+"iyw" = (
+/obj/effect/acid_hole{
+ dir = 4
+ },
+/turf/closed/wall/solaris,
+/area/bigredv2/outside/medical)
+"iyJ" = (
+/obj/item/bedsheet/brown{
+ pixel_y = -1;
+ pixel_x = 1
+ },
+/turf/open/floor{
+ icon_state = "dark"
+ },
+/area/bigredv2/outside/marshal_office)
+"iyN" = (
+/obj/effect/decal/strata_decals/grime/grime4,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached12"
+ },
+/area/bigredv2/outside/nw)
"iyY" = (
/turf/open/mars_cave{
icon_state = "mars_cave_13"
@@ -33914,30 +31960,30 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/caves_se)
-"izv" = (
-/obj/structure/flora/grass/desert/lightgrass_9,
-/turf/open/mars,
-/area/bigredv2/outside/virology)
-"izW" = (
-/turf/closed/wall/solaris{
- damage = 1870;
- damage_overlay = 5;
- current_bulletholes = 1
+"izJ" = (
+/obj/item/tool/warning_cone{
+ pixel_x = -14;
+ pixel_y = 10
},
-/area/bigredv2/outside/office_complex)
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached4"
+ },
+/area/bigredv2/outside/c)
+"iAa" = (
+/obj/structure/barricade/wooden,
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 6
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor{
+ icon_state = "wood"
+ },
+/area/bigredv2/outside/bar)
"iAi" = (
/obj/structure/surface/rack,
/obj/effect/spawner/random/toolbox,
/turf/open/floor/plating,
/area/bigredv2/caves/mining)
-"iAm" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/stack/folding_barricade,
-/turf/open/floor{
- dir = 8;
- icon_state = "asteroidwarning"
- },
-/area/bigredv2/outside/c)
"iAw" = (
/obj/effect/landmark/corpsespawner/scientist,
/turf/open/floor/plating,
@@ -33962,32 +32008,55 @@
},
/turf/open/gm/river,
/area/bigredv2/outside/engineering)
-"iAJ" = (
-/obj/structure/bed/roller,
-/obj/structure/closet/bodybag,
+"iAR" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/structure/machinery/door/airlock/almayer/security/glass/colony{
+ name = "\improper Marshal Office Courtroom";
+ welded = 1
+ },
/turf/open/floor{
- dir = 8;
- icon_state = "whitegreencorner"
+ icon_state = "delivery"
},
-/area/bigredv2/outside/medical)
-"iCu" = (
-/obj/effect/decal/cleanable/dirt,
+/area/bigredv2/outside/marshal_office)
+"iBp" = (
+/obj/effect/decal/cleanable/vomit{
+ icon_state = "vomit_4"
+ },
+/turf/open/floor{
+ dir = 4;
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/filtration_plant)
+"iBZ" = (
/obj/effect/decal/cleanable/dirt,
-/obj/structure/barricade/wooden{
- desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
- dir = 8;
- health = 25000
+/obj/item/restraint/adjustable/cable/cyan,
+/turf/open/floor,
+/area/bigredv2/outside/general_store)
+"iCb" = (
+/obj/item/explosive/grenade/incendiary/molotov{
+ pixel_x = 8
},
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached1"
+/turf/open/floor{
+ icon_state = "freezerfloor"
},
-/area/bigredv2/outside/w)
-"iCI" = (
-/obj/effect/decal/strata_decals/grime/grime3,
+/area/bigredv2/outside/general_offices)
+"iCX" = (
+/obj/effect/decal/cleanable/generic,
/turf/open/floor{
- icon_state = "asteroidwarning"
+ dir = 8;
+ icon_state = "carpet15-15"
},
-/area/bigredv2/outside/nw)
+/area/bigredv2/outside/bar)
+"iDA" = (
+/obj/structure/pipes/standard/manifold/hidden/green{
+ dir = 1
+ },
+/turf/open/asphalt/cement{
+ icon_state = "cement12"
+ },
+/area/bigredv2/outside/space_port)
"iDJ" = (
/obj/effect/landmark/corpsespawner/miner,
/obj/effect/decal/cleanable/blood{
@@ -34041,6 +32110,34 @@
/obj/structure/bed/chair/wood/normal,
/turf/open/floor/carpet,
/area/bigredv2/outside/library)
+"iEu" = (
+/obj/effect/landmark/crap_item,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor{
+ icon_state = "wood"
+ },
+/area/bigredv2/outside/dorms)
+"iEy" = (
+/obj/structure/machinery/shower{
+ dir = 8
+ },
+/obj/structure/window/reinforced/tinted,
+/obj/effect/decal/cleanable/blood,
+/obj/effect/decal/cleanable/blood/gibs/body,
+/turf/open/floor{
+ icon_state = "freezerfloor"
+ },
+/area/bigredv2/outside/dorms)
+"iEU" = (
+/obj/structure/machinery/iv_drip,
+/obj/effect/landmark/corpsespawner/chef,
+/obj/effect/decal/cleanable/blood,
+/obj/effect/decal/cleanable/blood/drip,
+/obj/effect/decal/cleanable/blood/gibs/body,
+/turf/open/floor{
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
"iFa" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/bananapeel,
@@ -34049,12 +32146,6 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/engineering)
-"iFw" = (
-/obj/structure/flora/grass/desert/lightgrass_1,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
- },
-/area/bigredv2/outside/nw)
"iFz" = (
/obj/structure/machinery/door/poddoor/almayer/closed{
dir = 4;
@@ -34065,15 +32156,6 @@
icon_state = "delivery"
},
/area/bigredv2/outside/lambda_cave_cas)
-"iGt" = (
-/obj/item/stack/sheet/wood{
- layer = 2.7;
- pixel_y = 8
- },
-/turf/open/floor{
- icon_state = "wood"
- },
-/area/bigredv2/outside/bar)
"iGK" = (
/turf/open/mars_cave,
/area/bigredv2/caves_sw)
@@ -34083,32 +32165,36 @@
icon_state = "mars_cave_6"
},
/area/bigredv2/caves_north)
-"iHe" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/trash/plate{
- pixel_x = -13;
- pixel_y = 12
+"iHQ" = (
+/obj/structure/surface/table/woodentable,
+/obj/item/device/radio{
+ pixel_x = 10
},
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached3"
+/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot{
+ pixel_y = 1;
+ pixel_x = -6
},
-/area/bigredv2/outside/space_port_lz2)
-"iHo" = (
-/obj/effect/decal/cleanable/blood/gibs/xeno/body,
/turf/open/floor{
- icon_state = "white"
+ icon_state = "wood"
},
-/area/bigredv2/outside/medical)
-"iHu" = (
+/area/bigredv2/outside/dorms)
+"iIx" = (
+/obj/item/trash/semki{
+ pixel_x = 6;
+ pixel_y = -5
+ },
+/turf/open/mars_cave{
+ icon_state = "mars_dirt_4"
+ },
+/area/bigredv2/outside/nw)
+"iIE" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
},
-/obj/effect/decal/cleanable/dirt,
/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
+ icon_state = "whitegreen"
},
-/area/bigredv2/outside/space_port)
+/area/bigredv2/outside/medical)
"iJF" = (
/obj/effect/decal/cleanable/blood{
icon_state = "gib6";
@@ -34119,11 +32205,23 @@
icon_state = "mars_cave_13"
},
/area/bigredv2/caves/mining)
-"iKn" = (
-/turf/open/asphalt/cement{
- icon_state = "cement14"
+"iKz" = (
+/obj/structure/flora/grass/desert/lightgrass_2,
+/turf/open/mars{
+ icon_state = "mars_dirt_10"
},
-/area/bigredv2/outside/lambda_cave_cas)
+/area/bigredv2/outside/nw)
+"iLb" = (
+/obj/structure/machinery/light{
+ dir = 1
+ },
+/obj/structure/machinery/suit_storage_unit/carbon_unit{
+ icon_state = "open"
+ },
+/turf/open/floor{
+ icon_state = "dark"
+ },
+/area/bigredv2/outside/general_offices)
"iLs" = (
/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
@@ -34138,13 +32236,48 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"iMs" = (
-/obj/structure/pipes/standard/simple/hidden/green{
+"iLN" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/medical_decals{
+ icon_state = "triagedecalbottomleft";
+ pixel_x = 20
+ },
+/obj/item/stack/sheet/wood{
+ pixel_x = 4;
+ pixel_y = 7
+ },
+/turf/open/floor{
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
+"iLQ" = (
+/obj/structure/surface/table/woodentable{
+ dir = 8;
+ flipped = 1
+ },
+/turf/open/floor{
+ icon_state = "wood"
+ },
+/area/bigredv2/outside/dorms)
+"iLU" = (
+/obj/structure/machinery/light{
dir = 4
},
-/obj/item/reagent_container/spray/cleaner{
- pixel_x = 6
+/turf/open/floor{
+ dir = 9;
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/space_port_lz2)
+"iNw" = (
+/obj/structure/machinery/optable,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/organ/heart/prosthetic{
+ pixel_x = 6;
+ pixel_y = -7
},
+/obj/effect/landmark/corpsespawner/colonist,
+/obj/effect/decal/cleanable/blood,
+/obj/effect/decal/cleanable/blood/gibs/body,
/turf/open/floor{
icon_state = "white"
},
@@ -34158,15 +32291,17 @@
"iNR" = (
/turf/open/gm/river,
/area/bigredv2/outside/engineering)
-"iOD" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/trash/snack_bowl{
- pixel_y = 5;
- pixel_x = -8
+"iOe" = (
+/turf/open/asphalt/cement{
+ icon_state = "cement14"
},
-/obj/effect/decal/cleanable/generic,
-/turf/open/floor/plating,
-/area/bigredv2/outside/bar)
+/area/bigredv2/caves_lambda)
+"iOk" = (
+/obj/structure/flora/grass/desert/lightgrass_12,
+/turf/open/mars_cave{
+ icon_state = "mars_dirt_4"
+ },
+/area/bigredv2/outside/nw)
"iOR" = (
/obj/effect/landmark/crap_item,
/turf/open/floor{
@@ -34174,6 +32309,12 @@
icon_state = "asteroidfloor"
},
/area/bigredv2/outside/ne)
+"iPo" = (
+/obj/effect/decal/cleanable/generic,
+/turf/open/asphalt/cement{
+ icon_state = "cement12"
+ },
+/area/bigredv2/outside/space_port)
"iPE" = (
/obj/structure/prop/invuln/minecart_tracks{
dir = 1
@@ -34182,15 +32323,6 @@
icon_state = "mars_dirt_4"
},
/area/bigredv2/caves/mining)
-"iQt" = (
-/obj/item/trash/cigbutt{
- pixel_x = -10;
- pixel_y = 7
- },
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached1"
- },
-/area/bigredv2/outside/nw)
"iQw" = (
/obj/item/ore,
/turf/open/gm/river,
@@ -34207,14 +32339,6 @@
icon_state = "mars_cave_6"
},
/area/bigredv2/caves_research)
-"iQO" = (
-/obj/structure/barricade/handrail/medical{
- dir = 4
- },
-/turf/open/mars_cave{
- icon_state = "mars_dirt_4"
- },
-/area/bigredv2/outside/nw)
"iRf" = (
/obj/structure/fence,
/turf/open/floor{
@@ -34230,6 +32354,13 @@
icon_state = "redfull"
},
/area/bigredv2/caves/eta/research)
+"iRB" = (
+/obj/item/stack/sheet/metal{
+ pixel_y = -3;
+ pixel_x = -8
+ },
+/turf/open/floor/plating,
+/area/bigredv2/outside/space_port)
"iRG" = (
/obj/effect/landmark/xeno_hive_spawn,
/obj/effect/landmark/ert_spawns/groundside_xeno,
@@ -34237,12 +32368,22 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/caves_research)
-"iSn" = (
-/obj/effect/decal/cleanable/blood/gibs/limb,
+"iRK" = (
+/obj/effect/decal/cleanable/blood/oil,
+/turf/open/floor/plating{
+ icon_state = "platingdmg1"
+ },
+/area/bigredv2/outside/office_complex)
+"iSy" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/obj/item/clothing/suit/armor/riot{
+ pixel_y = -9;
+ pixel_x = -12
+ },
/turf/open/floor{
- icon_state = "whitegreenfull"
+ icon_state = "dark"
},
-/area/bigredv2/outside/medical)
+/area/bigredv2/outside/marshal_office)
"iSz" = (
/obj/structure/barricade/handrail{
dir = 1;
@@ -34252,43 +32393,6 @@
/obj/structure/barricade/handrail,
/turf/open/floor/plating/plating_catwalk,
/area/bigredv2/outside/engineering)
-"iSZ" = (
-/obj/item/trash/cigbutt{
- pixel_x = -10;
- pixel_y = 13
- },
-/turf/open/floor{
- icon_state = "white"
- },
-/area/bigredv2/outside/medical)
-"iTg" = (
-/obj/effect/decal/cleanable/blood,
-/turf/open/mars_cave{
- icon_state = "mars_dirt_4"
- },
-/area/bigredv2/outside/eta)
-"iTl" = (
-/obj/effect/decal/cleanable/generic,
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
- },
-/area/bigredv2/outside/ne)
-"iTq" = (
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached9"
- },
-/area/bigredv2/outside/nw)
-"iTF" = (
-/obj/effect/decal/strata_decals/grime/grime2,
-/obj/item/trash/kepler/flamehot{
- pixel_y = 13;
- pixel_x = 14
- },
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached9"
- },
-/area/bigredv2/outside/nw)
"iTN" = (
/obj/effect/decal/warning_stripes{
icon_state = "NE-out";
@@ -34306,11 +32410,12 @@
icon_state = "darkred2"
},
/area/bigredv2/caves/eta/research)
-"iUj" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/drip,
-/turf/open/floor,
-/area/bigredv2/outside/general_offices)
+"iUu" = (
+/obj/structure/flora/grass/desert/lightgrass_1,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached1"
+ },
+/area/bigredv2/outside/c)
"iVd" = (
/obj/structure/platform/kutjevo/rock{
dir = 4
@@ -34327,23 +32432,38 @@
/obj/structure/fence,
/turf/open/mars,
/area/bigredv2/outside/se)
-"iWh" = (
-/obj/structure/bed/bedroll{
- dir = 1
+"iVI" = (
+/obj/structure/flora/grass/desert/lightgrass_4,
+/turf/open/mars,
+/area/bigredv2/outside/se)
+"iVM" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
},
-/obj/item/prop/colony/usedbandage{
- dir = 5;
- pixel_y = 8
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached12"
+ },
+/area/bigredv2/outside/c)
+"iWa" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/flora/grass/desert/lightgrass_1,
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/se)
+"iXi" = (
+/obj/structure/surface/table,
+/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb{
+ pixel_x = 1;
+ pixel_y = 3
+ },
+/obj/item/prop/helmetgarb/spent_buckshot{
+ pixel_x = 9;
+ pixel_y = -10
},
/turf/open/floor{
icon_state = "freezerfloor"
},
/area/bigredv2/outside/general_offices)
-"iXp" = (
-/turf/open/asphalt/cement{
- icon_state = "cement15"
- },
-/area/bigredv2/outside/filtration_cave_cas)
"iXs" = (
/obj/structure/platform_decoration{
dir = 1
@@ -34369,6 +32489,18 @@
icon_state = "mars_dirt_6"
},
/area/bigredv2/caves/mining)
+"iYG" = (
+/obj/item/stack/sheet/wood{
+ pixel_y = -8
+ },
+/turf/open/floor{
+ icon_state = "wood"
+ },
+/area/bigredv2/outside/dorms)
+"iYH" = (
+/obj/structure/flora/grass/desert/lightgrass_10,
+/turf/open/mars,
+/area/bigredv2/outside/c)
"iYN" = (
/obj/structure/closet/secure_closet,
/obj/effect/landmark/objective_landmark/close,
@@ -34405,8 +32537,12 @@
icon_state = "whitegreenfull"
},
/area/bigredv2/outside/hydroponics)
-"jaI" = (
-/obj/item/ammo_casing/bullet,
+"jbB" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/c)
+"jbG" = (
+/obj/structure/flora/grass/desert/lightgrass_11,
/turf/open/mars,
/area/bigredv2/outside/c)
"jbU" = (
@@ -34421,31 +32557,58 @@
icon_state = "mars_cave_13"
},
/area/bigredv2/caves/mining)
-"jcR" = (
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
-/turf/open/mars_cave{
- icon_state = "mars_cave_2"
- },
-/area/bigredv2/caves_research)
-"jdj" = (
-/obj/effect/landmark/nightmare{
- insert_tag = "crashlanding-offices"
+"jcg" = (
+/obj/item/trash/cigbutt{
+ pixel_x = -9;
+ pixel_y = -6
},
/turf/open/floor{
dir = 1;
icon_state = "asteroidfloor"
},
-/area/bigredv2/outside/c)
-"jdv" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
+/area/bigredv2/outside/ne)
+"jcl" = (
+/obj/structure/reagent_dispensers/beerkeg,
+/obj/item/reagent_container/food/drinks/cup{
+ pixel_x = -3;
+ pixel_y = 12
+ },
+/turf/open/floor{
+ icon_state = "wood"
+ },
+/area/bigredv2/outside/bar)
+"jcF" = (
+/obj/structure/surface/rack,
+/obj/effect/spawner/random/tool,
+/turf/open/floor,
+/area/bigredv2/outside/general_offices)
+"jcR" = (
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
+/turf/open/mars_cave{
+ icon_state = "mars_cave_2"
+ },
+/area/bigredv2/caves_research)
+"jdh" = (
+/obj/effect/decal/cleanable/generic,
/obj/effect/decal/cleanable/dirt,
+/obj/item/trash/cigbutt{
+ pixel_x = -1;
+ pixel_y = 17
+ },
+/turf/open/asphalt/cement{
+ icon_state = "cement1";
+ dir = 1
+ },
+/area/bigredv2/outside/filtration_cave_cas)
+"jdj" = (
+/obj/effect/landmark/nightmare{
+ insert_tag = "crashlanding-offices"
+ },
/turf/open/floor{
dir = 1;
- icon_state = "whitegreen"
+ icon_state = "asteroidfloor"
},
-/area/bigredv2/outside/medical)
+/area/bigredv2/outside/c)
"jdQ" = (
/obj/structure/prop/dam/truck/mining{
desc = "A crawler, imported from the Alpha Centauri colonies.";
@@ -34457,19 +32620,27 @@
icon_state = "mars_dirt_3"
},
/area/bigredv2/outside/s)
-"jdU" = (
+"jei" = (
+/obj/structure/bed/roller,
+/turf/open/mars,
+/area/bigredv2/outside/nw)
+"jel" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/ne)
+"jeM" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
},
-/obj/effect/decal/cleanable/generic,
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/e)
-"jdZ" = (
-/obj/structure/window/framed/solaris,
+/obj/effect/decal/cleanable/blood/drip,
/turf/open/floor{
- icon_state = "white"
+ icon_state = "floor4"
},
-/area/bigredv2/outside/medical)
+/area/bigredv2/outside/cargo)
"jeO" = (
/turf/open/mars{
icon_state = "mars_dirt_13"
@@ -34481,10 +32652,6 @@
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/se)
-"jfs" = (
-/obj/structure/flora/grass/desert/lightgrass_8,
-/turf/open/mars,
-/area/bigredv2/outside/w)
"jgw" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
@@ -34517,13 +32684,11 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"jic" = (
-/obj/structure/barricade/deployable,
-/turf/open/floor{
- dir = 8;
- icon_state = "asteroidwarning"
+"jhU" = (
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached20"
},
-/area/bigredv2/outside/c)
+/area/bigredv2/outside/nw)
"jiS" = (
/obj/structure/machinery/power/apc{
dir = 1;
@@ -34560,43 +32725,51 @@
/obj/structure/reagent_dispensers/fueltank/gas,
/turf/open/floor/plating,
/area/bigredv2/caves/mining)
-"jlQ" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/barricade/wooden{
- dir = 4;
- pixel_y = -1;
- pixel_x = -4
+"jlx" = (
+/obj/effect/decal/strata_decals/grime/grime3,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached12"
},
-/turf/open/floor,
-/area/bigredv2/outside/marshal_office)
+/area/bigredv2/outside/nw)
"jlS" = (
/turf/open/floor{
dir = 10;
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/space_port_lz2)
+"jmq" = (
+/obj/item/clothing/mask/gas{
+ pixel_y = 7;
+ pixel_x = 7
+ },
+/obj/structure/barricade/deployable,
+/turf/open/floor{
+ icon_state = "dark"
+ },
+/area/bigredv2/outside/marshal_office)
"jmD" = (
/turf/open/mars_cave{
icon_state = "mars_cave_6"
},
/area/bigredv2/outside/ne)
+"jmU" = (
+/obj/effect/decal/strata_decals/grime/grime3,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached14"
+ },
+/area/bigredv2/outside/nw)
+"jnf" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached4"
+ },
+/area/bigredv2/outside/nw)
"jnR" = (
/turf/open/floor{
dir = 9;
icon_state = "darkblue2"
},
/area/bigredv2/caves/eta/research)
-"jnS" = (
-/obj/structure/flora/bush/desert{
- icon_state = "tree_3"
- },
-/turf/open/mars{
- icon_state = "mars_dirt_14"
- },
-/area/bigredv2/outside/nw)
"jnV" = (
/obj/structure/prop/invuln/minecart_tracks{
desc = "A pipe.";
@@ -34612,6 +32785,29 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
+"joV" = (
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached1"
+ },
+/area/bigredv2/outside/e)
+"joX" = (
+/obj/structure/flora/grass/desert/lightgrass_7,
+/turf/open/mars,
+/area/bigredv2/outside/virology)
+"joY" = (
+/obj/structure/pipes/standard/manifold/hidden/green{
+ dir = 1
+ },
+/turf/open/floor{
+ dir = 4;
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
+"jpg" = (
+/turf/open/floor/plating{
+ icon_state = "platebot"
+ },
+/area/bigredv2/outside/space_port)
"jph" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
@@ -34621,6 +32817,13 @@
},
/turf/open/floor,
/area/bigredv2/outside/dorms)
+"jpB" = (
+/obj/item/trash/syndi_cakes{
+ pixel_y = -11;
+ pixel_x = 9
+ },
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/nw)
"jpT" = (
/obj/structure/surface/table,
/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
@@ -34631,34 +32834,14 @@
icon_state = "wood"
},
/area/bigredv2/outside/dorms)
-"jpU" = (
-/obj/effect/landmark/corpsespawner/security,
-/obj/effect/decal/cleanable/blood/gibs/body,
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor{
- icon_state = "dark"
- },
-/area/bigredv2/outside/marshal_office)
-"jqw" = (
-/obj/structure/flora/grass/desert/lightgrass_7,
-/turf/open/mars_cave{
- icon_state = "mars_dirt_4"
- },
-/area/bigredv2/outside/c)
-"jqF" = (
-/obj/effect/decal/cleanable/generic,
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/c)
-"jqO" = (
-/obj/item/trash/eat{
- pixel_x = -7;
- pixel_y = 6
- },
+"jrf" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/obj/effect/decal/cleanable/blood/drip,
/turf/open/floor{
- dir = 4;
+ dir = 8;
icon_state = "asteroidwarning"
},
-/area/bigredv2/outside/ne)
+/area/bigredv2/outside/eta)
"jrA" = (
/obj/structure/prop/invuln/minecart_tracks{
dir = 1
@@ -34678,6 +32861,17 @@
icon_state = "asteroidplating"
},
/area/bigredv2/outside/space_port_lz2)
+"jsC" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/structure/barricade/wooden{
+ dir = 8;
+ pixel_y = 12;
+ pixel_x = 4
+ },
+/turf/open/floor,
+/area/bigredv2/outside/general_offices)
"jsL" = (
/obj/effect/decal/warning_stripes{
icon_state = "N"
@@ -34688,29 +32882,28 @@
icon_state = "platingdmg2"
},
/area/bigredv2/caves/mining)
-"jsZ" = (
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached15"
+"jtc" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/obj/structure/machinery/door/airlock/almayer/maint/colony{
+ dir = 1;
+ name = "\improper Dormitories Tool Storage Maintenance";
+ welded = 1
},
-/area/bigredv2/outside/nw)
-"jtG" = (
-/obj/effect/decal/strata_decals/grime/grime1,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
+/turf/open/floor{
+ icon_state = "delivery"
},
-/area/bigredv2/outside/nw)
+/area/bigredv2/outside/general_offices)
+"jtJ" = (
+/obj/structure/flora/grass/desert/lightgrass_11,
+/turf/open/mars{
+ icon_state = "mars_dirt_13"
+ },
+/area/bigredv2/outside/c)
"jtL" = (
/turf/open/mars_cave{
icon_state = "mars_cave_7"
},
/area/bigredv2/caves/mining)
-"jtX" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/ammo_casing/bullet,
-/turf/open/floor{
- icon_state = "dark"
- },
-/area/bigredv2/outside/general_offices)
"juo" = (
/obj/structure/machinery/light{
dir = 8
@@ -34720,45 +32913,30 @@
icon_state = "podhatch"
},
/area/bigredv2/caves/lambda/research)
-"juE" = (
-/obj/effect/decal/cleanable/blood{
- layer = 3
+"juH" = (
+/obj/effect/decal/cleanable/blood,
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/c)
+"jvb" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 5
},
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor,
-/area/bigredv2/outside/lambda_cave_cas)
-"juQ" = (
-/turf/open/asphalt/cement{
- icon_state = "cement15"
- },
-/area/bigredv2/outside/lambda_cave_cas)
-"juZ" = (
-/obj/structure/machinery/light{
- dir = 1
- },
-/turf/open/asphalt/cement{
- icon_state = "cement4"
- },
-/area/bigredv2/outside/lambda_cave_cas)
-"jvJ" = (
-/turf/open/mars_cave{
- icon_state = "mars_cave_2"
- },
-/area/bigredv2/outside/nw)
-"jvW" = (
-/obj/structure/machinery/light/small{
- dir = 1
+/turf/open/floor{
+ icon_state = "wood"
},
-/turf/open/asphalt/cement{
- icon_state = "cement15"
+/area/bigredv2/outside/bar)
+"jvA" = (
+/obj/structure/surface/table,
+/obj/item/storage/firstaid/toxin{
+ pixel_y = 6;
+ pixel_x = -7
},
-/area/bigredv2/caves_lambda)
-"jvX" = (
-/obj/structure/bed/chair/office/light{
- dir = 8
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor{
+ icon_state = "white"
},
-/turf/open/floor,
-/area/bigredv2/outside/office_complex)
+/area/bigredv2/outside/medical)
"jwj" = (
/obj/structure/platform/shiva{
dir = 8
@@ -34768,10 +32946,36 @@
icon_state = "bcircuitoff"
},
/area/bigredv2/caves/lambda/research)
+"jwO" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/obj/structure/bed/chair/wood/normal{
+ dir = 1
+ },
+/turf/open/floor{
+ icon_state = "wood"
+ },
+/area/bigredv2/outside/bar)
+"jwZ" = (
+/obj/item/clothing/under/darkred{
+ pixel_y = 7;
+ pixel_x = 10
+ },
+/obj/structure/surface/rack,
+/turf/open/floor{
+ icon_state = "freezerfloor"
+ },
+/area/bigredv2/outside/general_offices)
"jxA" = (
/obj/structure/barricade/handrail,
/turf/open/floor/plating/plating_catwalk,
/area/bigredv2/outside/engineering)
+"jxC" = (
+/obj/structure/pipes/standard/manifold/hidden/green,
+/turf/open/floor{
+ dir = 1;
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
"jxS" = (
/obj/structure/machinery/light{
dir = 4
@@ -34781,41 +32985,13 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/engineering)
-"jxU" = (
-/turf/open/asphalt/cement{
- icon_state = "cement3"
- },
-/area/bigredv2/caves_lambda)
-"jyK" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/flora/grass/desert/lightgrass_1,
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/e)
-"jyS" = (
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor{
- icon_state = "freezerfloor"
- },
-/area/bigredv2/outside/dorms)
-"jzu" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/prop{
- desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
- icon = 'icons/obj/janitor.dmi';
- icon_state = "trashbag3";
- name = "trash bag";
- pixel_x = 7;
- pixel_y = -6
- },
-/obj/item/trash/eat{
- pixel_x = -9;
- pixel_y = 10
- },
-/obj/effect/decal/cleanable/generic,
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
+"jzo" = (
+/obj/structure/flora/grass/desert/lightgrass_6,
+/obj/item/stack/sheet/metal{
+ pixel_x = -13;
+ pixel_y = 14
},
+/turf/open/mars,
/area/bigredv2/outside/c)
"jzD" = (
/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
@@ -34823,10 +32999,13 @@
icon_state = "darkish"
},
/area/bigredv2/caves/lambda/virology)
-"jzW" = (
-/obj/structure/flora/grass/desert/lightgrass_2,
-/turf/open/mars,
-/area/bigredv2/outside/ne)
+"jzZ" = (
+/obj/item/shard,
+/turf/open/floor{
+ dir = 4;
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
"jAm" = (
/obj/structure/coatrack{
pixel_x = -8;
@@ -34846,11 +33025,6 @@
icon_state = "mars_cave_5"
},
/area/bigredv2/caves_sw)
-"jAr" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/flora/grass/desert/lightgrass_1,
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/c)
"jAJ" = (
/turf/open/floor{
icon_state = "podhatchfloor"
@@ -34868,11 +33042,27 @@
icon_state = "wood"
},
/area/bigredv2/outside/marshal_office)
+"jAW" = (
+/obj/structure/pipes/standard/manifold/hidden/green,
+/obj/item/prop/colony/usedbandage{
+ dir = 5
+ },
+/turf/open/floor{
+ dir = 8;
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
"jAX" = (
/turf/open/mars_cave{
icon_state = "mars_cave_17"
},
/area/bigredv2/caves_lambda)
+"jBi" = (
+/obj/effect/landmark/hunter_primary,
+/turf/open/floor/plating{
+ icon_state = "platebot"
+ },
+/area/bigredv2/outside/space_port)
"jBq" = (
/obj/structure/blocker/forcefield/multitile_vehicles,
/turf/open/floor{
@@ -34880,6 +33070,27 @@
icon_state = "asteroidfloor"
},
/area/bigredv2/outside/eta)
+"jBP" = (
+/obj/item/stack/sheet/wood{
+ pixel_y = -7
+ },
+/turf/open/floor{
+ dir = 4;
+ icon_state = "whitegreencorner"
+ },
+/area/bigredv2/outside/medical)
+"jBX" = (
+/obj/item/weapon/gun/smg/mp5{
+ current_mag = null;
+ pixel_y = 8;
+ pixel_x = -18
+ },
+/obj/item/ammo_casing/bullet,
+/obj/effect/landmark/corpsespawner/security,
+/obj/effect/decal/cleanable/blood,
+/obj/effect/decal/cleanable/blood/gibs/body,
+/turf/open/mars,
+/area/bigredv2/outside/c)
"jCg" = (
/obj/effect/spawner/random/attachment,
/obj/structure/machinery/light{
@@ -34907,38 +33118,28 @@
icon_state = "mars_dirt_4"
},
/area/bigredv2/caves/mining)
-"jCW" = (
-/obj/effect/decal/cleanable/blood/drip,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/prop{
- desc = "A bunch of tiny bits of shattered metal.";
- icon = 'icons/obj/items/shards.dmi';
- icon_state = "shrapnelsmall";
- name = "piece of shrapnel";
- pixel_x = -1;
- pixel_y = 4
+"jCt" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/obj/structure/barricade/metal{
+ dir = 1
},
/turf/open/floor{
- dir = 1;
- icon_state = "whiteblue"
+ icon_state = "white"
},
-/area/bigredv2/outside/medical)
+/area/bigredv2/outside/admin_building)
+"jCN" = (
+/obj/structure/barricade/wooden{
+ dir = 8;
+ pixel_y = 12;
+ pixel_x = 2
+ },
+/turf/open/floor,
+/area/bigredv2/outside/general_offices)
"jCY" = (
/turf/open/mars_cave{
icon_state = "mars_cave_10"
},
/area/bigredv2/caves_virology)
-"jDm" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/obj/effect/decal/cleanable/blood/drip,
-/obj/item/trash/sosjerky{
- pixel_y = 7;
- pixel_x = -13
- },
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached15"
- },
-/area/bigredv2/outside/nw)
"jDo" = (
/obj/effect/landmark/hunter_secondary,
/turf/open/mars_cave{
@@ -34955,15 +33156,13 @@
},
/turf/open/floor/plating,
/area/bigredv2/caves/mining)
-"jDI" = (
-/obj/item/trash/cigbutt{
- pixel_x = 1;
- pixel_y = 5
- },
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
+"jDJ" = (
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidwarning"
},
-/area/bigredv2/outside/c)
+/area/bigredv2/outside/eta)
"jDT" = (
/obj/structure/surface/table,
/obj/effect/spawner/random/technology_scanner,
@@ -34972,27 +33171,16 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/engineering)
-"jEc" = (
-/obj/structure/flora/bush/desert{
- icon_state = "tree_3"
- },
-/turf/open/mars,
-/area/bigredv2/outside/virology)
-"jEw" = (
-/obj/structure/surface/table/woodentable{
- dir = 1;
- flipped = 1
- },
-/turf/open/floor{
- icon_state = "wood"
- },
-/area/bigredv2/outside/bar)
"jEx" = (
/obj/structure/machinery/power/port_gen/pacman/super,
/turf/open/mars_cave{
icon_state = "mars_cave_16"
},
/area/bigredv2/caves/mining)
+"jEZ" = (
+/obj/effect/decal/cleanable/blood/gibs/body,
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/se)
"jGd" = (
/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
/turf/open/mars_cave{
@@ -35010,23 +33198,6 @@
icon_state = "wood"
},
/area/bigredv2/outside/marshal_office)
-"jGw" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/structure/barricade/wooden{
- dir = 8;
- pixel_y = 12;
- pixel_x = 4
- },
-/turf/open/floor,
-/area/bigredv2/outside/general_offices)
-"jGC" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
- },
-/area/bigredv2/outside/c)
"jGQ" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/device/flashlight/lantern,
@@ -35050,23 +33221,31 @@
/obj/effect/landmark/objective_landmark/close,
/turf/open/floor,
/area/bigred/ground/garage_workshop)
-"jIt" = (
-/obj/structure/platform/kutjevo/rock,
-/obj/structure/platform/kutjevo/rock{
- dir = 4
+"jHW" = (
+/obj/item/trash/cigbutt{
+ pixel_x = 4
},
-/turf/open/mars_cave{
- icon_state = "mars_cave_14"
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidfloor"
},
-/area/bigredv2/outside/nw)
-"jIw" = (
-/obj/item/trash/popcorn{
- pixel_y = 9
+/area/bigredv2/outside/ne)
+"jIa" = (
+/obj/structure/sign/safety/autodoc{
+ pixel_x = -32
},
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
+/obj/effect/decal/medical_decals{
+ icon_state = "triagedecalbottomleft"
},
-/area/bigredv2/outside/nw)
+/obj/structure/barricade/handrail/medical,
+/obj/structure/sign/safety/med_cryo{
+ pixel_x = -16
+ },
+/turf/open/floor{
+ dir = 8;
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
"jIQ" = (
/turf/open/mars_cave{
icon_state = "mars_cave_19"
@@ -35094,14 +33273,18 @@
icon_state = "mars_cave_13"
},
/area/bigredv2/caves_north)
-"jKi" = (
-/obj/effect/decal/cleanable/blood,
-/obj/effect/landmark/corpsespawner/colonist,
-/obj/effect/decal/cleanable/blood/gibs/body,
+"jJW" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/structure/surface/table/woodentable{
+ dir = 8;
+ flipped = 1
+ },
/turf/open/floor{
- icon_state = "dark"
+ icon_state = "wood"
},
-/area/bigredv2/outside/general_offices)
+/area/bigredv2/outside/bar)
"jKp" = (
/obj/structure/machinery/light{
dir = 1
@@ -35111,10 +33294,6 @@
icon_state = "red"
},
/area/bigredv2/outside/lambda_cave_cas)
-"jKw" = (
-/obj/effect/decal/strata_decals/grime/grime3,
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/nw)
"jKI" = (
/obj/structure/platform_decoration/shiva{
dir = 8
@@ -35127,24 +33306,12 @@
icon_state = "bcircuitoff"
},
/area/bigredv2/caves/lambda/research)
-"jLO" = (
-/obj/structure/flora/grass/desert/lightgrass_5,
-/turf/open/mars,
-/area/bigredv2/outside/se)
-"jMi" = (
-/obj/structure/prop/invuln/overhead_pipe{
- dir = 4;
- pixel_x = 2;
- pixel_y = 9
- },
-/obj/item/tool/warning_cone{
- pixel_x = 6
- },
+"jLR" = (
+/obj/effect/decal/cleanable/blood/gibs/xeno/body,
/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
+ icon_state = "white"
},
-/area/bigredv2/outside/ne)
+/area/bigredv2/outside/medical)
"jMm" = (
/obj/effect/decal/warning_stripes{
icon_state = "S"
@@ -35163,6 +33330,12 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/engineering)
+"jMX" = (
+/obj/effect/landmark/hunter_primary,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached2"
+ },
+/area/bigredv2/outside/c)
"jNE" = (
/obj/structure/machinery/washing_machine,
/obj/structure/machinery/washing_machine{
@@ -35179,6 +33352,12 @@
icon_state = "wood"
},
/area/bigredv2/outside/library)
+"jNZ" = (
+/obj/effect/decal/strata_decals/grime/grime2,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached4"
+ },
+/area/bigredv2/outside/nw)
"jOc" = (
/obj/structure/machinery/door/poddoor/almayer/closed{
dir = 4;
@@ -35197,27 +33376,18 @@
icon_state = "freezerfloor"
},
/area/bigredv2/outside/dorms)
-"jOm" = (
-/obj/item/paper,
-/turf/open/floor,
-/area/bigredv2/outside/office_complex)
-"jOq" = (
-/obj/item/trash/hotdog{
- pixel_x = -12;
- pixel_y = -11
+"jOI" = (
+/obj/structure/surface/table,
+/obj/item/tool/surgery/bonesetter{
+ pixel_y = 6;
+ pixel_x = -7
},
/obj/effect/decal/cleanable/dirt,
-/obj/item/prop{
- desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
- icon = 'icons/obj/janitor.dmi';
- icon_state = "trashbag3";
- name = "trash bag";
- pixel_x = 3;
- pixel_y = 13
- },
-/obj/effect/landmark/survivor_spawner,
-/turf/open/floor/plating,
-/area/bigredv2/outside/bar)
+/turf/open/floor{
+ dir = 5;
+ icon_state = "whitebluefull"
+ },
+/area/bigredv2/outside/medical)
"jOS" = (
/obj/structure/surface/rack,
/obj/item/tool/pickaxe/plasmacutter{
@@ -35239,16 +33409,23 @@
},
/turf/open/floor/plating,
/area/bigredv2/caves/mining)
-"jPM" = (
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached3"
+"jPI" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/obj/item/ammo_casing/bullet,
+/turf/open/floor{
+ icon_state = "dark"
},
-/area/bigredv2/outside/se)
+/area/bigredv2/outside/general_offices)
"jPQ" = (
/turf/open/mars_cave{
icon_state = "mars_cave_16"
},
/area/bigredv2/outside/ne)
+"jPU" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/flora/grass/desert/lightgrass_1,
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/e)
"jPV" = (
/obj/effect/decal/cleanable/blood/drip{
pixel_x = -1;
@@ -35279,6 +33456,18 @@
icon_state = "floor5"
},
/area/bigredv2/oob)
+"jRc" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached4"
+ },
+/area/bigredv2/outside/e)
+"jRe" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached2"
+ },
+/area/bigredv2/outside/se)
"jRi" = (
/obj/item/ammo_magazine/smg/bizon{
pixel_x = 5;
@@ -35308,14 +33497,18 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/filtration_plant)
-"jRr" = (
+"jRw" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/corpsespawner/engineer,
-/obj/effect/decal/cleanable/blood/gibs/body,
-/turf/open/gm/river{
- color = "#990000"
+/obj/item/ammo_casing/bullet,
+/turf/open/floor{
+ icon_state = "dark"
},
-/area/bigredv2/outside/c)
+/area/bigredv2/outside/general_offices)
+"jRE" = (
+/turf/open/asphalt/cement{
+ icon_state = "cement15"
+ },
+/area/bigredv2/outside/filtration_cave_cas)
"jRH" = (
/obj/structure/surface/table,
/obj/effect/landmark/objective_landmark/close,
@@ -35330,17 +33523,15 @@
icon_state = "mars_cave_20"
},
/area/bigredv2/caves_north)
-"jSh" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/medical_decals{
- icon_state = "triagedecalbottom"
+"jSD" = (
+/obj/structure/bed/chair/wood/normal{
+ dir = 4
},
+/obj/effect/decal/cleanable/dirt,
/turf/open/floor{
- dir = 6;
- icon_state = "whitegreen"
+ icon_state = "wood"
},
-/area/bigredv2/outside/medical)
+/area/bigredv2/outside/bar)
"jTa" = (
/obj/structure/machinery/camera/autoname,
/obj/effect/decal/warning_stripes{
@@ -35353,12 +33544,6 @@
icon_state = "red"
},
/area/bigredv2/outside/marshal_office)
-"jTc" = (
-/obj/item/ammo_casing/bullet,
-/turf/open/floor{
- icon_state = "dark"
- },
-/area/bigredv2/outside/general_offices)
"jTk" = (
/obj/structure/surface/table,
/obj/effect/decal/cleanable/molten_item,
@@ -35367,6 +33552,11 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/engineering)
+"jTy" = (
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached3"
+ },
+/area/bigredv2/outside/s)
"jUc" = (
/obj/structure/surface/table,
/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
@@ -35380,15 +33570,22 @@
icon_state = "delivery"
},
/area/bigredv2/outside/cargo)
-"jUs" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/gibs/xeno/body,
-/obj/effect/decal/cleanable/blood/xeno,
-/turf/open/floor/plating{
- dir = 8;
- icon_state = "platingdmg2"
+"jUt" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/obj/structure/blocker/forcefield/multitile_vehicles,
+/obj/effect/landmark/corpsespawner/scientist,
+/obj/effect/decal/cleanable/blood/gibs/body,
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidfloor"
},
-/area/bigredv2/outside/medical)
+/area/bigredv2/outside/eta)
+"jUx" = (
+/obj/effect/landmark/crap_item,
+/obj/structure/flora/grass/desert/lightgrass_11,
+/turf/open/mars,
+/area/bigredv2/outside/c)
"jUJ" = (
/obj/structure/machinery/light,
/obj/structure/surface/table/woodentable,
@@ -35422,6 +33619,12 @@
"jUY" = (
/turf/open/mars_cave,
/area/bigredv2/caves/mining)
+"jVh" = (
+/obj/effect/decal/cleanable/blood/gibs/body,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached1"
+ },
+/area/bigredv2/outside/c)
"jVr" = (
/obj/effect/decal/cleanable/blood/drip{
pixel_x = 6
@@ -35430,15 +33633,21 @@
icon_state = "mars_cave_9"
},
/area/bigredv2/caves/mining)
-"jVC" = (
-/obj/effect/decal/strata_decals/grime/grime1{
- dir = 1
+"jVG" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
},
-/obj/effect/decal/strata_decals/grime/grime4,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached15"
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood/xtracks,
+/obj/item/explosive/grenade/custom/large{
+ pixel_x = 6;
+ pixel_y = 9
},
-/area/bigredv2/outside/space_port_lz2)
+/turf/open/floor/plating{
+ dir = 8;
+ icon_state = "platingdmg2"
+ },
+/area/bigredv2/outside/medical)
"jVN" = (
/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
@@ -35457,6 +33666,13 @@
icon_state = "mars_dirt_4"
},
/area/bigredv2/caves/mining)
+"jVY" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor,
+/area/bigredv2/outside/general_offices)
"jWj" = (
/obj/effect/decal/cleanable/blood,
/turf/open/mars_cave{
@@ -35468,6 +33684,20 @@
icon_state = "mars_cave_17"
},
/area/bigredv2/outside/lz2_south_cas)
+"jWB" = (
+/obj/item/stack/sheet/wood{
+ layer = 2.7;
+ pixel_y = 8
+ },
+/obj/item/stack/rods{
+ pixel_x = 3;
+ pixel_y = 8
+ },
+/turf/open/floor{
+ dir = 8;
+ icon_state = "whitegreencorner"
+ },
+/area/bigredv2/outside/medical)
"jWF" = (
/obj/structure/prop/invuln/minecart_tracks{
desc = "A pipe.";
@@ -35491,10 +33721,6 @@
icon_state = "red"
},
/area/bigredv2/outside/marshal_office)
-"jWT" = (
-/obj/structure/platform/kutjevo/rock,
-/turf/closed/wall/solaris/rock,
-/area/bigredv2/caves)
"jXf" = (
/obj/structure/pipes/standard/manifold/hidden/green{
dir = 4
@@ -35504,33 +33730,6 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/engineering)
-"jXk" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/prop{
- desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
- icon = 'icons/obj/janitor.dmi';
- icon_state = "trashbag3";
- name = "trash bag";
- pixel_x = 5;
- layer = 3.01;
- pixel_y = -7
- },
-/obj/item/trash/eat{
- pixel_x = 2;
- pixel_y = 10
- },
-/obj/item/trash/eat{
- pixel_x = -9;
- pixel_y = -5
- },
-/turf/open/floor/plating,
-/area/bigredv2/outside/bar)
-"jXy" = (
-/obj/effect/decal/cleanable/generic,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached1"
- },
-/area/bigredv2/outside/s)
"jXJ" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/machinery/light_construct{
@@ -35552,11 +33751,6 @@
icon_state = "mars_cave_14"
},
/area/bigredv2/caves_sw)
-"jYw" = (
-/obj/effect/landmark/crap_item,
-/obj/effect/decal/cleanable/blood/xeno,
-/turf/open/mars,
-/area/bigredv2/outside/c)
"jYD" = (
/obj/effect/decal/cleanable/blood/drip{
pixel_y = 9
@@ -35565,6 +33759,12 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/caves/mining)
+"jYE" = (
+/obj/structure/flora/bush/desert{
+ icon_state = "tree_3"
+ },
+/turf/open/mars,
+/area/bigredv2/outside/virology)
"jYF" = (
/obj/structure/machinery/recharge_station,
/turf/open/floor/almayer{
@@ -35578,11 +33778,6 @@
icon_state = "mars_dirt_7"
},
/area/bigredv2/caves/mining)
-"jZj" = (
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
- },
-/area/bigredv2/outside/e)
"jZp" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
@@ -35612,26 +33807,82 @@
icon_state = "mars_cave_6"
},
/area/bigredv2/caves/mining)
-"kat" = (
-/obj/item/frame/rack,
+"kaF" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
/turf/open/floor{
- icon_state = "dark"
+ dir = 1;
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
+"kaL" = (
+/obj/effect/decal/cleanable/blood/xeno,
+/turf/open/floor{
+ dir = 4;
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/c)
+"kaS" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor{
+ icon_state = "redcorner"
},
/area/bigredv2/outside/marshal_office)
-"kck" = (
-/obj/effect/decal/strata_decals/grime/grime3,
+"kaU" = (
+/obj/effect/landmark/corpsespawner/scientist,
+/obj/effect/decal/cleanable/blood/gibs/body,
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidfloor"
+ },
+/area/bigredv2/outside/eta)
+"kbi" = (
/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached3"
+ icon_state = "cement_sunbleached15"
},
-/area/bigredv2/outside/w)
-"kcn" = (
-/obj/effect/decal/strata_decals/grime/grime1{
- dir = 1
+/area/bigredv2/outside/s)
+"kbt" = (
+/obj/structure/surface/rack,
+/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb{
+ pixel_y = -9
},
-/turf/open/mars_cave{
- icon_state = "mars_dirt_4"
+/obj/effect/decal/cleanable/dirt,
+/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb{
+ pixel_y = 1
},
-/area/bigredv2/outside/c)
+/turf/open/floor{
+ icon_state = "dark"
+ },
+/area/bigredv2/outside/marshal_office)
+"kbx" = (
+/turf/open/asphalt/cement{
+ icon_state = "cement2"
+ },
+/area/bigredv2/caves_lambda)
+"kbE" = (
+/obj/item/shard/shrapnel,
+/turf/open/floor{
+ icon_state = "white"
+ },
+/area/bigredv2/outside/marshal_office)
+"kbZ" = (
+/obj/item/stack/sheet/wood{
+ pixel_y = 5;
+ pixel_x = -4
+ },
+/obj/item/dartboard{
+ pixel_y = 28
+ },
+/turf/open/floor{
+ dir = 8;
+ icon_state = "carpet11-12"
+ },
+/area/bigredv2/outside/bar)
"kcx" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/weapon/broken_bottle,
@@ -35642,6 +33893,12 @@
icon_state = "mars_dirt_9"
},
/area/bigredv2/outside/sw)
+"kcJ" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement{
+ icon_state = "cement3"
+ },
+/area/bigredv2/outside/space_port)
"kcZ" = (
/obj/structure/blocker/forcefield/multitile_vehicles,
/obj/structure/fence,
@@ -35649,15 +33906,6 @@
icon_state = "mars_cave_17"
},
/area/bigredv2/outside/filtration_cave_cas)
-"kdb" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
- },
-/area/bigredv2/outside/e)
"kdf" = (
/obj/item/tool/warning_cone{
pixel_y = 17
@@ -35689,15 +33937,28 @@
icon_state = "asteroidfloor"
},
/area/bigredv2/outside/eta)
-"kdy" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
+"kdC" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/obj/item/stack/sheet/plasteel,
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/floor{
+ icon_state = "dark"
+ },
+/area/bigredv2/outside/general_offices)
+"kdH" = (
+/obj/item/stack/sheet/metal{
+ pixel_x = 7;
+ pixel_y = 6
},
/turf/open/floor{
- dir = 10;
- icon_state = "asteroidwarning"
+ dir = 4;
+ icon_state = "whitepurplecorner"
},
-/area/bigredv2/outside/e)
+/area/bigredv2/outside/medical)
+"keb" = (
+/obj/effect/decal/strata_decals/grime/grime3,
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/c)
"keg" = (
/turf/closed/wall/solaris/reinforced,
/area/bigredv2/outside/lz2_south_cas)
@@ -35714,41 +33975,15 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"kev" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor/colony{
- dir = 1;
- name = "\improper Medical Clinic";
- locked = 1
- },
-/turf/open/floor{
- icon_state = "delivery"
- },
-/area/bigredv2/outside/medical)
"key" = (
/obj/effect/decal/cleanable/blood/drip,
/turf/open/mars_cave,
/area/bigredv2/caves/mining)
-"keB" = (
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor{
- icon_state = "floor4"
- },
-/area/bigredv2/outside/cargo)
"kfk" = (
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
/turf/open/mars_cave,
/area/bigredv2/caves_lambda)
-"kfw" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/xeno,
-/turf/open/floor{
- icon_state = "white"
- },
-/area/bigredv2/outside/medical)
"kfx" = (
/turf/open/mars_cave{
icon_state = "mars_cave_15"
@@ -35779,14 +34014,19 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/outside/lz2_south_cas)
-"kgY" = (
-/obj/effect/decal/strata_decals/grime/grime1{
- dir = 1
+"kgA" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
},
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached15"
+/obj/item/trash/uscm_mre{
+ pixel_y = 13;
+ pixel_x = 6
},
-/area/bigredv2/outside/c)
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidfloor"
+ },
+/area/bigredv2/outside/ne)
"khl" = (
/obj/structure/machinery/light/small{
dir = 1
@@ -35842,17 +34082,9 @@
icon_state = "mars_dirt_6"
},
/area/bigredv2/caves/mining)
-"kif" = (
-/obj/structure/flora/grass/desert/lightgrass_3,
-/obj/structure/flora/bush/desert{
- icon_state = "tree_3"
- },
-/turf/open/mars,
-/area/bigredv2/outside/ne)
-"kjm" = (
-/obj/item/stack/folding_barricade,
-/turf/open/mars,
-/area/bigredv2/outside/c)
+"khT" = (
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/space_port_lz2)
"kjr" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/surface/rack,
@@ -35868,16 +34100,6 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"kjD" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/barricade/metal{
- dir = 8
- },
-/turf/open/floor{
- dir = 8;
- icon_state = "darkred2"
- },
-/area/bigredv2/outside/admin_building)
"kjH" = (
/obj/structure/surface/table,
/obj/item/stack/sheet/glass{
@@ -35903,22 +34125,6 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/bigredv2/outside/engineering)
-"kkH" = (
-/obj/item/trash/cigbutt{
- pixel_x = -6;
- pixel_y = -9
- },
-/obj/structure/flora/grass/desert/lightgrass_1,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached3"
- },
-/area/bigredv2/outside/nw)
-"kkY" = (
-/obj/effect/decal/cleanable/generic,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
- },
-/area/bigredv2/outside/virology)
"kli" = (
/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
/turf/open/mars_cave{
@@ -35934,12 +34140,19 @@
icon_state = "mars_dirt_4"
},
/area/bigredv2/caves/mining)
-"klF" = (
+"klA" = (
/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached3"
+/turf/open/floor{
+ dir = 8;
+ icon_state = "carpet15-15"
},
-/area/bigredv2/outside/space_port_lz2)
+/area/bigredv2/outside/bar)
+"kma" = (
+/obj/item/ammo_casing/bullet,
+/turf/open/floor{
+ icon_state = "dark"
+ },
+/area/bigredv2/outside/general_offices)
"kmb" = (
/obj/structure/prop/invuln/minecart_tracks{
desc = "A pipe.";
@@ -35965,11 +34178,16 @@
},
/area/bigredv2/outside/engineering)
"knw" = (
-/obj/structure/platform/kutjevo/rock{
- dir = 4
+/obj/structure/flora/grass/desert/lightgrass_5,
+/turf/open/mars{
+ icon_state = "mars_dirt_3"
},
-/turf/open/mars_cave{
- icon_state = "mars_cave_17"
+/area/bigredv2/outside/nw)
+"knE" = (
+/obj/effect/decal/strata_decals/grime/grime4,
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidwarning"
},
/area/bigredv2/outside/nw)
"knN" = (
@@ -35986,32 +34204,73 @@
icon_state = "mars_cave_7"
},
/area/bigredv2/outside/filtration_cave_cas)
-"kpd" = (
-/turf/open/mars_cave{
- icon_state = "mars_cave_14"
- },
-/area/bigredv2/outside/ne)
-"kpZ" = (
+"kol" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
},
+/obj/effect/decal/cleanable/generic,
+/turf/open/asphalt/cement{
+ icon_state = "cement4"
+ },
+/area/bigredv2/caves_lambda)
+"koq" = (
+/obj/structure/machinery/light,
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 5
+ },
+/obj/structure/largecrate/random/mini/small_case{
+ pixel_x = 4;
+ pixel_y = -3
+ },
+/obj/structure/barricade/wooden{
+ dir = 4;
+ pixel_y = 2;
+ pixel_x = -20
+ },
+/turf/open/floor,
+/area/bigredv2/outside/general_offices)
+"kos" = (
+/obj/structure/pipes/standard/simple/hidden/green,
/obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
+/turf/open/floor{
+ icon_state = "white"
+ },
+/area/bigredv2/outside/medical)
+"koB" = (
+/obj/structure/sign/double/barsign{
+ pixel_y = 32
+ },
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
/turf/open/asphalt/cement_sunbleached{
icon_state = "cement_sunbleached4"
},
-/area/bigredv2/outside/e)
-"kqI" = (
+/area/bigredv2/outside/c)
+"koN" = (
+/obj/effect/decal/strata_decals/grime/grime2,
/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached1"
+ icon_state = "cement_sunbleached9"
},
-/area/bigredv2/outside/w)
-"kqO" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
-/turf/open/asphalt/cement{
- icon_state = "cement12"
+/area/bigredv2/outside/nw)
+"kpd" = (
+/turf/open/mars_cave{
+ icon_state = "mars_cave_14"
},
-/area/bigredv2/caves_lambda)
+/area/bigredv2/outside/ne)
+"kpj" = (
+/turf/closed/wall/solaris{
+ damage = 500;
+ damage_overlay = 2;
+ current_bulletholes = 1
+ },
+/area/bigredv2/outside/office_complex)
+"kqv" = (
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached15"
+ },
+/area/bigredv2/outside/w)
"kqS" = (
/turf/open/floor{
icon_state = "wood"
@@ -36026,12 +34285,32 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/caves/mining)
+"krm" = (
+/obj/structure/machinery/body_scanconsole,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood,
+/obj/effect/decal/cleanable/blood/gibs/body,
+/turf/open/floor{
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
+"kro" = (
+/obj/effect/decal/cleanable/blood/oil/streak,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached2"
+ },
+/area/bigredv2/outside/c)
"krx" = (
/turf/open/floor{
dir = 6;
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/lz2_south_cas)
+"krV" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/obj/item/ammo_casing/bullet,
+/turf/open/floor,
+/area/bigredv2/outside/office_complex)
"krW" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/blood/writing,
@@ -36056,6 +34335,15 @@
icon_state = "mars_cave_20"
},
/area/bigredv2/caves/mining)
+"ktG" = (
+/obj/structure/pipes/vents/pump{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor{
+ icon_state = "dark"
+ },
+/area/bigredv2/outside/general_offices)
"ktN" = (
/turf/open/mars_cave{
icon_state = "mars_cave_17"
@@ -36068,6 +34356,16 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/engineering)
+"kur" = (
+/obj/item/stack/sheet/wood{
+ pixel_y = 5;
+ pixel_x = -4
+ },
+/turf/open/floor{
+ dir = 8;
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/n)
"kuu" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/trash/cigbutt,
@@ -36079,18 +34377,6 @@
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/filtration_plant)
-"kuC" = (
-/obj/item/clothing/mask/gas{
- pixel_x = 10;
- pixel_y = -12
- },
-/obj/structure/barricade/deployable{
- dir = 8
- },
-/turf/open/floor{
- icon_state = "dark"
- },
-/area/bigredv2/outside/marshal_office)
"kvp" = (
/turf/open/mars_cave{
icon_state = "mars_cave_7"
@@ -36103,6 +34389,15 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
+"kwb" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/generic,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached1"
+ },
+/area/bigredv2/outside/e)
"kwq" = (
/obj/structure/machinery/light{
dir = 8
@@ -36113,20 +34408,23 @@
icon_state = "asteroidfloor"
},
/area/bigredv2/outside/ne)
-"kwy" = (
-/obj/structure/flora/grass/desert/lightgrass_7,
-/turf/open/mars,
-/area/bigredv2/outside/nw)
+"kwz" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor,
+/area/bigredv2/outside/general_offices)
"kwQ" = (
/turf/open/floor{
dir = 10;
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/se)
-"kwT" = (
-/obj/structure/flora/grass/desert/lightgrass_2,
-/turf/open/mars,
-/area/bigredv2/outside/space_port_lz2)
+"kxc" = (
+/obj/structure/surface/table,
+/turf/open/floor{
+ icon_state = "whitegreencorner"
+ },
+/area/bigredv2/outside/medical)
"kxi" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
@@ -36144,15 +34442,23 @@
},
/turf/open/floor,
/area/bigredv2/outside/dorms)
-"kxz" = (
+"kxv" = (
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/bigredv2/caves_north)
-"kxD" = (
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
+/obj/structure/barricade/wooden{
+ desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
+ dir = 8;
+ health = 25000
},
-/area/bigredv2/outside/virology)
+/turf/open/floor{
+ icon_state = "white"
+ },
+/area/bigredv2/outside/medical)
+"kxy" = (
+/obj/structure/flora/grass/desert/lightgrass_11,
+/turf/open/mars_cave{
+ icon_state = "mars_dirt_4"
+ },
+/area/bigredv2/outside/n)
"kyz" = (
/obj/structure/transmitter/colony_net{
dir = 4;
@@ -36164,16 +34470,24 @@
icon_state = "dark"
},
/area/bigredv2/caves/eta/xenobiology)
-"kzE" = (
-/obj/effect/decal/cleanable/generic,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement,
-/area/bigredv2/outside/filtration_cave_cas)
+"kyR" = (
+/obj/structure/curtain/open/medical,
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/floor{
+ icon_state = "white"
+ },
+/area/bigredv2/outside/medical)
"kzF" = (
/turf/open/mars_cave{
icon_state = "mars_cave_2"
},
/area/bigredv2/outside/ne)
+"kzO" = (
+/obj/structure/machinery/light,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached12"
+ },
+/area/bigredv2/outside/virology)
"kAj" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 5
@@ -36181,12 +34495,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/carpet,
/area/bigredv2/outside/library)
-"kAm" = (
-/obj/structure/flora/grass/desert/lightgrass_9,
-/turf/open/mars_cave{
- icon_state = "mars_dirt_4"
- },
-/area/bigredv2/outside/w)
"kAs" = (
/obj/structure/platform_decoration{
dir = 8
@@ -36198,20 +34506,6 @@
icon_state = "asteroidfloor"
},
/area/bigredv2/outside/telecomm/n_cave)
-"kAR" = (
-/obj/structure/machinery/light{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor,
-/area/bigredv2/outside/general_offices)
-"kAU" = (
-/obj/effect/decal/cleanable/blood/drip,
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
- },
-/area/bigredv2/outside/c)
"kBn" = (
/turf/closed/wall/solaris,
/area/bigredv2/caves)
@@ -36222,14 +34516,6 @@
icon_state = "mars_cave_23"
},
/area/bigredv2/caves_lambda)
-"kBC" = (
-/obj/effect/decal/strata_decals/grime/grime2{
- dir = 1
- },
-/turf/open/asphalt/cement{
- icon_state = "cement3"
- },
-/area/bigredv2/outside/filtration_cave_cas)
"kBE" = (
/obj/structure/largecrate/supply/supplies/water,
/turf/open/floor/plating,
@@ -36241,13 +34527,26 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"kCs" = (
-/obj/effect/decal/cleanable/blood/drip,
+"kCk" = (
+/obj/structure/surface/table,
+/obj/item/trash/kepler{
+ pixel_y = 9
+ },
+/obj/effect/landmark/objective_landmark/medium,
/turf/open/floor{
dir = 4;
- icon_state = "asteroidwarning"
+ icon_state = "whiteyellowfull"
},
-/area/bigredv2/outside/ne)
+/area/bigredv2/outside/office_complex)
+"kCr" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/trash/snack_bowl{
+ pixel_y = 5;
+ pixel_x = -8
+ },
+/obj/effect/decal/cleanable/generic,
+/turf/open/floor/plating,
+/area/bigredv2/outside/bar)
"kCR" = (
/obj/structure/machinery/light{
dir = 8
@@ -36261,6 +34560,13 @@
icon_state = "red"
},
/area/bigredv2/outside/marshal_office)
+"kCY" = (
+/obj/structure/surface/table/woodentable,
+/obj/item/reagent_container/food/drinks/bottle/cognac,
+/turf/open/floor{
+ icon_state = "wood"
+ },
+/area/bigredv2/outside/bar)
"kDs" = (
/obj/structure/surface/table,
/obj/item/reagent_container/food/drinks/cans/waterbottle{
@@ -36271,23 +34577,23 @@
icon_state = "mars_cave_3"
},
/area/bigredv2/caves/mining)
-"kEb" = (
-/obj/structure/machinery/landinglight/ds1/delayone,
+"kDT" = (
/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/generic,
/turf/open/floor{
+ dir = 8;
icon_state = "asteroidwarning"
},
-/area/bigredv2/outside/space_port)
-"kEE" = (
-/obj/effect/decal/cleanable/blood,
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/nw)
-"kEN" = (
-/obj/structure/flora/grass/desert/lightgrass_1,
-/turf/open/mars{
- icon_state = "mars_dirt_9"
+/area/bigredv2/outside/s)
+"kEk" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
},
-/area/bigredv2/outside/nw)
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached4"
+ },
+/area/bigredv2/outside/e)
"kFe" = (
/obj/structure/largecrate/random/barrel/white,
/turf/open/floor{
@@ -36295,23 +34601,32 @@
icon_state = "asteroidwarning"
},
/area/bigred/ground/garage_workshop)
+"kFU" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor{
+ dir = 8;
+ icon_state = "carpet13-5"
+ },
+/area/bigredv2/outside/bar)
"kGm" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor{
icon_state = "darkgreencorners2"
},
/area/bigredv2/caves/eta/research)
+"kGs" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/turf/open/asphalt/cement{
+ icon_state = "cement3"
+ },
+/area/bigredv2/outside/lambda_cave_cas)
"kGw" = (
/obj/effect/landmark/objective_landmark/medium,
/turf/open/floor,
/area/bigredv2/caves/eta/storage)
-"kGY" = (
-/obj/structure/surface/table,
-/obj/item/storage/firstaid/adv/empty,
-/turf/open/floor{
- icon_state = "whitegreencorner"
- },
-/area/bigredv2/outside/medical)
"kHK" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor{
@@ -36319,19 +34634,11 @@
icon_state = "asteroidfloor"
},
/area/bigredv2/outside/space_port_lz2)
-"kId" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/e)
-"kIe" = (
-/obj/effect/decal/strata_decals/grime/grime2,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached9"
+"kIm" = (
+/turf/open/asphalt/cement{
+ icon_state = "cement14"
},
-/area/bigredv2/outside/space_port_lz2)
+/area/bigredv2/outside/space_port)
"kIv" = (
/obj/structure/curtain/red,
/obj/item/prop/alien/hugger,
@@ -36345,6 +34652,13 @@
},
/turf/open/floor/carpet,
/area/bigredv2/caves/lambda/breakroom)
+"kIM" = (
+/obj/structure/prop/rock/brown{
+ pixel_y = 10;
+ pixel_x = -6
+ },
+/turf/open/mars,
+/area/bigredv2/outside/nw)
"kIW" = (
/obj/structure/fence,
/turf/open/floor{
@@ -36352,16 +34666,28 @@
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/se)
-"kJh" = (
+"kJM" = (
+/obj/structure/bed/chair/office/light{
+ dir = 8
+ },
+/turf/open/floor,
+/area/bigredv2/outside/office_complex)
+"kKg" = (
+/obj/effect/landmark/corpsespawner/security,
+/obj/effect/decal/cleanable/blood{
+ layer = 3
+ },
+/obj/effect/decal/cleanable/blood/gibs/body,
/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/botany,
-/turf/open/floor{
- icon_state = "white"
+/turf/open/floor,
+/area/bigredv2/outside/lambda_cave_cas)
+"kKq" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/flora/grass/desert/lightgrass_3,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached3"
},
-/area/bigredv2/outside/marshal_office)
-"kKk" = (
-/turf/open/asphalt/cement,
-/area/bigredv2/outside/filtration_cave_cas)
+/area/bigredv2/outside/w)
"kKx" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/ash,
@@ -36372,44 +34698,20 @@
icon_state = "darkred2"
},
/area/bigredv2/caves/eta/research)
-"kLa" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/item/prop{
- desc = "A blood bag with a hole in it. The rats must have gotten to it first.";
- icon = 'icons/obj/items/bloodpack.dmi';
- icon_state = "bloodpack";
- name = "blood bag";
- pixel_x = -2;
- pixel_y = 10
- },
-/turf/open/floor{
- dir = 1;
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
-"kLy" = (
-/obj/effect/decal/medical_decals{
- icon_state = "triagedecalleft"
+"kLL" = (
+/obj/item/stack/sheet/wood{
+ layer = 2.7;
+ pixel_y = 8
},
/turf/open/floor{
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
-"kLK" = (
-/turf/open/gm/river{
- color = "#995555"
+ icon_state = "wood"
},
-/area/bigredv2/outside/c)
-"kMk" = (
-/obj/effect/landmark/hunter_primary,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
+/area/bigredv2/outside/bar)
+"kLW" = (
+/turf/open/asphalt/cement{
+ icon_state = "cement15"
},
-/area/bigredv2/outside/ne)
+/area/bigredv2/outside/lambda_cave_cas)
"kMs" = (
/obj/structure/prop/invuln/minecart_tracks{
desc = "Righty tighty, lefty loosey!";
@@ -36451,6 +34753,17 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/caves_research)
+"kNl" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 6
+ },
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/nw)
+"kNF" = (
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached4"
+ },
+/area/bigredv2/outside/se)
"kNK" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/pipes/standard/simple/hidden/green,
@@ -36458,12 +34771,28 @@
icon_state = "dark"
},
/area/bigredv2/outside/engineering)
+"kOq" = (
+/obj/structure/barricade/metal{
+ dir = 4
+ },
+/turf/open/floor{
+ dir = 6;
+ icon_state = "darkred2"
+ },
+/area/bigredv2/outside/admin_building)
"kOv" = (
/obj/structure/largecrate/random,
/turf/open/floor{
icon_state = "asteroidplating"
},
/area/bigredv2/outside/space_port_lz2)
+"kOB" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/floor{
+ icon_state = "white"
+ },
+/area/bigredv2/outside/medical)
"kPu" = (
/obj/structure/machinery/power/terminal{
dir = 1
@@ -36483,85 +34812,24 @@
icon_state = "mars_dirt_4"
},
/area/bigredv2/caves/mining)
-"kPU" = (
-/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot{
- pixel_y = 8;
- pixel_x = -2
- },
-/turf/open/floor{
- icon_state = "wood"
- },
-/area/bigredv2/outside/dorms)
"kQc" = (
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
/turf/open/mars_cave,
/area/bigredv2/caves_east)
-"kQd" = (
-/obj/item/prop{
- desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
- icon = 'icons/obj/janitor.dmi';
- icon_state = "trashbag3";
- name = "trash bag";
- pixel_x = 10;
- pixel_y = 6
- },
-/obj/item/stack/sheet/cardboard{
- pixel_x = 2;
- pixel_y = -5;
- layer = 3.01
- },
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
- },
-/area/bigredv2/outside/c)
-"kQj" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/vomit{
- pixel_x = -7;
- pixel_y = 13
- },
-/turf/open/floor/plating,
-/area/bigredv2/outside/bar)
-"kQw" = (
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached14"
- },
-/area/bigredv2/outside/nw)
-"kQX" = (
-/obj/structure/surface/table,
-/obj/item/reagent_container/food/snacks/wrapped/barcardine{
- pixel_y = -2;
- pixel_x = -8
- },
-/obj/item/reagent_container/food/snacks/packaged_meal{
- pixel_x = 8;
- pixel_y = 9
- },
-/turf/open/floor,
-/area/bigredv2/outside/general_offices)
-"kRy" = (
-/obj/structure/machinery/power/apc{
- dir = 1
- },
-/obj/effect/decal/cleanable/blood/drip,
-/turf/open/floor/plating,
-/area/bigredv2/outside/medical)
"kRK" = (
/obj/structure/window/framed/solaris/reinforced,
/turf/open/floor/plating,
/area/bigredv2/outside/admin_building)
-"kRY" = (
-/obj/effect/landmark/corpsespawner/colonist,
+"kSd" = (
+/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb{
+ pixel_x = -8
+ },
/obj/effect/decal/cleanable/blood,
-/obj/effect/decal/cleanable/blood/gibs/body,
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/c)
-"kSl" = (
-/obj/structure/flora/grass/desert/lightgrass_6,
-/turf/open/mars,
-/area/bigredv2/outside/s)
+/turf/open/floor{
+ icon_state = "dark"
+ },
+/area/bigredv2/outside/marshal_office)
"kSm" = (
/obj/item/storage/belt/grenade,
/obj/structure/closet/crate,
@@ -36584,72 +34852,55 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
+"kSF" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/turf/open/asphalt/cement{
+ icon_state = "cement14"
+ },
+/area/bigredv2/outside/space_port)
"kSH" = (
/obj/structure/ore_box,
/turf/open/mars_cave{
icon_state = "mars_cave_19"
},
/area/bigredv2/caves/mining)
-"kSI" = (
-/obj/effect/decal/cleanable/molten_item{
- pixel_x = -5;
- pixel_y = -11
- },
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
- },
-/area/bigredv2/outside/nw)
"kSL" = (
/turf/open/mars_cave{
icon_state = "mars_cave_7"
},
/area/bigredv2/outside/filtration_cave_cas)
-"kTa" = (
-/obj/structure/machinery/door/airlock/almayer/engineering/colony{
- dir = 1;
- name = "\improper Dormitories EVA";
- icon_state = "door_open";
- density = 0
+"kTj" = (
+/obj/structure/flora/grass/desert/lightgrass_2,
+/turf/open/mars,
+/area/bigredv2/outside/n)
+"kTp" = (
+/obj/item/device/flashlight/lamp/tripod{
+ layer = 6;
+ pixel_y = 11
},
-/turf/open/floor{
- icon_state = "delivery"
+/turf/open/mars_cave{
+ icon_state = "mars_cave_2"
},
-/area/bigredv2/outside/general_offices)
+/area/bigredv2/outside/n)
"kTs" = (
/obj/effect/decal/cleanable/blood,
/turf/open/floor,
/area/bigredv2/outside/filtration_cave_cas)
-"kUT" = (
-/obj/item/trash/syndi_cakes{
- pixel_y = -15;
- pixel_x = -3
+"kUa" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/machinery/computer/arcade,
+/turf/open/floor{
+ icon_state = "wood"
},
-/obj/item/prop/magazine/book/starshiptroopers{
- pixel_x = -6;
- pixel_y = -5
+/area/bigredv2/outside/dorms)
+"kVR" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 5
},
-/obj/effect/decal/cleanable/generic,
-/turf/open/mars_cave{
- icon_state = "mars_cave_13"
- },
-/area/bigredv2/outside/nw)
-"kUW" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
-/obj/structure/machinery/light{
- dir = 8
- },
-/turf/open/floor{
- dir = 5;
- icon_state = "asteroidwarning"
- },
-/area/bigredv2/caves_lambda)
-"kVR" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 5
- },
-/turf/open/floor{
- icon_state = "asteroidwarning"
+/turf/open/floor{
+ icon_state = "asteroidwarning"
},
/area/bigredv2/outside/n)
"kVS" = (
@@ -36672,14 +34923,24 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"kWl" = (
-/obj/structure/pipes/standard/simple/hidden/green{
+"kVZ" = (
+/obj/structure/bed/chair/wood/normal{
dir = 4
},
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/gibs/limb,
+/obj/effect/decal/cleanable/generic,
+/turf/open/floor{
+ icon_state = "wood"
+ },
+/area/bigredv2/outside/bar)
+"kWh" = (
+/obj/structure/machinery/light{
+ dir = 4
+ },
+/obj/item/tool/wrench{
+ pixel_x = -5
+ },
/turf/open/floor,
-/area/bigredv2/outside/marshal_office)
+/area/bigredv2/outside/office_complex)
"kWV" = (
/obj/effect/landmark/crap_item,
/turf/open/mars_cave{
@@ -36696,34 +34957,67 @@
icon_state = "asteroidfloor"
},
/area/bigredv2/outside/telecomm/lz2_cave)
-"kXQ" = (
-/obj/effect/decal/cleanable/generic,
-/turf/open/floor{
- dir = 8;
- icon_state = "carpet15-15"
+"kXa" = (
+/obj/item/trash/waffles{
+ pixel_x = -19;
+ pixel_y = -5
},
-/area/bigredv2/outside/bar)
-"kZF" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached4"
},
-/obj/effect/decal/cleanable/blood,
+/area/bigredv2/outside/nw)
+"kXo" = (
+/obj/effect/decal/strata_decals/grime/grime2,
+/obj/item/trash/kepler/flamehot{
+ pixel_y = 13;
+ pixel_x = 14
+ },
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached9"
+ },
+/area/bigredv2/outside/nw)
+"kXy" = (
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/se)
+"kYx" = (
+/obj/structure/machinery/door/airlock/almayer/medical/glass/colony{
+ name = "\improper Medical Command Complex";
+ density = 0;
+ icon_state = "door_open"
+ },
+/turf/open/floor{
+ icon_state = "delivery"
+ },
+/area/bigredv2/outside/admin_building)
+"kYP" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/pipes/standard/simple/hidden/green,
+/obj/effect/decal/cleanable/blood/drip,
/turf/open/floor,
-/area/bigredv2/outside/general_offices)
+/area/bigredv2/outside/cargo)
+"kZl" = (
+/obj/structure/fence,
+/turf/open/asphalt/cement{
+ icon_state = "cement12"
+ },
+/area/bigredv2/outside/filtration_cave_cas)
+"kZC" = (
+/obj/structure/surface/rack,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/ammo_magazine/shotgun/buckshot,
+/obj/item/ammo_magazine/shotgun/buckshot{
+ pixel_y = -8;
+ pixel_x = -6
+ },
+/turf/open/floor{
+ icon_state = "dark"
+ },
+/area/bigredv2/outside/marshal_office)
"kZG" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/storage/bible/hefa,
/turf/open/floor/plating,
/area/bigredv2/caves/mining)
-"kZI" = (
-/obj/structure/machinery/light/small{
- dir = 1
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement{
- icon_state = "cement14"
- },
-/area/bigredv2/caves_lambda)
"laj" = (
/obj/structure/tunnel{
id = "hole5"
@@ -36732,42 +35026,65 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/caves_lambda)
-"laI" = (
-/obj/item/trash/cigbutt{
- pixel_x = 7;
- pixel_y = 7
+"lap" = (
+/obj/item/clothing/under/brown{
+ pixel_x = 4;
+ pixel_y = -5
},
-/turf/open/mars_cave{
- icon_state = "mars_dirt_4"
+/turf/open/floor{
+ icon_state = "freezerfloor"
},
-/area/bigredv2/outside/n)
+/area/bigredv2/outside/general_offices)
+"laq" = (
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached18"
+ },
+/area/bigredv2/outside/virology)
+"lau" = (
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached3"
+ },
+/area/bigredv2/outside/space_port_lz2)
+"laO" = (
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached1"
+ },
+/area/bigredv2/outside/w)
+"laZ" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/obj/effect/decal/strata_decals/grime/grime2{
+ dir = 8
+ },
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached1"
+ },
+/area/bigredv2/outside/nw)
"lbh" = (
/turf/open/mars_cave{
icon_state = "mars_cave_17"
},
/area/bigredv2/outside/n)
-"lbF" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached15"
+"lbj" = (
+/obj/item/trash/hotdog{
+ pixel_x = -12;
+ pixel_y = -11
},
-/area/bigredv2/outside/nw)
-"lbH" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/obj/item/ammo_casing/bullet,
/turf/open/floor{
- icon_state = "whitegreen"
+ icon_state = "wood"
+ },
+/area/bigredv2/outside/bar)
+"lbP" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/structure/machinery/door/airlock/almayer/security/glass/colony{
+ name = "\improper Marshal Office Armory";
+ locked = 1
},
-/area/bigredv2/outside/medical)
-"lbU" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/coffin/woodencrate,
/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
+ icon_state = "delivery"
},
-/area/bigredv2/outside/n)
+/area/bigredv2/outside/marshal_office)
"lbZ" = (
/obj/item/frame/rack,
/obj/effect/decal/cleanable/dirt,
@@ -36790,6 +35107,12 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/engineering)
+"lcr" = (
+/obj/effect/decal/strata_decals/grime/grime3,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached3"
+ },
+/area/bigredv2/outside/s)
"lcu" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/clothing/mask/cigarette,
@@ -36802,6 +35125,21 @@
},
/turf/open/floor,
/area/bigred/ground/garage_workshop)
+"lcE" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached4"
+ },
+/area/bigredv2/outside/se)
+"lcY" = (
+/obj/item/trash/cigbutt{
+ pixel_x = -10;
+ pixel_y = 7
+ },
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached1"
+ },
+/area/bigredv2/outside/nw)
"ldh" = (
/obj/item/device/flashlight/on{
pixel_x = 8
@@ -36810,60 +35148,60 @@
icon_state = "floor1"
},
/area/bigredv2/oob)
-"ldD" = (
-/obj/item/tool/warning_cone{
- pixel_x = 16;
- pixel_y = 14
+"lds" = (
+/obj/structure/surface/table,
+/obj/item/storage/box/gloves{
+ pixel_y = 8
},
-/obj/structure/flora/grass/desert/lightgrass_4,
-/turf/open/mars,
-/area/bigredv2/outside/n)
-"lel" = (
-/obj/structure/bed/stool,
+/turf/open/floor{
+ icon_state = "whitegreencorner"
+ },
+/area/bigredv2/outside/medical)
+"ldT" = (
+/obj/structure/surface/table/reinforced,
+/obj/structure/machinery/recharger,
+/obj/structure/blocker/forcefield/multitile_vehicles,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor{
- icon_state = "wood"
+ dir = 9;
+ icon_state = "redfull"
},
-/area/bigredv2/outside/dorms)
-"leE" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
+/area/bigredv2/outside/lambda_cave_cas)
+"lex" = (
+/obj/structure/machinery/light{
+ dir = 8
},
-/obj/effect/decal/strata_decals/grime/grime4,
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/e)
-"leX" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
+/obj/structure/sign/nosmoking_1{
+ pixel_x = -32
},
-/obj/effect/decal/cleanable/generic,
-/turf/open/asphalt/cement{
- icon_state = "cement4"
+/obj/item/stack/sheet/wood/medium_stack{
+ pixel_x = 2;
+ pixel_y = 5
},
-/area/bigredv2/caves_lambda)
-"lfD" = (
-/obj/item/trash/cigbutt{
- pixel_x = -6;
- pixel_y = -2
+/obj/item/stack/sheet/wood{
+ pixel_x = -4;
+ pixel_y = -10
},
-/obj/effect/decal/cleanable/generic,
/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
+ dir = 8;
+ icon_state = "whitegreen"
},
-/area/bigredv2/outside/ne)
-"lgZ" = (
-/obj/effect/decal/strata_decals/grime/grime3,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached14"
+/area/bigredv2/outside/medical)
+"leQ" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/ammo_casing/bullet,
+/obj/item/ammo_casing/bullet,
+/turf/open/floor{
+ icon_state = "redcorner"
},
-/area/bigredv2/outside/nw)
-"lhg" = (
-/obj/effect/decal/strata_decals/grime/grime3,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
+/area/bigredv2/outside/marshal_office)
+"lgB" = (
+/obj/effect/decal/strata_decals/grime/grime2,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement{
+ icon_state = "cement4"
},
-/area/bigredv2/outside/w)
+/area/bigredv2/outside/space_port)
"lhh" = (
/obj/structure/fence,
/obj/structure/disposalpipe/segment,
@@ -36871,6 +35209,10 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/caves/mining)
+"lhA" = (
+/obj/structure/flora/grass/desert/lightgrass_9,
+/turf/open/mars,
+/area/bigredv2/outside/nw)
"lhE" = (
/obj/structure/prop/almayer/cannon_cable_connector{
name = "\improper Control Module";
@@ -36881,29 +35223,52 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/caves/mining)
-"lhO" = (
+"lhI" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
+/turf/open/asphalt/cement{
+ icon_state = "cement4"
+ },
+/area/bigredv2/caves_lambda)
+"lhU" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/ammo_casing/bullet,
+/turf/open/floor{
+ icon_state = "redcorner"
+ },
+/area/bigredv2/outside/marshal_office)
+"lin" = (
/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached3"
+ icon_state = "cement_sunbleached16"
},
-/area/bigredv2/outside/nw)
-"liO" = (
-/turf/open/asphalt/cement{
- icon_state = "cement1"
+/area/bigredv2/outside/virology)
+"lir" = (
+/obj/structure/flora/grass/desert/lightgrass_2,
+/turf/open/mars,
+/area/bigredv2/outside/c)
+"lkm" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor{
+ dir = 6;
+ icon_state = "darkred2"
},
-/area/bigredv2/outside/lambda_cave_cas)
-"liY" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 6
+/area/bigredv2/outside/admin_building)
+"lln" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/pipes/standard/simple/hidden/green,
+/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
+ name = "\improper Marshal Office";
+ welded = 1
},
-/obj/effect/decal/cleanable/blood/gibs/xeno,
/turf/open/floor{
- icon_state = "white"
+ icon_state = "delivery"
},
-/area/bigredv2/outside/medical)
-"ljH" = (
-/turf/open/mars{
- icon_state = "mars_dirt_5"
+/area/bigredv2/outside/marshal_office)
+"llC" = (
+/obj/structure/flora/bush/desert{
+ icon_state = "tree_4"
},
+/turf/open/mars,
/area/bigredv2/outside/nw)
"llS" = (
/obj/structure/prop/almayer/cannon_cable_connector{
@@ -36920,6 +35285,15 @@
icon_state = "floor1"
},
/area/bigredv2/oob)
+"llZ" = (
+/obj/effect/decal/cleanable/blood/drip,
+/obj/item/alien_embryo{
+ pixel_x = 4
+ },
+/turf/open/floor{
+ icon_state = "white"
+ },
+/area/bigredv2/outside/medical)
"lmg" = (
/obj/structure/bed/chair/office/light{
dir = 4
@@ -36933,51 +35307,21 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/engineering)
-"lmr" = (
-/obj/item/stack/sheet/metal{
- pixel_x = 2;
- pixel_y = 6
+"lmo" = (
+/obj/item/trash/wy_chips_pepper{
+ pixel_y = -13;
+ pixel_x = 24
},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor,
-/area/bigredv2/outside/general_offices)
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached4"
+ },
+/area/bigredv2/outside/nw)
"lms" = (
/turf/open/floor{
dir = 6;
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/eta)
-"lmC" = (
-/obj/effect/decal/strata_decals/grime/grime1{
- dir = 4
- },
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
- },
-/area/bigredv2/outside/c)
-"lmL" = (
-/obj/item/prop{
- desc = "A blood bag with a hole in it. The rats must have gotten to it first.";
- icon = 'icons/obj/items/bloodpack.dmi';
- icon_state = "bloodpack";
- name = "blood bag";
- pixel_x = -2;
- pixel_y = 10
- },
-/obj/item/prop/colony/usedbandage,
-/obj/item/prop/colony/usedbandage{
- dir = 4;
- pixel_x = 5;
- pixel_y = 26
- },
-/obj/effect/decal/cleanable/generic,
-/obj/effect/decal/cleanable/ash{
- pixel_y = 19
- },
-/turf/open/mars_cave{
- icon_state = "mars_cave_9"
- },
-/area/bigredv2/outside/nw)
"lmO" = (
/obj/structure/surface/table/woodentable,
/obj/item/newspaper{
@@ -36993,12 +35337,41 @@
icon_state = "wood"
},
/area/bigredv2/outside/library)
-"lok" = (
-/obj/item/ammo_casing/shell,
+"lnj" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/structure/machinery/door/airlock/almayer/engineering/colony{
+ name = "\improper Dormitories EVA";
+ icon_state = "door_open";
+ density = 0
+ },
+/obj/item/stack/sheet/wood,
/turf/open/floor{
- icon_state = "wood"
+ icon_state = "delivery"
},
-/area/bigredv2/outside/bar)
+/area/bigredv2/outside/general_offices)
+"lnO" = (
+/obj/structure/platform/kutjevo/rock,
+/obj/structure/platform/kutjevo/rock{
+ dir = 4
+ },
+/turf/open/mars_cave{
+ icon_state = "mars_cave_14"
+ },
+/area/bigredv2/outside/nw)
+"loe" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 6
+ },
+/obj/item/stack/rods{
+ pixel_y = 13;
+ pixel_x = 17
+ },
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached9"
+ },
+/area/bigredv2/outside/nw)
"lom" = (
/obj/effect/landmark/corpsespawner/miner,
/obj/effect/decal/cleanable/blood{
@@ -37012,21 +35385,65 @@
icon_state = "mars_cave_3"
},
/area/bigredv2/caves/mining)
-"los" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/drip,
+"loo" = (
+/obj/structure/barricade/wooden{
+ desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
+ dir = 8;
+ health = 25000
+ },
+/obj/structure/largecrate/random/mini{
+ pixel_x = 5;
+ pixel_y = -8
+ },
+/obj/structure/largecrate/random/mini{
+ pixel_x = 2;
+ pixel_y = 9
+ },
+/obj/structure/largecrate/random/mini{
+ pixel_x = 9;
+ pixel_y = 6;
+ layer = 2.95
+ },
/turf/open/floor,
-/area/bigredv2/outside/cargo)
-"lpP" = (
-/obj/item/trash/cigbutt{
- pixel_x = -10;
- pixel_y = 13
+/area/bigredv2/outside/general_offices)
+"loT" = (
+/obj/structure/flora/grass/desert/lightgrass_6,
+/turf/open/mars,
+/area/bigredv2/outside/s)
+"lpf" = (
+/obj/item/stack/rods{
+ pixel_y = -2
},
/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
+ icon_state = "redcorner"
},
-/area/bigredv2/outside/c)
+/area/bigredv2/outside/marshal_office)
+"lpD" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 6
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached3"
+ },
+/area/bigredv2/outside/virology)
+"lpI" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot{
+ pixel_x = -11;
+ pixel_y = 12
+ },
+/turf/open/floor{
+ icon_state = "dark"
+ },
+/area/bigredv2/outside/general_offices)
+"lqi" = (
+/obj/item/prop/alien/hugger,
+/turf/open/floor{
+ icon_state = "whiteblue"
+ },
+/area/bigredv2/outside/medical)
"lqo" = (
/obj/item/tool/lighter/random,
/obj/structure/pipes/vents/pump{
@@ -37047,46 +35464,29 @@
icon_state = "asteroidfloor"
},
/area/bigredv2/outside/telecomm/n_cave)
-"lqw" = (
-/obj/effect/decal/cleanable/blood{
- layer = 3
- },
-/turf/open/floor,
-/area/bigredv2/outside/lambda_cave_cas)
-"lrb" = (
-/obj/item/ammo_magazine/shotgun/slugs,
-/turf/closed/wall/solaris/rock,
-/area/bigredv2/caves)
-"lre" = (
-/obj/item/trash/cigbutt{
- pixel_x = 7
- },
-/obj/item/trash/cigbutt{
- pixel_x = -1;
- pixel_y = 17
- },
-/obj/item/trash/cigbutt{
- pixel_x = -10;
- pixel_y = 13
+"lqU" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/surface/table/woodentable{
+ dir = 1;
+ flipped = 1
},
-/obj/item/trash/cigbutt{
- pixel_x = -10;
- pixel_y = 7
+/turf/open/floor{
+ icon_state = "wood"
},
-/obj/item/trash/cigbutt{
- pixel_x = -9;
- pixel_y = -6
+/area/bigredv2/outside/dorms)
+"lrm" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/trash/hotdog{
+ pixel_x = -12;
+ pixel_y = -11
},
-/obj/item/trash/cigbutt,
/obj/item/trash/cigbutt{
- pixel_x = -6;
- pixel_y = -9
+ pixel_x = 7
},
/turf/open/floor{
- dir = 8;
- icon_state = "asteroidwarning"
+ icon_state = "dark"
},
-/area/bigredv2/outside/nw)
+/area/bigredv2/outside/marshal_office)
"lrs" = (
/obj/structure/machinery/door/airlock/almayer/command/colony{
name = "\improper Operations"
@@ -37095,34 +35495,12 @@
icon_state = "delivery"
},
/area/bigredv2/outside/admin_building)
-"lrw" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 6
- },
-/obj/item/stack/rods{
- pixel_y = 13;
- pixel_x = 17
- },
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached9"
- },
-/area/bigredv2/outside/nw)
"lrH" = (
/obj/effect/landmark/crap_item,
/turf/open/mars_cave{
icon_state = "mars_cave_2"
},
/area/bigredv2/outside/lz1_telecomm_cas)
-"lrM" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/clothing/suit/armor/riot{
- pixel_y = -6;
- pixel_x = -8
- },
-/turf/open/floor{
- icon_state = "dark"
- },
-/area/bigredv2/outside/marshal_office)
"lrW" = (
/obj/structure/prop/invuln/minecart_tracks{
desc = "A pipe.";
@@ -37147,6 +35525,21 @@
icon_state = "darkblue2"
},
/area/bigredv2/caves/eta/research)
+"lsO" = (
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
+/turf/open/floor{
+ dir = 9;
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/caves_lambda)
+"ltq" = (
+/obj/structure/surface/table,
+/obj/item/reagent_container/food/snacks/packaged_burrito{
+ pixel_x = 5;
+ pixel_y = 9
+ },
+/turf/open/floor,
+/area/bigredv2/outside/general_offices)
"ltu" = (
/turf/open/mars_cave{
icon_state = "mars_cave_19"
@@ -37163,6 +35556,17 @@
},
/turf/open/floor,
/area/bigredv2/outside/dorms)
+"lud" = (
+/obj/structure/surface/table,
+/obj/item/storage/fancy/vials/random{
+ pixel_y = -5;
+ pixel_x = -3
+ },
+/turf/open/floor{
+ dir = 1;
+ icon_state = "whitepurplecorner"
+ },
+/area/bigredv2/outside/medical)
"luA" = (
/obj/item/tool/crowbar/red,
/turf/open/floor/plating{
@@ -37170,11 +35574,6 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"luD" = (
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
- },
-/area/bigredv2/outside/c)
"lvh" = (
/obj/item/weapon/gun/rifle/m4ra,
/obj/effect/landmark/corpsespawner/ua_riot,
@@ -37208,6 +35607,24 @@
icon_state = "mars_cave_7"
},
/area/bigredv2/caves_sw)
+"lxg" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached12"
+ },
+/area/bigredv2/outside/c)
+"lxu" = (
+/obj/structure/machinery/light{
+ dir = 1
+ },
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement{
+ icon_state = "cement4"
+ },
+/area/bigredv2/caves_lambda)
"lxQ" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/paper/bigred/union,
@@ -37228,60 +35645,71 @@
},
/turf/open/floor,
/area/bigredv2/outside/marshal_office)
-"lyx" = (
-/obj/structure/surface/table,
-/obj/structure/machinery/light{
- dir = 1
- },
-/obj/item/reagent_container/glass/bottle/cyanide{
- pixel_y = 2;
- pixel_x = -6
+"lyw" = (
+/obj/structure/flora/grass/desert/lightgrass_1,
+/turf/open/mars,
+/area/bigredv2/outside/nw)
+"lyQ" = (
+/obj/item/trash/used_stasis_bag{
+ pixel_y = 5
},
/turf/open/floor{
- icon_state = "wood"
+ dir = 5;
+ icon_state = "whiteblue"
},
-/area/bigredv2/outside/dorms)
-"lze" = (
-/turf/closed/wall/solaris{
- damage = 1870;
- damage_overlay = 5;
- current_bulletholes = 3
+/area/bigredv2/outside/medical)
+"lyX" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/machinery/landinglight/ds1/delaytwo{
+ dir = 8
},
-/area/bigredv2/outside/office_complex)
-"lzg" = (
-/obj/effect/decal/cleanable/blood/drip,
-/obj/item/alien_embryo{
- pixel_x = 4
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor{
+ dir = 8;
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/space_port)
+"lzD" = (
+/obj/structure/surface/table,
+/obj/structure/machinery/light{
+ dir = 8
},
/turf/open/floor{
- icon_state = "white"
+ icon_state = "whitegreencorner"
},
/area/bigredv2/outside/medical)
"lzI" = (
/obj/structure/blocker/forcefield/multitile_vehicles,
/turf/closed/wall/solaris/reinforced,
/area/bigredv2/caves)
-"lzK" = (
-/obj/structure/flora/grass/desert/lightgrass_12,
-/obj/structure/flora/bush/desert{
- icon_state = "tree_3"
+"lzY" = (
+/obj/structure/reagent_dispensers/watertank,
+/obj/item/reagent_container/food/drinks/cup{
+ pixel_x = -6;
+ pixel_y = 8
},
-/turf/open/mars,
-/area/bigredv2/outside/s)
-"lAe" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
+/turf/open/floor{
+ dir = 1;
+ icon_state = "whitegreen"
},
-/obj/effect/decal/cleanable/blood/gibs/xeno/body,
-/turf/open/floor,
/area/bigredv2/outside/marshal_office)
-"lAB" = (
-/obj/structure/pipes/standard/simple/hidden/green,
+"lzZ" = (
+/obj/structure/surface/table,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/trash/syndi_cakes{
+ pixel_y = -4
+ },
+/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
/turf/open/floor{
- dir = 9;
- icon_state = "asteroidwarning"
+ icon_state = "dark"
},
-/area/bigredv2/outside/e)
+/area/bigredv2/outside/office_complex)
+"lAn" = (
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/mars_cave{
+ icon_state = "mars_cave_2"
+ },
+/area/bigredv2/outside/n)
"lAC" = (
/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
/turf/open/mars_cave{
@@ -37313,10 +35741,6 @@
/obj/structure/sign/poster/safety,
/turf/closed/wall/solaris/reinforced,
/area/bigredv2/caves/mining)
-"lBg" = (
-/obj/structure/flora/grass/desert/lightgrass_10,
-/turf/open/mars,
-/area/bigredv2/outside/c)
"lBx" = (
/obj/structure/machinery/door/airlock/almayer/maint/colony{
dir = 1;
@@ -37327,41 +35751,23 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"lBN" = (
-/obj/item/stack/sheet/wood{
- layer = 2.7;
- pixel_x = -13
- },
-/obj/item/stack/rods{
- pixel_y = 11;
- pixel_x = -11
- },
-/turf/open/floor{
- dir = 10;
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
-"lBO" = (
-/obj/structure/bed/chair/wheelchair{
- pixel_y = 5;
- pixel_x = 5
- },
-/obj/structure/machinery/iv_drip{
- pixel_y = 20;
- pixel_x = -13
- },
-/turf/open/floor{
- dir = 1;
- icon_state = "whitegreen"
+"lBC" = (
+/obj/structure/flora/grass/desert/lightgrass_10,
+/turf/open/mars_cave{
+ icon_state = "mars_dirt_4"
},
-/area/bigredv2/outside/medical)
-"lBS" = (
-/turf/closed/wall/solaris{
- damage = 2677;
- damage_overlay = 8;
- current_bulletholes = 3
+/area/bigredv2/outside/nw)
+"lBM" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
},
-/area/bigredv2/outside/medical)
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/e)
+"lBX" = (
+/obj/effect/decal/cleanable/generic,
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/se)
"lCt" = (
/obj/structure/machinery/power/reactor/colony{
name = "Reactor Turbine"
@@ -37370,12 +35776,10 @@
icon_state = "delivery"
},
/area/bigredv2/outside/engineering)
-"lCF" = (
-/obj/item/prop/alien/hugger,
-/turf/open/floor{
- icon_state = "whiteblue"
- },
-/area/bigredv2/outside/medical)
+"lCI" = (
+/obj/structure/flora/grass/desert/lightgrass_9,
+/turf/open/mars,
+/area/bigredv2/outside/c)
"lCR" = (
/obj/structure/surface/table,
/obj/item/reagent_container/food/drinks/flask/vacuumflask{
@@ -37407,18 +35811,6 @@
icon_state = "redfull"
},
/area/bigredv2/caves/eta/research)
-"lDu" = (
-/obj/item/trash/hotdog{
- pixel_x = -12;
- pixel_y = -11
- },
-/turf/open/floor{
- icon_state = "wood"
- },
-/area/bigredv2/outside/bar)
-"lEb" = (
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/se)
"lEi" = (
/obj/structure/bed/chair{
dir = 4
@@ -37436,75 +35828,35 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"lEN" = (
-/obj/item/stack/sheet/wood{
- pixel_x = 1;
- pixel_y = 6
- },
-/turf/open/floor{
- icon_state = "white"
- },
-/area/bigredv2/outside/marshal_office)
-"lFm" = (
+"lFn" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/pipes/standard/simple/hidden/green,
/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached14"
- },
-/area/bigredv2/outside/se)
-"lFw" = (
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidwarning"
- },
-/area/bigredv2/outside/eta)
-"lFF" = (
-/obj/structure/barricade/wooden{
- dir = 8;
- pixel_y = 12
+ icon_state = "cement_sunbleached12"
},
-/turf/open/floor,
-/area/bigredv2/outside/general_offices)
-"lFG" = (
+/area/bigredv2/outside/e)
+"lFO" = (
/turf/open/asphalt/cement_sunbleached{
icon_state = "cement_sunbleached2"
},
-/area/bigredv2/outside/virology)
-"lFJ" = (
-/obj/structure/flora/grass/desert/lightgrass_11,
-/turf/open/mars,
-/area/bigredv2/caves_north)
-"lFQ" = (
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached14"
- },
-/area/bigredv2/outside/c)
+/area/bigredv2/outside/e)
"lFR" = (
/obj/effect/landmark/nightmare{
insert_tag = "viro_open"
},
/turf/closed/wall/solaris/rock,
/area/bigredv2/caves)
-"lFZ" = (
-/obj/effect/decal/cleanable/blood/xeno,
-/turf/open/floor{
- icon_state = "darkish"
- },
-/area/bigredv2/outside/medical)
-"lGk" = (
-/obj/structure/flora/grass/desert/lightgrass_1,
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/space_port_lz2)
-"lGl" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
- },
-/area/bigredv2/outside/se)
"lGt" = (
/turf/open/floor{
icon_state = "delivery"
},
/area/bigredv2/caves/eta/living)
+"lHQ" = (
+/obj/structure/flora/grass/desert/lightgrass_1,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached4"
+ },
+/area/bigredv2/outside/nw)
"lIe" = (
/obj/item/weapon/twohanded/folded_metal_chair,
/obj/effect/decal/cleanable/dirt,
@@ -37513,10 +35865,6 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"lIr" = (
-/obj/structure/flora/grass/desert/lightgrass_12,
-/turf/open/mars,
-/area/bigredv2/outside/s)
"lID" = (
/obj/structure/barricade/handrail{
dir = 4
@@ -37535,17 +35883,14 @@
icon_state = "mars_cave_19"
},
/area/bigredv2/outside/ne)
-"lJa" = (
-/obj/effect/decal/cleanable/blood/xeno,
-/turf/open/floor{
- icon_state = "dark"
- },
-/area/bigredv2/outside/marshal_office)
-"lKq" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/obj/item/ammo_casing/bullet,
-/turf/open/floor,
-/area/bigredv2/outside/office_complex)
+"lJP" = (
+/obj/structure/flora/grass/desert/lightgrass_9,
+/turf/open/mars,
+/area/bigredv2/outside/virology)
+"lKe" = (
+/obj/effect/acid_hole,
+/turf/closed/wall/solaris,
+/area/bigredv2/outside/medical)
"lKw" = (
/obj/item/paper/bigred/walls,
/obj/structure/machinery/light/small{
@@ -37556,10 +35901,11 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"lKW" = (
+"lKH" = (
/obj/effect/decal/cleanable/dirt,
-/obj/structure/barricade/deployable{
- dir = 4
+/obj/item/clothing/suit/armor/riot{
+ pixel_x = -8;
+ pixel_y = -5
},
/turf/open/floor{
icon_state = "dark"
@@ -37577,22 +35923,6 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"lLn" = (
-/obj/structure/flora/grass/desert/lightgrass_11,
-/turf/open/mars,
-/area/bigredv2/outside/n)
-"lMj" = (
-/obj/effect/decal/cleanable/blood/gibs/xeno,
-/obj/effect/decal/cleanable/blood/xeno,
-/turf/open/floor,
-/area/bigredv2/outside/office_complex)
-"lMk" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/computer/arcade,
-/turf/open/floor{
- icon_state = "redcorner"
- },
-/area/bigredv2/outside/marshal_office)
"lMw" = (
/obj/structure/machinery/sensortower{
pixel_x = -9
@@ -37623,36 +35953,18 @@
icon_state = "dark"
},
/area/bigredv2/outside/office_complex)
-"lNT" = (
-/obj/structure/surface/table,
-/obj/item/reagent_container/food/snacks/packaged_burger,
-/turf/open/floor,
-/area/bigredv2/outside/general_offices)
-"lNW" = (
-/obj/structure/flora/grass/desert/lightgrass_4,
-/obj/structure/flora/grass/desert/lightgrass_11,
-/turf/open/mars_cave{
- icon_state = "mars_dirt_4"
- },
-/area/bigredv2/outside/space_port_lz2)
-"lNZ" = (
-/obj/structure/flora/grass/desert/lightgrass_2,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
+"lOG" = (
+/obj/item/stack/rods{
+ pixel_y = 13;
+ pixel_x = 17
},
-/area/bigredv2/outside/nw)
+/turf/open/floor/plating,
+/area/bigredv2/outside/space_port)
"lOL" = (
/turf/open/mars_cave{
icon_state = "mars_cave_20"
},
/area/bigredv2/outside/n)
-"lOM" = (
-/obj/effect/decal/cleanable/blood/drip,
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
- },
-/area/bigredv2/outside/eta)
"lOY" = (
/obj/effect/landmark/nightmare{
insert_tag = "etatunnel_open"
@@ -37671,12 +35983,6 @@
icon_state = "mars_cave_15"
},
/area/bigredv2/caves/mining)
-"lPI" = (
-/obj/structure/bed/chair/office/light{
- dir = 4
- },
-/turf/open/floor,
-/area/bigredv2/outside/office_complex)
"lPL" = (
/obj/structure/platform/shiva{
dir = 4
@@ -37688,24 +35994,29 @@
icon_state = "bcircuitoff"
},
/area/bigredv2/caves/lambda/research)
-"lQv" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/drip,
-/turf/open/floor{
- dir = 4;
- icon_state = "asteroidwarning"
- },
-/area/bigredv2/outside/n)
"lQN" = (
/turf/open/mars_cave{
icon_state = "mars_cave_18"
},
/area/bigredv2/outside/lz2_south_cas)
-"lQU" = (
+"lRd" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot{
+ pixel_x = 7;
+ pixel_y = -9
+ },
+/turf/open/floor{
+ icon_state = "dark"
+ },
+/area/bigredv2/outside/general_offices)
+"lRp" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
/turf/open/asphalt/cement_sunbleached{
icon_state = "cement_sunbleached12"
},
-/area/bigredv2/outside/virology)
+/area/bigredv2/outside/c)
"lRC" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/barricade/handrail{
@@ -37716,6 +36027,15 @@
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/c)
+"lRO" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 9
+ },
+/obj/effect/decal/strata_decals/grime/grime4,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached2"
+ },
+/area/bigredv2/outside/c)
"lSb" = (
/obj/structure/blocker/forcefield/multitile_vehicles,
/turf/open/mars_cave{
@@ -37733,12 +36053,6 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"lSv" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached15"
- },
-/area/bigredv2/outside/e)
"lSH" = (
/obj/structure/largecrate/guns/merc{
icon_state = "case_double";
@@ -37749,13 +36063,6 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"lSS" = (
-/obj/item/tool/warning_cone,
-/obj/structure/blocker/forcefield/multitile_vehicles,
-/turf/open/asphalt/cement{
- icon_state = "cement9"
- },
-/area/bigredv2/outside/filtration_cave_cas)
"lTi" = (
/obj/effect/decal/warning_stripes{
icon_state = "N";
@@ -37766,6 +36073,15 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/filtration_plant)
+"lTl" = (
+/obj/structure/machinery/light,
+/obj/structure/bed/chair/wood/normal{
+ dir = 1
+ },
+/turf/open/floor{
+ icon_state = "wood"
+ },
+/area/bigredv2/outside/bar)
"lTC" = (
/obj/structure/machinery/light{
dir = 4
@@ -37777,12 +36093,6 @@
icon_state = "wood"
},
/area/bigredv2/outside/library)
-"lTL" = (
-/turf/closed/wall/solaris{
- damage = 1870;
- damage_overlay = 5
- },
-/area/bigredv2/outside/office_complex)
"lTM" = (
/obj/item/folder/yellow,
/turf/open/floor{
@@ -37818,36 +36128,28 @@
/obj/structure/machinery/power/reactor/colony,
/turf/open/floor/plating,
/area/bigredv2/caves/lambda/xenobiology)
-"lVr" = (
-/obj/effect/landmark/monkey_spawn,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
-/turf/open/floor{
- icon_state = "dark"
- },
-/area/bigredv2/caves/lambda/breakroom)
-"lVU" = (
-/obj/structure/flora/bush/desert{
- icon_state = "tree_3"
+"lUU" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached3"
},
-/turf/open/mars,
-/area/bigredv2/outside/space_port_lz2)
-"lVW" = (
-/obj/structure/machinery/shower{
+/area/bigredv2/outside/c)
+"lUV" = (
+/obj/structure/machinery/light{
dir = 8
},
-/obj/structure/window/reinforced/tinted,
-/obj/effect/decal/cleanable/blood,
-/obj/effect/decal/cleanable/blood/gibs/body,
+/obj/effect/decal/cleanable/dirt,
/turf/open/floor{
- icon_state = "freezerfloor"
+ icon_state = "wood"
},
-/area/bigredv2/outside/dorms)
-"lWt" = (
-/obj/item/ammo_casing/shell,
+/area/bigredv2/outside/general_offices)
+"lVr" = (
+/obj/effect/landmark/monkey_spawn,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
/turf/open/floor{
icon_state = "dark"
},
-/area/bigredv2/outside/marshal_office)
+/area/bigredv2/caves/lambda/breakroom)
"lWA" = (
/turf/open/mars_cave{
icon_state = "mars_cave_15"
@@ -37860,42 +36162,67 @@
icon_state = "mars_cave_7"
},
/area/bigredv2/caves_sw)
-"lXo" = (
-/obj/item/trash/wy_chips_pepper{
- pixel_y = -13;
- pixel_x = 24
- },
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
+"lWL" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood/xeno,
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidfloor"
},
-/area/bigredv2/outside/nw)
-"lYi" = (
-/obj/structure/ore_box,
-/turf/open/mars_cave{
- icon_state = "mars_dirt_4"
+/area/bigredv2/outside/c)
+"lWS" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
},
-/area/bigredv2/caves/mining)
-"lYx" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/vomit{
- icon_state = "vomit_4"
+/turf/open/floor{
+ icon_state = "whitegreen"
},
-/obj/item/reagent_container/glass/bottle/toxin{
- pixel_y = 12;
- pixel_x = 12
+/area/bigredv2/outside/medical)
+"lWX" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached3"
},
+/area/bigredv2/outside/c)
+"lWZ" = (
+/obj/structure/machinery/cm_vending/sorted/medical/no_access,
+/obj/structure/medical_supply_link,
/turf/open/floor{
- icon_state = "whitegreenfull"
+ dir = 1;
+ icon_state = "darkyellow2"
},
-/area/bigredv2/outside/medical)
-"lYy" = (
-/obj/effect/decal/cleanable/blood/drip,
+/area/bigredv2/caves/eta/research)
+"lXc" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached12"
+ },
+/area/bigredv2/outside/c)
+"lYc" = (
/obj/effect/decal/cleanable/generic,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached3"
+ },
+/area/bigredv2/outside/s)
+"lYe" = (
+/obj/structure/barricade/wooden{
+ dir = 4
+ },
/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
+ icon_state = "redcorner"
},
-/area/bigredv2/outside/ne)
+/area/bigredv2/outside/marshal_office)
+"lYi" = (
+/obj/structure/ore_box,
+/turf/open/mars_cave{
+ icon_state = "mars_dirt_4"
+ },
+/area/bigredv2/caves/mining)
+"lYw" = (
+/obj/structure/flora/grass/desert/lightgrass_2,
+/turf/open/mars,
+/area/bigredv2/outside/space_port_lz2)
"lYC" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/mucus,
@@ -37911,53 +36238,39 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/filtration_plant)
-"lYX" = (
-/obj/item/tool/weldingtool{
- pixel_x = 9;
- pixel_y = -8
- },
+"lYJ" = (
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor,
-/area/bigredv2/outside/general_offices)
+/obj/structure/flora/grass/desert/lightgrass_1,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached12"
+ },
+/area/bigredv2/outside/e)
+"lYK" = (
+/obj/item/stack/sheet/wood{
+ pixel_x = 4
+ },
+/turf/open/floor{
+ dir = 1;
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
"lYZ" = (
/obj/structure/bed/chair/office/dark{
dir = 8
},
/turf/open/floor,
/area/bigred/ground/garage_workshop)
-"lZM" = (
-/obj/item/trash/cigbutt{
- pixel_x = -6;
- pixel_y = -9
- },
+"lZh" = (
+/obj/effect/decal/cleanable/dirt,
/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached2"
+ icon_state = "cement_sunbleached15"
},
-/area/bigredv2/outside/nw)
+/area/bigredv2/outside/e)
"lZV" = (
/turf/open/mars_cave{
icon_state = "mars_cave_23"
},
/area/bigredv2/caves/mining)
-"mas" = (
-/obj/item/trash/cigbutt{
- pixel_x = -7;
- pixel_y = 13
- },
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
- },
-/area/bigredv2/outside/virology)
-"mat" = (
-/obj/item/stack/sheet/metal{
- pixel_x = 7;
- pixel_y = 6
- },
-/turf/open/floor{
- dir = 4;
- icon_state = "whitepurplecorner"
- },
-/area/bigredv2/outside/medical)
"maB" = (
/obj/effect/landmark/nightmare{
insert_tag = "viro-rock_open"
@@ -37977,20 +36290,12 @@
/area/bigredv2/caves/mining)
"maH" = (
/obj/structure/surface/table,
-/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
-/turf/open/floor{
- dir = 8;
- icon_state = "darkyellow2"
- },
-/area/bigredv2/outside/engineering)
-"maL" = (
-/obj/effect/decal/strata_decals/grime/grime1{
- dir = 8
- },
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
+/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
+/turf/open/floor{
+ dir = 8;
+ icon_state = "darkyellow2"
},
-/area/bigredv2/outside/c)
+/area/bigredv2/outside/engineering)
"mbz" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
@@ -38002,11 +36307,68 @@
icon_state = "delivery"
},
/area/bigredv2/outside/bar)
+"mcA" = (
+/obj/item/tool/wirecutters,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached4"
+ },
+/area/bigredv2/outside/c)
+"mcB" = (
+/obj/effect/decal/strata_decals/grime/grime1{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/generic,
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidfloor"
+ },
+/area/bigredv2/outside/nw)
+"mcD" = (
+/obj/effect/decal/cleanable/blood/xeno,
+/turf/open/floor/plating{
+ icon_state = "platingdmg3"
+ },
+/area/bigredv2/outside/medical)
+"mcP" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement,
+/area/bigredv2/outside/space_port)
"mda" = (
/turf/open/mars_cave{
icon_state = "mars_cave_16"
},
/area/bigredv2/caves_lambda)
+"mdi" = (
+/obj/structure/largecrate/random/barrel/red,
+/turf/open/floor/plating{
+ icon_state = "platebotc"
+ },
+/area/bigredv2/outside/space_port)
+"mdN" = (
+/obj/structure/barricade/wooden{
+ dir = 8;
+ pixel_y = 12
+ },
+/turf/open/floor,
+/area/bigredv2/outside/general_offices)
+"mdO" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor{
+ dir = 1;
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
+"meR" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor{
+ dir = 8;
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/eta)
"meT" = (
/turf/open/mars,
/area/bigredv2/outside/eta)
@@ -38018,21 +36380,12 @@
icon_state = "mars_dirt_7"
},
/area/bigredv2/caves/mining)
-"mfD" = (
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached15"
- },
-/area/bigredv2/outside/c)
"mfG" = (
/obj/structure/pipes/vents/pump/on,
/turf/open/floor{
icon_state = "freezerfloor"
},
/area/bigredv2/outside/general_offices)
-"mfL" = (
-/obj/structure/flora/grass/desert/lightgrass_6,
-/turf/open/mars,
-/area/bigredv2/outside/e)
"mfQ" = (
/obj/structure/surface/rack,
/obj/item/fuel_cell,
@@ -38045,20 +36398,39 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/engineering)
-"mgS" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/obj/structure/bed/chair/wood/normal{
- dir = 1
+"mfS" = (
+/obj/structure/surface/table/woodentable{
+ dir = 4;
+ flipped = 1
},
/turf/open/floor{
icon_state = "wood"
},
/area/bigredv2/outside/bar)
-"mhn" = (
-/turf/open/mars{
- icon_state = "mars_dirt_6"
+"mge" = (
+/obj/item/tool/surgery/scalpel{
+ pixel_y = -8
},
-/area/bigredv2/outside/nw)
+/turf/open/floor{
+ icon_state = "whiteblue"
+ },
+/area/bigredv2/outside/medical)
+"mgp" = (
+/obj/effect/decal/cleanable/vomit,
+/turf/open/floor{
+ dir = 1;
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
+"mgQ" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/turf/open/floor{
+ dir = 6;
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/c)
"mhF" = (
/obj/structure/machinery/light{
dir = 4
@@ -38076,6 +36448,24 @@
},
/turf/closed/wall/solaris/reinforced/hull,
/area/bigredv2/caves/mining)
+"mhK" = (
+/obj/structure/machinery/washing_machine,
+/obj/item/clothing/under/brown{
+ pixel_y = 11;
+ pixel_x = 7
+ },
+/obj/structure/machinery/washing_machine{
+ pixel_y = 13
+ },
+/turf/open/floor{
+ icon_state = "freezerfloor"
+ },
+/area/bigredv2/outside/general_offices)
+"mhL" = (
+/turf/open/floor{
+ icon_state = "darkblue2"
+ },
+/area/bigredv2/outside/admin_building)
"mhV" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor{
@@ -38106,16 +36496,19 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/caves/mining)
-"miM" = (
-/obj/item/reagent_container/glass/bucket/mopbucket{
- pixel_x = -5;
- pixel_y = 11
- },
+"miG" = (
+/obj/structure/pipes/standard/manifold/hidden/green,
/turf/open/floor{
- dir = 4;
- icon_state = "whiteyellowfull"
+ icon_state = "whitegreenfull"
},
-/area/bigredv2/outside/office_complex)
+/area/bigredv2/outside/medical)
+"miP" = (
+/obj/structure/blocker/forcefield/multitile_vehicles,
+/turf/open/asphalt/cement{
+ icon_state = "cement1";
+ dir = 1
+ },
+/area/bigredv2/outside/filtration_cave_cas)
"mji" = (
/obj/structure/machinery/door/airlock/multi_tile/almayer/engidoor{
name = "\improper Engineering Workshop"
@@ -38126,22 +36519,38 @@
/obj/structure/cargo_container/kelland/right,
/turf/open/mars,
/area/bigredv2/outside/space_port_lz2)
-"mkQ" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement{
- icon_state = "cement12"
- },
-/area/bigredv2/caves_lambda)
-"mlB" = (
-/obj/item/trash/cigbutt,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
+"mkO" = (
+/obj/structure/surface/table,
+/obj/effect/spawner/random/powercell{
+ pixel_x = 4;
+ pixel_y = 2
},
-/area/bigredv2/outside/nw)
-"mlR" = (
+/obj/structure/pipes/vents/pump,
+/turf/open/floor,
+/area/bigredv2/outside/dorms)
+"mlo" = (
/obj/effect/decal/cleanable/blood,
-/turf/open/floor/plating,
-/area/bigredv2/outside/medical)
+/turf/open/floor{
+ icon_state = "dark"
+ },
+/area/bigredv2/outside/general_offices)
+"mlJ" = (
+/obj/structure/surface/table/woodentable,
+/obj/structure/pipes/vents/pump{
+ dir = 8
+ },
+/obj/item/reagent_container/food/drinks/bottle/beer/craft/ganucci{
+ pixel_x = -4;
+ pixel_y = 8
+ },
+/obj/item/trash/cigbutt{
+ pixel_x = -14;
+ pixel_y = -6
+ },
+/turf/open/floor{
+ icon_state = "wood"
+ },
+/area/bigredv2/outside/bar)
"mlV" = (
/obj/structure/surface/table,
/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
@@ -38149,6 +36558,11 @@
icon_state = "dark"
},
/area/bigredv2/outside/engineering)
+"mma" = (
+/obj/effect/decal/cleanable/generic,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement,
+/area/bigredv2/outside/filtration_cave_cas)
"mmg" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/blood/drip{
@@ -38163,42 +36577,27 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"mmj" = (
-/obj/structure/machinery/light{
- dir = 8
+"mnj" = (
+/obj/structure/flora/bush/desert{
+ icon_state = "tree_3"
},
-/obj/effect/decal/cleanable/blood,
-/obj/effect/decal/cleanable/blood/gibs/body,
-/obj/effect/decal/cleanable/blood/gibs/limb,
-/obj/effect/landmark/corpsespawner/chef,
-/turf/open/floor{
- icon_state = "wood"
+/turf/open/mars{
+ icon_state = "mars_dirt_14"
},
-/area/bigredv2/outside/general_offices)
+/area/bigredv2/outside/c)
"mnv" = (
/obj/structure/pipes/vents/pump,
/turf/open/floor{
icon_state = "grimy"
},
/area/bigredv2/outside/dorms)
-"mnI" = (
-/obj/structure/reagent_dispensers/watertank,
-/obj/item/reagent_container/food/drinks/cup{
- pixel_x = -6;
- pixel_y = 8
- },
-/turf/open/floor{
- dir = 1;
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/marshal_office)
-"mnQ" = (
-/obj/item/trash/pistachios{
- pixel_x = -3;
- pixel_y = 11
+"mnX" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/strata_decals/grime/grime1{
+ dir = 8
},
-/turf/open/mars_cave{
- icon_state = "mars_dirt_4"
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached1"
},
/area/bigredv2/outside/nw)
"mnY" = (
@@ -38215,37 +36614,55 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/carpet,
/area/bigredv2/outside/library)
-"mor" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/turf/open/floor{
- icon_state = "whitegreenfull"
+"mos" = (
+/obj/structure/machinery/light/small{
+ dir = 1
},
-/area/bigredv2/outside/medical)
+/turf/open/asphalt/cement{
+ icon_state = "cement15"
+ },
+/area/bigredv2/caves_lambda)
"moE" = (
/turf/open/mars_cave{
icon_state = "mars_cave_9"
},
/area/bigredv2/caves_research)
-"moI" = (
-/obj/structure/bed/chair/wood/normal{
- dir = 4
+"moS" = (
+/obj/structure/pipes/standard/manifold/hidden/green{
+ dir = 8
},
-/obj/effect/decal/cleanable/generic,
+/obj/effect/decal/cleanable/dirt,
/turf/open/floor{
icon_state = "wood"
},
/area/bigredv2/outside/bar)
-"moZ" = (
-/obj/item/ammo_casing/bullet,
-/obj/item/weapon/gun/pistol/holdout{
- pixel_x = -8;
- pixel_y = 11
+"mpc" = (
+/obj/structure/bed,
+/obj/effect/landmark/corpsespawner/colonist,
+/obj/item/grown/sunflower{
+ pixel_x = -2;
+ pixel_y = -7
},
-/obj/effect/decal/cleanable/blood/drip,
/turf/open/floor{
- icon_state = "dark"
+ icon_state = "wood"
},
-/area/bigredv2/outside/general_offices)
+/area/bigredv2/outside/dorms)
+"mpf" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached3"
+ },
+/area/bigredv2/outside/c)
+"mpX" = (
+/obj/effect/decal/cleanable/blood/gibs/body,
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/nw)
+"mqe" = (
+/obj/structure/barricade/deployable,
+/turf/open/mars,
+/area/bigredv2/outside/c)
"mqf" = (
/obj/structure/bed/chair{
dir = 8;
@@ -38263,21 +36680,35 @@
icon_state = "panelscorched"
},
/area/bigredv2/outside/engineering)
-"mqM" = (
-/obj/item/stack/sheet/wood{
- pixel_x = 6;
- pixel_y = -12
+"mqq" = (
+/obj/structure/barricade/handrail/medical{
+ dir = 1
},
/turf/open/floor{
- icon_state = "white"
+ dir = 4;
+ icon_state = "whitegreen"
},
-/area/bigredv2/outside/marshal_office)
+/area/bigredv2/outside/medical)
"mqX" = (
/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
/turf/open/mars_cave{
icon_state = "mars_cave_3"
},
/area/bigredv2/caves/mining)
+"mqZ" = (
+/obj/structure/machinery/light,
+/obj/structure/largecrate/random/barrel/white,
+/turf/open/floor{
+ dir = 6;
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
+"mrB" = (
+/obj/effect/decal/cleanable/blood/xeno,
+/turf/open/floor{
+ icon_state = "freezerfloor"
+ },
+/area/bigredv2/outside/general_offices)
"mrH" = (
/obj/structure/machinery/computer3/server,
/turf/open/floor{
@@ -38308,12 +36739,6 @@
icon_state = "freezerfloor"
},
/area/bigredv2/outside/hydroponics)
-"msE" = (
-/obj/effect/decal/cleanable/blood/drip,
-/turf/open/mars_cave{
- icon_state = "mars_cave_2"
- },
-/area/bigredv2/outside/n)
"msS" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor{
@@ -38321,26 +36746,12 @@
icon_state = "asteroidwarning"
},
/area/bigred/ground/garage_workshop)
-"mtn" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/space_port_lz2)
"mts" = (
/obj/item/ore,
/turf/open/mars_cave{
icon_state = "mars_cave_2"
},
/area/bigredv2/outside/filtration_cave_cas)
-"mtx" = (
-/obj/item/trash/cigbutt{
- pixel_x = -10;
- pixel_y = 13
- },
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
- },
-/area/bigredv2/outside/filtration_plant)
"mtL" = (
/obj/structure/bed/chair/office/dark{
dir = 4;
@@ -38349,20 +36760,6 @@
},
/turf/open/floor/plating,
/area/bigredv2/caves/mining)
-"mtM" = (
-/obj/structure/closet/secure_closet/detective,
-/obj/structure/machinery/light{
- dir = 1
- },
-/turf/open/floor{
- icon_state = "wood"
- },
-/area/bigredv2/outside/marshal_office)
-"mtO" = (
-/turf/open/asphalt/cement{
- icon_state = "cement1"
- },
-/area/bigredv2/caves_lambda)
"mtS" = (
/obj/structure/fence,
/turf/open/floor{
@@ -38370,24 +36767,61 @@
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/n)
-"mui" = (
-/obj/effect/decal/cleanable/blood/drip,
+"mud" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/stack/folding_barricade,
/turf/open/floor{
+ dir = 8;
icon_state = "asteroidwarning"
},
-/area/bigredv2/outside/n)
+/area/bigredv2/outside/c)
+"muM" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/corpsespawner/engineer,
+/obj/effect/decal/cleanable/blood/gibs/body,
+/turf/open/gm/river{
+ color = "#990000"
+ },
+/area/bigredv2/outside/c)
"muP" = (
/turf/closed/wall/wood,
/area/bigredv2/caves_research)
-"mwx" = (
-/obj/structure/flora/grass/desert/lightgrass_1,
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/nw)
-"mxf" = (
-/turf/open/asphalt/cement{
- icon_state = "cement2"
+"mvl" = (
+/obj/structure/platform/kutjevo/rock{
+ dir = 8;
+ layer = 2.9;
+ pixel_x = -3
},
-/area/bigredv2/outside/filtration_cave_cas)
+/turf/closed/wall/solaris/rock,
+/area/bigredv2/caves)
+"mwN" = (
+/obj/item/trash/cigbutt{
+ pixel_x = -10;
+ pixel_y = 13
+ },
+/turf/open/floor{
+ icon_state = "white"
+ },
+/area/bigredv2/outside/medical)
+"mwR" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor{
+ dir = 1;
+ icon_state = "whiteblue"
+ },
+/area/bigredv2/outside/medical)
+"mwY" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached12"
+ },
+/area/bigredv2/outside/e)
+"mxj" = (
+/obj/effect/decal/cleanable/blood,
+/turf/open/mars{
+ icon_state = "mars_dirt_11"
+ },
+/area/bigredv2/outside/eta)
"mya" = (
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
@@ -38413,6 +36847,28 @@
icon_state = "mars_cave_15"
},
/area/bigredv2/caves/mining)
+"myq" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/obj/structure/machinery/botany,
+/turf/open/floor{
+ icon_state = "white"
+ },
+/area/bigredv2/outside/marshal_office)
+"myV" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/bed/bedroll{
+ dir = 5
+ },
+/obj/item/prop/colony/usedbandage{
+ dir = 4;
+ pixel_x = -2;
+ pixel_y = 7
+ },
+/turf/open/floor{
+ dir = 1;
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
"myY" = (
/turf/open/floor{
icon_state = "delivery"
@@ -38421,6 +36877,18 @@
"mzV" = (
/turf/open/mars,
/area/bigredv2/outside/filtration_plant)
+"mAP" = (
+/obj/structure/flora/grass/desert/lightgrass_11,
+/turf/open/mars_cave{
+ icon_state = "mars_dirt_4"
+ },
+/area/bigredv2/outside/space_port_lz2)
+"mAX" = (
+/obj/structure/flora/grass/desert/lightgrass_9,
+/turf/open/mars_cave{
+ icon_state = "mars_dirt_4"
+ },
+/area/bigredv2/outside/w)
"mAY" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor{
@@ -38435,6 +36903,15 @@
icon_state = "freezerfloor"
},
/area/bigredv2/outside/dorms)
+"mBe" = (
+/obj/effect/decal/cleanable/blood{
+ icon_state = "gib6"
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor{
+ icon_state = "wood"
+ },
+/area/bigredv2/outside/bar)
"mBo" = (
/obj/item/weapon/twohanded/folded_metal_chair{
pixel_x = -7;
@@ -38442,32 +36919,51 @@
},
/turf/open/floor/plating,
/area/bigredv2/caves/mining)
-"mBx" = (
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached3"
+"mBA" = (
+/obj/item/prop/colony/usedbandage{
+ dir = 5;
+ pixel_x = -7;
+ pixel_y = 13
},
-/area/bigredv2/outside/space_port_lz2)
+/obj/item/prop/colony/usedbandage{
+ dir = 4;
+ pixel_x = 11;
+ pixel_y = -4
+ },
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor{
+ icon_state = "white"
+ },
+/area/bigredv2/outside/medical)
+"mBH" = (
+/obj/structure/largecrate/random/mini{
+ pixel_x = -8;
+ pixel_y = -7;
+ layer = 2.9
+ },
+/turf/open/floor,
+/area/bigredv2/outside/general_offices)
"mBI" = (
/obj/structure/closet/secure_closet/engineering_electrical,
/turf/open/floor,
/area/bigred/ground/garage_workshop)
+"mCk" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/vomit{
+ icon_state = "vomit_4"
+ },
+/obj/item/reagent_container/glass/bottle/toxin{
+ pixel_y = 12;
+ pixel_x = 12
+ },
+/turf/open/floor{
+ icon_state = "whitegreenfull"
+ },
+/area/bigredv2/outside/medical)
"mDk" = (
/obj/structure/dispenser/oxygen,
/turf/open/floor/plating,
/area/bigredv2/outside/filtration_plant)
-"mDp" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/ammo_casing/bullet,
-/obj/item/ammo_casing/bullet,
-/turf/open/floor{
- icon_state = "redcorner"
- },
-/area/bigredv2/outside/marshal_office)
-"mDq" = (
-/turf/open/asphalt/cement{
- icon_state = "cement4"
- },
-/area/bigredv2/outside/space_port)
"mDs" = (
/turf/open/floor{
dir = 1;
@@ -38479,25 +36975,24 @@
icon_state = "asteroidplating"
},
/area/bigredv2/outside/space_port_lz2)
-"mDE" = (
-/obj/item/ammo_casing/bullet,
-/obj/item/ammo_casing/bullet,
-/turf/open/floor{
- dir = 4;
- icon_state = "redcorner"
- },
-/area/bigredv2/outside/marshal_office)
-"mDI" = (
-/obj/effect/decal/cleanable/blood,
-/turf/open/mars_cave{
- icon_state = "mars_dirt_7"
- },
-/area/bigredv2/outside/eta)
"mDN" = (
/turf/open/mars_cave{
icon_state = "mars_cave_15"
},
/area/bigredv2/outside/lz1_north_cas)
+"mEB" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 6
+ },
+/obj/item/stack/sheet/metal{
+ pixel_y = 9;
+ pixel_x = 9
+ },
+/turf/open/floor/plating{
+ dir = 8;
+ icon_state = "platingdmg3"
+ },
+/area/bigredv2/outside/medical)
"mEC" = (
/obj/effect/decal/warning_stripes{
icon_state = "E-corner"
@@ -38516,6 +37011,23 @@
icon_state = "darkred2"
},
/area/bigredv2/outside/admin_building)
+"mET" = (
+/obj/item/trash/uscm_mre{
+ pixel_y = 42;
+ pixel_x = -3
+ },
+/turf/open/floor,
+/area/bigredv2/outside/hydroponics)
+"mFS" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/trash/cigbutt{
+ pixel_x = 1;
+ pixel_y = 5
+ },
+/turf/open/floor{
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/c)
"mFT" = (
/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb,
/obj/effect/landmark/corpsespawner/russian,
@@ -38524,12 +37036,23 @@
icon_state = "mars_cave_3"
},
/area/bigredv2/caves/mining)
+"mFU" = (
+/turf/open/mars_cave{
+ icon_state = "mars_cave_14"
+ },
+/area/bigredv2/outside/nw)
"mGq" = (
/obj/structure/blocker/forcefield/multitile_vehicles,
/turf/open/mars_cave{
icon_state = "mars_cave_17"
},
/area/bigredv2/outside/lz1_north_cas)
+"mGv" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached14"
+ },
+/area/bigredv2/outside/nw)
"mHp" = (
/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
@@ -38538,34 +37061,25 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/caves_se)
+"mHT" = (
+/obj/effect/decal/cleanable/blood{
+ layer = 3
+ },
+/turf/open/floor,
+/area/bigredv2/outside/lambda_cave_cas)
"mIc" = (
/obj/effect/landmark/static_comms/net_two,
/turf/open/floor{
icon_state = "podhatchfloor"
},
/area/bigredv2/outside/admin_building)
-"mIh" = (
-/obj/structure/surface/table/woodentable{
- dir = 4;
- flipped = 1
- },
-/obj/effect/landmark/objective_landmark/medium,
-/turf/open/floor{
- icon_state = "wood"
- },
-/area/bigredv2/outside/bar)
-"mIk" = (
-/obj/effect/decal/cleanable/blood/drip,
-/obj/item/bedsheet/medical{
- pixel_x = 4;
- pixel_y = -12
- },
-/obj/effect/decal/cleanable/blood,
-/obj/effect/decal/cleanable/blood/gibs/limb,
-/turf/open/floor{
- icon_state = "white"
+"mIq" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
},
-/area/bigredv2/outside/medical)
+/obj/effect/decal/cleanable/generic,
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/nw)
"mIr" = (
/turf/open/mars_cave{
icon_state = "mars_dirt_7"
@@ -38594,18 +37108,22 @@
dir = 8;
icon_state = "asteroidwarning"
},
-/area/bigredv2/outside/filtration_plant)
-"mJN" = (
-/obj/structure/flora/grass/desert/lightgrass_4,
-/turf/open/mars,
-/area/bigredv2/outside/c)
-"mJU" = (
-/obj/item/stack/sheet/metal{
- pixel_y = 5;
- pixel_x = 7
+/area/bigredv2/outside/filtration_plant)
+"mJm" = (
+/obj/effect/decal/cleanable/generic,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached4"
+ },
+/area/bigredv2/outside/nw)
+"mJY" = (
+/obj/structure/closet/secure_closet/detective,
+/obj/structure/machinery/light{
+ dir = 1
+ },
+/turf/open/floor{
+ icon_state = "wood"
},
-/turf/open/floor/plating,
-/area/bigredv2/outside/space_port)
+/area/bigredv2/outside/marshal_office)
"mKi" = (
/obj/structure/flora/pottedplant{
icon_state = "pottedplant_10"
@@ -38614,55 +37132,50 @@
icon_state = "wood"
},
/area/bigredv2/outside/library)
-"mKr" = (
-/obj/effect/decal/cleanable/vomit{
- icon_state = "vomit_4"
- },
-/turf/open/floor{
- icon_state = "wood"
- },
-/area/bigredv2/outside/bar)
"mKM" = (
/obj/effect/decal/cleanable/blood/drip{
pixel_y = 6
},
/turf/closed/wall/solaris/rock,
/area/bigredv2/caves)
-"mLw" = (
+"mLK" = (
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating{
- icon_state = "platebot"
+/obj/item/trash/cigbutt{
+ pixel_x = -9;
+ pixel_y = -6
},
-/area/bigredv2/outside/space_port)
-"mMc" = (
-/obj/structure/flora/grass/desert/lightgrass_8,
-/turf/open/mars,
-/area/bigredv2/outside/s)
+/obj/item/trash/cigbutt{
+ pixel_x = 7;
+ pixel_y = 7
+ },
+/turf/open/floor{
+ icon_state = "dark"
+ },
+/area/bigredv2/outside/marshal_office)
+"mLM" = (
+/obj/item/storage/firstaid/adv/empty{
+ pixel_y = -6;
+ pixel_x = -8
+ },
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor{
+ icon_state = "white"
+ },
+/area/bigredv2/outside/medical)
"mMf" = (
/turf/open/mars{
icon_state = "mars_dirt_11"
},
/area/bigredv2/outside/space_port_lz2)
-"mMh" = (
+"mNr" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor{
- icon_state = "redcorner"
+/obj/item/clothing/gloves/latex{
+ pixel_x = 3
},
-/area/bigredv2/outside/marshal_office)
-"mMx" = (
-/obj/effect/decal/cleanable/blood,
-/obj/effect/decal/cleanable/generic,
/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
+ icon_state = "white"
},
-/area/bigredv2/outside/c)
-"mNT" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/manifold/hidden/green,
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/e)
+/area/bigredv2/outside/medical)
"mOc" = (
/obj/structure/machinery/door/airlock/almayer/maint/colony{
dir = 1;
@@ -38672,6 +37185,19 @@
icon_state = "delivery"
},
/area/bigredv2/outside/cargo)
+"mOq" = (
+/obj/structure/flora/grass/desert/lightgrass_1,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached17"
+ },
+/area/bigredv2/outside/nw)
+"mON" = (
+/obj/structure/barricade/wooden,
+/turf/open/floor{
+ dir = 10;
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/c)
"mOW" = (
/obj/structure/pipes/standard/tank/oxygen,
/turf/open/floor/plating{
@@ -38686,20 +37212,6 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/caves/mining)
-"mPB" = (
-/obj/item/stack/sheet/wood{
- layer = 2.7;
- pixel_y = 8
- },
-/obj/item/stack/rods{
- pixel_x = 3;
- pixel_y = 8
- },
-/turf/open/floor{
- dir = 8;
- icon_state = "whitegreencorner"
- },
-/area/bigredv2/outside/medical)
"mPC" = (
/obj/structure/blocker/forcefield/multitile_vehicles,
/obj/structure/fence,
@@ -38723,40 +37235,85 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/engineering)
-"mRi" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_core,
+"mPY" = (
+/obj/structure/bed/chair{
+ dir = 4;
+ layer = 3.06
+ },
/turf/open/mars_cave{
icon_state = "mars_cave_2"
},
-/area/bigredv2/caves_lambda)
-"mRl" = (
+/area/bigredv2/outside/ne)
+"mQA" = (
/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor{
+ icon_state = "freezerfloor"
+ },
+/area/bigredv2/outside/dorms)
+"mQS" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot{
+ pixel_y = 9;
+ pixel_x = -15
+ },
+/turf/open/floor{
+ icon_state = "dark"
+ },
+/area/bigredv2/outside/general_offices)
+"mQU" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/trash/eat{
+ pixel_x = -2;
+ pixel_y = 10
+ },
/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidfloor"
+ },
+/area/bigredv2/outside/ne)
+"mRc" = (
+/obj/structure/barricade/wooden{
+ desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
dir = 8;
- icon_state = "carpet15-15"
+ health = 25000;
+ layer = 2.9;
+ pixel_x = -7;
+ pixel_y = 4
},
-/area/bigredv2/outside/bar)
+/turf/open/floor,
+/area/bigredv2/outside/general_offices)
+"mRi" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_core,
+/turf/open/mars_cave{
+ icon_state = "mars_cave_2"
+ },
+/area/bigredv2/caves_lambda)
+"mRv" = (
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached4"
+ },
+/area/bigredv2/outside/virology)
"mRD" = (
/obj/structure/surface/table,
/obj/structure/machinery/computer/atmos_alert,
/turf/open/floor,
/area/bigredv2/caves)
-"mRS" = (
-/obj/effect/landmark/crap_item,
-/turf/open/asphalt/cement{
- icon_state = "cement9"
+"mSk" = (
+/obj/item/storage/box/MRE{
+ pixel_x = -1;
+ pixel_y = -6
},
-/area/bigredv2/outside/space_port)
-"mSn" = (
-/obj/effect/decal/cleanable/blood/oil/streak,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached2"
+/obj/item/storage/box/MRE{
+ pixel_x = 3;
+ pixel_y = 3
},
-/area/bigredv2/outside/c)
-"mSs" = (
-/obj/structure/prop/wooden_cross,
-/turf/open/mars_cave{
- icon_state = "mars_cave_2"
+/turf/closed/wall/solaris/rock,
+/area/bigredv2/caves)
+"mSF" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached1"
},
/area/bigredv2/outside/nw)
"mSS" = (
@@ -38793,6 +37350,20 @@
icon_state = "mars_cave_7"
},
/area/bigredv2/caves/eta/xenobiology)
+"mUE" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 9
+ },
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached1"
+ },
+/area/bigredv2/outside/nw)
+"mUS" = (
+/obj/effect/decal/cleanable/blood/xtracks,
+/turf/open/floor{
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
"mWg" = (
/obj/structure/machinery/door/airlock/multi_tile/almayer/comdoor/colony{
dir = 2;
@@ -38802,6 +37373,14 @@
icon_state = "delivery"
},
/area/bigredv2/outside/admin_building)
+"mWp" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached4"
+ },
+/area/bigredv2/outside/c)
"mWt" = (
/obj/structure/prop/almayer/missile_tube{
desc = "A detached drill arm of a big old Seegson D-602 Mining Robot. Seems to be jury rigged to run without the main robot assembly.";
@@ -38812,12 +37391,35 @@
icon_state = "mars_dirt_5"
},
/area/bigredv2/caves/mining)
+"mWK" = (
+/obj/structure/bed/chair{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/floor{
+ icon_state = "dark"
+ },
+/area/bigredv2/outside/marshal_office)
+"mXp" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/stack/sheet/metal{
+ pixel_x = -2;
+ pixel_y = 3
+ },
+/turf/open/floor,
+/area/bigredv2/outside/office_complex)
"mXw" = (
/obj/item/storage/toolbox/mechanical,
/turf/open/mars_cave{
icon_state = "mars_dirt_6"
},
/area/bigredv2/caves/mining)
+"mXH" = (
+/obj/structure/flora/grass/desert/lightgrass_1,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached1"
+ },
+/area/bigredv2/outside/s)
"mYV" = (
/obj/structure/machinery/power/apc{
dir = 1;
@@ -38845,42 +37447,20 @@
icon_state = "mars_cave_11"
},
/area/bigredv2/caves_virology)
-"mZJ" = (
-/obj/structure/surface/table,
-/turf/open/floor{
- icon_state = "dark"
- },
-/area/bigredv2/outside/general_offices)
-"mZV" = (
-/obj/item/reagent_container/pill/cyanide,
-/turf/open/floor{
- icon_state = "wood"
- },
-/area/bigredv2/outside/dorms)
-"mZZ" = (
-/obj/effect/decal/cleanable/blood/gibs/body,
-/obj/effect/decal/cleanable/blood,
-/obj/effect/decal/cleanable/blood/drip,
-/obj/item/clothing/head/helmet/marine/desert{
- pixel_x = 10;
- pixel_y = 7
- },
-/turf/open/floor,
-/area/bigredv2/outside/office_complex)
-"nad" = (
-/obj/effect/decal/strata_decals/grime/grime2{
- dir = 8
+"naa" = (
+/obj/effect/decal/strata_decals/grime/grime1{
+ dir = 1
},
/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached1"
+ icon_state = "cement_sunbleached12"
},
-/area/bigredv2/outside/nw)
-"nbc" = (
-/obj/item/tool/warning_cone,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached9"
+/area/bigredv2/outside/c)
+"naO" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement{
+ icon_state = "cement3"
},
-/area/bigredv2/outside/se)
+/area/bigredv2/outside/filtration_cave_cas)
"nbi" = (
/obj/effect/landmark/hunter_secondary,
/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
@@ -38892,6 +37472,24 @@
/obj/effect/landmark/hunter_secondary,
/turf/open/mars,
/area/bigredv2/outside/space_port_lz2)
+"nbT" = (
+/obj/structure/platform/kutjevo/rock{
+ dir = 4
+ },
+/obj/item/trash/cigbutt/cigarbutt,
+/turf/open/mars_cave{
+ icon_state = "mars_cave_13"
+ },
+/area/bigredv2/outside/nw)
+"nct" = (
+/obj/structure/flora/grass/desert/lightgrass_11,
+/turf/open/mars,
+/area/bigredv2/outside/ne)
+"ncu" = (
+/obj/item/shard,
+/obj/structure/window_frame/solaris,
+/turf/open/floor/plating,
+/area/bigredv2/outside/medical)
"ncv" = (
/obj/effect/landmark/corpsespawner/ua_riot,
/obj/effect/decal/cleanable/blood{
@@ -38916,6 +37514,12 @@
icon_state = "mars_dirt_4"
},
/area/bigredv2/caves/mining)
+"ndi" = (
+/obj/item/tool/warning_cone,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached9"
+ },
+/area/bigredv2/outside/se)
"ndw" = (
/turf/open/floor{
dir = 4;
@@ -38931,35 +37535,57 @@
icon_state = "mars_dirt_4"
},
/area/bigredv2/caves/mining)
-"neE" = (
-/obj/structure/bed/bedroll{
- dir = 10
- },
-/obj/effect/decal/cleanable/blood,
+"ndS" = (
+/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
+/obj/item/ammo_casing/shell,
/obj/effect/decal/cleanable/blood/gibs/body,
-/obj/effect/decal/cleanable/blood/gibs/limb,
+/obj/effect/decal/cleanable/blood,
/turf/open/floor{
icon_state = "wood"
},
+/area/bigredv2/outside/bar)
+"neb" = (
+/obj/item/trash/cigbutt{
+ pixel_x = -6;
+ pixel_y = -9
+ },
+/obj/structure/flora/grass/desert/lightgrass_1,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached3"
+ },
+/area/bigredv2/outside/nw)
+"neB" = (
+/obj/structure/surface/table,
+/obj/item/reagent_container/food/snacks/packaged_burger,
+/turf/open/floor,
/area/bigredv2/outside/general_offices)
-"neH" = (
-/turf/open/asphalt/cement{
- icon_state = "cement9"
+"nfw" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
},
-/area/bigredv2/outside/filtration_cave_cas)
-"nfY" = (
/obj/effect/decal/cleanable/dirt,
-/turf/open/floor{
- dir = 4;
- icon_state = "asteroidwarning"
+/turf/open/asphalt/cement,
+/area/bigredv2/caves_lambda)
+"ngj" = (
+/obj/effect/decal/strata_decals/grime/grime3,
+/turf/open/asphalt/cement{
+ icon_state = "cement4"
},
-/area/bigredv2/caves_east)
+/area/bigredv2/outside/space_port)
"ngJ" = (
/obj/item/stack/cable_coil/cut,
/turf/open/mars_cave{
icon_state = "mars_dirt_6"
},
/area/bigredv2/caves/mining)
+"nhh" = (
+/obj/structure/flora/grass/desert/lightgrass_11,
+/turf/open/mars,
+/area/bigredv2/outside/space_port_lz2)
+"nhz" = (
+/obj/structure/flora/grass/desert/lightgrass_6,
+/turf/open/mars,
+/area/bigredv2/outside/nw)
"nhF" = (
/obj/structure/machinery/camera/autoname{
dir = 4
@@ -38969,22 +37595,20 @@
icon_state = "wood"
},
/area/bigredv2/outside/library)
-"niz" = (
-/obj/effect/decal/cleanable/generic,
+"niv" = (
+/obj/effect/decal/cleanable/blood/drip,
/turf/open/floor{
- icon_state = "wood"
- },
-/area/bigredv2/outside/bar)
-"niG" = (
-/obj/structure/pipes/vents/pump{
- dir = 8
+ dir = 1;
+ icon_state = "asteroidwarning"
},
-/obj/effect/decal/cleanable/blood,
+/area/bigredv2/outside/eta)
+"niL" = (
+/obj/item/trash/cheesie,
/turf/open/floor{
dir = 4;
- icon_state = "whitegreen"
+ icon_state = "redcorner"
},
-/area/bigredv2/outside/medical)
+/area/bigredv2/outside/office_complex)
"niQ" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 6
@@ -38994,59 +37618,43 @@
icon_state = "darkyellowcorners2"
},
/area/bigredv2/outside/engineering)
-"niT" = (
-/obj/structure/surface/table/woodentable{
- dir = 4;
- flipped = 1
- },
-/turf/open/floor{
- icon_state = "wood"
+"niU" = (
+/obj/item/prop{
+ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
+ icon = 'icons/obj/janitor.dmi';
+ icon_state = "trashbag3";
+ name = "trash bag";
+ pixel_x = -8;
+ pixel_y = -4
},
-/area/bigredv2/outside/bar)
-"niV" = (
-/obj/effect/landmark/corpsespawner/security,
-/obj/effect/decal/cleanable/blood/gibs/body,
-/obj/effect/decal/cleanable/blood,
+/obj/effect/decal/cleanable/generic,
/turf/open/floor{
- icon_state = "redcorner"
- },
-/area/bigredv2/outside/marshal_office)
-"niY" = (
-/obj/item/trash/cigbutt{
- pixel_x = 7;
- pixel_y = 7
+ dir = 1;
+ icon_state = "asteroidfloor"
},
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/nw)
+/area/bigredv2/outside/ne)
"njf" = (
/turf/open/mars_cave{
icon_state = "mars_dirt_6"
},
/area/bigredv2/outside/lz2_south_cas)
-"njW" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/item/tool/warning_cone{
- pixel_x = -2;
- pixel_y = 5
- },
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
+"nji" = (
+/obj/item/stack/sheet/metal{
+ pixel_x = 4;
+ pixel_y = -9
},
-/area/bigredv2/outside/c)
+/obj/effect/decal/cleanable/blood/xeno,
+/turf/open/floor,
+/area/bigredv2/outside/office_complex)
+"nkc" = (
+/obj/structure/flora/grass/desert/lightgrass_11,
+/turf/open/mars,
+/area/bigredv2/outside/nw)
"nky" = (
/obj/structure/machinery/vending/coffee,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor,
/area/bigredv2/outside/admin_building)
-"nkC" = (
-/turf/open/floor{
- dir = 9;
- icon_state = "asteroidwarning"
- },
-/area/bigredv2/outside/w)
"nkE" = (
/obj/structure/surface/table/woodentable,
/obj/item/paper_bin/wy{
@@ -39086,6 +37694,15 @@
icon_state = "mars_dirt_6"
},
/area/bigredv2/caves/mining)
+"nlj" = (
+/obj/effect/decal/cleanable/ash{
+ pixel_x = 11;
+ pixel_y = 25
+ },
+/turf/open/mars_cave{
+ icon_state = "mars_dirt_4"
+ },
+/area/bigredv2/outside/nw)
"nlB" = (
/turf/open/mars_cave{
icon_state = "mars_cave_16"
@@ -39097,9 +37714,6 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/filtration_plant)
-"nlO" = (
-/turf/open/asphalt/cement,
-/area/bigredv2/caves_lambda)
"nlW" = (
/obj/structure/platform/kutjevo/rock,
/obj/structure/platform/kutjevo/rock{
@@ -39108,13 +37722,16 @@
/obj/structure/platform_decoration/kutjevo/rock,
/turf/open/mars,
/area/space)
-"nmg" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
+"nms" = (
+/obj/item/trash/cigbutt{
+ pixel_x = -1;
+ pixel_y = 17
},
-/obj/effect/decal/cleanable/blood/drip,
-/turf/open/floor,
-/area/bigredv2/outside/general_offices)
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidfloor"
+ },
+/area/bigredv2/outside/c)
"nmU" = (
/obj/structure/surface/table,
/obj/item/device/analyzer,
@@ -39144,12 +37761,10 @@
icon_state = "wood"
},
/area/bigredv2/outside/library)
-"nnK" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
- },
-/area/bigredv2/outside/e)
+"nnD" = (
+/obj/structure/flora/grass/desert/lightgrass_12,
+/turf/open/mars,
+/area/bigredv2/outside/sw)
"nnU" = (
/obj/structure/machinery/door_control{
desc = "A remote control-switch for opening the engines blast doors.";
@@ -39167,44 +37782,15 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/engineering)
-"nok" = (
-/obj/structure/flora/grass/desert/lightgrass_1,
+"npv" = (
+/obj/item/trash/hotdog{
+ pixel_x = -12;
+ pixel_y = -11
+ },
/turf/open/asphalt/cement_sunbleached{
icon_state = "cement_sunbleached3"
},
-/area/bigredv2/outside/w)
-"nom" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/filtration_plant)
-"noG" = (
-/obj/structure/cargo_container/arious/rightmid,
-/turf/open/floor/plating/plating_catwalk,
-/area/bigredv2/outside/space_port)
-"noH" = (
-/obj/structure/machinery/door/airlock/almayer/generic{
- name = "\improper Private Office";
- density = 0;
- icon_state = "door_open"
- },
-/obj/effect/decal/cleanable/blood/drip,
-/turf/open/floor{
- icon_state = "delivery"
- },
-/area/bigredv2/outside/office_complex)
-"npm" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/structure/barricade/wooden{
- desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
- dir = 8;
- health = 25000
- },
-/turf/open/floor{
- icon_state = "dark"
- },
-/area/bigredv2/outside/general_offices)
+/area/bigredv2/outside/nw)
"npz" = (
/obj/structure/surface/table,
/obj/item/spacecash/c100,
@@ -39216,6 +37802,22 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
+"npJ" = (
+/obj/structure/flora/grass/desert/lightgrass_7,
+/turf/open/mars,
+/area/bigredv2/outside/nw)
+"npL" = (
+/obj/structure/bed/bedroll{
+ dir = 5
+ },
+/obj/effect/landmark/corpsespawner/colonist,
+/obj/effect/decal/cleanable/blood,
+/obj/effect/decal/cleanable/blood/gibs/body,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor{
+ icon_state = "freezerfloor"
+ },
+/area/bigredv2/outside/general_offices)
"nqr" = (
/obj/structure/prop/invuln/minecart_tracks{
dir = 8
@@ -39223,36 +37825,20 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/bigredv2/caves/mining)
-"nqJ" = (
-/obj/effect/decal/cleanable/generic,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
+"nqQ" = (
+/obj/item/weapon/baton/damaged{
+ pixel_y = 20
},
-/area/bigredv2/outside/nw)
-"nqS" = (
-/obj/structure/flora/grass/desert/lightgrass_7,
-/obj/item/stack/folding_barricade,
-/turf/open/mars,
-/area/bigredv2/outside/c)
-"nqT" = (
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached1"
+/obj/effect/decal/cleanable/blood/xeno,
+/turf/open/floor{
+ icon_state = "redcorner"
},
-/area/bigredv2/outside/s)
+/area/bigredv2/outside/marshal_office)
"nra" = (
/turf/open/mars{
icon_state = "mars_dirt_13"
},
/area/bigredv2/outside/sw)
-"nrf" = (
-/obj/item/trash/snack_bowl{
- pixel_x = 1;
- pixel_y = -12
- },
-/turf/open/mars{
- icon_state = "mars_dirt_10"
- },
-/area/bigredv2/outside/virology)
"nrj" = (
/obj/effect/decal/cleanable/blood/drip{
pixel_x = -1;
@@ -39262,55 +37848,34 @@
icon_state = "mars_dirt_4"
},
/area/bigredv2/caves/mining)
-"nrp" = (
-/obj/item/shard,
-/turf/open/floor{
- icon_state = "white"
- },
-/area/bigredv2/outside/medical)
"nrw" = (
/turf/open/mars_cave{
icon_state = "mars_cave_6"
},
/area/bigredv2/outside/filtration_cave_cas)
-"nrA" = (
-/obj/effect/landmark/objective_landmark/close,
-/obj/item/prop{
- desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
- icon = 'icons/obj/janitor.dmi';
- icon_state = "trashbag3";
- name = "trash bag";
- pixel_x = -6;
- pixel_y = 6;
- layer = 3.1
- },
-/obj/effect/decal/cleanable/generic,
-/obj/item/trash/cheesie{
- pixel_y = 6;
- pixel_x = 9
+"nrE" = (
+/obj/item/clothing/shoes/galoshes{
+ pixel_x = 4;
+ pixel_y = -6
},
/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
+ dir = 4;
+ icon_state = "whiteyellowfull"
},
-/area/bigredv2/outside/ne)
-"nrV" = (
-/obj/structure/flora/grass/desert/lightgrass_2,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached2"
+/area/bigredv2/outside/office_complex)
+"ntx" = (
+/obj/structure/flora/grass/desert/lightgrass_5,
+/turf/open/mars,
+/area/bigredv2/outside/s)
+"ntF" = (
+/obj/item/tool/warning_cone{
+ pixel_x = -12
},
-/area/bigredv2/outside/nw)
-"nsA" = (
-/obj/structure/flora/bush/desert{
- icon_state = "tree_3"
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidfloor"
},
-/turf/open/mars,
-/area/bigredv2/outside/e)
-"ntB" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor,
-/area/bigredv2/outside/general_offices)
+/area/bigredv2/outside/ne)
"ntX" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor{
@@ -39336,6 +37901,16 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
+"nuc" = (
+/obj/item/stack/sheet/wood{
+ layer = 4.1;
+ pixel_x = 14;
+ pixel_y = -4
+ },
+/turf/open/floor{
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
"nug" = (
/obj/structure/platform{
dir = 1
@@ -39348,12 +37923,12 @@
},
/turf/open/gm/river,
/area/bigredv2/outside/engineering)
-"nur" = (
-/obj/structure/flora/grass/desert/lightgrass_1,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached3"
+"nuu" = (
+/obj/effect/decal/cleanable/blood/xeno,
+/turf/open/floor{
+ icon_state = "dark"
},
-/area/bigredv2/outside/nw)
+/area/bigredv2/outside/general_offices)
"nuw" = (
/obj/effect/decal/warning_stripes{
icon_state = "NE-out";
@@ -39371,15 +37946,6 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/engineering)
-"nuC" = (
-/obj/effect/decal/strata_decals/grime/grime1{
- dir = 4
- },
-/obj/effect/decal/cleanable/generic,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached14"
- },
-/area/bigredv2/outside/nw)
"nuQ" = (
/obj/structure/surface/table/woodentable,
/obj/effect/landmark/objective_landmark/close,
@@ -39397,18 +37963,57 @@
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/c)
-"nvX" = (
-/obj/effect/decal/cleanable/blood/drip,
+"nvE" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached1"
+ },
+/area/bigredv2/outside/nw)
+"nvL" = (
+/obj/structure/surface/table/reinforced,
+/obj/structure/machinery/recharger,
+/obj/effect/decal/cleanable/dirt,
/turf/open/floor{
- icon_state = "whitegreen"
+ dir = 9;
+ icon_state = "redfull"
},
-/area/bigredv2/outside/medical)
+/area/bigredv2/outside/lambda_cave_cas)
+"nvN" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/spacecash/c1{
+ pixel_x = -6;
+ pixel_y = -8
+ },
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidfloor"
+ },
+/area/bigredv2/outside/ne)
+"nwr" = (
+/obj/effect/decal/cleanable/generic,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached1"
+ },
+/area/bigredv2/outside/virology)
"nwB" = (
/turf/open/floor{
dir = 8;
icon_state = "darkyellow2"
},
/area/bigredv2/outside/filtration_plant)
+"nwE" = (
+/turf/open/asphalt/cement{
+ icon_state = "cement9"
+ },
+/area/bigredv2/outside/lambda_cave_cas)
+"nwP" = (
+/obj/structure/barricade/wooden{
+ pixel_y = -4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor,
+/area/bigredv2/outside/general_offices)
"nwS" = (
/obj/item/ore{
pixel_x = -7;
@@ -39418,6 +38023,15 @@
icon_state = "mars_dirt_5"
},
/area/bigredv2/caves/mining)
+"nwT" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/obj/effect/decal/cleanable/blood,
+/obj/effect/landmark/corpsespawner/colonist,
+/obj/effect/decal/cleanable/blood/gibs/body,
+/turf/open/floor{
+ icon_state = "dark"
+ },
+/area/bigredv2/outside/general_offices)
"nxa" = (
/obj/structure/machinery/light/small{
dir = 8
@@ -39426,24 +38040,26 @@
icon_state = "mars_cave_3"
},
/area/bigredv2/caves/mining)
-"nxJ" = (
-/obj/effect/decal/cleanable/generic,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/space_port_lz2)
-"nyv" = (
-/obj/structure/flora/grass/desert/lightgrass_1,
-/turf/open/mars,
-/area/bigredv2/outside/e)
-"nzo" = (
-/obj/effect/decal/cleanable/ash{
- pixel_x = 11;
- pixel_y = 25
+"nyj" = (
+/obj/item/trash/chips{
+ pixel_y = 4;
+ pixel_x = -8
},
-/turf/open/mars_cave{
- icon_state = "mars_dirt_4"
+/obj/structure/pipes/standard/simple/hidden/green,
+/turf/open/floor{
+ dir = 8;
+ icon_state = "whitegreen"
},
-/area/bigredv2/outside/nw)
+/area/bigredv2/outside/medical)
+"nzc" = (
+/obj/effect/decal/medical_decals{
+ icon_state = "triagedecalbottomright"
+ },
+/turf/open/floor{
+ dir = 10;
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
"nzB" = (
/obj/structure/machinery/computer/general_air_control{
dir = 8;
@@ -39455,15 +38071,6 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/filtration_plant)
-"nzE" = (
-/obj/item/reagent_container/food/drinks/bottle/beer/craft/ganucci{
- pixel_x = -6;
- pixel_y = -8
- },
-/turf/open/floor{
- icon_state = "wood"
- },
-/area/bigredv2/outside/bar)
"nzN" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor{
@@ -39471,15 +38078,25 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/engineering)
-"nAz" = (
-/obj/item/trash/cigbutt{
- pixel_x = -6;
- pixel_y = -9
+"nAF" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/obj/structure/machinery/door/airlock/almayer/medical/glass/colony{
+ dir = 1;
+ name = "\improper Medical Clinic";
+ density = 0;
+ icon_state = "door_open"
},
-/turf/open/asphalt/cement{
- icon_state = "cement4"
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/floor{
+ icon_state = "delivery"
},
-/area/bigredv2/outside/space_port)
+/area/bigredv2/outside/medical)
+"nBa" = (
+/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
+/turf/open/floor{
+ icon_state = "white"
+ },
+/area/bigredv2/outside/medical)
"nBb" = (
/obj/item/ammo_magazine/pistol/b92fs,
/obj/item/weapon/gun/pistol/b92fs{
@@ -39490,10 +38107,33 @@
icon_state = "mars_dirt_6"
},
/area/bigredv2/caves/mining)
-"nBu" = (
-/obj/effect/landmark/survivor_spawner,
+"nBk" = (
+/obj/effect/decal/cleanable/blood/xeno,
+/turf/open/floor/plating,
+/area/bigredv2/outside/medical)
+"nBp" = (
+/obj/effect/decal/cleanable/generic,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached12"
+ },
+/area/bigredv2/outside/e)
+"nBy" = (
+/turf/open/asphalt/cement,
+/area/bigredv2/outside/lambda_cave_cas)
+"nBX" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/blood,
+/obj/effect/decal/cleanable/blood/gibs/body,
/turf/open/floor,
-/area/bigredv2/outside/office_complex)
+/area/bigredv2/outside/dorms)
+"nCd" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement{
+ icon_state = "cement1"
+ },
+/area/bigredv2/caves_lambda)
"nCp" = (
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest,
/obj/effect/landmark/structure_spawner/setup/distress/xeno_nest,
@@ -39501,6 +38141,16 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/caves_se)
+"nCF" = (
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached1"
+ },
+/area/bigredv2/outside/s)
+"nCJ" = (
+/obj/effect/decal/cleanable/blood/drip,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor,
+/area/bigredv2/outside/general_offices)
"nCT" = (
/obj/structure/sign/poster/ad,
/turf/closed/wall/solaris/reinforced,
@@ -39511,16 +38161,12 @@
},
/turf/open/floor/plating,
/area/bigredv2/caves/mining)
-"nDg" = (
-/obj/structure/flora/grass/desert/lightgrass_4,
-/turf/open/mars,
-/area/bigredv2/outside/n)
-"nDN" = (
-/obj/structure/flora/bush/desert{
- icon_state = "tree_3"
+"nDS" = (
+/obj/structure/flora/grass/desert/lightgrass_3,
+/turf/open/mars_cave{
+ icon_state = "mars_cave_20"
},
-/turf/open/mars,
-/area/bigredv2/outside/s)
+/area/bigredv2/outside/nw)
"nEl" = (
/turf/open/mars_cave{
icon_state = "mars_cave_13"
@@ -39564,15 +38210,6 @@
icon_state = "wood"
},
/area/bigredv2/outside/library)
-"nFA" = (
-/obj/structure/platform_decoration/kutjevo/rock{
- layer = 3.1
- },
-/obj/effect/decal/cleanable/generic,
-/turf/open/mars_cave{
- icon_state = "mars_cave_19"
- },
-/area/bigredv2/outside/nw)
"nFB" = (
/obj/item/weapon/gun/rifle/m16,
/obj/item/ammo_magazine/rifle/m16,
@@ -39581,13 +38218,25 @@
icon_state = "mars_cave_3"
},
/area/bigredv2/caves/mining)
-"nFH" = (
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
+"nFT" = (
+/obj/structure/prop/invuln/overhead_pipe{
+ dir = 4;
+ pixel_x = 2;
+ pixel_y = 9
+ },
+/obj/structure/prop/invuln/pipe_water{
+ pixel_x = 9;
+ pixel_y = -1
+ },
+/obj/item/reagent_container/glass/bucket/janibucket{
+ pixel_y = -19;
+ pixel_x = 7
+ },
/turf/open/floor{
- dir = 9;
- icon_state = "asteroidwarning"
+ dir = 1;
+ icon_state = "asteroidfloor"
},
-/area/bigredv2/caves_lambda)
+/area/bigredv2/outside/ne)
"nGm" = (
/obj/structure/fence,
/obj/structure/blocker/forcefield/multitile_vehicles,
@@ -39595,15 +38244,30 @@
icon_state = "mars_cave_17"
},
/area/bigredv2/outside/filtration_cave_cas)
-"nGo" = (
-/obj/effect/decal/cleanable/generic,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
+"nGZ" = (
+/obj/structure/flora/grass/desert/lightgrass_3,
+/turf/open/mars,
+/area/bigredv2/outside/e)
+"nHh" = (
+/obj/item/reagent_container/food/drinks/bottle/beer/craft{
+ pixel_y = -9;
+ pixel_x = -7
},
-/area/bigredv2/outside/filtration_plant)
-"nHO" = (
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/nw)
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidfloor"
+ },
+/area/bigredv2/outside/ne)
+"nHH" = (
+/obj/structure/machinery/light,
+/obj/item/trash/crushed_cup{
+ pixel_x = -4;
+ pixel_y = -7
+ },
+/turf/open/floor{
+ icon_state = "dark"
+ },
+/area/bigredv2/outside/marshal_office)
"nHQ" = (
/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
/obj/structure/machinery/door/poddoor/almayer/closed{
@@ -39615,6 +38279,23 @@
icon_state = "delivery"
},
/area/bigredv2/outside/filtration_cave_cas)
+"nHR" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 10
+ },
+/obj/effect/decal/cleanable/generic,
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/nw)
+"nHY" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/corpsespawner/security,
+/obj/effect/decal/cleanable/blood/gibs/body,
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor{
+ dir = 4;
+ icon_state = "redcorner"
+ },
+/area/bigredv2/outside/marshal_office)
"nIi" = (
/obj/structure/machinery/door/airlock/almayer/secure/colony{
dir = 1;
@@ -39632,15 +38313,13 @@
icon_state = "redfull"
},
/area/bigredv2/outside/lambda_cave_cas)
-"nKy" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/turf/open/floor{
- dir = 9;
- icon_state = "whitegreen"
+"nKg" = (
+/obj/structure/bed/chair{
+ dir = 1
},
-/area/bigredv2/outside/medical)
+/obj/effect/decal/cleanable/blood/xeno,
+/turf/open/floor,
+/area/bigredv2/outside/office_complex)
"nKL" = (
/obj/structure/prop/invuln/minecart_tracks{
desc = "An exchange valve";
@@ -39654,19 +38333,39 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
+"nLg" = (
+/obj/item/ashtray/glass,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor{
+ icon_state = "wood"
+ },
+/area/bigredv2/outside/bar)
+"nLi" = (
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached4"
+ },
+/area/bigredv2/outside/c)
"nLw" = (
/obj/structure/blocker/forcefield/multitile_vehicles,
/turf/open/mars_cave{
icon_state = "mars_dirt_4"
},
/area/bigredv2/outside/sw)
-"nLE" = (
-/obj/structure/surface/table/woodentable,
-/obj/item/reagent_container/food/drinks/bottle/cognac,
+"nLR" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached1"
+ },
+/area/bigredv2/outside/space_port_lz2)
+"nLX" = (
+/turf/open/floor/plating/plating_catwalk,
+/area/bigredv2/outside/space_port)
+"nMo" = (
+/obj/effect/decal/cleanable/dirt,
/turf/open/floor{
icon_state = "wood"
},
-/area/bigredv2/outside/bar)
+/area/bigredv2/outside/dorms)
"nMB" = (
/obj/structure/machinery/door_control{
id = "workshop_br_g";
@@ -39686,25 +38385,19 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"nND" = (
-/obj/item/trash/cigbutt{
- pixel_x = 4
- },
+"nNc" = (
+/obj/effect/decal/cleanable/blood,
/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
- },
-/area/bigredv2/outside/ne)
-"nNY" = (
-/obj/item/trash/eat{
- pixel_x = -9;
- pixel_y = 10
+ icon_state = "freezerfloor"
},
+/area/bigredv2/outside/dorms)
+"nNX" = (
+/obj/item/ammo_casing/bullet,
+/obj/effect/decal/cleanable/blood/drip,
/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
+ icon_state = "dark"
},
-/area/bigredv2/outside/ne)
+/area/bigredv2/outside/general_offices)
"nOe" = (
/obj/structure/toilet{
dir = 1
@@ -39713,20 +38406,24 @@
icon_state = "freezerfloor"
},
/area/bigredv2/outside/dorms)
-"nOP" = (
-/obj/structure/pipes/standard/simple/hidden/green{
+"nOq" = (
+/obj/structure/barricade/handrail{
dir = 4
},
-/obj/effect/decal/cleanable/dirt,
-/obj/item/trash/cigbutt{
- pixel_x = -6;
- pixel_y = -9
- },
+/obj/effect/decal/cleanable/generic,
/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
+ dir = 4;
+ icon_state = "asteroidwarning"
},
-/area/bigredv2/outside/ne)
+/area/bigredv2/outside/c)
+"nOw" = (
+/obj/structure/surface/table,
+/obj/effect/spawner/random/tool{
+ pixel_y = 7;
+ pixel_x = 13
+ },
+/turf/open/floor,
+/area/bigredv2/outside/dorms)
"nPz" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
@@ -39748,10 +38445,6 @@
icon_state = "mars_dirt_7"
},
/area/bigredv2/caves/mining)
-"nRO" = (
-/obj/structure/flora/grass/desert/lightgrass_9,
-/turf/open/mars,
-/area/bigredv2/outside/s)
"nRS" = (
/obj/structure/prop/invuln/minecart_tracks{
dir = 8
@@ -39770,6 +38463,20 @@
icon_state = "mars_dirt_7"
},
/area/bigredv2/caves/mining)
+"nTc" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached15"
+ },
+/area/bigredv2/outside/s)
+"nTe" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/nw)
"nTF" = (
/obj/structure/barricade/wooden{
desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
@@ -39785,25 +38492,6 @@
icon_state = "mars_cave_20"
},
/area/bigredv2/outside/lz2_south_cas)
-"nUw" = (
-/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb{
- pixel_x = -5;
- pixel_y = -9
- },
-/turf/closed/wall/solaris/rock,
-/area/bigredv2/caves)
-"nUB" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/vomit{
- icon_state = "vomit_4"
- },
-/turf/open/floor{
- icon_state = "wood"
- },
-/area/bigredv2/outside/bar)
"nUK" = (
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
@@ -39811,22 +38499,28 @@
icon_state = "dark"
},
/area/bigredv2/caves/eta/xenobiology)
-"nUV" = (
-/obj/structure/blocker/forcefield/multitile_vehicles,
-/turf/open/asphalt/cement{
- icon_state = "cement1";
- dir = 1
+"nUR" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/trash/cigbutt{
+ pixel_x = -10;
+ pixel_y = 16
},
-/area/bigredv2/outside/filtration_cave_cas)
-"nVe" = (
-/obj/item/storage/pill_bottle/tramadol{
+/turf/open/floor{
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/c)
+"nUZ" = (
+/obj/effect/decal/cleanable/blood{
+ layer = 3;
+ pixel_x = 24
+ },
+/obj/item/trash/chips{
pixel_y = -6;
- pixel_x = 6
+ pixel_x = -3
},
-/obj/item/trash/burger,
+/obj/structure/pipes/standard/simple/hidden/green,
/turf/open/floor{
- dir = 1;
- icon_state = "whitegreen"
+ icon_state = "white"
},
/area/bigredv2/outside/medical)
"nVq" = (
@@ -39840,19 +38534,13 @@
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/filtration_plant)
-"nVD" = (
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor{
- dir = 4;
- icon_state = "asteroidwarning"
- },
-/area/bigredv2/outside/ne)
-"nWi" = (
-/obj/item/tool/surgery/scalpel{
- pixel_y = -8
+"nWe" = (
+/obj/item/device/healthanalyzer{
+ pixel_x = 3;
+ pixel_y = 8
},
/turf/open/floor{
- icon_state = "whiteblue"
+ icon_state = "white"
},
/area/bigredv2/outside/medical)
"nWD" = (
@@ -39863,6 +38551,14 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
+"nWE" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 5
+ },
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached12"
+ },
+/area/bigredv2/outside/c)
"nWG" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 6
@@ -39893,19 +38589,15 @@
icon_state = "mars_cave_15"
},
/area/bigredv2/caves_research)
-"nYg" = (
-/obj/effect/decal/cleanable/blood/drip,
-/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb{
- pixel_x = 8;
- pixel_y = -5
- },
-/obj/structure/barricade/wooden{
- desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
- dir = 8;
- health = 25000
+"nYn" = (
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/e)
+"nYw" = (
+/obj/item/shard,
+/turf/open/floor{
+ icon_state = "dark"
},
-/turf/open/floor/plating,
-/area/bigredv2/outside/medical)
+/area/bigredv2/outside/general_offices)
"nYC" = (
/obj/structure/surface/table,
/obj/item/tool/pickaxe/plasmacutter,
@@ -39914,44 +38606,38 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"nYT" = (
-/obj/effect/decal/strata_decals/grime/grime4,
-/obj/item/trash/pistachios{
- pixel_x = -3;
- pixel_y = 11
- },
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/w)
"nYV" = (
/obj/item/tool/warning_cone,
/turf/open/mars,
/area/bigredv2/outside/s)
+"nYX" = (
+/obj/structure/flora/grass/desert/lightgrass_1,
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/space_port_lz2)
"nZd" = (
/obj/effect/landmark/nightmare{
insert_tag = "lz1cave_flank"
},
/turf/closed/wall/solaris/reinforced,
/area/bigredv2/outside/space_port)
-"nZg" = (
-/obj/item/reagent_container/food/drinks/cup{
- pixel_x = 8;
- pixel_y = -19
- },
-/obj/item/reagent_container/food/drinks/cup{
- pixel_x = 3;
- pixel_y = -1
- },
+"nZh" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/pipes/standard/manifold/hidden/green,
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/e)
+"nZm" = (
+/obj/effect/decal/cleanable/blood,
/turf/open/floor{
- dir = 1;
- icon_state = "whitegreen"
+ dir = 4;
+ icon_state = "asteroidwarning"
},
-/area/bigredv2/outside/marshal_office)
-"nZi" = (
-/obj/effect/decal/cleanable/vomit{
- icon_state = "vomit_2"
+/area/bigredv2/outside/ne)
+"nZq" = (
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/floor{
+ icon_state = "asteroidwarning"
},
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/c)
+/area/bigredv2/outside/eta)
"nZB" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor{
@@ -39976,29 +38662,40 @@
/obj/structure/largecrate/random/case/double,
/turf/open/floor/plating,
/area/bigredv2/caves/mining)
-"oaO" = (
-/obj/effect/decal/strata_decals/grime/grime2{
- dir = 4
+"oaf" = (
+/obj/structure/flora/grass/desert/lightgrass_4,
+/obj/structure/flora/grass/desert/lightgrass_11,
+/turf/open/mars_cave{
+ icon_state = "mars_dirt_4"
},
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached3"
+/area/bigredv2/outside/space_port_lz2)
+"oaq" = (
+/obj/structure/surface/table,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor{
+ icon_state = "whitegreencorner"
+ },
+/area/bigredv2/outside/medical)
+"oat" = (
+/obj/item/stack/rods{
+ pixel_x = 9;
+ pixel_y = 10
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor{
+ icon_state = "asteroidwarning"
},
/area/bigredv2/outside/nw)
+"oaV" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement,
+/area/bigredv2/caves_lambda)
"obf" = (
/obj/effect/landmark/nightmare{
insert_tag = "lambda-graveyard"
},
/turf/closed/wall/solaris/reinforced,
/area/bigredv2/outside/se)
-"obn" = (
-/obj/structure/pipes/vents/pump{
- dir = 1
- },
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor{
- icon_state = "dark"
- },
-/area/bigredv2/outside/general_offices)
"obB" = (
/obj/structure/prop/invuln/minecart_tracks{
dir = 1
@@ -40027,44 +38724,15 @@
icon_state = "wood"
},
/area/bigredv2/caves/eta/living)
-"ocR" = (
-/obj/structure/pipes/vents/pump{
- dir = 8
- },
-/turf/open/asphalt/cement{
- icon_state = "cement1"
- },
-/area/bigredv2/caves_lambda)
-"odk" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/obj/effect/decal/cleanable/blood/drip,
-/turf/open/floor{
- dir = 8;
- icon_state = "asteroidwarning"
- },
-/area/bigredv2/outside/eta)
-"odt" = (
-/obj/effect/decal/strata_decals/grime/grime2,
-/turf/open/asphalt/cement{
- icon_state = "cement3"
+"odq" = (
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached2"
},
-/area/bigredv2/outside/filtration_cave_cas)
+/area/bigredv2/outside/se)
"odw" = (
/obj/structure/bed,
/turf/open/floor/plating,
/area/bigredv2/outside/cargo)
-"ody" = (
-/obj/item/weapon/ice_axe/green{
- pixel_y = -12
- },
-/obj/item/stack/medical/bruise_pack{
- pixel_x = -15;
- pixel_y = 10
- },
-/turf/open/mars_cave{
- icon_state = "mars_cave_18"
- },
-/area/bigredv2/outside/n)
"oea" = (
/obj/effect/landmark/crap_item,
/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
@@ -40072,6 +38740,16 @@
icon_state = "dark"
},
/area/bigredv2/caves/lambda/breakroom)
+"oeb" = (
+/obj/item/clothing/gloves/latex{
+ pixel_y = 5;
+ pixel_x = 12
+ },
+/turf/open/floor{
+ dir = 5;
+ icon_state = "whitebluefull"
+ },
+/area/bigredv2/outside/medical)
"oes" = (
/obj/structure/surface/table/woodentable,
/obj/item/newspaper,
@@ -40079,6 +38757,15 @@
icon_state = "wood"
},
/area/bigredv2/outside/library)
+"oeA" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/storage/firstaid/rad/empty{
+ pixel_x = -9
+ },
+/turf/open/floor{
+ icon_state = "whitegreencorner"
+ },
+/area/bigredv2/outside/medical)
"ofn" = (
/obj/effect/decal/cleanable/dirt,
/turf/closed/wall/solaris,
@@ -40102,6 +38789,16 @@
icon_state = "dark"
},
/area/bigredv2/caves/eta/storage)
+"ofK" = (
+/obj/structure/surface/table,
+/obj/structure/machinery/power/apc{
+ dir = 1;
+ start_charge = 0
+ },
+/turf/open/floor{
+ icon_state = "dark"
+ },
+/area/bigredv2/outside/marshal_office)
"ofX" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
@@ -40119,41 +38816,48 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
+"ogI" = (
+/turf/open/asphalt/cement{
+ icon_state = "cement12"
+ },
+/area/bigredv2/outside/space_port)
+"ogL" = (
+/obj/effect/landmark/crap_item,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached12"
+ },
+/area/bigredv2/outside/e)
"ohg" = (
/obj/vehicle/train/cargo/trolley,
/turf/open/mars_cave{
icon_state = "mars_cave_2"
},
/area/bigredv2/caves/mining)
-"ohk" = (
-/obj/effect/landmark/crap_item,
-/turf/open/mars{
- icon_state = "mars_dirt_8"
- },
-/area/bigredv2/outside/s)
"ohD" = (
/turf/open/mars_cave{
icon_state = "mars_cave_11"
},
/area/bigredv2/caves_east)
"ohX" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/corpsespawner/security,
-/obj/effect/decal/cleanable/blood/gibs/body,
-/obj/effect/decal/cleanable/blood,
+/obj/effect/decal/cleanable/blood/drip,
/turf/open/floor{
- dir = 4;
- icon_state = "asteroidwarning"
+ icon_state = "whitegreen"
},
-/area/bigredv2/outside/n)
+/area/bigredv2/outside/medical)
"ohY" = (
/obj/structure/cargo_container/hd/left/alt,
/turf/open/floor/plating,
/area/bigredv2/caves/mining)
-"oic" = (
-/obj/structure/flora/grass/desert/lightgrass_7,
-/turf/open/mars,
-/area/bigredv2/outside/virology)
+"oil" = (
+/obj/effect/decal/cleanable/generic,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached1"
+ },
+/area/bigredv2/outside/s)
+"oiq" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/w)
"oji" = (
/obj/structure/morgue{
dir = 2
@@ -40169,6 +38873,23 @@
},
/turf/open/gm/river,
/area/bigredv2/outside/engineering)
+"ojO" = (
+/obj/structure/surface/table{
+ flipped = 1
+ },
+/turf/open/floor,
+/area/bigredv2/outside/office_complex)
+"ojR" = (
+/obj/item/ammo_casing/bullet,
+/turf/open/floor{
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
+"okd" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/pipes/standard/simple/hidden/green,
+/turf/open/floor,
+/area/bigredv2/outside/general_offices)
"okh" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -40187,11 +38908,6 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"okm" = (
-/obj/structure/window_frame/solaris,
-/obj/item/shard,
-/turf/open/floor/plating,
-/area/bigredv2/outside/medical)
"okt" = (
/obj/structure/surface/table,
/obj/effect/spawner/random/tool,
@@ -40199,6 +38915,22 @@
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/space_port_lz2)
+"okB" = (
+/obj/structure/bed/chair{
+ dir = 1
+ },
+/obj/structure/pipes/standard/simple/hidden/green,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/reagent_container/pill/happy,
+/turf/open/floor{
+ icon_state = "white"
+ },
+/area/bigredv2/outside/medical)
+"okF" = (
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached9"
+ },
+/area/bigredv2/outside/se)
"ole" = (
/turf/open/floor/almayer{
dir = 1;
@@ -40225,6 +38957,28 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/caves/mining)
+"omB" = (
+/obj/effect/decal/cleanable/blood,
+/obj/item/tool/hatchet{
+ pixel_x = -6;
+ pixel_y = -9
+ },
+/turf/open/floor{
+ dir = 1;
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/marshal_office)
+"omD" = (
+/obj/item/shard,
+/obj/item/stack/sheet/wood{
+ layer = 2.7;
+ pixel_y = 8
+ },
+/turf/open/floor{
+ dir = 9;
+ icon_state = "whiteblue"
+ },
+/area/bigredv2/outside/medical)
"omG" = (
/obj/effect/decal/cleanable/blood/drip{
pixel_x = -5;
@@ -40235,21 +38989,6 @@
icon_state = "mars_cave_13"
},
/area/bigredv2/caves/mining)
-"omI" = (
-/obj/effect/landmark/corpsespawner/scientist,
-/obj/effect/decal/cleanable/blood/gibs/body,
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidwarning"
- },
-/area/bigredv2/outside/eta)
-"omL" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/gibs/xeno,
-/obj/effect/decal/cleanable/blood/xeno,
-/turf/open/floor,
-/area/bigredv2/outside/office_complex)
"omX" = (
/obj/item/stack/cable_coil/cut{
pixel_x = -3;
@@ -40275,26 +39014,19 @@
icon_state = "mars_dirt_4"
},
/area/bigredv2/caves/mining)
-"onK" = (
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached3"
- },
-/area/bigredv2/outside/e)
"onR" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/disposalpipe/broken,
/turf/open/floor/plating,
/area/bigredv2/caves/mining)
-"onX" = (
-/obj/structure/machinery/light,
-/obj/item/trash/crushed_cup{
- pixel_x = -4;
- pixel_y = -7
- },
+"onS" = (
+/obj/effect/decal/cleanable/blood,
+/obj/effect/landmark/corpsespawner/colonist,
+/obj/effect/decal/cleanable/blood/gibs/body,
/turf/open/floor{
icon_state = "dark"
},
-/area/bigredv2/outside/marshal_office)
+/area/bigredv2/outside/general_offices)
"ooi" = (
/obj/structure/platform_decoration/shiva{
dir = 8
@@ -40305,11 +39037,29 @@
icon_state = "bcircuitoff"
},
/area/bigredv2/caves/lambda/research)
-"ooD" = (
-/turf/open/asphalt/cement{
- icon_state = "cement12"
+"ooy" = (
+/obj/structure/surface/table,
+/obj/item/storage/firstaid/regular{
+ pixel_y = 3;
+ pixel_x = 6
},
-/area/bigredv2/outside/filtration_cave_cas)
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor{
+ icon_state = "white"
+ },
+/area/bigredv2/outside/medical)
+"ooA" = (
+/obj/item/ammo_casing/bullet,
+/turf/open/floor{
+ dir = 8;
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/c)
+"ooU" = (
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached12"
+ },
+/area/bigredv2/outside/nw)
"opz" = (
/obj/effect/landmark/crap_item,
/turf/open/mars_cave{
@@ -40322,6 +39072,12 @@
icon_state = "mars_cave_3"
},
/area/bigredv2/caves/mining)
+"opZ" = (
+/obj/effect/decal/strata_decals/grime/grime3,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached4"
+ },
+/area/bigredv2/outside/c)
"oqr" = (
/obj/item/ore{
pixel_x = -1
@@ -40339,13 +39095,18 @@
icon_state = "dark"
},
/area/bigredv2/caves/eta/research)
-"oqV" = (
+"orf" = (
+/obj/structure/window_frame/solaris,
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/floor/plating,
+/area/bigredv2/outside/marshal_office)
+"orz" = (
+/obj/structure/machinery/landinglight/ds1/delaytwo,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor{
- dir = 1;
- icon_state = "whiteblue"
+ icon_state = "asteroidwarning"
},
-/area/bigredv2/outside/medical)
+/area/bigredv2/outside/space_port)
"orT" = (
/obj/structure/machinery/vending/coffee,
/turf/open/floor/carpet,
@@ -40357,6 +39118,12 @@
icon_state = "test_floor4"
},
/area/bigredv2/outside/filtration_plant)
+"oso" = (
+/obj/effect/landmark/crap_item,
+/turf/open/mars{
+ icon_state = "mars_dirt_8"
+ },
+/area/bigredv2/outside/s)
"otb" = (
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
@@ -40364,10 +39131,11 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/caves_se)
-"otc" = (
-/obj/effect/decal/cleanable/blood/gibs/xeno,
-/turf/open/floor,
-/area/bigredv2/outside/office_complex)
+"otV" = (
+/turf/open/asphalt/cement{
+ icon_state = "cement4"
+ },
+/area/bigredv2/outside/filtration_cave_cas)
"oud" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/blood/oil/streak,
@@ -40383,12 +39151,26 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/engineering)
-"ouB" = (
-/obj/structure/machinery/deployable/barrier,
+"oun" = (
+/obj/item/prop{
+ desc = "A blood bag with a hole in it. The rats must have gotten to it first.";
+ icon = 'icons/obj/items/bloodpack.dmi';
+ icon_state = "bloodpack";
+ name = "blood bag";
+ pixel_x = -5;
+ pixel_y = 2;
+ layer = 2.8
+ },
/turf/open/floor{
- icon_state = "dark"
+ icon_state = "white"
},
-/area/bigredv2/outside/marshal_office)
+/area/bigredv2/outside/medical)
+"ouW" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached4"
+ },
+/area/bigredv2/outside/nw)
"ovq" = (
/turf/open/floor{
icon_state = "delivery"
@@ -40400,13 +39182,9 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/outside/lz2_west_cas)
-"ovP" = (
-/obj/effect/decal/cleanable/ash{
- pixel_y = 19
- },
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
- },
+"ovK" = (
+/obj/effect/decal/cleanable/blood,
+/turf/open/asphalt/cement_sunbleached,
/area/bigredv2/outside/nw)
"ovQ" = (
/obj/structure/blocker/forcefield/multitile_vehicles,
@@ -40427,6 +39205,9 @@
icon_state = "mars_cave_3"
},
/area/bigredv2/caves/mining)
+"owz" = (
+/turf/open/asphalt/cement,
+/area/bigredv2/outside/filtration_cave_cas)
"owR" = (
/turf/open/mars_cave{
icon_state = "mars_cave_16"
@@ -40444,34 +39225,34 @@
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor,
/area/bigred/ground/garage_workshop)
+"oxl" = (
+/obj/effect/decal/cleanable/blood/xeno,
+/turf/open/floor{
+ icon_state = "dark"
+ },
+/area/bigredv2/outside/marshal_office)
"oxp" = (
/turf/open/mars_cave{
icon_state = "mars_cave_5"
},
/area/bigredv2/caves_research)
-"oxP" = (
-/obj/structure/cargo_container/arious/leftmid,
-/turf/open/floor/plating/plating_catwalk,
-/area/bigredv2/outside/space_port)
-"oxR" = (
-/obj/effect/decal/cleanable/blood/xeno,
-/turf/open/mars,
-/area/bigredv2/outside/c)
-"oxV" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/trash/cigbutt{
- pixel_x = -10;
- pixel_y = 13
- },
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached3"
- },
-/area/bigredv2/outside/c)
"oye" = (
/turf/open/mars_cave{
icon_state = "mars_cave_5"
},
/area/bigredv2/outside/filtration_cave_cas)
+"oyF" = (
+/obj/effect/decal/cleanable/vomit,
+/turf/open/floor{
+ icon_state = "whitegreenfull"
+ },
+/area/bigredv2/outside/medical)
+"ozb" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/turf/open/floor{
+ icon_state = "redcorner"
+ },
+/area/bigredv2/outside/office_complex)
"ozf" = (
/obj/structure/prop/invuln/minecart_tracks{
desc = "A heavy duty power cable for high voltage applications";
@@ -40504,38 +39285,35 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/caves_lambda)
-"ozS" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/structure/largecrate/supply/medicine/medkits{
- pixel_x = -3
- },
-/obj/structure/largecrate/supply/supplies/flares{
- pixel_x = -1;
- pixel_y = 20;
- layer = 3.1
- },
-/turf/open/floor{
- icon_state = "white"
- },
-/area/bigredv2/outside/medical)
"oAf" = (
/turf/open/mars_cave{
icon_state = "mars_cave_5"
},
/area/bigredv2/caves_virology)
-"oAg" = (
+"oBn" = (
+/obj/item/trash/snack_bowl{
+ pixel_y = 5;
+ pixel_x = -8
+ },
+/turf/open/floor{
+ icon_state = "wood"
+ },
+/area/bigredv2/outside/bar)
+"oCf" = (
/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
+ icon_state = "cement_sunbleached15"
},
-/area/bigredv2/outside/filtration_plant)
-"oCW" = (
-/obj/structure/flora/grass/desert/lightgrass_12,
-/turf/open/mars_cave{
- icon_state = "mars_dirt_4"
+/area/bigredv2/outside/se)
+"oCn" = (
+/obj/structure/surface/table/woodentable{
+ dir = 8;
+ flipped = 1
},
-/area/bigredv2/outside/nw)
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor{
+ icon_state = "wood"
+ },
+/area/bigredv2/outside/bar)
"oDB" = (
/obj/structure/closet/l3closet,
/obj/effect/landmark/objective_landmark/close,
@@ -40544,12 +39322,6 @@
icon_state = "vault"
},
/area/bigredv2/outside/general_offices)
-"oDF" = (
-/obj/structure/flora/bush/desert{
- icon_state = "tree_4"
- },
-/turf/open/mars,
-/area/bigredv2/outside/nw)
"oDW" = (
/obj/structure/pipes/standard/simple/hidden/green,
/obj/structure/machinery/light{
@@ -40560,35 +39332,6 @@
icon_state = "darkred2"
},
/area/bigredv2/outside/admin_building)
-"oEc" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood{
- dir = 4;
- icon_state = "gib6"
- },
-/turf/open/asphalt/cement{
- icon_state = "cement12"
- },
-/area/bigredv2/caves_lambda)
-"oEe" = (
-/obj/item/bodybag/cryobag,
-/turf/open/floor{
- dir = 1;
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
-"oEL" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor{
- icon_state = "freezerfloor"
- },
-/area/bigredv2/outside/general_offices)
-"oFa" = (
-/obj/structure/largecrate/random/barrel/true_random,
-/turf/open/floor/plating{
- icon_state = "platebotc"
- },
-/area/bigredv2/outside/space_port)
"oFj" = (
/obj/structure/barricade/wooden{
desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
@@ -40600,19 +39343,57 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/caves_north)
+"oFw" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached15"
+ },
+/area/bigredv2/outside/nw)
"oFx" = (
/obj/item/device/flashlight/lantern,
/turf/open/mars_cave{
icon_state = "mars_dirt_4"
},
/area/bigredv2/outside/ne)
-"oHn" = (
-/obj/structure/bed/chair{
+"oFC" = (
+/obj/structure/flora/grass/desert/lightgrass_1,
+/turf/open/mars{
+ icon_state = "mars_dirt_9"
+ },
+/area/bigredv2/outside/nw)
+"oFI" = (
+/obj/structure/surface/table,
+/obj/item/clothing/head/beret/sec/warden{
+ pixel_y = 5
+ },
+/turf/open/floor{
+ icon_state = "dark"
+ },
+/area/bigredv2/outside/marshal_office)
+"oGt" = (
+/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
},
-/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached1"
+ },
+/area/bigredv2/outside/nw)
+"oGM" = (
+/obj/structure/flora/grass/desert/lightgrass_1,
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/nw)
+"oHc" = (
+/obj/structure/flora/grass/desert/lightgrass_8,
+/turf/open/mars,
+/area/bigredv2/outside/nw)
+"oHy" = (
+/obj/structure/surface/table,
+/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
+/obj/structure/surface/table,
+/obj/item/restraint/handcuffs,
/turf/open/floor,
-/area/bigredv2/outside/lambda_cave_cas)
+/area/bigredv2/outside/marshal_office)
"oIc" = (
/obj/effect/decal/cleanable/blood{
base_icon = 'icons/obj/items/weapons/grenade.dmi';
@@ -40625,6 +39406,11 @@
icon_state = "mars_cave_3"
},
/area/bigredv2/caves/mining)
+"oII" = (
+/turf/open/gm/river/desert/deep{
+ icon = 'icons/turf/floors/desert_water_toxic.dmi'
+ },
+/area/bigredv2/outside/c)
"oIK" = (
/obj/structure/platform,
/obj/structure/platform{
@@ -40635,6 +39421,13 @@
},
/turf/open/gm/river,
/area/bigredv2/outside/engineering)
+"oIP" = (
+/obj/structure/machinery/computer/arcade,
+/turf/open/floor{
+ dir = 4;
+ icon_state = "redcorner"
+ },
+/area/bigredv2/outside/marshal_office)
"oJd" = (
/obj/structure/prop/invuln/minecart_tracks{
desc = "A heavy duty power cable for high voltage applications";
@@ -40671,10 +39464,6 @@
icon_state = "mars_dirt_7"
},
/area/bigredv2/caves/mining)
-"oJS" = (
-/obj/structure/flora/grass/desert/lightgrass_9,
-/turf/open/mars,
-/area/bigredv2/outside/n)
"oKc" = (
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
@@ -40683,6 +39472,12 @@
icon_state = "darkgreencorners2"
},
/area/bigredv2/caves/eta/research)
+"oKi" = (
+/turf/open/floor{
+ dir = 8;
+ icon_state = "vault"
+ },
+/area/bigredv2/outside/marshal_office)
"oKy" = (
/obj/structure/window/framed/solaris/reinforced,
/turf/open/floor/plating{
@@ -40690,14 +39485,42 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"oLm" = (
-/obj/item/toy/plush/bee,
-/obj/effect/decal/cleanable/blood/gibs/body,
-/obj/effect/landmark/corpsespawner/doctor,
+"oKD" = (
+/obj/effect/landmark/objective_landmark/close,
+/obj/item/prop{
+ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
+ icon = 'icons/obj/janitor.dmi';
+ icon_state = "trashbag3";
+ name = "trash bag";
+ pixel_x = -6;
+ pixel_y = 6;
+ layer = 3.1
+ },
+/obj/effect/decal/cleanable/generic,
+/obj/item/trash/cheesie{
+ pixel_y = 6;
+ pixel_x = 9
+ },
/turf/open/floor{
- icon_state = "whitegreen"
+ dir = 1;
+ icon_state = "asteroidfloor"
},
-/area/bigredv2/outside/medical)
+/area/bigredv2/outside/ne)
+"oKG" = (
+/obj/structure/machinery/landinglight/ds1{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor{
+ dir = 4;
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/space_port)
+"oLG" = (
+/turf/open/mars_cave{
+ icon_state = "mars_cave_2"
+ },
+/area/bigredv2/outside/nw)
"oMd" = (
/obj/effect/decal/cleanable/blood/drip{
pixel_y = 13
@@ -40714,30 +39537,30 @@
icon_state = "asteroidfloor"
},
/area/bigredv2/outside/telecomm/n_cave)
-"oMg" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/drip,
-/turf/open/floor,
-/area/bigredv2/outside/dorms)
-"oML" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
+"oMI" = (
+/obj/effect/decal/cleanable/blood{
+ layer = 3
},
-/obj/effect/decal/cleanable/blood,
-/obj/effect/decal/cleanable/blood/gibs/body,
-/turf/open/floor,
-/area/bigredv2/outside/dorms)
-"oNg" = (
-/obj/structure/flora/grass/desert/lightgrass_1,
/turf/open/asphalt/cement_sunbleached{
icon_state = "cement_sunbleached12"
},
-/area/bigredv2/outside/filtration_plant)
+/area/bigredv2/outside/e)
+"oNg" = (
+/obj/structure/flora/bush/desert{
+ icon_state = "tree_3"
+ },
+/turf/open/mars,
+/area/bigredv2/outside/n)
"oNu" = (
/turf/open/mars_cave{
icon_state = "mars_cave_11"
},
/area/bigredv2/outside/lz2_west_cas)
+"oNw" = (
+/obj/effect/decal/cleanable/generic,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/space_port_lz2)
"oOk" = (
/obj/effect/landmark/xeno_spawn,
/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
@@ -40745,6 +39568,16 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/caves_research)
+"oOp" = (
+/obj/effect/decal/cleanable/blood,
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/turf/open/floor{
+ dir = 1;
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
"oOr" = (
/obj/effect/landmark/item_pool_spawner/survivor_ammo,
/turf/open/floor/plating{
@@ -40756,21 +39589,17 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/gm/river,
/area/bigredv2/outside/c)
-"oON" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/spacecash/c1{
- pixel_x = -6;
- pixel_y = -8
- },
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
+"oPy" = (
+/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb{
+ pixel_x = -5;
+ pixel_y = -9
},
-/area/bigredv2/outside/ne)
-"oOS" = (
-/obj/effect/decal/strata_decals/grime/grime2,
+/turf/closed/wall/solaris/rock,
+/area/bigredv2/caves)
+"oPE" = (
+/obj/effect/decal/cleanable/dirt,
/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached9"
+ icon_state = "cement_sunbleached1"
},
/area/bigredv2/outside/nw)
"oPM" = (
@@ -40798,13 +39627,17 @@
icon_state = "mars_cave_23"
},
/area/bigredv2/caves_sw)
-"oRn" = (
+"oRb" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
},
-/obj/effect/decal/cleanable/dirt,
/turf/open/asphalt/cement_sunbleached,
/area/bigredv2/outside/virology)
+"oRl" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor,
+/area/bigredv2/outside/general_offices)
"oRs" = (
/turf/open/mars_cave{
icon_state = "mars_cave_13"
@@ -40820,6 +39653,10 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
+"oSg" = (
+/obj/structure/flora/grass/desert/lightgrass_6,
+/turf/open/mars,
+/area/bigredv2/caves_north)
"oTf" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/barricade/handrail{
@@ -40857,6 +39694,13 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/caves/mining)
+"oUm" = (
+/obj/structure/machinery/power/apc{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/floor/plating,
+/area/bigredv2/outside/medical)
"oUs" = (
/obj/structure/prop/invuln/minecart_tracks{
desc = "A heavy duty power cable for high voltage applications";
@@ -40868,7 +39712,39 @@
/turf/open/mars_cave{
icon_state = "mars_dirt_7"
},
-/area/bigredv2/caves/mining)
+/area/bigredv2/caves/mining)
+"oUF" = (
+/obj/effect/decal/cleanable/blood,
+/obj/effect/decal/cleanable/generic,
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidfloor"
+ },
+/area/bigredv2/outside/c)
+"oUK" = (
+/obj/effect/decal/strata_decals/grime/grime4,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached1"
+ },
+/area/bigredv2/outside/c)
+"oUP" = (
+/obj/structure/surface/table/reinforced,
+/obj/item/restraint/handcuffs,
+/turf/open/floor{
+ dir = 9;
+ icon_state = "redfull"
+ },
+/area/bigredv2/outside/lambda_cave_cas)
+"oUV" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/trash/eat{
+ pixel_y = -2
+ },
+/turf/open/floor{
+ dir = 4;
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/ne)
"oUY" = (
/obj/structure/platform_decoration{
dir = 4
@@ -40885,12 +39761,45 @@
},
/turf/open/mars,
/area/bigredv2/outside/nw)
-"oVE" = (
-/obj/structure/largecrate/random/barrel/true_random,
-/turf/open/floor/plating{
- icon_state = "platebot"
+"oVt" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
+/turf/open/asphalt/cement{
+ icon_state = "cement15"
},
-/area/bigredv2/outside/space_port)
+/area/bigredv2/caves_lambda)
+"oVu" = (
+/obj/effect/landmark/crap_item,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor{
+ dir = 8;
+ icon_state = "carpet13-5"
+ },
+/area/bigredv2/outside/bar)
+"oVD" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/machinery/iv_drip,
+/turf/open/floor{
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
+"oVN" = (
+/obj/structure/machinery/light{
+ dir = 8
+ },
+/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
+/turf/open/floor{
+ icon_state = "wood"
+ },
+/area/bigredv2/outside/bar)
+"oVW" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/obj/structure/machinery/light{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/floor,
+/area/bigredv2/outside/cargo)
"oWc" = (
/obj/effect/decal/warning_stripes{
icon_state = "S"
@@ -40930,18 +39839,6 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/engineering)
-"oWz" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/structure/surface/table/woodentable{
- dir = 8;
- flipped = 1
- },
-/turf/open/floor{
- icon_state = "wood"
- },
-/area/bigredv2/outside/bar)
"oWC" = (
/obj/structure/prop/invuln/minecart_tracks{
desc = "A heavy duty power cable for high voltage applications";
@@ -40954,20 +39851,40 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/caves/mining)
-"oWS" = (
-/obj/structure/flora/grass/desert/lightgrass_6,
-/turf/open/mars{
- icon_state = "mars_dirt_12"
+"oWF" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement{
+ icon_state = "cement4"
+ },
+/area/bigredv2/caves_lambda)
+"oWK" = (
+/obj/structure/largecrate/random/barrel/green{
+ pixel_y = 5;
+ pixel_x = 3
+ },
+/obj/item/storage/fancy/cigar/matchbook{
+ pixel_x = 6;
+ pixel_y = 17
},
-/area/bigredv2/outside/w)
-"oXr" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/obj/effect/decal/cleanable/blood,
/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidfloor"
+ },
+/area/bigredv2/outside/ne)
+"oXE" = (
+/obj/structure/cargo_container/arious/rightmid,
+/turf/open/floor/plating/plating_catwalk,
+/area/bigredv2/outside/space_port)
+"oXG" = (
+/obj/item/frame/table,
+/turf/open/floor/plating{
dir = 8;
- icon_state = "asteroidwarning"
+ icon_state = "platingdmg2"
},
-/area/bigredv2/outside/eta)
+/area/bigredv2/outside/office_complex)
"oXH" = (
/obj/structure/prop/invuln/minecart_tracks{
desc = "A pipe.";
@@ -40981,12 +39898,6 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"oYc" = (
-/obj/effect/decal/strata_decals/grime/grime4,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
- },
-/area/bigredv2/outside/nw)
"oZA" = (
/obj/structure/prop/almayer/cannon_cables{
name = "\improper Large Cables";
@@ -40996,6 +39907,14 @@
icon_state = "mars_cave_17"
},
/area/bigredv2/caves/mining)
+"oZK" = (
+/obj/structure/prop/invuln/overhead_pipe{
+ dir = 4;
+ pixel_x = 27;
+ pixel_y = 9
+ },
+/turf/closed/wall/solaris,
+/area/bigredv2/outside/bar)
"oZQ" = (
/turf/closed/wall/r_wall/unmeltable,
/area/bigredv2/outside/filtration_plant)
@@ -41012,14 +39931,6 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"pas" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/turf/open/floor{
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
"paz" = (
/obj/effect/decal/cleanable/blood{
icon_state = "xgib1"
@@ -41028,23 +39939,15 @@
icon_state = "mars_dirt_4"
},
/area/bigredv2/caves/mining)
-"paK" = (
-/obj/item/prop{
- desc = "A blood bag with a hole in it. The rats must have gotten to it first.";
- icon = 'icons/obj/items/bloodpack.dmi';
- icon_state = "bloodpack";
- name = "blood bag";
- pixel_x = -2;
- pixel_y = 10
- },
-/obj/item/prop/colony/usedbandage{
- dir = 5;
- pixel_y = 8
+"pbi" = (
+/obj/structure/sign/safety/biohazard{
+ pixel_x = 7;
+ pixel_y = -24
},
-/turf/open/floor{
- icon_state = "white"
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached12"
},
-/area/bigredv2/outside/medical)
+/area/bigredv2/outside/virology)
"pbr" = (
/obj/structure/blocker/forcefield/multitile_vehicles,
/turf/closed/wall/solaris,
@@ -41056,12 +39959,6 @@
icon_state = "grass_impenetrable"
},
/area/bigredv2/caves/eta/living)
-"pbw" = (
-/obj/effect/decal/strata_decals/grime/grime4,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached1"
- },
-/area/bigredv2/outside/nw)
"pbK" = (
/obj/effect/landmark/hunter_secondary,
/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
@@ -41075,12 +39972,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/bigredv2/caves/mining)
-"pbY" = (
-/turf/open/floor{
- dir = 4;
- icon_state = "whitegreencorner"
- },
-/area/bigredv2/outside/medical)
"pbZ" = (
/obj/effect/decal/cleanable/blood/drip,
/obj/effect/decal/cleanable/dirt,
@@ -41123,6 +40014,13 @@
/obj/structure/window_frame/solaris,
/turf/open/floor/plating,
/area/bigredv2/outside/dorms)
+"peR" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor{
+ icon_state = "floor4"
+ },
+/area/bigredv2/outside/cargo)
"pgh" = (
/turf/open/mars_cave{
icon_state = "mars_cave_17"
@@ -41142,6 +40040,11 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/engineering)
+"pgq" = (
+/turf/open/asphalt/cement{
+ icon_state = "cement14"
+ },
+/area/bigredv2/outside/lambda_cave_cas)
"pgu" = (
/obj/effect/decal/warning_stripes{
icon_state = "W-corner"
@@ -41150,23 +40053,13 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/outside/filtration_cave_cas)
-"pgE" = (
+"pgO" = (
+/obj/item/tool/weldingtool{
+ pixel_x = 9;
+ pixel_y = -8
+ },
/obj/effect/decal/cleanable/dirt,
/turf/open/floor,
-/area/bigredv2/outside/lambda_cave_cas)
-"pgP" = (
-/obj/structure/surface/table,
-/obj/item/explosive/grenade/incendiary/molotov{
- pixel_y = -7;
- pixel_x = 8
- },
-/obj/item/explosive/grenade/incendiary/molotov{
- pixel_y = 3;
- pixel_x = -1
- },
-/turf/open/floor{
- icon_state = "freezerfloor"
- },
/area/bigredv2/outside/general_offices)
"pgV" = (
/obj/structure/machinery/light{
@@ -41182,71 +40075,23 @@
icon_state = "mars_cave_6"
},
/area/bigredv2/caves_research)
-"phx" = (
-/obj/structure/pipes/standard/manifold/hidden/green{
- dir = 1
- },
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/e)
-"phC" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/trash/cigbutt{
- pixel_x = 1;
- pixel_y = 5
- },
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
- },
-/area/bigredv2/outside/se)
-"pjB" = (
-/obj/item/prop{
- desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
- icon = 'icons/obj/janitor.dmi';
- icon_state = "trashbag3";
- name = "trash bag";
- pixel_x = -6;
- pixel_y = -4;
- layer = 3.1
- },
-/obj/item/prop{
- desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
- icon = 'icons/obj/janitor.dmi';
- icon_state = "trashbag3";
- name = "trash bag";
- pixel_x = 8;
- layer = 3.01;
- pixel_y = 17
- },
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
- },
-/area/bigredv2/outside/nw)
-"pkb" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/trash/semki{
- pixel_y = -14
- },
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
- },
-/area/bigredv2/outside/nw)
-"pkD" = (
-/obj/structure/flora/grass/desert/lightgrass_12,
-/turf/open/mars,
-/area/bigredv2/outside/e)
-"pld" = (
-/obj/structure/bed/bedroll{
- dir = 5
+"phA" = (
+/obj/structure/window_frame/solaris,
+/obj/structure/curtain,
+/turf/open/floor/plating,
+/area/bigredv2/outside/medical)
+"phO" = (
+/obj/effect/decal/cleanable/blood/xeno,
+/turf/open/floor/plating{
+ icon_state = "platingdmg1"
},
-/obj/effect/landmark/corpsespawner/colonist,
-/obj/effect/decal/cleanable/blood,
-/obj/effect/decal/cleanable/blood/gibs/body,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor{
- icon_state = "freezerfloor"
+/area/bigredv2/outside/office_complex)
+"pkE" = (
+/turf/closed/wall/solaris{
+ damage = 1870;
+ damage_overlay = 5
},
-/area/bigredv2/outside/general_offices)
+/area/bigredv2/outside/office_complex)
"plx" = (
/obj/structure/machinery/power/apc{
dir = 4
@@ -41256,21 +40101,16 @@
icon_state = "darkred2"
},
/area/bigredv2/caves/eta/research)
-"plY" = (
-/obj/effect/decal/cleanable/vomit,
+"plV" = (
+/obj/structure/barricade/wooden,
/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
- },
-/area/bigredv2/outside/nw)
-"pme" = (
-/obj/item/trash/cigbutt{
- pixel_x = -1;
- pixel_y = 17
- },
-/turf/open/mars_cave{
- icon_state = "mars_dirt_4"
+ icon_state = "cement_sunbleached9"
},
/area/bigredv2/outside/c)
+"pmd" = (
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/mars,
+/area/bigredv2/outside/n)
"pmk" = (
/obj/structure/surface/table,
/obj/item/spacecash/c1,
@@ -41278,6 +40118,12 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/caves/mining)
+"pmI" = (
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/floor{
+ icon_state = "delivery"
+ },
+/area/bigredv2/outside/medical)
"pmN" = (
/obj/effect/decal/cleanable/blood{
base_icon = 'icons/obj/items/weapons/grenade.dmi';
@@ -41290,28 +40136,24 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/caves/mining)
+"pmP" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/obj/effect/decal/strata_decals/grime/grime4,
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/nw)
"pmS" = (
/turf/open/mars,
/area/bigredv2/caves_north)
-"pmV" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/turf/open/asphalt/cement{
- icon_state = "cement3"
- },
-/area/bigredv2/caves_lambda)
-"pna" = (
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached14"
- },
-/area/bigredv2/outside/e)
-"pnk" = (
-/obj/effect/decal/cleanable/generic,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached14"
+"pnb" = (
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/floor,
+/area/bigredv2/outside/dorms)
+"pnj" = (
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor{
+ icon_state = "floor4"
},
-/area/bigredv2/outside/space_port_lz2)
+/area/bigredv2/outside/cargo)
"pnL" = (
/turf/open/mars{
icon_state = "mars_dirt_11"
@@ -41326,18 +40168,35 @@
},
/turf/open/gm/river,
/area/bigredv2/outside/engineering)
+"pol" = (
+/obj/structure/machinery/door_control{
+ id = "workshop_br_g";
+ name = "Workshop Garage Lockdown";
+ pixel_x = -28
+ },
+/obj/structure/machinery/light{
+ dir = 8
+ },
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached2"
+ },
+/area/bigredv2/outside/nw)
"pow" = (
/obj/structure/blocker/forcefield/multitile_vehicles,
/turf/open/mars_cave{
icon_state = "mars_dirt_4"
},
/area/bigredv2/outside/lz1_north_cas)
-"poE" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
+"poA" = (
+/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
+/turf/open/floor{
+ icon_state = "dark"
},
-/area/bigredv2/outside/nw)
+/area/bigredv2/outside/general_offices)
+"poD" = (
+/obj/effect/decal/cleanable/generic,
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/c)
"poF" = (
/obj/structure/pipes/standard/manifold/hidden/supply{
dir = 4
@@ -41347,31 +40206,65 @@
icon_state = "darkpurple2"
},
/area/bigredv2/caves/lambda/research)
+"poQ" = (
+/obj/structure/flora/grass/desert/lightgrass_6,
+/turf/open/mars_cave{
+ icon_state = "mars_dirt_4"
+ },
+/area/bigredv2/outside/nw)
+"poV" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/generic,
+/turf/open/floor,
+/area/bigredv2/outside/hydroponics)
+"pph" = (
+/turf/open/asphalt/cement,
+/area/bigredv2/outside/space_port)
+"ppj" = (
+/obj/structure/barricade/deployable,
+/turf/open/floor{
+ dir = 8;
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/c)
"ppp" = (
/obj/structure/sign/safety/hazard,
/turf/closed/wall/solaris/rock,
/area/bigredv2/caves)
-"ppA" = (
-/obj/effect/decal/strata_decals/grime/grime1,
+"pqw" = (
+/obj/structure/barricade/metal{
+ dir = 4
+ },
+/turf/open/floor{
+ dir = 5;
+ icon_state = "darkred2"
+ },
+/area/bigredv2/outside/admin_building)
+"pqI" = (
+/obj/item/prop{
+ desc = "A blood bag with a hole in it. The rats must have gotten to it first.";
+ icon = 'icons/obj/items/bloodpack.dmi';
+ icon_state = "bloodpack";
+ name = "blood bag";
+ pixel_x = -5;
+ pixel_y = 2;
+ layer = 2.8
+ },
/obj/effect/decal/cleanable/generic,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
+/turf/open/mars_cave{
+ icon_state = "mars_cave_20"
},
-/area/bigredv2/outside/c)
-"ppN" = (
-/obj/effect/decal/strata_decals/grime/grime4,
-/turf/open/asphalt/cement_sunbleached,
/area/bigredv2/outside/nw)
-"ppU" = (
-/obj/effect/decal/cleanable/blood/drip,
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/c)
-"prc" = (
-/obj/effect/decal/cleanable/generic,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
+"pqQ" = (
+/obj/effect/decal/cleanable/blood/gibs/body,
+/obj/structure/pipes/standard/simple/hidden/green,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor{
+ icon_state = "wood"
},
-/area/bigredv2/outside/c)
+/area/bigredv2/outside/bar)
"pri" = (
/obj/structure/barricade/wooden{
desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
@@ -41382,19 +40275,6 @@
icon_state = "mars_cave_15"
},
/area/bigredv2/caves_north)
-"prB" = (
-/obj/item/reagent_container/spray/cleaner{
- desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back.";
- name = "Surgery Cleaner";
- pixel_y = 8;
- pixel_x = 13
- },
-/obj/item/reagent_container/food/drinks/cup,
-/obj/effect/decal/cleanable/generic,
-/turf/open/mars_cave{
- icon_state = "mars_cave_9"
- },
-/area/bigredv2/outside/nw)
"prU" = (
/obj/structure/machinery/light{
dir = 4
@@ -41408,26 +40288,36 @@
icon_state = "wood"
},
/area/bigredv2/outside/library)
-"psE" = (
-/obj/item/ammo_casing/shell,
-/obj/effect/landmark/corpsespawner/colonist,
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor{
- icon_state = "wood"
+"psH" = (
+/obj/effect/decal/strata_decals/grime/grime4,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached12"
},
-/area/bigredv2/outside/bar)
+/area/bigredv2/outside/space_port_lz2)
+"psV" = (
+/obj/structure/flora/grass/desert/lightgrass_3,
+/turf/open/mars,
+/area/bigredv2/outside/c)
"ptL" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
},
/turf/open/floor,
/area/bigredv2/caves/eta/living)
-"pui" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/generic,
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
+"puh" = (
+/turf/closed/wall/solaris{
+ damage = 1870;
+ damage_overlay = 5;
+ current_bulletholes = 3
+ },
+/area/bigredv2/outside/office_complex)
+"puu" = (
+/obj/effect/decal/cleanable/blood,
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached9"
},
/area/bigredv2/outside/c)
"puU" = (
@@ -41465,39 +40355,12 @@
icon_state = "mars_dirt_13"
},
/area/bigredv2/outside/filtration_plant)
-"pvC" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/bodybag,
-/turf/open/floor{
- icon_state = "white"
- },
-/area/bigredv2/outside/medical)
-"pvT" = (
-/obj/structure/barricade/wooden{
- desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
- dir = 8;
- health = 25000
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor,
-/area/bigredv2/outside/general_offices)
-"pwO" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/stack/sheet/wood{
- pixel_x = 4
- },
-/turf/open/floor{
- icon_state = "wood"
- },
-/area/bigredv2/outside/dorms)
-"pwS" = (
-/obj/structure/barricade/wooden{
- dir = 4
- },
-/turf/open/floor{
- icon_state = "redcorner"
+"pwj" = (
+/obj/effect/decal/strata_decals/grime/grime4,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached12"
},
-/area/bigredv2/outside/marshal_office)
+/area/bigredv2/outside/e)
"pxp" = (
/obj/structure/ore_box,
/turf/open/floor/plating{
@@ -41526,11 +40389,6 @@
icon_state = "dark"
},
/area/bigredv2/outside/admin_building)
-"pyo" = (
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
- },
-/area/bigredv2/outside/nw)
"pyq" = (
/obj/structure/surface/table,
/obj/structure/machinery/computer/emails{
@@ -41541,16 +40399,24 @@
icon_state = "wood"
},
/area/bigredv2/outside/library)
-"pyH" = (
-/obj/structure/flora/pottedplant{
- icon_state = "pottedplant_21";
- layer = 3.1;
- pixel_y = 11
+"pyv" = (
+/obj/item/stack/sheet/metal{
+ pixel_x = 6;
+ pixel_y = -9
+ },
+/turf/open/mars,
+/area/bigredv2/outside/c)
+"pyM" = (
+/obj/structure/bed/bedroll{
+ dir = 10
},
+/obj/effect/decal/cleanable/blood,
+/obj/effect/decal/cleanable/blood/gibs/body,
+/obj/effect/decal/cleanable/blood/gibs/limb,
/turf/open/floor{
- icon_state = "white"
+ icon_state = "wood"
},
-/area/bigredv2/outside/medical)
+/area/bigredv2/outside/general_offices)
"pyU" = (
/obj/effect/decal/warning_stripes{
icon_state = "NW-out";
@@ -41568,35 +40434,36 @@
icon_state = "dark"
},
/area/bigredv2/outside/admin_building)
+"pzy" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/restraint/adjustable/cable,
+/turf/open/floor,
+/area/bigredv2/outside/general_store)
"pzC" = (
/obj/structure/window/framed/solaris,
/obj/structure/curtain,
/turf/open/floor/plating,
/area/bigredv2/outside/medical)
"pzG" = (
-/obj/effect/decal/strata_decals/grime/grime2{
- dir = 8
+/obj/item/tool/shovel,
+/turf/open/mars,
+/area/bigredv2/outside/nw)
+"pzN" = (
+/obj/structure/bed,
+/obj/item/bedsheet/medical,
+/turf/open/floor{
+ dir = 4;
+ icon_state = "whitegreen"
},
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
+/area/bigredv2/outside/medical)
+"pAI" = (
+/turf/open/asphalt/cement{
+ icon_state = "cement12"
},
-/area/bigredv2/outside/c)
-"pzH" = (
-/obj/structure/flora/grass/desert/lightgrass_1,
-/turf/open/mars,
-/area/bigredv2/outside/n)
+/area/bigredv2/outside/filtration_cave_cas)
"pAX" = (
/turf/open/floor,
/area/bigredv2/outside/lambda_cave_cas)
-"pBm" = (
-/obj/item/trash/uscm_mre{
- pixel_x = 10;
- pixel_y = -2
- },
-/turf/open/floor{
- icon_state = "dark"
- },
-/area/bigredv2/outside/marshal_office)
"pBv" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor{
@@ -41610,6 +40477,33 @@
icon_state = "darkred2"
},
/area/bigredv2/caves/eta/research)
+"pBS" = (
+/obj/structure/flora/grass/desert/lightgrass_4,
+/turf/open/mars,
+/area/bigredv2/outside/c)
+"pCb" = (
+/obj/structure/machinery/door/airlock/almayer/maint/colony{
+ name = "\improper Medical Clinic Power Station";
+ locked = 1
+ },
+/turf/open/floor{
+ icon_state = "delivery"
+ },
+/area/bigredv2/outside/medical)
+"pCg" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
+ name = "\improper Dormitories";
+ welded = 1
+ },
+/turf/open/floor{
+ icon_state = "delivery"
+ },
+/area/bigredv2/outside/general_offices)
+"pCz" = (
+/obj/structure/flora/grass/desert/lightgrass_7,
+/turf/open/mars,
+/area/bigredv2/outside/eta)
"pCR" = (
/obj/structure/barricade/wooden{
desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
@@ -41626,23 +40520,25 @@
icon_state = "mars_cave_13"
},
/area/bigredv2/caves/mining)
-"pDb" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/largecrate/random/barrel/white,
-/obj/item/stack/medical/ointment{
- pixel_x = 2;
- pixel_y = 16
+"pDd" = (
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached4"
},
+/area/bigredv2/outside/nw)
+"pDl" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/frame/rack,
/turf/open/floor{
- icon_state = "white"
+ icon_state = "dark"
},
-/area/bigredv2/outside/medical)
-"pDp" = (
-/obj/effect/decal/cleanable/generic,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached15"
+/area/bigredv2/outside/marshal_office)
+"pDH" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor{
+ icon_state = "wood"
},
-/area/bigredv2/outside/c)
+/area/bigredv2/outside/bar)
"pDV" = (
/obj/effect/landmark/crap_item,
/obj/effect/decal/cleanable/dirt,
@@ -41651,17 +40547,56 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"pGJ" = (
-/obj/item/tool/mop{
- pixel_y = 19;
- pixel_x = 10
+"pDX" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
},
-/obj/effect/decal/cleanable/generic,
-/obj/effect/decal/cleanable/blood/gibs/body,
+/obj/effect/decal/medical_decals{
+ icon_state = "cryocell2deval"
+ },
+/turf/open/floor{
+ dir = 5;
+ icon_state = "whitebluefull"
+ },
+/area/bigredv2/outside/medical)
+"pEv" = (
+/obj/structure/flora/bush/desert{
+ icon_state = "tree_3"
+ },
+/turf/open/mars,
+/area/bigredv2/outside/s)
+"pFn" = (
+/obj/effect/decal/cleanable/blood/gibs/robot{
+ pixel_y = 7;
+ pixel_x = -4;
+ name = "door debris"
+ },
+/obj/effect/decal/cleanable/blood/oil,
+/obj/item/stack/rods,
+/turf/open/floor{
+ icon_state = "delivery"
+ },
+/area/bigredv2/outside/office_complex)
+"pFM" = (
/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached1"
+ icon_state = "cement_sunbleached2"
},
-/area/bigredv2/outside/nw)
+/area/bigredv2/outside/space_port_lz2)
+"pFS" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
+/turf/open/floor,
+/area/bigredv2/outside/office_complex)
+"pGL" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/tool/extinguisher{
+ pixel_y = 15;
+ pixel_x = -7
+ },
+/turf/open/floor{
+ icon_state = "whitegreencorner"
+ },
+/area/bigredv2/outside/medical)
"pGP" = (
/obj/structure/barricade/handrail{
dir = 4
@@ -41671,6 +40606,16 @@
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/filtration_plant)
+"pGW" = (
+/obj/structure/flora/grass/desert/lightgrass_12,
+/turf/open/mars,
+/area/bigredv2/outside/nw)
+"pHa" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached12"
+ },
+/area/bigredv2/outside/w)
"pHb" = (
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
@@ -41678,39 +40623,23 @@
icon_state = "mars_cave_7"
},
/area/bigredv2/caves_sw)
-"pHc" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/clothing/suit/armor/riot{
- pixel_y = 5;
- pixel_x = 7
- },
-/turf/open/floor{
- icon_state = "dark"
- },
-/area/bigredv2/outside/marshal_office)
-"pHy" = (
-/obj/effect/decal/cleanable/blood{
- icon_state = "xgib4"
- },
+"pHr" = (
+/obj/effect/decal/cleanable/blood/drip,
/turf/open/floor{
dir = 4;
icon_state = "asteroidwarning"
},
-/area/bigredv2/outside/c)
-"pIa" = (
-/obj/item/weapon/gun/smg/fp9000,
-/turf/open/floor{
- icon_state = "wood"
- },
-/area/bigredv2/outside/marshal_office)
-"pIi" = (
-/obj/item/ammo_casing/bullet,
-/obj/effect/decal/cleanable/blood/xtracks,
-/turf/open/floor{
+/area/bigredv2/outside/ne)
+"pHs" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood{
dir = 4;
- icon_state = "whitegreencorner"
+ icon_state = "gib6"
},
-/area/bigredv2/outside/medical)
+/turf/open/asphalt/cement{
+ icon_state = "cement12"
+ },
+/area/bigredv2/caves_lambda)
"pIl" = (
/obj/structure/morgue{
dir = 2
@@ -41744,6 +40673,14 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/outside/ne)
+"pJr" = (
+/obj/structure/machinery/light{
+ dir = 4
+ },
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached20"
+ },
+/area/bigredv2/outside/virology)
"pJt" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor{
@@ -41751,9 +40688,23 @@
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/telecomm/n_cave)
-"pJQ" = (
-/turf/open/asphalt/cement,
-/area/bigredv2/outside/space_port)
+"pJA" = (
+/obj/effect/decal/strata_decals/grime/grime1{
+ dir = 4
+ },
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached3"
+ },
+/area/bigredv2/outside/nw)
+"pJI" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor{
+ icon_state = "dark"
+ },
+/area/bigredv2/outside/general_offices)
"pJS" = (
/obj/effect/decal/cleanable/blood/drip{
pixel_x = -4;
@@ -41769,19 +40720,6 @@
icon_state = "mars_cave_14"
},
/area/bigredv2/caves/mining)
-"pKg" = (
-/obj/effect/decal/cleanable/blood/gibs/body,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached1"
- },
-/area/bigredv2/outside/c)
-"pKw" = (
-/obj/effect/decal/cleanable/generic,
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
- },
-/area/bigredv2/outside/c)
"pKP" = (
/obj/structure/surface/table,
/obj/effect/spawner/random/tool,
@@ -41791,26 +40729,33 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/engineering)
+"pKR" = (
+/obj/item/trash/eat{
+ pixel_x = -7;
+ pixel_y = 6
+ },
+/turf/open/floor{
+ dir = 4;
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/ne)
"pLj" = (
/obj/structure/largecrate/random/barrel/red,
/turf/open/mars_cave{
icon_state = "mars_cave_19"
},
/area/bigredv2/caves/mining)
-"pLn" = (
-/obj/effect/decal/strata_decals/grime/grime2{
- dir = 1
- },
-/obj/structure/flora/grass/desert/lightgrass_2,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
- },
-/area/bigredv2/outside/nw)
"pLH" = (
/turf/open/mars_cave{
icon_state = "mars_dirt_6"
},
/area/bigredv2/outside/ne)
+"pMd" = (
+/obj/structure/platform_decoration/kutjevo/rock{
+ dir = 1
+ },
+/turf/open/mars,
+/area/bigredv2/outside/nw)
"pMi" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/tool/extinguisher,
@@ -41835,14 +40780,18 @@
icon_state = "mars_cave_3"
},
/area/bigredv2/caves/mining)
-"pMW" = (
-/obj/structure/pipes/standard/manifold/visible,
-/obj/effect/decal/medical_decals{
- icon_state = "cryotop"
+"pMM" = (
+/obj/structure/surface/table,
+/obj/structure/extinguisher_cabinet{
+ pixel_x = -27
+ },
+/obj/item/storage/box/beakers{
+ pixel_y = -1;
+ pixel_x = 4
},
/turf/open/floor{
- dir = 5;
- icon_state = "whitebluefull"
+ dir = 1;
+ icon_state = "whitepurplecorner"
},
/area/bigredv2/outside/medical)
"pNa" = (
@@ -41860,6 +40809,23 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/engineering)
+"pOo" = (
+/obj/item/trash/hotdog{
+ pixel_x = -12;
+ pixel_y = -11
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/item/prop{
+ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
+ icon = 'icons/obj/janitor.dmi';
+ icon_state = "trashbag3";
+ name = "trash bag";
+ pixel_x = 3;
+ pixel_y = 13
+ },
+/obj/effect/landmark/survivor_spawner,
+/turf/open/floor/plating,
+/area/bigredv2/outside/bar)
"pOt" = (
/obj/structure/machinery/optable,
/turf/open/floor{
@@ -41873,6 +40839,22 @@
icon_state = "mars_dirt_4"
},
/area/bigredv2/caves/mining)
+"pOM" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/trash/syndi_cakes{
+ pixel_y = -11;
+ pixel_x = 9
+ },
+/obj/item/trash/crushed_cup{
+ pixel_y = 12
+ },
+/obj/item/trash/semki{
+ pixel_y = -14
+ },
+/turf/open/floor{
+ icon_state = "dark"
+ },
+/area/bigredv2/outside/marshal_office)
"pPh" = (
/obj/effect/decal/warning_stripes{
icon_state = "N";
@@ -41889,24 +40871,30 @@
icon_state = "dark"
},
/area/bigredv2/outside/filtration_plant)
-"pPz" = (
-/obj/effect/landmark/corpsespawner/colonist,
-/turf/open/floor{
- icon_state = "wood"
+"pPu" = (
+/obj/item/trash/cigbutt{
+ pixel_x = -6;
+ pixel_y = -9
},
-/area/bigredv2/outside/dorms)
-"pPF" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
+/obj/item/trash/cigbutt{
+ pixel_x = -7;
+ pixel_y = 13
+ },
+/turf/open/mars,
+/area/bigredv2/outside/nw)
+"pPK" = (
+/obj/structure/machinery/landinglight/ds1/delaytwo{
+ dir = 8
},
/obj/effect/decal/cleanable/dirt,
-/obj/structure/barricade/wooden,
-/turf/open/floor,
-/area/bigredv2/outside/marshal_office)
-"pPL" = (
-/obj/structure/flora/grass/desert/lightgrass_11,
-/turf/open/mars_cave{
- icon_state = "mars_dirt_4"
+/turf/open/floor{
+ dir = 8;
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/space_port)
+"pQc" = (
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached1"
},
/area/bigredv2/outside/space_port_lz2)
"pQv" = (
@@ -41921,24 +40909,31 @@
},
/turf/open/floor/plating,
/area/bigredv2/caves/mining)
-"pQH" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/corpsespawner/security,
-/obj/effect/decal/cleanable/blood,
-/obj/effect/decal/cleanable/blood/gibs/body,
-/obj/item/weapon/gun/pistol/holdout{
- pixel_x = 9;
- pixel_y = 18
- },
-/turf/open/floor,
-/area/bigredv2/outside/marshal_office)
"pQM" = (
/obj/structure/blocker/forcefield/multitile_vehicles,
/turf/open/mars_cave,
/area/bigredv2/outside/lz1_telecomm_cas)
+"pQN" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/pipes/standard/simple/hidden/green,
+/turf/open/floor{
+ dir = 8;
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
+"pQU" = (
+/obj/structure/machinery/door_control{
+ id = "Office Complex 1";
+ name = "Storm Shutters";
+ pixel_x = -32
+ },
+/obj/structure/pipes/standard/simple/hidden/green,
+/obj/effect/decal/cleanable/blood/xeno,
+/turf/open/floor{
+ dir = 8;
+ icon_state = "redcorner"
+ },
+/area/bigredv2/outside/office_complex)
"pRG" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/blood/oil,
@@ -41950,10 +40945,13 @@
"pRP" = (
/turf/closed/wall/solaris/reinforced,
/area/bigredv2/outside/telecomm/n_cave)
-"pRQ" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating/plating_catwalk,
-/area/bigredv2/outside/space_port)
+"pRR" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor,
+/area/bigredv2/outside/dorms)
"pSa" = (
/turf/open/floor/plating{
dir = 8;
@@ -41963,16 +40961,12 @@
"pSf" = (
/turf/open/floor/carpet,
/area/bigredv2/outside/library)
-"pSM" = (
-/obj/effect/decal/cleanable/generic,
+"pSQ" = (
+/obj/structure/flora/grass/desert/lightgrass_2,
/turf/open/asphalt/cement_sunbleached{
icon_state = "cement_sunbleached4"
},
-/area/bigredv2/outside/c)
-"pTg" = (
-/obj/structure/flora/grass/desert/lightgrass_9,
-/turf/open/mars,
-/area/bigredv2/outside/se)
+/area/bigredv2/outside/nw)
"pTo" = (
/obj/structure/machinery/power/apc{
dir = 1;
@@ -42005,28 +40999,39 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/caves_se)
-"pTI" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/effect/decal/medical_decals{
- icon_state = "triagedecalleft"
+"pTU" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/obj/effect/decal/cleanable/blood/drip,
+/obj/item/trash/sosjerky{
+ pixel_y = 7;
+ pixel_x = -13
},
-/turf/open/floor{
- dir = 1;
- icon_state = "whitegreen"
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached15"
},
-/area/bigredv2/outside/medical)
+/area/bigredv2/outside/nw)
"pUi" = (
/obj/item/weapon/broken_bottle,
/turf/open/floor/plating,
/area/bigredv2/caves/mining)
-"pUl" = (
-/obj/effect/decal/cleanable/generic,
-/turf/open/asphalt/cement{
- icon_state = "cement12"
+"pUy" = (
+/obj/item/weapon/ice_axe/green{
+ pixel_y = -12
},
-/area/bigredv2/outside/space_port)
+/obj/item/stack/medical/bruise_pack{
+ pixel_x = -15;
+ pixel_y = 10
+ },
+/turf/open/mars_cave{
+ icon_state = "mars_cave_18"
+ },
+/area/bigredv2/outside/n)
+"pVd" = (
+/obj/effect/landmark/corpsespawner/colonist,
+/obj/effect/decal/cleanable/blood,
+/obj/effect/decal/cleanable/blood/gibs/body,
+/turf/open/floor,
+/area/bigredv2/outside/dorms)
"pVp" = (
/obj/structure/prop/invuln/minecart_tracks{
dir = 1
@@ -42052,11 +41057,19 @@
icon_state = "asteroidfloor"
},
/area/bigred/ground/garage_workshop)
-"pWh" = (
+"pWf" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/xeno,
-/turf/open/floor/plating{
- icon_state = "platingdmg1"
+/obj/item/ammo_casing/bullet,
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor{
+ icon_state = "redcorner"
+ },
+/area/bigredv2/outside/marshal_office)
+"pWn" = (
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/floor{
+ dir = 8;
+ icon_state = "whitegreen"
},
/area/bigredv2/outside/medical)
"pWs" = (
@@ -42088,16 +41101,6 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"pXo" = (
-/obj/structure/bed/chair{
- dir = 4
- },
-/obj/effect/decal/cleanable/blood/drip,
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor{
- icon_state = "dark"
- },
-/area/bigredv2/outside/marshal_office)
"pXu" = (
/turf/open/mars_cave{
icon_state = "mars_cave_2"
@@ -42124,41 +41127,33 @@
icon_state = "mars_cave_17"
},
/area/bigredv2/caves/mining)
-"pXI" = (
+"pXD" = (
/obj/item/trash/cigbutt{
- pixel_x = 4
+ pixel_x = -10;
+ pixel_y = 13
},
-/turf/open/floor{
- dir = 8;
- icon_state = "asteroidwarning"
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached1"
},
-/area/bigredv2/outside/c)
+/area/bigredv2/outside/nw)
"pYt" = (
/turf/open/mars_cave{
icon_state = "mars_dirt_7"
},
/area/bigredv2/caves_sw)
-"pYw" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached3"
- },
-/area/bigredv2/outside/c)
"pYE" = (
/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb,
/turf/open/shuttle/escapepod{
icon_state = "floor5"
},
/area/bigredv2/oob)
-"pYU" = (
-/obj/structure/sign/nosmoking_1{
- pixel_x = -32
- },
-/turf/open/floor{
- dir = 8;
- icon_state = "whitegreen"
+"pYT" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement{
+ icon_state = "cement1";
+ dir = 1
},
-/area/bigredv2/outside/medical)
+/area/bigredv2/outside/space_port)
"pZe" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/weapon/twohanded/folded_metal_chair,
@@ -42167,15 +41162,6 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"pZj" = (
-/obj/structure/platform/kutjevo/rock{
- dir = 4
- },
-/obj/item/trash/cigbutt/cigarbutt,
-/turf/open/mars_cave{
- icon_state = "mars_cave_13"
- },
-/area/bigredv2/outside/nw)
"pZu" = (
/obj/structure/surface/rack,
/obj/item/storage/bag/ore{
@@ -42186,6 +41172,58 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
+"pZI" = (
+/obj/structure/girder/reinforced,
+/turf/open/floor/plating{
+ dir = 8;
+ icon_state = "platingdmg2"
+ },
+/area/bigredv2/outside/space_port)
+"pZQ" = (
+/obj/structure/surface/table,
+/obj/effect/landmark/objective_landmark/close{
+ pixel_x = 8
+ },
+/turf/open/floor,
+/area/bigredv2/outside/dorms)
+"pZR" = (
+/obj/item/trash/cigbutt{
+ pixel_x = -6;
+ pixel_y = -2
+ },
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached3"
+ },
+/area/bigredv2/outside/s)
+"qah" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/floor{
+ dir = 1;
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
+"qam" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 10
+ },
+/obj/effect/decal/cleanable/blood{
+ icon_state = "gib6"
+ },
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/n)
+"qaA" = (
+/obj/structure/flora/grass/desert/lightgrass_8,
+/turf/open/mars,
+/area/bigredv2/outside/s)
"qaK" = (
/obj/structure/largecrate,
/turf/open/floor{
@@ -42215,17 +41253,57 @@
icon_state = "delivery"
},
/area/bigredv2/outside/lambda_cave_cas)
+"qcl" = (
+/obj/structure/pipes/standard/manifold/hidden/green,
+/obj/item/reagent_container/food/drinks/bottle/beer/craft{
+ pixel_x = 7;
+ pixel_y = -7
+ },
+/turf/open/floor{
+ icon_state = "wood"
+ },
+/area/bigredv2/outside/bar)
+"qcD" = (
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidfloor"
+ },
+/area/bigredv2/outside/eta)
"qcE" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 10
},
/turf/open/floor/carpet,
/area/bigredv2/outside/library)
+"qcH" = (
+/obj/structure/largecrate/random/mini{
+ pixel_x = -6;
+ pixel_y = 7;
+ layer = 3.1
+ },
+/turf/open/floor,
+/area/bigredv2/outside/general_offices)
"qcQ" = (
/turf/open/mars_cave{
icon_state = "mars_dirt_7"
},
/area/bigredv2/outside/space_port_lz2)
+"qcV" = (
+/obj/effect/decal/strata_decals/grime/grime2{
+ dir = 8
+ },
+/turf/open/floor{
+ dir = 8;
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/nw)
+"qdI" = (
+/obj/item/tool/warning_cone,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached12"
+ },
+/area/bigredv2/outside/se)
"qeK" = (
/obj/structure/surface/table,
/obj/effect/spawner/random/tool,
@@ -42243,6 +41321,26 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
+"qeY" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/prop{
+ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
+ icon = 'icons/obj/janitor.dmi';
+ icon_state = "trashbag3";
+ name = "trash bag";
+ pixel_x = 7;
+ pixel_y = -6
+ },
+/obj/item/trash/eat{
+ pixel_x = -9;
+ pixel_y = 10
+ },
+/obj/effect/decal/cleanable/generic,
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidfloor"
+ },
+/area/bigredv2/outside/c)
"qeZ" = (
/obj/structure/machinery/light/small{
dir = 4
@@ -42251,6 +41349,13 @@
icon_state = "mars_cave_3"
},
/area/bigredv2/caves/mining)
+"qfe" = (
+/obj/effect/spawner/random/tool{
+ pixel_x = -11;
+ pixel_y = -9
+ },
+/turf/open/floor,
+/area/bigredv2/outside/general_offices)
"qgY" = (
/turf/open/mars_cave{
icon_state = "mars_cave_17"
@@ -42289,49 +41394,28 @@
icon_state = "mars_cave_6"
},
/area/bigredv2/caves/mining)
-"qhM" = (
-/obj/structure/flora/grass/desert/lightgrass_2,
+"qih" = (
+/obj/structure/flora/grass/desert/lightgrass_4,
/turf/open/mars,
-/area/bigredv2/outside/c)
-"qhV" = (
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor{
- icon_state = "dark"
- },
-/area/bigredv2/outside/general_offices)
-"qiA" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
-/obj/item/tool/extinguisher,
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidwarning"
- },
-/area/bigred/ground/garage_workshop)
-"qiK" = (
-/obj/effect/decal/cleanable/blood/drip,
-/turf/open/mars_cave{
- icon_state = "mars_dirt_6"
- },
-/area/bigredv2/outside/n)
-"qjg" = (
-/obj/structure/pipes/standard/manifold/hidden/green,
-/obj/item/prop/colony/usedbandage{
- dir = 5
- },
+/area/bigredv2/outside/ne)
+"qiA" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
+/obj/item/tool/extinguisher,
/turf/open/floor{
- dir = 8;
- icon_state = "whitegreen"
+ dir = 1;
+ icon_state = "asteroidwarning"
},
-/area/bigredv2/outside/medical)
-"qjz" = (
-/obj/effect/decal/strata_decals/grime/grime2{
+/area/bigred/ground/garage_workshop)
+"qiT" = (
+/obj/effect/decal/strata_decals/grime/grime1{
dir = 4
},
+/obj/effect/decal/cleanable/generic,
/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached3"
+ icon_state = "cement_sunbleached14"
},
-/area/bigredv2/outside/s)
+/area/bigredv2/outside/nw)
"qjA" = (
/obj/structure/machinery/light/small{
dir = 4
@@ -42347,6 +41431,16 @@
},
/turf/open/floor/greengrid,
/area/space)
+"qkg" = (
+/obj/item/weapon/gun/revolver/m44{
+ pixel_x = 9;
+ pixel_y = -14
+ },
+/turf/open/floor{
+ dir = 4;
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/c)
"qkw" = (
/obj/structure/machinery/door/airlock/almayer/maint/colony{
name = "\improper Access door"
@@ -42355,30 +41449,24 @@
icon_state = "mars_dirt_4"
},
/area/bigredv2/caves/mining)
-"qkC" = (
-/obj/structure/fence,
-/turf/open/asphalt/cement{
- icon_state = "cement12"
- },
-/area/bigredv2/outside/filtration_cave_cas)
-"qlo" = (
-/obj/effect/decal/cleanable/blood/drip,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor{
- icon_state = "red"
+"qle" = (
+/obj/item/trash/cigbutt{
+ pixel_x = -10;
+ pixel_y = 7
},
-/area/bigredv2/outside/lambda_cave_cas)
-"qly" = (
-/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
-/turf/open/floor{
- icon_state = "dark"
+/turf/open/mars{
+ icon_state = "mars_dirt_5"
},
-/area/bigredv2/outside/general_offices)
+/area/bigredv2/outside/nw)
"qlK" = (
/obj/structure/surface/rack,
/obj/effect/spawner/random/toolbox,
/turf/open/floor,
/area/bigred/ground/garage_workshop)
+"qmh" = (
+/obj/structure/flora/grass/desert/lightgrass_3,
+/turf/open/mars,
+/area/bigredv2/outside/nw)
"qmm" = (
/obj/structure/cargo_container/hd/right/alt,
/turf/open/floor/plating,
@@ -42394,17 +41482,37 @@
icon_state = "mars_dirt_4"
},
/area/bigredv2/caves/mining)
-"qmQ" = (
-/obj/effect/decal/cleanable/blood/drip,
+"qnd" = (
+/obj/structure/surface/table/reinforced,
+/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
/turf/open/floor{
- icon_state = "delivery"
+ icon_state = "white"
},
/area/bigredv2/outside/medical)
+"qnr" = (
+/obj/effect/decal/cleanable/blood/gibs/body,
+/turf/open/mars_cave{
+ icon_state = "mars_cave_2"
+ },
+/area/bigredv2/outside/nw)
+"qoa" = (
+/obj/effect/landmark/crap_item,
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/c)
"qoj" = (
/turf/open/mars_cave{
icon_state = "mars_cave_23"
},
/area/bigredv2/outside/filtration_cave_cas)
+"qop" = (
+/obj/item/stack/sheet/wood{
+ pixel_x = 6;
+ pixel_y = -12
+ },
+/turf/open/floor{
+ icon_state = "white"
+ },
+/area/bigredv2/outside/marshal_office)
"qot" = (
/obj/effect/decal/cleanable/blood/drip{
pixel_x = 6;
@@ -42414,6 +41522,13 @@
icon_state = "mars_dirt_7"
},
/area/bigredv2/caves/mining)
+"qoE" = (
+/obj/item/device/flashlight/lamp/tripod{
+ layer = 6;
+ pixel_y = 11
+ },
+/turf/closed/wall/solaris/rock,
+/area/bigredv2/caves)
"qoN" = (
/obj/structure/pipes/standard/manifold/hidden/green,
/turf/open/floor{
@@ -42429,15 +41544,13 @@
icon_state = "whiteblue"
},
/area/bigredv2/outside/medical)
-"qoS" = (
-/obj/structure/machinery/light{
- dir = 4
- },
+"qpb" = (
+/obj/effect/decal/cleanable/blood,
+/obj/effect/decal/cleanable/blood/gibs/body,
/turf/open/floor{
- dir = 9;
- icon_state = "asteroidwarning"
+ icon_state = "wood"
},
-/area/bigredv2/outside/e)
+/area/bigredv2/outside/general_offices)
"qpn" = (
/obj/item/tool/warning_cone{
pixel_x = -6
@@ -42447,17 +41560,9 @@
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/filtration_plant)
-"qpo" = (
-/obj/effect/landmark/crap_item,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
- },
-/area/bigredv2/outside/e)
-"qqe" = (
-/obj/effect/decal/cleanable/generic,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
- },
+"qqi" = (
+/obj/structure/flora/grass/desert/lightgrass_5,
+/turf/open/mars,
/area/bigredv2/outside/se)
"qqw" = (
/obj/effect/decal/cleanable/dirt,
@@ -42466,34 +41571,18 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/filtration_plant)
-"qrd" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidwarning"
- },
-/area/bigredv2/outside/ne)
-"qrg" = (
-/obj/structure/window_frame/solaris/reinforced,
-/obj/item/tool/crowbar/red{
- pixel_y = -13
- },
-/obj/item/shard,
-/turf/open/floor/plating,
-/area/bigredv2/outside/marshal_office)
-"qrl" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
+"qrc" = (
+/obj/structure/flora/grass/desert/lightgrass_2,
+/turf/open/mars_cave{
+ icon_state = "mars_dirt_4"
},
-/turf/open/asphalt/cement_sunbleached,
/area/bigredv2/outside/nw)
-"qrS" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
+"qrP" = (
+/obj/structure/flora/grass/desert/lightgrass_8,
+/turf/open/mars_cave{
+ icon_state = "mars_dirt_4"
},
-/obj/effect/decal/cleanable/generic,
-/turf/open/asphalt/cement,
-/area/bigredv2/caves_lambda)
+/area/bigredv2/outside/nw)
"qrZ" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/storage/firstaid/fire,
@@ -42513,11 +41602,24 @@
"qsE" = (
/turf/closed/wall/solaris/reinforced,
/area/bigred/ground/garage_workshop)
-"qsT" = (
+"qsF" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/item/stack/rods,
+/turf/open/floor{
+ icon_state = "redcorner"
+ },
+/area/bigredv2/outside/office_complex)
+"qsU" = (
+/obj/effect/decal/cleanable/blood{
+ dir = 4;
+ icon_state = "gib6"
+ },
/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
+ icon_state = "cement_sunbleached1"
},
-/area/bigredv2/outside/space_port_lz2)
+/area/bigredv2/outside/w)
"qsV" = (
/obj/structure/bookcase{
icon_state = "book-5"
@@ -42527,20 +41629,21 @@
icon_state = "wood"
},
/area/bigredv2/outside/library)
-"qtn" = (
-/obj/effect/decal/cleanable/generic,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached3"
+"qtD" = (
+/obj/item/trash/cigbutt{
+ pixel_x = 7;
+ pixel_y = 7
},
-/area/bigredv2/outside/nw)
-"qtp" = (
-/obj/structure/flora/bush/desert{
- icon_state = "tree_3"
+/turf/open/floor{
+ dir = 4;
+ icon_state = "whitegreen"
},
-/turf/open/mars_cave{
- icon_state = "mars_dirt_6"
+/area/bigredv2/outside/medical)
+"qtP" = (
+/turf/open/asphalt/cement{
+ icon_state = "cement9"
},
-/area/bigredv2/outside/n)
+/area/bigredv2/caves_lambda)
"qus" = (
/obj/structure/pipes/standard/simple/hidden/green,
/turf/open/floor{
@@ -42574,6 +41677,36 @@
icon_state = "test_floor4"
},
/area/bigredv2/outside/engineering)
+"qvr" = (
+/obj/item/trash/cigbutt{
+ pixel_x = 7
+ },
+/obj/item/trash/cigbutt{
+ pixel_x = -1;
+ pixel_y = 17
+ },
+/obj/item/trash/cigbutt{
+ pixel_x = -10;
+ pixel_y = 13
+ },
+/obj/item/trash/cigbutt{
+ pixel_x = -10;
+ pixel_y = 7
+ },
+/obj/item/trash/cigbutt{
+ pixel_x = -9;
+ pixel_y = -6
+ },
+/obj/item/trash/cigbutt,
+/obj/item/trash/cigbutt{
+ pixel_x = -6;
+ pixel_y = -9
+ },
+/turf/open/floor{
+ dir = 8;
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/nw)
"qvA" = (
/obj/effect/landmark/xeno_spawn,
/turf/open/mars_cave{
@@ -42586,22 +41719,14 @@
icon_state = "mars_cave_3"
},
/area/bigredv2/caves/mining)
-"qvS" = (
-/obj/structure/machinery/landinglight/ds1{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor{
- dir = 4;
- icon_state = "asteroidwarning"
- },
-/area/bigredv2/outside/space_port)
-"qwm" = (
+"qvM" = (
+/obj/effect/landmark/corpsespawner/security,
+/obj/effect/decal/cleanable/blood/gibs/body,
/obj/effect/decal/cleanable/blood,
-/turf/open/mars{
- icon_state = "mars_dirt_12"
+/turf/open/floor{
+ icon_state = "redcorner"
},
-/area/bigredv2/outside/n)
+/area/bigredv2/outside/marshal_office)
"qwx" = (
/obj/structure/pipes/standard/simple/hidden/green,
/turf/open/floor{
@@ -42620,22 +41745,26 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"qwS" = (
-/obj/effect/decal/cleanable/generic,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached3"
+"qwW" = (
+/obj/structure/surface/table,
+/obj/structure/bedsheetbin{
+ pixel_y = 8;
+ pixel_x = 7
},
-/area/bigredv2/outside/w)
-"qxw" = (
-/obj/structure/machinery/door/airlock/almayer/security/glass/colony{
- dir = 1;
- name = "\improper Marshal Office Prison";
- icon_state = "door_open"
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
},
+/obj/effect/landmark/objective_landmark/far,
/turf/open/floor{
- icon_state = "delivery"
+ icon_state = "freezerfloor"
},
-/area/bigredv2/outside/marshal_office)
+/area/bigredv2/outside/general_offices)
+"qxr" = (
+/obj/structure/flora/bush/desert{
+ icon_state = "tree_3"
+ },
+/turf/open/mars,
+/area/bigredv2/outside/ne)
"qyi" = (
/obj/effect/decal/warning_stripes{
icon_state = "NW-out";
@@ -42646,15 +41775,18 @@
icon_state = "darkredcorners2"
},
/area/bigredv2/outside/admin_building)
-"qyJ" = (
-/obj/structure/platform/kutjevo/rock{
- dir = 8;
- layer = 2.9;
- pixel_x = -3
+"qzx" = (
+/obj/structure/barricade/deployable{
+ dir = 4
},
-/obj/structure/platform/kutjevo/rock,
-/turf/closed/wall/solaris/rock,
-/area/bigredv2/caves)
+/turf/open/floor{
+ icon_state = "dark"
+ },
+/area/bigredv2/outside/marshal_office)
+"qzF" = (
+/obj/structure/flora/grass/desert/lightgrass_6,
+/turf/open/mars,
+/area/bigredv2/outside/se)
"qzO" = (
/obj/structure/blocker/forcefield/multitile_vehicles,
/obj/structure/machinery/door/poddoor/almayer/closed{
@@ -42674,118 +41806,91 @@
icon_state = "mars_cave_13"
},
/area/bigredv2/caves/mining)
-"qAY" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
-/turf/open/floor,
-/area/bigredv2/outside/office_complex)
-"qBb" = (
-/obj/structure/flora/grass/desert/lightgrass_4,
-/turf/open/mars,
-/area/bigredv2/outside/nw)
-"qBk" = (
-/turf/open/asphalt/cement{
- icon_state = "cement14"
- },
-/area/bigredv2/outside/space_port)
-"qBw" = (
-/obj/structure/flora/grass/desert/lightgrass_11,
-/turf/open/mars{
- icon_state = "mars_dirt_13"
- },
-/area/bigredv2/outside/c)
-"qCn" = (
+"qAN" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
},
-/obj/effect/decal/cleanable/blood/drip,
-/turf/open/floor{
- dir = 1;
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
-"qCA" = (
-/obj/item/trash/cigbutt{
- pixel_x = 1;
- pixel_y = 5
- },
-/obj/item/trash/cigbutt{
- pixel_x = -7;
- pixel_y = 13
- },
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
+/obj/effect/decal/cleanable/generic,
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/e)
+"qBa" = (
+/obj/effect/decal/cleanable/blood,
+/obj/item/stack/sheet/metal{
+ amount = 3
},
-/area/bigredv2/outside/ne)
-"qCB" = (
-/obj/structure/flora/grass/desert/lightgrass_3,
-/turf/open/mars_cave{
- icon_state = "mars_cave_20"
+/turf/open/floor/plating{
+ dir = 8;
+ icon_state = "platingdmg3"
},
-/area/bigredv2/outside/nw)
+/area/bigredv2/outside/medical)
"qCK" = (
/turf/open/floor{
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/lz2_south_cas)
-"qDm" = (
-/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb{
- pixel_x = -8
+"qDk" = (
+/obj/effect/decal/strata_decals/grime/grime4,
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/w)
+"qDA" = (
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached15"
+ },
+/area/bigredv2/outside/c)
+"qDK" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/obj/structure/machinery/door/airlock/almayer/security/glass/colony{
+ dir = 1;
+ name = "\improper Marshal Office Armory";
+ locked = 1
},
-/obj/effect/decal/cleanable/blood,
/turf/open/floor{
- icon_state = "dark"
+ icon_state = "delivery"
},
/area/bigredv2/outside/marshal_office)
-"qDq" = (
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached3"
- },
-/area/bigredv2/outside/c)
"qDZ" = (
/turf/open/floor{
icon_state = "podhatchfloor"
},
/area/bigredv2/outside/telecomm/n_cave)
-"qEm" = (
-/obj/item/stack/sheet/wood{
- pixel_x = -8
+"qEh" = (
+/obj/item/paper{
+ info = "god save us, I take this end over that at the hands of those monsters";
+ name = "scribbled note"
+ },
+/obj/item/tool/pen{
+ pixel_x = 10;
+ pixel_y = 14
+ },
+/turf/open/floor{
+ icon_state = "dark"
},
-/turf/open/floor,
/area/bigredv2/outside/general_offices)
+"qEn" = (
+/obj/structure/machinery/landinglight/ds1,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor{
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/space_port)
+"qEp" = (
+/obj/structure/machinery/light{
+ dir = 1
+ },
+/turf/open/asphalt/cement{
+ icon_state = "cement4"
+ },
+/area/bigredv2/outside/lambda_cave_cas)
"qEs" = (
/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
/turf/open/mars_cave{
icon_state = "mars_cave_2"
},
/area/bigredv2/outside/lz2_south_cas)
-"qEz" = (
-/obj/item/prop{
- desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
- icon = 'icons/obj/janitor.dmi';
- icon_state = "trashbag3";
- name = "trash bag";
- pixel_x = -6;
- pixel_y = 12
- },
-/obj/item/prop{
- desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
- icon = 'icons/obj/janitor.dmi';
- icon_state = "trashbag3";
- name = "trash bag";
- pixel_x = 7;
- pixel_y = 3;
- layer = 3.1
- },
-/obj/effect/landmark/corpsespawner/colonist,
-/obj/effect/decal/cleanable/blood/gibs/body,
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
- },
-/area/bigredv2/outside/ne)
+"qEw" = (
+/obj/structure/platform/kutjevo/rock,
+/turf/closed/wall/solaris/rock,
+/area/bigredv2/caves)
"qEJ" = (
/obj/structure/machinery/door/poddoor/almayer{
dir = 4;
@@ -42818,15 +41923,36 @@
icon_state = "mars_dirt_7"
},
/area/bigredv2/caves/mining)
-"qFK" = (
-/obj/effect/decal/cleanable/generic,
-/turf/open/asphalt/cement,
-/area/bigredv2/caves_lambda)
+"qFs" = (
+/obj/effect/decal/strata_decals/grime/grime1{
+ dir = 1
+ },
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached12"
+ },
+/area/bigredv2/outside/nw)
+"qFx" = (
+/obj/effect/decal/strata_decals/grime/grime4,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached3"
+ },
+/area/bigredv2/outside/space_port_lz2)
+"qFA" = (
+/obj/effect/decal/cleanable/blood/drip,
+/obj/effect/decal/cleanable/blood/drip,
+/obj/item/ammo_casing/shell,
+/turf/open/floor/plating,
+/area/bigredv2/outside/medical)
"qFY" = (
/turf/open/mars_cave{
icon_state = "mars_cave_5"
},
/area/bigredv2/caves_east)
+"qGc" = (
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached1"
+ },
+/area/bigredv2/outside/se)
"qGg" = (
/obj/item/device/flashlight/lamp{
pixel_x = 5;
@@ -42839,14 +41965,15 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"qGW" = (
-/obj/item/trash/cheesie{
- pixel_y = -4
- },
-/turf/open/floor{
- icon_state = "wood"
+"qGl" = (
+/obj/structure/flora/grass/desert/lightgrass_6,
+/turf/open/mars,
+/area/bigredv2/outside/virology)
+"qGT" = (
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached1"
},
-/area/bigredv2/outside/bar)
+/area/bigredv2/outside/virology)
"qGY" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/pipes/standard/simple/hidden/green,
@@ -42872,35 +41999,53 @@
/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
/turf/open/floor,
/area/bigredv2/outside/cargo)
-"qIn" = (
-/obj/item/device/flashlight/lamp/tripod{
- layer = 6;
- pixel_y = 11
+"qIf" = (
+/obj/structure/bed/chair{
+ dir = 4
},
-/turf/open/mars_cave{
- icon_state = "mars_cave_2"
+/turf/open/floor{
+ dir = 8;
+ icon_state = "whitegreen"
},
-/area/bigredv2/outside/n)
-"qIE" = (
+/area/bigredv2/outside/medical)
+"qID" = (
+/obj/structure/blocker/forcefield/multitile_vehicles,
+/turf/open/asphalt/cement{
+ icon_state = "cement15"
+ },
+/area/bigredv2/outside/filtration_cave_cas)
+"qJp" = (
+/obj/item/trash/uscm_mre{
+ pixel_x = 10;
+ pixel_y = -2
+ },
+/turf/open/floor{
+ icon_state = "dark"
+ },
+/area/bigredv2/outside/marshal_office)
+"qJD" = (
+/obj/structure/flora/grass/desert/lightgrass_12,
+/turf/open/mars,
+/area/bigredv2/outside/s)
+"qJG" = (
/obj/effect/decal/cleanable/blood/gibs/body,
/turf/open/floor{
dir = 1;
icon_state = "asteroidfloor"
},
/area/bigredv2/outside/virology)
-"qJB" = (
-/obj/effect/decal/cleanable/blood{
- dir = 4;
- icon_state = "gib6"
- },
-/turf/open/asphalt/cement{
- icon_state = "cement12"
- },
-/area/bigredv2/outside/lambda_cave_cas)
"qJM" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/carpet,
/area/bigredv2/outside/library)
+"qJQ" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/floor{
+ dir = 8;
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
"qJV" = (
/obj/effect/decal/cleanable/blood/drip{
pixel_x = -5;
@@ -42911,71 +42056,69 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"qKm" = (
-/obj/structure/flora/grass/desert/lightgrass_12,
-/turf/open/mars,
-/area/bigredv2/outside/c)
-"qKH" = (
-/obj/structure/machinery/light{
- dir = 1
+"qKc" = (
+/obj/structure/surface/table,
+/obj/item/trash/semki{
+ pixel_x = 11;
+ pixel_y = 9
},
-/obj/structure/pipes/standard/simple/hidden/green{
+/obj/structure/pipes/vents/pump{
dir = 4
},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement{
- icon_state = "cement4"
- },
-/area/bigredv2/caves_lambda)
-"qLk" = (
-/obj/item/device/flashlight/lantern,
-/turf/open/mars_cave{
- icon_state = "mars_dirt_5"
- },
-/area/bigredv2/caves/mining)
-"qLD" = (
-/turf/open/floor{
- icon_state = "red"
- },
-/area/bigredv2/outside/lambda_cave_cas)
-"qLV" = (
-/obj/structure/pipes/standard/simple/hidden/green,
/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
+ icon_state = "dark"
},
-/area/bigredv2/outside/eta)
-"qMc" = (
-/obj/effect/landmark/crap_item,
-/turf/open/floor{
- icon_state = "whitegreen"
+/area/bigredv2/outside/office_complex)
+"qLg" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 10
},
-/area/bigredv2/outside/medical)
-"qMs" = (
-/obj/item/tool/match{
+/obj/structure/machinery/vending/cola{
pixel_x = 8;
- pixel_y = 9
+ pixel_y = -7;
+ layer = 2.84
},
-/turf/open/floor{
- icon_state = "asteroidwarning"
+/obj/structure/largecrate/random/mini/wooden{
+ pixel_x = -12;
+ pixel_y = -4
},
-/area/bigredv2/outside/ne)
-"qMD" = (
-/obj/structure/bed,
-/obj/effect/landmark/corpsespawner/colonist,
-/obj/item/grown/sunflower{
- pixel_x = -2;
- pixel_y = -7
+/obj/structure/largecrate/random/mini/wooden{
+ pixel_x = -18;
+ pixel_y = 7
+ },
+/turf/open/floor,
+/area/bigredv2/outside/general_offices)
+"qLk" = (
+/obj/item/device/flashlight/lantern,
+/turf/open/mars_cave{
+ icon_state = "mars_dirt_5"
},
+/area/bigredv2/caves/mining)
+"qLD" = (
/turf/open/floor{
- icon_state = "wood"
+ icon_state = "red"
},
-/area/bigredv2/outside/dorms)
+/area/bigredv2/outside/lambda_cave_cas)
+"qLV" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidfloor"
+ },
+/area/bigredv2/outside/eta)
"qMS" = (
/turf/open/mars_cave{
icon_state = "mars_cave_18"
},
/area/bigredv2/outside/n)
+"qNd" = (
+/obj/effect/decal/cleanable/ash{
+ pixel_y = 19
+ },
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached4"
+ },
+/area/bigredv2/outside/nw)
"qNu" = (
/obj/structure/surface/table,
/obj/structure/machinery/light/small{
@@ -43007,6 +42150,19 @@
icon_state = "asteroidwarning"
},
/area/bigredv2/landing/console2)
+"qOa" = (
+/obj/structure/barricade/deployable,
+/turf/open/floor{
+ dir = 4;
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/c)
+"qOC" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement{
+ icon_state = "cement4"
+ },
+/area/bigredv2/outside/filtration_cave_cas)
"qOM" = (
/obj/effect/decal/cleanable/blood/drip{
pixel_x = -9;
@@ -43024,10 +42180,21 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
+"qOS" = (
+/obj/structure/machinery/light{
+ dir = 8
+ },
+/obj/structure/bed/roller,
+/obj/structure/closet/bodybag,
+/turf/open/floor{
+ icon_state = "whitegreenfull"
+ },
+/area/bigredv2/outside/medical)
"qPK" = (
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor,
-/area/bigredv2/outside/general_offices)
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached3"
+ },
+/area/bigredv2/outside/w)
"qPT" = (
/turf/closed/wall/solaris/reinforced,
/area/bigredv2/outside/eta)
@@ -43037,6 +42204,12 @@
icon_state = "bcircuit"
},
/area/bigredv2/outside/marshal_office)
+"qQm" = (
+/obj/effect/decal/strata_decals/grime/grime3,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached3"
+ },
+/area/bigredv2/outside/w)
"qQn" = (
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
@@ -43051,24 +42224,76 @@
icon_state = "mars_cave_7"
},
/area/bigredv2/caves_north)
+"qRV" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/bigredv2/outside/bar)
+"qSc" = (
+/obj/effect/decal/strata_decals/grime/grime3,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached4"
+ },
+/area/bigredv2/outside/e)
"qSj" = (
/obj/structure/cargo_container/hd/mid/alt,
/turf/open/floor/plating,
/area/bigredv2/caves/mining)
+"qSt" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/generic,
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/w)
+"qSI" = (
+/obj/item/reagent_container/food/drinks/cup{
+ pixel_x = 8;
+ pixel_y = -19
+ },
+/obj/item/reagent_container/food/drinks/cup{
+ pixel_x = 3;
+ pixel_y = -1
+ },
+/turf/open/floor{
+ dir = 1;
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/marshal_office)
+"qSP" = (
+/obj/item/weapon/gun/smg/fp9000,
+/turf/open/floor{
+ icon_state = "wood"
+ },
+/area/bigredv2/outside/marshal_office)
+"qSZ" = (
+/obj/structure/girder,
+/turf/open/floor/plating{
+ icon_state = "panelscorched"
+ },
+/area/bigredv2/outside/office_complex)
+"qTt" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached2"
+ },
+/area/bigredv2/outside/w)
"qTC" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor{
icon_state = "dark"
},
/area/bigredv2/caves/eta/xenobiology)
-"qTM" = (
-/obj/effect/decal/strata_decals/grime/grime1{
+"qTU" = (
+/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
},
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached3"
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidfloor"
},
-/area/bigredv2/outside/c)
+/area/bigredv2/outside/space_port)
"qUF" = (
/obj/structure/machinery/computer/area_atmos{
dir = 1
@@ -43083,11 +42308,6 @@
icon_state = "mars_dirt_6"
},
/area/bigredv2/caves_sw)
-"qVc" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor,
-/area/bigredv2/outside/dorms)
"qVd" = (
/obj/item/reagent_container/food/snacks/sausage,
/obj/structure/platform_decoration/kutjevo/rock{
@@ -43101,11 +42321,6 @@
/obj/structure/window/framed/solaris/reinforced,
/turf/open/floor/plating,
/area/bigredv2/caves/mining)
-"qVw" = (
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached16"
- },
-/area/bigredv2/outside/virology)
"qVB" = (
/obj/item/weapon/shield/riot,
/obj/effect/decal/cleanable/blood/drip{
@@ -43116,6 +42331,17 @@
icon_state = "mars_cave_17"
},
/area/bigredv2/caves/mining)
+"qWl" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/trash/cigbutt{
+ pixel_x = -6;
+ pixel_y = -2
+ },
+/turf/open/floor{
+ dir = 8;
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/c)
"qWA" = (
/obj/structure/surface/table/woodentable,
/obj/item/paper,
@@ -43137,6 +42363,11 @@
icon_state = "delivery"
},
/area/bigredv2/outside/lambda_cave_cas)
+"qXd" = (
+/turf/open/gm/river{
+ color = "#995555"
+ },
+/area/bigredv2/outside/c)
"qXi" = (
/obj/structure/surface/table/woodentable,
/obj/item/device/pinpointer,
@@ -43144,17 +42375,18 @@
icon_state = "wood"
},
/area/bigredv2/outside/admin_building)
-"qXs" = (
-/obj/structure/surface/table,
-/obj/item/storage/fancy/vials/random{
- pixel_y = -5;
- pixel_x = -3
+"qXB" = (
+/obj/effect/decal/cleanable/blood/gibs/body,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached3"
},
-/turf/open/floor{
- dir = 1;
- icon_state = "whitepurplecorner"
+/area/bigredv2/outside/s)
+"qYs" = (
+/obj/structure/flora/bush/desert{
+ icon_state = "tree_3"
},
-/area/bigredv2/outside/medical)
+/turf/open/mars,
+/area/bigredv2/outside/c)
"qYB" = (
/obj/structure/sink{
dir = 8;
@@ -43212,6 +42444,19 @@
icon_state = "bcircuit"
},
/area/bigredv2/outside/marshal_office)
+"ray" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/effect/landmark/corpsespawner/doctor,
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor/plating,
+/area/bigredv2/outside/medical)
+"raH" = (
+/turf/open/asphalt/cement{
+ icon_state = "cement2"
+ },
+/area/bigredv2/outside/space_port)
"raQ" = (
/obj/structure/barricade/handrail/wire{
dir = 4
@@ -43231,21 +42476,10 @@
icon_state = "red"
},
/area/bigredv2/outside/marshal_office)
-"raW" = (
-/obj/effect/decal/cleanable/blood,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor,
-/area/bigredv2/outside/general_offices)
"rbs" = (
/obj/structure/window/framed/solaris/reinforced,
/turf/open/floor/plating,
/area/bigredv2/outside/lambda_cave_cas)
-"rbv" = (
-/obj/effect/decal/cleanable/generic,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
- },
-/area/bigredv2/outside/w)
"rbD" = (
/obj/structure/largecrate/random,
/turf/open/floor/plating{
@@ -43275,6 +42509,32 @@
icon_state = "mars_dirt_6"
},
/area/bigredv2/caves/mining)
+"rcI" = (
+/obj/item/device/radio/intercom{
+ freerange = 1;
+ frequency = 1469;
+ name = "General Listening Channel";
+ pixel_x = 30
+ },
+/obj/structure/bed/bedroll{
+ dir = 10
+ },
+/obj/item/prop/colony/usedbandage{
+ dir = 4;
+ pixel_x = -1;
+ pixel_y = -4
+ },
+/obj/effect/decal/cleanable/blood,
+/obj/effect/landmark/corpsespawner/colonist,
+/obj/effect/decal/cleanable/blood/gibs/body,
+/turf/open/floor{
+ icon_state = "freezerfloor"
+ },
+/area/bigredv2/outside/general_offices)
+"rcJ" = (
+/obj/structure/flora/grass/desert/lightgrass_4,
+/turf/open/mars,
+/area/bigredv2/outside/n)
"rcN" = (
/turf/open/mars_cave{
icon_state = "mars_cave_16"
@@ -43287,32 +42547,24 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/engineering)
-"rdL" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/barricade/wooden{
- desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
- dir = 8;
- health = 25000;
- pixel_y = 3;
- pixel_x = 17
- },
-/turf/open/floor{
- icon_state = "redcorner"
- },
-/area/bigredv2/outside/marshal_office)
"rdR" = (
/turf/open/floor,
/area/bigredv2/outside/lz2_south_cas)
-"reh" = (
-/obj/item/trash/hotdog{
- pixel_x = 4;
- pixel_y = -2
+"rdT" = (
+/obj/effect/spawner/random/tool{
+ pixel_x = 2;
+ pixel_y = 6
},
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
+/turf/open/floor,
+/area/bigredv2/outside/general_offices)
+"reg" = (
+/obj/structure/surface/table,
+/obj/item/device/radio{
+ pixel_x = -10;
+ pixel_y = 9
},
-/area/bigredv2/outside/ne)
+/turf/open/floor,
+/area/bigredv2/outside/dorms)
"rem" = (
/obj/structure/barricade/wooden{
desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
@@ -43350,37 +42602,14 @@
icon_state = "mars_cave_2"
},
/area/space)
-"rfE" = (
-/turf/closed/wall/solaris{
- damage = 2677;
- damage_overlay = 8;
- current_bulletholes = 3
- },
-/area/bigredv2/outside/office_complex)
-"rfI" = (
-/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
-/turf/open/floor{
- icon_state = "white"
- },
-/area/bigredv2/outside/medical)
-"rfX" = (
-/obj/structure/surface/table,
-/obj/item/bodybag{
- pixel_y = 1;
- pixel_x = -2
- },
-/obj/item/bodybag{
- pixel_y = -2;
- pixel_x = 9
- },
-/obj/item/bodybag{
- pixel_y = 8;
- pixel_x = -7
- },
+"rfD" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood/drip,
/turf/open/floor{
- icon_state = "whitegreenfull"
+ dir = 8;
+ icon_state = "asteroidwarning"
},
-/area/bigredv2/outside/medical)
+/area/bigredv2/outside/c)
"rgm" = (
/obj/structure/bed/chair/wood/normal{
dir = 8
@@ -43390,21 +42619,12 @@
icon_state = "chapel"
},
/area/bigredv2/outside/chapel)
-"rgo" = (
-/obj/structure/flora/bush/desert{
- icon_state = "tree_3"
- },
-/turf/open/mars,
-/area/bigredv2/outside/nw)
"rgp" = (
/obj/structure/blocker/forcefield/multitile_vehicles,
/turf/open/mars_cave{
icon_state = "mars_cave_2"
},
/area/bigredv2/outside/lz1_north_cas)
-"rhy" = (
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/c)
"rhP" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/warning_stripes{
@@ -43428,11 +42648,20 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"riv" = (
+"riE" = (
+/obj/structure/machinery/suit_storage_unit/carbon_unit{
+ icon_state = "open"
+ },
+/turf/open/floor{
+ icon_state = "dark"
+ },
+/area/bigredv2/outside/general_offices)
+"rjn" = (
+/obj/effect/decal/strata_decals/grime/grime4,
/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached1"
+ icon_state = "cement_sunbleached3"
},
-/area/bigredv2/outside/c)
+/area/bigredv2/outside/nw)
"rjw" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor,
@@ -43443,12 +42672,29 @@
},
/turf/closed/wall/solaris/reinforced,
/area/bigredv2/caves/mining)
+"rjH" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor{
+ dir = 4;
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/caves_east)
+"rjY" = (
+/obj/effect/decal/cleanable/blood,
+/turf/open/mars,
+/area/bigredv2/outside/n)
"rkh" = (
/obj/structure/blocker/forcefield/multitile_vehicles,
/turf/open/floor{
icon_state = "red"
},
/area/bigredv2/outside/lambda_cave_cas)
+"rkP" = (
+/obj/item/reagent_container/pill/cyanide,
+/turf/open/floor{
+ icon_state = "wood"
+ },
+/area/bigredv2/outside/dorms)
"rkS" = (
/obj/structure/cable{
icon_state = "5-6"
@@ -43458,56 +42704,51 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"rlr" = (
-/obj/structure/machinery/light{
- dir = 8
- },
-/obj/structure/sign/nosmoking_1{
- pixel_x = -32
- },
-/obj/item/stack/sheet/wood/medium_stack{
- pixel_x = 2;
- pixel_y = 5
- },
-/obj/item/stack/sheet/wood{
- pixel_x = -4;
- pixel_y = -10
- },
-/turf/open/floor{
- dir = 8;
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
-"rmi" = (
-/obj/effect/acid_hole,
-/turf/closed/wall/solaris,
+"rlJ" = (
+/obj/item/shard,
+/turf/open/floor/plating,
/area/bigredv2/outside/medical)
"rml" = (
/obj/structure/machinery/cm_vending/sorted/tech/electronics_storage,
/turf/open/floor,
/area/bigred/ground/garage_workshop)
-"rmq" = (
-/obj/effect/decal/strata_decals/grime/grime4,
+"rmn" = (
+/obj/effect/decal/cleanable/vomit{
+ icon_state = "vomit_4"
+ },
/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached3"
+ icon_state = "cement_sunbleached12"
},
/area/bigredv2/outside/nw)
-"rmz" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
+"rmL" = (
+/obj/structure/surface/table/woodentable{
+ dir = 1;
+ flipped = 1
},
-/area/bigredv2/outside/space_port_lz2)
-"rmE" = (
-/obj/effect/spawner/random/tool{
- pixel_x = -11;
- pixel_y = -9
+/turf/open/floor{
+ icon_state = "wood"
},
-/turf/open/floor,
-/area/bigredv2/outside/general_offices)
+/area/bigredv2/outside/bar)
"rnc" = (
/turf/open/mars_cave,
/area/bigredv2/caves_research)
+"rnG" = (
+/obj/item/prop{
+ desc = "A blood bag with a hole in it. The rats must have gotten to it first.";
+ icon = 'icons/obj/items/bloodpack.dmi';
+ icon_state = "bloodpack";
+ name = "blood bag";
+ pixel_x = -2;
+ pixel_y = 10
+ },
+/obj/item/prop/colony/usedbandage{
+ dir = 5;
+ pixel_y = 8
+ },
+/turf/open/floor{
+ icon_state = "white"
+ },
+/area/bigredv2/outside/medical)
"rnK" = (
/obj/structure/machinery/door/poddoor/almayer/closed{
dir = 4;
@@ -43525,29 +42766,26 @@
icon_state = "dark"
},
/area/bigredv2/outside/engineering)
-"rol" = (
-/obj/structure/barricade/wooden{
- desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
- dir = 4;
- health = 25000
- },
-/turf/open/floor{
- dir = 6;
- icon_state = "asteroidwarning"
- },
-/area/bigredv2/outside/c)
"row" = (
/turf/open/floor{
dir = 8;
icon_state = "darkred2"
},
/area/bigredv2/caves/eta/research)
-"roH" = (
-/obj/structure/flora/grass/desert/lightgrass_1,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached1"
+"roE" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 9
},
-/area/bigredv2/outside/s)
+/obj/structure/barricade/wooden{
+ dir = 8;
+ pixel_y = -5;
+ pixel_x = -9
+ },
+/obj/structure/machinery/cm_vending/sorted/medical/no_access,
+/turf/open/floor{
+ icon_state = "white"
+ },
+/area/bigredv2/outside/medical)
"roP" = (
/obj/item/ore{
pixel_x = 9;
@@ -43557,12 +42795,21 @@
icon_state = "mars_dirt_7"
},
/area/bigredv2/caves/mining)
+"rpf" = (
+/obj/effect/spawner/random/claymore/highchance,
+/turf/closed/wall/solaris/rock,
+/area/bigredv2/caves)
"rpl" = (
/obj/structure/machinery/light/small,
/turf/open/mars_cave{
icon_state = "mars_cave_2"
},
/area/bigredv2/caves/mining)
+"rpG" = (
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached12"
+ },
+/area/bigredv2/outside/e)
"rpI" = (
/obj/effect/decal/warning_stripes{
icon_state = "W";
@@ -43573,22 +42820,6 @@
icon_state = "darkred2"
},
/area/bigredv2/outside/admin_building)
-"rpL" = (
-/obj/structure/flora/grass/desert/lightgrass_4,
-/turf/open/mars,
-/area/bigredv2/outside/e)
-"rpW" = (
-/obj/item/stack/sheet/metal{
- pixel_x = 4
- },
-/turf/open/floor,
-/area/bigredv2/outside/office_complex)
-"rpY" = (
-/obj/structure/flora/bush/desert{
- icon_state = "tree_3"
- },
-/turf/open/mars,
-/area/bigredv2/outside/n)
"rqa" = (
/obj/structure/tunnel{
id = "hole4"
@@ -43597,15 +42828,6 @@
icon_state = "whitepurplefull"
},
/area/bigredv2/caves/lambda/xenobiology)
-"rqh" = (
-/obj/structure/surface/table/woodentable{
- dir = 8;
- flipped = 1
- },
-/turf/open/floor{
- icon_state = "wood"
- },
-/area/bigredv2/outside/dorms)
"rqv" = (
/obj/structure/prop/invuln/minecart_tracks{
dir = 1
@@ -43614,46 +42836,40 @@
icon_state = "mars_cave_19"
},
/area/bigredv2/caves/mining)
-"rqH" = (
-/obj/structure/machinery/landinglight/ds1{
- dir = 1
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidwarning"
+"rqR" = (
+/obj/effect/decal/cleanable/blood,
+/turf/open/mars_cave{
+ icon_state = "mars_dirt_7"
},
-/area/bigredv2/outside/space_port)
-"rrm" = (
-/obj/structure/flora/grass/desert/lightgrass_7,
-/turf/open/mars,
-/area/bigredv2/outside/se)
-"rrF" = (
-/obj/structure/largecrate/random/barrel/green{
- pixel_x = -11;
- pixel_y = 9
+/area/bigredv2/outside/eta)
+"rre" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "N";
+ pixel_y = 1
},
-/obj/item/reagent_container/food/drinks/bottle/beer/craft/tuxedo{
- pixel_x = -5;
- pixel_y = 26
+/obj/effect/decal/warning_stripes{
+ icon_state = "S";
+ pixel_y = -1
},
-/obj/item/trash/plate{
- pixel_x = -12;
- pixel_y = 22
+/obj/effect/decal/warning_stripes{
+ icon_state = "W";
+ layer = 2.5
},
-/turf/open/mars_cave{
- icon_state = "mars_cave_13"
+/turf/open/floor{
+ icon_state = "dark"
},
-/area/bigredv2/outside/ne)
-"rrY" = (
+/area/bigredv2/outside/admin_building)
+"rrV" = (
/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement,
-/area/bigredv2/caves_lambda)
-"rsg" = (
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
+/obj/item/trash/hotdog{
+ pixel_x = -9;
+ pixel_y = 1
},
-/area/bigredv2/outside/e)
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidfloor"
+ },
+/area/bigredv2/outside/ne)
"rsv" = (
/turf/open/mars_cave{
icon_state = "mars_cave_3"
@@ -43694,6 +42910,20 @@
icon_state = "mars_dirt_4"
},
/area/bigredv2/caves/mining)
+"rup" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/tool/warning_cone{
+ pixel_x = 6
+ },
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidfloor"
+ },
+/area/bigredv2/outside/ne)
+"ruI" = (
+/obj/structure/flora/grass/desert/lightgrass_11,
+/turf/open/mars,
+/area/bigredv2/outside/sw)
"ruS" = (
/obj/structure/bed/chair{
dir = 8;
@@ -43720,25 +42950,31 @@
icon_state = "mars_cave_23"
},
/area/bigredv2/caves_east)
-"rxU" = (
-/obj/structure/bed/roller,
-/turf/open/floor{
- dir = 4;
- icon_state = "whitegreen"
+"rxQ" = (
+/obj/structure/surface/table,
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
},
-/area/bigredv2/outside/medical)
-"ryx" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached3"
+/obj/effect/landmark/objective_landmark/close,
+/obj/item/paper/bigred/crazy{
+ pixel_x = 8;
+ pixel_y = 13
},
-/area/bigredv2/outside/filtration_plant)
+/turf/open/floor,
+/area/bigredv2/outside/marshal_office)
"rzb" = (
/obj/structure/bed/chair,
/turf/open/floor{
icon_state = "dark"
},
/area/bigredv2/outside/engineering)
+"rzH" = (
+/obj/effect/decal/cleanable/blood/xtracks,
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidfloor"
+ },
+/area/bigredv2/outside/nw)
"rzO" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/reagent_dispensers/water_cooler/stacks{
@@ -43757,39 +42993,40 @@
/obj/structure/sign/nosmoking_1,
/turf/closed/wall/solaris/reinforced,
/area/bigredv2/caves/mining)
-"rAq" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/structure/barricade/wooden,
-/turf/open/floor{
- icon_state = "wood"
- },
-/area/bigredv2/outside/bar)
"rAs" = (
/turf/open/mars_cave{
icon_state = "mars_cave_6"
},
/area/bigredv2/caves_east)
-"rAR" = (
-/obj/effect/decal/cleanable/blood/drip,
-/turf/open/mars_cave{
- icon_state = "mars_cave_13"
+"rBi" = (
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached1"
},
-/area/bigredv2/outside/n)
+/area/bigredv2/outside/c)
"rBn" = (
/obj/structure/window,
/turf/open/floor{
icon_state = "wood"
},
/area/bigredv2/outside/library)
-"rBI" = (
-/obj/effect/spawner/random/tool{
- pixel_x = 2;
- pixel_y = 6
+"rBq" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 5
+ },
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/nw)
+"rBs" = (
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached12"
+ },
+/area/bigredv2/outside/w)
+"rBy" = (
+/obj/structure/flora/bush/desert{
+ icon_state = "tree_3"
},
-/turf/open/floor,
-/area/bigredv2/outside/general_offices)
+/turf/open/mars,
+/area/bigredv2/outside/nw)
"rBK" = (
/obj/structure/fence,
/turf/open/mars{
@@ -43802,17 +43039,18 @@
icon_state = "asteroidwarning"
},
/area/bigred/ground/garage_workshop)
+"rCr" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidfloor"
+ },
+/area/bigredv2/outside/space_port)
"rCA" = (
/turf/open/mars_cave{
icon_state = "mars_cave_7"
},
/area/bigredv2/outside/lz1_telecomm_cas)
-"rDa" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor{
- icon_state = "redcorner"
- },
-/area/bigredv2/outside/lambda_cave_cas)
"rDl" = (
/obj/effect/decal/cleanable/blood/drip{
pixel_x = -3;
@@ -43849,57 +43087,71 @@
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/filtration_plant)
-"rFy" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating{
- icon_state = "platebotc"
+"rEb" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 10
},
-/area/bigredv2/outside/space_port)
-"rFW" = (
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached1"
+ },
+/area/bigredv2/outside/nw)
+"rEk" = (
+/obj/effect/decal/strata_decals/grime/grime2,
+/turf/open/asphalt/cement{
+ icon_state = "cement3"
+ },
+/area/bigredv2/outside/filtration_cave_cas)
+"rEp" = (
/obj/structure/pipes/standard/simple/hidden/green,
/obj/effect/decal/cleanable/dirt,
-/obj/item/device/defibrillator{
- pixel_x = 6;
- pixel_y = 12
+/obj/item/trash/buritto{
+ pixel_y = 12;
+ pixel_x = -7
},
-/turf/open/floor{
- icon_state = "white"
+/obj/item/stack/tile/plasteel{
+ pixel_x = 16
},
+/turf/open/floor/plating,
/area/bigredv2/outside/medical)
-"rGp" = (
-/obj/structure/flora/grass/desert/lightgrass_4,
-/turf/open/mars,
-/area/bigredv2/outside/ne)
-"rGr" = (
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached15"
+"rFs" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
},
-/area/bigredv2/outside/space_port_lz2)
-"rGF" = (
-/obj/structure/surface/table,
-/obj/item/clothing/under/color/orange,
+/obj/structure/machinery/door/airlock/almayer/medical/glass/colony{
+ name = "\improper Dormitories Lavatory";
+ density = 0;
+ icon_state = "door_open"
+ },
+/obj/effect/decal/cleanable/blood/xeno,
/turf/open/floor{
- icon_state = "white"
+ icon_state = "delivery"
},
-/area/bigredv2/outside/marshal_office)
-"rGL" = (
-/obj/structure/flora/grass/desert/lightgrass_11,
-/turf/open/mars,
-/area/bigredv2/outside/space_port_lz2)
+/area/bigredv2/outside/general_offices)
+"rGp" = (
+/obj/structure/flora/grass/desert/lightgrass_12,
+/turf/open/mars{
+ icon_state = "mars_dirt_12"
+ },
+/area/bigredv2/outside/w)
"rGP" = (
/obj/structure/blocker/forcefield/multitile_vehicles,
/turf/open/mars_cave{
icon_state = "mars_cave_7"
},
/area/bigredv2/caves_virology)
-"rHk" = (
+"rHq" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_container/pill/happy,
-/obj/item/reagent_container/pill/happy,
+/obj/structure/barricade/wooden{
+ desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
+ dir = 8;
+ health = 25000;
+ pixel_y = 3;
+ pixel_x = 17
+ },
/turf/open/floor{
- icon_state = "whitegreenfull"
+ icon_state = "redcorner"
},
-/area/bigredv2/outside/medical)
+/area/bigredv2/outside/marshal_office)
"rHr" = (
/obj/item/ore,
/turf/open/mars_cave{
@@ -43917,31 +43169,15 @@
icon_state = "asteroidfloor"
},
/area/bigredv2/outside/c)
-"rHQ" = (
-/obj/effect/decal/cleanable/blood,
-/turf/open/mars,
-/area/bigredv2/outside/n)
-"rHR" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/item/weapon/gun/revolver/small{
- pixel_x = -11;
- pixel_y = 13
- },
-/turf/open/floor,
-/area/bigredv2/outside/marshal_office)
"rIl" = (
/turf/closed/wall/solaris/reinforced/hull,
/area/bigredv2/oob)
-"rJd" = (
-/obj/item/trash/uscm_mre{
- pixel_y = 42;
- pixel_x = -3
+"rJk" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached1"
},
-/turf/open/floor,
-/area/bigredv2/outside/hydroponics)
+/area/bigredv2/outside/s)
"rJJ" = (
/turf/open/floor{
dir = 1;
@@ -43981,6 +43217,15 @@
icon_state = "freezerfloor"
},
/area/bigredv2/outside/dorms)
+"rKG" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 10
+ },
+/obj/structure/barricade/wooden{
+ pixel_y = -10
+ },
+/turf/open/floor,
+/area/bigredv2/outside/marshal_office)
"rKP" = (
/obj/structure/machinery/portable_atmospherics/powered/scrubber,
/turf/open/floor/plating{
@@ -43988,36 +43233,18 @@
icon_state = "warnplate"
},
/area/bigredv2/oob)
-"rLb" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
-/turf/open/floor{
- icon_state = "white"
- },
-/area/bigredv2/outside/medical)
-"rLx" = (
-/obj/structure/flora/grass/desert/lightgrass_5,
-/turf/open/mars{
- icon_state = "mars_dirt_3"
- },
-/area/bigredv2/outside/nw)
-"rLJ" = (
-/obj/item/clothing/mask/gas,
+"rLj" = (
+/obj/effect/decal/cleanable/generic,
/turf/open/floor{
- icon_state = "dark"
+ dir = 1;
+ icon_state = "asteroidwarning"
},
-/area/bigredv2/outside/marshal_office)
+/area/bigredv2/outside/ne)
"rLM" = (
/turf/open/mars{
icon_state = "mars_dirt_12"
},
/area/bigredv2/outside/ne)
-"rLO" = (
-/obj/structure/window_frame/solaris,
-/obj/item/shard,
-/turf/open/floor/plating,
-/area/bigredv2/outside/general_offices)
"rLR" = (
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest,
/obj/effect/landmark/structure_spawner/setup/distress/xeno_nest,
@@ -44025,12 +43252,6 @@
icon_state = "mars_cave_11"
},
/area/bigredv2/caves_lambda)
-"rLU" = (
-/obj/structure/flora/grass/desert/lightgrass_12,
-/turf/open/mars_cave{
- icon_state = "mars_dirt_4"
- },
-/area/bigredv2/outside/space_port_lz2)
"rMg" = (
/obj/structure/toilet{
pixel_y = 8
@@ -44041,13 +43262,6 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"rMv" = (
-/obj/item/ammo_casing/bullet,
-/obj/effect/decal/cleanable/blood/drip,
-/turf/open/floor{
- icon_state = "dark"
- },
-/area/bigredv2/outside/general_offices)
"rMw" = (
/obj/effect/decal/cleanable/blood/oil/streak,
/turf/open/floor{
@@ -44075,6 +43289,15 @@
icon_state = "mars_cave_16"
},
/area/bigredv2/caves/mining)
+"rMS" = (
+/obj/structure/machinery/medical_pod/bodyscanner,
+/obj/effect/decal/medical_decals{
+ icon_state = "triagedecalbottomleft"
+ },
+/turf/open/floor{
+ icon_state = "white"
+ },
+/area/bigredv2/outside/medical)
"rNc" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/weapon/harpoon,
@@ -44091,12 +43314,17 @@
},
/turf/closed/wall/solaris/rock,
/area/bigredv2/caves)
-"rOB" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached1"
+"rOe" = (
+/obj/effect/decal/cleanable/blood,
+/obj/structure/barricade/wooden{
+ desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
+ dir = 8;
+ health = 25000
},
-/area/bigredv2/outside/s)
+/turf/open/floor{
+ icon_state = "wood"
+ },
+/area/bigredv2/outside/bar)
"rOK" = (
/obj/effect/landmark/corpsespawner/ua_riot,
/obj/item/weapon/baton/loaded,
@@ -44131,21 +43359,39 @@
icon_state = "mars_dirt_5"
},
/area/bigredv2/caves/mining)
-"rPl" = (
-/obj/effect/decal/cleanable/dirt,
+"rPy" = (
+/obj/structure/bed,
+/obj/effect/landmark/survivor_spawner,
/turf/open/floor{
- icon_state = "wood"
+ icon_state = "dark"
},
-/area/bigredv2/outside/dorms)
-"rPR" = (
-/obj/item/tool/warning_cone{
- pixel_x = -12
+/area/bigredv2/outside/marshal_office)
+"rPL" = (
+/obj/structure/machinery/camera/autoname,
+/obj/structure/bed,
+/turf/open/floor{
+ icon_state = "white"
+ },
+/area/bigredv2/outside/marshal_office)
+"rPZ" = (
+/obj/structure/sign/safety/galley{
+ pixel_x = 32
},
+/obj/item/storage/box/gloves,
/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
+ dir = 4;
+ icon_state = "whitegreen"
},
-/area/bigredv2/outside/ne)
+/area/bigredv2/outside/medical)
+"rQh" = (
+/obj/item/weapon/dart/green{
+ pixel_y = -11
+ },
+/turf/open/floor{
+ dir = 8;
+ icon_state = "carpet11-12"
+ },
+/area/bigredv2/outside/bar)
"rQs" = (
/obj/structure/bed/sofa/south{
desc = "An old rusty ladder";
@@ -44155,42 +43401,36 @@
},
/turf/open/floor/plating,
/area/bigredv2/oob)
-"rQO" = (
-/obj/item/trash/semki{
- pixel_x = 6;
+"rQC" = (
+/obj/item/trash/syndi_cakes{
+ pixel_y = -15;
+ pixel_x = -3
+ },
+/obj/item/prop/magazine/book/starshiptroopers{
+ pixel_x = -6;
pixel_y = -5
},
+/obj/effect/decal/cleanable/generic,
/turf/open/mars_cave{
- icon_state = "mars_dirt_4"
+ icon_state = "mars_cave_13"
},
/area/bigredv2/outside/nw)
-"rRO" = (
-/obj/structure/blocker/forcefield/multitile_vehicles,
-/turf/open/asphalt/cement{
- icon_state = "cement15"
- },
-/area/bigredv2/outside/filtration_cave_cas)
-"rTa" = (
-/obj/effect/decal/cleanable/generic,
-/obj/effect/decal/cleanable/dirt,
+"rRG" = (
+/obj/item/tool/warning_cone,
/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
+ icon_state = "cement_sunbleached15"
},
-/area/bigredv2/outside/c)
+/area/bigredv2/outside/se)
"rTq" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor{
icon_state = "dark"
},
/area/bigredv2/caves/eta/storage)
-"rTv" = (
-/obj/effect/decal/strata_decals/grime/grime2{
- dir = 1
- },
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached15"
- },
-/area/bigredv2/outside/nw)
+"rTK" = (
+/obj/structure/flora/grass/desert/lightgrass_12,
+/turf/open/mars,
+/area/bigredv2/outside/w)
"rTN" = (
/obj/structure/fence,
/turf/open/floor{
@@ -44198,15 +43438,6 @@
icon_state = "asteroidfloor"
},
/area/bigredv2/outside/filtration_plant)
-"rTX" = (
-/obj/item/trash/pistachios{
- pixel_x = -11;
- pixel_y = -9
- },
-/turf/open/mars_cave{
- icon_state = "mars_dirt_4"
- },
-/area/bigredv2/outside/nw)
"rUn" = (
/obj/effect/decal/warning_stripes{
icon_state = "N"
@@ -44217,6 +43448,12 @@
},
/turf/open/floor/plating,
/area/bigredv2/caves/mining)
+"rUp" = (
+/obj/effect/landmark/crap_item,
+/turf/open/floor{
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
"rUs" = (
/obj/structure/machinery/door_control{
id = "safe_room";
@@ -44228,6 +43465,10 @@
},
/turf/open/floor/wood,
/area/bigredv2/caves/lambda/breakroom)
+"rUL" = (
+/obj/structure/flora/grass/desert/lightgrass_1,
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/w)
"rUN" = (
/obj/structure/platform{
dir = 4
@@ -44262,17 +43503,26 @@
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/n)
-"rWu" = (
-/obj/item/storage/box/MRE{
- pixel_x = -1;
- pixel_y = -6
+"rWp" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
},
-/obj/item/storage/box/MRE{
- pixel_x = 3;
- pixel_y = 3
+/obj/structure/barricade/wooden{
+ desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
+ dir = 8;
+ health = 25000
},
-/turf/closed/wall/solaris/rock,
-/area/bigredv2/caves)
+/turf/open/floor{
+ icon_state = "dark"
+ },
+/area/bigredv2/outside/general_offices)
+"rWE" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/generic,
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/virology)
"rWF" = (
/obj/item/stack/cable_coil/cut{
pixel_x = 6;
@@ -44282,6 +43532,16 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/caves/mining)
+"rWM" = (
+/obj/structure/machinery/door/airlock/almayer/security/glass/colony{
+ dir = 1;
+ name = "\improper Marshal Office Prison";
+ icon_state = "door_open"
+ },
+/turf/open/floor{
+ icon_state = "delivery"
+ },
+/area/bigredv2/outside/marshal_office)
"rWN" = (
/obj/effect/decal/cleanable/blood/drip{
pixel_x = -9;
@@ -44291,6 +43551,12 @@
icon_state = "mars_cave_16"
},
/area/bigredv2/caves/mining)
+"rXe" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating{
+ icon_state = "platebot"
+ },
+/area/bigredv2/outside/space_port)
"rXy" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb,
@@ -44303,11 +43569,10 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"rXO" = (
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached15"
- },
-/area/bigredv2/outside/s)
+"rXP" = (
+/obj/structure/flora/grass/desert/lightgrass_1,
+/turf/open/mars,
+/area/bigredv2/outside/c)
"rXY" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 1
@@ -44330,6 +43595,12 @@
icon_state = "mars_dirt_6"
},
/area/bigredv2/caves_north)
+"rYz" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached15"
+ },
+/area/bigredv2/outside/c)
"rYD" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/machinery/light{
@@ -44349,16 +43620,26 @@
/obj/effect/spawner/random/toolbox,
/turf/open/floor,
/area/bigredv2/outside/cargo)
-"rZb" = (
-/obj/effect/decal/cleanable/blood,
-/obj/item/shard/shrapnel/bone_chips,
-/turf/open/floor{
- icon_state = "freezerfloor"
- },
-/area/bigredv2/outside/general_offices)
"rZn" = (
/turf/closed/wall/solaris/reinforced,
/area/bigredv2/outside/w)
+"rZP" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/structure/barricade/wooden{
+ desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
+ dir = 8;
+ health = 25000;
+ layer = 2.8
+ },
+/obj/structure/machinery/vending/snack{
+ pixel_x = 5;
+ pixel_y = -1;
+ layer = 2.9
+ },
+/turf/open/floor,
+/area/bigredv2/outside/general_offices)
"rZQ" = (
/obj/structure/surface/table,
/obj/item/reagent_container/food/snacks/csandwich,
@@ -44376,6 +43657,14 @@
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/n)
+"san" = (
+/obj/item/trash/cigbutt{
+ pixel_x = 4
+ },
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached9"
+ },
+/area/bigredv2/outside/c)
"sap" = (
/obj/effect/decal/warning_stripes{
icon_state = "N";
@@ -44386,16 +43675,14 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/engineering)
-"sav" = (
-/obj/item/trash/raisins{
- pixel_y = -5;
- pixel_x = -8
- },
-/obj/effect/decal/cleanable/generic,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached3"
+"saE" = (
+/obj/effect/decal/cleanable/blood/xeno,
+/obj/item/ammo_casing/bullet,
+/obj/item/ammo_casing/bullet,
+/turf/open/floor{
+ icon_state = "dark"
},
-/area/bigredv2/outside/nw)
+/area/bigredv2/outside/general_offices)
"saX" = (
/obj/structure/machinery/power/turbine,
/turf/open/floor{
@@ -44418,13 +43705,6 @@
icon_state = "asteroidfloor"
},
/area/bigredv2/outside/space_port_lz2)
-"sbv" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/generic,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
- },
-/area/bigredv2/outside/nw)
"sbz" = (
/obj/structure/platform/kutjevo/rock{
dir = 8
@@ -44447,39 +43727,25 @@
},
/turf/open/floor/plating,
/area/bigredv2/caves/mining)
+"sbI" = (
+/obj/structure/surface/table,
+/obj/structure/bedsheetbin{
+ pixel_y = 10;
+ pixel_x = 4
+ },
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/turf/open/floor{
+ icon_state = "freezerfloor"
+ },
+/area/bigredv2/outside/general_offices)
"sbQ" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor{
icon_state = "dark"
},
/area/bigredv2/caves/eta/living)
-"scf" = (
-/obj/effect/landmark/corpsespawner/doctor,
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor{
- icon_state = "white"
- },
-/area/bigredv2/outside/medical)
-"scp" = (
-/obj/effect/decal/strata_decals/grime/grime4,
-/obj/item/prop{
- desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
- icon = 'icons/obj/janitor.dmi';
- icon_state = "trashbag3";
- name = "trash bag";
- pixel_x = 9;
- layer = 3.01;
- pixel_y = 1
- },
-/obj/item/trash/hotdog{
- pixel_x = -5;
- pixel_y = 1
- },
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
- },
-/area/bigredv2/outside/nw)
"scK" = (
/obj/structure/platform{
dir = 8
@@ -44489,6 +43755,16 @@
icon_state = "asteroidfloor"
},
/area/bigredv2/outside/telecomm/n_cave)
+"sdg" = (
+/obj/item/trash/cigbutt{
+ pixel_x = -10;
+ pixel_y = 7
+ },
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/n)
"sdl" = (
/obj/structure/bed/chair/comfy{
dir = 4
@@ -44498,12 +43774,15 @@
icon_state = "wood"
},
/area/bigredv2/outside/library)
-"sdx" = (
-/turf/open/asphalt/cement{
- icon_state = "cement1";
- dir = 1
+"sdn" = (
+/obj/item/trash/sosjerky{
+ pixel_x = -12;
+ pixel_y = 17
},
-/area/bigredv2/outside/space_port)
+/turf/open/floor{
+ icon_state = "dark"
+ },
+/area/bigredv2/outside/marshal_office)
"sdP" = (
/obj/structure/largecrate/random/barrel/white,
/turf/open/floor/plating,
@@ -44517,34 +43796,54 @@
icon_state = "mars_dirt_7"
},
/area/bigredv2/caves/mining)
+"sfg" = (
+/obj/structure/machinery/computer/crew{
+ density = 0;
+ pixel_y = 16
+ },
+/obj/item/reagent_container/pill/happy,
+/turf/open/floor{
+ icon_state = "whitegreenfull"
+ },
+/area/bigredv2/outside/medical)
+"sfm" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/space_port_lz2)
+"sfw" = (
+/obj/effect/decal/cleanable/blood/drip,
+/obj/item/trash/crushed_cup{
+ pixel_x = -7;
+ pixel_y = -8
+ },
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidfloor"
+ },
+/area/bigredv2/outside/ne)
"sfI" = (
/turf/open/mars_cave{
icon_state = "mars_cave_23"
},
/area/bigredv2/caves_east)
-"sfL" = (
-/obj/structure/machinery/light{
- dir = 1
+"sfN" = (
+/obj/structure/machinery/door/airlock/almayer/generic{
+ name = "\improper Private Office";
+ density = 0;
+ icon_state = "door_open"
},
+/obj/effect/decal/cleanable/blood/drip,
/turf/open/floor{
- dir = 1;
- icon_state = "whitegreencorner"
+ icon_state = "delivery"
},
-/area/bigredv2/outside/medical)
+/area/bigredv2/outside/office_complex)
"sgk" = (
-/obj/item/ammo_casing/bullet,
-/turf/open/floor{
- dir = 4;
- icon_state = "asteroidwarning"
- },
-/area/bigredv2/outside/c)
-"sgl" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/xeno,
-/turf/open/floor{
- icon_state = "redcorner"
+/obj/structure/flora/grass/desert/lightgrass_3,
+/obj/structure/flora/bush/desert{
+ icon_state = "tree_3"
},
-/area/bigredv2/outside/marshal_office)
+/turf/open/mars,
+/area/bigredv2/outside/ne)
"sgF" = (
/obj/structure/cable{
icon_state = "1-6"
@@ -44589,52 +43888,47 @@
icon_state = "asteroidwarning"
},
/area/bigred/ground/garage_workshop)
-"siu" = (
-/obj/effect/decal/cleanable/blood/drip,
-/turf/open/floor{
- icon_state = "asteroidwarning"
- },
-/area/bigredv2/outside/eta)
-"six" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood,
-/obj/effect/landmark/corpsespawner/colonist,
-/obj/effect/decal/cleanable/blood/gibs/body,
-/turf/open/floor{
- icon_state = "dark"
- },
-/area/bigredv2/outside/general_offices)
"siM" = (
/turf/open/mars_cave{
icon_state = "mars_cave_18"
},
/area/bigredv2/outside/lz1_telecomm_cas)
-"siS" = (
-/obj/item/bedsheet/brown{
- pixel_y = -1;
- pixel_x = 1
+"sjy" = (
+/obj/structure/surface/rack,
+/obj/structure/machinery/light{
+ dir = 1
+ },
+/obj/item/ammo_magazine/revolver/cmb{
+ pixel_y = -7;
+ pixel_x = -7
},
+/obj/item/ammo_magazine/revolver/cmb,
/turf/open/floor{
- icon_state = "dark"
+ dir = 8;
+ icon_state = "vault"
},
/area/bigredv2/outside/marshal_office)
-"siV" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement,
-/area/bigredv2/outside/space_port)
+"sjD" = (
+/obj/item/toy/beach_ball{
+ pixel_x = -6;
+ pixel_y = -10
+ },
+/turf/open/floor{
+ icon_state = "wood"
+ },
+/area/bigredv2/outside/dorms)
"ski" = (
/turf/open/mars_cave,
/area/bigredv2/outside/lz2_west_cas)
-"skk" = (
-/obj/structure/flora/grass/desert/lightgrass_8,
-/turf/open/mars,
-/area/bigredv2/outside/n)
-"skr" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached3"
+"slj" = (
+/obj/item/trash/eat{
+ pixel_x = 2;
+ pixel_y = 10
},
-/area/bigredv2/outside/s)
+/turf/open/floor{
+ icon_state = "wood"
+ },
+/area/bigredv2/outside/bar)
"sln" = (
/obj/effect/decal/cleanable/blood{
icon_state = "xgib4"
@@ -44643,49 +43937,47 @@
icon_state = "mars_dirt_5"
},
/area/bigredv2/caves/mining)
+"slo" = (
+/obj/effect/landmark/corpsespawner/colonist,
+/obj/effect/decal/cleanable/blood,
+/obj/effect/decal/cleanable/blood/gibs/body,
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/c)
"slC" = (
/turf/open/floor{
dir = 1;
icon_state = "darkyellowcorners2"
},
/area/bigredv2/outside/engineering)
-"slD" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
- },
-/area/bigredv2/outside/virology)
"slG" = (
/obj/structure/pipes/standard/simple/hidden/green,
/turf/open/floor{
icon_state = "dark"
},
/area/bigredv2/outside/engineering)
-"slR" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
- },
-/area/bigredv2/outside/w)
-"slT" = (
-/obj/structure/flora/pottedplant{
- icon_state = "pottedplant_22"
+"slO" = (
+/obj/structure/flora/grass/desert/lightgrass_5,
+/turf/open/mars,
+/area/bigredv2/outside/filtration_plant)
+"slS" = (
+/obj/structure/surface/table/woodentable{
+ dir = 4;
+ flipped = 1
},
+/obj/effect/landmark/objective_landmark/medium,
/turf/open/floor{
- dir = 1;
- icon_state = "whitegreencorner"
+ icon_state = "wood"
},
-/area/bigredv2/outside/medical)
+/area/bigredv2/outside/bar)
+"sma" = (
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached12"
+ },
+/area/bigredv2/outside/space_port_lz2)
"smh" = (
/obj/structure/blocker/forcefield/multitile_vehicles,
/turf/open/floor/plating,
/area/bigredv2/caves_north)
-"smn" = (
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
- },
-/area/bigredv2/outside/space_port_lz2)
"smy" = (
/obj/item/stack/cable_coil/cut,
/turf/open/mars_cave{
@@ -44707,16 +43999,29 @@
icon_state = "mars_cave_9"
},
/area/bigredv2/outside/lz1_north_cas)
-"snh" = (
-/obj/effect/acid_hole,
-/turf/closed/wall/solaris,
-/area/bigredv2/outside/general_offices)
+"smR" = (
+/obj/structure/machinery/landinglight/ds1/delaythree,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor{
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/space_port)
"snk" = (
/obj/item/tank/air,
/turf/open/mars_cave{
icon_state = "mars_cave_2"
},
/area/bigredv2/outside/filtration_cave_cas)
+"snt" = (
+/obj/structure/barricade/handrail{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor{
+ dir = 8;
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/c)
"snv" = (
/obj/structure/machinery/light_construct{
dir = 4
@@ -44754,57 +44059,13 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"soF" = (
-/obj/item/stack/sheet/metal{
- pixel_x = 3;
- pixel_y = -11
- },
-/turf/open/floor{
- icon_state = "delivery"
- },
-/area/bigredv2/outside/marshal_office)
-"spr" = (
-/obj/structure/machinery/computer/arcade,
-/turf/open/floor{
- dir = 4;
- icon_state = "redcorner"
- },
-/area/bigredv2/outside/marshal_office)
-"spw" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/medical_decals{
- icon_state = "triagedecalbottom"
- },
-/turf/open/floor{
- dir = 10;
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
-"spA" = (
-/obj/structure/flora/grass/desert/lightgrass_3,
-/turf/open/mars,
-/area/bigredv2/outside/se)
-"spJ" = (
-/obj/item/prop{
- desc = "A blood bag with a hole in it. The rats must have gotten to it first.";
- icon = 'icons/obj/items/bloodpack.dmi';
- icon_state = "bloodpack";
- name = "blood bag";
- pixel_x = -5;
- pixel_y = 2;
- layer = 2.8
- },
-/turf/open/floor{
- icon_state = "white"
- },
-/area/bigredv2/outside/medical)
-"spX" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/generic,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached3"
+"spi" = (
+/obj/item/clothing/suit/storage/CMB{
+ pixel_x = -6;
+ pixel_y = -10
},
-/area/bigredv2/outside/s)
+/turf/closed/wall/solaris/rock,
+/area/bigredv2/caves)
"sqc" = (
/obj/effect/decal/cleanable/blood{
base_icon = 'icons/obj/items/weapons/grenade.dmi';
@@ -44836,45 +44097,24 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"sqY" = (
-/obj/effect/decal/cleanable/blood,
-/obj/item/stack/sheet/wood{
- pixel_y = -6
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor,
-/area/bigredv2/outside/general_offices)
-"srH" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/barricade/handrail/medical{
+"srN" = (
+/obj/structure/bed/bedroll{
dir = 1
},
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidwarning"
- },
-/area/bigredv2/outside/nw)
-"srP" = (
-/obj/structure/pipes/standard/manifold/hidden/green,
-/turf/open/floor{
- icon_state = "whitegreenfull"
+/obj/item/prop/colony/usedbandage{
+ dir = 5;
+ pixel_y = 8
},
-/area/bigredv2/outside/medical)
-"srX" = (
-/obj/item/ammo_casing/bullet,
/turf/open/floor{
- dir = 8;
- icon_state = "asteroidwarning"
- },
-/area/bigredv2/outside/c)
-"ssi" = (
-/obj/effect/decal/cleanable/vomit{
- icon_state = "vomit_4"
+ icon_state = "freezerfloor"
},
+/area/bigredv2/outside/general_offices)
+"ssb" = (
+/obj/effect/decal/cleanable/blood/gibs/xeno/limb,
/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
+ icon_state = "cement_sunbleached2"
},
-/area/bigredv2/outside/nw)
+/area/bigredv2/outside/c)
"sso" = (
/obj/structure/bed/chair,
/turf/open/mars_cave{
@@ -44897,38 +44137,80 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/caves/mining)
-"ssW" = (
-/obj/structure/flora/grass/desert/lightgrass_12,
-/turf/open/mars{
- icon_state = "mars_dirt_12"
- },
-/area/bigredv2/outside/w)
-"stk" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood,
+"std" = (
+/obj/effect/landmark/corpsespawner/colonist,
/obj/effect/decal/cleanable/blood/gibs/body,
-/turf/open/floor{
- icon_state = "grimy"
+/turf/open/floor/plating,
+/area/bigredv2/outside/medical)
+"stj" = (
+/obj/effect/landmark/objective_landmark/medium,
+/turf/open/floor,
+/area/bigredv2/outside/office_complex)
+"stw" = (
+/obj/item/reagent_container/spray/cleaner{
+ desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back.";
+ name = "Surgery Cleaner";
+ pixel_y = 8;
+ pixel_x = 13
},
-/area/bigredv2/outside/dorms)
-"stx" = (
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidwarning"
+/obj/item/reagent_container/food/drinks/cup,
+/obj/effect/decal/cleanable/generic,
+/turf/open/mars_cave{
+ icon_state = "mars_cave_9"
},
-/area/bigredv2/outside/n)
+/area/bigredv2/outside/nw)
"stZ" = (
/obj/effect/landmark/static_comms/net_two,
/turf/open/floor{
icon_state = "bcircuit"
},
/area/bigredv2/outside/telecomm/lz2_cave)
+"sue" = (
+/turf/open/asphalt/cement{
+ icon_state = "cement1";
+ dir = 1
+ },
+/area/bigredv2/outside/space_port)
"sus" = (
/turf/open/mars_cave{
icon_state = "mars_cave_23"
},
/area/bigredv2/caves_research)
+"suz" = (
+/obj/item/prop{
+ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
+ icon = 'icons/obj/janitor.dmi';
+ icon_state = "trashbag3";
+ name = "trash bag";
+ pixel_x = -6;
+ pixel_y = 12
+ },
+/obj/item/prop{
+ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
+ icon = 'icons/obj/janitor.dmi';
+ icon_state = "trashbag3";
+ name = "trash bag";
+ pixel_x = 7;
+ pixel_y = 3;
+ layer = 3.1
+ },
+/obj/effect/landmark/corpsespawner/colonist,
+/obj/effect/decal/cleanable/blood/gibs/body,
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidfloor"
+ },
+/area/bigredv2/outside/ne)
+"suB" = (
+/obj/structure/surface/table,
+/obj/effect/spawner/random/toolbox{
+ pixel_x = 6;
+ pixel_y = 5
+ },
+/obj/structure/pipes/vents/pump,
+/turf/open/floor,
+/area/bigredv2/outside/general_offices)
"suD" = (
/obj/structure/prop/almayer/cannon_cables{
name = "\improper Cables"
@@ -44961,14 +44243,12 @@
},
/area/bigredv2/oob)
"suH" = (
-/obj/structure/bed/chair/wood/normal{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor{
- icon_state = "wood"
+/obj/effect/landmark/crap_item,
+/turf/open/asphalt/cement{
+ icon_state = "cement1";
+ dir = 1
},
-/area/bigredv2/outside/bar)
+/area/bigredv2/outside/filtration_cave_cas)
"suV" = (
/obj/structure/machinery/door/airlock/multi_tile/almayer/engidoor{
dir = 1;
@@ -44978,60 +44258,6 @@
icon_state = "delivery"
},
/area/bigred/ground/garage_workshop)
-"svs" = (
-/obj/item/prop{
- desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
- icon = 'icons/obj/janitor.dmi';
- icon_state = "trashbag3";
- name = "trash bag";
- pixel_x = -11;
- pixel_y = -4;
- layer = 3.2
- },
-/obj/item/prop{
- desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
- icon = 'icons/obj/janitor.dmi';
- icon_state = "trashbag3";
- name = "trash bag";
- pixel_x = 7;
- pixel_y = 16;
- layer = 3.1
- },
-/obj/effect/decal/cleanable/blood/drip,
-/obj/item/trash/hotdog{
- pixel_x = 4;
- pixel_y = -2
- },
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
- },
-/area/bigredv2/outside/ne)
-"svu" = (
-/obj/item/stack/sheet/wood{
- layer = 4.1;
- pixel_x = 14;
- pixel_y = -4
- },
-/turf/open/floor{
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
-"swk" = (
-/obj/structure/machinery/light{
- dir = 4
- },
-/turf/open/floor{
- dir = 10;
- icon_state = "asteroidwarning"
- },
-/area/bigredv2/outside/w)
-"swm" = (
-/obj/effect/decal/strata_decals/grime/grime4,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached3"
- },
-/area/bigredv2/outside/space_port_lz2)
"swJ" = (
/obj/structure/surface/table,
/obj/effect/landmark/objective_landmark/science,
@@ -45039,15 +44265,17 @@
icon_state = "freezerfloor"
},
/area/bigredv2/outside/virology)
-"sxi" = (
-/obj/structure/bed/chair{
- dir = 4
+"swL" = (
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached4"
},
-/obj/effect/decal/cleanable/blood/drip,
+/area/bigredv2/outside/w)
+"swR" = (
+/obj/effect/decal/cleanable/blood/gibs/limb,
/turf/open/floor{
- icon_state = "dark"
+ icon_state = "asteroidwarning"
},
-/area/bigredv2/outside/marshal_office)
+/area/bigredv2/outside/n)
"sxs" = (
/obj/effect/decal/cleanable/blood/drip{
pixel_x = -3;
@@ -45069,13 +44297,6 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/caves/mining)
-"syp" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/turf/open/floor{
- dir = 6;
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
"syu" = (
/obj/effect/decal/cleanable/blood{
icon_state = "xgib3"
@@ -45084,27 +44305,36 @@
icon_state = "mars_cave_16"
},
/area/bigredv2/caves/mining)
-"syZ" = (
-/obj/effect/decal/cleanable/ash{
- pixel_y = -21
+"syv" = (
+/obj/effect/decal/cleanable/molten_item{
+ pixel_x = -5;
+ pixel_y = -11
},
/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
+ icon_state = "cement_sunbleached12"
},
/area/bigredv2/outside/nw)
-"szd" = (
-/obj/structure/barricade/wooden{
- desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
- dir = 8;
- health = 25000;
- pixel_y = 4;
- pixel_x = 22
+"syI" = (
+/obj/structure/pipes/vents/pump{
+ dir = 1
+ },
+/obj/item/trash/crushed_cup{
+ pixel_x = -10;
+ pixel_y = 1
},
/turf/open/floor{
- dir = 4;
- icon_state = "redcorner"
+ icon_state = "wood"
},
-/area/bigredv2/outside/marshal_office)
+/area/bigredv2/outside/bar)
+"syW" = (
+/obj/item/trash/cigbutt{
+ pixel_x = 4
+ },
+/turf/open/floor{
+ dir = 8;
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/c)
"szi" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
@@ -45126,6 +44356,13 @@
icon_state = "darkyellowcorners2"
},
/area/bigredv2/outside/engineering)
+"szU" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/bed,
+/turf/open/floor{
+ icon_state = "white"
+ },
+/area/bigredv2/outside/marshal_office)
"szZ" = (
/obj/structure/window/reinforced/tinted,
/obj/structure/machinery/shower{
@@ -45135,16 +44372,6 @@
icon_state = "freezerfloor"
},
/area/bigredv2/outside/dorms)
-"sAw" = (
-/obj/structure/pipes/standard/manifold/hidden/green{
- dir = 8
- },
-/obj/structure/machinery/iv_drip,
-/obj/effect/decal/cleanable/blood/drip,
-/turf/open/floor{
- icon_state = "white"
- },
-/area/bigredv2/outside/medical)
"sAG" = (
/obj/effect/landmark/hunter_primary,
/turf/open/mars_cave{
@@ -45158,6 +44385,16 @@
/obj/structure/surface/table/reinforced/prison,
/turf/open/floor/plating,
/area/bigredv2/caves/mining)
+"sAY" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 10
+ },
+/obj/item/reagent_container/spray/cleaner,
+/turf/open/floor{
+ dir = 8;
+ icon_state = "whitegreencorner"
+ },
+/area/bigredv2/outside/medical)
"sBm" = (
/obj/structure/bed/chair{
dir = 8
@@ -45176,24 +44413,54 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/caves_east)
+"sBO" = (
+/obj/structure/surface/table,
+/obj/structure/machinery/light{
+ dir = 1
+ },
+/obj/item/reagent_container/glass/bottle/cyanide{
+ pixel_y = 2;
+ pixel_x = -6
+ },
+/turf/open/floor{
+ icon_state = "wood"
+ },
+/area/bigredv2/outside/dorms)
"sCj" = (
/obj/item/stack/cable_coil/cut,
/turf/open/mars_cave{
icon_state = "mars_cave_17"
},
/area/bigredv2/caves/mining)
-"sCk" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/e)
"sCt" = (
/turf/open/floor{
icon_state = "darkyellow2"
},
/area/bigredv2/outside/engineering)
+"sCE" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached3"
+ },
+/area/bigredv2/outside/virology)
+"sCK" = (
+/turf/open/asphalt/cement{
+ icon_state = "cement4"
+ },
+/area/bigredv2/outside/lambda_cave_cas)
+"sCL" = (
+/obj/item/tool/warning_cone,
+/obj/structure/blocker/forcefield/multitile_vehicles,
+/turf/open/asphalt/cement{
+ icon_state = "cement9"
+ },
+/area/bigredv2/outside/filtration_cave_cas)
+"sCV" = (
+/obj/effect/decal/cleanable/vomit{
+ icon_state = "vomit_2"
+ },
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/c)
"sDs" = (
/obj/structure/closet/crate/miningcar,
/obj/item/weapon/gun/smg/nailgun,
@@ -45244,13 +44511,43 @@
icon_state = "darkgreencorners2"
},
/area/bigredv2/caves/eta/research)
-"sFc" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/ammo_casing/bullet,
+"sEx" = (
+/obj/structure/flora/grass/desert/lightgrass_3,
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/nw)
+"sEz" = (
+/obj/structure/machinery/light{
+ dir = 4
+ },
+/obj/structure/bed,
/turf/open/floor{
+ dir = 4;
icon_state = "whitegreen"
},
-/area/bigredv2/outside/medical)
+/area/bigredv2/outside/marshal_office)
+"sED" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/item/trash/cigbutt{
+ pixel_x = -6;
+ pixel_y = -9
+ },
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidfloor"
+ },
+/area/bigredv2/outside/ne)
+"sFm" = (
+/obj/structure/surface/table,
+/obj/item/trash/kepler{
+ pixel_x = -5;
+ pixel_y = 8
+ },
+/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
+/turf/open/floor,
+/area/bigredv2/outside/marshal_office)
"sFv" = (
/turf/open/floor{
dir = 1;
@@ -45263,31 +44560,11 @@
icon_state = "mars_cave_17"
},
/area/bigredv2/caves/mining)
-"sFX" = (
-/obj/item/stack/sheet/wood{
- pixel_x = 4
- },
-/turf/open/floor{
- dir = 1;
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
"sGi" = (
/turf/open/mars_cave{
icon_state = "mars_cave_5"
},
/area/bigredv2/outside/lz1_telecomm_cas)
-"sGz" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/structure/surface/table/woodentable{
- flipped = 1
- },
-/turf/open/floor{
- icon_state = "wood"
- },
-/area/bigredv2/outside/bar)
"sGT" = (
/obj/item/tool/weldpack,
/obj/item/frame/rack,
@@ -45296,6 +44573,29 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
+"sHb" = (
+/obj/effect/decal/strata_decals/grime/grime2{
+ dir = 1
+ },
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached15"
+ },
+/area/bigredv2/outside/nw)
+"sHn" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/floor,
+/area/bigredv2/outside/dorms)
+"sHr" = (
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/floor{
+ icon_state = "white"
+ },
+/area/bigredv2/outside/medical)
+"sHy" = (
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/floor,
+/area/bigredv2/outside/lambda_cave_cas)
"sHz" = (
/obj/item/ore{
pixel_x = 9;
@@ -45318,20 +44618,6 @@
},
/turf/closed/wall/solaris/rock,
/area/bigredv2/caves)
-"sIp" = (
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor,
-/area/bigredv2/outside/dorms)
-"sIs" = (
-/obj/item/reagent_container/glass/fertilizer/ez,
-/turf/open/floor{
- icon_state = "white"
- },
-/area/bigredv2/outside/marshal_office)
-"sIN" = (
-/obj/structure/flora/grass/desert/lightgrass_5,
-/turf/open/mars,
-/area/bigredv2/outside/space_port_lz2)
"sIP" = (
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
@@ -45345,27 +44631,42 @@
icon_state = "delivery"
},
/area/bigredv2/outside/c)
-"sJq" = (
-/obj/structure/fence,
-/turf/open/asphalt/cement{
- icon_state = "cement4"
- },
-/area/bigredv2/outside/filtration_cave_cas)
-"sJK" = (
+"sJv" = (
/obj/effect/decal/cleanable/dirt,
+/obj/item/trash/cigbutt{
+ pixel_x = -10;
+ pixel_y = 14
+ },
/turf/open/asphalt/cement_sunbleached{
icon_state = "cement_sunbleached4"
},
-/area/bigredv2/outside/e)
-"sKf" = (
-/obj/effect/decal/cleanable/blood/drip,
-/turf/open/floor,
-/area/bigredv2/outside/dorms)
+/area/bigredv2/outside/nw)
+"sKG" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
+/turf/open/asphalt/cement{
+ icon_state = "cement12"
+ },
+/area/bigredv2/caves_lambda)
+"sLb" = (
+/obj/structure/flora/grass/desert/lightgrass_7,
+/obj/item/stack/folding_barricade,
+/turf/open/mars,
+/area/bigredv2/outside/c)
"sLr" = (
/turf/open/mars_cave{
icon_state = "mars_cave_11"
},
/area/bigredv2/caves_se)
+"sLw" = (
+/obj/structure/surface/table,
+/obj/structure/pipes/vents/pump{
+ dir = 8
+ },
+/turf/open/floor{
+ icon_state = "dark"
+ },
+/area/bigredv2/outside/general_offices)
"sLy" = (
/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
/turf/open/mars_cave{
@@ -45376,23 +44677,43 @@
/obj/structure/machinery/suit_storage_unit/carbon_unit,
/turf/open/floor/plating,
/area/bigredv2/outside/admin_building)
-"sLW" = (
-/obj/item/trash/cigbutt{
- pixel_x = 1;
- pixel_y = 5
+"sMq" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/structure/barricade/wooden{
+ desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
+ dir = 8;
+ health = 25000
},
/turf/open/floor{
dir = 1;
- icon_state = "asteroidwarning"
+ icon_state = "whitegreencorner"
+ },
+/area/bigredv2/outside/medical)
+"sMt" = (
+/obj/item/weapon/dart{
+ pixel_x = 10
},
-/area/bigredv2/outside/c)
-"sNj" = (
-/obj/effect/decal/cleanable/blood,
/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
+ dir = 8;
+ icon_state = "carpet9-4"
},
-/area/bigredv2/outside/ne)
+/area/bigredv2/outside/bar)
+"sNC" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/generic,
+/turf/open/asphalt/cement,
+/area/bigredv2/caves_lambda)
+"sNI" = (
+/obj/item/clothing/mask/gas{
+ pixel_x = -10;
+ pixel_y = 4
+ },
+/turf/closed/wall/solaris/rock,
+/area/bigredv2/caves)
"sNP" = (
/obj/structure/window/framed/solaris,
/turf/open/floor/plating{
@@ -45404,15 +44725,6 @@
icon_state = "mars_cave_11"
},
/area/bigredv2/caves_lambda)
-"sOc" = (
-/obj/structure/barricade/metal{
- dir = 4
- },
-/turf/open/floor{
- dir = 6;
- icon_state = "darkred2"
- },
-/area/bigredv2/outside/admin_building)
"sOi" = (
/obj/structure/airlock_assembly,
/turf/open/floor/plating{
@@ -45420,13 +44732,15 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"sOk" = (
-/obj/structure/bed,
-/obj/effect/landmark/survivor_spawner,
+"sOp" = (
+/obj/item/trash/popcorn{
+ pixel_y = 9
+ },
/turf/open/floor{
- icon_state = "dark"
+ dir = 1;
+ icon_state = "asteroidfloor"
},
-/area/bigredv2/outside/marshal_office)
+/area/bigredv2/outside/nw)
"sOE" = (
/obj/structure/blocker/forcefield/multitile_vehicles,
/turf/open/mars_cave{
@@ -45438,6 +44752,30 @@
icon_state = "mars_cave_10"
},
/area/bigredv2/caves_east)
+"sPh" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached3"
+ },
+/area/bigredv2/outside/se)
+"sPo" = (
+/obj/structure/window_frame/solaris,
+/obj/item/shard,
+/turf/open/floor/plating,
+/area/bigredv2/outside/office_complex)
+"sPq" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/item/weapon/baseballbat/metal{
+ pixel_x = -16;
+ pixel_y = 18
+ },
+/obj/effect/decal/cleanable/blood,
+/obj/effect/decal/cleanable/blood/gibs/body,
+/obj/effect/landmark/corpsespawner/colonist,
+/turf/open/floor,
+/area/bigredv2/outside/general_offices)
"sPv" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
@@ -45446,19 +44784,19 @@
icon_state = "delivery"
},
/area/bigredv2/outside/bar)
-"sPM" = (
-/obj/structure/flora/grass/desert/lightgrass_5,
-/turf/open/mars,
-/area/bigredv2/outside/nw)
"sQw" = (
/turf/open/mars_cave{
icon_state = "mars_cave_23"
},
/area/bigredv2/outside/lz1_telecomm_cas)
-"sRo" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/virology)
+"sQx" = (
+/obj/structure/pipes/standard/manifold/hidden/green,
+/obj/effect/decal/cleanable/blood/xeno,
+/turf/open/floor{
+ dir = 1;
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
"sRy" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
@@ -45470,21 +44808,23 @@
icon_state = "delivery"
},
/area/bigredv2/outside/admin_building)
-"sRJ" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor{
- dir = 6;
- icon_state = "asteroidwarning"
+"sSL" = (
+/obj/item/stack/sheet/cardboard{
+ pixel_x = 8;
+ pixel_y = -1
},
-/area/bigredv2/outside/se)
-"sRV" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidfloor"
},
-/turf/open/asphalt/cement{
- icon_state = "cement4"
+/area/bigredv2/outside/ne)
+"sSM" = (
+/obj/structure/machinery/light,
+/obj/effect/decal/cleanable/generic,
+/turf/open/floor{
+ icon_state = "wood"
},
-/area/bigredv2/caves_lambda)
+/area/bigredv2/outside/bar)
"sSU" = (
/turf/open/mars_cave{
icon_state = "mars_cave_19"
@@ -45499,46 +44839,70 @@
icon_state = "wood"
},
/area/bigredv2/outside/library)
-"sTP" = (
-/obj/item/trash/semki{
- layer = 2;
- pixel_x = -13;
- pixel_y = 14
+"sTI" = (
+/obj/item/stack/rods{
+ pixel_x = -11;
+ pixel_y = -8
},
-/turf/open/mars_cave{
- icon_state = "mars_dirt_4"
+/obj/item/stack/rods{
+ pixel_y = 13;
+ pixel_x = 17
},
-/area/bigredv2/outside/w)
-"sUe" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/obj/effect/decal/cleanable/blood/drip,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor{
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/nw)
+"sUa" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/bed/roller,
+/obj/structure/machinery/iv_drip,
+/obj/effect/decal/cleanable/blood,
/turf/open/floor{
icon_state = "white"
},
/area/bigredv2/outside/medical)
+"sUn" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/coffin/woodencrate,
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidfloor"
+ },
+/area/bigredv2/outside/n)
+"sUA" = (
+/obj/effect/decal/cleanable/blood/xeno,
+/turf/open/mars,
+/area/bigredv2/outside/c)
"sUQ" = (
/obj/structure/machinery/photocopier,
/turf/open/floor/wood,
/area/bigredv2/caves/lambda/breakroom)
-"sVk" = (
-/obj/effect/decal/remains/human,
-/turf/open/asphalt/cement{
- icon_state = "cement2"
+"sVq" = (
+/obj/item/trash/semki{
+ pixel_y = -14
},
-/area/bigredv2/outside/lambda_cave_cas)
-"sVB" = (
-/obj/structure/window_frame/solaris,
-/obj/effect/decal/cleanable/blood/drip,
-/turf/open/floor/plating,
-/area/bigredv2/outside/marshal_office)
-"sVM" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached4"
},
-/turf/open/asphalt/cement,
-/area/bigredv2/caves_lambda)
+/area/bigredv2/outside/virology)
+"sVS" = (
+/obj/structure/machinery/light{
+ dir = 1
+ },
+/obj/item/prop{
+ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
+ icon = 'icons/obj/janitor.dmi';
+ icon_state = "trashbag3";
+ name = "trash bag";
+ pixel_x = -6;
+ pixel_y = 3
+ },
+/obj/effect/decal/cleanable/generic,
+/turf/open/floor{
+ icon_state = "wood"
+ },
+/area/bigredv2/outside/bar)
"sWa" = (
/obj/item/ore{
pixel_x = 12;
@@ -45559,13 +44923,14 @@
icon_state = "asteroidfloor"
},
/area/bigredv2/outside/telecomm/n_cave)
-"sWo" = (
+"sWj" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/blood/gibs/limb,
-/turf/open/floor{
- icon_state = "white"
- },
-/area/bigredv2/outside/medical)
+/turf/open/floor,
+/area/bigredv2/outside/marshal_office)
"sWS" = (
/obj/structure/largecrate/random/barrel/white,
/turf/open/floor/plating{
@@ -45590,28 +44955,19 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"sXY" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/surface/table/woodentable{
- dir = 1;
- flipped = 1
- },
-/turf/open/floor{
- icon_state = "wood"
+"sXK" = (
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/mars_cave{
+ icon_state = "mars_dirt_6"
},
-/area/bigredv2/outside/dorms)
-"sYp" = (
+/area/bigredv2/outside/n)
+"sXQ" = (
+/obj/item/weapon/broken_bottle,
/obj/effect/decal/cleanable/dirt,
-/obj/item/trash/pistachios{
- pixel_y = -21;
- pixel_x = -6
- },
-/obj/item/stack/sheet/cardboard{
- pixel_x = -1;
- pixel_y = 6
+/turf/open/floor{
+ icon_state = "whitegreen"
},
-/turf/open/floor/plating,
-/area/bigredv2/outside/bar)
+/area/bigredv2/outside/medical)
"sYL" = (
/turf/open/mars_cave{
icon_state = "mars_cave_8"
@@ -45624,13 +44980,6 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/caves/mining)
-"sYT" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/gibs/xeno/body,
-/turf/open/floor{
- icon_state = "white"
- },
-/area/bigredv2/outside/medical)
"sZh" = (
/turf/open/mars_cave{
icon_state = "mars_cave_15"
@@ -45647,30 +44996,11 @@
icon_state = "mars_dirt_4"
},
/area/bigredv2/caves/mining)
-"sZq" = (
-/obj/structure/machinery/iv_drip,
-/obj/item/prop{
- desc = "A blood bag with a hole in it. The rats must have gotten to it first.";
- icon = 'icons/obj/items/bloodpack.dmi';
- icon_state = "bloodpack";
- name = "blood bag";
- pixel_x = -5;
- pixel_y = 2;
- layer = 2.8
- },
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor{
- dir = 8;
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
-"sZv" = (
+"sZy" = (
+/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/blood,
-/turf/open/floor{
- dir = 8;
- icon_state = "asteroidwarning"
- },
-/area/bigredv2/outside/eta)
+/turf/open/floor,
+/area/bigredv2/outside/dorms)
"taf" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
@@ -45687,13 +45017,15 @@
icon_state = "podhatchfloor"
},
/area/bigredv2/outside/admin_building)
-"taK" = (
-/obj/item/stack/sheet/metal{
- pixel_x = 6;
- pixel_y = -9
+"taz" = (
+/obj/structure/airlock_assembly,
+/obj/item/stack/rods{
+ pixel_y = -2
},
-/turf/open/mars,
-/area/bigredv2/outside/c)
+/turf/open/floor{
+ icon_state = "delivery"
+ },
+/area/bigredv2/outside/medical)
"taV" = (
/obj/structure/closet/coffin/woodencrate,
/obj/effect/decal/cleanable/dirt,
@@ -45710,12 +45042,6 @@
icon_state = "whiteblue"
},
/area/bigredv2/outside/medical)
-"tbW" = (
-/obj/effect/decal/cleanable/blood/xeno,
-/turf/open/floor{
- icon_state = "redcorner"
- },
-/area/bigredv2/outside/marshal_office)
"tcb" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/pizzabox/meat,
@@ -45731,6 +45057,14 @@
/obj/effect/decal/cleanable/dirt/greenglow,
/turf/closed/wall/solaris/reinforced,
/area/bigredv2/outside/engineering)
+"tcS" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/vomit{
+ pixel_x = -7;
+ pixel_y = 13
+ },
+/turf/open/floor/plating,
+/area/bigredv2/outside/bar)
"tdp" = (
/obj/effect/decal/cleanable/blood{
icon_state = "xgib4"
@@ -45761,13 +45095,6 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/engineering)
-"tdU" = (
-/obj/item/stack/folding_barricade,
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
- },
-/area/bigredv2/outside/nw)
"tdZ" = (
/obj/item/tool/pickaxe/drill,
/obj/structure/machinery/light{
@@ -45779,6 +45106,32 @@
},
/turf/open/floor/plating,
/area/bigredv2/caves/mining)
+"teq" = (
+/turf/open/asphalt/cement{
+ icon_state = "cement3"
+ },
+/area/bigredv2/outside/filtration_cave_cas)
+"teE" = (
+/obj/structure/machinery/light{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/blood,
+/obj/effect/decal/cleanable/blood/gibs/body,
+/obj/effect/decal/cleanable/blood/gibs/limb,
+/obj/effect/landmark/corpsespawner/chef,
+/turf/open/floor{
+ icon_state = "wood"
+ },
+/area/bigredv2/outside/general_offices)
+"teO" = (
+/obj/item/trash/burger{
+ pixel_y = -10;
+ pixel_x = 8
+ },
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached15"
+ },
+/area/bigredv2/outside/nw)
"teV" = (
/obj/structure/fence,
/obj/structure/prop/invuln/minecart_tracks{
@@ -45793,6 +45146,13 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
+"teY" = (
+/obj/effect/decal/cleanable/blood,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor{
+ icon_state = "whiteblue"
+ },
+/area/bigredv2/outside/medical)
"tff" = (
/obj/effect/decal/cleanable/blood{
dir = 8;
@@ -45805,6 +45165,10 @@
icon_state = "mars_cave_16"
},
/area/bigredv2/caves/mining)
+"tfk" = (
+/obj/structure/cargo_container/arious/leftmid,
+/turf/open/floor/plating/plating_catwalk,
+/area/bigredv2/outside/space_port)
"tfp" = (
/obj/structure/prop/almayer/computers/sensor_computer1{
desc = "An old W-Y systems control computer that manages the air enviorment for a large area. Commonly used in mining operations in order to control O2 levels, alert of any dangerous gases and make the heat slightly more bearable.";
@@ -45829,52 +45193,57 @@
/obj/effect/decal/cleanable/ash,
/turf/open/floor/plating,
/area/bigredv2/caves/mining)
-"tgf" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor,
-/area/bigredv2/outside/general_offices)
"tgF" = (
/obj/effect/spawner/random/tool,
/turf/open/shuttle/escapepod{
icon_state = "floor5"
},
/area/bigredv2/oob)
+"tgK" = (
+/obj/effect/decal/cleanable/blood/xeno,
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached2"
+ },
+/area/bigredv2/outside/e)
"tgL" = (
/turf/open/mars_cave{
icon_state = "mars_cave_6"
},
/area/bigredv2/caves_se)
-"tgQ" = (
-/obj/structure/barricade/handrail/medical{
- dir = 1
+"thB" = (
+/obj/item/stack/sheet/metal{
+ pixel_x = 3;
+ pixel_y = -11
},
/turf/open/floor{
- dir = 5;
- icon_state = "asteroidwarning"
+ icon_state = "delivery"
},
+/area/bigredv2/outside/marshal_office)
+"thO" = (
+/turf/open/asphalt/cement_sunbleached,
/area/bigredv2/outside/nw)
-"thl" = (
-/obj/structure/machinery/landinglight/ds1/delaythree,
-/obj/effect/decal/cleanable/dirt,
+"thW" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/item/ammo_casing/bullet,
/turf/open/floor{
- icon_state = "asteroidwarning"
+ dir = 4;
+ icon_state = "redcorner"
},
-/area/bigredv2/outside/space_port)
-"thB" = (
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached3"
+/area/bigredv2/outside/marshal_office)
+"tij" = (
+/obj/item/trash/cigbutt{
+ pixel_x = -6;
+ pixel_y = -9
},
-/area/bigredv2/outside/w)
-"tiC" = (
-/obj/structure/bed,
-/obj/item/bedsheet/medical,
-/obj/item/prop/alien/hugger,
-/turf/open/floor{
- dir = 8;
- icon_state = "whitegreen"
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached2"
},
-/area/bigredv2/outside/medical)
+/area/bigredv2/outside/nw)
"tiD" = (
/obj/effect/decal/cleanable/blood{
icon_state = "gib6";
@@ -45886,6 +45255,17 @@
icon_state = "mars_dirt_4"
},
/area/bigredv2/caves/mining)
+"tiW" = (
+/obj/structure/prop/invuln/overhead_pipe{
+ dir = 4;
+ pixel_x = 2;
+ pixel_y = 9
+ },
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidfloor"
+ },
+/area/bigredv2/outside/ne)
"tju" = (
/obj/structure/machinery/shower{
dir = 8
@@ -45902,6 +45282,15 @@
icon_state = "mars_cave_7"
},
/area/bigredv2/outside/n)
+"tkI" = (
+/obj/effect/landmark/corpsespawner/scientist,
+/obj/effect/decal/cleanable/blood/gibs/body,
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/eta)
"tkN" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 5
@@ -45926,22 +45315,20 @@
icon_state = "elevatorshaft"
},
/area/bigredv2/caves/lambda/breakroom)
-"tlk" = (
-/obj/effect/decal/cleanable/vomit{
- icon_state = "vomit_4"
- },
-/turf/open/floor{
- dir = 4;
- icon_state = "asteroidwarning"
- },
-/area/bigredv2/outside/filtration_plant)
-"tlJ" = (
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
+"tla" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/flora/grass/desert/lightgrass_1,
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/c)
+"tlx" = (
+/turf/open/floor/plating{
+ icon_state = "platebotc"
},
-/area/bigredv2/outside/eta)
+/area/bigredv2/outside/space_port)
+"tly" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/bigredv2/outside/space_port)
"tlP" = (
/obj/structure/machinery/cm_vending/sorted/tech/tool_storage,
/obj/structure/machinery/light{
@@ -45949,33 +45336,6 @@
},
/turf/open/floor,
/area/bigred/ground/garage_workshop)
-"tlQ" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/medical_decals{
- icon_state = "triagedecalbottomleft";
- pixel_x = 20
- },
-/obj/item/stack/sheet/wood{
- pixel_x = 4;
- pixel_y = 7
- },
-/turf/open/floor{
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
-"tlR" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached3"
- },
-/area/bigredv2/outside/w)
-"tlS" = (
-/obj/effect/decal/strata_decals/grime/grime2,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement{
- icon_state = "cement4"
- },
-/area/bigredv2/outside/space_port)
"tlU" = (
/obj/structure/surface/table,
/obj/structure/window,
@@ -45987,27 +45347,18 @@
icon_state = "wood"
},
/area/bigredv2/outside/library)
-"tme" = (
-/obj/structure/barricade/wooden{
- desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
- dir = 8;
- health = 25000
- },
-/obj/structure/largecrate/random/mini{
- pixel_x = 5;
- pixel_y = -8
- },
-/obj/structure/largecrate/random/mini{
- pixel_x = 2;
- pixel_y = 9
+"tlZ" = (
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached9"
},
-/obj/structure/largecrate/random/mini{
- pixel_x = 9;
- pixel_y = 6;
- layer = 2.95
+/area/bigredv2/outside/nw)
+"tmy" = (
+/obj/item/trash/cigbutt{
+ pixel_x = -14;
+ pixel_y = -6
},
/turf/open/floor,
-/area/bigredv2/outside/general_offices)
+/area/bigredv2/outside/hydroponics)
"tmH" = (
/obj/structure/closet/crate,
/obj/structure/machinery/light{
@@ -46017,6 +45368,11 @@
icon_state = "wood"
},
/area/bigredv2/outside/dorms)
+"tmN" = (
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached9"
+ },
+/area/bigredv2/outside/e)
"tnd" = (
/obj/effect/decal/cleanable/blood/drip{
pixel_x = -3;
@@ -46032,11 +45388,37 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/outside/n)
-"toE" = (
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached1"
+"tnQ" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor{
+ icon_state = "whitegreen"
},
-/area/bigredv2/outside/e)
+/area/bigredv2/outside/medical)
+"too" = (
+/obj/structure/machinery/deployable/barrier,
+/turf/open/floor{
+ icon_state = "dark"
+ },
+/area/bigredv2/outside/marshal_office)
+"toJ" = (
+/obj/structure/bed,
+/obj/effect/decal/cleanable/blood/gibs/body,
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor{
+ dir = 4;
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
+"tpO" = (
+/obj/structure/machinery/botany,
+/obj/item/seeds/goldappleseed,
+/turf/open/floor{
+ dir = 1;
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/marshal_office)
"tpR" = (
/obj/structure/bed/chair{
dir = 4;
@@ -46064,23 +45446,15 @@
icon_state = "mars_cave_19"
},
/area/bigredv2/caves/mining)
+"tqI" = (
+/obj/effect/decal/cleanable/generic,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached4"
+ },
+/area/bigredv2/outside/se)
"tqS" = (
/turf/closed/wall/solaris/reinforced,
/area/bigredv2/caves_north)
-"tri" = (
-/obj/structure/sink{
- dir = 8;
- pixel_x = -12;
- pixel_y = 2
- },
-/obj/structure/mirror{
- pixel_x = -28
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor{
- icon_state = "freezerfloor"
- },
-/area/bigredv2/outside/dorms)
"trk" = (
/turf/open/mars_cave{
icon_state = "mars_cave_13"
@@ -46095,6 +45469,16 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/engineering)
+"trt" = (
+/obj/structure/window_frame/solaris,
+/obj/item/shard,
+/turf/open/floor/plating,
+/area/bigredv2/outside/general_offices)
+"trV" = (
+/obj/effect/decal/cleanable/blood,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor,
+/area/bigredv2/outside/general_offices)
"trW" = (
/obj/item/clothing/suit/storage/hazardvest,
/obj/effect/decal/cleanable/blood,
@@ -46109,12 +45493,6 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/caves/mining)
-"tss" = (
-/obj/structure/largecrate/random/barrel/red,
-/turf/open/floor/plating{
- icon_state = "platebotc"
- },
-/area/bigredv2/outside/space_port)
"tsy" = (
/obj/effect/decal/cleanable/dirt{
pixel_x = 8
@@ -46151,6 +45529,30 @@
icon_state = "mars_cave_14"
},
/area/bigredv2/outside/lz2_south_cas)
+"tsN" = (
+/obj/effect/decal/cleanable/blood/drip,
+/obj/item/bedsheet/medical{
+ pixel_x = 4;
+ pixel_y = -12
+ },
+/obj/effect/decal/cleanable/blood,
+/obj/effect/decal/cleanable/blood/gibs/limb,
+/turf/open/floor{
+ icon_state = "white"
+ },
+/area/bigredv2/outside/medical)
+"tsR" = (
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached14"
+ },
+/area/bigredv2/outside/space_port_lz2)
+"ttK" = (
+/obj/item/clothing/suit/armor/riot{
+ pixel_y = -5;
+ pixel_x = -4
+ },
+/turf/closed/wall/solaris/rock,
+/area/bigredv2/caves)
"tub" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 5
@@ -46174,6 +45576,27 @@
icon_state = "loadingarea"
},
/area/bigredv2/outside/cargo)
+"tuB" = (
+/obj/item/storage/pill_bottle/tramadol{
+ pixel_y = -6;
+ pixel_x = 6
+ },
+/obj/item/trash/burger,
+/turf/open/floor{
+ dir = 1;
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
+"tuM" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/blood/xeno,
+/turf/open/floor{
+ dir = 4;
+ icon_state = "redcorner"
+ },
+/area/bigredv2/outside/marshal_office)
"tuN" = (
/obj/structure/machinery/light/small,
/turf/open/mars_cave,
@@ -46184,13 +45607,13 @@
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/lz2_south_cas)
-"tvl" = (
-/obj/structure/machinery/light{
- dir = 4
+"tvA" = (
+/obj/item/trash/cigbutt{
+ pixel_x = -6;
+ pixel_y = -9
},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/bigredv2/outside/space_port)
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/c)
"tvH" = (
/obj/structure/machinery/compressor{
dir = 1
@@ -46200,39 +45623,53 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/engineering)
-"tvM" = (
-/obj/item/stack/rods{
- pixel_y = 13;
- pixel_x = 17
+"twK" = (
+/obj/item/trash/cigbutt{
+ pixel_x = -10;
+ pixel_y = 13
},
-/turf/open/floor/plating,
-/area/bigredv2/outside/space_port)
-"twh" = (
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidfloor"
+ },
+/area/bigredv2/outside/c)
+"txJ" = (
+/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached9"
+ icon_state = "cement_sunbleached4"
+ },
+/area/bigredv2/outside/e)
+"txR" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
},
-/area/bigredv2/outside/w)
-"tyy" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/prop{
- desc = "A bunch of tiny bits of shattered metal.";
- icon = 'icons/obj/items/shards.dmi';
- icon_state = "shrapnelsmall";
- name = "piece of shrapnel";
- pixel_x = -1;
- pixel_y = 24
+/obj/effect/landmark/corpsespawner/security,
+/obj/effect/decal/cleanable/blood,
+/obj/effect/decal/cleanable/blood/gibs/body,
+/obj/item/weapon/gun/pistol/holdout{
+ pixel_x = 9;
+ pixel_y = 18
},
+/turf/open/floor,
+/area/bigredv2/outside/marshal_office)
+"typ" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached3"
+ },
+/area/bigredv2/outside/s)
+"tzr" = (
+/obj/effect/decal/cleanable/blood,
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
/turf/open/floor{
- icon_state = "white"
+ icon_state = "whitegreen"
},
/area/bigredv2/outside/medical)
-"tyQ" = (
-/obj/effect/decal/strata_decals/grime/grime3,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
- },
-/area/bigredv2/outside/nw)
"tzJ" = (
/obj/structure/machinery/door/airlock/almayer/engineering/colony{
name = "\improper Engine Reactor Control"
@@ -46293,13 +45730,6 @@
icon_state = "w-y1"
},
/area/bigredv2/outside/admin_building)
-"tBF" = (
-/obj/effect/decal/cleanable/blood/xeno,
-/turf/open/floor{
- dir = 4;
- icon_state = "asteroidwarning"
- },
-/area/bigredv2/outside/c)
"tBK" = (
/obj/structure/surface/rack,
/obj/item/tool/pickaxe{
@@ -46317,43 +45747,11 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"tBS" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/item/shard/shrapnel/bone_chips,
-/turf/open/floor{
- icon_state = "freezerfloor"
- },
-/area/bigredv2/outside/general_offices)
"tCh" = (
/obj/structure/machinery/door/poddoor/almayer/closed,
/obj/structure/prop/invuln/minecart_tracks,
/turf/open/floor/plating,
/area/bigredv2/caves/mining)
-"tCw" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor,
-/area/bigredv2/outside/general_offices)
-"tCB" = (
-/obj/structure/girder,
-/turf/open/floor/plating{
- icon_state = "panelscorched"
- },
-/area/bigredv2/outside/office_complex)
-"tCE" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/device/healthanalyzer{
- pixel_y = 10;
- pixel_x = 6
- },
-/turf/open/floor{
- icon_state = "whitegreencorner"
- },
-/area/bigredv2/outside/medical)
"tCH" = (
/obj/effect/decal/cleanable/blood{
dir = 8;
@@ -46366,13 +45764,6 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/caves/mining)
-"tDd" = (
-/obj/item/paper_bin{
- pixel_x = 6;
- pixel_y = -7
- },
-/turf/open/floor,
-/area/bigredv2/outside/office_complex)
"tDk" = (
/obj/structure/machinery/light/double{
dir = 1
@@ -46386,23 +45777,66 @@
icon_state = "darkredcorners2"
},
/area/bigredv2/caves/eta/xenobiology)
+"tDs" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/trash/cigbutt{
+ pixel_x = 4
+ },
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached1"
+ },
+/area/bigredv2/outside/s)
"tDv" = (
/obj/effect/landmark/crap_item,
/turf/open/mars_cave{
icon_state = "mars_cave_2"
},
/area/bigredv2/outside/lz2_west_cas)
+"tDE" = (
+/obj/item/trash/raisins{
+ pixel_y = 9;
+ pixel_x = -7
+ },
+/turf/open/floor{
+ icon_state = "dark"
+ },
+/area/bigredv2/outside/office_complex)
+"tDG" = (
+/obj/item/paper_bin{
+ pixel_x = 6;
+ pixel_y = -7
+ },
+/turf/open/floor,
+/area/bigredv2/outside/office_complex)
+"tDI" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/stack/sheet/wood{
+ pixel_x = 4
+ },
+/turf/open/floor{
+ icon_state = "wood"
+ },
+/area/bigredv2/outside/dorms)
"tEc" = (
/obj/structure/machinery/light/small,
/turf/open/mars_cave{
icon_state = "mars_dirt_4"
},
/area/bigredv2/caves_research)
-"tFc" = (
-/obj/structure/pipes/standard/manifold/hidden/green,
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor,
-/area/bigredv2/outside/cargo)
+"tEm" = (
+/obj/structure/bed/roller,
+/obj/structure/closet/bodybag,
+/turf/open/floor{
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
+"tFm" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached9"
+ },
+/area/bigredv2/outside/w)
"tFt" = (
/obj/structure/surface/table,
/obj/structure/machinery/light,
@@ -46418,41 +45852,18 @@
icon_state = "delivery"
},
/area/bigredv2/caves/lambda/breakroom)
-"tFX" = (
+"tFR" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/storage/firstaid/fire/empty,
-/turf/open/floor{
- icon_state = "whitegreencorner"
- },
-/area/bigredv2/outside/medical)
-"tGa" = (
-/obj/effect/decal/cleanable/blood,
-/obj/item/stack/sheet/cardboard{
- pixel_x = -6;
- pixel_y = -11
- },
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached12"
},
-/area/bigredv2/outside/ne)
+/area/bigredv2/outside/virology)
"tHl" = (
/obj/structure/reagent_dispensers/watertank,
/turf/open/mars{
icon_state = "mars_dirt_10"
},
/area/bigredv2/outside/c)
-"tHm" = (
-/obj/item/trash/cigbutt{
- pixel_x = -10;
- pixel_y = 16
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
- },
-/area/bigredv2/outside/ne)
"tHB" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 10
@@ -46475,6 +45886,24 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/filtration_plant)
+"tIy" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/structure/largecrate/random/barrel{
+ layer = 3.3;
+ pixel_x = -15;
+ pixel_y = -9
+ },
+/obj/structure/largecrate/random/barrel{
+ pixel_x = -4;
+ pixel_y = 10;
+ layer = 3.2
+ },
+/turf/open/floor{
+ icon_state = "white"
+ },
+/area/bigredv2/outside/medical)
"tIA" = (
/obj/structure/surface/rack,
/obj/effect/spawner/random/toolbox,
@@ -46483,18 +45912,14 @@
},
/turf/open/floor,
/area/bigred/ground/garage_workshop)
-"tIF" = (
-/obj/structure/flora/grass/desert/lightgrass_6,
-/turf/open/mars_cave{
- icon_state = "mars_dirt_4"
+"tIJ" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
},
-/area/bigredv2/outside/nw)
-"tJe" = (
-/obj/effect/decal/cleanable/blood/drip,
/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
+ icon_state = "cement_sunbleached4"
},
-/area/bigredv2/outside/nw)
+/area/bigredv2/outside/e)
"tJn" = (
/obj/effect/decal/warning_stripes{
icon_state = "W";
@@ -46516,6 +45941,24 @@
icon_state = "mars_dirt_4"
},
/area/bigredv2/caves/mining)
+"tJZ" = (
+/obj/structure/bed/bedroll{
+ dir = 10
+ },
+/obj/item/weapon/baseballbat{
+ pixel_x = -17;
+ pixel_y = 10
+ },
+/obj/item/prop/colony/usedbandage{
+ dir = 9;
+ pixel_x = 5;
+ pixel_y = 15
+ },
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidfloor"
+ },
+/area/bigredv2/outside/nw)
"tKr" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/bed/chair{
@@ -46554,6 +45997,17 @@
icon_state = "mars_cave_14"
},
/area/bigredv2/caves_north)
+"tLM" = (
+/obj/item/storage/toolbox{
+ pixel_x = 4;
+ pixel_y = 9
+ },
+/obj/item/ammo_casing/bullet,
+/turf/open/floor{
+ dir = 4;
+ icon_state = "redcorner"
+ },
+/area/bigredv2/outside/marshal_office)
"tLO" = (
/obj/structure/machinery/computer/med_data{
density = 0;
@@ -46571,10 +46025,35 @@
icon_state = "asteroidfloor"
},
/area/bigredv2/outside/space_port_lz2)
-"tMm" = (
+"tMg" = (
+/obj/structure/surface/rack,
+/obj/item/stack/sheet/mineral/gold,
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/floor{
+ icon_state = "dark"
+ },
+/area/bigredv2/outside/general_offices)
+"tMo" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 5
+ },
/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement,
-/area/bigredv2/outside/filtration_cave_cas)
+/turf/open/floor,
+/area/bigredv2/outside/general_offices)
+"tMu" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/turf/open/floor{
+ dir = 1;
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
+"tML" = (
+/obj/effect/landmark/crap_item,
+/obj/structure/pipes/standard/simple/hidden/green,
+/turf/open/floor{
+ icon_state = "whitegreenfull"
+ },
+/area/bigredv2/outside/medical)
"tNz" = (
/obj/effect/decal/warning_stripes{
icon_state = "E-corner"
@@ -46583,6 +46062,11 @@
icon_state = "mars_cave_7"
},
/area/bigredv2/outside/filtration_cave_cas)
+"tOa" = (
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached4"
+ },
+/area/bigredv2/outside/e)
"tOh" = (
/obj/structure/surface/table,
/obj/item/device/megaphone,
@@ -46590,6 +46074,28 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/caves/mining)
+"tOY" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached4"
+ },
+/area/bigredv2/outside/space_port_lz2)
+"tPB" = (
+/obj/structure/surface/table,
+/turf/open/floor{
+ icon_state = "dark"
+ },
+/area/bigredv2/outside/general_offices)
+"tPJ" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/machinery/camera/autoname{
+ dir = 1
+ },
+/turf/open/floor{
+ dir = 5;
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/s)
"tQg" = (
/obj/structure/cargo_container/horizontal/blue/bottom,
/turf/open/mars,
@@ -46616,6 +46122,13 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/caves_lambda)
+"tQU" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood/gibs/xeno/body,
+/turf/open/floor{
+ icon_state = "white"
+ },
+/area/bigredv2/outside/medical)
"tRd" = (
/obj/structure/prop/invuln/minecart_tracks{
desc = "A pipe.";
@@ -46629,11 +46142,28 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
+"tRp" = (
+/obj/effect/decal/cleanable/generic,
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/nw)
"tRI" = (
/turf/open/mars_cave{
icon_state = "mars_cave_7"
},
/area/bigredv2/caves_research)
+"tRR" = (
+/obj/structure/reagent_dispensers/beerkeg,
+/obj/structure/machinery/light{
+ dir = 4
+ },
+/obj/item/trash/crushed_cup{
+ pixel_x = -3;
+ pixel_y = 11
+ },
+/turf/open/floor{
+ icon_state = "wood"
+ },
+/area/bigredv2/outside/bar)
"tRV" = (
/obj/item/ore/uranium{
desc = "You feel fuzzy just looking at it.... it's slightly lumanesant";
@@ -46652,15 +46182,13 @@
icon_state = "mars_cave_14"
},
/area/bigredv2/caves/mining)
-"tSx" = (
-/obj/structure/blocker/forcefield/multitile_vehicles,
-/obj/effect/decal/cleanable/blood,
-/obj/effect/decal/cleanable/blood/drip,
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
+"tSd" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/tool/crowbar{
+ pixel_x = -13
},
-/area/bigredv2/outside/eta)
+/turf/open/floor,
+/area/bigredv2/outside/general_offices)
"tSI" = (
/obj/structure/platform/shiva{
dir = 8
@@ -46669,12 +46197,33 @@
icon_state = "bcircuitoff"
},
/area/bigredv2/caves/lambda/research)
+"tSJ" = (
+/obj/item/ammo_casing/shell,
+/turf/open/floor{
+ icon_state = "wood"
+ },
+/area/bigredv2/outside/bar)
+"tSQ" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor{
+ dir = 1;
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
"tTI" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor{
icon_state = "dark"
},
/area/bigredv2/outside/engineering)
+"tUs" = (
+/obj/structure/flora/grass/desert/lightgrass_5,
+/turf/open/mars,
+/area/bigredv2/outside/n)
"tUL" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/hefa_cult_decals/d32,
@@ -46683,15 +46232,15 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"tUY" = (
-/obj/structure/machinery/light{
+"tUS" = (
+/obj/structure/platform/kutjevo/rock{
dir = 4
},
-/turf/open/floor{
- dir = 9;
- icon_state = "asteroidwarning"
+/obj/effect/decal/cleanable/blood,
+/turf/open/mars_cave{
+ icon_state = "mars_cave_13"
},
-/area/bigredv2/outside/space_port_lz2)
+/area/bigredv2/outside/nw)
"tVn" = (
/obj/item/tool/lighter/zippo,
/turf/open/floor,
@@ -46715,51 +46264,50 @@
icon_state = "mars_dirt_4"
},
/area/bigredv2/outside/space_port_lz2)
-"tWr" = (
-/obj/structure/bed/bedroll{
- dir = 5
- },
-/obj/effect/decal/cleanable/blood/drip,
-/obj/item/prop/colony/usedbandage{
+"tWA" = (
+/obj/effect/decal/cleanable/blood/xeno,
+/turf/open/floor{
dir = 4;
- pixel_x = -1;
- pixel_y = -4
+ icon_state = "whitegreen"
},
-/turf/closed/wall/solaris/rock,
-/area/bigredv2/caves)
+/area/bigredv2/outside/medical)
"tWS" = (
/obj/effect/landmark/item_pool_spawner/survivor_ammo,
/turf/open/mars_cave{
icon_state = "mars_cave_13"
},
/area/bigredv2/caves/mining)
-"tXd" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/turf/open/floor{
- dir = 1;
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
-"tXp" = (
+"tYk" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
},
+/obj/item/prop/helmetgarb/spent_buckshot{
+ pixel_y = 8
+ },
/obj/effect/decal/cleanable/dirt,
/turf/open/floor{
- icon_state = "wood"
+ icon_state = "freezerfloor"
},
-/area/bigredv2/outside/bar)
-"tZH" = (
-/obj/item/weapon/gun/smg/mp5{
- current_mag = null;
- pixel_y = 8;
- pixel_x = -18
+/area/bigredv2/outside/general_offices)
+"tZb" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/barricade/metal{
+ dir = 8
+ },
+/turf/open/floor{
+ dir = 8;
+ icon_state = "darkred2"
+ },
+/area/bigredv2/outside/admin_building)
+"tZQ" = (
+/obj/structure/barricade/wooden{
+ desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
+ dir = 4;
+ health = 25000
+ },
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached3"
},
-/obj/item/ammo_casing/bullet,
-/obj/effect/landmark/corpsespawner/security,
-/obj/effect/decal/cleanable/blood,
-/obj/effect/decal/cleanable/blood/gibs/body,
-/turf/open/mars,
/area/bigredv2/outside/c)
"tZU" = (
/obj/effect/decal/cleanable/dirt,
@@ -46770,19 +46318,19 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
+"uam" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood/xeno,
+/turf/open/floor{
+ icon_state = "white"
+ },
+/area/bigredv2/outside/medical)
"uaB" = (
/turf/open/floor{
dir = 8;
icon_state = "darkpurple2"
},
/area/bigredv2/caves/lambda/research)
-"uaO" = (
-/obj/structure/machinery/light,
-/obj/effect/decal/cleanable/generic,
-/turf/open/floor{
- icon_state = "wood"
- },
-/area/bigredv2/outside/bar)
"uaS" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
@@ -46794,27 +46342,41 @@
icon_state = "test_floor4"
},
/area/bigredv2/outside/engineering)
-"ubc" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/bed,
+"ube" = (
+/obj/structure/closet/crate/trashcart{
+ pixel_x = 4;
+ pixel_y = 3
+ },
+/obj/item/reagent_container/food/drinks/bottle/beer/craft/ganucci,
+/obj/item/stack/sheet/cardboard{
+ pixel_x = 7;
+ pixel_y = -2
+ },
+/obj/item/trash/eat{
+ pixel_x = -9;
+ pixel_y = -5
+ },
/turf/open/floor{
- icon_state = "white"
+ dir = 1;
+ icon_state = "asteroidfloor"
},
-/area/bigredv2/outside/marshal_office)
+/area/bigredv2/outside/ne)
"ubY" = (
/obj/structure/barricade/wooden,
/turf/open/mars_cave{
icon_state = "mars_dirt_4"
},
/area/bigredv2/caves/mining)
-"uck" = (
-/obj/effect/decal/cleanable/generic,
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/se)
"ucl" = (
/obj/structure/cargo_container/arious/rightmid,
/turf/open/mars,
/area/bigredv2/outside/space_port_lz2)
+"ucq" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached3"
+ },
+/area/bigredv2/outside/nw)
"ucH" = (
/turf/open/mars_cave,
/area/bigredv2/caves_virology)
@@ -46823,18 +46385,6 @@
icon_state = "mars_cave_4"
},
/area/bigredv2/caves_se)
-"uea" = (
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/space_port_lz2)
-"ueo" = (
-/obj/item/trash/cigbutt{
- pixel_x = -6;
- pixel_y = -2
- },
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached3"
- },
-/area/bigredv2/outside/s)
"ueL" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/window/framed/solaris,
@@ -46842,11 +46392,6 @@
icon_state = "panelscorched"
},
/area/bigredv2/outside/engineering)
-"ufb" = (
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
- },
-/area/bigredv2/outside/c)
"ufu" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/blood/oil,
@@ -46862,32 +46407,16 @@
icon_state = "darkgreencorners2"
},
/area/bigredv2/caves/eta/research)
-"ufM" = (
-/obj/effect/decal/cleanable/blood/gibs/xeno,
-/obj/structure/largecrate/supply/medicine/medkits,
-/obj/structure/largecrate/supply{
- layer = 3.2;
- pixel_x = -2;
- pixel_y = 19
- },
-/turf/open/floor{
- icon_state = "white"
- },
-/area/bigredv2/outside/medical)
"ugc" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/largecrate/random/barrel,
/turf/open/floor,
/area/bigredv2/outside/cargo)
-"ugC" = (
-/obj/item/weapon/shield/riot{
- pixel_x = -3;
- pixel_y = -7
- },
-/turf/open/floor{
- icon_state = "dark"
- },
-/area/bigredv2/outside/marshal_office)
+"ugj" = (
+/obj/effect/landmark/crap_item,
+/obj/effect/decal/cleanable/blood/xeno,
+/turf/open/mars,
+/area/bigredv2/outside/c)
"ugW" = (
/obj/structure/machinery/light/small,
/turf/open/floor/plating{
@@ -46895,30 +46424,57 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"uhO" = (
-/obj/item/clothing/suit/storage/CMB{
- pixel_x = -6;
- pixel_y = -10
+"uhn" = (
+/obj/item/ammo_casing/shell,
+/turf/open/floor{
+ dir = 1;
+ icon_state = "whiteblue"
+ },
+/area/bigredv2/outside/medical)
+"uhV" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/clothing/suit/armor/riot{
+ pixel_y = -6;
+ pixel_x = -8
+ },
+/turf/open/floor{
+ icon_state = "dark"
+ },
+/area/bigredv2/outside/marshal_office)
+"uip" = (
+/obj/item/shard,
+/turf/open/mars_cave{
+ icon_state = "mars_cave_19"
+ },
+/area/bigredv2/outside/n)
+"uir" = (
+/obj/structure/pipes/standard/manifold/hidden/green{
+ dir = 8
},
-/turf/closed/wall/solaris/rock,
-/area/bigredv2/caves)
-"uie" = (
-/obj/effect/decal/strata_decals/grime/grime4,
+/obj/structure/machinery/iv_drip,
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/floor{
+ icon_state = "white"
+ },
+/area/bigredv2/outside/medical)
+"uiz" = (
/obj/item/trash/cigbutt{
- pixel_x = -1;
- pixel_y = 17
+ pixel_x = -10;
+ pixel_y = 16
},
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/se)
-"uij" = (
-/turf/open/asphalt/cement{
- icon_state = "cement3"
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached4"
},
-/area/bigredv2/outside/filtration_cave_cas)
+/area/bigredv2/outside/c)
"uiD" = (
-/obj/effect/decal/cleanable/blood/xeno,
-/turf/open/floor,
-/area/bigredv2/outside/office_complex)
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 6
+ },
+/obj/effect/decal/cleanable/blood/gibs/xeno,
+/turf/open/floor{
+ icon_state = "white"
+ },
+/area/bigredv2/outside/medical)
"uiE" = (
/obj/structure/bed/chair{
dir = 8;
@@ -46928,18 +46484,11 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/caves/mining)
-"uiJ" = (
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached2"
- },
-/area/bigredv2/outside/space_port_lz2)
-"ujq" = (
-/obj/structure/closet/bodybag,
-/obj/structure/bed/bedroll{
- dir = 10
- },
+"ujo" = (
+/obj/structure/surface/table,
+/obj/item/storage/firstaid/adv/empty,
/turf/open/floor{
- icon_state = "whitegreenfull"
+ icon_state = "whitegreencorner"
},
/area/bigredv2/outside/medical)
"ujC" = (
@@ -46959,6 +46508,12 @@
icon_state = "delivery"
},
/area/bigredv2/outside/filtration_cave_cas)
+"ujT" = (
+/obj/item/shard,
+/turf/open/floor{
+ icon_state = "whitegreencorner"
+ },
+/area/bigredv2/outside/medical)
"ujU" = (
/obj/item/ammo_magazine/handful/shotgun/custom_color{
color = "#6666ff";
@@ -46970,33 +46525,63 @@
icon_state = "floor5"
},
/area/bigredv2/oob)
+"ujY" = (
+/obj/structure/barricade/handrail/medical{
+ dir = 1
+ },
+/turf/open/floor{
+ dir = 5;
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/nw)
+"uki" = (
+/obj/effect/decal/cleanable/blood,
+/obj/structure/pipes/standard/simple/hidden/green,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached1"
+ },
+/area/bigredv2/outside/nw)
"ukv" = (
/turf/open/mars_cave{
icon_state = "mars_cave_15"
},
/area/bigredv2/caves_lambda)
-"ukw" = (
+"ukG" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
+/turf/open/floor/plating{
+ icon_state = "platebotc"
},
-/area/bigredv2/outside/c)
-"ukU" = (
-/turf/open/floor{
- dir = 10;
- icon_state = "asteroidwarning"
+/area/bigredv2/outside/space_port)
+"ukO" = (
+/obj/structure/surface/table,
+/obj/item/clothing/suit/armor/det_suit{
+ pixel_x = 8
},
-/area/bigredv2/caves_lambda)
+/turf/open/floor,
+/area/bigredv2/outside/marshal_office)
"ukW" = (
/turf/open/mars_cave{
icon_state = "mars_cave_20"
},
/area/bigredv2/outside/ne)
-"uld" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/surface/table,
-/turf/open/floor,
+"ukY" = (
+/obj/structure/flora/grass/desert/lightgrass_9,
+/turf/open/mars,
+/area/bigredv2/outside/s)
+"ule" = (
+/obj/structure/surface/rack,
+/obj/item/weapon/gun/revolver/cmb{
+ pixel_y = -11;
+ pixel_x = 5
+ },
+/obj/item/weapon/gun/revolver/cmb{
+ pixel_y = -1;
+ pixel_x = -3
+ },
+/turf/open/floor{
+ dir = 8;
+ icon_state = "vault"
+ },
/area/bigredv2/outside/marshal_office)
"ulk" = (
/obj/structure/prop/invuln/minecart_tracks{
@@ -47011,40 +46596,30 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
+"ulr" = (
+/turf/open/asphalt/cement{
+ icon_state = "cement12"
+ },
+/area/bigredv2/caves_lambda)
"ulH" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/device/flashlight/on,
/turf/open/floor/plating,
/area/bigredv2/caves/mining)
-"ulR" = (
-/obj/effect/landmark/corpsespawner/colonist,
-/obj/effect/decal/cleanable/blood,
-/obj/effect/decal/cleanable/blood/gibs/body,
-/turf/open/floor,
-/area/bigredv2/outside/dorms)
-"ume" = (
-/obj/structure/machinery/light{
- dir = 1
- },
-/obj/structure/machinery/door_control{
- id = "Medical";
- name = "Storm Shutters";
- pixel_y = 32
+"ulV" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
},
-/obj/structure/bed,
-/turf/open/floor{
- dir = 4;
- icon_state = "whitegreen"
+/turf/open/asphalt/cement{
+ icon_state = "cement15"
},
-/area/bigredv2/outside/medical)
-"umn" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor{
- dir = 4;
- icon_state = "asteroidwarning"
+/area/bigredv2/outside/space_port)
+"umh" = (
+/obj/effect/decal/strata_decals/grime/grime4,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached3"
},
-/area/bigredv2/outside/n)
+/area/bigredv2/outside/s)
"umK" = (
/obj/effect/decal/cleanable/blood/drip{
pixel_x = -8;
@@ -47057,10 +46632,29 @@
icon_state = "mars_cave_16"
},
/area/bigredv2/caves/mining)
-"unj" = (
-/obj/effect/landmark/objective_landmark/medium,
-/turf/open/floor,
-/area/bigredv2/outside/office_complex)
+"umN" = (
+/obj/structure/pipes/standard/manifold/hidden/green{
+ dir = 1
+ },
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached1"
+ },
+/area/bigredv2/outside/s)
+"unp" = (
+/obj/item/stack/tile/plasteel{
+ pixel_x = 1;
+ pixel_y = 9
+ },
+/turf/open/floor/plating{
+ icon_state = "panelscorched"
+ },
+/area/bigredv2/outside/medical)
+"uny" = (
+/obj/effect/decal/cleanable/generic,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached4"
+ },
+/area/bigredv2/outside/c)
"unC" = (
/turf/open/floor{
icon_state = "delivery"
@@ -47070,31 +46664,30 @@
/obj/structure/pipes/standard/simple/hidden/green,
/turf/open/floor/carpet,
/area/bigredv2/outside/library)
-"uoj" = (
-/obj/effect/decal/remains/human,
-/turf/open/asphalt/cement{
- icon_state = "cement15"
+"unX" = (
+/obj/effect/decal/strata_decals/grime/grime3,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached3"
},
-/area/bigredv2/caves_lambda)
-"upn" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/obj/effect/decal/strata_decals/grime/grime4,
-/turf/open/asphalt/cement_sunbleached,
/area/bigredv2/outside/nw)
+"uoW" = (
+/obj/structure/surface/table,
+/obj/item/explosive/grenade/incendiary/molotov{
+ pixel_y = -7;
+ pixel_x = 8
+ },
+/obj/item/explosive/grenade/incendiary/molotov{
+ pixel_y = 3;
+ pixel_x = -1
+ },
+/turf/open/floor{
+ icon_state = "freezerfloor"
+ },
+/area/bigredv2/outside/general_offices)
"upE" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor,
/area/bigred/ground/garage_workshop)
-"upK" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/item/ammo_casing/bullet,
-/turf/open/floor{
- dir = 4;
- icon_state = "redcorner"
- },
-/area/bigredv2/outside/marshal_office)
"upV" = (
/obj/structure/pipes/standard/simple/hidden/green,
/obj/effect/decal/cleanable/dirt,
@@ -47102,35 +46695,31 @@
icon_state = "delivery"
},
/area/bigredv2/outside/admin_building)
-"uqg" = (
-/obj/effect/decal/cleanable/generic,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached3"
+"uqd" = (
+/obj/structure/flora/bush/desert{
+ icon_state = "tree_3"
},
-/area/bigredv2/outside/s)
-"uqw" = (
-/obj/effect/decal/strata_decals/grime/grime2,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
+/turf/open/mars,
+/area/bigredv2/outside/sw)
+"uqA" = (
+/obj/structure/prop/invuln/rope{
+ pixel_x = -5;
+ pixel_y = 26
},
-/area/bigredv2/outside/nw)
-"uqM" = (
-/obj/structure/closet/crate/trashcart,
-/turf/open/mars_cave{
- icon_state = "mars_dirt_4"
+/obj/effect/decal/cleanable/blood/drip,
+/obj/item/prop/colony/usedbandage{
+ dir = 4;
+ pixel_x = 10;
+ pixel_y = -4
},
-/area/bigredv2/outside/nw)
-"uqX" = (
-/obj/item/trash/eat{
- pixel_x = 12;
- pixel_y = -13
+/turf/open/mars_cave{
+ icon_state = "mars_cave_7"
},
+/area/bigredv2/outside/n)
+"uqI" = (
+/obj/effect/decal/cleanable/blood/xeno,
/turf/open/floor,
-/area/bigredv2/outside/hydroponics)
-"urb" = (
-/obj/effect/decal/strata_decals/grime/grime4,
-/turf/open/asphalt/cement,
-/area/bigredv2/outside/space_port)
+/area/bigredv2/outside/office_complex)
"urn" = (
/obj/structure/surface/table,
/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
@@ -47139,22 +46728,33 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/filtration_plant)
-"usg" = (
-/obj/item/tool/warning_cone,
-/obj/structure/flora/grass/desert/lightgrass_1,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
+"urp" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "NE-out";
+ pixel_x = 1;
+ pixel_y = 1
+ },
+/turf/open/floor{
+ dir = 8;
+ icon_state = "asteroidwarning"
},
/area/bigredv2/outside/c)
-"usq" = (
-/obj/effect/decal/cleanable/blood/drip,
-/obj/item/stack/sheet/wood{
- pixel_y = -2
+"urI" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/explosive/grenade/custom/large{
+ pixel_x = 6;
+ pixel_y = 9
},
/turf/open/floor{
- icon_state = "white"
+ icon_state = "whitepurplefull"
},
/area/bigredv2/outside/medical)
+"urX" = (
+/obj/effect/decal/cleanable/blood/gibs/limb,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached12"
+ },
+/area/bigredv2/outside/e)
"ust" = (
/obj/effect/decal/cleanable/blood/drip{
pixel_x = -3;
@@ -47163,24 +46763,60 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/bigredv2/caves/mining)
+"usx" = (
+/obj/effect/decal/cleanable/generic,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached4"
+ },
+/area/bigredv2/outside/c)
+"usz" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/flora/grass/desert/lightgrass_1,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached3"
+ },
+/area/bigredv2/outside/s)
"usG" = (
/turf/open/mars_cave{
icon_state = "mars_cave_18"
},
/area/bigredv2/caves_east)
-"uua" = (
-/obj/structure/barricade/wooden{
- pixel_y = 2
+"usK" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/obj/item/tool/screwdriver{
+ pixel_x = -13;
+ pixel_y = 9
+ },
+/obj/item/tool/crowbar/red{
+ pixel_y = -14;
+ pixel_x = 2
+ },
+/obj/item/stack/tile/plasteel{
+ pixel_x = 16;
+ pixel_y = 12
+ },
+/turf/open/floor/plating,
+/area/bigredv2/outside/marshal_office)
+"utc" = (
+/obj/structure/surface/rack,
+/obj/item/ammo_magazine/shotgun/slugs{
+ pixel_y = -9;
+ pixel_x = -7
+ },
+/obj/item/ammo_magazine/shotgun/slugs{
+ pixel_y = -2
},
-/turf/open/floor,
-/area/bigredv2/outside/general_offices)
-"uuM" = (
-/obj/item/shard,
/turf/open/floor{
- dir = 4;
- icon_state = "whitegreen"
+ icon_state = "dark"
},
-/area/bigredv2/outside/medical)
+/area/bigredv2/outside/marshal_office)
+"uts" = (
+/obj/effect/landmark/corpsespawner/security/marshal,
+/obj/effect/decal/cleanable/blood/gibs/body,
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor,
+/area/bigredv2/outside/cargo)
"uuO" = (
/obj/item/shard{
icon_state = "small"
@@ -47190,6 +46826,14 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
+"uuZ" = (
+/obj/effect/decal/cleanable/blood/gibs/robot{
+ name = "door debris"
+ },
+/obj/effect/decal/cleanable/blood/gibs/xeno,
+/obj/effect/decal/cleanable/blood/xeno,
+/turf/open/floor,
+/area/bigredv2/outside/office_complex)
"uvl" = (
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
@@ -47197,27 +46841,48 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/caves/lambda/xenobiology)
-"uvm" = (
-/obj/structure/flora/grass/desert/lightgrass_3,
-/turf/open/mars,
-/area/bigredv2/outside/space_port_lz2)
"uvz" = (
/turf/open/floor{
dir = 1;
icon_state = "asteroidwarning"
},
/area/bigred/ground/garage_workshop)
+"uvL" = (
+/obj/item/prop{
+ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
+ icon = 'icons/obj/janitor.dmi';
+ icon_state = "trashbag3";
+ name = "trash bag";
+ pixel_x = -2;
+ pixel_y = -4
+ },
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidfloor"
+ },
+/area/bigredv2/outside/ne)
"uvZ" = (
/turf/open/mars_cave{
icon_state = "mars_dirt_4"
},
/area/bigredv2/outside/filtration_plant)
-"uwN" = (
+"uwf" = (
/obj/effect/decal/cleanable/dirt,
+/obj/item/trash/cigbutt{
+ pixel_x = -1;
+ pixel_y = 17
+ },
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached12"
+ },
+/area/bigredv2/outside/se)
+"uwB" = (
+/obj/effect/decal/cleanable/generic,
/turf/open/floor{
- icon_state = "wood"
+ dir = 1;
+ icon_state = "asteroidfloor"
},
-/area/bigredv2/outside/bar)
+/area/bigredv2/outside/ne)
"uwV" = (
/obj/effect/decal/cleanable/dirt,
/turf/closed/wall/solaris/reinforced,
@@ -47226,6 +46891,22 @@
/obj/structure/machinery/door/poddoor/almayer/closed,
/turf/open/floor/plating,
/area/bigredv2/caves/mining)
+"uxL" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/flour,
+/turf/open/floor/plating,
+/area/bigredv2/outside/bar)
+"uxZ" = (
+/obj/item/trash/hotdog{
+ pixel_x = 4;
+ pixel_y = -2
+ },
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidfloor"
+ },
+/area/bigredv2/outside/ne)
"uyd" = (
/obj/effect/decal/warning_stripes{
icon_state = "W";
@@ -47236,60 +46917,24 @@
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/telecomm/lz2_cave)
-"uyf" = (
-/obj/effect/decal/medical_decals{
- icon_state = "triagedecaltopleft"
- },
-/obj/structure/barricade/handrail/medical{
- dir = 1
- },
-/turf/open/floor{
- dir = 8;
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
"uyk" = (
/turf/open/mars_cave{
icon_state = "mars_cave_7"
},
/area/bigredv2/outside/lz2_west_cas)
-"uyH" = (
-/obj/item/clothing/gloves/latex{
- pixel_y = 5;
- pixel_x = 12
- },
+"uyT" = (
+/obj/structure/bed/roller,
/turf/open/floor{
- dir = 5;
- icon_state = "whitebluefull"
+ dir = 4;
+ icon_state = "whitegreen"
},
/area/bigredv2/outside/medical)
-"uyR" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor{
- dir = 9;
- icon_state = "asteroidwarning"
- },
-/area/bigredv2/outside/s)
-"uzs" = (
-/obj/structure/flora/grass/desert/lightgrass_2,
-/turf/open/mars_cave{
- icon_state = "mars_dirt_4"
- },
-/area/bigredv2/outside/nw)
"uzv" = (
/obj/structure/blocker/forcefield/multitile_vehicles,
/turf/open/mars_cave{
icon_state = "mars_dirt_7"
},
/area/bigredv2/outside/lz1_north_cas)
-"uzw" = (
-/obj/effect/landmark/corpsespawner/scientist,
-/obj/effect/decal/cleanable/blood/gibs/body,
-/obj/effect/decal/cleanable/blood,
-/turf/open/mars_cave{
- icon_state = "mars_dirt_4"
- },
-/area/bigredv2/outside/eta)
"uzB" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/blood/oil,
@@ -47299,10 +46944,32 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"uzV" = (
-/obj/structure/flora/grass/desert/lightgrass_10,
-/turf/open/mars,
+"uAo" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/turf/open/asphalt/cement{
+ icon_state = "cement1"
+ },
+/area/bigredv2/outside/lambda_cave_cas)
+"uAB" = (
+/obj/structure/barricade/handrail/medical{
+ dir = 4
+ },
+/turf/open/mars_cave{
+ icon_state = "mars_dirt_4"
+ },
/area/bigredv2/outside/nw)
+"uBb" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/item/trash/cigbutt{
+ pixel_x = 4
+ },
+/turf/open/floor/plating,
+/area/bigredv2/outside/bar)
"uBi" = (
/obj/structure/pipes/standard/manifold/hidden/green{
dir = 1
@@ -47311,6 +46978,13 @@
icon_state = "dark"
},
/area/bigredv2/outside/engineering)
+"uBk" = (
+/turf/closed/wall/solaris{
+ damage = 2677;
+ damage_overlay = 8;
+ current_bulletholes = 3
+ },
+/area/bigredv2/outside/office_complex)
"uBP" = (
/obj/structure/cargo_container/arious/leftmid,
/turf/open/mars,
@@ -47322,6 +46996,19 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
+"uCc" = (
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/floor{
+ dir = 4;
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/eta)
+"uCC" = (
+/obj/effect/decal/cleanable/blood/gibs/body,
+/turf/open/gm/river{
+ color = "#995555"
+ },
+/area/bigredv2/outside/c)
"uDn" = (
/obj/structure/sign/safety/west,
/obj/structure/sign/safety/hazard{
@@ -47329,19 +47016,6 @@
},
/turf/closed/wall/wood,
/area/bigredv2/caves/mining)
-"uDt" = (
-/obj/structure/surface/table,
-/obj/item/bodybag,
-/obj/item/bodybag,
-/obj/item/bodybag{
- pixel_y = 5;
- pixel_x = -5
- },
-/turf/open/floor{
- dir = 1;
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
"uDA" = (
/obj/item/stack/sheet/glass,
/turf/open/floor{
@@ -47368,23 +47042,30 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/caves/mining)
-"uEd" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/tool/crowbar{
- pixel_x = -13
+"uEH" = (
+/obj/effect/decal/cleanable/blood,
+/turf/open/mars_cave{
+ icon_state = "mars_dirt_4"
},
-/turf/open/floor,
-/area/bigredv2/outside/general_offices)
-"uEv" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement{
- icon_state = "cement12"
+/area/bigredv2/outside/eta)
+"uEY" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
},
-/area/bigredv2/outside/lambda_cave_cas)
-"uFc" = (
-/obj/structure/flora/grass/desert/lightgrass_8,
-/turf/open/mars,
-/area/bigredv2/outside/se)
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor{
+ icon_state = "floor4"
+ },
+/area/bigredv2/outside/cargo)
+"uFa" = (
+/obj/structure/window_frame/solaris,
+/turf/open/floor/plating,
+/area/bigredv2/outside/medical)
+"uFg" = (
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached14"
+ },
+/area/bigredv2/outside/e)
"uFi" = (
/obj/item/paper/bigred/finance{
pixel_x = -9
@@ -47395,19 +47076,6 @@
/obj/structure/machinery/mill,
/turf/open/floor,
/area/bigred/ground/garage_workshop)
-"uFA" = (
-/obj/item/storage/firstaid/o2/empty{
- pixel_y = 4;
- pixel_x = -11
- },
-/turf/open/floor{
- icon_state = "whitegreencorner"
- },
-/area/bigredv2/outside/medical)
-"uFB" = (
-/obj/structure/flora/grass/desert/lightgrass_3,
-/turf/open/mars,
-/area/bigredv2/outside/c)
"uFD" = (
/obj/structure/bed/chair{
can_buckle = 0;
@@ -47427,7 +47095,27 @@
icon_state = "mars_cave_15"
},
/area/bigredv2/caves/mining)
-"uGr" = (
+"uFP" = (
+/obj/item/trash/cigbutt{
+ pixel_x = -1;
+ pixel_y = 17
+ },
+/obj/item/newspaper{
+ pixel_x = 7;
+ pixel_y = -12
+ },
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidfloor"
+ },
+/area/bigredv2/outside/ne)
+"uFQ" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/turf/open/floor{
+ icon_state = "whitegreenfull"
+ },
+/area/bigredv2/outside/medical)
+"uGl" = (
/obj/item/prop/colony/folded_bedroll{
pixel_x = -5;
pixel_y = -4
@@ -47448,6 +47136,16 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/engineering)
+"uGx" = (
+/obj/structure/pipes/vents/pump{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor{
+ dir = 4;
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
"uGz" = (
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
@@ -47455,13 +47153,6 @@
icon_state = "darkredcorners2"
},
/area/bigredv2/caves/eta/xenobiology)
-"uHn" = (
-/obj/item/ammo_casing/shell,
-/turf/open/floor{
- dir = 1;
- icon_state = "whiteblue"
- },
-/area/bigredv2/outside/medical)
"uHE" = (
/obj/item/tool/warning_cone{
pixel_y = 19
@@ -47471,6 +47162,17 @@
icon_state = "asteroidfloor"
},
/area/bigredv2/outside/filtration_plant)
+"uHN" = (
+/obj/structure/machinery/door/airlock/almayer/engineering/colony{
+ dir = 1;
+ name = "\improper Dormitories EVA";
+ icon_state = "door_open";
+ density = 0
+ },
+/turf/open/floor{
+ icon_state = "delivery"
+ },
+/area/bigredv2/outside/general_offices)
"uHQ" = (
/turf/closed/wall/solaris/reinforced,
/area/bigredv2/caves/mining)
@@ -47497,11 +47199,14 @@
icon_state = "asteroidfloor"
},
/area/bigred/ground/garage_workshop)
-"uIK" = (
-/turf/open/asphalt/cement{
- icon_state = "cement9"
+"uIS" = (
+/obj/structure/surface/table/reinforced,
+/obj/structure/machinery/door/window/brigdoor/eastleft,
+/turf/open/floor{
+ dir = 8;
+ icon_state = "vault"
},
-/area/bigredv2/caves_lambda)
+/area/bigredv2/outside/marshal_office)
"uJj" = (
/obj/structure/machinery/light{
dir = 8
@@ -47519,19 +47224,6 @@
icon_state = "mars_dirt_5"
},
/area/bigredv2/caves/mining)
-"uJy" = (
-/obj/item/stack/sheet/wood{
- pixel_y = 5;
- pixel_x = -4
- },
-/obj/item/dartboard{
- pixel_y = 28
- },
-/turf/open/floor{
- dir = 8;
- icon_state = "carpet11-12"
- },
-/area/bigredv2/outside/bar)
"uJF" = (
/obj/structure/machinery/power/apc{
dir = 1;
@@ -47539,6 +47231,14 @@
},
/turf/open/floor,
/area/bigred/ground/garage_workshop)
+"uJH" = (
+/obj/structure/surface/table,
+/obj/effect/spawner/random/toolbox,
+/obj/item/stack/cable_coil/blue{
+ pixel_y = 10
+ },
+/turf/open/floor,
+/area/bigredv2/outside/general_offices)
"uJI" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/machinery/light/small{
@@ -47548,22 +47248,22 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/caves/mining)
-"uJM" = (
-/obj/item/prop/colony/usedbandage{
- dir = 5;
- pixel_x = -7;
- pixel_y = 13
+"uKA" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
},
-/obj/item/prop/colony/usedbandage{
- dir = 4;
- pixel_x = 11;
- pixel_y = -4
+/obj/effect/decal/medical_decals{
+ icon_state = "triagedecalleft"
},
-/obj/effect/decal/cleanable/blood,
/turf/open/floor{
- icon_state = "white"
+ dir = 1;
+ icon_state = "whitegreen"
},
/area/bigredv2/outside/medical)
+"uKF" = (
+/obj/item/ammo_magazine/shotgun/slugs,
+/turf/closed/wall/solaris/rock,
+/area/bigredv2/caves)
"uKH" = (
/obj/structure/stairs/perspective{
dir = 6;
@@ -47574,22 +47274,42 @@
icon_state = "darkred2"
},
/area/bigredv2/outside/admin_building)
-"uLh" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/weapon/dart/green{
- pixel_y = -10;
- pixel_x = -11
- },
+"uNB" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/obj/structure/machinery/deployable/barrier,
/turf/open/floor{
- icon_state = "wood"
+ icon_state = "dark"
},
-/area/bigredv2/outside/bar)
-"uNn" = (
-/obj/effect/decal/cleanable/blood,
-/turf/open/mars{
- icon_state = "mars_dirt_14"
+/area/bigredv2/outside/marshal_office)
+"uNL" = (
+/obj/structure/surface/table,
+/obj/item/storage/fancy/cigar/matchbook/brown{
+ pixel_x = 7;
+ pixel_y = 9
},
-/area/bigredv2/outside/eta)
+/turf/open/floor,
+/area/bigredv2/outside/office_complex)
+"uNP" = (
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached12"
+ },
+/area/bigredv2/outside/filtration_plant)
+"uNQ" = (
+/obj/structure/window_frame/solaris/reinforced,
+/obj/item/tool/crowbar/red{
+ pixel_y = -13
+ },
+/obj/item/shard,
+/turf/open/floor/plating,
+/area/bigredv2/outside/marshal_office)
+"uNV" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/obj/structure/barricade/wooden,
+/turf/open/floor{
+ dir = 1;
+ icon_state = "whitegreencorner"
+ },
+/area/bigredv2/outside/medical)
"uNW" = (
/obj/effect/decal/cleanable/blood{
dir = 8;
@@ -47604,22 +47324,30 @@
icon_state = "mars_cave_13"
},
/area/bigredv2/caves/mining)
-"uOl" = (
-/obj/effect/decal/cleanable/generic,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
- },
-/area/bigredv2/outside/e)
-"uOo" = (
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached1"
- },
-/area/bigredv2/outside/se)
"uPm" = (
/turf/open/mars_cave{
icon_state = "mars_cave_5"
},
/area/bigredv2/caves_se)
+"uPp" = (
+/obj/effect/decal/strata_decals/grime/grime2{
+ dir = 1
+ },
+/turf/open/asphalt/cement{
+ icon_state = "cement3"
+ },
+/area/bigredv2/outside/filtration_cave_cas)
+"uPy" = (
+/obj/structure/surface/table/woodentable,
+/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot{
+ pixel_x = -6;
+ pixel_y = 8
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor{
+ icon_state = "wood"
+ },
+/area/bigredv2/outside/dorms)
"uPF" = (
/obj/structure/machinery/filtration/console{
pixel_y = 13
@@ -47640,26 +47368,52 @@
icon_state = "bcircuitoff"
},
/area/bigredv2/caves/lambda/research)
+"uQc" = (
+/obj/effect/decal/cleanable/blood/drip,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/prop{
+ desc = "A bunch of tiny bits of shattered metal.";
+ icon = 'icons/obj/items/shards.dmi';
+ icon_state = "shrapnelsmall";
+ name = "piece of shrapnel";
+ pixel_x = -1;
+ pixel_y = 4
+ },
+/turf/open/floor{
+ dir = 1;
+ icon_state = "whiteblue"
+ },
+/area/bigredv2/outside/medical)
+"uQu" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor{
+ dir = 4;
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/n)
+"uRD" = (
+/obj/structure/largecrate/random/barrel/true_random,
+/turf/open/floor/plating{
+ icon_state = "platebot"
+ },
+/area/bigredv2/outside/space_port)
"uRE" = (
/obj/effect/landmark/nightmare{
insert_tag = "medbay-passage"
},
/turf/closed/wall/solaris/reinforced,
/area/bigredv2/outside/admin_building)
-"uRR" = (
-/obj/item/trash/cigbutt{
- pixel_x = -10;
- pixel_y = 13
- },
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached1"
- },
-/area/bigredv2/outside/nw)
"uSf" = (
/turf/open/shuttle/escapepod{
icon_state = "floor1"
},
/area/bigredv2/oob)
+"uSh" = (
+/obj/structure/barricade/deployable,
+/obj/item/ammo_casing/bullet,
+/turf/open/mars,
+/area/bigredv2/outside/c)
"uSt" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 10
@@ -47673,11 +47427,6 @@
icon_state = "mars_dirt_10"
},
/area/bigredv2/outside/space_port_lz2)
-"uSQ" = (
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached14"
- },
-/area/bigredv2/outside/s)
"uST" = (
/obj/structure/machinery/door/airlock/almayer/maint/colony{
dir = 1;
@@ -47687,6 +47436,18 @@
icon_state = "delivery"
},
/area/bigredv2/outside/medical)
+"uSX" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/virology)
+"uTl" = (
+/obj/item/toy/plush/bee,
+/obj/effect/decal/cleanable/blood/gibs/body,
+/obj/effect/landmark/corpsespawner/doctor,
+/turf/open/floor{
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
"uTO" = (
/obj/structure/machinery/pipedispenser,
/turf/open/floor{
@@ -47694,53 +47455,18 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/filtration_plant)
-"uUb" = (
-/obj/effect/decal/strata_decals/grime/grime3,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached3"
- },
-/area/bigredv2/outside/se)
-"uUp" = (
-/obj/effect/decal/cleanable/blood,
-/obj/effect/decal/cleanable/blood/gibs/body,
-/obj/effect/landmark/corpsespawner/colonist/random,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
+"uUR" = (
+/obj/structure/machinery/light,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor{
+ dir = 10;
+ icon_state = "whitegreen"
},
-/area/bigredv2/outside/nw)
+/area/bigredv2/outside/medical)
"uUV" = (
/obj/structure/prop/server_equipment/yutani_server/broken,
/turf/open/floor/greengrid,
/area/bigredv2/caves/lambda/research)
-"uVc" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/medical_decals{
- icon_state = "triagedecaldir"
- },
-/turf/open/floor{
- icon_state = "white"
- },
-/area/bigredv2/outside/medical)
-"uVe" = (
-/turf/open/asphalt/cement{
- icon_state = "cement14"
- },
-/area/bigredv2/outside/filtration_cave_cas)
-"uVi" = (
-/obj/structure/surface/table,
-/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb{
- pixel_x = 1;
- pixel_y = 3
- },
-/obj/item/prop/helmetgarb/spent_buckshot{
- pixel_x = 9;
- pixel_y = -10
- },
-/turf/open/floor{
- icon_state = "freezerfloor"
- },
-/area/bigredv2/outside/general_offices)
"uVn" = (
/obj/structure/blocker/forcefield/multitile_vehicles,
/turf/open/mars_cave{
@@ -47754,15 +47480,25 @@
icon_state = "dark"
},
/area/bigredv2/caves/eta/living)
-"uXx" = (
-/obj/effect/decal/strata_decals/grime/grime2{
- dir = 1
+"uXa" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
},
+/obj/item/stack/sheet/wood,
/turf/open/floor{
- dir = 1;
- icon_state = "asteroidwarning"
+ icon_state = "dark"
},
-/area/bigredv2/outside/nw)
+/area/bigredv2/outside/general_offices)
+"uXK" = (
+/obj/item/stack/sheet/metal{
+ pixel_x = 7;
+ pixel_y = 6
+ },
+/turf/open/floor/plating{
+ dir = 8;
+ icon_state = "platingdmg3"
+ },
+/area/bigredv2/outside/space_port)
"uXW" = (
/turf/open/mars_cave{
icon_state = "mars_cave_8"
@@ -47773,36 +47509,77 @@
icon_state = "mars_cave_3"
},
/area/bigredv2/caves_sw)
-"uYF" = (
-/obj/structure/barricade/wooden{
+"uYs" = (
+/obj/structure/surface/rack,
+/obj/item/trash/wy_chips_pepper{
+ pixel_y = -13;
+ pixel_x = 24
+ },
+/obj/item/explosive/grenade/high_explosive{
+ pixel_x = -1;
+ pixel_y = -2
+ },
+/turf/open/floor{
+ dir = 8;
+ icon_state = "vault"
+ },
+/area/bigredv2/outside/marshal_office)
+"uYM" = (
+/obj/structure/surface/table/woodentable,
+/obj/item/ashtray/glass,
+/obj/item/trash/cigbutt{
+ pixel_x = -10;
+ pixel_y = 16
+ },
+/obj/item/trash/cigbutt/cigarbutt{
+ pixel_x = 7;
+ pixel_y = 12
+ },
+/turf/open/floor{
+ icon_state = "wood"
+ },
+/area/bigredv2/outside/bar)
+"uZz" = (
+/obj/structure/platform/kutjevo/rock{
dir = 4;
+ layer = 2.9;
pixel_x = 4
},
+/turf/closed/wall/solaris/rock,
+/area/bigredv2/caves)
+"uZE" = (
+/obj/structure/largecrate/random/secure{
+ pixel_x = -9;
+ pixel_y = 20
+ },
+/obj/structure/largecrate/supply/supplies/tables_racks{
+ pixel_y = 1;
+ pixel_x = -6;
+ layer = 3.1
+ },
/turf/open/floor{
- dir = 4;
- icon_state = "redcorner"
+ icon_state = "white"
},
-/area/bigredv2/outside/marshal_office)
-"uZG" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached14"
+/area/bigredv2/outside/medical)
+"uZH" = (
+/obj/item/stack/sheet/cardboard{
+ pixel_x = -6;
+ pixel_y = -2
},
-/area/bigredv2/outside/c)
-"uZO" = (
-/obj/structure/flora/grass/desert/lightgrass_11,
-/turf/open/mars,
-/area/bigredv2/outside/c)
-"uZR" = (
-/obj/structure/pipes/standard/simple/hidden/green{
+/turf/open/floor{
+ icon_state = "wood"
+ },
+/area/bigredv2/outside/bar)
+"vaa" = (
+/obj/structure/machinery/light{
dir = 4
},
/obj/effect/decal/cleanable/blood,
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
+/obj/item/stack/sheet/wood{
+ pixel_x = 4
},
-/area/bigredv2/outside/virology)
+/turf/open/floor/plating,
+/area/bigredv2/outside/medical)
"vbi" = (
/turf/open/floor{
dir = 5;
@@ -47816,20 +47593,14 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/engineering)
-"vca" = (
-/obj/item/trash/cigbutt{
- pixel_x = 1;
- pixel_y = 5
- },
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/e)
-"vcq" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor{
- icon_state = "wood"
+"vcb" = (
+/obj/item/stack/sheet/metal{
+ pixel_x = -5;
+ pixel_y = 2
},
-/area/bigredv2/outside/bar)
+/obj/effect/decal/cleanable/blood/xeno,
+/turf/open/floor,
+/area/bigredv2/outside/office_complex)
"vct" = (
/obj/effect/decal/warning_stripes{
icon_state = "S"
@@ -47849,26 +47620,25 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/caves/mining)
-"vcD" = (
-/obj/item/tool/weldingtool{
- pixel_x = 9;
- pixel_y = 1
+"vcX" = (
+/obj/effect/decal/cleanable/blood,
+/turf/open/mars{
+ icon_state = "mars_dirt_14"
},
-/obj/structure/barricade/wooden{
- dir = 8;
- pixel_x = 2;
- pixel_y = 6
+/area/bigredv2/outside/eta)
+"vdi" = (
+/obj/effect/decal/cleanable/vomit{
+ icon_state = "vomit_4"
},
-/turf/open/floor,
-/area/bigredv2/outside/general_offices)
-"vdh" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
+/obj/structure/largecrate/random/mini/med{
+ pixel_x = -6;
+ pixel_y = -1
},
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached3"
+/turf/open/floor{
+ dir = 4;
+ icon_state = "whitegreencorner"
},
-/area/bigredv2/outside/c)
+/area/bigredv2/outside/medical)
"vdl" = (
/obj/effect/decal/cleanable/liquid_fuel,
/obj/effect/decal/warning_stripes{
@@ -47880,15 +47650,19 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/engineering)
-"vdH" = (
-/obj/structure/machinery/light{
- dir = 1
+"vdK" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
},
-/turf/open/floor{
- dir = 4;
- icon_state = "whitegreen"
+/obj/effect/decal/strata_decals/grime/grime3,
+/obj/item/trash/cigbutt{
+ pixel_x = -10;
+ pixel_y = 13
},
-/area/bigredv2/outside/medical)
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached4"
+ },
+/area/bigredv2/outside/e)
"vdS" = (
/obj/item/explosive/grenade/incendiary/molotov{
pixel_x = -10;
@@ -47904,25 +47678,34 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
+"vdW" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor,
+/area/bigredv2/outside/general_offices)
"vec" = (
/obj/structure/pipes/standard/tank,
/turf/open/floor/plating,
/area/bigredv2/caves/mining)
+"vet" = (
+/obj/item/frame/rack,
+/turf/open/floor{
+ icon_state = "dark"
+ },
+/area/bigredv2/outside/marshal_office)
"vex" = (
/turf/closed/wall/wood,
/area/bigredv2/outside/lz2_south_cas)
-"vfo" = (
-/obj/structure/sink{
- dir = 4;
- pixel_x = 9;
- pixel_y = -3
+"veI" = (
+/obj/structure/flora/bush/desert{
+ icon_state = "tree_3"
},
-/obj/effect/decal/cleanable/blood/drip,
-/obj/effect/decal/cleanable/blood/gibs/limb,
-/turf/open/floor{
- icon_state = "white"
+/turf/open/mars{
+ icon_state = "mars_dirt_14"
},
-/area/bigredv2/outside/medical)
+/area/bigredv2/outside/nw)
"vfI" = (
/turf/open/mars{
icon_state = "mars_dirt_13"
@@ -47942,13 +47725,10 @@
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/n)
-"vgO" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/bed/roller,
-/obj/structure/machinery/iv_drip,
-/obj/effect/decal/cleanable/blood,
+"vgR" = (
+/obj/structure/machinery/vending/snack,
/turf/open/floor{
- icon_state = "white"
+ icon_state = "whitegreenfull"
},
/area/bigredv2/outside/medical)
"vgZ" = (
@@ -47960,55 +47740,21 @@
icon_state = "bcircuitoff"
},
/area/bigredv2/caves/lambda/research)
-"vhw" = (
-/obj/structure/machinery/light{
+"vhE" = (
+/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
},
-/obj/effect/decal/cleanable/blood,
-/obj/item/stack/sheet/wood{
- pixel_x = 4
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached12"
},
-/turf/open/floor/plating,
-/area/bigredv2/outside/medical)
+/area/bigredv2/outside/c)
"vhF" = (
/obj/item/device/flashlight/lantern,
/turf/open/mars_cave{
icon_state = "mars_cave_13"
},
/area/bigredv2/caves/mining)
-"vhO" = (
-/obj/structure/largecrate/random/barrel/green{
- pixel_y = 5;
- pixel_x = 3
- },
-/obj/item/storage/fancy/cigar/matchbook{
- pixel_x = 6;
- pixel_y = 17
- },
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
- },
-/area/bigredv2/outside/ne)
-"vhP" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/trash/cigbutt{
- pixel_x = 1;
- pixel_y = 5
- },
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/se)
-"vil" = (
-/obj/structure/surface/table/woodentable,
-/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot{
- pixel_x = -6;
- pixel_y = 8
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor{
- icon_state = "wood"
- },
-/area/bigredv2/outside/dorms)
"vin" = (
/obj/structure/bed/chair{
dir = 4
@@ -48017,19 +47763,12 @@
icon_state = "dark"
},
/area/bigredv2/outside/filtration_plant)
-"viN" = (
-/obj/structure/machinery/door_control{
- id = "workshop_br_g";
- name = "Workshop Garage Lockdown";
- pixel_x = -28
- },
-/obj/structure/machinery/light{
- dir = 8
- },
+"viw" = (
+/obj/structure/pipes/standard/simple/hidden/green,
/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached2"
+ icon_state = "cement_sunbleached4"
},
-/area/bigredv2/outside/nw)
+/area/bigredv2/outside/e)
"vjc" = (
/obj/item/tool/warning_cone{
pixel_x = -13;
@@ -48040,6 +47779,22 @@
icon_state = "asteroidfloor"
},
/area/bigredv2/outside/filtration_plant)
+"vje" = (
+/obj/structure/barricade/wooden{
+ desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
+ dir = 8;
+ health = 25000
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor,
+/area/bigredv2/outside/general_offices)
+"vjE" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/obj/item/ammo_casing/bullet,
+/turf/open/floor{
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
"vkf" = (
/obj/effect/landmark/crap_item,
/obj/structure/blocker/forcefield/multitile_vehicles,
@@ -48053,35 +47808,12 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/engineering)
-"vkA" = (
-/obj/structure/sign/nosmoking_1{
- pixel_x = -32
- },
-/obj/item/prop/colony/usedbandage{
- dir = 5;
- pixel_x = 10;
- pixel_y = 18
- },
-/turf/open/floor{
- dir = 8;
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
"vkF" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/surface/table,
/obj/effect/spawner/random/tool,
/turf/open/floor,
/area/bigredv2/outside/cargo)
-"vkY" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/strata_decals/grime/grime1{
- dir = 8
- },
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached1"
- },
-/area/bigredv2/outside/nw)
"vld" = (
/obj/item/tool/warning_cone,
/turf/open/mars_cave{
@@ -48107,23 +47839,21 @@
icon_state = "mars_dirt_4"
},
/area/bigredv2/caves/mining)
-"vlO" = (
-/turf/open/asphalt/cement{
- icon_state = "cement12"
- },
-/area/bigredv2/outside/space_port)
-"vmm" = (
-/obj/structure/barricade/wooden,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
- },
-/area/bigredv2/outside/c)
"vmI" = (
/obj/item/device/flashlight/lantern,
/turf/open/mars_cave{
icon_state = "mars_dirt_4"
},
-/area/bigredv2/caves/mining)
+/area/bigredv2/caves/mining)
+"vmJ" = (
+/obj/item/clothing/mask/gas{
+ pixel_y = 9
+ },
+/obj/structure/machinery/deployable/barrier,
+/turf/open/floor{
+ icon_state = "dark"
+ },
+/area/bigredv2/outside/marshal_office)
"vmL" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/landmark/crap_item,
@@ -48147,6 +47877,10 @@
},
/turf/open/floor/plating,
/area/bigredv2/caves/mining)
+"vnO" = (
+/obj/structure/flora/grass/desert/lightgrass_7,
+/turf/open/mars,
+/area/bigredv2/outside/e)
"voz" = (
/obj/structure/machinery/camera/autoname,
/turf/open/floor{
@@ -48161,11 +47895,10 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/engineering)
-"voZ" = (
-/obj/effect/decal/cleanable/blood/gibs/xeno/body,
-/obj/effect/decal/cleanable/blood/xeno,
-/turf/open/floor/plating,
-/area/bigredv2/outside/medical)
+"voM" = (
+/obj/structure/flora/grass/desert/lightgrass_6,
+/turf/open/mars,
+/area/bigredv2/outside/n)
"vpu" = (
/obj/item/weapon/twohanded/folded_metal_chair,
/turf/open/mars_cave{
@@ -48181,6 +47914,16 @@
icon_state = "dark"
},
/area/bigredv2/outside/admin_building)
+"vpP" = (
+/obj/structure/flora/bush/desert{
+ icon_state = "tree_3"
+ },
+/turf/open/mars,
+/area/bigredv2/caves_north)
+"vpV" = (
+/obj/structure/flora/grass/desert/lightgrass_5,
+/turf/open/mars,
+/area/bigredv2/outside/c)
"vpY" = (
/obj/structure/machinery/door/poddoor/almayer/closed{
id = "eta";
@@ -48190,10 +47933,15 @@
icon_state = "delivery"
},
/area/bigredv2/outside/eta)
-"vqj" = (
-/obj/effect/decal/cleanable/blood/drip,
-/turf/open/floor,
-/area/bigredv2/outside/lambda_cave_cas)
+"vqV" = (
+/obj/structure/machinery/light{
+ dir = 1
+ },
+/turf/open/floor{
+ dir = 4;
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
"vqY" = (
/turf/open/mars_cave{
icon_state = "mars_cave_11"
@@ -48211,13 +47959,19 @@
icon_state = "asteroidfloor"
},
/area/bigredv2/outside/space_port_lz2)
-"vsF" = (
-/obj/structure/barricade/deployable,
+"vsY" = (
+/obj/structure/machinery/reagentgrinder{
+ pixel_x = 7
+ },
+/obj/structure/surface/table/woodentable,
+/obj/item/weapon/gun/shotgun/double/sawn{
+ pixel_x = 1;
+ pixel_y = 10
+ },
/turf/open/floor{
- dir = 4;
- icon_state = "asteroidwarning"
+ icon_state = "wood"
},
-/area/bigredv2/outside/c)
+/area/bigredv2/outside/bar)
"vti" = (
/obj/structure/closet/crate,
/obj/effect/landmark/objective_landmark/close,
@@ -48234,15 +47988,13 @@
},
/area/bigredv2/caves/eta/xenobiology)
"vtU" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/tool/warning_cone{
- pixel_x = 6
- },
+/obj/item/shard/shrapnel,
+/obj/item/shard,
/turf/open/floor{
dir = 1;
- icon_state = "asteroidfloor"
+ icon_state = "whitegreen"
},
-/area/bigredv2/outside/ne)
+/area/bigredv2/outside/marshal_office)
"vuz" = (
/obj/structure/machinery/door_control{
id = "eta";
@@ -48259,6 +48011,25 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/bigredv2/caves/eta/xenobiology)
+"vvC" = (
+/obj/structure/bed,
+/obj/item/prop/colony/usedbandage{
+ dir = 9;
+ pixel_x = 5;
+ pixel_y = 15
+ },
+/turf/open/floor{
+ icon_state = "whitegreenfull"
+ },
+/area/bigredv2/outside/medical)
+"vvI" = (
+/obj/effect/decal/strata_decals/grime/grime4,
+/obj/item/trash/pistachios{
+ pixel_x = -3;
+ pixel_y = 11
+ },
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/w)
"vvL" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/prop/invuln/minecart_tracks{
@@ -48280,6 +48051,21 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
+"vwj" = (
+/obj/item/tool/match{
+ pixel_x = 8;
+ pixel_y = 9
+ },
+/turf/open/floor{
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/ne)
+"vwk" = (
+/obj/item/stack/sheet/wood{
+ pixel_x = -8
+ },
+/turf/open/floor,
+/area/bigredv2/outside/general_offices)
"vxv" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 5
@@ -48291,19 +48077,47 @@
icon_state = "asteroidfloor"
},
/area/bigredv2/outside/n)
+"vxF" = (
+/obj/structure/surface/table,
+/obj/structure/pipes/vents/pump{
+ dir = 4
+ },
+/turf/open/floor/carpet,
+/area/bigredv2/outside/admin_building)
"vxQ" = (
/obj/item/tool/pickaxe/gold,
/turf/open/floor/plating,
/area/bigredv2/caves/mining)
+"vyE" = (
+/obj/item/trash/eat{
+ pixel_x = -9;
+ pixel_y = 10
+ },
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidfloor"
+ },
+/area/bigredv2/outside/ne)
"vyV" = (
/obj/structure/largecrate/random/barrel/red,
/turf/open/floor/plating,
/area/bigredv2/caves/lambda/xenobiology)
-"vzA" = (
-/obj/structure/barricade/deployable,
-/obj/item/ammo_casing/bullet,
+"vyX" = (
+/obj/structure/flora/grass/desert/lightgrass_8,
/turf/open/mars,
-/area/bigredv2/outside/c)
+/area/bigredv2/outside/se)
+"vzg" = (
+/obj/structure/surface/table,
+/obj/item/reagent_container/food/snacks/wrapped/barcardine{
+ pixel_y = -2;
+ pixel_x = -8
+ },
+/obj/item/reagent_container/food/snacks/packaged_meal{
+ pixel_x = 8;
+ pixel_y = 9
+ },
+/turf/open/floor,
+/area/bigredv2/outside/general_offices)
"vzL" = (
/obj/item/weapon/gun/boltaction,
/turf/open/floor/plating{
@@ -48311,38 +48125,51 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
+"vzQ" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/ne)
"vAs" = (
/obj/structure/window/framed/solaris/reinforced/tinted,
/turf/open/floor/plating,
/area/bigredv2/caves/lambda/xenobiology)
"vAW" = (
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached20"
+/obj/structure/surface/table,
+/obj/structure/machinery/light{
+ dir = 4
},
-/area/bigredv2/outside/nw)
+/obj/effect/landmark/objective_landmark/medium,
+/turf/open/floor{
+ icon_state = "whitegreenfull"
+ },
+/area/bigredv2/outside/medical)
"vBy" = (
/obj/item/ammo_magazine/shotgun/beanbag/riot,
/turf/open/mars_cave{
icon_state = "mars_cave_17"
},
/area/bigredv2/caves_research)
+"vBC" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/turf/open/floor{
+ dir = 9;
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/e)
+"vBD" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached14"
+ },
+/area/bigredv2/outside/c)
"vBI" = (
/turf/open/mars_cave{
icon_state = "mars_cave_9"
},
/area/bigredv2/outside/n)
-"vBT" = (
-/obj/structure/surface/table/reinforced,
-/obj/structure/transmitter/colony_net/rotary{
- phone_category = "Solaris Ridge";
- phone_id = "Clinic Reception";
- pixel_y = 9;
- pixel_x = 6
- },
-/turf/open/floor{
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
"vCd" = (
/obj/structure/surface/rack,
/obj/item/weapon/twohanded/lungemine{
@@ -48363,11 +48190,57 @@
icon_state = "dark"
},
/area/bigredv2/outside/engineering)
+"vCJ" = (
+/obj/structure/flora/grass/desert/lightgrass_1,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached3"
+ },
+/area/bigredv2/outside/w)
+"vCK" = (
+/obj/item/frame/table/reinforced,
+/turf/open/floor{
+ dir = 4;
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
"vCU" = (
/turf/open/mars_cave{
icon_state = "mars_cave_16"
},
/area/bigredv2/outside/lz2_south_cas)
+"vDc" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/turf/open/floor{
+ dir = 8;
+ icon_state = "whitegreencorner"
+ },
+/area/bigredv2/outside/medical)
+"vDi" = (
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/floor{
+ dir = 10;
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/eta)
+"vDl" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/floor{
+ dir = 1;
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
+"vEv" = (
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor,
+/area/bigredv2/outside/general_offices)
+"vEz" = (
+/obj/effect/decal/cleanable/blood/gibs/xeno,
+/obj/effect/decal/cleanable/blood/xeno,
+/turf/open/floor,
+/area/bigredv2/outside/office_complex)
"vEF" = (
/obj/structure/surface/table,
/obj/item/clothing/head/hardhat/orange{
@@ -48378,33 +48251,45 @@
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/filtration_plant)
-"vEN" = (
-/obj/structure/flora/grass/desert/lightgrass_6,
-/obj/item/stack/sheet/metal{
- pixel_x = -13;
- pixel_y = 14
- },
-/turf/open/mars,
-/area/bigredv2/outside/c)
"vEU" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/mars{
icon_state = "mars_dirt_10"
},
/area/bigredv2/outside/s)
+"vFd" = (
+/obj/effect/decal/strata_decals/grime/grime4,
+/obj/item/trash/cigbutt{
+ pixel_x = -1;
+ pixel_y = 17
+ },
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/se)
+"vFp" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 10
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/crate/trashcart{
+ pixel_x = -2;
+ pixel_y = -1
+ },
+/obj/item/prop{
+ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
+ icon = 'icons/obj/janitor.dmi';
+ icon_state = "trashbag3";
+ name = "trash bag";
+ pixel_x = -3;
+ pixel_y = 2
+ },
+/turf/open/floor/plating,
+/area/bigredv2/outside/bar)
"vFA" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor{
icon_state = "wood"
},
/area/bigredv2/outside/library)
-"vFH" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
-/turf/open/asphalt/cement{
- icon_state = "cement4"
- },
-/area/bigredv2/caves_lambda)
"vFS" = (
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
@@ -48412,74 +48297,50 @@
icon_state = "dark"
},
/area/bigredv2/caves/eta/living)
-"vFY" = (
-/obj/item/shard,
-/turf/open/mars_cave{
- icon_state = "mars_cave_19"
+"vGl" = (
+/obj/structure/surface/table,
+/obj/structure/machinery/light{
+ dir = 8
},
-/area/bigredv2/outside/n)
-"vGj" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/trash/cigbutt{
- pixel_x = -1;
- pixel_y = 17
+/obj/item/tool/surgery/circular_saw{
+ pixel_x = 10
},
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
+/turf/open/floor{
+ dir = 1;
+ icon_state = "whitepurplecorner"
},
-/area/bigredv2/outside/se)
+/area/bigredv2/outside/medical)
"vGE" = (
/turf/open/floor{
dir = 6;
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/space_port_lz2)
-"vGN" = (
-/obj/effect/decal/cleanable/blood{
- icon_state = "gib6"
+"vGQ" = (
+/obj/structure/machinery/light{
+ dir = 4
},
-/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor/colony{
- name = "\improper Medical Clinic";
- icon_state = "door_open";
- density = 0
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/bigredv2/outside/space_port)
+"vHa" = (
+/obj/item/tool/minihoe{
+ pixel_x = -4;
+ pixel_y = -4
},
-/obj/structure/pipes/standard/simple/hidden/green,
/turf/open/floor{
- icon_state = "delivery"
+ icon_state = "white"
},
-/area/bigredv2/outside/medical)
-"vGS" = (
-/obj/structure/flora/grass/desert/lightgrass_7,
-/turf/open/mars,
-/area/bigredv2/outside/e)
+/area/bigredv2/outside/marshal_office)
"vHw" = (
/turf/closed/wall/wood,
/area/bigredv2/caves/mining)
-"vHL" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/item/weapon/baseballbat/metal{
- pixel_x = -16;
- pixel_y = 18
- },
-/obj/effect/decal/cleanable/blood,
-/obj/effect/decal/cleanable/blood/gibs/body,
-/obj/effect/landmark/corpsespawner/colonist,
-/turf/open/floor,
-/area/bigredv2/outside/general_offices)
"vHU" = (
/obj/effect/landmark/hunter_primary,
/turf/open/mars_cave{
icon_state = "mars_cave_2"
},
/area/bigredv2/outside/n)
-"vIy" = (
-/obj/structure/flora/bush/desert{
- icon_state = "tree_3"
- },
-/turf/open/mars,
-/area/bigredv2/outside/c)
"vIQ" = (
/obj/structure/pipes/standard/simple/hidden/green,
/obj/effect/decal/cleanable/dirt,
@@ -48488,56 +48349,31 @@
icon_state = "asteroidfloor"
},
/area/bigredv2/outside/c)
-"vKt" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood,
+"vJf" = (
+/obj/item/tool/wirecutters/clippers,
/turf/open/floor{
- dir = 1;
- icon_state = "whitegreen"
+ icon_state = "white"
},
-/area/bigredv2/outside/medical)
+/area/bigredv2/outside/marshal_office)
"vKv" = (
/turf/open/floor{
dir = 8;
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/space_port_lz2)
-"vKH" = (
-/obj/item/stack/sheet/wood{
- pixel_y = -8
- },
+"vKT" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/corpsespawner/security,
+/obj/effect/decal/cleanable/blood/gibs/body,
+/obj/effect/decal/cleanable/blood,
/turf/open/floor{
- icon_state = "wood"
- },
-/area/bigredv2/outside/dorms)
-"vKW" = (
-/obj/structure/platform_decoration/kutjevo/rock{
- dir = 1
+ dir = 4;
+ icon_state = "asteroidwarning"
},
-/turf/open/mars,
-/area/bigredv2/outside/nw)
+/area/bigredv2/outside/n)
"vLd" = (
/turf/open/floor,
/area/bigred/ground/garage_workshop)
-"vLF" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/obj/item/tool/screwdriver{
- pixel_x = -13;
- pixel_y = 9
- },
-/obj/item/tool/crowbar/red{
- pixel_y = -14;
- pixel_x = 2
- },
-/obj/item/stack/tile/plasteel{
- pixel_x = 16;
- pixel_y = 12
- },
-/turf/open/floor/plating,
-/area/bigredv2/outside/marshal_office)
"vMj" = (
/turf/open/mars_cave{
icon_state = "mars_cave_6"
@@ -48552,14 +48388,17 @@
icon_state = "mars_cave_9"
},
/area/bigredv2/caves/mining)
-"vMR" = (
-/obj/structure/bed/chair{
- dir = 8
- },
-/turf/open/floor{
- icon_state = "white"
+"vMO" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/bigredv2/outside/general_offices)
+"vMY" = (
+/obj/item/trash/cigbutt{
+ pixel_x = -9;
+ pixel_y = -6
},
-/area/bigredv2/outside/marshal_office)
+/turf/open/mars,
+/area/bigredv2/outside/nw)
"vNh" = (
/obj/structure/blocker/forcefield/multitile_vehicles,
/turf/open/mars_cave{
@@ -48572,16 +48411,44 @@
icon_state = "mars_cave_5"
},
/area/bigredv2/caves_virology)
-"vNH" = (
-/obj/structure/pipes/standard/simple/hidden/green,
+"vNw" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/trash/cigbutt{
- pixel_x = 4
- },
/turf/open/asphalt/cement_sunbleached{
icon_state = "cement_sunbleached1"
},
-/area/bigredv2/outside/s)
+/area/bigredv2/outside/w)
+"vNO" = (
+/obj/structure/surface/table,
+/obj/item/bodybag/cryobag{
+ pixel_y = -3;
+ pixel_x = 10
+ },
+/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot{
+ pixel_y = 3;
+ pixel_x = 7
+ },
+/obj/structure/sign/nosmoking_1{
+ pixel_y = 32
+ },
+/turf/open/floor{
+ dir = 1;
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
+"vOg" = (
+/obj/effect/decal/strata_decals/grime/grime3,
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/nw)
+"vOm" = (
+/obj/structure/surface/table,
+/obj/item/trash/kepler{
+ pixel_y = 3
+ },
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/turf/open/floor,
+/area/bigredv2/outside/marshal_office)
"vOs" = (
/obj/structure/coatrack{
pixel_x = 12
@@ -48595,17 +48462,6 @@
icon_state = "wood"
},
/area/bigredv2/outside/admin_building)
-"vOA" = (
-/obj/structure/machinery/light,
-/obj/structure/barricade/wooden{
- desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
- dir = 4;
- health = 25000
- },
-/turf/open/floor{
- icon_state = "redcorner"
- },
-/area/bigredv2/outside/marshal_office)
"vPP" = (
/obj/effect/decal/cleanable/blood/drip{
pixel_x = 6
@@ -48614,6 +48470,11 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/caves/mining)
+"vPQ" = (
+/turf/open/asphalt/cement{
+ icon_state = "cement2"
+ },
+/area/bigredv2/outside/filtration_cave_cas)
"vPZ" = (
/obj/structure/bed/chair{
dir = 8
@@ -48623,6 +48484,21 @@
icon_state = "white"
},
/area/bigredv2/outside/marshal_office)
+"vQV" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood/gibs/xeno/body,
+/obj/effect/decal/cleanable/blood/xeno,
+/turf/open/floor/plating{
+ dir = 8;
+ icon_state = "platingdmg2"
+ },
+/area/bigredv2/outside/medical)
+"vQW" = (
+/obj/effect/decal/cleanable/generic,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached12"
+ },
+/area/bigredv2/outside/w)
"vQZ" = (
/obj/effect/decal/cleanable/blood{
icon_state = "gib6"
@@ -48631,6 +48507,14 @@
icon_state = "mars_cave_9"
},
/area/bigredv2/caves_research)
+"vRj" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/turf/open/asphalt/cement{
+ icon_state = "cement4"
+ },
+/area/bigredv2/caves_lambda)
"vRs" = (
/obj/structure/sign/safety/high_voltage,
/turf/closed/wall/solaris/reinforced,
@@ -48643,26 +48527,17 @@
},
/area/bigredv2/caves/lambda/xenobiology)
"vRP" = (
-/obj/item/clothing/under/color/orange{
- pixel_y = -7;
- pixel_x = 6
+/obj/structure/pipes/standard/simple/hidden/green,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached12"
},
-/turf/closed/wall/solaris/rock,
-/area/bigredv2/caves)
+/area/bigredv2/outside/virology)
"vRR" = (
/turf/open/mars_cave{
icon_state = "mars_dirt_7"
},
/area/bigredv2/caves_north)
-"vSc" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/item/ammo_casing/shell,
-/turf/open/floor{
- icon_state = "wood"
- },
-/area/bigredv2/outside/bar)
"vTh" = (
/obj/structure/machinery/light/small{
dir = 1
@@ -48678,33 +48553,16 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/engineering)
-"vUa" = (
-/obj/item/prop{
- desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
- icon = 'icons/obj/janitor.dmi';
- icon_state = "trashbag3";
- name = "trash bag";
- pixel_x = 2;
- pixel_y = -4
+"vTJ" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
},
+/obj/item/trash/cigbutt/cigarbutt,
/turf/open/floor{
dir = 1;
icon_state = "asteroidfloor"
},
/area/bigredv2/outside/ne)
-"vUm" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
- },
-/area/bigredv2/outside/space_port)
-"vUw" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement{
- icon_state = "cement3"
- },
-/area/bigredv2/outside/lambda_cave_cas)
"vUy" = (
/obj/structure/cargo_container/kelland/left,
/turf/open/mars_cave{
@@ -48720,11 +48578,6 @@
icon_state = "wood"
},
/area/bigredv2/outside/library)
-"vVc" = (
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached1"
- },
-/area/bigredv2/outside/space_port_lz2)
"vVl" = (
/obj/structure/machinery/door/airlock/almayer/generic{
name = "\improper Dormitories Toilet"
@@ -48743,6 +48596,13 @@
icon_state = "mars_cave_5"
},
/area/bigredv2/caves/mining)
+"vVX" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/machinery/computer/arcade,
+/turf/open/floor{
+ icon_state = "redcorner"
+ },
+/area/bigredv2/outside/marshal_office)
"vVZ" = (
/turf/closed/wall/solaris,
/area/bigredv2/outside/filtration_cave_cas)
@@ -48752,91 +48612,29 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/engineering)
-"vWo" = (
-/obj/structure/flora/grass/desert/lightgrass_4,
-/turf/open/mars,
-/area/bigredv2/outside/filtration_plant)
-"vWt" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement{
- icon_state = "cement3"
- },
-/area/bigredv2/outside/filtration_cave_cas)
-"vWW" = (
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached9"
- },
-/area/bigredv2/outside/e)
-"vXi" = (
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
- },
-/area/bigredv2/outside/nw)
-"vXp" = (
-/obj/structure/machinery/light{
- dir = 8
- },
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached14"
- },
-/area/bigredv2/outside/nw)
"vXJ" = (
/turf/open/mars_cave{
icon_state = "mars_dirt_4"
},
-/area/bigredv2/caves_lambda)
-"vXS" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/prop{
- desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
- icon = 'icons/obj/janitor.dmi';
- icon_state = "trashbag3";
- name = "trash bag";
- pixel_x = -6;
- pixel_y = -4
- },
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
- },
-/area/bigredv2/outside/ne)
-"vXW" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/trash/cigbutt{
- pixel_x = -7;
- pixel_y = 13
- },
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached3"
- },
-/area/bigredv2/outside/nw)
+/area/bigredv2/caves_lambda)
"vYw" = (
/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
/turf/open/mars_cave{
icon_state = "mars_dirt_4"
},
/area/bigredv2/caves/mining)
-"vYL" = (
-/obj/effect/decal/strata_decals/grime/grime3,
+"vZI" = (
+/obj/effect/decal/cleanable/dirt,
/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached3"
+ icon_state = "cement_sunbleached12"
},
/area/bigredv2/outside/nw)
-"vZh" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
+"waa" = (
/obj/effect/decal/cleanable/blood,
-/obj/effect/decal/cleanable/dirt,
/turf/open/floor{
- icon_state = "freezerfloor"
- },
-/area/bigredv2/outside/general_offices)
-"waA" = (
-/turf/open/asphalt/cement{
- icon_state = "cement12"
+ icon_state = "white"
},
-/area/bigredv2/caves_lambda)
+/area/bigredv2/outside/marshal_office)
"waJ" = (
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
@@ -48857,12 +48655,6 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/caves/mining)
-"wbo" = (
-/obj/effect/decal/strata_decals/grime/grime3,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached1"
- },
-/area/bigredv2/outside/space_port_lz2)
"wbp" = (
/turf/open/mars_cave{
icon_state = "mars_cave_2"
@@ -48884,27 +48676,31 @@
icon_state = "mars_dirt_4"
},
/area/bigredv2/outside/space_port_lz2)
-"wbO" = (
-/obj/effect/landmark/crap_item,
-/obj/structure/flora/grass/desert/lightgrass_11,
+"wbN" = (
+/obj/item/stack/folding_barricade,
/turf/open/mars,
/area/bigredv2/outside/c)
-"wbX" = (
-/obj/effect/landmark/corpsespawner/colonist,
-/obj/effect/decal/cleanable/vomit{
- pixel_x = -7;
- pixel_y = 13
- },
-/turf/open/floor{
- icon_state = "wood"
- },
-/area/bigredv2/outside/bar)
"wbY" = (
/obj/effect/landmark/hunter_secondary,
/turf/open/mars_cave{
icon_state = "mars_cave_2"
},
/area/bigredv2/outside/n)
+"wcc" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/obj/effect/decal/cleanable/blood/xeno,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached1"
+ },
+/area/bigredv2/outside/nw)
+"wcg" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/ammo_casing/bullet,
+/turf/open/floor{
+ icon_state = "dark"
+ },
+/area/bigredv2/outside/general_offices)
"wcs" = (
/obj/structure/blocker/forcefield/multitile_vehicles,
/turf/open/mars_cave{
@@ -48914,15 +48710,6 @@
"wcw" = (
/turf/open/gm/river,
/area/bigredv2/outside/filtration_plant)
-"wcD" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/obj/effect/decal/strata_decals/grime/grime2{
- dir = 8
- },
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached1"
- },
-/area/bigredv2/outside/nw)
"wdM" = (
/obj/structure/platform/kutjevo/rock{
dir = 4
@@ -48937,64 +48724,19 @@
icon_state = "mars_dirt_4"
},
/area/space)
-"wdX" = (
-/obj/structure/prop/invuln/overhead_pipe{
- dir = 4;
- pixel_x = 2;
- pixel_y = 9
- },
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
- },
-/area/bigredv2/outside/ne)
-"weL" = (
-/obj/item/stack/sheet/wood,
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor{
- icon_state = "dark"
- },
-/area/bigredv2/outside/general_offices)
+"weg" = (
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/c)
"weO" = (
/obj/structure/closet/secure_closet/medical_wall{
pixel_y = -5
},
/turf/closed/wall/solaris/reinforced,
/area/bigredv2/caves/mining)
-"weP" = (
-/obj/item/trash/cigbutt{
- pixel_x = -10;
- pixel_y = 16
- },
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached1"
- },
-/area/bigredv2/outside/s)
"wfd" = (
/obj/effect/decal/cleanable/dirt,
/turf/closed/wall/solaris/reinforced,
/area/bigredv2/caves/mining)
-"wfi" = (
-/obj/item/trash/snack_bowl{
- pixel_x = 1;
- pixel_y = -12
- },
-/obj/item/trash/raisins{
- pixel_y = 8;
- pixel_x = -2
- },
-/obj/item/trash/uscm_mre{
- pixel_y = 3;
- pixel_x = 10
- },
-/obj/effect/decal/cleanable/generic,
-/obj/effect/decal/cleanable/ash{
- pixel_y = 19
- },
-/turf/open/mars_cave{
- icon_state = "mars_cave_16"
- },
-/area/bigredv2/outside/nw)
"wfk" = (
/obj/structure/filingcabinet/medical{
density = 0;
@@ -49049,35 +48791,49 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"wge" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
+"wfX" = (
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidfloor"
},
-/obj/item/prop{
- desc = "A blood bag with a hole in it. The rats must have gotten to it first.";
- icon = 'icons/obj/items/bloodpack.dmi';
- icon_state = "bloodpack";
- name = "blood bag";
- pixel_x = -2;
- pixel_y = 10
+/area/bigredv2/outside/eta)
+"wgd" = (
+/obj/structure/bed/chair/comfy,
+/obj/effect/decal/cleanable/blood,
+/obj/item/ammo_casing/bullet{
+ icon_state = "cartridge_10_1"
},
/turf/open/floor{
- dir = 4;
+ icon_state = "wood"
+ },
+/area/bigredv2/outside/marshal_office)
+"wgu" = (
+/obj/structure/sign/nosmoking_1{
+ pixel_x = -32
+ },
+/obj/item/prop/colony/usedbandage{
+ dir = 5;
+ pixel_x = 10;
+ pixel_y = 18
+ },
+/turf/open/floor{
+ dir = 8;
icon_state = "whitegreen"
},
/area/bigredv2/outside/medical)
-"whi" = (
-/obj/effect/decal/cleanable/generic,
+"wgI" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/trash/cigbutt{
- pixel_x = -1;
- pixel_y = 17
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/barricade/wooden{
+ desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
+ dir = 8;
+ health = 25000
},
-/turf/open/asphalt/cement{
- icon_state = "cement1";
- dir = 1
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached1"
},
-/area/bigredv2/outside/filtration_cave_cas)
+/area/bigredv2/outside/w)
"whw" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/surface/table/woodentable,
@@ -49098,13 +48854,15 @@
icon_state = "asteroidwarning"
},
/area/bigred/ground/garage_workshop)
-"wiw" = (
-/obj/structure/bed,
-/obj/effect/decal/cleanable/blood/gibs/body,
-/obj/effect/decal/cleanable/blood,
+"wip" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/trash/sosjerky{
+ pixel_x = -12;
+ pixel_y = 17
+ },
/turf/open/floor{
- dir = 4;
- icon_state = "whitegreen"
+ icon_state = "whitegreenfull"
},
/area/bigredv2/outside/medical)
"wix" = (
@@ -49116,32 +48874,33 @@
icon_state = "asteroidwarning"
},
/area/bigred/ground/garage_workshop)
+"wiA" = (
+/obj/structure/barricade/wooden{
+ desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
+ dir = 8;
+ health = 25000;
+ pixel_y = 4;
+ pixel_x = 22
+ },
+/turf/open/floor{
+ dir = 4;
+ icon_state = "redcorner"
+ },
+/area/bigredv2/outside/marshal_office)
"wiK" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor{
icon_state = "podhatchfloor"
},
/area/bigredv2/outside/engineering)
-"wjx" = (
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/e)
-"wjK" = (
-/obj/effect/landmark/corpsespawner/scientist,
-/obj/effect/decal/cleanable/blood/gibs/body,
-/turf/open/floor{
- icon_state = "asteroidwarning"
- },
-/area/bigredv2/outside/eta)
-"wjM" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/clothing/suit/armor/riot{
- pixel_x = -8;
- pixel_y = -5
- },
+"wiR" = (
+/obj/item/ammo_casing/shell,
+/obj/effect/landmark/corpsespawner/colonist,
+/obj/effect/decal/cleanable/blood,
/turf/open/floor{
- icon_state = "dark"
+ icon_state = "wood"
},
-/area/bigredv2/outside/marshal_office)
+/area/bigredv2/outside/bar)
"wjW" = (
/obj/structure/platform/shiva{
dir = 1
@@ -49158,19 +48917,21 @@
icon_state = "darkpurple2"
},
/area/bigredv2/caves/lambda/research)
-"wkE" = (
-/obj/effect/decal/cleanable/vomit{
- icon_state = "vomit_4"
- },
-/obj/structure/largecrate/random/mini/med{
- pixel_x = -6;
- pixel_y = -1
+"wkY" = (
+/obj/item/ammo_casing/bullet,
+/obj/item/weapon/gun/pistol/holdout{
+ pixel_x = -8;
+ pixel_y = 11
},
+/obj/effect/decal/cleanable/blood/drip,
/turf/open/floor{
- dir = 4;
- icon_state = "whitegreencorner"
+ icon_state = "dark"
},
-/area/bigredv2/outside/medical)
+/area/bigredv2/outside/general_offices)
+"wlr" = (
+/obj/structure/flora/grass/desert/lightgrass_7,
+/turf/open/mars,
+/area/bigredv2/outside/se)
"wlE" = (
/obj/item/stack/cable_coil/cut,
/turf/open/mars_cave{
@@ -49186,6 +48947,17 @@
icon_state = "mars_dirt_4"
},
/area/bigredv2/caves/mining)
+"wmF" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor/colony{
+ name = "\improper Medical Clinic";
+ icon_state = "door_open";
+ density = 0
+ },
+/turf/open/floor{
+ icon_state = "delivery"
+ },
+/area/bigredv2/outside/medical)
"wmN" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor{
@@ -49208,14 +48980,6 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/caves_sw)
-"wow" = (
-/obj/item/shard/shrapnel,
-/obj/item/shard,
-/turf/open/floor{
- dir = 1;
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/marshal_office)
"woK" = (
/obj/effect/decal/warning_stripes{
icon_state = "NW-out";
@@ -49227,6 +48991,15 @@
icon_state = "red"
},
/area/bigredv2/outside/marshal_office)
+"woW" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor{
+ icon_state = "whitegreencorner"
+ },
+/area/bigredv2/outside/medical)
"wpf" = (
/turf/open/mars_cave{
icon_state = "mars_cave_19"
@@ -49238,43 +49011,24 @@
icon_state = "delivery"
},
/area/bigredv2/outside/engineering)
-"wpA" = (
-/obj/structure/flora/bush/desert{
- icon_state = "tree_3"
- },
-/turf/open/mars,
-/area/bigredv2/outside/filtration_plant)
-"wqe" = (
-/obj/item/trash/hotdog{
- pixel_x = -12;
- pixel_y = -11
- },
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached3"
- },
-/area/bigredv2/outside/nw)
-"wqY" = (
-/obj/item/trash/cigbutt{
- pixel_x = -10;
- pixel_y = 7
- },
-/obj/item/trash/cigbutt{
- pixel_x = 4
+"wqr" = (
+/obj/structure/surface/table,
+/obj/item/paper_bin,
+/obj/structure/pipes/standard/manifold/hidden/green{
+ dir = 8
},
-/obj/item/trash/cigbutt{
- pixel_x = -10;
- pixel_y = 13
+/turf/open/floor{
+ icon_state = "dark"
},
-/obj/item/trash/cigbutt{
- icon_state = "ucigbutt";
- pixel_x = 2;
- pixel_y = 8
+/area/bigredv2/outside/general_offices)
+"wrq" = (
+/obj/effect/decal/strata_decals/grime/grime1,
+/obj/effect/decal/cleanable/ash{
+ pixel_y = 19
},
-/obj/structure/bed/chair{
- dir = 4;
- layer = 3.06
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached9"
},
-/turf/open/mars,
/area/bigredv2/outside/nw)
"wry" = (
/obj/structure/surface/table,
@@ -49309,17 +49063,6 @@
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/telecomm/n_cave)
-"wsL" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/obj/structure/machinery/door/airlock/almayer/security/glass/colony{
- dir = 1;
- name = "\improper Marshal Office Armory";
- locked = 1
- },
-/turf/open/floor{
- icon_state = "delivery"
- },
-/area/bigredv2/outside/marshal_office)
"wtj" = (
/turf/open/floor/plating,
/area/bigredv2/caves/mining)
@@ -49353,6 +49096,26 @@
icon_state = "mars_dirt_4"
},
/area/bigredv2/caves/mining)
+"wtU" = (
+/obj/item/trash/cigbutt{
+ pixel_x = 1;
+ pixel_y = 5
+ },
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached4"
+ },
+/area/bigredv2/outside/c)
+"wuw" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/largecrate/random/barrel/white,
+/obj/item/stack/medical/ointment{
+ pixel_x = 2;
+ pixel_y = 16
+ },
+/turf/open/floor{
+ icon_state = "white"
+ },
+/area/bigredv2/outside/medical)
"wuz" = (
/obj/structure/sink{
dir = 8;
@@ -49364,15 +49127,6 @@
icon_state = "whitebluefull"
},
/area/bigredv2/outside/medical)
-"wuB" = (
-/obj/item/trash/crushed_cup{
- pixel_x = -7;
- pixel_y = -8
- },
-/turf/open/mars_cave{
- icon_state = "mars_dirt_6"
- },
-/area/bigredv2/outside/ne)
"wuC" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/device/flashlight/flare{
@@ -49383,6 +49137,17 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
+"wuM" = (
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached3"
+ },
+/area/bigredv2/outside/e)
+"wuW" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/turf/open/asphalt/cement,
+/area/bigredv2/caves_lambda)
"wvk" = (
/obj/structure/fence,
/turf/open/mars_cave{
@@ -49410,11 +49175,6 @@
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/c)
-"wxC" = (
-/turf/open/floor/plating{
- icon_state = "platebot"
- },
-/area/bigredv2/outside/space_port)
"wyF" = (
/obj/structure/surface/table,
/obj/effect/spawner/random/toolbox,
@@ -49429,31 +49189,17 @@
icon_state = "mars_dirt_4"
},
/area/bigredv2/outside/space_port_lz2)
-"wzZ" = (
-/obj/structure/machinery/cm_vending/sorted/medical/no_access{
- layer = 3.5
- },
-/turf/open/floor{
- icon_state = "white"
+"wAj" = (
+/obj/effect/decal/strata_decals/grime/grime2{
+ dir = 8
},
-/area/bigredv2/outside/medical)
-"wAx" = (
-/obj/item/prop{
- icon = 'icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi';
- icon_state = "m41ae2";
- name = "M41AE2 Heavy Pulse Rifle";
- desc = "A large claw mark across this weapon indicates it is inoperable.";
- pixel_x = 4;
- pixel_y = 7
+/obj/item/stack/sheet/cardboard{
+ pixel_x = -9;
+ pixel_y = -5
},
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor,
-/area/bigredv2/outside/office_complex)
-"wBf" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/obj/effect/decal/cleanable/blood/xeno,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached1"
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidfloor"
},
/area/bigredv2/outside/nw)
"wBi" = (
@@ -49480,6 +49226,25 @@
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/c)
+"wBD" = (
+/obj/structure/surface/table,
+/obj/item/tool/pen{
+ pixel_x = 4;
+ pixel_y = 3
+ },
+/obj/structure/machinery/light{
+ dir = 4
+ },
+/obj/item/tool/hand_labeler{
+ pixel_x = -6;
+ pixel_y = 5
+ },
+/obj/effect/landmark/objective_landmark/science,
+/turf/open/floor{
+ dir = 4;
+ icon_state = "whitepurplecorner"
+ },
+/area/bigredv2/outside/medical)
"wBK" = (
/obj/structure/bed/chair/wood/normal{
dir = 4
@@ -49488,6 +49253,28 @@
icon_state = "wood"
},
/area/bigredv2/outside/library)
+"wBX" = (
+/obj/effect/decal/cleanable/generic,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached12"
+ },
+/area/bigredv2/outside/c)
+"wCi" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/structure/largecrate/supply/medicine/medkits{
+ pixel_x = -3
+ },
+/obj/structure/largecrate/supply/supplies/flares{
+ pixel_x = -1;
+ pixel_y = 20;
+ layer = 3.1
+ },
+/turf/open/floor{
+ icon_state = "white"
+ },
+/area/bigredv2/outside/medical)
"wCo" = (
/turf/open/mars_cave{
icon_state = "mars_dirt_4"
@@ -49509,23 +49296,11 @@
icon_state = "mars_cave_17"
},
/area/bigredv2/caves/mining)
-"wDk" = (
-/obj/item/stack/sheet/wood{
- pixel_y = -7
- },
-/turf/open/floor{
- dir = 4;
- icon_state = "whitegreencorner"
- },
-/area/bigredv2/outside/medical)
-"wEE" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/ammo_casing/bullet,
-/turf/open/floor{
- icon_state = "dark"
+"wDo" = (
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached14"
},
-/area/bigredv2/outside/general_offices)
+/area/bigredv2/outside/filtration_plant)
"wET" = (
/obj/structure/machinery/light{
dir = 8
@@ -49534,6 +49309,20 @@
icon_state = "wood"
},
/area/bigredv2/outside/library)
+"wFd" = (
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/floor{
+ dir = 4;
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/n)
+"wFE" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor{
+ icon_state = "wood"
+ },
+/area/bigredv2/outside/bar)
"wFL" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/sign/safety/hazard{
@@ -49560,35 +49349,6 @@
/obj/structure/closet/firecloset/full,
/turf/open/mars,
/area/bigredv2/outside/c)
-"wGD" = (
-/obj/effect/decal/warning_stripes{
- icon_state = "N";
- pixel_y = 1
- },
-/obj/effect/decal/warning_stripes{
- icon_state = "S";
- pixel_y = -1
- },
-/obj/effect/decal/warning_stripes{
- icon_state = "W";
- layer = 2.5
- },
-/turf/open/floor{
- icon_state = "dark"
- },
-/area/bigredv2/outside/admin_building)
-"wGF" = (
-/obj/item/tool/warning_cone,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
- },
-/area/bigredv2/outside/se)
-"wGV" = (
-/obj/item/tool/wrench,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
- },
-/area/bigredv2/outside/c)
"wHg" = (
/obj/effect/landmark/nightmare{
insert_tag = "lz1north_mining"
@@ -49605,11 +49365,13 @@
icon_state = "darkredcorners2"
},
/area/bigredv2/outside/admin_building)
-"wHy" = (
-/obj/structure/flora/grass/desert/lightgrass_4,
-/obj/effect/decal/cleanable/blood/drip,
-/turf/open/mars,
-/area/bigredv2/outside/n)
+"wHG" = (
+/obj/structure/lz_sign/solaris_sign,
+/turf/open/floor{
+ dir = 10;
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/nw)
"wHM" = (
/obj/structure/pipes/vents/pump{
dir = 4
@@ -49625,23 +49387,6 @@
icon_state = "wood"
},
/area/bigredv2/outside/library)
-"wHW" = (
-/obj/structure/flora/grass/desert/lightgrass_5,
-/turf/open/mars,
-/area/bigredv2/outside/s)
-"wHZ" = (
-/obj/structure/flora/grass/desert/lightgrass_10,
-/turf/open/mars,
-/area/bigredv2/outside/n)
-"wIi" = (
-/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb,
-/obj/item/ammo_casing/shell,
-/obj/item/ammo_casing/shell,
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor{
- icon_state = "wood"
- },
-/area/bigredv2/outside/bar)
"wIw" = (
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
@@ -49650,23 +49395,28 @@
},
/area/bigredv2/caves_east)
"wIz" = (
-/obj/effect/decal/strata_decals/grime/grime3,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
+/obj/effect/landmark/corpsespawner/security,
+/obj/effect/decal/cleanable/blood/gibs/body,
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor{
+ icon_state = "dark"
},
-/area/bigredv2/outside/e)
+/area/bigredv2/outside/marshal_office)
"wJd" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
/obj/structure/surface/table/reinforced/prison,
/turf/open/floor/plating,
/area/bigredv2/caves/mining)
-"wJt" = (
-/obj/effect/decal/cleanable/blood/xeno,
-/turf/open/floor/plating{
- icon_state = "platingdmg3"
+"wJl" = (
+/obj/structure/barricade/wooden{
+ desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
+ health = 25000
},
-/area/bigredv2/outside/medical)
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached14"
+ },
+/area/bigredv2/outside/c)
"wKf" = (
/obj/structure/surface/table,
/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
@@ -49683,15 +49433,32 @@
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
},
-/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor{
+ icon_state = "wood"
+ },
+/area/bigredv2/outside/library)
+"wLj" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/trash/crushed_cup{
+ pixel_x = 7;
+ pixel_y = -5
+ },
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidfloor"
+ },
+/area/bigredv2/outside/ne)
+"wLC" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/blood,
/turf/open/floor{
- icon_state = "wood"
+ dir = 1;
+ icon_state = "asteroidfloor"
},
-/area/bigredv2/outside/library)
-"wKL" = (
-/obj/structure/flora/grass/desert/lightgrass_1,
-/turf/open/mars,
-/area/bigredv2/outside/nw)
+/area/bigredv2/outside/virology)
"wLD" = (
/obj/structure/largecrate/random/barrel/yellow,
/turf/open/floor/plating{
@@ -49722,15 +49489,6 @@
icon_state = "mars_cave_9"
},
/area/bigredv2/caves_north)
-"wMK" = (
-/obj/structure/platform/kutjevo/rock{
- dir = 4
- },
-/obj/effect/decal/cleanable/blood,
-/turf/open/mars_cave{
- icon_state = "mars_cave_13"
- },
-/area/bigredv2/outside/nw)
"wMM" = (
/obj/structure/pipes/vents/pump{
dir = 8
@@ -49744,43 +49502,31 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/engineering)
+"wMN" = (
+/obj/structure/surface/table,
+/obj/item/storage/box/bodybags{
+ pixel_y = 4
+ },
+/turf/open/floor{
+ dir = 4;
+ icon_state = "whitepurplecorner"
+ },
+/area/bigredv2/outside/medical)
"wMQ" = (
/obj/structure/largecrate/random/secure,
/turf/open/floor,
/area/bigred/ground/garage_workshop)
-"wNw" = (
-/obj/effect/decal/cleanable/blood/drip,
-/obj/effect/decal/cleanable/blood/drip,
-/obj/item/ammo_casing/shell,
-/turf/open/floor/plating,
-/area/bigredv2/outside/medical)
"wNA" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/ammo_magazine/pistol/m1911,
/turf/open/floor/plating,
/area/bigredv2/caves/mining)
-"wOf" = (
-/obj/effect/decal/strata_decals/grime/grime1{
- dir = 4
- },
+"wOV" = (
+/obj/effect/decal/cleanable/dirt,
/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached3"
- },
-/area/bigredv2/outside/nw)
-"wOK" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
-/turf/open/asphalt/cement{
- icon_state = "cement15"
- },
-/area/bigredv2/caves_lambda)
-"wPg" = (
-/obj/item/trash/cigbutt{
- pixel_x = -9;
- pixel_y = -6
+ icon_state = "cement_sunbleached4"
},
-/turf/open/mars,
-/area/bigredv2/outside/nw)
+/area/bigredv2/outside/virology)
"wPk" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
@@ -49806,12 +49552,24 @@
icon_state = "mars_cave_7"
},
/area/bigredv2/caves_lambda)
+"wQM" = (
+/obj/effect/decal/cleanable/generic,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached4"
+ },
+/area/bigredv2/outside/w)
"wRl" = (
/obj/effect/landmark/nightmare{
insert_tag = "admin_pmc"
},
/turf/closed/wall/solaris/reinforced,
/area/bigredv2/outside/admin_building)
+"wRz" = (
+/obj/effect/landmark/corpsespawner/colonist,
+/turf/open/floor{
+ icon_state = "wood"
+ },
+/area/bigredv2/outside/dorms)
"wRH" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/device/flashlight,
@@ -49819,24 +49577,18 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/caves/mining)
-"wRI" = (
-/obj/item/explosive/grenade/incendiary/molotov{
- pixel_x = 8
+"wRU" = (
+/turf/open/asphalt/cement,
+/area/bigredv2/caves_lambda)
+"wRV" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
},
+/obj/effect/decal/cleanable/blood,
/turf/open/floor{
icon_state = "freezerfloor"
},
-/area/bigredv2/outside/general_offices)
-"wRM" = (
-/obj/structure/barricade/wooden{
- desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
- dir = 8;
- health = 25000
- },
-/turf/open/floor{
- icon_state = "dark"
- },
-/area/bigredv2/outside/general_offices)
+/area/bigredv2/outside/dorms)
"wSj" = (
/obj/structure/sign/safety/life_support,
/obj/structure/sign/safety/maint{
@@ -49844,16 +49596,68 @@
},
/turf/closed/wall/solaris/reinforced/hull,
/area/bigredv2/oob)
+"wSA" = (
+/turf/closed/wall/solaris{
+ damage = 1870;
+ damage_overlay = 5;
+ current_bulletholes = 1
+ },
+/area/bigredv2/outside/office_complex)
"wSH" = (
-/obj/structure/flora/grass/desert/lightgrass_3,
+/obj/structure/flora/grass/desert/lightgrass_10,
/turf/open/mars,
-/area/bigredv2/outside/e)
-"wTf" = (
+/area/bigredv2/outside/n)
+"wSM" = (
+/obj/item/reagent_container/spray/cleaner{
+ desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back.";
+ name = "Surgery Cleaner";
+ pixel_y = 7;
+ pixel_x = -5
+ },
/turf/open/floor{
- dir = 5;
- icon_state = "whitegreen"
+ icon_state = "white"
+ },
+/area/bigredv2/outside/medical)
+"wSN" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/virology)
+"wTl" = (
+/obj/item/trash/barcardine{
+ pixel_y = 5;
+ pixel_x = 17
+ },
+/turf/open/mars_cave{
+ icon_state = "mars_dirt_4"
+ },
+/area/bigredv2/outside/nw)
+"wTB" = (
+/obj/effect/decal/cleanable/blood/drip,
+/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb{
+ pixel_x = 8;
+ pixel_y = -5
},
+/obj/structure/barricade/wooden{
+ desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
+ dir = 8;
+ health = 25000
+ },
+/turf/open/floor/plating,
/area/bigredv2/outside/medical)
+"wUc" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
+/obj/structure/machinery/light{
+ dir = 8
+ },
+/turf/open/floor{
+ dir = 5;
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/caves_lambda)
"wUo" = (
/obj/item/stack/sheet/wood{
pixel_y = -8
@@ -49868,23 +49672,16 @@
icon_state = "mars_cave_5"
},
/area/bigredv2/caves_se)
+"wUP" = (
+/obj/item/clothing/accessory/storage/holster/armpit,
+/turf/closed/wall/solaris/rock,
+/area/bigredv2/caves)
"wVd" = (
/obj/structure/largecrate/random/barrel/red,
/turf/open/mars_cave{
icon_state = "mars_cave_13"
},
/area/bigredv2/caves/mining)
-"wVt" = (
-/obj/structure/barricade/wooden{
- desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
- dir = 8;
- health = 25000;
- layer = 2.9;
- pixel_x = -7;
- pixel_y = 4
- },
-/turf/open/floor,
-/area/bigredv2/outside/general_offices)
"wVw" = (
/turf/open/floor{
dir = 6;
@@ -49901,18 +49698,17 @@
},
/turf/open/gm/river,
/area/bigredv2/outside/engineering)
+"wVG" = (
+/obj/structure/flora/bush/desert{
+ icon_state = "tree_3"
+ },
+/turf/open/mars,
+/area/bigredv2/outside/e)
"wVQ" = (
/turf/open/mars_cave{
icon_state = "mars_cave_17"
},
/area/bigredv2/caves/mining)
-"wWl" = (
-/obj/structure/prop/rock/brown{
- pixel_y = 10;
- pixel_x = -6
- },
-/turf/open/mars,
-/area/bigredv2/outside/nw)
"wWE" = (
/turf/open/mars_cave{
icon_state = "mars_cave_19"
@@ -49924,13 +49720,6 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/caves_east)
-"wWL" = (
-/obj/effect/decal/cleanable/blood,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor{
- icon_state = "whiteblue"
- },
-/area/bigredv2/outside/medical)
"wWN" = (
/obj/structure/largecrate/random/barrel/green,
/obj/effect/decal/cleanable/dirt,
@@ -49940,35 +49729,41 @@
},
/area/bigredv2/caves/mining)
"wWU" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
+/obj/effect/decal/cleanable/blood/gibs/xeno/body,
+/obj/effect/decal/cleanable/blood/xeno,
+/turf/open/floor/plating,
+/area/bigredv2/outside/medical)
+"wXa" = (
+/obj/structure/prop/invuln/overhead_pipe{
+ dir = 4;
+ pixel_x = 2;
+ pixel_y = 9
},
-/obj/effect/decal/cleanable/generic,
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/nw)
-"wWZ" = (
-/obj/item/ammo_casing/bullet,
-/obj/item/ammo_casing/bullet,
-/turf/open/mars,
-/area/bigredv2/outside/c)
+/obj/item/tool/warning_cone{
+ pixel_x = 6
+ },
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidfloor"
+ },
+/area/bigredv2/outside/ne)
"wXg" = (
/turf/open/mars_cave{
icon_state = "mars_dirt_4"
},
/area/bigredv2/outside/lz1_north_cas)
-"wXn" = (
-/obj/item/frame/table,
-/turf/open/floor{
- icon_state = "dark"
+"wXk" = (
+/obj/effect/decal/cleanable/blood/gibs/xeno,
+/obj/structure/largecrate/supply/medicine/medkits,
+/obj/structure/largecrate/supply{
+ layer = 3.2;
+ pixel_x = -2;
+ pixel_y = 19
},
-/area/bigredv2/outside/marshal_office)
-"wXp" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
+/turf/open/floor{
+ icon_state = "white"
},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement,
-/area/bigredv2/caves_lambda)
+/area/bigredv2/outside/medical)
"wXv" = (
/turf/open/mars{
icon_state = "mars_dirt_14"
@@ -49977,25 +49772,49 @@
"wXz" = (
/turf/open/floor/plating,
/area/bigredv2/caves/eta/research)
-"wXB" = (
-/obj/effect/decal/cleanable/generic,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached1"
+"wXO" = (
+/obj/structure/flora/grass/desert/lightgrass_4,
+/turf/open/mars,
+/area/bigredv2/outside/e)
+"wYp" = (
+/obj/structure/flora/pottedplant{
+ icon_state = "pottedplant_21";
+ layer = 3.1;
+ pixel_y = 11
},
-/area/bigredv2/outside/c)
-"wXE" = (
-/obj/effect/decal/cleanable/dirt,
/turf/open/floor{
- dir = 8;
- icon_state = "carpet13-5"
+ icon_state = "white"
+ },
+/area/bigredv2/outside/medical)
+"wYB" = (
+/obj/item/prop{
+ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
+ icon = 'icons/obj/janitor.dmi';
+ icon_state = "trashbag3";
+ name = "trash bag";
+ pixel_x = -11;
+ pixel_y = -4;
+ layer = 3.2
+ },
+/obj/item/prop{
+ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
+ icon = 'icons/obj/janitor.dmi';
+ icon_state = "trashbag3";
+ name = "trash bag";
+ pixel_x = 7;
+ pixel_y = 16;
+ layer = 3.1
+ },
+/obj/effect/decal/cleanable/blood/drip,
+/obj/item/trash/hotdog{
+ pixel_x = 4;
+ pixel_y = -2
},
-/area/bigredv2/outside/bar)
-"wXN" = (
-/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
/turf/open/floor{
- icon_state = "wood"
+ dir = 1;
+ icon_state = "asteroidfloor"
},
-/area/bigredv2/outside/bar)
+/area/bigredv2/outside/ne)
"wYE" = (
/obj/structure/prop/server_equipment/yutani_server{
density = 0;
@@ -50006,6 +49825,10 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/engineering)
+"wZg" = (
+/obj/item/ammo_casing/bullet,
+/turf/open/mars,
+/area/bigredv2/outside/c)
"wZv" = (
/obj/structure/machinery/light,
/turf/open/floor{
@@ -50018,25 +49841,18 @@
icon_state = "mars_dirt_11"
},
/area/bigredv2/outside/eta)
+"wZM" = (
+/obj/item/frame/table,
+/turf/open/floor{
+ icon_state = "dark"
+ },
+/area/bigredv2/outside/marshal_office)
"wZP" = (
/obj/structure/cargo_container/arious/rightmid,
/turf/open/mars_cave{
icon_state = "mars_dirt_4"
},
/area/bigredv2/outside/space_port_lz2)
-"xaf" = (
-/obj/item/device/defibrillator{
- pixel_x = -9;
- pixel_y = -9
- },
-/obj/item/reagent_container/hypospray/autoinjector/adrenaline{
- pixel_y = 6;
- pixel_x = 9
- },
-/turf/open/floor{
- icon_state = "white"
- },
-/area/bigredv2/outside/medical)
"xaE" = (
/obj/structure/machinery/door/airlock/almayer/security/glass/colony{
dir = 1;
@@ -50049,12 +49865,35 @@
"xaH" = (
/turf/closed/wall/wood,
/area/bigredv2/caves_sw)
+"xbb" = (
+/turf/open/mars{
+ icon_state = "mars_dirt_6"
+ },
+/area/bigredv2/outside/nw)
+"xbO" = (
+/obj/effect/decal/cleanable/blood/xeno,
+/turf/open/floor{
+ icon_state = "darkish"
+ },
+/area/bigredv2/outside/medical)
"xbV" = (
/obj/structure/blocker/forcefield/multitile_vehicles,
/turf/open/mars_cave{
icon_state = "mars_cave_14"
},
/area/bigredv2/outside/lz1_north_cas)
+"xca" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/nw)
+"xcj" = (
+/obj/structure/machinery/light{
+ dir = 8
+ },
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached14"
+ },
+/area/bigredv2/outside/nw)
"xck" = (
/obj/effect/decal/cleanable/blood/drip{
pixel_y = 6
@@ -50075,19 +49914,6 @@
icon_state = "mars_dirt_7"
},
/area/bigredv2/caves/mining)
-"xcq" = (
-/obj/effect/decal/cleanable/blood/gibs/robot{
- name = "door debris"
- },
-/obj/effect/decal/cleanable/blood/gibs/xeno,
-/obj/effect/decal/cleanable/blood/xeno,
-/turf/open/floor,
-/area/bigredv2/outside/office_complex)
-"xcv" = (
-/turf/open/mars_cave{
- icon_state = "mars_cave_14"
- },
-/area/bigredv2/outside/nw)
"xcz" = (
/obj/effect/decal/warning_stripes{
icon_state = "W";
@@ -50099,10 +49925,17 @@
icon_state = "warnplate"
},
/area/bigredv2/outside/telecomm/warehouse)
-"xdl" = (
-/obj/structure/flora/grass/desert/lightgrass_5,
-/turf/open/mars,
-/area/bigredv2/outside/c)
+"xcZ" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/floor,
+/area/bigredv2/outside/general_offices)
+"xdg" = (
+/obj/structure/girder,
+/turf/open/floor/plating{
+ icon_state = "platingdmg3"
+ },
+/area/bigredv2/outside/medical)
"xej" = (
/obj/effect/decal/warning_stripes{
icon_state = "S";
@@ -50112,6 +49945,22 @@
icon_state = "dark"
},
/area/bigredv2/outside/admin_building)
+"xen" = (
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached12"
+ },
+/area/bigredv2/outside/se)
+"xet" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/limb/head,
+/obj/effect/decal/cleanable/blood,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached3"
+ },
+/area/bigredv2/outside/nw)
"xeN" = (
/obj/effect/landmark/lv624/xeno_tunnel,
/turf/open/mars_cave{
@@ -50130,12 +49979,6 @@
icon_state = "mars_dirt_4"
},
/area/bigredv2/caves/mining)
-"xfG" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
- },
-/area/bigredv2/outside/nw)
"xfN" = (
/obj/structure/platform_decoration/shiva{
dir = 1
@@ -50151,6 +49994,27 @@
icon_state = "bcircuitoff"
},
/area/bigredv2/caves/lambda/research)
+"xfT" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/prop{
+ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!";
+ icon = 'icons/obj/janitor.dmi';
+ icon_state = "trashbag3";
+ name = "trash bag";
+ pixel_x = 5;
+ layer = 3.01;
+ pixel_y = -7
+ },
+/obj/item/trash/eat{
+ pixel_x = 2;
+ pixel_y = 10
+ },
+/obj/item/trash/eat{
+ pixel_x = -9;
+ pixel_y = -5
+ },
+/turf/open/floor/plating,
+/area/bigredv2/outside/bar)
"xfW" = (
/turf/open/jungle{
bushes_spawn = 0;
@@ -50169,24 +50033,6 @@
icon_state = "mars_cave_3"
},
/area/bigredv2/caves/mining)
-"xgj" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/item/stack/sheet/wood,
-/turf/open/floor{
- icon_state = "dark"
- },
-/area/bigredv2/outside/general_offices)
-"xgk" = (
-/obj/effect/decal/strata_decals/grime/grime2{
- dir = 4
- },
-/obj/structure/flora/grass/desert/lightgrass_1,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
- },
-/area/bigredv2/outside/c)
"xgm" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor{
@@ -50198,6 +50044,15 @@
icon_state = "mars_cave_9"
},
/area/bigredv2/outside/lz2_south_cas)
+"xgy" = (
+/obj/effect/decal/cleanable/blood/gibs/xeno/body,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/ammo_casing/shell,
+/turf/open/floor{
+ dir = 6;
+ icon_state = "whiteblue"
+ },
+/area/bigredv2/outside/medical)
"xhy" = (
/obj/structure/machinery/light/small{
dir = 8
@@ -50222,40 +50077,22 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"xiy" = (
-/obj/structure/flora/grass/desert/lightgrass_2,
-/turf/open/mars,
-/area/bigredv2/outside/s)
-"xjP" = (
+"xiN" = (
/obj/effect/decal/cleanable/dirt,
-/obj/structure/barricade/wooden{
- desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
- dir = 8;
- health = 25000
+/turf/open/asphalt/cement{
+ icon_state = "cement3"
},
-/turf/open/floor{
- icon_state = "white"
+/area/bigredv2/outside/lambda_cave_cas)
+"xiR" = (
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/mars_cave{
+ icon_state = "mars_cave_13"
},
-/area/bigredv2/outside/medical)
+/area/bigredv2/outside/n)
"xjU" = (
/obj/structure/cargo_container/arious/right,
/turf/open/mars,
/area/bigredv2/outside/space_port_lz2)
-"xkd" = (
-/obj/item/prop{
- desc = "A blood bag with a hole in it. The rats must have gotten to it first.";
- icon = 'icons/obj/items/bloodpack.dmi';
- icon_state = "bloodpack";
- name = "blood bag";
- pixel_x = -5;
- pixel_y = 2;
- layer = 2.8
- },
-/obj/effect/decal/cleanable/generic,
-/turf/open/mars_cave{
- icon_state = "mars_cave_20"
- },
-/area/bigredv2/outside/nw)
"xkq" = (
/turf/open/mars_cave{
icon_state = "mars_cave_3"
@@ -50274,11 +50111,6 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"xkN" = (
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached14"
- },
-/area/bigredv2/outside/filtration_plant)
"xkR" = (
/obj/effect/decal/cleanable/blood{
icon_state = "xgib3";
@@ -50292,27 +50124,23 @@
icon_state = "mars_cave_13"
},
/area/bigredv2/caves/mining)
-"xkU" = (
-/obj/effect/decal/cleanable/blood/gibs/body,
-/turf/open/mars_cave{
- icon_state = "mars_cave_2"
- },
-/area/bigredv2/outside/nw)
-"xlB" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement{
- icon_state = "cement3"
- },
-/area/bigredv2/caves_lambda)
-"xmq" = (
-/obj/structure/flora/grass/desert/lightgrass_11,
+"xln" = (
+/obj/item/ammo_casing/bullet,
+/obj/item/ammo_casing/bullet,
/turf/open/mars,
-/area/bigredv2/outside/nw)
+/area/bigredv2/outside/c)
"xmy" = (
/turf/open/mars_cave{
icon_state = "mars_cave_2"
},
/area/bigredv2/outside/lz1_telecomm_cas)
+"xmQ" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/ammo_casing/shell,
+/turf/open/floor{
+ icon_state = "whiteblue"
+ },
+/area/bigredv2/outside/medical)
"xmT" = (
/obj/structure/platform/kutjevo/rock,
/obj/structure/platform/kutjevo/rock{
@@ -50325,24 +50153,24 @@
icon_state = "mars_cave_2"
},
/area/space)
-"xnX" = (
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached2"
+"xnf" = (
+/obj/structure/surface/table,
+/obj/item/tool/surgery/FixOVein{
+ pixel_x = -7;
+ pixel_y = -6
},
-/area/bigredv2/outside/e)
-"xof" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement{
- icon_state = "cement3"
+/turf/open/floor{
+ dir = 5;
+ icon_state = "whitebluefull"
},
-/area/bigredv2/outside/space_port)
-"xoQ" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement{
- icon_state = "cement1";
- dir = 1
+/area/bigredv2/outside/medical)
+"xoz" = (
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor{
+ dir = 1;
+ icon_state = "whiteblue"
},
-/area/bigredv2/outside/space_port)
+/area/bigredv2/outside/medical)
"xpb" = (
/turf/open/floor{
dir = 5;
@@ -50354,75 +50182,35 @@
icon_state = "dark"
},
/area/bigredv2/caves/eta/research)
-"xpv" = (
-/obj/effect/landmark/corpsespawner/security/marshal,
-/obj/item/weapon/gun/revolver/cmb{
- pixel_x = 7;
- pixel_y = -13
- },
-/obj/effect/decal/cleanable/blood,
-/obj/effect/decal/cleanable/blood/gibs/body,
-/obj/item/explosive/grenade/high_explosive{
- pixel_x = -11;
- pixel_y = 17
- },
-/turf/open/floor{
- dir = 1;
- icon_state = "whitegreen"
- },
-/area/bigredv2/outside/medical)
-"xpF" = (
-/obj/structure/machinery/landinglight/ds1,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor{
- icon_state = "asteroidwarning"
- },
-/area/bigredv2/outside/space_port)
"xpG" = (
/obj/structure/sign/safety/hazard,
/turf/closed/wall/solaris,
/area/bigredv2/outside/filtration_plant)
-"xpL" = (
-/obj/item/tool/wirecutters,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
- },
-/area/bigredv2/outside/c)
-"xpY" = (
-/obj/effect/decal/cleanable/blood/drip,
+"xpT" = (
+/obj/effect/decal/strata_decals/grime/grime3,
/turf/open/floor{
- dir = 6;
icon_state = "asteroidwarning"
},
-/area/bigredv2/outside/eta)
+/area/bigredv2/outside/nw)
"xqf" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/landmark/objective_landmark/medium,
/turf/open/floor,
/area/bigredv2/outside/general_offices)
-"xrb" = (
-/obj/structure/flora/grass/desert/lightgrass_1,
-/turf/open/mars,
-/area/bigredv2/outside/c)
-"xrp" = (
-/obj/structure/largecrate/guns/merc{
- name = "\improper dodgy crate"
+"xqX" = (
+/obj/structure/flora/bush/desert{
+ icon_state = "tree_3"
},
-/turf/open/floor/plating,
-/area/bigredv2/caves/mining)
-"xrG" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached15"
+/turf/open/mars_cave{
+ icon_state = "mars_dirt_6"
},
-/area/bigredv2/outside/c)
-"xrH" = (
-/obj/item/trash/cigbutt{
- pixel_x = -6;
- pixel_y = -9
+/area/bigredv2/outside/n)
+"xrp" = (
+/obj/structure/largecrate/guns/merc{
+ name = "\improper dodgy crate"
},
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/c)
+/turf/open/floor/plating,
+/area/bigredv2/caves/mining)
"xrO" = (
/obj/structure/barricade/wooden{
desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
@@ -50438,6 +50226,10 @@
icon_state = "mars_dirt_4"
},
/area/bigredv2/caves/mining)
+"xsK" = (
+/obj/structure/flora/grass/desert/lightgrass_8,
+/turf/open/mars,
+/area/bigredv2/outside/n)
"xsX" = (
/obj/structure/bed/chair{
dir = 8;
@@ -50454,10 +50246,12 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"xtg" = (
-/obj/structure/flora/grass/desert/lightgrass_3,
-/turf/open/mars,
-/area/bigredv2/outside/n)
+"xtq" = (
+/obj/effect/decal/strata_decals/grime/grime4,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached1"
+ },
+/area/bigredv2/outside/nw)
"xtB" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
@@ -50470,6 +50264,32 @@
icon_state = "mars_dirt_4"
},
/area/bigredv2/outside/s)
+"xtO" = (
+/obj/effect/decal/strata_decals/grime/grime1{
+ dir = 4
+ },
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached3"
+ },
+/area/bigredv2/outside/c)
+"xux" = (
+/obj/structure/surface/table,
+/obj/structure/machinery/light{
+ dir = 8
+ },
+/obj/item/reagent_container/food/snacks/wrapped/booniebars{
+ pixel_y = 7;
+ pixel_x = -2
+ },
+/turf/open/floor,
+/area/bigredv2/outside/general_offices)
+"xuH" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 6
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/bigredv2/outside/general_offices)
"xuP" = (
/obj/item/trash/cigbutt/cigarbutt{
pixel_x = 16;
@@ -50491,22 +50311,31 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/caves_east)
-"xwm" = (
-/turf/closed/wall/solaris{
- damage = 1000;
- damage_overlay = 3
+"xuZ" = (
+/obj/structure/platform_decoration/kutjevo/rock{
+ layer = 3.1
},
-/area/bigredv2/outside/office_complex)
+/obj/effect/decal/cleanable/generic,
+/turf/open/mars_cave{
+ icon_state = "mars_cave_19"
+ },
+/area/bigredv2/outside/nw)
+"xvW" = (
+/obj/item/clothing/mask/breath/medical{
+ pixel_y = -3;
+ pixel_x = -7
+ },
+/obj/effect/decal/cleanable/blood/gibs/limb,
+/turf/open/floor{
+ icon_state = "white"
+ },
+/area/bigredv2/outside/medical)
"xwo" = (
/obj/structure/disposalpipe/junction,
/turf/open/mars_cave{
icon_state = "mars_cave_2"
},
/area/bigredv2/caves/mining)
-"xwv" = (
-/obj/effect/decal/cleanable/generic,
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/nw)
"xwy" = (
/obj/structure/machinery/light/small{
dir = 1
@@ -50522,27 +50351,18 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"xwL" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/barricade/handrail{
- dir = 8
- },
+"xwM" = (
+/obj/effect/decal/cleanable/blood/gibs/limb,
/obj/effect/decal/cleanable/blood,
/turf/open/floor{
- dir = 8;
- icon_state = "asteroidwarning"
- },
-/area/bigredv2/outside/c)
-"xwN" = (
-/obj/item/weapon/gun/revolver/m44{
- pixel_x = 9;
- pixel_y = -14
- },
-/turf/open/floor{
- dir = 4;
- icon_state = "asteroidwarning"
+ dir = 1;
+ icon_state = "asteroidfloor"
},
-/area/bigredv2/outside/c)
+/area/bigredv2/outside/s)
+"xwV" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/se)
"xya" = (
/obj/structure/barricade/wooden{
desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it...";
@@ -50556,12 +50376,25 @@
icon_state = "mars_dirt_4"
},
/area/bigredv2/caves/mining)
-"xye" = (
-/obj/item/ammo_casing/bullet,
-/obj/item/ammo_casing/bullet,
-/obj/item/ammo_casing/bullet,
-/turf/open/mars,
+"xyj" = (
+/turf/open/asphalt/cement{
+ icon_state = "cement4"
+ },
+/area/bigredv2/outside/space_port)
+"xyr" = (
+/obj/effect/decal/strata_decals/grime/grime1{
+ dir = 1
+ },
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached15"
+ },
/area/bigredv2/outside/c)
+"xyt" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor{
+ icon_state = "red"
+ },
+/area/bigredv2/outside/lambda_cave_cas)
"xyu" = (
/obj/structure/closet/l3closet/security,
/turf/open/floor{
@@ -50577,25 +50410,21 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"xyE" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/storage/firstaid/rad/empty{
- pixel_x = -9
- },
-/turf/open/floor{
- icon_state = "whitegreencorner"
+"xyM" = (
+/obj/effect/decal/strata_decals/grime/grime2{
+ dir = 4
},
-/area/bigredv2/outside/medical)
-"xzb" = (
-/obj/structure/surface/rack,
-/obj/item/clothing/under/lightbrown{
- pixel_x = 10;
- pixel_y = -5
+/obj/structure/flora/grass/desert/lightgrass_1,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached12"
},
-/turf/open/floor{
- icon_state = "freezerfloor"
+/area/bigredv2/outside/c)
+"xzf" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 5
},
-/area/bigredv2/outside/general_offices)
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/nw)
"xzi" = (
/obj/effect/decal/remains/xeno,
/turf/open/floor/plating{
@@ -50624,13 +50453,6 @@
icon_state = "mars_cave_15"
},
/area/bigredv2/caves/mining)
-"xAJ" = (
-/obj/effect/decal/strata_decals/grime/grime3,
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidwarning"
- },
-/area/bigredv2/outside/nw)
"xAX" = (
/obj/structure/machinery/power/apc{
dir = 1
@@ -50640,6 +50462,33 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/engineering)
+"xBa" = (
+/turf/open/floor{
+ dir = 4;
+ icon_state = "whitegreencorner"
+ },
+/area/bigredv2/outside/medical)
+"xBe" = (
+/obj/structure/pipes/standard/simple/visible{
+ dir = 9
+ },
+/obj/effect/decal/medical_decals{
+ icon_state = "cryotop"
+ },
+/turf/open/floor{
+ dir = 5;
+ icon_state = "whitebluefull"
+ },
+/area/bigredv2/outside/medical)
+"xBl" = (
+/obj/structure/pipes/standard/manifold/hidden/green{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/floor{
+ icon_state = "white"
+ },
+/area/bigredv2/outside/medical)
"xBn" = (
/obj/structure/platform{
dir = 4
@@ -50656,72 +50505,41 @@
icon_state = "mars_dirt_6"
},
/area/bigredv2/caves/mining)
-"xBS" = (
-/turf/open/mars_cave{
- icon_state = "mars_cave_14"
- },
-/area/bigredv2/outside/lz1_north_cas)
-"xBT" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/shard,
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
+"xBL" = (
+/obj/item/prop{
+ desc = "A blood bag with a hole in it. The rats must have gotten to it first.";
+ icon = 'icons/obj/items/bloodpack.dmi';
+ icon_state = "bloodpack";
+ name = "blood bag";
+ pixel_x = -2;
+ pixel_y = 10
},
-/area/bigredv2/outside/ne)
-"xBU" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/ammo_casing/bullet,
-/obj/effect/decal/cleanable/blood/drip,
-/turf/open/floor{
- icon_state = "dark"
+/obj/item/prop/colony/usedbandage,
+/obj/item/prop/colony/usedbandage{
+ dir = 4;
+ pixel_x = 5;
+ pixel_y = 26
},
-/area/bigredv2/outside/general_offices)
-"xBY" = (
-/obj/effect/decal/cleanable/blood,
-/turf/open/mars,
-/area/bigredv2/outside/c)
-"xCh" = (
-/obj/item/trash/cigbutt{
- pixel_x = -6;
- pixel_y = -9
+/obj/effect/decal/cleanable/generic,
+/obj/effect/decal/cleanable/ash{
+ pixel_y = 19
},
-/obj/item/trash/cigbutt{
- pixel_x = -7;
- pixel_y = 13
+/turf/open/mars_cave{
+ icon_state = "mars_cave_9"
},
-/turf/open/mars,
/area/bigredv2/outside/nw)
-"xCi" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
- },
-/area/bigredv2/outside/eta)
-"xCH" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/obj/structure/barricade/wooden{
- dir = 1;
- pixel_y = 7
- },
-/obj/structure/largecrate/supply/medicine/iv{
- pixel_y = -7;
- pixel_x = 3
- },
-/obj/structure/largecrate/random/mini/med{
- pixel_x = 5;
- pixel_y = 6
+"xBS" = (
+/turf/open/mars_cave{
+ icon_state = "mars_cave_14"
},
-/turf/open/floor{
- icon_state = "whitegreencorner"
+/area/bigredv2/outside/lz1_north_cas)
+"xCB" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood/xeno,
+/turf/open/floor/plating{
+ icon_state = "platingdmg1"
},
/area/bigredv2/outside/medical)
-"xDd" = (
-/obj/structure/flora/grass/desert/lightgrass_6,
-/turf/open/mars,
-/area/bigredv2/outside/virology)
"xDO" = (
/turf/open/floor/plating{
dir = 8;
@@ -50735,29 +50553,71 @@
icon_state = "test_floor4"
},
/area/bigredv2/outside/engineering)
-"xEB" = (
-/obj/structure/flora/grass/desert/lightgrass_12,
-/turf/open/mars,
-/area/bigredv2/outside/n)
-"xFQ" = (
-/obj/structure/bed,
-/obj/item/bedsheet/medical,
+"xEX" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/e)
+"xFg" = (
+/obj/structure/bed/chair{
+ dir = 4
+ },
+/obj/effect/landmark/survivor_spawner,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor,
+/area/bigredv2/outside/dorms)
+"xFo" = (
+/obj/item/trash/pistachios{
+ pixel_x = -3;
+ pixel_y = 11
+ },
+/turf/open/mars_cave{
+ icon_state = "mars_dirt_4"
+ },
+/area/bigredv2/outside/nw)
+"xFz" = (
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/w)
+"xFA" = (
+/obj/structure/machinery/botany,
+/obj/item/seeds/goldappleseed,
/turf/open/floor{
- dir = 4;
- icon_state = "whitegreen"
+ icon_state = "white"
},
-/area/bigredv2/outside/medical)
+/area/bigredv2/outside/marshal_office)
+"xFP" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 9
+ },
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached3"
+ },
+/area/bigredv2/outside/s)
"xFZ" = (
/turf/open/mars_cave,
/area/bigredv2/caves_lambda)
-"xHA" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
+"xGH" = (
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/floor{
+ dir = 6;
+ icon_state = "asteroidwarning"
},
-/turf/open/asphalt/cement{
- icon_state = "cement14"
+/area/bigredv2/outside/eta)
+"xHx" = (
+/obj/structure/surface/table/reinforced,
+/turf/open/floor{
+ dir = 4;
+ icon_state = "whitegreen"
},
-/area/bigredv2/outside/space_port)
+/area/bigredv2/outside/medical)
+"xHE" = (
+/obj/structure/bed/roller,
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor{
+ icon_state = "whitegreenfull"
+ },
+/area/bigredv2/outside/medical)
"xIo" = (
/obj/structure/window/framed/solaris/reinforced/hull,
/turf/open/floor/plating{
@@ -50765,15 +50625,6 @@
icon_state = "platingdmg3"
},
/area/bigredv2/oob)
-"xIt" = (
-/obj/item/trash/cigbutt{
- pixel_x = 1;
- pixel_y = 5
- },
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached9"
- },
-/area/bigredv2/outside/c)
"xIv" = (
/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
dir = 8;
@@ -50794,10 +50645,32 @@
/obj/structure/surface/table,
/turf/open/floor,
/area/bigredv2/outside/lz2_south_cas)
+"xIW" = (
+/obj/structure/blocker/forcefield/multitile_vehicles,
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidfloor"
+ },
+/area/bigredv2/outside/eta)
"xJC" = (
/obj/item/ore,
/turf/open/mars,
/area/bigredv2/outside/filtration_plant)
+"xJG" = (
+/obj/structure/surface/table/woodentable,
+/obj/item/trash/raisins{
+ pixel_x = 9;
+ pixel_y = 11
+ },
+/turf/open/floor{
+ icon_state = "wood"
+ },
+/area/bigredv2/outside/bar)
+"xJM" = (
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/nw)
"xJP" = (
/obj/effect/landmark/corpsespawner/miner,
/obj/item/tool/pickaxe,
@@ -50818,6 +50691,21 @@
/obj/structure/prop/server_equipment/yutani_server,
/turf/open/floor/greengrid,
/area/bigredv2/caves/lambda/research)
+"xKt" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood/oil/streak,
+/turf/open/floor,
+/area/bigredv2/outside/office_complex)
+"xKz" = (
+/obj/structure/surface/table,
+/obj/item/tool/pen/blue{
+ pixel_y = -8;
+ pixel_x = 3
+ },
+/turf/open/floor{
+ icon_state = "grimy"
+ },
+/area/bigredv2/outside/office_complex)
"xKG" = (
/obj/structure/bed/sofa/south/grey/right{
pixel_y = 6
@@ -50825,13 +50713,16 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor,
/area/bigredv2/outside/admin_building)
-"xLj" = (
-/obj/effect/decal/cleanable/blood/drip,
-/turf/open/floor{
- dir = 4;
- icon_state = "asteroidwarning"
+"xKM" = (
+/obj/item/stack/sheet/wood{
+ pixel_y = -13;
+ pixel_x = 12
},
-/area/bigredv2/outside/eta)
+/obj/structure/barricade/wooden{
+ dir = 4
+ },
+/turf/open/mars,
+/area/bigredv2/outside/n)
"xLz" = (
/obj/effect/landmark/nightmare{
insert_tag = "lz1containers_scramble"
@@ -50841,6 +50732,15 @@
icon_state = "asteroidwarning"
},
/area/bigredv2/outside/space_port)
+"xLL" = (
+/obj/structure/machinery/door/airlock/almayer/medical{
+ name = "\improper Medical Clinic Morgue";
+ locked = 1
+ },
+/turf/open/floor{
+ icon_state = "delivery"
+ },
+/area/bigredv2/outside/medical)
"xLM" = (
/obj/structure/machinery/light{
dir = 1
@@ -50851,11 +50751,26 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"xMd" = (
-/obj/effect/landmark/corpsespawner/colonist,
-/obj/effect/decal/cleanable/blood/gibs/body,
-/turf/open/floor/plating,
-/area/bigredv2/outside/medical)
+"xLU" = (
+/obj/effect/decal/strata_decals/grime/grime4,
+/turf/open/asphalt/cement,
+/area/bigredv2/outside/space_port)
+"xMj" = (
+/obj/structure/machinery/landinglight/ds1{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor{
+ dir = 1;
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/space_port)
+"xMl" = (
+/obj/effect/decal/strata_decals/grime/grime1,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached4"
+ },
+/area/bigredv2/outside/nw)
"xMr" = (
/obj/effect/decal/cleanable/dirt,
/turf/closed/wall/solaris/reinforced/hull,
@@ -50885,14 +50800,13 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"xNr" = (
-/obj/structure/surface/table,
-/obj/effect/spawner/random/tool{
- pixel_x = 4;
- pixel_y = 13
+"xNA" = (
+/obj/effect/landmark/corpsespawner/scientist,
+/obj/effect/decal/cleanable/blood/gibs/body,
+/turf/open/floor{
+ icon_state = "asteroidwarning"
},
-/turf/open/floor,
-/area/bigredv2/outside/dorms)
+/area/bigredv2/outside/eta)
"xNL" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 1
@@ -50901,29 +50815,57 @@
icon_state = "dark"
},
/area/bigredv2/caves/lambda/research)
+"xNU" = (
+/obj/structure/flora/grass/desert/lightgrass_3,
+/turf/open/mars,
+/area/bigredv2/outside/se)
"xOk" = (
/obj/effect/landmark/nightmare{
insert_tag = "cargo_containers"
},
/turf/closed/wall/solaris,
/area/bigredv2/outside/cargo)
-"xOC" = (
-/obj/structure/girder,
-/turf/open/floor/plating{
- dir = 8;
- icon_state = "platingdmg3"
+"xOM" = (
+/obj/structure/largecrate/random/barrel/green{
+ pixel_x = -11;
+ pixel_y = 9
},
-/area/bigredv2/outside/office_complex)
+/obj/item/reagent_container/food/drinks/bottle/beer/craft/tuxedo{
+ pixel_x = -5;
+ pixel_y = 26
+ },
+/obj/item/trash/plate{
+ pixel_x = -12;
+ pixel_y = 22
+ },
+/turf/open/mars_cave{
+ icon_state = "mars_cave_13"
+ },
+/area/bigredv2/outside/ne)
+"xOW" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/trash/cigbutt{
+ pixel_x = -7;
+ pixel_y = 13
+ },
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached3"
+ },
+/area/bigredv2/outside/nw)
"xPg" = (
/obj/structure/barricade/handrail/wire,
/turf/open/mars_cave{
icon_state = "mars_dirt_4"
},
/area/bigredv2/outside/c)
-"xPW" = (
-/obj/effect/decal/cleanable/blood/drip,
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/nw)
+"xPP" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/turf/open/asphalt/cement{
+ icon_state = "cement3"
+ },
+/area/bigredv2/caves_lambda)
"xQb" = (
/obj/structure/pipes/vents/pump/on,
/obj/effect/decal/cleanable/dirt,
@@ -50952,22 +50894,25 @@
icon_state = "asteroidfloor"
},
/area/bigredv2/caves_north)
+"xRM" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/structure/barricade/wooden,
+/turf/open/floor{
+ icon_state = "wood"
+ },
+/area/bigredv2/outside/bar)
"xSa" = (
/obj/structure/prop/dam/crane,
/turf/open/mars_cave{
icon_state = "mars_cave_13"
},
/area/bigredv2/caves/mining)
-"xSX" = (
-/obj/structure/barricade/deployable{
- dir = 8
- },
-/turf/open/floor{
- icon_state = "dark"
+"xSw" = (
+/obj/structure/flora/bush/desert{
+ icon_state = "tree_3"
},
-/area/bigredv2/outside/marshal_office)
-"xTc" = (
-/obj/structure/flora/grass/desert/lightgrass_5,
/turf/open/mars,
/area/bigredv2/outside/filtration_plant)
"xTk" = (
@@ -50976,25 +50921,27 @@
/obj/structure/blocker/forcefield/multitile_vehicles,
/turf/open/floor,
/area/bigredv2/outside/lambda_cave_cas)
+"xTL" = (
+/obj/structure/bed/chair{
+ dir = 8
+ },
+/turf/open/floor{
+ icon_state = "white"
+ },
+/area/bigredv2/outside/marshal_office)
"xTM" = (
/obj/structure/closet/medical_wall,
/turf/closed/wall/solaris/reinforced,
/area/bigredv2/caves/mining)
-"xTQ" = (
-/obj/effect/decal/cleanable/blood/xeno,
-/turf/open/floor{
- icon_state = "freezerfloor"
- },
-/area/bigredv2/outside/general_offices)
-"xTV" = (
-/obj/effect/decal/cleanable/dirt,
+"xTZ" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
},
-/turf/open/asphalt/cement{
- icon_state = "cement3"
+/obj/item/ammo_casing/shell,
+/turf/open/floor{
+ icon_state = "wood"
},
-/area/bigredv2/outside/lambda_cave_cas)
+/area/bigredv2/outside/bar)
"xUo" = (
/obj/effect/landmark/monkey_spawn,
/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
@@ -51008,12 +50955,15 @@
icon_state = "mars_dirt_4"
},
/area/bigredv2/caves/mining)
-"xWe" = (
-/obj/item/clothing/under/darkred,
-/turf/open/floor{
- icon_state = "freezerfloor"
+"xVt" = (
+/obj/item/trash/kepler{
+ pixel_y = 14;
+ pixel_x = 15
},
-/area/bigredv2/outside/general_offices)
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached1"
+ },
+/area/bigredv2/outside/nw)
"xWl" = (
/obj/structure/machinery/door/poddoor/almayer/closed{
dir = 4;
@@ -51045,11 +50995,6 @@
},
/turf/open/floor/plating,
/area/bigredv2/caves/mining)
-"xWv" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
-/turf/open/asphalt/cement,
-/area/bigredv2/caves_lambda)
"xWz" = (
/obj/effect/decal/cleanable/dirt{
pixel_x = 17
@@ -51061,21 +51006,35 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"xWD" = (
-/obj/structure/blocker/forcefield/multitile_vehicles,
-/obj/effect/decal/cleanable/blood/gibs/limb,
-/obj/effect/decal/cleanable/blood/drip,
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
+"xWA" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
},
-/area/bigredv2/outside/eta)
+/obj/effect/decal/cleanable/blood/xeno,
+/obj/effect/decal/cleanable/blood{
+ icon_state = "xgib4"
+ },
+/turf/open/floor,
+/area/bigredv2/outside/general_offices)
+"xWF" = (
+/obj/structure/pipes/standard/manifold/hidden/green,
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor,
+/area/bigredv2/outside/cargo)
"xWH" = (
/obj/structure/barricade/wooden,
/turf/open/mars_cave{
icon_state = "mars_cave_16"
},
/area/bigredv2/caves/mining)
+"xWJ" = (
+/obj/structure/bed/roller,
+/obj/structure/closet/bodybag,
+/turf/open/floor{
+ dir = 8;
+ icon_state = "whitegreencorner"
+ },
+/area/bigredv2/outside/medical)
"xWR" = (
/obj/effect/decal/warning_stripes{
icon_state = "E";
@@ -51117,6 +51076,12 @@
icon_state = "darkyellow2"
},
/area/bigredv2/outside/engineering)
+"xXK" = (
+/obj/structure/flora/grass/desert/lightgrass_7,
+/turf/open/mars_cave{
+ icon_state = "mars_dirt_4"
+ },
+/area/bigredv2/outside/c)
"xXP" = (
/obj/structure/prop/invuln/minecart_tracks/bumper,
/turf/open/mars_cave{
@@ -51135,6 +51100,28 @@
icon_state = "mars_cave_17"
},
/area/bigredv2/caves/mining)
+"xYA" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/blood/oil/streak,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached3"
+ },
+/area/bigredv2/outside/s)
+"xYB" = (
+/obj/structure/platform/kutjevo/rock{
+ dir = 8;
+ layer = 2.9;
+ pixel_x = -3
+ },
+/obj/structure/platform/kutjevo/rock,
+/turf/closed/wall/solaris/rock,
+/area/bigredv2/caves)
+"xYI" = (
+/obj/structure/flora/grass/desert/lightgrass_9,
+/turf/open/mars,
+/area/bigredv2/outside/se)
"xZf" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
@@ -51153,51 +51140,45 @@
icon_state = "mars_dirt_7"
},
/area/bigredv2/caves/mining)
-"xZo" = (
-/obj/effect/decal/cleanable/blood/drip,
-/turf/open/mars_cave{
- icon_state = "mars_cave_15"
- },
-/area/bigredv2/outside/n)
-"xZy" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
- },
-/area/bigredv2/outside/c)
"xZL" = (
/turf/closed/wall/solaris/rock,
/area/bigredv2/outside/lambda_cave_cas)
+"xZO" = (
+/obj/structure/flora/grass/desert/lightgrass_4,
+/turf/open/mars,
+/area/bigredv2/outside/filtration_plant)
+"xZV" = (
+/obj/structure/bed/bedroll{
+ dir = 5
+ },
+/obj/effect/decal/cleanable/blood/drip,
+/obj/item/prop/colony/usedbandage{
+ dir = 4;
+ pixel_x = -1;
+ pixel_y = -4
+ },
+/turf/closed/wall/solaris/rock,
+/area/bigredv2/caves)
"yar" = (
/turf/open/floor{
dir = 4;
icon_state = "darkyellow2"
},
/area/bigredv2/outside/filtration_plant)
-"yaE" = (
-/obj/item/trash/sosjerky{
- pixel_x = 8;
- pixel_y = 12
- },
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
- },
-/area/bigredv2/outside/w)
"ybk" = (
/turf/open/mars_cave{
icon_state = "mars_cave_17"
},
/area/bigredv2/caves_research)
-"ybG" = (
-/obj/structure/blocker/forcefield/multitile_vehicles,
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
+"ybL" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/item/trash/semki{
+ pixel_y = -14
},
-/area/bigredv2/outside/eta)
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached12"
+ },
+/area/bigredv2/outside/nw)
"ybT" = (
/obj/structure/machinery/door/airlock/almayer/maint/colony{
name = "\improper Machine room"
@@ -51207,27 +51188,11 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"ybV" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/xtracks,
-/turf/open/floor{
- icon_state = "whitepurplefull"
- },
-/area/bigredv2/outside/medical)
"ycM" = (
/turf/open/mars_cave{
icon_state = "mars_cave_7"
},
/area/bigredv2/caves/lambda/xenobiology)
-"ycN" = (
-/obj/item/weapon/baton/damaged{
- pixel_y = 20
- },
-/obj/effect/decal/cleanable/blood/xeno,
-/turf/open/floor{
- icon_state = "redcorner"
- },
-/area/bigredv2/outside/marshal_office)
"ycP" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
@@ -51235,6 +51200,18 @@
icon_state = "dark"
},
/area/bigredv2/caves/eta/storage)
+"ycR" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/obj/structure/barricade/wooden{
+ dir = 8
+ },
+/obj/structure/machinery/cm_vending/sorted/medical/no_access{
+ pixel_x = 12
+ },
+/turf/open/floor{
+ icon_state = "white"
+ },
+/area/bigredv2/outside/medical)
"yda" = (
/obj/effect/decal/warning_stripes{
icon_state = "N"
@@ -51263,47 +51240,50 @@
icon_state = "mars_dirt_4"
},
/area/bigredv2/outside/eta)
-"ydq" = (
-/obj/item/tool/minihoe{
- pixel_x = -4;
- pixel_y = -4
+"yeq" = (
+/obj/effect/decal/strata_decals/grime/grime4,
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/nw)
+"yeC" = (
+/obj/structure/surface/table,
+/obj/structure/pipes/vents/pump,
+/obj/structure/transmitter/colony_net{
+ phone_category = "Solaris Ridge";
+ phone_color = "green";
+ phone_id = "Clinic";
+ pixel_y = 24
},
/turf/open/floor{
icon_state = "white"
},
-/area/bigredv2/outside/marshal_office)
-"ydw" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/flora/grass/desert/lightgrass_1,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
+/area/bigredv2/outside/medical)
+"yeK" = (
+/obj/item/trash/cigbutt{
+ pixel_x = -6;
+ pixel_y = -2
},
-/area/bigredv2/outside/e)
-"ydK" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/generic,
/turf/open/floor{
dir = 1;
- icon_state = "asteroidwarning"
+ icon_state = "asteroidfloor"
},
/area/bigredv2/outside/ne)
-"yej" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 10
- },
-/obj/effect/decal/cleanable/blood{
- icon_state = "gib6"
+"yeL" = (
+/obj/effect/landmark/corpsespawner/colonist,
+/obj/effect/decal/cleanable/vomit{
+ pixel_x = -7;
+ pixel_y = 13
},
-/obj/effect/decal/cleanable/blood/drip,
/turf/open/floor{
- dir = 1;
- icon_state = "asteroidwarning"
+ icon_state = "wood"
},
-/area/bigredv2/outside/n)
-"yfc" = (
-/obj/effect/decal/cleanable/vomit,
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/w)
+/area/bigredv2/outside/bar)
+"yeX" = (
+/obj/effect/landmark/crap_item,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached12"
+ },
+/area/bigredv2/outside/nw)
"yfs" = (
/obj/effect/decal/warning_stripes{
icon_state = "S"
@@ -51333,19 +51313,6 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
-"ygN" = (
-/obj/structure/machinery/washing_machine,
-/obj/item/clothing/under/brown{
- pixel_y = 11;
- pixel_x = 7
- },
-/obj/structure/machinery/washing_machine{
- pixel_y = 13
- },
-/turf/open/floor{
- icon_state = "freezerfloor"
- },
-/area/bigredv2/outside/general_offices)
"ygP" = (
/obj/effect/decal/warning_stripes{
icon_state = "N";
@@ -51375,11 +51342,12 @@
icon_state = "mars_dirt_5"
},
/area/bigredv2/caves/mining)
-"yhr" = (
-/obj/structure/bed/roller,
+"yhi" = (
+/obj/structure/bed,
/obj/effect/decal/cleanable/blood/gibs/body,
/turf/open/floor{
- icon_state = "white"
+ dir = 4;
+ icon_state = "whitegreen"
},
/area/bigredv2/outside/medical)
"yhG" = (
@@ -51402,6 +51370,15 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/caves/mining)
+"yhS" = (
+/obj/structure/pipes/standard/manifold/hidden/green{
+ dir = 8
+ },
+/obj/item/frame/table,
+/turf/open/floor{
+ icon_state = "dark"
+ },
+/area/bigredv2/outside/marshal_office)
"yhV" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
@@ -51410,10 +51387,37 @@
icon_state = "test_floor4"
},
/area/bigredv2/outside/filtration_plant)
-"yjg" = (
-/obj/structure/flora/grass/desert/lightgrass_9,
-/turf/open/mars,
-/area/bigredv2/outside/nw)
+"yiw" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/blood,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor{
+ icon_state = "freezerfloor"
+ },
+/area/bigredv2/outside/general_offices)
+"yiI" = (
+/obj/structure/machinery/light{
+ dir = 1
+ },
+/obj/structure/machinery/door_control{
+ id = "Medical";
+ name = "Storm Shutters";
+ pixel_y = 32
+ },
+/obj/structure/bed,
+/turf/open/floor{
+ dir = 4;
+ icon_state = "whitegreen"
+ },
+/area/bigredv2/outside/medical)
+"yjx" = (
+/obj/structure/bed/chair/office/light{
+ dir = 4
+ },
+/turf/open/floor,
+/area/bigredv2/outside/office_complex)
"yjU" = (
/obj/item/weapon/broken_bottle,
/turf/open/floor/plating{
@@ -51427,20 +51431,10 @@
},
/turf/open/gm/river,
/area/bigredv2/outside/engineering)
-"ykL" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/turf/open/floor{
- dir = 8;
- icon_state = "whitegreencorner"
- },
-/area/bigredv2/outside/medical)
-"ykO" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
- },
-/area/bigredv2/outside/e)
+"yko" = (
+/obj/structure/flora/grass/desert/lightgrass_11,
+/turf/open/mars,
+/area/bigredv2/caves_north)
"ykR" = (
/turf/closed/wall/mineral/uranium,
/area/bigredv2/outside/engineering)
@@ -51457,12 +51451,12 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/caves/mining)
-"yle" = (
-/obj/structure/pipes/standard/simple/hidden/green,
+"ylj" = (
+/obj/effect/decal/cleanable/generic,
/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
+ icon_state = "cement_sunbleached3"
},
-/area/bigredv2/outside/c)
+/area/bigredv2/outside/w)
"yln" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/machinery/light{
@@ -51480,6 +51474,13 @@
icon_state = "platingdmg3"
},
/area/bigredv2/caves/mining)
+"ylB" = (
+/obj/effect/decal/strata_decals/grime/grime2,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached9"
+ },
+/area/bigredv2/outside/space_port_lz2)
"ymi" = (
/obj/item/tool/wet_sign,
/turf/open/floor/plating{
@@ -54766,8 +54767,8 @@ aaf
aaf
aaf
aaf
-vUm
-vUm
+rCr
+rCr
aaf
aaf
aaf
@@ -55418,7 +55419,7 @@ abC
aae
abZ
aaf
-vUm
+rCr
aaf
aaf
aaf
@@ -55427,9 +55428,9 @@ abQ
aaf
aaf
aaf
-vUm
-vUm
-vUm
+rCr
+rCr
+rCr
aaf
aaf
aae
@@ -55470,10 +55471,10 @@ aFs
aFs
aFt
aHZ
-xDd
+qGl
aFv
-nrf
-aHg
+dmJ
+ewb
aoD
aMZ
aNc
@@ -55638,15 +55639,15 @@ aaf
aaf
aaf
aaf
-vUm
+rCr
acJ
aaf
aaf
-vUm
+rCr
aaf
-vUm
-vUm
-vUm
+rCr
+rCr
+rCr
aaf
aaf
aae
@@ -55690,7 +55691,7 @@ aFt
aFw
aFw
aFt
-aLT
+hjl
aoD
aNa
aNc
@@ -55848,7 +55849,7 @@ aaf
aaf
aaf
aaf
-vUm
+rCr
aaf
aaf
aag
@@ -55902,12 +55903,12 @@ aao
aao
aFt
aFt
-lFG
-aIa
-aJg
-aJg
-aJg
-aLU
+dOF
+lpD
+sCE
+sCE
+sCE
+vRP
aPt
aNb
aOr
@@ -55943,7 +55944,7 @@ ayf
cVY
cVY
cVY
-eYG
+hph
cVY
cVY
cVY
@@ -56058,7 +56059,7 @@ aae
aaf
aaf
aan
-qvS
+oKG
aaE
aaS
aba
@@ -56119,12 +56120,12 @@ aao
aoD
aFu
aFt
-kxD
-aIb
-aHj
-sRo
-aHj
-aLV
+mRv
+rWE
+gBk
+uSX
+gBk
+pbi
aoD
aNc
aNc
@@ -56152,7 +56153,7 @@ aao
aao
ayf
cVY
-eYG
+hph
cVY
cVY
ucl
@@ -56336,12 +56337,12 @@ aoD
aoD
aFv
aGr
-kxD
-eze
-sRo
-aKg
-aHj
-aLW
+mRv
+oRb
+uSX
+eRa
+gBk
+tFR
aoD
aNd
aOs
@@ -56376,7 +56377,7 @@ xjU
cVY
cVY
cVY
-lVU
+etv
cVY
cVY
cVY
@@ -56489,8 +56490,8 @@ aao
aao
aao
aae
-vUm
-kEb
+rCr
+dTX
aah
aah
aah
@@ -56551,14 +56552,14 @@ aao
aao
aeI
aoD
-izv
+lJP
aGr
-kxD
-eze
-aHj
-aHj
-aHj
-aLX
+mRv
+oRb
+gBk
+gBk
+gBk
+kzO
aoD
aoD
aoD
@@ -56591,13 +56592,13 @@ cVY
nbu
cVY
cVY
-rGL
+nhh
cVY
hpg
mMf
cVY
cVY
-uvm
+ddF
cVY
ayf
ayf
@@ -56706,8 +56707,8 @@ aao
aao
aao
aae
-vUm
-xpF
+rCr
+qEn
aah
aah
aah
@@ -56731,7 +56732,7 @@ acx
aah
aej
aaf
-vUm
+rCr
aaf
acJ
aae
@@ -56770,12 +56771,12 @@ aeI
aoD
aFv
aGr
-cef
-eze
-aHj
-eTA
-aJh
-aLW
+wOV
+oRb
+gBk
+nwr
+edm
+tFR
aoD
aNe
aNc
@@ -56824,12 +56825,12 @@ ayf
qcQ
tVp
fFO
-uvm
+ddF
cVY
uSC
tVp
fFO
-kwT
+lYw
cVY
cVY
ayf
@@ -56923,8 +56924,8 @@ aao
aao
aao
aae
-vUm
-thl
+rCr
+smR
aah
aah
aah
@@ -56975,24 +56976,24 @@ aao
aao
aao
aao
-xkU
-mSs
-jvJ
-bWf
+qnr
+hFZ
+oLG
+enl
aeI
aeI
-kwy
+npJ
aeI
aoD
aoD
aFw
aFt
-kxD
-eze
-lQU
+mRv
+oRb
+ijS
aFt
aFt
-aHh
+laq
aoD
aNf
aNc
@@ -57021,7 +57022,7 @@ aao
ayf
ayf
cVY
-eYG
+hph
tVp
feN
vKv
@@ -57140,8 +57141,8 @@ aao
aao
aao
aae
-vUm
-gTH
+rCr
+orz
aah
aah
aah
@@ -57192,10 +57193,10 @@ aeI
aeI
aao
aao
-knw
-wMK
-pZj
-jIt
+fvo
+tUS
+nbT
+lnO
aeI
aeI
aeI
@@ -57204,12 +57205,12 @@ aeI
aoD
aFt
aFt
-bJh
-eze
-aLW
+sVq
+oRb
+tFR
aFt
aFu
-qVw
+lin
aoD
aNg
aNc
@@ -57237,7 +57238,7 @@ aao
aao
ayf
cVY
-kwT
+lYw
hpg
tVp
bgX
@@ -57408,12 +57409,12 @@ aeI
aeI
aeI
aeI
-vKW
+pMd
aeI
-cbh
-fYO
+jei
+pzG
aeI
-epw
+nhz
aeI
aeI
aeI
@@ -57421,9 +57422,9 @@ aeI
aoD
aFt
aFt
-kkY
-eze
-aJi
+bTM
+oRb
+cks
aHZ
aFv
aLY
@@ -57622,7 +57623,7 @@ aao
aeI
aeI
aeI
-ily
+oHc
aeI
aeI
aeI
@@ -57638,9 +57639,9 @@ aoD
aoD
aFt
aFt
-kxD
-eze
-mas
+mRv
+oRb
+cxb
aHZ
aFv
aFv
@@ -57818,7 +57819,7 @@ aek
aaf
aaf
aaf
-iHu
+qTU
aae
aao
qsE
@@ -57845,7 +57846,7 @@ aeI
aeI
aeI
aeI
-rgo
+rBy
aeI
aeI
aeI
@@ -57855,11 +57856,11 @@ aeI
aoD
aFt
aFt
-kxD
-oRn
-lQU
+mRv
+wSN
+ijS
aHZ
-jEc
+jYE
aFv
aoD
aNi
@@ -58031,9 +58032,9 @@ aah
aah
aah
aah
-rqH
+xMj
aaf
-vUm
+rCr
aaf
acJ
aae
@@ -58052,7 +58053,7 @@ qsE
qsE
aao
aao
-ily
+oHc
aeI
aeI
aeI
@@ -58062,7 +58063,7 @@ ahO
aeI
aeI
aeI
-wKL
+lyw
aeI
aeI
aeI
@@ -58072,11 +58073,11 @@ aeI
aoD
aFt
aFt
-kxD
-eze
-lQU
+mRv
+oRb
+ijS
aHZ
-oic
+joX
aFv
aoD
aNi
@@ -58250,7 +58251,7 @@ aah
aah
aei
aaf
-vUm
+rCr
aaf
acJ
aae
@@ -58284,15 +58285,15 @@ aeI
aiz
aog
ahO
-yjg
+lhA
aeI
aoD
aFt
-aGs
-egf
-dde
-egf
-aJj
+pJr
+qGT
+djl
+qGT
+ejh
aHZ
aFv
aoD
@@ -58322,7 +58323,7 @@ aao
aao
ayf
ayf
-sIN
+eaQ
wXv
tVp
bgX
@@ -58442,7 +58443,7 @@ aao
aao
aao
aae
-vUm
+rCr
aak
aah
aaF
@@ -58662,11 +58663,11 @@ aae
aaf
aaf
aap
-gQl
+pPK
aaG
aaT
aap
-abj
+lyX
abt
aaT
aap
@@ -58684,7 +58685,7 @@ aaT
aap
aaf
aag
-vUm
+rCr
aaf
acJ
aae
@@ -58692,40 +58693,40 @@ aao
aao
aeI
aeI
-uzV
-viN
-lhO
-qtn
-dnj
-lhO
-vXp
+gni
+pol
+hIZ
+hfo
+ucq
+hIZ
+xcj
oVq
aeI
-kwy
+npJ
aeI
-nrV
-lhO
-dnj
-dnj
-dnj
-sav
-dnj
-dnj
-vYL
-lhO
-lhO
-lhO
-oaO
-dnj
-lhO
-dnj
-aDw
+epa
+hIZ
+ucq
+ucq
+ucq
+eKY
+ucq
+ucq
+unX
+hIZ
+hIZ
+hIZ
+gib
+ucq
+hIZ
+ucq
+mGv
aoD
aoD
aoD
-qIE
-uZR
-slD
+qJG
+wLC
+aLW
aoD
aoD
aoD
@@ -58910,34 +58911,34 @@ aeI
aeI
aeI
aeI
-iTq
-nHO
-aoN
-nHO
-jKw
-jsZ
+tlZ
+thO
+cAc
+thO
+vOg
+dJT
aeI
aeI
aeI
aeI
-vXi
-nHO
-aoN
-vkY
-akd
-akd
-dYj
-aoN
-nHO
-amc
-aix
-gms
-aix
-aix
-aix
-aix
-aDx
-aDw
+pDd
+thO
+cAc
+mnX
+oPE
+oPE
+iwJ
+cAc
+thO
+kNl
+xca
+hrA
+xca
+xca
+xca
+xca
+rBq
+mGv
ahP
aoD
grU
@@ -58973,7 +58974,7 @@ rZn
aSB
tVp
mMf
-bvy
+hRD
tVp
tVp
bgX
@@ -59107,60 +59108,60 @@ aah
abu
aaH
ace
-gHI
-gHI
-gHI
-eri
-eri
-gHI
-gHI
-gHI
+tlx
+tlx
+tlx
+nLX
+nLX
+tlx
+tlx
+tlx
aah
aah
-gXj
-xof
-qBk
+raH
+kcJ
+kIm
aeG
aae
ahR
aeI
-sPM
+cWH
aeI
aeI
-kwy
-ovP
-nHO
-nHO
-pyo
+npJ
+qNd
+thO
+thO
+ooU
aeI
aeI
aeI
aeI
aiz
-vXi
-nHO
-oYc
+pDd
+thO
+iyN
ahP
aqJ
ahP
ahP
-vXi
-aHl
-qrl
-mwx
-nHO
-xwv
-nHO
-ppN
-nHO
-qrl
-bHX
+pDd
+mpX
+cIh
+oGM
+thO
+tRp
+thO
+yeq
+thO
+cIh
+vZI
ahP
-vAW
-lhO
-ajY
-lhO
-cBb
+jhU
+hIZ
+xet
+hIZ
+mOq
aln
aEu
aEu
@@ -59176,7 +59177,7 @@ aEu
aEu
aEu
aEu
-kAm
+mAX
aEu
aEu
aEu
@@ -59324,19 +59325,19 @@ aah
abv
aaI
acf
-gHI
-tss
-gHI
-eri
-eri
-gHI
-oFa
-rFy
-hUF
+tlx
+mdi
+tlx
+nLX
+nLX
+tlx
+fkl
+ukG
+tly
aah
-flY
-pJQ
-pUl
+ngj
+pph
+iPo
aeG
aae
ahR
@@ -59345,38 +59346,38 @@ aeI
aeI
aeI
aeI
-lXo
-aoN
-aoN
-pyo
+lmo
+cAc
+cAc
+ooU
aeI
aeI
aeI
-sPM
+cWH
aiA
-vXi
-aoN
-cMu
+pDd
+cAc
+fai
aqJ
aoO
aiw
ahQ
-iTq
-nad
-gAN
-dYj
-dYj
-dYj
-pGJ
-dYj
-nHO
-aDz
-aEv
+tlZ
+dJF
+oGt
+iwJ
+iwJ
+iwJ
+huh
+iwJ
+thO
+nTe
+yeX
ahP
ahP
-dQi
-qrl
-pyo
+cPS
+cIh
+ooU
ahP
ama
aeI
@@ -59389,27 +59390,27 @@ aEu
aQF
aQG
aEu
-aVF
-thB
-nok
-thB
-kck
-thB
-tlR
-thB
-thB
-thB
-tlR
-qwS
-thB
-aVI
-thB
-thB
-iHe
-klF
-klF
-swm
-pnk
+qTt
+qPK
+vCJ
+qPK
+qQm
+qPK
+fTb
+qPK
+qPK
+qPK
+fTb
+ylj
+qPK
+kKq
+qPK
+qPK
+erQ
+cqB
+cqB
+qFx
+gfj
eWd
bhA
bie
@@ -59541,39 +59542,39 @@ aah
abw
aaJ
acg
-gHI
-gHI
-gHI
-eri
-eri
-gHI
-gHI
-gHI
+tlx
+tlx
+tlx
+nLX
+nLX
+tlx
+tlx
+tlx
aah
aah
-mDq
-pJQ
-vlO
+xyj
+pph
+ogI
aeG
aae
ahR
ahO
aeI
-wKL
+lyw
aeI
aeI
-vXi
-aoN
-ppN
-pyo
-sPM
+pDd
+cAc
+yeq
+ooU
+cWH
aeI
aeI
aeI
aiA
-xfG
-xwv
-bHX
+ouW
+tRp
+vZI
ahP
ajy
anp
@@ -59586,16 +59587,16 @@ anp
anp
anp
gri
-xfG
-qrl
-bHX
-oCW
+ouW
+cIh
+vZI
+iOk
ahP
-gbs
-qrl
-pyo
+sJv
+cIh
+ooU
aln
-efC
+qmh
aeI
aeI
aEu
@@ -59606,27 +59607,27 @@ aEu
aEu
aQF
aQF
-gvz
-bYC
-aWV
-kqI
-kqI
-aWV
-kqI
-kqI
-aWV
-bba
-kqI
-nYT
-aUQ
-bYC
-bYC
-bYC
-wbo
-dtz
-vVc
-vVc
-rGr
+wQM
+xFz
+vNw
+laO
+laO
+vNw
+laO
+laO
+vNw
+qsU
+laO
+vvI
+oiq
+xFz
+xFz
+xFz
+dFu
+nLR
+pQc
+pQc
+ccd
eWd
bhv
bie
@@ -59760,37 +59761,37 @@ aah
ach
aah
aah
-hUF
-eri
-eri
-hUF
+tly
+nLX
+nLX
+tly
aah
aah
aah
aah
-mDq
-siV
-vlO
+xyj
+mcP
+ogI
aeG
aae
ahR
-buX
+lBC
ahO
aeI
aeI
-irK
-uqw
-nHO
-nHO
-sbv
+pGW
+jNZ
+thO
+thO
+ckZ
aeI
aeI
-oDF
+llC
aeI
aiA
-vXi
-nHO
-bHX
+pDd
+thO
+vZI
aln
ajy
anp
@@ -59803,14 +59804,14 @@ azn
avT
avT
anp
-vXi
-qrl
-pLn
+pDd
+cIh
+hPd
ahP
ahP
-vXi
-wWU
-pkb
+pDd
+mIq
+ybL
aln
aeI
aeI
@@ -59823,26 +59824,26 @@ aEu
aSB
aSB
aSB
-slR
-lhg
-sTP
+fzy
+gdr
+dsU
aSB
aSB
aYE
aYE
aYE
-oWS
-ssW
+cFy
+rGp
aSB
-aVG
-bYC
-bYC
-bYC
-beu
+swL
+xFz
+xFz
+xFz
+ggL
woe
tVp
tVp
-rLU
+fta
tVp
bgX
bhw
@@ -59964,8 +59965,8 @@ aae
aae
aae
wHg
-hUF
-hUF
+tly
+tly
aaU
abc
aah
@@ -59976,18 +59977,18 @@ aah
aah
ach
aah
-wxC
-wxC
-pRQ
-eri
-oVE
-wxC
+jpg
+jpg
+cTC
+nLX
+uRD
+jpg
aah
aah
aah
-mDq
-pJQ
-vlO
+xyj
+pph
+ogI
aeG
aae
ahT
@@ -59996,20 +59997,20 @@ ahP
ahO
ahi
aeI
-syZ
-aoN
-cQX
-kSI
+dXq
+cAc
+idm
+syv
aeI
aeI
aeI
aeI
aiA
-vXi
-nHO
-pyo
-rLx
-hIC
+pDd
+thO
+ooU
+knw
+knE
bFw
xWR
xWR
@@ -60020,14 +60021,14 @@ azo
aAq
aAZ
anp
-vXi
-qrl
-xwv
-lhO
-lhO
-aHl
-qrl
-bHX
+pDd
+cIh
+tRp
+hIZ
+hIZ
+mpX
+cIh
+vZI
aln
aeI
aoO
@@ -60040,9 +60041,9 @@ aEu
aEu
aEu
aXY
-twh
-ivf
-nkC
+tFm
+kqv
+fTz
aWk
aWk
aWk
@@ -60051,11 +60052,11 @@ aWk
aXY
aYF
bbJ
-aVG
-fTC
-aUQ
-yfc
-bev
+swL
+rUL
+oiq
+eMg
+pHa
woe
tVp
wbD
@@ -60181,8 +60182,8 @@ pow
mGq
rgp
aae
-hUF
-hUF
+tly
+tly
aah
aah
aah
@@ -60190,41 +60191,41 @@ aah
aah
abD
aah
-hUF
+tly
ach
aah
-wxC
-wxC
-eri
-pRQ
-wxC
-wxC
+jpg
+jpg
+nLX
+cTC
+jpg
+jpg
aah
aah
aah
-tlS
-pJQ
-urb
-xHA
+lgB
+pph
+xLU
+kSF
ahK
-lZM
-rmq
-lhO
-dnj
-lhO
-oaO
-nHO
-mwx
-nHO
-nHO
-wqe
-lhO
-oaO
-vXW
-dnj
-ppN
-nHO
-bHX
+tij
+rjn
+hIZ
+ucq
+hIZ
+gib
+thO
+oGM
+thO
+thO
+npv
+hIZ
+gib
+xOW
+ucq
+yeq
+thO
+vZI
aln
ajy
bFw
@@ -60237,14 +60238,14 @@ avT
avT
avT
anp
-iTF
-aDA
-eme
-alm
-alm
-aHm
-aIi
-rTv
+kXo
+rEb
+nvE
+mSF
+mSF
+uki
+mUE
+sHb
aln
aeI
ajy
@@ -60268,11 +60269,11 @@ asK
beQ
aYF
aYF
-aVG
-bYC
-aUQ
-bYC
-bev
+swL
+xFz
+oiq
+xFz
+pHa
woe
tVp
tVp
@@ -60402,46 +60403,46 @@ aah
aah
aah
aah
-hUF
-hUF
+tly
+tly
aah
aah
aah
-hUF
+tly
ach
aah
-wxC
-wxC
-eri
-eri
-wxC
-wxC
+jpg
+jpg
+nLX
+nLX
+jpg
+jpg
aah
aMC
aah
-nAz
-pJQ
-siV
-agr
+ihG
+pph
+mcP
+iDA
fSJ
-poE
-aix
-aix
-aix
-ajX
-nHO
-jKw
-nHO
-nHO
-nHO
-jKw
-aoN
-nHO
-aoN
-aoN
-nHO
-aoN
-ssi
+jnf
+xca
+xca
+xca
+xzf
+thO
+vOg
+thO
+thO
+thO
+vOg
+cAc
+thO
+cAc
+cAc
+thO
+cAc
+rmn
aln
ajy
bFw
@@ -60463,7 +60464,7 @@ ahP
ahP
ahP
ama
-qBb
+hFW
ajz
apt
aNk
@@ -60484,12 +60485,12 @@ aXH
asK
beQ
aYF
-jfs
-aVG
-bYC
-aUQ
-bYC
-bev
+aHE
+swL
+xFz
+oiq
+xFz
+pHa
tVp
aao
aao
@@ -60622,45 +60623,45 @@ adL
aah
aah
aah
-tvl
+vGQ
aah
aah
ach
aah
acx
aah
-eri
-eri
+nLX
+nLX
aah
aah
aah
aah
aah
-mRS
-xoQ
-sdx
-cfk
+bNR
+pYT
+sue
+ulV
ahK
-oOS
-nad
-dYj
-nHO
-qrl
-aoN
-dYj
-dYj
-dYj
-dYj
-dYj
-dYj
-uRR
-aiy
-dYj
-dYj
-akd
-gHu
+koN
+dJF
+iwJ
+thO
+cIh
+cAc
+iwJ
+iwJ
+iwJ
+iwJ
+iwJ
+iwJ
+pXD
+xVt
+iwJ
+iwJ
+oPE
+teO
aln
-xAJ
+dbF
bFw
ccI
xcz
@@ -60673,13 +60674,13 @@ aAZ
anp
ahR
aeI
-wKL
+lyw
ahi
aiB
ahV
ama
aeI
-rgo
+rBy
aeI
ajz
apt
@@ -60702,11 +60703,11 @@ asK
beQ
aYF
aYF
-bcq
-bYC
-bYC
-bYC
-bev
+bJc
+xFz
+xFz
+xFz
+pHa
tVp
tVp
aao
@@ -60731,9 +60732,9 @@ qcQ
tVp
tVp
tVp
-uiJ
-mBx
-fad
+pFM
+lau
+tsR
tVp
qcQ
tVp
@@ -60844,12 +60845,12 @@ aaw
aah
ach
aah
-wxC
-wxC
-eri
-eri
-wxC
-wxC
+jpg
+jpg
+nLX
+nLX
+jpg
+jpg
aah
aah
aah
@@ -60858,25 +60859,25 @@ aah
aah
aeG
aae
-ahU
+wHG
ahP
ahP
-nqJ
-qrl
-bBu
-mnQ
-hro
+mJm
+cIh
+qFs
+xFo
+qle
ahP
-tIF
+poQ
ahP
ahP
-mhn
+xbb
ahP
ahP
-oCW
+iOk
ahP
ahP
-uzs
+qrc
ajy
anp
avT
@@ -60895,7 +60896,7 @@ aeI
aeI
aeI
aeI
-xmq
+nkc
aeI
aeI
ajz
@@ -60910,7 +60911,7 @@ aTM
aUS
aNo
aNm
-aWY
+iBZ
aXD
aoH
aXH
@@ -60919,12 +60920,12 @@ asK
beQ
bbb
aYF
-aVG
-bYC
-bYC
-bYC
-bev
-pPL
+swL
+xFz
+xFz
+xFz
+pHa
+mAP
tVp
jDo
tVp
@@ -60948,9 +60949,9 @@ tVp
tVp
qcQ
tVp
-smn
-mtn
-eOz
+dHv
+sfm
+psH
tVp
tVp
tVp
@@ -61061,12 +61062,12 @@ aaw
aca
ach
aah
-wxC
-wxC
-eri
-eri
-wxC
-oVE
+jpg
+jpg
+nLX
+nLX
+jpg
+uRD
aah
aah
aah
@@ -61077,20 +61078,20 @@ aeG
aae
ahR
ahP
-ljH
-xfG
-qrl
-pyo
-nzo
-fqE
-rQO
+hGs
+ouW
+cIh
+ooU
+nlj
+wTl
+iIx
ahP
ahP
ahP
-fRZ
+qrP
ahP
ard
-ljH
+hGs
ahP
ahP
ahP
@@ -61109,7 +61110,7 @@ ahR
aeI
aeI
aeI
-uzV
+gni
aeI
aeI
aeI
@@ -61134,15 +61135,15 @@ aXH
aXH
asK
beQ
-fEx
+rTK
bbc
-aVG
-evB
-bYC
-bYC
-rbv
+swL
+qDk
+xFz
+xFz
+vQW
tVp
-lNW
+oaf
tVp
tVp
tVp
@@ -61165,9 +61166,9 @@ quX
quX
axX
tVp
-smn
-lGk
-qsT
+dHv
+nYX
+sma
tVp
tVp
tVp
@@ -61278,40 +61279,40 @@ abR
aah
ach
aah
-wxC
-acB
-eri
-eri
-wxC
-wxC
+jpg
+jBi
+nLX
+nLX
+jpg
+jpg
aah
-hUF
-hUF
+tly
+tly
aeF
afg
afg
adl
aae
-iCI
+xpT
ahV
ahP
-vXi
-qrl
-aoN
-lhO
-lhO
-wOf
-vYL
-lhO
-lhO
-lhO
-nur
-lhO
-lhO
-lhO
-lhO
-lhO
-lgZ
+pDd
+cIh
+cAc
+hIZ
+hIZ
+pJA
+unX
+hIZ
+hIZ
+hIZ
+bOW
+hIZ
+hIZ
+hIZ
+hIZ
+hIZ
+jmU
axv
avT
avT
@@ -61325,13 +61326,13 @@ anp
ahR
aeI
aeI
-epw
+nhz
aeI
aeI
aeI
aeI
aeI
-uzV
+gni
aLZ
aoH
aNl
@@ -61353,11 +61354,11 @@ asK
beQ
bbc
aSB
-yaE
-bYC
-bYC
-bYC
-gjE
+bqr
+xFz
+xFz
+xFz
+rBs
tVp
tVp
tVp
@@ -61381,17 +61382,17 @@ azb
vkv
kVT
azb
-uiJ
-uea
-nxJ
-mtn
-mBx
-gEy
-mBx
-mBx
-mBx
-mBx
-fad
+pFM
+khT
+oNw
+sfm
+lau
+bOg
+lau
+lau
+lau
+lau
+tsR
qzO
cHn
cHn
@@ -61497,38 +61498,38 @@ ach
aah
aah
aah
-eri
-eri
+nLX
+nLX
aah
aah
aah
-hUF
-hUF
+tly
+tly
aeG
-mJU
+ghZ
afM
agv
-ahg
-ahW
+uXK
+oat
ahX
aiA
-vXi
-qrl
-nHO
-ppN
-aHl
-nHO
-nHO
-nHO
-nHO
-xwv
-nHO
-ppN
-nHO
-nHO
-nHO
-nHO
-pyo
+pDd
+cIh
+thO
+yeq
+mpX
+thO
+thO
+thO
+thO
+tRp
+thO
+yeq
+thO
+thO
+thO
+thO
+ooU
axv
avT
avT
@@ -61540,7 +61541,7 @@ avT
avT
anp
ahR
-oDF
+llC
aeI
aeI
aeI
@@ -61569,13 +61570,13 @@ aXH
asK
bdZ
aWk
-swk
-slR
-eKc
-aUQ
-aUQ
-gjE
-tUY
+dwJ
+fzy
+qSt
+oiq
+oiq
+rBs
+iLU
vKv
vKv
vKv
@@ -61598,17 +61599,17 @@ azb
hhK
nVq
bqf
-rmz
-uea
-mtn
-mtn
-uea
-uea
-uea
-uea
-uea
-nxJ
-qsT
+tOY
+khT
+sfm
+sfm
+khT
+khT
+khT
+khT
+khT
+oNw
+sma
qzO
bGL
bGL
@@ -61712,12 +61713,12 @@ aaw
aah
ach
acn
-wxC
-wxC
-eri
-eri
-wxC
-wxC
+jpg
+jpg
+nLX
+nLX
+jpg
+jpg
aah
aah
aah
@@ -61729,23 +61730,23 @@ agv
akK
ahX
aiA
-gWG
-ajZ
-upn
-alm
-alm
-alm
-alm
-alm
-alm
-alm
-wcD
-alm
-alm
-alm
-alm
-wcD
-lbF
+kXa
+nHR
+pmP
+mSF
+mSF
+mSF
+mSF
+mSF
+mSF
+mSF
+laZ
+mSF
+mSF
+mSF
+mSF
+laZ
+oFw
avt
avV
avV
@@ -61776,7 +61777,7 @@ aRM
aOB
aOB
aUW
-aVL
+pzy
aWt
aHK
aXG
@@ -61787,11 +61788,11 @@ asK
bdZ
bdZ
asK
-twh
-kqI
-kqI
-iCu
-ivf
+tFm
+laO
+laO
+wgI
+kqv
asK
eWd
eWd
@@ -61815,17 +61816,17 @@ azb
hhK
sCt
azb
-kIe
-vVc
-vVc
-vVc
-vVc
-vVc
-vVc
-vVc
-dtz
-vVc
-jVC
+ylB
+pQc
+pQc
+pQc
+pQc
+pQc
+pQc
+pQc
+nLR
+pQc
+drf
qzO
bGL
bGL
@@ -61929,13 +61930,13 @@ abS
aah
ach
aco
-mLw
-wxC
-eri
-oxP
-wxC
-wxC
-hUF
+rXe
+jpg
+nLX
+tfk
+jpg
+jpg
+tly
aah
aah
aah
@@ -61943,18 +61944,18 @@ aah
aah
agx
agv
-ahY
-wKL
+eOG
+lyw
aiA
-jIw
-nHO
-bHX
-dke
+fXd
+thO
+vZI
+gdz
ahP
ahV
ahV
ahP
-mhn
+xbb
ahP
ahP
ahV
@@ -61980,7 +61981,7 @@ aeI
aeI
aeI
aeI
-sPM
+cWH
aeI
aeI
ajy
@@ -62146,28 +62147,28 @@ abT
aah
ach
aah
-oVE
-wxC
-eri
-noG
-wxC
-wxC
+uRD
+jpg
+nLX
+oXE
+jpg
+jpg
aah
aah
aah
aah
aah
-tvM
+lOG
afM
agw
ahR
ahX
aiA
-vXi
-niY
-mlB
+pDd
+eDr
+caY
ahP
-kEN
+oFC
aeI
aeI
aiB
@@ -62175,7 +62176,7 @@ ahV
ahV
ama
aeI
-sPM
+cWH
aiB
ahV
ahV
@@ -62192,7 +62193,7 @@ aBa
anp
ahR
aeI
-kwy
+npJ
aeI
aeI
aeI
@@ -62234,7 +62235,7 @@ asK
kjH
beT
baz
-ivg
+fMw
bbM
rYS
asK
@@ -62365,37 +62366,37 @@ ach
aah
aah
aah
-eri
-htn
+nLX
+fGD
aah
aah
aah
aah
aah
-hUF
+tly
aah
agv
-afh
-egk
-ahZ
+iRB
+pZI
+sTI
aeI
aiA
-lNZ
-nHO
-pyo
+pSQ
+thO
+ooU
aln
aeI
-efC
+qmh
aeI
aeI
aeI
-uzV
+gni
aeI
aeI
aeI
aeI
aeI
-ily
+oHc
ajy
anp
avT
@@ -62412,7 +62413,7 @@ aeI
aeI
aeI
aeI
-ily
+oHc
aeI
aeI
aeI
@@ -62450,7 +62451,7 @@ bgq
atA
gMC
bhb
-bik
+uEY
bhb
bhb
aZu
@@ -62461,7 +62462,7 @@ hzy
axL
bsI
bme
-dHW
+nnD
azb
hhK
nVq
@@ -62579,11 +62580,11 @@ aae
aae
aah
acj
-hUF
+tly
aah
aah
-eri
-eri
+nLX
+nLX
aah
aah
aah
@@ -62597,9 +62598,9 @@ aae
akK
aeI
aiA
-vXi
-nHO
-bBu
+pDd
+thO
+qFs
aln
aeI
aeI
@@ -62607,7 +62608,7 @@ aeI
aeI
aeI
aeI
-xmq
+nkc
aeI
aeI
aeI
@@ -62668,7 +62669,7 @@ atA
bkn
bhb
bfB
-bgD
+kYP
eYK
bbe
bjR
@@ -62814,21 +62815,21 @@ aae
atm
aeI
aiA
-xfG
-bUt
-bHX
+ouW
+jpB
+vZI
ahP
ahO
aeI
-rgo
+rBy
aeI
-wKL
+lyw
aeI
aeI
aeI
-qBb
+hFW
aeI
-epw
+nhz
aeI
ajy
anp
@@ -62884,9 +62885,9 @@ baF
asK
aZu
bhb
-fhD
-keB
-bhD
+jeM
+pnj
+peR
ugc
atA
bkl
@@ -62894,7 +62895,7 @@ aZO
blg
axL
bsI
-eXo
+ruI
bme
azb
hhK
@@ -63031,10 +63032,10 @@ aao
aeI
aeI
aiA
-dQi
-aoN
-bHX
-ljH
+cPS
+cAc
+vZI
+hGs
aln
aeI
aeI
@@ -63047,7 +63048,7 @@ aeI
aeI
aeI
aeI
-xAJ
+dbF
anp
anp
alX
@@ -63066,7 +63067,7 @@ aeI
aeI
aeI
aeI
-wKL
+lyw
aeI
aMb
apu
@@ -63100,9 +63101,9 @@ bbe
bbe
bjR
bbe
-bhE
-tFc
-biK
+oVW
+xWF
+uts
vkF
fVt
atA
@@ -63112,7 +63113,7 @@ aZu
axL
bsI
bme
-gmh
+uqd
azb
fLl
btu
@@ -63246,34 +63247,34 @@ aao
aao
aao
aeI
-uzV
+gni
aiA
-vXi
-aoN
-sbv
-mhn
+pDd
+cAc
+ckZ
+xbb
aln
-sPM
+cWH
aeI
-xmq
+nkc
aeI
aeI
aeI
aeI
aeI
aeI
-uzV
+gni
aeI
ajy
-hAy
-scp
+wAj
+grh
alu
aqw
azv
-rmi
-eOV
+lKe
+rzH
ajx
-tdU
+gQR
ajx
ahR
aeI
@@ -63461,13 +63462,13 @@ aao
aao
aao
aao
-wWl
+kIM
aeI
aeI
aiA
-plY
-nHO
-oYc
+dRs
+thO
+iyN
ahP
ama
aeI
@@ -63475,22 +63476,22 @@ aeI
aeI
aoO
aiw
-gzs
+qcV
aiw
aiw
aiw
aiw
aiw
-arV
-dOL
-pjB
-rmi
+sOp
+mcB
+fUS
+lKe
aqw
aye
alu
-deT
-eOV
-egg
+tJZ
+rzH
+hLl
ajx
ajx
aiw
@@ -63536,7 +63537,7 @@ aZO
aZu
beT
baz
-los
+bXD
aZu
aZu
asK
@@ -63682,11 +63683,11 @@ aeI
aeI
aiz
ahP
-jtG
-aoN
-pyo
+xMl
+cAc
+ooU
aln
-efC
+qmh
aeI
aeI
aeI
@@ -63700,10 +63701,10 @@ alu
alu
alu
alu
-dkE
+iyw
alu
ayN
-kev
+eOy
alu
alu
alu
@@ -63895,34 +63896,34 @@ aao
aao
aao
aao
-oDF
+llC
aeI
aiA
ahP
-vXi
-eEZ
-fQI
+pDd
+gTT
+icC
alo
aeI
aeI
aeI
-efC
-uXx
+qmh
+gqd
alu
aqq
-qXs
-aim
-asy
+lud
+pMM
+vGl
ajk
-are
-auG
+gIo
+gAA
alu
arl
-awL
-ufM
-ozS
-ayG
-azp
+gQT
+wXk
+wCi
+dwk
+xHE
alu
aBb
aBI
@@ -63930,7 +63931,7 @@ amj
aqC
aEw
wuz
-uyH
+oeb
aHo
alu
aHD
@@ -64115,11 +64116,11 @@ aao
aeI
aeI
aiA
-mhn
-xfG
-aoN
-uUp
-nzo
+xbb
+ouW
+cAc
+gkK
+nlj
ahO
aeI
aeI
@@ -64132,20 +64133,20 @@ aqr
asz
aqr
atR
-hyK
+cNV
avu
-nVe
-cfc
-fvw
-fiM
-wzZ
+tuB
+fWo
+uZE
+tIy
+bdV
azq
alu
aBb
aBb
-icA
-aDC
-kfw
+diU
+jOI
+uam
ayO
ari
aFx
@@ -64333,42 +64334,42 @@ aeI
aeI
aiA
ahP
-xfG
-aoN
-kEE
-cUr
-lhO
-nuC
-qBb
+ouW
+cAc
+ovK
+bFW
+hIZ
+qiT
+hFW
aeI
ajz
alu
aqs
aqs
-arO
+urI
asA
aqs
-ybV
+dnC
aqs
-okm
+gBp
avX
-rLb
-dnN
-ayg
-iSZ
+kos
+ycR
+roE
+mwN
awO
-aAr
-lFZ
-aBc
+taz
+xbO
+huE
amj
aDD
-sYT
-aFy
-aGt
+tQU
+iNw
+wSM
aHp
alu
aHD
-vIy
+qYs
aBR
aMc
apt
@@ -64546,16 +64547,16 @@ aao
aao
aeI
aeI
-irK
+pGW
aeI
aiB
ahP
-vXi
-aoN
-aoN
-aoN
-ech
-tyQ
+pDd
+cAc
+cAc
+cAc
+sEx
+jlx
aeI
aeI
aoP
@@ -64568,20 +64569,20 @@ ato
atS
auH
avv
-gtO
+sQx
arR
aqw
-rfI
+nBa
aqw
-azr
+hWI
alu
aBb
aBb
amj
-aDE
+xnf
aEx
aqw
-aGu
+xvW
aFx
alu
aHD
@@ -64761,18 +64762,18 @@ adh
acp
aao
aao
-wPg
+vMY
aeI
ahi
aeI
aeI
aiA
-ajA
-akd
-pbw
-iQt
-xPW
-bHX
+wrq
+oPE
+xtq
+lcY
+xJM
+vZI
ahO
aeI
ajz
@@ -64780,29 +64781,29 @@ alu
aqu
arg
arQ
-mat
+kdH
aqu
-atT
-auI
+wBD
+wMN
alu
avZ
awN
-ceR
-rxU
-axx
-azs
+mqq
+uyT
+qtD
+hOo
alu
aBd
aBb
amj
-aDF
+fTD
arW
aFz
aGv
aHq
alu
aHD
-qKm
+ftc
aBR
aMc
aME
@@ -64977,33 +64978,33 @@ adh
adh
acp
aao
-wqY
-xCh
+fwl
+pPu
aeI
aeI
-sPM
+cWH
aeI
aiB
ahP
ahP
ahP
-rTX
-vXi
-pyo
+gCg
+pDd
+ooU
aln
-wKL
+lyw
aoQ
alu
alu
-hRR
+xHx
amj
-hhC
+vCK
alu
alu
alu
alu
-blP
-ggi
+hjz
+mUS
alu
alu
alu
@@ -65194,45 +65195,45 @@ adz
adz
acp
aao
-lre
-eZb
+qvr
+ehT
aiw
aiw
aiw
ahQ
aeI
-iqG
+iKz
ahP
-uqM
+bQk
ahP
-fCG
-bHX
+gTe
+vZI
ahP
aog
aoR
alu
-atq
+fpX
avw
avw
-fuv
-hbx
+gnA
+qOS
amj
-ujq
-vkA
-awb
-tlQ
+bHt
+wgu
+sMq
+iLN
amj
ayh
ayH
avw
-aAs
+nzc
amj
ayh
avw
-bVy
+pWn
axz
aFB
-epE
+qJQ
aHr
alu
aHD
@@ -65419,38 +65420,38 @@ acp
ahR
aeI
aiA
-eJK
-wfi
-prB
-vXi
-bHX
-nFA
-lmL
-srH
+hqG
+gTG
+stw
+pDd
+vZI
+xuZ
+xBL
+ifW
alD
ayR
-ibH
+eCt
arR
arR
-ark
+tEm
amj
-auK
+myV
awN
-awc
-jSh
+joY
+idf
axy
atr
ayI
azt
-uVc
-bJJ
-sUe
-sAw
+gWw
+nAF
+kOB
+uir
atr
aEz
-aFC
+xBl
aGx
-aHs
+krm
alu
aHD
aBR
@@ -65635,43 +65636,43 @@ adS
acp
ahR
aeI
-jnS
-qCB
-kUT
-dyG
-vXi
-tJe
-xkd
-xcv
-srH
+veI
+nDS
+rQC
+bYz
+pDd
+gtA
+pqI
+mFU
+ifW
alD
ayR
aqw
arR
-asC
-iAJ
+mNr
+xWJ
amj
-dht
-sFc
-nKy
-spw
+cWh
+ffG
+dPe
+dKQ
ayN
arR
arR
azu
-aAt
+rMS
amj
aBJ
aCB
aDG
aEA
axB
-niG
-aHt
+uGx
+mqZ
alu
aHD
aBR
-qKm
+ftc
aMc
aoH
aNr
@@ -65856,25 +65857,25 @@ aeI
aiB
ahP
ahP
-iFw
-pyo
-iQO
-iQO
-tgQ
+lHQ
+ooU
+uAB
+uAB
+ujY
alD
-slT
+deK
ari
-liY
-asD
-tXd
+uiD
+tML
+tMu
aBe
-lbH
-gwD
-avY
-hmS
+vjE
+iff
+jxC
+fYM
amj
ayi
-spJ
+oun
azv
aAu
alu
@@ -66064,8 +66065,8 @@ acp
acp
acp
acp
-szd
-rdL
+wiA
+rHq
acp
acp
ajx
@@ -66073,35 +66074,35 @@ aiw
aiw
aiw
ahQ
-nqJ
-ppN
-cUr
-kkH
-kQw
+mJm
+yeq
+bFW
+neb
+dCC
apE
awN
avy
-wge
-iSn
-iqb
-abz
-pIi
-ima
-jdv
-sFc
+dhi
+goi
+ujT
+uFa
+fzd
+ojR
+mdO
+ffG
alu
alu
ayJ
-azw
+itK
alu
alu
aBK
-aCD
+woW
aDH
arX
-kGY
-aGz
-axw
+ujo
+lzD
+bQt
alu
aHD
aBR
@@ -66281,8 +66282,8 @@ acr
acT
afj
acp
-spr
-uld
+oIP
+eal
aia
acp
acr
@@ -66290,39 +66291,39 @@ acr
acr
acr
acr
-lrw
-wBf
-alm
-alm
-jDm
+loe
+wcc
+mSF
+mSF
+pTU
apF
-ykL
-arj
-qjg
-sZq
+vDc
+nyj
+jAW
+dlr
awO
-fgT
+ncu
auM
-ima
-jdv
+ojR
+mdO
awP
amj
-ayj
+gQw
ayK
azv
awk
alu
asq
-aCE
-aDI
+hmb
+pGL
awN
awN
-tFX
-aHu
+gJk
+oaq
alu
aHD
aBR
-qhM
+lir
aMc
apt
aNu
@@ -66489,15 +66490,15 @@ acp
acp
agy
acp
-acL
-fXF
+rPL
+evr
acD
adm
acC
-soF
+thB
acC
acC
-qxw
+rWM
agA
adk
aib
@@ -66508,34 +66509,34 @@ aiX
aiX
acr
amd
-ana
+dFE
acp
acp
acp
sXd
-ume
-crk
+yiI
+yhi
aGy
-wiw
-aqv
+toJ
+vvC
amj
auL
-qMc
-vKt
+rUp
+tSQ
awP
alu
ayk
-pMW
-eiw
+daT
+pDX
awl
alu
aBM
-iMs
+fWV
aqw
-gaO
+mLM
aFE
arR
-aHv
+jvA
alu
aHD
aBR
@@ -66703,7 +66704,7 @@ nnz
aqL
asc
acp
-acy
+tpO
acC
acU
acC
@@ -66724,8 +66725,8 @@ afS
afS
afS
acr
-upK
-dYs
+thW
+lpf
aer
afS
cLZ
@@ -66736,23 +66737,23 @@ amj
alu
alu
alu
-auN
+geN
awO
-kLa
-awR
+fZG
+iEU
amj
ayl
ayL
azx
aAv
alu
-aBN
+yeC
aCF
ari
aEC
-scf
+fSt
arR
-aHw
+ooy
alu
aHD
aBR
@@ -66924,7 +66925,7 @@ acz
acC
acC
acC
-mqM
+qop
acC
acD
acD
@@ -66941,34 +66942,34 @@ afS
afS
afS
alp
-hhM
-hiL
+tuM
+lhU
anx
afS
akM
acp
agY
-lYx
-rHk
+mCk
+cfs
aDO
arl
amj
-awL
+gQT
awO
-qCn
-nvX
+vDl
+ohX
alu
ayk
-ayM
-azy
+xBe
+ciU
awk
alu
aBO
awN
-xyE
-tCE
+oeA
+dqY
aDJ
-uFA
+htq
aBP
alu
aHD
@@ -66978,15 +66979,15 @@ aMd
aMg
aNw
aNw
-sgk
-vsF
+fAu
+qOa
aMg
-tBF
+kaL
aMg
-pHy
+bIC
aNw
aNw
-irO
+lWL
bhU
aHF
aMg
@@ -67004,11 +67005,11 @@ aMg
aMg
aMg
aMg
-rol
-efX
-bgF
-vdh
-biR
+bFJ
+eHO
+tZQ
+mpf
+wJl
aMd
bjx
bjx
@@ -67134,13 +67135,13 @@ dQR
idn
nnz
aqL
-vFY
+uip
asc
acr
acz
-fSK
+kbE
acC
-rGF
+isK
acC
acM
acD
@@ -67158,46 +67159,46 @@ ajC
ake
rat
acr
-gTb
-mDp
+dBG
+leQ
aer
afS
aoT
acp
tLO
-arm
-aip
-asE
-rFW
+fEC
+cUH
+okB
+eRT
atV
-gvD
-mor
-avY
+dpN
+uFQ
+jxC
awO
amj
-pyH
+wYp
aqw
azv
awl
alu
-ans
+lds
awN
asq
asq
aFF
-aHy
-aHy
+kxc
+kxc
alu
aHD
aKk
aBR
aBR
-jaI
-mJN
-jaI
-ehp
+wZg
+pBS
+wZg
+mqe
aBR
-gHD
+fcl
aFL
aBR
aBR
@@ -67206,7 +67207,7 @@ aBR
aMc
aHF
aHD
-chr
+mnj
aIp
aBR
aBR
@@ -67216,16 +67217,16 @@ aIn
aIn
aIn
aIp
-xrb
+rXP
aBR
aBR
aBR
aBR
aBR
-rTa
-rhy
-biy
-biS
+usx
+weg
+gym
+nWE
aIn
bjy
bjy
@@ -67354,14 +67355,14 @@ aqL
lbh
asc
acs
-eUJ
+omB
acC
acD
acD
acC
acC
adC
-ibj
+myq
aen
adN
adN
@@ -67376,25 +67377,25 @@ acr
acr
acr
pXm
-hiL
+lhU
acp
acp
acp
acp
-efK
-bVk
-aiY
+sfg
+oyF
+vAW
asF
arl
amj
-pbY
+xBa
awO
-awg
+oOp
awS
alu
alu
ayN
-azz
+eLb
alu
alu
amj
@@ -67409,22 +67410,22 @@ aHD
aBR
aLc
aBR
-jaI
-wWZ
-xye
+wZg
+xln
+cjR
aBR
-kjm
+wbN
aBR
aBR
-dEE
-oxR
-jYw
+fed
+sUA
+ugj
aBR
aMc
aHF
aHD
aBR
-qKm
+ftc
aBR
aLd
aIn
@@ -67439,10 +67440,10 @@ aBR
aBR
aBR
aLd
-bAt
-fKe
-biz
-xZy
+hAQ
+eNn
+fAn
+lRp
aIn
bjy
bjy
@@ -67569,14 +67570,14 @@ tnG
nlB
nlB
dQR
-stx
+doE
acq
-wow
+vtU
acD
acF
-acO
+dTx
acC
-ado
+waa
acC
acU
acr
@@ -67604,23 +67605,23 @@ alu
alu
alu
alu
-lBO
+bPM
awO
awa
awT
-uGr
-aym
-kLy
-pTI
-uyf
-rlr
-eDW
-fig
-aDK
+uGl
+jIa
+dLV
+uKA
+cuD
+lex
+fwQ
+hsY
+bHH
aED
-tiC
+cQL
aFG
-aHz
+emD
alu
aHF
aFM
@@ -67629,8 +67630,8 @@ aFM
aFM
aFM
aOE
-srX
-jic
+ooA
+ppj
aFM
aFM
aFM
@@ -67638,7 +67639,7 @@ aFM
aFM
aFM
aHF
-dgn
+aUi
aHF
aFM
aFM
@@ -67652,14 +67653,14 @@ aFM
aFM
aHC
aBR
-lBg
+iYH
aBR
aBR
aYK
aIn
aIn
-fYL
-biT
+dfb
+vhE
aIn
bjz
bjz
@@ -67786,16 +67787,16 @@ tnG
dQR
dQR
dQR
-fhO
+ewr
acq
-nZg
+qSI
acD
acD
-lEN
+gex
acC
acM
acC
-ubc
+szU
acr
acr
acr
@@ -67821,23 +67822,23 @@ rbV
rbV
vxv
alu
-sfL
+hwM
awO
-awh
-awU
-yhr
+kaF
+fcb
+hes
aqw
-drZ
-azA
+tnQ
+qah
arR
-usq
-ear
+crH
+sHr
avx
-aDL
-ear
-ear
-mIk
-oLm
+kyR
+sHr
+sHr
+tsN
+uTl
alu
aHF
aHF
@@ -67875,12 +67876,12 @@ aBR
aFL
aVo
aIn
-dNb
-njW
+izJ
+cYz
aWJ
bjA
bjA
-lIr
+qJD
bjA
blq
axX
@@ -68005,8 +68006,8 @@ dQR
kfx
asc
acp
-mnI
-ydq
+lzY
+vHa
acC
acM
acD
@@ -68027,31 +68028,31 @@ aiX
iis
afS
amg
-sgl
+hOp
aer
afS
aoT
acp
aqM
gdK
-qiK
+sXK
aqL
-yej
-vGN
-xCH
-syp
-avY
-vgO
-paK
-xaf
+qam
+bsl
+hFi
+gkc
+jxC
+sUa
+rnG
+hkc
awP
-jdv
-dff
+mdO
+fOk
aBf
avy
axB
aDM
-xFQ
+pzN
aEE
aGB
aHA
@@ -68072,7 +68073,7 @@ mIc
tap
aof
aNK
-kjD
+tZb
bdo
aof
cXG
@@ -68092,8 +68093,8 @@ aBR
aBR
aVo
aIn
-xpL
-biU
+mcA
+iVM
aIn
bjB
bjA
@@ -68222,27 +68223,27 @@ elh
kfx
asc
acq
-ckz
-sIs
-vMR
+aGR
+deg
+xTL
acC
vPZ
acD
acD
-kJh
+htl
aem
acC
acC
afP
agz
ahn
-pwS
+lYe
acp
jTa
raU
raU
woK
-lJa
+oxl
amg
aic
acp
@@ -68250,26 +68251,26 @@ acp
acp
acp
aqM
-qtp
+xqX
aqL
-laI
-cgq
-qmQ
-mPB
-lBN
+gsF
+sdg
+pmI
+jWB
+dBu
awa
-uJM
-sWo
-tyy
-ayP
+mBA
+dbT
+hXw
+sXQ
awa
aAw
-hor
-lBS
-czd
-lBS
-ihm
-ihm
+fgN
+gsg
+hij
+gsg
+hrP
+hrP
alu
alu
alu
@@ -68305,11 +68306,11 @@ aHD
aBR
aBR
aBR
-qKm
-vIy
+ftc
+qYs
lBc
eRI
-ppA
+caG
biV
sIY
bjC
@@ -68436,24 +68437,24 @@ aao
aao
tjX
dQR
-xZo
+cYt
asc
acp
-acy
-cOS
-cGc
-vMR
+tpO
+vJf
+xFA
+xTL
acC
-adp
+sEz
adD
adD
acr
aeL
acC
acp
-uYF
-jlQ
-vOA
+bND
+fJP
+eAk
acp
afS
afS
@@ -68467,32 +68468,32 @@ afS
eLp
acp
aqM
-exP
+fFm
aqL
aqL
-eet
+fRa
alD
-wkE
-ceC
-hMC
-mor
+vdi
+cPW
+fkt
+uFQ
aFH
-gPm
+wip
aFH
-srP
-sFX
-aBg
-eRK
-aaM
+miG
+lYK
+oVD
+xdg
+vgR
ayV
-voZ
-pYU
-aGC
-aIj
-aIj
+wWU
+cPH
+eVJ
+qIf
+qIf
alu
aof
-aLe
+kYx
aof
apC
aNy
@@ -68502,7 +68503,7 @@ aQW
aRU
aof
aTU
-wGD
+rre
aTV
aof
aYU
@@ -68514,7 +68515,7 @@ aZT
aIY
bbj
caN
-bcE
+vxF
aOO
aOO
apC
@@ -68526,8 +68527,8 @@ aBR
aBR
aVo
aIn
-luD
-ufb
+nLi
+hCV
aIn
bjD
bka
@@ -68669,8 +68670,8 @@ acr
acr
acp
agz
-pPF
-lMk
+hsz
+vVX
aiC
ajb
ajE
@@ -68685,34 +68686,34 @@ akM
acp
aqM
aqL
-dlr
+gHz
aqL
asc
alD
-uDt
-pvC
+fnD
+ebP
arR
aqw
axA
-pDb
+wuw
arR
-bIZ
-aAx
+lWS
+mgp
awO
-gLp
-aCI
-pWh
-arS
-eqX
+rlJ
+cHc
+xCB
+mEB
+rEp
awV
awQ
atr
-aJl
+wmF
aKo
aKo
aSX
aMF
-aNz
+jCt
aKo
aKo
aQX
@@ -68743,8 +68744,8 @@ aBR
bhi
bhi
bhI
-wGV
-usg
+hfq
+hfS
aIn
bjD
jdQ
@@ -68879,57 +68880,57 @@ aao
acp
acp
acp
-adF
+cFg
adP
aeo
aeM
afk
acp
agz
-aho
-hBl
+rKG
+cuC
aiD
ajc
aif
aif
aif
alr
-ami
+drC
anb
aer
afS
aoT
acp
aqM
-exP
+fFm
aqL
aqL
asc
alD
-rfX
+ghY
avy
-uuM
+jzZ
avy
axB
ayn
ayQ
-azD
-xpv
-svu
-wJt
-aCJ
-jUs
-aEG
-gHP
-bYE
+tzr
+iaJ
+nuc
+mcD
+unp
+vQV
+jVG
+hpu
+nBk
axB
-aDN
+tWA
ayN
aKp
aQW
aTb
kmm
-aNA
+fLZ
aMf
aMf
aQY
@@ -68955,14 +68956,14 @@ apD
aHD
aBR
aBR
-qBw
+jtJ
bhi
bhi
bhi
raQ
-hVx
-kgY
-kcn
+san
+xyr
+fnm
bjD
bka
bjA
@@ -69085,7 +69086,7 @@ aao
aao
aao
aqL
-exP
+fFm
lbh
dQR
kfx
@@ -69111,13 +69112,13 @@ ajF
aer
acp
als
-lAe
+gAn
anc
acp
acp
acp
acp
-fSX
+gzU
aqL
aqL
aqL
@@ -69125,25 +69126,25 @@ hGv
alu
alu
pzC
-fni
-flB
+xLL
+phA
alu
alu
ayR
-pas
-oEe
+iIE
+avE
awT
-okm
-aCK
-cZc
-aEH
-aFI
-vBT
-jdZ
-jdZ
+gBp
+dfa
+qBa
+ray
+qnd
+bFe
+cUO
+cUO
alu
aof
-aLe
+kYx
aof
apC
aNB
@@ -69177,7 +69178,7 @@ bhi
dbi
oWk
oWk
-fTg
+urp
aHC
aIn
bjD
@@ -69318,18 +69319,18 @@ alF
buB
acp
afl
-afR
-afR
-afR
+oKi
+oKi
+oKi
acp
aiE
-xSX
-kuC
-aki
+ccv
+cxs
+vmJ
aer
agB
ahn
-tbW
+gOk
aer
afS
bNE
@@ -69341,23 +69342,23 @@ aqL
cBq
alu
pIl
-avz
-xjP
-auP
+eAM
+kxv
+omD
qoQ
alu
-ayS
-pas
-wTf
-wDk
+grR
+iIE
+gRC
+jBP
apE
-nrp
+ePU
ayV
azv
-aFI
-aGE
+qnd
+ibK
aGw
-aIk
+uUR
alu
aKq
aHF
@@ -69401,7 +69402,7 @@ ofX
bjy
bkr
bjy
-bls
+tPJ
axX
ayr
ayZ
@@ -69525,24 +69526,24 @@ dXK
hQO
aqL
arp
-ldD
+hrp
acP
acP
-rpY
+oNg
acP
acP
acP
asc
acp
afm
-jpU
-lWt
-dgK
+wIz
+gWW
+cBC
acp
-aiF
-wXn
-kat
-gag
+ofK
+wZM
+vet
+bNU
aer
alt
ahn
@@ -69558,21 +69559,21 @@ aqL
asc
alu
oji
-avA
+xmQ
aqw
-awW
+xoz
tbS
alu
-ayT
-awi
-aAy
-dPI
+vNO
+sAY
+pQN
+uNV
apF
atr
-aDP
+nUZ
arU
bgJ
-fbM
+nWe
arR
awO
alu
@@ -69613,12 +69614,12 @@ qby
qby
kWW
aHD
-mSn
-bjE
-bus
-eJc
-spX
-uSQ
+kro
+xYA
+lcr
+jTy
+ghT
+dGe
bsX
bmy
bmZ
@@ -69752,17 +69753,17 @@ acP
asc
acp
xyu
-qDm
+kSd
agD
-pBm
+qJp
acp
-aiG
-rLJ
-lrM
-ouB
+cwQ
+fcu
+uhV
+too
akQ
-gzL
-rHR
+nHY
+dPm
ahj
aer
afS
@@ -69775,23 +69776,23 @@ aqL
asc
alu
oji
-lCF
-iHo
-oqV
+lqi
+jLR
+mwR
tbS
alu
-ayU
+irK
avy
aAz
-aBh
-ihm
-vdH
+rPZ
+hrP
+vqV
avy
aGy
-aFK
+hGH
avy
axB
-aIl
+cOk
alu
aHF
aHF
@@ -69830,12 +69831,12 @@ pTo
uyd
gMj
aHD
-bAt
-bjF
-bkc
-vNH
-bkc
-blt
+hAQ
+umN
+rJk
+tDs
+rJk
+nTc
xDW
bmz
bna
@@ -69963,23 +69964,23 @@ oMf
pRP
aWy
acP
-xtg
+eXe
acP
jeO
asc
acp
afn
-hIH
-agE
+lrm
+utc
afS
acp
-aiH
+edC
afT
ajG
-gag
+bNU
aer
agB
-kWl
+sWj
ahj
acp
acp
@@ -69992,13 +69993,13 @@ aqL
asc
alu
gts
-wWL
-lzg
-uHn
+teY
+llZ
+uhn
tbS
alu
alu
-azH
+pCb
alu
alu
alu
@@ -70034,7 +70035,7 @@ aOK
bbk
aOK
aPS
-bdp
+lkm
apD
aHF
aHD
@@ -70052,7 +70053,7 @@ ofX
bjy
bjy
bjy
-uyR
+dzE
axX
axX
axX
@@ -70170,7 +70171,7 @@ aao
tjX
dQR
dQR
-rAR
+xiR
aaB
pRP
sWh
@@ -70185,38 +70186,38 @@ acP
bJQ
aao
acp
-afo
-cEG
-agF
+uYs
+mLK
+kbt
ahp
acp
-aiI
-wjM
-pHc
-gag
+oFI
+lKH
+dUY
+bNU
aer
-mDE
+isp
ajL
-mMh
+kaS
any
aoh
aoU
acq
aqM
aqL
-cOE
+kxy
aqL
asc
alu
oji
-nWi
-vfo
-jCW
+mge
+eEj
+uQc
tbS
alu
-kRy
-nYg
-mlR
+oUm
+wTB
+hXJ
alu
aHF
aMg
@@ -70402,19 +70403,19 @@ jeO
aqL
aao
acp
-afp
+gKd
afT
-agG
-onX
+kZC
+nHH
acp
aiJ
afT
-ajH
-bBE
+pDl
+jmq
aer
-fDs
-pQH
-gMX
+tLM
+txR
+pWf
aer
aoi
aoV
@@ -70428,12 +70429,12 @@ alu
jRH
avB
pOt
-awX
-gej
+lyQ
+xgy
uST
-vhw
-xMd
-wNw
+vaa
+std
+qFA
alu
aHD
aBR
@@ -70443,7 +70444,7 @@ aBR
aBR
aBR
aBR
-lBg
+iYH
aBR
aFL
aMc
@@ -70473,7 +70474,7 @@ bdP
apC
aHD
aBR
-wbO
+jUx
aBR
aVo
aIn
@@ -70508,7 +70509,7 @@ vbp
tub
axX
bjY
-nDN
+pEv
bjA
bjA
bjH
@@ -70619,18 +70620,18 @@ aqL
aao
aao
acp
-eRh
-bjQ
+ule
+pOM
agH
-gja
+uNB
aih
-gmx
+iSy
ahr
-ajI
+yhS
akm
-wsL
-vLF
-amo
+qDK
+usK
+hfH
ahj
acp
aer
@@ -70658,7 +70659,7 @@ aBR
aBR
aBR
aBR
-vIy
+qYs
aBR
aBR
aBR
@@ -70670,7 +70671,7 @@ aof
aof
aof
aof
-aSV
+aKh
bdl
aof
aof
@@ -70709,9 +70710,9 @@ bjA
bjA
bjA
bjA
-xiy
+buO
bjA
-nDN
+pEv
bjA
blq
axX
@@ -70726,7 +70727,7 @@ bor
axX
bjY
bjA
-icf
+idQ
bkC
bjy
btD
@@ -70836,20 +70837,20 @@ aao
aao
aao
acp
-afq
-ugC
-lKW
-dHC
+sjy
+etf
+dgD
+sdn
acp
aiK
-fZG
+qzx
ajJ
akn
acp
agz
amp
and
-anz
+lln
aoj
aoj
apH
@@ -70871,7 +70872,7 @@ alF
alF
axW
aBR
-uZO
+jbG
aBR
aFL
aBR
@@ -70948,10 +70949,10 @@ bjy
bjy
bjy
azO
-dqJ
+gcm
ydn
ydn
-iTg
+uEH
epe
kdr
kdr
@@ -71055,17 +71056,17 @@ acp
acp
acp
acp
-agI
+uIS
acp
acp
acp
aer
-ajK
+lbP
aer
acp
alv
amq
-ebG
+cXe
aeJ
adS
adk
@@ -71076,7 +71077,7 @@ arZ
amD
acP
acP
-giO
+kTj
acP
acP
acP
@@ -71110,7 +71111,7 @@ aYm
aVU
aOM
aOM
-aXO
+mhL
kRK
aNL
aOM
@@ -71130,15 +71131,15 @@ bhi
bhi
wGr
aBR
-hKV
-lFQ
+cNl
+gHk
aIn
bjD
bjy
bjA
bkq
bjA
-lzK
+dGM
bjA
bjA
bjA
@@ -71166,11 +71167,11 @@ bkd
azO
azO
azO
-fJH
-dqJ
+vDi
+gcm
ydn
epe
-tlJ
+wfX
kdr
kdr
kdr
@@ -71256,7 +71257,7 @@ aao
aao
tjX
kfx
-cgO
+isP
pJt
pJt
gPc
@@ -71290,16 +71291,16 @@ acp
aqH
aqL
asa
-xtg
+eXe
acP
-dNN
+voM
acP
acP
acP
-fqA
+xKM
aqO
aqO
-xEB
+ivz
acP
aAA
acP
@@ -71312,7 +71313,7 @@ aBR
aBR
aBR
aBR
-xrb
+rXP
aBR
aMc
apC
@@ -71342,13 +71343,13 @@ apC
aHD
aWJ
aBR
-vIy
+qYs
aBR
aBR
aBR
aBR
-pSM
-euf
+uny
+elt
aIn
bjD
bjy
@@ -71362,10 +71363,10 @@ bkr
bkr
bkr
bkr
-ohk
+oso
bjA
bjA
-xiy
+buO
bjH
bjy
blu
@@ -71381,12 +71382,12 @@ btD
btD
blq
vpY
-tSx
+eDi
vpY
-dHq
+hTT
bvH
ihW
-omI
+tkI
kdr
kdr
kdr
@@ -71464,10 +71465,10 @@ aao
aao
aao
aao
-ikm
-ikm
-ikm
-ikm
+uZz
+uZz
+uZz
+uZz
aao
aao
aao
@@ -71481,7 +71482,7 @@ acP
acP
acP
acP
-giO
+kTj
asc
acp
adR
@@ -71499,7 +71500,7 @@ adS
akR
agz
amr
-niV
+qvM
aer
afS
cLZ
@@ -71515,7 +71516,7 @@ ahe
ahe
ahe
ahe
-atl
+kur
ahe
ahe
auE
@@ -71559,33 +71560,33 @@ apC
aHD
aWJ
aBR
-uZO
+jbG
aBR
aBR
aBR
bhO
-biY
-dzY
-bpT
-bjG
-skr
-ePB
-eJc
-eJc
-skr
-eJc
-eJc
-bPn
-eJc
-eJc
-skr
-eJc
-cbe
-eJc
-uqg
-ueo
-qjz
-uSQ
+exP
+jbB
+lUU
+xFP
+typ
+umh
+jTy
+jTy
+typ
+jTy
+jTy
+qXB
+jTy
+jTy
+typ
+jTy
+usz
+jTy
+lYc
+pZR
+dID
+dGe
bsX
nVq
nVq
@@ -71598,11 +71599,11 @@ buJ
buJ
buo
bvz
-dXu
+jUt
bvz
-xCi
-odk
-oXr
+fXA
+jrf
+meR
qLV
qLV
qLV
@@ -71680,13 +71681,13 @@ aao
aao
aao
aao
-jWT
+qEw
aao
aao
aao
-rWu
-eZl
-uhO
+mSk
+gwt
+spi
aao
aao
aao
@@ -71709,17 +71710,17 @@ adk
adk
adS
aer
-aiL
+hAE
adS
ahm
adS
acr
agz
ahm
-ycN
+nqQ
anx
-siS
-bHp
+iyJ
+fqt
acp
aqH
arp
@@ -71778,31 +71779,31 @@ aIn
aIm
aBR
aBR
-qhM
-qhM
+lir
+lir
bhP
-fYL
-gpt
-riv
-nqT
-roH
-rOB
-nqT
-nqT
-nqT
-weP
-nqT
-rOB
-nqT
-ilf
-jXy
-rOB
-rOB
-nqT
-nqT
-nqT
-rOB
-rXO
+dfb
+qoa
+rBi
+nCF
+mXH
+efv
+nCF
+nCF
+nCF
+cte
+nCF
+efv
+nCF
+hfU
+oil
+efv
+efv
+nCF
+nCF
+nCF
+efv
+kbi
maD
nVq
nVq
@@ -71813,14 +71814,14 @@ bjw
bjw
bjx
bjx
-ftU
+xwM
vpY
-xWD
+hkI
vpY
-cET
+kaU
bvQ
eAU
-lOM
+qcD
kdr
kdr
kdr
@@ -71897,17 +71898,17 @@ aao
aao
aao
aao
-jWT
+qEw
aao
aao
-hca
-lrb
-eZl
-iul
+wUP
+uKF
+gwt
+rpf
aao
tjX
-qIn
-msE
+kTp
+lAn
dQR
hQO
arp
@@ -71926,17 +71927,17 @@ afV
adT
adT
aer
-aiM
+oHy
adS
ajL
akp
acr
alw
ams
-ane
-qrg
+hAp
+uNQ
afS
-sOk
+rPy
acp
aqH
aqL
@@ -71963,7 +71964,7 @@ amn
wxo
aBR
aBR
-vIy
+qYs
aBR
aMc
apC
@@ -71975,7 +71976,7 @@ aof
aSZ
czS
aof
-aVW
+aPU
aWF
aof
kRK
@@ -71998,15 +71999,15 @@ aBR
aBR
aBR
bhP
-xIt
-xrG
-qKm
+hsT
+rYz
+ftc
bjH
bkd
bks
bks
bks
-gRK
+kDT
bkb
bkb
bkb
@@ -72032,11 +72033,11 @@ bjy
bjy
blq
vpY
-ybG
+xIW
vpY
-siu
-uzw
-iTg
+nZq
+hRQ
+uEH
epe
kdr
kdr
@@ -72115,21 +72116,21 @@ aao
aao
aao
aao
-bcm
-qyJ
-tWr
-crZ
-eZl
-iul
+mvl
+xYB
+xZV
+qoE
+gwt
+rpf
aao
-hNy
+uqA
vHU
dQR
hQO
aqL
aqL
lUa
-xEB
+ivz
acP
acP
acP
@@ -72149,7 +72150,7 @@ ajL
akq
acr
acr
-amt
+iAR
acr
acp
acp
@@ -72334,12 +72335,12 @@ aao
aao
aao
aao
-bcm
-bVC
-vRP
-feH
+mvl
+cmL
+cuO
+ttK
aao
-ody
+pUy
dQR
kfx
aqL
@@ -72363,7 +72364,7 @@ adS
ahk
adk
ajL
-aiN
+fpo
acr
adS
ajL
@@ -72394,7 +72395,7 @@ aua
aua
aws
amn
-htu
+mFS
aBR
aBR
aBR
@@ -72416,7 +72417,7 @@ aWH
xej
ole
eSN
-fWk
+gTh
baI
aYO
bca
@@ -72430,13 +72431,13 @@ aNw
aNw
aNw
aHF
-pKw
+ifc
bhR
bhU
bhU
bhU
bhU
-gkq
+cTP
awp
bkD
blx
@@ -72471,9 +72472,9 @@ meT
vrt
ydn
ydn
-cmo
+niv
kdr
-lOM
+qcD
kdr
kdr
kdr
@@ -72552,9 +72553,9 @@ aao
aao
aao
aao
-nUw
+oPy
aao
-gnS
+sNI
aao
aao
tjX
@@ -72570,7 +72571,7 @@ acP
asc
acq
acv
-pIa
+qSP
aeP
afs
adW
@@ -72583,7 +72584,7 @@ ajL
aks
acr
alx
-amu
+feM
anf
adk
alx
@@ -72613,7 +72614,7 @@ aFO
amn
aHD
aBR
-gEs
+lCI
aBR
aBR
aMc
@@ -72633,7 +72634,7 @@ aYW
xej
tBD
eSN
-aZZ
+ioR
upV
baJ
bcb
@@ -72688,8 +72689,8 @@ meT
meT
fZm
ydn
-omI
-tlJ
+tkI
+wfX
kdr
bvZ
kdr
@@ -72782,12 +72783,12 @@ aqL
aqL
lUa
acP
-rpY
+oNg
acP
asc
adG
adW
-aet
+wgd
akA
adW
adW
@@ -72897,15 +72898,15 @@ ayr
bjw
bjY
bjA
-nRO
+ukY
bjA
bjA
azO
-ikj
+pCz
meT
vrt
ydn
-lFw
+jDJ
kdr
kdr
kdr
@@ -73012,16 +73013,16 @@ acp
adS
adk
aiO
-ajf
-ajN
+sFm
+fCY
akt
acr
alz
amw
anD
-anC
-sxi
-pXo
+cms
+mWK
+fGo
amb
aqM
aqL
@@ -73033,9 +73034,9 @@ aua
avC
aua
asJ
-qVc
+sZy
ayo
-oMg
+sHn
azP
asJ
aua
@@ -73077,7 +73078,7 @@ aYO
apD
aTh
aWJ
-uFB
+psV
aBR
aBR
aMc
@@ -73087,7 +73088,7 @@ lID
lID
aMg
bhU
-pui
+gcg
awp
bkG
wvK
@@ -73115,7 +73116,7 @@ bjw
bjY
bjA
bjA
-nDN
+pEv
bjA
azO
meT
@@ -73124,7 +73125,7 @@ meT
fZm
epe
kdr
-lOM
+qcD
kdr
kdr
kdr
@@ -73220,7 +73221,7 @@ acP
acP
asc
acp
-mtM
+mJY
jGn
adW
adW
@@ -73229,8 +73230,8 @@ aer
adS
adS
aiO
-ajg
-adU
+dfr
+rxQ
akt
acr
alA
@@ -73239,8 +73240,8 @@ adS
anD
alA
alA
-sVB
-mui
+orf
+iaD
aqL
ase
amn
@@ -73249,9 +73250,9 @@ amn
amn
avD
awn
-sIp
-ulR
-sIp
+hLk
+pVd
+hLk
ayX
azQ
aAC
@@ -73292,7 +73293,7 @@ bcU
bds
aYO
apC
-dge
+mgQ
aIn
aKl
aIm
@@ -73433,7 +73434,7 @@ aqL
aao
aao
arp
-lLn
+fpt
acP
asc
acp
@@ -73446,8 +73447,8 @@ acp
aht
adS
aiO
-ajh
-ajP
+ukO
+vOm
akt
acr
adS
@@ -73458,7 +73459,7 @@ adk
adS
acr
aqM
-qwm
+fFh
asc
amI
aty
@@ -73466,11 +73467,11 @@ atY
amn
asJ
aua
-bQN
-oMg
-sKf
+aJK
+sHn
+pnb
aua
-gTR
+pRR
asJ
aBi
asJ
@@ -73509,10 +73510,10 @@ bcV
bdt
baJ
bej
-beE
-pYw
-oxV
-lFQ
+lRO
+lWX
+cac
+gHk
aBR
aMc
fHw
@@ -73548,14 +73549,14 @@ caD
bjw
bjY
bjA
-kSl
+loT
bjA
bjA
azO
-dnd
+mxj
ihW
ydn
-dqJ
+gcm
epe
kdr
kdr
@@ -73663,7 +73664,7 @@ acr
ahu
adS
aiO
-aji
+hfK
ajQ
akt
acr
@@ -73675,7 +73676,7 @@ aok
adk
alZ
aqM
-cCN
+pmd
asc
amI
atB
@@ -73715,10 +73716,10 @@ aNQ
aOO
aXn
aof
-aYr
+eQZ
aof
-aNJ
-sOc
+pqw
+kOq
aof
bbr
bQe
@@ -73726,10 +73727,10 @@ aYO
fPB
bQe
bek
-bjZ
-riv
-jqF
-pzG
+plV
+rBi
+poD
+hOh
aBR
aMc
fHw
@@ -73770,9 +73771,9 @@ bkd
azO
azO
azO
-fJH
-iTg
-uzw
+vDi
+uEH
+hRQ
epe
kdr
kdr
@@ -73892,7 +73893,7 @@ aol
adS
acr
aqM
-xtg
+eXe
asc
amn
atz
@@ -73901,12 +73902,12 @@ amn
pvj
asJ
awY
-axH
+xFg
aua
asJ
azT
amn
-tri
+dqO
qYB
aBk
aBk
@@ -73918,7 +73919,7 @@ aIp
aBR
aBR
aBR
-sLW
+hsR
apC
apJ
apJ
@@ -73943,10 +73944,10 @@ apC
apC
apC
apC
-beF
+mON
bfb
-luD
-xgk
+nLi
+xyM
aIm
aMc
aHD
@@ -73976,7 +73977,7 @@ bsC
awp
bjY
bjA
-kSl
+loT
bjA
blq
bjw
@@ -73987,8 +73988,8 @@ blq
vpY
jBq
vpY
-dHq
-dqJ
+hTT
+gcm
ihW
epe
kdr
@@ -74110,15 +74111,15 @@ acr
acr
aqM
acP
-fhO
+ewr
amn
aty
atY
amn
asJ
awo
-bNA
-axI
+pZQ
+nOw
ayp
asJ
azU
@@ -74139,10 +74140,10 @@ aMd
aMg
aMg
aMg
-xwN
-vsF
+qkg
+qOa
aMg
-tBF
+kaL
aMg
aMg
aMg
@@ -74151,8 +74152,8 @@ aMg
aMg
aMg
axW
-hKV
-lFQ
+cNl
+gHk
aMd
aMg
aMg
@@ -74162,9 +74163,9 @@ aMg
aMg
beG
aIn
-vmm
-biz
-uZG
+dEL
+fAn
+vBD
bhU
aHF
aCN
@@ -74204,10 +74205,10 @@ bjw
vpY
jBq
vpY
-tlJ
-sZv
-erJ
-tlJ
+wfX
+gyq
+fxs
+wfX
kdr
kdr
kdr
@@ -74326,7 +74327,7 @@ aoX
apb
acr
aqM
-cCN
+pmd
asc
amn
tmH
@@ -74335,7 +74336,7 @@ amn
asJ
awo
axa
-axJ
+mkO
ayq
ayY
azV
@@ -74351,41 +74352,41 @@ aHD
aBR
aBR
aBR
-xBY
+cWi
aBR
aBR
-xBY
+cWi
aBR
-nqS
+sLb
aBR
aBR
aBR
aBR
aBR
-xdl
-oxR
+vpV
+sUA
aVo
aIn
aWJ
-mJN
-luD
-prc
+pBS
+nLi
+wBX
aBR
-uFB
+psV
aVo
aIn
aIn
aWJ
aBR
-vIy
+qYs
bfc
-vmm
-rhy
-pDp
+dEL
+weg
+gWr
bhU
aHF
aHF
-lpP
+twK
aHF
aHF
bhU
@@ -74421,8 +74422,8 @@ bjw
vpY
jBq
vpY
-cET
-xLj
+kaU
+uCc
bvQ
kdr
kdr
@@ -74543,7 +74544,7 @@ alB
adW
acr
aqM
-rHQ
+rjY
asg
amI
atB
@@ -74569,12 +74570,12 @@ aBR
aBR
aBR
aBR
-gHD
+fcl
aBR
aBR
-vIy
+qYs
aBR
-taK
+pyv
aBR
aBR
aBR
@@ -74585,8 +74586,8 @@ aIn
aIn
aIn
aKl
-dZm
-ufb
+opZ
+hCV
aKl
aKl
aIn
@@ -74596,13 +74597,13 @@ aIn
aKl
aKl
aIn
-jDI
-ufb
+wtU
+hCV
aIn
aMc
aHF
aMg
-hJd
+nOq
lID
aMg
aHF
@@ -74638,10 +74639,10 @@ blq
vpY
jBq
vpY
-wjK
-mDI
+xNA
+rqR
ydn
-cmo
+niv
kdr
kdr
bvZ
@@ -74759,7 +74760,7 @@ alC
aon
aoY
acr
-mui
+iaD
acP
ash
amI
@@ -74768,8 +74769,8 @@ atY
amn
asJ
awo
-axb
-xNr
+reg
+dfB
ayp
asJ
azW
@@ -74789,38 +74790,38 @@ aBR
aBR
aBR
aBR
-jaI
+wZg
aBR
-jaI
+wZg
aBR
aBR
-oxR
-aVn
-qTM
-pYw
-pYw
-pYw
-qDq
-qDq
-xrH
-baa
-qDq
-qDq
-qDq
-pYw
-qDq
-qDq
-pYw
-qDq
-qDq
-rhy
-jGC
+sUA
+jMX
+xtO
+lWX
+lWX
+lWX
+eWI
+eWI
+tvA
+juH
+eWI
+eWI
+eWI
+lWX
+eWI
+eWI
+lWX
+eWI
+eWI
+weg
+lxg
aWJ
aMc
aHD
dPJ
-ecm
-ecm
+oII
+oII
dPJ
nvn
bhU
@@ -74844,7 +74845,7 @@ bsG
azG
btn
bjA
-wHW
+ntx
bjA
bjA
bjA
@@ -74855,8 +74856,8 @@ blu
azO
azO
azO
-xpY
-dqJ
+xGH
+gcm
ydn
epe
kdr
@@ -74961,7 +74962,7 @@ ahS
aqM
acP
acP
-wHZ
+wSH
acP
asc
aiQ
@@ -74985,13 +74986,13 @@ amn
amn
avF
awo
-axc
+hLm
awZ
ayp
asJ
azP
enJ
-aBo
+wRV
aBW
aBk
aBk
@@ -75006,39 +75007,39 @@ aBR
aBR
aBR
aBR
-jaI
-jaI
-vEN
+wZg
+wZg
+jzo
aBR
aLc
aBR
-luD
-rhy
-riv
-riv
-riv
-pKg
-riv
-hSD
-riv
-riv
-wXB
-riv
-riv
-gev
-gmb
-riv
-riv
-riv
-riv
-mfD
+nLi
+weg
+rBi
+rBi
+rBi
+jVh
+rBi
+iUu
+rBi
+rBi
+cYG
+rBi
+rBi
+gOU
+oUK
+rBi
+rBi
+rBi
+rBi
+qDA
aIp
aMc
fHw
-ecm
-ecm
-ecm
-ecm
+oII
+oII
+oII
+oII
wBu
aHF
awp
@@ -75062,7 +75063,7 @@ azG
bjY
bjA
bjA
-nDN
+pEv
bjA
bjA
bjH
@@ -75072,7 +75073,7 @@ buc
buc
azO
meT
-uNn
+vcX
ydn
ydn
epe
@@ -75194,7 +75195,7 @@ agt
apa
acr
ajT
-cCN
+pmd
asc
amI
aty
@@ -75209,28 +75210,28 @@ aua
azY
qus
aBp
-ePV
-jyS
+mQA
+nNc
aBk
amn
amn
amn
-dOw
+nUR
aBR
-dEE
+fed
aBR
aBR
aBR
aBR
-jaI
-xBY
-tZH
-vzA
+wZg
+cWi
+jBX
+uSh
aBR
-oxR
+sUA
aBR
-pSM
-idy
+uny
+dVf
aIn
aIn
aIn
@@ -75252,12 +75253,12 @@ aIp
aBR
aMc
fHw
-ecm
-ecm
-kLK
-hwo
+oII
+oII
+qXd
+uCC
wBu
-kAU
+hBI
awp
qeK
ccP
@@ -75281,7 +75282,7 @@ bjA
bjA
nYV
bjA
-mMc
+qaA
vEU
gke
buc
@@ -75386,7 +75387,7 @@ aqL
aqL
aqL
arp
-nDg
+rcJ
acP
rZU
ahS
@@ -75426,7 +75427,7 @@ aua
ltK
amn
aBq
-lVW
+iEy
szZ
aBk
aEN
@@ -75435,19 +75436,19 @@ amn
aHF
aFM
aFM
-pXI
+syW
aCN
aFM
aCN
-srX
+ooA
aOR
aFM
-iAm
+mud
aCN
aHC
aBR
-luD
-jGC
+nLi
+lxg
aIn
aXo
aKt
@@ -75457,7 +75458,7 @@ aKt
aIp
aBR
aBR
-vIy
+qYs
aBR
aBR
aBR
@@ -75466,12 +75467,12 @@ aBR
aBR
aBR
aBR
-uFB
+psV
aWW
aHD
dPJ
-hwo
-jRr
+uCC
+muM
dPJ
aMc
aHF
@@ -75613,7 +75614,7 @@ rVT
acP
acP
acP
-skk
+xsK
asc
acr
acr
@@ -75627,12 +75628,12 @@ akj
akj
akj
acr
-hxz
-wHy
+swR
+cRX
asc
amn
atB
-mZV
+rkP
amn
asJ
awq
@@ -75663,21 +75664,21 @@ anJ
anJ
aHD
aBR
-luD
-ufb
+nLi
+hCV
aIn
aWJ
aBR
-xdl
+vpV
aBR
aBR
aBR
aBR
-mJN
+pBS
aBR
aBR
aBR
-uFB
+psV
aBR
aBR
aBR
@@ -75686,12 +75687,12 @@ aBR
aBR
aMc
aHF
-cfg
-xwL
-fks
-cfg
-irT
-pKw
+rfD
+bOk
+snt
+rfD
+baa
+ifc
awp
bkO
blC
@@ -75827,7 +75828,7 @@ vgE
vgE
vgE
lPg
-pzH
+cyG
acP
acP
acP
@@ -75840,16 +75841,16 @@ akw
alF
alF
akw
-umn
-ohX
-lQv
-cOs
-aqI
+uQu
+vKT
+eWZ
+wFd
+dfq
amD
asc
amn
-qMD
-pPz
+mpc
+wRz
amn
avG
awq
@@ -75859,29 +75860,29 @@ awq
axM
aws
amn
-aBr
-alT
+sjD
+fbo
aCS
aDU
-vil
-aFT
+uPy
+iHQ
amn
-kXQ
+iCX
aIq
aJn
-cEI
+oBn
aLp
aEO
-aMH
+oVN
aEO
-moI
+kVZ
aEO
-lDu
+lbj
anJ
aTc
aBR
-luD
-ufb
+nLi
+hCV
aIn
aWJ
aWI
@@ -75898,14 +75899,14 @@ aFM
aFM
aFM
aFM
-hUr
+qWl
aCN
aCN
aHF
aHF
-kAU
+hBI
aHF
-kAU
+hBI
jdj
aHF
aHF
@@ -75950,7 +75951,7 @@ bvY
kdr
kdr
aBv
-bwZ
+lWZ
bxo
bxz
bxo
@@ -76049,26 +76050,26 @@ acP
acP
acP
acP
-rpY
+oNg
acP
acP
acP
acP
acP
acP
-rHQ
+rjY
acP
-rHQ
-cie
+rjY
+gQa
acP
acP
acP
asc
amn
-lyx
-mZV
+sBO
+rkP
amn
-sIp
+hLk
awq
mnv
axN
@@ -76076,29 +76077,29 @@ ays
axN
aAa
aAE
-sXY
-fTO
-aCT
+lqU
+kUa
+iEu
atY
atY
atY
aAE
aHG
-aIr
+fYG
aJn
-niz
-aLq
-vcq
-vcq
-aNR
-wXN
-iGt
+hFN
+eml
+wFE
+wFE
+jvb
+bFO
+kLL
aGI
aqz
aHD
aKl
-fYL
-ufb
+dfb
+hCV
aIn
aWJ
aMc
@@ -76122,10 +76123,10 @@ asv
asv
aHF
aHF
-mMx
+oUF
aHF
aHF
-ewF
+nms
awp
bkE
blC
@@ -76268,7 +76269,7 @@ acP
acP
acP
acP
-dNN
+voM
acP
acP
acP
@@ -76276,7 +76277,7 @@ amD
acP
acP
acP
-rHQ
+rjY
acP
acP
acP
@@ -76288,34 +76289,34 @@ auU
asJ
awq
awq
-stk
+faV
ayt
axM
aAb
amn
aCa
-ghv
-rPl
-fTO
-pwO
+fUB
+nMo
+kUa
+tDI
aFU
amn
aHG
aHG
-wXE
-qGW
-uwN
-ipL
-hlU
-oWz
+kFU
+dFi
+pDH
+oCn
+rOe
+jJW
aEO
-uwN
+pDH
aEO
anJ
aTd
aIn
-cjd
-hXA
+uiz
+naa
aIn
aWJ
aMc
@@ -76335,7 +76336,7 @@ bfd
wKf
bgc
bfe
-bgI
+qKc
asv
aHF
aHF
@@ -76475,12 +76476,12 @@ aqL
arp
acP
acP
-rpY
+oNg
acP
acP
acP
acP
-dNN
+voM
acP
acP
acP
@@ -76503,36 +76504,36 @@ aty
atY
amn
pvj
-awr
+gqL
axN
axO
ayu
awq
aws
aAE
-vKH
-lel
-lel
-lel
+iYG
+gNp
+gNp
+gNp
aBZ
aBZ
aAE
aHG
aIs
-aJo
+oVu
aEO
-jEw
-fER
-psE
-sGz
+rmL
+ndS
+wiR
+iee
aEO
-hWP
+nLg
aRj
aqz
aHD
aUh
-maL
-ufb
+htZ
+hCV
aIn
aWJ
aWW
@@ -76549,7 +76550,7 @@ aYY
aYY
asv
wKf
-bfJ
+tDE
bgd
bgd
aLf
@@ -76693,7 +76694,7 @@ aqL
lUa
acP
acP
-nDg
+rcJ
acP
acP
acP
@@ -76704,7 +76705,7 @@ acP
acP
acP
acP
-akV
+dRZ
acP
acP
asc
@@ -76720,36 +76721,36 @@ amn
amn
amn
asJ
-oML
+nBX
asJ
-sIp
+hLk
ayv
asJ
aws
amn
-rqh
-kPU
+iLQ
+erm
atY
atY
aCa
aCa
amn
aHH
-mRl
-wXE
+klA
+kFU
aEO
aLs
-mIh
-wIi
-rAq
+slS
+gsI
+xRM
aEO
-suH
+jSD
aEO
anJ
axW
aIn
-lmC
-ufb
+dor
+hCV
aIn
aWJ
aMc
@@ -76770,7 +76771,7 @@ gAX
bge
bgs
bfM
-avr
+sPo
bhT
bhU
bhU
@@ -76912,7 +76913,7 @@ bQh
bQh
lUa
acP
-ghw
+tUs
acP
acP
acP
@@ -76929,16 +76930,16 @@ aku
aoo
atE
apK
-ehW
+ltq
ars
apc
-hpv
-atC
+cCd
+xux
ars
amn
amn
jZp
-axh
+esn
amn
amn
anJ
@@ -76951,22 +76952,22 @@ amn
amn
amn
amn
-uJy
-aHI
-aJp
+kbZ
+rQh
+sMt
aEQ
aGH
-lok
-niT
+tSJ
+mfS
aNS
-aOS
-uwN
-aRk
+eXK
+pDH
+lTl
anJ
-aTe
-qDq
-rhy
-ufb
+ssb
+eWI
+weg
+hCV
aIn
aWJ
aMc
@@ -76988,7 +76989,7 @@ bgc
bgc
bgK
asH
-kQd
+gqR
bhU
bhU
asv
@@ -77146,45 +77147,45 @@ aku
aop
apc
apK
-lNT
+neB
ars
apc
apK
-kQX
+vzg
ars
ako
-fCQ
-awt
-tme
-axP
+mBH
+rZP
+loo
+qcH
ahf
anJ
-dPF
-iOD
-sYp
-aAg
+qRV
+kCr
+hyI
+deh
anJ
-aDV
-fRP
+sVS
+uZH
aEO
-uwN
-uwN
-niz
-uLh
+pDH
+pDH
+hFN
+cBo
aKw
aEO
aEO
aEO
-vSc
+xTZ
aLr
-aPY
-uwN
-aSc
-luD
-nZi
-jAr
-ufb
-jqw
+mBe
+pDH
+dBw
+nLi
+sCV
+tla
+hCV
+xXK
aWJ
aMc
asv
@@ -77202,10 +77203,10 @@ asv
bfK
bfM
bgc
-bgt
+lzZ
bgL
asv
-jzu
+qeY
aHF
rHD
asv
@@ -77370,37 +77371,37 @@ atE
apc
apc
apc
-wVt
-jGw
-dkT
-lFF
-lmr
+mRc
+jsC
+jCN
+mdN
+hOR
anJ
-hhX
-cYy
-eAy
-aCb
+vFp
+eSt
+aNp
+uxL
aCU
-hhv
+moS
aEP
aER
aER
-vcq
-aIt
+wFE
+pqQ
aER
aER
-eAO
+ewG
aER
-mgS
-aNU
-uwN
-uwN
-aRl
+jwO
+qcl
+pDH
+pDH
+iAa
cNH
-aTf
-hOI
-biz
-ufb
+gZn
+keb
+fAn
+hCV
aIn
aWJ
aMc
@@ -77579,46 +77580,46 @@ ahS
aku
aoq
apd
-apL
-kAR
-raW
+tMo
+dKF
+trV
apc
apc
apc
apc
aqQ
-uEd
-kZF
-lYX
-icE
+tSd
+vdW
+pgO
+dPn
ars
anJ
-aAf
-aAH
-kQj
-dPP
+gKD
+uBb
+tcS
+gCU
anJ
-bxZ
+emB
aEO
-uwN
+pDH
aGH
-wXN
+bFO
aEO
aEO
-uwN
-dTJ
+pDH
+slj
aGH
aEO
aNV
aEP
-aDW
+bMv
aRm
anJ
-aTg
-rhy
-rhy
-jGC
-pme
+koB
+weg
+weg
+lxg
+iem
aWJ
aMc
asv
@@ -77782,7 +77783,7 @@ aqL
aqL
aqL
lUa
-oJS
+doY
acP
asc
hHa
@@ -77796,7 +77797,7 @@ ahS
ako
ako
ako
-apM
+rFs
ako
ako
ako
@@ -77807,17 +77808,17 @@ ako
avI
aop
atE
-axQ
+gQG
ahf
anJ
-eRF
-dPF
-jXk
-jOq
+dXD
+qRV
+xfT
+pOo
anJ
aNS
aEO
-wXN
+bFO
aLr
aEO
aEO
@@ -77827,14 +77828,14 @@ aKx
aKx
aKx
aNW
-uwN
-nUB
+pDH
+hxP
aEO
anJ
-gAS
-aUi
-ppU
-ufb
+mWp
+cRT
+ioq
+hCV
aIn
aIp
aMc
@@ -78011,15 +78012,15 @@ ahS
ahS
khK
ako
-eNe
-xWe
+jwZ
+hgA
apN
-wRI
-uVi
+iCb
+iXi
ako
atD
-iqT
-iqT
+jcF
+jcF
ako
atE
awu
@@ -78039,20 +78040,20 @@ anJ
anJ
anJ
anJ
-aKy
+uYM
aLu
-aMi
-aMI
-aNX
+aBs
+eXy
+mlJ
aKx
-tXp
+foK
aRn
aqz
-gAS
-ppU
-ppU
-baa
-lFQ
+mWp
+ioq
+ioq
+juH
+gHk
aWI
aHF
aHF
@@ -78226,50 +78227,50 @@ ahS
ahS
ahS
ahS
-lbU
+sUn
ako
-xzb
-oEL
-gJF
-xTQ
-pgP
+cly
+dkW
+tYk
+mrB
+uoW
ako
-asM
+eLe
atE
apc
ako
-tgf
+kwz
aop
atE
axR
-ayw
-dNL
+dLq
+lUV
ako
-nOP
-dCg
+sED
+niU
sqt
anJ
aEa
-hWI
-aFX
-mKr
-aHJ
+bLd
+syI
+cXf
+vsY
aIu
anJ
aEO
aEO
aMj
aEO
-aFW
+hWC
aKx
-tXp
-uwN
+foK
+pDH
anJ
-gAS
-baa
-kRY
-ppU
-ufb
+mWp
+juH
+slo
+ioq
+hCV
asv
asv
asv
@@ -78443,17 +78444,17 @@ ahS
ahS
ahS
khK
-bKJ
-snh
-ape
-oEL
-vZh
-oEL
-ied
+fQm
+bJe
+fOO
+dkW
+yiw
+dkW
+gcO
ako
asN
atE
-rBI
+rdT
ako
atE
aop
@@ -78463,30 +78464,30 @@ ayx
azd
ako
aAJ
-cWd
-vXS
+jcg
+fmW
anJ
-aEb
-wbX
-etc
+bWp
+yeL
+dHS
aEO
-nzE
+fhr
aEO
aJr
aEO
coT
aEO
aEO
-aNY
-dYw
+xJG
+drM
aNS
-uaO
+sSM
anJ
-gAS
-ppU
-baa
-jqF
-ukw
+mWp
+ioq
+juH
+poD
+edv
asv
aXS
aYs
@@ -78498,11 +78499,11 @@ asv
asv
asv
asv
-ezK
+kpj
asv
beK
bfn
-ezK
+kpj
bgg
bgg
bgO
@@ -78662,7 +78663,7 @@ khK
xQd
xQd
ako
-xTQ
+mrB
mfG
apO
aqR
@@ -78673,19 +78674,19 @@ atE
apc
ako
atE
-tCw
+jVY
axi
ako
ako
ako
ako
aAJ
-qCA
+cSO
apo
anJ
aEc
-hGg
-aFY
+jcl
+tRR
aGJ
aCP
aIv
@@ -78694,18 +78695,18 @@ aKz
aLv
anJ
aMJ
-nLE
+kCY
aKx
aNS
-uwN
+pDH
aqz
-aTi
-dzY
-dzY
-dzY
-yle
+gSY
+jbB
+jbB
+jbB
+lXc
aXq
-lKq
+krV
bcX
bcX
aZF
@@ -78715,11 +78716,11 @@ bbA
bbA
bbA
aZF
-bdU
+pQU
aZF
beL
bfo
-ezK
+kpj
bgh
bgu
bgh
@@ -78739,14 +78740,14 @@ awp
awp
awp
bWk
-mtx
+glN
ntX
nVx
nVx
nVx
nVx
nVx
-tlk
+iBp
nVx
eRc
uvZ
@@ -78880,21 +78881,21 @@ aao
aao
ako
jNE
-rZb
-eJU
-aqS
-ape
+ddw
+qwW
+lap
+fOO
ako
asP
-rmE
+qfe
apc
auV
apc
-tCw
-qPK
+jVY
+vEv
axR
-cFn
-mmj
+qpb
+teE
ako
aAJ
gbA
@@ -78904,7 +78905,7 @@ anJ
anJ
anJ
anJ
-doh
+oZK
anJ
anJ
anJ
@@ -78916,11 +78917,11 @@ anJ
sPv
aRo
anJ
-aTj
-riv
-biz
-rhy
-mfD
+puu
+rBi
+fAn
+weg
+qDA
bET
aXr
aXr
@@ -78936,9 +78937,9 @@ bai
bbB
aXU
bfp
-ezK
+kpj
bgi
-bgv
+xKz
aLg
bgg
bgg
@@ -78955,9 +78956,9 @@ bep
bep
bep
bep
-hFA
-ryx
-xkN
+jRe
+grP
+wDo
xJC
mzV
mzV
@@ -79096,47 +79097,47 @@ aao
aao
aao
ako
-ygN
-apg
-apP
-ape
-pld
+mhK
+ehW
+sbI
+fOO
+npL
ako
-asQ
+uJH
atE
atE
ovq
apc
-daz
+xWA
atE
ako
-hQP
-neE
+dKd
+pyM
ako
aAK
apo
-gZj
-kMk
-hDU
-nND
+cpq
+hHl
+rrV
+jHW
gbA
-oON
-wdX
+nvN
+tiW
apo
apo
-gVQ
+nHh
apo
-nNY
-lfD
+vyE
+yeK
apo
anT
-ifH
-rJd
+poV
+mET
anT
-kdy
+ghj
aQu
-ykO
-jZj
+txJ
+rpG
aSi
asH
aXU
@@ -79147,20 +79148,20 @@ asv
asv
asv
asv
-rfE
-rfE
-tCB
-rfE
+uBk
+uBk
+qSZ
+uBk
beI
bft
-ezK
+kpj
bgj
bgw
bgQ
bgg
bhY
asv
-sRJ
+dJb
bjm
bes
bes
@@ -79169,18 +79170,18 @@ bes
bes
bes
bes
-htN
+iVI
bes
bes
-cGK
-nom
-nGo
+kNF
+gTa
+hYz
mzV
-xTc
+slO
mzV
mzV
mzV
-xTc
+slO
mzV
pcI
uvZ
@@ -79314,31 +79315,31 @@ aao
aao
ako
jNE
-iWh
-tBS
-aqT
-oEL
+srN
+eiU
+rcI
+dkW
ako
-asR
+suB
atF
atE
ako
-qPK
-vHL
-biO
+vEv
+sPq
+nCJ
ako
ako
ako
ako
-fIb
+vTJ
apo
apo
apo
apo
apo
gbA
-vtU
-jMi
+rup
+wXa
iOR
apo
gbA
@@ -79348,55 +79349,55 @@ gbA
apo
aOU
aQa
-hPU
+tmy
aOU
aTk
aQu
-sJK
-gVF
+jRc
+pwj
aTr
asv
aXV
aYu
aZd
asv
-lPI
+yjx
bwA
-rpW
-lTL
+dfp
+pkE
bcY
-czm
-aKn
-xOC
+phO
+oXG
+gTt
beI
bft
-ezK
-ezK
+kpj
+kpj
asv
asv
asv
asv
asv
-eFM
-lFm
+odq
+fmA
bjl
bes
bes
-rrm
+wlr
bes
bes
bes
bes
bes
bes
-bbL
-vhP
-oAg
+lcE
+fgF
+uNP
mzV
mzV
mzV
mzV
-vWo
+xZO
mzV
mzV
pcI
@@ -79540,53 +79541,53 @@ asS
atG
aub
ako
-ntB
-nmg
+oRl
+ipQ
apc
axR
-ayw
+dLq
azc
ako
aAJ
apo
-hqQ
-iTl
+uFP
+uwB
gbA
-fUH
-xBT
-vhO
-fSr
-rPR
-tHm
+mQU
+fnI
+oWK
+nFT
+ntF
+iex
gbA
-fma
+wLj
gbA
-bFV
-vUa
+ube
+hPi
anT
aQb
-uqX
+dhq
anT
aTk
aUk
-rsg
-fMV
+tOa
+mwY
aTr
asv
asv
asv
asv
asv
-jOm
+gIP
baO
-uiD
-ebH
-qAY
-gVI
-xcq
+uqI
+pFn
+pFS
+nji
+uuZ
asv
beN
-bfq
+htn
bfO
bgk
bgx
@@ -79594,21 +79595,21 @@ bgR
bhk
bgx
biD
-phC
-lGl
+irp
+hdK
beq
bhr
bes
bes
bes
bes
-spA
+xNU
bes
bes
bes
-cGK
-lEb
-oNg
+kNF
+kXy
+irO
mzV
eWo
mzV
@@ -79750,14 +79751,14 @@ pmS
aou
aph
apR
-irE
+vMO
arw
ako
bqA
atG
auc
ako
-iUj
+xcZ
aop
apc
ako
@@ -79765,7 +79766,7 @@ ayx
azd
ako
aAJ
-dBu
+sSL
anT
anX
anX
@@ -79786,8 +79787,8 @@ aRp
anT
aTk
aUk
-rsg
-qpo
+tOa
+ogL
aXW
aSg
aTq
@@ -79797,22 +79798,22 @@ asv
asv
asv
asv
-izW
+wSA
bcZ
bdA
-hJr
-cab
+xKt
+iRK
beI
bfr
bfP
-bgl
+ozb
bfP
bfP
bhl
bbB
bET
-cGK
-cRc
+kNF
+xen
beq
bes
bes
@@ -79823,13 +79824,13 @@ bes
bes
bes
bes
-cGK
-lEb
-cRc
+kNF
+kXy
+xen
mzV
mzV
mzV
-wpA
+xSw
mzV
mzV
mzV
@@ -79963,25 +79964,25 @@ aao
aao
pmS
hqO
-kxz
+ceO
aou
-api
+xuH
apS
-aqV
-aqV
-asi
-bdX
+cQF
+cQF
+jtc
+hBV
atH
aud
amZ
-avH
+okd
atH
-axj
+koq
ako
ako
ako
ako
-ckE
+kgA
apo
anU
nWG
@@ -80003,8 +80004,8 @@ aIE
anT
aTk
aUk
-rsg
-jZj
+tOa
+rpG
aKP
aSh
aTr
@@ -80014,35 +80015,35 @@ asH
baj
baP
bbC
-lTL
+pkE
bda
-lMj
-hJr
-rfE
+vEz
+xKt
+uBk
beI
-bfs
-ezK
-ezK
+qsF
+kpj
+kpj
asv
asv
asv
asv
asv
-qqe
-gdF
-jPM
-jPM
-uUb
-jPM
-jPM
-jPM
-jPM
-jPM
-jPM
-bpY
-eLK
-eLK
-cRc
+tqI
+iWa
+ejx
+ejx
+iwx
+ejx
+ejx
+ejx
+ejx
+ejx
+ejx
+sPh
+xwV
+xwV
+xen
bes
mzV
eWo
@@ -80182,7 +80183,7 @@ amE
hqO
ako
ako
-apj
+cTD
ako
ako
ako
@@ -80192,9 +80193,9 @@ ako
ako
ako
avI
-uua
-axk
-axS
+hrD
+qLg
+pCg
mnY
kwq
mnY
@@ -80220,8 +80221,8 @@ aQm
aqU
aTk
aUl
-rsg
-uOl
+tOa
+nBp
aOk
aQu
aTr
@@ -80232,34 +80233,34 @@ aXr
baO
aXr
bck
-otc
-uiD
-bdY
-lze
-hPb
+gVx
+uqI
+mXp
+puh
+niL
bft
-ezK
+kpj
bgm
bgy
-bgS
-bhm
-bhZ
+dUv
+kCk
+czB
asv
-bbL
-eLK
-lEb
-lEb
-lEb
-lEb
-uck
-lEb
-uie
-aqP
-uck
-lEb
-eLK
-lEb
-cRc
+lcE
+xwV
+kXy
+kXy
+kXy
+kXy
+lBX
+kXy
+vFd
+jEZ
+lBX
+kXy
+xwV
+kXy
+xen
bes
mzV
mzV
@@ -80392,29 +80393,29 @@ aao
aao
aao
aao
-lFJ
+yko
pmS
-hnC
+oSg
pmS
hqO
ako
aov
-npm
+rWp
apT
aqW
-arx
+boo
ako
asW
asU
asW
ako
-raW
-cNg
-axl
+trV
+nwP
+drg
ovq
apo
-aBx
-eWN
+cma
+oUV
gbA
gbA
tKR
@@ -80435,12 +80436,12 @@ aOX
aQf
aQh
aqU
-aTl
-onK
-wjx
-jyK
-onK
-pna
+tgK
+wuM
+nYn
+jPU
+wuM
+uFg
aTr
aTq
aTq
@@ -80448,35 +80449,35 @@ asv
asv
asv
asv
-ezK
-fMi
+kpj
+vcb
bdB
bdW
-xwm
+ddp
beI
bft
-ezK
+kpj
bgm
bgz
bgB
bgB
bfR
asv
-bbL
-lEb
-uOo
-uOo
-uOo
-cVF
-cVF
-eLK
-lEb
-lEb
-lEb
-uOo
-uOo
-uOo
-eke
+lcE
+kXy
+qGc
+qGc
+qGc
+dwy
+dwy
+xwV
+kXy
+kXy
+kXy
+qGc
+qGc
+qGc
+oCf
lvy
lvy
lvy
@@ -80610,16 +80611,16 @@ aao
aao
aao
pmS
-dnv
+vpP
pmS
pmS
hqO
ako
aov
-cXr
-dky
+pJI
+mQS
aoB
-mZJ
+tPB
ako
apU
apU
@@ -80627,13 +80628,13 @@ aoB
ako
atE
atE
-vcD
+dfJ
ako
-qMs
+vwj
arD
arD
aMk
-bNO
+uvL
anU
aCZ
aCZ
@@ -80652,49 +80653,49 @@ aOY
aQg
aCo
aqU
-aDy
-wjx
-toE
-toE
-toE
-lSv
+tIJ
+nYn
+joV
+joV
+joV
+lZh
aTr
aTq
aTq
asv
-unj
-nBu
-eCV
+stj
+fhA
+ojO
bck
-tDd
-omL
-gWJ
+tDG
+exe
+nKg
asv
beI
bft
-ezK
+kpj
bgn
bgz
bgT
bgB
bfR
biE
-bbL
-cRc
+lcE
+xen
bjl
bes
bes
bes
bes
-cGK
-lEb
-eLK
-wGF
+kNF
+kXy
+xwV
+qdI
bes
-jLO
+qqi
bes
bes
-htN
+iVI
bes
bes
mzV
@@ -80832,22 +80833,22 @@ alG
pmS
hqO
ako
-aow
-cXr
+iLb
+pJI
apU
apU
-mZJ
+tPB
aml
-jtX
-eAs
-czN
-rLO
-pvT
-sqY
+jRw
+clv
+saE
+trt
+vje
+ixM
apc
aku
aBu
-irU
+nct
arD
aMk
gbA
@@ -80869,8 +80870,8 @@ aOZ
aMQ
aMN
aqU
-aDy
-jZj
+tIJ
+rpG
aVq
aVq
aVq
@@ -80880,11 +80881,11 @@ aTq
aTq
asH
baj
-aIo
-jvX
+kWh
+kJM
asv
asv
-noH
+sfN
asv
asv
beI
@@ -80892,21 +80893,21 @@ bfu
bfQ
bgo
bgA
-bgU
-bhn
+nrE
+gqE
bgB
bET
-bbL
-vGj
+lcE
+uwf
bjm
bes
bes
-rrm
+wlr
bes
-nbc
-uOo
-uOo
-eke
+ndi
+qGc
+qGc
+oCf
vVZ
aao
vVZ
@@ -81051,15 +81052,15 @@ aao
ako
aov
apk
-apV
-hKj
-eoB
-kTa
-jTc
-hof
-fZP
+lpI
+lRd
+nuu
+uHN
+kma
+glU
+nYw
ask
-qEm
+vwk
apc
avJ
aku
@@ -81086,8 +81087,8 @@ aPa
aQh
aRq
anT
-aDy
-fMV
+tIJ
+mwY
aVr
aVY
aKP
@@ -81100,9 +81101,9 @@ asv
asv
asv
asv
-bdb
-mZZ
-wAx
+uNL
+hrh
+evW
asv
beI
bbB
@@ -81113,10 +81114,10 @@ bgB
bgB
bia
asv
-fFL
-bto
+okF
+rRG
bjm
-htN
+iVI
bes
bes
ejP
@@ -81270,10 +81271,10 @@ aox
apl
apW
apY
-ary
+wqr
amm
apY
-wEE
+wcg
asY
aml
atE
@@ -81303,8 +81304,8 @@ aOX
aQi
aLE
aSe
-aDy
-aUm
+tIJ
+oMI
aUk
aKP
aKP
@@ -81317,15 +81318,15 @@ aTq
aTq
aTq
asv
-fFt
-bdD
-fpw
+hgc
+gyj
+cJr
asv
beI
bbB
asv
-miM
-bgp
+fAP
+ioU
bgV
bhp
aLi
@@ -81337,10 +81338,10 @@ bes
bhr
aao
aao
-mxf
-vWt
-uij
-uVe
+vPQ
+naO
+teq
+hIY
brD
fCb
fCb
@@ -81483,11 +81484,11 @@ alI
alH
aao
ako
-hLn
-xgj
-qly
-qhV
-ahq
+riE
+uXa
+poA
+mlo
+sLw
ako
asV
aoB
@@ -81499,9 +81500,9 @@ apc
aku
aBu
arD
-dFf
+fxr
aMk
-reh
+uxZ
anU
aCf
aCZ
@@ -81520,8 +81521,8 @@ aPb
aQj
aRr
tKR
-aDy
-jZj
+tIJ
+rpG
aUk
aKP
aKP
@@ -81554,10 +81555,10 @@ bes
bes
aao
aao
-neH
-whi
-bqb
-iXp
+gdH
+jdh
+suH
+jRE
aao
aao
rjw
@@ -81702,9 +81703,9 @@ aao
ako
aoy
apk
-wRM
+eMf
aqW
-bIt
+itq
ako
asW
oDB
@@ -81737,8 +81738,8 @@ aPc
aQk
aIE
anT
-aDy
-jZj
+tIJ
+rpG
aVs
aKP
aKP
@@ -81918,7 +81919,7 @@ akY
aao
akL
akU
-apm
+lnj
akU
akU
akL
@@ -81932,9 +81933,9 @@ atE
avJ
ako
aBu
-kif
+sgk
arD
-hgb
+rLj
anU
aCi
aCZ
@@ -81954,8 +81955,8 @@ aPa
aQl
aCo
aqU
-aDy
-fMV
+tIJ
+mwY
aKP
aKP
aKP
@@ -81983,15 +81984,15 @@ beq
rBK
bfw
bhq
-spA
-buh
+xNU
+bIK
bes
bes
aao
-mxf
-kBC
-odt
-uVe
+vPQ
+uPp
+rEk
+hIY
vVZ
vVZ
vVZ
@@ -82138,11 +82139,11 @@ aoA
apk
apX
apU
-arA
+djY
apU
asX
aoB
-auf
+tMg
uwV
ant
ant
@@ -82171,11 +82172,11 @@ aPe
aQm
aLE
aqU
-gKH
-fMV
+vdK
+mwY
aKP
aKP
-eCI
+gdf
aKP
aKP
aWK
@@ -82205,10 +82206,10 @@ bkh
bkV
bkV
aao
-cAs
-kKk
-kKk
-ooD
+otV
+owz
+owz
+pAI
vVZ
fCb
fCb
@@ -82351,24 +82352,24 @@ aao
aao
aao
akL
-jKi
-cXr
-weL
-six
-xBU
+onS
+pJI
+eao
+hhA
+ebR
apU
-grz
-six
+qEh
+hhA
aoB
akL
gbA
-aBx
-jqO
+cma
+pKR
ata
rzR
cHH
aCW
-qrd
+vzQ
anU
aOc
aCo
@@ -82388,8 +82389,8 @@ aPb
aIE
aCZ
aqU
-aDy
-fMV
+tIJ
+mwY
aVt
aKP
aKP
@@ -82397,7 +82398,7 @@ aKP
aKP
aKP
aKP
-pkD
+fCF
aKP
aKP
aKP
@@ -82422,10 +82423,10 @@ bki
beq
beq
aao
-hIL
-tMm
-kKk
-ooD
+qOC
+dYn
+owz
+pAI
myY
kTs
fCb
@@ -82568,14 +82569,14 @@ aao
aao
aao
akL
-rMv
+nNX
apn
-gep
-hde
-arB
-gcO
-obn
-moZ
+nwT
+jPI
+kdC
+gDN
+ktG
+wkY
aug
akL
xgm
@@ -82605,8 +82606,8 @@ aQc
aQn
aIE
anT
-aDy
-fMV
+tIJ
+mwY
aVr
aKP
aKP
@@ -82617,7 +82618,7 @@ aKP
aKP
aKP
aKP
-wSH
+nGZ
aKP
aKP
aKP
@@ -82639,10 +82640,10 @@ beq
beq
aao
aao
-cAs
-tMm
-tMm
-ooD
+otV
+dYn
+dYn
+pAI
myY
fCb
fCb
@@ -82790,9 +82791,9 @@ aoB
apZ
apU
arC
-jKi
+onS
auh
-qhV
+mlo
auh
akL
aBu
@@ -82822,8 +82823,8 @@ aPh
aOV
aCZ
aqU
-kpZ
-aUn
+gox
+urX
aUk
aKP
aKP
@@ -82837,7 +82838,7 @@ aKP
aKP
aKP
aKP
-eCI
+gdf
aKP
bes
bes
@@ -82850,16 +82851,16 @@ bes
bes
iVi
bes
-htN
+iVI
bki
bky
aao
aao
aao
-cAs
-kKk
-kzE
-ooD
+otV
+owz
+mma
+pAI
vVZ
fCb
kTs
@@ -83039,11 +83040,11 @@ aOb
aQo
aQl
aqU
-blk
-jZj
+bZF
+rpG
aUk
aKP
-nsA
+wVG
aKP
aKP
aKP
@@ -83059,7 +83060,7 @@ aKP
bes
bes
bes
-hLT
+qzF
bes
bes
bes
@@ -83073,10 +83074,10 @@ beq
aao
aao
aao
-sJq
-bpZ
-bpZ
-qkC
+cLN
+fNv
+fNv
+kZl
vVZ
kTs
fCb
@@ -83224,11 +83225,11 @@ tAW
aqa
aqa
aqa
-aBx
+cma
ata
ata
ata
-hBa
+cTv
rzR
aCc
aCc
@@ -83236,7 +83237,7 @@ pgh
aao
aao
fEE
-ydK
+jel
anU
aCo
aCZ
@@ -83256,12 +83257,12 @@ aPi
aQp
aQm
aqU
-blk
-jZj
+bZF
+rpG
aUk
aKP
aKP
-nyv
+eyj
aKP
aKP
aKP
@@ -83290,10 +83291,10 @@ aao
aao
aao
aao
-lSS
-nUV
-nUV
-rRO
+sCL
+miP
+miP
+qID
pbr
pbr
pbr
@@ -83449,11 +83450,11 @@ pLH
aCc
aCc
aCc
-gDe
-ift
+hPq
+mPY
aao
fEE
-qrd
+vzQ
anU
aCp
aDb
@@ -83473,8 +83474,8 @@ aPj
aQq
aRs
anT
-kdb
-fMV
+kEk
+mwY
aUk
aKP
aKP
@@ -83493,12 +83494,12 @@ aKP
bes
bes
bes
-uFc
+vyX
bes
bes
bes
bes
-pTg
+xYI
iVi
bes
bes
@@ -83666,9 +83667,9 @@ aao
aao
pLH
aCc
-wuB
+gHx
ukW
-rrF
+xOM
kpd
aMk
anW
@@ -83690,12 +83691,12 @@ anW
anW
anW
anW
-aDy
-fMV
+tIJ
+mwY
aUk
aKP
aKP
-rpL
+wXO
aKP
aSi
aZe
@@ -83906,9 +83907,9 @@ eBL
eBL
eBL
anW
-xnX
-jdU
-jZj
+lFO
+qAN
+rpG
aUk
aKP
aWL
@@ -84123,9 +84124,9 @@ aEi
aEi
aEi
aqx
-rsg
-kId
-fMV
+tOa
+xEX
+mwY
aUk
aKP
aKP
@@ -84144,7 +84145,7 @@ atb
bja
bes
bes
-buh
+bIK
bes
bes
bes
@@ -84340,13 +84341,13 @@ pSf
iEm
lmO
aqx
-rsg
-kId
-fMV
+tOa
+xEX
+mwY
aQu
aVr
aKP
-erV
+gHS
aKP
aTr
atd
@@ -84557,9 +84558,9 @@ unS
rKe
eeI
anW
-wIz
-sCk
-fMV
+qSc
+lBM
+mwY
aQu
aUk
aKP
@@ -84576,7 +84577,7 @@ baR
nRT
atb
bja
-uFc
+vyX
bes
bes
bes
@@ -84774,9 +84775,9 @@ pSf
qcE
mIs
aRu
-nnK
-mNT
-fMV
+viw
+nZh
+mwY
aQu
aUk
aKP
@@ -84991,9 +84992,9 @@ aEi
sHO
vFA
ocA
-rsg
-sCk
-fMV
+tOa
+lBM
+mwY
aQu
aQu
aOk
@@ -85020,7 +85021,7 @@ aEX
aEX
bes
bes
-rrm
+wlr
bes
aao
aao
@@ -85208,10 +85209,10 @@ oes
nnA
jUJ
anW
-eTF
-phx
-aTt
-lAB
+hEW
+cBI
+lFn
+vBC
aSf
aWM
aSf
@@ -85409,9 +85410,9 @@ aCc
aCc
aMk
apo
-sNj
-nrA
-qEz
+btO
+oKD
+suz
anW
voz
wBK
@@ -85425,9 +85426,9 @@ aEi
iaS
aui
aqx
-rsg
-kId
-ydw
+tOa
+xEX
+lYJ
aXW
aSg
aSg
@@ -85454,7 +85455,7 @@ bes
bes
bes
bes
-rrm
+wlr
bes
bes
bes
@@ -85626,9 +85627,9 @@ pLH
aCc
aMk
apo
-hqy
-tGa
-svs
+sfw
+gNM
+wYB
anW
lTC
nuQ
@@ -85642,9 +85643,9 @@ sEb
sEb
nkE
aqx
-rsg
-kId
-fMV
+tOa
+xEX
+mwY
aQu
aVq
aVq
@@ -85842,10 +85843,10 @@ aao
aao
rLM
aMk
-iTl
-sNj
+uwB
+btO
apo
-lYy
+hUM
anW
anW
anW
@@ -85859,12 +85860,12 @@ aoc
aoc
anW
anW
-rsg
-sCk
-fMV
+tOa
+lBM
+mwY
aUk
aKP
-mfL
+ibt
aWK
aQu
aYx
@@ -85884,10 +85885,10 @@ bes
bes
bes
bes
-hLT
+qzF
bes
bes
-buh
+bIK
bes
bes
bes
@@ -86059,29 +86060,29 @@ aao
aao
arD
bMz
-kCs
+pHr
aqa
aqa
-nVD
+nZm
aqa
aqa
aqa
ata
aqa
aSg
-bHw
+hcI
aSg
aSg
aSg
-bHw
-bHw
+hcI
+hcI
aSg
-rsg
-sCk
-fMV
+tOa
+lBM
+mwY
aUk
aKP
-nsA
+wVG
aKP
aSh
aYx
@@ -86276,10 +86277,10 @@ aao
aao
arD
arD
-jzW
+gYW
arD
arD
-dFf
+fxr
arD
arD
arD
@@ -86291,15 +86292,15 @@ aKP
aKP
aKP
aKP
-mfL
+ibt
aMR
-hbm
-kId
-fMV
+gSG
+xEX
+mwY
aQu
aVr
aKP
-vGS
+vnO
aSh
eYA
aZh
@@ -86321,7 +86322,7 @@ bes
bes
bes
bes
-uFc
+vyX
bes
bes
aao
@@ -86499,22 +86500,22 @@ arD
arD
arD
arD
-rGp
+qih
arD
arD
aKP
-eCI
+gdf
aKP
aKP
aKP
aKP
aMR
aQu
-sJK
-kId
-eps
-pna
-qoS
+jRc
+xEX
+hUm
+uFg
+gUz
aTu
aTu
aTu
@@ -86713,8 +86714,8 @@ aao
aao
arD
arD
-jzW
-ixN
+gYW
+qxr
aao
aao
aao
@@ -86727,10 +86728,10 @@ aOk
aOk
aQu
aQu
-rsg
-leE
-vca
-jZj
+tOa
+hhn
+fbe
+rpG
dTB
rbs
rbs
@@ -86944,14 +86945,14 @@ aQu
aQu
aQu
ceA
-vWW
-eUF
-toE
-lSv
+tmN
+kwb
+joV
+lZh
rbs
oPM
eKZ
-pgE
+fpj
hKO
dTB
nRT
@@ -86967,7 +86968,7 @@ bes
aEX
aEX
bes
-htN
+iVI
bes
bes
bes
@@ -87166,7 +87167,7 @@ shn
qWT
rnK
dvz
-djo
+ldT
xsX
xTk
rkh
@@ -87378,15 +87379,15 @@ aao
aao
aao
lLe
-sVk
-xTV
-vUw
-iKn
+dYB
+kGs
+xiN
+pgq
rbs
aIe
-juE
-vqj
-qlo
+gjl
+sHy
+cva
dvz
dTB
aJy
@@ -87595,15 +87596,15 @@ aao
aao
aao
aao
-hLs
-dOV
-dcu
-hNW
+sCK
+eCl
+nBy
+eTV
dTB
jKp
-dFL
-vqj
-dKk
+kKg
+sHy
+chx
fyZ
dTB
atb
@@ -87812,15 +87813,15 @@ aao
aao
aao
dTB
-juZ
-dOV
-dcu
-uEv
+qEp
+eCl
+nBy
+eSd
xaE
-lqw
-juE
-vqj
-pgE
+mHT
+gjl
+sHy
+fpj
gEM
aao
aao
@@ -88029,16 +88030,16 @@ aao
aao
aao
aao
-hLs
-dOV
-dcu
-qJB
+sCK
+eCl
+nBy
+eyz
dTB
mYV
-vqj
-lqw
-rDa
-cry
+sHy
+mHT
+hQl
+oUP
aao
aao
aao
@@ -88246,15 +88247,15 @@ aao
aao
aao
sYL
-bLB
-aUv
-liO
-juQ
+nwE
+uAo
+hrC
+kLW
rbs
nIS
pAX
-pgE
-fSW
+fpj
+xyt
dTB
aao
aao
@@ -88468,9 +88469,9 @@ qbG
iFz
iFz
dTB
-dAd
-oHn
-pgE
+nvL
+dMu
+fpj
qLD
xZL
aao
@@ -88680,14 +88681,14 @@ aao
aao
aao
aao
-aTw
-pmV
-jxU
-aTv
+kbx
+xPP
+inY
+iOe
rbs
lAR
oJv
-pgE
+fpj
irZ
dTB
aao
@@ -88897,10 +88898,10 @@ tQw
aao
aao
aao
-vFH
-wXp
-rrY
-kqO
+lhI
+nfw
+oaV
+sKG
dTB
rbs
rbs
@@ -89114,14 +89115,14 @@ tQw
tQw
aao
aao
-dJr
-sVM
-xWv
-wOK
-kUW
+cxy
+hJO
+bYQ
+oVt
+wUc
aOn
-nfY
-nfY
+rjH
+rjH
pgV
gCE
gCE
@@ -89332,8 +89333,8 @@ gXp
gXp
hFg
eFh
-sRV
-waA
+vRj
+ulr
tQw
ujC
ujC
@@ -89549,8 +89550,8 @@ tQw
tQw
tQw
eFh
-leX
-waA
+kol
+ulr
tQw
tQw
pIN
@@ -89766,8 +89767,8 @@ tQw
tQw
tQw
eFh
-dSL
-mkQ
+oWF
+cNG
tQw
tQw
aWN
@@ -89977,14 +89978,14 @@ anI
anI
anI
anI
-kZI
+bMb
gmN
tQw
tQw
tQw
arK
-qKH
-oEc
+lxu
+pHs
tQw
tQw
ujC
@@ -90194,14 +90195,14 @@ uaB
uaB
uaB
aMq
-qFK
-jxU
-jxU
-xlB
-xlB
-aSl
-drX
-waA
+cLA
+inY
+inY
+caC
+caC
+fZd
+wuW
+ulr
tQw
ujC
ujC
@@ -90411,14 +90412,14 @@ aJE
aKQ
aKQ
hmm
-rrY
-mtO
-mtO
-dHb
-dHb
-nlO
-qrS
-mkQ
+oaV
+gbl
+gbl
+nCd
+nCd
+wRU
+sNC
+cNG
tQw
tQw
pIN
@@ -90628,14 +90629,14 @@ aJF
anI
anI
anI
-jvW
+mos
gXp
gXp
gXp
gXp
-uIK
-ocR
-uoj
+qtP
+gur
+dcq
tQw
tQw
aWN
@@ -90850,9 +90851,9 @@ tQw
ahw
tQw
tQw
-nFH
+lsO
aOm
-ukU
+dUC
tQw
tQw
ujC
diff --git a/maps/map_files/BigRed/sprinkles/20.etatunnel_open.dmm b/maps/map_files/BigRed/sprinkles/20.etatunnel_open.dmm
index 633a79f6acb9..8f155a1eabef 100644
--- a/maps/map_files/BigRed/sprinkles/20.etatunnel_open.dmm
+++ b/maps/map_files/BigRed/sprinkles/20.etatunnel_open.dmm
@@ -250,7 +250,7 @@
pixel_x = -11;
pixel_y = 1
},
-/obj/item/handcuffs{
+/obj/item/restraint/handcuffs{
pixel_x = 1;
pixel_y = 5
},
@@ -432,7 +432,7 @@
/area/bigredv2/caves_sw)
"OV" = (
/obj/structure/surface/rack,
-/obj/item/handcuffs{
+/obj/item/restraint/handcuffs{
pixel_x = 1;
pixel_y = 5
},
@@ -509,7 +509,7 @@
"Ue" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/paper_bundle,
-/obj/item/handcuffs{
+/obj/item/restraint/handcuffs{
pixel_y = -3
},
/turf/open/floor/plating{
diff --git a/maps/map_files/BigRed/sprinkles/40.viro_open.dmm b/maps/map_files/BigRed/sprinkles/40.viro_open.dmm
index eb82dda7b53b..1163446c1d22 100644
--- a/maps/map_files/BigRed/sprinkles/40.viro_open.dmm
+++ b/maps/map_files/BigRed/sprinkles/40.viro_open.dmm
@@ -8,36 +8,6 @@
icon_state = "mars_cave_13"
},
/area/bigredv2/outside/virology)
-"ac" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached14"
- },
-/area/bigredv2/outside/nw)
-"ad" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
- },
-/area/bigredv2/outside/nw)
-"ae" = (
-/obj/effect/landmark/crap_item,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
- },
-/area/bigredv2/outside/nw)
-"af" = (
-/obj/effect/decal/cleanable/blood/gibs/xeno/body,
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/structure/machinery/door/poddoor/almayer/open{
- dir = 4;
- id = "viro";
- name = "Virology Lockdown"
- },
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/virology)
"ag" = (
/turf/open/mars_cave{
icon_state = "mars_dirt_4"
@@ -94,39 +64,12 @@
icon_state = "mars_cave_7"
},
/area/bigredv2/outside/virology)
-"as" = (
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached2"
- },
-/area/bigredv2/outside/virology)
-"at" = (
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
- },
-/area/bigredv2/outside/virology)
"au" = (
/obj/structure/inflatable,
/turf/open/mars_cave{
icon_state = "mars_dirt_4"
},
/area/bigredv2/outside/virology)
-"av" = (
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/virology)
-"aw" = (
-/obj/structure/machinery/light{
- dir = 4
- },
-/obj/structure/inflatable,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached20"
- },
-/area/bigredv2/outside/virology)
-"ax" = (
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
- },
-/area/bigredv2/outside/nw)
"ay" = (
/obj/structure/closet/bodybag{
icon_state = "bodybag_open"
@@ -135,90 +78,18 @@
icon_state = "mars_dirt_5"
},
/area/bigredv2/outside/virology)
-"az" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 6
- },
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached3"
- },
-/area/bigredv2/outside/virology)
-"aA" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/virology)
-"aE" = (
-/obj/structure/inflatable,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached20"
- },
-/area/bigredv2/outside/nw)
"aF" = (
/obj/structure/inflatable/door,
/turf/open/mars_cave{
icon_state = "mars_dirt_4"
},
/area/bigredv2/outside/virology)
-"aG" = (
-/obj/structure/inflatable/door,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached3"
- },
-/area/bigredv2/outside/virology)
-"aH" = (
-/obj/structure/machinery/light{
- dir = 4
- },
-/obj/structure/inflatable,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached1"
- },
-/area/bigredv2/outside/virology)
-"aI" = (
-/obj/structure/inflatable/door,
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/nw)
-"aJ" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached3"
- },
-/area/bigredv2/outside/virology)
-"aK" = (
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached1"
- },
-/area/bigredv2/outside/virology)
-"aM" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/structure/inflatable/popped/door,
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/virology)
"aN" = (
/obj/effect/decal/cleanable/ash,
/turf/open/mars_cave{
icon_state = "mars_dirt_5"
},
/area/bigredv2/outside/virology)
-"aO" = (
-/obj/effect/landmark/hunter_secondary,
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/virology)
-"aR" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/structure/machinery/door/poddoor/almayer/open{
- dir = 4;
- id = "viro";
- name = "Virology Lockdown"
- },
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/virology)
"aU" = (
/turf/open/mars,
/area/bigredv2/outside/nw)
@@ -226,37 +97,6 @@
/obj/effect/decal/cleanable/blood,
/turf/open/mars,
/area/bigredv2/outside/nw)
-"aW" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/obj/structure/inflatable/door,
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/nw)
-"aX" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached14"
- },
-/area/bigredv2/outside/virology)
-"aY" = (
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
- },
-/area/bigredv2/outside/virology)
-"aZ" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
- },
-/area/bigredv2/outside/virology)
-"ba" = (
-/obj/structure/machinery/light,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
- },
-/area/bigredv2/outside/virology)
"bb" = (
/turf/open/mars{
icon_state = "mars_dirt_14"
@@ -279,34 +119,12 @@
dir = 1
},
/area/bigredv2/outside/virology)
-"bf" = (
-/obj/effect/decal/cleanable/blood{
- dir = 4;
- icon_state = "gib6"
- },
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
- },
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/nw)
"bg" = (
/obj/structure/inflatable,
/turf/open/mars{
icon_state = "mars_dirt_11"
},
/area/bigredv2/outside/virology)
-"bj" = (
-/obj/structure/inflatable,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached17"
- },
-/area/bigredv2/outside/nw)
-"bk" = (
-/obj/structure/inflatable/door,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached14"
- },
-/area/bigredv2/outside/virology)
"bl" = (
/obj/structure/inflatable,
/turf/open/floor{
@@ -322,12 +140,6 @@
dir = 1
},
/area/bigredv2/outside/virology)
-"bn" = (
-/obj/structure/inflatable,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached3"
- },
-/area/bigredv2/outside/virology)
"bo" = (
/obj/structure/closet/bodybag{
icon_state = "bodybag_open"
@@ -367,32 +179,55 @@
icon_state = "mars_dirt_10"
},
/area/bigredv2/outside/virology)
-"bu" = (
-/obj/structure/bed/roller,
-/obj/effect/decal/cleanable/blood,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached2"
+"bx" = (
+/obj/structure/inflatable/popped,
+/turf/open/mars{
+ icon_state = "mars_dirt_10"
},
/area/bigredv2/outside/virology)
-"bv" = (
+"cp" = (
/obj/structure/inflatable/popped,
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/virology)
+"df" = (
+/obj/structure/sign/safety/biohazard,
+/turf/closed/wall/solaris/reinforced,
+/area/bigredv2/outside/virology)
+"dv" = (
+/obj/structure/inflatable,
/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
+ icon_state = "cement_sunbleached17"
+ },
+/area/bigredv2/outside/nw)
+"dQ" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
},
+/turf/open/asphalt/cement_sunbleached,
/area/bigredv2/outside/virology)
-"bw" = (
-/obj/structure/bed/roller,
+"gx" = (
+/obj/effect/decal/cleanable/dirt,
/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
+ icon_state = "cement_sunbleached14"
},
+/area/bigredv2/outside/nw)
+"kg" = (
+/obj/structure/bed/chair/office/light{
+ dir = 4
+ },
+/turf/open/asphalt/cement_sunbleached,
/area/bigredv2/outside/virology)
-"bx" = (
+"lg" = (
/obj/structure/inflatable/popped,
-/turf/open/mars{
- icon_state = "mars_dirt_10"
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached4"
},
/area/bigredv2/outside/virology)
-"by" = (
+"lK" = (
+/obj/effect/landmark/hunter_secondary,
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/virology)
+"mI" = (
/obj/structure/inflatable/popped/door,
/obj/effect/decal/cleanable/blood{
icon_state = "gib6"
@@ -401,25 +236,12 @@
icon_state = "cement_sunbleached3"
},
/area/bigredv2/outside/virology)
-"bz" = (
-/obj/structure/inflatable,
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/virology)
-"bA" = (
-/obj/structure/inflatable/door,
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/virology)
-"bB" = (
-/obj/structure/sign/safety/biohazard,
-/turf/closed/wall/solaris/reinforced,
-/area/bigredv2/outside/virology)
-"bE" = (
-/obj/structure/bed/chair/office/light{
- dir = 4
+"nc" = (
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached12"
},
-/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/virology)
-"bF" = (
+/area/bigredv2/outside/nw)
+"nn" = (
/obj/structure/surface/table/almayer,
/obj/structure/machinery/computer/med_data/laptop{
dir = 8
@@ -428,83 +250,261 @@
icon_state = "cement_sunbleached9"
},
/area/bigredv2/outside/virology)
-"bG" = (
-/obj/structure/surface/table/almayer,
-/obj/item/ashtray/glass,
-/obj/item/storage/syringe_case/regular{
- pixel_y = 10
+"nv" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
},
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
+/obj/structure/machinery/door/poddoor/almayer/open{
+ dir = 4;
+ id = "viro";
+ name = "Virology Lockdown"
},
+/turf/open/asphalt/cement_sunbleached,
/area/bigredv2/outside/virology)
-"bH" = (
-/obj/structure/surface/table/almayer,
-/obj/item/handcuffs,
+"pP" = (
/turf/open/asphalt/cement_sunbleached{
icon_state = "cement_sunbleached15"
},
/area/bigredv2/outside/virology)
-"lB" = (
+"qQ" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/obj/effect/decal/cleanable/dirt,
/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached15"
+ icon_state = "cement_sunbleached14"
},
/area/bigredv2/outside/virology)
-"qP" = (
-/obj/structure/inflatable/popped/door,
+"rg" = (
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached2"
+ },
+/area/bigredv2/outside/virology)
+"rY" = (
+/obj/structure/inflatable/door,
/turf/open/asphalt/cement_sunbleached,
-/area/bigredv2/outside/nw)
-"rG" = (
+/area/bigredv2/outside/virology)
+"tr" = (
+/obj/structure/inflatable,
/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
+ icon_state = "cement_sunbleached20"
},
/area/bigredv2/outside/nw)
+"uH" = (
+/obj/structure/inflatable/popped/door,
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/nw)
"uN" = (
/turf/open/mars_cave{
icon_state = "mars_dirt_5"
},
/area/bigredv2/outside/virology)
-"zC" = (
+"vz" = (
/obj/structure/machinery/door/poddoor/almayer/open{
dir = 4;
id = "viro";
name = "Virology Lockdown"
},
/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached4"
+ icon_state = "cement_sunbleached12"
},
/area/bigredv2/outside/virology)
-"FK" = (
+"wY" = (
+/obj/structure/machinery/light{
+ dir = 4
+ },
/obj/structure/inflatable,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached20"
+ },
+/area/bigredv2/outside/virology)
+"xj" = (
+/obj/structure/bed/roller,
+/obj/effect/decal/cleanable/blood,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached2"
+ },
+/area/bigredv2/outside/virology)
+"yG" = (
/turf/open/asphalt/cement_sunbleached{
icon_state = "cement_sunbleached1"
},
/area/bigredv2/outside/virology)
-"Kk" = (
+"zp" = (
+/obj/effect/landmark/crap_item,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached12"
+ },
+/area/bigredv2/outside/nw)
+"AC" = (
+/obj/effect/decal/cleanable/blood{
+ dir = 4;
+ icon_state = "gib6"
+ },
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/nw)
+"AF" = (
+/obj/structure/inflatable/door,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached3"
+ },
+/area/bigredv2/outside/virology)
+"CS" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/structure/inflatable/popped/door,
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/virology)
+"Dt" = (
+/obj/structure/inflatable,
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/virology)
+"DV" = (
+/obj/structure/inflatable,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached1"
+ },
+/area/bigredv2/outside/virology)
+"Es" = (
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached12"
+ },
+/area/bigredv2/outside/virology)
+"Fe" = (
+/obj/structure/bed/roller,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached4"
+ },
+/area/bigredv2/outside/virology)
+"Fj" = (
+/obj/effect/decal/cleanable/blood/gibs/xeno/body,
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
/obj/structure/machinery/door/poddoor/almayer/open{
dir = 4;
id = "viro";
name = "Virology Lockdown"
},
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/virology)
+"Fw" = (
+/obj/structure/inflatable,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached3"
+ },
+/area/bigredv2/outside/virology)
+"GO" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached3"
+ },
+/area/bigredv2/outside/virology)
+"HI" = (
+/obj/effect/decal/cleanable/dirt,
/turf/open/asphalt/cement_sunbleached{
icon_state = "cement_sunbleached12"
},
/area/bigredv2/outside/virology)
+"HV" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/structure/inflatable/door,
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/nw)
+"HZ" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 6
+ },
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached3"
+ },
+/area/bigredv2/outside/virology)
+"Io" = (
+/obj/structure/surface/table/almayer,
+/obj/item/restraint/handcuffs,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached15"
+ },
+/area/bigredv2/outside/virology)
+"IE" = (
+/obj/structure/machinery/light{
+ dir = 4
+ },
+/obj/structure/inflatable,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached1"
+ },
+/area/bigredv2/outside/virology)
"Kv" = (
/obj/item/weapon/gun/flamer,
/turf/open/mars_cave{
icon_state = "mars_dirt_4"
},
/area/bigredv2/outside/virology)
+"Ln" = (
+/obj/structure/inflatable/door,
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/nw)
+"ML" = (
+/obj/structure/surface/table/almayer,
+/obj/item/ashtray/glass,
+/obj/item/storage/syringe_case/regular{
+ pixel_y = 10
+ },
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached12"
+ },
+/area/bigredv2/outside/virology)
+"Oi" = (
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached4"
+ },
+/area/bigredv2/outside/virology)
+"PD" = (
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/virology)
+"Qi" = (
+/obj/structure/machinery/light,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached12"
+ },
+/area/bigredv2/outside/virology)
+"Rt" = (
+/obj/structure/inflatable/door,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached14"
+ },
+/area/bigredv2/outside/virology)
"Ry" = (
/obj/effect/decal/cleanable/ash,
/turf/open/mars_cave{
icon_state = "mars_cave_14"
},
/area/bigredv2/outside/virology)
-"Vr" = (
-/obj/structure/inflatable/popped,
-/turf/open/asphalt/cement_sunbleached,
+"VB" = (
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached4"
+ },
+/area/bigredv2/outside/nw)
+"VN" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached12"
+ },
+/area/bigredv2/outside/nw)
+"WP" = (
+/obj/structure/machinery/door/poddoor/almayer/open{
+ dir = 4;
+ id = "viro";
+ name = "Virology Lockdown"
+ },
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached4"
+ },
/area/bigredv2/outside/virology)
(1,1,1) = {"
@@ -571,69 +571,69 @@ bd
aa
bo
bo
-as
-az
-aJ
-aJ
-aJ
-aX
+rg
+HZ
+GO
+GO
+GO
+qQ
be
"}
(7,1,1) = {"
bd
ao
bo
-at
-aA
-av
-av
-av
-aY
-bB
+Oi
+dQ
+PD
+PD
+PD
+Es
+df
"}
(8,1,1) = {"
bd
br
bx
-at
-aA
-av
-aO
-av
-aZ
+Oi
+dQ
+PD
+lK
+PD
+HI
bd
"}
(9,1,1) = {"
bd
-bu
-by
-av
-aA
-av
-av
-av
-ba
+xj
+mI
+PD
+dQ
+PD
+PD
+PD
+Qi
bd
"}
(10,1,1) = {"
bd
-bv
-bz
-av
-aA
-av
-aK
-aK
-lB
+lg
+Dt
+PD
+dQ
+PD
+yG
+yG
+pP
bd
"}
(11,1,1) = {"
bd
-bw
-bA
-av
-aA
-aY
+Fe
+rY
+PD
+dQ
+Es
ag
ag
ag
@@ -641,11 +641,11 @@ bd
"}
(12,1,1) = {"
bd
-bv
-Vr
-av
-aA
-aY
+lg
+cp
+PD
+dQ
+Es
ag
ah
ag
@@ -653,11 +653,11 @@ bd
"}
(13,1,1) = {"
bd
-bw
-bA
-av
-aA
-aY
+Fe
+rY
+PD
+dQ
+Es
ag
ai
bb
@@ -665,107 +665,107 @@ bd
"}
(14,1,1) = {"
bd
-FK
-FK
-av
-aA
-av
-bn
-aG
-bk
+DV
+DV
+PD
+dQ
+PD
+Fw
+AF
+Rt
bd
"}
(15,1,1) = {"
bd
ag
ag
-at
-aA
-av
-bz
-av
-aY
+Oi
+dQ
+PD
+Dt
+PD
+Es
bd
"}
(16,1,1) = {"
bd
ag
ag
-at
-aA
-av
-bz
-av
-aY
+Oi
+dQ
+PD
+Dt
+PD
+Es
bd
"}
(17,1,1) = {"
bd
ag
-aw
-bA
-aM
-bA
-aH
-bE
-bG
+wY
+rY
+CS
+rY
+IE
+kg
+ML
bd
"}
(18,1,1) = {"
bd
ag
bd
-zC
-af
-Kk
+WP
+Fj
+vz
bd
-bF
-bH
+nn
+Io
bd
"}
(19,1,1) = {"
bd
bd
bd
-at
-aA
-aY
+Oi
+dQ
+Es
bd
bd
bd
bd
"}
(20,1,1) = {"
-ac
+gx
ak
bd
-zC
-aR
-Kk
+WP
+nv
+vz
bd
aU
bd
bc
"}
(21,1,1) = {"
-ad
+VN
ak
-aE
-aI
-aW
-qP
-bj
+tr
+Ln
+HV
+uH
+dv
aU
bc
bc
"}
(22,1,1) = {"
-ae
+zp
ak
ak
-ax
-bf
-rG
+VB
+AC
+nc
ak
aV
aU
diff --git a/maps/map_files/BigRed/sprinkles/70.se-checkpoint.dmm b/maps/map_files/BigRed/sprinkles/70.se-checkpoint.dmm
index 1c33f0b04a89..0dbfc3dc0b53 100644
--- a/maps/map_files/BigRed/sprinkles/70.se-checkpoint.dmm
+++ b/maps/map_files/BigRed/sprinkles/70.se-checkpoint.dmm
@@ -1,4 +1,11 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"ao" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/blocker/forcefield/multitile_vehicles,
+/turf/open/asphalt/cement{
+ icon_state = "cement15"
+ },
+/area/bigredv2/outside/filtration_cave_cas)
"ax" = (
/obj/structure/machinery/power/apc{
dir = 1;
@@ -14,42 +21,36 @@
},
/turf/open/floor,
/area/bigred/ground/security)
-"bp" = (
-/obj/structure/machinery/door/airlock/almayer/security/glass/colony{
- icon_state = "door_locked";
- name = "\improper Checkpoint Office"
- },
-/turf/open/floor,
-/area/bigred/ground/security)
"bx" = (
/obj/structure/surface/table/almayer,
/obj/item/device/motiondetector,
/turf/open/floor,
/area/bigred/ground/security)
-"cl" = (
+"cJ" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/asphalt/cement{
- icon_state = "cement12"
+ icon_state = "cement2"
},
/area/bigredv2/outside/filtration_cave_cas)
-"cO" = (
-/obj/effect/decal/cleanable/dirt,
+"cX" = (
/turf/open/asphalt/cement{
icon_state = "cement4"
},
/area/bigredv2/outside/filtration_cave_cas)
-"dz" = (
+"dj" = (
+/obj/effect/decal/cleanable/generic,
/obj/effect/decal/cleanable/dirt,
-/obj/structure/blocker/forcefield/multitile_vehicles,
/turf/open/asphalt/cement{
- icon_state = "cement15"
+ icon_state = "cement1";
+ dir = 1
+ },
+/area/bigredv2/outside/filtration_cave_cas)
+"fT" = (
+/obj/effect/decal/strata_decals/grime/grime2,
+/turf/open/asphalt/cement{
+ icon_state = "cement3"
},
/area/bigredv2/outside/filtration_cave_cas)
-"el" = (
-/obj/structure/surface/table/almayer,
-/obj/item/handcuffs,
-/turf/open/floor,
-/area/bigred/ground/security)
"ge" = (
/obj/structure/closet/secure_closet/marshal,
/turf/open/floor/greengrid,
@@ -70,10 +71,12 @@
icon_state = "mars_cave_2"
},
/area/bigredv2/outside/filtration_cave_cas)
-"iS" = (
-/obj/effect/decal/cleanable/dirt,
+"jW" = (
+/obj/structure/machinery/light{
+ dir = 1
+ },
/turf/open/asphalt/cement{
- icon_state = "cement3"
+ icon_state = "cement4"
},
/area/bigredv2/outside/filtration_cave_cas)
"kd" = (
@@ -85,64 +88,47 @@
},
/turf/open/floor/greengrid,
/area/bigred/ground/security)
-"kG" = (
-/turf/open/asphalt/cement{
- icon_state = "cement15"
- },
-/area/bigredv2/outside/filtration_cave_cas)
-"kL" = (
-/obj/structure/machinery/light{
- dir = 1
- },
-/turf/open/asphalt/cement{
- icon_state = "cement2"
- },
-/area/bigredv2/outside/filtration_cave_cas)
"kX" = (
/turf/closed/wall/solaris/reinforced,
/area/bigred/ground/security)
-"mp" = (
-/obj/effect/decal/cleanable/dirt,
+"ml" = (
/turf/open/asphalt/cement{
- icon_state = "cement2"
+ icon_state = "cement15"
},
/area/bigredv2/outside/filtration_cave_cas)
+"nP" = (
+/obj/item/tool/warning_cone,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached9"
+ },
+/area/bigredv2/outside/se)
"oT" = (
/turf/closed/wall/solaris/reinforced,
/area/bigredv2/outside/filtration_cave_cas)
-"pb" = (
-/obj/item/tool/warning_cone,
+"pm" = (
+/obj/effect/decal/cleanable/dirt,
/turf/open/asphalt/cement{
icon_state = "cement4"
},
/area/bigredv2/outside/filtration_cave_cas)
-"pJ" = (
-/obj/item/tool/warning_cone,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached9"
- },
-/area/bigredv2/outside/se)
+"pB" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement,
+/area/bigredv2/outside/filtration_cave_cas)
"pV" = (
/obj/structure/surface/table/almayer,
/obj/effect/spawner/random/tool,
/turf/open/floor,
/area/bigred/ground/security)
-"qg" = (
-/turf/open/asphalt/cement{
- icon_state = "cement12"
- },
-/area/bigredv2/outside/filtration_cave_cas)
"qy" = (
/obj/item/device/radio,
/obj/structure/surface/table/almayer,
/turf/open/floor,
/area/bigred/ground/security)
-"rA" = (
-/obj/effect/decal/cleanable/generic,
+"qW" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/asphalt/cement{
- icon_state = "cement1";
- dir = 1
+ icon_state = "cement12"
},
/area/bigredv2/outside/filtration_cave_cas)
"rD" = (
@@ -155,6 +141,13 @@
/obj/structure/machinery/deployable/barrier,
/turf/open/floor/greengrid,
/area/bigred/ground/security)
+"tq" = (
+/obj/structure/machinery/door/airlock/almayer/security/glass/colony{
+ icon_state = "door_locked";
+ name = "\improper Checkpoint Office"
+ },
+/turf/open/floor,
+/area/bigred/ground/security)
"tV" = (
/obj/structure/machinery/door/poddoor/almayer/closed{
dir = 4;
@@ -174,6 +167,12 @@
/obj/effect/spawner/random/technology_scanner,
/turf/open/floor/greengrid,
/area/bigred/ground/security)
+"uM" = (
+/obj/structure/machinery/camera/autoname,
+/turf/open/asphalt/cement{
+ icon_state = "cement4"
+ },
+/area/bigredv2/outside/filtration_cave_cas)
"ve" = (
/obj/structure/machinery/door/airlock/almayer/security/glass/colony{
dir = 1;
@@ -187,16 +186,20 @@
/obj/effect/decal/cleanable/blood,
/turf/open/floor,
/area/bigred/ground/security)
+"vM" = (
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached1"
+ },
+/area/bigredv2/outside/se)
"vO" = (
/obj/structure/surface/rack,
/obj/item/stack/sheet/metal/small_stack,
/turf/open/floor,
/area/bigred/ground/security)
-"wi" = (
-/obj/effect/landmark/crap_item,
+"wr" = (
+/obj/effect/decal/cleanable/dirt,
/turf/open/asphalt/cement{
- icon_state = "cement1";
- dir = 1
+ icon_state = "cement3"
},
/area/bigredv2/outside/filtration_cave_cas)
"xa" = (
@@ -217,47 +220,48 @@
},
/turf/open/floor,
/area/bigred/ground/security)
-"zE" = (
+"xu" = (
+/obj/effect/decal/strata_decals/grime/grime2{
+ dir = 1
+ },
/turf/open/asphalt/cement{
icon_state = "cement3"
},
/area/bigredv2/outside/filtration_cave_cas)
-"Aq" = (
+"xD" = (
+/obj/effect/decal/cleanable/generic,
+/obj/effect/decal/cleanable/dirt,
/turf/open/asphalt/cement,
/area/bigredv2/outside/filtration_cave_cas)
-"AY" = (
-/turf/open/floor,
-/area/bigred/ground/security)
-"AZ" = (
-/turf/open/asphalt/cement{
- icon_state = "cement4"
+"yq" = (
+/obj/structure/machinery/light{
+ dir = 1
},
-/area/bigredv2/outside/filtration_cave_cas)
-"Ge" = (
/turf/open/asphalt/cement{
- icon_state = "cement9"
+ icon_state = "cement2"
},
/area/bigredv2/outside/filtration_cave_cas)
-"Gm" = (
-/obj/structure/machinery/light{
- dir = 1
- },
+"zt" = (
/turf/open/asphalt/cement{
- icon_state = "cement4"
+ icon_state = "cement12"
},
/area/bigredv2/outside/filtration_cave_cas)
-"GJ" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/blocker/forcefield/multitile_vehicles,
+"zV" = (
/turf/open/asphalt/cement{
- icon_state = "cement1";
- dir = 1
+ icon_state = "cement9"
},
/area/bigredv2/outside/filtration_cave_cas)
-"Ih" = (
-/obj/effect/decal/cleanable/dirt,
+"AY" = (
+/turf/open/floor,
+/area/bigred/ground/security)
+"Eg" = (
/turf/open/asphalt/cement,
/area/bigredv2/outside/filtration_cave_cas)
+"HF" = (
+/obj/structure/surface/table/almayer,
+/obj/item/restraint/handcuffs,
+/turf/open/floor,
+/area/bigred/ground/security)
"IS" = (
/obj/structure/filingcabinet,
/turf/open/floor/greengrid,
@@ -267,6 +271,21 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor,
/area/bigred/ground/security)
+"Lb" = (
+/obj/effect/landmark/crap_item,
+/turf/open/asphalt/cement{
+ icon_state = "cement1";
+ dir = 1
+ },
+/area/bigredv2/outside/filtration_cave_cas)
+"LM" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/blocker/forcefield/multitile_vehicles,
+/turf/open/asphalt/cement{
+ icon_state = "cement1";
+ dir = 1
+ },
+/area/bigredv2/outside/filtration_cave_cas)
"LX" = (
/obj/structure/machinery/light{
dir = 8
@@ -278,6 +297,11 @@
/obj/structure/surface/table/almayer,
/turf/open/floor/greengrid,
/area/bigred/ground/security)
+"Nc" = (
+/turf/open/asphalt/cement{
+ icon_state = "cement14"
+ },
+/area/bigredv2/outside/filtration_cave_cas)
"NQ" = (
/obj/structure/largecrate,
/turf/open/floor/greengrid,
@@ -289,29 +313,16 @@
/obj/structure/machinery/vending/security,
/turf/open/floor,
/area/bigred/ground/security)
-"OD" = (
+"OX" = (
/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached1"
+ icon_state = "cement_sunbleached15"
},
/area/bigredv2/outside/se)
-"OM" = (
-/turf/open/asphalt/cement{
- icon_state = "cement14"
- },
-/area/bigredv2/outside/filtration_cave_cas)
"Pf" = (
/obj/effect/decal/cleanable/blood,
/obj/effect/spawner/gibspawner/human,
/turf/open/floor,
/area/bigred/ground/security)
-"PP" = (
-/obj/effect/decal/strata_decals/grime/grime2{
- dir = 1
- },
-/turf/open/asphalt/cement{
- icon_state = "cement3"
- },
-/area/bigredv2/outside/filtration_cave_cas)
"PS" = (
/turf/open/mars,
/area/bigredv2/outside/se)
@@ -338,22 +349,21 @@
/obj/effect/spawner/random/toolbox,
/turf/open/floor,
/area/bigred/ground/security)
+"SA" = (
+/turf/open/asphalt/cement{
+ icon_state = "cement3"
+ },
+/area/bigredv2/outside/filtration_cave_cas)
"SF" = (
/obj/structure/window/framed/solaris/reinforced,
/turf/open/floor/plating,
/area/bigred/ground/security)
-"Ue" = (
-/obj/structure/machinery/camera/autoname,
+"UI" = (
+/obj/item/tool/warning_cone,
/turf/open/asphalt/cement{
icon_state = "cement4"
},
/area/bigredv2/outside/filtration_cave_cas)
-"Vg" = (
-/obj/effect/decal/strata_decals/grime/grime2,
-/turf/open/asphalt/cement{
- icon_state = "cement3"
- },
-/area/bigredv2/outside/filtration_cave_cas)
"Vn" = (
/obj/structure/surface/table/almayer,
/obj/item/ashtray/bronze,
@@ -364,15 +374,12 @@
/obj/structure/largecrate,
/turf/open/floor,
/area/bigred/ground/security)
-"Wa" = (
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached15"
+"Xd" = (
+/obj/effect/landmark/hunter_primary,
+/obj/structure/blocker/forcefield/multitile_vehicles,
+/turf/open/asphalt/cement{
+ icon_state = "cement9"
},
-/area/bigredv2/outside/se)
-"Yd" = (
-/obj/effect/decal/cleanable/generic,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement,
/area/bigredv2/outside/filtration_cave_cas)
"Yo" = (
/obj/structure/surface/rack,
@@ -386,13 +393,6 @@
},
/turf/open/floor/greengrid,
/area/bigred/ground/security)
-"Zu" = (
-/obj/effect/landmark/hunter_primary,
-/obj/structure/blocker/forcefield/multitile_vehicles,
-/turf/open/asphalt/cement{
- icon_state = "cement9"
- },
-/area/bigredv2/outside/filtration_cave_cas)
"ZK" = (
/obj/effect/landmark/crap_item,
/obj/structure/machinery/light{
@@ -403,10 +403,10 @@
(1,1,1) = {"
PS
-pJ
-OD
-OD
-Wa
+nP
+vM
+vM
+OX
kX
kX
kX
@@ -428,17 +428,17 @@ IS
LX
qy
bx
-el
+HF
NU
rF
Qo
"}
(3,1,1) = {"
oT
-kL
-iS
-zE
-OM
+yq
+wr
+SA
+Nc
SF
kd
AY
@@ -451,10 +451,10 @@ Qo
"}
(4,1,1) = {"
oT
-Ge
-rA
-wi
-kG
+zV
+dj
+Lb
+ml
SF
Vn
xj
@@ -483,15 +483,15 @@ Qo
"}
(6,1,1) = {"
oT
-mp
-PP
-Vg
-OM
+cJ
+xu
+fT
+Nc
kX
kX
kX
kX
-bp
+tq
kX
kX
kX
@@ -499,10 +499,10 @@ Qo
"}
(7,1,1) = {"
oT
-Ue
-Aq
-Aq
-qg
+uM
+Eg
+Eg
+zt
kX
VI
VI
@@ -515,10 +515,10 @@ Qo
"}
(8,1,1) = {"
oT
-AZ
-Ih
-Aq
-qg
+cX
+pB
+Eg
+zt
kX
ax
AY
@@ -531,10 +531,10 @@ Qo
"}
(9,1,1) = {"
oT
-cO
-Ih
-Ih
-qg
+pm
+pB
+pB
+zt
ve
uk
uk
@@ -547,10 +547,10 @@ Qo
"}
(10,1,1) = {"
oT
-Gm
-Aq
-Yd
-qg
+jW
+Eg
+xD
+zt
kX
AY
Pf
@@ -563,10 +563,10 @@ Qo
"}
(11,1,1) = {"
oT
-pb
-Aq
-Ih
-cl
+UI
+Eg
+pB
+qW
kX
vH
ZK
@@ -579,10 +579,10 @@ Qo
"}
(12,1,1) = {"
ie
-Zu
-GJ
-GJ
-dz
+Xd
+LM
+LM
+ao
Qo
Qo
Qo
diff --git a/maps/map_files/BigRed/standalone/crashlanding-eva.dmm b/maps/map_files/BigRed/standalone/crashlanding-eva.dmm
index 638d8cd2df50..f74baff487aa 100644
--- a/maps/map_files/BigRed/standalone/crashlanding-eva.dmm
+++ b/maps/map_files/BigRed/standalone/crashlanding-eva.dmm
@@ -70,17 +70,6 @@
"aK" = (
/turf/open/floor,
/area/bigredv2/outside/general_offices)
-"aL" = (
-/obj/item/clothing/under/darkred{
- pixel_y = 7;
- pixel_x = 10
- },
-/obj/structure/surface/rack,
-/obj/item/clothing/under/darkred,
-/turf/open/floor{
- icon_state = "freezerfloor"
- },
-/area/bigredv2/outside/general_offices)
"aM" = (
/obj/structure/machinery/washing_machine,
/turf/open/floor{
@@ -332,33 +321,6 @@
icon_state = "dark"
},
/area/bigredv2/outside/general_offices)
-"bK" = (
-/obj/structure/surface/table,
-/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb{
- pixel_x = 1;
- pixel_y = 3
- },
-/obj/item/prop/helmetgarb/spent_buckshot{
- pixel_x = 9;
- pixel_y = -10
- },
-/turf/open/floor{
- icon_state = "freezerfloor"
- },
-/area/bigredv2/outside/general_offices)
-"bL" = (
-/obj/structure/surface/table,
-/obj/item/clothing/under/brown{
- pixel_y = 7;
- pixel_x = 12
- },
-/obj/item/explosive/grenade/incendiary/molotov{
- pixel_x = 8
- },
-/turf/open/floor{
- icon_state = "freezerfloor"
- },
-/area/bigredv2/outside/general_offices)
"bM" = (
/turf/closed/shuttle/ert{
icon_state = "wy12"
@@ -456,11 +418,6 @@
icon_state = "wy4"
},
/area/bigredv2/outside/general_offices)
-"cb" = (
-/obj/structure/surface/rack,
-/obj/item/restraints,
-/turf/open/shuttle/dropship/can_surgery/dark_grey,
-/area/bigredv2/outside/general_offices)
"cc" = (
/turf/open/shuttle/dropship/can_surgery/light_grey_bottom_left,
/area/bigredv2/outside/general_offices)
@@ -507,10 +464,6 @@
},
/turf/open/floor,
/area/bigredv2/outside/general_offices)
-"cl" = (
-/obj/structure/surface/rack,
-/turf/open/floor,
-/area/bigredv2/outside/general_offices)
"cm" = (
/obj/effect/spawner/gibspawner/human,
/obj/effect/decal/cleanable/blood,
@@ -1034,67 +987,88 @@
icon_state = "platingdmg3"
},
/area/bigredv2/outside/hydroponics)
-"fF" = (
-/obj/structure/surface/rack,
-/obj/item/clothing/under/lightbrown{
- pixel_x = 10;
- pixel_y = -5
+"hm" = (
+/obj/structure/surface/table,
+/obj/item/explosive/grenade/incendiary/molotov{
+ pixel_y = -7;
+ pixel_x = 8
+ },
+/obj/item/explosive/grenade/incendiary/molotov{
+ pixel_y = 3;
+ pixel_x = -1
},
/turf/open/floor{
icon_state = "freezerfloor"
},
/area/bigredv2/outside/general_offices)
-"ie" = (
-/obj/effect/decal/cleanable/dirt,
+"ic" = (
+/obj/structure/surface/table,
+/obj/item/clothing/under/brown{
+ pixel_y = 7;
+ pixel_x = 12
+ },
+/obj/item/explosive/grenade/incendiary/molotov{
+ pixel_x = 8
+ },
/turf/open/floor{
icon_state = "freezerfloor"
},
/area/bigredv2/outside/general_offices)
-"is" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/corpsespawner/colonist,
-/obj/effect/decal/cleanable/blood,
+"iN" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
/turf/open/floor{
icon_state = "freezerfloor"
},
/area/bigredv2/outside/general_offices)
-"lx" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/corpsespawner/chef,
-/obj/effect/decal/cleanable/blood/gibs/body,
+"lr" = (
+/obj/effect/spawner/random/tool,
+/turf/open/floor{
+ icon_state = "platingdmg1"
+ },
+/area/bigredv2/outside/general_offices)
+"oB" = (
+/obj/effect/landmark/objective_landmark/close,
+/turf/open/floor{
+ icon_state = "dark"
+ },
+/area/bigredv2/outside/general_offices)
+"pL" = (
+/obj/structure/surface/rack,
+/turf/open/floor,
+/area/bigredv2/outside/general_offices)
+"sA" = (
/obj/effect/decal/cleanable/blood,
/turf/open/floor{
icon_state = "platingdmg1"
},
/area/bigredv2/outside/general_offices)
-"mm" = (
+"sF" = (
/obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/corpsespawner/chef,
+/obj/effect/decal/cleanable/blood/gibs/body,
/obj/effect/decal/cleanable/blood,
/turf/open/floor{
icon_state = "platingdmg1"
},
/area/bigredv2/outside/general_offices)
-"mw" = (
-/obj/structure/surface/table,
-/obj/item/explosive/grenade/incendiary/molotov{
- pixel_y = -7;
- pixel_x = 8
- },
-/obj/item/explosive/grenade/incendiary/molotov{
- pixel_y = 3;
- pixel_x = -1
+"vr" = (
+/obj/structure/surface/rack,
+/obj/item/clothing/under/lightbrown{
+ pixel_x = 10;
+ pixel_y = -5
},
/turf/open/floor{
icon_state = "freezerfloor"
},
/area/bigredv2/outside/general_offices)
-"mG" = (
-/obj/effect/spawner/random/tool,
-/turf/open/floor{
- icon_state = "platingdmg1"
- },
+"wP" = (
+/obj/structure/surface/rack,
+/obj/item/xeno_restraints,
+/turf/open/shuttle/dropship/can_surgery/dark_grey,
/area/bigredv2/outside/general_offices)
-"ne" = (
+"xn" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
},
@@ -1103,40 +1077,34 @@
icon_state = "freezerfloor"
},
/area/bigredv2/outside/general_offices)
-"oB" = (
-/obj/effect/landmark/objective_landmark/close,
-/turf/open/floor{
- icon_state = "dark"
- },
-/area/bigredv2/outside/general_offices)
"xT" = (
/obj/structure/blocker/forcefield/multitile_vehicles,
/turf/open/mars_cave{
icon_state = "mars_dirt_6"
},
/area/bigredv2/caves_north)
-"yc" = (
-/obj/effect/decal/cleanable/blood,
+"yB" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/spawner/random/tool,
/turf/open/floor{
icon_state = "platingdmg1"
},
/area/bigredv2/outside/general_offices)
-"zI" = (
+"EO" = (
+/turf/closed/shuttle/ert{
+ icon_state = "wy20"
+ },
+/area/bigredv2/outside/general_offices)
+"FM" = (
/obj/structure/bed/bedroll,
/turf/open/floor{
icon_state = "freezerfloor"
},
/area/bigredv2/outside/general_offices)
-"Df" = (
+"GK" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/tool,
/turf/open/floor{
- icon_state = "platingdmg1"
- },
-/area/bigredv2/outside/general_offices)
-"EO" = (
-/turf/closed/shuttle/ert{
- icon_state = "wy20"
+ icon_state = "freezerfloor"
},
/area/bigredv2/outside/general_offices)
"IB" = (
@@ -1151,14 +1119,46 @@
icon_state = "panelscorched"
},
/area/bigredv2/outside/general_offices)
-"Nh" = (
-/obj/structure/pipes/standard/simple/hidden/green{
- dir = 4
+"NU" = (
+/obj/structure/surface/table,
+/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb{
+ pixel_x = 1;
+ pixel_y = 3
+ },
+/obj/item/prop/helmetgarb/spent_buckshot{
+ pixel_x = 9;
+ pixel_y = -10
+ },
+/turf/open/floor{
+ icon_state = "freezerfloor"
},
+/area/bigredv2/outside/general_offices)
+"Px" = (
+/obj/item/clothing/under/darkred{
+ pixel_y = 7;
+ pixel_x = 10
+ },
+/obj/structure/surface/rack,
+/obj/item/clothing/under/darkred,
+/turf/open/floor{
+ icon_state = "freezerfloor"
+ },
+/area/bigredv2/outside/general_offices)
+"Vq" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/corpsespawner/colonist,
+/obj/effect/decal/cleanable/blood,
/turf/open/floor{
icon_state = "freezerfloor"
},
/area/bigredv2/outside/general_offices)
+"Wg" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor{
+ icon_state = "platingdmg1"
+ },
+/area/bigredv2/outside/general_offices)
"Zt" = (
/obj/structure/bed/chair/dropship/passenger,
/obj/effect/landmark/corpsespawner/wygoon,
@@ -1329,15 +1329,15 @@ eF
eF
eF
aB
-aL
+Px
bd
-Nh
+iN
bd
-bK
+NU
aB
-cl
-cl
-cl
+pL
+pL
+pL
aB
aK
aK
@@ -1360,15 +1360,15 @@ eF
eF
eF
aB
-fF
-ie
-ne
+vr
+GK
+xn
bd
-mw
+hm
aB
bW
bl
-mG
+lr
aB
cF
aK
@@ -1392,10 +1392,10 @@ eF
eF
aB
bd
-is
-ne
-ie
-bL
+Vq
+xn
+GK
+ic
aB
bX
bl
@@ -1424,15 +1424,15 @@ eF
aB
aM
be
-zI
+FM
bd
bf
bT
bY
-Df
+yB
aO
bU
-mm
+Wg
aO
dd
aB
@@ -1494,8 +1494,8 @@ aO
bl
bl
aK
-lx
-yc
+sF
+sA
aX
aB
dp
@@ -1614,7 +1614,7 @@ bs
bs
bs
bu
-cb
+wP
co
ca
ca
diff --git a/maps/map_files/BigRed/standalone/crashlanding-offices.dmm b/maps/map_files/BigRed/standalone/crashlanding-offices.dmm
index 92e1b73d1bd5..effea28efa69 100644
--- a/maps/map_files/BigRed/standalone/crashlanding-offices.dmm
+++ b/maps/map_files/BigRed/standalone/crashlanding-offices.dmm
@@ -15,17 +15,6 @@
icon_state = "mars_dirt_3"
},
/area/bigredv2/outside/c)
-"ae" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
- },
-/area/bigredv2/outside/c)
-"ag" = (
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached14"
- },
-/area/bigredv2/outside/e)
"ah" = (
/turf/open/floor{
dir = 1;
@@ -250,11 +239,6 @@
icon_state = "wy18"
},
/area/bigredv2/outside/office_complex)
-"aU" = (
-/obj/structure/surface/rack,
-/obj/item/restraints,
-/turf/open/shuttle/dropship/can_surgery/dark_grey,
-/area/bigredv2/outside/office_complex)
"aV" = (
/turf/open/shuttle/dropship/can_surgery/dark_grey,
/area/bigredv2/outside/office_complex)
@@ -1345,6 +1329,11 @@
icon_state = "platingdmg1"
},
/area/bigredv2/outside/office_complex)
+"fs" = (
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached15"
+ },
+/area/bigredv2/outside/c)
"fv" = (
/obj/structure/bed/chair/dropship/passenger{
dir = 8
@@ -1359,11 +1348,6 @@
/obj/item/device/radio/headset/distress/pmc/hvh,
/turf/open/shuttle/dropship/can_surgery/dark_grey,
/area/bigredv2/outside/office_complex)
-"fP" = (
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached1"
- },
-/area/bigredv2/outside/e)
"hN" = (
/obj/structure/bed/chair/dropship/passenger{
dir = 4
@@ -1386,16 +1370,21 @@
/obj/item/limb/leg/l_leg,
/turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_up_to_down,
/area/bigredv2/outside/office_complex)
-"kr" = (
+"jA" = (
/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached15"
+ icon_state = "cement_sunbleached14"
},
/area/bigredv2/outside/c)
-"nj" = (
+"kX" = (
/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached14"
+ icon_state = "cement_sunbleached12"
},
/area/bigredv2/outside/c)
+"ln" = (
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached3"
+ },
+/area/bigredv2/outside/e)
"nE" = (
/obj/structure/surface/rack,
/obj/effect/landmark/crap_item,
@@ -1477,6 +1466,11 @@
/obj/effect/landmark/corpsespawner/wygoon,
/turf/open/shuttle/dropship/can_surgery/dark_grey,
/area/bigredv2/outside/office_complex)
+"AR" = (
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached1"
+ },
+/area/bigredv2/outside/e)
"Bu" = (
/obj/effect/decal/cleanable/blood,
/obj/effect/spawner/gibspawner/human,
@@ -1485,11 +1479,6 @@
/obj/item/limb/hand/r_hand,
/turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_up_to_down,
/area/bigredv2/outside/office_complex)
-"BR" = (
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached12"
- },
-/area/bigredv2/outside/c)
"EE" = (
/obj/structure/bed/chair/dropship/passenger{
dir = 8
@@ -1497,6 +1486,17 @@
/obj/item/limb/hand/l_hand,
/turf/open/shuttle/dropship/can_surgery/dark_grey,
/area/bigredv2/outside/office_complex)
+"Fm" = (
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached14"
+ },
+/area/bigredv2/outside/e)
+"Gm" = (
+/turf/open/floor{
+ dir = 9;
+ icon_state = "asteroidwarning"
+ },
+/area/bigredv2/outside/e)
"GG" = (
/obj/item/weapon/gun/rifle/m41a/corporate/no_lock{
desc = "A Weyland-Yutani creation, this M41A MK2 comes equipped in corporate white. Uses 10x24mm caseless ammunition. The IFF electronics appear to be non-functional.";
@@ -1511,10 +1511,9 @@
icon_state = "asteroidfloor"
},
/area/bigredv2/outside/se)
-"IN" = (
-/turf/open/floor{
- dir = 9;
- icon_state = "asteroidwarning"
+"HN" = (
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached15"
},
/area/bigredv2/outside/e)
"Lk" = (
@@ -1524,6 +1523,12 @@
/obj/item/device/radio/headset/distress/pmc/hvh,
/turf/open/shuttle/dropship/can_surgery/dark_grey,
/area/bigredv2/outside/office_complex)
+"MH" = (
+/obj/structure/pipes/standard/simple/hidden/green,
+/turf/open/asphalt/cement_sunbleached{
+ icon_state = "cement_sunbleached12"
+ },
+/area/bigredv2/outside/c)
"NK" = (
/obj/structure/surface/rack,
/obj/item/ammo_magazine/rifle/rubber,
@@ -1548,16 +1553,11 @@
/obj/effect/landmark/objective_landmark/medium,
/turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_left_to_right,
/area/bigredv2/outside/office_complex)
-"WM" = (
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached3"
- },
-/area/bigredv2/outside/e)
-"Xe" = (
-/turf/open/asphalt/cement_sunbleached{
- icon_state = "cement_sunbleached15"
- },
-/area/bigredv2/outside/e)
+"Wm" = (
+/obj/structure/surface/rack,
+/obj/item/xeno_restraints,
+/turf/open/shuttle/dropship/can_surgery/dark_grey,
+/area/bigredv2/outside/office_complex)
"XH" = (
/obj/structure/bed/chair/dropship/passenger{
dir = 4
@@ -1837,7 +1837,7 @@ bu
ar
"}
(11,1,1) = {"
-nj
+jA
ao
cX
cX
@@ -1864,7 +1864,7 @@ bI
bI
"}
(12,1,1) = {"
-BR
+kX
ap
ap
ap
@@ -1891,12 +1891,12 @@ dm
dW
"}
(13,1,1) = {"
-BR
+kX
ap
av
ar
aN
-aU
+Wm
nE
bm
dA
@@ -1918,7 +1918,7 @@ dn
dt
"}
(14,1,1) = {"
-ae
+MH
aq
aw
aC
@@ -1945,7 +1945,7 @@ do
ds
"}
(15,1,1) = {"
-kr
+fs
ar
bt
aD
@@ -1972,7 +1972,7 @@ dp
du
"}
(16,1,1) = {"
-IN
+Gm
ba
bb
aE
@@ -2134,8 +2134,8 @@ Ha
PR
"}
(22,1,1) = {"
-WM
-ag
+ln
+Fm
aA
aG
dX
@@ -2161,8 +2161,8 @@ Ha
PR
"}
(23,1,1) = {"
-fP
-Xe
+AR
+HN
aA
aG
aG
diff --git a/maps/map_files/CORSAT/Corsat.dmm b/maps/map_files/CORSAT/Corsat.dmm
index 9c09a95e9f94..28db8fa8831f 100644
--- a/maps/map_files/CORSAT/Corsat.dmm
+++ b/maps/map_files/CORSAT/Corsat.dmm
@@ -179,7 +179,6 @@
"aaF" = (
/obj/structure/machinery/door/airlock/almayer/security/glass/colony{
dir = 1;
- locked = 0;
name = "CORSAT Armory";
req_access_txt = "101"
},
@@ -2354,7 +2353,6 @@
/obj/structure/machinery/door/airlock/almayer/maint/colony{
damage_cap = 4000;
dir = 1;
- locked = 0;
name = "\improper Emergency Access";
req_access_txt = "100";
req_one_access = null
@@ -4896,7 +4894,7 @@
/area/corsat/gamma/airlock/north)
"aoq" = (
/obj/structure/surface/table/almayer,
-/obj/item/handcuffs,
+/obj/item/restraint/handcuffs,
/turf/open/floor/corsat{
dir = 4;
icon_state = "red"
@@ -5915,7 +5913,6 @@
"arv" = (
/obj/structure/machinery/door/airlock/almayer/maint/colony{
damage_cap = 4000;
- locked = 0;
name = "\improper Emergency Access";
req_access_txt = "100";
req_one_access = null
@@ -13708,7 +13705,7 @@
/area/corsat/omega/airlocknorth/id)
"aMA" = (
/obj/structure/surface/table/reinforced,
-/obj/item/restraints,
+/obj/item/xeno_restraints,
/turf/open/floor/corsat{
icon_state = "plate"
},
@@ -21812,8 +21809,7 @@
/area/corsat/gamma/engineering)
"bij" = (
/obj/structure/machinery/floodlight{
- name = "Floodlight";
- unacidable = 0
+ name = "Floodlight"
},
/turf/open/auto_turf/snow/layer3,
/area/corsat/gamma/biodome)
@@ -27158,7 +27154,7 @@
/area/corsat/gamma/medbay)
"byJ" = (
/obj/structure/surface/rack,
-/obj/item/restraints,
+/obj/item/xeno_restraints,
/turf/open/floor/corsat{
dir = 1;
icon_state = "purplewhite"
@@ -27730,6 +27726,7 @@
/area/corsat/gamma/medbay)
"bAg" = (
/obj/structure/machinery/cm_vending/sorted/medical/no_access,
+/obj/structure/medical_supply_link,
/turf/open/floor/corsat{
dir = 5;
icon_state = "greenwhite"
@@ -28911,7 +28908,7 @@
/area/corsat/sigma/south/security)
"bDu" = (
/obj/structure/surface/table/almayer,
-/obj/item/handcuffs,
+/obj/item/restraint/handcuffs,
/turf/open/floor/corsat{
dir = 8;
icon_state = "red"
@@ -28919,7 +28916,6 @@
/area/corsat/omega/checkpoint)
"bDv" = (
/obj/structure/machinery/door/airlock/almayer/security/glass/colony{
- locked = 0;
name = "Security Armory";
req_access_txt = "101"
},
@@ -29590,8 +29586,8 @@
/area/corsat/gamma/security)
"bFF" = (
/obj/structure/surface/table/almayer,
-/obj/item/handcuffs,
-/obj/item/handcuffs,
+/obj/item/restraint/handcuffs,
+/obj/item/restraint/handcuffs,
/turf/open/floor/corsat{
dir = 8;
icon_state = "red"
@@ -30377,8 +30373,7 @@
/area/corsat/gamma/airlock/control)
"bJE" = (
/obj/structure/machinery/floodlight{
- name = "Floodlight";
- unacidable = 0
+ name = "Floodlight"
},
/turf/open/mars,
/area/corsat/sigma/biodome)
@@ -33069,8 +33064,8 @@
/area/corsat/omega/checkpoint)
"bRn" = (
/obj/structure/surface/rack,
-/obj/item/handcuffs,
-/obj/item/handcuffs,
+/obj/item/restraint/handcuffs,
+/obj/item/restraint/handcuffs,
/turf/open/floor/corsat{
dir = 4;
icon_state = "red"
@@ -33274,7 +33269,7 @@
"bSb" = (
/obj/structure/surface/table/almayer,
/obj/item/clipboard,
-/obj/item/handcuffs/zip,
+/obj/item/restraint/handcuffs/zip,
/turf/open/floor/corsat{
icon_state = "plate"
},
@@ -33313,8 +33308,8 @@
name = "riot cabinet";
req_access_txt = "100"
},
-/obj/item/handcuffs,
-/obj/item/handcuffs,
+/obj/item/restraint/handcuffs,
+/obj/item/restraint/handcuffs,
/turf/open/floor/corsat{
icon_state = "red"
},
@@ -34143,8 +34138,7 @@
/area/corsat/sigma/airlock/control)
"bVD" = (
/obj/structure/machinery/floodlight{
- name = "Floodlight";
- unacidable = 0
+ name = "Floodlight"
},
/turf/open/floor{
dir = 1;
@@ -35393,7 +35387,6 @@
/obj/structure/machinery/door/airlock/almayer/research/glass/colony{
dir = 1;
name = "Weapons Development";
- req_access = null;
req_one_access_txt = "103"
},
/obj/structure/pipes/standard/simple/hidden/green,
@@ -35406,7 +35399,7 @@
dir = 8
},
/obj/structure/surface/table/reinforced,
-/obj/item/restraints,
+/obj/item/xeno_restraints,
/turf/open/floor/corsat{
dir = 8;
icon_state = "red"
@@ -35720,8 +35713,7 @@
/area/corsat/omega/control)
"caS" = (
/obj/structure/machinery/floodlight{
- name = "Floodlight";
- unacidable = 0
+ name = "Floodlight"
},
/turf/open/floor/plating,
/area/corsat/sigma/biodome/testgrounds)
@@ -37793,8 +37785,7 @@
/area/corsat/omega/hallways)
"dFb" = (
/obj/structure/machinery/floodlight{
- name = "Floodlight";
- unacidable = 0
+ name = "Floodlight"
},
/turf/open/auto_turf/snow/layer0,
/area/corsat/gamma/biodome)
@@ -44677,8 +44668,8 @@
name = "riot cabinet";
req_access_txt = "100"
},
-/obj/item/restraints,
-/obj/item/restraints,
+/obj/item/xeno_restraints,
+/obj/item/xeno_restraints,
/turf/open/floor/corsat{
dir = 6;
icon_state = "red"
@@ -48442,7 +48433,6 @@
/obj/structure/machinery/door/airlock/almayer/research/glass/colony{
dir = 1;
name = "Teleportation Lab";
- req_access = null;
req_one_access_txt = "103"
},
/obj/structure/pipes/standard/simple/hidden/green,
@@ -49076,8 +49066,7 @@
/area/corsat/omega/airlocknorth/id)
"lUY" = (
/obj/structure/machinery/floodlight{
- name = "Floodlight";
- unacidable = 0
+ name = "Floodlight"
},
/obj/structure/pipes/standard/simple/hidden/green,
/turf/open/auto_turf/snow/layer3,
@@ -50944,7 +50933,6 @@
/obj/structure/machinery/door/airlock/almayer/research/glass/colony{
dir = 1;
name = "Teleportation Chamber";
- req_access = null;
req_one_access_txt = "101;103"
},
/turf/open/floor/corsat{
@@ -61779,7 +61767,6 @@
"vqF" = (
/obj/structure/machinery/door/airlock/almayer/maint/colony{
damage_cap = 4000;
- locked = 0;
name = "\improper Emergency Access";
req_access_txt = "100";
req_one_access = null
@@ -63075,7 +63062,7 @@
/area/corsat/omega/hangar)
"wrd" = (
/obj/structure/surface/rack,
-/obj/item/restraints,
+/obj/item/xeno_restraints,
/turf/open/shuttle/dropship{
icon_state = "rasputin15"
},
@@ -63841,7 +63828,7 @@
/area/corsat/omega/complex)
"wUd" = (
/obj/structure/surface/table/almayer,
-/obj/item/handcuffs,
+/obj/item/restraint/handcuffs,
/turf/open/floor/corsat{
dir = 8;
icon_state = "red"
diff --git a/maps/map_files/DesertDam/Desert_Dam.dmm b/maps/map_files/DesertDam/Desert_Dam.dmm
index a86fb326152d..3c4125023686 100644
--- a/maps/map_files/DesertDam/Desert_Dam.dmm
+++ b/maps/map_files/DesertDam/Desert_Dam.dmm
@@ -18539,7 +18539,7 @@
},
/area/desert_dam/interior/dam_interior/north_tunnel)
"bfk" = (
-/obj/item/handcuffs,
+/obj/item/restraint/handcuffs,
/obj/item/weapon/baton,
/obj/structure/surface/table/woodentable/fancy,
/turf/open/floor/interior/wood/alt,
@@ -26207,7 +26207,7 @@
/area/desert_dam/exterior/valley/valley_mining)
"bFf" = (
/obj/structure/surface/table,
-/obj/item/handcuffs,
+/obj/item/restraint/handcuffs,
/turf/open/floor/prison{
dir = 10;
icon_state = "darkred2"
@@ -37633,7 +37633,7 @@
/area/desert_dam/building/warehouse/breakroom)
"cqj" = (
/obj/structure/surface/table,
-/obj/item/handcuffs,
+/obj/item/restraint/handcuffs,
/turf/open/floor/prison{
icon_state = "darkred2"
},
@@ -64959,6 +64959,14 @@
/obj/structure/machinery/camera/autoname/lz_camera,
/turf/open/floor/plating,
/area/desert_dam/exterior/landing_pad_one)
+"uIC" = (
+/obj/structure/machinery/cm_vending/sorted/medical/no_access,
+/obj/structure/medical_supply_link/green,
+/turf/open/floor/prison{
+ dir = 10;
+ icon_state = "whitegreenfull"
+ },
+/area/desert_dam/building/medical/treatment_room)
"uKo" = (
/obj/structure/platform/mineral/sandstone/runed{
dir = 4
@@ -102788,7 +102796,7 @@ cvU
cvU
cCn
ctW
-cEy
+uIC
cEB
cGg
cHc
diff --git a/maps/map_files/DesertDam/sprinkles/10.damtemple_intact.dmm b/maps/map_files/DesertDam/sprinkles/10.damtemple_intact.dmm
index d0ebbc5039d5..6c7e859826db 100644
--- a/maps/map_files/DesertDam/sprinkles/10.damtemple_intact.dmm
+++ b/maps/map_files/DesertDam/sprinkles/10.damtemple_intact.dmm
@@ -139,7 +139,7 @@
/obj/structure/surface/table/reinforced/prison{
color = "#6b675e"
},
-/obj/item/legcuffs/beartrap{
+/obj/item/restraint/legcuffs/beartrap{
pixel_x = -1;
pixel_y = 8
},
diff --git a/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm b/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm
index 97f0248ff6e8..d1dd76922ee1 100644
--- a/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm
+++ b/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm
@@ -1378,8 +1378,7 @@
/obj/structure/machinery/door/airlock/almayer/security/glass/colony{
density = 0;
icon_state = "door_open";
- name = "Cell Access";
- req_access = null
+ name = "Cell Access"
},
/turf/open/floor/prison{
dir = 10;
@@ -1574,8 +1573,7 @@
density = 0;
icon_state = "door_open";
name = "Cell";
- opacity = 0;
- req_access = null
+ opacity = 0
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -1621,8 +1619,7 @@
dir = 2;
icon_state = "door_open";
name = "Cell";
- opacity = 0;
- req_access = null
+ opacity = 0
},
/obj/structure/disposalpipe/segment,
/turf/open/floor/prison{
@@ -3454,10 +3451,10 @@
/area/prison/research/secret)
"aiZ" = (
/obj/structure/surface/rack,
-/obj/item/handcuffs,
-/obj/item/handcuffs,
-/obj/item/handcuffs,
-/obj/item/handcuffs,
+/obj/item/restraint/handcuffs,
+/obj/item/restraint/handcuffs,
+/obj/item/restraint/handcuffs,
+/obj/item/restraint/handcuffs,
/turf/open/floor/prison{
dir = 8;
icon_state = "darkpurple2"
@@ -3915,8 +3912,7 @@
/obj/structure/machinery/door/airlock/almayer/security/glass/colony{
density = 0;
icon_state = "door_open";
- name = "Cell Access";
- req_access = null
+ name = "Cell Access"
},
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 4
@@ -8229,13 +8225,6 @@
icon_state = "bright_clean"
},
/area/prison/chapel)
-"awd" = (
-/obj/structure/machinery/door/airlock/almayer/security/colony{
- locked = 0;
- name = "Research Containment Locker"
- },
-/turf/open/floor/prison,
-/area/prison/research/secret)
"awe" = (
/obj/structure/window/framed/prison/reinforced/hull,
/turf/open/floor/plating,
@@ -13800,7 +13789,7 @@
/area/prison/command/secretary_office)
"aMK" = (
/obj/structure/closet,
-/obj/item/handcuffs,
+/obj/item/restraint/handcuffs,
/obj/item/clothing/mask/muzzle,
/obj/item/weapon/chainofcommand,
/turf/open/floor/prison{
@@ -28265,8 +28254,7 @@
/area/prison/hallway/east)
"bDU" = (
/obj/structure/machinery/door/airlock/multi_tile/almayer/comdoor/colony{
- dir = 2;
- req_access = null
+ dir = 2
},
/turf/open/floor/prison{
dir = 10;
@@ -31414,9 +31402,7 @@
/turf/open/floor/wood,
/area/prison/residential/south)
"bNt" = (
-/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
- locked = 0
- },
+/obj/structure/machinery/door/airlock/multi_tile/almayer/generic,
/turf/open/floor/prison{
icon_state = "damaged3"
},
@@ -47865,6 +47851,14 @@
icon_state = "yellowfull"
},
/area/prison/cellblock/protective)
+"rmb" = (
+/obj/structure/machinery/cm_vending/sorted/medical/no_access,
+/obj/structure/medical_supply_link/green,
+/turf/open/floor/prison{
+ dir = 10;
+ icon_state = "whitegreenfull"
+ },
+/area/prison/medbay)
"rpB" = (
/obj/structure/flora/bush/ausbushes/var3/brflowers,
/obj/structure/machinery/light{
@@ -82696,7 +82690,7 @@ arx
apK
asp
asT
-att
+rmb
att
avj
avn
@@ -87123,7 +87117,7 @@ aeZ
aeZ
aiN
aiN
-awd
+atK
aiN
aiN
aiN
diff --git a/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm b/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm
index f81f67e45a80..fcbdcc4fdc33 100644
--- a/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm
+++ b/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm
@@ -444,7 +444,7 @@
"anl" = (
/obj/item/pamphlet/engineer,
/obj/structure/closet,
-/obj/item/handcuffs,
+/obj/item/restraint/handcuffs,
/obj/effect/landmark/objective_landmark/close,
/turf/open/floor/prison{
icon_state = "darkredfull2"
@@ -2947,7 +2947,7 @@
/area/fiorina/lz/near_lzI)
"bMG" = (
/obj/structure/surface/rack,
-/obj/item/handcuffs/zip,
+/obj/item/restraint/handcuffs/zip,
/turf/open/floor/prison{
icon_state = "darkredfull2"
},
@@ -18049,7 +18049,7 @@
/area/fiorina/tumor/civres)
"kWv" = (
/obj/structure/surface/table/reinforced/prison,
-/obj/item/handcuffs,
+/obj/item/restraint/handcuffs,
/turf/open/floor/prison,
/area/fiorina/station/security)
"kWx" = (
@@ -19576,7 +19576,7 @@
},
/area/fiorina/station/lowsec)
"lNv" = (
-/obj/item/handcuffs/cable/pink,
+/obj/item/restraint/adjustable/cable/pink,
/turf/open/floor/prison/chapel_carpet{
dir = 1;
icon_state = "doubleside"
@@ -22085,6 +22085,7 @@
dir = 8;
health = 80
},
+/obj/structure/medical_supply_link,
/turf/open/floor/prison{
dir = 10;
icon_state = "sterile_white"
@@ -31004,7 +31005,7 @@
/area/fiorina/tumor/ice_lab)
"sQC" = (
/obj/structure/surface/rack,
-/obj/item/handcuffs,
+/obj/item/restraint/handcuffs,
/turf/open/floor/prison{
icon_state = "darkredfull2"
},
@@ -38286,7 +38287,7 @@
/area/fiorina/station/chapel)
"xoK" = (
/obj/structure/closet,
-/obj/item/handcuffs,
+/obj/item/restraint/handcuffs,
/obj/item/clothing/mask/muzzle,
/obj/item/weapon/chainofcommand,
/turf/open/floor/wood,
diff --git a/maps/map_files/FOP_v3_Sciannex/sprinkles/20.yardbasketball.dmm b/maps/map_files/FOP_v3_Sciannex/sprinkles/20.yardbasketball.dmm
index 6662ebf081f0..ce60474959f1 100644
--- a/maps/map_files/FOP_v3_Sciannex/sprinkles/20.yardbasketball.dmm
+++ b/maps/map_files/FOP_v3_Sciannex/sprinkles/20.yardbasketball.dmm
@@ -36,7 +36,7 @@
"f" = (
/obj/effect/landmark/corpsespawner/ua_riot,
/obj/effect/decal/cleanable/blood,
-/obj/item/handcuffs/zip{
+/obj/item/restraint/handcuffs/zip{
pixel_y = -12
},
/turf/open/floor/wood,
diff --git a/maps/map_files/FOP_v3_Sciannex/sprinkles/25.researchprestine.dmm b/maps/map_files/FOP_v3_Sciannex/sprinkles/25.researchprestine.dmm
index 8df7c92de478..9ff0e6e4a246 100644
--- a/maps/map_files/FOP_v3_Sciannex/sprinkles/25.researchprestine.dmm
+++ b/maps/map_files/FOP_v3_Sciannex/sprinkles/25.researchprestine.dmm
@@ -696,11 +696,11 @@
dir = 1;
pixel_y = 21
},
-/obj/item/handcuffs{
+/obj/item/restraint/handcuffs{
pixel_x = -3;
pixel_y = 10
},
-/obj/item/handcuffs{
+/obj/item/restraint/handcuffs{
pixel_x = 4
},
/turf/open/floor/prison{
diff --git a/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm b/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm
index 74d5921e30de..5326d72de2a8 100644
--- a/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm
+++ b/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm
@@ -12163,7 +12163,7 @@
/area/ice_colony/surface/command/crisis)
"aIv" = (
/obj/structure/surface/table/woodentable,
-/obj/item/handcuffs,
+/obj/item/restraint/handcuffs,
/obj/item/tool/stamp,
/turf/open/floor/wood,
/area/ice_colony/surface/command/crisis)
@@ -28871,7 +28871,7 @@
/area/ice_colony/underground/security/interrogation)
"bJH" = (
/obj/structure/surface/table/reinforced,
-/obj/item/handcuffs,
+/obj/item/restraint/handcuffs,
/obj/structure/machinery/flasher_button{
id = "sec_checkpoint";
pixel_y = 24
@@ -30138,7 +30138,7 @@
"bMX" = (
/obj/item/book/manual/marine_law,
/obj/structure/surface/table/reinforced,
-/obj/item/handcuffs,
+/obj/item/restraint/handcuffs,
/turf/open/floor{
dir = 1;
icon_state = "darkred2"
@@ -33966,7 +33966,7 @@
/area/ice_colony/underground/medical/storage)
"bXR" = (
/obj/structure/surface/table/woodentable,
-/obj/item/handcuffs,
+/obj/item/restraint/handcuffs,
/obj/item/weapon/baton,
/turf/open/floor/wood,
/area/ice_colony/underground/security/marshal)
diff --git a/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm b/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm
index 7ff89252a916..b1ce353976c2 100644
--- a/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm
+++ b/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm
@@ -2249,7 +2249,7 @@
/area/shiva/interior/colony/medseceng)
"akT" = (
/obj/structure/surface/table/woodentable,
-/obj/item/handcuffs,
+/obj/item/restraint/handcuffs,
/obj/item/weapon/baton,
/turf/open/floor/wood,
/area/shiva/interior/colony/medseceng)
@@ -11583,6 +11583,7 @@
/area/shiva/exterior/junkyard)
"gHh" = (
/obj/structure/machinery/cm_vending/sorted/medical/no_access,
+/obj/structure/medical_supply_link,
/turf/open/floor/shiva{
dir = 9;
icon_state = "wred"
@@ -20197,7 +20198,7 @@
"pCJ" = (
/obj/item/book/manual/marine_law,
/obj/structure/surface/table/reinforced/prison,
-/obj/item/handcuffs,
+/obj/item/restraint/handcuffs,
/turf/open/floor/shiva{
dir = 1;
icon_state = "red"
@@ -22215,7 +22216,7 @@
/area/shiva/interior/colony/medseceng)
"rMe" = (
/obj/structure/surface/table,
-/obj/item/handcuffs,
+/obj/item/restraint/handcuffs,
/obj/item/tool/stamp,
/turf/open/floor/shiva{
icon_state = "bluefull"
@@ -26357,7 +26358,7 @@
/turf/open/shuttle/dropship/can_surgery/medium_grey_single_wide_left_to_right,
/area/shiva/interior/aerodrome)
"vWf" = (
-/obj/item/handcuffs,
+/obj/item/restraint/handcuffs,
/turf/open/floor/shiva{
dir = 8;
icon_state = "redfull"
diff --git a/maps/map_files/Kutjevo/Kutjevo.dmm b/maps/map_files/Kutjevo/Kutjevo.dmm
index e29ebb9280b9..b1beb0dfc2b1 100644
--- a/maps/map_files/Kutjevo/Kutjevo.dmm
+++ b/maps/map_files/Kutjevo/Kutjevo.dmm
@@ -13120,6 +13120,7 @@
/area/kutjevo/exterior/lz_dunes)
"rQa" = (
/obj/structure/machinery/cm_vending/sorted/medical/no_access,
+/obj/structure/medical_supply_link/green,
/turf/open/floor/kutjevo/colors/cyan/inner_corner{
dir = 1
},
diff --git a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm
index 38c917ce08e8..94c7420a6da4 100644
--- a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm
+++ b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm
@@ -9855,6 +9855,17 @@
/obj/vehicle/train/cargo/engine,
/turf/open/floor/plating,
/area/lv522/landing_zone_1/tunnel)
+"evg" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/landmark/lv624/fog_blocker/short,
+/obj/structure/machinery/power/apc/weak{
+ dir = 8
+ },
+/turf/open/floor/prison{
+ dir = 4;
+ icon_state = "greenfull"
+ },
+/area/lv522/landing_zone_1/ceiling)
"evu" = (
/obj/structure/tunnel/maint_tunnel{
pixel_y = 6
@@ -17194,8 +17205,8 @@
/area/lv522/atmos/cargo_intake)
"hlH" = (
/obj/structure/surface/table/reinforced/prison,
-/obj/item/handcuffs/cable/white,
-/obj/item/handcuffs/cable/white{
+/obj/item/restraint/adjustable/cable/white,
+/obj/item/restraint/adjustable/cable/white{
pixel_y = 4
},
/turf/open/floor/strata{
@@ -18228,13 +18239,13 @@
/area/lv522/indoors/c_block/casino)
"hIz" = (
/obj/structure/surface/table/almayer,
-/obj/item/handcuffs{
+/obj/item/restraint/handcuffs{
pixel_y = 12
},
-/obj/item/handcuffs{
+/obj/item/restraint/handcuffs{
pixel_y = 6
},
-/obj/item/handcuffs,
+/obj/item/restraint/handcuffs,
/obj/item/weapon/classic_baton,
/turf/open/floor/prison{
icon_state = "darkredfull2"
@@ -44744,6 +44755,7 @@
/obj/structure/machinery/light{
dir = 4
},
+/obj/structure/medical_supply_link/green,
/turf/open/floor/strata{
dir = 4;
icon_state = "white_cyan3"
@@ -61924,15 +61936,6 @@
icon_state = "marked"
},
/area/lv522/indoors/a_block/fitness)
-"xOS" = (
-/obj/structure/machinery/power/apc/weak{
- dir = 1
- },
-/obj/effect/landmark/lv624/fog_blocker/short,
-/turf/open/asphalt/cement{
- icon_state = "cement12"
- },
-/area/lv522/landing_zone_1)
"xPa" = (
/obj/structure/machinery/conveyor,
/turf/open/floor/plating,
@@ -66660,7 +66663,7 @@ cpy
tFx
tFx
wnP
-rzz
+evg
syM
rnT
lBl
@@ -66889,7 +66892,7 @@ moz
mvP
ggS
tFx
-xOS
+rnT
lBl
ttT
pkH
diff --git a/maps/map_files/LV624/LV624.dmm b/maps/map_files/LV624/LV624.dmm
index 6f03ce4c2cba..a9baa8a1efc7 100644
--- a/maps/map_files/LV624/LV624.dmm
+++ b/maps/map_files/LV624/LV624.dmm
@@ -2125,8 +2125,7 @@
"akh" = (
/obj/item/trash/candy,
/obj/structure/machinery/power/apc{
- dir = 1;
- name = "Corporate Lobby APC"
+ dir = 1
},
/obj/structure/machinery/door_control{
id = "secure_outer_blast";
@@ -3238,11 +3237,8 @@
},
/area/lv624/lazarus/hydroponics)
"aru" = (
-/obj/structure/machinery/power/apc{
- dir = 1;
- name = "Hydroponics APC";
- pixel_y = 30;
- start_charge = 0
+/obj/structure/machinery/power/apc/nocharge{
+ dir = 1
},
/turf/open/floor{
dir = 9;
@@ -4413,11 +4409,8 @@
},
/area/lv624/lazarus/fitness)
"aww" = (
-/obj/structure/machinery/power/apc{
- dir = 1;
- name = "Fitness APC";
- pixel_y = 30;
- start_charge = 0
+/obj/structure/machinery/power/apc/nocharge{
+ dir = 1
},
/turf/open/floor{
dir = 4;
@@ -5132,11 +5125,8 @@
},
/area/lv624/lazarus/robotics)
"azc" = (
-/obj/structure/machinery/power/apc{
- dir = 1;
- name = "Robotics Lab APC";
- pixel_y = 30;
- start_charge = 0
+/obj/structure/machinery/power/apc/nocharge{
+ dir = 1
},
/turf/open/floor{
icon_state = "vault"
@@ -5625,33 +5615,27 @@
},
/area/lv624/lazarus/sleep_male)
"aAR" = (
-/obj/structure/machinery/power/apc{
- dir = 1;
- name = "Research APC";
- pixel_y = 30;
- start_charge = 0
- },
/obj/structure/machinery/light/small{
dir = 1
},
/obj/structure/surface/table,
/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
+/obj/structure/machinery/power/apc/nocharge{
+ dir = 1
+ },
/turf/open/floor{
dir = 5;
icon_state = "whitepurple"
},
/area/lv624/lazarus/research)
"aAS" = (
-/obj/structure/machinery/power/apc{
- dir = 1;
- name = "Men's Dorms APC";
- pixel_y = 30;
- start_charge = 0
- },
/obj/structure/surface/table,
/obj/item/toy/deck,
/obj/item/storage/fancy/cigarettes/wypacket,
/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
+/obj/structure/machinery/power/apc/nocharge{
+ dir = 1
+ },
/turf/open/floor{
icon_state = "bluecorner"
},
@@ -6068,12 +6052,6 @@
/obj/structure/machinery/light/small{
dir = 4
},
-/obj/structure/machinery/power/apc{
- dir = 4;
- name = "Women's Dorms APC";
- pixel_x = 30;
- start_charge = 0
- },
/turf/open/floor{
dir = 9;
icon_state = "purple"
@@ -6498,11 +6476,8 @@
},
/area/lv624/lazarus/sleep_female)
"aDE" = (
-/obj/structure/machinery/power/apc{
- dir = 8;
- name = "Storage Pods APC";
- pixel_x = -30;
- start_charge = 0
+/obj/structure/machinery/power/apc/nocharge{
+ dir = 8
},
/turf/open/floor/vault,
/area/lv624/lazarus/quartstorage)
@@ -6682,11 +6657,8 @@
/obj/structure/machinery/light/small{
dir = 1
},
-/obj/structure/machinery/power/apc{
- dir = 1;
- name = "Unisex Bathrooms APC";
- pixel_y = 30;
- start_charge = 0
+/obj/structure/machinery/power/apc/nocharge{
+ dir = 8
},
/turf/open/floor{
icon_state = "freezerfloor"
@@ -6779,15 +6751,12 @@
},
/area/lv624/ground/caves/north_central_caves)
"aEK" = (
-/obj/structure/machinery/power/apc{
- dir = 1;
- name = "Chapel APC";
- pixel_y = 30;
- start_charge = 0
- },
/obj/structure/pipes/standard/simple/hidden/cyan{
dir = 4
},
+/obj/structure/machinery/power/apc/nocharge{
+ dir = 1
+ },
/turf/open/floor{
dir = 1;
icon_state = "chapel"
@@ -6915,16 +6884,13 @@
},
/area/lv624/lazarus/quart)
"aEZ" = (
-/obj/structure/machinery/power/apc{
- dir = 1;
- name = "Quartermaster APC";
- pixel_y = 30;
- start_charge = 0
- },
/obj/structure/largecrate/random,
/obj/structure/pipes/standard/simple/hidden/cyan{
dir = 4
},
+/obj/structure/machinery/power/apc/nocharge{
+ dir = 1
+ },
/turf/open/floor{
dir = 4;
icon_state = "whiteyellowfull"
@@ -7756,15 +7722,12 @@
},
/area/lv624/lazarus/main_hall)
"aIh" = (
-/obj/structure/machinery/power/apc{
- dir = 1;
- name = "Central Hallway APC";
- pixel_y = 30;
- start_charge = 0
- },
/obj/structure/surface/table,
/obj/effect/landmark/crap_item,
/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
+/obj/structure/machinery/power/apc/nocharge{
+ dir = 1
+ },
/turf/open/floor{
icon_state = "white"
},
@@ -8313,9 +8276,8 @@
/area/lv624/lazarus/yggdrasil)
"aKq" = (
/obj/structure/flora/jungle/vines/light_1,
-/obj/structure/machinery/power/apc{
- dir = 1;
- name = "Atmospherics Processing APC"
+/obj/structure/machinery/power/apc/nocharge{
+ dir = 1
},
/turf/open/gm/grass/grass2,
/area/lv624/lazarus/yggdrasil)
@@ -9003,9 +8965,8 @@
},
/area/lv624/lazarus/security)
"aNR" = (
-/obj/structure/machinery/power/apc{
- dir = 1;
- name = "Security Office APC"
+/obj/structure/machinery/power/apc/nocharge{
+ dir = 1
},
/turf/open/floor{
icon_state = "red"
@@ -9148,11 +9109,8 @@
/turf/open/gm/dirt,
/area/lv624/ground/jungle/east_central_jungle)
"aOy" = (
-/obj/structure/machinery/power/apc{
- dir = 8;
- name = "Secure Vault APC";
- pixel_x = -28;
- start_charge = 0
+/obj/structure/machinery/power/apc/nocharge{
+ dir = 8
},
/turf/open/floor{
icon_state = "cult"
@@ -9400,7 +9358,7 @@
/area/lv624/lazarus/security)
"aPv" = (
/obj/structure/surface/table/reinforced/prison,
-/obj/item/handcuffs,
+/obj/item/restraint/handcuffs,
/obj/item/storage/firstaid/adv,
/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
/turf/open/floor{
@@ -9775,11 +9733,8 @@
},
/area/lv624/lazarus/kitchen)
"aQQ" = (
-/obj/structure/machinery/power/apc{
- dir = 8;
- name = "Cafeteria APC";
- pixel_x = -28;
- start_charge = 0
+/obj/structure/machinery/power/apc/nocharge{
+ dir = 8
},
/turf/open/floor{
icon_state = "bar"
@@ -10128,11 +10083,8 @@
},
/area/lv624/ground/caves/south_east_caves)
"aSq" = (
-/obj/structure/machinery/power/apc{
- dir = 8;
- name = "Commandant's Quarters APC";
- pixel_x = -28;
- start_charge = 0
+/obj/structure/machinery/power/apc/nocharge{
+ dir = 8
},
/turf/open/floor{
icon_state = "grimy"
@@ -10483,7 +10435,6 @@
"aTJ" = (
/obj/structure/machinery/power/apc{
dir = 1;
- name = "Telecomms APC";
start_charge = 15
},
/turf/open/floor{
@@ -10594,8 +10545,7 @@
"aUc" = (
/obj/structure/surface/rack,
/obj/structure/machinery/power/apc{
- dir = 1;
- name = "Kitchen APC"
+ dir = 1
},
/turf/open/floor{
icon_state = "freezerfloor"
@@ -10748,18 +10698,6 @@
icon_state = "grimy"
},
/area/lv624/lazarus/hop)
-"aUF" = (
-/obj/structure/pipes/standard/simple/hidden/cyan{
- dir = 4
- },
-/obj/structure/machinery/power/apc{
- dir = 1;
- name = "Research Director's APC"
- },
-/turf/open/floor{
- icon_state = "grimy"
- },
-/area/lv624/lazarus/hop)
"aUG" = (
/obj/structure/pipes/standard/simple/hidden/cyan{
dir = 4
@@ -10823,8 +10761,6 @@
"aUR" = (
/obj/structure/machinery/power/apc{
dir = 1;
- name = "Secure Vault APC";
- pixel_y = 30;
start_charge = 200
},
/turf/open/floor/greengrid,
@@ -11562,10 +11498,8 @@
/area/lv624/ground/jungle/east_central_jungle)
"aXs" = (
/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/power/apc{
- dir = 1;
- name = "Geothermal APC";
- start_charge = 0
+/obj/structure/machinery/power/apc/nocharge{
+ dir = 1
},
/turf/open/floor{
icon_state = "delivery"
@@ -14779,9 +14713,7 @@
/turf/open/gm/dirt,
/area/lv624/ground/caves/south_central_caves)
"fqM" = (
-/obj/structure/machinery/power/apc{
- start_charge = 0
- },
+/obj/structure/machinery/power/apc/nocharge,
/turf/open/floor{
dir = 4;
icon_state = "asteroidwarning"
@@ -14881,6 +14813,7 @@
/area/lv624/lazarus/engineering)
"fAz" = (
/obj/structure/machinery/cm_vending/sorted/medical/no_access,
+/obj/structure/medical_supply_link,
/turf/open/floor{
icon_state = "whitebluefull"
},
@@ -14951,9 +14884,7 @@
/turf/open/floor/plating,
/area/lv624/lazarus/engineering)
"fFZ" = (
-/obj/structure/machinery/power/apc{
- start_charge = 0
- },
+/obj/structure/machinery/power/apc/nocharge,
/turf/open/floor{
dir = 1;
icon_state = "asteroidfloor"
@@ -16668,6 +16599,15 @@
},
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/north_jungle)
+"jcb" = (
+/obj/structure/machinery/power/apc/nocharge{
+ dir = 4
+ },
+/turf/open/floor{
+ dir = 9;
+ icon_state = "purple"
+ },
+/area/lv624/lazarus/sleep_female)
"jcn" = (
/obj/effect/decal/grass_overlay/grass1{
dir = 8
@@ -17096,6 +17036,17 @@
/obj/effect/landmark/objective_landmark/far,
/turf/open/gm/dirt,
/area/lv624/ground/caves/sand_temple)
+"jQX" = (
+/obj/structure/pipes/standard/simple/hidden/cyan{
+ dir = 4
+ },
+/obj/structure/machinery/power/apc/nocharge{
+ dir = 1
+ },
+/turf/open/floor{
+ icon_state = "grimy"
+ },
+/area/lv624/lazarus/hop)
"jRm" = (
/turf/open/gm/dirt,
/area/lv624/ground/colony/north_nexus_road)
@@ -20098,11 +20049,8 @@
/turf/open/auto_turf/strata_grass/layer1,
/area/lv624/ground/barrens/north_east_barrens)
"pgf" = (
-/obj/structure/machinery/power/apc{
- dir = 1;
- name = "Medbay APC";
- pixel_y = 30;
- start_charge = 0
+/obj/structure/machinery/power/apc/nocharge{
+ dir = 1
},
/turf/open/floor{
dir = 1;
@@ -24688,10 +24636,10 @@
/area/lv624/ground/caves/east_caves)
"xwQ" = (
/obj/structure/surface/table/reinforced/prison,
-/obj/item/handcuffs/cable/white{
+/obj/item/restraint/adjustable/cable/white{
pixel_y = 4
},
-/obj/item/handcuffs/cable/white,
+/obj/item/restraint/adjustable/cable/white,
/turf/open/floor{
icon_state = "whiteyellow"
},
@@ -51067,7 +51015,7 @@ aSA
aSA
aTC
aQM
-aUF
+jQX
aVq
aVM
aSB
@@ -54914,7 +54862,7 @@ azw
aBg
azR
aCd
-aBC
+jcb
aDb
aOo
aDY
diff --git a/maps/map_files/LV624/armory/10.cheese.dmm b/maps/map_files/LV624/armory/10.cheese.dmm
index cee714b1c170..0864030e130b 100644
--- a/maps/map_files/LV624/armory/10.cheese.dmm
+++ b/maps/map_files/LV624/armory/10.cheese.dmm
@@ -151,12 +151,6 @@
},
/area/lv624/lazarus/security)
"u" = (
-/obj/structure/machinery/power/apc{
- dir = 8;
- name = "Secure Vault APC";
- pixel_x = -28;
- start_charge = 0
- },
/obj/structure/surface/rack,
/obj/item/reagent_container/food/snacks/cheesewedge/verymature{
pixel_x = -7;
@@ -169,6 +163,9 @@
/obj/item/reagent_container/food/snacks/cheesewedge/verymature{
pixel_y = 6
},
+/obj/structure/machinery/power/apc/nocharge{
+ dir = 8
+ },
/turf/open/floor{
icon_state = "cult"
},
diff --git a/maps/map_files/LV624/armory/10.extra.dmm b/maps/map_files/LV624/armory/10.extra.dmm
index 7086e945d1ad..3e6fa0c0d68b 100644
--- a/maps/map_files/LV624/armory/10.extra.dmm
+++ b/maps/map_files/LV624/armory/10.extra.dmm
@@ -168,11 +168,8 @@
},
/area/lv624/lazarus/security)
"u" = (
-/obj/structure/machinery/power/apc{
- dir = 8;
- name = "Secure Vault APC";
- pixel_x = -28;
- start_charge = 0
+/obj/structure/machinery/power/apc/nocharge{
+ dir = 8
},
/turf/open/floor{
icon_state = "cult"
diff --git a/maps/map_files/LV624/armory/10.looted.dmm b/maps/map_files/LV624/armory/10.looted.dmm
index b81e0660816d..1c619fad1678 100644
--- a/maps/map_files/LV624/armory/10.looted.dmm
+++ b/maps/map_files/LV624/armory/10.looted.dmm
@@ -135,11 +135,8 @@
},
/area/lv624/lazarus/security)
"u" = (
-/obj/structure/machinery/power/apc{
- dir = 8;
- name = "Secure Vault APC";
- pixel_x = -28;
- start_charge = 0
+/obj/structure/machinery/power/apc/nocharge{
+ dir = 8
},
/turf/open/floor{
icon_state = "cult"
diff --git a/maps/map_files/LV624/gym/20.pool.dmm b/maps/map_files/LV624/gym/20.pool.dmm
index be863f49c556..ab5a1afe46bb 100644
--- a/maps/map_files/LV624/gym/20.pool.dmm
+++ b/maps/map_files/LV624/gym/20.pool.dmm
@@ -221,13 +221,10 @@
},
/area/lv624/lazarus/fitness)
"Be" = (
-/obj/structure/machinery/power/apc{
- dir = 1;
- name = "Fitness APC";
- pixel_y = 30;
- start_charge = 0
- },
/obj/effect/decal/remains/human,
+/obj/structure/machinery/power/apc/nocharge{
+ dir = 1
+ },
/turf/open/floor{
dir = 4;
icon_state = "whitepurplecorner"
diff --git a/maps/map_files/LV624/gym/30.alternate.dmm b/maps/map_files/LV624/gym/30.alternate.dmm
index 79d0887c2219..466c996ef91d 100644
--- a/maps/map_files/LV624/gym/30.alternate.dmm
+++ b/maps/map_files/LV624/gym/30.alternate.dmm
@@ -658,11 +658,8 @@
/turf/open/floor/plating,
/area/lv624/lazarus/fitness)
"Wy" = (
-/obj/structure/machinery/power/apc{
- dir = 1;
- name = "Fitness APC";
- pixel_y = 30;
- start_charge = 0
+/obj/structure/machinery/power/apc/nocharge{
+ dir = 1
},
/turf/open/floor{
dir = 4;
diff --git a/maps/map_files/LV624/maintemple/1.intact.dmm b/maps/map_files/LV624/maintemple/1.intact.dmm
index 8f7c741d80c6..ea69a6c4c787 100644
--- a/maps/map_files/LV624/maintemple/1.intact.dmm
+++ b/maps/map_files/LV624/maintemple/1.intact.dmm
@@ -515,7 +515,7 @@
/obj/structure/surface/table/reinforced/prison{
color = "#6b675e"
},
-/obj/item/restraints,
+/obj/item/xeno_restraints,
/obj/effect/landmark/objective_landmark/close,
/turf/open/floor/strata{
color = "#5e5d5d";
diff --git a/maps/map_files/LV624/medbay/10.destroyed.dmm b/maps/map_files/LV624/medbay/10.destroyed.dmm
index 88e17a3aeee0..b33c4c28d8c2 100644
--- a/maps/map_files/LV624/medbay/10.destroyed.dmm
+++ b/maps/map_files/LV624/medbay/10.destroyed.dmm
@@ -48,11 +48,8 @@
},
/area/lv624/lazarus/medbay)
"hW" = (
-/obj/structure/machinery/power/apc{
- dir = 1;
- name = "Medbay APC";
- pixel_y = 30;
- start_charge = 0
+/obj/structure/machinery/power/apc/nocharge{
+ dir = 1
},
/turf/open/floor{
icon_state = "white"
diff --git a/maps/map_files/LV624/medbay/30.larvasurgery.dmm b/maps/map_files/LV624/medbay/30.larvasurgery.dmm
index b67b5e7bf1c5..4f0bf7a041ec 100644
--- a/maps/map_files/LV624/medbay/30.larvasurgery.dmm
+++ b/maps/map_files/LV624/medbay/30.larvasurgery.dmm
@@ -363,14 +363,11 @@
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/north_west_jungle)
"qP" = (
-/obj/structure/machinery/power/apc{
- dir = 1;
- name = "Medbay APC";
- pixel_y = 30;
- start_charge = 0
- },
/obj/effect/landmark/corpsespawner/colonist/random/burst,
/obj/effect/decal/cleanable/blood,
+/obj/structure/machinery/power/apc/nocharge{
+ dir = 1
+ },
/turf/open/floor{
dir = 1;
icon_state = "whiteblue"
diff --git a/maps/map_files/LV624/science/10.yautja.dmm b/maps/map_files/LV624/science/10.yautja.dmm
index 04e671be3259..3d70df608c1f 100644
--- a/maps/map_files/LV624/science/10.yautja.dmm
+++ b/maps/map_files/LV624/science/10.yautja.dmm
@@ -266,12 +266,6 @@
},
/area/lv624/lazarus/research)
"aL" = (
-/obj/structure/machinery/power/apc{
- dir = 1;
- name = "Research APC";
- pixel_y = 30;
- start_charge = 0
- },
/obj/structure/machinery/light/small{
dir = 1
},
@@ -516,6 +510,16 @@
icon_state = "freezerfloor"
},
/area/lv624/lazarus/research)
+"Hj" = (
+/obj/effect/landmark/crap_item,
+/obj/structure/machinery/power/apc/nocharge{
+ dir = 1
+ },
+/turf/open/floor{
+ dir = 5;
+ icon_state = "whitepurple"
+ },
+/area/lv624/lazarus/research)
"Lo" = (
/obj/effect/decal/cleanable/blood/splatter,
/obj/effect/decal/remains/human,
@@ -724,7 +728,7 @@ Zw
al
aE
ab
-ec
+Hj
ak
al
ab
diff --git a/maps/map_files/LV624/science/40.fullylocked.dmm b/maps/map_files/LV624/science/40.fullylocked.dmm
index 933de359a481..ae7fffe8efd9 100644
--- a/maps/map_files/LV624/science/40.fullylocked.dmm
+++ b/maps/map_files/LV624/science/40.fullylocked.dmm
@@ -310,12 +310,6 @@
},
/area/lv624/lazarus/research)
"aS" = (
-/obj/structure/machinery/power/apc{
- dir = 1;
- name = "Research APC";
- pixel_y = 30;
- start_charge = 0
- },
/obj/structure/machinery/light/small{
dir = 1
},
@@ -455,6 +449,15 @@
icon_state = "whitepurple"
},
/area/lv624/lazarus/research)
+"Fm" = (
+/obj/structure/machinery/power/apc/nocharge{
+ dir = 1
+ },
+/turf/open/floor{
+ dir = 5;
+ icon_state = "whitepurple"
+ },
+/area/lv624/lazarus/research)
"Jv" = (
/obj/effect/landmark/corpsespawner/scientist,
/obj/effect/decal/cleanable/blood/splatter,
@@ -663,7 +666,7 @@ Mu
ay
aJ
ab
-ay
+Fm
ak
ay
ab
diff --git a/maps/map_files/LV624/standalone/clfship.dmm b/maps/map_files/LV624/standalone/clfship.dmm
index c24a511cfc29..090ad40084f7 100644
--- a/maps/map_files/LV624/standalone/clfship.dmm
+++ b/maps/map_files/LV624/standalone/clfship.dmm
@@ -1328,11 +1328,11 @@
"IP" = (
/obj/structure/bed,
/obj/item/bedsheet/yellow,
-/obj/item/handcuffs{
+/obj/item/restraint/handcuffs{
pixel_x = 4;
pixel_y = 4
},
-/obj/item/handcuffs,
+/obj/item/restraint/handcuffs,
/turf/open/floor/almayer{
dir = 6;
icon_state = "green"
@@ -1601,12 +1601,10 @@
},
/area/lv624/lazarus/crashed_ship)
"Px" = (
+/obj/structure/machinery/autolathe,
/obj/structure/machinery/power/apc{
- dir = 1;
- name = "Crashed Ship APC";
- pixel_y = 25
+ dir = 1
},
-/obj/structure/machinery/autolathe,
/turf/open/floor/almayer{
dir = 9;
icon_state = "orange"
diff --git a/maps/map_files/LV624/standalone/corporatedome.dmm b/maps/map_files/LV624/standalone/corporatedome.dmm
index 0778d0c61564..9c3eddbac441 100644
--- a/maps/map_files/LV624/standalone/corporatedome.dmm
+++ b/maps/map_files/LV624/standalone/corporatedome.dmm
@@ -1216,7 +1216,7 @@
"ZG" = (
/obj/effect/decal/cleanable/blood,
/obj/effect/landmark/corpsespawner/scientist,
-/obj/item/handcuffs,
+/obj/item/restraint/handcuffs,
/turf/open/floor{
icon_state = "dark"
},
diff --git a/maps/map_files/New_Varadero/New_Varadero.dmm b/maps/map_files/New_Varadero/New_Varadero.dmm
index fbcba0174790..e0d689cf1c8c 100644
--- a/maps/map_files/New_Varadero/New_Varadero.dmm
+++ b/maps/map_files/New_Varadero/New_Varadero.dmm
@@ -1890,9 +1890,7 @@
/area/varadero/interior/hall_N)
"bhU" = (
/obj/structure/machinery/floodlight{
- name = "Floodlight";
- unacidable = 0;
- wrenchable = 1
+ name = "Floodlight"
},
/obj/structure/platform_decoration/kutjevo{
dir = 8
@@ -2319,7 +2317,7 @@
pixel_x = -5;
pixel_y = 1
},
-/obj/item/handcuffs{
+/obj/item/restraint/handcuffs{
pixel_x = 2;
pixel_y = 16
},
@@ -2877,7 +2875,7 @@
},
/area/varadero/interior/chapel)
"bPL" = (
-/obj/item/handcuffs{
+/obj/item/restraint/handcuffs{
pixel_x = 2;
pixel_y = 16
},
@@ -10659,9 +10657,7 @@
/area/varadero/interior/security)
"gRU" = (
/obj/structure/machinery/floodlight{
- name = "Floodlight";
- unacidable = 0;
- wrenchable = 1
+ name = "Floodlight"
},
/turf/open/auto_turf/sand_white/layer1,
/area/varadero/interior_protected/caves/digsite)
@@ -13796,9 +13792,7 @@
/area/varadero/interior/administration)
"iWX" = (
/obj/structure/machinery/floodlight{
- name = "Floodlight";
- unacidable = 0;
- wrenchable = 1
+ name = "Floodlight"
},
/turf/open/auto_turf/sand_white/layer1,
/area/varadero/exterior/eastbeach)
@@ -19282,9 +19276,7 @@
/area/varadero/interior/cargo)
"mtp" = (
/obj/structure/machinery/floodlight{
- name = "Floodlight";
- unacidable = 0;
- wrenchable = 1
+ name = "Floodlight"
},
/turf/open/floor/plating/icefloor{
icon_state = "asteroidplating"
@@ -19372,9 +19364,7 @@
/area/varadero/interior/hall_SE)
"mvO" = (
/obj/structure/machinery/floodlight{
- name = "Floodlight";
- unacidable = 0;
- wrenchable = 1
+ name = "Floodlight"
},
/turf/open/floor/shiva{
dir = 1;
@@ -19887,9 +19877,7 @@
dir = 1
},
/obj/structure/machinery/floodlight{
- name = "Floodlight";
- unacidable = 0;
- wrenchable = 1
+ name = "Floodlight"
},
/turf/open/floor/shiva{
dir = 1;
@@ -22001,7 +21989,7 @@
/area/varadero/interior/hall_SE)
"ohi" = (
/obj/structure/surface/table/reinforced/prison,
-/obj/item/handcuffs,
+/obj/item/restraint/handcuffs,
/obj/structure/machinery/flasher_button{
id = "sec_checkpoint";
pixel_y = 24
@@ -27273,6 +27261,7 @@
/area/varadero/interior/caves/east)
"rsh" = (
/obj/structure/machinery/cm_vending/sorted/medical/no_access,
+/obj/structure/medical_supply_link,
/turf/open/floor/shiva{
dir = 9;
icon_state = "wred"
@@ -28073,7 +28062,7 @@
/area/varadero/interior/caves/east)
"rTu" = (
/obj/structure/surface/table/woodentable,
-/obj/item/handcuffs,
+/obj/item/restraint/handcuffs,
/obj/item/weapon/baton,
/turf/open/floor/wood,
/area/varadero/interior/security)
@@ -33857,7 +33846,7 @@
"vEa" = (
/obj/structure/closet/crate/medical,
/obj/item/tool/wirecutters/clippers,
-/obj/item/handcuffs/zip,
+/obj/item/restraint/handcuffs/zip,
/obj/item/tool/surgery/surgicaldrill,
/obj/item/storage/firstaid/adv,
/turf/open/floor/shiva{
diff --git a/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm b/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm
index c781fdff23cc..db1f07a8b3b1 100644
--- a/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm
+++ b/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm
@@ -33534,6 +33534,7 @@
/area/strata/ag/interior/outpost/med)
"jsd" = (
/obj/structure/machinery/cm_vending/sorted/medical/no_access,
+/obj/structure/medical_supply_link,
/turf/open/floor/strata{
icon_state = "floor2"
},
@@ -40148,7 +40149,7 @@
"ulv" = (
/obj/structure/surface/rack,
/obj/item/weapon/gun/pistol/t73,
-/obj/item/handcuffs,
+/obj/item/restraint/handcuffs,
/turf/open/floor/strata{
icon_state = "red1"
},
diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm
index b55d0b716e57..4d84eb26487f 100644
--- a/maps/map_files/USS_Almayer/USS_Almayer.dmm
+++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm
@@ -522,18 +522,6 @@
},
/turf/open/floor/wood/ship,
/area/almayer/living/basketball)
-"acJ" = (
-/mob/living/silicon/decoy/ship_ai{
- layer = 2.98;
- pixel_y = -16
- },
-/obj/structure/blocker/invisible_wall,
-/obj/effect/decal/warning_stripes{
- icon_state = "E";
- pixel_x = 1
- },
-/turf/open/floor/almayer/aicore/no_build,
-/area/almayer/command/airoom)
"acK" = (
/obj/structure/desertdam/decals/road_edge{
pixel_x = 2
@@ -1487,6 +1475,9 @@
name = "\improper Officer's Cafeteria"
},
/obj/structure/machinery/door/firedoor/border_only/almayer,
+/obj/structure/pipes/standard/simple/hidden/supply{
+ dir = 4
+ },
/turf/open/floor/almayer{
icon_state = "test_floor4"
},
@@ -1506,7 +1497,7 @@
/area/almayer/living/cafeteria_officer)
"ain" = (
/obj/structure/pipes/standard/simple/hidden/supply{
- dir = 5
+ dir = 9
},
/turf/open/floor/almayer{
icon_state = "plate"
@@ -1662,10 +1653,6 @@
icon_state = "mono"
},
/area/almayer/lifeboat_pumps/north1)
-"ajJ" = (
-/obj/structure/window/framed/almayer,
-/turf/open/floor/plating,
-/area/almayer/living/cafeteria_officer)
"ajM" = (
/obj/structure/window/framed/almayer,
/obj/structure/machinery/door/poddoor/almayer/open{
@@ -2682,18 +2669,6 @@
icon_state = "tcomms"
},
/area/almayer/command/telecomms)
-"aqe" = (
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
-/obj/structure/machinery/door/firedoor/border_only/almayer{
- dir = 1
- },
-/turf/open/floor/almayer{
- icon_state = "test_floor4"
- },
-/area/almayer/engineering/upper_engineering)
"aqf" = (
/obj/structure/pipes/vents/pump{
dir = 4
@@ -2702,19 +2677,15 @@
/area/almayer/engineering/upper_engineering)
"aqg" = (
/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/disposalpipe/junction,
/obj/structure/machinery/door/firedoor/border_only/almayer{
dir = 1
},
+/obj/structure/disposalpipe/segment,
/turf/open/floor/almayer{
icon_state = "test_floor4"
},
/area/almayer/engineering/upper_engineering)
"aqh" = (
-/obj/structure/pipes/standard/manifold/hidden/supply{
- dir = 4
- },
-/obj/structure/disposalpipe/segment,
/obj/structure/flora/pottedplant{
icon_state = "pottedplant_21"
},
@@ -2726,15 +2697,6 @@
icon_state = "orange"
},
/area/almayer/engineering/upper_engineering)
-"aqj" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/window/framed/almayer,
-/obj/structure/machinery/door/firedoor/border_only/almayer{
- dir = 1
- },
-/turf/open/floor/plating,
-/area/almayer/engineering/upper_engineering)
"aqm" = (
/obj/item/bedsheet/brown,
/obj/structure/bed,
@@ -2816,6 +2778,10 @@
icon_state = "test_floor4"
},
/area/almayer/living/pilotbunks)
+"aqB" = (
+/obj/structure/blocker/fuelpump,
+/turf/open/floor/almayer,
+/area/almayer/lifeboat_pumps/south1)
"aqF" = (
/obj/structure/flora/pottedplant{
icon_state = "pottedplant_10"
@@ -3026,15 +2992,8 @@
name = "General Listening Channel";
pixel_y = 28
},
-/turf/open/floor/almayer{
- dir = 1;
- icon_state = "orange"
- },
-/area/almayer/engineering/upper_engineering)
-"arw" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/disposalpipe/junction{
- dir = 1
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
/turf/open/floor/almayer{
dir = 1;
@@ -3222,34 +3181,12 @@
/obj/structure/pipes/standard/simple/hidden/supply,
/turf/open/floor/almayer,
/area/almayer/lifeboat_pumps/north2)
-"asD" = (
-/obj/effect/step_trigger/clone_cleaner,
-/obj/structure/machinery/door_control{
- id = "ARES StairsUpper";
- name = "ARES Core Access";
- pixel_x = -24;
- pixel_y = 24;
- req_one_access_txt = "90;91;92"
- },
-/turf/open/floor/almayer/aicore/no_build,
-/area/almayer/command/airoom)
"asE" = (
/obj/structure/bed/chair/office/dark{
dir = 8
},
/turf/open/floor/almayer,
/area/almayer/hallways/lower/repair_bay)
-"asF" = (
-/obj/structure/machinery/door/airlock/almayer/secure/reinforced{
- access_modified = 1;
- name = "\improper AI Reception";
- req_access = null;
- req_one_access_txt = "91;92"
- },
-/turf/open/floor/almayer/no_build{
- icon_state = "test_floor4"
- },
-/area/almayer/command/airoom)
"asH" = (
/obj/structure/machinery/telecomms/bus/preset_three,
/turf/open/floor/almayer{
@@ -3599,12 +3536,6 @@
/obj/structure/pipes/standard/simple/hidden/supply/no_boom,
/turf/closed/wall/almayer/aicore/hull,
/area/almayer/command/airoom)
-"aug" = (
-/obj/structure/bed/chair/office/dark{
- dir = 8
- },
-/turf/open/floor/almayer/aicore/no_build,
-/area/almayer/command/airoom)
"aui" = (
/obj/structure/machinery/telecomms/hub/preset,
/turf/open/floor/almayer{
@@ -3883,66 +3814,6 @@
icon_state = "test_floor4"
},
/area/almayer/powered)
-"avL" = (
-/obj/structure/machinery/door_control{
- id = "ARES StairsUpper";
- name = "ARES Core Access";
- pixel_x = -10;
- pixel_y = -24;
- req_one_access_txt = "91;92"
- },
-/obj/structure/machinery/door_control{
- id = "ARES StairsLock";
- name = "ARES Exterior Lockdown";
- pixel_y = -24;
- req_one_access_txt = "91;92"
- },
-/obj/structure/surface/table/reinforced/almayer_B{
- climbable = 0;
- indestructible = 1;
- unacidable = 1;
- unslashable = 1
- },
-/obj/structure/transmitter/rotary{
- name = "AI Reception Telephone";
- phone_category = "ARES";
- phone_color = "blue";
- phone_id = "AI Reception"
- },
-/obj/structure/machinery/door_control{
- id = "ARES Emergency";
- name = "ARES Emergency Lockdown";
- pixel_x = 10;
- pixel_y = -24;
- req_one_access_txt = "91;92"
- },
-/turf/open/floor/almayer/aicore/no_build,
-/area/almayer/command/airoom)
-"avM" = (
-/obj/structure/machinery/computer/cameras/almayer{
- dir = 8;
- pixel_x = 17;
- pixel_y = 8
- },
-/obj/structure/surface/table/reinforced/almayer_B{
- climbable = 0;
- indestructible = 1;
- unacidable = 1;
- unslashable = 1
- },
-/obj/item/paper_bin/uscm{
- pixel_y = 6
- },
-/obj/item/tool/pen,
-/obj/structure/machinery/computer/cameras/almayer/ares{
- dir = 8;
- pixel_x = 17;
- pixel_y = -6
- },
-/turf/open/floor/almayer/no_build{
- icon_state = "ai_floors"
- },
-/area/almayer/command/airoom)
"avN" = (
/obj/structure/machinery/telecomms/processor/preset_two,
/turf/open/floor/almayer{
@@ -4539,27 +4410,8 @@
icon_state = "red"
},
/area/almayer/lifeboat_pumps/north2)
-"ayd" = (
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
-/obj/structure/pipes/standard/simple/hidden/supply{
- dir = 5
- },
-/turf/open/floor/almayer{
- dir = 4;
- icon_state = "orangecorner"
- },
-/area/almayer/engineering/upper_engineering)
"aye" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/structure/bed/chair,
-/obj/structure/pipes/standard/simple/hidden/supply{
- dir = 4
- },
/turf/open/floor/almayer{
dir = 1;
icon_state = "orange"
@@ -5323,12 +5175,11 @@
/turf/open/floor/plating/plating_catwalk,
/area/almayer/engineering/upper_engineering)
"aBl" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
+/obj/structure/pipes/standard/simple/hidden/supply{
+ dir = 4
},
-/obj/structure/pipes/standard/manifold/hidden/supply{
- dir = 1
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
/turf/open/floor/almayer,
/area/almayer/engineering/upper_engineering)
@@ -5720,8 +5571,6 @@
},
/area/almayer/engineering/upper_engineering)
"aDh" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/disposalpipe/segment,
/turf/open/floor/almayer{
icon_state = "cargo"
},
@@ -6169,11 +6018,9 @@
/turf/open/floor/plating/plating_catwalk,
/area/almayer/command/telecomms)
"aFl" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/machinery/door/firedoor/border_only/almayer{
dir = 2
},
-/obj/structure/pipes/standard/simple/hidden/supply,
/turf/open/floor/almayer{
icon_state = "test_floor4"
},
@@ -6557,19 +6404,6 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/command/telecomms)
-"aHt" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
-/obj/structure/pipes/standard/simple/hidden/supply{
- dir = 9
- },
-/turf/open/floor/almayer{
- dir = 5;
- icon_state = "orange"
- },
-/area/almayer/engineering/upper_engineering)
"aHu" = (
/obj/structure/pipes/standard/simple/hidden/supply,
/obj/effect/decal/warning_stripes{
@@ -7343,11 +7177,11 @@
req_one_access_txt = "3;22;2;19;7"
},
/obj/structure/surface/rack,
-/obj/item/rappel_harness{
+/obj/item/parachute{
pixel_y = 8
},
-/obj/item/rappel_harness,
-/obj/item/rappel_harness{
+/obj/item/parachute,
+/obj/item/parachute{
pixel_y = -6
},
/obj/structure/sign/safety/bulkhead_door{
@@ -9728,16 +9562,6 @@
icon_state = "dark_sterile"
},
/area/almayer/medical/operating_room_one)
-"bat" = (
-/obj/structure/machinery/door_control{
- id = "ARES Mainframe Right";
- name = "ARES Mainframe Lockdown";
- pixel_x = -24;
- pixel_y = -24;
- req_one_access_txt = "200;91;92"
- },
-/turf/open/floor/almayer/aicore/no_build,
-/area/almayer/command/airoom)
"baw" = (
/turf/open/floor/almayer,
/area/almayer/lifeboat_pumps/south1)
@@ -9899,13 +9723,6 @@
},
/turf/open/floor/almayer,
/area/almayer/shipboard/starboard_missiles)
-"bbX" = (
-/obj/effect/decal/cleanable/blood/oil,
-/obj/structure/machinery/constructable_frame,
-/turf/open/floor/almayer{
- icon_state = "mono"
- },
-/area/almayer/lifeboat_pumps/north2)
"bbY" = (
/obj/structure/machinery/cm_vending/clothing/smartgun/alpha,
/turf/open/floor/almayer{
@@ -10348,14 +10165,6 @@
icon_state = "dark_sterile"
},
/area/almayer/medical/chemistry)
-"bek" = (
-/obj/structure/machinery/cm_vending/sorted/medical/marinemed,
-/obj/structure/medical_supply_link,
-/turf/open/floor/almayer{
- dir = 1;
- icon_state = "sterile_green_side"
- },
-/area/almayer/medical/lower_medical_lobby)
"ben" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 4
@@ -10940,23 +10749,6 @@
icon_state = "red"
},
/area/almayer/squads/alpha)
-"bha" = (
-/obj/structure/machinery/door_control{
- id = "ARES StairsLower";
- name = "ARES Core Lockdown";
- pixel_x = 24;
- pixel_y = -8;
- req_one_access_txt = "90;91;92"
- },
-/obj/structure/machinery/camera/autoname/almayer/containment/ares{
- dir = 8;
- pixel_y = 2
- },
-/turf/open/floor/almayer/aicore/no_build{
- dir = 4;
- icon_state = "ai_silver"
- },
-/area/almayer/command/airoom)
"bhf" = (
/obj/structure/machinery/light{
dir = 4
@@ -12871,12 +12663,6 @@
},
/turf/open/floor/almayer,
/area/almayer/lifeboat_pumps/north1)
-"bvd" = (
-/obj/structure/machinery/constructable_frame,
-/turf/open/floor/almayer{
- icon_state = "mono"
- },
-/area/almayer/lifeboat_pumps/north1)
"bve" = (
/obj/structure/disposalpipe/segment,
/obj/effect/decal/warning_stripes{
@@ -14304,6 +14090,15 @@
icon_state = "red"
},
/area/almayer/shipboard/weapon_room)
+"bFg" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "W";
+ layer = 3.3
+ },
+/turf/open/floor/almayer/aicore/no_build{
+ icon_state = "ai_floor2"
+ },
+/area/almayer/command/airoom)
"bFj" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 4
@@ -14745,15 +14540,7 @@
name = "\improper ARES Mainframe Shutters";
plane = -7
},
-/obj/structure/machinery/door/poddoor/almayer/blended/aicore/open{
- closed_layer = 3.2;
- id = "ARES Emergency";
- layer = 3.2;
- name = "ARES Emergency Lockdown";
- needs_power = 0;
- open_layer = 1.9;
- plane = -7
- },
+/obj/structure/machinery/door/poddoor/almayer/blended/ai_lockdown/aicore,
/turf/open/floor/almayer/no_build{
icon_state = "test_floor4"
},
@@ -15386,6 +15173,13 @@
},
/turf/open/floor/almayer,
/area/almayer/hallways/lower/starboard_midship_hallway)
+"bMg" = (
+/obj/structure/pipes/vents/pump/no_boom/gas{
+ vent_tag = "Synth Bay";
+ dir = 8
+ },
+/turf/open/floor/almayer/aicore/no_build,
+/area/almayer/command/airoom)
"bMq" = (
/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep,
/obj/structure/machinery/light{
@@ -16764,12 +16558,6 @@
icon_state = "blue"
},
/area/almayer/squads/delta)
-"bUx" = (
-/obj/structure/machinery/light/small{
- dir = 8
- },
-/turf/open/floor/plating,
-/area/almayer/command/airoom)
"bUy" = (
/obj/structure/closet/crate/ammo,
/obj/structure/machinery/light/small,
@@ -17295,6 +17083,21 @@
/obj/structure/pipes/standard/simple/hidden/supply,
/turf/open/floor/plating/plating_catwalk,
/area/almayer/hallways/lower/starboard_midship_hallway)
+"bZq" = (
+/obj/effect/projector{
+ name = "Almayer_AresUp";
+ vector_x = -96;
+ vector_y = 65
+ },
+/obj/structure/platform{
+ dir = 8
+ },
+/obj/structure/stairs{
+ dir = 1;
+ icon_state = "ramptop"
+ },
+/turf/open/floor/almayer/aicore/no_build,
+/area/almayer/command/airoom)
"bZr" = (
/turf/open/floor/almayer{
dir = 1;
@@ -17781,6 +17584,10 @@
icon_state = "test_floor4"
},
/area/almayer/maint/upper/u_m_s)
+"cea" = (
+/obj/structure/machinery/fuelpump,
+/turf/open/floor/almayer,
+/area/almayer/lifeboat_pumps/south2)
"ceg" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 4
@@ -18515,14 +18322,6 @@
icon_state = "test_floor4"
},
/area/almayer/engineering/lower/engine_core)
-"cla" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/almayer{
- icon_state = "orangecorner"
- },
-/area/almayer/hallways/upper/aft_hallway)
"cle" = (
/turf/open/floor/almayer{
dir = 4;
@@ -18936,12 +18735,6 @@
icon_state = "red"
},
/area/almayer/hallways/upper/port)
-"cnp" = (
-/obj/structure/machinery/light{
- dir = 4
- },
-/turf/open/floor/almayer/aicore/no_build,
-/area/almayer/command/airoom)
"cnq" = (
/obj/structure/machinery/line_nexter{
id = "line1";
@@ -19279,6 +19072,12 @@
/obj/structure/window/framed/almayer/hull/hijack_bustable,
/turf/open/floor/plating,
/area/almayer/squads/req)
+"cpP" = (
+/obj/structure/blocker/fuelpump,
+/turf/open/floor/almayer{
+ icon_state = "mono"
+ },
+/area/almayer/lifeboat_pumps/north1)
"cqd" = (
/obj/effect/decal/warning_stripes{
icon_state = "S"
@@ -19692,6 +19491,16 @@
icon_state = "orange"
},
/area/almayer/maint/upper/mess)
+"cyP" = (
+/obj/structure/machinery/cm_vending/clothing/intelligence_officer{
+ density = 0;
+ pixel_x = -32
+ },
+/turf/open/floor/almayer{
+ dir = 8;
+ icon_state = "silver"
+ },
+/area/almayer/command/securestorage)
"cyR" = (
/obj/structure/bed/chair{
dir = 8
@@ -19814,21 +19623,6 @@
icon_state = "cargo"
},
/area/almayer/engineering/upper_engineering/port)
-"cBm" = (
-/obj/effect/projector{
- name = "Almayer_AresUp";
- vector_x = -97;
- vector_y = 65
- },
-/obj/structure/platform{
- dir = 4
- },
-/obj/structure/stairs{
- dir = 1;
- icon_state = "ramptop"
- },
-/turf/open/floor/almayer/aicore/no_build,
-/area/almayer/command/airoom)
"cBs" = (
/obj/structure/bed/chair,
/obj/effect/decal/warning_stripes{
@@ -20052,6 +19846,24 @@
icon_state = "mono"
},
/area/almayer/hallways/upper/fore_hallway)
+"cFg" = (
+/obj/structure/stairs{
+ dir = 1;
+ icon_state = "ramptop"
+ },
+/obj/effect/projector{
+ name = "Almayer_AresUp2";
+ vector_x = -102;
+ vector_y = 61
+ },
+/obj/structure/machinery/door_control{
+ id = "ARES ReceptStairs2";
+ name = "ARES Reception Stairway Shutters";
+ pixel_x = 24;
+ req_one_access_txt = "91;92"
+ },
+/turf/open/floor/almayer/aicore/no_build,
+/area/almayer/command/airoom)
"cFh" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 5
@@ -20258,10 +20070,37 @@
icon_state = "plate"
},
/area/almayer/living/pilotbunks)
+"cJv" = (
+/obj/structure/stairs{
+ dir = 1;
+ icon_state = "ramptop"
+ },
+/obj/effect/projector{
+ name = "Almayer_AresDown2";
+ vector_x = 102;
+ vector_y = -61
+ },
+/turf/open/floor/plating,
+/area/almayer/command/airoom)
"cJE" = (
/obj/structure/sign/prop2,
/turf/closed/wall/almayer,
/area/almayer/shipboard/sea_office)
+"cJI" = (
+/obj/structure/disposalpipe/trunk{
+ dir = 1
+ },
+/obj/structure/machinery/disposal/delivery{
+ density = 0;
+ desc = "A pneumatic delivery unit.";
+ icon_state = "delivery_engi";
+ name = "Returns";
+ pixel_y = 28;
+ pixel_x = 25
+ },
+/obj/structure/surface/rack,
+/turf/open/floor/almayer/aicore/no_build,
+/area/almayer/command/airoom)
"cJK" = (
/obj/effect/decal/warning_stripes{
icon_state = "E";
@@ -20532,6 +20371,12 @@
},
/turf/open/floor/almayer,
/area/almayer/living/grunt_rnr)
+"cOd" = (
+/obj/structure/blocker/fuelpump,
+/turf/open/floor/almayer{
+ icon_state = "mono"
+ },
+/area/almayer/lifeboat_pumps/south2)
"cOe" = (
/turf/open/floor/almayer{
dir = 5;
@@ -20571,6 +20416,27 @@
icon_state = "outerhull_dir"
},
/area/almayer/engineering/upper_engineering/starboard)
+"cOV" = (
+/obj/effect/projector{
+ name = "Almayer_AresDown";
+ vector_x = 96;
+ vector_y = -65
+ },
+/obj/structure/platform{
+ dir = 8
+ },
+/obj/structure/stairs{
+ dir = 1;
+ icon_state = "ramptop"
+ },
+/obj/structure/machinery/door_control{
+ id = "ARES StairsUpper";
+ name = "ARES Core Access";
+ pixel_x = -24;
+ req_one_access_txt = "90;91;92"
+ },
+/turf/open/floor/almayer/aicore/no_build,
+/area/almayer/command/airoom)
"cOY" = (
/obj/item/clothing/under/blackskirt{
desc = "A stylish skirt, in a business-black and red colour scheme.";
@@ -21484,6 +21350,9 @@
dir = 4
},
/obj/structure/machinery/door/firedoor/border_only/almayer,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/open/floor/almayer{
icon_state = "test_floor4"
},
@@ -21603,6 +21472,14 @@
icon_state = "red"
},
/area/almayer/shipboard/brig/chief_mp_office)
+"dgI" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+ dir = 4
+ },
+/turf/open/floor/prison{
+ icon_state = "kitchen"
+ },
+/area/almayer/living/cafeteria_officer)
"dha" = (
/turf/open/floor/almayer{
icon_state = "plate"
@@ -21916,15 +21793,6 @@
icon_state = "red"
},
/area/almayer/maint/upper/u_a_p)
-"dnm" = (
-/obj/structure/machinery/cm_vending/sorted/cargo_guns/intelligence_officer,
-/obj/structure/machinery/light{
- dir = 8
- },
-/turf/open/floor/almayer{
- icon_state = "silverfull"
- },
-/area/almayer/command/computerlab)
"dnC" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 6
@@ -22040,6 +21908,21 @@
icon_state = "mono"
},
/area/almayer/lifeboat_pumps/north1)
+"dpp" = (
+/obj/effect/projector{
+ name = "Almayer_AresUp";
+ vector_x = -96;
+ vector_y = 65
+ },
+/obj/structure/platform{
+ dir = 4
+ },
+/obj/structure/stairs{
+ dir = 1;
+ icon_state = "ramptop"
+ },
+/turf/open/floor/almayer/aicore/no_build,
+/area/almayer/command/airoom)
"dpA" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -22152,6 +22035,19 @@
icon_state = "sterile_green"
},
/area/almayer/medical/hydroponics)
+"drU" = (
+/obj/structure/machinery/door_control{
+ id = "ARES JoeCryo";
+ name = "ARES WorkingJoe Bay Shutters";
+ req_one_access_txt = "91;92";
+ pixel_x = 24
+ },
+/obj/structure/machinery/camera/autoname/almayer/containment/ares{
+ autoname = 0;
+ c_tag = "AI - Comms"
+ },
+/turf/open/floor/almayer/aicore/no_build,
+/area/almayer/command/airoom)
"dsA" = (
/obj/effect/decal/cleanable/blood,
/turf/open/floor/almayer{
@@ -22488,6 +22384,24 @@
"dzp" = (
/turf/open/floor/almayer,
/area/almayer/command/corporateliaison)
+"dzt" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "N";
+ pixel_y = 1
+ },
+/obj/effect/decal/warning_stripes{
+ icon_state = "S";
+ layer = 3.3
+ },
+/obj/structure/machinery/camera/autoname/almayer/containment/ares{
+ dir = 8;
+ autoname = 0;
+ c_tag = "AI - Secondary Processors"
+ },
+/turf/open/floor/almayer/aicore/no_build{
+ icon_state = "ai_floor2"
+ },
+/area/almayer/command/airoom)
"dzG" = (
/obj/structure/reagent_dispensers/peppertank{
pixel_y = 26
@@ -22903,13 +22817,6 @@
icon_state = "red"
},
/area/almayer/shipboard/brig/starboard_hallway)
-"dFB" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/machinery/light,
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/hallways/upper/aft_hallway)
"dFF" = (
/obj/structure/flora/pottedplant{
icon_state = "pottedplant_21"
@@ -22933,6 +22840,16 @@
icon_state = "plate"
},
/area/almayer/hallways/lower/vehiclehangar)
+"dFN" = (
+/obj/structure/pipes/standard/manifold/hidden/supply{
+ dir = 8
+ },
+/obj/structure/disposalpipe/junction{
+ dir = 2;
+ icon_state = "pipe-j2"
+ },
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/engineering/upper_engineering)
"dFR" = (
/turf/open/floor/almayer{
dir = 9;
@@ -22955,20 +22872,6 @@
icon_state = "plate"
},
/area/almayer/maint/hull/upper/u_m_s)
-"dGl" = (
-/obj/effect/step_trigger/teleporter_vector{
- name = "Almayer_AresUp";
- vector_x = -97;
- vector_y = 65
- },
-/obj/structure/platform{
- dir = 8
- },
-/obj/structure/stairs{
- dir = 1
- },
-/turf/open/floor/almayer/aicore/no_build,
-/area/almayer/command/airoom)
"dGr" = (
/obj/structure/pipes/vents/scrubber{
dir = 8
@@ -23415,19 +23318,6 @@
},
/turf/open/floor/plating,
/area/almayer/maint/lower/constr)
-"dPB" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
-/obj/structure/pipes/standard/simple/hidden/supply{
- dir = 10
- },
-/turf/open/floor/almayer{
- dir = 8;
- icon_state = "orange"
- },
-/area/almayer/hallways/upper/midship_hallway)
"dPC" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 9
@@ -23466,20 +23356,6 @@
allow_construction = 0
},
/area/almayer/shipboard/brig/processing)
-"dQl" = (
-/obj/structure/platform{
- dir = 4
- },
-/obj/effect/step_trigger/teleporter_vector{
- name = "Almayer_AresUp";
- vector_x = -97;
- vector_y = 65
- },
-/obj/structure/stairs{
- dir = 1
- },
-/turf/open/floor/almayer/aicore/no_build,
-/area/almayer/command/airoom)
"dQp" = (
/obj/structure/pipes/standard/simple/hidden/supply,
/obj/effect/decal/warning_stripes{
@@ -24001,18 +23877,6 @@
icon_state = "test_floor4"
},
/area/almayer/living/briefing)
-"dZr" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/pipes/standard/simple/hidden/supply{
- dir = 4
- },
-/turf/open/floor/almayer{
- dir = 1;
- icon_state = "orange"
- },
-/area/almayer/engineering/upper_engineering)
"dZu" = (
/obj/structure/machinery/light{
dir = 1
@@ -24374,6 +24238,26 @@
icon_state = "dark_sterile"
},
/area/almayer/medical/lower_medical_medbay)
+"ege" = (
+/obj/structure/machinery/door_control{
+ id = "ARES StairsLower";
+ name = "ARES Core Lockdown";
+ pixel_x = -24;
+ pixel_y = 8;
+ req_one_access_txt = "90;91;92"
+ },
+/obj/structure/machinery/camera/autoname/almayer/containment/ares{
+ dir = 4;
+ pixel_y = -8;
+ autoname = 0;
+ c_tag = "AI - Main Staircase"
+ },
+/obj/effect/step_trigger/clone_cleaner,
+/turf/open/floor/almayer/aicore/no_build{
+ dir = 8;
+ icon_state = "ai_silver"
+ },
+/area/almayer/command/airoom)
"egp" = (
/obj/structure/pipes/standard/simple/hidden/supply,
/obj/structure/platform_decoration,
@@ -24512,6 +24396,20 @@
icon_state = "red"
},
/area/almayer/shipboard/brig/processing)
+"eii" = (
+/obj/structure/platform{
+ dir = 4
+ },
+/obj/effect/step_trigger/teleporter_vector{
+ name = "Almayer_AresUp";
+ vector_x = -96;
+ vector_y = 65
+ },
+/obj/structure/stairs{
+ dir = 1
+ },
+/turf/open/floor/almayer/aicore/no_build,
+/area/almayer/command/airoom)
"eim" = (
/obj/structure/pipes/vents/pump{
dir = 1
@@ -24602,6 +24500,13 @@
/obj/structure/window/framed/almayer,
/turf/open/floor/plating,
/area/almayer/living/grunt_rnr)
+"ejx" = (
+/obj/structure/pipes/standard/simple/hidden/supply,
+/turf/open/floor/almayer{
+ dir = 1;
+ icon_state = "silver"
+ },
+/area/almayer/hallways/upper/midship_hallway)
"ejV" = (
/obj/structure/closet,
/obj/item/device/flashlight/pen,
@@ -24789,10 +24694,6 @@
/area/almayer/medical/medical_science)
"emL" = (
/obj/structure/machinery/light,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/pipes/standard/manifold/hidden/supply,
/turf/open/floor/almayer{
icon_state = "orange"
},
@@ -24840,17 +24741,6 @@
icon_state = "test_floor4"
},
/area/almayer/maint/hull/lower/l_m_s)
-"eol" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/pipes/standard/simple/hidden/supply{
- dir = 9
- },
-/turf/open/floor/almayer{
- icon_state = "orangecorner"
- },
-/area/almayer/hallways/upper/midship_hallway)
"eox" = (
/obj/structure/machinery/light/small,
/turf/open/floor/plating/plating_catwalk,
@@ -25257,6 +25147,19 @@
icon_state = "plate"
},
/area/almayer/shipboard/starboard_point_defense)
+"etM" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "S";
+ layer = 3.3
+ },
+/obj/effect/decal/warning_stripes{
+ icon_state = "NE-out";
+ pixel_y = 1
+ },
+/turf/open/floor/almayer/aicore/no_build{
+ icon_state = "ai_floor2"
+ },
+/area/almayer/command/airoom)
"etN" = (
/obj/effect/landmark/yautja_teleport,
/turf/open/floor/plating/plating_catwalk,
@@ -25504,6 +25407,18 @@
icon_state = "green"
},
/area/almayer/shipboard/brig/cells)
+"ezq" = (
+/obj/effect/projector{
+ name = "Almayer_AresDown";
+ vector_x = 96;
+ vector_y = -65
+ },
+/obj/structure/stairs{
+ dir = 1;
+ icon_state = "ramptop"
+ },
+/turf/open/floor/almayer/aicore/no_build,
+/area/almayer/command/airoom)
"ezG" = (
/obj/structure/pipes/vents/scrubber{
dir = 4
@@ -25780,6 +25695,15 @@
},
/turf/open/floor/almayer,
/area/almayer/living/bridgebunks)
+"eDT" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/almayer{
+ dir = 1;
+ icon_state = "orange"
+ },
+/area/almayer/engineering/upper_engineering)
"eEc" = (
/obj/structure/machinery/light,
/obj/effect/decal/warning_stripes{
@@ -25920,14 +25844,6 @@
},
/turf/open/floor/carpet,
/area/almayer/command/corporateliaison)
-"eGb" = (
-/obj/structure/machinery/constructable_frame{
- icon_state = "box_2"
- },
-/turf/open/floor/almayer{
- icon_state = "mono"
- },
-/area/almayer/lifeboat_pumps/north2)
"eGq" = (
/obj/structure/largecrate/random/secure,
/turf/open/floor/almayer{
@@ -25935,6 +25851,15 @@
icon_state = "green"
},
/area/almayer/hallways/lower/port_midship_hallway)
+"eGr" = (
+/obj/structure/pipes/standard/simple/hidden/supply/no_boom,
+/obj/structure/machinery/camera/autoname/almayer/containment/ares{
+ dir = 8;
+ autoname = 0;
+ c_tag = "AI - Records"
+ },
+/turf/open/floor/almayer/aicore/no_build,
+/area/almayer/command/airoom)
"eGB" = (
/obj/structure/platform_decoration,
/turf/open/floor/almayer,
@@ -26178,17 +26103,6 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/maint/hull/lower/l_m_s)
-"eLV" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/pipes/standard/simple/hidden/supply{
- dir = 4
- },
-/turf/open/floor/almayer{
- icon_state = "orangecorner"
- },
-/area/almayer/hallways/upper/aft_hallway)
"eLX" = (
/obj/structure/bed/chair{
dir = 4
@@ -26357,6 +26271,36 @@
icon_state = "cargo"
},
/area/almayer/engineering/lower/workshop/hangar)
+"eQj" = (
+/obj/structure/machinery/door_control{
+ id = "ARES StairsUpper";
+ name = "ARES Core Access";
+ pixel_x = -5;
+ pixel_y = -24;
+ req_one_access_txt = "91;92"
+ },
+/obj/structure/machinery/door_control{
+ id = "ARES StairsLock";
+ name = "ARES Exterior Lockdown";
+ pixel_y = -24;
+ req_one_access_txt = "91;92";
+ pixel_x = 6
+ },
+/obj/structure/surface/table/reinforced/almayer_B{
+ indestructible = 1;
+ unacidable = 1;
+ unslashable = 1
+ },
+/obj/structure/machinery/computer/cameras/almayer{
+ dir = 4;
+ pixel_y = 12
+ },
+/obj/structure/machinery/computer/cameras/almayer/ares{
+ dir = 4;
+ pixel_y = -1
+ },
+/turf/open/floor/almayer/aicore/no_build,
+/area/almayer/command/airoom)
"eQm" = (
/obj/structure/machinery/power/apc/almayer{
dir = 1
@@ -26425,6 +26369,22 @@
icon_state = "test_floor4"
},
/area/almayer/medical/lower_medical_medbay)
+"eRI" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "E";
+ pixel_x = 1
+ },
+/obj/structure/machinery/camera/autoname/almayer/containment/ares{
+ dir = 8;
+ pixel_y = 2;
+ autoname = 0;
+ c_tag = "AI - Reception Exterior"
+ },
+/turf/open/floor/almayer{
+ dir = 4;
+ icon_state = "silver"
+ },
+/area/almayer/hallways/upper/midship_hallway)
"eRR" = (
/obj/item/clothing/head/helmet/marine{
pixel_x = 16;
@@ -26712,15 +26672,6 @@
icon_state = "sterile_green_side"
},
/area/almayer/medical/lower_medical_medbay)
-"eXk" = (
-/obj/effect/landmark/late_join/working_joe,
-/obj/effect/landmark/start/working_joe,
-/obj/structure/machinery/light/small{
- dir = 8;
- light_color = "#d69c46"
- },
-/turf/open/floor/plating/plating_catwalk/aicore,
-/area/almayer/command/airoom)
"eXq" = (
/turf/closed/wall/almayer,
/area/almayer/living/offices/flight)
@@ -26728,6 +26679,21 @@
/obj/structure/pipes/vents/pump,
/turf/open/floor/almayer,
/area/almayer/living/offices)
+"eXy" = (
+/obj/effect/projector{
+ name = "Almayer_AresDown";
+ vector_x = 96;
+ vector_y = -65
+ },
+/obj/structure/stairs{
+ dir = 1;
+ icon_state = "ramptop"
+ },
+/turf/open/floor/almayer/aicore/glowing/no_build{
+ icon_state = "ai_floor3";
+ light_range = 3
+ },
+/area/almayer/command/airoom)
"eXD" = (
/obj/structure/prop/invuln/lattice_prop{
dir = 1;
@@ -26790,16 +26756,6 @@
icon_state = "plate"
},
/area/almayer/living/briefing)
-"eYz" = (
-/obj/structure/machinery/camera/autoname/almayer/containment/ares{
- dir = 1
- },
-/obj/structure/machinery/computer/working_joe{
- dir = 8;
- pixel_x = 29
- },
-/turf/open/floor/almayer/aicore/no_build,
-/area/almayer/command/airoom)
"eYD" = (
/obj/effect/decal/warning_stripes{
icon_state = "S"
@@ -27389,6 +27345,13 @@
icon_state = "mono"
},
/area/almayer/engineering/upper_engineering/starboard)
+"fhR" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
+ },
+/turf/closed/wall/almayer/aicore/hull,
+/area/almayer/command/airoom)
"fic" = (
/obj/effect/decal/warning_stripes{
icon_state = "S"
@@ -27473,6 +27436,13 @@
dir = 8
},
/area/almayer/medical/containment/cell/cl)
+"flf" = (
+/obj/structure/pipes/vents/pump/no_boom/gas{
+ vent_tag = "Records";
+ dir = 1
+ },
+/turf/open/floor/almayer/aicore/no_build,
+/area/almayer/command/airoom)
"flr" = (
/obj/structure/prop/invuln/overhead_pipe{
pixel_x = 12
@@ -27487,6 +27457,29 @@
icon_state = "red"
},
/area/almayer/maint/upper/u_a_p)
+"flL" = (
+/obj/structure/machinery/camera/autoname/almayer/containment/ares{
+ dir = 8;
+ autoname = 0;
+ c_tag = "AI - SynthBay"
+ },
+/turf/open/floor/almayer/aicore/no_build,
+/area/almayer/command/airoom)
+"flR" = (
+/obj/effect/projector{
+ name = "Almayer_AresDown";
+ vector_x = 96;
+ vector_y = -65
+ },
+/obj/structure/platform{
+ dir = 4
+ },
+/obj/structure/stairs{
+ dir = 1;
+ icon_state = "ramptop"
+ },
+/turf/open/floor/almayer/aicore/no_build,
+/area/almayer/command/airoom)
"flW" = (
/obj/structure/surface/table/reinforced/almayer_B,
/obj/structure/machinery/light{
@@ -27543,6 +27536,10 @@
icon_state = "green"
},
/area/almayer/hallways/lower/port_midship_hallway)
+"fnk" = (
+/obj/structure/blocker/fuelpump,
+/turf/open/floor/almayer,
+/area/almayer/lifeboat_pumps/north1)
"fnv" = (
/obj/structure/machinery/light{
dir = 4
@@ -28314,6 +28311,20 @@
/obj/effect/decal/cleanable/blood/oil,
/turf/open/floor/almayer,
/area/almayer/hallways/lower/repair_bay)
+"fCI" = (
+/obj/structure/machinery/door/poddoor/shutters/almayer{
+ id = "ARES JoeCryo";
+ name = "\improper ARES Synth Bay Shutters";
+ plane = -7;
+ dir = 4
+ },
+/obj/structure/pipes/standard/simple/hidden/supply/no_boom{
+ dir = 4
+ },
+/turf/open/floor/almayer/no_build{
+ icon_state = "test_floor4"
+ },
+/area/almayer/command/airoom)
"fCL" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 4
@@ -28426,12 +28437,6 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/hallways/lower/starboard_midship_hallway)
-"fEN" = (
-/obj/structure/machinery/camera/autoname/almayer/containment/ares{
- dir = 4
- },
-/turf/open/floor/almayer/aicore/no_build,
-/area/almayer/command/airoom)
"fER" = (
/obj/structure/machinery/autolathe,
/turf/open/floor/almayer{
@@ -28691,7 +28696,9 @@
/obj/effect/decal/warning_stripes{
icon_state = "SW-out"
},
-/turf/open/floor/almayer/aicore/glowing/no_build,
+/turf/open/floor/almayer/aicore/no_build{
+ icon_state = "ai_floor2"
+ },
/area/almayer/command/airoom)
"fKh" = (
/obj/structure/window/framed/almayer,
@@ -28858,15 +28865,6 @@
plane = -7
},
/obj/effect/step_trigger/ares_alert/core,
-/obj/structure/machinery/door/poddoor/almayer/blended/aicore/open{
- closed_layer = 3.2;
- id = "ARES Emergency";
- layer = 3.2;
- name = "ARES Emergency Lockdown";
- needs_power = 0;
- open_layer = 1.9;
- plane = -7
- },
/obj/structure/sign/safety/laser{
pixel_x = 32;
pixel_y = -8
@@ -28875,6 +28873,7 @@
pixel_x = 32;
pixel_y = 6
},
+/obj/structure/machinery/door/poddoor/almayer/blended/ai_lockdown/aicore,
/turf/open/floor/almayer/no_build{
icon_state = "test_floor4"
},
@@ -28960,13 +28959,6 @@
icon_state = "plating"
},
/area/almayer/shipboard/sea_office)
-"fOJ" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/almayer{
- icon_state = "orangecorner"
- },
-/area/almayer/engineering/upper_engineering)
"fOK" = (
/obj/structure/surface/table/almayer,
/obj/item/device/camera,
@@ -29083,6 +29075,16 @@
icon_state = "plate"
},
/area/almayer/maint/hull/lower/l_f_s)
+"fQD" = (
+/obj/structure/machinery/camera/autoname/almayer/containment/ares{
+ dir = 8;
+ autoname = 0;
+ c_tag = "AI - Core Chamber"
+ },
+/turf/open/floor/almayer/aicore/glowing/no_build{
+ icon_state = "ai_floor3"
+ },
+/area/almayer/command/airoom)
"fQS" = (
/obj/structure/bed/chair/comfy/orange,
/obj/structure/pipes/standard/simple/hidden/supply{
@@ -29261,6 +29263,12 @@
icon_state = "orange"
},
/area/almayer/engineering/lower/workshop)
+"fVx" = (
+/turf/open/floor/almayer/aicore/glowing/no_build{
+ icon_state = "ai_floor3";
+ light_range = 4
+ },
+/area/almayer/command/airoom)
"fVz" = (
/obj/effect/decal/warning_stripes{
icon_state = "E";
@@ -29763,10 +29771,6 @@
},
/turf/open/floor/almayer/aicore/glowing/no_build,
/area/almayer/command/airoom)
-"gfE" = (
-/obj/structure/machinery/recharge_station,
-/turf/open/floor/plating,
-/area/almayer/command/airoom)
"gfG" = (
/obj/structure/disposalpipe/segment,
/obj/structure/pipes/standard/simple/hidden/supply,
@@ -29984,23 +29988,14 @@
icon_state = "red"
},
/area/almayer/shipboard/navigation)
-"gjw" = (
-/obj/structure/machinery/faxmachine/uscm/command{
- density = 0;
- department = "AI Core";
- pixel_y = 32
- },
-/obj/structure/surface/rack{
- density = 0;
- pixel_y = 16
- },
-/obj/structure/machinery/computer/working_joe{
- dir = 8;
- pixel_x = 17;
- pixel_y = -6
+"gjv" = (
+/obj/effect/step_trigger/teleporter_vector{
+ name = "Almayer_AresUp";
+ vector_x = -96;
+ vector_y = 65
},
-/obj/item/storage/box/ids{
- pixel_x = -4
+/obj/structure/stairs{
+ dir = 1
},
/turf/open/floor/almayer/aicore/no_build,
/area/almayer/command/airoom)
@@ -30250,7 +30245,7 @@
},
/area/almayer/engineering/upper_engineering/starboard)
"gpi" = (
-/obj/structure/dropship_equipment/rappel_system,
+/obj/structure/dropship_equipment/paradrop_system,
/turf/open/floor/almayer{
icon_state = "test_floor4"
},
@@ -30287,6 +30282,23 @@
icon_state = "blue"
},
/area/almayer/hallways/upper/midship_hallway)
+"gpW" = (
+/obj/structure/surface/table/reinforced/almayer_B{
+ indestructible = 1;
+ unacidable = 1;
+ unslashable = 1
+ },
+/obj/structure/machinery/computer/secure_data{
+ dir = 4
+ },
+/obj/structure/machinery/door_control{
+ id = "ARES ReceptStairs1";
+ name = "ARES Reception Shutters";
+ pixel_y = 24;
+ req_one_access_txt = "91;92"
+ },
+/turf/open/floor/almayer/aicore/no_build,
+/area/almayer/command/airoom)
"gpY" = (
/turf/closed/wall/almayer/reinforced,
/area/almayer/lifeboat_pumps/north1)
@@ -30935,16 +30947,6 @@
icon_state = "green"
},
/area/almayer/living/grunt_rnr)
-"gAe" = (
-/obj/structure/machinery/door_control{
- id = "ARES JoeCryo";
- name = "Working Joe Cryogenics Lockdown";
- pixel_x = 24;
- pixel_y = 8;
- req_one_access_txt = "91;92"
- },
-/turf/open/floor/almayer/aicore/no_build,
-/area/almayer/command/airoom)
"gAj" = (
/obj/structure/bed/chair/comfy/charlie{
dir = 1
@@ -31075,15 +31077,6 @@
},
/turf/open/floor/almayer,
/area/almayer/hallways/hangar)
-"gCx" = (
-/obj/structure/pipes/vents/pump/no_boom{
- dir = 8
- },
-/turf/open/floor/almayer/aicore/no_build{
- dir = 4;
- icon_state = "ai_silver"
- },
-/area/almayer/command/airoom)
"gCB" = (
/obj/structure/machinery/power/apc/almayer/hardened{
cell_type = /obj/item/cell/hyper;
@@ -31105,6 +31098,21 @@
icon_state = "plate"
},
/area/almayer/living/bridgebunks)
+"gDh" = (
+/obj/structure/machinery/door/airlock/almayer/secure/reinforced{
+ access_modified = 1;
+ name = "\improper Security Vault";
+ req_access = null;
+ req_one_access_txt = "91;92";
+ dir = 1
+ },
+/obj/structure/machinery/door/poddoor/almayer/blended/ai_lockdown/aicore{
+ plane = -6
+ },
+/turf/open/floor/almayer/no_build{
+ icon_state = "test_floor4"
+ },
+/area/almayer/command/airoom)
"gDk" = (
/obj/structure/sign/safety/stairs{
pixel_x = -15
@@ -31820,17 +31828,6 @@
icon_state = "orange"
},
/area/almayer/engineering/upper_engineering/starboard)
-"gPr" = (
-/obj/effect/step_trigger/teleporter_vector{
- name = "Almayer_AresUp";
- vector_x = -97;
- vector_y = 65
- },
-/obj/structure/stairs{
- dir = 1
- },
-/turf/open/floor/almayer/aicore/no_build,
-/area/almayer/command/airoom)
"gPA" = (
/obj/structure/disposalpipe/segment{
dir = 2;
@@ -32407,13 +32404,6 @@
icon_state = "orange"
},
/area/almayer/engineering/lower)
-"haM" = (
-/obj/effect/decal/cleanable/blood/oil,
-/obj/structure/machinery/constructable_frame,
-/turf/open/floor/almayer{
- icon_state = "mono"
- },
-/area/almayer/lifeboat_pumps/south2)
"haO" = (
/turf/open/floor/almayer{
icon_state = "plate"
@@ -33985,9 +33975,9 @@
/area/almayer/hallways/lower/port_midship_hallway)
"hAG" = (
/obj/structure/closet/crate/internals,
-/obj/item/handcuffs/cable/blue,
-/obj/item/handcuffs/cable/blue,
-/obj/item/handcuffs/cable/cyan,
+/obj/item/restraint/adjustable/cable/blue,
+/obj/item/restraint/adjustable/cable/blue,
+/obj/item/restraint/adjustable/cable/cyan,
/obj/effect/spawner/random/toolbox,
/turf/open/shuttle/dropship{
icon_state = "rasputin3"
@@ -35164,6 +35154,10 @@
icon_state = "red"
},
/area/almayer/shipboard/weapon_room)
+"hWM" = (
+/obj/structure/surface/rack,
+/turf/open/floor/almayer/aicore/no_build,
+/area/almayer/command/airoom)
"hWO" = (
/obj/structure/pipes/vents/scrubber,
/turf/open/floor/almayer{
@@ -35403,6 +35397,18 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/engineering/upper_engineering/port)
+"iav" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+ dir = 9
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
+ },
+/turf/open/floor/almayer{
+ icon_state = "orangecorner"
+ },
+/area/almayer/engineering/upper_engineering)
"iaF" = (
/obj/structure/pipes/standard/manifold/hidden/supply{
dir = 4
@@ -35603,18 +35609,6 @@
icon_state = "sterile_green_corner"
},
/area/almayer/medical/lower_medical_lobby)
-"ieF" = (
-/obj/effect/projector{
- name = "Almayer_AresUp";
- vector_x = -97;
- vector_y = 65
- },
-/obj/structure/stairs{
- dir = 1;
- icon_state = "ramptop"
- },
-/turf/open/floor/almayer/aicore/no_build,
-/area/almayer/command/airoom)
"ieX" = (
/obj/structure/surface/table/almayer,
/obj/structure/sign/safety/distribution_pipes{
@@ -35659,7 +35653,9 @@
/obj/effect/decal/warning_stripes{
icon_state = "SE-out"
},
-/turf/open/floor/almayer/aicore/glowing/no_build,
+/turf/open/floor/almayer/aicore/no_build{
+ icon_state = "ai_floor2"
+ },
/area/almayer/command/airoom)
"igs" = (
/obj/structure/surface/table/almayer,
@@ -35683,13 +35679,6 @@
icon_state = "plate"
},
/area/almayer/maint/hull/lower/l_m_s)
-"igC" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
-/turf/open/floor/almayer,
-/area/almayer/hallways/upper/aft_hallway)
"igS" = (
/obj/effect/decal/warning_stripes{
icon_state = "SE-out"
@@ -35964,6 +35953,23 @@
/obj/structure/pipes/standard/simple/hidden/supply,
/turf/open/floor/almayer,
/area/almayer/living/offices/flight)
+"imS" = (
+/obj/effect/step_trigger/clone_cleaner,
+/obj/structure/machinery/door/poddoor/shutters/almayer{
+ id = "ARES StairsUpper";
+ name = "\improper ARES Core Shutters";
+ plane = -7
+ },
+/obj/structure/disposalpipe/up/almayer{
+ id = "ares_vault_in";
+ name = "aicore";
+ dir = 2
+ },
+/obj/structure/machinery/door/poddoor/almayer/blended/ai_lockdown,
+/turf/open/floor/almayer/no_build{
+ icon_state = "test_floor4"
+ },
+/area/almayer/command/airoom)
"inh" = (
/obj/structure/pipes/standard/manifold/hidden/supply{
dir = 8
@@ -35997,6 +36003,16 @@
icon_state = "sterile_green_side"
},
/area/almayer/medical/medical_science)
+"ios" = (
+/obj/structure/surface/table/reinforced/almayer_B,
+/obj/item/paper_bin/uscm{
+ pixel_y = 6
+ },
+/obj/item/tool/pen,
+/turf/open/floor/almayer/no_build{
+ icon_state = "plating"
+ },
+/area/almayer/command/airoom)
"iow" = (
/obj/structure/machinery/cm_vending/sorted/attachments/squad{
req_access = null;
@@ -36160,6 +36176,18 @@
icon_state = "cargo"
},
/area/almayer/shipboard/brig/cryo)
+"irr" = (
+/obj/structure/stairs{
+ dir = 1;
+ icon_state = "ramptop"
+ },
+/obj/effect/projector{
+ name = "Almayer_AresUp2";
+ vector_x = -102;
+ vector_y = 61
+ },
+/turf/open/floor/almayer/aicore/no_build,
+/area/almayer/command/airoom)
"iry" = (
/obj/structure/platform{
dir = 8
@@ -36227,18 +36255,6 @@
icon_state = "plate"
},
/area/almayer/maint/hull/upper/u_m_p)
-"isC" = (
-/obj/effect/projector{
- name = "Almayer_AresDown";
- vector_x = 97;
- vector_y = -65
- },
-/obj/structure/stairs{
- dir = 1;
- icon_state = "ramptop"
- },
-/turf/open/floor/almayer/aicore/no_build,
-/area/almayer/command/airoom)
"isI" = (
/obj/structure/sign/nosmoking_2{
pixel_x = 32
@@ -36261,6 +36277,12 @@
icon_state = "sterile_green_side"
},
/area/almayer/medical/morgue)
+"itg" = (
+/obj/structure/pipes/standard/simple/hidden/supply/no_boom{
+ dir = 4
+ },
+/turf/open/floor/almayer/aicore/no_build,
+/area/almayer/command/airoom)
"ito" = (
/obj/effect/decal/warning_stripes{
icon_state = "W"
@@ -36552,16 +36574,6 @@
icon_state = "orange"
},
/area/almayer/engineering/lower)
-"iyH" = (
-/obj/structure/surface/table/reinforced/almayer_B{
- climbable = 0;
- desc = "A square metal surface resting on its fat metal bottom. You can't flip something that doesn't have legs. This one has a metal rail running above it, preventing something large passing over. Like you.";
- indestructible = 1;
- unacidable = 1;
- unslashable = 1
- },
-/turf/open/floor/almayer/aicore/no_build,
-/area/almayer/command/airoom)
"iyS" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -36574,6 +36586,14 @@
icon_state = "blue"
},
/area/almayer/squads/delta)
+"izf" = (
+/obj/structure/disposalpipe/up/almayer{
+ dir = 4;
+ id = "ares_vault_out";
+ name = "aicore"
+ },
+/turf/closed/wall/almayer/aicore/hull,
+/area/almayer/command/airoom)
"izk" = (
/obj/effect/decal/warning_stripes{
icon_state = "N";
@@ -36656,6 +36676,9 @@
},
/turf/open/floor/almayer,
/area/almayer/shipboard/brig/cells)
+"iBn" = (
+/turf/closed/wall/almayer/aicore/white/hull,
+/area/space)
"iBu" = (
/obj/structure/sign/safety/storage{
pixel_x = -17
@@ -36745,6 +36768,12 @@
icon_state = "plate"
},
/area/almayer/maint/hull/upper/u_a_s)
+"iDK" = (
+/obj/structure/blocker/fuelpump,
+/turf/open/floor/almayer{
+ icon_state = "mono"
+ },
+/area/almayer/lifeboat_pumps/north2)
"iEa" = (
/obj/structure/machinery/light/small,
/turf/open/floor/almayer{
@@ -37001,6 +37030,11 @@
icon_state = "plate"
},
/area/almayer/maint/upper/u_a_s)
+"iJs" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/pipes/standard/simple/hidden/supply,
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/engineering/upper_engineering)
"iJB" = (
/obj/structure/sign/safety/galley{
pixel_x = 8;
@@ -38026,20 +38060,6 @@
},
/turf/open/floor/almayer,
/area/almayer/command/lifeboat)
-"iZw" = (
-/obj/effect/step_trigger/teleporter_vector{
- name = "Almayer_AresUp";
- vector_x = -97;
- vector_y = 65
- },
-/obj/structure/platform{
- dir = 4
- },
-/obj/structure/stairs{
- dir = 1
- },
-/turf/open/floor/almayer/aicore/no_build,
-/area/almayer/command/airoom)
"iZE" = (
/obj/structure/machinery/cm_vending/sorted/tech/tool_storage,
/obj/effect/decal/warning_stripes{
@@ -38147,16 +38167,6 @@
icon_state = "plate"
},
/area/almayer/hallways/lower/starboard_umbilical)
-"jaH" = (
-/obj/structure/surface/table/reinforced/almayer_B,
-/obj/item/paper_bin/uscm{
- pixel_y = 6
- },
-/obj/item/tool/pen,
-/turf/open/floor/almayer/no_build{
- icon_state = "plating"
- },
-/area/almayer/command/airoom)
"jaI" = (
/obj/structure/sign/safety/storage{
pixel_x = 8;
@@ -38238,15 +38248,14 @@
pixel_x = -2;
pixel_y = 26
},
-/obj/structure/machinery/door_control/brbutton{
- id = "ARES Emergency";
- name = "ARES Emergency Lockdown Override";
- pixel_x = 8;
- pixel_y = 26
- },
/obj/structure/machinery/computer/cameras/almayer/ares{
dir = 4
},
+/obj/structure/machinery/aicore_lockdown{
+ icon_state = "big_red_button_wallv";
+ pixel_x = 8;
+ pixel_y = 26
+ },
/turf/open/floor/wood/ship,
/area/almayer/living/commandbunks)
"jbX" = (
@@ -38537,6 +38546,20 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/engineering/upper_engineering/notunnel)
+"jgy" = (
+/obj/effect/step_trigger/teleporter_vector{
+ name = "Almayer_AresUp";
+ vector_x = -96;
+ vector_y = 65
+ },
+/obj/structure/platform{
+ dir = 4
+ },
+/obj/structure/stairs{
+ dir = 1
+ },
+/turf/open/floor/almayer/aicore/no_build,
+/area/almayer/command/airoom)
"jgF" = (
/obj/structure/platform,
/turf/open/floor/almayer{
@@ -39185,15 +39208,7 @@
plane = -7
},
/obj/effect/step_trigger/ares_alert/core,
-/obj/structure/machinery/door/poddoor/almayer/blended/aicore/open{
- closed_layer = 3.2;
- id = "ARES Emergency";
- layer = 3.2;
- name = "ARES Emergency Lockdown";
- needs_power = 0;
- open_layer = 1.9;
- plane = -7
- },
+/obj/structure/machinery/door/poddoor/almayer/blended/ai_lockdown/aicore,
/turf/open/floor/almayer/no_build{
icon_state = "test_floor4"
},
@@ -39204,12 +39219,6 @@
},
/turf/open/floor/almayer,
/area/almayer/shipboard/brig/execution)
-"jrc" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
- dir = 4
- },
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/hallways/upper/midship_hallway)
"jre" = (
/obj/structure/closet/secure_closet/cargotech,
/obj/item/clothing/accessory/storage/webbing,
@@ -39255,6 +39264,12 @@
icon_state = "plate"
},
/area/almayer/maint/upper/u_a_s)
+"jrH" = (
+/obj/structure/pipes/standard/manifold/hidden/supply/no_boom{
+ dir = 8
+ },
+/turf/open/floor/almayer/aicore/no_build,
+/area/almayer/command/airoom)
"jrI" = (
/obj/structure/filingcabinet{
density = 0;
@@ -39886,27 +39901,6 @@
},
/turf/open/floor/almayer,
/area/almayer/engineering/lower/workshop/hangar)
-"jDV" = (
-/obj/effect/projector{
- name = "Almayer_AresDown";
- vector_x = 97;
- vector_y = -65
- },
-/obj/structure/platform{
- dir = 4
- },
-/obj/structure/stairs{
- dir = 1;
- icon_state = "ramptop"
- },
-/obj/structure/machinery/door_control{
- id = "ARES StairsUpper";
- name = "ARES Core Access";
- pixel_x = 24;
- req_one_access_txt = "90;91;92"
- },
-/turf/open/floor/almayer/aicore/no_build,
-/area/almayer/command/airoom)
"jEA" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -40117,6 +40111,13 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/medical/morgue)
+"jIs" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/pipes/standard/manifold/hidden/supply,
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/hallways/upper/midship_hallway)
"jIC" = (
/obj/structure/machinery/computer/working_joe{
dir = 4;
@@ -40984,6 +40985,18 @@
icon_state = "plate"
},
/area/almayer/maint/hull/upper/p_stern)
+"jYH" = (
+/obj/structure/blocker/invisible_wall,
+/obj/effect/decal/warning_stripes{
+ icon_state = "E";
+ pixel_x = 1
+ },
+/mob/living/silicon/decoy/ship_ai{
+ layer = 2.98;
+ pixel_y = -16
+ },
+/turf/open/floor/almayer/aicore/no_build,
+/area/almayer/command/airoom)
"jYM" = (
/obj/structure/ladder{
height = 1;
@@ -40995,20 +41008,6 @@
},
/turf/open/floor/plating/almayer,
/area/almayer/maint/hull/lower/p_bow)
-"jYR" = (
-/obj/effect/decal/warning_stripes{
- icon_state = "N";
- pixel_y = 1
- },
-/obj/effect/decal/warning_stripes{
- icon_state = "S";
- layer = 3.3
- },
-/obj/structure/machinery/camera/autoname/almayer/containment/ares{
- dir = 4
- },
-/turf/open/floor/almayer/aicore/glowing/no_build,
-/area/almayer/command/airoom)
"jZd" = (
/obj/structure/pipes/vents/pump{
dir = 8;
@@ -41248,20 +41247,6 @@
icon_state = "kitchen"
},
/area/almayer/engineering/upper_engineering)
-"kbH" = (
-/obj/effect/step_trigger/teleporter_vector{
- name = "Almayer_AresDown";
- vector_x = 97;
- vector_y = -65
- },
-/obj/structure/platform{
- dir = 4
- },
-/obj/structure/stairs{
- dir = 1
- },
-/turf/open/floor/almayer/aicore/no_build,
-/area/almayer/command/airoom)
"kbJ" = (
/obj/effect/decal/warning_stripes{
icon_state = "E";
@@ -41572,20 +41557,6 @@
icon_state = "plate"
},
/area/almayer/maint/hull/lower/l_f_p)
-"khJ" = (
-/obj/effect/decal/warning_stripes{
- icon_state = "N";
- pixel_y = 1
- },
-/obj/effect/decal/warning_stripes{
- icon_state = "S";
- layer = 3.3
- },
-/obj/structure/machinery/camera/autoname/almayer/containment/ares{
- dir = 8
- },
-/turf/open/floor/almayer/aicore/glowing/no_build,
-/area/almayer/command/airoom)
"kil" = (
/obj/structure/stairs/perspective{
icon_state = "p_stair_full"
@@ -41944,10 +41915,6 @@
icon_state = "plate"
},
/area/almayer/squads/bravo)
-"kpc" = (
-/obj/structure/reagent_dispensers/watertank,
-/turf/open/floor/plating,
-/area/almayer/command/airoom)
"kph" = (
/obj/structure/machinery/door/firedoor/border_only/almayer,
/obj/structure/machinery/door/airlock/multi_tile/almayer/engidoor{
@@ -42842,6 +42809,16 @@
icon_state = "dark_sterile"
},
/area/almayer/medical/containment)
+"kDH" = (
+/obj/structure/pipes/standard/manifold/hidden/supply{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
+ },
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/engineering/upper_engineering)
"kDK" = (
/obj/structure/pipes/vents/scrubber,
/turf/open/floor/wood/ship,
@@ -43139,14 +43116,6 @@
icon_state = "plate"
},
/area/almayer/engineering/lower/workshop/hangar)
-"kJL" = (
-/obj/structure/machinery/constructable_frame{
- icon_state = "box_2"
- },
-/turf/open/floor/almayer{
- icon_state = "mono"
- },
-/area/almayer/lifeboat_pumps/north1)
"kJW" = (
/obj/structure/machinery/door/window/westright,
/obj/structure/machinery/shower{
@@ -43176,21 +43145,6 @@
icon_state = "test_floor4"
},
/area/almayer/living/grunt_rnr)
-"kKv" = (
-/obj/effect/projector{
- name = "Almayer_AresUp";
- vector_x = -97;
- vector_y = 65
- },
-/obj/structure/platform{
- dir = 8
- },
-/obj/structure/stairs{
- dir = 1;
- icon_state = "ramptop"
- },
-/turf/open/floor/almayer/aicore/no_build,
-/area/almayer/command/airoom)
"kKB" = (
/obj/structure/machinery/door/firedoor/border_only/almayer,
/turf/open/floor/almayer{
@@ -43389,6 +43343,14 @@
},
/turf/open/floor/wood/ship,
/area/almayer/living/basketball)
+"kNV" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+ dir = 4
+ },
+/turf/open/floor/almayer{
+ icon_state = "mono"
+ },
+/area/almayer/hallways/upper/starboard)
"kNX" = (
/obj/structure/bed/chair/comfy/charlie{
dir = 1
@@ -43617,6 +43579,22 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/hallways/hangar)
+"kRQ" = (
+/obj/structure/surface/table/reinforced/almayer_B,
+/obj/structure/machinery/computer/cameras/almayer/ares{
+ dir = 8;
+ pixel_x = 17;
+ pixel_y = 7
+ },
+/obj/structure/machinery/computer/cameras/almayer{
+ dir = 8;
+ pixel_x = 17;
+ pixel_y = -6
+ },
+/turf/open/floor/almayer/aicore/glowing/no_build{
+ icon_state = "ai_floor3"
+ },
+/area/almayer/command/airoom)
"kRU" = (
/obj/vehicle/powerloader,
/obj/structure/platform{
@@ -43630,6 +43608,16 @@
icon_state = "cargo"
},
/area/almayer/hallways/lower/repair_bay)
+"kSi" = (
+/obj/structure/machinery/cm_vending/gear/intelligence_officer{
+ density = 0;
+ pixel_x = -32
+ },
+/turf/open/floor/almayer{
+ dir = 8;
+ icon_state = "silver"
+ },
+/area/almayer/command/computerlab)
"kSn" = (
/obj/structure/machinery/camera/autoname/almayer{
dir = 4;
@@ -43794,13 +43782,6 @@
icon_state = "plate"
},
/area/almayer/maint/hull/upper/u_m_p)
-"kUQ" = (
-/obj/effect/decal/cleanable/blood/oil/streak,
-/obj/structure/machinery/constructable_frame,
-/turf/open/floor/almayer{
- icon_state = "mono"
- },
-/area/almayer/lifeboat_pumps/south1)
"kUR" = (
/turf/open/floor/almayer{
icon_state = "bluefull"
@@ -43953,12 +43934,6 @@
icon_state = "sterile_green_side"
},
/area/almayer/medical/medical_science)
-"kXD" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
- dir = 6
- },
-/turf/open/floor/almayer,
-/area/almayer/hallways/upper/midship_hallway)
"kXN" = (
/obj/item/clothing/glasses/sunglasses/aviator{
pixel_x = -1;
@@ -44138,6 +44113,8 @@
/obj/structure/machinery/door/airlock/multi_tile/almayer/engidoor/glass{
name = "\improper Engineering Reception"
},
+/obj/structure/disposalpipe/segment,
+/obj/structure/pipes/standard/simple/hidden/supply,
/turf/open/floor/almayer{
icon_state = "test_floor4"
},
@@ -44529,21 +44506,6 @@
icon_state = "mono"
},
/area/almayer/medical/medical_science)
-"lin" = (
-/obj/effect/projector{
- name = "Almayer_AresDown";
- vector_x = 97;
- vector_y = -65
- },
-/obj/structure/platform{
- dir = 8
- },
-/obj/structure/stairs{
- dir = 1;
- icon_state = "ramptop"
- },
-/turf/open/floor/almayer/aicore/no_build,
-/area/almayer/command/airoom)
"liJ" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 4
@@ -44833,9 +44795,6 @@
allow_construction = 0
},
/area/almayer/hallways/upper/fore_hallway)
-"lmK" = (
-/turf/closed/wall/almayer/reinforced,
-/area/almayer/command/securestorage)
"lne" = (
/obj/structure/bed/chair,
/turf/open/floor/almayer{
@@ -45420,12 +45379,6 @@
icon_state = "cargo"
},
/area/almayer/living/commandbunks)
-"lxT" = (
-/obj/structure/machinery/constructable_frame,
-/turf/open/floor/almayer{
- icon_state = "mono"
- },
-/area/almayer/lifeboat_pumps/south2)
"lxW" = (
/obj/structure/sign/prop2{
pixel_y = 29
@@ -45723,10 +45676,6 @@
},
/turf/open/floor/plating,
/area/almayer/maint/lower/constr)
-"lDH" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/almayer,
-/area/almayer/hallways/upper/midship_hallway)
"lDL" = (
/obj/structure/machinery/light{
dir = 4
@@ -45855,12 +45804,6 @@
icon_state = "ai_silver"
},
/area/almayer/command/airoom)
-"lFm" = (
-/turf/open/floor/almayer{
- dir = 8;
- icon_state = "silver"
- },
-/area/almayer/command/securestorage)
"lFn" = (
/obj/structure/flora/pottedplant{
icon_state = "pottedplant_21"
@@ -45873,14 +45816,6 @@
"lFp" = (
/turf/closed/wall/almayer,
/area/almayer/engineering/lower/workshop/hangar)
-"lFq" = (
-/obj/structure/pipes/vents/pump/no_boom{
- dir = 1
- },
-/turf/open/floor/almayer/aicore/no_build{
- icon_state = "ai_plates"
- },
-/area/almayer/command/airoom)
"lFr" = (
/obj/structure/machinery/firealarm{
dir = 8;
@@ -46183,6 +46118,15 @@
icon_state = "orangecorner"
},
/area/almayer/hallways/upper/midship_hallway)
+"lLA" = (
+/obj/structure/machinery/door/firedoor/border_only/almayer{
+ dir = 2
+ },
+/obj/structure/pipes/standard/simple/hidden/supply,
+/turf/open/floor/almayer{
+ icon_state = "test_floor4"
+ },
+/area/almayer/hallways/upper/midship_hallway)
"lLC" = (
/obj/structure/surface/table/almayer,
/turf/open/floor/almayer,
@@ -46245,6 +46189,10 @@
icon_state = "cargo"
},
/area/almayer/engineering/upper_engineering/starboard)
+"lMy" = (
+/obj/structure/machinery/fuelpump,
+/turf/open/floor/almayer,
+/area/almayer/lifeboat_pumps/north2)
"lMF" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -47493,6 +47441,21 @@
icon_state = "test_floor4"
},
/area/almayer/command/corporateliaison)
+"mmn" = (
+/obj/structure/machinery/cm_vending/sorted/cargo_guns/intelligence_officer{
+ density = 0;
+ pixel_x = -32
+ },
+/obj/structure/machinery/light{
+ dir = 8;
+ pixel_x = -32;
+ alpha = 0
+ },
+/turf/open/floor/almayer{
+ dir = 8;
+ icon_state = "silver"
+ },
+/area/almayer/command/computerlab)
"mmN" = (
/obj/structure/machinery/door/firedoor/border_only/almayer{
dir = 1
@@ -47662,6 +47625,15 @@
icon_state = "test_floor4"
},
/area/almayer/hallways/lower/starboard_umbilical)
+"mpZ" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/pipes/standard/simple/hidden/supply{
+ dir = 4
+ },
+/turf/open/floor/almayer,
+/area/almayer/engineering/upper_engineering)
"mqb" = (
/obj/structure/pipes/standard/manifold/hidden/supply{
dir = 8
@@ -47681,6 +47653,16 @@
icon_state = "silver"
},
/area/almayer/shipboard/brig/cic_hallway)
+"mqh" = (
+/obj/structure/machinery/light{
+ dir = 8
+ },
+/obj/structure/machinery/cm_vending/sorted/medical/marinemed,
+/obj/structure/medical_supply_link,
+/turf/open/floor/almayer{
+ icon_state = "redfull"
+ },
+/area/almayer/command/cic)
"mqt" = (
/turf/open/floor/almayer{
icon_state = "bluecorner"
@@ -47745,19 +47727,6 @@
icon_state = "green"
},
/area/almayer/squads/req)
-"mrO" = (
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
-/obj/structure/pipes/standard/simple/hidden/supply{
- dir = 5
- },
-/turf/open/floor/almayer{
- dir = 10;
- icon_state = "orange"
- },
-/area/almayer/hallways/upper/midship_hallway)
"msg" = (
/obj/structure/machinery/light,
/obj/structure/sign/safety/waterhazard{
@@ -47907,8 +47876,6 @@
/turf/open/floor/almayer,
/area/almayer/lifeboat_pumps/north1)
"mux" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/disposalpipe/segment,
/obj/structure/machinery/camera/autoname/almayer{
dir = 8;
name = "ship-grade camera"
@@ -48192,6 +48159,17 @@
icon_state = "plate"
},
/area/almayer/maint/hull/lower/l_m_s)
+"mzP" = (
+/obj/structure/stairs{
+ dir = 1
+ },
+/obj/effect/step_trigger/teleporter_vector{
+ name = "Almayer_AresDown2";
+ vector_x = 102;
+ vector_y = -61
+ },
+/turf/open/floor/plating,
+/area/almayer/command/airoom)
"mzS" = (
/turf/open/floor/almayer{
dir = 9;
@@ -48204,11 +48182,33 @@
icon_state = "blue"
},
/area/almayer/living/port_emb)
+"mAe" = (
+/obj/structure/window/framed/almayer/aicore/hull/black/hijack_bustable,
+/obj/structure/machinery/door/poddoor/almayer/blended/ai_lockdown{
+ plane = -6;
+ dir = 4
+ },
+/turf/open/floor/almayer/aicore/no_build,
+/area/almayer/command/airoom)
"mAp" = (
/obj/structure/surface/table/almayer,
/obj/effect/spawner/random/tool,
/turf/open/floor/almayer,
/area/almayer/lifeboat_pumps/south1)
+"mAs" = (
+/obj/effect/step_trigger/teleporter_vector{
+ name = "Almayer_AresDown";
+ vector_x = 96;
+ vector_y = -65
+ },
+/obj/structure/platform{
+ dir = 4
+ },
+/obj/structure/stairs{
+ dir = 1
+ },
+/turf/open/floor/almayer/aicore/no_build,
+/area/almayer/command/airoom)
"mAF" = (
/obj/effect/decal/warning_stripes{
icon_state = "N";
@@ -48337,6 +48337,23 @@
},
/turf/open/floor/plating,
/area/almayer/squads/req)
+"mCx" = (
+/obj/structure/machinery/door/airlock/almayer/secure/reinforced{
+ access_modified = 1;
+ name = "\improper AI Reception";
+ req_access = null;
+ req_one_access_txt = "91;92";
+ dir = 1
+ },
+/obj/effect/step_trigger/clone_cleaner,
+/obj/structure/machinery/door/poddoor/shutters/almayer{
+ id = "ARES ReceptStairs1";
+ name = "\improper ARES Reception Shutters"
+ },
+/turf/open/floor/almayer/no_build{
+ icon_state = "test_floor4"
+ },
+/area/almayer/command/airoom)
"mCE" = (
/obj/structure/prop/invuln/overhead_pipe{
pixel_x = 12;
@@ -48508,15 +48525,7 @@
name = "\improper ARES Mainframe Shutters";
plane = -7
},
-/obj/structure/machinery/door/poddoor/almayer/blended/aicore/open{
- closed_layer = 3.2;
- id = "ARES Emergency";
- layer = 3.2;
- name = "ARES Emergency Lockdown";
- needs_power = 0;
- open_layer = 1.9;
- plane = -7
- },
+/obj/structure/machinery/door/poddoor/almayer/blended/ai_lockdown/aicore,
/turf/open/floor/almayer/no_build{
icon_state = "test_floor4"
},
@@ -48564,12 +48573,6 @@
icon_state = "silver"
},
/area/almayer/command/securestorage)
-"mGL" = (
-/turf/open/floor/almayer{
- dir = 4;
- icon_state = "orange"
- },
-/area/almayer/hallways/upper/midship_hallway)
"mGT" = (
/obj/structure/machinery/status_display{
pixel_y = 30
@@ -48680,6 +48683,20 @@
icon_state = "plate"
},
/area/almayer/maint/hull/upper/u_m_s)
+"mIi" = (
+/obj/effect/step_trigger/teleporter_vector{
+ name = "Almayer_AresUp";
+ vector_x = -96;
+ vector_y = 65
+ },
+/obj/structure/platform{
+ dir = 8
+ },
+/obj/structure/stairs{
+ dir = 1
+ },
+/turf/open/floor/almayer/aicore/no_build,
+/area/almayer/command/airoom)
"mIy" = (
/obj/structure/disposalpipe/segment{
dir = 1;
@@ -48703,6 +48720,12 @@
icon_state = "plate"
},
/area/almayer/hallways/hangar)
+"mIJ" = (
+/obj/structure/pipes/standard/simple/hidden/supply/no_boom{
+ dir = 6
+ },
+/turf/open/floor/almayer/aicore/no_build,
+/area/almayer/command/airoom)
"mIP" = (
/obj/structure/pipes/vents/pump,
/obj/effect/decal/warning_stripes{
@@ -48926,9 +48949,6 @@
icon_state = "plate"
},
/area/almayer/living/pilotbunks)
-"mLE" = (
-/turf/open/floor/plating,
-/area/almayer/command/airoom)
"mLF" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -49175,15 +49195,6 @@
plane = -7
},
/obj/effect/step_trigger/ares_alert/core,
-/obj/structure/machinery/door/poddoor/almayer/blended/aicore/open{
- closed_layer = 3.2;
- id = "ARES Emergency";
- layer = 3.2;
- name = "ARES Emergency Lockdown";
- needs_power = 0;
- open_layer = 1.9;
- plane = -7
- },
/obj/structure/sign/safety/terminal{
pixel_x = -18;
pixel_y = -8
@@ -49192,6 +49203,7 @@
pixel_x = -18;
pixel_y = 6
},
+/obj/structure/machinery/door/poddoor/almayer/blended/ai_lockdown/aicore,
/turf/open/floor/almayer/no_build{
icon_state = "test_floor4"
},
@@ -49368,6 +49380,25 @@
icon_state = "cargo_arrow"
},
/area/almayer/medical/hydroponics)
+"mTr" = (
+/obj/structure/machinery/door_control{
+ id = "ARES StairsLower";
+ name = "ARES Core Lockdown";
+ pixel_x = 24;
+ pixel_y = -8;
+ req_one_access_txt = "90;91;92"
+ },
+/obj/structure/machinery/camera/autoname/almayer/containment/ares{
+ dir = 8;
+ pixel_y = 2;
+ c_tag = "AI - Main Corridor";
+ autoname = 0
+ },
+/turf/open/floor/almayer/aicore/no_build{
+ dir = 4;
+ icon_state = "ai_silver"
+ },
+/area/almayer/command/airoom)
"mTL" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -49397,16 +49428,6 @@
icon_state = "test_floor4"
},
/area/almayer/squads/bravo)
-"mUz" = (
-/obj/structure/surface/table/reinforced/almayer_B,
-/obj/structure/machinery/computer/cameras/almayer/ares{
- dir = 8;
- pixel_x = 17
- },
-/turf/open/floor/almayer/aicore/glowing/no_build{
- icon_state = "ai_floor3"
- },
-/area/almayer/command/airoom)
"mUE" = (
/obj/structure/disposalpipe/segment,
/turf/open/floor/almayer{
@@ -49733,6 +49754,15 @@
icon_state = "red"
},
/area/almayer/shipboard/brig/lobby)
+"naj" = (
+/obj/structure/machinery/door_control{
+ id = "ARES JoeCryo";
+ name = "ARES WorkingJoe Bay Shutters";
+ req_one_access_txt = "91;92";
+ pixel_x = -24
+ },
+/turf/open/floor/almayer/aicore/no_build,
+/area/almayer/command/airoom)
"nar" = (
/obj/structure/toilet{
dir = 4
@@ -50455,6 +50485,21 @@
icon_state = "red"
},
/area/almayer/hallways/upper/starboard)
+"nkK" = (
+/obj/structure/stairs{
+ dir = 1;
+ icon_state = "ramptop"
+ },
+/obj/effect/projector{
+ name = "Almayer_AresDown2";
+ vector_x = 102;
+ vector_y = -61
+ },
+/turf/open/floor/almayer/aicore/glowing/no_build{
+ icon_state = "ai_floor3";
+ light_range = 3
+ },
+/area/almayer/command/airoom)
"nkX" = (
/obj/structure/surface/table/almayer,
/obj/structure/sign/safety/terminal{
@@ -50716,6 +50761,14 @@
},
/turf/open/floor/plating,
/area/almayer/engineering/starboard_atmos)
+"npq" = (
+/obj/structure/disposalpipe/down/almayer{
+ dir = 8;
+ id = "ares_vault_in";
+ name = "aicore"
+ },
+/turf/closed/wall/almayer/aicore/hull,
+/area/almayer/command/airoom)
"npt" = (
/obj/effect/decal/warning_stripes{
icon_state = "SE-out";
@@ -51460,6 +51513,17 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/medical/medical_science)
+"nDy" = (
+/obj/structure/bed/chair/comfy/ares{
+ dir = 1
+ },
+/obj/structure/pipes/vents/pump/no_boom/gas{
+ vent_tag = "Core Chamber"
+ },
+/turf/open/floor/almayer/no_build{
+ icon_state = "plating"
+ },
+/area/almayer/command/airoom)
"nDH" = (
/obj/structure/machinery/light/small{
dir = 1;
@@ -51790,6 +51854,21 @@
icon_state = "red"
},
/area/almayer/command/lifeboat)
+"nKO" = (
+/obj/structure/disposalpipe/trunk{
+ dir = 1
+ },
+/obj/structure/disposaloutlet{
+ density = 0;
+ desc = "An outlet for the pneumatic delivery system.";
+ icon_state = "delivery_outlet";
+ name = "take-ins";
+ pixel_x = 7;
+ pixel_y = 28;
+ range = 0
+ },
+/turf/open/floor/almayer/aicore/no_build,
+/area/almayer/command/airoom)
"nKP" = (
/obj/effect/decal/warning_stripes{
icon_state = "W"
@@ -51908,6 +51987,19 @@
icon_state = "red"
},
/area/almayer/hallways/upper/port)
+"nNA" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "N";
+ pixel_y = 1
+ },
+/obj/effect/decal/warning_stripes{
+ icon_state = "S";
+ layer = 3.3
+ },
+/turf/open/floor/almayer/aicore/no_build{
+ icon_state = "ai_floor2"
+ },
+/area/almayer/command/airoom)
"nNH" = (
/turf/open/floor/almayer{
dir = 1;
@@ -52537,12 +52629,19 @@
},
/turf/open/floor/wood/ship,
/area/almayer/shipboard/brig/cells)
-"nYf" = (
-/obj/structure/machinery/cm_vending/clothing/intelligence_officer,
-/turf/open/floor/almayer{
- icon_state = "silverfull"
+"nYg" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "S";
+ layer = 3.3
},
-/area/almayer/command/securestorage)
+/obj/effect/decal/warning_stripes{
+ icon_state = "NW-out";
+ pixel_y = 1
+ },
+/turf/open/floor/almayer/aicore/no_build{
+ icon_state = "ai_floor2"
+ },
+/area/almayer/command/airoom)
"nYi" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/almayer{
@@ -52779,6 +52878,14 @@
},
/turf/open/floor/almayer/aicore/glowing/no_build,
/area/almayer/command/airoom)
+"ocL" = (
+/obj/structure/machinery/cryopod/right{
+ dir = 4
+ },
+/turf/open/floor/almayer/aicore/no_build{
+ icon_state = "ai_cargo"
+ },
+/area/almayer/command/airoom)
"odb" = (
/obj/structure/machinery/light,
/turf/open/floor/almayer{
@@ -52963,6 +53070,19 @@
icon_state = "red"
},
/area/almayer/hallways/upper/port)
+"ofY" = (
+/obj/structure/surface/table/reinforced/almayer_B{
+ indestructible = 1;
+ unacidable = 1;
+ unslashable = 1
+ },
+/obj/structure/machinery/computer/working_joe{
+ layer = 3.3;
+ dir = 4;
+ pixel_y = 6
+ },
+/turf/open/floor/almayer/aicore/no_build,
+/area/almayer/command/airoom)
"ogK" = (
/obj/structure/bed/bedroll{
desc = "A bed of cotton fabric, purposely made for a cat to comfortably sleep on.";
@@ -53447,6 +53567,20 @@
icon_state = "sterile_green_side"
},
/area/almayer/medical/upper_medical)
+"onU" = (
+/obj/effect/step_trigger/teleporter_vector{
+ name = "Almayer_AresDown";
+ vector_x = 96;
+ vector_y = -65
+ },
+/obj/structure/platform{
+ dir = 8
+ },
+/obj/structure/stairs{
+ dir = 1
+ },
+/turf/open/floor/almayer/aicore/no_build,
+/area/almayer/command/airoom)
"onY" = (
/obj/structure/surface/table/almayer,
/obj/item/paper_bin/uscm,
@@ -53994,12 +54128,6 @@
},
/turf/open/floor/almayer,
/area/almayer/hallways/lower/starboard_aft_hallway)
-"oxi" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
- dir = 10
- },
-/turf/open/floor/almayer,
-/area/almayer/living/cafeteria_officer)
"oxl" = (
/obj/structure/window/reinforced{
dir = 8;
@@ -54216,6 +54344,16 @@
icon_state = "silver"
},
/area/almayer/command/cichallway)
+"oBD" = (
+/obj/structure/pipes/vents/pump/no_boom/gas{
+ vent_tag = "Access Hall";
+ dir = 8
+ },
+/turf/open/floor/almayer/aicore/no_build{
+ dir = 4;
+ icon_state = "ai_silver"
+ },
+/area/almayer/command/airoom)
"oCa" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -54495,7 +54633,7 @@
"oFn" = (
/obj/structure/surface/table/almayer,
/obj/item/tool/wirecutters/clippers,
-/obj/item/handcuffs/zip,
+/obj/item/restraint/handcuffs/zip,
/turf/open/floor/almayer{
icon_state = "plate"
},
@@ -54813,27 +54951,6 @@
icon_state = "plate"
},
/area/almayer/hallways/lower/port_fore_hallway)
-"oJR" = (
-/obj/effect/projector{
- name = "Almayer_AresDown";
- vector_x = 97;
- vector_y = -65
- },
-/obj/structure/platform{
- dir = 8
- },
-/obj/structure/stairs{
- dir = 1;
- icon_state = "ramptop"
- },
-/obj/structure/machinery/door_control{
- id = "ARES StairsUpper";
- name = "ARES Core Access";
- pixel_x = -24;
- req_one_access_txt = "90;91;92"
- },
-/turf/open/floor/almayer/aicore/no_build,
-/area/almayer/command/airoom)
"oKb" = (
/obj/structure/machinery/status_display{
pixel_y = 30
@@ -55082,6 +55199,17 @@
icon_state = "plate"
},
/area/almayer/command/lifeboat)
+"oOW" = (
+/obj/structure/pipes/standard/simple/hidden/supply,
+/obj/structure/disposalpipe/junction{
+ dir = 2;
+ icon_state = "pipe-j2"
+ },
+/turf/open/floor/almayer{
+ dir = 1;
+ icon_state = "orange"
+ },
+/area/almayer/engineering/upper_engineering)
"oOZ" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 4
@@ -55619,17 +55747,6 @@
icon_state = "orange"
},
/area/almayer/engineering/lower)
-"oXP" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/pipes/standard/simple/hidden/supply{
- dir = 4
- },
-/turf/open/floor/almayer{
- icon_state = "orangecorner"
- },
-/area/almayer/hallways/upper/midship_hallway)
"oXY" = (
/obj/structure/machinery/camera/autoname/almayer{
dir = 8;
@@ -55698,6 +55815,20 @@
icon_state = "silver"
},
/area/almayer/hallways/lower/repair_bay)
+"oYZ" = (
+/obj/effect/step_trigger/teleporter_vector{
+ name = "Almayer_AresDown";
+ vector_x = 96;
+ vector_y = -65
+ },
+/obj/structure/stairs{
+ dir = 1
+ },
+/turf/open/floor/almayer/aicore/glowing/no_build{
+ icon_state = "ai_floor3";
+ light_range = 3
+ },
+/area/almayer/command/airoom)
"oZp" = (
/obj/structure/surface/table/almayer,
/obj/structure/machinery/light,
@@ -55714,6 +55845,17 @@
icon_state = "red"
},
/area/almayer/living/offices/flight)
+"oZx" = (
+/obj/effect/step_trigger/clone_cleaner,
+/obj/structure/machinery/door/poddoor/shutters/almayer{
+ id = "ARES ReceptStairs2";
+ name = "\improper ARES Reception Shutters";
+ plane = -7
+ },
+/turf/open/floor/almayer/no_build{
+ icon_state = "test_floor4"
+ },
+/area/almayer/command/airoom)
"oZy" = (
/obj/effect/decal/warning_stripes{
icon_state = "S"
@@ -55798,6 +55940,17 @@
icon_state = "cargo"
},
/area/almayer/shipboard/brig/cryo)
+"pax" = (
+/obj/effect/step_trigger/clone_cleaner,
+/obj/structure/pipes/vents/pump/no_boom/gas{
+ vent_tag = "Reception";
+ dir = 8
+ },
+/turf/open/floor/almayer/aicore/glowing/no_build{
+ icon_state = "ai_floor3";
+ light_range = 3
+ },
+/area/almayer/command/airoom)
"paI" = (
/obj/structure/sign/safety/debark_lounge{
pixel_x = 15;
@@ -56125,21 +56278,6 @@
"pgD" = (
/turf/closed/wall/almayer,
/area/almayer/lifeboat_pumps/south1)
-"pgH" = (
-/obj/effect/projector{
- name = "Almayer_AresDown";
- vector_x = 97;
- vector_y = -65
- },
-/obj/structure/platform{
- dir = 4
- },
-/obj/structure/stairs{
- dir = 1;
- icon_state = "ramptop"
- },
-/turf/open/floor/almayer/aicore/no_build,
-/area/almayer/command/airoom)
"pgJ" = (
/obj/structure/sign/safety/hvac_old{
pixel_x = 8;
@@ -56197,10 +56335,10 @@
},
/area/almayer/living/briefing)
"phj" = (
-/obj/structure/machinery/photocopier,
/obj/structure/machinery/light/small{
dir = 1
},
+/obj/structure/machinery/photocopier/wyphotocopier,
/turf/open/floor/almayer{
icon_state = "plate"
},
@@ -56334,6 +56472,20 @@
icon_state = "orange"
},
/area/almayer/engineering/lower)
+"pkS" = (
+/obj/structure/stairs{
+ dir = 1;
+ icon_state = "ramptop"
+ },
+/obj/effect/projector{
+ name = "Almayer_AresUp2";
+ vector_x = -102;
+ vector_y = 61
+ },
+/turf/open/floor/almayer/aicore/glowing/no_build{
+ icon_state = "ai_floor3"
+ },
+/area/almayer/command/airoom)
"pld" = (
/obj/item/book/manual/medical_diagnostics_manual,
/obj/structure/surface/rack,
@@ -57150,6 +57302,12 @@
"pzW" = (
/turf/closed/wall/almayer/reinforced,
/area/almayer/hallways/lower/vehiclehangar)
+"pzX" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+ dir = 9
+ },
+/turf/open/floor/almayer,
+/area/almayer/engineering/upper_engineering)
"pAm" = (
/turf/open/floor/almayer,
/area/almayer/engineering/lower/engine_core)
@@ -57523,19 +57681,6 @@
icon_state = "dark_sterile"
},
/area/almayer/living/port_emb)
-"pJR" = (
-/obj/effect/step_trigger/teleporter_vector{
- name = "Almayer_AresUp";
- vector_x = -97;
- vector_y = 65
- },
-/obj/structure/stairs{
- dir = 1
- },
-/turf/open/floor/almayer/aicore/glowing/no_build{
- icon_state = "ai_floor3"
- },
-/area/almayer/command/airoom)
"pJS" = (
/obj/structure/disposalpipe/segment,
/obj/structure/sign/safety/distribution_pipes{
@@ -58050,16 +58195,6 @@
icon_state = "silvercorner"
},
/area/almayer/command/computerlab)
-"pTt" = (
-/obj/structure/machinery/door/poddoor/shutters/almayer{
- id = "ARES JoeCryo";
- name = "\improper ARES Core Shutters";
- plane = -7
- },
-/turf/open/floor/almayer/no_build{
- icon_state = "test_floor4"
- },
-/area/almayer/command/airoom)
"pTI" = (
/obj/structure/sign/safety/storage{
pixel_x = 8;
@@ -58121,6 +58256,16 @@
icon_state = "bluecorner"
},
/area/almayer/squads/delta)
+"pUg" = (
+/obj/effect/step_trigger/clone_cleaner,
+/obj/structure/machinery/door_control{
+ id = "ARES ReceptStairs2";
+ name = "ARES Reception Stairway Shutters";
+ pixel_x = 24;
+ req_one_access_txt = "91;92"
+ },
+/turf/open/floor/almayer/aicore/no_build,
+/area/almayer/command/airoom)
"pUj" = (
/obj/effect/decal/cleanable/blood/oil,
/turf/open/floor/almayer,
@@ -59440,6 +59585,16 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/maint/hull/lower/l_f_p)
+"qpY" = (
+/obj/structure/machinery/cryopod/right{
+ layer = 3.1;
+ pixel_y = 13;
+ dir = 4
+ },
+/turf/open/floor/almayer/aicore/no_build{
+ icon_state = "ai_cargo"
+ },
+/area/almayer/command/airoom)
"qqa" = (
/obj/effect/step_trigger/clone_cleaner,
/turf/open/floor/plating/almayer{
@@ -59538,6 +59693,13 @@
icon_state = "plating_striped"
},
/area/almayer/squads/req)
+"qsG" = (
+/obj/structure/pipes/standard/manifold/hidden/supply,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/almayer,
+/area/almayer/hallways/upper/aft_hallway)
"qsL" = (
/obj/structure/pipes/standard/simple/hidden/supply,
/turf/open/floor/almayer,
@@ -59713,6 +59875,21 @@
icon_state = "plate"
},
/area/almayer/living/offices)
+"qwJ" = (
+/obj/effect/projector{
+ name = "Almayer_AresDown";
+ vector_x = 96;
+ vector_y = -65
+ },
+/obj/structure/platform{
+ dir = 8
+ },
+/obj/structure/stairs{
+ dir = 1;
+ icon_state = "ramptop"
+ },
+/turf/open/floor/almayer/aicore/no_build,
+/area/almayer/command/airoom)
"qwU" = (
/obj/effect/decal/warning_stripes{
icon_state = "SW-out"
@@ -59870,6 +60047,16 @@
icon_state = "red"
},
/area/almayer/lifeboat_pumps/south1)
+"qyA" = (
+/obj/structure/machinery/cm_vending/clothing/intelligence_officer{
+ density = 0;
+ pixel_x = -32
+ },
+/turf/open/floor/almayer{
+ dir = 8;
+ icon_state = "silver"
+ },
+/area/almayer/command/computerlab)
"qyD" = (
/obj/structure/surface/table/almayer,
/obj/structure/machinery/recharger,
@@ -60162,16 +60349,6 @@
icon_state = "test_floor4"
},
/area/almayer/maint/hull/upper/u_a_p)
-"qDN" = (
-/obj/structure/machinery/light{
- dir = 8
- },
-/obj/structure/machinery/cm_vending/sorted/medical/marinemed,
-/obj/structure/medical_supply_link,
-/turf/open/floor/almayer{
- icon_state = "redfull"
- },
-/area/almayer/command/cic)
"qDP" = (
/obj/structure/machinery/light{
dir = 4
@@ -60400,11 +60577,14 @@
},
/area/almayer/powered)
"qHD" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 4
},
-/turf/open/floor/almayer,
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
+ },
+/turf/open/floor/plating/plating_catwalk,
/area/almayer/hallways/upper/aft_hallway)
"qHG" = (
/obj/structure/machinery/light/small{
@@ -60641,6 +60821,19 @@
icon_state = "orange"
},
/area/almayer/engineering/upper_engineering/port)
+"qKZ" = (
+/obj/effect/step_trigger/teleporter_vector{
+ name = "Almayer_AresUp";
+ vector_x = -96;
+ vector_y = 65
+ },
+/obj/structure/stairs{
+ dir = 1
+ },
+/turf/open/floor/almayer/aicore/glowing/no_build{
+ icon_state = "ai_floor3"
+ },
+/area/almayer/command/airoom)
"qLg" = (
/obj/structure/disposalpipe/segment,
/turf/open/floor/almayer{
@@ -60739,6 +60932,16 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/shipboard/brig/armory)
+"qMI" = (
+/obj/structure/pipes/standard/manifold/hidden/supply{
+ dir = 1
+ },
+/obj/structure/disposalpipe/junction{
+ dir = 2;
+ icon_state = "pipe-y"
+ },
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/hallways/upper/aft_hallway)
"qMP" = (
/obj/structure/bed/chair/comfy{
dir = 8
@@ -60859,6 +61062,14 @@
icon_state = "test_floor4"
},
/area/almayer/maint/hull/upper/u_f_p)
+"qOZ" = (
+/obj/structure/machinery/cm_vending/sorted/medical/marinemed,
+/obj/structure/medical_supply_link,
+/turf/open/floor/almayer{
+ dir = 1;
+ icon_state = "sterile_green_side"
+ },
+/area/almayer/medical/lower_medical_lobby)
"qPk" = (
/turf/open/floor/almayer,
/area/almayer/hallways/lower/starboard_fore_hallway)
@@ -60991,21 +61202,20 @@
icon_state = "test_floor4"
},
/area/almayer/command/corporateliaison)
+"qRX" = (
+/obj/structure/pipes/standard/simple/hidden/supply/no_boom{
+ dir = 4
+ },
+/turf/open/floor/almayer/aicore/glowing/no_build{
+ icon_state = "ai_floor3"
+ },
+/area/almayer/command/airoom)
"qSm" = (
/obj/structure/pipes/vents/pump{
dir = 4
},
/turf/open/floor/almayer,
/area/almayer/shipboard/port_point_defense)
-"qSp" = (
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
-/turf/open/floor/almayer{
- icon_state = "orangecorner"
- },
-/area/almayer/hallways/upper/aft_hallway)
"qSE" = (
/obj/structure/surface/table/almayer,
/obj/item/reagent_container/food/condiment/hotsauce/cholula,
@@ -61264,18 +61474,6 @@
dir = 4
},
/area/almayer/medical/containment/cell/cl)
-"qXh" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/pipes/standard/simple/hidden/supply{
- dir = 4
- },
-/turf/open/floor/almayer{
- dir = 6;
- icon_state = "orange"
- },
-/area/almayer/hallways/upper/midship_hallway)
"qXk" = (
/turf/open/floor/almayer{
icon_state = "plate"
@@ -62310,6 +62508,10 @@
icon_state = "dark_sterile"
},
/area/almayer/engineering/upper_engineering/port)
+"rmG" = (
+/obj/structure/blocker/fuelpump,
+/turf/open/floor/almayer,
+/area/almayer/lifeboat_pumps/north2)
"rna" = (
/obj/structure/machinery/status_display{
pixel_y = 30
@@ -62844,6 +63046,28 @@
icon_state = "plate"
},
/area/almayer/maint/hull/lower/l_m_p)
+"rxl" = (
+/obj/effect/step_trigger/clone_cleaner,
+/obj/structure/machinery/disposal/delivery{
+ density = 0;
+ desc = "A pneumatic delivery unit.";
+ icon_state = "delivery_engi";
+ name = "Security Vault";
+ pixel_y = 28;
+ pixel_x = -24
+ },
+/obj/structure/disposalpipe/trunk{
+ dir = 1
+ },
+/obj/structure/machinery/door_control{
+ id = "ARES StairsUpper";
+ name = "ARES Core Access";
+ pixel_x = -32;
+ pixel_y = 40;
+ req_one_access_txt = "90;91;92"
+ },
+/turf/open/floor/almayer/aicore/no_build,
+/area/almayer/command/airoom)
"rxq" = (
/obj/structure/disposalpipe/segment{
dir = 2;
@@ -62857,12 +63081,6 @@
/obj/structure/pipes/standard/manifold/hidden/supply,
/turf/open/floor/plating/plating_catwalk,
/area/almayer/shipboard/navigation)
-"rxO" = (
-/obj/structure/machinery/cm_vending/clothing/intelligence_officer,
-/turf/open/floor/almayer{
- icon_state = "silverfull"
- },
-/area/almayer/command/computerlab)
"rxQ" = (
/obj/structure/pipes/standard/manifold/hidden/supply,
/obj/structure/disposalpipe/segment{
@@ -62870,6 +63088,9 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/hallways/upper/fore_hallway)
+"ryn" = (
+/turf/closed/wall/almayer/outer,
+/area/almayer/command/securestorage)
"ryt" = (
/obj/structure/pipes/standard/manifold/visible,
/turf/open/floor/almayer{
@@ -63042,14 +63263,6 @@
icon_state = "test_floor4"
},
/area/almayer/maint/upper/u_m_p)
-"rBH" = (
-/obj/structure/machinery/constructable_frame{
- icon_state = "box_2"
- },
-/turf/open/floor/almayer{
- icon_state = "mono"
- },
-/area/almayer/lifeboat_pumps/south1)
"rBY" = (
/obj/structure/machinery/shower{
pixel_y = 16
@@ -63066,12 +63279,6 @@
icon_state = "plate"
},
/area/almayer/maint/hull/lower/l_m_p)
-"rCi" = (
-/obj/structure/machinery/camera/autoname/almayer/containment/ares{
- dir = 8
- },
-/turf/open/floor/almayer/aicore/no_build,
-/area/almayer/command/airoom)
"rCl" = (
/obj/effect/decal/warning_stripes{
icon_state = "E";
@@ -63082,20 +63289,6 @@
icon_state = "red"
},
/area/almayer/hallways/upper/port)
-"rCw" = (
-/obj/effect/step_trigger/teleporter_vector{
- name = "Almayer_AresDown";
- vector_x = 97;
- vector_y = -65
- },
-/obj/structure/platform{
- dir = 8
- },
-/obj/structure/stairs{
- dir = 1
- },
-/turf/open/floor/almayer/aicore/no_build,
-/area/almayer/command/airoom)
"rCD" = (
/obj/structure/machinery/light/small{
dir = 4
@@ -63296,12 +63489,6 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/maint/hull/lower/l_f_p)
-"rEL" = (
-/obj/structure/machinery/cm_vending/gear/intelligence_officer,
-/turf/open/floor/almayer{
- icon_state = "silverfull"
- },
-/area/almayer/command/computerlab)
"rEY" = (
/obj/structure/machinery/disposal,
/obj/structure/disposalpipe/trunk{
@@ -63811,13 +63998,6 @@
icon_state = "dark_sterile"
},
/area/almayer/living/port_emb)
-"rNF" = (
-/obj/structure/machinery/light{
- unacidable = 1;
- unslashable = 1
- },
-/turf/open/floor/almayer/aicore/no_build,
-/area/almayer/command/airoom)
"rNK" = (
/obj/structure/surface/table/almayer,
/turf/open/floor/almayer{
@@ -63850,6 +64030,15 @@
icon_state = "silver"
},
/area/almayer/hallways/lower/repair_bay)
+"rOz" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "S";
+ layer = 3.3
+ },
+/turf/open/floor/almayer/aicore/no_build{
+ icon_state = "ai_floor2"
+ },
+/area/almayer/command/airoom)
"rOC" = (
/obj/structure/machinery/light{
dir = 1
@@ -64634,16 +64823,6 @@
icon_state = "red"
},
/area/almayer/hallways/upper/starboard)
-"sdl" = (
-/obj/structure/surface/rack{
- density = 0;
- pixel_y = 16
- },
-/obj/item/tool/wet_sign,
-/obj/item/tool/wet_sign,
-/obj/item/tool/wet_sign,
-/turf/open/floor/plating,
-/area/almayer/command/airoom)
"sdn" = (
/obj/structure/sink{
dir = 4;
@@ -64703,6 +64882,10 @@
icon_state = "silver"
},
/area/almayer/hallways/upper/midship_hallway)
+"sfA" = (
+/obj/structure/machinery/fuelpump,
+/turf/open/floor/almayer,
+/area/almayer/lifeboat_pumps/south1)
"sfT" = (
/turf/open/floor/almayer,
/area/almayer/hallways/upper/port)
@@ -65470,8 +65653,6 @@
},
/area/almayer/shipboard/brig/perma)
"sqo" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/disposalpipe/segment,
/obj/structure/bed/chair{
dir = 8
},
@@ -65742,6 +65923,18 @@
icon_state = "greencorner"
},
/area/almayer/living/grunt_rnr)
+"swx" = (
+/obj/effect/projector{
+ name = "Almayer_AresUp";
+ vector_x = -96;
+ vector_y = 65
+ },
+/obj/structure/stairs{
+ dir = 1;
+ icon_state = "ramptop"
+ },
+/turf/open/floor/almayer/aicore/no_build,
+/area/almayer/command/airoom)
"swE" = (
/obj/structure/surface/table/almayer,
/obj/structure/machinery/alarm/almayer{
@@ -65948,6 +66141,13 @@
icon_state = "blue"
},
/area/almayer/squads/delta)
+"sAw" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/pipes/standard/manifold/hidden/supply{
+ dir = 8
+ },
+/turf/open/floor/almayer,
+/area/almayer/engineering/upper_engineering)
"sAz" = (
/obj/effect/decal/warning_stripes{
icon_state = "W"
@@ -66360,17 +66560,6 @@
icon_state = "red"
},
/area/almayer/squads/alpha)
-"sIf" = (
-/obj/effect/step_trigger/teleporter_vector{
- name = "Almayer_AresDown";
- vector_x = 97;
- vector_y = -65
- },
-/obj/structure/stairs{
- dir = 1
- },
-/turf/open/floor/almayer/aicore/no_build,
-/area/almayer/command/airoom)
"sIr" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 4
@@ -66399,6 +66588,17 @@
icon_state = "silver"
},
/area/almayer/engineering/port_atmos)
+"sII" = (
+/obj/effect/step_trigger/clone_cleaner,
+/obj/structure/machinery/door/poddoor/shutters/almayer{
+ id = "ARES ReceptStairs2";
+ name = "\improper ARES Reception Stairway Shutters";
+ plane = -7
+ },
+/turf/open/floor/almayer/no_build{
+ icon_state = "test_floor4"
+ },
+/area/almayer/command/airoom)
"sIR" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -66456,12 +66656,6 @@
icon_state = "cargo"
},
/area/almayer/engineering/lower/workshop/hangar)
-"sJN" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/hallways/upper/aft_hallway)
"sJY" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 4
@@ -66685,6 +66879,14 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/maint/hull/lower/l_a_p)
+"sOK" = (
+/obj/structure/disposalpipe/down/almayer{
+ dir = 2;
+ id = "ares_vault_out";
+ name = "wycomms"
+ },
+/turf/closed/wall/almayer/outer,
+/area/almayer/command/airoom)
"sOL" = (
/obj/structure/machinery/light/small{
dir = 1
@@ -66773,23 +66975,6 @@
icon_state = "plate"
},
/area/almayer/command/lifeboat)
-"sRC" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/machinery/door/firedoor/border_only/almayer,
-/turf/open/floor/almayer{
- icon_state = "test_floor4"
- },
-/area/almayer/hallways/upper/aft_hallway)
-"sRM" = (
-/obj/structure/machinery/power/apc/almayer{
- dir = 1
- },
-/turf/open/floor/almayer{
- icon_state = "plate"
- },
-/area/almayer/maint/hull/lower/l_a_s)
"sRZ" = (
/obj/effect/projector{
name = "Almayer_Down2";
@@ -67296,13 +67481,17 @@
icon_state = "blue"
},
/area/almayer/living/port_emb)
+"sZY" = (
+/obj/structure/blocker/fuelpump,
+/turf/open/floor/almayer,
+/area/almayer/lifeboat_pumps/south2)
"tab" = (
/obj/structure/surface/table/reinforced/almayer_B,
/obj/item/storage/box/flashbangs{
pixel_x = -5;
pixel_y = 5
},
-/obj/item/handcuffs,
+/obj/item/restraint/handcuffs,
/obj/item/storage/firstaid/regular,
/obj/structure/machinery/light{
dir = 8
@@ -68086,22 +68275,20 @@
icon_state = "redcorner"
},
/area/almayer/shipboard/brig/execution)
-"tmK" = (
-/obj/structure/machinery/door/airlock/almayer/maint{
- dir = 1;
- req_one_access = null;
- req_one_access_txt = "91;92"
- },
-/turf/open/floor/almayer/no_build{
- icon_state = "test_floor4"
- },
-/area/almayer/command/airoom)
"tmQ" = (
/obj/structure/machinery/light/small{
dir = 1
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/maint/hull/lower/stern)
+"tmV" = (
+/obj/structure/machinery/camera/autoname/almayer/containment/ares{
+ dir = 8;
+ autoname = 0;
+ c_tag = "AI - SecVault"
+ },
+/turf/open/floor/almayer/aicore/no_build,
+/area/almayer/command/airoom)
"tmX" = (
/obj/effect/landmark/start/professor,
/obj/effect/landmark/late_join/cmo,
@@ -68309,6 +68496,16 @@
},
/turf/open/floor/almayer,
/area/almayer/hallways/lower/vehiclehangar)
+"tqu" = (
+/obj/effect/step_trigger/clone_cleaner,
+/obj/structure/machinery/door_control{
+ id = "ARES ReceptStairs1";
+ name = "ARES Reception Shutters";
+ pixel_y = -24;
+ req_one_access_txt = "91;92"
+ },
+/turf/open/floor/almayer/aicore/no_build,
+/area/almayer/command/airoom)
"tqE" = (
/obj/structure/machinery/light{
dir = 8
@@ -68512,10 +68709,6 @@
/obj/structure/largecrate/random/barrel/blue,
/turf/open/floor/plating/plating_catwalk,
/area/almayer/maint/hull/upper/p_bow)
-"tsH" = (
-/obj/effect/landmark/crap_item,
-/turf/open/floor/almayer,
-/area/almayer/hallways/upper/midship_hallway)
"tsM" = (
/obj/effect/decal/warning_stripes{
icon_state = "N";
@@ -68972,6 +69165,30 @@
icon_state = "plate"
},
/area/almayer/engineering/upper_engineering/port)
+"tAt" = (
+/obj/effect/step_trigger/clone_cleaner,
+/obj/structure/machinery/door/poddoor/almayer/open{
+ dir = 4;
+ id = "ARES StairsLock";
+ name = "ARES Exterior Lockdown"
+ },
+/obj/effect/step_trigger/ares_alert/access_control,
+/obj/structure/disposalpipe/trunk{
+ dir = 1
+ },
+/obj/structure/disposaloutlet{
+ density = 0;
+ desc = "An outlet for the pneumatic delivery system.";
+ icon_state = "delivery_outlet";
+ name = "returns outlet";
+ pixel_y = 28;
+ range = 0;
+ pixel_x = -7
+ },
+/turf/open/floor/almayer/no_build{
+ icon_state = "test_floor4"
+ },
+/area/almayer/command/airoom)
"tAL" = (
/obj/structure/machinery/cryopod,
/turf/open/floor/almayer{
@@ -69085,6 +69302,14 @@
icon_state = "test_floor4"
},
/area/almayer/hallways/upper/port)
+"tCC" = (
+/obj/structure/machinery/camera/autoname/almayer/containment/ares{
+ dir = 1;
+ c_tag = "AI - Reception Interior";
+ autoname = 0
+ },
+/turf/open/floor/almayer/aicore/no_build,
+/area/almayer/command/airoom)
"tCH" = (
/obj/structure/machinery/door/firedoor/border_only/almayer,
/obj/structure/disposalpipe/segment{
@@ -69185,12 +69410,7 @@
name = "\improper ARES Core Shutters";
plane = -7
},
-/obj/structure/machinery/door/poddoor/almayer/blended/open{
- id = "ARES Emergency";
- name = "ARES Emergency Lockdown";
- open_layer = 1.9;
- plane = -7
- },
+/obj/structure/machinery/door/poddoor/almayer/blended/ai_lockdown,
/turf/open/floor/almayer/no_build{
icon_state = "test_floor4"
},
@@ -69292,12 +69512,10 @@
/obj/structure/machinery/light{
dir = 1
},
-/obj/structure/machinery/photocopier{
- anchored = 0
- },
/obj/structure/sign/poster/art{
pixel_y = 32
},
+/obj/structure/machinery/photocopier/wyphotocopier,
/turf/open/floor/wood/ship,
/area/almayer/command/corporateliaison)
"tHk" = (
@@ -69391,6 +69609,15 @@
icon_state = "test_floor4"
},
/area/almayer/living/port_emb)
+"tIu" = (
+/obj/structure/bed/chair/office/dark{
+ dir = 8
+ },
+/turf/open/floor/almayer/aicore/glowing/no_build{
+ icon_state = "ai_floor3";
+ light_range = 3
+ },
+/area/almayer/command/airoom)
"tIF" = (
/obj/structure/largecrate/random/barrel/green,
/turf/open/floor/almayer{
@@ -69467,15 +69694,6 @@
},
/turf/open/floor/almayer,
/area/almayer/squads/charlie_delta_shared)
-"tJN" = (
-/obj/structure/machinery/cryopod/right{
- layer = 3.1;
- pixel_y = 13
- },
-/turf/open/floor/almayer/aicore/no_build{
- icon_state = "ai_cargo"
- },
-/area/almayer/command/airoom)
"tJR" = (
/obj/structure/machinery/vending/cigarette,
/obj/structure/sign/safety/medical{
@@ -69555,20 +69773,6 @@
icon_state = "green"
},
/area/almayer/living/grunt_rnr)
-"tLY" = (
-/obj/structure/surface/table/reinforced/almayer_B{
- climbable = 0;
- indestructible = 1;
- unacidable = 1;
- unslashable = 1
- },
-/obj/item/desk_bell{
- pixel_x = -6;
- pixel_y = 10;
- anchored = 1
- },
-/turf/open/floor/almayer/aicore/no_build,
-/area/almayer/command/airoom)
"tLZ" = (
/turf/open/floor/almayer{
icon_state = "green"
@@ -70094,6 +70298,14 @@
icon_state = "test_floor4"
},
/area/almayer/squads/req)
+"tXn" = (
+/obj/structure/machinery/power/apc/almayer{
+ dir = 8
+ },
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/maint/hull/lower/l_a_s)
"tXo" = (
/turf/open/floor/almayer{
icon_state = "redcorner"
@@ -70517,6 +70729,10 @@
icon_state = "sterile_green_side"
},
/area/almayer/medical/lockerroom)
+"uez" = (
+/obj/structure/pipes/standard/manifold/hidden/supply,
+/turf/open/floor/almayer,
+/area/almayer/hallways/upper/aft_hallway)
"ueG" = (
/obj/item/bedsheet/orange,
/obj/structure/bed{
@@ -70747,6 +70963,14 @@
icon_state = "test_floor4"
},
/area/almayer/command/cichallway)
+"ujn" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "E"
+ },
+/turf/open/floor/almayer/aicore/no_build{
+ icon_state = "ai_floor2"
+ },
+/area/almayer/command/airoom)
"ujz" = (
/obj/structure/disposalpipe/segment,
/obj/structure/pipes/standard/simple/hidden/supply,
@@ -72193,6 +72417,27 @@
icon_state = "emerald"
},
/area/almayer/living/port_emb)
+"uMO" = (
+/obj/effect/projector{
+ name = "Almayer_AresDown";
+ vector_x = 96;
+ vector_y = -65
+ },
+/obj/structure/platform{
+ dir = 4
+ },
+/obj/structure/stairs{
+ dir = 1;
+ icon_state = "ramptop"
+ },
+/obj/structure/machinery/door_control{
+ id = "ARES StairsUpper";
+ name = "ARES Core Access";
+ pixel_x = 24;
+ req_one_access_txt = "90;91;92"
+ },
+/turf/open/floor/almayer/aicore/no_build,
+/area/almayer/command/airoom)
"uMS" = (
/turf/open/floor/almayer{
dir = 5;
@@ -72299,6 +72544,22 @@
"uPE" = (
/turf/open/floor/almayer,
/area/almayer/hallways/lower/port_aft_hallway)
+"uPI" = (
+/obj/structure/surface/table/reinforced/almayer_B{
+ indestructible = 1;
+ unacidable = 1;
+ unslashable = 1
+ },
+/obj/structure/transmitter/rotary{
+ name = "AI Reception Telephone";
+ phone_category = "ARES";
+ phone_color = "blue";
+ phone_id = "AI Reception"
+ },
+/turf/open/floor/almayer/no_build{
+ icon_state = "ai_floors"
+ },
+/area/almayer/command/airoom)
"uPP" = (
/obj/structure/machinery/door/airlock/almayer/engineering{
dir = 2;
@@ -72652,6 +72913,25 @@
},
/turf/open/floor/plating,
/area/almayer/engineering/upper_engineering/port)
+"uUB" = (
+/obj/structure/surface/table/reinforced/almayer_B{
+ indestructible = 1;
+ unacidable = 1;
+ unslashable = 1
+ },
+/obj/item/paper_bin/uscm{
+ pixel_y = 6;
+ pixel_x = -12
+ },
+/obj/item/tool/pen{
+ pixel_x = -14
+ },
+/obj/structure/machinery/aicore_lockdown{
+ pixel_y = 4;
+ pixel_x = 3
+ },
+/turf/open/floor/almayer/aicore/no_build,
+/area/almayer/command/airoom)
"uVc" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 1
@@ -73835,6 +74115,12 @@
icon_state = "plate"
},
/area/almayer/living/gym)
+"vnM" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+ dir = 6
+ },
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/hallways/upper/starboard)
"vnY" = (
/turf/open/floor/almayer,
/area/almayer/hallways/lower/repair_bay)
@@ -73964,6 +74250,23 @@
/obj/item/clothing/mask/cigarette/weed,
/turf/open/floor/plating/plating_catwalk,
/area/almayer/engineering/upper_engineering/port)
+"vpH" = (
+/obj/structure/surface/table/reinforced/almayer_B{
+ indestructible = 1;
+ unacidable = 1;
+ unslashable = 1
+ },
+/obj/structure/machinery/computer/working_joe{
+ layer = 3.3;
+ dir = 8
+ },
+/obj/item/desk_bell/ares{
+ pixel_y = 14;
+ pixel_x = -5;
+ anchored = 1
+ },
+/turf/open/floor/almayer/aicore/no_build,
+/area/almayer/command/airoom)
"vpI" = (
/obj/structure/sign/safety/hvac_old{
pixel_x = 8;
@@ -74868,6 +75171,24 @@
/obj/structure/largecrate/random/barrel/yellow,
/turf/open/floor/plating/plating_catwalk,
/area/almayer/maint/hull/lower/s_bow)
+"vCH" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "N";
+ pixel_y = 1
+ },
+/obj/effect/decal/warning_stripes{
+ icon_state = "S";
+ layer = 3.3
+ },
+/obj/structure/machinery/camera/autoname/almayer/containment/ares{
+ dir = 4;
+ c_tag = "AI - Primary Processors";
+ autoname = 0
+ },
+/turf/open/floor/almayer/aicore/no_build{
+ icon_state = "ai_floor2"
+ },
+/area/almayer/command/airoom)
"vCO" = (
/obj/effect/landmark/start/bridge,
/turf/open/floor/plating/plating_catwalk,
@@ -75040,16 +75361,6 @@
icon_state = "plate"
},
/area/almayer/maint/hull/lower/l_f_p)
-"vGi" = (
-/obj/structure/pipes/standard/manifold/hidden/supply{
- dir = 8
- },
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
-/turf/open/floor/almayer,
-/area/almayer/hallways/upper/aft_hallway)
"vGn" = (
/turf/open/floor/almayer{
dir = 1;
@@ -75388,6 +75699,16 @@
icon_state = "silver"
},
/area/almayer/hallways/lower/repair_bay)
+"vLz" = (
+/obj/structure/machinery/door_control{
+ id = "ARES Mainframe Right";
+ name = "ARES Mainframe Lockdown";
+ pixel_x = -24;
+ pixel_y = -24;
+ req_one_access_txt = "200;91;92"
+ },
+/turf/open/floor/almayer/aicore/no_build,
+/area/almayer/command/airoom)
"vLA" = (
/obj/effect/decal/warning_stripes{
icon_state = "W";
@@ -75787,6 +76108,17 @@
icon_state = "orange"
},
/area/almayer/engineering/upper_engineering/starboard)
+"vRA" = (
+/obj/effect/step_trigger/teleporter_vector{
+ name = "Almayer_AresDown";
+ vector_x = 96;
+ vector_y = -65
+ },
+/obj/structure/stairs{
+ dir = 1
+ },
+/turf/open/floor/almayer/aicore/no_build,
+/area/almayer/command/airoom)
"vRR" = (
/obj/effect/step_trigger/clone_cleaner,
/obj/effect/decal/warning_stripes{
@@ -76030,6 +76362,13 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/living/briefing)
+"vVk" = (
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
+ },
+/turf/closed/wall/almayer/aicore/hull,
+/area/almayer/command/airoom)
"vVs" = (
/turf/open/floor/almayer{
icon_state = "sterile_green"
@@ -76611,14 +76950,6 @@
/obj/effect/landmark/late_join/charlie,
/turf/open/floor/plating/plating_catwalk,
/area/almayer/squads/charlie)
-"wdE" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/almayer{
- icon_state = "orangecorner"
- },
-/area/almayer/hallways/upper/midship_hallway)
"wdF" = (
/turf/open/floor/almayer{
allow_construction = 0
@@ -76692,17 +77023,6 @@
icon_state = "plate"
},
/area/almayer/hallways/lower/repair_bay)
-"wes" = (
-/obj/structure/machinery/cm_vending/sorted/medical/marinemed,
-/obj/structure/sign/safety/medical{
- pixel_x = 8;
- pixel_y = 32
- },
-/obj/structure/medical_supply_link,
-/turf/open/floor/almayer{
- icon_state = "plate"
- },
-/area/almayer/shipboard/panic)
"wex" = (
/obj/structure/sign/safety/bathunisex{
pixel_x = 8;
@@ -76866,6 +77186,12 @@
"wid" = (
/turf/closed/wall/almayer/outer,
/area/almayer/maint/hull/lower/p_bow)
+"wiu" = (
+/obj/structure/pipes/standard/simple/hidden/supply/no_boom,
+/turf/open/floor/almayer/aicore/glowing/no_build{
+ icon_state = "ai_floor3"
+ },
+/area/almayer/command/airoom)
"wiz" = (
/obj/structure/bed/chair{
dir = 4
@@ -77068,15 +77394,7 @@
alert_message = "Caution: Movement detected in ARES Core.";
cooldown_duration = 1200
},
-/obj/structure/machinery/door/poddoor/almayer/blended/aicore/open{
- closed_layer = 3.2;
- id = "ARES Emergency";
- layer = 3.2;
- name = "ARES Emergency Lockdown";
- needs_power = 0;
- open_layer = 1.9;
- plane = -7
- },
+/obj/structure/machinery/door/poddoor/almayer/blended/ai_lockdown/aicore,
/turf/open/floor/almayer/no_build{
icon_state = "test_floor4"
},
@@ -77352,18 +77670,6 @@
icon_state = "mono"
},
/area/almayer/medical/upper_medical)
-"wpw" = (
-/obj/structure/bed/chair/comfy/ares{
- dir = 1
- },
-/obj/structure/pipes/vents/pump/no_boom{
- desc = "Has a valve and pump attached to it, connected to multiple gas tanks.";
- name = "Security Vent"
- },
-/turf/open/floor/almayer/no_build{
- icon_state = "plating"
- },
-/area/almayer/command/airoom)
"wpI" = (
/turf/open/floor/almayer{
dir = 4;
@@ -77620,7 +77926,7 @@
pixel_y = 5
},
/obj/item/paper,
-/obj/item/handcuffs,
+/obj/item/restraint/handcuffs,
/obj/item/clothing/mask/cigarette/cigar/classic,
/obj/item/coin/silver{
desc = "A small coin, bearing the falling falcons insignia.";
@@ -77957,12 +78263,7 @@
/area/almayer/maint/hull/lower/l_m_s)
"wyQ" = (
/obj/structure/surface/table/reinforced/almayer_B,
-/obj/structure/machinery/door_control{
- id = "ARES Emergency";
- indestructible = 1;
- name = "ARES Emergency Lockdown";
- req_one_access_txt = "91;92"
- },
+/obj/structure/machinery/aicore_lockdown,
/turf/open/floor/almayer/no_build{
icon_state = "plating"
},
@@ -78056,20 +78357,6 @@
icon_state = "redcorner"
},
/area/almayer/living/briefing)
-"wCT" = (
-/obj/effect/step_trigger/teleporter_vector{
- name = "Almayer_AresDown";
- vector_x = 97;
- vector_y = -65
- },
-/obj/structure/machinery/light{
- dir = 1
- },
-/obj/structure/stairs{
- dir = 1
- },
-/turf/open/floor/almayer/aicore/no_build,
-/area/almayer/command/airoom)
"wDg" = (
/obj/effect/decal/warning_stripes{
icon_state = "E";
@@ -78246,6 +78533,17 @@
icon_state = "sterile_green_corner"
},
/area/almayer/medical/lower_medical_medbay)
+"wFi" = (
+/obj/structure/machinery/cm_vending/sorted/medical/marinemed,
+/obj/structure/sign/safety/medical{
+ pixel_x = 8;
+ pixel_y = 32
+ },
+/obj/structure/medical_supply_link,
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/shipboard/panic)
"wFn" = (
/obj/structure/surface/rack,
/obj/item/clothing/suit/storage/marine/light/vest,
@@ -78388,24 +78686,6 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/hallways/upper/aft_hallway)
-"wHX" = (
-/obj/structure/machinery/door_control{
- id = "ARES StairsLower";
- name = "ARES Core Lockdown";
- pixel_x = -24;
- pixel_y = 8;
- req_one_access_txt = "90;91;92"
- },
-/obj/structure/machinery/camera/autoname/almayer/containment/ares{
- dir = 4;
- pixel_y = -8
- },
-/obj/effect/step_trigger/clone_cleaner,
-/turf/open/floor/almayer/aicore/no_build{
- dir = 8;
- icon_state = "ai_silver"
- },
-/area/almayer/command/airoom)
"wIr" = (
/obj/structure/machinery/cm_vending/clothing/senior_officer{
req_access = list();
@@ -78491,12 +78771,6 @@
icon_state = "test_floor4"
},
/area/almayer/medical/upper_medical)
-"wJB" = (
-/obj/structure/machinery/cryopod/right,
-/turf/open/floor/almayer/aicore/no_build{
- icon_state = "ai_cargo"
- },
-/area/almayer/command/airoom)
"wJC" = (
/obj/structure/largecrate/random/barrel/yellow,
/turf/open/floor/plating/plating_catwalk,
@@ -79637,15 +79911,6 @@
icon_state = "plate"
},
/area/almayer/maint/hull/lower/l_m_s)
-"xbN" = (
-/obj/structure/surface/rack{
- density = 0;
- pixel_y = 16
- },
-/obj/structure/janitorialcart,
-/obj/item/tool/mop,
-/turf/open/floor/plating,
-/area/almayer/command/airoom)
"xcI" = (
/obj/structure/sign/safety/water{
pixel_x = 8;
@@ -79686,6 +79951,18 @@
icon_state = "sterile_green_side"
},
/area/almayer/medical/lower_medical_medbay)
+"xdA" = (
+/obj/structure/surface/rack{
+ density = 0;
+ pixel_y = 16
+ },
+/obj/structure/machinery/faxmachine/uscm/command{
+ density = 0;
+ department = "AI Core";
+ pixel_y = 32
+ },
+/turf/open/floor/almayer/aicore/no_build,
+/area/almayer/command/airoom)
"xdJ" = (
/obj/structure/machinery/light{
dir = 4;
@@ -79756,8 +80033,10 @@
},
/area/almayer/engineering/laundry)
"xfm" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
/obj/structure/window/framed/almayer,
+/obj/structure/machinery/door/firedoor/border_only/almayer{
+ dir = 2
+ },
/turf/open/floor/plating,
/area/almayer/living/cafeteria_officer)
"xfq" = (
@@ -80189,18 +80468,6 @@
icon_state = "plate"
},
/area/almayer/maint/upper/u_a_s)
-"xns" = (
-/obj/structure/machinery/door_control{
- id = "ARES JoeCryo";
- name = "Working Joe Cryogenics Lockdown";
- pixel_x = -24;
- pixel_y = -8;
- req_one_access_txt = "91;92"
- },
-/obj/effect/landmark/late_join/working_joe,
-/obj/effect/landmark/start/working_joe,
-/turf/open/floor/plating/plating_catwalk/aicore,
-/area/almayer/command/airoom)
"xnz" = (
/obj/effect/decal/warning_stripes{
icon_state = "N";
@@ -80476,6 +80743,17 @@
},
/turf/open/floor/almayer,
/area/almayer/hallways/lower/repair_bay)
+"xsi" = (
+/obj/structure/stairs{
+ dir = 1
+ },
+/obj/effect/step_trigger/teleporter_vector{
+ name = "Almayer_AresUp2";
+ vector_x = -102;
+ vector_y = 61
+ },
+/turf/open/floor/almayer/aicore/no_build,
+/area/almayer/command/airoom)
"xsl" = (
/obj/structure/machinery/alarm/almayer{
dir = 1
@@ -80705,6 +80983,15 @@
icon_state = "plate"
},
/area/almayer/living/briefing)
+"xwU" = (
+/obj/structure/pipes/vents/pump/no_boom/gas{
+ vent_tag = "Comms";
+ dir = 1
+ },
+/turf/open/floor/almayer/aicore/no_build{
+ icon_state = "ai_plates"
+ },
+/area/almayer/command/airoom)
"xwX" = (
/turf/open/floor/almayer{
dir = 9;
@@ -80786,6 +81073,10 @@
},
/turf/open/floor/plating,
/area/almayer/living/port_emb)
+"xxB" = (
+/obj/structure/machinery/fuelpump,
+/turf/open/floor/almayer,
+/area/almayer/lifeboat_pumps/north1)
"xxG" = (
/obj/structure/prop/holidays/string_lights{
pixel_y = 27
@@ -82351,7 +82642,7 @@
/obj/structure/pipes/standard/simple/hidden/supply/no_boom{
dir = 4
},
-/turf/open/floor/plating/plating_catwalk,
+/turf/open/floor/almayer,
/area/almayer/engineering/upper_engineering)
"xZk" = (
/obj/item/prop/helmetgarb/gunoil{
@@ -82597,18 +82888,6 @@
icon_state = "plate"
},
/area/almayer/living/briefing)
-"ycA" = (
-/obj/structure/disposalpipe/junction{
- dir = 8;
- icon_state = "pipe-j2"
- },
-/obj/structure/pipes/standard/simple/hidden/supply{
- dir = 10
- },
-/turf/open/floor/almayer{
- icon_state = "orangecorner"
- },
-/area/almayer/hallways/upper/aft_hallway)
"ycH" = (
/obj/structure/surface/table/almayer,
/obj/item/pizzabox/margherita{
@@ -82945,12 +83224,6 @@
icon_state = "plate"
},
/area/almayer/maint/hull/lower/l_m_s)
-"yit" = (
-/obj/structure/pipes/vents/pump/no_boom{
- dir = 1
- },
-/turf/open/floor/almayer/aicore/no_build,
-/area/almayer/command/airoom)
"yiu" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 4
@@ -101100,7 +101373,7 @@ aaa
sGw
xzB
bfs
-wes
+wFi
qxI
dKO
ykv
@@ -103664,7 +103937,7 @@ wlE
gvq
wVW
lrW
-qDN
+mqh
vHW
wVW
ccg
@@ -106883,7 +107156,7 @@ add
fsU
aHU
aTm
-awW
+xxB
aTm
jgF
fsU
@@ -106929,7 +107202,7 @@ aJU
gBW
ouQ
iun
-baw
+sfA
vPm
qys
gBW
@@ -107086,7 +107359,7 @@ awW
auK
aIr
aTm
-bvd
+cpP
aTm
juX
scu
@@ -107132,7 +107405,7 @@ baw
lRE
tuf
vbB
-rBH
+aqB
vbB
mlz
sOy
@@ -107289,7 +107562,7 @@ awW
avc
aIv
aTm
-kJL
+cpP
cbM
jzZ
sLo
@@ -107335,7 +107608,7 @@ baw
hJk
yac
vbB
-kUQ
+aqB
vbB
fDS
iLd
@@ -107492,7 +107765,7 @@ add
fsU
aHU
aTm
-awW
+fnk
aTm
jgF
fsU
@@ -107538,7 +107811,7 @@ aJU
gBW
ouQ
vbB
-baw
+aqB
tBq
qys
gBW
@@ -108628,7 +108901,7 @@ arX
vSG
iag
nvM
-bek
+qOZ
qjN
gGJ
ham
@@ -108831,7 +109104,7 @@ tzO
fVG
qpQ
nvM
-bek
+qOZ
qjN
sld
ham
@@ -109034,7 +109307,7 @@ qpx
bet
bgu
nvM
-bek
+qOZ
qjN
gGJ
ham
@@ -119886,10 +120159,10 @@ sVV
sVV
sVV
sVV
-sVV
-wNC
-sfz
-lGh
+vnM
+lLA
+ejx
+jIs
xLw
vOy
woh
@@ -120089,7 +120362,7 @@ xMz
lIY
gxn
aMy
-aMy
+kNV
wNC
wlr
xyp
@@ -120495,7 +120768,7 @@ lzt
ael
afE
agT
-agT
+dgI
ael
ogT
yiu
@@ -120513,7 +120786,7 @@ xIj
tsn
tsn
tsn
-tsH
+xIj
xIj
xIj
lGh
@@ -120712,7 +120985,7 @@ dUR
kaE
kaE
kaE
-dUR
+eRI
qvh
aMl
xXd
@@ -120901,18 +121174,18 @@ qTi
ael
afI
agY
-oxi
+aiq
xfm
-lDH
-vIZ
+xIj
+qdJ
iCg
mOi
mOi
mOi
mOi
mOi
-mOi
-auc
+sOK
+tAt
auc
hyE
aqU
@@ -121105,17 +121378,17 @@ ael
afJ
agY
aiq
-ajJ
+xfm
xIj
qdJ
xIj
mOi
-rCw
-rCw
-lin
-oJR
-tFe
-asD
+onU
+onU
+qwJ
+cOV
+imS
+rxl
xQV
qQS
aqU
@@ -121313,14 +121586,14 @@ sgH
qdJ
xIj
mOi
-wCT
-sIf
-isC
-isC
+vRA
+oYZ
+ezq
+eXy
tFe
xQV
-xQV
-rNF
+pax
+tCC
aqU
qjF
oqv
@@ -121516,14 +121789,14 @@ xIj
yiu
xIj
mOi
-kbH
-kbH
-pgH
-jDV
+mAs
+mAs
+flR
+uMO
tFe
xVc
xQV
-eYz
+vpH
aqU
gjB
wDy
@@ -121724,9 +121997,9 @@ mOi
mOi
mOi
mOi
-asF
-tLY
-iyH
+mAe
+mAe
+mAe
aqU
jVE
nTs
@@ -121921,15 +122194,15 @@ adO
oDm
poD
xIj
+mOi
+mzP
+mzP
+nkK
+tqu
aqU
-sdl
-mLE
-bUx
-mLE
-tmK
-qQS
-aug
-avL
+gpW
+ofY
+eQj
aqU
lyE
rsO
@@ -122124,15 +122397,15 @@ ahG
muW
qdJ
xIj
-aqU
-xbN
-gfE
-gfE
-kpc
-aqU
-gjw
-cnp
-avM
+mOi
+mzP
+mzP
+cJv
+xQV
+mCx
+qQS
+tIu
+uPI
aqU
wmK
liJ
@@ -122327,16 +122600,16 @@ adO
xIj
qdJ
xIj
-lmK
-lmK
-lmK
-lmK
-lmK
-ntj
-ntj
-ntj
-ntj
-ntj
+ryn
+ryn
+ryn
+ryn
+ryn
+mOi
+xdA
+qQS
+uUB
+aqU
aHq
cnH
kzk
@@ -122534,12 +122807,12 @@ ioU
pvK
qPE
xqD
-nYf
-rEL
-dnm
-rEL
-rxO
-aHq
+ioU
+ntj
+ntj
+ntj
+ntj
+ntj
cnE
liJ
hgB
@@ -122737,11 +123010,11 @@ ioU
qyZ
wTd
cmK
-lFm
-kXu
-kXu
-kXu
-kXu
+cyP
+kSi
+mmn
+kSi
+qyA
kXu
jHC
liJ
@@ -123949,8 +124222,8 @@ fjo
opu
hlj
iso
-dPB
-mrO
+ceV
+nsH
alL
alL
alL
@@ -124137,7 +124410,7 @@ aeC
wXh
ayn
atr
-aeA
+lMy
aex
ciw
wXh
@@ -124152,7 +124425,7 @@ asA
msS
nZf
rho
-lDH
+jIs
emL
jvY
jvY
@@ -124185,7 +124458,7 @@ vcE
kpo
iMx
tGi
-lJY
+cea
bXe
eyG
kpo
@@ -124340,7 +124613,7 @@ aeA
asY
ayQ
atr
-bbX
+iDK
atr
ciD
ngl
@@ -124355,8 +124628,8 @@ nBK
wYa
hlj
giW
-mGL
-qXh
+puP
+tfF
jvY
arg
atf
@@ -124388,7 +124661,7 @@ lJY
ttS
wEO
faO
-haM
+cOd
bXe
deg
wLu
@@ -124543,7 +124816,7 @@ aeA
atp
ayR
atr
-eGb
+iDK
atr
cji
nqV
@@ -124558,8 +124831,8 @@ aeC
beN
mdm
lLt
-xIj
-oXP
+qdJ
+vCv
jvY
arh
atm
@@ -124591,7 +124864,7 @@ lJY
hlX
umh
bXe
-lxT
+cOd
tGi
pfH
wlF
@@ -124746,7 +125019,7 @@ aeC
wXh
ayn
atr
-aeA
+rmG
bXz
ciw
wXh
@@ -124761,8 +125034,8 @@ ggQ
aME
aep
lLt
-kXD
-eol
+lGh
+vCv
jvY
ari
aoP
@@ -124794,7 +125067,7 @@ vcE
kpo
iMx
bXe
-lJY
+sZY
mzF
eyG
kpo
@@ -124964,8 +125237,8 @@ afk
agM
aep
lLt
-jrc
-wdE
+yiu
+vCv
jvY
arj
atm
@@ -125167,8 +125440,8 @@ afk
afk
aep
lLt
-jrc
-wdE
+poD
+vCv
jvY
ark
atm
@@ -125371,7 +125644,7 @@ aep
aep
umI
ddO
-sRC
+umI
jvY
alL
atk
@@ -125573,8 +125846,8 @@ aep
aep
aep
sHI
-cNC
-cla
+jao
+qhT
jvY
arl
atm
@@ -125776,8 +126049,8 @@ cMx
cMx
cMx
sHI
-cNC
-cla
+jao
+qhT
jvY
abF
atm
@@ -125979,8 +126252,8 @@ oVo
oVo
cMx
nSw
-pqY
-cla
+qsG
+qhT
jvY
jvY
jvY
@@ -126182,8 +126455,8 @@ fIK
fIK
wuS
tzF
-pqY
-cla
+qsG
+qhT
alL
urM
dBG
@@ -126385,9 +126658,9 @@ oVo
oVo
cMx
nWf
-cNC
-igC
-aqe
+lOn
+acQ
+kwd
amw
anO
arq
@@ -126588,20 +126861,20 @@ oVo
rYU
cMx
nXV
-wHr
-vGi
+qMI
+rUN
aqg
-arr
-atn
+oOW
atn
atn
atn
+sAw
anP
aBh
anP
-atn
-atn
-atn
+anP
+iJs
+dFN
atn
aOB
aRj
@@ -126791,21 +127064,21 @@ iVz
rAS
cMx
sHI
-tof
-jao
+lOn
+acQ
kwd
-amA
-atq
-atq
+eDT
amx
amx
amx
-atq
+awy
amx
amx
amx
-atq
-atq
+amx
+amx
+mpZ
+amx
aoT
kwd
acQ
@@ -126994,20 +127267,20 @@ cMx
cMx
cMx
sHI
-tof
-eLV
+jao
+qhT
alO
ars
amx
amx
aqf
+pzX
amx
amx
-atq
-amx
amx
amx
amx
+mpZ
amx
aOC
alO
@@ -127197,20 +127470,20 @@ oaP
jhQ
cMx
kYb
-tof
-eLV
+jao
+qhT
inw
-amA
+eDT
amx
amx
-awy
amx
amx
amx
amx
amx
amx
-atq
+amx
+aBo
amx
aoT
inw
@@ -127400,21 +127673,21 @@ oVo
oVo
cMx
sHI
-tof
-ycA
-aqj
-arw
-anP
-fOJ
+jao
+qhT
+inw
+eDT
+amx
+auB
aqh
sqo
sqo
aDh
aDh
mux
-ayd
-atq
-atq
+aya
+aBo
+amx
wwJ
inw
sHI
@@ -127603,8 +127876,8 @@ oVo
oVo
cMx
nWf
-tof
-cla
+jao
+qhT
inw
qHM
emn
@@ -127616,7 +127889,7 @@ aBi
aDi
alO
aye
-amx
+aBo
amx
aBs
inw
@@ -127806,8 +128079,8 @@ qbw
qbw
vTE
kGS
-tof
-dFB
+lOn
+wCe
alO
alO
alO
@@ -127819,8 +128092,8 @@ anO
aDj
inw
aye
-atq
-atq
+mpZ
+amx
aBs
alO
sHI
@@ -128009,21 +128282,21 @@ oVo
oVo
btb
sHI
-tof
-sJN
+lOn
+qhT
alO
gKZ
vTv
auL
alO
axy
-amA
-atq
+azh
+aBk
aoT
inw
aye
-atq
-atq
+mpZ
+amx
aBs
alO
uSk
@@ -128212,20 +128485,20 @@ pVh
mSl
btb
sHI
-tof
-sJN
+jao
+qhT
alO
arz
atq
aoT
alO
aOG
-azh
-aBk
-aoT
+amA
+kDH
+aOB
laQ
-dZr
-auB
+arr
+iav
atc
aOF
alO
@@ -128415,8 +128688,8 @@ cMx
cMx
cMx
sHI
-tof
-sJN
+jao
+qhT
alO
arz
atq
@@ -128425,9 +128698,9 @@ alO
axA
amA
aBl
-aOB
+aoT
aFl
-aHt
+arm
aIU
aMq
aOG
@@ -128618,8 +128891,8 @@ yfn
nkc
cMx
sHI
-tof
-sJN
+jao
+qhT
alO
arz
atq
@@ -128821,8 +129094,8 @@ oVo
iIU
cMx
uSk
-tof
-sJN
+jao
+kGS
xHt
arm
ats
@@ -129025,7 +129298,7 @@ whO
bYL
dlT
qHD
-qSp
+qhT
alO
arA
att
@@ -129227,7 +129500,7 @@ cMx
cMx
cMx
nWf
-tof
+cNC
qhT
wDM
wDM
@@ -129633,7 +129906,7 @@ jhx
dnH
gpc
tzF
-pqY
+uez
qhT
wDM
uto
@@ -129836,7 +130109,7 @@ owg
owg
ptK
sHI
-cNC
+tof
qhT
wDM
aOQ
@@ -130242,7 +130515,7 @@ wiG
nWN
eNi
sHI
-cNC
+tof
qhT
wDM
wDM
@@ -131345,7 +131618,7 @@ emA
emA
emA
ikT
-oBr
+jEM
aQL
qDq
qDq
@@ -132368,8 +132641,8 @@ jEM
gCu
jEM
jEM
-oBr
-sRM
+tXn
+jEM
jEM
jEM
oBr
@@ -133959,21 +134232,21 @@ aaa
aKQ
aaa
aaa
-aab
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+aak
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
aaa
bdH
aaa
@@ -134162,21 +134435,21 @@ aaa
aKQ
aaa
aaa
-aab
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+aak
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
aaa
aaa
aaa
@@ -134365,21 +134638,21 @@ aaa
aKQ
aaa
aaa
-aab
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+aak
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
aaa
aaa
aaa
@@ -134568,21 +134841,21 @@ aaa
aKQ
aaa
aaa
-aab
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+aak
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
aaa
aaa
aaa
@@ -134771,21 +135044,21 @@ aaa
aKQ
aaa
aaa
-aab
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+aak
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
aaa
aaa
aaa
@@ -134974,21 +135247,21 @@ aaa
aKQ
aaa
aaa
-aab
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+aak
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
aaa
aaa
aaa
@@ -135177,21 +135450,21 @@ aaa
aKQ
aaa
aaa
-aab
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+aak
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
+bdH
aaa
aaa
aaa
@@ -135380,10 +135653,10 @@ aaa
aKQ
aaa
aaa
-aab
-aaa
-aaa
-aaa
+aak
+bdH
+bdH
+bdH
bdH
bdH
bdH
@@ -135583,10 +135856,10 @@ aaa
aKQ
aaa
aaa
-aab
-aaa
-aaa
-aaa
+aak
+bdH
+bdH
+bdH
bdH
bdH
bdH
@@ -135786,10 +136059,10 @@ aaa
aKQ
aaa
aaa
-aab
-aaa
-aaa
-aaa
+aak
+bdH
+bdH
+bdH
bdH
bdH
bdH
@@ -135989,10 +136262,10 @@ aaa
aKQ
aaa
aaa
-aab
-aaa
-aaa
-aaa
+aak
+bdH
+bdH
+bdH
bdH
bdH
bdH
@@ -136192,10 +136465,10 @@ aaa
aKQ
aaa
aaa
-aab
-aaa
-aaa
-aaa
+aak
+bdH
+bdH
+bdH
bdH
bdH
bdH
@@ -136395,10 +136668,10 @@ aaa
aKQ
aaa
aaa
-aab
-aaa
-aaa
-aaa
+aak
+bdH
+bdH
+bdH
bdH
bdH
bdH
@@ -136800,9 +137073,9 @@ aaa
aaa
aKQ
aaa
-aaa
-aab
-aaa
+bdH
+aak
+bdH
bdH
bdH
bdH
@@ -137003,9 +137276,9 @@ aaa
aaa
aKQ
aaa
-aaa
-aab
-aaa
+bdH
+aak
+bdH
bdH
bdH
bdH
@@ -137206,9 +137479,9 @@ aaa
aaa
aKQ
aaa
-aaa
-aab
-aaa
+bdH
+aak
+bdH
bdH
bdH
bdH
@@ -137409,9 +137682,9 @@ aaa
aaa
aKQ
aaa
-aaa
-aab
-aaa
+bdH
+aak
+bdH
bdH
bdH
bdH
@@ -137612,9 +137885,9 @@ aaa
aaa
aKQ
aaa
-aaa
-aab
-aaa
+bdH
+aak
+bdH
bdH
bdH
bdH
@@ -137815,9 +138088,9 @@ aaa
aaa
aKQ
aaa
-aaa
-aab
-aaa
+bdH
+aak
+bdH
bdH
bdH
bdH
@@ -138018,9 +138291,9 @@ aaa
aaa
aKQ
aaa
-aaa
-aab
-aaa
+bdH
+aak
+bdH
bdH
bdH
bdH
@@ -138220,10 +138493,10 @@ aab
aaa
aaa
aKQ
-aaa
-aaa
-aab
-aab
+bdH
+bdH
+aak
+aak
aak
aak
aak
@@ -138822,27 +139095,27 @@ bdH
bdH
bdH
bdH
-bdH
-bdH
-bdH
-bdH
-bdH
-bdH
-aKQ
-bdH
-bdH
-bdH
-bdH
-bdH
-bdH
-bdH
-bdH
-bdH
-bdH
-bdH
-bdH
-bdH
-bdH
+lmz
+lmz
+lmz
+lmz
+lmz
+lmz
+lmz
+lmz
+iBn
+iBn
+iBn
+iBn
+iBn
+iBn
+iBn
+iBn
+iBn
+iBn
+iBn
+iBn
+iBn
bdH
bdH
bdH
@@ -139221,7 +139494,7 @@ aaa
aab
aaa
aaa
-aaa
+bdH
bdH
bdH
bdH
@@ -139425,19 +139698,6 @@ aab
aaa
aaa
bdH
-bdH
-bdH
-bdH
-bdH
-bdH
-bdH
-lmz
-lmz
-lmz
-lmz
-lmz
-lmz
-lmz
lmz
lmz
lmz
@@ -139449,6 +139709,19 @@ lmz
lmz
lmz
lmz
+daz
+daz
+daz
+daz
+daz
+daz
+daz
+daz
+daz
+daz
+daz
+daz
+daz
lmz
lmz
lmz
@@ -139640,17 +139913,17 @@ lmz
lmz
lmz
daz
-daz
-daz
-daz
-daz
-daz
-daz
-daz
-daz
-daz
-daz
-daz
+vhe
+qQS
+cqm
+gTH
+qit
+ebN
+qQS
+gwn
+pfT
+vCH
+dyp
daz
lmz
lmz
@@ -139839,21 +140112,21 @@ lmz
lmz
lmz
lmz
-lmz
-lmz
-lmz
+sbJ
+sbJ
+sbJ
daz
-vhe
-fEN
-cqm
-gTH
-qit
-ebN
+rna
+clw
qQS
-gwn
-pfT
-jYR
-dyp
+sKY
+qQS
+bIp
+fKe
+dDp
+bFg
+frM
+lcg
daz
lmz
lmz
@@ -140033,29 +140306,29 @@ aaa
aab
aaa
aaa
-bdH
lmz
lmz
lmz
lmz
lmz
-lmz
-lmz
-lmz
-sbJ
-sbJ
-sbJ
daz
-rna
-clw
-qQS
-sKY
-qQS
+daz
+daz
+daz
+daz
+tte
+hvw
+auf
+pmV
+eGr
+xDC
+dIn
+rby
bIp
-fKe
-dDp
-dDp
-frM
+euN
+ujn
+sEK
+etM
lcg
daz
lmz
@@ -140240,26 +140513,26 @@ lmz
lmz
lmz
lmz
-lmz
daz
daz
+hRW
+asZ
+vXh
daz
daz
+kfU
daz
-tte
-hvw
-auf
-pmV
-xDC
-xDC
-dIn
-rby
-bIp
-euN
-sEK
-sEK
-mlb
-lcg
+ebN
+ebN
+lnS
+uVv
+flf
+ebN
+rOz
+kBy
+kBy
+nNA
+fPB
daz
lmz
lmz
@@ -140442,34 +140715,34 @@ bdH
lmz
lmz
lmz
-lmz
daz
daz
-hRW
-asZ
-vXh
+eKJ
+yaZ
+ffE
+hZj
+clw
daz
daz
-kfU
daz
+sGZ
ebN
ebN
-lnS
-uVv
-yit
+roH
ebN
-cxc
-kBy
-kBy
-gfu
-fPB
+daz
+daz
+daz
+wnh
+wnh
+daz
+daz
daz
lmz
lmz
lmz
bdH
bdH
-bdH
aak
bdH
bdH
@@ -140646,27 +140919,27 @@ lmz
lmz
lmz
daz
-daz
-eKJ
-yaZ
-ffE
-hZj
-clw
-daz
-daz
-daz
-sGZ
-ebN
-ebN
-roH
-ebN
-daz
-daz
-daz
-wnh
-wnh
-daz
-daz
+jYH
+ubA
+cck
+wyQ
+fmv
+ubA
+gMN
+mRn
+dJO
+vMt
+dkz
+aGk
+ktQ
+teZ
+wkM
+ege
+hWP
+bZq
+bZq
+mIi
+mIi
daz
lmz
lmz
@@ -140849,27 +141122,27 @@ lmz
lmz
lmz
daz
-acJ
-ubA
-cck
-wyQ
-fmv
-ubA
-gMN
-mRn
-dJO
-vMt
-dkz
-aGk
-ktQ
-teZ
+cwS
+ffE
+vHa
+nDy
+ffE
+ffE
+ffE
+jqP
+cLo
+clw
+viB
+dIi
+qLS
+erN
wkM
-wHX
-hWP
-kKv
-kKv
-dGl
-dGl
+jvB
+jtj
+swx
+swx
+qKZ
+gjv
daz
lmz
lmz
@@ -141052,27 +141325,27 @@ lmz
lmz
lmz
daz
-cwS
-ffE
-vHa
-wpw
-ffE
-ffE
-ffE
-jqP
-cLo
-clw
-viB
-dIi
-qLS
-erN
+oRV
+ydI
+mdW
+ios
+awu
+ydI
+aKs
+fMt
+mEs
+gbm
+oBD
+lFj
+vyE
+mTr
wkM
-jvB
-jtj
-ieF
-ieF
-pJR
-gPr
+qNc
+jdl
+dpp
+dpp
+jgy
+eii
daz
lmz
lmz
@@ -141255,27 +141528,27 @@ lmz
lmz
lmz
daz
-oRV
-ydI
-mdW
-jaH
-awu
-ydI
-aKs
-fMt
-mEs
-gbm
-gCx
-lFj
-vyE
-bha
-wkM
-qNc
-jdl
-cBm
-cBm
-iZw
-dQl
+daz
+eKJ
+yaZ
+ffE
+hZj
+fQD
+daz
+daz
+daz
+tHu
+ebN
+ebN
+gXs
+ebN
+daz
+daz
+daz
+wnh
+wnh
+daz
+daz
daz
lmz
lmz
@@ -141457,34 +141730,34 @@ bdH
lmz
lmz
lmz
+lmz
daz
daz
-eKJ
-yaZ
-ffE
-hZj
-clw
+ocB
+nJH
+rnH
daz
daz
+sTV
daz
-tHu
ebN
ebN
-gXs
+gbg
+uVv
+xwU
ebN
-daz
-daz
-daz
-wnh
-wnh
-daz
-daz
+qQS
+kBy
+kBy
+gfu
+kBy
daz
lmz
lmz
lmz
bdH
bdH
+bdH
aak
bdH
bdH
@@ -141661,26 +141934,26 @@ lmz
lmz
lmz
lmz
+lmz
daz
daz
-ocB
-nJH
-rnH
daz
daz
-sTV
daz
-ebN
-ebN
-gbg
-uVv
-lFq
-ebN
-qQS
-kBy
-kBy
-gfu
-kBy
+tte
+hvw
+auf
+hTl
+jrH
+xDC
+yaQ
+vLz
+mFN
+kSy
+bFg
+dDp
+nYg
+lcg
daz
lmz
lmz
@@ -141860,8 +142133,7 @@ aaa
aab
aaa
bdH
-lmz
-lmz
+bdH
lmz
lmz
lmz
@@ -141870,19 +142142,20 @@ daz
daz
daz
daz
-tte
-hvw
-auf
-hTl
-xDC
-xDC
-yaQ
-bat
+sbJ
+sbJ
+sbJ
+daz
+rna
+qRX
+qQS
+aCd
+qQS
mFN
-kSy
-dDp
-dDp
-frM
+igr
+sEK
+ujn
+mlb
lcg
daz
lmz
@@ -142067,26 +142340,26 @@ bdH
lmz
lmz
lmz
-lmz
-lmz
-lmz
-lmz
daz
-sbJ
-sbJ
-sbJ
+hWM
+hWM
+hWM
+ebN
daz
-rna
-clw
-qQS
-aCd
-qQS
-mFN
-igr
-sEK
-sEK
-mlb
-lcg
+ocL
+qpY
+daz
+drU
+itg
+gba
+kRQ
+our
+ebN
+cxc
+kBy
+kBy
+dzt
+gyN
daz
lmz
lmz
@@ -142270,26 +142543,26 @@ bdH
lmz
lmz
lmz
-lmz
-lmz
-lmz
-lmz
daz
+hWM
+fVx
+hWM
+ebN
+tId
ltc
-eXk
-xns
-pTt
-gAe
-rCi
-gba
-mUz
-our
+ltc
+daz
ebN
-cxc
-kBy
-kBy
-khJ
-gyN
+fCI
+ebN
+daz
+daz
+daz
+daz
+daz
+daz
+daz
+daz
daz
lmz
lmz
@@ -142470,25 +142743,21 @@ aab
aaa
aaa
bdH
-lmz
-lmz
-lmz
-lmz
-lmz
-lmz
-lmz
-daz
+bdH
+bdH
+bdH
+izf
+hWM
+qQS
+hWM
+ebN
tId
-wJB
-tJN
-daz
-daz
-daz
-daz
-daz
-daz
-daz
-daz
+fVx
+qQS
+ebN
+naj
+itg
+qQS
daz
daz
daz
@@ -142497,6 +142766,10 @@ daz
lmz
lmz
lmz
+lmz
+lmz
+lmz
+lmz
bdH
bdH
bdH
@@ -142672,18 +142945,26 @@ aaa
aab
aaa
aaa
+aaa
bdH
bdH
bdH
-bdH
-bdH
-bdH
-bdH
-lmz
-daz
-daz
-daz
-daz
+vVk
+cJI
+fVx
+hWM
+ebN
+tId
+qQS
+mIJ
+wiu
+xDC
+yaQ
+jtj
+oZx
+irr
+irr
+xsi
daz
lmz
lmz
@@ -142692,14 +142973,6 @@ lmz
lmz
lmz
lmz
-lmz
-lmz
-lmz
-lmz
-lmz
-lmz
-lmz
-lmz
bdH
bdH
bdH
@@ -142879,23 +143152,23 @@ aaa
bdH
bdH
bdH
-bdH
-bdH
-bdH
-lmz
-lmz
-lmz
-lmz
-lmz
-lmz
-lmz
-lmz
-lmz
-lmz
-lmz
-lmz
-lmz
-lmz
+fhR
+nKO
+tmV
+qQS
+gDh
+qQS
+qQS
+bMg
+flL
+qQS
+qQS
+pUg
+sII
+cFg
+pkS
+xsi
+daz
lmz
lmz
lmz
@@ -143078,27 +143351,27 @@ aab
aab
aab
aab
-aaa
-bdH
-bdH
bdH
bdH
bdH
bdH
-lmz
-lmz
-lmz
-lmz
-lmz
-lmz
-lmz
-lmz
-lmz
-lmz
-lmz
-lmz
-lmz
-lmz
+npq
+daz
+daz
+daz
+daz
+daz
+daz
+daz
+daz
+daz
+daz
+daz
+daz
+daz
+daz
+daz
+daz
lmz
lmz
lmz
diff --git a/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm b/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm
index 5a4ce7045021..46200d9f79e4 100644
--- a/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm
+++ b/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm
@@ -2413,6 +2413,7 @@
/area/whiskey_outpost/inside/bunker/bunker/front)
"iJ" = (
/obj/structure/machinery/cm_vending/sorted/medical,
+/obj/structure/medical_supply_link/green,
/turf/open/floor{
dir = 10;
icon_state = "whitegreen"
@@ -2446,6 +2447,7 @@
/area/whiskey_outpost/outside/mortar_pit)
"iN" = (
/obj/structure/machinery/cm_vending/sorted/medical,
+/obj/structure/medical_supply_link/green,
/turf/open/floor{
icon_state = "whitegreen"
},
@@ -3686,16 +3688,6 @@
icon_state = "whitegreencorner"
},
/area/whiskey_outpost/inside/hospital/triage)
-"ne" = (
-/obj/effect/decal/medical_decals{
- icon_state = "docstripingdir"
- },
-/obj/structure/machinery/cm_vending/gear/medic,
-/turf/open/floor{
- dir = 1;
- icon_state = "asteroidfloor"
- },
-/area/whiskey_outpost)
"nf" = (
/obj/structure/disposalpipe/segment,
/obj/effect/decal/medical_decals{
@@ -3713,12 +3705,10 @@
/area/whiskey_outpost/outside/south/very_far)
"ni" = (
/obj/structure/machinery/cm_vending/sorted/medical/marinemed,
-/obj/effect/decal/medical_decals{
- icon_state = "docstripingdir"
- },
/obj/structure/machinery/light{
dir = 1
},
+/obj/structure/medical_supply_link,
/turf/open/floor{
dir = 1;
icon_state = "asteroidfloor"
@@ -3911,9 +3901,7 @@
/area/whiskey_outpost)
"nR" = (
/obj/structure/machinery/cm_vending/sorted/medical/marinemed,
-/obj/effect/decal/medical_decals{
- icon_state = "docstripingdir"
- },
+/obj/structure/medical_supply_link,
/turf/open/floor{
dir = 1;
icon_state = "asteroidfloor"
@@ -13296,6 +13284,7 @@
/area/whiskey_outpost/outside/south)
"Zm" = (
/obj/structure/machinery/cm_vending/sorted/medical/chemistry,
+/obj/structure/medical_supply_link,
/turf/open/floor{
icon_state = "white"
},
@@ -23638,7 +23627,7 @@ lG
iV
qz
qz
-ne
+kh
kj
oW
OX
diff --git a/maps/map_files/generic/Admin_level.dmm b/maps/map_files/generic/Admin_level.dmm
index d085d7a99b0c..36538b22cb60 100644
--- a/maps/map_files/generic/Admin_level.dmm
+++ b/maps/map_files/generic/Admin_level.dmm
@@ -1264,7 +1264,7 @@
"Dw" = (
/obj/structure/closet/secure_closet/brig,
/obj/item/book/manual/marine_law,
-/obj/item/handcuffs,
+/obj/item/restraint/handcuffs,
/turf/open/floor/almayer{
dir = 4;
icon_state = "red"
diff --git a/maps/predship/huntership.dmm b/maps/predship/huntership.dmm
index 7c5d633286f0..433d9057dc70 100644
--- a/maps/predship/huntership.dmm
+++ b/maps/predship/huntership.dmm
@@ -525,6 +525,11 @@
/obj/item/stack/sheet/mineral/sandstone/large_stack,
/obj/item/stack/sheet/mineral/sandstone/large_stack,
/obj/item/stack/sheet/mineral/sandstone/large_stack,
+/obj/item/stack/sheet/mineral/sandstone/large_stack,
+/obj/item/stack/sheet/mineral/sandstone/large_stack,
+/obj/item/stack/sheet/mineral/sandstone/large_stack,
+/obj/item/stack/sheet/mineral/sandstone/large_stack,
+/obj/item/stack/sheet/mineral/sandstone/large_stack,
/turf/open/floor/corsat{
dir = 1;
icon_state = "squareswood"
@@ -844,6 +849,13 @@
icon_state = "squareswood"
},
/area/yautja)
+"bZ" = (
+/obj/item/storage/fancy/candle_box,
+/turf/open/floor/corsat{
+ dir = 1;
+ icon_state = "squareswood"
+ },
+/area/yautja)
"ca" = (
/obj/structure/barricade/handrail/strata{
dir = 1
@@ -1029,6 +1041,18 @@
/obj/structure/closet/secure_closet/freezer/fridge{
locked = 0
},
+/obj/item/reagent_container/food/snacks/xemeatpie{
+ name = "Elite Hunter's Xenopie"
+ },
+/obj/item/reagent_container/food/snacks/xemeatpie{
+ name = "Elite Hunter's Xenopie"
+ },
+/obj/item/reagent_container/food/snacks/xemeatpie{
+ name = "Elite Hunter's Xenopie"
+ },
+/obj/item/reagent_container/food/snacks/xemeatpie{
+ name = "Elite Hunter's Xenopie"
+ },
/turf/open/floor{
dir = 10;
icon_state = "darkred2"
@@ -1343,6 +1367,29 @@
/obj/item/stack/sheet/mineral/sandstone/runed/large_stack,
/obj/item/stack/sheet/mineral/sandstone/runed/large_stack,
/obj/item/stack/sheet/mineral/sandstone/runed/large_stack,
+/obj/item/stack/sheet/mineral/sandstone/runed/large_stack,
+/obj/item/stack/sheet/mineral/sandstone/runed/large_stack,
+/obj/item/stack/sheet/mineral/sandstone/runed/large_stack,
+/obj/item/stack/sheet/mineral/sandstone/runed/large_stack,
+/obj/item/stack/sheet/mineral/sandstone/runed/large_stack,
+/obj/item/stack/sheet/mineral/sandstone/runed/large_stack,
+/obj/item/stack/sheet/mineral/sandstone/runed/large_stack,
+/obj/item/stack/sheet/mineral/sandstone/runed/large_stack,
+/obj/item/stack/sheet/mineral/sandstone/runed/large_stack,
+/obj/item/stack/sheet/mineral/sandstone/runed/large_stack,
+/obj/item/stack/sheet/mineral/sandstone/runed/large_stack,
+/obj/item/stack/sheet/mineral/sandstone/runed/large_stack,
+/obj/item/stack/sheet/mineral/sandstone/runed/large_stack,
+/obj/item/stack/sheet/mineral/sandstone/runed/large_stack,
+/obj/item/stack/sheet/mineral/sandstone/runed/large_stack,
+/obj/item/stack/sheet/mineral/sandstone/runed/large_stack,
+/obj/item/stack/sheet/mineral/sandstone/runed/large_stack,
+/obj/item/stack/sheet/mineral/sandstone/runed/large_stack,
+/obj/item/stack/sheet/mineral/sandstone/runed/large_stack,
+/obj/item/stack/sheet/mineral/sandstone/runed/large_stack,
+/obj/item/stack/sheet/mineral/sandstone/runed/large_stack,
+/obj/item/stack/sheet/mineral/sandstone/runed/large_stack,
+/obj/item/stack/sheet/mineral/sandstone/runed/large_stack,
/turf/open/floor/corsat{
dir = 1;
icon_state = "squareswood"
@@ -1547,6 +1594,12 @@
/obj/structure/closet/secure_closet/freezer/fridge{
locked = 0
},
+/obj/item/reagent_container/food/snacks/xemeatpie{
+ name = "Elite Hunter's Xenopie"
+ },
+/obj/item/reagent_container/food/snacks/xemeatpie{
+ name = "Elite Hunter's Xenopie"
+ },
/turf/open/floor{
dir = 1;
icon_state = "darkred2"
@@ -1734,6 +1787,30 @@
},
/turf/open/shuttle/predship,
/area/yautja)
+"fI" = (
+/obj/structure/surface/rack{
+ color = "#6b675e";
+ layer = 2.79
+ },
+/obj/item/device/flashlight/lamp,
+/obj/item/device/flashlight/lamp,
+/obj/item/device/flashlight/lamp,
+/obj/item/device/flashlight/lamp,
+/obj/item/device/flashlight/lamp,
+/obj/item/device/flashlight/lamp,
+/obj/item/device/flashlight/lamp,
+/obj/item/device/flashlight/lamp,
+/obj/item/device/flashlight/lamp,
+/obj/item/device/flashlight/lamp,
+/obj/item/device/flashlight/lamp,
+/obj/item/device/flashlight/lamp,
+/obj/item/device/flashlight/lamp,
+/obj/item/device/flashlight/lamp,
+/turf/open/floor/corsat{
+ dir = 1;
+ icon_state = "squareswood"
+ },
+/area/yautja)
"fS" = (
/obj/structure/barricade/handrail/strata,
/turf/open/gm/dirtgrassborder/weedable{
@@ -1807,8 +1884,32 @@
name = "Armory Shutters";
needs_power = 0;
pixel_x = 24;
- req_one_access_txt = "392";
- needs_power = 0
+ req_one_access_txt = "392"
+ },
+/turf/open/floor/corsat{
+ dir = 1;
+ icon_state = "squareswood"
+ },
+/area/yautja)
+"gN" = (
+/obj/structure/surface/rack{
+ color = "#6b675e";
+ layer = 2.79
+ },
+/obj/item/stack/tile/carpet{
+ amount = 50
+ },
+/obj/item/stack/tile/carpet{
+ amount = 50
+ },
+/obj/item/stack/tile/carpet{
+ amount = 50
+ },
+/obj/item/stack/tile/carpet{
+ amount = 50
+ },
+/obj/item/stack/tile/carpet{
+ amount = 50
},
/turf/open/floor/corsat{
dir = 1;
@@ -1859,6 +1960,11 @@
/obj/structure/kitchenspike,
/obj/item/reagent_container/food/snacks/sliceable/xenomeatbread,
/obj/item/reagent_container/food/snacks/sliceable/xenomeatbread,
+/obj/item/reagent_container/food/snacks/sliceable/xenomeatbread,
+/obj/item/reagent_container/food/snacks/sliceable/xenomeatbread,
+/obj/item/reagent_container/food/snacks/sliceable/xenomeatbread,
+/obj/item/reagent_container/food/snacks/sliceable/xenomeatbread,
+/obj/item/reagent_container/food/snacks/sliceable/xenomeatbread,
/turf/open/floor{
dir = 8;
icon_state = "darkred2"
@@ -1950,6 +2056,60 @@
icon_state = "desert1"
},
/area/yautja)
+"mn" = (
+/obj/structure/surface/rack{
+ color = "#6b675e";
+ layer = 2.79
+ },
+/obj/item/device/flashlight/lantern{
+ pixel_x = 1;
+ pixel_y = 9
+ },
+/obj/item/device/flashlight/lantern{
+ pixel_x = 1;
+ pixel_y = 9
+ },
+/obj/item/device/flashlight/lantern{
+ pixel_x = 1;
+ pixel_y = 9
+ },
+/obj/item/device/flashlight/lantern{
+ pixel_x = 1;
+ pixel_y = 9
+ },
+/obj/item/device/flashlight/lantern{
+ pixel_x = 1;
+ pixel_y = 9
+ },
+/obj/item/device/flashlight/lantern{
+ pixel_x = 1;
+ pixel_y = 9
+ },
+/obj/item/device/flashlight/lantern{
+ pixel_x = 1;
+ pixel_y = 9
+ },
+/obj/item/device/flashlight/lantern{
+ pixel_x = 1;
+ pixel_y = 9
+ },
+/obj/item/device/flashlight/lantern{
+ pixel_x = 1;
+ pixel_y = 9
+ },
+/obj/item/device/flashlight/lantern{
+ pixel_x = 1;
+ pixel_y = 9
+ },
+/obj/item/device/flashlight/lantern{
+ pixel_x = 1;
+ pixel_y = 9
+ },
+/turf/open/floor/corsat{
+ dir = 1;
+ icon_state = "squareswood"
+ },
+/area/yautja)
"mv" = (
/obj/structure/surface/table/reinforced/prison{
color = "#6b675e"
@@ -2151,6 +2311,37 @@
icon_state = "multi_tiles"
},
/area/yautja)
+"sS" = (
+/obj/structure/surface/rack{
+ color = "#6b675e";
+ layer = 2.79
+ },
+/obj/item/stack/sheet/wood{
+ amount = 50
+ },
+/obj/item/stack/sheet/wood{
+ amount = 50
+ },
+/obj/item/stack/sheet/wood{
+ amount = 50
+ },
+/obj/item/stack/sheet/wood{
+ amount = 50
+ },
+/obj/item/stack/sheet/wood{
+ amount = 50
+ },
+/obj/item/stack/sheet/wood{
+ amount = 50
+ },
+/obj/item/stack/sheet/wood{
+ amount = 50
+ },
+/turf/open/floor/corsat{
+ dir = 1;
+ icon_state = "squareswood"
+ },
+/area/yautja)
"sV" = (
/obj/structure/machinery/door/airlock/yautja{
dir = 1;
@@ -2210,18 +2401,22 @@
},
/area/yautja)
"tR" = (
-/obj/structure/surface/table/reinforced/prison{
- color = "#6b675e"
- },
-/obj/structure/window/reinforced{
- dir = 8;
- health = 80
- },
-/obj/structure/window/reinforced{
- dir = 4;
- health = 80
+/obj/structure/surface/rack{
+ color = "#6b675e";
+ layer = 2.79
},
-/obj/item/storage/box/bracer,
+/obj/item/frame/table/wood/poor,
+/obj/item/frame/table/wood/poor,
+/obj/item/frame/table/wood/poor,
+/obj/item/frame/table/wood/poor,
+/obj/item/frame/table/wood/poor,
+/obj/item/frame/table/wood/poor,
+/obj/item/frame/table/wood/poor,
+/obj/item/frame/table/wood/poor,
+/obj/item/frame/table/wood/poor,
+/obj/item/frame/table/wood/poor,
+/obj/item/frame/table/wood/poor,
+/obj/item/frame/table/wood/poor,
/turf/open/floor/corsat{
dir = 1;
icon_state = "squareswood"
@@ -2233,6 +2428,54 @@
},
/turf/open/gm/dirtgrassborder/west,
/area/yautja)
+"uj" = (
+/obj/structure/surface/rack{
+ color = "#6b675e";
+ layer = 2.79
+ },
+/obj/item/frame/table/gambling,
+/obj/item/frame/table/gambling,
+/obj/item/frame/table/gambling,
+/obj/item/frame/table/gambling,
+/obj/item/frame/table/gambling,
+/obj/item/frame/table/gambling,
+/obj/item/frame/table/gambling,
+/obj/item/frame/table/gambling,
+/obj/item/frame/table/gambling,
+/obj/item/frame/table/gambling,
+/obj/item/frame/table/gambling,
+/obj/item/frame/table/gambling,
+/obj/item/frame/table/gambling,
+/obj/item/frame/table/gambling,
+/obj/item/frame/table/gambling,
+/obj/item/frame/table/gambling,
+/obj/item/frame/table/gambling,
+/obj/item/frame/table/gambling,
+/obj/item/frame/table/gambling,
+/obj/item/frame/table/gambling,
+/obj/item/frame/table/gambling,
+/turf/open/floor/corsat{
+ dir = 1;
+ icon_state = "squareswood"
+ },
+/area/yautja)
+"um" = (
+/obj/structure/surface/rack{
+ color = "#6b675e";
+ layer = 2.79
+ },
+/obj/item/storage/fancy/candle_box,
+/obj/item/storage/fancy/candle_box,
+/obj/item/storage/fancy/candle_box,
+/obj/item/storage/fancy/candle_box,
+/obj/item/storage/fancy/candle_box,
+/obj/item/storage/fancy/candle_box,
+/obj/item/storage/fancy/candle_box,
+/turf/open/floor/corsat{
+ dir = 1;
+ icon_state = "squareswood"
+ },
+/area/yautja)
"uO" = (
/obj/structure/bed/chair/hunter{
dir = 4
@@ -2358,6 +2601,24 @@
icon_state = "squareswood"
},
/area/yautja)
+"yr" = (
+/obj/structure/window/reinforced{
+ dir = 8;
+ health = 80
+ },
+/obj/structure/window/reinforced{
+ dir = 4;
+ health = 80
+ },
+/obj/structure/surface/table/reinforced/prison{
+ color = "#6b675e"
+ },
+/obj/item/storage/box/bracer,
+/turf/open/floor/corsat{
+ dir = 1;
+ icon_state = "squareswood"
+ },
+/area/yautja)
"yH" = (
/obj/structure/closet/secure_closet/freezer/fridge/groceries,
/turf/open/floor{
@@ -2394,18 +2655,28 @@
},
/area/yautja)
"zZ" = (
-/obj/structure/surface/table/reinforced/prison{
- color = "#6b675e"
- },
-/obj/structure/window/reinforced{
- dir = 8;
- health = 80
- },
-/obj/structure/window/reinforced{
- dir = 1;
- health = 80;
- pixel_y = 16
+/obj/structure/surface/rack{
+ color = "#6b675e";
+ layer = 2.79
},
+/obj/item/frame/table/wood/fancy,
+/obj/item/frame/table/wood/fancy,
+/obj/item/frame/table/wood/fancy,
+/obj/item/frame/table/wood/fancy,
+/obj/item/frame/table/wood/fancy,
+/obj/item/frame/table/wood/fancy,
+/obj/item/frame/table/wood/fancy,
+/obj/item/frame/table/wood/fancy,
+/obj/item/frame/table/wood/fancy,
+/obj/item/frame/table/wood/fancy,
+/obj/item/frame/table/wood/fancy,
+/obj/item/frame/table/wood/fancy,
+/obj/item/frame/table/wood/fancy,
+/obj/item/frame/table/wood/fancy,
+/obj/item/frame/table/wood/fancy,
+/obj/item/frame/table/wood/fancy,
+/obj/item/frame/table/wood/fancy,
+/obj/item/frame/table/wood/fancy,
/turf/open/floor/corsat{
dir = 1;
icon_state = "squareswood"
@@ -2636,30 +2907,30 @@
/obj/structure/surface/table/reinforced/prison{
color = "#6b675e"
},
-/obj/item/legcuffs{
+/obj/item/restraint/legcuffs{
pixel_y = 5
},
-/obj/item/legcuffs{
+/obj/item/restraint/legcuffs{
pixel_y = 5
},
-/obj/item/legcuffs{
+/obj/item/restraint/legcuffs{
pixel_y = 5
},
-/obj/item/legcuffs{
+/obj/item/restraint/legcuffs{
pixel_y = 5
},
-/obj/item/legcuffs{
+/obj/item/restraint/legcuffs{
pixel_y = 5
},
-/obj/item/legcuffs{
+/obj/item/restraint/legcuffs{
pixel_y = 5
},
-/obj/item/handcuffs,
-/obj/item/handcuffs,
-/obj/item/handcuffs,
-/obj/item/handcuffs,
-/obj/item/handcuffs,
-/obj/item/handcuffs,
+/obj/item/restraint/handcuffs,
+/obj/item/restraint/handcuffs,
+/obj/item/restraint/handcuffs,
+/obj/item/restraint/handcuffs,
+/obj/item/restraint/handcuffs,
+/obj/item/restraint/handcuffs,
/turf/open/shuttle/predship,
/area/yautja)
"GM" = (
@@ -2845,6 +3116,21 @@
/obj/item/stack/sheet/metal{
amount = 50
},
+/obj/item/stack/sheet/metal{
+ amount = 50
+ },
+/obj/item/stack/sheet/metal{
+ amount = 50
+ },
+/obj/item/stack/sheet/metal{
+ amount = 50
+ },
+/obj/item/stack/sheet/metal{
+ amount = 50
+ },
+/obj/item/stack/sheet/metal{
+ amount = 50
+ },
/turf/open/floor/corsat{
dir = 1;
icon_state = "squareswood"
@@ -3109,17 +3395,32 @@
/turf/open/shuttle/predship,
/area/yautja)
"Ut" = (
-/obj/structure/surface/table/reinforced/prison{
- color = "#6b675e"
- },
-/obj/structure/window/reinforced{
- dir = 8;
- health = 80
- },
-/obj/structure/window/reinforced{
- dir = 4;
- health = 80
+/obj/structure/surface/rack{
+ color = "#6b675e";
+ layer = 2.79
},
+/obj/item/frame/table/wood,
+/obj/item/frame/table/wood,
+/obj/item/frame/table/wood,
+/obj/item/frame/table/wood,
+/obj/item/frame/table/wood,
+/obj/item/frame/table/wood,
+/obj/item/frame/table/wood,
+/obj/item/frame/table/wood,
+/obj/item/frame/table/wood,
+/obj/item/frame/table/wood,
+/obj/item/frame/table/wood,
+/obj/item/frame/table/wood,
+/obj/item/frame/table/wood,
+/obj/item/frame/table/wood,
+/obj/item/frame/table/wood,
+/obj/item/frame/table/wood,
+/obj/item/frame/table/wood,
+/obj/item/frame/table/wood,
+/obj/item/frame/table/wood,
+/obj/item/frame/table/wood,
+/obj/item/frame/table/wood,
+/obj/item/frame/table/wood,
/turf/open/floor/corsat{
dir = 1;
icon_state = "squareswood"
@@ -3146,12 +3447,12 @@
/obj/structure/surface/table/reinforced/prison{
color = "#6b675e"
},
-/obj/item/restraints,
-/obj/item/restraints,
-/obj/item/restraints,
-/obj/item/restraints,
-/obj/item/restraints,
-/obj/item/restraints,
+/obj/item/xeno_restraints,
+/obj/item/xeno_restraints,
+/obj/item/xeno_restraints,
+/obj/item/xeno_restraints,
+/obj/item/xeno_restraints,
+/obj/item/xeno_restraints,
/turf/open/shuttle/predship,
/area/yautja)
"VT" = (
@@ -5403,7 +5704,7 @@ JH
JH
JH
bL
-bL
+yr
bj
bj
bj
@@ -5475,7 +5776,7 @@ bL
bL
JH
JH
-bL
+yr
bj
bM
da
@@ -5545,9 +5846,9 @@ cP
bL
bL
bL
-bL
+bZ
JH
-bL
+yr
bj
cv
cP
@@ -5619,7 +5920,7 @@ bL
mv
xO
JH
-bL
+yr
bj
cP
cP
@@ -5691,7 +5992,7 @@ cP
cP
Dk
JH
-bL
+yr
bj
cP
cP
@@ -6479,7 +6780,7 @@ cH
ti
bd
ti
-Ut
+uj
bL
cP
tR
@@ -6554,7 +6855,7 @@ bj
Ut
cP
cP
-tR
+fI
bj
bj
bj
@@ -6621,12 +6922,12 @@ cP
cP
Pm
ov
-nh
-ZM
+sS
+gN
zZ
cP
cP
-tR
+mn
bj
bj
bj
@@ -6698,7 +6999,7 @@ cP
cP
cP
cP
-tR
+um
bj
bj
aa
diff --git a/maps/predship/regular.dmm b/maps/predship/regular.dmm
index 895e8ae84c91..984bd4e7c65a 100644
--- a/maps/predship/regular.dmm
+++ b/maps/predship/regular.dmm
@@ -1136,12 +1136,12 @@
/area/yautja)
"dk" = (
/obj/structure/surface/table/reinforced,
-/obj/item/handcuffs,
-/obj/item/handcuffs,
-/obj/item/handcuffs,
-/obj/item/handcuffs,
-/obj/item/handcuffs,
-/obj/item/handcuffs,
+/obj/item/restraint/handcuffs,
+/obj/item/restraint/handcuffs,
+/obj/item/restraint/handcuffs,
+/obj/item/restraint/handcuffs,
+/obj/item/restraint/handcuffs,
+/obj/item/restraint/handcuffs,
/turf/open/floor/holofloor{
dir = 2;
icon_state = "cult"
@@ -1149,12 +1149,12 @@
/area/yautja)
"dl" = (
/obj/structure/surface/table/reinforced,
-/obj/item/legcuffs,
-/obj/item/legcuffs,
-/obj/item/legcuffs,
-/obj/item/legcuffs,
-/obj/item/legcuffs,
-/obj/item/legcuffs,
+/obj/item/restraint/legcuffs,
+/obj/item/restraint/legcuffs,
+/obj/item/restraint/legcuffs,
+/obj/item/restraint/legcuffs,
+/obj/item/restraint/legcuffs,
+/obj/item/restraint/legcuffs,
/turf/open/floor/holofloor{
dir = 2;
icon_state = "cult"
diff --git a/maps/shuttles/ert_shuttle_big.dmm b/maps/shuttles/ert_shuttle_big.dmm
index f3983899e249..a07c57e00a20 100644
--- a/maps/shuttles/ert_shuttle_big.dmm
+++ b/maps/shuttles/ert_shuttle_big.dmm
@@ -84,9 +84,9 @@
pixel_x = -2;
pixel_y = 3
},
-/obj/item/handcuffs,
-/obj/item/handcuffs,
-/obj/item/handcuffs,
+/obj/item/restraint/handcuffs,
+/obj/item/restraint/handcuffs,
+/obj/item/restraint/handcuffs,
/turf/open/floor/almayer{
icon_state = "plate"
},
diff --git a/maps/templates/lazy_templates/clf_ert_station.dmm b/maps/templates/lazy_templates/clf_ert_station.dmm
index 908f8de06dcb..3aa8c800327f 100644
--- a/maps/templates/lazy_templates/clf_ert_station.dmm
+++ b/maps/templates/lazy_templates/clf_ert_station.dmm
@@ -804,7 +804,7 @@
"sx" = (
/obj/structure/surface/table/woodentable/poor,
/obj/item/clothing/glasses/sunglasses/blindfold,
-/obj/item/handcuffs,
+/obj/item/restraint/handcuffs,
/turf/open/floor/wood,
/area/adminlevel/ert_station/clf_station)
"sC" = (
@@ -1817,8 +1817,8 @@
"Ro" = (
/obj/structure/surface/table/woodentable/poor,
/obj/item/clothing/glasses/sunglasses/blindfold,
-/obj/item/handcuffs,
-/obj/item/handcuffs,
+/obj/item/restraint/handcuffs,
+/obj/item/restraint/handcuffs,
/turf/open/floor/wood,
/area/adminlevel/ert_station/clf_station)
"Rr" = (
diff --git a/maps/templates/lazy_templates/freelancer_ert_station.dmm b/maps/templates/lazy_templates/freelancer_ert_station.dmm
index bf9709e2150d..74c368e4f0b6 100644
--- a/maps/templates/lazy_templates/freelancer_ert_station.dmm
+++ b/maps/templates/lazy_templates/freelancer_ert_station.dmm
@@ -811,7 +811,7 @@
"Hg" = (
/obj/structure/closet/secure_closet/brig,
/obj/item/book/manual/marine_law,
-/obj/item/handcuffs,
+/obj/item/restraint/handcuffs,
/turf/open/floor/almayer{
dir = 4;
icon_state = "red"
diff --git a/maps/templates/lazy_templates/twe_ert_station.dmm b/maps/templates/lazy_templates/twe_ert_station.dmm
index 2c9c696d7842..10e175eae24c 100644
--- a/maps/templates/lazy_templates/twe_ert_station.dmm
+++ b/maps/templates/lazy_templates/twe_ert_station.dmm
@@ -1465,11 +1465,11 @@
},
/area/adminlevel/ert_station/royal_marines_station)
"Cm" = (
-/obj/item/handcuffs{
+/obj/item/restraint/handcuffs{
pixel_y = 12
},
/obj/structure/surface/table/almayer,
-/obj/item/handcuffs,
+/obj/item/restraint/handcuffs,
/obj/item/weapon/baton{
pixel_x = -12
},
@@ -2658,11 +2658,11 @@
"VL" = (
/obj/structure/surface/table/almayer,
/obj/item/clothing/suit/straight_jacket,
-/obj/item/handcuffs{
+/obj/item/restraint/handcuffs{
pixel_x = -4;
pixel_y = 1
},
-/obj/item/handcuffs,
+/obj/item/restraint/handcuffs,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/almayer{
icon_state = "redfull"
diff --git a/maps/templates/lazy_templates/upp_ert_station.dmm b/maps/templates/lazy_templates/upp_ert_station.dmm
index ae2a8ad40c47..fd1e6186bf73 100644
--- a/maps/templates/lazy_templates/upp_ert_station.dmm
+++ b/maps/templates/lazy_templates/upp_ert_station.dmm
@@ -828,11 +828,11 @@
"me" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/clothing/suit/straight_jacket,
-/obj/item/handcuffs{
+/obj/item/restraint/handcuffs{
pixel_x = -4;
pixel_y = 1
},
-/obj/item/handcuffs,
+/obj/item/restraint/handcuffs,
/turf/open/floor/strata{
icon_state = "red1"
},
diff --git a/strings/xenotips.txt b/strings/xenotips.txt
index d5bc61e7cf79..414d0883e576 100644
--- a/strings/xenotips.txt
+++ b/strings/xenotips.txt
@@ -37,6 +37,8 @@ You can filter out the Xenomorphs displayed in hive status by health, allowing y
Each xeno has their own ‘tackle counter’ on a marine. The range to successfully tackle can be anywhere from two to six tackles based on caste. If a marine gets stunned or knocked over by other means it will reset everyone's tackle counters and they may get up!
As a Xenomorph, the list of available tunnels is sorted by their distance to the player!
As a Xenomorph, pay attention to what a marine is wearing. If they have no helmet, aiming for the head will be significantly more damaging, if they aren't wearing gloves, then think about going for their hands.
+The M540-A Armored Recon Carrier can be crawled under as a xenomorph when destroyed.
+The M540-A Armored Recon Carrier is very vulnerable to acid damage.
Applying acid to flares makes them burn faster.
Melting weapons, ammo or other valuables owned by marines is a good way to debilitate them.
The secrete acid shortcut is (by default) Shift + C.
diff --git a/tgui/.swcrc b/tgui/.swcrc
new file mode 100644
index 000000000000..c0402a41f0bf
--- /dev/null
+++ b/tgui/.swcrc
@@ -0,0 +1,15 @@
+{
+ "$schema": "https://json.schemastore.org/swcrc",
+ "jsc": {
+ "loose": true,
+ "parser": {
+ "syntax": "typescript",
+ "tsx": true
+ },
+ "transform": {
+ "react": {
+ "runtime": "automatic"
+ }
+ }
+ }
+}
diff --git a/tgui/babel.config.js b/tgui/babel.config.js
deleted file mode 100644
index 69a5a401cc77..000000000000
--- a/tgui/babel.config.js
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * @file
- * @copyright 2020 Aleksej Komarov
- * @license MIT
- */
-
-const createBabelConfig = (options) => {
- const { presets = [], plugins = [], removeConsole } = options;
- return {
- presets: [
- [
- require.resolve('@babel/preset-typescript'),
- {
- allowDeclareFields: true,
- },
- ],
- [
- require.resolve('@babel/preset-env'),
- {
- modules: 'commonjs',
- useBuiltIns: 'entry',
- corejs: '3.3.2',
- spec: false,
- loose: true,
- targets: [],
- },
- ],
- [require.resolve('@babel/preset-react'), { runtime: 'automatic' }],
- ...presets,
- ].filter(Boolean),
- plugins: [
- [
- require.resolve('@babel/plugin-transform-class-properties'),
- {
- loose: true,
- },
- ],
- require.resolve('@babel/plugin-transform-jscript'),
- removeConsole && require.resolve('babel-plugin-transform-remove-console'),
- require.resolve('common/string.babel-plugin.cjs'),
- ...plugins,
- ].filter(Boolean),
- };
-};
-
-module.exports = (api) => {
- api.cache(true);
- const mode = process.env.NODE_ENV;
- return createBabelConfig({ mode });
-};
-
-module.exports.createBabelConfig = createBabelConfig;
diff --git a/tgui/jest.config.js b/tgui/jest.config.js
index 8b78818004be..d8b4ac3e41a8 100644
--- a/tgui/jest.config.js
+++ b/tgui/jest.config.js
@@ -8,7 +8,7 @@ module.exports = {
testEnvironment: 'jsdom',
testRunner: require.resolve('jest-circus/runner'),
transform: {
- '^.+\\.(js|cjs|ts|tsx)$': require.resolve('babel-jest'),
+ '^.+\\.(js|cjs|ts|tsx)$': require.resolve('@swc/jest'),
},
moduleFileExtensions: ['js', 'cjs', 'ts', 'tsx', 'json'],
resetMocks: true,
diff --git a/tgui/package.json b/tgui/package.json
index 77ff3be9b01f..1187ab904451 100644
--- a/tgui/package.json
+++ b/tgui/package.json
@@ -20,24 +20,16 @@
"tgui:tsc": "tsc"
},
"dependencies": {
- "@babel/core": "^7.15.0",
- "@babel/eslint-parser": "^7.15.0",
- "@babel/plugin-transform-class-properties": "^7.23.3",
- "@babel/plugin-transform-jscript": "^7.14.5",
- "@babel/preset-env": "^7.15.0",
- "@babel/preset-react": "^7.23.3",
- "@babel/preset-typescript": "^7.15.0",
+ "@swc/core": "^1.5.0",
+ "@swc/jest": "^0.2.36",
"@types/jest": "^27.0.1",
"@types/jsdom": "^16.2.13",
"@types/node": "^14.17.9",
"@types/webpack": "^5.28.0",
"@types/webpack-env": "^1.16.2",
"@typescript-eslint/parser": "^4.29.1",
- "babel-jest": "^27.0.6",
- "babel-loader": "^8.2.2",
- "babel-plugin-transform-remove-console": "^6.9.4",
- "common": "workspace:*",
"css-loader": "^5.2.7",
+ "esbuild-loader": "^4.1.0",
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-radar": "^0.2.1",
@@ -52,7 +44,7 @@
"sass": "^1.37.5",
"sass-loader": "^11.1.1",
"style-loader": "^2.0.0",
- "terser-webpack-plugin": "^5.1.4",
+ "swc-loader": "^0.2.6",
"typescript": "^4.9.4",
"url-loader": "^4.1.1",
"webpack": "^5.75.0",
diff --git a/tgui/packages/tgui/components/Button.jsx b/tgui/packages/tgui/components/Button.jsx
index dbffb6a72c95..826ba3309676 100644
--- a/tgui/packages/tgui/components/Button.jsx
+++ b/tgui/packages/tgui/components/Button.jsx
@@ -5,7 +5,7 @@
*/
import { KEY_ENTER, KEY_ESCAPE, KEY_SPACE } from 'common/keycodes';
-import { classes, pureComponentHooks } from 'common/react';
+import { classes } from 'common/react';
import { Component, createRef } from 'react';
import { createLogger } from '../logging';
import { Box, computeBoxClassName, computeBoxProps } from './Box';
@@ -134,8 +134,6 @@ export const Button = (props) => {
return buttonContent;
};
-Button.defaultHooks = pureComponentHooks;
-
export const ButtonCheckbox = (props) => {
const { checked, ...rest } = props;
return (
diff --git a/tgui/packages/tgui/components/Chart.jsx b/tgui/packages/tgui/components/Chart.jsx
index b8a9c62f8929..87eacff1e35f 100644
--- a/tgui/packages/tgui/components/Chart.jsx
+++ b/tgui/packages/tgui/components/Chart.jsx
@@ -5,7 +5,6 @@
*/
import { map, zipWith } from 'common/collections';
-import { pureComponentHooks } from 'common/react';
import { Component, createRef } from 'react';
import { Box } from './Box';
@@ -117,8 +116,6 @@ class LineChart extends Component {
}
}
-LineChart.defaultHooks = pureComponentHooks;
-
const Stub = (props) => null;
// IE8: No inline svg support
diff --git a/tgui/packages/tgui/components/ColorBox.jsx b/tgui/packages/tgui/components/ColorBox.jsx
index a6203ca4694c..ce3c202d8cd6 100644
--- a/tgui/packages/tgui/components/ColorBox.jsx
+++ b/tgui/packages/tgui/components/ColorBox.jsx
@@ -4,7 +4,7 @@
* @license MIT
*/
-import { classes, pureComponentHooks } from 'common/react';
+import { classes } from 'common/react';
import { computeBoxClassName, computeBoxProps } from './Box';
export const ColorBox = (props) => {
@@ -27,5 +27,3 @@ export const ColorBox = (props) => {
);
};
-
-ColorBox.defaultHooks = pureComponentHooks;
diff --git a/tgui/packages/tgui/components/DraggableControl.jsx b/tgui/packages/tgui/components/DraggableControl.jsx
index 018118dd7966..3b4b5380ccb4 100644
--- a/tgui/packages/tgui/components/DraggableControl.jsx
+++ b/tgui/packages/tgui/components/DraggableControl.jsx
@@ -5,7 +5,6 @@
*/
import { clamp } from 'common/math';
-import { pureComponentHooks } from 'common/react';
import { Component, createRef } from 'react';
import { AnimatedNumber } from './AnimatedNumber';
@@ -276,7 +275,6 @@ export class DraggableControl extends Component {
}
}
-DraggableControl.defaultHooks = pureComponentHooks;
DraggableControl.defaultProps = {
minValue: -Infinity,
maxValue: +Infinity,
diff --git a/tgui/packages/tgui/components/Grid.jsx b/tgui/packages/tgui/components/Grid.jsx
index 7ad3fd1dfdbf..f5593c9e00a5 100644
--- a/tgui/packages/tgui/components/Grid.jsx
+++ b/tgui/packages/tgui/components/Grid.jsx
@@ -5,7 +5,6 @@
*/
import { Table } from './Table';
-import { pureComponentHooks } from 'common/react';
/** @deprecated */
export const Grid = (props) => {
@@ -17,8 +16,6 @@ export const Grid = (props) => {
);
};
-Grid.defaultHooks = pureComponentHooks;
-
/** @deprecated */
export const GridColumn = (props) => {
const { size = 1, style, ...rest } = props;
@@ -33,6 +30,4 @@ export const GridColumn = (props) => {
);
};
-Grid.defaultHooks = pureComponentHooks;
-
Grid.Column = GridColumn;
diff --git a/tgui/packages/tgui/components/Icon.jsx b/tgui/packages/tgui/components/Icon.jsx
index e9a4d7fd7ba9..5d63782fa72c 100644
--- a/tgui/packages/tgui/components/Icon.jsx
+++ b/tgui/packages/tgui/components/Icon.jsx
@@ -6,7 +6,7 @@
* @license MIT
*/
-import { classes, pureComponentHooks } from 'common/react';
+import { classes } from 'common/react';
import { computeBoxClassName, computeBoxProps } from './Box';
const FA_OUTLINE_REGEX = /-o$/;
@@ -55,8 +55,6 @@ export const Icon = (props) => {
);
};
-Icon.defaultHooks = pureComponentHooks;
-
export const IconStack = (props) => {
const { className, children, ...rest } = props;
return (
diff --git a/tgui/packages/tgui/components/NoticeBox.jsx b/tgui/packages/tgui/components/NoticeBox.jsx
index 1c3b49b16a53..09e205b46bef 100644
--- a/tgui/packages/tgui/components/NoticeBox.jsx
+++ b/tgui/packages/tgui/components/NoticeBox.jsx
@@ -4,7 +4,7 @@
* @license MIT
*/
-import { classes, pureComponentHooks } from 'common/react';
+import { classes } from 'common/react';
import { Box } from './Box';
export const NoticeBox = (props) => {
@@ -23,5 +23,3 @@ export const NoticeBox = (props) => {
/>
);
};
-
-NoticeBox.defaultHooks = pureComponentHooks;
diff --git a/tgui/packages/tgui/components/Table.jsx b/tgui/packages/tgui/components/Table.jsx
index e936b9144808..60e7ea1cd227 100644
--- a/tgui/packages/tgui/components/Table.jsx
+++ b/tgui/packages/tgui/components/Table.jsx
@@ -4,7 +4,7 @@
* @license MIT
*/
-import { classes, pureComponentHooks } from 'common/react';
+import { classes } from 'common/react';
import { computeBoxClassName, computeBoxProps } from './Box';
export const Table = (props) => {
@@ -23,8 +23,6 @@ export const Table = (props) => {
);
};
-Table.defaultHooks = pureComponentHooks;
-
export const TableRow = (props) => {
const { className, header, ...rest } = props;
return (
@@ -40,8 +38,6 @@ export const TableRow = (props) => {
);
};
-TableRow.defaultHooks = pureComponentHooks;
-
export const TableCell = (props) => {
const { className, collapsing, header, ...rest } = props;
return (
@@ -58,7 +54,5 @@ export const TableCell = (props) => {
);
};
-TableCell.defaultHooks = pureComponentHooks;
-
Table.Row = TableRow;
Table.Cell = TableCell;
diff --git a/tgui/packages/tgui/interfaces/AresAdmin.js b/tgui/packages/tgui/interfaces/AresAdmin.js
index 3963ee87f3a4..dd51b5a1e007 100644
--- a/tgui/packages/tgui/interfaces/AresAdmin.js
+++ b/tgui/packages/tgui/interfaces/AresAdmin.js
@@ -19,6 +19,7 @@ const PAGES = {
'requisitions': () => Requisitions,
'emergency': () => Emergency,
'tech_log': () => TechLogs,
+ 'core_security': () => CoreSec,
'admin_access_log': () => AdminAccessLogs,
'access_management': () => AccessManagement,
'maintenance_management': () => MaintManagement,
@@ -32,6 +33,10 @@ export const AresAdmin = (props, context) => {
let themecolor = 'crtyellow';
if (sudo >= 1) {
themecolor = 'crtred';
+ } else if (current_menu === 'emergency') {
+ themecolor = 'crtred';
+ } else if (current_menu === 'core_security') {
+ themecolor = 'crtred';
}
return (
@@ -350,6 +355,25 @@ const MainMenu = (props, context) => {
)}
+
+ Core Security Protocols
+
+
+
+
+
@@ -665,7 +689,7 @@ const BombardmentLogs = (props, context) => {
User
- Coordinates
+ Details
)}
@@ -1328,6 +1352,8 @@ const FlightLogs = (props, context) => {
{logged_in}, {access_text}
+
+ Remote Admin: {admin_login}
{
);
};
+const CoreSec = (props) => {
+ const { data, act } = useBackend();
+ const {
+ logged_in,
+ access_text,
+ last_page,
+ current_menu,
+ security_vents,
+ admin_login,
+ } = data;
+
+ return (
+ <>
+
+
+
+
+
+
+ {logged_in}, {access_text}
+
+ Remote Admin: {admin_login}
+
+
+ act('logout')}
+ />
+
+
+
+
+ Core Security Protocols
+
+
+ Nerve Gas Release
+ {security_vents.map((vent, i) => {
+ return (
+ act('trigger_vent', { vent: vent.ref })}
+ />
+ );
+ })}
+
+ >
+ );
+};
+
// -------------------------------------------------------------------- //
// Anything below this line is exclusive to the Admin Remote Interface.
// -------------------------------------------------------------------- //
diff --git a/tgui/packages/tgui/interfaces/AresInterface.jsx b/tgui/packages/tgui/interfaces/AresInterface.jsx
index 4045cba6509c..115a5fd1e74f 100644
--- a/tgui/packages/tgui/interfaces/AresInterface.jsx
+++ b/tgui/packages/tgui/interfaces/AresInterface.jsx
@@ -23,6 +23,7 @@ const PAGES = {
'requisitions': () => Requisitions,
'emergency': () => Emergency,
'tech_log': () => TechLogs,
+ 'core_security': () => CoreSec,
};
export const AresInterface = (props) => {
@@ -35,6 +36,8 @@ export const AresInterface = (props) => {
themecolor = 'crtred';
} else if (current_menu === 'emergency') {
themecolor = 'crtred';
+ } else if (current_menu === 'core_security') {
+ themecolor = 'crtred';
}
return (
@@ -63,7 +66,7 @@ const Login = (props) => {
WY-DOS Executive
- Version 8.2.3
+ Version 8.3.4
Copyright © 2182, Weyland Yutani Corp.
{
)}
+ {(access_level === 3 || access_level >= 6) && (
+
+ Core Security Protocols
+
+
+ act('page_core_sec')}
+ />
+
+
+ act('security_lockdown')}
+ />
+
+
+
+ )}
>
);
};
@@ -628,7 +666,7 @@ const BombardmentLogs = (props) => {
User
- Coordinates
+ Details
)}
@@ -1670,3 +1708,77 @@ const TechLogs = (props, context) => {
>
);
};
+
+const CoreSec = (props) => {
+ const { data, act } = useBackend();
+ const {
+ logged_in,
+ access_text,
+ access_level,
+ last_page,
+ current_menu,
+ security_vents,
+ } = data;
+
+ return (
+ <>
+
+
+
+ act('go_back')}
+ disabled={last_page === current_menu}
+ />
+ act('home')}
+ />
+
+
+
+ {logged_in}, {access_text}
+
+
+ act('logout')}
+ />
+
+
+
+
+ Core Security Protocols
+
+
+ Nerve Gas Release
+ {security_vents.map((vent, i) => {
+ return (
+ act('trigger_vent', { vent: vent.ref })}
+ />
+ );
+ })}
+
+ >
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/DropshipFlightControl.tsx b/tgui/packages/tgui/interfaces/DropshipFlightControl.tsx
index 679b78efe843..7466942aa141 100644
--- a/tgui/packages/tgui/interfaces/DropshipFlightControl.tsx
+++ b/tgui/packages/tgui/interfaces/DropshipFlightControl.tsx
@@ -86,10 +86,13 @@ const DropshipDoorControl = () => {
<>
{x.value === DoorStatusEnum.SHUTTLE_DOOR_BROKEN && (
- No response
+
+ No response
+
)}
{x.value === DoorStatusEnum.SHUTTLE_DOOR_UNLOCKED && (
act('door-control', {
interaction: 'force-lock',
diff --git a/tgui/packages/tgui/interfaces/KeyBinds.jsx b/tgui/packages/tgui/interfaces/KeyBinds.jsx
index b387d6a8dba5..b3b2fd5a8c30 100644
--- a/tgui/packages/tgui/interfaces/KeyBinds.jsx
+++ b/tgui/packages/tgui/interfaces/KeyBinds.jsx
@@ -10,6 +10,20 @@ const KEY_MODS = {
'CONTROL': true,
};
+const KEY_CODE_TO_BYOND = {
+ 'DEL': 'Delete',
+ 'DOWN': 'South',
+ 'END': 'Southwest',
+ 'HOME': 'Northwest',
+ 'INSERT': 'Insert',
+ 'LEFT': 'West',
+ 'PAGEDOWN': 'Southeast',
+ 'PAGEUP': 'Northeast',
+ 'RIGHT': 'East',
+ ' ': 'Space',
+ 'UP': 'North',
+};
+
const getAllKeybinds = (glob_keybinds) => {
const all_keybinds = new Array();
Object.keys(glob_keybinds).map((x) => all_keybinds.push(...glob_keybinds[x]));
@@ -274,6 +288,10 @@ export class ButtonKeybind extends Component {
return;
}
+ if (KEY_CODE_TO_BYOND[pressedKey]) {
+ pressedKey = KEY_CODE_TO_BYOND[pressedKey];
+ }
+
if (e.keyCode >= 96 && e.keyCode <= 105) {
pressedKey = 'Numpad' + pressedKey;
}
diff --git a/tgui/packages/tgui/interfaces/MfdPanels/ParadropPanel.tsx b/tgui/packages/tgui/interfaces/MfdPanels/ParadropPanel.tsx
new file mode 100644
index 000000000000..504743d254be
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/MfdPanels/ParadropPanel.tsx
@@ -0,0 +1,76 @@
+import { MfdPanel, MfdProps } from './MultifunctionDisplay';
+import { Box, Stack } from '../../components';
+import { DropshipEquipment } from '../DropshipWeaponsConsole';
+import { useBackend } from '../../backend';
+import { mfdState, useEquipmentState } from './stateManagers';
+import { EquipmentContext, ParadropSpec } from './types';
+
+const ParadropPanel = (props: DropshipEquipment) => {
+ const paradropData = props.data as ParadropSpec;
+ return (
+
+
+
+
+
+
+
+ {props.name}
+
+
+
+ {paradropData.signal
+ ? 'Locked to ' + paradropData.signal + '.'
+ : 'No locked target found.'}
+
+
+
+
+ {paradropData.locked
+ ? 'Paradropping available.'
+ : 'Paradropping not available.'}
+
+
+
+
+
+
+
+
+ );
+};
+
+export const ParadropMfdPanel = (props: MfdProps) => {
+ const { act, data } = useBackend();
+ const { setPanelState } = mfdState(props.panelStateId);
+ const { equipmentState } = useEquipmentState(props.panelStateId);
+ const paradrop = data.equipment_data.find(
+ (x) => x.mount_point === equipmentState
+ );
+ const deployLabel = paradrop?.data?.locked ? 'CLEAR' : 'LOCK';
+
+ return (
+ setPanelState('equipment') },
+ ]}
+ leftButtons={[
+ {
+ children: deployLabel,
+ onClick: () =>
+ act('paradrop-lock', { equipment_id: paradrop?.mount_point }),
+ },
+ ]}
+ bottomButtons={[
+ {
+ children: 'EXIT',
+ onClick: () => setPanelState(''),
+ },
+ ]}>
+
+ {paradrop && }
+
+
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/MfdPanels/SupportPanel.tsx b/tgui/packages/tgui/interfaces/MfdPanels/SupportPanel.tsx
index 6c224dc7ad63..95bf3b647eff 100644
--- a/tgui/packages/tgui/interfaces/MfdPanels/SupportPanel.tsx
+++ b/tgui/packages/tgui/interfaces/MfdPanels/SupportPanel.tsx
@@ -4,6 +4,7 @@ import { MedevacMfdPanel } from './MedevacPanel';
import { FultonMfdPanel } from './FultonPanel';
import { Box, Stack } from '../../components';
import { SentryMfdPanel } from './SentryPanel';
+import { ParadropMfdPanel } from './ParadropPanel';
import { MgMfdPanel } from './MGPanel';
import { SpotlightMfdPanel } from './SpotlightPanel';
import { EquipmentContext } from './types';
@@ -27,6 +28,9 @@ export const SupportMfdPanel = (props: MfdProps) => {
if (result?.shorthand === 'Sentry') {
return ;
}
+ if (result?.shorthand === 'PDS') {
+ return ;
+ }
if (result?.shorthand === 'MG') {
return ;
}
diff --git a/tgui/packages/tgui/interfaces/MfdPanels/types.ts b/tgui/packages/tgui/interfaces/MfdPanels/types.ts
index 0e4f6f392ba4..239c121a1c3e 100644
--- a/tgui/packages/tgui/interfaces/MfdPanels/types.ts
+++ b/tgui/packages/tgui/interfaces/MfdPanels/types.ts
@@ -73,6 +73,11 @@ export type SpotlightSpec = {
name: string;
};
+export type ParadropSpec = {
+ signal: string | null;
+ locked: 0 | 1;
+};
+
export type MGSpec = {
name: string;
health: number;
diff --git a/tgui/packages/tgui/interfaces/StripMenu.tsx b/tgui/packages/tgui/interfaces/StripMenu.tsx
new file mode 100644
index 000000000000..23bf1199d54e
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/StripMenu.tsx
@@ -0,0 +1,377 @@
+import { range } from 'common/collections';
+import { BooleanLike } from 'common/react';
+import { resolveAsset } from '../assets';
+import { useBackend } from '../backend';
+import { Box, Button, Icon, Stack } from '../components';
+import { Window } from '../layouts';
+
+const ROWS = 5;
+const COLUMNS = 6;
+
+const BUTTON_DIMENSIONS = '50px';
+
+type GridSpotKey = string;
+
+const getGridSpotKey = (spot: [number, number]): GridSpotKey => {
+ return `${spot[0]}/${spot[1]}`;
+};
+
+const CornerText = (props: {
+ readonly align: 'left' | 'right';
+ readonly children: string;
+}): JSX.Element => {
+ const { align, children } = props;
+
+ return (
+
+ {children}
+
+ );
+};
+
+type AlternateAction = {
+ icon: string;
+ text: string;
+};
+
+const ALTERNATE_ACTIONS: Record = {
+ remove_splints: {
+ icon: 'crutch',
+ text: 'Remove splints',
+ },
+
+ remove_accessory: {
+ icon: 'tshirt',
+ text: 'Remove accessory',
+ },
+
+ retrieve_tag: {
+ icon: 'tags',
+ text: 'Retrieve info tag',
+ },
+
+ toggle_internals: {
+ icon: 'mask-face',
+ text: 'Toggle internals',
+ },
+};
+
+type Slot = {
+ displayName: string;
+ gridSpot: GridSpotKey;
+ image?: string;
+ additionalComponent?: JSX.Element;
+ hideEmpty?: boolean;
+};
+
+const SLOTS: Record = {
+ glasses: {
+ displayName: 'glasses',
+ gridSpot: getGridSpotKey([0, 1]),
+ image: 'inventory-glasses.png',
+ },
+
+ head: {
+ displayName: 'headwear',
+ gridSpot: getGridSpotKey([0, 2]),
+ image: 'inventory-head.png',
+ },
+
+ wear_mask: {
+ displayName: 'mask',
+ gridSpot: getGridSpotKey([1, 2]),
+ image: 'inventory-mask.png',
+ },
+
+ wear_r_ear: {
+ displayName: 'right earwear',
+ gridSpot: getGridSpotKey([0, 3]),
+ image: 'inventory-ears.png',
+ },
+
+ wear_l_ear: {
+ displayName: 'left earwear',
+ gridSpot: getGridSpotKey([1, 3]),
+ image: 'inventory-ears.png',
+ },
+
+ handcuffs: {
+ displayName: 'handcuffs',
+ gridSpot: getGridSpotKey([1, 4]),
+ hideEmpty: true,
+ },
+
+ legcuffs: {
+ displayName: 'legcuffs',
+ gridSpot: getGridSpotKey([1, 5]),
+ hideEmpty: true,
+ },
+
+ w_uniform: {
+ displayName: 'uniform',
+ gridSpot: getGridSpotKey([2, 1]),
+ image: 'inventory-uniform.png',
+ },
+
+ wear_suit: {
+ displayName: 'suit',
+ gridSpot: getGridSpotKey([2, 2]),
+ image: 'inventory-suit.png',
+ },
+
+ gloves: {
+ displayName: 'gloves',
+ gridSpot: getGridSpotKey([2, 3]),
+ image: 'inventory-gloves.png',
+ },
+
+ r_hand: {
+ displayName: 'right hand',
+ gridSpot: getGridSpotKey([2, 4]),
+ image: 'inventory-hand_r.png',
+ additionalComponent: R,
+ },
+
+ l_hand: {
+ displayName: 'left hand',
+ gridSpot: getGridSpotKey([2, 5]),
+ image: 'inventory-hand_l.png',
+ additionalComponent: L,
+ },
+
+ shoes: {
+ displayName: 'shoes',
+ gridSpot: getGridSpotKey([3, 2]),
+ image: 'inventory-shoes.png',
+ },
+
+ j_store: {
+ displayName: 'suit storage item',
+ gridSpot: getGridSpotKey([4, 0]),
+ image: 'inventory-suit_storage.png',
+ },
+
+ id: {
+ displayName: 'ID',
+ gridSpot: getGridSpotKey([4, 1]),
+ image: 'inventory-id.png',
+ },
+
+ belt: {
+ displayName: 'belt',
+ gridSpot: getGridSpotKey([4, 2]),
+ image: 'inventory-belt.png',
+ },
+
+ back: {
+ displayName: 'backpack',
+ gridSpot: getGridSpotKey([4, 3]),
+ image: 'inventory-back.png',
+ },
+
+ l_store: {
+ displayName: 'left pocket',
+ gridSpot: getGridSpotKey([4, 4]),
+ image: 'inventory-pocket.png',
+ },
+
+ r_store: {
+ displayName: 'right pocket',
+ gridSpot: getGridSpotKey([4, 5]),
+ image: 'inventory-pocket.png',
+ },
+};
+
+enum ObscuringLevel {
+ Completely = 1,
+ Hidden = 2,
+}
+
+type Interactable = {
+ interacting: BooleanLike;
+};
+
+/**
+ * Some possible options:
+ *
+ * null - No interactions, no item, but is an available slot
+ * { interacting: 1 } - No item, but we're interacting with it
+ * { icon: icon, name: name } - An item with no alternate actions
+ * that we're not interacting with.
+ * { icon, name, interacting: 1 } - An item with no alternate actions
+ * that we're interacting with.
+ */
+type StripMenuItem =
+ | null
+ | Interactable
+ | ((
+ | {
+ icon: string;
+ name: string;
+ alternate: string;
+ }
+ | {
+ obscured: ObscuringLevel;
+ }
+ | {
+ no_item_action: string;
+ }
+ ) &
+ Partial);
+
+type StripMenuData = {
+ items: Record;
+ name: string;
+};
+
+const StripContent = (props: { readonly item: StripMenuItem }) => {
+ if (props.item && 'name' in props.item) {
+ return (
+
+ );
+ }
+ if (props.item && 'obscured' in props.item) {
+ return (
+
+ );
+ }
+ return <> >;
+};
+
+export const StripMenu = (props, context) => {
+ const { act, data } = useBackend();
+
+ const gridSpots = new Map();
+ for (const key of Object.keys(data.items)) {
+ const item = data.items[key];
+ if (item === null && SLOTS[key].hideEmpty) continue;
+ gridSpots.set(SLOTS[key].gridSpot, key);
+ }
+
+ return (
+
+
+
+ {range(0, ROWS).map((row) => (
+
+
+ {range(0, COLUMNS).map((column) => {
+ const key = getGridSpotKey([row, column]);
+ const keyAtSpot = gridSpots.get(key);
+
+ if (!keyAtSpot) {
+ return (
+
+ );
+ }
+
+ const item = data.items[keyAtSpot];
+ const slot = SLOTS[keyAtSpot];
+
+ let alternateAction: AlternateAction | undefined;
+
+ let content;
+ let tooltip;
+
+ if (item === null) {
+ tooltip = slot.displayName;
+ } else if ('name' in item) {
+ alternateAction = ALTERNATE_ACTIONS[item.alternate];
+ tooltip = item.name;
+ } else if ('obscured' in item) {
+ tooltip = `obscured ${slot.displayName}`;
+ } else if ('no_item_action' in item) {
+ tooltip = slot.displayName;
+ alternateAction = ALTERNATE_ACTIONS[item.no_item_action];
+ }
+
+ return (
+
+
+ {
+ if (item === null || 'no_item_action' in item) {
+ act('equip', {
+ key: keyAtSpot,
+ });
+ } else {
+ act('strip', {
+ key: keyAtSpot,
+ });
+ }
+ }}
+ fluid
+ tooltip={tooltip}
+ className="StripMenu__itembutton"
+ style={{
+ background: item?.interacting
+ ? 'hsl(39, 73%, 30%)'
+ : undefined,
+ }}>
+ {slot.image && (
+
+ )}
+ {item && }
+ {slot.additionalComponent}
+
+
+ {alternateAction !== undefined && (
+ {
+ act('alt', {
+ key: keyAtSpot,
+ });
+ }}
+ tooltip={alternateAction.text}
+ className="StripMenu__alternativeaction">
+
+
+ )}
+
+
+ );
+ })}
+
+
+ ))}
+
+
+
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/WorkingJoe.jsx b/tgui/packages/tgui/interfaces/WorkingJoe.jsx
index 4864631aa152..cc87399fef5f 100644
--- a/tgui/packages/tgui/interfaces/WorkingJoe.jsx
+++ b/tgui/packages/tgui/interfaces/WorkingJoe.jsx
@@ -12,14 +12,20 @@ const PAGES = {
'access_requests': () => AccessRequests,
'access_tickets': () => AccessTickets,
'id_access': () => AccessID,
+ 'core_security_gas': () => CoreSecGas,
};
export const WorkingJoe = (props) => {
const { data } = useBackend();
const { current_menu } = data;
const PageComponent = PAGES[current_menu]();
+ let themecolor = 'crtblue';
+ if (current_menu === 'core_security_gas') {
+ themecolor = 'crtred';
+ }
+
return (
-
+
@@ -235,6 +241,41 @@ const MainMenu = (props) => {
)}
+ {access_level >= 5 && (
+
+ Core Security Protocols
+
+
+ act('page_core_gas')}
+ />
+
+
+ act('security_lockdown')}
+ />
+
+
+
+ )}
>
);
};
@@ -963,3 +1004,72 @@ const AccessTickets = (props) => {
>
);
};
+
+const CoreSecGas = (props) => {
+ const { data, act } = useBackend();
+ const {
+ logged_in,
+ access_text,
+ access_level,
+ last_page,
+ current_menu,
+ security_vents,
+ } = data;
+
+ return (
+ <>
+
+
+
+ act('go_back')}
+ disabled={last_page === current_menu}
+ />
+ act('home')}
+ />
+
+
+
+ {logged_in}, {access_text}
+
+
+ act('logout')}
+ />
+
+
+
+
+ Nerve Gas Release
+ {security_vents.map((vent, i) => {
+ return (
+ act('trigger_vent', { vent: vent.ref })}
+ />
+ );
+ })}
+
+ >
+ );
+};
diff --git a/tgui/packages/tgui/styles/interfaces/StripMenu.scss b/tgui/packages/tgui/styles/interfaces/StripMenu.scss
new file mode 100644
index 000000000000..d2c867c0aca1
--- /dev/null
+++ b/tgui/packages/tgui/styles/interfaces/StripMenu.scss
@@ -0,0 +1,65 @@
+@use '../base.scss';
+
+$background-color: rgba(0, 0, 0, 0.33) !default;
+
+.StripMenu__cornertext_left {
+ position: relative;
+ left: 2px;
+ text-align: left;
+ text-shadow: 1px 1px 1px #555;
+}
+
+.StripMenu__cornertext_right {
+ position: relative;
+ left: -2px;
+ text-align: right;
+ text-shadow: 1px 1px 1px #555;
+}
+
+.StripMenu__iconbox {
+ height: 100%;
+ width: 100%;
+ -ms-interpolation-mode: nearest-neighbor;
+ vertical-align: middle;
+}
+
+.StripMenu__obscured {
+ text-align: center;
+ height: 100%;
+ width: 100%;
+}
+
+.StripMenu__itembox {
+ position: relative;
+ width: 100%;
+ height: 100%;
+}
+
+.StripMenu__contentbox {
+ position: relative;
+}
+
+.StripMenu__itembutton {
+ position: relative;
+ width: 100%;
+ height: 100%;
+ padding: 0;
+}
+
+.StripMenu__itemslot {
+ position: absolute;
+ width: 32px;
+ height: 32px;
+ left: 50%;
+ top: 50%;
+ transform: translateX(-50%) translateY(-50%) scale(0.8);
+ opacity: 0.7;
+}
+
+.StripMenu__alternativeaction {
+ background: rgba(0, 0, 0, 0.6);
+ position: absolute;
+ bottom: 0;
+ right: 0;
+ z-index: 2;
+}
diff --git a/tgui/packages/tgui/styles/main.scss b/tgui/packages/tgui/styles/main.scss
index f7a9ae4fbd7b..a76b1ef3d8e4 100644
--- a/tgui/packages/tgui/styles/main.scss
+++ b/tgui/packages/tgui/styles/main.scss
@@ -78,6 +78,7 @@
@include meta.load-css('./interfaces/common/Dpad.scss');
@include meta.load-css('./interfaces/common/ElectricalPanel.scss');
@include meta.load-css('./interfaces/TacticalMap.scss');
+@include meta.load-css('./interfaces/StripMenu.scss');
// Layouts
@include meta.load-css('./layouts/Layout.scss');
diff --git a/tgui/public/tgui-panel.bundle.css b/tgui/public/tgui-panel.bundle.css
index 65ed516c5573..4d00b843f41b 100644
--- a/tgui/public/tgui-panel.bundle.css
+++ b/tgui/public/tgui-panel.bundle.css
@@ -1,2 +1 @@
-html,body{box-sizing:border-box;height:100%;margin:0;font-size:12px}html{overflow:hidden;cursor:default}body{overflow:auto;font-family:Verdana,Geneva,sans-serif}*,*:before,*:after{box-sizing:inherit}h1,h2,h3,h4,h5,h6{display:block;margin:0;padding:6px 0;padding:.5rem 0}h1{font-size:18px;font-size:1.5rem}h2{font-size:16px;font-size:1.333rem}h3{font-size:14px;font-size:1.167rem}h4{font-size:12px;font-size:1rem}td,th{vertical-align:baseline;text-align:left}.candystripe:nth-child(odd){background-color:rgba(0,0,0,.25)}.color-black{color:#1a1a1a !important}.color-white{color:#fff !important}.color-red{color:#df3e3e !important}.color-orange{color:#f37f33 !important}.color-yellow{color:#fbda21 !important}.color-olive{color:#cbe41c !important}.color-green{color:#25ca4c !important}.color-teal{color:#00d6cc !important}.color-blue{color:#2e93de !important}.color-dark-blue{color:#005fa7 !important}.color-violet{color:#7349cf !important}.color-purple{color:#ad45d0 !important}.color-pink{color:#e34da1 !important}.color-brown{color:#b97447 !important}.color-grey{color:#848484 !important}.color-light-grey{color:#b3b3b3 !important}.color-good{color:#68c22d !important}.color-average{color:#f29a29 !important}.color-bad{color:#df3e3e !important}.color-label{color:#8b9bb0 !important}.color-xeno{color:#664573 !important}.color-bg-black{background-color:#000 !important}.color-bg-white{background-color:#d9d9d9 !important}.color-bg-red{background-color:#bd2020 !important}.color-bg-orange{background-color:#d95e0c !important}.color-bg-yellow{background-color:#d9b804 !important}.color-bg-olive{background-color:#9aad14 !important}.color-bg-green{background-color:#1b9638 !important}.color-bg-teal{background-color:#009a93 !important}.color-bg-blue{background-color:#1c71b1 !important}.color-bg-dark-blue{background-color:#003e6e !important}.color-bg-violet{background-color:#552dab !important}.color-bg-purple{background-color:#8b2baa !important}.color-bg-pink{background-color:#cf2082 !important}.color-bg-brown{background-color:#8c5836 !important}.color-bg-grey{background-color:#646464 !important}.color-bg-light-grey{background-color:#919191 !important}.color-bg-good{background-color:#4d9121 !important}.color-bg-average{background-color:#cd7a0d !important}.color-bg-bad{background-color:#bd2020 !important}.color-bg-label{background-color:#657a94 !important}.color-bg-xeno{background-color:#462f4e !important}.debug-layout,.debug-layout *:not(g):not(path){color:rgba(255,255,255,.9) !important;background:rgba(0,0,0,0) !important;outline:1px solid rgba(255,255,255,.5) !important;box-shadow:none !important;filter:none !important}.debug-layout:hover,.debug-layout *:not(g):not(path):hover{outline-color:rgba(255,255,255,.8) !important}.outline-dotted{outline-style:dotted !important}.outline-dashed{outline-style:dashed !important}.outline-solid{outline-style:solid !important}.outline-double{outline-style:double !important}.outline-groove{outline-style:groove !important}.outline-ridge{outline-style:ridge !important}.outline-inset{outline-style:inset !important}.outline-outset{outline-style:outset !important}.outline-color-black{outline:.167rem solid #1a1a1a !important}.outline-color-white{outline:.167rem solid #fff !important}.outline-color-red{outline:.167rem solid #df3e3e !important}.outline-color-orange{outline:.167rem solid #f37f33 !important}.outline-color-yellow{outline:.167rem solid #fbda21 !important}.outline-color-olive{outline:.167rem solid #cbe41c !important}.outline-color-green{outline:.167rem solid #25ca4c !important}.outline-color-teal{outline:.167rem solid #00d6cc !important}.outline-color-blue{outline:.167rem solid #2e93de !important}.outline-color-dark-blue{outline:.167rem solid #005fa7 !important}.outline-color-violet{outline:.167rem solid #7349cf !important}.outline-color-purple{outline:.167rem solid #ad45d0 !important}.outline-color-pink{outline:.167rem solid #e34da1 !important}.outline-color-brown{outline:.167rem solid #b97447 !important}.outline-color-grey{outline:.167rem solid #848484 !important}.outline-color-light-grey{outline:.167rem solid #b3b3b3 !important}.outline-color-good{outline:.167rem solid #68c22d !important}.outline-color-average{outline:.167rem solid #f29a29 !important}.outline-color-bad{outline:.167rem solid #df3e3e !important}.outline-color-label{outline:.167rem solid #8b9bb0 !important}.outline-color-xeno{outline:.167rem solid #664573 !important}.text-left{text-align:left}.text-center{text-align:center}.text-right{text-align:right}.text-baseline{text-align:baseline}.text-justify{text-align:justify}.text-nowrap{white-space:nowrap}.text-pre{white-space:pre}.text-bold{font-weight:bold}.text-italic{font-style:italic}.text-underline{text-decoration:underline}.BlockQuote{color:#8b9bb0;border-left:.1666666667em solid #8b9bb0;padding-left:.5em;margin-bottom:.5em}.BlockQuote:last-child{margin-bottom:0}.Button{position:relative;display:inline-block;line-height:1.667em;padding:0 .5em;margin-right:.1666666667em;white-space:nowrap;outline:0;border-radius:.16em;margin-bottom:.1666666667em;user-select:none;-ms-user-select:none}.Button .fa,.Button .fas,.Button .far{margin-left:-0.25em;margin-right:-0.25em;min-width:1.333em;text-align:center}.Button--hasContent .fa,.Button--hasContent .fas,.Button--hasContent .far{margin-right:.25em}.Button--hasContent.Button--iconPosition--right .fa,.Button--hasContent.Button--iconPosition--right .fas,.Button--hasContent.Button--iconPosition--right .far{margin-right:0px;margin-left:3px}.Button--ellipsis{overflow:hidden;text-overflow:ellipsis}.Button--fluid{display:block;margin-left:0;margin-right:0}.Button--circular{border-radius:50%}.Button--compact{padding:0 .25em;line-height:1.333em}.Button--color--black{transition:color 50ms,background-color 50ms;background-color:#000;color:#fff}.Button--color--black:hover{transition:color 0ms,background-color 0ms}.Button--color--black:focus{transition:color 100ms,background-color 100ms}.Button--color--black:hover,.Button--color--black:focus{background-color:#131313;color:#fff}.Button--color--white{transition:color 50ms,background-color 50ms;background-color:#d9d9d9;color:#000}.Button--color--white:hover{transition:color 0ms,background-color 0ms}.Button--color--white:focus{transition:color 100ms,background-color 100ms}.Button--color--white:hover,.Button--color--white:focus{background-color:#f8f8f8;color:#000}.Button--color--red{transition:color 50ms,background-color 50ms;background-color:#bd2020;color:#fff}.Button--color--red:hover{transition:color 0ms,background-color 0ms}.Button--color--red:focus{transition:color 100ms,background-color 100ms}.Button--color--red:hover,.Button--color--red:focus{background-color:#dc4848;color:#fff}.Button--color--orange{transition:color 50ms,background-color 50ms;background-color:#d95e0c;color:#fff}.Button--color--orange:hover{transition:color 0ms,background-color 0ms}.Button--color--orange:focus{transition:color 100ms,background-color 100ms}.Button--color--orange:hover,.Button--color--orange:focus{background-color:#f0853f;color:#fff}.Button--color--yellow{transition:color 50ms,background-color 50ms;background-color:#d9b804;color:#000}.Button--color--yellow:hover{transition:color 0ms,background-color 0ms}.Button--color--yellow:focus{transition:color 100ms,background-color 100ms}.Button--color--yellow:hover,.Button--color--yellow:focus{background-color:#f5d72e;color:#000}.Button--color--olive{transition:color 50ms,background-color 50ms;background-color:#9aad14;color:#fff}.Button--color--olive:hover{transition:color 0ms,background-color 0ms}.Button--color--olive:focus{transition:color 100ms,background-color 100ms}.Button--color--olive:hover,.Button--color--olive:focus{background-color:#c4da2b;color:#fff}.Button--color--green{transition:color 50ms,background-color 50ms;background-color:#1b9638;color:#fff}.Button--color--green:hover{transition:color 0ms,background-color 0ms}.Button--color--green:focus{transition:color 100ms,background-color 100ms}.Button--color--green:hover,.Button--color--green:focus{background-color:#32c154;color:#fff}.Button--color--teal{transition:color 50ms,background-color 50ms;background-color:#009a93;color:#fff}.Button--color--teal:hover{transition:color 0ms,background-color 0ms}.Button--color--teal:focus{transition:color 100ms,background-color 100ms}.Button--color--teal:hover,.Button--color--teal:focus{background-color:#13c4bc;color:#fff}.Button--color--blue{transition:color 50ms,background-color 50ms;background-color:#1c71b1;color:#fff}.Button--color--blue:hover{transition:color 0ms,background-color 0ms}.Button--color--blue:focus{transition:color 100ms,background-color 100ms}.Button--color--blue:hover,.Button--color--blue:focus{background-color:#3a95d9;color:#fff}.Button--color--dark-blue{transition:color 50ms,background-color 50ms;background-color:#003e6e;color:#fff}.Button--color--dark-blue:hover{transition:color 0ms,background-color 0ms}.Button--color--dark-blue:focus{transition:color 100ms,background-color 100ms}.Button--color--dark-blue:hover,.Button--color--dark-blue:focus{background-color:#135b92;color:#fff}.Button--color--violet{transition:color 50ms,background-color 50ms;background-color:#552dab;color:#fff}.Button--color--violet:hover{transition:color 0ms,background-color 0ms}.Button--color--violet:focus{transition:color 100ms,background-color 100ms}.Button--color--violet:hover,.Button--color--violet:focus{background-color:#7953cc;color:#fff}.Button--color--purple{transition:color 50ms,background-color 50ms;background-color:#8b2baa;color:#fff}.Button--color--purple:hover{transition:color 0ms,background-color 0ms}.Button--color--purple:focus{transition:color 100ms,background-color 100ms}.Button--color--purple:hover,.Button--color--purple:focus{background-color:#ad4fcd;color:#fff}.Button--color--pink{transition:color 50ms,background-color 50ms;background-color:#cf2082;color:#fff}.Button--color--pink:hover{transition:color 0ms,background-color 0ms}.Button--color--pink:focus{transition:color 100ms,background-color 100ms}.Button--color--pink:hover,.Button--color--pink:focus{background-color:#e257a5;color:#fff}.Button--color--brown{transition:color 50ms,background-color 50ms;background-color:#8c5836;color:#fff}.Button--color--brown:hover{transition:color 0ms,background-color 0ms}.Button--color--brown:focus{transition:color 100ms,background-color 100ms}.Button--color--brown:hover,.Button--color--brown:focus{background-color:#b47851;color:#fff}.Button--color--grey{transition:color 50ms,background-color 50ms;background-color:#646464;color:#fff}.Button--color--grey:hover{transition:color 0ms,background-color 0ms}.Button--color--grey:focus{transition:color 100ms,background-color 100ms}.Button--color--grey:hover,.Button--color--grey:focus{background-color:#868686;color:#fff}.Button--color--light-grey{transition:color 50ms,background-color 50ms;background-color:#919191;color:#fff}.Button--color--light-grey:hover{transition:color 0ms,background-color 0ms}.Button--color--light-grey:focus{transition:color 100ms,background-color 100ms}.Button--color--light-grey:hover,.Button--color--light-grey:focus{background-color:#bababa;color:#fff}.Button--color--good{transition:color 50ms,background-color 50ms;background-color:#4d9121;color:#fff}.Button--color--good:hover{transition:color 0ms,background-color 0ms}.Button--color--good:focus{transition:color 100ms,background-color 100ms}.Button--color--good:hover,.Button--color--good:focus{background-color:#6cba39;color:#fff}.Button--color--average{transition:color 50ms,background-color 50ms;background-color:#cd7a0d;color:#fff}.Button--color--average:hover{transition:color 0ms,background-color 0ms}.Button--color--average:focus{transition:color 100ms,background-color 100ms}.Button--color--average:hover,.Button--color--average:focus{background-color:#ed9d35;color:#fff}.Button--color--bad{transition:color 50ms,background-color 50ms;background-color:#bd2020;color:#fff}.Button--color--bad:hover{transition:color 0ms,background-color 0ms}.Button--color--bad:focus{transition:color 100ms,background-color 100ms}.Button--color--bad:hover,.Button--color--bad:focus{background-color:#dc4848;color:#fff}.Button--color--label{transition:color 50ms,background-color 50ms;background-color:#657a94;color:#fff}.Button--color--label:hover{transition:color 0ms,background-color 0ms}.Button--color--label:focus{transition:color 100ms,background-color 100ms}.Button--color--label:hover,.Button--color--label:focus{background-color:#91a1b3;color:#fff}.Button--color--xeno{transition:color 50ms,background-color 50ms;background-color:#462f4e;color:#fff}.Button--color--xeno:hover{transition:color 0ms,background-color 0ms}.Button--color--xeno:focus{transition:color 100ms,background-color 100ms}.Button--color--xeno:hover,.Button--color--xeno:focus{background-color:#64496d;color:#fff}.Button--color--default{transition:color 50ms,background-color 50ms;background-color:#3e6189;color:#fff}.Button--color--default:hover{transition:color 0ms,background-color 0ms}.Button--color--default:focus{transition:color 100ms,background-color 100ms}.Button--color--default:hover,.Button--color--default:focus{background-color:#5c83b0;color:#fff}.Button--color--caution{transition:color 50ms,background-color 50ms;background-color:#d9b804;color:#000}.Button--color--caution:hover{transition:color 0ms,background-color 0ms}.Button--color--caution:focus{transition:color 100ms,background-color 100ms}.Button--color--caution:hover,.Button--color--caution:focus{background-color:#f5d72e;color:#000}.Button--color--danger{transition:color 50ms,background-color 50ms;background-color:#bd2020;color:#fff}.Button--color--danger:hover{transition:color 0ms,background-color 0ms}.Button--color--danger:focus{transition:color 100ms,background-color 100ms}.Button--color--danger:hover,.Button--color--danger:focus{background-color:#dc4848;color:#fff}.Button--color--transparent{transition:color 50ms,background-color 50ms;background-color:#202020;color:#fff;background-color:rgba(32,32,32,0);color:rgba(255,255,255,.5)}.Button--color--transparent:hover{transition:color 0ms,background-color 0ms}.Button--color--transparent:focus{transition:color 100ms,background-color 100ms}.Button--color--transparent:hover,.Button--color--transparent:focus{background-color:#383838;color:#fff}.Button--disabled{background-color:#999 !important}.Button--selected{transition:color 50ms,background-color 50ms;background-color:#1b9638;color:#fff}.Button--selected:hover{transition:color 0ms,background-color 0ms}.Button--selected:focus{transition:color 100ms,background-color 100ms}.Button--selected:hover,.Button--selected:focus{background-color:#32c154;color:#fff}.Button--flex{display:inline-flex;flex-direction:column}.Button--flex--fluid{width:100%}.Button--verticalAlignContent--top{justify-content:flex-start}.Button--verticalAlignContent--middle{justify-content:center}.Button--verticalAlignContent--bottom{justify-content:flex-end}.Button__content{display:block;align-self:stretch}.ColorBox{display:inline-block;width:1em;height:1em;line-height:1em;text-align:center}.Dimmer{display:flex;justify-content:center;align-items:center;position:absolute;top:0;bottom:0;left:0;right:0;background-color:rgba(0,0,0,.75);z-index:1}.Divider--horizontal{margin:.5em 0}.Divider--horizontal:not(.Divider--hidden){border-top:.1666666667em solid rgba(255,255,255,.1)}.Divider--vertical{height:100%;margin:0 .5em}.Divider--vertical:not(.Divider--hidden){border-left:.1666666667em solid rgba(255,255,255,.1)}.Dropdown{position:relative}.Dropdown__control{position:relative;display:inline-block;font-family:Verdana,sans-serif;font-size:1em;width:8.3333333333em;line-height:1.4166666667em;user-select:none}.Dropdown__arrow-button{float:right;padding-left:.35em;width:1.2em;height:1.8333333333em;border-left:.0833333333em solid #000;border-left:.0833333333em solid rgba(0,0,0,.25)}.Dropdown__menu{position:absolute;overflow-y:auto;z-index:5;width:8.3333333333em;max-height:16.6666666667em;overflow-y:scroll;border-radius:0 0 .1666666667em .1666666667em;color:#fff;background-color:#000;background-color:rgba(0,0,0,.75)}.Dropdown__menu-noscroll{position:absolute;overflow-y:auto;z-index:5;width:8.3333333333em;max-height:16.6666666667em;border-radius:0 0 .1666666667em .1666666667em;color:#fff;background-color:#000;background-color:rgba(0,0,0,.75)}.Dropdown__menuentry{padding:.1666666667em .3333333333em;font-family:Verdana,sans-serif;font-size:1em;line-height:1.4166666667em;transition:background-color 100ms ease-out}.Dropdown__menuentry:hover{background-color:rgba(255,255,255,.2);transition:background-color 0ms}.Dropdown__over{top:auto;bottom:100%}.Dropdown__selected-text{display:inline-block;text-overflow:ellipsis;white-space:nowrap;height:1.4166666667em;width:calc(100% - 1.2em)}.Flex{display:-ms-flexbox;display:flex}.Flex--inline{display:inline-flex}.Flex--iefix{display:block}.Flex--iefix.Flex--inline{display:inline-block}.Flex__item--iefix{display:inline-block}.Flex--iefix--column>.Flex__item--iefix{display:block}.Input{position:relative;display:inline-block;width:10em;border:.0833333333em solid #88bfff;border:.0833333333em solid rgba(136,191,255,.75);border-radius:.16em;color:#fff;background-color:#0a0a0a;padding:0 .3333333333em;margin-right:.1666666667em;line-height:1.4166666667em;overflow:visible}.Input--fluid{display:block;width:auto}.Input__baseline{display:inline-block;color:rgba(0,0,0,0)}.Input__input{display:block;position:absolute;top:0;bottom:0;left:0;right:0;border:0;outline:0;width:100%;font-size:1em;line-height:1.4166666667em;height:1.4166666667em;margin:0;padding:0 .5em;font-family:Verdana,sans-serif;background-color:rgba(0,0,0,0);color:#fff;color:inherit}.Input__input:-ms-input-placeholder{font-style:italic;color:#777;color:rgba(255,255,255,.45)}.Input--monospace .Input__input{font-family:"Consolas",monospace}.Knob{position:relative;font-size:1rem;width:2.6em;height:2.6em;margin:0 auto;margin-bottom:-0.2em;cursor:n-resize}.Knob:after{content:".";color:rgba(0,0,0,0);line-height:2.5em}.Knob__circle{position:absolute;top:.1em;bottom:.1em;left:.1em;right:.1em;margin:.3em;background-color:#333;background-image:linear-gradient(to bottom, rgba(255, 255, 255, 0.15) 0%, rgba(255, 255, 255, 0) 100%);border-radius:50%;box-shadow:0 .05em .5em 0 rgba(0,0,0,.5)}.Knob__cursorBox{position:absolute;top:0;bottom:0;left:0;right:0}.Knob__cursor{position:relative;top:.05em;margin:0 auto;width:.2em;height:.8em;background-color:rgba(255,255,255,.9)}.Knob__popupValue{position:absolute;top:-2rem;right:50%;font-size:1rem;text-align:center;padding:.25rem .5rem;color:#fff;background-color:#000;transform:translateX(50%);white-space:nowrap}.Knob__ring{position:absolute;top:0;bottom:0;left:0;right:0;padding:.1em}.Knob__ringTrackPivot{transform:rotateZ(135deg)}.Knob__ringTrack{fill:rgba(0,0,0,0);stroke:rgba(255,255,255,.1);stroke-width:8;stroke-linecap:round;stroke-dasharray:235.62}.Knob__ringFillPivot{transform:rotateZ(135deg)}.Knob--bipolar .Knob__ringFillPivot{transform:rotateZ(270deg)}.Knob__ringFill{fill:rgba(0,0,0,0);stroke:#6a96c9;stroke-width:8;stroke-linecap:round;stroke-dasharray:314.16;transition:stroke 50ms ease-out}.Knob--color--black .Knob__ringFill{stroke:#1a1a1a}.Knob--color--white .Knob__ringFill{stroke:#fff}.Knob--color--red .Knob__ringFill{stroke:#df3e3e}.Knob--color--orange .Knob__ringFill{stroke:#f37f33}.Knob--color--yellow .Knob__ringFill{stroke:#fbda21}.Knob--color--olive .Knob__ringFill{stroke:#cbe41c}.Knob--color--green .Knob__ringFill{stroke:#25ca4c}.Knob--color--teal .Knob__ringFill{stroke:#00d6cc}.Knob--color--blue .Knob__ringFill{stroke:#2e93de}.Knob--color--dark-blue .Knob__ringFill{stroke:#005fa7}.Knob--color--violet .Knob__ringFill{stroke:#7349cf}.Knob--color--purple .Knob__ringFill{stroke:#ad45d0}.Knob--color--pink .Knob__ringFill{stroke:#e34da1}.Knob--color--brown .Knob__ringFill{stroke:#b97447}.Knob--color--grey .Knob__ringFill{stroke:#848484}.Knob--color--light-grey .Knob__ringFill{stroke:#b3b3b3}.Knob--color--good .Knob__ringFill{stroke:#68c22d}.Knob--color--average .Knob__ringFill{stroke:#f29a29}.Knob--color--bad .Knob__ringFill{stroke:#df3e3e}.Knob--color--label .Knob__ringFill{stroke:#8b9bb0}.Knob--color--xeno .Knob__ringFill{stroke:#664573}.LabeledList{display:table;width:100%;width:calc(100% + 1em);border-collapse:collapse;border-spacing:0;margin:-0.25em -0.5em;margin-bottom:0;padding:0}.LabeledList__row{display:table-row}.LabeledList__row:last-child .LabeledList__cell{padding-bottom:0}.LabeledList__cell{display:table-cell;margin:0;padding:.25em .5em;border:0;text-align:left}.LabeledList__label--nowrap{width:1%;white-space:nowrap;min-width:5em}.LabeledList__buttons{width:.1%;white-space:nowrap;text-align:right;padding-top:.0833333333em;padding-bottom:0}.Modal{background-color:#202020;max-width:calc(100% - 1rem);padding:1rem}.NoticeBox{padding:.33em .5em;margin-bottom:.5em;box-shadow:none;font-weight:bold;font-style:italic;color:#000;background-color:#bb9b68;background-image:repeating-linear-gradient(-45deg, transparent, transparent 0.8333333333em, rgba(0, 0, 0, 0.1) 0.8333333333em, rgba(0, 0, 0, 0.1) 1.6666666667em)}.NoticeBox--color--black{color:#fff;background-color:#000}.NoticeBox--color--white{color:#000;background-color:#b3b3b3}.NoticeBox--color--red{color:#fff;background-color:#701f1f}.NoticeBox--color--orange{color:#fff;background-color:#854114}.NoticeBox--color--yellow{color:#000;background-color:#83710d}.NoticeBox--color--olive{color:#000;background-color:#576015}.NoticeBox--color--green{color:#fff;background-color:#174e24}.NoticeBox--color--teal{color:#fff;background-color:#064845}.NoticeBox--color--blue{color:#fff;background-color:#1b4565}.NoticeBox--color--dark-blue{color:#fff;background-color:#02121f}.NoticeBox--color--violet{color:#fff;background-color:#3b2864}.NoticeBox--color--purple{color:#fff;background-color:#542663}.NoticeBox--color--pink{color:#fff;background-color:#802257}.NoticeBox--color--brown{color:#fff;background-color:#4c3729}.NoticeBox--color--grey{color:#fff;background-color:#3e3e3e}.NoticeBox--color--light-grey{color:#fff;background-color:#6a6a6a}.NoticeBox--color--good{color:#fff;background-color:#2e4b1a}.NoticeBox--color--average{color:#fff;background-color:#7b4e13}.NoticeBox--color--bad{color:#fff;background-color:#701f1f}.NoticeBox--color--label{color:#fff;background-color:#53565a}.NoticeBox--color--xeno{color:#fff;background-color:#19161b}.NoticeBox--type--info{color:#fff;background-color:#235982}.NoticeBox--type--success{color:#fff;background-color:#1e662f}.NoticeBox--type--warning{color:#fff;background-color:#a95219}.NoticeBox--type--danger{color:#fff;background-color:#8f2828}.Input{position:relative;display:inline-block;width:10em;border:.0833333333em solid #88bfff;border:.0833333333em solid rgba(136,191,255,.75);border-radius:.16em;color:#fff;background-color:#0a0a0a;padding:0 .3333333333em;margin-right:.1666666667em;line-height:1.4166666667em;overflow:visible}.Input--fluid{display:block;width:auto}.Input__baseline{display:inline-block;color:rgba(0,0,0,0)}.Input__input{display:block;position:absolute;top:0;bottom:0;left:0;right:0;border:0;outline:0;width:100%;font-size:1em;line-height:1.4166666667em;height:1.4166666667em;margin:0;padding:0 .5em;font-family:Verdana,sans-serif;background-color:rgba(0,0,0,0);color:#fff;color:inherit}.Input__input:-ms-input-placeholder{font-style:italic;color:#777;color:rgba(255,255,255,.45)}.Input--monospace .Input__input{font-family:"Consolas",monospace}.NumberInput{position:relative;display:inline-block;border:.0833333333em solid #88bfff;border:.0833333333em solid rgba(136,191,255,.75);border-radius:.16em;color:#88bfff;background-color:#0a0a0a;padding:0 .3333333333em;margin-right:.1666666667em;line-height:1.4166666667em;text-align:right;overflow:visible;cursor:n-resize}.NumberInput--fluid{display:block}.NumberInput__content{margin-left:.5em}.NumberInput__barContainer{position:absolute;top:.1666666667em;bottom:.1666666667em;left:.1666666667em}.NumberInput__bar{position:absolute;bottom:0;left:0;width:.25em;box-sizing:border-box;border-bottom:.0833333333em solid #88bfff;background-color:#88bfff}.NumberInput__input{display:block;position:absolute;top:0;bottom:0;left:0;right:0;border:0;outline:0;width:100%;font-size:1em;line-height:1.4166666667em;height:1.4166666667em;margin:0;padding:0 .5em;font-family:Verdana,sans-serif;background-color:#0a0a0a;color:#fff;text-align:right}.ProgressBar{display:inline-block;position:relative;width:100%;padding:0 .5em;border-width:.0833333333em !important;border-style:solid !important;border-radius:.16em;background-color:rgba(0,0,0,0);transition:border-color 900ms ease-out}.ProgressBar__fill{position:absolute;top:-0.5px;left:0px;bottom:-0.5px}.ProgressBar__fill--animated{transition:background-color 900ms ease-out,width 900ms ease-out}.ProgressBar__content{position:relative;line-height:1.4166666667em;width:100%;text-align:right}.ProgressBar--color--default{border:.0833333333em solid #3e6189}.ProgressBar--color--default .ProgressBar__fill{background-color:#3e6189}.ProgressBar--color--black{border-color:#000 !important}.ProgressBar--color--black .ProgressBar__fill{background-color:#000}.ProgressBar--color--white{border-color:#d9d9d9 !important}.ProgressBar--color--white .ProgressBar__fill{background-color:#d9d9d9}.ProgressBar--color--red{border-color:#bd2020 !important}.ProgressBar--color--red .ProgressBar__fill{background-color:#bd2020}.ProgressBar--color--orange{border-color:#d95e0c !important}.ProgressBar--color--orange .ProgressBar__fill{background-color:#d95e0c}.ProgressBar--color--yellow{border-color:#d9b804 !important}.ProgressBar--color--yellow .ProgressBar__fill{background-color:#d9b804}.ProgressBar--color--olive{border-color:#9aad14 !important}.ProgressBar--color--olive .ProgressBar__fill{background-color:#9aad14}.ProgressBar--color--green{border-color:#1b9638 !important}.ProgressBar--color--green .ProgressBar__fill{background-color:#1b9638}.ProgressBar--color--teal{border-color:#009a93 !important}.ProgressBar--color--teal .ProgressBar__fill{background-color:#009a93}.ProgressBar--color--blue{border-color:#1c71b1 !important}.ProgressBar--color--blue .ProgressBar__fill{background-color:#1c71b1}.ProgressBar--color--dark-blue{border-color:#003e6e !important}.ProgressBar--color--dark-blue .ProgressBar__fill{background-color:#003e6e}.ProgressBar--color--violet{border-color:#552dab !important}.ProgressBar--color--violet .ProgressBar__fill{background-color:#552dab}.ProgressBar--color--purple{border-color:#8b2baa !important}.ProgressBar--color--purple .ProgressBar__fill{background-color:#8b2baa}.ProgressBar--color--pink{border-color:#cf2082 !important}.ProgressBar--color--pink .ProgressBar__fill{background-color:#cf2082}.ProgressBar--color--brown{border-color:#8c5836 !important}.ProgressBar--color--brown .ProgressBar__fill{background-color:#8c5836}.ProgressBar--color--grey{border-color:#646464 !important}.ProgressBar--color--grey .ProgressBar__fill{background-color:#646464}.ProgressBar--color--light-grey{border-color:#919191 !important}.ProgressBar--color--light-grey .ProgressBar__fill{background-color:#919191}.ProgressBar--color--good{border-color:#4d9121 !important}.ProgressBar--color--good .ProgressBar__fill{background-color:#4d9121}.ProgressBar--color--average{border-color:#cd7a0d !important}.ProgressBar--color--average .ProgressBar__fill{background-color:#cd7a0d}.ProgressBar--color--bad{border-color:#bd2020 !important}.ProgressBar--color--bad .ProgressBar__fill{background-color:#bd2020}.ProgressBar--color--label{border-color:#657a94 !important}.ProgressBar--color--label .ProgressBar__fill{background-color:#657a94}.ProgressBar--color--xeno{border-color:#462f4e !important}.ProgressBar--color--xeno .ProgressBar__fill{background-color:#462f4e}.Section{position:relative;margin-bottom:.5em;background-color:#131313;background-color:#131313;box-sizing:border-box}.Section:last-child{margin-bottom:0}.Section__title{position:relative;padding:.5em;border-bottom:.1666666667em solid #4972a1}.Section__titleText{font-size:1.1666666667em;font-weight:bold;color:#fff}.Section__buttons{position:absolute;display:inline-block;right:.5em;margin-top:-.0833333333em}.Section__rest{position:relative}.Section__content{padding:.66em .5em}.Section--fitted>.Section__rest>.Section__content{padding:0}.Section--fill{display:flex;flex-direction:column;height:100%}.Section--fill>.Section__rest{flex-grow:1}.Section--fill>.Section__rest>.Section__content{height:100%}.Section--fill.Section--scrollable>.Section__rest>.Section__content{position:absolute;top:0;left:0;right:0;bottom:0}.Section--fill.Section--iefix{display:table !important;width:100% !important;height:100% !important;border-collapse:collapse;border-spacing:0}.Section--fill.Section--iefix>.Section__rest{display:table-row !important;height:100% !important}.Section--scrollable{overflow-x:hidden;overflow-y:hidden}.Section--scrollable>.Section__rest>.Section__content{overflow-y:scroll;overflow-x:hidden}.Section--scrollableHorizontal{overflow-x:hidden;overflow-y:hidden}.Section--scrollableHorizontal>.Section__rest>.Section__content{overflow-y:hidden;overflow-x:scroll}.Section--scrollable.Section--scrollableHorizontal{overflow-x:hidden;overflow-y:hidden}.Section--scrollable.Section--scrollableHorizontal>.Section__rest>.Section__content{overflow-y:scroll;overflow-x:scroll}.Section .Section{background-color:rgba(0,0,0,0);margin-left:-0.5em;margin-right:-0.5em}.Section .Section:first-child{margin-top:-0.5em}.Section .Section .Section__titleText{font-size:1.0833333333em}.Section .Section .Section .Section__titleText{font-size:1em}.Slider{cursor:e-resize}.Slider__cursorOffset{position:absolute;top:0;left:0;bottom:0;transition:none !important}.Slider__cursor{position:absolute;top:0;right:-.0833333333em;bottom:0;width:0;border-left:.1666666667em solid #fff}.Slider__pointer{position:absolute;right:-.4166666667em;bottom:-.3333333333em;width:0;height:0;border-left:.4166666667em solid rgba(0,0,0,0);border-right:.4166666667em solid rgba(0,0,0,0);border-bottom:.4166666667em solid #fff}.Slider__popupValue{position:absolute;right:0;top:-2rem;font-size:1rem;padding:.25rem .5rem;color:#fff;background-color:#000;transform:translateX(50%);white-space:nowrap}.Divider--horizontal{margin:.5em 0}.Divider--horizontal:not(.Divider--hidden){border-top:.1666666667em solid rgba(255,255,255,.1)}.Divider--vertical{height:100%;margin:0 .5em}.Divider--vertical:not(.Divider--hidden){border-left:.1666666667em solid rgba(255,255,255,.1)}.Stack--fill{height:100%}.Stack--horizontal>.Stack__item{margin-left:.5em}.Stack--horizontal>.Stack__item:first-child{margin-left:0}.Stack--vertical>.Stack__item{margin-top:.5em}.Stack--vertical>.Stack__item:first-child{margin-top:0}.Stack--horizontal>.Stack__divider:not(.Stack__divider--hidden){border-left:.1666666667em solid rgba(255,255,255,.1)}.Stack--vertical>.Stack__divider:not(.Stack__divider--hidden){border-top:.1666666667em solid rgba(255,255,255,.1)}.Table{display:table;width:100%;border-collapse:collapse;border-spacing:0;margin:0}.Table--collapsing{width:auto}.Table__row{display:table-row}.Table__cell{display:table-cell;padding:0 .25em}.Table__cell:first-child{padding-left:0}.Table__cell:last-child{padding-right:0}.Table__row--header .Table__cell,.Table__cell--header{font-weight:bold;padding-bottom:.5em}.Table__cell--collapsing{width:1%;white-space:nowrap}.Tabs{display:flex;align-items:stretch;overflow:hidden;background-color:#131313}.Tabs--fill{height:100%}.Section .Tabs{background-color:rgba(0,0,0,0)}.Section:not(.Section--fitted) .Tabs{margin:0 -0.5em .5em}.Section:not(.Section--fitted) .Tabs:first-child{margin-top:-0.5em}.Tabs--vertical{flex-direction:column;padding:.25em 0 .25em .25em}.Tabs--horizontal{margin-bottom:.5em;padding:.25em .25em 0 .25em}.Tabs--horizontal:last-child{margin-bottom:0}.Tabs__Tab{flex-grow:0}.Tabs--fluid .Tabs__Tab{flex-grow:1}.Tab{display:flex;align-items:center;justify-content:space-between;background-color:rgba(0,0,0,0);color:rgba(255,255,255,.5);min-height:2.25em;min-width:4em}.Tab:not(.Tab--selected):hover{background-color:rgba(255,255,255,.075)}.Tab--selected{background-color:rgba(255,255,255,.125);color:#dfe7f0}.Tab__text{flex-grow:1;margin:0 .5em}.Tab__left{min-width:1.5em;text-align:center;margin-left:.25em}.Tab__right{min-width:1.5em;text-align:center;margin-right:.25em}.Tabs--horizontal .Tab{border-top:.1666666667em solid rgba(0,0,0,0);border-bottom:.1666666667em solid rgba(0,0,0,0);border-top-left-radius:.25em;border-top-right-radius:.25em}.Tabs--horizontal .Tab--selected{border-bottom:.1666666667em solid #d4dfec}.Tabs--vertical .Tab{min-height:2em;border-left:.1666666667em solid rgba(0,0,0,0);border-right:.1666666667em solid rgba(0,0,0,0);border-top-left-radius:.25em;border-bottom-left-radius:.25em}.Tabs--vertical .Tab--selected{border-right:.1666666667em solid #d4dfec}.Tab--selected.Tab--color--black{color:#535353}.Tabs--horizontal .Tab--selected.Tab--color--black{border-bottom-color:#1a1a1a}.Tabs--vertical .Tab--selected.Tab--color--black{border-right-color:#1a1a1a}.Tab--selected.Tab--color--white{color:#fff}.Tabs--horizontal .Tab--selected.Tab--color--white{border-bottom-color:#fff}.Tabs--vertical .Tab--selected.Tab--color--white{border-right-color:#fff}.Tab--selected.Tab--color--red{color:#e76e6e}.Tabs--horizontal .Tab--selected.Tab--color--red{border-bottom-color:#df3e3e}.Tabs--vertical .Tab--selected.Tab--color--red{border-right-color:#df3e3e}.Tab--selected.Tab--color--orange{color:#f69f66}.Tabs--horizontal .Tab--selected.Tab--color--orange{border-bottom-color:#f37f33}.Tabs--vertical .Tab--selected.Tab--color--orange{border-right-color:#f37f33}.Tab--selected.Tab--color--yellow{color:#fce358}.Tabs--horizontal .Tab--selected.Tab--color--yellow{border-bottom-color:#fbda21}.Tabs--vertical .Tab--selected.Tab--color--yellow{border-right-color:#fbda21}.Tab--selected.Tab--color--olive{color:#d8eb55}.Tabs--horizontal .Tab--selected.Tab--color--olive{border-bottom-color:#cbe41c}.Tabs--vertical .Tab--selected.Tab--color--olive{border-right-color:#cbe41c}.Tab--selected.Tab--color--green{color:#53e074}.Tabs--horizontal .Tab--selected.Tab--color--green{border-bottom-color:#25ca4c}.Tabs--vertical .Tab--selected.Tab--color--green{border-right-color:#25ca4c}.Tab--selected.Tab--color--teal{color:#21fff5}.Tabs--horizontal .Tab--selected.Tab--color--teal{border-bottom-color:#00d6cc}.Tabs--vertical .Tab--selected.Tab--color--teal{border-right-color:#00d6cc}.Tab--selected.Tab--color--blue{color:#62aee6}.Tabs--horizontal .Tab--selected.Tab--color--blue{border-bottom-color:#2e93de}.Tabs--vertical .Tab--selected.Tab--color--blue{border-right-color:#2e93de}.Tab--selected.Tab--color--dark-blue{color:#008ffd}.Tabs--horizontal .Tab--selected.Tab--color--dark-blue{border-bottom-color:#005fa7}.Tabs--vertical .Tab--selected.Tab--color--dark-blue{border-right-color:#005fa7}.Tab--selected.Tab--color--violet{color:#9676db}.Tabs--horizontal .Tab--selected.Tab--color--violet{border-bottom-color:#7349cf}.Tabs--vertical .Tab--selected.Tab--color--violet{border-right-color:#7349cf}.Tab--selected.Tab--color--purple{color:#c274db}.Tabs--horizontal .Tab--selected.Tab--color--purple{border-bottom-color:#ad45d0}.Tabs--vertical .Tab--selected.Tab--color--purple{border-right-color:#ad45d0}.Tab--selected.Tab--color--pink{color:#ea79b9}.Tabs--horizontal .Tab--selected.Tab--color--pink{border-bottom-color:#e34da1}.Tabs--vertical .Tab--selected.Tab--color--pink{border-right-color:#e34da1}.Tab--selected.Tab--color--brown{color:#ca9775}.Tabs--horizontal .Tab--selected.Tab--color--brown{border-bottom-color:#b97447}.Tabs--vertical .Tab--selected.Tab--color--brown{border-right-color:#b97447}.Tab--selected.Tab--color--grey{color:#a3a3a3}.Tabs--horizontal .Tab--selected.Tab--color--grey{border-bottom-color:#848484}.Tabs--vertical .Tab--selected.Tab--color--grey{border-right-color:#848484}.Tab--selected.Tab--color--light-grey{color:#c6c6c6}.Tabs--horizontal .Tab--selected.Tab--color--light-grey{border-bottom-color:#b3b3b3}.Tabs--vertical .Tab--selected.Tab--color--light-grey{border-right-color:#b3b3b3}.Tab--selected.Tab--color--good{color:#8cd95a}.Tabs--horizontal .Tab--selected.Tab--color--good{border-bottom-color:#68c22d}.Tabs--vertical .Tab--selected.Tab--color--good{border-right-color:#68c22d}.Tab--selected.Tab--color--average{color:#f5b35e}.Tabs--horizontal .Tab--selected.Tab--color--average{border-bottom-color:#f29a29}.Tabs--vertical .Tab--selected.Tab--color--average{border-right-color:#f29a29}.Tab--selected.Tab--color--bad{color:#e76e6e}.Tabs--horizontal .Tab--selected.Tab--color--bad{border-bottom-color:#df3e3e}.Tabs--vertical .Tab--selected.Tab--color--bad{border-right-color:#df3e3e}.Tab--selected.Tab--color--label{color:#a8b4c4}.Tabs--horizontal .Tab--selected.Tab--color--label{border-bottom-color:#8b9bb0}.Tabs--vertical .Tab--selected.Tab--color--label{border-right-color:#8b9bb0}.Tab--selected.Tab--color--xeno{color:#9366a3}.Tabs--horizontal .Tab--selected.Tab--color--xeno{border-bottom-color:#664573}.Tabs--vertical .Tab--selected.Tab--color--xeno{border-right-color:#664573}.Input{position:relative;display:inline-block;width:10em;border:.0833333333em solid #88bfff;border:.0833333333em solid rgba(136,191,255,.75);border-radius:.16em;color:#fff;background-color:#0a0a0a;padding:0 .3333333333em;margin-right:.1666666667em;line-height:1.4166666667em;overflow:visible}.Input--fluid{display:block;width:auto}.Input__baseline{display:inline-block;color:rgba(0,0,0,0)}.Input__input{display:block;position:absolute;top:0;bottom:0;left:0;right:0;border:0;outline:0;width:100%;font-size:1em;line-height:1.4166666667em;height:1.4166666667em;margin:0;padding:0 .5em;font-family:Verdana,sans-serif;background-color:rgba(0,0,0,0);color:#fff;color:inherit}.Input__input:-ms-input-placeholder{font-style:italic;color:#777;color:rgba(255,255,255,.45)}.Input--monospace .Input__input{font-family:"Consolas",monospace}.TextArea{position:relative;display:inline-block;border:.0833333333em solid #88bfff;border:.0833333333em solid rgba(136,191,255,.75);border-radius:.16em;background-color:#0a0a0a;margin-right:.1666666667em;line-height:1.4166666667em;box-sizing:border-box;width:100%}.TextArea--fluid{display:block;width:auto;height:auto}.TextArea--noborder{border:0px}.TextArea__textarea.TextArea__textarea--scrollable{overflow:auto;overflow-x:hidden;overflow-y:scroll}.TextArea__textarea{display:block;position:absolute;top:0;bottom:0;left:0;right:0;border:0;outline:0;width:100%;height:100%;font-size:1em;line-height:1.4166666667em;min-height:1.4166666667em;margin:0;padding:0 .5em;font-family:inherit;background-color:rgba(0,0,0,0);color:inherit;box-sizing:border-box;word-wrap:break-word;overflow:hidden}.TextArea__textarea:-ms-input-placeholder{font-style:italic;color:#777;color:rgba(255,255,255,.45)}.TextArea__textarea_custom{overflow:visible;white-space:pre-wrap}.Tooltip{z-index:2;padding:.5em .75em;pointer-events:none;text-align:left;transition:opacity 150ms ease-out;background-color:#000;color:#fff;box-shadow:.1em .1em 1.25em -0.1em rgba(0,0,0,.5);border-radius:.16em;max-width:20.8333333333em}.Chat{color:#abc6ec}.Chat__badge{display:inline-block;min-width:.5em;font-size:.7em;padding:.2em .3em;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:middle;background-color:crimson;border-radius:10px;transition:font-size 200ms ease-out}.Chat__badge:before{content:"x"}.Chat__badge--animate{font-size:.9em;transition:font-size 0ms}.Chat__scrollButton{position:fixed;right:2em;bottom:1em}.Chat__reconnected{font-size:.85em;text-align:center;margin:1em 0 2em}.Chat__reconnected:before{content:"Reconnected";display:inline-block;border-radius:1em;padding:0 .7em;color:#db2828;background-color:#131313}.Chat__reconnected:after{content:"";display:block;margin-top:-0.75em;border-bottom:.1666666667em solid #db2828}.Chat__highlight{color:#000}.Chat__highlight--restricted{color:#fff;background-color:#a00;font-weight:bold}.ChatMessage{word-wrap:break-word}.ChatMessage--highlighted{position:relative;border-left:.1666666667em solid #fd4;padding-left:.5em}.ChatMessage--highlighted:after{content:"";position:absolute;top:0;bottom:0;left:0;right:0;background-color:rgba(255,221,68,.1);pointer-events:none}.Ping{position:relative;padding:.125em .25em;border:.0833333333em solid rgba(140,140,140,.5);border-radius:.25em;width:3.75em;text-align:right}.Ping__indicator{content:"";position:absolute;top:.5em;left:.5em;width:.5em;height:.5em;background-color:#888;border-radius:.25em}.Notifications{position:absolute;bottom:1em;left:1em;right:2em}.Notification{color:#fff;background-color:crimson;padding:.5em;margin:1em 0}.Notification:first-child{margin-top:0}.Notification:last-child{margin-bottom:0}.Layout,.Layout *{scrollbar-base-color:#181818;scrollbar-face-color:#363636;scrollbar-3dlight-color:#202020;scrollbar-highlight-color:#202020;scrollbar-track-color:#181818;scrollbar-arrow-color:#909090;scrollbar-shadow-color:#363636}.Layout__content{position:absolute;top:0;bottom:0;left:0;right:0;overflow-x:hidden;overflow-y:hidden}.Layout__content--scrollable{overflow-y:scroll;margin-bottom:0}.Window{position:fixed;top:0;bottom:0;left:0;right:0;color:#fff;background-color:#202020;background-image:linear-gradient(to bottom, #202020 0%, #202020 100%)}.Window__titleBar{position:fixed;z-index:1;top:0;left:0;width:100%;height:32px;height:2.6666666667rem}.Window__rest{position:fixed;top:32px;top:2.6666666667rem;bottom:0;left:0;right:0}.Window__contentPadding{margin:.5rem;height:100%;height:calc(100% - 1.01rem)}.Window__contentPadding:after{height:0}.Layout__content--scrollable .Window__contentPadding:after{display:block;content:"";height:.5rem}.Window__dimmer{position:fixed;top:0;bottom:0;left:0;right:0;background-color:rgba(56,56,56,.25);pointer-events:none}.Window__resizeHandle__se{position:fixed;bottom:0;right:0;width:20px;width:1.6666666667rem;height:20px;height:1.6666666667rem;cursor:se-resize}.Window__resizeHandle__s{position:fixed;bottom:0;left:0;right:0;height:6px;height:.5rem;cursor:s-resize}.Window__resizeHandle__e{position:fixed;top:0;bottom:0;right:0;width:3px;width:.25rem;cursor:e-resize}em{font-style:normal;font-weight:bold}img{margin:0;padding:0;line-height:1;-ms-interpolation-mode:nearest-neighbor;image-rendering:pixelated}img.icon{height:1em;min-height:16px;width:auto;vertical-align:bottom}a{color:#397ea5}a.visited{color:#7c00e6}a:visited{color:#7c00e6}a.popt{text-decoration:none}.popup{position:fixed;top:50%;left:50%;background:#ddd}.popup .close{position:absolute;background:#aaa;top:0;right:0;color:#333;text-decoration:none;z-index:2;padding:0 10px;height:30px;line-height:30px}.popup .close:hover{background:#999}.popup .head{background:#999;color:#ddd;padding:0 10px;height:30px;line-height:30px;text-transform:uppercase;font-size:.9em;font-weight:bold;border-bottom:2px solid green}.popup input{border:1px solid #999;background:#fff;margin:0;padding:5px;outline:none;color:#333}.popup input[type=text]:hover,.popup input[type=text]:active,.popup input[type=text]:focus{border-color:green}.popup input[type=submit]{padding:5px 10px;background:#999;color:#ddd;text-transform:uppercase;font-size:.9em;font-weight:bold}.popup input[type=submit]:hover,.popup input[type=submit]:focus,.popup input[type=submit]:active{background:#aaa;cursor:pointer}.changeFont{padding:10px}.changeFont a{display:block;text-decoration:none;padding:3px;color:#333}.changeFont a:hover{background:#ccc}.highlightPopup{padding:10px;text-align:center}.highlightPopup input[type=text]{display:block;width:215px;text-align:left;margin-top:5px}.highlightPopup input.highlightColor{background-color:#ff0}.highlightPopup input.highlightTermSubmit{margin-top:5px}.contextMenu{background-color:#ddd;position:fixed;margin:2px;width:150px}.contextMenu a{display:block;padding:2px 5px;text-decoration:none;color:#333}.contextMenu a:hover{background-color:#ccc}.filterMessages{padding:5px}.filterMessages div{padding:2px 0}.icon-stack{height:1em;line-height:1em;width:1em;vertical-align:middle;margin-top:-2px}.motd{color:#a4bad6;font-family:Verdana,sans-serif;white-space:normal}.motd h1,.motd h2,.motd h3,.motd h4,.motd h5,.motd h6{color:#a4bad6;text-decoration:underline}.motd a,.motd a:link,.motd a:visited,.motd a:active,.motd a:hover{color:#a4bad6}.bold,.name,.prefix,.ooc,.looc,.adminooc,.admin,.niche,.medal,.yell{font-weight:bold}.italic,.italics{font-style:italic}.highlight{background:#ff0}h1,h2,h3,h4,h5,h6{color:#a4bad6;font-family:Georgia,Verdana,sans-serif}h1.alert,h2.alert{color:#a4bad6}em{font-style:normal;font-weight:bold}.ooc{font-weight:bold}.adminobserverooc{color:#09c;font-weight:bold}.adminooc{color:#3d5bc3;font-weight:bold}.adminsay{color:#9611d4;font-weight:bold}.admin{color:#5975da;font-weight:bold}.niche{color:#5975da;font-weight:bold}.name{font-weight:bold}.deadsay{color:#e2c1ff}.binarysay{color:#1e90ff}.binarysay a{color:lime}.binarysay a:active,.binarysay a:visited{color:#8f8}.radio{color:#1ecc43}.sciradio{color:#c68cfa}.comradio{color:#fcdf03}.secradio{color:#dd3535}.medradio{color:#57b8f0}.engradio{color:#f37746}.suppradio{color:#b88646}.servradio{color:#6ca729}.syndradio{color:#8f4a4b}.gangradio{color:#ac2ea1}.centcomradio{color:#2681a5}.aiprivradio{color:#d65d95}.redteamradio{color:#f44}.blueteamradio{color:#3434fd}.greenteamradio{color:#34fd34}.yellowteamradio{color:#fdfd34}.yell{font-weight:bold}.alert{color:#d82020}.userdanger{color:#c51e1e;font-weight:bold;font-size:185%}.bolddanger{color:#c51e1e;font-weight:bold}.danger{color:#c51e1e}.warning{color:#c51e1e;font-style:italic}.alertwarning{color:red;font-weight:bold}.boldwarning{color:#c51e1e;font-style:italic;font-weight:bold}.announce{color:#c51e1e;font-weight:bold}.boldannounce{color:#c51e1e;font-weight:bold}.bigannounce{font-weight:bold;font-size:115%}.greenannounce{color:#059223;font-weight:bold}.rose{color:#ff5050}.info{color:#9ab0ff}.notice{color:#6685f5}.staff_ic{color:#6685f5}.tinynotice{color:#6685f5;font-size:85%}.tinynoticeital{color:#6685f5;font-style:italic;font-size:85%}.smallnotice{color:#6685f5;font-size:90%}.smallnoticeital{color:#6685f5;font-style:italic;font-size:90%}.boldnotice{color:#6685f5;font-weight:bold}.hear{color:#6685f5;font-style:italic}.adminnotice{color:#6685f5}.adminhelp{color:red;font-weight:bold}.unconscious{color:#a4bad6;font-weight:bold}.suicide{color:#ff5050;font-style:italic}.green{color:#059223}.grey{color:#838383}.red{color:red}.blue{color:#215cff}.nicegreen{color:#059223}.boldnicegreen{color:#059223;font-weight:bold}.cult{color:#973e3b}.cultitalic{color:#973e3b;font-style:italic}.cultbold{color:#973e3b;font-style:italic;font-weight:bold}.cultboldtalic{color:#973e3b;font-weight:bold;font-size:185%}.cultlarge{color:#973e3b;font-weight:bold;font-size:185%}.narsie{color:#973e3b;font-weight:bold;font-size:925%}.narsiesmall{color:#973e3b;font-weight:bold;font-size:370%}.colossus{color:#7f282a;font-size:310%}.hierophant{color:#b441ee;font-weight:bold;font-style:italic}.hierophant_warning{color:#c56bf1;font-style:italic}.purple{color:#9956d3}.holoparasite{color:#88809c}.revennotice{color:#c099e2}.revenboldnotice{color:#c099e2;font-weight:bold}.revenbignotice{color:#c099e2;font-weight:bold;font-size:185%}.revenminor{color:#823abb}.revenwarning{color:#760fbb;font-style:italic}.revendanger{color:#760fbb;font-weight:bold;font-size:185%}.deconversion_message{color:#a947ff;font-size:185%;font-style:italic}.ghostalert{color:#60f;font-style:italic;font-weight:bold}.alien{color:#855d85}.noticealien{color:#059223}.alertalien{color:#059223;font-weight:bold}.changeling{color:#059223;font-style:italic}.alertsyndie{color:red;font-size:185%;font-weight:bold}.spider{color:#80f;font-weight:bold;font-size:185%}.interface{color:#750e75}.sans{font-family:"Comic Sans MS",cursive,sans-serif}.papyrus{font-family:"Papyrus",cursive,sans-serif}.robot{font-family:"Courier New",cursive,sans-serif}.tape_recorder{color:red;font-family:"Courier New",cursive,sans-serif}.command_headset{font-weight:bold;font-size:160%}.small{font-size:60%}.big{font-size:185%}.reallybig{font-size:245%}.extremelybig{font-size:310%}.greentext{color:#059223;font-size:185%}.redtext{color:#c51e1e;font-size:185%}.clown{color:#ff70c1;font-size:160%;font-family:"Comic Sans MS",cursive,sans-serif;font-weight:bold}.singing{font-family:"Trebuchet MS",cursive,sans-serif;font-style:italic}.his_grace{color:#15d512;font-family:"Courier New",cursive,sans-serif;font-style:italic}.hypnophrase{color:#202020;font-weight:bold;animation:hypnocolor 1500ms infinite;animation-direction:alternate}@keyframes hypnocolor{0%{color:#202020}25%{color:#4b02ac}50%{color:#9f41f1}75%{color:#541c9c}100%{color:#7adbf3}}.phobia{color:#d00;font-weight:bold;animation:phobia 750ms infinite}@keyframes phobia{0%{color:#f75a5a}50%{color:#d00}100%{color:#f75a5a}}.icon{height:1em;width:auto}.bigicon{font-size:2.5em}.memo{color:#638500;text-align:center}.memoedit{text-align:center;font-size:125%}.abductor{color:#c204c2;font-style:italic}.mind_control{color:#df3da9;font-size:100%;font-weight:bold;font-style:italic}.slime{color:#00ced1}.drone{color:#848482}.monkey{color:#975032}.swarmer{color:#2c75ff}.resonate{color:#298f85}.monkeyhive{color:#a56408}.monkeylead{color:#af6805;font-size:80%}.connectionClosed,.fatalError{background:red;color:#fff;padding:5px}.connectionClosed.restored{background:green}.internal.boldnshit{color:#3d5bc3;font-weight:bold}.text-normal{font-weight:normal;font-style:normal}.hidden{display:none;visibility:hidden}.ml-1{margin-left:1em}.ml-2{margin-left:2em}.ml-3{margin-left:3em}.xooc{color:#ac04e9;font-weight:bold;font-size:140%}.mooc{color:#090;font-weight:bold;font-size:140%}.yooc{color:#999600;font-weight:bold;font-size:140%}.headminsay{color:#653d78;font-weight:bold}.radio{color:#b4b4b4}.deptradio{color:#939}.comradio{color:#779cc2}.centradio{color:#5c5c8a}.hcradio{color:#318779}.pvstradio{color:#9b0612}.cryoradio{color:#ad6d48}.airadio{color:#f0f}.secradio{color:#a52929}.engradio{color:#a66300}.sentryradio{color:#844300}.medradio{color:#008160}.supradio{color:#ba8e41}.jtacradio{color:#ad3b98}.intelradio{color:#027d02}.wyradio{color:#fe9b24}.pmcradio{color:#4dc5ce}.vairadio{color:#e3580e}.rmcradio{color:#e3580e}.cmbradio{color:#1b748c}.clfradio{color:#8e83ca}.alpharadio{color:#db2626}.bravoradio{color:#c68610}.charlieradio{color:#a5a}.deltaradio{color:#007fcf}.echoradio{color:#3eb489}.medium{font-size:110%}.big{font-size:115%}.large{font-size:125%}.extra_large{font-size:130%}.huge{font-size:150%}.underline{text-decoration:underline}.orange{color:#eca100}.normal{font-style:normal}.attack{color:#ff3838}.moderate{color:#c00}.disarm{color:#900}.passive{color:#600}.helpful{color:#368f31}.scanner{color:#ff3838}.scannerb{color:#ff3838;font-weight:bold}.scannerburn{color:orange}.scannerburnb{color:orange;font-weight:bold}.rose{color:#ff5050}.debuginfo{color:#493d26;font-style:italic}.xenonotice{color:#51a16c}.xenoboldnotice{color:#51a16c;font-weight:bold}.xenowarning{color:#51a16c;font-style:italic}.xenominorwarning{color:#51a16c;font-weight:bold;font-style:italic}.xenodanger{color:#51a16c;font-weight:bold}.avoidharm{color:#72a0e5;font-weight:bold}.highdanger{color:#ff3838;font-weight:bold;font-size:140%}.xenohighdanger{color:#51a16c;font-weight:bold;font-size:140%}.xenoannounce{color:#65c585;font-family:book-antiqua;font-weight:bold;font-size:140%}.yautjabold{color:purple;font-weight:bold}.yautjaboldbig{color:purple;font-weight:bold;font-size:120%}.objectivebig{font-weight:bold;font-size:130%}.objectivegreen{color:lime}.objectivered{color:red}.objectivesuccess{color:lime;font-weight:bold;font-size:110%}.objectivefail{color:red;font-weight:bold;font-size:110%}.xenotalk,.xeno{color:#c048c0;font-style:italic}.xenoleader{color:#996e99;font-style:italic;font-size:125%}.xenoqueen{color:#996e99;font-style:italic;font-weight:bold;font-size:125%}.newscaster{color:maroon}.role_header{color:#e92d2d;display:block;text-align:center;font-weight:bold;font-family:trebuchet-ms;font-size:150%}.role_body{color:#3a3ae9;display:block;text-align:center;font-size:125%}.round_header{color:#e92d2d;display:block;text-align:center;font-family:courier;font-weight:bold;font-size:180%}.round_body{color:#c5c5c5;display:block;text-align:center;font-family:trebuchet-ms;font-weight:bold;font-size:125%}.event_announcement{color:#600d48;font-family:arial-narrow;font-weight:bold;font-size:125%}.announce_header{color:#cecece;font-weight:bold;font-size:150%}.announce_header_blue{color:#7575f3;font-weight:bold;font-size:150%}.announce_header_admin{color:#7575f3;font-weight:bold;font-size:150%}.announce_body{color:#e92d2d;font-weight:normal;font-size:125%}.centerbold{display:block;text-align:center;font-weight:bold}.mod{color:#917455;font-weight:bold}.modooc{color:#184880;font-weight:bold}.adminmod{color:#7c440c;font-weight:bold}.mentorsay{color:#d4af57;font-weight:bold}.mentorhelp{color:#090;font-weight:bold}.mentorbody{color:#da6200;font-weight:bold}.mentorstaff{color:#b5850d;font-weight:bold}.staffsay{color:#b5850d;font-weight:bold}.tajaran{color:#803b56}.tajaran_signlang{color:#941c1c}.skrell{color:#00ced1}.soghun{color:#228b22}.changeling{color:purple}.vox{color:#a0a}.monkey{color:#966c47}.german{color:#858f1e;font-family:"Times New Roman",Times,serif}.spanish{color:#cf982b}.japanese{color:#940927}.chinese{color:#fe1919}.zombie{color:#2dacb1;font-style:italic}.rough{font-family:trebuchet-ms,cursive,sans-serif}.commando{color:#fe9b24;font-style:bold}.say_quote{font-family:Georgia,Verdana,sans-serif}.admin .message{color:#314cad}.admin .prefix{font-weight:bolder}.pm{font-size:110%}.deadsay{color:#8b4dff}.retro_translator{font-weight:bold}.yautja_translator{color:#a00;font-weight:bold;animation:glitch .5s infinite}@keyframes glitch{25%{color:#a00;transform:translate(-2px, -1px)}50%{color:#be0000;transform:translate(1px, -2px)}75%{color:#8d0000;transform:translate(-1px, 2px)}100%{color:#830000;transform:translate(1px, 1px)}}.examine_block{background:#1b1c1e;border:1px solid #a4bad6;margin:.5em;padding:.5em .75em}.examine_block .icon{width:1.5em;height:1.5em;margin:0;padding:0}.tooltip{font-style:italic;border-bottom:1px dashed #fff}
-.theme-light .color-black{color:#000 !important}.theme-light .color-white{color:#e6e6e6 !important}.theme-light .color-red{color:#c82121 !important}.theme-light .color-orange{color:#e6630d !important}.theme-light .color-yellow{color:#e5c304 !important}.theme-light .color-olive{color:#a3b816 !important}.theme-light .color-green{color:#1d9f3b !important}.theme-light .color-teal{color:#00a39c !important}.theme-light .color-blue{color:#1e78bb !important}.theme-light .color-dark-blue{color:#004274 !important}.theme-light .color-violet{color:#5a30b5 !important}.theme-light .color-purple{color:#932eb4 !important}.theme-light .color-pink{color:#db228a !important}.theme-light .color-brown{color:#955d39 !important}.theme-light .color-grey{color:#e6e6e6 !important}.theme-light .color-light-grey{color:#999 !important}.theme-light .color-good{color:#529923 !important}.theme-light .color-average{color:#da810e !important}.theme-light .color-bad{color:#c82121 !important}.theme-light .color-label{color:#353535 !important}.theme-light .color-xeno{color:#4a3253 !important}.theme-light .color-bg-black{background-color:#000 !important}.theme-light .color-bg-white{background-color:#bfbfbf !important}.theme-light .color-bg-red{background-color:#a61c1c !important}.theme-light .color-bg-orange{background-color:#c0530b !important}.theme-light .color-bg-yellow{background-color:#bfa303 !important}.theme-light .color-bg-olive{background-color:#889912 !important}.theme-light .color-bg-green{background-color:#188532 !important}.theme-light .color-bg-teal{background-color:#008882 !important}.theme-light .color-bg-blue{background-color:#19649c !important}.theme-light .color-bg-dark-blue{background-color:#003761 !important}.theme-light .color-bg-violet{background-color:#4b2897 !important}.theme-light .color-bg-purple{background-color:#7a2696 !important}.theme-light .color-bg-pink{background-color:#b61d73 !important}.theme-light .color-bg-brown{background-color:#7c4d2f !important}.theme-light .color-bg-grey{background-color:#bfbfbf !important}.theme-light .color-bg-light-grey{background-color:gray !important}.theme-light .color-bg-good{background-color:#44801d !important}.theme-light .color-bg-average{background-color:#b56b0b !important}.theme-light .color-bg-bad{background-color:#a61c1c !important}.theme-light .color-bg-label{background-color:#2c2c2c !important}.theme-light .color-bg-xeno{background-color:#3e2945 !important}.theme-light .Tabs{display:flex;align-items:stretch;overflow:hidden;background-color:#fff}.theme-light .Tabs--fill{height:100%}.theme-light .Section .Tabs{background-color:rgba(0,0,0,0)}.theme-light .Section:not(.Section--fitted) .Tabs{margin:0 -0.5em .5em}.theme-light .Section:not(.Section--fitted) .Tabs:first-child{margin-top:-0.5em}.theme-light .Tabs--vertical{flex-direction:column;padding:.25em 0 .25em .25em}.theme-light .Tabs--horizontal{margin-bottom:.5em;padding:.25em .25em 0 .25em}.theme-light .Tabs--horizontal:last-child{margin-bottom:0}.theme-light .Tabs__Tab{flex-grow:0}.theme-light .Tabs--fluid .Tabs__Tab{flex-grow:1}.theme-light .Tab{display:flex;align-items:center;justify-content:space-between;background-color:rgba(0,0,0,0);color:rgba(0,0,0,.5);min-height:2.25em;min-width:4em}.theme-light .Tab:not(.Tab--selected):hover{background-color:rgba(255,255,255,.075)}.theme-light .Tab--selected{background-color:rgba(255,255,255,.125);color:#404040}.theme-light .Tab__text{flex-grow:1;margin:0 .5em}.theme-light .Tab__left{min-width:1.5em;text-align:center;margin-left:.25em}.theme-light .Tab__right{min-width:1.5em;text-align:center;margin-right:.25em}.theme-light .Tabs--horizontal .Tab{border-top:.1666666667em solid rgba(0,0,0,0);border-bottom:.1666666667em solid rgba(0,0,0,0);border-top-left-radius:.25em;border-top-right-radius:.25em}.theme-light .Tabs--horizontal .Tab--selected{border-bottom:.1666666667em solid #000}.theme-light .Tabs--vertical .Tab{min-height:2em;border-left:.1666666667em solid rgba(0,0,0,0);border-right:.1666666667em solid rgba(0,0,0,0);border-top-left-radius:.25em;border-bottom-left-radius:.25em}.theme-light .Tabs--vertical .Tab--selected{border-right:.1666666667em solid #000}.theme-light .Tab--selected.Tab--color--black{color:#404040}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--black{border-bottom-color:#000}.theme-light .Tabs--vertical .Tab--selected.Tab--color--black{border-right-color:#000}.theme-light .Tab--selected.Tab--color--white{color:#ececec}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--white{border-bottom-color:#e6e6e6}.theme-light .Tabs--vertical .Tab--selected.Tab--color--white{border-right-color:#e6e6e6}.theme-light .Tab--selected.Tab--color--red{color:#e14d4d}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--red{border-bottom-color:#c82121}.theme-light .Tabs--vertical .Tab--selected.Tab--color--red{border-right-color:#c82121}.theme-light .Tab--selected.Tab--color--orange{color:#f48942}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--orange{border-bottom-color:#e6630d}.theme-light .Tabs--vertical .Tab--selected.Tab--color--orange{border-right-color:#e6630d}.theme-light .Tab--selected.Tab--color--yellow{color:#fcdd33}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--yellow{border-bottom-color:#e5c304}.theme-light .Tabs--vertical .Tab--selected.Tab--color--yellow{border-right-color:#e5c304}.theme-light .Tab--selected.Tab--color--olive{color:#d0e732}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--olive{border-bottom-color:#a3b816}.theme-light .Tabs--vertical .Tab--selected.Tab--color--olive{border-right-color:#a3b816}.theme-light .Tab--selected.Tab--color--green{color:#33da5a}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--green{border-bottom-color:#1d9f3b}.theme-light .Tabs--vertical .Tab--selected.Tab--color--green{border-right-color:#1d9f3b}.theme-light .Tab--selected.Tab--color--teal{color:#00faef}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--teal{border-bottom-color:#00a39c}.theme-light .Tabs--vertical .Tab--selected.Tab--color--teal{border-right-color:#00a39c}.theme-light .Tab--selected.Tab--color--blue{color:#419ce1}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--blue{border-bottom-color:#1e78bb}.theme-light .Tabs--vertical .Tab--selected.Tab--color--blue{border-right-color:#1e78bb}.theme-light .Tab--selected.Tab--color--dark-blue{color:#0079d7}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--dark-blue{border-bottom-color:#004274}.theme-light .Tabs--vertical .Tab--selected.Tab--color--dark-blue{border-right-color:#004274}.theme-light .Tab--selected.Tab--color--violet{color:#7f58d3}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--violet{border-bottom-color:#5a30b5}.theme-light .Tabs--vertical .Tab--selected.Tab--color--violet{border-right-color:#5a30b5}.theme-light .Tab--selected.Tab--color--purple{color:#b455d4}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--purple{border-bottom-color:#932eb4}.theme-light .Tabs--vertical .Tab--selected.Tab--color--purple{border-right-color:#932eb4}.theme-light .Tab--selected.Tab--color--pink{color:#e558a7}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--pink{border-bottom-color:#db228a}.theme-light .Tabs--vertical .Tab--selected.Tab--color--pink{border-right-color:#db228a}.theme-light .Tab--selected.Tab--color--brown{color:#c0825a}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--brown{border-bottom-color:#955d39}.theme-light .Tabs--vertical .Tab--selected.Tab--color--brown{border-right-color:#955d39}.theme-light .Tab--selected.Tab--color--grey{color:#ececec}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--grey{border-bottom-color:#e6e6e6}.theme-light .Tabs--vertical .Tab--selected.Tab--color--grey{border-right-color:#e6e6e6}.theme-light .Tab--selected.Tab--color--light-grey{color:#b3b3b3}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--light-grey{border-bottom-color:#999}.theme-light .Tabs--vertical .Tab--selected.Tab--color--light-grey{border-right-color:#999}.theme-light .Tab--selected.Tab--color--good{color:#77d23b}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--good{border-bottom-color:#529923}.theme-light .Tabs--vertical .Tab--selected.Tab--color--good{border-right-color:#529923}.theme-light .Tab--selected.Tab--color--average{color:#f3a23a}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--average{border-bottom-color:#da810e}.theme-light .Tabs--vertical .Tab--selected.Tab--color--average{border-right-color:#da810e}.theme-light .Tab--selected.Tab--color--bad{color:#e14d4d}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--bad{border-bottom-color:#c82121}.theme-light .Tabs--vertical .Tab--selected.Tab--color--bad{border-right-color:#c82121}.theme-light .Tab--selected.Tab--color--label{color:#686868}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--label{border-bottom-color:#353535}.theme-light .Tabs--vertical .Tab--selected.Tab--color--label{border-right-color:#353535}.theme-light .Tab--selected.Tab--color--xeno{color:#7e558e}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--xeno{border-bottom-color:#4a3253}.theme-light .Tabs--vertical .Tab--selected.Tab--color--xeno{border-right-color:#4a3253}.theme-light .Section{position:relative;margin-bottom:.5em;background-color:#fff;background-color:#fff;box-sizing:border-box}.theme-light .Section:last-child{margin-bottom:0}.theme-light .Section__title{position:relative;padding:.5em;border-bottom:.1666666667em solid #fff}.theme-light .Section__titleText{font-size:1.1666666667em;font-weight:bold;color:#000}.theme-light .Section__buttons{position:absolute;display:inline-block;right:.5em;margin-top:-.0833333333em}.theme-light .Section__rest{position:relative}.theme-light .Section__content{padding:.66em .5em}.theme-light .Section--fitted>.Section__rest>.Section__content{padding:0}.theme-light .Section--fill{display:flex;flex-direction:column;height:100%}.theme-light .Section--fill>.Section__rest{flex-grow:1}.theme-light .Section--fill>.Section__rest>.Section__content{height:100%}.theme-light .Section--fill.Section--scrollable>.Section__rest>.Section__content{position:absolute;top:0;left:0;right:0;bottom:0}.theme-light .Section--fill.Section--iefix{display:table !important;width:100% !important;height:100% !important;border-collapse:collapse;border-spacing:0}.theme-light .Section--fill.Section--iefix>.Section__rest{display:table-row !important;height:100% !important}.theme-light .Section--scrollable{overflow-x:hidden;overflow-y:hidden}.theme-light .Section--scrollable>.Section__rest>.Section__content{overflow-y:scroll;overflow-x:hidden}.theme-light .Section--scrollableHorizontal{overflow-x:hidden;overflow-y:hidden}.theme-light .Section--scrollableHorizontal>.Section__rest>.Section__content{overflow-y:hidden;overflow-x:scroll}.theme-light .Section--scrollable.Section--scrollableHorizontal{overflow-x:hidden;overflow-y:hidden}.theme-light .Section--scrollable.Section--scrollableHorizontal>.Section__rest>.Section__content{overflow-y:scroll;overflow-x:scroll}.theme-light .Section .Section{background-color:rgba(0,0,0,0);margin-left:-0.5em;margin-right:-0.5em}.theme-light .Section .Section:first-child{margin-top:-0.5em}.theme-light .Section .Section .Section__titleText{font-size:1.0833333333em}.theme-light .Section .Section .Section .Section__titleText{font-size:1em}.theme-light .Button{position:relative;display:inline-block;line-height:1.667em;padding:0 .5em;margin-right:.1666666667em;white-space:nowrap;outline:0;border-radius:.16em;margin-bottom:.1666666667em;user-select:none;-ms-user-select:none}.theme-light .Button .fa,.theme-light .Button .fas,.theme-light .Button .far{margin-left:-0.25em;margin-right:-0.25em;min-width:1.333em;text-align:center}.theme-light .Button--hasContent .fa,.theme-light .Button--hasContent .fas,.theme-light .Button--hasContent .far{margin-right:.25em}.theme-light .Button--hasContent.Button--iconPosition--right .fa,.theme-light .Button--hasContent.Button--iconPosition--right .fas,.theme-light .Button--hasContent.Button--iconPosition--right .far{margin-right:0px;margin-left:3px}.theme-light .Button--ellipsis{overflow:hidden;text-overflow:ellipsis}.theme-light .Button--fluid{display:block;margin-left:0;margin-right:0}.theme-light .Button--circular{border-radius:50%}.theme-light .Button--compact{padding:0 .25em;line-height:1.333em}.theme-light .Button--color--black{transition:color 50ms,background-color 50ms;background-color:#000;color:#fff}.theme-light .Button--color--black:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--black:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--black:hover,.theme-light .Button--color--black:focus{background-color:#131313;color:#fff}.theme-light .Button--color--white{transition:color 50ms,background-color 50ms;background-color:#bfbfbf;color:#000}.theme-light .Button--color--white:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--white:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--white:hover,.theme-light .Button--color--white:focus{background-color:#efefef;color:#000}.theme-light .Button--color--red{transition:color 50ms,background-color 50ms;background-color:#a61c1c;color:#fff}.theme-light .Button--color--red:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--red:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--red:hover,.theme-light .Button--color--red:focus{background-color:#d23333;color:#fff}.theme-light .Button--color--orange{transition:color 50ms,background-color 50ms;background-color:#c0530b;color:#fff}.theme-light .Button--color--orange:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--orange:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--orange:hover,.theme-light .Button--color--orange:focus{background-color:#ea7426;color:#fff}.theme-light .Button--color--yellow{transition:color 50ms,background-color 50ms;background-color:#bfa303;color:#fff}.theme-light .Button--color--yellow:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--yellow:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--yellow:hover,.theme-light .Button--color--yellow:focus{background-color:#efce17;color:#fff}.theme-light .Button--color--olive{transition:color 50ms,background-color 50ms;background-color:#889912;color:#fff}.theme-light .Button--color--olive:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--olive:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--olive:hover,.theme-light .Button--color--olive:focus{background-color:#afc328;color:#fff}.theme-light .Button--color--green{transition:color 50ms,background-color 50ms;background-color:#188532;color:#fff}.theme-light .Button--color--green:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--green:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--green:hover,.theme-light .Button--color--green:focus{background-color:#2fac4c;color:#fff}.theme-light .Button--color--teal{transition:color 50ms,background-color 50ms;background-color:#008882;color:#fff}.theme-light .Button--color--teal:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--teal:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--teal:hover,.theme-light .Button--color--teal:focus{background-color:#13afa9;color:#fff}.theme-light .Button--color--blue{transition:color 50ms,background-color 50ms;background-color:#19649c;color:#fff}.theme-light .Button--color--blue:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--blue:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--blue:hover,.theme-light .Button--color--blue:focus{background-color:#3086c7;color:#fff}.theme-light .Button--color--dark-blue{transition:color 50ms,background-color 50ms;background-color:#003761;color:#fff}.theme-light .Button--color--dark-blue:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--dark-blue:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--dark-blue:hover,.theme-light .Button--color--dark-blue:focus{background-color:#135283;color:#fff}.theme-light .Button--color--violet{transition:color 50ms,background-color 50ms;background-color:#4b2897;color:#fff}.theme-light .Button--color--violet:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--violet:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--violet:hover,.theme-light .Button--color--violet:focus{background-color:#6a41c1;color:#fff}.theme-light .Button--color--purple{transition:color 50ms,background-color 50ms;background-color:#7a2696;color:#fff}.theme-light .Button--color--purple:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--purple:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--purple:hover,.theme-light .Button--color--purple:focus{background-color:#a03fc0;color:#fff}.theme-light .Button--color--pink{transition:color 50ms,background-color 50ms;background-color:#b61d73;color:#fff}.theme-light .Button--color--pink:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--pink:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--pink:hover,.theme-light .Button--color--pink:focus{background-color:#da3f96;color:#fff}.theme-light .Button--color--brown{transition:color 50ms,background-color 50ms;background-color:#7c4d2f;color:#fff}.theme-light .Button--color--brown:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--brown:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--brown:hover,.theme-light .Button--color--brown:focus{background-color:#a26c49;color:#fff}.theme-light .Button--color--grey{transition:color 50ms,background-color 50ms;background-color:#bfbfbf;color:#000}.theme-light .Button--color--grey:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--grey:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--grey:hover,.theme-light .Button--color--grey:focus{background-color:#efefef;color:#000}.theme-light .Button--color--light-grey{transition:color 50ms,background-color 50ms;background-color:gray;color:#fff}.theme-light .Button--color--light-grey:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--light-grey:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--light-grey:hover,.theme-light .Button--color--light-grey:focus{background-color:#a6a6a6;color:#fff}.theme-light .Button--color--good{transition:color 50ms,background-color 50ms;background-color:#44801d;color:#fff}.theme-light .Button--color--good:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--good:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--good:hover,.theme-light .Button--color--good:focus{background-color:#62a635;color:#fff}.theme-light .Button--color--average{transition:color 50ms,background-color 50ms;background-color:#b56b0b;color:#fff}.theme-light .Button--color--average:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--average:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--average:hover,.theme-light .Button--color--average:focus{background-color:#e48f20;color:#fff}.theme-light .Button--color--bad{transition:color 50ms,background-color 50ms;background-color:#a61c1c;color:#fff}.theme-light .Button--color--bad:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--bad:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--bad:hover,.theme-light .Button--color--bad:focus{background-color:#d23333;color:#fff}.theme-light .Button--color--label{transition:color 50ms,background-color 50ms;background-color:#2c2c2c;color:#fff}.theme-light .Button--color--label:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--label:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--label:hover,.theme-light .Button--color--label:focus{background-color:#464646;color:#fff}.theme-light .Button--color--xeno{transition:color 50ms,background-color 50ms;background-color:#3e2945;color:#fff}.theme-light .Button--color--xeno:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--xeno:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--xeno:hover,.theme-light .Button--color--xeno:focus{background-color:#5a4363;color:#fff}.theme-light .Button--color--default{transition:color 50ms,background-color 50ms;background-color:#bbb;color:#000}.theme-light .Button--color--default:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--default:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--default:hover,.theme-light .Button--color--default:focus{background-color:#eaeaea;color:#000}.theme-light .Button--color--caution{transition:color 50ms,background-color 50ms;background-color:#be6209;color:#fff}.theme-light .Button--color--caution:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--caution:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--caution:hover,.theme-light .Button--color--caution:focus{background-color:#ec8420;color:#fff}.theme-light .Button--color--danger{transition:color 50ms,background-color 50ms;background-color:#9a9d00;color:#fff}.theme-light .Button--color--danger:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--danger:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--danger:hover,.theme-light .Button--color--danger:focus{background-color:#c4c813;color:#fff}.theme-light .Button--color--transparent{transition:color 50ms,background-color 50ms;background-color:#eee;color:#000;background-color:rgba(238,238,238,0);color:rgba(0,0,0,.5)}.theme-light .Button--color--transparent:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--transparent:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--color--transparent:hover,.theme-light .Button--color--transparent:focus{background-color:#fcfcfc;color:#000}.theme-light .Button--disabled{background-color:#363636 !important}.theme-light .Button--selected{transition:color 50ms,background-color 50ms;background-color:#0668b8;color:#fff}.theme-light .Button--selected:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--selected:focus{transition:color 100ms,background-color 100ms}.theme-light .Button--selected:hover,.theme-light .Button--selected:focus{background-color:#1a8be7;color:#fff}.theme-light .Button--flex{display:inline-flex;flex-direction:column}.theme-light .Button--flex--fluid{width:100%}.theme-light .Button--verticalAlignContent--top{justify-content:flex-start}.theme-light .Button--verticalAlignContent--middle{justify-content:center}.theme-light .Button--verticalAlignContent--bottom{justify-content:flex-end}.theme-light .Button__content{display:block;align-self:stretch}.theme-light .Input{position:relative;display:inline-block;width:10em;border:.0833333333em solid #353535;border:.0833333333em solid rgba(53,53,53,.75);border-radius:.16em;color:#000;background-color:#fff;padding:0 .3333333333em;margin-right:.1666666667em;line-height:1.4166666667em;overflow:visible}.theme-light .Input--fluid{display:block;width:auto}.theme-light .Input__baseline{display:inline-block;color:rgba(0,0,0,0)}.theme-light .Input__input{display:block;position:absolute;top:0;bottom:0;left:0;right:0;border:0;outline:0;width:100%;font-size:1em;line-height:1.4166666667em;height:1.4166666667em;margin:0;padding:0 .5em;font-family:Verdana,sans-serif;background-color:rgba(0,0,0,0);color:#000;color:inherit}.theme-light .Input__input:-ms-input-placeholder{font-style:italic;color:#777;color:rgba(255,255,255,.45)}.theme-light .Input--monospace .Input__input{font-family:"Consolas",monospace}.theme-light .Input{position:relative;display:inline-block;width:10em;border:.0833333333em solid #353535;border:.0833333333em solid rgba(53,53,53,.75);border-radius:.16em;color:#000;background-color:#fff;padding:0 .3333333333em;margin-right:.1666666667em;line-height:1.4166666667em;overflow:visible}.theme-light .Input--fluid{display:block;width:auto}.theme-light .Input__baseline{display:inline-block;color:rgba(0,0,0,0)}.theme-light .Input__input{display:block;position:absolute;top:0;bottom:0;left:0;right:0;border:0;outline:0;width:100%;font-size:1em;line-height:1.4166666667em;height:1.4166666667em;margin:0;padding:0 .5em;font-family:Verdana,sans-serif;background-color:rgba(0,0,0,0);color:#000;color:inherit}.theme-light .Input__input:-ms-input-placeholder{font-style:italic;color:#777;color:rgba(255,255,255,.45)}.theme-light .Input--monospace .Input__input{font-family:"Consolas",monospace}.theme-light .NumberInput{position:relative;display:inline-block;border:.0833333333em solid #353535;border:.0833333333em solid rgba(53,53,53,.75);border-radius:.16em;color:#353535;background-color:#fff;padding:0 .3333333333em;margin-right:.1666666667em;line-height:1.4166666667em;text-align:right;overflow:visible;cursor:n-resize}.theme-light .NumberInput--fluid{display:block}.theme-light .NumberInput__content{margin-left:.5em}.theme-light .NumberInput__barContainer{position:absolute;top:.1666666667em;bottom:.1666666667em;left:.1666666667em}.theme-light .NumberInput__bar{position:absolute;bottom:0;left:0;width:.25em;box-sizing:border-box;border-bottom:.0833333333em solid #353535;background-color:#353535}.theme-light .NumberInput__input{display:block;position:absolute;top:0;bottom:0;left:0;right:0;border:0;outline:0;width:100%;font-size:1em;line-height:1.4166666667em;height:1.4166666667em;margin:0;padding:0 .5em;font-family:Verdana,sans-serif;background-color:#fff;color:#000;text-align:right}.theme-light .Input{position:relative;display:inline-block;width:10em;border:.0833333333em solid #353535;border:.0833333333em solid rgba(53,53,53,.75);border-radius:.16em;color:#000;background-color:#fff;padding:0 .3333333333em;margin-right:.1666666667em;line-height:1.4166666667em;overflow:visible}.theme-light .Input--fluid{display:block;width:auto}.theme-light .Input__baseline{display:inline-block;color:rgba(0,0,0,0)}.theme-light .Input__input{display:block;position:absolute;top:0;bottom:0;left:0;right:0;border:0;outline:0;width:100%;font-size:1em;line-height:1.4166666667em;height:1.4166666667em;margin:0;padding:0 .5em;font-family:Verdana,sans-serif;background-color:rgba(0,0,0,0);color:#000;color:inherit}.theme-light .Input__input:-ms-input-placeholder{font-style:italic;color:#777;color:rgba(255,255,255,.45)}.theme-light .Input--monospace .Input__input{font-family:"Consolas",monospace}.theme-light .TextArea{position:relative;display:inline-block;border:.0833333333em solid #353535;border:.0833333333em solid rgba(53,53,53,.75);border-radius:.16em;background-color:#fff;margin-right:.1666666667em;line-height:1.4166666667em;box-sizing:border-box;width:100%}.theme-light .TextArea--fluid{display:block;width:auto;height:auto}.theme-light .TextArea--noborder{border:0px}.theme-light .TextArea__textarea.TextArea__textarea--scrollable{overflow:auto;overflow-x:hidden;overflow-y:scroll}.theme-light .TextArea__textarea{display:block;position:absolute;top:0;bottom:0;left:0;right:0;border:0;outline:0;width:100%;height:100%;font-size:1em;line-height:1.4166666667em;min-height:1.4166666667em;margin:0;padding:0 .5em;font-family:inherit;background-color:rgba(0,0,0,0);color:inherit;box-sizing:border-box;word-wrap:break-word;overflow:hidden}.theme-light .TextArea__textarea:-ms-input-placeholder{font-style:italic;color:#777;color:rgba(255,255,255,.45)}.theme-light .TextArea__textarea_custom{overflow:visible;white-space:pre-wrap}.theme-light .Knob{position:relative;font-size:1rem;width:2.6em;height:2.6em;margin:0 auto;margin-bottom:-0.2em;cursor:n-resize}.theme-light .Knob:after{content:".";color:rgba(0,0,0,0);line-height:2.5em}.theme-light .Knob__circle{position:absolute;top:.1em;bottom:.1em;left:.1em;right:.1em;margin:.3em;background-color:#333;background-image:linear-gradient(to bottom, rgba(255, 255, 255, 0.15) 0%, rgba(255, 255, 255, 0) 100%);border-radius:50%;box-shadow:0 .05em .5em 0 rgba(0,0,0,.5)}.theme-light .Knob__cursorBox{position:absolute;top:0;bottom:0;left:0;right:0}.theme-light .Knob__cursor{position:relative;top:.05em;margin:0 auto;width:.2em;height:.8em;background-color:rgba(255,255,255,.9)}.theme-light .Knob__popupValue{position:absolute;top:-2rem;right:50%;font-size:1rem;text-align:center;padding:.25rem .5rem;color:#fff;background-color:#000;transform:translateX(50%);white-space:nowrap}.theme-light .Knob__ring{position:absolute;top:0;bottom:0;left:0;right:0;padding:.1em}.theme-light .Knob__ringTrackPivot{transform:rotateZ(135deg)}.theme-light .Knob__ringTrack{fill:rgba(0,0,0,0);stroke:rgba(255,255,255,.1);stroke-width:8;stroke-linecap:round;stroke-dasharray:235.62}.theme-light .Knob__ringFillPivot{transform:rotateZ(135deg)}.theme-light .Knob--bipolar .Knob__ringFillPivot{transform:rotateZ(270deg)}.theme-light .Knob__ringFill{fill:rgba(0,0,0,0);stroke:#6a96c9;stroke-width:8;stroke-linecap:round;stroke-dasharray:314.16;transition:stroke 50ms ease-out}.theme-light .Knob--color--black .Knob__ringFill{stroke:#000}.theme-light .Knob--color--white .Knob__ringFill{stroke:#e6e6e6}.theme-light .Knob--color--red .Knob__ringFill{stroke:#c82121}.theme-light .Knob--color--orange .Knob__ringFill{stroke:#e6630d}.theme-light .Knob--color--yellow .Knob__ringFill{stroke:#e5c304}.theme-light .Knob--color--olive .Knob__ringFill{stroke:#a3b816}.theme-light .Knob--color--green .Knob__ringFill{stroke:#1d9f3b}.theme-light .Knob--color--teal .Knob__ringFill{stroke:#00a39c}.theme-light .Knob--color--blue .Knob__ringFill{stroke:#1e78bb}.theme-light .Knob--color--dark-blue .Knob__ringFill{stroke:#004274}.theme-light .Knob--color--violet .Knob__ringFill{stroke:#5a30b5}.theme-light .Knob--color--purple .Knob__ringFill{stroke:#932eb4}.theme-light .Knob--color--pink .Knob__ringFill{stroke:#db228a}.theme-light .Knob--color--brown .Knob__ringFill{stroke:#955d39}.theme-light .Knob--color--grey .Knob__ringFill{stroke:#e6e6e6}.theme-light .Knob--color--light-grey .Knob__ringFill{stroke:#999}.theme-light .Knob--color--good .Knob__ringFill{stroke:#529923}.theme-light .Knob--color--average .Knob__ringFill{stroke:#da810e}.theme-light .Knob--color--bad .Knob__ringFill{stroke:#c82121}.theme-light .Knob--color--label .Knob__ringFill{stroke:#353535}.theme-light .Knob--color--xeno .Knob__ringFill{stroke:#4a3253}.theme-light .Slider{cursor:e-resize}.theme-light .Slider__cursorOffset{position:absolute;top:0;left:0;bottom:0;transition:none !important}.theme-light .Slider__cursor{position:absolute;top:0;right:-.0833333333em;bottom:0;width:0;border-left:.1666666667em solid #000}.theme-light .Slider__pointer{position:absolute;right:-.4166666667em;bottom:-.3333333333em;width:0;height:0;border-left:.4166666667em solid rgba(0,0,0,0);border-right:.4166666667em solid rgba(0,0,0,0);border-bottom:.4166666667em solid #000}.theme-light .Slider__popupValue{position:absolute;right:0;top:-2rem;font-size:1rem;padding:.25rem .5rem;color:#fff;background-color:#000;transform:translateX(50%);white-space:nowrap}.theme-light .ProgressBar{display:inline-block;position:relative;width:100%;padding:0 .5em;border-width:.0833333333em !important;border-style:solid !important;border-radius:.16em;background-color:rgba(0,0,0,0);transition:border-color 900ms ease-out}.theme-light .ProgressBar__fill{position:absolute;top:-0.5px;left:0px;bottom:-0.5px}.theme-light .ProgressBar__fill--animated{transition:background-color 900ms ease-out,width 900ms ease-out}.theme-light .ProgressBar__content{position:relative;line-height:1.4166666667em;width:100%;text-align:right}.theme-light .ProgressBar--color--default{border:.0833333333em solid #bfbfbf}.theme-light .ProgressBar--color--default .ProgressBar__fill{background-color:#bfbfbf}.theme-light .ProgressBar--color--black{border-color:#000 !important}.theme-light .ProgressBar--color--black .ProgressBar__fill{background-color:#000}.theme-light .ProgressBar--color--white{border-color:#bfbfbf !important}.theme-light .ProgressBar--color--white .ProgressBar__fill{background-color:#bfbfbf}.theme-light .ProgressBar--color--red{border-color:#a61c1c !important}.theme-light .ProgressBar--color--red .ProgressBar__fill{background-color:#a61c1c}.theme-light .ProgressBar--color--orange{border-color:#c0530b !important}.theme-light .ProgressBar--color--orange .ProgressBar__fill{background-color:#c0530b}.theme-light .ProgressBar--color--yellow{border-color:#bfa303 !important}.theme-light .ProgressBar--color--yellow .ProgressBar__fill{background-color:#bfa303}.theme-light .ProgressBar--color--olive{border-color:#889912 !important}.theme-light .ProgressBar--color--olive .ProgressBar__fill{background-color:#889912}.theme-light .ProgressBar--color--green{border-color:#188532 !important}.theme-light .ProgressBar--color--green .ProgressBar__fill{background-color:#188532}.theme-light .ProgressBar--color--teal{border-color:#008882 !important}.theme-light .ProgressBar--color--teal .ProgressBar__fill{background-color:#008882}.theme-light .ProgressBar--color--blue{border-color:#19649c !important}.theme-light .ProgressBar--color--blue .ProgressBar__fill{background-color:#19649c}.theme-light .ProgressBar--color--dark-blue{border-color:#003761 !important}.theme-light .ProgressBar--color--dark-blue .ProgressBar__fill{background-color:#003761}.theme-light .ProgressBar--color--violet{border-color:#4b2897 !important}.theme-light .ProgressBar--color--violet .ProgressBar__fill{background-color:#4b2897}.theme-light .ProgressBar--color--purple{border-color:#7a2696 !important}.theme-light .ProgressBar--color--purple .ProgressBar__fill{background-color:#7a2696}.theme-light .ProgressBar--color--pink{border-color:#b61d73 !important}.theme-light .ProgressBar--color--pink .ProgressBar__fill{background-color:#b61d73}.theme-light .ProgressBar--color--brown{border-color:#7c4d2f !important}.theme-light .ProgressBar--color--brown .ProgressBar__fill{background-color:#7c4d2f}.theme-light .ProgressBar--color--grey{border-color:#bfbfbf !important}.theme-light .ProgressBar--color--grey .ProgressBar__fill{background-color:#bfbfbf}.theme-light .ProgressBar--color--light-grey{border-color:gray !important}.theme-light .ProgressBar--color--light-grey .ProgressBar__fill{background-color:gray}.theme-light .ProgressBar--color--good{border-color:#44801d !important}.theme-light .ProgressBar--color--good .ProgressBar__fill{background-color:#44801d}.theme-light .ProgressBar--color--average{border-color:#b56b0b !important}.theme-light .ProgressBar--color--average .ProgressBar__fill{background-color:#b56b0b}.theme-light .ProgressBar--color--bad{border-color:#a61c1c !important}.theme-light .ProgressBar--color--bad .ProgressBar__fill{background-color:#a61c1c}.theme-light .ProgressBar--color--label{border-color:#2c2c2c !important}.theme-light .ProgressBar--color--label .ProgressBar__fill{background-color:#2c2c2c}.theme-light .ProgressBar--color--xeno{border-color:#3e2945 !important}.theme-light .ProgressBar--color--xeno .ProgressBar__fill{background-color:#3e2945}.theme-light .Chat{color:#000}.theme-light .Chat__badge{display:inline-block;min-width:.5em;font-size:.7em;padding:.2em .3em;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:middle;background-color:crimson;border-radius:10px;transition:font-size 200ms ease-out}.theme-light .Chat__badge:before{content:"x"}.theme-light .Chat__badge--animate{font-size:.9em;transition:font-size 0ms}.theme-light .Chat__scrollButton{position:fixed;right:2em;bottom:1em}.theme-light .Chat__reconnected{font-size:.85em;text-align:center;margin:1em 0 2em}.theme-light .Chat__reconnected:before{content:"Reconnected";display:inline-block;border-radius:1em;padding:0 .7em;color:#db2828;background-color:#fff}.theme-light .Chat__reconnected:after{content:"";display:block;margin-top:-0.75em;border-bottom:.1666666667em solid #db2828}.theme-light .Chat__highlight{color:#000}.theme-light .Chat__highlight--restricted{color:#fff;background-color:#a00;font-weight:bold}.theme-light .ChatMessage{word-wrap:break-word}.theme-light .ChatMessage--highlighted{position:relative;border-left:.1666666667em solid #fd4;padding-left:.5em}.theme-light .ChatMessage--highlighted:after{content:"";position:absolute;top:0;bottom:0;left:0;right:0;background-color:rgba(255,221,68,.1);pointer-events:none}.theme-light .Layout,.theme-light .Layout *{scrollbar-base-color:#f2f2f2;scrollbar-face-color:#d6d6d6;scrollbar-3dlight-color:#eee;scrollbar-highlight-color:#eee;scrollbar-track-color:#f2f2f2;scrollbar-arrow-color:#777;scrollbar-shadow-color:#d6d6d6}.theme-light .Layout__content{position:absolute;top:0;bottom:0;left:0;right:0;overflow-x:hidden;overflow-y:hidden}.theme-light .Layout__content--scrollable{overflow-y:scroll;margin-bottom:0}.theme-light .Window{position:fixed;top:0;bottom:0;left:0;right:0;color:#000;background-color:#eee;background-image:linear-gradient(to bottom, #eeeeee 0%, #eeeeee 100%)}.theme-light .Window__titleBar{position:fixed;z-index:1;top:0;left:0;width:100%;height:32px;height:2.6666666667rem}.theme-light .Window__rest{position:fixed;top:32px;top:2.6666666667rem;bottom:0;left:0;right:0}.theme-light .Window__contentPadding{margin:.5rem;height:100%;height:calc(100% - 1.01rem)}.theme-light .Window__contentPadding:after{height:0}.theme-light .Layout__content--scrollable .Window__contentPadding:after{display:block;content:"";height:.5rem}.theme-light .Window__dimmer{position:fixed;top:0;bottom:0;left:0;right:0;background-color:rgba(252,252,252,.25);pointer-events:none}.theme-light .Window__resizeHandle__se{position:fixed;bottom:0;right:0;width:20px;width:1.6666666667rem;height:20px;height:1.6666666667rem;cursor:se-resize}.theme-light .Window__resizeHandle__s{position:fixed;bottom:0;left:0;right:0;height:6px;height:.5rem;cursor:s-resize}.theme-light .Window__resizeHandle__e{position:fixed;top:0;bottom:0;right:0;width:3px;width:.25rem;cursor:e-resize}.theme-light .TitleBar{background-color:#eee;border-bottom:1px solid rgba(0,0,0,.25);box-shadow:0 2px 2px rgba(0,0,0,.1);box-shadow:0 .1666666667rem .1666666667rem rgba(0,0,0,.1);user-select:none;-ms-user-select:none}.theme-light .TitleBar__clickable{color:rgba(0,0,0,.5);background-color:#eee;transition:color 250ms ease-out,background-color 250ms ease-out}.theme-light .TitleBar__clickable:hover{color:#fff;background-color:#c00;transition:color 0ms,background-color 0ms}.theme-light .TitleBar__title{position:absolute;display:inline-block;top:0;left:46px;left:3.8333333333rem;color:rgba(0,0,0,.75);font-size:14px;font-size:1.1666666667rem;line-height:31px;line-height:2.5833333333rem;white-space:nowrap;pointer-events:none}.theme-light .TitleBar__buttons{pointer-events:initial;display:inline-block;width:100%;margin-left:10px}.theme-light .TitleBar__dragZone{position:absolute;top:0;left:0;right:0;height:32px;height:2.6666666667rem}.theme-light .TitleBar__statusIcon{position:absolute;top:0;left:12px;left:1rem;transition:color .5s;font-size:20px;font-size:1.6666666667rem;line-height:32px !important;line-height:2.6666666667rem !important}.theme-light .TitleBar__close{position:absolute;top:-1px;right:0;width:45px;width:3.75rem;height:32px;height:2.6666666667rem;font-size:20px;font-size:1.6666666667rem;line-height:31px;line-height:2.5833333333rem;text-align:center}.theme-light .TitleBar__devBuildIndicator{position:absolute;top:6px;top:.5rem;right:52px;right:4.3333333333rem;min-width:20px;min-width:1.6666666667rem;padding:2px 4px;padding:.1666666667rem .3333333333rem;background-color:rgba(91,170,39,.75);color:#fff;text-align:center}.theme-light html,.theme-light body{padding:0;margin:0;height:100%;color:#000}.theme-light body{background:#fff;font-family:Verdana,sans-serif;font-size:13px;line-height:1.2;overflow-x:hidden;overflow-y:scroll;word-wrap:break-word}.theme-light em{font-style:normal;font-weight:bold}.theme-light img{margin:0;padding:0;line-height:1;-ms-interpolation-mode:nearest-neighbor;image-rendering:pixelated}.theme-light img.icon{height:1em;min-height:16px;width:auto;vertical-align:bottom}.theme-light a{color:blue}.theme-light a.visited{color:#f0f}.theme-light a:visited{color:#f0f}.theme-light a.popt{text-decoration:none}.theme-light .popup{position:fixed;top:50%;left:50%;background:#ddd}.theme-light .popup .close{position:absolute;background:#aaa;top:0;right:0;color:#333;text-decoration:none;z-index:2;padding:0 10px;height:30px;line-height:30px}.theme-light .popup .close:hover{background:#999}.theme-light .popup .head{background:#999;color:#ddd;padding:0 10px;height:30px;line-height:30px;text-transform:uppercase;font-size:.9em;font-weight:bold;border-bottom:2px solid green}.theme-light .popup input{border:1px solid #999;background:#fff;margin:0;padding:5px;outline:none;color:#333}.theme-light .popup input[type=text]:hover,.theme-light .popup input[type=text]:active,.theme-light .popup input[type=text]:focus{border-color:green}.theme-light .popup input[type=submit]{padding:5px 10px;background:#999;color:#ddd;text-transform:uppercase;font-size:.9em;font-weight:bold}.theme-light .popup input[type=submit]:hover,.theme-light .popup input[type=submit]:focus,.theme-light .popup input[type=submit]:active{background:#aaa;cursor:pointer}.theme-light .changeFont{padding:10px}.theme-light .changeFont a{display:block;text-decoration:none;padding:3px;color:#333}.theme-light .changeFont a:hover{background:#ccc}.theme-light .highlightPopup{padding:10px;text-align:center}.theme-light .highlightPopup input[type=text]{display:block;width:215px;text-align:left;margin-top:5px}.theme-light .highlightPopup input.highlightColor{background-color:#ff0}.theme-light .highlightPopup input.highlightTermSubmit{margin-top:5px}.theme-light .contextMenu{background-color:#ddd;position:fixed;margin:2px;width:150px}.theme-light .contextMenu a{display:block;padding:2px 5px;text-decoration:none;color:#333}.theme-light .contextMenu a:hover{background-color:#ccc}.theme-light .filterMessages{padding:5px}.theme-light .filterMessages div{padding:2px 0}.theme-light .icon-stack{height:1em;line-height:1em;width:1em;vertical-align:middle;margin-top:-2px}.theme-light .motd{color:#638500;font-family:Verdana,sans-serif;white-space:normal}.theme-light .motd h1,.theme-light .motd h2,.theme-light .motd h3,.theme-light .motd h4,.theme-light .motd h5,.theme-light .motd h6{color:#638500;text-decoration:underline}.theme-light .motd a,.theme-light .motd a:link,.theme-light .motd a:visited,.theme-light .motd a:active,.theme-light .motd a:hover{color:#638500}.theme-light .bold,.theme-light .name,.theme-light .prefix,.theme-light .ooc,.theme-light .looc,.theme-light .adminooc,.theme-light .admin,.theme-light .niche,.theme-light .medal,.theme-light .yell{font-weight:bold}.theme-light .italic,.theme-light .italics{font-style:italic}.theme-light .highlight{background:#ff0}.theme-light h1,.theme-light h2,.theme-light h3,.theme-light h4,.theme-light h5,.theme-light h6{color:blue;font-family:Georgia,Verdana,sans-serif}.theme-light h1.alert,.theme-light h2.alert{color:#000}.theme-light em{font-style:normal;font-weight:bold}.theme-light .ooc{font-weight:bold}.theme-light .adminobserverooc{color:#09c;font-weight:bold}.theme-light .adminooc{color:#700038;font-weight:bold}.theme-light .adminsay{color:#ff4500;font-weight:bold}.theme-light .admin{color:#4473ff;font-weight:bold}.theme-light .niche{color:#4473ff;font-weight:bold}.theme-light .name{font-weight:bold}.theme-light .deadsay{color:#5c00e6}.theme-light .binarysay{color:#20c20e;background-color:#000;display:block}.theme-light .binarysay a{color:lime}.theme-light .binarysay a:active,.theme-light .binarysay a:visited{color:#8f8}.theme-light .radio{color:green}.theme-light .sciradio{color:#939}.theme-light .comradio{color:#948f02}.theme-light .secradio{color:#a30000}.theme-light .medradio{color:#337296}.theme-light .engradio{color:#fb5613}.theme-light .sentryradio{color:#844300}.theme-light .suppradio{color:#a8732b}.theme-light .servradio{color:#6eaa2c}.theme-light .syndradio{color:#6d3f40}.theme-light .gangradio{color:#ac2ea1}.theme-light .centcomradio{color:#686868}.theme-light .aiprivradio{color:#f0f}.theme-light .redteamradio{color:red}.theme-light .blueteamradio{color:blue}.theme-light .greenteamradio{color:lime}.theme-light .yellowteamradio{color:#d1ba22}.theme-light .yell{font-weight:bold}.theme-light .alert{color:red}.theme-light h1.alert,.theme-light h2.alert{color:#000}.theme-light .userdanger{color:red;font-weight:bold;font-size:185%}.theme-light .bolddanger{color:red;font-weight:bold}.theme-light .danger{color:red}.theme-light .tinydanger{color:red;font-size:85%}.theme-light .smalldanger{color:red;font-size:90%}.theme-light .warning{color:red;font-style:italic}.theme-light .alertwarning{color:red;font-weight:bold}.theme-light .boldwarning{color:red;font-style:italic;font-weight:bold}.theme-light .announce{color:#228b22;font-weight:bold}.theme-light .boldannounce{color:red;font-weight:bold}.theme-light .bigannounce{font-weight:bold;font-size:115%}.theme-light .greenannounce{color:lime;font-weight:bold}.theme-light .rose{color:#ff5050}.theme-light .info{color:#00c}.theme-light .notice{color:#009}.theme-light .staff_ic{color:#009}.theme-light .tinynotice{color:#009;font-size:85%}.theme-light .tinynoticeital{color:#009;font-style:italic;font-size:85%}.theme-light .smallnotice{color:#009;font-size:90%}.theme-light .smallnoticeital{color:#009;font-style:italic;font-size:90%}.theme-light .boldnotice{color:#009;font-weight:bold}.theme-light .hear{color:#009;font-style:italic}.theme-light .adminnotice{color:blue}.theme-light .adminhelp{color:red;font-weight:bold}.theme-light .unconscious{color:blue;font-weight:bold}.theme-light .suicide{color:#ff5050;font-style:italic}.theme-light .green{color:#03ff39}.theme-light .grey{color:#838383}.theme-light .red{color:red}.theme-light .blue{color:blue}.theme-light .nicegreen{color:#14a833}.theme-light .boldnicegreen{color:#14a833;font-weight:bold}.theme-light .cult{color:#973e3b}.theme-light .cultitalic{color:#973e3b;font-style:italic}.theme-light .cultbold{color:#973e3b;font-style:italic;font-weight:bold}.theme-light .cultboldtalic{color:#973e3b;font-weight:bold;font-size:185%}.theme-light .cultlarge{color:#973e3b;font-weight:bold;font-size:185%}.theme-light .narsie{color:#973e3b;font-weight:bold;font-size:925%}.theme-light .narsiesmall{color:#973e3b;font-weight:bold;font-size:370%}.theme-light .colossus{color:#7f282a;font-size:310%}.theme-light .hierophant{color:#609;font-weight:bold;font-style:italic}.theme-light .hierophant_warning{color:#609;font-style:italic}.theme-light .purple{color:#5e2d79}.theme-light .holoparasite{color:#35333a}.theme-light .revennotice{color:#1d2953}.theme-light .revenboldnotice{color:#1d2953;font-weight:bold}.theme-light .revenbignotice{color:#1d2953;font-weight:bold;font-size:185%}.theme-light .revenminor{color:#823abb}.theme-light .revenwarning{color:#760fbb;font-style:italic}.theme-light .revendanger{color:#760fbb;font-weight:bold;font-size:185%}.theme-light .deconversion_message{color:#5000a0;font-size:185%;font-style:italic}.theme-light .ghostalert{color:#5c00e6;font-style:italic;font-weight:bold}.theme-light .alien{color:#543354}.theme-light .noticealien{color:#00c000}.theme-light .alertalien{color:#00c000;font-weight:bold}.theme-light .changeling{color:purple;font-style:italic}.theme-light .alertsyndie{color:red;font-size:185%;font-weight:bold}.theme-light .spider{color:#4d004d;font-weight:bold;font-size:185%}.theme-light .interface{color:#303}.theme-light .sans{font-family:"Comic Sans MS",cursive,sans-serif}.theme-light .papyrus{font-family:"Papyrus",cursive,sans-serif}.theme-light .robot{font-family:"Courier New",cursive,sans-serif}.theme-light .tape_recorder{color:maroon;font-family:"Courier New",cursive,sans-serif}.theme-light .command_headset{font-weight:bold;font-size:160%}.theme-light .small{font-size:60%}.theme-light .big{font-size:185%}.theme-light .reallybig{font-size:245%}.theme-light .extremelybig{font-size:310%}.theme-light .greentext{color:lime;font-size:185%}.theme-light .redtext{color:red;font-size:185%}.theme-light .clown{color:#ff69bf;font-size:160%;font-family:"Comic Sans MS",cursive,sans-serif;font-weight:bold}.theme-light .singing{font-family:"Trebuchet MS",cursive,sans-serif;font-style:italic}.theme-light .his_grace{color:#15d512;font-family:"Courier New",cursive,sans-serif;font-style:italic}.theme-light .hypnophrase{color:#0d0d0d;font-weight:bold;animation:hypnocolor 1500ms infinite;animation-direction:alternate}@keyframes hypnocolor{0%{color:#0d0d0d}25%{color:#410194}50%{color:#7f17d8}75%{color:#410194}100%{color:#3bb5d3}}.theme-light .phobia{color:#d00;font-weight:bold;animation:phobia 750ms infinite}@keyframes phobia{0%{color:#0d0d0d}50%{color:#d00}100%{color:#0d0d0d}}.theme-light .icon{height:1em;width:auto}.theme-light .bigicon{font-size:2.5em}.theme-light .memo{color:#638500;text-align:center}.theme-light .memoedit{text-align:center;font-size:125%}.theme-light .abductor{color:purple;font-style:italic}.theme-light .mind_control{color:#a00d6f;font-size:100%;font-weight:bold;font-style:italic}.theme-light .slime{color:#00ced1}.theme-light .drone{color:#848482}.theme-light .monkey{color:#975032}.theme-light .swarmer{color:#2c75ff}.theme-light .resonate{color:#298f85}.theme-light .monkeyhive{color:#774704}.theme-light .monkeylead{color:#774704;font-size:80%}.theme-light .connectionClosed,.theme-light .fatalError{background:red;color:#fff;padding:5px}.theme-light .connectionClosed.restored{background:green}.theme-light .internal.boldnshit{color:blue;font-weight:bold}.theme-light .text-normal{font-weight:normal;font-style:normal}.theme-light .hidden{display:none;visibility:hidden}.theme-light .ml-1{margin-left:1em}.theme-light .ml-2{margin-left:2em}.theme-light .ml-3{margin-left:3em}.theme-light .xooc{color:#6c0094;font-weight:bold;font-size:140%}.theme-light .mooc{color:#090;font-weight:bold;font-size:140%}.theme-light .yooc{color:#999600;font-weight:bold;font-size:140%}.theme-light .headminsay{color:#5a0a7f;font-weight:bold}.theme-light .radio{color:#4e4e4e}.theme-light .deptradio{color:#939}.theme-light .comradio{color:#004080}.theme-light .centradio{color:#5c5c8a}.theme-light .cryoradio{color:#554e3f}.theme-light .hcradio{color:#318779}.theme-light .pvstradio{color:#9b0612}.theme-light .airadio{color:#f0f}.theme-light .secradio{color:#a30000}.theme-light .engradio{color:#a66300}.theme-light .sentryradio{color:#844300}.theme-light .medradio{color:#008160}.theme-light .supradio{color:#5f4519}.theme-light .jtacradio{color:#702963}.theme-light .intelradio{color:#027d02}.theme-light .wyradio{color:#fe9b24}.theme-light .pmcradio{color:#136957}.theme-light .vairadio{color:#943d0a}.theme-light .cmbradio{color:#1b748c}.theme-light .clfradio{color:#6f679c}.theme-light .alpharadio{color:#ea0000}.theme-light .bravoradio{color:#c68610}.theme-light .charlieradio{color:#a5a}.theme-light .deltaradio{color:#007fcf}.theme-light .echoradio{color:#3a7e65}.theme-light .medium{font-size:110%}.theme-light .big{font-size:115%}.theme-light .large{font-size:125%}.theme-light .extra_large{font-size:130%}.theme-light .huge{font-size:150%}.theme-light .underline{text-decoration:underline}.theme-light .orange{color:#eca100}.theme-light .normal{font-style:normal}.theme-light .attack{color:red}.theme-light .moderate{color:#c00}.theme-light .disarm{color:#900}.theme-light .passive{color:#600}.theme-light .helpful{color:#368f31}.theme-light .scanner{color:red}.theme-light .scannerb{color:red;font-weight:bold}.theme-light .scannerburn{color:orange}.theme-light .scannerburnb{color:orange;font-weight:bold}.theme-light .rose{color:#ff5050}.theme-light .debuginfo{color:#493d26;font-style:italic}.theme-light .xenonotice{color:#2a623d}.theme-light .xenoboldnotice{color:#2a623d;font-weight:bold}.theme-light .xenowarning{color:#2a623d;font-style:italic}.theme-light .xenominorwarning{color:#2a623d;font-weight:bold;font-style:italic}.theme-light .xenodanger{color:#2a623d;font-weight:bold}.theme-light .avoidharm{color:#72a0e5;font-weight:bold}.theme-light .highdanger{color:red;font-weight:bold;font-size:140%}.theme-light .xenohighdanger{color:#2a623d;font-weight:bold;font-size:140%}.theme-light .xenoannounce{color:#1a472a;font-family:book-antiqua;font-weight:bold;font-size:140%}.theme-light .yautjabold{color:purple;font-weight:bold}.theme-light .yautjaboldbig{color:purple;font-weight:bold;font-size:120%}.theme-light .objectivebig{font-weight:bold;font-size:130%}.theme-light .objectivegreen{color:lime}.theme-light .objectivered{color:red}.theme-light .objectivesuccess{color:lime;font-weight:bold;font-size:110%}.theme-light .objectivefail{color:red;font-weight:bold;font-size:110%}.theme-light .xenotalk,.theme-light .xeno{color:#900090;font-style:italic}.theme-light .xenoleader{color:#730d73;font-style:italic;font-size:125%}.theme-light .xenoqueen{color:#730d73;font-style:italic;font-weight:bold;font-size:125%}.theme-light .newscaster{color:maroon}.theme-light .role_header{color:#db0000;display:block;text-align:center;font-weight:bold;font-family:trebuchet-ms;font-size:150%}.theme-light .role_body{color:#009;display:block;text-align:center;font-size:125%}.theme-light .round_header{color:#db0000;display:block;text-align:center;font-family:courier;font-weight:bold;font-size:180%}.theme-light .round_body{color:#001427;display:block;text-align:center;font-family:trebuchet-ms;font-weight:bold;font-size:125%}.theme-light .event_announcement{color:#600d48;font-family:arial-narrow;font-weight:bold;font-size:125%}.theme-light .announce_header{color:#000;font-weight:bold;font-size:150%}.theme-light .announce_header_blue{color:#009;font-weight:bold;font-size:150%}.theme-light .announce_body{color:red;font-weight:normal;font-size:125%}.theme-light .centerbold{display:block;text-align:center;font-weight:bold}.theme-light .mod{color:#735638;font-weight:bold}.theme-light .modooc{color:#184880;font-weight:bold}.theme-light .adminmod{color:#402a14;font-weight:bold}.theme-light .mentorsay{color:#b38c32;font-weight:bold}.theme-light .mentorhelp{color:#007e00;font-weight:bold}.theme-light .mentorbody{color:#da6200;font-weight:bold}.theme-light .mentorstaff{color:#876101;font-weight:bold}.theme-light .staffsay{color:#876101;font-weight:bold}.theme-light .tajaran{color:#803b56}.theme-light .tajaran_signlang{color:#941c1c}.theme-light .skrell{color:#00ced1}.theme-light .soghun{color:#228b22}.theme-light .changeling{color:purple}.theme-light .vox{color:#a0a}.theme-light .monkey{color:#966c47}.theme-light .german{color:#858f1e;font-family:"Times New Roman",Times,serif}.theme-light .spanish{color:#cf982b}.theme-light .japanese{color:#940927}.theme-light .chinese{color:#fe1919}.theme-light .zombie{color:#216163;font-style:italic}.theme-light .commando{color:#fe9b24;font-style:bold}.theme-light .rough{font-family:trebuchet-ms,cursive,sans-serif}.theme-light .say_quote{font-family:Georgia,Verdana,sans-serif}.theme-light .admin .message{color:#314cad}.theme-light .admin .prefix{font-weight:bolder}.theme-light .pm{font-size:110%}.theme-light .retro_translator{font-weight:bold}.theme-light .yautja_translator{color:#a00;font-weight:bold;animation:glitch .5s infinite}@keyframes glitch{25%{color:#a00;transform:translate(-2px, -1px)}50%{color:#be0000;transform:translate(1px, -2px)}75%{color:#8d0000;transform:translate(-1px, 2px)}100%{color:#830000;transform:translate(1px, 1px)}}.theme-light .examine_block{background:#f2f7fa;border:1px solid #111a27;margin:.5em;padding:.5em .75em}.theme-light .examine_block .icon{width:1.5em;height:1.5em;margin:0;padding:0}.theme-light .tooltip{font-style:italic;border-bottom:1px dashed #000}
+html,body{box-sizing:border-box;height:100%;margin:0;font-size:12px}html{overflow:hidden;cursor:default}body{overflow:auto;font-family:Verdana,Geneva,sans-serif}*,*:before,*:after{box-sizing:inherit}h1,h2,h3,h4,h5,h6{display:block;margin:0;padding:6px 0;padding:.5rem 0}h1{font-size:18px;font-size:1.5rem}h2{font-size:16px;font-size:1.333rem}h3{font-size:14px;font-size:1.167rem}h4{font-size:12px;font-size:1rem}td,th{vertical-align:baseline;text-align:left}.candystripe:nth-child(odd){background-color:rgba(0,0,0,.25)}.color-black{color:#1a1a1a!important}.color-white{color:#fff!important}.color-red{color:#df3e3e!important}.color-orange{color:#f37f33!important}.color-yellow{color:#fbda21!important}.color-olive{color:#cbe41c!important}.color-green{color:#25ca4c!important}.color-teal{color:#00d6cc!important}.color-blue{color:#2e93de!important}.color-dark-blue{color:#005fa7!important}.color-violet{color:#7349cf!important}.color-purple{color:#ad45d0!important}.color-pink{color:#e34da1!important}.color-brown{color:#b97447!important}.color-grey{color:#848484!important}.color-light-grey{color:#b3b3b3!important}.color-good{color:#68c22d!important}.color-average{color:#f29a29!important}.color-bad{color:#df3e3e!important}.color-label{color:#8b9bb0!important}.color-xeno{color:#664573!important}.color-bg-black{background-color:#000!important}.color-bg-white{background-color:#d9d9d9!important}.color-bg-red{background-color:#bd2020!important}.color-bg-orange{background-color:#d95e0c!important}.color-bg-yellow{background-color:#d9b804!important}.color-bg-olive{background-color:#9aad14!important}.color-bg-green{background-color:#1b9638!important}.color-bg-teal{background-color:#009a93!important}.color-bg-blue{background-color:#1c71b1!important}.color-bg-dark-blue{background-color:#003e6e!important}.color-bg-violet{background-color:#552dab!important}.color-bg-purple{background-color:#8b2baa!important}.color-bg-pink{background-color:#cf2082!important}.color-bg-brown{background-color:#8c5836!important}.color-bg-grey{background-color:#646464!important}.color-bg-light-grey{background-color:#919191!important}.color-bg-good{background-color:#4d9121!important}.color-bg-average{background-color:#cd7a0d!important}.color-bg-bad{background-color:#bd2020!important}.color-bg-label{background-color:#657a94!important}.color-bg-xeno{background-color:#462f4e!important}.debug-layout,.debug-layout *:not(g):not(path){color:rgba(255,255,255,.9)!important;background:rgba(0,0,0,0)!important;outline:1px solid rgba(255,255,255,.5)!important;box-shadow:none!important;filter:none!important}.debug-layout:hover,.debug-layout *:not(g):not(path):hover{outline-color:rgba(255,255,255,.8)!important}.outline-dotted{outline-style:dotted!important}.outline-dashed{outline-style:dashed!important}.outline-solid{outline-style:solid!important}.outline-double{outline-style:double!important}.outline-groove{outline-style:groove!important}.outline-ridge{outline-style:ridge!important}.outline-inset{outline-style:inset!important}.outline-outset{outline-style:outset!important}.outline-color-black{outline:.167rem solid #1a1a1a!important}.outline-color-white{outline:.167rem solid #fff!important}.outline-color-red{outline:.167rem solid #df3e3e!important}.outline-color-orange{outline:.167rem solid #f37f33!important}.outline-color-yellow{outline:.167rem solid #fbda21!important}.outline-color-olive{outline:.167rem solid #cbe41c!important}.outline-color-green{outline:.167rem solid #25ca4c!important}.outline-color-teal{outline:.167rem solid #00d6cc!important}.outline-color-blue{outline:.167rem solid #2e93de!important}.outline-color-dark-blue{outline:.167rem solid #005fa7!important}.outline-color-violet{outline:.167rem solid #7349cf!important}.outline-color-purple{outline:.167rem solid #ad45d0!important}.outline-color-pink{outline:.167rem solid #e34da1!important}.outline-color-brown{outline:.167rem solid #b97447!important}.outline-color-grey{outline:.167rem solid #848484!important}.outline-color-light-grey{outline:.167rem solid #b3b3b3!important}.outline-color-good{outline:.167rem solid #68c22d!important}.outline-color-average{outline:.167rem solid #f29a29!important}.outline-color-bad{outline:.167rem solid #df3e3e!important}.outline-color-label{outline:.167rem solid #8b9bb0!important}.outline-color-xeno{outline:.167rem solid #664573!important}.text-left{text-align:left}.text-center{text-align:center}.text-right{text-align:right}.text-baseline{text-align:baseline}.text-justify{text-align:justify}.text-nowrap{white-space:nowrap}.text-pre{white-space:pre}.text-bold{font-weight:700}.text-italic{font-style:italic}.text-underline{text-decoration:underline}.BlockQuote{color:#8b9bb0;border-left:.1666666667em solid #8b9bb0;padding-left:.5em;margin-bottom:.5em}.BlockQuote:last-child{margin-bottom:0}.Button{position:relative;display:inline-block;line-height:1.667em;padding:0 .5em;margin-right:.1666666667em;white-space:nowrap;outline:0;border-radius:.16em;margin-bottom:.1666666667em;user-select:none;-ms-user-select:none}.Button .fa,.Button .fas,.Button .far{margin-left:-.25em;margin-right:-.25em;min-width:1.333em;text-align:center}.Button--hasContent .fa,.Button--hasContent .fas,.Button--hasContent .far{margin-right:.25em}.Button--hasContent.Button--iconPosition--right .fa,.Button--hasContent.Button--iconPosition--right .fas,.Button--hasContent.Button--iconPosition--right .far{margin-right:0;margin-left:3px}.Button--ellipsis{overflow:hidden;text-overflow:ellipsis}.Button--fluid{display:block;margin-left:0;margin-right:0}.Button--circular{border-radius:50%}.Button--compact{padding:0 .25em;line-height:1.333em}.Button--color--black{transition:color 50ms,background-color 50ms;background-color:#000;color:#fff}.Button--color--black:hover{transition:color 0ms,background-color 0ms}.Button--color--black:focus{transition:color .1s,background-color .1s}.Button--color--black:hover,.Button--color--black:focus{background-color:#131313;color:#fff}.Button--color--white{transition:color 50ms,background-color 50ms;background-color:#d9d9d9;color:#000}.Button--color--white:hover{transition:color 0ms,background-color 0ms}.Button--color--white:focus{transition:color .1s,background-color .1s}.Button--color--white:hover,.Button--color--white:focus{background-color:#f8f8f8;color:#000}.Button--color--red{transition:color 50ms,background-color 50ms;background-color:#bd2020;color:#fff}.Button--color--red:hover{transition:color 0ms,background-color 0ms}.Button--color--red:focus{transition:color .1s,background-color .1s}.Button--color--red:hover,.Button--color--red:focus{background-color:#dc4848;color:#fff}.Button--color--orange{transition:color 50ms,background-color 50ms;background-color:#d95e0c;color:#fff}.Button--color--orange:hover{transition:color 0ms,background-color 0ms}.Button--color--orange:focus{transition:color .1s,background-color .1s}.Button--color--orange:hover,.Button--color--orange:focus{background-color:#f0853f;color:#fff}.Button--color--yellow{transition:color 50ms,background-color 50ms;background-color:#d9b804;color:#000}.Button--color--yellow:hover{transition:color 0ms,background-color 0ms}.Button--color--yellow:focus{transition:color .1s,background-color .1s}.Button--color--yellow:hover,.Button--color--yellow:focus{background-color:#f5d72e;color:#000}.Button--color--olive{transition:color 50ms,background-color 50ms;background-color:#9aad14;color:#fff}.Button--color--olive:hover{transition:color 0ms,background-color 0ms}.Button--color--olive:focus{transition:color .1s,background-color .1s}.Button--color--olive:hover,.Button--color--olive:focus{background-color:#c4da2b;color:#fff}.Button--color--green{transition:color 50ms,background-color 50ms;background-color:#1b9638;color:#fff}.Button--color--green:hover{transition:color 0ms,background-color 0ms}.Button--color--green:focus{transition:color .1s,background-color .1s}.Button--color--green:hover,.Button--color--green:focus{background-color:#32c154;color:#fff}.Button--color--teal{transition:color 50ms,background-color 50ms;background-color:#009a93;color:#fff}.Button--color--teal:hover{transition:color 0ms,background-color 0ms}.Button--color--teal:focus{transition:color .1s,background-color .1s}.Button--color--teal:hover,.Button--color--teal:focus{background-color:#13c4bc;color:#fff}.Button--color--blue{transition:color 50ms,background-color 50ms;background-color:#1c71b1;color:#fff}.Button--color--blue:hover{transition:color 0ms,background-color 0ms}.Button--color--blue:focus{transition:color .1s,background-color .1s}.Button--color--blue:hover,.Button--color--blue:focus{background-color:#3a95d9;color:#fff}.Button--color--dark-blue{transition:color 50ms,background-color 50ms;background-color:#003e6e;color:#fff}.Button--color--dark-blue:hover{transition:color 0ms,background-color 0ms}.Button--color--dark-blue:focus{transition:color .1s,background-color .1s}.Button--color--dark-blue:hover,.Button--color--dark-blue:focus{background-color:#135b92;color:#fff}.Button--color--violet{transition:color 50ms,background-color 50ms;background-color:#552dab;color:#fff}.Button--color--violet:hover{transition:color 0ms,background-color 0ms}.Button--color--violet:focus{transition:color .1s,background-color .1s}.Button--color--violet:hover,.Button--color--violet:focus{background-color:#7953cc;color:#fff}.Button--color--purple{transition:color 50ms,background-color 50ms;background-color:#8b2baa;color:#fff}.Button--color--purple:hover{transition:color 0ms,background-color 0ms}.Button--color--purple:focus{transition:color .1s,background-color .1s}.Button--color--purple:hover,.Button--color--purple:focus{background-color:#ad4fcd;color:#fff}.Button--color--pink{transition:color 50ms,background-color 50ms;background-color:#cf2082;color:#fff}.Button--color--pink:hover{transition:color 0ms,background-color 0ms}.Button--color--pink:focus{transition:color .1s,background-color .1s}.Button--color--pink:hover,.Button--color--pink:focus{background-color:#e257a5;color:#fff}.Button--color--brown{transition:color 50ms,background-color 50ms;background-color:#8c5836;color:#fff}.Button--color--brown:hover{transition:color 0ms,background-color 0ms}.Button--color--brown:focus{transition:color .1s,background-color .1s}.Button--color--brown:hover,.Button--color--brown:focus{background-color:#b47851;color:#fff}.Button--color--grey{transition:color 50ms,background-color 50ms;background-color:#646464;color:#fff}.Button--color--grey:hover{transition:color 0ms,background-color 0ms}.Button--color--grey:focus{transition:color .1s,background-color .1s}.Button--color--grey:hover,.Button--color--grey:focus{background-color:#868686;color:#fff}.Button--color--light-grey{transition:color 50ms,background-color 50ms;background-color:#919191;color:#fff}.Button--color--light-grey:hover{transition:color 0ms,background-color 0ms}.Button--color--light-grey:focus{transition:color .1s,background-color .1s}.Button--color--light-grey:hover,.Button--color--light-grey:focus{background-color:#bababa;color:#fff}.Button--color--good{transition:color 50ms,background-color 50ms;background-color:#4d9121;color:#fff}.Button--color--good:hover{transition:color 0ms,background-color 0ms}.Button--color--good:focus{transition:color .1s,background-color .1s}.Button--color--good:hover,.Button--color--good:focus{background-color:#6cba39;color:#fff}.Button--color--average{transition:color 50ms,background-color 50ms;background-color:#cd7a0d;color:#fff}.Button--color--average:hover{transition:color 0ms,background-color 0ms}.Button--color--average:focus{transition:color .1s,background-color .1s}.Button--color--average:hover,.Button--color--average:focus{background-color:#ed9d35;color:#fff}.Button--color--bad{transition:color 50ms,background-color 50ms;background-color:#bd2020;color:#fff}.Button--color--bad:hover{transition:color 0ms,background-color 0ms}.Button--color--bad:focus{transition:color .1s,background-color .1s}.Button--color--bad:hover,.Button--color--bad:focus{background-color:#dc4848;color:#fff}.Button--color--label{transition:color 50ms,background-color 50ms;background-color:#657a94;color:#fff}.Button--color--label:hover{transition:color 0ms,background-color 0ms}.Button--color--label:focus{transition:color .1s,background-color .1s}.Button--color--label:hover,.Button--color--label:focus{background-color:#91a1b3;color:#fff}.Button--color--xeno{transition:color 50ms,background-color 50ms;background-color:#462f4e;color:#fff}.Button--color--xeno:hover{transition:color 0ms,background-color 0ms}.Button--color--xeno:focus{transition:color .1s,background-color .1s}.Button--color--xeno:hover,.Button--color--xeno:focus{background-color:#64496d;color:#fff}.Button--color--default{transition:color 50ms,background-color 50ms;background-color:#3e6189;color:#fff}.Button--color--default:hover{transition:color 0ms,background-color 0ms}.Button--color--default:focus{transition:color .1s,background-color .1s}.Button--color--default:hover,.Button--color--default:focus{background-color:#5c83b0;color:#fff}.Button--color--caution{transition:color 50ms,background-color 50ms;background-color:#d9b804;color:#000}.Button--color--caution:hover{transition:color 0ms,background-color 0ms}.Button--color--caution:focus{transition:color .1s,background-color .1s}.Button--color--caution:hover,.Button--color--caution:focus{background-color:#f5d72e;color:#000}.Button--color--danger{transition:color 50ms,background-color 50ms;background-color:#bd2020;color:#fff}.Button--color--danger:hover{transition:color 0ms,background-color 0ms}.Button--color--danger:focus{transition:color .1s,background-color .1s}.Button--color--danger:hover,.Button--color--danger:focus{background-color:#dc4848;color:#fff}.Button--color--transparent{transition:color 50ms,background-color 50ms;background-color:#202020;color:#fff;background-color:rgba(32,32,32,0);color:rgba(255,255,255,.5)}.Button--color--transparent:hover{transition:color 0ms,background-color 0ms}.Button--color--transparent:focus{transition:color .1s,background-color .1s}.Button--color--transparent:hover,.Button--color--transparent:focus{background-color:#383838;color:#fff}.Button--disabled{background-color:#999!important}.Button--selected{transition:color 50ms,background-color 50ms;background-color:#1b9638;color:#fff}.Button--selected:hover{transition:color 0ms,background-color 0ms}.Button--selected:focus{transition:color .1s,background-color .1s}.Button--selected:hover,.Button--selected:focus{background-color:#32c154;color:#fff}.Button--flex{display:inline-flex;flex-direction:column}.Button--flex--fluid{width:100%}.Button--verticalAlignContent--top{justify-content:flex-start}.Button--verticalAlignContent--middle{justify-content:center}.Button--verticalAlignContent--bottom{justify-content:flex-end}.Button__content{display:block;align-self:stretch}.ColorBox{display:inline-block;width:1em;height:1em;line-height:1em;text-align:center}.Dimmer{display:flex;justify-content:center;align-items:center;position:absolute;top:0;bottom:0;left:0;right:0;background-color:rgba(0,0,0,.75);z-index:1}.Dropdown{position:relative}.Dropdown__control{position:relative;display:inline-block;font-family:Verdana,sans-serif;font-size:1em;width:8.3333333333em;line-height:1.4166666667em;-ms-user-select:none;user-select:none}.Dropdown__arrow-button{float:right;padding-left:.35em;width:1.2em;height:1.8333333333em;border-left:.0833333333em solid #000;border-left:.0833333333em solid rgba(0,0,0,.25)}.Dropdown__menu{position:absolute;overflow-y:auto;z-index:5;width:8.3333333333em;max-height:16.6666666667em;overflow-y:scroll;border-radius:0 0 .1666666667em .1666666667em;color:#fff;background-color:#000;background-color:rgba(0,0,0,.75)}.Dropdown__menu-noscroll{position:absolute;overflow-y:auto;z-index:5;width:8.3333333333em;max-height:16.6666666667em;border-radius:0 0 .1666666667em .1666666667em;color:#fff;background-color:#000;background-color:rgba(0,0,0,.75)}.Dropdown__menuentry{padding:.1666666667em .3333333333em;font-family:Verdana,sans-serif;font-size:1em;line-height:1.4166666667em;transition:background-color .1s ease-out}.Dropdown__menuentry:hover{background-color:rgba(255,255,255,.2);transition:background-color 0ms}.Dropdown__over{top:auto;bottom:100%}.Dropdown__selected-text{display:inline-block;text-overflow:ellipsis;white-space:nowrap;height:1.4166666667em;width:calc(100% - 1.2em)}.Flex{display:-ms-flexbox;display:flex}.Flex--inline{display:inline-flex}.Flex--iefix{display:block}.Flex--iefix.Flex--inline,.Flex__item--iefix{display:inline-block}.Flex--iefix--column>.Flex__item--iefix{display:block}.Knob{position:relative;font-size:1rem;width:2.6em;height:2.6em;margin:0 auto -.2em;cursor:n-resize}.Knob:after{content:".";color:rgba(0,0,0,0);line-height:2.5em}.Knob__circle{position:absolute;top:.1em;bottom:.1em;left:.1em;right:.1em;margin:.3em;background-color:#333;background-image:linear-gradient(to bottom,rgba(255,255,255,.15),rgba(255,255,255,0));border-radius:50%;box-shadow:0 .05em .5em rgba(0,0,0,.5)}.Knob__cursorBox{position:absolute;top:0;bottom:0;left:0;right:0}.Knob__cursor{position:relative;top:.05em;margin:0 auto;width:.2em;height:.8em;background-color:rgba(255,255,255,.9)}.Knob__popupValue{position:absolute;top:-2rem;right:50%;font-size:1rem;text-align:center;padding:.25rem .5rem;color:#fff;background-color:#000;transform:translate(50%);white-space:nowrap}.Knob__ring{position:absolute;top:0;bottom:0;left:0;right:0;padding:.1em}.Knob__ringTrackPivot{transform:rotate(135deg)}.Knob__ringTrack{fill:rgba(0,0,0,0);stroke:rgba(255,255,255,.1);stroke-width:8;stroke-linecap:round;stroke-dasharray:235.62}.Knob__ringFillPivot{transform:rotate(135deg)}.Knob--bipolar .Knob__ringFillPivot{transform:rotate(270deg)}.Knob__ringFill{fill:rgba(0,0,0,0);stroke:#6a96c9;stroke-width:8;stroke-linecap:round;stroke-dasharray:314.16;transition:stroke 50ms ease-out}.Knob--color--black .Knob__ringFill{stroke:#1a1a1a}.Knob--color--white .Knob__ringFill{stroke:#fff}.Knob--color--red .Knob__ringFill{stroke:#df3e3e}.Knob--color--orange .Knob__ringFill{stroke:#f37f33}.Knob--color--yellow .Knob__ringFill{stroke:#fbda21}.Knob--color--olive .Knob__ringFill{stroke:#cbe41c}.Knob--color--green .Knob__ringFill{stroke:#25ca4c}.Knob--color--teal .Knob__ringFill{stroke:#00d6cc}.Knob--color--blue .Knob__ringFill{stroke:#2e93de}.Knob--color--dark-blue .Knob__ringFill{stroke:#005fa7}.Knob--color--violet .Knob__ringFill{stroke:#7349cf}.Knob--color--purple .Knob__ringFill{stroke:#ad45d0}.Knob--color--pink .Knob__ringFill{stroke:#e34da1}.Knob--color--brown .Knob__ringFill{stroke:#b97447}.Knob--color--grey .Knob__ringFill{stroke:#848484}.Knob--color--light-grey .Knob__ringFill{stroke:#b3b3b3}.Knob--color--good .Knob__ringFill{stroke:#68c22d}.Knob--color--average .Knob__ringFill{stroke:#f29a29}.Knob--color--bad .Knob__ringFill{stroke:#df3e3e}.Knob--color--label .Knob__ringFill{stroke:#8b9bb0}.Knob--color--xeno .Knob__ringFill{stroke:#664573}.LabeledList{display:table;width:100%;width:calc(100% + 1em);border-collapse:collapse;border-spacing:0;margin:-.25em -.5em 0;padding:0}.LabeledList__row{display:table-row}.LabeledList__row:last-child .LabeledList__cell{padding-bottom:0}.LabeledList__cell{display:table-cell;margin:0;padding:.25em .5em;border:0;text-align:left}.LabeledList__label--nowrap{width:1%;white-space:nowrap;min-width:5em}.LabeledList__buttons{width:.1%;white-space:nowrap;text-align:right;padding-top:.0833333333em;padding-bottom:0}.Modal{background-color:#202020;max-width:calc(100% - 1rem);padding:1rem}.NoticeBox{padding:.33em .5em;margin-bottom:.5em;box-shadow:none;font-weight:700;font-style:italic;color:#000;background-color:#bb9b68;background-image:repeating-linear-gradient(-45deg,transparent,transparent .8333333333em,rgba(0,0,0,.1) .8333333333em,rgba(0,0,0,.1) 1.6666666667em)}.NoticeBox--color--black{color:#fff;background-color:#000}.NoticeBox--color--white{color:#000;background-color:#b3b3b3}.NoticeBox--color--red{color:#fff;background-color:#701f1f}.NoticeBox--color--orange{color:#fff;background-color:#854114}.NoticeBox--color--yellow{color:#000;background-color:#83710d}.NoticeBox--color--olive{color:#000;background-color:#576015}.NoticeBox--color--green{color:#fff;background-color:#174e24}.NoticeBox--color--teal{color:#fff;background-color:#064845}.NoticeBox--color--blue{color:#fff;background-color:#1b4565}.NoticeBox--color--dark-blue{color:#fff;background-color:#02121f}.NoticeBox--color--violet{color:#fff;background-color:#3b2864}.NoticeBox--color--purple{color:#fff;background-color:#542663}.NoticeBox--color--pink{color:#fff;background-color:#802257}.NoticeBox--color--brown{color:#fff;background-color:#4c3729}.NoticeBox--color--grey{color:#fff;background-color:#3e3e3e}.NoticeBox--color--light-grey{color:#fff;background-color:#6a6a6a}.NoticeBox--color--good{color:#fff;background-color:#2e4b1a}.NoticeBox--color--average{color:#fff;background-color:#7b4e13}.NoticeBox--color--bad{color:#fff;background-color:#701f1f}.NoticeBox--color--label{color:#fff;background-color:#53565a}.NoticeBox--color--xeno{color:#fff;background-color:#19161b}.NoticeBox--type--info{color:#fff;background-color:#235982}.NoticeBox--type--success{color:#fff;background-color:#1e662f}.NoticeBox--type--warning{color:#fff;background-color:#a95219}.NoticeBox--type--danger{color:#fff;background-color:#8f2828}.NumberInput{position:relative;display:inline-block;border:.0833333333em solid #88bfff;border:.0833333333em solid rgba(136,191,255,.75);border-radius:.16em;color:#88bfff;background-color:#0a0a0a;padding:0 .3333333333em;margin-right:.1666666667em;line-height:1.4166666667em;text-align:right;overflow:visible;cursor:n-resize}.NumberInput--fluid{display:block}.NumberInput__content{margin-left:.5em}.NumberInput__barContainer{position:absolute;top:.1666666667em;bottom:.1666666667em;left:.1666666667em}.NumberInput__bar{position:absolute;bottom:0;left:0;width:.25em;box-sizing:border-box;border-bottom:.0833333333em solid #88bfff;background-color:#88bfff}.NumberInput__input{display:block;position:absolute;top:0;bottom:0;left:0;right:0;border:0;outline:0;width:100%;font-size:1em;line-height:1.4166666667em;height:1.4166666667em;margin:0;padding:0 .5em;font-family:Verdana,sans-serif;background-color:#0a0a0a;color:#fff;text-align:right}.ProgressBar{display:inline-block;position:relative;width:100%;padding:0 .5em;border-width:.0833333333em!important;border-style:solid!important;border-radius:.16em;background-color:rgba(0,0,0,0);transition:border-color .9s ease-out}.ProgressBar__fill{position:absolute;top:-.5px;left:0;bottom:-.5px}.ProgressBar__fill--animated{transition:background-color .9s ease-out,width .9s ease-out}.ProgressBar__content{position:relative;line-height:1.4166666667em;width:100%;text-align:right}.ProgressBar--color--default{border:.0833333333em solid #3e6189}.ProgressBar--color--default .ProgressBar__fill{background-color:#3e6189}.ProgressBar--color--black{border-color:#000!important}.ProgressBar--color--black .ProgressBar__fill{background-color:#000}.ProgressBar--color--white{border-color:#d9d9d9!important}.ProgressBar--color--white .ProgressBar__fill{background-color:#d9d9d9}.ProgressBar--color--red{border-color:#bd2020!important}.ProgressBar--color--red .ProgressBar__fill{background-color:#bd2020}.ProgressBar--color--orange{border-color:#d95e0c!important}.ProgressBar--color--orange .ProgressBar__fill{background-color:#d95e0c}.ProgressBar--color--yellow{border-color:#d9b804!important}.ProgressBar--color--yellow .ProgressBar__fill{background-color:#d9b804}.ProgressBar--color--olive{border-color:#9aad14!important}.ProgressBar--color--olive .ProgressBar__fill{background-color:#9aad14}.ProgressBar--color--green{border-color:#1b9638!important}.ProgressBar--color--green .ProgressBar__fill{background-color:#1b9638}.ProgressBar--color--teal{border-color:#009a93!important}.ProgressBar--color--teal .ProgressBar__fill{background-color:#009a93}.ProgressBar--color--blue{border-color:#1c71b1!important}.ProgressBar--color--blue .ProgressBar__fill{background-color:#1c71b1}.ProgressBar--color--dark-blue{border-color:#003e6e!important}.ProgressBar--color--dark-blue .ProgressBar__fill{background-color:#003e6e}.ProgressBar--color--violet{border-color:#552dab!important}.ProgressBar--color--violet .ProgressBar__fill{background-color:#552dab}.ProgressBar--color--purple{border-color:#8b2baa!important}.ProgressBar--color--purple .ProgressBar__fill{background-color:#8b2baa}.ProgressBar--color--pink{border-color:#cf2082!important}.ProgressBar--color--pink .ProgressBar__fill{background-color:#cf2082}.ProgressBar--color--brown{border-color:#8c5836!important}.ProgressBar--color--brown .ProgressBar__fill{background-color:#8c5836}.ProgressBar--color--grey{border-color:#646464!important}.ProgressBar--color--grey .ProgressBar__fill{background-color:#646464}.ProgressBar--color--light-grey{border-color:#919191!important}.ProgressBar--color--light-grey .ProgressBar__fill{background-color:#919191}.ProgressBar--color--good{border-color:#4d9121!important}.ProgressBar--color--good .ProgressBar__fill{background-color:#4d9121}.ProgressBar--color--average{border-color:#cd7a0d!important}.ProgressBar--color--average .ProgressBar__fill{background-color:#cd7a0d}.ProgressBar--color--bad{border-color:#bd2020!important}.ProgressBar--color--bad .ProgressBar__fill{background-color:#bd2020}.ProgressBar--color--label{border-color:#657a94!important}.ProgressBar--color--label .ProgressBar__fill{background-color:#657a94}.ProgressBar--color--xeno{border-color:#462f4e!important}.ProgressBar--color--xeno .ProgressBar__fill{background-color:#462f4e}.Section{position:relative;margin-bottom:.5em;background-color:#131313;box-sizing:border-box}.Section:last-child{margin-bottom:0}.Section__title{position:relative;padding:.5em;border-bottom:.1666666667em solid #4972a1}.Section__titleText{font-size:1.1666666667em;font-weight:700;color:#fff}.Section__buttons{position:absolute;display:inline-block;right:.5em;margin-top:-.0833333333em}.Section__rest{position:relative}.Section__content{padding:.66em .5em}.Section--fitted>.Section__rest>.Section__content{padding:0}.Section--fill{display:flex;flex-direction:column;height:100%}.Section--fill>.Section__rest{flex-grow:1}.Section--fill>.Section__rest>.Section__content{height:100%}.Section--fill.Section--scrollable>.Section__rest>.Section__content{position:absolute;top:0;left:0;right:0;bottom:0}.Section--fill.Section--iefix{display:table!important;width:100%!important;height:100%!important;border-collapse:collapse;border-spacing:0}.Section--fill.Section--iefix>.Section__rest{display:table-row!important;height:100%!important}.Section--scrollable{overflow-x:hidden;overflow-y:hidden}.Section--scrollable>.Section__rest>.Section__content{overflow-y:scroll;overflow-x:hidden}.Section--scrollableHorizontal{overflow-x:hidden;overflow-y:hidden}.Section--scrollableHorizontal>.Section__rest>.Section__content{overflow-y:hidden;overflow-x:scroll}.Section--scrollable.Section--scrollableHorizontal{overflow-x:hidden;overflow-y:hidden}.Section--scrollable.Section--scrollableHorizontal>.Section__rest>.Section__content{overflow-y:scroll;overflow-x:scroll}.Section .Section{background-color:rgba(0,0,0,0);margin-left:-.5em;margin-right:-.5em}.Section .Section:first-child{margin-top:-.5em}.Section .Section .Section__titleText{font-size:1.0833333333em}.Section .Section .Section .Section__titleText{font-size:1em}.Slider{cursor:e-resize}.Slider__cursorOffset{position:absolute;top:0;left:0;bottom:0;transition:none!important}.Slider__cursor{position:absolute;top:0;right:-.0833333333em;bottom:0;width:0;border-left:.1666666667em solid #fff}.Slider__pointer{position:absolute;right:-.4166666667em;bottom:-.3333333333em;width:0;height:0;border-left:.4166666667em solid rgba(0,0,0,0);border-right:.4166666667em solid rgba(0,0,0,0);border-bottom:.4166666667em solid #fff}.Slider__popupValue{position:absolute;right:0;top:-2rem;font-size:1rem;padding:.25rem .5rem;color:#fff;background-color:#000;transform:translate(50%);white-space:nowrap}.Divider--horizontal{margin:.5em 0}.Divider--horizontal:not(.Divider--hidden){border-top:.1666666667em solid rgba(255,255,255,.1)}.Divider--vertical{height:100%;margin:0 .5em}.Divider--vertical:not(.Divider--hidden){border-left:.1666666667em solid rgba(255,255,255,.1)}.Stack--fill{height:100%}.Stack--horizontal>.Stack__item{margin-left:.5em}.Stack--horizontal>.Stack__item:first-child{margin-left:0}.Stack--vertical>.Stack__item{margin-top:.5em}.Stack--vertical>.Stack__item:first-child{margin-top:0}.Stack--horizontal>.Stack__divider:not(.Stack__divider--hidden){border-left:.1666666667em solid rgba(255,255,255,.1)}.Stack--vertical>.Stack__divider:not(.Stack__divider--hidden){border-top:.1666666667em solid rgba(255,255,255,.1)}.Table{display:table;width:100%;border-collapse:collapse;border-spacing:0;margin:0}.Table--collapsing{width:auto}.Table__row{display:table-row}.Table__cell{display:table-cell;padding:0 .25em}.Table__cell:first-child{padding-left:0}.Table__cell:last-child{padding-right:0}.Table__row--header .Table__cell,.Table__cell--header{font-weight:700;padding-bottom:.5em}.Table__cell--collapsing{width:1%;white-space:nowrap}.Tabs{display:flex;align-items:stretch;overflow:hidden;background-color:#131313}.Tabs--fill{height:100%}.Section .Tabs{background-color:rgba(0,0,0,0)}.Section:not(.Section--fitted) .Tabs{margin:0 -.5em .5em}.Section:not(.Section--fitted) .Tabs:first-child{margin-top:-.5em}.Tabs--vertical{flex-direction:column;padding:.25em 0 .25em .25em}.Tabs--horizontal{margin-bottom:.5em;padding:.25em .25em 0}.Tabs--horizontal:last-child{margin-bottom:0}.Tabs__Tab{flex-grow:0}.Tabs--fluid .Tabs__Tab{flex-grow:1}.Tab{display:flex;align-items:center;justify-content:space-between;background-color:rgba(0,0,0,0);color:rgba(255,255,255,.5);min-height:2.25em;min-width:4em}.Tab:not(.Tab--selected):hover{background-color:rgba(255,255,255,.075)}.Tab--selected{background-color:rgba(255,255,255,.125);color:#dfe7f0}.Tab__text{flex-grow:1;margin:0 .5em}.Tab__left{min-width:1.5em;text-align:center;margin-left:.25em}.Tab__right{min-width:1.5em;text-align:center;margin-right:.25em}.Tabs--horizontal .Tab{border-top:.1666666667em solid rgba(0,0,0,0);border-bottom:.1666666667em solid rgba(0,0,0,0);border-top-left-radius:.25em;border-top-right-radius:.25em}.Tabs--horizontal .Tab--selected{border-bottom:.1666666667em solid #d4dfec}.Tabs--vertical .Tab{min-height:2em;border-left:.1666666667em solid rgba(0,0,0,0);border-right:.1666666667em solid rgba(0,0,0,0);border-top-left-radius:.25em;border-bottom-left-radius:.25em}.Tabs--vertical .Tab--selected{border-right:.1666666667em solid #d4dfec}.Tab--selected.Tab--color--black{color:#535353}.Tabs--horizontal .Tab--selected.Tab--color--black{border-bottom-color:#1a1a1a}.Tabs--vertical .Tab--selected.Tab--color--black{border-right-color:#1a1a1a}.Tab--selected.Tab--color--white{color:#fff}.Tabs--horizontal .Tab--selected.Tab--color--white{border-bottom-color:#fff}.Tabs--vertical .Tab--selected.Tab--color--white{border-right-color:#fff}.Tab--selected.Tab--color--red{color:#e76e6e}.Tabs--horizontal .Tab--selected.Tab--color--red{border-bottom-color:#df3e3e}.Tabs--vertical .Tab--selected.Tab--color--red{border-right-color:#df3e3e}.Tab--selected.Tab--color--orange{color:#f69f66}.Tabs--horizontal .Tab--selected.Tab--color--orange{border-bottom-color:#f37f33}.Tabs--vertical .Tab--selected.Tab--color--orange{border-right-color:#f37f33}.Tab--selected.Tab--color--yellow{color:#fce358}.Tabs--horizontal .Tab--selected.Tab--color--yellow{border-bottom-color:#fbda21}.Tabs--vertical .Tab--selected.Tab--color--yellow{border-right-color:#fbda21}.Tab--selected.Tab--color--olive{color:#d8eb55}.Tabs--horizontal .Tab--selected.Tab--color--olive{border-bottom-color:#cbe41c}.Tabs--vertical .Tab--selected.Tab--color--olive{border-right-color:#cbe41c}.Tab--selected.Tab--color--green{color:#53e074}.Tabs--horizontal .Tab--selected.Tab--color--green{border-bottom-color:#25ca4c}.Tabs--vertical .Tab--selected.Tab--color--green{border-right-color:#25ca4c}.Tab--selected.Tab--color--teal{color:#21fff5}.Tabs--horizontal .Tab--selected.Tab--color--teal{border-bottom-color:#00d6cc}.Tabs--vertical .Tab--selected.Tab--color--teal{border-right-color:#00d6cc}.Tab--selected.Tab--color--blue{color:#62aee6}.Tabs--horizontal .Tab--selected.Tab--color--blue{border-bottom-color:#2e93de}.Tabs--vertical .Tab--selected.Tab--color--blue{border-right-color:#2e93de}.Tab--selected.Tab--color--dark-blue{color:#008ffd}.Tabs--horizontal .Tab--selected.Tab--color--dark-blue{border-bottom-color:#005fa7}.Tabs--vertical .Tab--selected.Tab--color--dark-blue{border-right-color:#005fa7}.Tab--selected.Tab--color--violet{color:#9676db}.Tabs--horizontal .Tab--selected.Tab--color--violet{border-bottom-color:#7349cf}.Tabs--vertical .Tab--selected.Tab--color--violet{border-right-color:#7349cf}.Tab--selected.Tab--color--purple{color:#c274db}.Tabs--horizontal .Tab--selected.Tab--color--purple{border-bottom-color:#ad45d0}.Tabs--vertical .Tab--selected.Tab--color--purple{border-right-color:#ad45d0}.Tab--selected.Tab--color--pink{color:#ea79b9}.Tabs--horizontal .Tab--selected.Tab--color--pink{border-bottom-color:#e34da1}.Tabs--vertical .Tab--selected.Tab--color--pink{border-right-color:#e34da1}.Tab--selected.Tab--color--brown{color:#ca9775}.Tabs--horizontal .Tab--selected.Tab--color--brown{border-bottom-color:#b97447}.Tabs--vertical .Tab--selected.Tab--color--brown{border-right-color:#b97447}.Tab--selected.Tab--color--grey{color:#a3a3a3}.Tabs--horizontal .Tab--selected.Tab--color--grey{border-bottom-color:#848484}.Tabs--vertical .Tab--selected.Tab--color--grey{border-right-color:#848484}.Tab--selected.Tab--color--light-grey{color:#c6c6c6}.Tabs--horizontal .Tab--selected.Tab--color--light-grey{border-bottom-color:#b3b3b3}.Tabs--vertical .Tab--selected.Tab--color--light-grey{border-right-color:#b3b3b3}.Tab--selected.Tab--color--good{color:#8cd95a}.Tabs--horizontal .Tab--selected.Tab--color--good{border-bottom-color:#68c22d}.Tabs--vertical .Tab--selected.Tab--color--good{border-right-color:#68c22d}.Tab--selected.Tab--color--average{color:#f5b35e}.Tabs--horizontal .Tab--selected.Tab--color--average{border-bottom-color:#f29a29}.Tabs--vertical .Tab--selected.Tab--color--average{border-right-color:#f29a29}.Tab--selected.Tab--color--bad{color:#e76e6e}.Tabs--horizontal .Tab--selected.Tab--color--bad{border-bottom-color:#df3e3e}.Tabs--vertical .Tab--selected.Tab--color--bad{border-right-color:#df3e3e}.Tab--selected.Tab--color--label{color:#a8b4c4}.Tabs--horizontal .Tab--selected.Tab--color--label{border-bottom-color:#8b9bb0}.Tabs--vertical .Tab--selected.Tab--color--label{border-right-color:#8b9bb0}.Tab--selected.Tab--color--xeno{color:#9366a3}.Tabs--horizontal .Tab--selected.Tab--color--xeno{border-bottom-color:#664573}.Tabs--vertical .Tab--selected.Tab--color--xeno{border-right-color:#664573}.Input{position:relative;display:inline-block;width:10em;border:.0833333333em solid #88bfff;border:.0833333333em solid rgba(136,191,255,.75);border-radius:.16em;color:#fff;background-color:#0a0a0a;padding:0 .3333333333em;margin-right:.1666666667em;line-height:1.4166666667em;overflow:visible}.Input--fluid{display:block;width:auto}.Input__baseline{display:inline-block;color:rgba(0,0,0,0)}.Input__input{display:block;position:absolute;top:0;bottom:0;left:0;right:0;border:0;outline:0;width:100%;font-size:1em;line-height:1.4166666667em;height:1.4166666667em;margin:0;padding:0 .5em;font-family:Verdana,sans-serif;background-color:rgba(0,0,0,0);color:#fff;color:inherit}.Input__input:-ms-input-placeholder{font-style:italic;color:#777;color:rgba(255,255,255,.45)}.Input--monospace .Input__input{font-family:Consolas,monospace}.TextArea{position:relative;display:inline-block;border:.0833333333em solid #88bfff;border:.0833333333em solid rgba(136,191,255,.75);border-radius:.16em;background-color:#0a0a0a;margin-right:.1666666667em;line-height:1.4166666667em;box-sizing:border-box;width:100%}.TextArea--fluid{display:block;width:auto;height:auto}.TextArea--noborder{border:0px}.TextArea__textarea.TextArea__textarea--scrollable{overflow:auto;overflow-x:hidden;overflow-y:scroll}.TextArea__textarea{display:block;position:absolute;top:0;bottom:0;left:0;right:0;border:0;outline:0;width:100%;height:100%;font-size:1em;line-height:1.4166666667em;min-height:1.4166666667em;margin:0;padding:0 .5em;font-family:inherit;background-color:rgba(0,0,0,0);color:inherit;box-sizing:border-box;word-wrap:break-word;overflow:hidden}.TextArea__textarea:-ms-input-placeholder{font-style:italic;color:#777;color:rgba(255,255,255,.45)}.TextArea__textarea_custom{overflow:visible;white-space:pre-wrap}.Tooltip{z-index:2;padding:.5em .75em;pointer-events:none;text-align:left;transition:opacity .15s ease-out;background-color:#000;color:#fff;box-shadow:.1em .1em 1.25em -.1em rgba(0,0,0,.5);border-radius:.16em;max-width:20.8333333333em}.Chat{color:#abc6ec}.Chat__badge{display:inline-block;min-width:.5em;font-size:.7em;padding:.2em .3em;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:middle;background-color:#dc143c;border-radius:10px;transition:font-size .2s ease-out}.Chat__badge:before{content:"x"}.Chat__badge--animate{font-size:.9em;transition:font-size 0ms}.Chat__scrollButton{position:fixed;right:2em;bottom:1em}.Chat__reconnected{font-size:.85em;text-align:center;margin:1em 0 2em}.Chat__reconnected:before{content:"Reconnected";display:inline-block;border-radius:1em;padding:0 .7em;color:#db2828;background-color:#131313}.Chat__reconnected:after{content:"";display:block;margin-top:-.75em;border-bottom:.1666666667em solid #db2828}.Chat__highlight{color:#000}.Chat__highlight--restricted{color:#fff;background-color:#a00;font-weight:700}.ChatMessage{word-wrap:break-word}.ChatMessage--highlighted{position:relative;border-left:.1666666667em solid #fd4;padding-left:.5em}.ChatMessage--highlighted:after{content:"";position:absolute;top:0;bottom:0;left:0;right:0;background-color:rgba(255,221,68,.1);pointer-events:none}.Ping{position:relative;padding:.125em .25em;border:.0833333333em solid rgba(140,140,140,.5);border-radius:.25em;width:3.75em;text-align:right}.Ping__indicator{content:"";position:absolute;top:.5em;left:.5em;width:.5em;height:.5em;background-color:#888;border-radius:.25em}.Notifications{position:absolute;bottom:1em;left:1em;right:2em}.Notification{color:#fff;background-color:#dc143c;padding:.5em;margin:1em 0}.Notification:first-child{margin-top:0}.Notification:last-child{margin-bottom:0}.Layout,.Layout *{scrollbar-base-color:#181818;scrollbar-face-color:#363636;scrollbar-3dlight-color:#202020;scrollbar-highlight-color:#202020;scrollbar-track-color:#181818;scrollbar-arrow-color:#909090;scrollbar-shadow-color:#363636}.Layout__content{position:absolute;top:0;bottom:0;left:0;right:0;overflow-x:hidden;overflow-y:hidden}.Layout__content--scrollable{overflow-y:scroll;margin-bottom:0}.Window{position:fixed;top:0;bottom:0;left:0;right:0;color:#fff;background-color:#202020;background-image:linear-gradient(to bottom,#202020,#202020)}.Window__titleBar{position:fixed;z-index:1;top:0;left:0;width:100%;height:32px;height:2.6666666667rem}.Window__rest{position:fixed;top:32px;top:2.6666666667rem;bottom:0;left:0;right:0}.Window__contentPadding{margin:.5rem;height:100%;height:calc(100% - 1.01rem)}.Window__contentPadding:after{height:0}.Layout__content--scrollable .Window__contentPadding:after{display:block;content:"";height:.5rem}.Window__dimmer{position:fixed;top:0;bottom:0;left:0;right:0;background-color:rgba(56,56,56,.25);pointer-events:none}.Window__resizeHandle__se{position:fixed;bottom:0;right:0;width:20px;width:1.6666666667rem;height:20px;height:1.6666666667rem;cursor:se-resize}.Window__resizeHandle__s{position:fixed;bottom:0;left:0;right:0;height:6px;height:.5rem;cursor:s-resize}.Window__resizeHandle__e{position:fixed;top:0;bottom:0;right:0;width:3px;width:.25rem;cursor:e-resize}img{margin:0;padding:0;line-height:1;-ms-interpolation-mode:nearest-neighbor;image-rendering:pixelated}img.icon{height:1em;min-height:16px;width:auto;vertical-align:bottom}a{color:#397ea5}a.visited,a:visited{color:#7c00e6}a.popt{text-decoration:none}.popup{position:fixed;top:50%;left:50%;background:#ddd}.popup .close{position:absolute;background:#aaa;top:0;right:0;color:#333;text-decoration:none;z-index:2;padding:0 10px;height:30px;line-height:30px}.popup .close:hover{background:#999}.popup .head{background:#999;color:#ddd;padding:0 10px;height:30px;line-height:30px;text-transform:uppercase;font-size:.9em;font-weight:700;border-bottom:2px solid green}.popup input{border:1px solid #999;background:#fff;margin:0;padding:5px;outline:none;color:#333}.popup input[type=text]:hover,.popup input[type=text]:active,.popup input[type=text]:focus{border-color:green}.popup input[type=submit]{padding:5px 10px;background:#999;color:#ddd;text-transform:uppercase;font-size:.9em;font-weight:700}.popup input[type=submit]:hover,.popup input[type=submit]:focus,.popup input[type=submit]:active{background:#aaa;cursor:pointer}.changeFont{padding:10px}.changeFont a{display:block;text-decoration:none;padding:3px;color:#333}.changeFont a:hover{background:#ccc}.highlightPopup{padding:10px;text-align:center}.highlightPopup input[type=text]{display:block;width:215px;text-align:left;margin-top:5px}.highlightPopup input.highlightColor{background-color:#ff0}.highlightPopup input.highlightTermSubmit{margin-top:5px}.contextMenu{background-color:#ddd;position:fixed;margin:2px;width:150px}.contextMenu a{display:block;padding:2px 5px;text-decoration:none;color:#333}.contextMenu a:hover{background-color:#ccc}.filterMessages{padding:5px}.filterMessages div{padding:2px 0}.icon-stack{height:1em;line-height:1em;width:1em;vertical-align:middle;margin-top:-2px}.motd{color:#a4bad6;font-family:Verdana,sans-serif;white-space:normal}.motd h1,.motd h2,.motd h3,.motd h4,.motd h5,.motd h6{color:#a4bad6;text-decoration:underline}.motd a,.motd a:link,.motd a:visited,.motd a:active,.motd a:hover{color:#a4bad6}.bold,.name,.prefix,.ooc,.looc,.adminooc,.admin,.niche,.medal,.yell{font-weight:700}.italic,.italics{font-style:italic}.highlight{background:#ff0}h1,h2,h3,h4,h5,h6{color:#a4bad6;font-family:Georgia,Verdana,sans-serif}h1.alert,h2.alert{color:#a4bad6}em{font-style:normal;font-weight:700}.ooc{font-weight:700}.adminobserverooc{color:#09c;font-weight:700}.adminooc{color:#3d5bc3;font-weight:700}.adminsay{color:#9611d4;font-weight:700}.admin,.niche{color:#5975da;font-weight:700}.name{font-weight:700}.deadsay{color:#e2c1ff}.binarysay{color:#1e90ff}.binarysay a{color:#0f0}.binarysay a:active,.binarysay a:visited{color:#8f8}.radio{color:#1ecc43}.sciradio{color:#c68cfa}.comradio{color:#fcdf03}.secradio{color:#dd3535}.medradio{color:#57b8f0}.engradio{color:#f37746}.suppradio{color:#b88646}.servradio{color:#6ca729}.syndradio{color:#8f4a4b}.gangradio{color:#ac2ea1}.centcomradio{color:#2681a5}.aiprivradio{color:#d65d95}.redteamradio{color:#f44}.blueteamradio{color:#3434fd}.greenteamradio{color:#34fd34}.yellowteamradio{color:#fdfd34}.yell{font-weight:700}.alert{color:#d82020}.userdanger{color:#c51e1e;font-weight:700;font-size:185%}.bolddanger{color:#c51e1e;font-weight:700}.danger{color:#c51e1e}.warning{color:#c51e1e;font-style:italic}.alertwarning{color:red;font-weight:700}.boldwarning{color:#c51e1e;font-style:italic;font-weight:700}.announce,.boldannounce{color:#c51e1e;font-weight:700}.bigannounce{font-weight:700;font-size:115%}.greenannounce{color:#059223;font-weight:700}.info{color:#9ab0ff}.notice,.staff_ic{color:#6685f5}.tinynotice{color:#6685f5;font-size:85%}.tinynoticeital{color:#6685f5;font-style:italic;font-size:85%}.smallnotice{color:#6685f5;font-size:90%}.smallnoticeital{color:#6685f5;font-style:italic;font-size:90%}.boldnotice{color:#6685f5;font-weight:700}.hear{color:#6685f5;font-style:italic}.adminnotice{color:#6685f5}.adminhelp{color:red;font-weight:700}.unconscious{color:#a4bad6;font-weight:700}.suicide{color:#ff5050;font-style:italic}.green{color:#059223}.grey{color:#838383}.red{color:red}.blue{color:#215cff}.nicegreen{color:#059223}.boldnicegreen{color:#059223;font-weight:700}.cult{color:#973e3b}.cultitalic{color:#973e3b;font-style:italic}.cultbold{color:#973e3b;font-style:italic;font-weight:700}.cultboldtalic,.cultlarge{color:#973e3b;font-weight:700;font-size:185%}.narsie{color:#973e3b;font-weight:700;font-size:925%}.narsiesmall{color:#973e3b;font-weight:700;font-size:370%}.colossus{color:#7f282a;font-size:310%}.hierophant{color:#b441ee;font-weight:700;font-style:italic}.hierophant_warning{color:#c56bf1;font-style:italic}.purple{color:#9956d3}.holoparasite{color:#88809c}.revennotice{color:#c099e2}.revenboldnotice{color:#c099e2;font-weight:700}.revenbignotice{color:#c099e2;font-weight:700;font-size:185%}.revenminor{color:#823abb}.revenwarning{color:#760fbb;font-style:italic}.revendanger{color:#760fbb;font-weight:700;font-size:185%}.deconversion_message{color:#a947ff;font-size:185%;font-style:italic}.ghostalert{color:#60f;font-style:italic;font-weight:700}.alien{color:#855d85}.noticealien{color:#059223}.alertalien{color:#059223;font-weight:700}.changeling{color:#059223;font-style:italic}.alertsyndie{color:red;font-size:185%;font-weight:700}.spider{color:#80f;font-weight:700;font-size:185%}.interface{color:#750e75}.sans{font-family:Comic Sans MS,cursive,sans-serif}.papyrus{font-family:Papyrus,cursive,sans-serif}.robot{font-family:Courier New,cursive,sans-serif}.tape_recorder{color:red;font-family:Courier New,cursive,sans-serif}.command_headset{font-weight:700;font-size:160%}.small{font-size:60%}.big{font-size:185%}.reallybig{font-size:245%}.extremelybig{font-size:310%}.greentext{color:#059223;font-size:185%}.redtext{color:#c51e1e;font-size:185%}.clown{color:#ff70c1;font-size:160%;font-family:Comic Sans MS,cursive,sans-serif;font-weight:700}.singing{font-family:Trebuchet MS,cursive,sans-serif;font-style:italic}.his_grace{color:#15d512;font-family:Courier New,cursive,sans-serif;font-style:italic}.hypnophrase{color:#202020;font-weight:700;animation:hypnocolor 1.5s infinite;animation-direction:alternate}@keyframes hypnocolor{0%{color:#202020}25%{color:#4b02ac}50%{color:#9f41f1}75%{color:#541c9c}to{color:#7adbf3}}.phobia{color:#d00;font-weight:700;animation:phobia .75s infinite}@keyframes phobia{0%{color:#f75a5a}50%{color:#d00}to{color:#f75a5a}}.icon{height:1em;width:auto}.bigicon{font-size:2.5em}.memo{color:#638500;text-align:center}.memoedit{text-align:center;font-size:125%}.abductor{color:#c204c2;font-style:italic}.mind_control{color:#df3da9;font-size:100%;font-weight:700;font-style:italic}.slime{color:#00ced1}.drone{color:#848482}.monkey{color:#975032}.swarmer{color:#2c75ff}.resonate{color:#298f85}.monkeyhive{color:#a56408}.monkeylead{color:#af6805;font-size:80%}.connectionClosed,.fatalError{background:red;color:#fff;padding:5px}.connectionClosed.restored{background:green}.internal.boldnshit{color:#3d5bc3;font-weight:700}.text-normal{font-weight:400;font-style:normal}.hidden{display:none;visibility:hidden}.ml-1{margin-left:1em}.ml-2{margin-left:2em}.ml-3{margin-left:3em}.xooc{color:#ac04e9;font-weight:700;font-size:140%}.mooc{color:#090;font-weight:700;font-size:140%}.yooc{color:#999600;font-weight:700;font-size:140%}.headminsay{color:#653d78;font-weight:700}.radio{color:#b4b4b4}.deptradio{color:#939}.comradio{color:#779cc2}.centradio{color:#5c5c8a}.hcradio{color:#318779}.pvstradio{color:#9b0612}.cryoradio{color:#ad6d48}.airadio{color:#f0f}.secradio{color:#a52929}.engradio{color:#a66300}.sentryradio{color:#844300}.medradio{color:#008160}.supradio{color:#ba8e41}.jtacradio{color:#ad3b98}.intelradio{color:#027d02}.wyradio{color:#fe9b24}.pmcradio{color:#4dc5ce}.vairadio,.rmcradio{color:#e3580e}.cmbradio{color:#1b748c}.clfradio{color:#8e83ca}.alpharadio{color:#db2626}.bravoradio{color:#c68610}.charlieradio{color:#a5a}.deltaradio{color:#007fcf}.echoradio{color:#3eb489}.medium{font-size:110%}.big{font-size:115%}.large{font-size:125%}.extra_large{font-size:130%}.huge{font-size:150%}.underline{text-decoration:underline}.orange{color:#eca100}.normal{font-style:normal}.attack{color:#ff3838}.moderate{color:#c00}.disarm{color:#900}.passive{color:#600}.helpful{color:#368f31}.scanner{color:#ff3838}.scannerb{color:#ff3838;font-weight:700}.scannerburn{color:orange}.scannerburnb{color:orange;font-weight:700}.rose{color:#ff5050}.debuginfo{color:#493d26;font-style:italic}.xenonotice{color:#51a16c}.xenoboldnotice{color:#51a16c;font-weight:700}.xenowarning{color:#51a16c;font-style:italic}.xenominorwarning{color:#51a16c;font-weight:700;font-style:italic}.xenodanger{color:#51a16c;font-weight:700}.avoidharm{color:#72a0e5;font-weight:700}.highdanger{color:#ff3838;font-weight:700;font-size:140%}.xenohighdanger{color:#51a16c;font-weight:700;font-size:140%}.xenoannounce{color:#65c585;font-family:book-antiqua;font-weight:700;font-size:140%}.yautjabold{color:purple;font-weight:700}.yautjaboldbig{color:purple;font-weight:700;font-size:120%}.objectivebig{font-weight:700;font-size:130%}.objectivegreen{color:#0f0}.objectivered{color:red}.objectivesuccess{color:#0f0;font-weight:700;font-size:110%}.objectivefail{color:red;font-weight:700;font-size:110%}.xenotalk,.xeno{color:#c048c0;font-style:italic}.xenoleader{color:#996e99;font-style:italic;font-size:125%}.xenoqueen{color:#996e99;font-style:italic;font-weight:700;font-size:125%}.newscaster{color:maroon}.role_header{color:#e92d2d;display:block;text-align:center;font-weight:700;font-family:trebuchet-ms;font-size:150%}.role_body{color:#3a3ae9;display:block;text-align:center;font-size:125%}.round_header{color:#e92d2d;display:block;text-align:center;font-family:courier;font-weight:700;font-size:180%}.round_body{color:#c5c5c5;display:block;text-align:center;font-family:trebuchet-ms;font-weight:700;font-size:125%}.event_announcement{color:#600d48;font-family:arial-narrow;font-weight:700;font-size:125%}.announce_header{color:#cecece;font-weight:700;font-size:150%}.announce_header_blue,.announce_header_admin{color:#7575f3;font-weight:700;font-size:150%}.announce_body{color:#e92d2d;font-weight:400;font-size:125%}.centerbold{display:block;text-align:center;font-weight:700}.mod{color:#917455;font-weight:700}.modooc{color:#184880;font-weight:700}.adminmod{color:#7c440c;font-weight:700}.mentorsay{color:#d4af57;font-weight:700}.mentorhelp{color:#090;font-weight:700}.mentorbody{color:#da6200;font-weight:700}.mentorstaff,.staffsay{color:#b5850d;font-weight:700}.tajaran{color:#803b56}.tajaran_signlang{color:#941c1c}.skrell{color:#00ced1}.soghun{color:#228b22}.changeling{color:purple}.vox{color:#a0a}.monkey{color:#966c47}.german{color:#858f1e;font-family:Times New Roman,Times,serif}.spanish{color:#cf982b}.japanese{color:#940927}.chinese{color:#fe1919}.zombie{color:#2dacb1;font-style:italic}.rough{font-family:trebuchet-ms,cursive,sans-serif}.commando{color:#fe9b24;font-style:bold}.say_quote{font-family:Georgia,Verdana,sans-serif}.admin .message{color:#314cad}.admin .prefix{font-weight:bolder}.pm{font-size:110%}.deadsay{color:#8b4dff}.retro_translator{font-weight:700}.yautja_translator{color:#a00;font-weight:700;animation:glitch .5s infinite}.examine_block{background:#1b1c1e;border:1px solid #a4bad6;margin:.5em;padding:.5em .75em}.examine_block .icon{width:1.5em;height:1.5em;margin:0;padding:0}.tooltip{font-style:italic;border-bottom:1px dashed #fff}.theme-light .color-black{color:#000!important}.theme-light .color-white{color:#e6e6e6!important}.theme-light .color-red{color:#c82121!important}.theme-light .color-orange{color:#e6630d!important}.theme-light .color-yellow{color:#e5c304!important}.theme-light .color-olive{color:#a3b816!important}.theme-light .color-green{color:#1d9f3b!important}.theme-light .color-teal{color:#00a39c!important}.theme-light .color-blue{color:#1e78bb!important}.theme-light .color-dark-blue{color:#004274!important}.theme-light .color-violet{color:#5a30b5!important}.theme-light .color-purple{color:#932eb4!important}.theme-light .color-pink{color:#db228a!important}.theme-light .color-brown{color:#955d39!important}.theme-light .color-grey{color:#e6e6e6!important}.theme-light .color-light-grey{color:#999!important}.theme-light .color-good{color:#529923!important}.theme-light .color-average{color:#da810e!important}.theme-light .color-bad{color:#c82121!important}.theme-light .color-label{color:#353535!important}.theme-light .color-xeno{color:#4a3253!important}.theme-light .color-bg-black{background-color:#000!important}.theme-light .color-bg-white{background-color:#bfbfbf!important}.theme-light .color-bg-red{background-color:#a61c1c!important}.theme-light .color-bg-orange{background-color:#c0530b!important}.theme-light .color-bg-yellow{background-color:#bfa303!important}.theme-light .color-bg-olive{background-color:#889912!important}.theme-light .color-bg-green{background-color:#188532!important}.theme-light .color-bg-teal{background-color:#008882!important}.theme-light .color-bg-blue{background-color:#19649c!important}.theme-light .color-bg-dark-blue{background-color:#003761!important}.theme-light .color-bg-violet{background-color:#4b2897!important}.theme-light .color-bg-purple{background-color:#7a2696!important}.theme-light .color-bg-pink{background-color:#b61d73!important}.theme-light .color-bg-brown{background-color:#7c4d2f!important}.theme-light .color-bg-grey{background-color:#bfbfbf!important}.theme-light .color-bg-light-grey{background-color:gray!important}.theme-light .color-bg-good{background-color:#44801d!important}.theme-light .color-bg-average{background-color:#b56b0b!important}.theme-light .color-bg-bad{background-color:#a61c1c!important}.theme-light .color-bg-label{background-color:#2c2c2c!important}.theme-light .color-bg-xeno{background-color:#3e2945!important}.theme-light .Tabs{display:flex;align-items:stretch;overflow:hidden;background-color:#fff}.theme-light .Tabs--fill{height:100%}.theme-light .Section .Tabs{background-color:rgba(0,0,0,0)}.theme-light .Section:not(.Section--fitted) .Tabs{margin:0 -.5em .5em}.theme-light .Section:not(.Section--fitted) .Tabs:first-child{margin-top:-.5em}.theme-light .Tabs--vertical{flex-direction:column;padding:.25em 0 .25em .25em}.theme-light .Tabs--horizontal{margin-bottom:.5em;padding:.25em .25em 0}.theme-light .Tabs--horizontal:last-child{margin-bottom:0}.theme-light .Tabs__Tab{flex-grow:0}.theme-light .Tabs--fluid .Tabs__Tab{flex-grow:1}.theme-light .Tab{display:flex;align-items:center;justify-content:space-between;background-color:rgba(0,0,0,0);color:rgba(0,0,0,.5);min-height:2.25em;min-width:4em}.theme-light .Tab:not(.Tab--selected):hover{background-color:rgba(255,255,255,.075)}.theme-light .Tab--selected{background-color:rgba(255,255,255,.125);color:#404040}.theme-light .Tab__text{flex-grow:1;margin:0 .5em}.theme-light .Tab__left{min-width:1.5em;text-align:center;margin-left:.25em}.theme-light .Tab__right{min-width:1.5em;text-align:center;margin-right:.25em}.theme-light .Tabs--horizontal .Tab{border-top:.1666666667em solid rgba(0,0,0,0);border-bottom:.1666666667em solid rgba(0,0,0,0);border-top-left-radius:.25em;border-top-right-radius:.25em}.theme-light .Tabs--horizontal .Tab--selected{border-bottom:.1666666667em solid #000}.theme-light .Tabs--vertical .Tab{min-height:2em;border-left:.1666666667em solid rgba(0,0,0,0);border-right:.1666666667em solid rgba(0,0,0,0);border-top-left-radius:.25em;border-bottom-left-radius:.25em}.theme-light .Tabs--vertical .Tab--selected{border-right:.1666666667em solid #000}.theme-light .Tab--selected.Tab--color--black{color:#404040}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--black{border-bottom-color:#000}.theme-light .Tabs--vertical .Tab--selected.Tab--color--black{border-right-color:#000}.theme-light .Tab--selected.Tab--color--white{color:#ececec}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--white{border-bottom-color:#e6e6e6}.theme-light .Tabs--vertical .Tab--selected.Tab--color--white{border-right-color:#e6e6e6}.theme-light .Tab--selected.Tab--color--red{color:#e14d4d}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--red{border-bottom-color:#c82121}.theme-light .Tabs--vertical .Tab--selected.Tab--color--red{border-right-color:#c82121}.theme-light .Tab--selected.Tab--color--orange{color:#f48942}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--orange{border-bottom-color:#e6630d}.theme-light .Tabs--vertical .Tab--selected.Tab--color--orange{border-right-color:#e6630d}.theme-light .Tab--selected.Tab--color--yellow{color:#fcdd33}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--yellow{border-bottom-color:#e5c304}.theme-light .Tabs--vertical .Tab--selected.Tab--color--yellow{border-right-color:#e5c304}.theme-light .Tab--selected.Tab--color--olive{color:#d0e732}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--olive{border-bottom-color:#a3b816}.theme-light .Tabs--vertical .Tab--selected.Tab--color--olive{border-right-color:#a3b816}.theme-light .Tab--selected.Tab--color--green{color:#33da5a}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--green{border-bottom-color:#1d9f3b}.theme-light .Tabs--vertical .Tab--selected.Tab--color--green{border-right-color:#1d9f3b}.theme-light .Tab--selected.Tab--color--teal{color:#00faef}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--teal{border-bottom-color:#00a39c}.theme-light .Tabs--vertical .Tab--selected.Tab--color--teal{border-right-color:#00a39c}.theme-light .Tab--selected.Tab--color--blue{color:#419ce1}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--blue{border-bottom-color:#1e78bb}.theme-light .Tabs--vertical .Tab--selected.Tab--color--blue{border-right-color:#1e78bb}.theme-light .Tab--selected.Tab--color--dark-blue{color:#0079d7}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--dark-blue{border-bottom-color:#004274}.theme-light .Tabs--vertical .Tab--selected.Tab--color--dark-blue{border-right-color:#004274}.theme-light .Tab--selected.Tab--color--violet{color:#7f58d3}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--violet{border-bottom-color:#5a30b5}.theme-light .Tabs--vertical .Tab--selected.Tab--color--violet{border-right-color:#5a30b5}.theme-light .Tab--selected.Tab--color--purple{color:#b455d4}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--purple{border-bottom-color:#932eb4}.theme-light .Tabs--vertical .Tab--selected.Tab--color--purple{border-right-color:#932eb4}.theme-light .Tab--selected.Tab--color--pink{color:#e558a7}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--pink{border-bottom-color:#db228a}.theme-light .Tabs--vertical .Tab--selected.Tab--color--pink{border-right-color:#db228a}.theme-light .Tab--selected.Tab--color--brown{color:#c0825a}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--brown{border-bottom-color:#955d39}.theme-light .Tabs--vertical .Tab--selected.Tab--color--brown{border-right-color:#955d39}.theme-light .Tab--selected.Tab--color--grey{color:#ececec}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--grey{border-bottom-color:#e6e6e6}.theme-light .Tabs--vertical .Tab--selected.Tab--color--grey{border-right-color:#e6e6e6}.theme-light .Tab--selected.Tab--color--light-grey{color:#b3b3b3}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--light-grey{border-bottom-color:#999}.theme-light .Tabs--vertical .Tab--selected.Tab--color--light-grey{border-right-color:#999}.theme-light .Tab--selected.Tab--color--good{color:#77d23b}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--good{border-bottom-color:#529923}.theme-light .Tabs--vertical .Tab--selected.Tab--color--good{border-right-color:#529923}.theme-light .Tab--selected.Tab--color--average{color:#f3a23a}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--average{border-bottom-color:#da810e}.theme-light .Tabs--vertical .Tab--selected.Tab--color--average{border-right-color:#da810e}.theme-light .Tab--selected.Tab--color--bad{color:#e14d4d}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--bad{border-bottom-color:#c82121}.theme-light .Tabs--vertical .Tab--selected.Tab--color--bad{border-right-color:#c82121}.theme-light .Tab--selected.Tab--color--label{color:#686868}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--label{border-bottom-color:#353535}.theme-light .Tabs--vertical .Tab--selected.Tab--color--label{border-right-color:#353535}.theme-light .Tab--selected.Tab--color--xeno{color:#7e558e}.theme-light .Tabs--horizontal .Tab--selected.Tab--color--xeno{border-bottom-color:#4a3253}.theme-light .Tabs--vertical .Tab--selected.Tab--color--xeno{border-right-color:#4a3253}.theme-light .Section{position:relative;margin-bottom:.5em;background-color:#fff;box-sizing:border-box}.theme-light .Section:last-child{margin-bottom:0}.theme-light .Section__title{position:relative;padding:.5em;border-bottom:.1666666667em solid #fff}.theme-light .Section__titleText{font-size:1.1666666667em;font-weight:700;color:#000}.theme-light .Section__buttons{position:absolute;display:inline-block;right:.5em;margin-top:-.0833333333em}.theme-light .Section__rest{position:relative}.theme-light .Section__content{padding:.66em .5em}.theme-light .Section--fitted>.Section__rest>.Section__content{padding:0}.theme-light .Section--fill{display:flex;flex-direction:column;height:100%}.theme-light .Section--fill>.Section__rest{flex-grow:1}.theme-light .Section--fill>.Section__rest>.Section__content{height:100%}.theme-light .Section--fill.Section--scrollable>.Section__rest>.Section__content{position:absolute;top:0;left:0;right:0;bottom:0}.theme-light .Section--fill.Section--iefix{display:table!important;width:100%!important;height:100%!important;border-collapse:collapse;border-spacing:0}.theme-light .Section--fill.Section--iefix>.Section__rest{display:table-row!important;height:100%!important}.theme-light .Section--scrollable{overflow-x:hidden;overflow-y:hidden}.theme-light .Section--scrollable>.Section__rest>.Section__content{overflow-y:scroll;overflow-x:hidden}.theme-light .Section--scrollableHorizontal{overflow-x:hidden;overflow-y:hidden}.theme-light .Section--scrollableHorizontal>.Section__rest>.Section__content{overflow-y:hidden;overflow-x:scroll}.theme-light .Section--scrollable.Section--scrollableHorizontal{overflow-x:hidden;overflow-y:hidden}.theme-light .Section--scrollable.Section--scrollableHorizontal>.Section__rest>.Section__content{overflow-y:scroll;overflow-x:scroll}.theme-light .Section .Section{background-color:rgba(0,0,0,0);margin-left:-.5em;margin-right:-.5em}.theme-light .Section .Section:first-child{margin-top:-.5em}.theme-light .Section .Section .Section__titleText{font-size:1.0833333333em}.theme-light .Section .Section .Section .Section__titleText{font-size:1em}.theme-light .Button{position:relative;display:inline-block;line-height:1.667em;padding:0 .5em;margin-right:.1666666667em;white-space:nowrap;outline:0;border-radius:.16em;margin-bottom:.1666666667em;user-select:none;-ms-user-select:none}.theme-light .Button .fa,.theme-light .Button .fas,.theme-light .Button .far{margin-left:-.25em;margin-right:-.25em;min-width:1.333em;text-align:center}.theme-light .Button--hasContent .fa,.theme-light .Button--hasContent .fas,.theme-light .Button--hasContent .far{margin-right:.25em}.theme-light .Button--hasContent.Button--iconPosition--right .fa,.theme-light .Button--hasContent.Button--iconPosition--right .fas,.theme-light .Button--hasContent.Button--iconPosition--right .far{margin-right:0;margin-left:3px}.theme-light .Button--ellipsis{overflow:hidden;text-overflow:ellipsis}.theme-light .Button--fluid{display:block;margin-left:0;margin-right:0}.theme-light .Button--circular{border-radius:50%}.theme-light .Button--compact{padding:0 .25em;line-height:1.333em}.theme-light .Button--color--black{transition:color 50ms,background-color 50ms;background-color:#000;color:#fff}.theme-light .Button--color--black:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--black:focus{transition:color .1s,background-color .1s}.theme-light .Button--color--black:hover,.theme-light .Button--color--black:focus{background-color:#131313;color:#fff}.theme-light .Button--color--white{transition:color 50ms,background-color 50ms;background-color:#bfbfbf;color:#000}.theme-light .Button--color--white:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--white:focus{transition:color .1s,background-color .1s}.theme-light .Button--color--white:hover,.theme-light .Button--color--white:focus{background-color:#efefef;color:#000}.theme-light .Button--color--red{transition:color 50ms,background-color 50ms;background-color:#a61c1c;color:#fff}.theme-light .Button--color--red:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--red:focus{transition:color .1s,background-color .1s}.theme-light .Button--color--red:hover,.theme-light .Button--color--red:focus{background-color:#d23333;color:#fff}.theme-light .Button--color--orange{transition:color 50ms,background-color 50ms;background-color:#c0530b;color:#fff}.theme-light .Button--color--orange:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--orange:focus{transition:color .1s,background-color .1s}.theme-light .Button--color--orange:hover,.theme-light .Button--color--orange:focus{background-color:#ea7426;color:#fff}.theme-light .Button--color--yellow{transition:color 50ms,background-color 50ms;background-color:#bfa303;color:#fff}.theme-light .Button--color--yellow:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--yellow:focus{transition:color .1s,background-color .1s}.theme-light .Button--color--yellow:hover,.theme-light .Button--color--yellow:focus{background-color:#efce17;color:#fff}.theme-light .Button--color--olive{transition:color 50ms,background-color 50ms;background-color:#889912;color:#fff}.theme-light .Button--color--olive:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--olive:focus{transition:color .1s,background-color .1s}.theme-light .Button--color--olive:hover,.theme-light .Button--color--olive:focus{background-color:#afc328;color:#fff}.theme-light .Button--color--green{transition:color 50ms,background-color 50ms;background-color:#188532;color:#fff}.theme-light .Button--color--green:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--green:focus{transition:color .1s,background-color .1s}.theme-light .Button--color--green:hover,.theme-light .Button--color--green:focus{background-color:#2fac4c;color:#fff}.theme-light .Button--color--teal{transition:color 50ms,background-color 50ms;background-color:#008882;color:#fff}.theme-light .Button--color--teal:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--teal:focus{transition:color .1s,background-color .1s}.theme-light .Button--color--teal:hover,.theme-light .Button--color--teal:focus{background-color:#13afa9;color:#fff}.theme-light .Button--color--blue{transition:color 50ms,background-color 50ms;background-color:#19649c;color:#fff}.theme-light .Button--color--blue:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--blue:focus{transition:color .1s,background-color .1s}.theme-light .Button--color--blue:hover,.theme-light .Button--color--blue:focus{background-color:#3086c7;color:#fff}.theme-light .Button--color--dark-blue{transition:color 50ms,background-color 50ms;background-color:#003761;color:#fff}.theme-light .Button--color--dark-blue:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--dark-blue:focus{transition:color .1s,background-color .1s}.theme-light .Button--color--dark-blue:hover,.theme-light .Button--color--dark-blue:focus{background-color:#135283;color:#fff}.theme-light .Button--color--violet{transition:color 50ms,background-color 50ms;background-color:#4b2897;color:#fff}.theme-light .Button--color--violet:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--violet:focus{transition:color .1s,background-color .1s}.theme-light .Button--color--violet:hover,.theme-light .Button--color--violet:focus{background-color:#6a41c1;color:#fff}.theme-light .Button--color--purple{transition:color 50ms,background-color 50ms;background-color:#7a2696;color:#fff}.theme-light .Button--color--purple:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--purple:focus{transition:color .1s,background-color .1s}.theme-light .Button--color--purple:hover,.theme-light .Button--color--purple:focus{background-color:#a03fc0;color:#fff}.theme-light .Button--color--pink{transition:color 50ms,background-color 50ms;background-color:#b61d73;color:#fff}.theme-light .Button--color--pink:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--pink:focus{transition:color .1s,background-color .1s}.theme-light .Button--color--pink:hover,.theme-light .Button--color--pink:focus{background-color:#da3f96;color:#fff}.theme-light .Button--color--brown{transition:color 50ms,background-color 50ms;background-color:#7c4d2f;color:#fff}.theme-light .Button--color--brown:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--brown:focus{transition:color .1s,background-color .1s}.theme-light .Button--color--brown:hover,.theme-light .Button--color--brown:focus{background-color:#a26c49;color:#fff}.theme-light .Button--color--grey{transition:color 50ms,background-color 50ms;background-color:#bfbfbf;color:#000}.theme-light .Button--color--grey:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--grey:focus{transition:color .1s,background-color .1s}.theme-light .Button--color--grey:hover,.theme-light .Button--color--grey:focus{background-color:#efefef;color:#000}.theme-light .Button--color--light-grey{transition:color 50ms,background-color 50ms;background-color:gray;color:#fff}.theme-light .Button--color--light-grey:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--light-grey:focus{transition:color .1s,background-color .1s}.theme-light .Button--color--light-grey:hover,.theme-light .Button--color--light-grey:focus{background-color:#a6a6a6;color:#fff}.theme-light .Button--color--good{transition:color 50ms,background-color 50ms;background-color:#44801d;color:#fff}.theme-light .Button--color--good:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--good:focus{transition:color .1s,background-color .1s}.theme-light .Button--color--good:hover,.theme-light .Button--color--good:focus{background-color:#62a635;color:#fff}.theme-light .Button--color--average{transition:color 50ms,background-color 50ms;background-color:#b56b0b;color:#fff}.theme-light .Button--color--average:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--average:focus{transition:color .1s,background-color .1s}.theme-light .Button--color--average:hover,.theme-light .Button--color--average:focus{background-color:#e48f20;color:#fff}.theme-light .Button--color--bad{transition:color 50ms,background-color 50ms;background-color:#a61c1c;color:#fff}.theme-light .Button--color--bad:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--bad:focus{transition:color .1s,background-color .1s}.theme-light .Button--color--bad:hover,.theme-light .Button--color--bad:focus{background-color:#d23333;color:#fff}.theme-light .Button--color--label{transition:color 50ms,background-color 50ms;background-color:#2c2c2c;color:#fff}.theme-light .Button--color--label:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--label:focus{transition:color .1s,background-color .1s}.theme-light .Button--color--label:hover,.theme-light .Button--color--label:focus{background-color:#464646;color:#fff}.theme-light .Button--color--xeno{transition:color 50ms,background-color 50ms;background-color:#3e2945;color:#fff}.theme-light .Button--color--xeno:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--xeno:focus{transition:color .1s,background-color .1s}.theme-light .Button--color--xeno:hover,.theme-light .Button--color--xeno:focus{background-color:#5a4363;color:#fff}.theme-light .Button--color--default{transition:color 50ms,background-color 50ms;background-color:#bbb;color:#000}.theme-light .Button--color--default:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--default:focus{transition:color .1s,background-color .1s}.theme-light .Button--color--default:hover,.theme-light .Button--color--default:focus{background-color:#eaeaea;color:#000}.theme-light .Button--color--caution{transition:color 50ms,background-color 50ms;background-color:#be6209;color:#fff}.theme-light .Button--color--caution:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--caution:focus{transition:color .1s,background-color .1s}.theme-light .Button--color--caution:hover,.theme-light .Button--color--caution:focus{background-color:#ec8420;color:#fff}.theme-light .Button--color--danger{transition:color 50ms,background-color 50ms;background-color:#9a9d00;color:#fff}.theme-light .Button--color--danger:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--danger:focus{transition:color .1s,background-color .1s}.theme-light .Button--color--danger:hover,.theme-light .Button--color--danger:focus{background-color:#c4c813;color:#fff}.theme-light .Button--color--transparent{transition:color 50ms,background-color 50ms;background-color:#eee;color:#000;background-color:rgba(238,238,238,0);color:rgba(0,0,0,.5)}.theme-light .Button--color--transparent:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--color--transparent:focus{transition:color .1s,background-color .1s}.theme-light .Button--color--transparent:hover,.theme-light .Button--color--transparent:focus{background-color:#fcfcfc;color:#000}.theme-light .Button--disabled{background-color:#363636!important}.theme-light .Button--selected{transition:color 50ms,background-color 50ms;background-color:#0668b8;color:#fff}.theme-light .Button--selected:hover{transition:color 0ms,background-color 0ms}.theme-light .Button--selected:focus{transition:color .1s,background-color .1s}.theme-light .Button--selected:hover,.theme-light .Button--selected:focus{background-color:#1a8be7;color:#fff}.theme-light .Button--flex{display:inline-flex;flex-direction:column}.theme-light .Button--flex--fluid{width:100%}.theme-light .Button--verticalAlignContent--top{justify-content:flex-start}.theme-light .Button--verticalAlignContent--middle{justify-content:center}.theme-light .Button--verticalAlignContent--bottom{justify-content:flex-end}.theme-light .Button__content{display:block;align-self:stretch}.theme-light .NumberInput{position:relative;display:inline-block;border:.0833333333em solid #353535;border:.0833333333em solid rgba(53,53,53,.75);border-radius:.16em;color:#353535;background-color:#fff;padding:0 .3333333333em;margin-right:.1666666667em;line-height:1.4166666667em;text-align:right;overflow:visible;cursor:n-resize}.theme-light .NumberInput--fluid{display:block}.theme-light .NumberInput__content{margin-left:.5em}.theme-light .NumberInput__barContainer{position:absolute;top:.1666666667em;bottom:.1666666667em;left:.1666666667em}.theme-light .NumberInput__bar{position:absolute;bottom:0;left:0;width:.25em;box-sizing:border-box;border-bottom:.0833333333em solid #353535;background-color:#353535}.theme-light .NumberInput__input{display:block;position:absolute;top:0;bottom:0;left:0;right:0;border:0;outline:0;width:100%;font-size:1em;line-height:1.4166666667em;height:1.4166666667em;margin:0;padding:0 .5em;font-family:Verdana,sans-serif;background-color:#fff;color:#000;text-align:right}.theme-light .Input{position:relative;display:inline-block;width:10em;border:.0833333333em solid #353535;border:.0833333333em solid rgba(53,53,53,.75);border-radius:.16em;color:#000;background-color:#fff;padding:0 .3333333333em;margin-right:.1666666667em;line-height:1.4166666667em;overflow:visible}.theme-light .Input--fluid{display:block;width:auto}.theme-light .Input__baseline{display:inline-block;color:rgba(0,0,0,0)}.theme-light .Input__input{display:block;position:absolute;top:0;bottom:0;left:0;right:0;border:0;outline:0;width:100%;font-size:1em;line-height:1.4166666667em;height:1.4166666667em;margin:0;padding:0 .5em;font-family:Verdana,sans-serif;background-color:rgba(0,0,0,0);color:#000;color:inherit}.theme-light .Input__input:-ms-input-placeholder{font-style:italic;color:#777;color:rgba(255,255,255,.45)}.theme-light .Input--monospace .Input__input{font-family:Consolas,monospace}.theme-light .TextArea{position:relative;display:inline-block;border:.0833333333em solid #353535;border:.0833333333em solid rgba(53,53,53,.75);border-radius:.16em;background-color:#fff;margin-right:.1666666667em;line-height:1.4166666667em;box-sizing:border-box;width:100%}.theme-light .TextArea--fluid{display:block;width:auto;height:auto}.theme-light .TextArea--noborder{border:0px}.theme-light .TextArea__textarea.TextArea__textarea--scrollable{overflow:auto;overflow-x:hidden;overflow-y:scroll}.theme-light .TextArea__textarea{display:block;position:absolute;top:0;bottom:0;left:0;right:0;border:0;outline:0;width:100%;height:100%;font-size:1em;line-height:1.4166666667em;min-height:1.4166666667em;margin:0;padding:0 .5em;font-family:inherit;background-color:rgba(0,0,0,0);color:inherit;box-sizing:border-box;word-wrap:break-word;overflow:hidden}.theme-light .TextArea__textarea:-ms-input-placeholder{font-style:italic;color:#777;color:rgba(255,255,255,.45)}.theme-light .TextArea__textarea_custom{overflow:visible;white-space:pre-wrap}.theme-light .Knob{position:relative;font-size:1rem;width:2.6em;height:2.6em;margin:0 auto -.2em;cursor:n-resize}.theme-light .Knob:after{content:".";color:rgba(0,0,0,0);line-height:2.5em}.theme-light .Knob__circle{position:absolute;top:.1em;bottom:.1em;left:.1em;right:.1em;margin:.3em;background-color:#333;background-image:linear-gradient(to bottom,rgba(255,255,255,.15),rgba(255,255,255,0));border-radius:50%;box-shadow:0 .05em .5em rgba(0,0,0,.5)}.theme-light .Knob__cursorBox{position:absolute;top:0;bottom:0;left:0;right:0}.theme-light .Knob__cursor{position:relative;top:.05em;margin:0 auto;width:.2em;height:.8em;background-color:rgba(255,255,255,.9)}.theme-light .Knob__popupValue{position:absolute;top:-2rem;right:50%;font-size:1rem;text-align:center;padding:.25rem .5rem;color:#fff;background-color:#000;transform:translate(50%);white-space:nowrap}.theme-light .Knob__ring{position:absolute;top:0;bottom:0;left:0;right:0;padding:.1em}.theme-light .Knob__ringTrackPivot{transform:rotate(135deg)}.theme-light .Knob__ringTrack{fill:rgba(0,0,0,0);stroke:rgba(255,255,255,.1);stroke-width:8;stroke-linecap:round;stroke-dasharray:235.62}.theme-light .Knob__ringFillPivot{transform:rotate(135deg)}.theme-light .Knob--bipolar .Knob__ringFillPivot{transform:rotate(270deg)}.theme-light .Knob__ringFill{fill:rgba(0,0,0,0);stroke:#6a96c9;stroke-width:8;stroke-linecap:round;stroke-dasharray:314.16;transition:stroke 50ms ease-out}.theme-light .Knob--color--black .Knob__ringFill{stroke:#000}.theme-light .Knob--color--white .Knob__ringFill{stroke:#e6e6e6}.theme-light .Knob--color--red .Knob__ringFill{stroke:#c82121}.theme-light .Knob--color--orange .Knob__ringFill{stroke:#e6630d}.theme-light .Knob--color--yellow .Knob__ringFill{stroke:#e5c304}.theme-light .Knob--color--olive .Knob__ringFill{stroke:#a3b816}.theme-light .Knob--color--green .Knob__ringFill{stroke:#1d9f3b}.theme-light .Knob--color--teal .Knob__ringFill{stroke:#00a39c}.theme-light .Knob--color--blue .Knob__ringFill{stroke:#1e78bb}.theme-light .Knob--color--dark-blue .Knob__ringFill{stroke:#004274}.theme-light .Knob--color--violet .Knob__ringFill{stroke:#5a30b5}.theme-light .Knob--color--purple .Knob__ringFill{stroke:#932eb4}.theme-light .Knob--color--pink .Knob__ringFill{stroke:#db228a}.theme-light .Knob--color--brown .Knob__ringFill{stroke:#955d39}.theme-light .Knob--color--grey .Knob__ringFill{stroke:#e6e6e6}.theme-light .Knob--color--light-grey .Knob__ringFill{stroke:#999}.theme-light .Knob--color--good .Knob__ringFill{stroke:#529923}.theme-light .Knob--color--average .Knob__ringFill{stroke:#da810e}.theme-light .Knob--color--bad .Knob__ringFill{stroke:#c82121}.theme-light .Knob--color--label .Knob__ringFill{stroke:#353535}.theme-light .Knob--color--xeno .Knob__ringFill{stroke:#4a3253}.theme-light .Slider{cursor:e-resize}.theme-light .Slider__cursorOffset{position:absolute;top:0;left:0;bottom:0;transition:none!important}.theme-light .Slider__cursor{position:absolute;top:0;right:-.0833333333em;bottom:0;width:0;border-left:.1666666667em solid #000}.theme-light .Slider__pointer{position:absolute;right:-.4166666667em;bottom:-.3333333333em;width:0;height:0;border-left:.4166666667em solid rgba(0,0,0,0);border-right:.4166666667em solid rgba(0,0,0,0);border-bottom:.4166666667em solid #000}.theme-light .Slider__popupValue{position:absolute;right:0;top:-2rem;font-size:1rem;padding:.25rem .5rem;color:#fff;background-color:#000;transform:translate(50%);white-space:nowrap}.theme-light .ProgressBar{display:inline-block;position:relative;width:100%;padding:0 .5em;border-width:.0833333333em!important;border-style:solid!important;border-radius:.16em;background-color:rgba(0,0,0,0);transition:border-color .9s ease-out}.theme-light .ProgressBar__fill{position:absolute;top:-.5px;left:0;bottom:-.5px}.theme-light .ProgressBar__fill--animated{transition:background-color .9s ease-out,width .9s ease-out}.theme-light .ProgressBar__content{position:relative;line-height:1.4166666667em;width:100%;text-align:right}.theme-light .ProgressBar--color--default{border:.0833333333em solid #bfbfbf}.theme-light .ProgressBar--color--default .ProgressBar__fill{background-color:#bfbfbf}.theme-light .ProgressBar--color--black{border-color:#000!important}.theme-light .ProgressBar--color--black .ProgressBar__fill{background-color:#000}.theme-light .ProgressBar--color--white{border-color:#bfbfbf!important}.theme-light .ProgressBar--color--white .ProgressBar__fill{background-color:#bfbfbf}.theme-light .ProgressBar--color--red{border-color:#a61c1c!important}.theme-light .ProgressBar--color--red .ProgressBar__fill{background-color:#a61c1c}.theme-light .ProgressBar--color--orange{border-color:#c0530b!important}.theme-light .ProgressBar--color--orange .ProgressBar__fill{background-color:#c0530b}.theme-light .ProgressBar--color--yellow{border-color:#bfa303!important}.theme-light .ProgressBar--color--yellow .ProgressBar__fill{background-color:#bfa303}.theme-light .ProgressBar--color--olive{border-color:#889912!important}.theme-light .ProgressBar--color--olive .ProgressBar__fill{background-color:#889912}.theme-light .ProgressBar--color--green{border-color:#188532!important}.theme-light .ProgressBar--color--green .ProgressBar__fill{background-color:#188532}.theme-light .ProgressBar--color--teal{border-color:#008882!important}.theme-light .ProgressBar--color--teal .ProgressBar__fill{background-color:#008882}.theme-light .ProgressBar--color--blue{border-color:#19649c!important}.theme-light .ProgressBar--color--blue .ProgressBar__fill{background-color:#19649c}.theme-light .ProgressBar--color--dark-blue{border-color:#003761!important}.theme-light .ProgressBar--color--dark-blue .ProgressBar__fill{background-color:#003761}.theme-light .ProgressBar--color--violet{border-color:#4b2897!important}.theme-light .ProgressBar--color--violet .ProgressBar__fill{background-color:#4b2897}.theme-light .ProgressBar--color--purple{border-color:#7a2696!important}.theme-light .ProgressBar--color--purple .ProgressBar__fill{background-color:#7a2696}.theme-light .ProgressBar--color--pink{border-color:#b61d73!important}.theme-light .ProgressBar--color--pink .ProgressBar__fill{background-color:#b61d73}.theme-light .ProgressBar--color--brown{border-color:#7c4d2f!important}.theme-light .ProgressBar--color--brown .ProgressBar__fill{background-color:#7c4d2f}.theme-light .ProgressBar--color--grey{border-color:#bfbfbf!important}.theme-light .ProgressBar--color--grey .ProgressBar__fill{background-color:#bfbfbf}.theme-light .ProgressBar--color--light-grey{border-color:gray!important}.theme-light .ProgressBar--color--light-grey .ProgressBar__fill{background-color:gray}.theme-light .ProgressBar--color--good{border-color:#44801d!important}.theme-light .ProgressBar--color--good .ProgressBar__fill{background-color:#44801d}.theme-light .ProgressBar--color--average{border-color:#b56b0b!important}.theme-light .ProgressBar--color--average .ProgressBar__fill{background-color:#b56b0b}.theme-light .ProgressBar--color--bad{border-color:#a61c1c!important}.theme-light .ProgressBar--color--bad .ProgressBar__fill{background-color:#a61c1c}.theme-light .ProgressBar--color--label{border-color:#2c2c2c!important}.theme-light .ProgressBar--color--label .ProgressBar__fill{background-color:#2c2c2c}.theme-light .ProgressBar--color--xeno{border-color:#3e2945!important}.theme-light .ProgressBar--color--xeno .ProgressBar__fill{background-color:#3e2945}.theme-light .Chat{color:#000}.theme-light .Chat__badge{display:inline-block;min-width:.5em;font-size:.7em;padding:.2em .3em;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:middle;background-color:#dc143c;border-radius:10px;transition:font-size .2s ease-out}.theme-light .Chat__badge:before{content:"x"}.theme-light .Chat__badge--animate{font-size:.9em;transition:font-size 0ms}.theme-light .Chat__scrollButton{position:fixed;right:2em;bottom:1em}.theme-light .Chat__reconnected{font-size:.85em;text-align:center;margin:1em 0 2em}.theme-light .Chat__reconnected:before{content:"Reconnected";display:inline-block;border-radius:1em;padding:0 .7em;color:#db2828;background-color:#fff}.theme-light .Chat__reconnected:after{content:"";display:block;margin-top:-.75em;border-bottom:.1666666667em solid #db2828}.theme-light .Chat__highlight{color:#000}.theme-light .Chat__highlight--restricted{color:#fff;background-color:#a00;font-weight:700}.theme-light .ChatMessage{word-wrap:break-word}.theme-light .ChatMessage--highlighted{position:relative;border-left:.1666666667em solid #fd4;padding-left:.5em}.theme-light .ChatMessage--highlighted:after{content:"";position:absolute;top:0;bottom:0;left:0;right:0;background-color:rgba(255,221,68,.1);pointer-events:none}.theme-light .Layout,.theme-light .Layout *{scrollbar-base-color:#f2f2f2;scrollbar-face-color:#d6d6d6;scrollbar-3dlight-color:#eee;scrollbar-highlight-color:#eee;scrollbar-track-color:#f2f2f2;scrollbar-arrow-color:#777;scrollbar-shadow-color:#d6d6d6}.theme-light .Layout__content{position:absolute;top:0;bottom:0;left:0;right:0;overflow-x:hidden;overflow-y:hidden}.theme-light .Layout__content--scrollable{overflow-y:scroll;margin-bottom:0}.theme-light .Window{position:fixed;top:0;bottom:0;left:0;right:0;color:#000;background-color:#eee;background-image:linear-gradient(to bottom,#eee,#eee)}.theme-light .Window__titleBar{position:fixed;z-index:1;top:0;left:0;width:100%;height:32px;height:2.6666666667rem}.theme-light .Window__rest{position:fixed;top:32px;top:2.6666666667rem;bottom:0;left:0;right:0}.theme-light .Window__contentPadding{margin:.5rem;height:100%;height:calc(100% - 1.01rem)}.theme-light .Window__contentPadding:after{height:0}.theme-light .Layout__content--scrollable .Window__contentPadding:after{display:block;content:"";height:.5rem}.theme-light .Window__dimmer{position:fixed;top:0;bottom:0;left:0;right:0;background-color:rgba(252,252,252,.25);pointer-events:none}.theme-light .Window__resizeHandle__se{position:fixed;bottom:0;right:0;width:20px;width:1.6666666667rem;height:20px;height:1.6666666667rem;cursor:se-resize}.theme-light .Window__resizeHandle__s{position:fixed;bottom:0;left:0;right:0;height:6px;height:.5rem;cursor:s-resize}.theme-light .Window__resizeHandle__e{position:fixed;top:0;bottom:0;right:0;width:3px;width:.25rem;cursor:e-resize}.theme-light .TitleBar{background-color:#eee;border-bottom:1px solid rgba(0,0,0,.25);box-shadow:0 2px 2px rgba(0,0,0,.1);box-shadow:0 .1666666667rem .1666666667rem rgba(0,0,0,.1);user-select:none;-ms-user-select:none}.theme-light .TitleBar__clickable{color:rgba(0,0,0,.5);background-color:#eee;transition:color .25s ease-out,background-color .25s ease-out}.theme-light .TitleBar__clickable:hover{color:#fff;background-color:#c00;transition:color 0ms,background-color 0ms}.theme-light .TitleBar__title{position:absolute;display:inline-block;top:0;left:46px;left:3.8333333333rem;color:rgba(0,0,0,.75);font-size:14px;font-size:1.1666666667rem;line-height:31px;line-height:2.5833333333rem;white-space:nowrap;pointer-events:none}.theme-light .TitleBar__buttons{pointer-events:initial;display:inline-block;width:100%;margin-left:10px}.theme-light .TitleBar__dragZone{position:absolute;top:0;left:0;right:0;height:32px;height:2.6666666667rem}.theme-light .TitleBar__statusIcon{position:absolute;top:0;left:12px;left:1rem;transition:color .5s;font-size:20px;font-size:1.6666666667rem;line-height:32px!important;line-height:2.6666666667rem!important}.theme-light .TitleBar__close{position:absolute;top:-1px;right:0;width:45px;width:3.75rem;height:32px;height:2.6666666667rem;font-size:20px;font-size:1.6666666667rem;line-height:31px;line-height:2.5833333333rem;text-align:center}.theme-light .TitleBar__devBuildIndicator{position:absolute;top:6px;top:.5rem;right:52px;right:4.3333333333rem;min-width:20px;min-width:1.6666666667rem;padding:2px 4px;padding:.1666666667rem .3333333333rem;background-color:rgba(91,170,39,.75);color:#fff;text-align:center}.theme-light html,.theme-light body{padding:0;margin:0;height:100%;color:#000}.theme-light body{background:#fff;font-family:Verdana,sans-serif;font-size:13px;line-height:1.2;overflow-x:hidden;overflow-y:scroll;word-wrap:break-word}.theme-light img{margin:0;padding:0;line-height:1;-ms-interpolation-mode:nearest-neighbor;image-rendering:pixelated}.theme-light img.icon{height:1em;min-height:16px;width:auto;vertical-align:bottom}.theme-light a{color:#00f}.theme-light a.visited,.theme-light a:visited{color:#f0f}.theme-light a.popt{text-decoration:none}.theme-light .popup{position:fixed;top:50%;left:50%;background:#ddd}.theme-light .popup .close{position:absolute;background:#aaa;top:0;right:0;color:#333;text-decoration:none;z-index:2;padding:0 10px;height:30px;line-height:30px}.theme-light .popup .close:hover{background:#999}.theme-light .popup .head{background:#999;color:#ddd;padding:0 10px;height:30px;line-height:30px;text-transform:uppercase;font-size:.9em;font-weight:700;border-bottom:2px solid green}.theme-light .popup input{border:1px solid #999;background:#fff;margin:0;padding:5px;outline:none;color:#333}.theme-light .popup input[type=text]:hover,.theme-light .popup input[type=text]:active,.theme-light .popup input[type=text]:focus{border-color:green}.theme-light .popup input[type=submit]{padding:5px 10px;background:#999;color:#ddd;text-transform:uppercase;font-size:.9em;font-weight:700}.theme-light .popup input[type=submit]:hover,.theme-light .popup input[type=submit]:focus,.theme-light .popup input[type=submit]:active{background:#aaa;cursor:pointer}.theme-light .changeFont{padding:10px}.theme-light .changeFont a{display:block;text-decoration:none;padding:3px;color:#333}.theme-light .changeFont a:hover{background:#ccc}.theme-light .highlightPopup{padding:10px;text-align:center}.theme-light .highlightPopup input[type=text]{display:block;width:215px;text-align:left;margin-top:5px}.theme-light .highlightPopup input.highlightColor{background-color:#ff0}.theme-light .highlightPopup input.highlightTermSubmit{margin-top:5px}.theme-light .contextMenu{background-color:#ddd;position:fixed;margin:2px;width:150px}.theme-light .contextMenu a{display:block;padding:2px 5px;text-decoration:none;color:#333}.theme-light .contextMenu a:hover{background-color:#ccc}.theme-light .filterMessages{padding:5px}.theme-light .filterMessages div{padding:2px 0}.theme-light .icon-stack{height:1em;line-height:1em;width:1em;vertical-align:middle;margin-top:-2px}.theme-light .motd{color:#638500;font-family:Verdana,sans-serif;white-space:normal}.theme-light .motd h1,.theme-light .motd h2,.theme-light .motd h3,.theme-light .motd h4,.theme-light .motd h5,.theme-light .motd h6{color:#638500;text-decoration:underline}.theme-light .motd a,.theme-light .motd a:link,.theme-light .motd a:visited,.theme-light .motd a:active,.theme-light .motd a:hover{color:#638500}.theme-light .bold,.theme-light .name,.theme-light .prefix,.theme-light .ooc,.theme-light .looc,.theme-light .adminooc,.theme-light .admin,.theme-light .niche,.theme-light .medal,.theme-light .yell{font-weight:700}.theme-light .italic,.theme-light .italics{font-style:italic}.theme-light .highlight{background:#ff0}.theme-light h1,.theme-light h2,.theme-light h3,.theme-light h4,.theme-light h5,.theme-light h6{color:#00f;font-family:Georgia,Verdana,sans-serif}.theme-light em{font-style:normal;font-weight:700}.theme-light .ooc{font-weight:700}.theme-light .adminobserverooc{color:#09c;font-weight:700}.theme-light .adminooc{color:#700038;font-weight:700}.theme-light .adminsay{color:#ff4500;font-weight:700}.theme-light .admin,.theme-light .niche{color:#4473ff;font-weight:700}.theme-light .name{font-weight:700}.theme-light .deadsay{color:#5c00e6}.theme-light .binarysay{color:#20c20e;background-color:#000;display:block}.theme-light .binarysay a{color:#0f0}.theme-light .binarysay a:active,.theme-light .binarysay a:visited{color:#8f8}.theme-light .radio{color:green}.theme-light .sciradio{color:#939}.theme-light .comradio{color:#948f02}.theme-light .medradio{color:#337296}.theme-light .engradio{color:#fb5613}.theme-light .suppradio{color:#a8732b}.theme-light .servradio{color:#6eaa2c}.theme-light .syndradio{color:#6d3f40}.theme-light .gangradio{color:#ac2ea1}.theme-light .centcomradio{color:#686868}.theme-light .aiprivradio{color:#f0f}.theme-light .redteamradio{color:red}.theme-light .blueteamradio{color:#00f}.theme-light .greenteamradio{color:#0f0}.theme-light .yellowteamradio{color:#d1ba22}.theme-light .yell{font-weight:700}.theme-light .alert{color:red}.theme-light h1.alert,.theme-light h2.alert{color:#000}.theme-light .userdanger{color:red;font-weight:700;font-size:185%}.theme-light .bolddanger{color:red;font-weight:700}.theme-light .danger{color:red}.theme-light .tinydanger{color:red;font-size:85%}.theme-light .smalldanger{color:red;font-size:90%}.theme-light .warning{color:red;font-style:italic}.theme-light .alertwarning{color:red;font-weight:700}.theme-light .boldwarning{color:red;font-style:italic;font-weight:700}.theme-light .announce{color:#228b22;font-weight:700}.theme-light .boldannounce{color:red;font-weight:700}.theme-light .bigannounce{font-weight:700;font-size:115%}.theme-light .greenannounce{color:#0f0;font-weight:700}.theme-light .info{color:#00c}.theme-light .notice,.theme-light .staff_ic{color:#009}.theme-light .tinynotice{color:#009;font-size:85%}.theme-light .tinynoticeital{color:#009;font-style:italic;font-size:85%}.theme-light .smallnotice{color:#009;font-size:90%}.theme-light .smallnoticeital{color:#009;font-style:italic;font-size:90%}.theme-light .boldnotice{color:#009;font-weight:700}.theme-light .hear{color:#009;font-style:italic}.theme-light .adminnotice{color:#00f}.theme-light .adminhelp{color:red;font-weight:700}.theme-light .unconscious{color:#00f;font-weight:700}.theme-light .suicide{color:#ff5050;font-style:italic}.theme-light .green{color:#03ff39}.theme-light .grey{color:#838383}.theme-light .red{color:red}.theme-light .blue{color:#00f}.theme-light .nicegreen{color:#14a833}.theme-light .boldnicegreen{color:#14a833;font-weight:700}.theme-light .cult{color:#973e3b}.theme-light .cultitalic{color:#973e3b;font-style:italic}.theme-light .cultbold{color:#973e3b;font-style:italic;font-weight:700}.theme-light .cultboldtalic,.theme-light .cultlarge{color:#973e3b;font-weight:700;font-size:185%}.theme-light .narsie{color:#973e3b;font-weight:700;font-size:925%}.theme-light .narsiesmall{color:#973e3b;font-weight:700;font-size:370%}.theme-light .colossus{color:#7f282a;font-size:310%}.theme-light .hierophant{color:#609;font-weight:700;font-style:italic}.theme-light .hierophant_warning{color:#609;font-style:italic}.theme-light .purple{color:#5e2d79}.theme-light .holoparasite{color:#35333a}.theme-light .revennotice{color:#1d2953}.theme-light .revenboldnotice{color:#1d2953;font-weight:700}.theme-light .revenbignotice{color:#1d2953;font-weight:700;font-size:185%}.theme-light .revenminor{color:#823abb}.theme-light .revenwarning{color:#760fbb;font-style:italic}.theme-light .revendanger{color:#760fbb;font-weight:700;font-size:185%}.theme-light .deconversion_message{color:#5000a0;font-size:185%;font-style:italic}.theme-light .ghostalert{color:#5c00e6;font-style:italic;font-weight:700}.theme-light .alien{color:#543354}.theme-light .noticealien{color:#00c000}.theme-light .alertalien{color:#00c000;font-weight:700}.theme-light .changeling{color:purple;font-style:italic}.theme-light .alertsyndie{color:red;font-size:185%;font-weight:700}.theme-light .spider{color:#4d004d;font-weight:700;font-size:185%}.theme-light .interface{color:#303}.theme-light .sans{font-family:Comic Sans MS,cursive,sans-serif}.theme-light .papyrus{font-family:Papyrus,cursive,sans-serif}.theme-light .robot{font-family:Courier New,cursive,sans-serif}.theme-light .tape_recorder{color:maroon;font-family:Courier New,cursive,sans-serif}.theme-light .command_headset{font-weight:700;font-size:160%}.theme-light .small{font-size:60%}.theme-light .big{font-size:185%}.theme-light .reallybig{font-size:245%}.theme-light .extremelybig{font-size:310%}.theme-light .greentext{color:#0f0;font-size:185%}.theme-light .redtext{color:red;font-size:185%}.theme-light .clown{color:#ff69bf;font-size:160%;font-family:Comic Sans MS,cursive,sans-serif;font-weight:700}.theme-light .singing{font-family:Trebuchet MS,cursive,sans-serif;font-style:italic}.theme-light .his_grace{color:#15d512;font-family:Courier New,cursive,sans-serif;font-style:italic}.theme-light .hypnophrase{color:#0d0d0d;font-weight:700;animation:hypnocolor 1.5s infinite;animation-direction:alternate}@keyframes hypnocolor{0%{color:#0d0d0d}25%{color:#410194}50%{color:#7f17d8}75%{color:#410194}to{color:#3bb5d3}}.theme-light .phobia{color:#d00;font-weight:700;animation:phobia .75s infinite}@keyframes phobia{0%{color:#0d0d0d}50%{color:#d00}to{color:#0d0d0d}}.theme-light .icon{height:1em;width:auto}.theme-light .bigicon{font-size:2.5em}.theme-light .memo{color:#638500;text-align:center}.theme-light .memoedit{text-align:center;font-size:125%}.theme-light .abductor{color:purple;font-style:italic}.theme-light .mind_control{color:#a00d6f;font-size:100%;font-weight:700;font-style:italic}.theme-light .slime{color:#00ced1}.theme-light .drone{color:#848482}.theme-light .monkey{color:#975032}.theme-light .swarmer{color:#2c75ff}.theme-light .resonate{color:#298f85}.theme-light .monkeyhive{color:#774704}.theme-light .monkeylead{color:#774704;font-size:80%}.theme-light .connectionClosed,.theme-light .fatalError{background:red;color:#fff;padding:5px}.theme-light .connectionClosed.restored{background:green}.theme-light .internal.boldnshit{color:#00f;font-weight:700}.theme-light .text-normal{font-weight:400;font-style:normal}.theme-light .hidden{display:none;visibility:hidden}.theme-light .ml-1{margin-left:1em}.theme-light .ml-2{margin-left:2em}.theme-light .ml-3{margin-left:3em}.theme-light .xooc{color:#6c0094;font-weight:700;font-size:140%}.theme-light .mooc{color:#090;font-weight:700;font-size:140%}.theme-light .yooc{color:#999600;font-weight:700;font-size:140%}.theme-light .headminsay{color:#5a0a7f;font-weight:700}.theme-light .radio{color:#4e4e4e}.theme-light .deptradio{color:#939}.theme-light .comradio{color:#004080}.theme-light .centradio{color:#5c5c8a}.theme-light .cryoradio{color:#554e3f}.theme-light .hcradio{color:#318779}.theme-light .pvstradio{color:#9b0612}.theme-light .airadio{color:#f0f}.theme-light .secradio{color:#a30000}.theme-light .engradio{color:#a66300}.theme-light .sentryradio{color:#844300}.theme-light .medradio{color:#008160}.theme-light .supradio{color:#5f4519}.theme-light .jtacradio{color:#702963}.theme-light .intelradio{color:#027d02}.theme-light .wyradio{color:#fe9b24}.theme-light .pmcradio{color:#136957}.theme-light .vairadio{color:#943d0a}.theme-light .cmbradio{color:#1b748c}.theme-light .clfradio{color:#6f679c}.theme-light .alpharadio{color:#ea0000}.theme-light .bravoradio{color:#c68610}.theme-light .charlieradio{color:#a5a}.theme-light .deltaradio{color:#007fcf}.theme-light .echoradio{color:#3a7e65}.theme-light .medium{font-size:110%}.theme-light .big{font-size:115%}.theme-light .large{font-size:125%}.theme-light .extra_large{font-size:130%}.theme-light .huge{font-size:150%}.theme-light .underline{text-decoration:underline}.theme-light .orange{color:#eca100}.theme-light .normal{font-style:normal}.theme-light .attack{color:red}.theme-light .moderate{color:#c00}.theme-light .disarm{color:#900}.theme-light .passive{color:#600}.theme-light .helpful{color:#368f31}.theme-light .scanner{color:red}.theme-light .scannerb{color:red;font-weight:700}.theme-light .scannerburn{color:orange}.theme-light .scannerburnb{color:orange;font-weight:700}.theme-light .rose{color:#ff5050}.theme-light .debuginfo{color:#493d26;font-style:italic}.theme-light .xenonotice{color:#2a623d}.theme-light .xenoboldnotice{color:#2a623d;font-weight:700}.theme-light .xenowarning{color:#2a623d;font-style:italic}.theme-light .xenominorwarning{color:#2a623d;font-weight:700;font-style:italic}.theme-light .xenodanger{color:#2a623d;font-weight:700}.theme-light .avoidharm{color:#72a0e5;font-weight:700}.theme-light .highdanger{color:red;font-weight:700;font-size:140%}.theme-light .xenohighdanger{color:#2a623d;font-weight:700;font-size:140%}.theme-light .xenoannounce{color:#1a472a;font-family:book-antiqua;font-weight:700;font-size:140%}.theme-light .yautjabold{color:purple;font-weight:700}.theme-light .yautjaboldbig{color:purple;font-weight:700;font-size:120%}.theme-light .objectivebig{font-weight:700;font-size:130%}.theme-light .objectivegreen{color:#0f0}.theme-light .objectivered{color:red}.theme-light .objectivesuccess{color:#0f0;font-weight:700;font-size:110%}.theme-light .objectivefail{color:red;font-weight:700;font-size:110%}.theme-light .xenotalk,.theme-light .xeno{color:#900090;font-style:italic}.theme-light .xenoleader{color:#730d73;font-style:italic;font-size:125%}.theme-light .xenoqueen{color:#730d73;font-style:italic;font-weight:700;font-size:125%}.theme-light .newscaster{color:maroon}.theme-light .role_header{color:#db0000;display:block;text-align:center;font-weight:700;font-family:trebuchet-ms;font-size:150%}.theme-light .role_body{color:#009;display:block;text-align:center;font-size:125%}.theme-light .round_header{color:#db0000;display:block;text-align:center;font-family:courier;font-weight:700;font-size:180%}.theme-light .round_body{color:#001427;display:block;text-align:center;font-family:trebuchet-ms;font-weight:700;font-size:125%}.theme-light .event_announcement{color:#600d48;font-family:arial-narrow;font-weight:700;font-size:125%}.theme-light .announce_header{color:#000;font-weight:700;font-size:150%}.theme-light .announce_header_blue{color:#009;font-weight:700;font-size:150%}.theme-light .announce_body{color:red;font-weight:400;font-size:125%}.theme-light .centerbold{display:block;text-align:center;font-weight:700}.theme-light .mod{color:#735638;font-weight:700}.theme-light .modooc{color:#184880;font-weight:700}.theme-light .adminmod{color:#402a14;font-weight:700}.theme-light .mentorsay{color:#b38c32;font-weight:700}.theme-light .mentorhelp{color:#007e00;font-weight:700}.theme-light .mentorbody{color:#da6200;font-weight:700}.theme-light .mentorstaff,.theme-light .staffsay{color:#876101;font-weight:700}.theme-light .tajaran{color:#803b56}.theme-light .tajaran_signlang{color:#941c1c}.theme-light .skrell{color:#00ced1}.theme-light .soghun{color:#228b22}.theme-light .changeling{color:purple}.theme-light .vox{color:#a0a}.theme-light .monkey{color:#966c47}.theme-light .german{color:#858f1e;font-family:Times New Roman,Times,serif}.theme-light .spanish{color:#cf982b}.theme-light .japanese{color:#940927}.theme-light .chinese{color:#fe1919}.theme-light .zombie{color:#216163;font-style:italic}.theme-light .commando{color:#fe9b24;font-style:bold}.theme-light .rough{font-family:trebuchet-ms,cursive,sans-serif}.theme-light .say_quote{font-family:Georgia,Verdana,sans-serif}.theme-light .admin .message{color:#314cad}.theme-light .admin .prefix{font-weight:bolder}.theme-light .pm{font-size:110%}.theme-light .retro_translator{font-weight:700}.theme-light .yautja_translator{color:#a00;font-weight:700;animation:glitch .5s infinite}@keyframes glitch{25%{color:#a00;transform:translate(-2px,-1px)}50%{color:#be0000;transform:translate(1px,-2px)}75%{color:#8d0000;transform:translate(-1px,2px)}to{color:#830000;transform:translate(1px,1px)}}.theme-light .examine_block{background:#f2f7fa;border:1px solid #111a27;margin:.5em;padding:.5em .75em}.theme-light .examine_block .icon{width:1.5em;height:1.5em;margin:0;padding:0}.theme-light .tooltip{font-style:italic;border-bottom:1px dashed #000}
diff --git a/tgui/webpack.config.js b/tgui/webpack.config.js
index f90b80926e44..4a1a3ec61b79 100644
--- a/tgui/webpack.config.js
+++ b/tgui/webpack.config.js
@@ -7,7 +7,6 @@
const webpack = require('webpack');
const path = require('path');
const ExtractCssPlugin = require('mini-css-extract-plugin');
-const { createBabelConfig } = require('./babel.config.js');
const createStats = (verbose) => ({
assets: verbose,
@@ -33,18 +32,9 @@ module.exports = (env = {}, argv) => {
context: path.resolve(__dirname),
target: ['web', 'es3', 'browserslist:ie 8'],
entry: {
- 'tgui': [
- './packages/tgui-polyfill',
- './packages/tgui',
- ],
- 'tgui-panel': [
- './packages/tgui-polyfill',
- './packages/tgui-panel',
- ],
- 'tgui-say': [
- './packages/tgui-polyfill',
- './packages/tgui-say',
- ],
+ 'tgui': ['./packages/tgui-polyfill', './packages/tgui'],
+ 'tgui-panel': ['./packages/tgui-polyfill', './packages/tgui-panel'],
+ 'tgui-say': ['./packages/tgui-polyfill', './packages/tgui-say'],
},
output: {
path: argv.useTmpFolder
@@ -61,13 +51,10 @@ module.exports = (env = {}, argv) => {
module: {
rules: [
{
- test: /\.(js|jsx|cjs|ts|tsx)$/,
+ test: /\.([tj]s(x)?|cjs)$/,
use: [
{
- loader: require.resolve('babel-loader'),
- options: createBabelConfig({
- removeConsole: !bench,
- }),
+ loader: require.resolve('swc-loader'),
},
],
},
@@ -143,17 +130,11 @@ module.exports = (env = {}, argv) => {
// Production build specific options
if (mode === 'production') {
- const TerserPlugin = require('terser-webpack-plugin');
+ const { EsbuildPlugin } = require('esbuild-loader');
config.optimization.minimizer = [
- new TerserPlugin({
- extractComments: false,
- terserOptions: {
- ie8: true,
- output: {
- ascii_only: true,
- comments: false,
- },
- },
+ new EsbuildPlugin({
+ target: 'ie8',
+ css: true,
}),
];
}
diff --git a/tgui/yarn.lock b/tgui/yarn.lock
index 5c33f5665cb5..4e6d9e3d5fce 100644
--- a/tgui/yarn.lock
+++ b/tgui/yarn.lock
@@ -61,14 +61,14 @@ __metadata:
languageName: node
linkType: hard
-"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.23.3, @babel/compat-data@npm:^7.23.5":
+"@babel/compat-data@npm:^7.23.5":
version: 7.23.5
resolution: "@babel/compat-data@npm:7.23.5"
checksum: 06ce244cda5763295a0ea924728c09bae57d35713b675175227278896946f922a63edf803c322f855a3878323d48d0255a2a3023409d2a123483c8a69ebb4744
languageName: node
linkType: hard
-"@babel/core@npm:^7.1.0, @babel/core@npm:^7.12.3, @babel/core@npm:^7.15.0, @babel/core@npm:^7.7.2, @babel/core@npm:^7.8.0":
+"@babel/core@npm:^7.1.0, @babel/core@npm:^7.12.3, @babel/core@npm:^7.7.2, @babel/core@npm:^7.8.0":
version: 7.23.7
resolution: "@babel/core@npm:7.23.7"
dependencies:
@@ -91,20 +91,6 @@ __metadata:
languageName: node
linkType: hard
-"@babel/eslint-parser@npm:^7.15.0":
- version: 7.23.3
- resolution: "@babel/eslint-parser@npm:7.23.3"
- dependencies:
- "@nicolo-ribaudo/eslint-scope-5-internals": 5.1.1-v1
- eslint-visitor-keys: ^2.1.0
- semver: ^6.3.1
- peerDependencies:
- "@babel/core": ^7.11.0
- eslint: ^7.5.0 || ^8.0.0
- checksum: 9573daebe21af5123c302c307be80cacf1c2bf236a9497068a14726d3944ef55e1282519d0ccf51882dfc369359a3442299c98cb22a419e209924db39d4030fd
- languageName: node
- linkType: hard
-
"@babel/generator@npm:^7.23.6":
version: 7.23.6
resolution: "@babel/generator@npm:7.23.6"
@@ -128,25 +114,7 @@ __metadata:
languageName: node
linkType: hard
-"@babel/helper-annotate-as-pure@npm:^7.22.5":
- version: 7.22.5
- resolution: "@babel/helper-annotate-as-pure@npm:7.22.5"
- dependencies:
- "@babel/types": ^7.22.5
- checksum: 53da330f1835c46f26b7bf4da31f7a496dee9fd8696cca12366b94ba19d97421ce519a74a837f687749318f94d1a37f8d1abcbf35e8ed22c32d16373b2f6198d
- languageName: node
- linkType: hard
-
-"@babel/helper-builder-binary-assignment-operator-visitor@npm:^7.22.15":
- version: 7.22.15
- resolution: "@babel/helper-builder-binary-assignment-operator-visitor@npm:7.22.15"
- dependencies:
- "@babel/types": ^7.22.15
- checksum: 639c697a1c729f9fafa2dd4c9af2e18568190299b5907bd4c2d0bc818fcbd1e83ffeecc2af24327a7faa7ac4c34edd9d7940510a5e66296c19bad17001cf5c7a
- languageName: node
- linkType: hard
-
-"@babel/helper-compilation-targets@npm:^7.22.15, @babel/helper-compilation-targets@npm:^7.22.6, @babel/helper-compilation-targets@npm:^7.23.6":
+"@babel/helper-compilation-targets@npm:^7.23.6":
version: 7.23.6
resolution: "@babel/helper-compilation-targets@npm:7.23.6"
dependencies:
@@ -159,53 +127,6 @@ __metadata:
languageName: node
linkType: hard
-"@babel/helper-create-class-features-plugin@npm:^7.22.15, @babel/helper-create-class-features-plugin@npm:^7.23.6":
- version: 7.23.7
- resolution: "@babel/helper-create-class-features-plugin@npm:7.23.7"
- dependencies:
- "@babel/helper-annotate-as-pure": ^7.22.5
- "@babel/helper-environment-visitor": ^7.22.20
- "@babel/helper-function-name": ^7.23.0
- "@babel/helper-member-expression-to-functions": ^7.23.0
- "@babel/helper-optimise-call-expression": ^7.22.5
- "@babel/helper-replace-supers": ^7.22.20
- "@babel/helper-skip-transparent-expression-wrappers": ^7.22.5
- "@babel/helper-split-export-declaration": ^7.22.6
- semver: ^6.3.1
- peerDependencies:
- "@babel/core": ^7.0.0
- checksum: 33e60714b856c3816a7965d4c76278cc8f430644a2dfc4eeafad2f7167c4fbd2becdb74cbfeb04b02efd6bbd07176ef53c6683262b588e65d378438e9c55c26b
- languageName: node
- linkType: hard
-
-"@babel/helper-create-regexp-features-plugin@npm:^7.18.6, @babel/helper-create-regexp-features-plugin@npm:^7.22.15, @babel/helper-create-regexp-features-plugin@npm:^7.22.5":
- version: 7.22.15
- resolution: "@babel/helper-create-regexp-features-plugin@npm:7.22.15"
- dependencies:
- "@babel/helper-annotate-as-pure": ^7.22.5
- regexpu-core: ^5.3.1
- semver: ^6.3.1
- peerDependencies:
- "@babel/core": ^7.0.0
- checksum: 0243b8d4854f1dc8861b1029a46d3f6393ad72f366a5a08e36a4648aa682044f06da4c6e87a456260e1e1b33c999f898ba591a0760842c1387bcc93fbf2151a6
- languageName: node
- linkType: hard
-
-"@babel/helper-define-polyfill-provider@npm:^0.4.4":
- version: 0.4.4
- resolution: "@babel/helper-define-polyfill-provider@npm:0.4.4"
- dependencies:
- "@babel/helper-compilation-targets": ^7.22.6
- "@babel/helper-plugin-utils": ^7.22.5
- debug: ^4.1.1
- lodash.debounce: ^4.0.8
- resolve: ^1.14.2
- peerDependencies:
- "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
- checksum: 2453cdd79f18a4cb8653d8a7e06b2eb0d8e31bae0d35070fc5abadbddca246a36d82b758064b421cca49b48d0e696d331d54520ba8582c1d61fb706d6d831817
- languageName: node
- linkType: hard
-
"@babel/helper-environment-visitor@npm:^7.22.20":
version: 7.22.20
resolution: "@babel/helper-environment-visitor@npm:7.22.20"
@@ -213,7 +134,7 @@ __metadata:
languageName: node
linkType: hard
-"@babel/helper-function-name@npm:^7.22.5, @babel/helper-function-name@npm:^7.23.0":
+"@babel/helper-function-name@npm:^7.23.0":
version: 7.23.0
resolution: "@babel/helper-function-name@npm:7.23.0"
dependencies:
@@ -232,15 +153,6 @@ __metadata:
languageName: node
linkType: hard
-"@babel/helper-member-expression-to-functions@npm:^7.22.15, @babel/helper-member-expression-to-functions@npm:^7.23.0":
- version: 7.23.0
- resolution: "@babel/helper-member-expression-to-functions@npm:7.23.0"
- dependencies:
- "@babel/types": ^7.23.0
- checksum: 494659361370c979ada711ca685e2efe9460683c36db1b283b446122596602c901e291e09f2f980ecedfe6e0f2bd5386cb59768285446530df10c14df1024e75
- languageName: node
- linkType: hard
-
"@babel/helper-module-imports@npm:^7.22.15":
version: 7.22.15
resolution: "@babel/helper-module-imports@npm:7.22.15"
@@ -265,55 +177,13 @@ __metadata:
languageName: node
linkType: hard
-"@babel/helper-optimise-call-expression@npm:^7.22.5":
- version: 7.22.5
- resolution: "@babel/helper-optimise-call-expression@npm:7.22.5"
- dependencies:
- "@babel/types": ^7.22.5
- checksum: c70ef6cc6b6ed32eeeec4482127e8be5451d0e5282d5495d5d569d39eb04d7f1d66ec99b327f45d1d5842a9ad8c22d48567e93fc502003a47de78d122e355f7c
- languageName: node
- linkType: hard
-
-"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3":
+"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.8.0":
version: 7.14.5
resolution: "@babel/helper-plugin-utils@npm:7.14.5"
checksum: fe20e90a24d02770a60ebe80ab9f0dfd7258503cea8006c71709ac9af1aa3e47b0de569499673f11ea6c99597f8c0e4880ae1d505986e61101b69716820972fe
languageName: node
linkType: hard
-"@babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.22.5":
- version: 7.22.5
- resolution: "@babel/helper-plugin-utils@npm:7.22.5"
- checksum: c0fc7227076b6041acd2f0e818145d2e8c41968cc52fb5ca70eed48e21b8fe6dd88a0a91cbddf4951e33647336eb5ae184747ca706817ca3bef5e9e905151ff5
- languageName: node
- linkType: hard
-
-"@babel/helper-remap-async-to-generator@npm:^7.22.20":
- version: 7.22.20
- resolution: "@babel/helper-remap-async-to-generator@npm:7.22.20"
- dependencies:
- "@babel/helper-annotate-as-pure": ^7.22.5
- "@babel/helper-environment-visitor": ^7.22.20
- "@babel/helper-wrap-function": ^7.22.20
- peerDependencies:
- "@babel/core": ^7.0.0
- checksum: 2fe6300a6f1b58211dffa0aed1b45d4958506d096543663dba83bd9251fe8d670fa909143a65b45e72acb49e7e20fbdb73eae315d9ddaced467948c3329986e7
- languageName: node
- linkType: hard
-
-"@babel/helper-replace-supers@npm:^7.22.20":
- version: 7.22.20
- resolution: "@babel/helper-replace-supers@npm:7.22.20"
- dependencies:
- "@babel/helper-environment-visitor": ^7.22.20
- "@babel/helper-member-expression-to-functions": ^7.22.15
- "@babel/helper-optimise-call-expression": ^7.22.5
- peerDependencies:
- "@babel/core": ^7.0.0
- checksum: a0008332e24daedea2e9498733e3c39b389d6d4512637e000f96f62b797e702ee24a407ccbcd7a236a551590a38f31282829a8ef35c50a3c0457d88218cae639
- languageName: node
- linkType: hard
-
"@babel/helper-simple-access@npm:^7.22.5":
version: 7.22.5
resolution: "@babel/helper-simple-access@npm:7.22.5"
@@ -323,15 +193,6 @@ __metadata:
languageName: node
linkType: hard
-"@babel/helper-skip-transparent-expression-wrappers@npm:^7.22.5":
- version: 7.22.5
- resolution: "@babel/helper-skip-transparent-expression-wrappers@npm:7.22.5"
- dependencies:
- "@babel/types": ^7.22.5
- checksum: 1012ef2295eb12dc073f2b9edf3425661e9b8432a3387e62a8bc27c42963f1f216ab3124228015c748770b2257b4f1fda882ca8fa34c0bf485e929ae5bc45244
- languageName: node
- linkType: hard
-
"@babel/helper-split-export-declaration@npm:^7.22.6":
version: 7.22.6
resolution: "@babel/helper-split-export-declaration@npm:7.22.6"
@@ -362,24 +223,13 @@ __metadata:
languageName: node
linkType: hard
-"@babel/helper-validator-option@npm:^7.22.15, @babel/helper-validator-option@npm:^7.23.5":
+"@babel/helper-validator-option@npm:^7.23.5":
version: 7.23.5
resolution: "@babel/helper-validator-option@npm:7.23.5"
checksum: 537cde2330a8aede223552510e8a13e9c1c8798afee3757995a7d4acae564124fe2bf7e7c3d90d62d3657434a74340a274b3b3b1c6f17e9a2be1f48af29cb09e
languageName: node
linkType: hard
-"@babel/helper-wrap-function@npm:^7.22.20":
- version: 7.22.20
- resolution: "@babel/helper-wrap-function@npm:7.22.20"
- dependencies:
- "@babel/helper-function-name": ^7.22.5
- "@babel/template": ^7.22.15
- "@babel/types": ^7.22.19
- checksum: 221ed9b5572612aeb571e4ce6a256f2dee85b3c9536f1dd5e611b0255e5f59a3d0ec392d8d46d4152149156a8109f92f20379b1d6d36abb613176e0e33f05fca
- languageName: node
- linkType: hard
-
"@babel/helpers@npm:^7.23.7":
version: 7.23.8
resolution: "@babel/helpers@npm:7.23.8"
@@ -440,51 +290,6 @@ __metadata:
languageName: node
linkType: hard
-"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.23.3":
- version: 7.23.3
- resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.23.3"
- dependencies:
- "@babel/helper-plugin-utils": ^7.22.5
- peerDependencies:
- "@babel/core": ^7.0.0
- checksum: ddbaf2c396b7780f15e80ee01d6dd790db076985f3dfeb6527d1a8d4cacf370e49250396a3aa005b2c40233cac214a106232f83703d5e8491848bde273938232
- languageName: node
- linkType: hard
-
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:^7.23.3":
- version: 7.23.3
- resolution: "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:7.23.3"
- dependencies:
- "@babel/helper-plugin-utils": ^7.22.5
- "@babel/helper-skip-transparent-expression-wrappers": ^7.22.5
- "@babel/plugin-transform-optional-chaining": ^7.23.3
- peerDependencies:
- "@babel/core": ^7.13.0
- checksum: 434b9d710ae856fa1a456678cc304fbc93915af86d581ee316e077af746a709a741ea39d7e1d4f5b98861b629cc7e87f002d3138f5e836775632466d4c74aef2
- languageName: node
- linkType: hard
-
-"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:^7.23.7":
- version: 7.23.7
- resolution: "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:7.23.7"
- dependencies:
- "@babel/helper-environment-visitor": ^7.22.20
- "@babel/helper-plugin-utils": ^7.22.5
- peerDependencies:
- "@babel/core": ^7.0.0
- checksum: f88e400b548202a6f8c5dfd25bc4949a13ea1ccb64a170d7dea4deaa655a0fcb001d3fd61c35e1ad9c09a3d5f0d43f783400425471fe6d660ccaf33dabea9aba
- languageName: node
- linkType: hard
-
-"@babel/plugin-proposal-private-property-in-object@npm:7.21.0-placeholder-for-preset-env.2":
- version: 7.21.0-placeholder-for-preset-env.2
- resolution: "@babel/plugin-proposal-private-property-in-object@npm:7.21.0-placeholder-for-preset-env.2"
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: d97745d098b835d55033ff3a7fb2b895b9c5295b08a5759e4f20df325aa385a3e0bc9bd5ad8f2ec554a44d4e6525acfc257b8c5848a1345cb40f26a30e277e91
- languageName: node
- linkType: hard
-
"@babel/plugin-syntax-async-generators@npm:^7.8.4":
version: 7.8.4
resolution: "@babel/plugin-syntax-async-generators@npm:7.8.4"
@@ -507,7 +312,7 @@ __metadata:
languageName: node
linkType: hard
-"@babel/plugin-syntax-class-properties@npm:^7.12.13, @babel/plugin-syntax-class-properties@npm:^7.8.3":
+"@babel/plugin-syntax-class-properties@npm:^7.8.3":
version: 7.12.13
resolution: "@babel/plugin-syntax-class-properties@npm:7.12.13"
dependencies:
@@ -518,62 +323,7 @@ __metadata:
languageName: node
linkType: hard
-"@babel/plugin-syntax-class-static-block@npm:^7.14.5":
- version: 7.14.5
- resolution: "@babel/plugin-syntax-class-static-block@npm:7.14.5"
- dependencies:
- "@babel/helper-plugin-utils": ^7.14.5
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: 3e80814b5b6d4fe17826093918680a351c2d34398a914ce6e55d8083d72a9bdde4fbaf6a2dcea0e23a03de26dc2917ae3efd603d27099e2b98380345703bf948
- languageName: node
- linkType: hard
-
-"@babel/plugin-syntax-dynamic-import@npm:^7.8.3":
- version: 7.8.3
- resolution: "@babel/plugin-syntax-dynamic-import@npm:7.8.3"
- dependencies:
- "@babel/helper-plugin-utils": ^7.8.0
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: ce307af83cf433d4ec42932329fad25fa73138ab39c7436882ea28742e1c0066626d224e0ad2988724c82644e41601cef607b36194f695cb78a1fcdc959637bd
- languageName: node
- linkType: hard
-
-"@babel/plugin-syntax-export-namespace-from@npm:^7.8.3":
- version: 7.8.3
- resolution: "@babel/plugin-syntax-export-namespace-from@npm:7.8.3"
- dependencies:
- "@babel/helper-plugin-utils": ^7.8.3
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: 85740478be5b0de185228e7814451d74ab8ce0a26fcca7613955262a26e99e8e15e9da58f60c754b84515d4c679b590dbd3f2148f0f58025f4ae706f1c5a5d4a
- languageName: node
- linkType: hard
-
-"@babel/plugin-syntax-import-assertions@npm:^7.23.3":
- version: 7.23.3
- resolution: "@babel/plugin-syntax-import-assertions@npm:7.23.3"
- dependencies:
- "@babel/helper-plugin-utils": ^7.22.5
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: 883e6b35b2da205138caab832d54505271a3fee3fc1e8dc0894502434fc2b5d517cbe93bbfbfef8068a0fb6ec48ebc9eef3f605200a489065ba43d8cddc1c9a7
- languageName: node
- linkType: hard
-
-"@babel/plugin-syntax-import-attributes@npm:^7.23.3":
- version: 7.23.3
- resolution: "@babel/plugin-syntax-import-attributes@npm:7.23.3"
- dependencies:
- "@babel/helper-plugin-utils": ^7.22.5
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: 9aed7661ffb920ca75df9f494757466ca92744e43072e0848d87fa4aa61a3f2ee5a22198ac1959856c036434b5614a8f46f1fb70298835dbe28220cdd1d4c11e
- languageName: node
- linkType: hard
-
-"@babel/plugin-syntax-import-meta@npm:^7.10.4, @babel/plugin-syntax-import-meta@npm:^7.8.3":
+"@babel/plugin-syntax-import-meta@npm:^7.8.3":
version: 7.10.4
resolution: "@babel/plugin-syntax-import-meta@npm:7.10.4"
dependencies:
@@ -595,18 +345,7 @@ __metadata:
languageName: node
linkType: hard
-"@babel/plugin-syntax-jsx@npm:^7.23.3":
- version: 7.23.3
- resolution: "@babel/plugin-syntax-jsx@npm:7.23.3"
- dependencies:
- "@babel/helper-plugin-utils": ^7.22.5
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: 89037694314a74e7f0e7a9c8d3793af5bf6b23d80950c29b360db1c66859d67f60711ea437e70ad6b5b4b29affe17eababda841b6c01107c2b638e0493bafb4e
- languageName: node
- linkType: hard
-
-"@babel/plugin-syntax-logical-assignment-operators@npm:^7.10.4, @babel/plugin-syntax-logical-assignment-operators@npm:^7.8.3":
+"@babel/plugin-syntax-logical-assignment-operators@npm:^7.8.3":
version: 7.10.4
resolution: "@babel/plugin-syntax-logical-assignment-operators@npm:7.10.4"
dependencies:
@@ -628,7 +367,7 @@ __metadata:
languageName: node
linkType: hard
-"@babel/plugin-syntax-numeric-separator@npm:^7.10.4, @babel/plugin-syntax-numeric-separator@npm:^7.8.3":
+"@babel/plugin-syntax-numeric-separator@npm:^7.8.3":
version: 7.10.4
resolution: "@babel/plugin-syntax-numeric-separator@npm:7.10.4"
dependencies:
@@ -642,893 +381,55 @@ __metadata:
"@babel/plugin-syntax-object-rest-spread@npm:^7.8.3":
version: 7.8.3
resolution: "@babel/plugin-syntax-object-rest-spread@npm:7.8.3"
- dependencies:
- "@babel/helper-plugin-utils": ^7.8.0
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: fddcf581a57f77e80eb6b981b10658421bc321ba5f0a5b754118c6a92a5448f12a0c336f77b8abf734841e102e5126d69110a306eadb03ca3e1547cab31f5cbf
- languageName: node
- linkType: hard
-
-"@babel/plugin-syntax-optional-catch-binding@npm:^7.8.3":
- version: 7.8.3
- resolution: "@babel/plugin-syntax-optional-catch-binding@npm:7.8.3"
- dependencies:
- "@babel/helper-plugin-utils": ^7.8.0
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: 910d90e72bc90ea1ce698e89c1027fed8845212d5ab588e35ef91f13b93143845f94e2539d831dc8d8ededc14ec02f04f7bd6a8179edd43a326c784e7ed7f0b9
- languageName: node
- linkType: hard
-
-"@babel/plugin-syntax-optional-chaining@npm:^7.8.3":
- version: 7.8.3
- resolution: "@babel/plugin-syntax-optional-chaining@npm:7.8.3"
- dependencies:
- "@babel/helper-plugin-utils": ^7.8.0
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: eef94d53a1453361553c1f98b68d17782861a04a392840341bc91780838dd4e695209c783631cf0de14c635758beafb6a3a65399846ffa4386bff90639347f30
- languageName: node
- linkType: hard
-
-"@babel/plugin-syntax-private-property-in-object@npm:^7.14.5":
- version: 7.14.5
- resolution: "@babel/plugin-syntax-private-property-in-object@npm:7.14.5"
- dependencies:
- "@babel/helper-plugin-utils": ^7.14.5
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: b317174783e6e96029b743ccff2a67d63d38756876e7e5d0ba53a322e38d9ca452c13354a57de1ad476b4c066dbae699e0ca157441da611117a47af88985ecda
- languageName: node
- linkType: hard
-
-"@babel/plugin-syntax-top-level-await@npm:^7.14.5, @babel/plugin-syntax-top-level-await@npm:^7.8.3":
- version: 7.14.5
- resolution: "@babel/plugin-syntax-top-level-await@npm:7.14.5"
- dependencies:
- "@babel/helper-plugin-utils": ^7.14.5
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: bbd1a56b095be7820029b209677b194db9b1d26691fe999856462e66b25b281f031f3dfd91b1619e9dcf95bebe336211833b854d0fb8780d618e35667c2d0d7e
- languageName: node
- linkType: hard
-
-"@babel/plugin-syntax-typescript@npm:^7.23.3":
- version: 7.23.3
- resolution: "@babel/plugin-syntax-typescript@npm:7.23.3"
- dependencies:
- "@babel/helper-plugin-utils": ^7.22.5
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: abfad3a19290d258b028e285a1f34c9b8a0cbe46ef79eafed4ed7ffce11b5d0720b5e536c82f91cbd8442cde35a3dd8e861fa70366d87ff06fdc0d4756e30876
- languageName: node
- linkType: hard
-
-"@babel/plugin-syntax-typescript@npm:^7.7.2":
- version: 7.14.5
- resolution: "@babel/plugin-syntax-typescript@npm:7.14.5"
- dependencies:
- "@babel/helper-plugin-utils": ^7.14.5
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: 5447d13b31aeeeaa5c2b945e60a598642dedca480f11d3232b0927aeb6a6bb8201a0025f509bc23851da4bf126f69b0522790edbd58f4560f0a4984cabd0d126
- languageName: node
- linkType: hard
-
-"@babel/plugin-syntax-unicode-sets-regex@npm:^7.18.6":
- version: 7.18.6
- resolution: "@babel/plugin-syntax-unicode-sets-regex@npm:7.18.6"
- dependencies:
- "@babel/helper-create-regexp-features-plugin": ^7.18.6
- "@babel/helper-plugin-utils": ^7.18.6
- peerDependencies:
- "@babel/core": ^7.0.0
- checksum: a651d700fe63ff0ddfd7186f4ebc24447ca734f114433139e3c027bc94a900d013cf1ef2e2db8430425ba542e39ae160c3b05f06b59fd4656273a3df97679e9c
- languageName: node
- linkType: hard
-
-"@babel/plugin-transform-arrow-functions@npm:^7.23.3":
- version: 7.23.3
- resolution: "@babel/plugin-transform-arrow-functions@npm:7.23.3"
- dependencies:
- "@babel/helper-plugin-utils": ^7.22.5
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: 1e99118176e5366c2636064d09477016ab5272b2a92e78b8edb571d20bc3eaa881789a905b20042942c3c2d04efc530726cf703f937226db5ebc495f5d067e66
- languageName: node
- linkType: hard
-
-"@babel/plugin-transform-async-generator-functions@npm:^7.23.7":
- version: 7.23.7
- resolution: "@babel/plugin-transform-async-generator-functions@npm:7.23.7"
- dependencies:
- "@babel/helper-environment-visitor": ^7.22.20
- "@babel/helper-plugin-utils": ^7.22.5
- "@babel/helper-remap-async-to-generator": ^7.22.20
- "@babel/plugin-syntax-async-generators": ^7.8.4
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: b1f66b23423933c27336b1161ac92efef46683321caea97e2255a666f992979376f47a5559f64188d3831fa66a4b24c2a7a40838cc0e9737e90eebe20e8e6372
- languageName: node
- linkType: hard
-
-"@babel/plugin-transform-async-to-generator@npm:^7.23.3":
- version: 7.23.3
- resolution: "@babel/plugin-transform-async-to-generator@npm:7.23.3"
- dependencies:
- "@babel/helper-module-imports": ^7.22.15
- "@babel/helper-plugin-utils": ^7.22.5
- "@babel/helper-remap-async-to-generator": ^7.22.20
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: 2e9d9795d4b3b3d8090332104e37061c677f29a1ce65bcbda4099a32d243e5d9520270a44bbabf0fb1fb40d463bd937685b1a1042e646979086c546d55319c3c
- languageName: node
- linkType: hard
-
-"@babel/plugin-transform-block-scoped-functions@npm:^7.23.3":
- version: 7.23.3
- resolution: "@babel/plugin-transform-block-scoped-functions@npm:7.23.3"
- dependencies:
- "@babel/helper-plugin-utils": ^7.22.5
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: e63b16d94ee5f4d917e669da3db5ea53d1e7e79141a2ec873c1e644678cdafe98daa556d0d359963c827863d6b3665d23d4938a94a4c5053a1619c4ebd01d020
- languageName: node
- linkType: hard
-
-"@babel/plugin-transform-block-scoping@npm:^7.23.4":
- version: 7.23.4
- resolution: "@babel/plugin-transform-block-scoping@npm:7.23.4"
- dependencies:
- "@babel/helper-plugin-utils": ^7.22.5
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: fc4b2100dd9f2c47d694b4b35ae8153214ccb4e24ef545c259a9db17211b18b6a430f22799b56db8f6844deaeaa201af45a03331d0c80cc28b0c4e3c814570e4
- languageName: node
- linkType: hard
-
-"@babel/plugin-transform-class-properties@npm:^7.23.3":
- version: 7.23.3
- resolution: "@babel/plugin-transform-class-properties@npm:7.23.3"
- dependencies:
- "@babel/helper-create-class-features-plugin": ^7.22.15
- "@babel/helper-plugin-utils": ^7.22.5
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: 9c6f8366f667897541d360246de176dd29efc7a13d80a5b48361882f7173d9173be4646c3b7d9b003ccc0e01e25df122330308f33db921fa553aa17ad544b3fc
- languageName: node
- linkType: hard
-
-"@babel/plugin-transform-class-static-block@npm:^7.23.4":
- version: 7.23.4
- resolution: "@babel/plugin-transform-class-static-block@npm:7.23.4"
- dependencies:
- "@babel/helper-create-class-features-plugin": ^7.22.15
- "@babel/helper-plugin-utils": ^7.22.5
- "@babel/plugin-syntax-class-static-block": ^7.14.5
- peerDependencies:
- "@babel/core": ^7.12.0
- checksum: c8bfaba19a674fc2eb54edad71e958647360474e3163e8226f1acd63e4e2dbec32a171a0af596c1dc5359aee402cc120fea7abd1fb0e0354b6527f0fc9e8aa1e
- languageName: node
- linkType: hard
-
-"@babel/plugin-transform-classes@npm:^7.23.8":
- version: 7.23.8
- resolution: "@babel/plugin-transform-classes@npm:7.23.8"
- dependencies:
- "@babel/helper-annotate-as-pure": ^7.22.5
- "@babel/helper-compilation-targets": ^7.23.6
- "@babel/helper-environment-visitor": ^7.22.20
- "@babel/helper-function-name": ^7.23.0
- "@babel/helper-plugin-utils": ^7.22.5
- "@babel/helper-replace-supers": ^7.22.20
- "@babel/helper-split-export-declaration": ^7.22.6
- globals: ^11.1.0
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: 7dee6cebe52131d2d16944f36e1fdb9d4b24f44d0e7e450f93a44435d001f17cc0789a4cb6b15ec67c8e484581b8a730b5c3ec374470f29ff0133086955b8c58
- languageName: node
- linkType: hard
-
-"@babel/plugin-transform-computed-properties@npm:^7.23.3":
- version: 7.23.3
- resolution: "@babel/plugin-transform-computed-properties@npm:7.23.3"
- dependencies:
- "@babel/helper-plugin-utils": ^7.22.5
- "@babel/template": ^7.22.15
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: 80452661dc25a0956f89fe98cb562e8637a9556fb6c00d312c57653ce7df8798f58d138603c7e1aad96614ee9ccd10c47e50ab9ded6b6eded5adeb230d2a982e
- languageName: node
- linkType: hard
-
-"@babel/plugin-transform-destructuring@npm:^7.23.3":
- version: 7.23.3
- resolution: "@babel/plugin-transform-destructuring@npm:7.23.3"
- dependencies:
- "@babel/helper-plugin-utils": ^7.22.5
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: 9e015099877272501162419bfe781689aec5c462cd2aec752ee22288f209eec65969ff11b8fdadca2eaddea71d705d3bba5b9c60752fcc1be67874fcec687105
- languageName: node
- linkType: hard
-
-"@babel/plugin-transform-dotall-regex@npm:^7.23.3":
- version: 7.23.3
- resolution: "@babel/plugin-transform-dotall-regex@npm:7.23.3"
- dependencies:
- "@babel/helper-create-regexp-features-plugin": ^7.22.15
- "@babel/helper-plugin-utils": ^7.22.5
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: a2dbbf7f1ea16a97948c37df925cb364337668c41a3948b8d91453f140507bd8a3429030c7ce66d09c299987b27746c19a2dd18b6f17dcb474854b14fd9159a3
- languageName: node
- linkType: hard
-
-"@babel/plugin-transform-duplicate-keys@npm:^7.23.3":
- version: 7.23.3
- resolution: "@babel/plugin-transform-duplicate-keys@npm:7.23.3"
- dependencies:
- "@babel/helper-plugin-utils": ^7.22.5
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: c2a21c34dc0839590cd945192cbc46fde541a27e140c48fe1808315934664cdbf18db64889e23c4eeb6bad9d3e049482efdca91d29de5734ffc887c4fbabaa16
- languageName: node
- linkType: hard
-
-"@babel/plugin-transform-dynamic-import@npm:^7.23.4":
- version: 7.23.4
- resolution: "@babel/plugin-transform-dynamic-import@npm:7.23.4"
- dependencies:
- "@babel/helper-plugin-utils": ^7.22.5
- "@babel/plugin-syntax-dynamic-import": ^7.8.3
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: 57a722604c430d9f3dacff22001a5f31250e34785d4969527a2ae9160fa86858d0892c5b9ff7a06a04076f8c76c9e6862e0541aadca9c057849961343aab0845
- languageName: node
- linkType: hard
-
-"@babel/plugin-transform-exponentiation-operator@npm:^7.23.3":
- version: 7.23.3
- resolution: "@babel/plugin-transform-exponentiation-operator@npm:7.23.3"
- dependencies:
- "@babel/helper-builder-binary-assignment-operator-visitor": ^7.22.15
- "@babel/helper-plugin-utils": ^7.22.5
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: 00d05ab14ad0f299160fcf9d8f55a1cc1b740e012ab0b5ce30207d2365f091665115557af7d989cd6260d075a252d9e4283de5f2b247dfbbe0e42ae586e6bf66
- languageName: node
- linkType: hard
-
-"@babel/plugin-transform-export-namespace-from@npm:^7.23.4":
- version: 7.23.4
- resolution: "@babel/plugin-transform-export-namespace-from@npm:7.23.4"
- dependencies:
- "@babel/helper-plugin-utils": ^7.22.5
- "@babel/plugin-syntax-export-namespace-from": ^7.8.3
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: 9f770a81bfd03b48d6ba155d452946fd56d6ffe5b7d871e9ec2a0b15e0f424273b632f3ed61838b90015b25bbda988896b7a46c7d964fbf8f6feb5820b309f93
- languageName: node
- linkType: hard
-
-"@babel/plugin-transform-for-of@npm:^7.23.6":
- version: 7.23.6
- resolution: "@babel/plugin-transform-for-of@npm:7.23.6"
- dependencies:
- "@babel/helper-plugin-utils": ^7.22.5
- "@babel/helper-skip-transparent-expression-wrappers": ^7.22.5
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: 228c060aa61f6aa89dc447170075f8214863b94f830624e74ade99c1a09316897c12d76e848460b0b506593e58dbc42739af6dc4cb0fe9b84dffe4a596050a36
- languageName: node
- linkType: hard
-
-"@babel/plugin-transform-function-name@npm:^7.23.3":
- version: 7.23.3
- resolution: "@babel/plugin-transform-function-name@npm:7.23.3"
- dependencies:
- "@babel/helper-compilation-targets": ^7.22.15
- "@babel/helper-function-name": ^7.23.0
- "@babel/helper-plugin-utils": ^7.22.5
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: 355c6dbe07c919575ad42b2f7e020f320866d72f8b79181a16f8e0cd424a2c761d979f03f47d583d9471b55dcd68a8a9d829b58e1eebcd572145b934b48975a6
- languageName: node
- linkType: hard
-
-"@babel/plugin-transform-jscript@npm:^7.14.5":
- version: 7.23.3
- resolution: "@babel/plugin-transform-jscript@npm:7.23.3"
- dependencies:
- "@babel/helper-plugin-utils": ^7.22.5
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: 07d03d471376c3f86f5900990e787fab2b31940c67df525a36f97faa602742b82289144ec4bfabcbed8aaa7dcc9000a3f3886ed15229c72d74910e3c565f2e8b
- languageName: node
- linkType: hard
-
-"@babel/plugin-transform-json-strings@npm:^7.23.4":
- version: 7.23.4
- resolution: "@babel/plugin-transform-json-strings@npm:7.23.4"
- dependencies:
- "@babel/helper-plugin-utils": ^7.22.5
- "@babel/plugin-syntax-json-strings": ^7.8.3
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: f9019820233cf8955d8ba346df709a0683c120fe86a24ed1c9f003f2db51197b979efc88f010d558a12e1491210fc195a43cd1c7fee5e23b92da38f793a875de
- languageName: node
- linkType: hard
-
-"@babel/plugin-transform-literals@npm:^7.23.3":
- version: 7.23.3
- resolution: "@babel/plugin-transform-literals@npm:7.23.3"
- dependencies:
- "@babel/helper-plugin-utils": ^7.22.5
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: 519a544cd58586b9001c4c9b18da25a62f17d23c48600ff7a685d75ca9eb18d2c5e8f5476f067f0a8f1fea2a31107eff950b9864833061e6076dcc4bdc3e71ed
- languageName: node
- linkType: hard
-
-"@babel/plugin-transform-logical-assignment-operators@npm:^7.23.4":
- version: 7.23.4
- resolution: "@babel/plugin-transform-logical-assignment-operators@npm:7.23.4"
- dependencies:
- "@babel/helper-plugin-utils": ^7.22.5
- "@babel/plugin-syntax-logical-assignment-operators": ^7.10.4
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: 2ae1dc9b4ff3bf61a990ff3accdecb2afe3a0ca649b3e74c010078d1cdf29ea490f50ac0a905306a2bcf9ac177889a39ac79bdcc3a0fdf220b3b75fac18d39b5
- languageName: node
- linkType: hard
-
-"@babel/plugin-transform-member-expression-literals@npm:^7.23.3":
- version: 7.23.3
- resolution: "@babel/plugin-transform-member-expression-literals@npm:7.23.3"
- dependencies:
- "@babel/helper-plugin-utils": ^7.22.5
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: 95cec13c36d447c5aa6b8e4c778b897eeba66dcb675edef01e0d2afcec9e8cb9726baf4f81b4bbae7a782595aed72e6a0d44ffb773272c3ca180fada99bf92db
- languageName: node
- linkType: hard
-
-"@babel/plugin-transform-modules-amd@npm:^7.23.3":
- version: 7.23.3
- resolution: "@babel/plugin-transform-modules-amd@npm:7.23.3"
- dependencies:
- "@babel/helper-module-transforms": ^7.23.3
- "@babel/helper-plugin-utils": ^7.22.5
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: d163737b6a3d67ea579c9aa3b83d4df4b5c34d9dcdf25f415f027c0aa8cded7bac2750d2de5464081f67a042ad9e1c03930c2fab42acd79f9e57c00cf969ddff
- languageName: node
- linkType: hard
-
-"@babel/plugin-transform-modules-commonjs@npm:^7.23.3":
- version: 7.23.3
- resolution: "@babel/plugin-transform-modules-commonjs@npm:7.23.3"
- dependencies:
- "@babel/helper-module-transforms": ^7.23.3
- "@babel/helper-plugin-utils": ^7.22.5
- "@babel/helper-simple-access": ^7.22.5
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: 720a231ceade4ae4d2632478db4e7fecf21987d444942b72d523487ac8d715ca97de6c8f415c71e939595e1a4776403e7dc24ed68fe9125ad4acf57753c9bff7
- languageName: node
- linkType: hard
-
-"@babel/plugin-transform-modules-systemjs@npm:^7.23.3":
- version: 7.23.3
- resolution: "@babel/plugin-transform-modules-systemjs@npm:7.23.3"
- dependencies:
- "@babel/helper-hoist-variables": ^7.22.5
- "@babel/helper-module-transforms": ^7.23.3
- "@babel/helper-plugin-utils": ^7.22.5
- "@babel/helper-validator-identifier": ^7.22.20
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: 0d2fdd993c785aecac9e0850cd5ed7f7d448f0fbb42992a950cc0590167144df25d82af5aac9a5c99ef913d2286782afa44e577af30c10901c5ee8984910fa1f
- languageName: node
- linkType: hard
-
-"@babel/plugin-transform-modules-umd@npm:^7.23.3":
- version: 7.23.3
- resolution: "@babel/plugin-transform-modules-umd@npm:7.23.3"
- dependencies:
- "@babel/helper-module-transforms": ^7.23.3
- "@babel/helper-plugin-utils": ^7.22.5
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: 586a7a2241e8b4e753a37af9466a9ffa8a67b4ba9aa756ad7500712c05d8fa9a8c1ed4f7bd25fae2a8265e6cf8fe781ec85a8ee885dd34cf50d8955ee65f12dc
- languageName: node
- linkType: hard
-
-"@babel/plugin-transform-named-capturing-groups-regex@npm:^7.22.5":
- version: 7.22.5
- resolution: "@babel/plugin-transform-named-capturing-groups-regex@npm:7.22.5"
- dependencies:
- "@babel/helper-create-regexp-features-plugin": ^7.22.5
- "@babel/helper-plugin-utils": ^7.22.5
- peerDependencies:
- "@babel/core": ^7.0.0
- checksum: 3ee564ddee620c035b928fdc942c5d17e9c4b98329b76f9cefac65c111135d925eb94ed324064cd7556d4f5123beec79abea1d4b97d1c8a2a5c748887a2eb623
- languageName: node
- linkType: hard
-
-"@babel/plugin-transform-new-target@npm:^7.23.3":
- version: 7.23.3
- resolution: "@babel/plugin-transform-new-target@npm:7.23.3"
- dependencies:
- "@babel/helper-plugin-utils": ^7.22.5
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: e5053389316fce73ad5201b7777437164f333e24787fbcda4ae489cd2580dbbbdfb5694a7237bad91fabb46b591d771975d69beb1c740b82cb4761625379f00b
- languageName: node
- linkType: hard
-
-"@babel/plugin-transform-nullish-coalescing-operator@npm:^7.23.4":
- version: 7.23.4
- resolution: "@babel/plugin-transform-nullish-coalescing-operator@npm:7.23.4"
- dependencies:
- "@babel/helper-plugin-utils": ^7.22.5
- "@babel/plugin-syntax-nullish-coalescing-operator": ^7.8.3
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: a27d73ea134d3d9560a6b2e26ab60012fba15f1db95865aa0153c18f5ec82cfef6a7b3d8df74e3c2fca81534fa5efeb6cacaf7b08bdb7d123e3dafdd079886a3
- languageName: node
- linkType: hard
-
-"@babel/plugin-transform-numeric-separator@npm:^7.23.4":
- version: 7.23.4
- resolution: "@babel/plugin-transform-numeric-separator@npm:7.23.4"
- dependencies:
- "@babel/helper-plugin-utils": ^7.22.5
- "@babel/plugin-syntax-numeric-separator": ^7.10.4
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: 6ba0e5db3c620a3ec81f9e94507c821f483c15f196868df13fa454cbac719a5449baf73840f5b6eb7d77311b24a2cf8e45db53700d41727f693d46f7caf3eec3
- languageName: node
- linkType: hard
-
-"@babel/plugin-transform-object-rest-spread@npm:^7.23.4":
- version: 7.23.4
- resolution: "@babel/plugin-transform-object-rest-spread@npm:7.23.4"
- dependencies:
- "@babel/compat-data": ^7.23.3
- "@babel/helper-compilation-targets": ^7.22.15
- "@babel/helper-plugin-utils": ^7.22.5
- "@babel/plugin-syntax-object-rest-spread": ^7.8.3
- "@babel/plugin-transform-parameters": ^7.23.3
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: 73fec495e327ca3959c1c03d07a621be09df00036c69fff0455af9a008291677ee9d368eec48adacdc6feac703269a649747568b4af4c4e9f134aa71cc5b378d
- languageName: node
- linkType: hard
-
-"@babel/plugin-transform-object-super@npm:^7.23.3":
- version: 7.23.3
- resolution: "@babel/plugin-transform-object-super@npm:7.23.3"
- dependencies:
- "@babel/helper-plugin-utils": ^7.22.5
- "@babel/helper-replace-supers": ^7.22.20
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: e495497186f621fa79026e183b4f1fbb172fd9df812cbd2d7f02c05b08adbe58012b1a6eb6dd58d11a30343f6ec80d0f4074f9b501d70aa1c94df76d59164c53
- languageName: node
- linkType: hard
-
-"@babel/plugin-transform-optional-catch-binding@npm:^7.23.4":
- version: 7.23.4
- resolution: "@babel/plugin-transform-optional-catch-binding@npm:7.23.4"
- dependencies:
- "@babel/helper-plugin-utils": ^7.22.5
- "@babel/plugin-syntax-optional-catch-binding": ^7.8.3
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: d50b5ee142cdb088d8b5de1ccf7cea85b18b85d85b52f86618f6e45226372f01ad4cdb29abd4fd35ea99a71fefb37009e0107db7a787dcc21d4d402f97470faf
- languageName: node
- linkType: hard
-
-"@babel/plugin-transform-optional-chaining@npm:^7.23.3, @babel/plugin-transform-optional-chaining@npm:^7.23.4":
- version: 7.23.4
- resolution: "@babel/plugin-transform-optional-chaining@npm:7.23.4"
- dependencies:
- "@babel/helper-plugin-utils": ^7.22.5
- "@babel/helper-skip-transparent-expression-wrappers": ^7.22.5
- "@babel/plugin-syntax-optional-chaining": ^7.8.3
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: e7a4c08038288057b7a08d68c4d55396ada9278095509ca51ed8dfb72a7f13f26bdd7c5185de21079fe0a9d60d22c227cb32e300d266c1bda40f70eee9f4bc1e
- languageName: node
- linkType: hard
-
-"@babel/plugin-transform-parameters@npm:^7.23.3":
- version: 7.23.3
- resolution: "@babel/plugin-transform-parameters@npm:7.23.3"
- dependencies:
- "@babel/helper-plugin-utils": ^7.22.5
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: a735b3e85316d17ec102e3d3d1b6993b429bdb3b494651c9d754e3b7d270462ee1f1a126ccd5e3d871af5e683727e9ef98c9d34d4a42204fffaabff91052ed16
- languageName: node
- linkType: hard
-
-"@babel/plugin-transform-private-methods@npm:^7.23.3":
- version: 7.23.3
- resolution: "@babel/plugin-transform-private-methods@npm:7.23.3"
- dependencies:
- "@babel/helper-create-class-features-plugin": ^7.22.15
- "@babel/helper-plugin-utils": ^7.22.5
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: cedc1285c49b5a6d9a3d0e5e413b756ac40b3ac2f8f68bdfc3ae268bc8d27b00abd8bb0861c72756ff5dd8bf1eb77211b7feb5baf4fdae2ebbaabe49b9adc1d0
- languageName: node
- linkType: hard
-
-"@babel/plugin-transform-private-property-in-object@npm:^7.23.4":
- version: 7.23.4
- resolution: "@babel/plugin-transform-private-property-in-object@npm:7.23.4"
- dependencies:
- "@babel/helper-annotate-as-pure": ^7.22.5
- "@babel/helper-create-class-features-plugin": ^7.22.15
- "@babel/helper-plugin-utils": ^7.22.5
- "@babel/plugin-syntax-private-property-in-object": ^7.14.5
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: fb7adfe94ea97542f250a70de32bddbc3e0b802381c92be947fec83ebffda57e68533c4d0697152719a3496fdd3ebf3798d451c024cd4ac848fc15ac26b70aa7
- languageName: node
- linkType: hard
-
-"@babel/plugin-transform-property-literals@npm:^7.23.3":
- version: 7.23.3
- resolution: "@babel/plugin-transform-property-literals@npm:7.23.3"
- dependencies:
- "@babel/helper-plugin-utils": ^7.22.5
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: 16b048c8e87f25095f6d53634ab7912992f78e6997a6ff549edc3cf519db4fca01c7b4e0798530d7f6a05228ceee479251245cdd850a5531c6e6f404104d6cc9
- languageName: node
- linkType: hard
-
-"@babel/plugin-transform-react-display-name@npm:^7.23.3":
- version: 7.23.3
- resolution: "@babel/plugin-transform-react-display-name@npm:7.23.3"
- dependencies:
- "@babel/helper-plugin-utils": ^7.22.5
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: 7f86964e8434d3ddbd3c81d2690c9b66dbf1cd8bd9512e2e24500e9fa8cf378bc52c0853270b3b82143aba5965aec04721df7abdb768f952b44f5c6e0b198779
- languageName: node
- linkType: hard
-
-"@babel/plugin-transform-react-jsx-development@npm:^7.22.5":
- version: 7.22.5
- resolution: "@babel/plugin-transform-react-jsx-development@npm:7.22.5"
- dependencies:
- "@babel/plugin-transform-react-jsx": ^7.22.5
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: 36bc3ff0b96bb0ef4723070a50cfdf2e72cfd903a59eba448f9fe92fea47574d6f22efd99364413719e1f3fb3c51b6c9b2990b87af088f8486a84b2a5f9e4560
- languageName: node
- linkType: hard
-
-"@babel/plugin-transform-react-jsx@npm:^7.22.15, @babel/plugin-transform-react-jsx@npm:^7.22.5":
- version: 7.23.4
- resolution: "@babel/plugin-transform-react-jsx@npm:7.23.4"
- dependencies:
- "@babel/helper-annotate-as-pure": ^7.22.5
- "@babel/helper-module-imports": ^7.22.15
- "@babel/helper-plugin-utils": ^7.22.5
- "@babel/plugin-syntax-jsx": ^7.23.3
- "@babel/types": ^7.23.4
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: d8b8c52e8e22e833bf77c8d1a53b0a57d1fd52ba9596a319d572de79446a8ed9d95521035bc1175c1589d1a6a34600d2e678fa81d81bac8fac121137097f1f0a
- languageName: node
- linkType: hard
-
-"@babel/plugin-transform-react-pure-annotations@npm:^7.23.3":
- version: 7.23.3
- resolution: "@babel/plugin-transform-react-pure-annotations@npm:7.23.3"
- dependencies:
- "@babel/helper-annotate-as-pure": ^7.22.5
- "@babel/helper-plugin-utils": ^7.22.5
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: 9ea3698b1d422561d93c0187ac1ed8f2367e4250b10e259785ead5aa643c265830fd0f4cf5087a5bedbc4007444c06da2f2006686613220acf0949895f453666
- languageName: node
- linkType: hard
-
-"@babel/plugin-transform-regenerator@npm:^7.23.3":
- version: 7.23.3
- resolution: "@babel/plugin-transform-regenerator@npm:7.23.3"
- dependencies:
- "@babel/helper-plugin-utils": ^7.22.5
- regenerator-transform: ^0.15.2
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: 7fdacc7b40008883871b519c9e5cdea493f75495118ccc56ac104b874983569a24edd024f0f5894ba1875c54ee2b442f295d6241c3280e61c725d0dd3317c8e6
- languageName: node
- linkType: hard
-
-"@babel/plugin-transform-reserved-words@npm:^7.23.3":
- version: 7.23.3
- resolution: "@babel/plugin-transform-reserved-words@npm:7.23.3"
- dependencies:
- "@babel/helper-plugin-utils": ^7.22.5
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: 298c4440ddc136784ff920127cea137168e068404e635dc946ddb5d7b2a27b66f1dd4c4acb01f7184478ff7d5c3e7177a127279479926519042948fb7fa0fa48
- languageName: node
- linkType: hard
-
-"@babel/plugin-transform-shorthand-properties@npm:^7.23.3":
- version: 7.23.3
- resolution: "@babel/plugin-transform-shorthand-properties@npm:7.23.3"
- dependencies:
- "@babel/helper-plugin-utils": ^7.22.5
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: 5d677a03676f9fff969b0246c423d64d77502e90a832665dc872a5a5e05e5708161ce1effd56bb3c0f2c20a1112fca874be57c8a759d8b08152755519281f326
- languageName: node
- linkType: hard
-
-"@babel/plugin-transform-spread@npm:^7.23.3":
- version: 7.23.3
- resolution: "@babel/plugin-transform-spread@npm:7.23.3"
- dependencies:
- "@babel/helper-plugin-utils": ^7.22.5
- "@babel/helper-skip-transparent-expression-wrappers": ^7.22.5
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: 8fd5cac201e77a0b4825745f4e07a25f923842f282f006b3a79223c00f61075c8868d12eafec86b2642cd0b32077cdd32314e27bcb75ee5e6a68c0144140dcf2
- languageName: node
- linkType: hard
-
-"@babel/plugin-transform-sticky-regex@npm:^7.23.3":
- version: 7.23.3
- resolution: "@babel/plugin-transform-sticky-regex@npm:7.23.3"
- dependencies:
- "@babel/helper-plugin-utils": ^7.22.5
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: 53e55eb2575b7abfdb4af7e503a2bf7ef5faf8bf6b92d2cd2de0700bdd19e934e5517b23e6dfed94ba50ae516b62f3f916773ef7d9bc81f01503f585051e2949
- languageName: node
- linkType: hard
-
-"@babel/plugin-transform-template-literals@npm:^7.23.3":
- version: 7.23.3
- resolution: "@babel/plugin-transform-template-literals@npm:7.23.3"
- dependencies:
- "@babel/helper-plugin-utils": ^7.22.5
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: b16c5cb0b8796be0118e9c144d15bdc0d20a7f3f59009c6303a6e9a8b74c146eceb3f05186f5b97afcba7cfa87e34c1585a22186e3d5b22f2fd3d27d959d92b2
- languageName: node
- linkType: hard
-
-"@babel/plugin-transform-typeof-symbol@npm:^7.23.3":
- version: 7.23.3
- resolution: "@babel/plugin-transform-typeof-symbol@npm:7.23.3"
- dependencies:
- "@babel/helper-plugin-utils": ^7.22.5
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: 0af7184379d43afac7614fc89b1bdecce4e174d52f4efaeee8ec1a4f2c764356c6dba3525c0685231f1cbf435b6dd4ee9e738d7417f3b10ce8bbe869c32f4384
- languageName: node
- linkType: hard
-
-"@babel/plugin-transform-typescript@npm:^7.23.3":
- version: 7.23.6
- resolution: "@babel/plugin-transform-typescript@npm:7.23.6"
- dependencies:
- "@babel/helper-annotate-as-pure": ^7.22.5
- "@babel/helper-create-class-features-plugin": ^7.23.6
- "@babel/helper-plugin-utils": ^7.22.5
- "@babel/plugin-syntax-typescript": ^7.23.3
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: 0462241843d14dff9f1a4c49ab182a6f01a5f7679957c786b08165dac3e8d49184011f05ca204183d164c54b9d3496d1b3005f904fa8708e394e6f15bf5548e6
- languageName: node
- linkType: hard
-
-"@babel/plugin-transform-unicode-escapes@npm:^7.23.3":
- version: 7.23.3
- resolution: "@babel/plugin-transform-unicode-escapes@npm:7.23.3"
- dependencies:
- "@babel/helper-plugin-utils": ^7.22.5
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: 561c429183a54b9e4751519a3dfba6014431e9cdc1484fad03bdaf96582dfc72c76a4f8661df2aeeae7c34efd0fa4d02d3b83a2f63763ecf71ecc925f9cc1f60
- languageName: node
- linkType: hard
-
-"@babel/plugin-transform-unicode-property-regex@npm:^7.23.3":
- version: 7.23.3
- resolution: "@babel/plugin-transform-unicode-property-regex@npm:7.23.3"
- dependencies:
- "@babel/helper-create-regexp-features-plugin": ^7.22.15
- "@babel/helper-plugin-utils": ^7.22.5
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: 2298461a194758086d17c23c26c7de37aa533af910f9ebf31ebd0893d4aa317468043d23f73edc782ec21151d3c46cf0ff8098a83b725c49a59de28a1d4d6225
- languageName: node
- linkType: hard
-
-"@babel/plugin-transform-unicode-regex@npm:^7.23.3":
- version: 7.23.3
- resolution: "@babel/plugin-transform-unicode-regex@npm:7.23.3"
- dependencies:
- "@babel/helper-create-regexp-features-plugin": ^7.22.15
- "@babel/helper-plugin-utils": ^7.22.5
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: c5f835d17483ba899787f92e313dfa5b0055e3deab332f1d254078a2bba27ede47574b6599fcf34d3763f0c048ae0779dc21d2d8db09295edb4057478dc80a9a
- languageName: node
- linkType: hard
-
-"@babel/plugin-transform-unicode-sets-regex@npm:^7.23.3":
- version: 7.23.3
- resolution: "@babel/plugin-transform-unicode-sets-regex@npm:7.23.3"
- dependencies:
- "@babel/helper-create-regexp-features-plugin": ^7.22.15
- "@babel/helper-plugin-utils": ^7.22.5
- peerDependencies:
- "@babel/core": ^7.0.0
- checksum: 79d0b4c951955ca68235c87b91ab2b393c96285f8aeaa34d6db416d2ddac90000c9bd6e8c4d82b60a2b484da69930507245035f28ba63c6cae341cf3ba68fdef
- languageName: node
- linkType: hard
-
-"@babel/preset-env@npm:^7.15.0":
- version: 7.23.8
- resolution: "@babel/preset-env@npm:7.23.8"
- dependencies:
- "@babel/compat-data": ^7.23.5
- "@babel/helper-compilation-targets": ^7.23.6
- "@babel/helper-plugin-utils": ^7.22.5
- "@babel/helper-validator-option": ^7.23.5
- "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": ^7.23.3
- "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": ^7.23.3
- "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": ^7.23.7
- "@babel/plugin-proposal-private-property-in-object": 7.21.0-placeholder-for-preset-env.2
- "@babel/plugin-syntax-async-generators": ^7.8.4
- "@babel/plugin-syntax-class-properties": ^7.12.13
- "@babel/plugin-syntax-class-static-block": ^7.14.5
- "@babel/plugin-syntax-dynamic-import": ^7.8.3
- "@babel/plugin-syntax-export-namespace-from": ^7.8.3
- "@babel/plugin-syntax-import-assertions": ^7.23.3
- "@babel/plugin-syntax-import-attributes": ^7.23.3
- "@babel/plugin-syntax-import-meta": ^7.10.4
- "@babel/plugin-syntax-json-strings": ^7.8.3
- "@babel/plugin-syntax-logical-assignment-operators": ^7.10.4
- "@babel/plugin-syntax-nullish-coalescing-operator": ^7.8.3
- "@babel/plugin-syntax-numeric-separator": ^7.10.4
- "@babel/plugin-syntax-object-rest-spread": ^7.8.3
- "@babel/plugin-syntax-optional-catch-binding": ^7.8.3
- "@babel/plugin-syntax-optional-chaining": ^7.8.3
- "@babel/plugin-syntax-private-property-in-object": ^7.14.5
- "@babel/plugin-syntax-top-level-await": ^7.14.5
- "@babel/plugin-syntax-unicode-sets-regex": ^7.18.6
- "@babel/plugin-transform-arrow-functions": ^7.23.3
- "@babel/plugin-transform-async-generator-functions": ^7.23.7
- "@babel/plugin-transform-async-to-generator": ^7.23.3
- "@babel/plugin-transform-block-scoped-functions": ^7.23.3
- "@babel/plugin-transform-block-scoping": ^7.23.4
- "@babel/plugin-transform-class-properties": ^7.23.3
- "@babel/plugin-transform-class-static-block": ^7.23.4
- "@babel/plugin-transform-classes": ^7.23.8
- "@babel/plugin-transform-computed-properties": ^7.23.3
- "@babel/plugin-transform-destructuring": ^7.23.3
- "@babel/plugin-transform-dotall-regex": ^7.23.3
- "@babel/plugin-transform-duplicate-keys": ^7.23.3
- "@babel/plugin-transform-dynamic-import": ^7.23.4
- "@babel/plugin-transform-exponentiation-operator": ^7.23.3
- "@babel/plugin-transform-export-namespace-from": ^7.23.4
- "@babel/plugin-transform-for-of": ^7.23.6
- "@babel/plugin-transform-function-name": ^7.23.3
- "@babel/plugin-transform-json-strings": ^7.23.4
- "@babel/plugin-transform-literals": ^7.23.3
- "@babel/plugin-transform-logical-assignment-operators": ^7.23.4
- "@babel/plugin-transform-member-expression-literals": ^7.23.3
- "@babel/plugin-transform-modules-amd": ^7.23.3
- "@babel/plugin-transform-modules-commonjs": ^7.23.3
- "@babel/plugin-transform-modules-systemjs": ^7.23.3
- "@babel/plugin-transform-modules-umd": ^7.23.3
- "@babel/plugin-transform-named-capturing-groups-regex": ^7.22.5
- "@babel/plugin-transform-new-target": ^7.23.3
- "@babel/plugin-transform-nullish-coalescing-operator": ^7.23.4
- "@babel/plugin-transform-numeric-separator": ^7.23.4
- "@babel/plugin-transform-object-rest-spread": ^7.23.4
- "@babel/plugin-transform-object-super": ^7.23.3
- "@babel/plugin-transform-optional-catch-binding": ^7.23.4
- "@babel/plugin-transform-optional-chaining": ^7.23.4
- "@babel/plugin-transform-parameters": ^7.23.3
- "@babel/plugin-transform-private-methods": ^7.23.3
- "@babel/plugin-transform-private-property-in-object": ^7.23.4
- "@babel/plugin-transform-property-literals": ^7.23.3
- "@babel/plugin-transform-regenerator": ^7.23.3
- "@babel/plugin-transform-reserved-words": ^7.23.3
- "@babel/plugin-transform-shorthand-properties": ^7.23.3
- "@babel/plugin-transform-spread": ^7.23.3
- "@babel/plugin-transform-sticky-regex": ^7.23.3
- "@babel/plugin-transform-template-literals": ^7.23.3
- "@babel/plugin-transform-typeof-symbol": ^7.23.3
- "@babel/plugin-transform-unicode-escapes": ^7.23.3
- "@babel/plugin-transform-unicode-property-regex": ^7.23.3
- "@babel/plugin-transform-unicode-regex": ^7.23.3
- "@babel/plugin-transform-unicode-sets-regex": ^7.23.3
- "@babel/preset-modules": 0.1.6-no-external-plugins
- babel-plugin-polyfill-corejs2: ^0.4.7
- babel-plugin-polyfill-corejs3: ^0.8.7
- babel-plugin-polyfill-regenerator: ^0.5.4
- core-js-compat: ^3.31.0
- semver: ^6.3.1
+ dependencies:
+ "@babel/helper-plugin-utils": ^7.8.0
peerDependencies:
"@babel/core": ^7.0.0-0
- checksum: b850f99fc4aed4ba22c7d9207bd2bbc7a729b49ea6f2c2c36e819fe209e309b96fba336096e555b46f791b39f7cdd5ac41246b556283d435a99106eb825a209f
+ checksum: fddcf581a57f77e80eb6b981b10658421bc321ba5f0a5b754118c6a92a5448f12a0c336f77b8abf734841e102e5126d69110a306eadb03ca3e1547cab31f5cbf
languageName: node
linkType: hard
-"@babel/preset-modules@npm:0.1.6-no-external-plugins":
- version: 0.1.6-no-external-plugins
- resolution: "@babel/preset-modules@npm:0.1.6-no-external-plugins"
+"@babel/plugin-syntax-optional-catch-binding@npm:^7.8.3":
+ version: 7.8.3
+ resolution: "@babel/plugin-syntax-optional-catch-binding@npm:7.8.3"
dependencies:
- "@babel/helper-plugin-utils": ^7.0.0
- "@babel/types": ^7.4.4
- esutils: ^2.0.2
+ "@babel/helper-plugin-utils": ^7.8.0
peerDependencies:
- "@babel/core": ^7.0.0-0 || ^8.0.0-0 <8.0.0
- checksum: 4855e799bc50f2449fb5210f78ea9e8fd46cf4f242243f1e2ed838e2bd702e25e73e822e7f8447722a5f4baa5e67a8f7a0e403f3e7ce04540ff743a9c411c375
+ "@babel/core": ^7.0.0-0
+ checksum: 910d90e72bc90ea1ce698e89c1027fed8845212d5ab588e35ef91f13b93143845f94e2539d831dc8d8ededc14ec02f04f7bd6a8179edd43a326c784e7ed7f0b9
languageName: node
linkType: hard
-"@babel/preset-react@npm:^7.23.3":
- version: 7.23.3
- resolution: "@babel/preset-react@npm:7.23.3"
- dependencies:
- "@babel/helper-plugin-utils": ^7.22.5
- "@babel/helper-validator-option": ^7.22.15
- "@babel/plugin-transform-react-display-name": ^7.23.3
- "@babel/plugin-transform-react-jsx": ^7.22.15
- "@babel/plugin-transform-react-jsx-development": ^7.22.5
- "@babel/plugin-transform-react-pure-annotations": ^7.23.3
+"@babel/plugin-syntax-optional-chaining@npm:^7.8.3":
+ version: 7.8.3
+ resolution: "@babel/plugin-syntax-optional-chaining@npm:7.8.3"
+ dependencies:
+ "@babel/helper-plugin-utils": ^7.8.0
peerDependencies:
"@babel/core": ^7.0.0-0
- checksum: 2d90961e7e627a74b44551e88ad36a440579e283e8dc27972bf2f50682152bbc77228673a3ea22c0e0d005b70cbc487eccd64897c5e5e0384e5ce18f300b21eb
+ checksum: eef94d53a1453361553c1f98b68d17782861a04a392840341bc91780838dd4e695209c783631cf0de14c635758beafb6a3a65399846ffa4386bff90639347f30
languageName: node
linkType: hard
-"@babel/preset-typescript@npm:^7.15.0":
- version: 7.23.3
- resolution: "@babel/preset-typescript@npm:7.23.3"
+"@babel/plugin-syntax-top-level-await@npm:^7.8.3":
+ version: 7.14.5
+ resolution: "@babel/plugin-syntax-top-level-await@npm:7.14.5"
dependencies:
- "@babel/helper-plugin-utils": ^7.22.5
- "@babel/helper-validator-option": ^7.22.15
- "@babel/plugin-syntax-jsx": ^7.23.3
- "@babel/plugin-transform-modules-commonjs": ^7.23.3
- "@babel/plugin-transform-typescript": ^7.23.3
+ "@babel/helper-plugin-utils": ^7.14.5
peerDependencies:
"@babel/core": ^7.0.0-0
- checksum: 105a2d39bbc464da0f7e1ad7f535c77c5f62d6b410219355b20e552e7d29933567a5c55339b5d0aec1a5c7a0a7dfdf1b54aae601a4fe15a157d54dcbfcb3e854
- languageName: node
- linkType: hard
-
-"@babel/regjsgen@npm:^0.8.0":
- version: 0.8.0
- resolution: "@babel/regjsgen@npm:0.8.0"
- checksum: 89c338fee774770e5a487382170711014d49a68eb281e74f2b5eac88f38300a4ad545516a7786a8dd5702e9cf009c94c2f582d200f077ac5decd74c56b973730
+ checksum: bbd1a56b095be7820029b209677b194db9b1d26691fe999856462e66b25b281f031f3dfd91b1619e9dcf95bebe336211833b854d0fb8780d618e35667c2d0d7e
languageName: node
linkType: hard
-"@babel/runtime@npm:^7.8.4":
- version: 7.15.3
- resolution: "@babel/runtime@npm:7.15.3"
+"@babel/plugin-syntax-typescript@npm:^7.7.2":
+ version: 7.14.5
+ resolution: "@babel/plugin-syntax-typescript@npm:7.14.5"
dependencies:
- regenerator-runtime: ^0.13.4
- checksum: 2f0b8d2d4e36035ab1d84af0ec26aafa098536870f27c8e07de0a0e398f7a394fdea68a88165535ffb52ded6a68912bdc3450bdf91f229eb132e1c89470789f5
+ "@babel/helper-plugin-utils": ^7.14.5
+ peerDependencies:
+ "@babel/core": ^7.0.0-0
+ checksum: 5447d13b31aeeeaa5c2b945e60a598642dedca480f11d3232b0927aeb6a6bb8201a0025f509bc23851da4bf126f69b0522790edbd58f4560f0a4984cabd0d126
languageName: node
linkType: hard
@@ -1572,7 +473,7 @@ __metadata:
languageName: node
linkType: hard
-"@babel/types@npm:^7.0.0, @babel/types@npm:^7.14.5, @babel/types@npm:^7.15.0, @babel/types@npm:^7.3.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
+"@babel/types@npm:^7.0.0, @babel/types@npm:^7.14.5, @babel/types@npm:^7.15.0, @babel/types@npm:^7.3.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.8.3":
version: 7.15.0
resolution: "@babel/types@npm:7.15.0"
dependencies:
@@ -1582,7 +483,7 @@ __metadata:
languageName: node
linkType: hard
-"@babel/types@npm:^7.20.7, @babel/types@npm:^7.22.15, @babel/types@npm:^7.22.19, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.23.4, @babel/types@npm:^7.23.6":
+"@babel/types@npm:^7.20.7, @babel/types@npm:^7.22.15, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.23.6":
version: 7.23.6
resolution: "@babel/types@npm:7.23.6"
dependencies:
@@ -1638,6 +539,167 @@ __metadata:
languageName: node
linkType: hard
+"@esbuild/aix-ppc64@npm:0.20.2":
+ version: 0.20.2
+ resolution: "@esbuild/aix-ppc64@npm:0.20.2"
+ conditions: os=aix & cpu=ppc64
+ languageName: node
+ linkType: hard
+
+"@esbuild/android-arm64@npm:0.20.2":
+ version: 0.20.2
+ resolution: "@esbuild/android-arm64@npm:0.20.2"
+ conditions: os=android & cpu=arm64
+ languageName: node
+ linkType: hard
+
+"@esbuild/android-arm@npm:0.20.2":
+ version: 0.20.2
+ resolution: "@esbuild/android-arm@npm:0.20.2"
+ conditions: os=android & cpu=arm
+ languageName: node
+ linkType: hard
+
+"@esbuild/android-x64@npm:0.20.2":
+ version: 0.20.2
+ resolution: "@esbuild/android-x64@npm:0.20.2"
+ conditions: os=android & cpu=x64
+ languageName: node
+ linkType: hard
+
+"@esbuild/darwin-arm64@npm:0.20.2":
+ version: 0.20.2
+ resolution: "@esbuild/darwin-arm64@npm:0.20.2"
+ conditions: os=darwin & cpu=arm64
+ languageName: node
+ linkType: hard
+
+"@esbuild/darwin-x64@npm:0.20.2":
+ version: 0.20.2
+ resolution: "@esbuild/darwin-x64@npm:0.20.2"
+ conditions: os=darwin & cpu=x64
+ languageName: node
+ linkType: hard
+
+"@esbuild/freebsd-arm64@npm:0.20.2":
+ version: 0.20.2
+ resolution: "@esbuild/freebsd-arm64@npm:0.20.2"
+ conditions: os=freebsd & cpu=arm64
+ languageName: node
+ linkType: hard
+
+"@esbuild/freebsd-x64@npm:0.20.2":
+ version: 0.20.2
+ resolution: "@esbuild/freebsd-x64@npm:0.20.2"
+ conditions: os=freebsd & cpu=x64
+ languageName: node
+ linkType: hard
+
+"@esbuild/linux-arm64@npm:0.20.2":
+ version: 0.20.2
+ resolution: "@esbuild/linux-arm64@npm:0.20.2"
+ conditions: os=linux & cpu=arm64
+ languageName: node
+ linkType: hard
+
+"@esbuild/linux-arm@npm:0.20.2":
+ version: 0.20.2
+ resolution: "@esbuild/linux-arm@npm:0.20.2"
+ conditions: os=linux & cpu=arm
+ languageName: node
+ linkType: hard
+
+"@esbuild/linux-ia32@npm:0.20.2":
+ version: 0.20.2
+ resolution: "@esbuild/linux-ia32@npm:0.20.2"
+ conditions: os=linux & cpu=ia32
+ languageName: node
+ linkType: hard
+
+"@esbuild/linux-loong64@npm:0.20.2":
+ version: 0.20.2
+ resolution: "@esbuild/linux-loong64@npm:0.20.2"
+ conditions: os=linux & cpu=loong64
+ languageName: node
+ linkType: hard
+
+"@esbuild/linux-mips64el@npm:0.20.2":
+ version: 0.20.2
+ resolution: "@esbuild/linux-mips64el@npm:0.20.2"
+ conditions: os=linux & cpu=mips64el
+ languageName: node
+ linkType: hard
+
+"@esbuild/linux-ppc64@npm:0.20.2":
+ version: 0.20.2
+ resolution: "@esbuild/linux-ppc64@npm:0.20.2"
+ conditions: os=linux & cpu=ppc64
+ languageName: node
+ linkType: hard
+
+"@esbuild/linux-riscv64@npm:0.20.2":
+ version: 0.20.2
+ resolution: "@esbuild/linux-riscv64@npm:0.20.2"
+ conditions: os=linux & cpu=riscv64
+ languageName: node
+ linkType: hard
+
+"@esbuild/linux-s390x@npm:0.20.2":
+ version: 0.20.2
+ resolution: "@esbuild/linux-s390x@npm:0.20.2"
+ conditions: os=linux & cpu=s390x
+ languageName: node
+ linkType: hard
+
+"@esbuild/linux-x64@npm:0.20.2":
+ version: 0.20.2
+ resolution: "@esbuild/linux-x64@npm:0.20.2"
+ conditions: os=linux & cpu=x64
+ languageName: node
+ linkType: hard
+
+"@esbuild/netbsd-x64@npm:0.20.2":
+ version: 0.20.2
+ resolution: "@esbuild/netbsd-x64@npm:0.20.2"
+ conditions: os=netbsd & cpu=x64
+ languageName: node
+ linkType: hard
+
+"@esbuild/openbsd-x64@npm:0.20.2":
+ version: 0.20.2
+ resolution: "@esbuild/openbsd-x64@npm:0.20.2"
+ conditions: os=openbsd & cpu=x64
+ languageName: node
+ linkType: hard
+
+"@esbuild/sunos-x64@npm:0.20.2":
+ version: 0.20.2
+ resolution: "@esbuild/sunos-x64@npm:0.20.2"
+ conditions: os=sunos & cpu=x64
+ languageName: node
+ linkType: hard
+
+"@esbuild/win32-arm64@npm:0.20.2":
+ version: 0.20.2
+ resolution: "@esbuild/win32-arm64@npm:0.20.2"
+ conditions: os=win32 & cpu=arm64
+ languageName: node
+ linkType: hard
+
+"@esbuild/win32-ia32@npm:0.20.2":
+ version: 0.20.2
+ resolution: "@esbuild/win32-ia32@npm:0.20.2"
+ conditions: os=win32 & cpu=ia32
+ languageName: node
+ linkType: hard
+
+"@esbuild/win32-x64@npm:0.20.2":
+ version: 0.20.2
+ resolution: "@esbuild/win32-x64@npm:0.20.2"
+ conditions: os=win32 & cpu=x64
+ languageName: node
+ linkType: hard
+
"@eslint/eslintrc@npm:^0.4.3":
version: 0.4.3
resolution: "@eslint/eslintrc@npm:0.4.3"
@@ -1817,6 +879,15 @@ __metadata:
languageName: node
linkType: hard
+"@jest/create-cache-key-function@npm:^29.7.0":
+ version: 29.7.0
+ resolution: "@jest/create-cache-key-function@npm:29.7.0"
+ dependencies:
+ "@jest/types": ^29.6.3
+ checksum: 681bc761fa1d6fa3dd77578d444f97f28296ea80755e90e46d1c8fa68661b9e67f54dd38b988742db636d26cf160450dc6011892cec98b3a7ceb58cad8ff3aae
+ languageName: node
+ linkType: hard
+
"@jest/environment@npm:^27.5.1":
version: 27.5.1
resolution: "@jest/environment@npm:27.5.1"
@@ -1892,6 +963,15 @@ __metadata:
languageName: node
linkType: hard
+"@jest/schemas@npm:^29.6.3":
+ version: 29.6.3
+ resolution: "@jest/schemas@npm:29.6.3"
+ dependencies:
+ "@sinclair/typebox": ^0.27.8
+ checksum: 910040425f0fc93cd13e68c750b7885590b8839066dfa0cd78e7def07bbb708ad869381f725945d66f2284de5663bbecf63e8fdd856e2ae6e261ba30b1687e93
+ languageName: node
+ linkType: hard
+
"@jest/source-map@npm:^27.5.1":
version: 27.5.1
resolution: "@jest/source-map@npm:27.5.1"
@@ -1963,6 +1043,20 @@ __metadata:
languageName: node
linkType: hard
+"@jest/types@npm:^29.6.3":
+ version: 29.6.3
+ resolution: "@jest/types@npm:29.6.3"
+ dependencies:
+ "@jest/schemas": ^29.6.3
+ "@types/istanbul-lib-coverage": ^2.0.0
+ "@types/istanbul-reports": ^3.0.0
+ "@types/node": "*"
+ "@types/yargs": ^17.0.8
+ chalk: ^4.0.0
+ checksum: a0bcf15dbb0eca6bdd8ce61a3fb055349d40268622a7670a3b2eb3c3dbafe9eb26af59938366d520b86907b9505b0f9b29b85cec11579a9e580694b87cd90fcc
+ languageName: node
+ linkType: hard
+
"@jridgewell/gen-mapping@npm:^0.3.0":
version: 0.3.2
resolution: "@jridgewell/gen-mapping@npm:0.3.2"
@@ -1992,13 +1086,6 @@ __metadata:
languageName: node
linkType: hard
-"@jridgewell/resolve-uri@npm:^3.1.0":
- version: 3.1.1
- resolution: "@jridgewell/resolve-uri@npm:3.1.1"
- checksum: f5b441fe7900eab4f9155b3b93f9800a916257f4e8563afbcd3b5a5337b55e52bd8ae6735453b1b745457d9f6cdb16d74cd6220bbdd98cf153239e13f6cbb653
- languageName: node
- linkType: hard
-
"@jridgewell/set-array@npm:^1.0.1":
version: 1.1.2
resolution: "@jridgewell/set-array@npm:1.1.2"
@@ -2016,16 +1103,6 @@ __metadata:
languageName: node
linkType: hard
-"@jridgewell/source-map@npm:^0.3.3":
- version: 0.3.5
- resolution: "@jridgewell/source-map@npm:0.3.5"
- dependencies:
- "@jridgewell/gen-mapping": ^0.3.0
- "@jridgewell/trace-mapping": ^0.3.9
- checksum: 1ad4dec0bdafbade57920a50acec6634f88a0eb735851e0dda906fa9894e7f0549c492678aad1a10f8e144bfe87f238307bf2a914a1bc85b7781d345417e9f6f
- languageName: node
- linkType: hard
-
"@jridgewell/sourcemap-codec@npm:1.4.14, @jridgewell/sourcemap-codec@npm:^1.4.10":
version: 1.4.14
resolution: "@jridgewell/sourcemap-codec@npm:1.4.14"
@@ -2033,13 +1110,6 @@ __metadata:
languageName: node
linkType: hard
-"@jridgewell/sourcemap-codec@npm:^1.4.14":
- version: 1.4.15
- resolution: "@jridgewell/sourcemap-codec@npm:1.4.15"
- checksum: b881c7e503db3fc7f3c1f35a1dd2655a188cc51a3612d76efc8a6eb74728bef5606e6758ee77423e564092b4a518aba569bbb21c9bac5ab7a35b0c6ae7e344c8
- languageName: node
- linkType: hard
-
"@jridgewell/trace-mapping@npm:^0.3.17":
version: 0.3.18
resolution: "@jridgewell/trace-mapping@npm:0.3.18"
@@ -2050,16 +1120,6 @@ __metadata:
languageName: node
linkType: hard
-"@jridgewell/trace-mapping@npm:^0.3.20":
- version: 0.3.21
- resolution: "@jridgewell/trace-mapping@npm:0.3.21"
- dependencies:
- "@jridgewell/resolve-uri": ^3.1.0
- "@jridgewell/sourcemap-codec": ^1.4.14
- checksum: e91d3943c6d84687503ba033600d42b2a81d9eaf32758fee06449cd1415c59b944af08841e99f030b71f83bb5f814969e96fc8aa29e469eb3ea1b46597d13cff
- languageName: node
- linkType: hard
-
"@jridgewell/trace-mapping@npm:^0.3.9":
version: 0.3.17
resolution: "@jridgewell/trace-mapping@npm:0.3.17"
@@ -2070,88 +1130,231 @@ __metadata:
languageName: node
linkType: hard
-"@nicolo-ribaudo/eslint-scope-5-internals@npm:5.1.1-v1":
- version: 5.1.1-v1
- resolution: "@nicolo-ribaudo/eslint-scope-5-internals@npm:5.1.1-v1"
- dependencies:
- eslint-scope: 5.1.1
- checksum: f2e3b2d6a6e2d9f163ca22105910c9f850dc4897af0aea3ef0a5886b63d8e1ba6505b71c99cb78a3bba24a09557d601eb21c8dede3f3213753fcfef364eb0e57
+"@nodelib/fs.scandir@npm:2.1.4":
+ version: 2.1.4
+ resolution: "@nodelib/fs.scandir@npm:2.1.4"
+ dependencies:
+ "@nodelib/fs.stat": 2.0.4
+ run-parallel: ^1.1.9
+ checksum: 18c2150ab52a042bd65babe5b70106e6586dc036644131c33d253ff99e5eeef2e65858ab40161530a6f22b512a65e7c7629f0f1e0f35c00ee4c606f960d375ba
+ languageName: node
+ linkType: hard
+
+"@nodelib/fs.stat@npm:2.0.4, @nodelib/fs.stat@npm:^2.0.2":
+ version: 2.0.4
+ resolution: "@nodelib/fs.stat@npm:2.0.4"
+ checksum: d0d9745f878816d041a8b36faf5797d88ba961274178f0ad1f7fe0efef8118ca9bd0e43e4d0d85a9af911bd35122ec1580e626a83d7595fc4d60f2c1c70e2665
+ languageName: node
+ linkType: hard
+
+"@nodelib/fs.walk@npm:^1.2.3":
+ version: 1.2.6
+ resolution: "@nodelib/fs.walk@npm:1.2.6"
+ dependencies:
+ "@nodelib/fs.scandir": 2.1.4
+ fastq: ^1.6.0
+ checksum: d156901823b3d3de368ad68047a964523e0ce5f796c0aa7712443b1f748d8e7fc24ce2c0f18d22a177e1f1c6092bca609ab5e4cb1792c41cdc8a6989bc391139
+ languageName: node
+ linkType: hard
+
+"@npmcli/move-file@npm:^1.0.1":
+ version: 1.1.2
+ resolution: "@npmcli/move-file@npm:1.1.2"
+ dependencies:
+ mkdirp: ^1.0.4
+ rimraf: ^3.0.2
+ checksum: c96381d4a37448ea280951e46233f7e541058cf57a57d4094dd4bdcaae43fa5872b5f2eb6bfb004591a68e29c5877abe3cdc210cb3588cbf20ab2877f31a7de7
+ languageName: node
+ linkType: hard
+
+"@polka/url@npm:^1.0.0-next.24":
+ version: 1.0.0-next.24
+ resolution: "@polka/url@npm:1.0.0-next.24"
+ checksum: 00baec4458ac86ca27edf7ce807ccfad97cd1d4b67bdedaf3401a9e755757588f3331e891290d1deea52d88df2bf2387caf8d94a6835b614d5b37b638a688273
+ languageName: node
+ linkType: hard
+
+"@popperjs/core@npm:^2.9.3":
+ version: 2.9.3
+ resolution: "@popperjs/core@npm:2.9.3"
+ checksum: 4cb94c271eaa13416ab8169c6af778c5b6160614351a79c68e8219d6ee0a40b8f71080ca29e139591c7c0c8e08fc1627d0e18d40a64609713a42b58d683a009d
+ languageName: node
+ linkType: hard
+
+"@simple-dom/interface@npm:^1.4.0":
+ version: 1.4.0
+ resolution: "@simple-dom/interface@npm:1.4.0"
+ checksum: e0ce8b6174208c5a369c2650094d16080230bf90cb95cc8258f9fd6b93be8afedbffb9d63da7f1d295a4e8d901f5fff907a69e1d55556db9e8544f2615b2f1d7
+ languageName: node
+ linkType: hard
+
+"@sinclair/typebox@npm:^0.27.8":
+ version: 0.27.8
+ resolution: "@sinclair/typebox@npm:0.27.8"
+ checksum: 00bd7362a3439021aa1ea51b0e0d0a0e8ca1351a3d54c606b115fdcc49b51b16db6e5f43b4fe7a28c38688523e22a94d49dd31168868b655f0d4d50f032d07a1
+ languageName: node
+ linkType: hard
+
+"@sinonjs/commons@npm:^1.7.0":
+ version: 1.8.6
+ resolution: "@sinonjs/commons@npm:1.8.6"
+ dependencies:
+ type-detect: 4.0.8
+ checksum: 7d3f8c1e85f30cd4e83594fc19b7a657f14d49eb8d95a30095631ce15e906c869e0eff96c5b93dffea7490c00418b07f54582ba49c6560feb2a8c34c0b16832d
+ languageName: node
+ linkType: hard
+
+"@sinonjs/fake-timers@npm:^8.0.1":
+ version: 8.1.0
+ resolution: "@sinonjs/fake-timers@npm:8.1.0"
+ dependencies:
+ "@sinonjs/commons": ^1.7.0
+ checksum: 09b5a158ce013a6c37613258bad79ca4efeb99b1f59c41c73cca36cac00b258aefcf46eeea970fccf06b989414d86fe9f54c1102272c0c3bdd51a313cea80949
+ languageName: node
+ linkType: hard
+
+"@swc/core-darwin-arm64@npm:1.5.0":
+ version: 1.5.0
+ resolution: "@swc/core-darwin-arm64@npm:1.5.0"
+ conditions: os=darwin & cpu=arm64
+ languageName: node
+ linkType: hard
+
+"@swc/core-darwin-x64@npm:1.5.0":
+ version: 1.5.0
+ resolution: "@swc/core-darwin-x64@npm:1.5.0"
+ conditions: os=darwin & cpu=x64
+ languageName: node
+ linkType: hard
+
+"@swc/core-linux-arm-gnueabihf@npm:1.5.0":
+ version: 1.5.0
+ resolution: "@swc/core-linux-arm-gnueabihf@npm:1.5.0"
+ conditions: os=linux & cpu=arm
+ languageName: node
+ linkType: hard
+
+"@swc/core-linux-arm64-gnu@npm:1.5.0":
+ version: 1.5.0
+ resolution: "@swc/core-linux-arm64-gnu@npm:1.5.0"
+ conditions: os=linux & cpu=arm64 & libc=glibc
+ languageName: node
+ linkType: hard
+
+"@swc/core-linux-arm64-musl@npm:1.5.0":
+ version: 1.5.0
+ resolution: "@swc/core-linux-arm64-musl@npm:1.5.0"
+ conditions: os=linux & cpu=arm64 & libc=musl
languageName: node
linkType: hard
-"@nodelib/fs.scandir@npm:2.1.4":
- version: 2.1.4
- resolution: "@nodelib/fs.scandir@npm:2.1.4"
- dependencies:
- "@nodelib/fs.stat": 2.0.4
- run-parallel: ^1.1.9
- checksum: 18c2150ab52a042bd65babe5b70106e6586dc036644131c33d253ff99e5eeef2e65858ab40161530a6f22b512a65e7c7629f0f1e0f35c00ee4c606f960d375ba
+"@swc/core-linux-x64-gnu@npm:1.5.0":
+ version: 1.5.0
+ resolution: "@swc/core-linux-x64-gnu@npm:1.5.0"
+ conditions: os=linux & cpu=x64 & libc=glibc
languageName: node
linkType: hard
-"@nodelib/fs.stat@npm:2.0.4, @nodelib/fs.stat@npm:^2.0.2":
- version: 2.0.4
- resolution: "@nodelib/fs.stat@npm:2.0.4"
- checksum: d0d9745f878816d041a8b36faf5797d88ba961274178f0ad1f7fe0efef8118ca9bd0e43e4d0d85a9af911bd35122ec1580e626a83d7595fc4d60f2c1c70e2665
+"@swc/core-linux-x64-musl@npm:1.5.0":
+ version: 1.5.0
+ resolution: "@swc/core-linux-x64-musl@npm:1.5.0"
+ conditions: os=linux & cpu=x64 & libc=musl
languageName: node
linkType: hard
-"@nodelib/fs.walk@npm:^1.2.3":
- version: 1.2.6
- resolution: "@nodelib/fs.walk@npm:1.2.6"
- dependencies:
- "@nodelib/fs.scandir": 2.1.4
- fastq: ^1.6.0
- checksum: d156901823b3d3de368ad68047a964523e0ce5f796c0aa7712443b1f748d8e7fc24ce2c0f18d22a177e1f1c6092bca609ab5e4cb1792c41cdc8a6989bc391139
+"@swc/core-win32-arm64-msvc@npm:1.5.0":
+ version: 1.5.0
+ resolution: "@swc/core-win32-arm64-msvc@npm:1.5.0"
+ conditions: os=win32 & cpu=arm64
languageName: node
linkType: hard
-"@npmcli/move-file@npm:^1.0.1":
- version: 1.1.2
- resolution: "@npmcli/move-file@npm:1.1.2"
- dependencies:
- mkdirp: ^1.0.4
- rimraf: ^3.0.2
- checksum: c96381d4a37448ea280951e46233f7e541058cf57a57d4094dd4bdcaae43fa5872b5f2eb6bfb004591a68e29c5877abe3cdc210cb3588cbf20ab2877f31a7de7
+"@swc/core-win32-ia32-msvc@npm:1.5.0":
+ version: 1.5.0
+ resolution: "@swc/core-win32-ia32-msvc@npm:1.5.0"
+ conditions: os=win32 & cpu=ia32
languageName: node
linkType: hard
-"@polka/url@npm:^1.0.0-next.24":
- version: 1.0.0-next.24
- resolution: "@polka/url@npm:1.0.0-next.24"
- checksum: 00baec4458ac86ca27edf7ce807ccfad97cd1d4b67bdedaf3401a9e755757588f3331e891290d1deea52d88df2bf2387caf8d94a6835b614d5b37b638a688273
+"@swc/core-win32-x64-msvc@npm:1.5.0":
+ version: 1.5.0
+ resolution: "@swc/core-win32-x64-msvc@npm:1.5.0"
+ conditions: os=win32 & cpu=x64
languageName: node
linkType: hard
-"@popperjs/core@npm:^2.9.3":
- version: 2.9.3
- resolution: "@popperjs/core@npm:2.9.3"
- checksum: 4cb94c271eaa13416ab8169c6af778c5b6160614351a79c68e8219d6ee0a40b8f71080ca29e139591c7c0c8e08fc1627d0e18d40a64609713a42b58d683a009d
+"@swc/core@npm:^1.5.0":
+ version: 1.5.0
+ resolution: "@swc/core@npm:1.5.0"
+ dependencies:
+ "@swc/core-darwin-arm64": 1.5.0
+ "@swc/core-darwin-x64": 1.5.0
+ "@swc/core-linux-arm-gnueabihf": 1.5.0
+ "@swc/core-linux-arm64-gnu": 1.5.0
+ "@swc/core-linux-arm64-musl": 1.5.0
+ "@swc/core-linux-x64-gnu": 1.5.0
+ "@swc/core-linux-x64-musl": 1.5.0
+ "@swc/core-win32-arm64-msvc": 1.5.0
+ "@swc/core-win32-ia32-msvc": 1.5.0
+ "@swc/core-win32-x64-msvc": 1.5.0
+ "@swc/counter": ^0.1.2
+ "@swc/types": ^0.1.5
+ peerDependencies:
+ "@swc/helpers": ^0.5.0
+ dependenciesMeta:
+ "@swc/core-darwin-arm64":
+ optional: true
+ "@swc/core-darwin-x64":
+ optional: true
+ "@swc/core-linux-arm-gnueabihf":
+ optional: true
+ "@swc/core-linux-arm64-gnu":
+ optional: true
+ "@swc/core-linux-arm64-musl":
+ optional: true
+ "@swc/core-linux-x64-gnu":
+ optional: true
+ "@swc/core-linux-x64-musl":
+ optional: true
+ "@swc/core-win32-arm64-msvc":
+ optional: true
+ "@swc/core-win32-ia32-msvc":
+ optional: true
+ "@swc/core-win32-x64-msvc":
+ optional: true
+ peerDependenciesMeta:
+ "@swc/helpers":
+ optional: true
+ checksum: 1abab0b57755020b60ebf2557629c23c65c3546e4cd80f9d02fbdf208d4169c9300a0229c088081b43a01e630c9d86d02f8c240c9fc2842eaed2a517770fcd1d
languageName: node
linkType: hard
-"@simple-dom/interface@npm:^1.4.0":
- version: 1.4.0
- resolution: "@simple-dom/interface@npm:1.4.0"
- checksum: e0ce8b6174208c5a369c2650094d16080230bf90cb95cc8258f9fd6b93be8afedbffb9d63da7f1d295a4e8d901f5fff907a69e1d55556db9e8544f2615b2f1d7
+"@swc/counter@npm:^0.1.2, @swc/counter@npm:^0.1.3":
+ version: 0.1.3
+ resolution: "@swc/counter@npm:0.1.3"
+ checksum: df8f9cfba9904d3d60f511664c70d23bb323b3a0803ec9890f60133954173047ba9bdeabce28cd70ba89ccd3fd6c71c7b0bd58be85f611e1ffbe5d5c18616598
languageName: node
linkType: hard
-"@sinonjs/commons@npm:^1.7.0":
- version: 1.8.6
- resolution: "@sinonjs/commons@npm:1.8.6"
+"@swc/jest@npm:^0.2.36":
+ version: 0.2.36
+ resolution: "@swc/jest@npm:0.2.36"
dependencies:
- type-detect: 4.0.8
- checksum: 7d3f8c1e85f30cd4e83594fc19b7a657f14d49eb8d95a30095631ce15e906c869e0eff96c5b93dffea7490c00418b07f54582ba49c6560feb2a8c34c0b16832d
+ "@jest/create-cache-key-function": ^29.7.0
+ "@swc/counter": ^0.1.3
+ jsonc-parser: ^3.2.0
+ peerDependencies:
+ "@swc/core": "*"
+ checksum: 14f2e696ac093e23dae1e2e57d894bbcde4de6fe80341a26c8d0d8cbae5aae31832f8fa32dc698529f128d19a76aeedf2227f59480de6dab5eb3f30bfdf9b71a
languageName: node
linkType: hard
-"@sinonjs/fake-timers@npm:^8.0.1":
- version: 8.1.0
- resolution: "@sinonjs/fake-timers@npm:8.1.0"
+"@swc/types@npm:^0.1.5":
+ version: 0.1.6
+ resolution: "@swc/types@npm:0.1.6"
dependencies:
- "@sinonjs/commons": ^1.7.0
- checksum: 09b5a158ce013a6c37613258bad79ca4efeb99b1f59c41c73cca36cac00b258aefcf46eeea970fccf06b989414d86fe9f54c1102272c0c3bdd51a313cea80949
+ "@swc/counter": ^0.1.3
+ checksum: fd579fbb9ab220b01b8eec03e32c37d355efbbce12e408e4c2743ca147760b749e068f5d3bec288b26bb10ecf2fe8d061c2554df0985d50d0e56962597262b34
languageName: node
linkType: hard
@@ -2324,7 +1527,7 @@ __metadata:
languageName: node
linkType: hard
-"@types/json-schema@npm:*, @types/json-schema@npm:^7.0.5, @types/json-schema@npm:^7.0.8":
+"@types/json-schema@npm:*, @types/json-schema@npm:^7.0.8":
version: 7.0.9
resolution: "@types/json-schema@npm:7.0.9"
checksum: 259d0e25f11a21ba5c708f7ea47196bd396e379fddb79c76f9f4f62c945879dc21657904914313ec2754e443c5018ea8372362f323f30e0792897fdb2098a705
@@ -2462,6 +1665,15 @@ __metadata:
languageName: node
linkType: hard
+"@types/yargs@npm:^17.0.8":
+ version: 17.0.32
+ resolution: "@types/yargs@npm:17.0.32"
+ dependencies:
+ "@types/yargs-parser": "*"
+ checksum: 4505bdebe8716ff383640c6e928f855b5d337cb3c68c81f7249fc6b983d0aa48de3eee26062b84f37e0d75a5797bc745e0c6e76f42f81771252a758c638f36ba
+ languageName: node
+ linkType: hard
+
"@typescript-eslint/parser@npm:^4.29.1":
version: 4.33.0
resolution: "@typescript-eslint/parser@npm:4.33.0"
@@ -2998,7 +2210,7 @@ __metadata:
languageName: node
linkType: hard
-"acorn@npm:^8.2.4, acorn@npm:^8.8.2":
+"acorn@npm:^8.2.4":
version: 8.11.3
resolution: "acorn@npm:8.11.3"
bin:
@@ -3390,7 +2602,7 @@ __metadata:
languageName: node
linkType: hard
-"babel-jest@npm:^27.0.6, babel-jest@npm:^27.5.1":
+"babel-jest@npm:^27.5.1":
version: 27.5.1
resolution: "babel-jest@npm:27.5.1"
dependencies:
@@ -3408,21 +2620,6 @@ __metadata:
languageName: node
linkType: hard
-"babel-loader@npm:^8.2.2":
- version: 8.3.0
- resolution: "babel-loader@npm:8.3.0"
- dependencies:
- find-cache-dir: ^3.3.1
- loader-utils: ^2.0.0
- make-dir: ^3.1.0
- schema-utils: ^2.6.5
- peerDependencies:
- "@babel/core": ^7.0.0
- webpack: ">=2"
- checksum: d48bcf9e030e598656ad3ff5fb85967db2eaaf38af5b4a4b99d25618a2057f9f100e6b231af2a46c1913206db506115ca7a8cbdf52c9c73d767070dae4352ab5
- languageName: node
- linkType: hard
-
"babel-plugin-istanbul@npm:^6.1.1":
version: 6.1.1
resolution: "babel-plugin-istanbul@npm:6.1.1"
@@ -3448,49 +2645,6 @@ __metadata:
languageName: node
linkType: hard
-"babel-plugin-polyfill-corejs2@npm:^0.4.7":
- version: 0.4.7
- resolution: "babel-plugin-polyfill-corejs2@npm:0.4.7"
- dependencies:
- "@babel/compat-data": ^7.22.6
- "@babel/helper-define-polyfill-provider": ^0.4.4
- semver: ^6.3.1
- peerDependencies:
- "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
- checksum: b3c84ce44d00211c919a94f76453fb2065861612f3e44862eb7acf854e325c738a7441ad82690deba2b6fddfa2ad2cf2c46960f46fab2e3b17c6ed4fd2d73b38
- languageName: node
- linkType: hard
-
-"babel-plugin-polyfill-corejs3@npm:^0.8.7":
- version: 0.8.7
- resolution: "babel-plugin-polyfill-corejs3@npm:0.8.7"
- dependencies:
- "@babel/helper-define-polyfill-provider": ^0.4.4
- core-js-compat: ^3.33.1
- peerDependencies:
- "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
- checksum: 51bc215ab0c062bbb2225d912f69f8a6705d1837c8e01f9651307b5b937804287c1d73ebd8015689efcc02c3c21f37688b9ee6f5997635619b7a9cc4b7d9908d
- languageName: node
- linkType: hard
-
-"babel-plugin-polyfill-regenerator@npm:^0.5.4":
- version: 0.5.4
- resolution: "babel-plugin-polyfill-regenerator@npm:0.5.4"
- dependencies:
- "@babel/helper-define-polyfill-provider": ^0.4.4
- peerDependencies:
- "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
- checksum: 461b735c6c0eca3c7b4434d14bfa98c2ab80f00e2bdc1c69eb46d1d300092a9786d76bbd3ee55e26d2d1a2380c14592d8d638e271dfd2a2b78a9eacffa3645d1
- languageName: node
- linkType: hard
-
-"babel-plugin-transform-remove-console@npm:^6.9.4":
- version: 6.9.4
- resolution: "babel-plugin-transform-remove-console@npm:6.9.4"
- checksum: 1123c3816c6f89c064752199c8796f30265d937f5d8e1e43d3837f1c0e87ed0e6bbd0afa6117ce021c8b93ec1de7154e158674bb22331c7ed6609d10121359df
- languageName: node
- linkType: hard
-
"babel-preset-current-node-syntax@npm:^1.0.0":
version: 1.0.1
resolution: "babel-preset-current-node-syntax@npm:1.0.1"
@@ -4055,13 +3209,6 @@ __metadata:
languageName: unknown
linkType: soft
-"commondir@npm:^1.0.1":
- version: 1.0.1
- resolution: "commondir@npm:1.0.1"
- checksum: 59715f2fc456a73f68826285718503340b9f0dd89bfffc42749906c5cf3d4277ef11ef1cca0350d0e79204f00f1f6d83851ececc9095dc88512a697ac0b9bdcb
- languageName: node
- linkType: hard
-
"concat-map@npm:0.0.1":
version: 0.0.1
resolution: "concat-map@npm:0.0.1"
@@ -4117,15 +3264,6 @@ __metadata:
languageName: node
linkType: hard
-"core-js-compat@npm:^3.31.0, core-js-compat@npm:^3.33.1":
- version: 3.35.0
- resolution: "core-js-compat@npm:3.35.0"
- dependencies:
- browserslist: ^4.22.2
- checksum: 64c41ce6870aa9130b9d0cb8f00c05204094f46db7e345d520ec2e38f8b6e1d51e921d4974ceb880948f19c0a79e5639e55be0e56f88ea20e32e9a6274da7f82
- languageName: node
- linkType: hard
-
"core-js@npm:^3.16.1":
version: 3.16.1
resolution: "core-js@npm:3.16.1"
@@ -4819,6 +3957,100 @@ __metadata:
languageName: node
linkType: hard
+"esbuild-loader@npm:^4.1.0":
+ version: 4.1.0
+ resolution: "esbuild-loader@npm:4.1.0"
+ dependencies:
+ esbuild: ^0.20.0
+ get-tsconfig: ^4.7.0
+ loader-utils: ^2.0.4
+ webpack-sources: ^1.4.3
+ peerDependencies:
+ webpack: ^4.40.0 || ^5.0.0
+ checksum: 51e76c36dd1fb70545889b07e3c4b4a437aaf1a2acc836e83141f06bcb8fbf96af778cf21b37355ea724c30504ad288ba76b0554ff94af260bb12ece647de861
+ languageName: node
+ linkType: hard
+
+"esbuild@npm:^0.20.0":
+ version: 0.20.2
+ resolution: "esbuild@npm:0.20.2"
+ dependencies:
+ "@esbuild/aix-ppc64": 0.20.2
+ "@esbuild/android-arm": 0.20.2
+ "@esbuild/android-arm64": 0.20.2
+ "@esbuild/android-x64": 0.20.2
+ "@esbuild/darwin-arm64": 0.20.2
+ "@esbuild/darwin-x64": 0.20.2
+ "@esbuild/freebsd-arm64": 0.20.2
+ "@esbuild/freebsd-x64": 0.20.2
+ "@esbuild/linux-arm": 0.20.2
+ "@esbuild/linux-arm64": 0.20.2
+ "@esbuild/linux-ia32": 0.20.2
+ "@esbuild/linux-loong64": 0.20.2
+ "@esbuild/linux-mips64el": 0.20.2
+ "@esbuild/linux-ppc64": 0.20.2
+ "@esbuild/linux-riscv64": 0.20.2
+ "@esbuild/linux-s390x": 0.20.2
+ "@esbuild/linux-x64": 0.20.2
+ "@esbuild/netbsd-x64": 0.20.2
+ "@esbuild/openbsd-x64": 0.20.2
+ "@esbuild/sunos-x64": 0.20.2
+ "@esbuild/win32-arm64": 0.20.2
+ "@esbuild/win32-ia32": 0.20.2
+ "@esbuild/win32-x64": 0.20.2
+ dependenciesMeta:
+ "@esbuild/aix-ppc64":
+ optional: true
+ "@esbuild/android-arm":
+ optional: true
+ "@esbuild/android-arm64":
+ optional: true
+ "@esbuild/android-x64":
+ optional: true
+ "@esbuild/darwin-arm64":
+ optional: true
+ "@esbuild/darwin-x64":
+ optional: true
+ "@esbuild/freebsd-arm64":
+ optional: true
+ "@esbuild/freebsd-x64":
+ optional: true
+ "@esbuild/linux-arm":
+ optional: true
+ "@esbuild/linux-arm64":
+ optional: true
+ "@esbuild/linux-ia32":
+ optional: true
+ "@esbuild/linux-loong64":
+ optional: true
+ "@esbuild/linux-mips64el":
+ optional: true
+ "@esbuild/linux-ppc64":
+ optional: true
+ "@esbuild/linux-riscv64":
+ optional: true
+ "@esbuild/linux-s390x":
+ optional: true
+ "@esbuild/linux-x64":
+ optional: true
+ "@esbuild/netbsd-x64":
+ optional: true
+ "@esbuild/openbsd-x64":
+ optional: true
+ "@esbuild/sunos-x64":
+ optional: true
+ "@esbuild/win32-arm64":
+ optional: true
+ "@esbuild/win32-ia32":
+ optional: true
+ "@esbuild/win32-x64":
+ optional: true
+ bin:
+ esbuild: bin/esbuild
+ checksum: bc88050fc1ca5c1bd03648f9979e514bdefb956a63aa3974373bb7b9cbac0b3aac9b9da1b5bdca0b3490e39d6b451c72815dbd6b7d7f978c91fbe9c9e9aa4e4c
+ languageName: node
+ linkType: hard
+
"escalade@npm:^3.1.1":
version: 3.1.1
resolution: "escalade@npm:3.1.1"
@@ -4967,7 +4199,7 @@ __metadata:
languageName: node
linkType: hard
-"eslint-visitor-keys@npm:^2.0.0, eslint-visitor-keys@npm:^2.1.0":
+"eslint-visitor-keys@npm:^2.0.0":
version: 2.1.0
resolution: "eslint-visitor-keys@npm:2.1.0"
checksum: e3081d7dd2611a35f0388bbdc2f5da60b3a3c5b8b6e928daffff7391146b434d691577aa95064c8b7faad0b8a680266bcda0a42439c18c717b80e6718d7e267d
@@ -5390,17 +4622,6 @@ __metadata:
languageName: node
linkType: hard
-"find-cache-dir@npm:^3.3.1":
- version: 3.3.1
- resolution: "find-cache-dir@npm:3.3.1"
- dependencies:
- commondir: ^1.0.1
- make-dir: ^3.0.2
- pkg-dir: ^4.1.0
- checksum: 0f7c22b65e07f9b486b4560227d014fab1e79ffbbfbafb87d113a2e878510bd620ef6fdff090e5248bb2846d28851d19e42bfdc7c50687966acc106328e7abf1
- languageName: node
- linkType: hard
-
"find-my-way@npm:^4.5.0":
version: 4.5.1
resolution: "find-my-way@npm:4.5.1"
@@ -5689,6 +4910,15 @@ __metadata:
languageName: node
linkType: hard
+"get-tsconfig@npm:^4.7.0":
+ version: 4.7.3
+ resolution: "get-tsconfig@npm:4.7.3"
+ dependencies:
+ resolve-pkg-maps: ^1.0.0
+ checksum: d124e6900f8beb3b71f215941096075223158d0abb09fb5daa8d83299f6c17d5e95a97d12847b387e9e716bb9bd256a473f918fb8020f3b1acc0b1e5c2830bbf
+ languageName: node
+ linkType: hard
+
"getpass@npm:^0.1.1":
version: 0.1.7
resolution: "getpass@npm:0.1.7"
@@ -7336,15 +6566,6 @@ __metadata:
languageName: node
linkType: hard
-"jsesc@npm:~0.5.0":
- version: 0.5.0
- resolution: "jsesc@npm:0.5.0"
- bin:
- jsesc: bin/jsesc
- checksum: b8b44cbfc92f198ad972fba706ee6a1dfa7485321ee8c0b25f5cedd538dcb20cde3197de16a7265430fce8277a12db066219369e3d51055038946039f6e20e17
- languageName: node
- linkType: hard
-
"json-parse-better-errors@npm:^1.0.2":
version: 1.0.2
resolution: "json-parse-better-errors@npm:1.0.2"
@@ -7414,6 +6635,13 @@ __metadata:
languageName: node
linkType: hard
+"jsonc-parser@npm:^3.2.0":
+ version: 3.2.1
+ resolution: "jsonc-parser@npm:3.2.1"
+ checksum: 656d9027b91de98d8ab91b3aa0d0a4cab7dc798a6830845ca664f3e76c82d46b973675bbe9b500fae1de37fd3e81aceacbaa2a57884bf2f8f29192150d2d1ef7
+ languageName: node
+ linkType: hard
+
"jsprim@npm:^1.2.2":
version: 1.4.1
resolution: "jsprim@npm:1.4.1"
@@ -7543,6 +6771,17 @@ __metadata:
languageName: node
linkType: hard
+"loader-utils@npm:^2.0.4":
+ version: 2.0.4
+ resolution: "loader-utils@npm:2.0.4"
+ dependencies:
+ big.js: ^5.2.2
+ emojis-list: ^3.0.0
+ json5: ^2.1.2
+ checksum: a5281f5fff1eaa310ad5e1164095689443630f3411e927f95031ab4fb83b4a98f388185bb1fe949e8ab8d4247004336a625e9255c22122b815bb9a4c5d8fc3b7
+ languageName: node
+ linkType: hard
+
"locate-path@npm:^5.0.0":
version: 5.0.0
resolution: "locate-path@npm:5.0.0"
@@ -7559,13 +6798,6 @@ __metadata:
languageName: node
linkType: hard
-"lodash.debounce@npm:^4.0.8":
- version: 4.0.8
- resolution: "lodash.debounce@npm:4.0.8"
- checksum: a3f527d22c548f43ae31c861ada88b2637eb48ac6aa3eb56e82d44917971b8aa96fbb37aa60efea674dc4ee8c42074f90f7b1f772e9db375435f6c83a19b3bc6
- languageName: node
- linkType: hard
-
"lodash.merge@npm:^4.6.2":
version: 4.6.2
resolution: "lodash.merge@npm:4.6.2"
@@ -7644,7 +6876,7 @@ __metadata:
languageName: node
linkType: hard
-"make-dir@npm:^3.0.0, make-dir@npm:^3.0.2, make-dir@npm:^3.1.0":
+"make-dir@npm:^3.0.0":
version: 3.1.0
resolution: "make-dir@npm:3.1.0"
dependencies:
@@ -8556,7 +7788,7 @@ __metadata:
languageName: node
linkType: hard
-"pkg-dir@npm:^4.1.0, pkg-dir@npm:^4.2.0":
+"pkg-dir@npm:^4.2.0":
version: 4.2.0
resolution: "pkg-dir@npm:4.2.0"
dependencies:
@@ -9088,38 +8320,13 @@ __metadata:
languageName: node
linkType: hard
-"regenerate-unicode-properties@npm:^10.1.0":
- version: 10.1.1
- resolution: "regenerate-unicode-properties@npm:10.1.1"
- dependencies:
- regenerate: ^1.4.2
- checksum: b80958ef40f125275824c2c47d5081dfaefebd80bff26c76761e9236767c748a4a95a69c053fe29d2df881177f2ca85df4a71fe70a82360388b31159ef19adcf
- languageName: node
- linkType: hard
-
-"regenerate@npm:^1.4.2":
- version: 1.4.2
- resolution: "regenerate@npm:1.4.2"
- checksum: 3317a09b2f802da8db09aa276e469b57a6c0dd818347e05b8862959c6193408242f150db5de83c12c3fa99091ad95fb42a6db2c3329bfaa12a0ea4cbbeb30cb0
- languageName: node
- linkType: hard
-
-"regenerator-runtime@npm:^0.13.4, regenerator-runtime@npm:^0.13.9":
+"regenerator-runtime@npm:^0.13.9":
version: 0.13.9
resolution: "regenerator-runtime@npm:0.13.9"
checksum: 65ed455fe5afd799e2897baf691ca21c2772e1a969d19bb0c4695757c2d96249eb74ee3553ea34a91062b2a676beedf630b4c1551cc6299afb937be1426ec55e
languageName: node
linkType: hard
-"regenerator-transform@npm:^0.15.2":
- version: 0.15.2
- resolution: "regenerator-transform@npm:0.15.2"
- dependencies:
- "@babel/runtime": ^7.8.4
- checksum: 20b6f9377d65954980fe044cfdd160de98df415b4bff38fbade67b3337efaf078308c4fed943067cd759827cc8cfeca9cb28ccda1f08333b85d6a2acbd022c27
- languageName: node
- linkType: hard
-
"regexp-util@npm:1.2.2, regexp-util@npm:^1.2.0, regexp-util@npm:^1.2.1":
version: 1.2.2
resolution: "regexp-util@npm:1.2.2"
@@ -9147,31 +8354,6 @@ __metadata:
languageName: node
linkType: hard
-"regexpu-core@npm:^5.3.1":
- version: 5.3.2
- resolution: "regexpu-core@npm:5.3.2"
- dependencies:
- "@babel/regjsgen": ^0.8.0
- regenerate: ^1.4.2
- regenerate-unicode-properties: ^10.1.0
- regjsparser: ^0.9.1
- unicode-match-property-ecmascript: ^2.0.0
- unicode-match-property-value-ecmascript: ^2.1.0
- checksum: 95bb97088419f5396e07769b7de96f995f58137ad75fac5811fb5fe53737766dfff35d66a0ee66babb1eb55386ef981feaef392f9df6d671f3c124812ba24da2
- languageName: node
- linkType: hard
-
-"regjsparser@npm:^0.9.1":
- version: 0.9.1
- resolution: "regjsparser@npm:0.9.1"
- dependencies:
- jsesc: ~0.5.0
- bin:
- regjsparser: bin/parser
- checksum: 5e1b76afe8f1d03c3beaf9e0d935dd467589c3625f6d65fb8ffa14f224d783a0fed4bf49c2c1b8211043ef92b6117313419edf055a098ed8342e340586741afc
- languageName: node
- linkType: hard
-
"remark-footnotes@npm:2.0.0":
version: 2.0.0
resolution: "remark-footnotes@npm:2.0.0"
@@ -9265,6 +8447,13 @@ __metadata:
languageName: node
linkType: hard
+"resolve-pkg-maps@npm:^1.0.0":
+ version: 1.0.0
+ resolution: "resolve-pkg-maps@npm:1.0.0"
+ checksum: 1012afc566b3fdb190a6309cc37ef3b2dcc35dff5fa6683a9d00cd25c3247edfbc4691b91078c97adc82a29b77a2660c30d791d65dab4fc78bfc473f60289977
+ languageName: node
+ linkType: hard
+
"resolve.exports@npm:^1.1.0":
version: 1.1.1
resolution: "resolve.exports@npm:1.1.1"
@@ -9272,7 +8461,7 @@ __metadata:
languageName: node
linkType: hard
-"resolve@^1.14.2, resolve@^1.20.0, resolve@npm:1.20.0":
+"resolve@^1.20.0, resolve@npm:1.20.0":
version: 1.20.0
resolution: "resolve@npm:1.20.0"
dependencies:
@@ -9308,7 +8497,7 @@ __metadata:
languageName: node
linkType: hard
-"resolve@patch:resolve@1.20.0#~builtin, resolve@patch:resolve@^1.14.2#~builtin, resolve@patch:resolve@^1.20.0#~builtin":
+"resolve@patch:resolve@1.20.0#~builtin, resolve@patch:resolve@^1.20.0#~builtin":
version: 1.20.0
resolution: "resolve@patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=c3c19d"
dependencies:
@@ -9505,17 +8694,6 @@ __metadata:
languageName: node
linkType: hard
-"schema-utils@npm:^2.6.5":
- version: 2.7.1
- resolution: "schema-utils@npm:2.7.1"
- dependencies:
- "@types/json-schema": ^7.0.5
- ajv: ^6.12.4
- ajv-keywords: ^3.5.2
- checksum: 32c62fc9e28edd101e1bd83453a4216eb9bd875cc4d3775e4452b541908fa8f61a7bbac8ffde57484f01d7096279d3ba0337078e85a918ecbeb72872fb09fb2b
- languageName: node
- linkType: hard
-
"schema-utils@npm:^3.0.0, schema-utils@npm:^3.1.0":
version: 3.1.1
resolution: "schema-utils@npm:3.1.1"
@@ -10290,6 +9468,18 @@ __metadata:
languageName: node
linkType: hard
+"swc-loader@npm:^0.2.6":
+ version: 0.2.6
+ resolution: "swc-loader@npm:0.2.6"
+ dependencies:
+ "@swc/counter": ^0.1.3
+ peerDependencies:
+ "@swc/core": ^1.2.147
+ webpack: ">=2"
+ checksum: fe90948c02a51bb8ffcff1ce3590e01dc12860b0bb7c9e22052b14fa846ed437781ae265614a5e14344bea22001108780f00a6e350e28c0b3499bc4cd11335fb
+ languageName: node
+ linkType: hard
+
"symbol-tree@npm:^3.2.4":
version: 3.2.4
resolution: "symbol-tree@npm:3.2.4"
@@ -10358,28 +9548,6 @@ __metadata:
languageName: node
linkType: hard
-"terser-webpack-plugin@npm:^5.1.4":
- version: 5.3.10
- resolution: "terser-webpack-plugin@npm:5.3.10"
- dependencies:
- "@jridgewell/trace-mapping": ^0.3.20
- jest-worker: ^27.4.5
- schema-utils: ^3.1.1
- serialize-javascript: ^6.0.1
- terser: ^5.26.0
- peerDependencies:
- webpack: ^5.1.0
- peerDependenciesMeta:
- "@swc/core":
- optional: true
- esbuild:
- optional: true
- uglify-js:
- optional: true
- checksum: bd6e7596cf815f3353e2a53e79cbdec959a1b0276f5e5d4e63e9d7c3c5bb5306df567729da287d1c7b39d79093e56863c569c42c6c24cc34c76aa313bd2cbcea
- languageName: node
- linkType: hard
-
"terser-webpack-plugin@npm:^5.3.7":
version: 5.3.7
resolution: "terser-webpack-plugin@npm:5.3.7"
@@ -10430,20 +9598,6 @@ __metadata:
languageName: node
linkType: hard
-"terser@npm:^5.26.0":
- version: 5.26.0
- resolution: "terser@npm:5.26.0"
- dependencies:
- "@jridgewell/source-map": ^0.3.3
- acorn: ^8.8.2
- commander: ^2.20.0
- source-map-support: ~0.5.20
- bin:
- terser: bin/terser
- checksum: 02a9bb896f04df828025af8f0eced36c315d25d310b6c2418e7dad2bed19ddeb34a9cea9b34e7c24789830fa51e1b6a9be26679980987a9c817a7e6d9cd4154b
- languageName: node
- linkType: hard
-
"test-exclude@npm:^6.0.0":
version: 6.0.0
resolution: "test-exclude@npm:6.0.0"
@@ -10538,24 +9692,16 @@ __metadata:
version: 0.0.0-use.local
resolution: "tgui-workspace@workspace:."
dependencies:
- "@babel/core": ^7.15.0
- "@babel/eslint-parser": ^7.15.0
- "@babel/plugin-transform-class-properties": ^7.23.3
- "@babel/plugin-transform-jscript": ^7.14.5
- "@babel/preset-env": ^7.15.0
- "@babel/preset-react": ^7.23.3
- "@babel/preset-typescript": ^7.15.0
+ "@swc/core": ^1.5.0
+ "@swc/jest": ^0.2.36
"@types/jest": ^27.0.1
"@types/jsdom": ^16.2.13
"@types/node": ^14.17.9
"@types/webpack": ^5.28.0
"@types/webpack-env": ^1.16.2
"@typescript-eslint/parser": ^4.29.1
- babel-jest: ^27.0.6
- babel-loader: ^8.2.2
- babel-plugin-transform-remove-console: ^6.9.4
- common: "workspace:*"
css-loader: ^5.2.7
+ esbuild-loader: ^4.1.0
eslint: ^7.32.0
eslint-config-prettier: ^8.5.0
eslint-plugin-radar: ^0.2.1
@@ -10570,7 +9716,7 @@ __metadata:
sass: ^1.37.5
sass-loader: ^11.1.1
style-loader: ^2.0.0
- terser-webpack-plugin: ^5.1.4
+ swc-loader: ^0.2.6
typescript: ^4.9.4
url-loader: ^4.1.1
webpack: ^5.75.0
@@ -10987,37 +10133,6 @@ __metadata:
languageName: node
linkType: hard
-"unicode-canonical-property-names-ecmascript@npm:^2.0.0":
- version: 2.0.0
- resolution: "unicode-canonical-property-names-ecmascript@npm:2.0.0"
- checksum: 39be078afd014c14dcd957a7a46a60061bc37c4508ba146517f85f60361acf4c7539552645ece25de840e17e293baa5556268d091ca6762747fdd0c705001a45
- languageName: node
- linkType: hard
-
-"unicode-match-property-ecmascript@npm:^2.0.0":
- version: 2.0.0
- resolution: "unicode-match-property-ecmascript@npm:2.0.0"
- dependencies:
- unicode-canonical-property-names-ecmascript: ^2.0.0
- unicode-property-aliases-ecmascript: ^2.0.0
- checksum: 1f34a7434a23df4885b5890ac36c5b2161a809887000be560f56ad4b11126d433c0c1c39baf1016bdabed4ec54829a6190ee37aa24919aa116dc1a5a8a62965a
- languageName: node
- linkType: hard
-
-"unicode-match-property-value-ecmascript@npm:^2.1.0":
- version: 2.1.0
- resolution: "unicode-match-property-value-ecmascript@npm:2.1.0"
- checksum: 8d6f5f586b9ce1ed0e84a37df6b42fdba1317a05b5df0c249962bd5da89528771e2d149837cad11aa26bcb84c35355cb9f58a10c3d41fa3b899181ece6c85220
- languageName: node
- linkType: hard
-
-"unicode-property-aliases-ecmascript@npm:^2.0.0":
- version: 2.1.0
- resolution: "unicode-property-aliases-ecmascript@npm:2.1.0"
- checksum: 243524431893649b62cc674d877bd64ef292d6071dd2fd01ab4d5ad26efbc104ffcd064f93f8a06b7e4ec54c172bf03f6417921a0d8c3a9994161fe1f88f815b
- languageName: node
- linkType: hard
-
"unicode-regex@npm:3.0.0":
version: 3.0.0
resolution: "unicode-regex@npm:3.0.0"
@@ -11438,7 +10553,7 @@ __metadata:
languageName: node
linkType: hard
-"webpack-sources@npm:^1.1.0":
+"webpack-sources@npm:^1.1.0, webpack-sources@npm:^1.4.3":
version: 1.4.3
resolution: "webpack-sources@npm:1.4.3"
dependencies: