diff --git a/code/modules/mob/living/silicon/pai/software.dm b/code/modules/mob/living/silicon/pai/software.dm
index 3a98a5bea3..3475700c4b 100644
--- a/code/modules/mob/living/silicon/pai/software.dm
+++ b/code/modules/mob/living/silicon/pai/software.dm
@@ -1,19 +1,20 @@
var/list/pai_emotions = list(
- "Happy" = 1,
- "Cat" = 2,
- "Extremely Happy" = 3,
- "Face" = 4,
- "Laugh" = 5,
- "Off" = 6,
- "Sad" = 7,
- "Angry" = 8,
- "What" = 9,
- "Neutral" = 10,
- "Silly" = 11,
- "Nose" = 12,
- "Smirk" = 13,
- "Exclamation Points" = 14,
- "Question Mark" = 15
+ "Neutral" = 1,
+ "What" = 2,
+ "Happy" = 3,
+ "Cat" = 4,
+ "Extremely Happy" = 5,
+ "Face" = 6,
+ "Laugh" = 7,
+ "Sad" = 8,
+ "Angry" = 9,
+ "Silly" = 10,
+ "Nose" = 11,
+ "Smirk" = 12,
+ "Exclamation Points" = 13,
+ "Question Mark" = 14,
+ "Blank" = 15,
+ "Off" = 16
)
diff --git a/code/modules/mob/living/silicon/pai/software_modules.dm b/code/modules/mob/living/silicon/pai/software_modules.dm
index 1fb28a58fd..07d82b74d0 100644
--- a/code/modules/mob/living/silicon/pai/software_modules.dm
+++ b/code/modules/mob/living/silicon/pai/software_modules.dm
@@ -98,9 +98,10 @@
/datum/pai_software/crew_manifest
name = "Crew Manifest"
- ram_cost = 5
+ ram_cost = 0
id = "manifest"
toggle = 0
+ default = 1 //Comes with the communicator already, also why not
/datum/pai_software/crew_manifest/tgui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui)
ui = SStgui.try_update_ui(user, src, ui)
@@ -117,9 +118,10 @@
/datum/pai_software/messenger
name = "Digital Messenger"
- ram_cost = 5
+ ram_cost = 0
id = "messenger"
toggle = 0
+ default = 1 //Can already be accessed through verbs, and also why not
/datum/pai_software/messenger/tgui_interact(mob/living/silicon/pai/user, datum/tgui/ui, datum/tgui/parent_ui)
return user.pda.tgui_interact(user, parent_ui = parent_ui)
@@ -411,6 +413,35 @@
user.add_language(LANGUAGE_SKRELLIAN)
user.add_language(LANGUAGE_ZADDAT)
user.add_language(LANGUAGE_SCHECHI)
+ user.add_language(LANGUAGE_DRUDAKAR)
+ user.add_language(LANGUAGE_SLAVIC)
+ user.add_language(LANGUAGE_BIRDSONG)
+ user.add_language(LANGUAGE_SAGARU)
+ user.add_language(LANGUAGE_CANILUNZT)
+ user.add_language(LANGUAGE_ECUREUILIAN)
+ user.add_language(LANGUAGE_DAEMON)
+ user.add_language(LANGUAGE_ENOCHIAN)
+ user.add_language(LANGUAGE_VESPINAE)
+ user.add_language(LANGUAGE_SPACER)
+ user.add_language(LANGUAGE_CLOWNISH)
+ user.add_language(LANGUAGE_TAVAN)
+ user.add_language(LANGUAGE_ECHOSONG)
+ user.add_language(LANGUAGE_CHIMPANZEE)
+ user.add_language(LANGUAGE_NEAERA)
+ user.add_language(LANGUAGE_STOK)
+ user.add_language(LANGUAGE_FARWA)
+ user.add_language(LANGUAGE_ROOTLOCAL)
+ user.add_language(LANGUAGE_VOX)
+ user.add_language(LANGUAGE_SKRELLIANFAR)
+ user.add_language(LANGUAGE_MINBUS)
+ user.add_language(LANGUAGE_ALAI)
+ user.add_language(LANGUAGE_PROMETHEAN)
+ user.add_language(LANGUAGE_GIBBERISH)
+ user.add_language("Mouse")
+ user.add_language("Cat")
+ user.add_language("Bird")
+ user.add_language("Dog")
+ user.add_language("Teppi")
else
user.remove_language(LANGUAGE_UNATHI)
user.remove_language(LANGUAGE_SIIK)
@@ -418,6 +449,35 @@
user.remove_language(LANGUAGE_SKRELLIAN)
user.remove_language(LANGUAGE_ZADDAT)
user.remove_language(LANGUAGE_SCHECHI)
+ user.remove_language(LANGUAGE_DRUDAKAR)
+ user.remove_language(LANGUAGE_SLAVIC)
+ user.remove_language(LANGUAGE_BIRDSONG)
+ user.remove_language(LANGUAGE_SAGARU)
+ user.remove_language(LANGUAGE_CANILUNZT)
+ user.remove_language(LANGUAGE_ECUREUILIAN)
+ user.remove_language(LANGUAGE_DAEMON)
+ user.remove_language(LANGUAGE_ENOCHIAN)
+ user.remove_language(LANGUAGE_VESPINAE)
+ user.remove_language(LANGUAGE_SPACER)
+ user.remove_language(LANGUAGE_CLOWNISH)
+ user.remove_language(LANGUAGE_TAVAN)
+ user.remove_language(LANGUAGE_ECHOSONG)
+ user.remove_language(LANGUAGE_CHIMPANZEE)
+ user.remove_language(LANGUAGE_NEAERA)
+ user.remove_language(LANGUAGE_STOK)
+ user.remove_language(LANGUAGE_FARWA)
+ user.remove_language(LANGUAGE_ROOTLOCAL)
+ user.remove_language(LANGUAGE_VOX)
+ user.remove_language(LANGUAGE_SKRELLIANFAR)
+ user.remove_language(LANGUAGE_MINBUS)
+ user.remove_language(LANGUAGE_ALAI)
+ user.remove_language(LANGUAGE_PROMETHEAN)
+ user.remove_language(LANGUAGE_GIBBERISH)
+ user.remove_language("Mouse")
+ user.remove_language("Cat")
+ user.remove_language("Bird")
+ user.remove_language("Dog")
+ user.remove_language("Teppi")
/datum/pai_software/translator/is_active(mob/living/silicon/pai/user)
return user.translator_on
diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm
index f2a4d9775b..9def436c7c 100644
--- a/code/modules/mob/living/silicon/robot/emote.dm
+++ b/code/modules/mob/living/silicon/robot/emote.dm
@@ -16,12 +16,14 @@ var/list/_robot_default_emotes = list(
/decl/emote/visible/spin,
/decl/emote/visible/sidestep,
/decl/emote/audible/synth,
- /decl/emote/audible/synth/ping,
+ /decl/emote/audible/synth/beep,
/decl/emote/audible/synth/buzz,
/decl/emote/audible/synth/confirm,
/decl/emote/audible/synth/deny,
/decl/emote/audible/synth/scary,
/decl/emote/audible/synth/dwoop,
+ /decl/emote/audible/synth/boop,
+ /decl/emote/audible/synth/robochirp,
/decl/emote/audible/synth/security,
/decl/emote/audible/synth/security/halt,
//VOREStation Add
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/pets/fennec.dm b/code/modules/mob/living/simple_mob/subtypes/animal/pets/fennec.dm
new file mode 100644
index 0000000000..0ea451246f
--- /dev/null
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/pets/fennec.dm
@@ -0,0 +1,29 @@
+/mob/living/simple_mob/animal/passive/fennec
+ name = "fennec"
+ desc = "A fox preferring arid climates, also known as a dingler, or a goob."
+ tt_desc = "Vulpes Zerda"
+ icon_state = "fennec"
+ item_state = "fennec"
+
+ movement_cooldown = 0.5 SECONDS
+
+ see_in_dark = 6
+ response_help = "pets"
+ response_disarm = "gently pushes aside"
+ response_harm = "kicks"
+
+ holder_type = /obj/item/holder/fennec
+ mob_size = MOB_SMALL
+
+ has_langs = list("Cat, Dog") //they're similar, why not.
+
+/mob/living/simple_mob/animal/passive/fennec/faux
+ name = "faux"
+ desc = "Domesticated fennec. Seems to like screaming just as much though."
+
+/mob/living/simple_mob/animal/passive/fennec/Initialize()
+ icon_living = "[initial(icon_state)]"
+ icon_dead = "[initial(icon_state)]_dead"
+ icon_rest = "[initial(icon_state)]_rest"
+ update_icon()
+ return ..()
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/dominated_brain.dm b/code/modules/mob/living/simple_mob/subtypes/vore/dominated_brain.dm
index 82375f0a15..e69e0fc54a 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/dominated_brain.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/dominated_brain.dm
@@ -169,6 +169,10 @@
pred = loc.loc
else if(isliving(prey.loc))
pred = loc
+ else if(ispAI(src))
+ var/mob/living/silicon/pai/pocketpal = src
+ if(isbelly(pocketpal.card.loc))
+ pred = pocketpal.card.loc.loc
else
to_chat(prey, "You are not inside anyone.")
return
diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm
index 66d712bc44..e564bba7b0 100644
--- a/code/modules/mob/new_player/preferences_setup.dm
+++ b/code/modules/mob/new_player/preferences_setup.dm
@@ -259,6 +259,7 @@
mannequin.update_transform() //VOREStation Edit to update size/shape stuff.
mannequin.toggle_tail(setting = TRUE)
mannequin.toggle_wing(setting = TRUE)
+ mannequin.update_tail_showing()
COMPILE_OVERLAYS(mannequin)
update_character_previews(new /mutable_appearance(mannequin))
diff --git a/code/modules/mob/new_player/sprite_accessories_ear_vr.dm b/code/modules/mob/new_player/sprite_accessories_ear_vr.dm
index f6b0c77abe..4c09f5d7cd 100644
--- a/code/modules/mob/new_player/sprite_accessories_ear_vr.dm
+++ b/code/modules/mob/new_player/sprite_accessories_ear_vr.dm
@@ -119,6 +119,15 @@
do_colouration = 1
color_blend_mode = ICON_MULTIPLY
+/datum/sprite_accessory/ears/antennae_eye
+ name = "antennae eye, colorable"
+ desc = ""
+ icon_state = "antennae"
+ extra_overlay = "antennae_eye_1"
+ extra_overlay2 = "antennae_eye_2"
+ do_colouration = 1
+ color_blend_mode = ICON_MULTIPLY
+
/datum/sprite_accessory/ears/curly_bug
name = "curly antennae, colorable"
desc = ""
diff --git a/code/modules/mob/new_player/sprite_accessories_taur.dm b/code/modules/mob/new_player/sprite_accessories_taur.dm
index 4637ac008e..4288f9bbc6 100644
--- a/code/modules/mob/new_player/sprite_accessories_taur.dm
+++ b/code/modules/mob/new_player/sprite_accessories_taur.dm
@@ -285,6 +285,11 @@
suit_sprites = 'icons/mob/taursuits_slug.dmi'
icon_sprite_tag = "slug"
+/datum/sprite_accessory/tail/taur/slug/snail
+ name = "Snail (Taur)"
+ icon_state = "slug_s"
+ extra_overlay = "snail_shell_marking"
+
/datum/sprite_accessory/tail/taur/frog
name = "Frog (Taur)"
icon_state = "frog_s"
diff --git a/code/modules/mob/new_player/sprite_accessories_taur_vr.dm b/code/modules/mob/new_player/sprite_accessories_taur_vr.dm
index f182b5792e..2a574510b0 100644
--- a/code/modules/mob/new_player/sprite_accessories_taur_vr.dm
+++ b/code/modules/mob/new_player/sprite_accessories_taur_vr.dm
@@ -69,6 +69,15 @@
extra_overlay2 = "wolf_markings_2"
//icon_sprite_tag = "wolf2c"
+/datum/sprite_accessory/tail/taur/wolf/wolf_2c_wag
+ name = "Wolf 3-color (Taur, vwag)"
+ icon_state = "wolf_s"
+ extra_overlay = "wolf_markings"
+ extra_overlay2 = "wolf_markings_2"
+ ani_state = "fatwolf_s"
+ extra_overlay_w = "fatwolf_markings"
+ extra_overlay2_w = "wolf_markings_2"
+
/datum/sprite_accessory/tail/taur/wolf/fatwolf_2c
name = "Fat Wolf 3-color (Taur)"
icon_state = "fatwolf_s"
@@ -411,6 +420,12 @@
suit_sprites = 'icons/mob/taursuits_drake_vr.dmi'
icon_sprite_tag = "drake"
+/datum/sprite_accessory/tail/taur/ch/fatdrake
+ name = "Drake (Fat Taur dual-color)"
+ icon_state = "fatdrake_s"
+ extra_overlay = "fatdrake_markings"
+ icon_sprite_tag = "drake"
+
/datum/sprite_accessory/tail/taur/otie
name = "Otie (Taur)"
icon_state = "otie_s"
diff --git a/code/modules/mob/typing_indicator.dm b/code/modules/mob/typing_indicator.dm
index 35fe2d8bbb..7ab6de6fe5 100644
--- a/code/modules/mob/typing_indicator.dm
+++ b/code/modules/mob/typing_indicator.dm
@@ -40,7 +40,11 @@
set hidden = 1
set_typing_indicator(TRUE)
- var/message = tgui_input_text(usr, "Type your message:", "Say")
+ var/message
+ if(usr.client.prefs.tgui_input_mode)
+ message = tgui_input_text(usr, "Type your message:", "Say")
+ else
+ message = input(usr, "Type your message:", "Say") as text
set_typing_indicator(FALSE)
if(message)
@@ -51,7 +55,11 @@
set hidden = 1
set_typing_indicator(TRUE)
- var/message = tgui_input_message(usr, "Type your message:", "Emote")
+ var/message
+ if(usr.client.prefs.tgui_input_mode)
+ message = tgui_input_message(usr, "Type your message:", "Emote")
+ else
+ message = input(usr, "Type your message:", "Emote") as message
set_typing_indicator(FALSE)
if(message)
@@ -62,7 +70,12 @@
set name = ".Whisper"
set hidden = 1
- var/message = tgui_input_text(usr, "Type your message:", "Whisper")
+ var/message
+ if(usr.client.prefs.tgui_input_mode)
+ message = tgui_input_text(usr, "Type your message:", "Whisper")
+ else
+ message = input(usr, "Type your message:", "Whisper") as text
+
if(message)
whisper(message)
@@ -70,6 +83,11 @@
set name = ".Subtle"
set hidden = 1
- var/message = tgui_input_message(usr, "Type your message:", "Subtle")
+ var/message
+ if(usr.client.prefs.tgui_input_mode)
+ message = tgui_input_message(usr, "Type your message:", "Subtle")
+ else
+ message = input(usr, "Type your message:", "Subtle") as message
+
if(message)
me_verb_subtle(message)
diff --git a/code/modules/nifsoft/software/14_commlink.dm b/code/modules/nifsoft/software/14_commlink.dm
index 93e1af799c..75a04fc589 100644
--- a/code/modules/nifsoft/software/14_commlink.dm
+++ b/code/modules/nifsoft/software/14_commlink.dm
@@ -128,4 +128,4 @@
return
if(ringer && nif.human)
- nif.notify("Commlink message from [who]: \"[text]\" (Open)")
+ nif.notify("Commlink message from [who]: \"[text]\" (Open) (Reply)")
diff --git a/code/modules/tgui/modules/rcon.dm b/code/modules/tgui/modules/rcon.dm
index 01ba355248..0a29153d76 100644
--- a/code/modules/tgui/modules/rcon.dm
+++ b/code/modules/tgui/modules/rcon.dm
@@ -1,3 +1,5 @@
+#define SMES_PER_PAGE 4
+
/datum/tgui_module/rcon
name = "Power RCON"
tgui_id = "RCON"
@@ -5,17 +7,41 @@
var/list/known_SMESs = null
var/list/known_breakers = null
+ var/filtered_smeslist = list()
+
+ var/current_page = 1
+ var/number_pages = 0
+
+/datum/tgui_module/rcon/proc/filter_smeslist(var/page)
+ number_pages = known_SMESs.len / SMES_PER_PAGE
+
+ if(number_pages != round(number_pages))
+ number_pages = round(number_pages) + 1
+ var/page_index = page - 1
+
+ var/lower_bound = page_index * SMES_PER_PAGE + 1
+ var/upper_bound = (page_index + 1) * SMES_PER_PAGE
+ upper_bound = min(upper_bound, known_SMESs.len)
+ filtered_smeslist = list()
+
+ for(var/index = lower_bound, index <= upper_bound, index++)
+ filtered_smeslist += known_SMESs[index]
+
/datum/tgui_module/rcon/tgui_data(mob/user)
FindDevices() // Update our devices list
var/list/data = ..()
+ filter_smeslist(current_page)
+
// SMES DATA (simplified view)
var/list/smeslist[0]
- for(var/obj/machinery/power/smes/buildable/SMES in known_SMESs)
+ for(var/obj/machinery/power/smes/buildable/SMES in filtered_smeslist)
var/list/smes_data = SMES.tgui_data()
smes_data["RCON_tag"] = SMES.RCon_tag
smeslist.Add(list(smes_data))
+ data["pages"] = number_pages + 1
+ data["current_page"] = current_page
data["smes_info"] = sortByKey(smeslist, "RCON_tag")
// BREAKER DATA (simplified view)
@@ -34,6 +60,10 @@
return TRUE
switch(action)
+ if("set_smes_page")
+ var/page = params["index"]
+ current_page = page
+ . = TRUE
if("smes_in_toggle")
var/obj/machinery/power/smes/buildable/SMES = GetSMESByTag(params["smes"])
if(SMES)
diff --git a/code/modules/tgui/tgui.dm b/code/modules/tgui/tgui.dm
index 5f95ab7db2..c34ccf63d7 100644
--- a/code/modules/tgui/tgui.dm
+++ b/code/modules/tgui/tgui.dm
@@ -92,10 +92,9 @@
if(!window.is_ready())
window.initialize(
fancy = user.client.prefs.tgui_fancy,
- inline_assets = list(
- get_asset_datum(/datum/asset/simple/tgui_common),
- get_asset_datum(/datum/asset/simple/tgui)
- ))
+ assets = list(
+ get_asset_datum(/datum/asset/simple/tgui),
+ ))
else
window.send_message("ping")
window.send_asset(get_asset_datum(/datum/asset/simple/fontawesome))
diff --git a/code/modules/tgui/tgui_window.dm b/code/modules/tgui/tgui_window.dm
index cc8a63ef27..2e1b64bac1 100644
--- a/code/modules/tgui/tgui_window.dm
+++ b/code/modules/tgui/tgui_window.dm
@@ -18,8 +18,11 @@
var/message_queue
var/sent_assets = list()
// Vars passed to initialize proc (and saved for later)
- var/inline_assets
- var/fancy
+ var/initial_fancy
+ var/initial_assets
+ var/initial_inline_html
+ var/initial_inline_js
+ var/initial_inline_css
/**
* public
@@ -45,21 +48,26 @@
* state. You can begin sending messages right after initializing. Messages
* will be put into the queue until the window finishes loading.
*
- * optional inline_assets list List of assets to inline into the html.
+ * optional assets list List of assets to inline into the html.
* optional inline_html string Custom HTML to inject.
* optional fancy bool If TRUE, will hide the window titlebar.
*/
/datum/tgui_window/proc/initialize(
- inline_assets = list(),
+ fancy = FALSE,
+ assets = list(),
inline_html = "",
- fancy = FALSE)
+ inline_js = "",
+ inline_css = "")
#ifdef TGUI_DEBUGGING
log_tgui(client, "[id]/initiailize ([src])")
#endif
if(!client)
return
- src.inline_assets = inline_assets
- src.fancy = fancy
+ src.initial_fancy = fancy
+ src.initial_assets = assets
+ src.initial_inline_html = inline_html
+ src.initial_inline_js = inline_js
+ src.initial_inline_css = inline_css
status = TGUI_WINDOW_LOADING
fatally_errored = FALSE
// Build window options
@@ -72,9 +80,9 @@
// Generate page html
var/html = SStgui.basehtml
html = replacetextEx(html, "\[tgui:windowId]", id)
- // Inject inline assets
+ // Inject assets
var/inline_assets_str = ""
- for(var/datum/asset/asset in inline_assets)
+ for(var/datum/asset/asset in assets)
var/mappings = asset.get_url_mappings()
for(var/name in mappings)
var/url = mappings[name]
@@ -87,8 +95,17 @@
if(length(inline_assets_str))
inline_assets_str = "\n"
html = replacetextEx(html, "\n", inline_assets_str)
- // Inject custom HTML
- html = replacetextEx(html, "\n", inline_html)
+ // Inject inline HTML
+ if (inline_html)
+ html = replacetextEx(html, "", inline_html)
+ // Inject inline JS
+ if (inline_js)
+ inline_js = ""
+ html = replacetextEx(html, "", inline_js)
+ // Inject inline CSS
+ if (inline_css)
+ inline_css = ""
+ html = replacetextEx(html, "", inline_css)
// Open the window
client << browse(html, "window=[id];[options]")
// Detect whether the control is a browser
@@ -281,6 +298,17 @@
: "[id].browser:update")
message_queue = null
+/**
+ * public
+ *
+ * Replaces the inline HTML content.
+ *
+ * required inline_html string HTML to inject
+ */
+/datum/tgui_window/proc/replace_html(inline_html = "")
+ client << output(url_encode(inline_html), is_browser \
+ ? "[id]:replaceHtml" \
+ : "[id].browser:replaceHtml")
/**
* private
@@ -325,7 +353,12 @@
client << link(href_list["url"])
if("cacheReloaded")
// Reinitialize
- initialize(inline_assets = inline_assets, fancy = fancy)
+ initialize(
+ fancy = initial_fancy,
+ assets = initial_assets,
+ inline_html = initial_inline_html,
+ inline_js = initial_inline_js,
+ inline_css = initial_inline_css)
// Resend the assets
for(var/asset in sent_assets)
send_asset(asset)
\ No newline at end of file
diff --git a/code/modules/tooltip/tooltip.html b/code/modules/tooltip/tooltip.html
index 67fb8a77f1..77ac63c1a9 100644
--- a/code/modules/tooltip/tooltip.html
+++ b/code/modules/tooltip/tooltip.html
@@ -217,8 +217,13 @@
$wrap.width($wrap.width() + 2); //Dumb hack to fix a bizarre sizing bug
- var docWidth = $wrap.outerWidth(),
- docHeight = $wrap.outerHeight();
+ var pixelRatio = 1;
+ if (window.devicePixelRatio) {
+ pixelRatio = window.devicePixelRatio;
+ }
+
+ var docWidth = Math.floor($wrap.outerWidth() * pixelRatio),
+ docHeight = Math.floor($wrap.outerHeight() * pixelRatio);
if (posY + docHeight > map.size.y) { //Is the bottom edge below the window? Snap it up if so
posY = (posY - docHeight) - realIconSize - tooltip.padding;
diff --git a/code/modules/vchat/vchat_client.dm b/code/modules/vchat/vchat_client.dm
index a918c94cde..7520b41abb 100644
--- a/code/modules/vchat/vchat_client.dm
+++ b/code/modules/vchat/vchat_client.dm
@@ -161,6 +161,7 @@ GLOBAL_DATUM_INIT(iconCache, /savefile, new("data/iconCache.sav")) //Cache of ic
update_vis()
spawn()
+ if(owner.is_preference_enabled(/datum/client_preference/vchat_enable))
tgui_alert_async(owner,"VChat didn't load after some time. Switching to use oldchat as a fallback. Try using 'Reload VChat' verb in OOC verbs, or reconnecting to try again.")
//Provide the JS with who we are
diff --git a/code/modules/vore/eating/belly_obj_vr.dm b/code/modules/vore/eating/belly_obj_vr.dm
index 554dac57f1..6ebda2446b 100644
--- a/code/modules/vore/eating/belly_obj_vr.dm
+++ b/code/modules/vore/eating/belly_obj_vr.dm
@@ -30,6 +30,7 @@
var/escapechance = 0 // % Chance of prey beginning to escape if prey struggles.
var/transferchance = 0 // % Chance of prey being trasnsfered, goes from 0-100%
var/transferchance_secondary = 0 // % Chance of prey being transfered to transferchance_secondary, also goes 0-100%
+ var/save_digest_mode = TRUE // Whether this belly's digest mode persists across rounds
var/can_taste = FALSE // If this belly prints the flavor of prey when it eats someone.
var/bulge_size = 0.25 // The minimum size the prey has to be in order to show up on examine.
var/display_absorbed_examine = FALSE // Do we display absorption examine messages for this belly at all?
@@ -157,61 +158,67 @@
//For serialization, keep this updated, required for bellies to save correctly.
/obj/belly/vars_to_save()
- return ..() + list(
- "name",
- "desc",
- "absorbed_desc",
- "vore_sound",
- "vore_verb",
- "human_prey_swallow_time",
- "nonhuman_prey_swallow_time",
- "emote_time",
- "nutrition_percent",
- "digest_brute",
- "digest_burn",
- "digest_oxy",
- "immutable",
- "can_taste",
- "escapable",
- "escapetime",
- "digestchance",
- "absorbchance",
- "escapechance",
- "transferchance",
- "transferchance_secondary",
- "transferlocation",
- "transferlocation_secondary",
- "bulge_size",
- "display_absorbed_examine",
- "shrink_grow_size",
- "struggle_messages_outside",
- "struggle_messages_inside",
- "absorbed_struggle_messages_outside",
- "absorbed_struggle_messages_inside",
- "digest_messages_owner",
- "digest_messages_prey",
- "absorb_messages_owner",
- "absorb_messages_prey",
- "unabsorb_messages_owner",
- "unabsorb_messages_prey",
- "examine_messages",
- "examine_messages_absorbed",
- "emote_lists",
- "emote_time",
- "emote_active",
- "mode_flags",
- "item_digest_mode",
- "contaminates",
- "contamination_flavor",
- "contamination_color",
- "release_sound",
- "fancy_vore",
- "is_wet",
- "wet_loop",
- "belly_fullscreen",
- "disable_hud",
- "egg_type"
- )
+ var/list/saving = list(
+ "name",
+ "desc",
+ "absorbed_desc",
+ "vore_sound",
+ "vore_verb",
+ "human_prey_swallow_time",
+ "nonhuman_prey_swallow_time",
+ "emote_time",
+ "nutrition_percent",
+ "digest_brute",
+ "digest_burn",
+ "digest_oxy",
+ "immutable",
+ "can_taste",
+ "escapable",
+ "escapetime",
+ "digestchance",
+ "absorbchance",
+ "escapechance",
+ "transferchance",
+ "transferchance_secondary",
+ "transferlocation",
+ "transferlocation_secondary",
+ "bulge_size",
+ "display_absorbed_examine",
+ "shrink_grow_size",
+ "struggle_messages_outside",
+ "struggle_messages_inside",
+ "absorbed_struggle_messages_outside",
+ "absorbed_struggle_messages_inside",
+ "digest_messages_owner",
+ "digest_messages_prey",
+ "absorb_messages_owner",
+ "absorb_messages_prey",
+ "unabsorb_messages_owner",
+ "unabsorb_messages_prey",
+ "examine_messages",
+ "examine_messages_absorbed",
+ "emote_lists",
+ "emote_time",
+ "emote_active",
+ "mode_flags",
+ "item_digest_mode",
+ "contaminates",
+ "contamination_flavor",
+ "contamination_color",
+ "release_sound",
+ "fancy_vore",
+ "is_wet",
+ "wet_loop",
+ "belly_fullscreen",
+ "disable_hud",
+ "egg_type",
+ "save_digest_mode"
+ )
+
+ if (save_digest_mode == 1)
+ return ..() + saving + list("digest_mode")
+
+ return ..() + saving
/obj/belly/Initialize()
. = ..()
@@ -335,7 +342,7 @@
owner.update_icons()
//Print notifications/sound if necessary
- if(!silent)
+ if(!silent && count)
owner.visible_message("[owner] expels everything from their [lowertext(name)]!")
var/soundfile
if(!fancy_vore)
@@ -371,6 +378,9 @@
slip.slip_protect = world.time + 25 // This is to prevent slipping back into your pred if they stand on soap or something.
//Place them into our drop_location
M.forceMove(drop_location())
+ if(ismob(M))
+ var/mob/ourmob = M
+ ourmob.reset_view(null)
items_preserved -= M
//Special treatment for absorbed prey
@@ -409,6 +419,10 @@
soundfile = fancy_release_sounds[release_sound]
if(soundfile)
playsound(src, soundfile, vol = 100, vary = 1, falloff = VORE_SOUND_FALLOFF, preference = /datum/client_preference/eating_noises, volume_channel = VOLUME_CHANNEL_VORE)
+ //Should fix your view not following you out of mobs sometimes!
+ if(ismob(M))
+ var/mob/ourmob = M
+ ourmob.reset_view(null)
return 1
@@ -422,6 +436,9 @@
prey.buckled.unbuckle_mob()
prey.forceMove(src)
+ if(ismob(prey))
+ var/mob/ourmob = prey
+ ourmob.reset_view(owner)
owner.updateVRPanel()
if(isanimal(owner))
owner.update_icon()
@@ -716,6 +733,10 @@
if(M.loc != src)
M.forceMove(src)
+ if(ismob(M))
+ var/mob/ourmob = M
+ ourmob.reset_view(owner)
+
//Seek out absorbed prey of the prey, absorb them too.
//This in particular will recurse oddly because if there is absorbed prey of prey of prey...
//it will just move them up one belly. This should never happen though since... when they were
@@ -1026,6 +1047,9 @@
if(!(content in src) || !istype(target))
return
content.forceMove(target)
+ if(ismob(content))
+ var/mob/ourmob = content
+ ourmob.reset_view(owner)
if(isitem(content))
var/obj/item/I = content
if(istype(I,/obj/item/weapon/card/id))
@@ -1101,6 +1125,7 @@
dupe.egg_type = egg_type
dupe.emote_time = emote_time
dupe.emote_active = emote_active
+ dupe.save_digest_mode = save_digest_mode
//// Object-holding variables
//struggle_messages_outside - strings
diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm
index fdaca89429..d0acc9614f 100644
--- a/code/modules/vore/eating/living_vr.dm
+++ b/code/modules/vore/eating/living_vr.dm
@@ -234,6 +234,7 @@
P.vore_taste = src.vore_taste
P.vore_smell = src.vore_smell
P.permit_healbelly = src.permit_healbelly
+ P.noisy = src.noisy
P.show_vore_fx = src.show_vore_fx
P.can_be_drop_prey = src.can_be_drop_prey
P.can_be_drop_pred = src.can_be_drop_pred
@@ -273,6 +274,7 @@
vore_taste = P.vore_taste
vore_smell = P.vore_smell
permit_healbelly = P.permit_healbelly
+ noisy = P.noisy
show_vore_fx = P.show_vore_fx
can_be_drop_prey = P.can_be_drop_prey
can_be_drop_pred = P.can_be_drop_pred
@@ -678,6 +680,13 @@
to_chat(src, "You are not allowed to eat this.")
return
+ if(istype(I, /obj/item/device/paicard))
+ var/obj/item/device/paicard/palcard = I
+ var/mob/living/silicon/pai/pocketpal = palcard.pai
+ if(!pocketpal.devourable)
+ to_chat(src, "\The [pocketpal] doesn't allow you to eat it.")
+ return
+
if(is_type_in_list(I,edible_trash) | adminbus_trash)
if(I.hidden_uplink)
to_chat(src, "You really should not be eating this.")
@@ -1053,9 +1062,13 @@
if(!screen_icon)
screen_icon = new()
RegisterSignal(screen_icon, COMSIG_CLICK, .proc/vore_panel_click)
- screen_icon.icon = HUD.ui_style
- screen_icon.color = HUD.ui_color
- screen_icon.alpha = HUD.ui_alpha
+ if(ispAI(user))
+ screen_icon.icon = 'icons/mob/pai_hud.dmi'
+ screen_icon.screen_loc = ui_acti
+ else
+ screen_icon.icon = HUD.ui_style
+ screen_icon.color = HUD.ui_color
+ screen_icon.alpha = HUD.ui_alpha
LAZYADD(HUD.other_important, screen_icon)
user.client?.screen += screen_icon
diff --git a/code/modules/vore/eating/vore_vr.dm b/code/modules/vore/eating/vore_vr.dm
index bbb26b7e3c..a1668e0482 100644
--- a/code/modules/vore/eating/vore_vr.dm
+++ b/code/modules/vore/eating/vore_vr.dm
@@ -54,6 +54,7 @@ V::::::V V::::::VO:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEE
var/digest_leave_remains = FALSE
var/allowmobvore = TRUE
var/permit_healbelly = TRUE
+ var/noisy = FALSE
// These are 'modifier' prefs, do nothing on their own but pair with drop_prey/drop_pred settings.
var/drop_vore = TRUE
@@ -140,6 +141,7 @@ V::::::V V::::::VO:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEE
vore_taste = json_from_file["vore_taste"]
vore_smell = json_from_file["vore_smell"]
permit_healbelly = json_from_file["permit_healbelly"]
+ noisy = json_from_file["noisy"]
show_vore_fx = json_from_file["show_vore_fx"]
can_be_drop_prey = json_from_file["can_be_drop_prey"]
can_be_drop_pred = json_from_file["can_be_drop_pred"]
@@ -169,6 +171,8 @@ V::::::V V::::::VO:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEE
allowmobvore = TRUE
if(isnull(permit_healbelly))
permit_healbelly = TRUE
+ if (isnull(noisy))
+ noisy = FALSE
if(isnull(show_vore_fx))
show_vore_fx = TRUE
if(isnull(can_be_drop_prey))
@@ -211,6 +215,7 @@ V::::::V V::::::VO:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEE
"vore_taste" = vore_taste,
"vore_smell" = vore_smell,
"permit_healbelly" = permit_healbelly,
+ "noisy" = noisy,
"show_vore_fx" = show_vore_fx,
"can_be_drop_prey" = can_be_drop_prey,
"can_be_drop_pred" = can_be_drop_pred,
diff --git a/code/modules/vore/eating/vorepanel_vr.dm b/code/modules/vore/eating/vorepanel_vr.dm
index a84bbd4526..471d2fca03 100644
--- a/code/modules/vore/eating/vorepanel_vr.dm
+++ b/code/modules/vore/eating/vorepanel_vr.dm
@@ -176,6 +176,7 @@
"digest_burn" = selected.digest_burn,
"digest_oxy" = selected.digest_oxy,
"bulge_size" = selected.bulge_size,
+ "save_digest_mode" = selected.save_digest_mode,
"display_absorbed_examine" = selected.display_absorbed_examine,
"shrink_grow_size" = selected.shrink_grow_size,
"emote_time" = selected.emote_time,
@@ -1074,6 +1075,9 @@
if("b_disable_hud")
host.vore_selected.disable_hud = !host.vore_selected.disable_hud
. = TRUE
+ if("b_save_digest_mode")
+ host.vore_selected.save_digest_mode = !host.vore_selected.save_digest_mode
+ . = TRUE
if("b_del")
var/alert = tgui_alert(usr, "Are you sure you want to delete your [lowertext(host.vore_selected.name)]?","Confirmation",list("Cancel","Delete"))
if(!(alert == "Delete"))
diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm
index 09d2902a12..bb8666908e 100644
--- a/code/modules/vore/fluffstuff/custom_items_vr.dm
+++ b/code/modules/vore/fluffstuff/custom_items_vr.dm
@@ -638,34 +638,6 @@
desc = "An elaborately made custom walking stick with a dark wooding core, a crimson red gemstone on its head and a steel cover around the bottom. you'd probably hear someone using this down the hall."
icon = 'icons/vore/custom_items_vr.dmi'
-//Stobarico - Alexis Bloise
-/obj/item/weapon/cane/wand
- name = "Ancient wand"
- desc = "A really old looking wand with floating parts and cyan crystals, wich seem to radiate a cyan glow. The wand has a golden plaque on the side that would say Corncobble, but it is covered by a sticker saying Bloise."
- icon = 'icons/vore/custom_items_vr.dmi'
- icon_state = "alexiswand"
- item_icons = list (slot_r_hand_str = 'icons/vore/custom_items_vr.dmi', slot_l_hand_str = 'icons/vore/custom_items_vr.dmi')
- item_state_slots = list(slot_r_hand_str = "alexiswandmob_r", slot_l_hand_str = "alexiswandmob_l")
- force = 1.0
- throwforce = 2.0
- w_class = ITEMSIZE_SMALL
- matter = list(MAT_STEEL = 50)
- attack_verb = list("sparkled", "whacked", "twinkled", "radiated", "dazzled", "zapped")
- hitsound = 'sound/weapons/sparkle.ogg'
- var/last_use = 0
- var/cooldown = 30
-
-/obj/item/weapon/cane/wand/attack_self(mob/user)
- if(last_use + cooldown >= world.time)
- return
- playsound(src, 'sound/weapons/sparkle.ogg', 50, 1)
- user.visible_message(" [user] swings their wand.")
- var/datum/effect/effect/system/spark_spread/s = new
- s.set_up(3, 1, src)
- s.start()
- last_use = world.time
- qdel ()
-
/obj/item/device/fluff/id_kit_ivy
name = "Holo-ID reprinter"
desc = "Stick your ID in one end and it'll print a new ID out the other!"
@@ -1505,3 +1477,12 @@
nano_printer = new/obj/item/weapon/computer_hardware/nano_printer(src)
battery_module = new/obj/item/weapon/computer_hardware/battery_module(src)
battery_module.charge_to_full()
+
+
+//Stobarico - Kyu Comet
+/obj/item/instrument/piano_synth/fluff/kyutar
+ name = "Kyu's Custom Instrument"
+ desc = "A pastel pink guitar-like instrument with a body resembling a smug cat face. It seems to have a few different parts from a regular stringed instrument, including the lack of any strings, and the hand looking like a small screen, which connects to a small array of projectors."
+ icon = 'icons/vore/custom_items_vr.dmi'
+ item_icons = list(slot_l_hand_str = 'icons/vore/custom_items_left_hand_vr.dmi', slot_r_hand_str = 'icons/vore/custom_items_right_hand_vr.dmi')
+ icon_state = "kyuholotar"
diff --git a/code/modules/vore/resizing/resize_vr.dm b/code/modules/vore/resizing/resize_vr.dm
index b82ecb07e7..dd131ffca3 100644
--- a/code/modules/vore/resizing/resize_vr.dm
+++ b/code/modules/vore/resizing/resize_vr.dm
@@ -113,8 +113,6 @@
/mob/living/carbon/human/resize(var/new_size, var/animate = TRUE, var/uncapped = FALSE, var/ignore_prefs = FALSE, var/aura_animation = TRUE)
if(!resizable && !ignore_prefs)
return 1
- if(species)
- vis_height = species.icon_height
. = ..()
if(LAZYLEN(hud_list) && has_huds)
var/new_y_offset = vis_height * (size_multiplier - 1)
@@ -147,8 +145,8 @@
resize(new_size/100, uncapped = has_large_resize_bounds(), ignore_prefs = TRUE)
// I'm not entirely convinced that `src ? ADMIN_JMP(src) : "null"` here does anything
// but just in case it does, I'm leaving the null-src checking
- message_admins("[key_name(src)] used the resize command in-game to be [new_size]% size. [src ? ADMIN_JMP(src) : "null"]")
-
+ log_admin("[key_name(src)] used the resize command in-game to be [new_size]% size. [src ? ADMIN_JMP(src) : "null"]")
+
/*
//Add the set_size() proc to usable verbs. By commenting this out, we can leave the proc and hand it to species that need it.
/hook/living_new/proc/resize_setup(mob/living/H)
diff --git a/icons/_nanomaps/gb1.png b/icons/_nanomaps/gb1.png
new file mode 100644
index 0000000000..8c3ac8f2db
Binary files /dev/null and b/icons/_nanomaps/gb1.png differ
diff --git a/icons/_nanomaps/gb2.png b/icons/_nanomaps/gb2.png
new file mode 100644
index 0000000000..63277ea186
Binary files /dev/null and b/icons/_nanomaps/gb2.png differ
diff --git a/icons/_nanomaps/gb3.png b/icons/_nanomaps/gb3.png
new file mode 100644
index 0000000000..2ad403f15e
Binary files /dev/null and b/icons/_nanomaps/gb3.png differ
diff --git a/icons/_nanomaps/gbeast.png b/icons/_nanomaps/gbeast.png
new file mode 100644
index 0000000000..2f6f110f42
Binary files /dev/null and b/icons/_nanomaps/gbeast.png differ
diff --git a/icons/_nanomaps/gbmining.png b/icons/_nanomaps/gbmining.png
new file mode 100644
index 0000000000..769d080980
Binary files /dev/null and b/icons/_nanomaps/gbmining.png differ
diff --git a/icons/_nanomaps/gbnorth.png b/icons/_nanomaps/gbnorth.png
new file mode 100644
index 0000000000..5b4f03662e
Binary files /dev/null and b/icons/_nanomaps/gbnorth.png differ
diff --git a/icons/_nanomaps/gbsouth.png b/icons/_nanomaps/gbsouth.png
new file mode 100644
index 0000000000..1a3a1b22e3
Binary files /dev/null and b/icons/_nanomaps/gbsouth.png differ
diff --git a/icons/_nanomaps/gbwest.png b/icons/_nanomaps/gbwest.png
new file mode 100644
index 0000000000..d19c3019a8
Binary files /dev/null and b/icons/_nanomaps/gbwest.png differ
diff --git a/icons/_nanomaps/tether_nanomap_z1.png b/icons/_nanomaps/tether_nanomap_z1.png
index a2ef4f92e0..2cf0c71d84 100644
Binary files a/icons/_nanomaps/tether_nanomap_z1.png and b/icons/_nanomaps/tether_nanomap_z1.png differ
diff --git a/icons/_nanomaps/tether_nanomap_z2.png b/icons/_nanomaps/tether_nanomap_z2.png
index 5f1eacdb19..53492f77ee 100644
Binary files a/icons/_nanomaps/tether_nanomap_z2.png and b/icons/_nanomaps/tether_nanomap_z2.png differ
diff --git a/icons/_nanomaps/tether_nanomap_z3.png b/icons/_nanomaps/tether_nanomap_z3.png
index b6d0eed70d..53888984ca 100644
Binary files a/icons/_nanomaps/tether_nanomap_z3.png and b/icons/_nanomaps/tether_nanomap_z3.png differ
diff --git a/icons/_nanomaps/tether_nanomap_z4.png b/icons/_nanomaps/tether_nanomap_z4.png
index c2623219ee..510d22b3d6 100644
Binary files a/icons/_nanomaps/tether_nanomap_z4.png and b/icons/_nanomaps/tether_nanomap_z4.png differ
diff --git a/icons/inventory/head/mob_vox.dmi b/icons/inventory/head/mob_vox.dmi
index 346ea9b7d1..f1570089c8 100644
Binary files a/icons/inventory/head/mob_vox.dmi and b/icons/inventory/head/mob_vox.dmi differ
diff --git a/icons/mob/animal.dmi b/icons/mob/animal.dmi
index def737dcc3..2cb35cf667 100644
Binary files a/icons/mob/animal.dmi and b/icons/mob/animal.dmi differ
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
new file mode 100644
index 0000000000..3e8d60a579
Binary files /dev/null and b/icons/mob/head.dmi differ
diff --git a/icons/mob/pai_hud.dmi b/icons/mob/pai_hud.dmi
new file mode 100644
index 0000000000..c1be3ab314
Binary files /dev/null and b/icons/mob/pai_hud.dmi differ
diff --git a/icons/mob/pai_vr.dmi b/icons/mob/pai_vr.dmi
index 0b8b985ff7..859cfc7116 100644
Binary files a/icons/mob/pai_vr.dmi and b/icons/mob/pai_vr.dmi differ
diff --git a/icons/mob/pai_vr64x64.dmi b/icons/mob/pai_vr64x64.dmi
index f9c99e51eb..d19f5137df 100644
Binary files a/icons/mob/pai_vr64x64.dmi and b/icons/mob/pai_vr64x64.dmi differ
diff --git a/icons/mob/species/teshari/head.dmi b/icons/mob/species/teshari/head.dmi
index 0bb0637c4e..6cf6b2ac7d 100644
Binary files a/icons/mob/species/teshari/head.dmi and b/icons/mob/species/teshari/head.dmi differ
diff --git a/icons/mob/taursuits_horse.dmi b/icons/mob/taursuits_horse.dmi
index 192f282796..4986bed14f 100644
Binary files a/icons/mob/taursuits_horse.dmi and b/icons/mob/taursuits_horse.dmi differ
diff --git a/icons/mob/taursuits_horse_vr.dmi b/icons/mob/taursuits_horse_vr.dmi
index 192f282796..4986bed14f 100644
Binary files a/icons/mob/taursuits_horse_vr.dmi and b/icons/mob/taursuits_horse_vr.dmi differ
diff --git a/icons/mob/vore/ears_vr.dmi b/icons/mob/vore/ears_vr.dmi
index 032ba8e4fa..4bde02b8bf 100644
Binary files a/icons/mob/vore/ears_vr.dmi and b/icons/mob/vore/ears_vr.dmi differ
diff --git a/icons/mob/vore/taurs_vr.dmi b/icons/mob/vore/taurs_vr.dmi
index d10b18cb04..20ddaee2a4 100644
Binary files a/icons/mob/vore/taurs_vr.dmi and b/icons/mob/vore/taurs_vr.dmi differ
diff --git a/icons/obj/cooking_machines.dmi b/icons/obj/cooking_machines.dmi
index 4009cb6224..b8c3ea6f5d 100644
Binary files a/icons/obj/cooking_machines.dmi and b/icons/obj/cooking_machines.dmi differ
diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi
index 915c170551..f1637aca4b 100644
Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ
diff --git a/icons/obj/paicard.dmi b/icons/obj/paicard.dmi
new file mode 100644
index 0000000000..c69ead6efd
Binary files /dev/null and b/icons/obj/paicard.dmi differ
diff --git a/icons/obj/pda.dmi b/icons/obj/pda.dmi
index 9aa94d1fe9..f98d60b5bd 100644
Binary files a/icons/obj/pda.dmi and b/icons/obj/pda.dmi differ
diff --git a/icons/obj/playing_cards.dmi b/icons/obj/playing_cards.dmi
index 071d53b04b..0f2e51923a 100644
Binary files a/icons/obj/playing_cards.dmi and b/icons/obj/playing_cards.dmi differ
diff --git a/icons/vore/custom_items_left_hand_vr.dmi b/icons/vore/custom_items_left_hand_vr.dmi
index 1ee6c0a336..a9abdac0c3 100644
Binary files a/icons/vore/custom_items_left_hand_vr.dmi and b/icons/vore/custom_items_left_hand_vr.dmi differ
diff --git a/icons/vore/custom_items_right_hand_vr.dmi b/icons/vore/custom_items_right_hand_vr.dmi
index a6e419e2ed..130ac35689 100644
Binary files a/icons/vore/custom_items_right_hand_vr.dmi and b/icons/vore/custom_items_right_hand_vr.dmi differ
diff --git a/icons/vore/custom_items_vr.dmi b/icons/vore/custom_items_vr.dmi
index c83155640c..1f3fb6cea7 100644
Binary files a/icons/vore/custom_items_vr.dmi and b/icons/vore/custom_items_vr.dmi differ
diff --git a/maps/atoll/atoll.dmm b/maps/atoll/atoll.dmm
new file mode 100644
index 0000000000..55567d90fd
--- /dev/null
+++ b/maps/atoll/atoll.dmm
@@ -0,0 +1,397 @@
+"aa" = (/obj/effect/floor_decal/atoll{icon_state = "mural"; dir = 1},/obj/machinery/gateway{dir = 9},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"ab" = (/obj/effect/floor_decal/atoll/border/invert{icon_state = "border_invert"; dir = 4},/obj/effect/floor_decal/atoll/border/invert{icon_state = "border_invert"; dir = 1},/obj/machinery/gateway{dir = 1},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"ac" = (/obj/effect/floor_decal/atoll{icon_state = "mural"; dir = 8},/obj/machinery/gateway{dir = 5},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"ad" = (/obj/effect/floor_decal/atoll{icon_state = "mural"; dir = 8},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"ae" = (/obj/effect/floor_decal/atoll{icon_state = "mural"; dir = 1},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"af" = (/obj/effect/floor_decal/atoll{icon_state = "mural"; dir = 4},/obj/machinery/gateway{dir = 8},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"ag" = (/obj/effect/floor_decal/atoll/moss/random,/turf/simulated/floor/atoll,/area/gateway/atoll)
+"ah" = (/obj/effect/floor_decal/atoll,/turf/simulated/floor/atoll,/area/gateway/atoll)
+"ai" = (/obj/effect/floor_decal/atoll{icon_state = "mural"; dir = 4},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"aj" = (/obj/structure/flora/moss,/obj/structure/railing/overhang/waterless{icon_state = "wbronze_railing0"; dir = 1},/turf/simulated/floor/atoll/vertical,/area/gateway/atoll)
+"ak" = (/obj/structure/railing/overhang/waterless{icon_state = "wbronze_railing0"; dir = 1},/turf/simulated/floor/atoll/vertical,/area/gateway/atoll)
+"al" = (/turf/simulated/floor/atoll/vertical,/area/gateway/atoll)
+"am" = (/turf/simulated/floor/atoll,/area/gateway/atoll)
+"an" = (/turf/simulated/floor/water/atoll,/area/gateway/atoll)
+"ao" = (/obj/structure/railing/overhang/waterless,/turf/simulated/floor/water/atoll,/area/gateway/atoll)
+"ap" = (/obj/effect/decal/shadow,/turf/simulated/floor/atoll/vertical,/area/gateway/atoll)
+"aq" = (/obj/structure/railing/overhang,/turf/simulated/floor/water/atoll,/area/gateway/atoll)
+"ar" = (/obj/structure/railing/overhang/waterless{icon_state = "wbronze_railing0"; dir = 4},/turf/simulated/floor/water/atoll,/area/gateway/atoll)
+"as" = (/obj/structure/bed/chair/sofa/bench/marble,/turf/simulated/floor/atoll,/area/gateway/atoll)
+"at" = (/obj/structure/railing/overhang/waterless{icon_state = "wbronze_railing0"; dir = 8},/turf/simulated/floor/water/atoll,/area/gateway/atoll)
+"au" = (/obj/effect/decal/shadow{icon_state = "wall_shadow"; dir = 1},/turf/simulated/floor/atoll/vertical,/area/gateway/atoll)
+"av" = (/obj/structure/railing/overhang{icon_state = "bronze_railing0"; dir = 4},/turf/simulated/floor/water/atoll,/area/gateway/atoll)
+"aw" = (/obj/structure/lightpost/atoll,/turf/simulated/floor/atoll,/area/gateway/atoll)
+"ax" = (/obj/structure/railing/overhang{icon_state = "bronze_railing0"; dir = 8},/turf/simulated/floor/water/atoll,/area/gateway/atoll)
+"ay" = (/obj/structure/flora/moss{icon_state = "moss"; dir = 8},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"az" = (/obj/effect/decal/shadow{icon_state = "wall_shadow"; dir = 4},/turf/simulated/floor/atoll/vertical,/area/gateway/atoll)
+"aA" = (/obj/effect/decal/shadow/silhouette/pillar{icon_state = "silhouette_p"; dir = 1},/obj/structure/railing/overhang{icon_state = "bronze_railing0"; dir = 1},/turf/simulated/floor/water/atoll,/area/gateway/atoll)
+"aB" = (/obj/machinery/gateway/centerstation,/turf/simulated/floor/atoll,/area/gateway/atoll)
+"aC" = (/obj/effect/blocker,/turf/simulated/floor/water/atoll,/area/gateway/atoll)
+"aD" = (/obj/effect/blocker,/obj/structure/railing/overhang/waterless{icon_state = "wbronze_railing0"; dir = 4},/turf/simulated/floor/water/atoll,/area/gateway/atoll)
+"aE" = (/obj/effect/blocker,/obj/effect/floor_decal/atoll/moss/random,/turf/simulated/floor/atoll,/area/gateway/atoll)
+"aF" = (/obj/effect/blocker,/turf/simulated/floor/atoll,/area/gateway/atoll)
+"aG" = (/obj/effect/blocker,/obj/structure/railing/overhang/waterless{icon_state = "wbronze_railing0"; dir = 8},/turf/simulated/floor/water/atoll,/area/gateway/atoll)
+"aH" = (/obj/effect/blocker,/obj/effect/decal/shadow{icon_state = "wall_shadow"; dir = 8},/turf/simulated/floor/atoll/vertical,/area/gateway/atoll)
+"aI" = (/obj/effect/blocker,/obj/structure/railing/overhang/waterless,/turf/simulated/floor/water/atoll,/area/gateway/atoll)
+"aJ" = (/obj/effect/blocker,/obj/effect/decal/shadow{icon_state = "wall_shadow"; dir = 4},/turf/simulated/floor/atoll/vertical,/area/gateway/atoll)
+"aK" = (/obj/effect/blocker,/obj/structure/railing/overhang/waterless{icon_state = "wbronze_railing0"; dir = 1},/turf/simulated/floor/atoll/vertical,/area/gateway/atoll)
+"aL" = (/obj/effect/blocker,/turf/simulated/floor/atoll/vertical,/area/gateway/atoll)
+"aM" = (/obj/effect/blocker,/obj/structure/flora/moss{icon_state = "moss"; dir = 8},/turf/simulated/floor/atoll/vertical,/area/gateway/atoll)
+"aN" = (/obj/effect/blocker,/obj/structure/flora/moss,/turf/simulated/floor/atoll/vertical,/area/gateway/atoll)
+"aO" = (/obj/effect/decal/shadow/silhouette,/turf/simulated/floor/water/atoll,/area/gateway/atoll)
+"aP" = (/obj/effect/floor_decal/atoll{icon_state = "mural"; dir = 4},/obj/structure/bed/chair/sofa/bench/marble{dir = 4},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"aQ" = (/obj/effect/floor_decal/atoll/border{icon_state = "border"; dir = 9},/obj/effect/floor_decal/atoll/bronze,/turf/simulated/floor/atoll,/area/gateway/atoll)
+"aR" = (/obj/effect/floor_decal/atoll/border,/obj/effect/floor_decal/atoll/bronze,/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 8},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"aS" = (/obj/effect/floor_decal/atoll/border{icon_state = "border"; dir = 5},/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 8},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"aT" = (/obj/effect/floor_decal/atoll,/obj/structure/bed/chair/sofa/bench/marble{icon_state = "bench"; dir = 8},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"aU" = (/obj/effect/decal/shadow{icon_state = "wall_shadow"; dir = 8},/turf/simulated/floor/atoll/vertical,/area/gateway/atoll)
+"aV" = (/obj/structure/flora/lily2,/turf/simulated/floor/water/atoll,/area/gateway/atoll)
+"aW" = (/obj/structure/flora/moss{icon_state = "moss"; dir = 1},/turf/simulated/floor/atoll/vertical,/area/gateway/atoll)
+"aX" = (/obj/effect/decal/shadow/silhouette{icon_state = "silhouette"; dir = 1},/turf/simulated/floor/water/atoll,/area/gateway/atoll)
+"aY" = (/obj/effect/floor_decal/atoll/border{icon_state = "border"; dir = 9},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"aZ" = (/obj/effect/floor_decal/atoll/bronze,/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 4},/obj/effect/floor_decal/atoll/border/invert{icon_state = "border_invert"; dir = 1},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"ba" = (/obj/structure/flora/lily2,/obj/structure/railing/overhang{icon_state = "bronze_railing0"; dir = 8},/obj/structure/railing/overhang{icon_state = "bronze_railing0"; dir = 1},/turf/simulated/floor/water/atoll,/area/gateway/atoll)
+"bb" = (/obj/structure/railing/overhang{icon_state = "bronze_railing0"; dir = 1},/turf/simulated/floor/water/atoll,/area/gateway/atoll)
+"bc" = (/obj/structure/railing/overhang{icon_state = "bronze_railing0"; dir = 1},/obj/structure/railing/overhang{icon_state = "bronze_railing0"; dir = 4},/turf/simulated/floor/water/atoll,/area/gateway/atoll)
+"bd" = (/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 1},/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 8},/obj/effect/floor_decal/atoll/border/invert{icon_state = "border_invert"; dir = 4},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"be" = (/obj/effect/floor_decal/atoll/border{icon_state = "border"; dir = 5},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"bf" = (/obj/effect/floor_decal/atoll/border{icon_state = "border"; dir = 8},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"bg" = (/obj/effect/floor_decal/atoll/bronze,/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 4},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"bh" = (/obj/structure/railing/overhang,/obj/structure/railing/overhang{icon_state = "bronze_railing0"; dir = 8},/turf/simulated/floor/water/atoll,/area/gateway/atoll)
+"bi" = (/obj/structure/flora/lily3,/obj/structure/railing/overhang,/turf/simulated/floor/water/atoll,/area/gateway/atoll)
+"bj" = (/obj/structure/railing/overhang,/obj/structure/railing/overhang{icon_state = "bronze_railing0"; dir = 4},/turf/simulated/floor/water/atoll,/area/gateway/atoll)
+"bk" = (/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 1},/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 8},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"bl" = (/obj/effect/floor_decal/atoll/border{icon_state = "border"; dir = 4},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"bm" = (/obj/structure/flora/lily3,/turf/simulated/floor/water/atoll,/area/gateway/atoll)
+"bn" = (/obj/effect/floor_decal/atoll/border{icon_state = "border"; dir = 10},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"bo" = (/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 4},/obj/effect/floor_decal/atoll/border/invert{icon_state = "border_invert"; dir = 8},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"bp" = (/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 1},/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 4},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"bq" = (/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 1},/obj/effect/floor_decal/atoll/border/invert,/turf/simulated/floor/atoll,/area/gateway/atoll)
+"br" = (/obj/effect/floor_decal/atoll/border{icon_state = "border"; dir = 6},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"bs" = (/obj/structure/flora/lily1,/turf/simulated/floor/water/atoll,/area/gateway/atoll)
+"bt" = (/obj/structure/flora/moss{icon_state = "moss"; dir = 8},/turf/simulated/floor/atoll/vertical,/area/gateway/atoll)
+"bu" = (/obj/effect/floor_decal/atoll{icon_state = "mural"; dir = 1},/obj/structure/bed/chair/sofa/bench/marble{dir = 4},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"bv" = (/obj/effect/floor_decal/atoll/border{icon_state = "border"; dir = 10},/obj/effect/floor_decal/atoll/moss/random,/turf/simulated/floor/atoll,/area/gateway/atoll)
+"bw" = (/obj/effect/floor_decal/atoll/border{icon_state = "border"; dir = 1},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"bx" = (/obj/effect/floor_decal/atoll/border/invert,/obj/effect/floor_decal/atoll/border/invert{icon_state = "border_invert"; dir = 8},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"by" = (/obj/effect/floor_decal/atoll/moss/random,/obj/effect/floor_decal/atoll/border/invert,/obj/effect/floor_decal/atoll/border/invert{icon_state = "border_invert"; dir = 8},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"bz" = (/obj/effect/floor_decal/atoll{icon_state = "mural"; dir = 8},/obj/structure/bed/chair/sofa/bench/marble{icon_state = "bench"; dir = 8},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"bA" = (/obj/effect/decal/shadow,/obj/structure/railing/overhang/waterless{icon_state = "wbronze_railing0"; dir = 1},/turf/simulated/floor/atoll/vertical,/area/gateway/atoll)
+"bB" = (/obj/effect/floor_decal/atoll/stairs,/obj/effect/decal/shadow,/turf/simulated/floor/atoll,/area/gateway/atoll)
+"bC" = (/obj/structure/flora/moss{icon_state = "moss"; dir = 4},/turf/simulated/floor/atoll/vertical,/area/gateway/atoll)
+"bD" = (/obj/structure/flora/moss{icon_state = "moss"; dir = 1},/turf/simulated/floor/water/atoll,/area/gateway/atoll)
+"bE" = (/obj/effect/decal/shadow{icon_state = "wall_shadow"; dir = 1},/obj/structure/flora/moss{icon_state = "moss"; dir = 4},/turf/simulated/floor/atoll/vertical,/area/gateway/atoll)
+"bF" = (/obj/effect/floor_decal/atoll/stairs,/obj/effect/decal/shadow{icon_state = "wall_shadow"; dir = 1},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"bG" = (/obj/effect/decal/shadow{icon_state = "wall_shadow"; dir = 1},/obj/structure/flora/moss{icon_state = "moss"; dir = 1},/turf/simulated/floor/atoll/vertical,/area/gateway/atoll)
+"bH" = (/obj/effect/decal/shadow{icon_state = "wall_shadow"; dir = 1},/obj/structure/flora/moss{icon_state = "moss"; dir = 8},/turf/simulated/floor/atoll/vertical,/area/gateway/atoll)
+"bI" = (/obj/effect/floor_decal/atoll/stairs,/obj/effect/decal/shadow{icon_state = "wall_shadow"; dir = 4},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"bJ" = (/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 9},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"bK" = (/obj/structure/bed/chair/sofa/bench/marble,/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 5},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"bL" = (/obj/effect/decal/shadow/silhouette{icon_state = "silhouette"; dir = 1},/obj/structure/railing/overhang,/turf/simulated/floor/water/atoll,/area/gateway/atoll)
+"bM" = (/obj/structure/flora/lily2,/obj/structure/railing/overhang,/turf/simulated/floor/water/atoll,/area/gateway/atoll)
+"bN" = (/obj/effect/floor_decal/atoll/stairs,/obj/effect/decal/shadow{icon_state = "wall_shadow"; dir = 8},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"bO" = (/obj/structure/flora/moss{icon_state = "moss"; dir = 8},/turf/simulated/floor/water/atoll,/area/gateway/atoll)
+"bP" = (/obj/structure/flora/moss,/turf/simulated/floor/atoll/vertical,/area/gateway/atoll)
+"bQ" = (/obj/structure/flora/log2,/turf/simulated/floor/water/atoll,/area/gateway/atoll)
+"bR" = (/obj/structure/flora/tree/atoll{icon_state = "green"; dir = 4},/obj/effect/floor_decal/atoll/moss/random,/turf/simulated/floor/atoll,/area/gateway/atoll)
+"bS" = (/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 4},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"bT" = (/obj/effect/decal/shadow/floor,/turf/simulated/floor/atoll,/area/gateway/atoll)
+"bU" = (/obj/effect/decal/shadow/floor,/obj/effect/floor_decal/atoll/moss/random,/turf/simulated/floor/atoll,/area/gateway/atoll)
+"bV" = (/obj/effect/decal/shadow/floor,/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 5},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"bW" = (/obj/structure/bed/chair/sofa/bench/marble{dir = 4},/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 1},/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 8},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"bX" = (/obj/structure/bed/chair/sofa/bench/marble{icon_state = "bench"; dir = 8},/obj/effect/floor_decal/atoll/bronze,/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 4},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"bY" = (/obj/structure/flora/tree/atoll{icon_state = "green"; dir = 1},/obj/effect/floor_decal/atoll/moss/random,/turf/simulated/floor/atoll,/area/gateway/atoll)
+"bZ" = (/obj/effect/floor_decal/atoll/moss/random,/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 1},/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 8},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"ca" = (/obj/effect/floor_decal/atoll/bronze,/turf/simulated/floor/atoll,/area/gateway/atoll)
+"cb" = (/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 6},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"cc" = (/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 10},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"cd" = (/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 8},/obj/effect/floor_decal/atoll/bronze,/turf/simulated/floor/atoll,/area/gateway/atoll)
+"ce" = (/obj/effect/floor_decal/atoll/bronze,/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 8},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"cf" = (/obj/structure/bed/chair/sofa/bench/marble{icon_state = "bench"; dir = 1},/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 6},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"cg" = (/obj/structure/railing/overhang{icon_state = "bronze_railing0"; dir = 1},/obj/structure/railing/overhang{icon_state = "bronze_railing0"; dir = 8},/turf/simulated/floor/water/atoll,/area/gateway/atoll)
+"ch" = (/turf/simulated/floor/beach/sand/outdoors/atoll,/area/gateway/atoll)
+"ci" = (/turf/simulated/floor/outdoors/grass/heavy/atoll,/area/gateway/atoll)
+"cj" = (/obj/structure/flora/tree/jungle,/turf/simulated/floor/outdoors/grass/heavy/atoll,/area/gateway/atoll)
+"ck" = (/obj/structure/flora/tree/jungle_small,/turf/simulated/floor/outdoors/grass/heavy/atoll,/area/gateway/atoll)
+"cl" = (/obj/structure/flora/bboulder1,/turf/simulated/floor/outdoors/grass/heavy/atoll,/area/gateway/atoll)
+"cm" = (/obj/structure/flora/log1,/turf/simulated/floor/atoll,/area/gateway/atoll)
+"cn" = (/obj/structure/flora/ausbushes/reedbush,/turf/simulated/floor/outdoors/grass/heavy/atoll,/area/gateway/atoll)
+"co" = (/obj/structure/flora/rocks1,/turf/simulated/floor/outdoors/grass/heavy/atoll,/area/gateway/atoll)
+"cp" = (/obj/structure/flora/rocks2,/turf/simulated/floor/outdoors/grass/heavy/atoll,/area/gateway/atoll)
+"cq" = (/obj/structure/flora/ausbushes/fernybush,/turf/simulated/floor/outdoors/grass/heavy/atoll,/area/gateway/atoll)
+"cr" = (/obj/structure/flora/bboulder2,/turf/simulated/floor/outdoors/grass/heavy/atoll,/area/gateway/atoll)
+"cs" = (/obj/structure/flora/log1,/turf/simulated/floor/beach/sand/outdoors/atoll,/area/gateway/atoll)
+"ct" = (/obj/structure/bed/chair/sofa/bench/marble,/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 9},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"cu" = (/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 1},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"cv" = (/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 8},/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 1},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"cw" = (/obj/effect/step_trigger/teleporter/atoll{teleport_x = 48; teleport_y = 107},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"cx" = (/obj/effect/step_trigger/teleporter/atoll{teleport_x = 33; teleport_y = 107},/obj/effect/floor_decal/atoll/border{icon_state = "border"; dir = 1},/obj/effect/floor_decal/atoll/border,/turf/simulated/floor/atoll,/area/gateway/atoll)
+"cy" = (/obj/structure/flora/ausbushes/palebush,/turf/simulated/floor/outdoors/grass/heavy/atoll,/area/gateway/atoll)
+"cz" = (/obj/structure/flora/tree/atoll{icon_state = "green"; dir = 8},/obj/effect/floor_decal/atoll/moss/random,/turf/simulated/floor/atoll,/area/gateway/atoll)
+"cA" = (/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 4},/obj/effect/floor_decal/atoll/bronze,/turf/simulated/floor/atoll,/area/gateway/atoll)
+"cB" = (/obj/structure/flora/log1,/turf/simulated/floor/outdoors/grass/heavy/atoll,/area/gateway/atoll)
+"cC" = (/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 8},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"cD" = (/obj/structure/bed/chair/sofa/bench/marble{icon_state = "bench"; dir = 1},/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 10},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"cE" = (/obj/effect/floor_decal/atoll/moss/random,/obj/effect/floor_decal/atoll/bronze,/turf/simulated/floor/atoll,/area/gateway/atoll)
+"cF" = (/obj/structure/flora/smallbould,/turf/simulated/floor/outdoors/grass/heavy/atoll,/area/gateway/atoll)
+"cG" = (/obj/structure/flora/ausbushes/pointybush,/turf/simulated/floor/outdoors/grass/heavy/atoll,/area/gateway/atoll)
+"cH" = (/obj/effect/floor_decal/atoll/border/invert{icon_state = "border_invert"; dir = 8},/obj/effect/floor_decal/atoll/border/invert,/turf/simulated/floor/atoll,/area/gateway/atoll)
+"cI" = (/obj/effect/decal/shadow,/obj/structure/flora/moss{icon_state = "moss"; dir = 8},/turf/simulated/floor/atoll/vertical,/area/gateway/atoll)
+"cJ" = (/obj/effect/decal/shadow,/obj/structure/flora/moss{icon_state = "moss"; dir = 1},/turf/simulated/floor/atoll/vertical,/area/gateway/atoll)
+"cK" = (/obj/effect/step_trigger/teleporter/atoll{teleport_x = 62; teleport_y = 103},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"cL" = (/obj/structure/flora/tree/atoll{icon_state = "green"; dir = 4},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"cM" = (/obj/structure/flora/log2,/obj/structure/railing/overhang{icon_state = "bronze_railing0"; dir = 4},/turf/simulated/floor/water/atoll,/area/gateway/atoll)
+"cN" = (/obj/structure/flora/ausbushes/fullgrass,/turf/simulated/floor/outdoors/grass/heavy/atoll,/area/gateway/atoll)
+"cO" = (/obj/structure/flora/tree/atoll{icon_state = "green"; dir = 1},/obj/structure/railing/overhang/waterless{icon_state = "wbronze_railing0"; dir = 1},/turf/simulated/floor/atoll/vertical,/area/gateway/atoll)
+"cP" = (/obj/structure/flora/moss{icon_state = "moss"; dir = 4},/turf/simulated/floor/water/atoll,/area/gateway/atoll)
+"cQ" = (/obj/effect/step_trigger/teleporter/atoll{teleport_x = 99; teleport_y = 83},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"cR" = (/obj/structure/flora/moss{icon_state = "moss"; dir = 8},/obj/structure/railing/overhang/waterless{icon_state = "wbronze_railing0"; dir = 1},/turf/simulated/floor/atoll/vertical,/area/gateway/atoll)
+"cS" = (/obj/effect/step_trigger/teleporter/atoll{teleport_x = 108; teleport_y = 90},/obj/effect/floor_decal/atoll/border,/obj/effect/floor_decal/atoll/border{icon_state = "border"; dir = 1},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"cT" = (/obj/effect/decal/shadow/silhouette/pillar{icon_state = "silhouette_p"; dir = 4},/obj/structure/railing/overhang{icon_state = "bronze_railing0"; dir = 1},/obj/structure/railing/overhang{icon_state = "bronze_railing0"; dir = 4},/turf/simulated/floor/water/atoll,/area/gateway/atoll)
+"cU" = (/obj/structure/flora/tree/atoll{icon_state = "green"; dir = 1},/obj/structure/railing/overhang{icon_state = "bronze_railing0"; dir = 8},/turf/simulated/floor/water/atoll,/area/gateway/atoll)
+"cV" = (/obj/effect/floor_decal/atoll/border/invert{icon_state = "border_invert"; dir = 8},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"cW" = (/obj/effect/floor_decal/atoll/border/invert,/turf/simulated/floor/atoll,/area/gateway/atoll)
+"cX" = (/obj/structure/flora/tree/atoll/huge,/turf/simulated/floor/beach/sand/outdoors/atoll,/area/gateway/atoll)
+"cY" = (/obj/effect/floor_decal/atoll/border,/turf/simulated/floor/atoll,/area/gateway/atoll)
+"cZ" = (/obj/effect/floor_decal/atoll/border/invert{icon_state = "border_invert"; dir = 4},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"da" = (/obj/structure/flora/lily1,/obj/structure/railing/overhang,/obj/structure/railing/overhang{icon_state = "bronze_railing0"; dir = 4},/turf/simulated/floor/water/atoll,/area/gateway/atoll)
+"db" = (/obj/effect/floor_decal/atoll,/obj/machinery/gateway{dir = 4},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"dc" = (/obj/structure/bed/chair/sofa/bench/marble{dir = 4},/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 9},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"dd" = (/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 4},/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 1},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"de" = (/obj/structure/bed/chair/sofa/bench/marble,/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 4},/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 1},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"df" = (/obj/structure/bed/chair/sofa/bench/marble{icon_state = "bench"; dir = 8},/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 5},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"dg" = (/obj/effect/floor_decal/atoll/border/invert{icon_state = "border_invert"; dir = 1},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"dh" = (/obj/machinery/gateway,/turf/simulated/floor/atoll,/area/gateway/atoll)
+"di" = (/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 9},/obj/effect/floor_decal/atoll/moss/random,/turf/simulated/floor/atoll,/area/gateway/atoll)
+"dj" = (/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 1},/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 4},/obj/effect/floor_decal/atoll/moss/random,/turf/simulated/floor/atoll,/area/gateway/atoll)
+"dk" = (/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 5},/obj/effect/floor_decal/atoll/moss/random,/turf/simulated/floor/atoll,/area/gateway/atoll)
+"dl" = (/obj/structure/flora/lily2,/obj/structure/railing/overhang{icon_state = "bronze_railing0"; dir = 1},/obj/structure/railing/overhang{icon_state = "bronze_railing0"; dir = 8},/turf/simulated/floor/water/atoll,/area/gateway/atoll)
+"dm" = (/obj/effect/floor_decal/atoll/border/invert{icon_state = "border_invert"; dir = 8},/obj/effect/floor_decal/atoll/border/invert{icon_state = "border_invert"; dir = 1},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"dn" = (/obj/effect/floor_decal/atoll/power,/turf/simulated/floor/atoll{desc = "Scuff and weathered etchings make these floors out to be pretty old. This particular area looks energized, maybe it can supply power to something?"},/area/gateway/atoll/powered)
+"do" = (/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 1},/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 8},/obj/effect/floor_decal/atoll/moss/random,/turf/simulated/floor/atoll,/area/gateway/atoll)
+"dp" = (/obj/effect/floor_decal/atoll/moss/random,/obj/structure/flora/tree/atoll{icon_state = "green"; dir = 4},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"dq" = (/obj/effect/floor_decal/atoll/bronze,/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 4},/obj/effect/floor_decal/atoll/moss/random,/turf/simulated/floor/atoll,/area/gateway/atoll)
+"dr" = (/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 10},/obj/effect/floor_decal/atoll/moss/random,/turf/simulated/floor/atoll,/area/gateway/atoll)
+"ds" = (/obj/effect/floor_decal/atoll/bronze,/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 8},/obj/effect/floor_decal/atoll/moss/random,/turf/simulated/floor/atoll,/area/gateway/atoll)
+"dt" = (/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 6},/obj/effect/floor_decal/atoll/moss/random,/turf/simulated/floor/atoll,/area/gateway/atoll)
+"du" = (/obj/effect/floor_decal/atoll/moss/random,/obj/effect/floor_decal/atoll/border/invert,/turf/simulated/floor/atoll,/area/gateway/atoll)
+"dv" = (/obj/structure/flora/lily3,/obj/structure/railing/overhang,/obj/structure/railing/overhang{icon_state = "bronze_railing0"; dir = 8},/turf/simulated/floor/water/atoll,/area/gateway/atoll)
+"dw" = (/obj/structure/flora/lily3,/obj/structure/railing/overhang,/obj/structure/railing/overhang{icon_state = "bronze_railing0"; dir = 4},/turf/simulated/floor/water/atoll,/area/gateway/atoll)
+"dx" = (/obj/effect/decal/shadow/silhouette/pillar,/obj/structure/railing/overhang{icon_state = "bronze_railing0"; dir = 1},/obj/structure/railing/overhang{icon_state = "bronze_railing0"; dir = 4},/turf/simulated/floor/water/atoll,/area/gateway/atoll)
+"dy" = (/obj/effect/decal/shadow/silhouette/pillar,/obj/structure/railing/overhang{icon_state = "bronze_railing0"; dir = 1},/obj/structure/railing/overhang{icon_state = "bronze_railing0"; dir = 8},/turf/simulated/floor/water/atoll,/area/gateway/atoll)
+"dz" = (/obj/structure/bed/chair/sofa/bench/marble{dir = 4},/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 10},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"dA" = (/obj/structure/bed/chair/sofa/bench/marble{icon_state = "bench"; dir = 1},/obj/effect/floor_decal/atoll/bronze,/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 8},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"dB" = (/obj/structure/bed/chair/sofa/bench/marble{icon_state = "bench"; dir = 8},/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 6},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"dC" = (/obj/effect/decal/shadow/silhouette/pillar{icon_state = "silhouette_p"; dir = 8},/obj/structure/railing/overhang{icon_state = "bronze_railing0"; dir = 1},/obj/structure/railing/overhang{icon_state = "bronze_railing0"; dir = 8},/turf/simulated/floor/water/atoll,/area/gateway/atoll)
+"dD" = (/obj/effect/decal/shadow/silhouette/pillar{icon_state = "silhouette_p"; dir = 8},/obj/structure/railing/overhang{icon_state = "bronze_railing0"; dir = 1},/turf/simulated/floor/water/atoll,/area/gateway/atoll)
+"dE" = (/obj/effect/decal/shadow/silhouette/pillar{icon_state = "silhouette_p"; dir = 4},/obj/structure/railing/overhang{icon_state = "bronze_railing0"; dir = 1},/turf/simulated/floor/water/atoll,/area/gateway/atoll)
+"dF" = (/obj/effect/floor_decal/atoll/border{icon_state = "border"; dir = 4},/obj/effect/floor_decal/atoll/moss/random,/turf/simulated/floor/atoll,/area/gateway/atoll)
+"dG" = (/obj/structure/flora/tree/atoll{icon_state = "green"; dir = 8},/obj/effect/floor_decal/atoll/moss/random,/obj/effect/floor_decal/atoll/border/invert{icon_state = "border_invert"; dir = 4},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"dH" = (/obj/structure/flora/ausbushes/genericbush,/turf/simulated/floor/outdoors/grass/heavy/atoll,/area/gateway/atoll)
+"dI" = (/obj/structure/railing/overhang/waterless,/obj/structure/railing/overhang/waterless{icon_state = "wbronze_railing0"; dir = 4},/turf/simulated/floor/water/atoll,/area/gateway/atoll)
+"dJ" = (/obj/structure/railing/overhang/waterless,/obj/structure/railing/overhang/waterless{icon_state = "wbronze_railing0"; dir = 8},/turf/simulated/floor/water/atoll,/area/gateway/atoll)
+"dK" = (/obj/structure/flora/tree/atoll,/obj/effect/floor_decal/atoll/moss/random,/turf/simulated/floor/atoll,/area/gateway/atoll)
+"dL" = (/obj/structure/flora/moss,/obj/effect/step_trigger/teleporter/atoll{teleport_x = 97; teleport_y = 46},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"dM" = (/obj/structure/railing/overhang/waterless{icon_state = "wbronze_railing0"; dir = 1},/turf/simulated/floor/water/atoll,/area/gateway/atoll)
+"dN" = (/obj/effect/decal/shadow,/obj/structure/flora/moss{icon_state = "moss"; dir = 4},/turf/simulated/floor/atoll/vertical,/area/gateway/atoll)
+"dO" = (/obj/structure/flora/ausbushes/grassybush,/turf/simulated/floor/outdoors/grass/heavy/atoll,/area/gateway/atoll)
+"dP" = (/obj/effect/step_trigger/teleporter/atoll{teleport_x = 80; teleport_y = 55},/obj/effect/floor_decal/atoll/border{icon_state = "border"; dir = 1},/obj/effect/floor_decal/atoll/border,/turf/simulated/floor/atoll,/area/gateway/atoll)
+"dQ" = (/obj/structure/flora/tree/atoll/huge{icon_state = "tree"; dir = 1},/obj/structure/flora/rocks1,/turf/simulated/floor/outdoors/grass/heavy/atoll,/area/gateway/atoll)
+"dR" = (/obj/effect/step_trigger/teleporter/atoll{teleport_x = 15; teleport_y = 39},/obj/effect/floor_decal/atoll/border,/obj/effect/floor_decal/atoll/border{icon_state = "border"; dir = 1},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"dS" = (/obj/effect/step_trigger/teleporter/atoll{teleport_x = 36; teleport_y = 41},/obj/effect/floor_decal/atoll,/turf/simulated/floor/atoll,/area/gateway/atoll)
+"dT" = (/obj/structure/flora/ausbushes/sparsegrass,/turf/simulated/floor/outdoors/grass/heavy/atoll,/area/gateway/atoll)
+"dU" = (/obj/effect/step_trigger/teleporter/atoll{teleport_x = 44; teleport_y = 33},/obj/effect/floor_decal/atoll/border/invert{icon_state = "border_invert"; dir = 1},/obj/effect/floor_decal/atoll/border/invert{icon_state = "border_invert"; dir = 4},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"dV" = (/obj/effect/step_trigger/teleporter/atoll{teleport_x = 44; teleport_y = 38},/obj/effect/floor_decal/atoll/border/invert,/obj/effect/floor_decal/atoll/border/invert{icon_state = "border_invert"; dir = 8},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"dW" = (/obj/effect/floor_decal/atoll/border{icon_state = "border"; dir = 8},/obj/effect/floor_decal/atoll/border{icon_state = "border"; dir = 4},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"dX" = (/obj/structure/flora/ausbushes/brflowers,/turf/simulated/floor/outdoors/grass/heavy/atoll,/area/gateway/atoll)
+"dY" = (/obj/effect/step_trigger/teleporter/atoll{teleport_x = 30; teleport_y = 25},/obj/effect/floor_decal/atoll/border{icon_state = "border"; dir = 1},/obj/effect/floor_decal/atoll/border,/turf/simulated/floor/atoll,/area/gateway/atoll)
+"dZ" = (/obj/structure/flora/ausbushes/sunnybush,/turf/simulated/floor/outdoors/grass/heavy/atoll,/area/gateway/atoll)
+"ea" = (/obj/structure/railing/overhang/waterless{icon_state = "wbronze_railing0"; dir = 4},/obj/structure/flora/lily1,/turf/simulated/floor/water/atoll,/area/gateway/atoll)
+"eb" = (/obj/structure/flora/rocks1,/turf/simulated/floor/beach/sand/outdoors/atoll,/area/gateway/atoll)
+"ec" = (/obj/effect/step_trigger/teleporter/atoll{teleport_x = 101; teleport_y = 19},/obj/effect/floor_decal/atoll/border{icon_state = "border"; dir = 1},/obj/effect/floor_decal/atoll/border,/turf/simulated/floor/atoll,/area/gateway/atoll)
+"ed" = (/obj/effect/floor_decal/atoll/border{icon_state = "border"; dir = 1},/obj/effect/floor_decal/atoll/moss/random,/turf/simulated/floor/atoll,/area/gateway/atoll)
+"ee" = (/obj/effect/step_trigger/teleporter/atoll{teleport_x = 114; teleport_y = 20},/obj/effect/floor_decal/atoll/border{icon_state = "border"; dir = 4},/obj/effect/floor_decal/atoll/border{icon_state = "border"; dir = 8},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"ef" = (/obj/structure/railing/overhang/waterless{icon_state = "wbronze_railing0"; dir = 1},/obj/structure/railing/overhang/waterless{icon_state = "wbronze_railing0"; dir = 4},/turf/simulated/floor/atoll/vertical,/area/gateway/atoll)
+"eg" = (/obj/structure/railing/overhang/waterless{icon_state = "wbronze_railing0"; dir = 4},/turf/simulated/floor/atoll/vertical,/area/gateway/atoll)
+"eh" = (/obj/effect/step_trigger/teleporter/atoll{teleport_x = 33; teleport_y = 91},/obj/effect/floor_decal/atoll/border{icon_state = "border"; dir = 4},/obj/effect/floor_decal/atoll/border{icon_state = "border"; dir = 8},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"ei" = (/obj/effect/blocker,/obj/effect/decal/shadow/silhouette,/turf/simulated/floor/water/atoll,/area/gateway/atoll)
+"ej" = (/obj/machinery/gateway{dir = 10},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"ek" = (/obj/machinery/gateway{dir = 6},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"el" = (/obj/effect/floor_decal/atoll/bronze,/obj/effect/floor_decal/atoll/border{icon_state = "border"; dir = 9},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"em" = (/obj/effect/floor_decal/atoll/bronze,/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 8},/obj/effect/floor_decal/atoll/border,/turf/simulated/floor/atoll,/area/gateway/atoll)
+"en" = (/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 8},/obj/effect/floor_decal/atoll/border{icon_state = "border"; dir = 5},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"eo" = (/obj/effect/floor_decal/atoll/bronze,/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 4},/obj/effect/floor_decal/atoll/border{icon_state = "border"; dir = 8},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"ep" = (/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 8},/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 1},/obj/effect/floor_decal/atoll/border{icon_state = "border"; dir = 4},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"eq" = (/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 4},/obj/effect/floor_decal/atoll/border{icon_state = "border"; dir = 10},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"er" = (/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 4},/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 1},/obj/effect/floor_decal/atoll/border{icon_state = "border"; dir = 1},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"es" = (/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 1},/obj/effect/floor_decal/atoll/border{icon_state = "border"; dir = 6},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"et" = (/obj/structure/railing/overhang{icon_state = "bronze_railing0"; dir = 4},/obj/structure/railing/overhang,/turf/simulated/floor/water/atoll,/area/gateway/atoll)
+"eu" = (/obj/effect/floor_decal/atoll/moss/random,/obj/effect/floor_decal/atoll/border/invert{icon_state = "border_invert"; dir = 1},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"ev" = (/obj/effect/floor_decal/atoll/moss/random,/obj/effect/floor_decal/atoll/border/invert{icon_state = "border_invert"; dir = 8},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"ew" = (/obj/effect/floor_decal/atoll/border{icon_state = "border"; dir = 8},/obj/effect/floor_decal/atoll/bronze,/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 4},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"ex" = (/obj/effect/floor_decal/atoll/border{icon_state = "border"; dir = 4},/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 8},/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 1},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"ey" = (/obj/effect/floor_decal/atoll/border/invert{icon_state = "border_invert"; dir = 1},/obj/effect/floor_decal/atoll/bronze,/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 4},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"ez" = (/obj/effect/floor_decal/atoll/border/invert{icon_state = "border_invert"; dir = 8},/obj/effect/floor_decal/atoll/bronze,/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 4},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"eA" = (/obj/effect/floor_decal/atoll/border{icon_state = "border"; dir = 9},/obj/structure/bed/chair/sofa/bench/marble,/turf/simulated/floor/atoll,/area/gateway/atoll)
+"eB" = (/obj/effect/floor_decal/atoll/border{icon_state = "border"; dir = 1},/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 1},/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 4},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"eC" = (/obj/effect/floor_decal/atoll/border{icon_state = "border"; dir = 1},/obj/effect/floor_decal/atoll/moss/random,/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 1},/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 4},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"eD" = (/obj/effect/floor_decal/atoll/border{icon_state = "border"; dir = 9},/obj/effect/floor_decal/atoll/bronze,/obj/structure/bed/chair/sofa/bench/marble{dir = 4},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"eE" = (/obj/effect/floor_decal/atoll/moss/random,/obj/effect/floor_decal/atoll/border,/turf/simulated/floor/atoll,/area/gateway/atoll)
+"eF" = (/obj/effect/step_trigger/teleporter/atoll{teleport_x = 45; teleport_y = 26},/obj/effect/floor_decal/atoll,/turf/simulated/floor/atoll,/area/gateway/atoll)
+"eG" = (/obj/effect/floor_decal/atoll/moss/random,/obj/effect/floor_decal/atoll/border{icon_state = "border"; dir = 1},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"eH" = (/obj/effect/floor_decal/atoll/border{icon_state = "border"; dir = 5},/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 8},/obj/structure/bed/chair/sofa/bench/marble{icon_state = "bench"; dir = 8},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"eI" = (/obj/effect/floor_decal/atoll/moss/random,/obj/effect/floor_decal/atoll/border/invert{icon_state = "border_invert"; dir = 4},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"eJ" = (/obj/effect/floor_decal/atoll/moss/random,/obj/effect/floor_decal/atoll/border{icon_state = "border"; dir = 5},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"eK" = (/obj/effect/floor_decal/atoll/border{icon_state = "border"; dir = 10},/obj/structure/bed/chair/sofa/bench/marble{icon_state = "bench"; dir = 1},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"eL" = (/obj/effect/floor_decal/atoll/moss/random,/obj/effect/floor_decal/atoll/border{icon_state = "border"; dir = 6},/obj/structure/bed/chair/sofa/bench/marble{icon_state = "bench"; dir = 1},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"eM" = (/obj/effect/floor_decal/atoll/border{icon_state = "border"; dir = 10},/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 4},/obj/structure/bed/chair/sofa/bench/marble{dir = 4},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"eN" = (/obj/effect/floor_decal/atoll/border{icon_state = "border"; dir = 6},/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 1},/obj/structure/bed/chair/sofa/bench/marble{icon_state = "bench"; dir = 8},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"eO" = (/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 4},/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 1},/obj/structure/bed/chair/sofa/bench/marble,/turf/simulated/floor/atoll,/area/gateway/atoll)
+"eP" = (/obj/effect/floor_decal/atoll/bronze,/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 8},/obj/structure/flora/tree/atoll{icon_state = "green"; dir = 8},/turf/simulated/floor/atoll,/area/gateway/atoll)
+"eQ" = (/obj/effect/floor_decal/atoll/bronze,/obj/effect/floor_decal/atoll/bronze{icon_state = "bronze"; dir = 8},/obj/structure/bed/chair/sofa/bench/marble{icon_state = "bench"; dir = 1},/obj/effect/floor_decal/atoll/moss/random,/turf/simulated/floor/atoll,/area/gateway/atoll)
+"eR" = (/obj/vehicle/boat{icon_state = "boat"; dir = 8},/turf/simulated/floor/water/atoll,/area/gateway/atoll)
+"eS" = (/obj/vehicle/boat,/turf/simulated/floor/water/atoll,/area/gateway/atoll)
+"eT" = (/obj/vehicle/boat{icon_state = "boat"; dir = 4},/turf/simulated/floor/water/atoll,/area/gateway/atoll)
+
+(1,1,1) = {"
+anananananananananananananananananananananananananananananananananananananananananananananananananananananaoaoananananananananananananananaoanananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananan
+ananananananananananananananananananananananananananananananananananananananananananananananananananananaradaeatananananananananananananaragatananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananan
+ananananananananananananananananananananananananananananananananananananananananananananananananananananarahaiatanananananananananananananajananananananananananananananananananananananananananananananananananananananananananananananananaoaoaoaoaoaoaoaoanananananananananananananan
+anananananananananananananananananananananananananananananananananananananananananananananananananananananakakananananananananananananananalanananananananananananananananananananananananananananananananananananananananananananananananaramamamamamamamamatananananananananananananan
+ananananananananananananananananananananananananananananananananananananananananananananananaoaoaoananananapapananananananaqanananananananalanananananaoaoananananananananananananananananananananananananananananananananananananananananaramamamamamamamamatananananananananananananan
+anananananananananananananananananananananananananananananananananananananananananananananaramasamatanananauauanananananavawaxananananananapananananaradaeatanananananananananananananananananananananananananananananananananananananananaramamamamamamamamatananananananananananananan
+anananananananananananananananananananananananananananananananananananananananananananananaramagayatanananazazananananananaAanananananananauananananarahaiatananananananananananananananananananananananananananananananananananananananananakakakakakakakakanananananananananananananan
+ananananananaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaDaEaFaEaGaCaCaCaHaHaCaIaIaIaIaIaIaIaIaIaIaIaCaCaJaCaCaCaCaCaKaKaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaLaLaLaMaLaLaNaLaCaCaCaCaCaCaCananananananan
+ananananananaCanananananananananananananananananananananananananananananananananananananananakakakananananaOaOaraPaQaRaRaRaRaRaRaRaSaTatanaUanananananapapanananananananananananananananananananananananananananananananananananananananananalalalalalalalalananananananaCananananananan
+ananananananaCananananananananananaVananananananananananananananananananananananananananananaWalalananananaXaXaraYaZbabbbbbbbbbbbcbdbeatanaOanananananauauanananananananananananananananananananananananananananananananananananananananananalalalalalalalalananananananaCananananananan
+ananananananaCanananananananananananananananananananananananananananananananananananananananalalalanananananaVarbfbgbhaqaqbiaqaqbjbkblatanaXanananananazazanananananananananananananananananananananananananananananananananananananananananalalalalalalalalananananbmanaCananananananan
+ananananananaCanananananananananananananananananananananananananananananananananananananananapapapananananananarbnbobpbpbpbpbpbpbpbqbratanananananananaUaUanananananananananananananananananananananananananananananananbsananananbmananananalalalalalbtalalananananananaCananananananan
+ananananananaCanananananananananananananananananananananananananananananananananananananananauauauananananananarbubvbwbwbxbwbybwbwbrbzatanananbmanananaOaOanananananananananananananaoaoaoaoanaVananananananananananananananananananananananalbtalalalalalalananananananaCananananananan
+ananananananaCananananbmanananananananananananananananananananananananananananananananaqananazazazanananananananbAbAbAbAbBbAbBbAbAbAbAananananananananaXaXananananananananananananaramamagamatanananananananananananananananananananananananalalalaWalalbCalananananananaCananananananan
+ananananananaCanananananananananananananananananananananananananananananananananananavawaxanaUaUaUananananananbDaubEauaubFbGbFaubHauauananananananananananananananananananananananaramagamamatanananananananananananananananananananananananalalalalalalalalananananananaCananananananan
+ananananananaCananananananananananananananananananananananananananananbmanaqaqaqaqananaAananaOaOaOananbmanananavazazazazbIazbIazazazazaxananananananananananananananananbmanananananakakakakananananananananananananananbmanananananaqanananapapapapapapapapanbmananananaCananananananan
+ananananananaCanananananananananananananananananananananananananananananavbJbpbpbKbhaqaqaqaqbLbLbLaqaqaqbMaqaqbjaUaUaUaUbNaUbNaUaUaUaUaxanananananananananananananananananananananbOalalalbPanananananananananananananananananananavawaxananaubGauauauauauauananananananaCananananananan
+ananananananaCananbQananananananananananananananananananananananananaqanavbkbRagbSamamamamamambSddddeOddddcuamambTbUbTbTbTbUbTbTbTbTbVaxanaqananananananaoaoaoanananananananananananalalalalananananananananananananananananananananaAanananazazazazazazazazananananananaCananananananan
+ananananananaCanananananananbmananananananananananaVanananananananavawaxavbWagagamamamamamamamagagagamamamamamamamamamagamamamamagambXaxavawaxananananaramagbYatbsanananananananananalalalalananananananananananananananananananananananananaUaUaUaUaUaUaUaUananananananaCananananananan
+ananananananaCanananananananananananananananananananananananananananaAanavbZamamcaamamamamamamcadsePeQcececCamamamamamamamamamamamamcbaxanaAananananananakakakanananananananananananalalalalananananananananananananananananananananananananaOaOaOaOaOaOaOaOananananananaCananananananan
+ananananananaCanananananananananananbmanananananananananananananananananavcccdcecfcgbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbcamamamcgbbbbbbanananananananananalaWalanananananananananananapapapapananananananananananananananananananananananananaXaXaXaXaXaXaXaXananananananaCananananananan
+ananananananaCananananananananananananananananananananananananananananananbbbbbbbbananaqanananananananananananananaqanavamamamaxanaqananananananananananalalalanananananananananananauauauauananananananananananananananananananananananananananananananananananananananaCananananananan
+ananananananaCanananananananananananananananananchchchchchchchchchchananananananananavawaxanananananananananananavawaxavamamamaxavawaxanbmanananananananapapapananbsananananananananazazazazanananananananananananananbmananananananananananananananananananananananananaCananananananan
+ananananananaCbmananananananananananananananananchcicichchcichcicichanananananananananaAananananananananananananbsaAanavamamamaxanaAananananananananananauauauanananananananbmanananaUaUaUaUananananananananananananananananananananananananananananananananananananananaCananananananan
+ananananananaCanananananananananananananananananchcicicicicicicicichchananananananananananananananananananananananananavamamamaxananananananananananananazazazanananananananananananaOaOaOaOanananananananananananananananananananananananbmananananananananananananananaCananananananan
+ananananananaCanananananananananananananananchchchcicicicicicicicichchchchanananananananananananananaVananananananananavamamamaxananananananananananananaUaUaUanananananananananananaXaXaXaXananananananananananananananananananananananananananananananananananananananaCananananananan
+ananananananaCananananananananananbmananananchcicicjcicickciciclcicicicichananananananananananananananananananananananavamamamaxchchchchananananananananaOaOaOananananananananananananananananananananananananananbsananananananananananananananananananananananananananaCananananananan
+ananananananaCanananananananananananananananchchchchcicicicicicicicicichchanananananananananananeRananananananananananavamamamchchcicichchanananananananaXaXaXanananananananananananananananananananananananananananananananananananananananananananananananananananananaCananananananan
+ananananananaCananananananananananananananananchchchcicicicjcicicicickchchananananananananananananananananchchchchchchchamamcmcicicicicnchchchchchanananananananananananananananananananananananananananananananananananbmanananananananananananananananananananananananaCananananananan
+ananananananaCanananananananananananananananananchchcicicicicicicicicicichananananananananchchchchchchchchchcicicicicicoamamamcicicicicicicicicichanananananananananananaqanananananananananananananananananananananananananananananananananananananananananananananananaCananananananan
+ananananananaCananananananananananananananananananchcicpclcqcickcicicicichananananananananchcncicicicicicicicicicicicicramamamcicjcicicicicicicichchchchchchchananananavawaxanananananchchchchchchchchchananananananananananananananananananananananananananananananananaCananananananan
+ananananananaCananananananananananananananananbmanchcicicicicicicickcicicsananananananananchcicicicicicicicjcicickcicictcuambSbKcicicicicicicickcicicicicicichanananananaAanananananchchcicicicickcicichchchchchchchananananbmanananananananananananananananananananananaCananananananan
+ananananananaCananananananananananananananananananchciciciciciciadcYaecochchananananbmanchchaiaYdgciciciamcicicicickcicvagagagbgcpcicickcicicicicicicicrcicichaqaqaqaqaqaqaqaqaqaqaqchcrckcicncicicjctbpbpbpbKcicichchchchchananananananananananananananananananananananaCananananananan
+ananananananaCananananananananananananananananananchchcickcicicibfcwblclcichananananananchcicxdmamciciciciamcicyciamamamagczagamamamamamamamamamamamamamamamamadaYcYcYcYcYcYcYbeaeamamamamamamamamamcuagagamcAcicicicicocBchchchananananananananananananananananananananaCananananananan
+ananananananaCananananananananananananananananananchchcicicicrcjahbwaichchchbQanbsanananchclaebncVciciamciciciamcicicoamamagamamamamamamamamamamamamamamamamamahbnbwbwbwbwbwbwbraiamamamamamamamamamcCagbRamcAciciciciciclcichchananananananananananananananananananananaCananananananan
+ananananananaCanananananananananananananananananbmchchchcrchchchcschcichananananananananchchchcicicicicicicicicicicicicDcCamcEcfcicicicicicicicicpcjcicicicichbbaAbbbbbbbbbbbbaAbbcscpcicicickcicFcicDcCagcEcfcicicjcicicicichchananananananananananananananananananananaCananananananan
+ananananananaCananananananananananananananananananchchchchchanananchchchananananananananananchcicicicicicicicicicrcicicicVamcWcicicicicicicicicicicicicicicichanananananaqananananchcicicicicocicicicnamamamcicickcicicicicichchananananananananananananananananananananaCananananananan
+ananananananaCananananananananananananananananananananananananaqananananananananananananananchcicicicjciclcicicicicicicibncHbrcicicncicjcicicicicicicicicicjchananananavawaxanananchchcicjciclcicGciciamamamclcicicicickcicichchananananananananananananananananananananaCananananananan
+ananananananaCanananananananananananananananananananananananavawaxanananananananananananananchchchchchchchchcicnciciciciaeehadcicicicickcicicjcichchchchchchchanananananaAanananananchciciciciciciciciamamamcicicicicicicicicschananananananananananananananbmanananananaCananananananan
+ananananananaCananananananananananananananananananananananananaAanananananananananananananananananananananchchchcicjchchchchchchchchchchchchchchchananananananananaVananananananananchcicicicicicickciamamamcicicicicicicicichanananananananananananananananananananananaCananananananan
+ananananananaCananananananananananananananananananananananananananananananananananananananananananananananananchchchchanananananananananananananananananananananananananananananananchchckcicicicicicpamamamcicicickcicicicichanbQanananananananananananananananananananaCananananananan
+ananananananaCanananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananchchchcicjciciciciamamamcjcicicicicjcicichanananananananananananananananananananananaCananananananan
+ananananananaCananananananananananananananaoaoanananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananchchchchciciciciciamamamcicicicicicicichchanananananananananananananananananananananaCananananananan
+ananananananaCanananananananananananananaramamatananananananananananananananananananananananananananananananananananananbmananananananananananananananananananananananananananananananchchchchchciciciamamamcicrcjcicicichchananananbmanananananananananananananananananaCananananananan
+ananananananaCananananananananananananananakakananananananananananananananananananananananananananananananananananananananananananananananbmananananananananananananananananananbmananananananchchcjclamamamcochchchchchchanananananananananananananbsanananananananananaCananananananan
+ananananananaCanananananananananananananancIcJanananananananananananananananbsananananananananananananananananananananananananananananananananananananananananananananananananananananananananchchcschamamamchchchanananananananananananananananananananananananananananaCananananananan
+ananananananaCananananananananananbmanananauauanananbmanananananananananananananananananananananananananananananananananananananaoaoaoanananananananananananananananananananananananananananananananavamamamaxanananananananananananananananananananananananananananananaCananananananan
+ananananananaCananananananananananananananazazanananananaoaoaoaoaoananananananananananananananananananananananananananananananaramamamatananananananananananananananananananananananananananananananavamamamaxanananananananananananananananananananananananananananananaCananananananan
+ananananananaCananananananananananananananaUaUananananaramamagamcKatananananananaoaoanananananananananananananananananananananaramcLamatananananananbmananananananananananananananananananananananancMamamamaxanananbmanananananananananananananananananananananananananaCananananananan
+ananananananaCananananananananananananananaOaOananananaragagagagagatanananananaramamatanananananbsanananananananananananananananakakakanananananananananananananananananananananananananananananananavamamamaxananananaoaoaoaoaoaoanananananananananananananananananananaCananananananan
+ananananananaCananananananananananananananaXaXananananaragbRbYagamatananananananakcOananananananananananananananananananananananaWbtalanananananananananananananananananananananananananananananananavamamamaxanananaragagamasamamatananananananananananananananananananaCananananananan
+ananananananaCananananananbmananananananananananananananakakakakakanananananancPapcJananananananananananananananananananaVanananalalalanananananananananananananananananananananananananananananananavamamamaxanananarcQagamagagczatanaoaobmananananananananananananananaCananananananan
+ananananananaCanananananananananananbmanananaqananananbOaWalbCalalananananbmananauauananananananananananananananananananananananapapapanananananananananananananananananananananananananananananananavcVamamaxananananakakakakakcRanaradaeatananananananananananananananaCananananananan
+ananananananaCananananananananananananananavawaxanananbmalalalalalanananananananazazananananananananananananananananananananananauauauanananananananananananananananananananananananananananananananavbfamamaxanaVananalaWbCalalalanarahaiatananananananananananbmanananaCananananananan
+ananananananaCanananananananananananananananaAanananananapapapapapananananananbmaUaUananananananananananananananananananananananazazazananananananananananananananananananananananananananananananbsavbfamamaxananananalalalalalalananakakanananananananananananananananaCananananananan
+ananananananaCananananananananananananananananbmananananauauauauauanananananananaOaOanbmananananananananananananananananananananaUaUaUananananananananananananananananananananananananananananananaqbjbfamamaxananananalalalalalalananalalanananananananananananananananaCananananananan
+ananananananaCananananananananananananbmananananananananazazazazazanbmanananananaXaXananananananananananananananbsanananananananaOaOaOananananananananananananananbmananananananananananananananavaiaYdgamamaxananananalalalalalalananapapananananbmananananananananananaCananananananan
+ananananananaCanananananananananananananananananananananaUaUaUaUaUanananananananbmananananananananananananananbmananananananananaXaXaXanananananananananananananananananananananananananananananavcSdmamamamaxananananalalalalalalananauauanananananananananananananananaCananananananan
+ananananananaCanananananananananananananananananananananaOaOaOaOaOanananananananananananananananananananananbmanananananananananananananananananbmanananananananananananananananananananananananavaebncVamagaxananananapapapapapapananazazanananananananananananananananaCananananananan
+ananananananaCanananananananananananananananananananananaXaXaXaXaXananananananananananananananananananbQanananananananananananananananananananananananananananananananananananananananananananananbbcTbfagagcUananananauauauauauauananaUaUbmananananananananananananananaCananananananan
+ananananananaCananananananananananbsananananananananananananananananananananananananananananananananananbmanananananananananananananananananananananananananananananananananananananananananananananavbfamagaxananananazazazazazazananaOaOanananananananananananananananaCananananananan
+ananananananaCanananananananananananananananananananbmanananananananananananananananananananaVanananananananananananananananananananananananananananananananananananananananananananananananananananavbfamamaxananananaUaUaUaUaUaUananaXaXanananananananananbmanananananaCananananananan
+ananananananaCananananananananananananananananananananananananananananananbsananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananavdgamamaxananananaOaOaOaOaOaOanananananananananananananananananananaCananananananan
+ananananananaCanananananananananananananananananananananananananbmanananananananananananananananananananananananananananananananananananananananananananananananananananananchchchchananananananananavamamamaxananananaXaXaXaXaXaXanananananananananananananananananananaCananananananan
+ananananananaCananananananananananananananananananananananananananananananananananananananananananananananananananananananananaqananananananananananananbsanaqananananananchcicicichananananaqanananavamamamaxanananaqanananananananananananananananananaVanananananananaCananananananan
+ananananananaCananananananananananananananananananananananananananananananananananananananaqanananananananaqananananananananavawaxanananeRananananananananavawaxanananananchcicicichanananavawaxananavcVamcWaxananavawaxananananananananananananananananananananananananaCananananananan
+ananananananaCananananananananananananananbmananananananananananananananananananananananavawaxanananananavawaxananananananananaAananananananananananananananaAananananananchcXcicichananananaAanaqaqbjbfamblbhaqaqanaAanananananbmanananananananananananananananananananaCananananananan
+ananananananaCananananananananananananananananananananananananananananananananananananananaAananaqaqaqananaAananbsananananaqaqaqaqaqananananananananananaqaqaqaqaqaneRbmananchchchananananananavaPaYcYdgamcZcYbeaTaxananananananananananananananananananananananananananaCananananananan
+ananananananaCananbsananananchchchchchananananananananananananananbmananananbmanananananananandaaaabacbhaqaqaqaqaqaqaqaqbjdcdddedddfbhaqaqbMaqaqaqaqaqbjaYcYcYcYbebhaqaqaqaqaqaqaqaqaqaqaqaqaqbjaYdgcacecececCcZbeaxananananananananananananananananananananananananananaCananananananan
+ananananananaCananananananchchchcicichchchanananananananananananananananananananananananananavahafaBdbaiamamamamamamamamamamcWbwcVamamamamamamamamamcZcYdgdidjdkcZcYdgamamamamamamamamamamamcZcYdgambgdlbbbcbkamblaxananananananananananananananananananananananananananaCananananananan
+ananananananaCanananananchchcicicicicicichanananananananananananananananananananananananananavdmejdhekamamamamamamamamamamambldnbfamamamamamamamamamamamagdodpdqamamamamamamamamamamamamamamamamamambgaxbsavbkamblaxananananananananananananananananananananananananananaCananananananan
+ananananananaCanananananchcicicicicicicichchananananananananananananananananananananananananavadaeamadaeamamamamamamamamamamcZcYdgamamamamamamamamamcWbwcVdrdsdtdubwcVamamamamamamamamamamamcWbwcVambgdvaqdwbkamblaxananananananananananananananananananananananananananaCananananananan
+ananananananaCanananananchciclcicicickcicichchanananananananananananananananananananananananandxaibxahdybbbbbbbbbbbbbbbbcTdzcedAcedBdCbbbbbbbbbbbbbbbbcTbnbwbwbwbrdCbbbbbbbbbbbbbbbbbbbbbbbbbbcTbncVbSddddddcucWbraxananananananananananananananananananananananananananaCananananananan
+ananananananaCanananananchchcocickcicicicicichananananananananananananananananananananananaqananbbbbbbananaqanbmanananananbbdDaAdEbbanananananananananbQbbdDaAdEbbananananananananananananananavbubnbwcVamcWbwbrbzaxananananananananananananananananananananananananananaCananananananan
+ananananananaCananananananchcicicicicicrcicichanananananbmanananananananananananananananavawaxanananananavawaxananananananananaqananananananananananananananaqanananananananananananananananaqanbbbbcTbfamdFdCbbbbanaqanananananananananananananananananananananananananaCananananananan
+ananananananaCanananananchchcicicicicpcqcicichananananananananananananananananananananananaAanananananananaAananananananananavawaxananananananananananananavawaxanananananananananananananavawaxananavdgagdGaxananavawaxananananananananananananananananananananananananaCananananananan
+ananananananaCanananananchcicickcNcicicicickchananananananananananananananbmanananananananananananananananananananananananananaAananananananananaVanananananaAanananananananananananananananaAanananavamamagaxanananaAanananananananananananananananananbmanananananananaCananananananan
+ananananananaCanananananchchchcicicichchchchchanananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananavamamamaxanananananananananananananananananananananananananananananaCananananananan
+ananananananaCanananananananchchcrchchanananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananavamamamaxanananananananananananananananananananananananananananananaCananananananan
+ananananananaCananananananananchchchanananananananananananananananananananananananananananananananananananananananananananbsanananananananananananananananananananananaVananananananananananananananavamamamaxanananananananananananananananananananananananananananananaCananananananan
+ananananananaCanananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananavamamamaxananananananananananbmananananananananananananananananananaCananananananan
+ananananananaCananananananbmananananananananananananananananananananananananananananananananananananananbmananananananananananananananananananananananananananananananananananananananananananananbmavamamamaxanananananananananananananananananaoaoanananbmananananananaCananananananan
+ananananananaCanananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananaqanavamamamaxanaqanananananananananananananandIamamdJanananananananananaCananananananan
+ananananananaCananananananananananananananbmananananananananananananananananananananananananananananananananananananananananananananaoaoaoaoaoaoaoaoaoaoaoaoaoaoaoananananananananananananananavawaxavamamamaxavawaxananananananananananananaramdKagamatananananananananaCananananananan
+ananananananaCananananananananananananananananananananananananananananananananananananananananananananananananananananananananananaramamamagamamamasamamamamamamagatananananananananananananananaAanavamamamaxanaAananananananananananananananakakakakanananananananananaCananananananan
+ananananananaCananananananananananbsananananananananananananananbmananananananananananananananananananananananananananananananananaragagamamamamamagamamamamagamdLatananananananananananananananananavamamamaxananananananananananananananananalbtbCalanananananananananaCananananananan
+ananananananaCananananananananananananananananananananananananananananananananananananananananananananananananananananbmananananananakakakakdMdMdMdMdMdMakakakakakanananananananananchchchchchchchchavamamamaxananananananananananananaoaoananalalalalanananananaoaoaoanaCananananananan
+ananananananaCanananananananananananananananananananananananananananananananananananananananananananananananananananananaoaoananancPalaWalalananbmanananalalalalalanananananananchchchcicicicicicichavamamamaxanbmanananananananananaramagatanapapapapananananaramagamataCananananananan
+ananananananaCanananananananananananananananananananananananananananananananananananananananaVananananananananananananaragbYatanananapapapapananananananapdNapapapanananananananchcicicicicicicicichchcVamcWaxananananananananananananakakananauauauauanananananakakakanaCananananananan
+ananananananaCanananananananananananananananananbmananananananananananananchchchchchananananananananananananananananananakakananananauauauauananananananauauauauauananananananchchcicicicicicicicicicibfamblaxananananananananananananbCalananazazazazanananananalaWalanaCananananananan
+ananananananaCananananananananananananananananananananananananananananananchcicicichchananananananananananbmananananananbtalanaqananazazazazananbsanananazazazazazananaqanananchcicicrcicicickcicicicibfamblaxananananananananananananapapananaUaUaUaUananananbmalalalanaCananananananan
+ananananananaCanananananananbmanananananananananananananananananananananchchcicickcichchchchchanananananananananananananapapavawaxanaUaUaUaUananananananaUaUaUaUaUanavawaxanchchcicicicicicicicickcicibfamblaxananananananananananananauauananaOaOaOaOanananananalalalanaCananananananan
+ananananananaCanananananananananananananananananananananananananananchchchcicicicicicicicicichanananananananananananananauauanaAananaOaOaOaOananananbmanaOaOaOaOaOananaAananchcicicicicicicicidHciciaYdgamblaxanaqananananananananananazazananaXaXaXaXanananananapapapanaCananananananan
+ananananananaCananananananananananananananananananananananananananchchcicicicickcicicicicichchanananananananananananananazazananananaXaXaXaXananananananaXaXaXaXaXanananananchcicicickcicicicraeaYcYeuamamblaxavawaxanananananananananaUaUanananananaqanananananauauauanaCananananananan
+ananananananaCanananananananananananananananananananananananananchchcicicicicicicicicicickchananananananananananananananaUaUananananananananananananananananananananananananchcicicicicicicicidPdmagbRagamblaxanaAananananananananananaOaOananananavawaxananananazazazanaCananananananan
+ananananananaCanananananananananananananaVanananananananananananchciciciciciciclcicjcicNcichchanananananananananbsanananaOaOananananananananananananananananananananananananchcicicicicicickciaibnbwevagamblaxananananananananananananaXaXanananaVanaAanananananaUaUaUanaCananananananan
+ananananananaCanananananananananananananananananananananananananchcicpcickciciamamamamclcicichanananananananananananananaXaXananananananananananananananananananananananananchchcicicicicicicicicicibncVamblaxanananananananananananananananananananananananananaOaOaOanaCananananananan
+ananananananaCanananananananaqanananananananananananananananananchciciciciciciamagagamcicicNchananananananananananananananananananananananananananananananananananananananananchchcicickcidOcrcicicicibfamblaxanananananananananananananananananananananananananaXaXaXanaCananananananan
+ananananananaCananananananavawaxanananbmananananananananananananchchaiciamcNckagamamamcicochchanananananananananananananananananananananananananananananananananananananananananchchcicicicicicicickcibfamblaxanananananananananananananananananananananananananananananaCananananananan
+ananananananaCanananananananaAanananananananananananananananananchchdRciciamamamamamagcicichanananbmananchchchchchchchananananananananananananananananananananananananananananananchchchchchchchchchchbfamblaxanaVanananananananananananananananananananananananananananaCananananananan
+ananananananaCananaoaoaoaoaoaoaoanananananananananananbmanananchchciciciciciciciciciamamcichchanananananchcicicicicichanananananananananananananananananananananananananananananananananananananananavdgamcZaxanananananananananananananbmanananananananananananananananaCananananananan
+ananananananaCanarasamamamcZbedSatananananananananananananananchchcicicicicicrcNcjciamagcicrchanananananchcidQcicicichanananananananananananananananananananananananananbmanananananananananeSanaqanavamamamaxanaqanananananananananananananananananananananananananananaCananananananan
+ananananananaCanaramamamamameIeJatanananananananananananananananchchclcicjcpciciciciadciaechchanananananchchchcicicpchananananananananbmanananananananananananananananananananananananananananavawaxavamamamaxavawaxananananananananananananananananananananananananananaCananananananan
+ananananananaCananakakakakakakajanananananananananananananananananchchchchchchchchchaYdUbechanaVananananananchchchchchanananananananananananananananaVanananananananananananananananananananananaAanavamamamaxanaAanananananananananananananananananananananananananananaCananananananan
+ananananananaCanbOalalalalalbCalananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananavamamamaxanananananananananananananananananananananananananananananaCananananananan
+ananananananaCananalalalalalalalanananananbmananananananananananananananananaqanbsanananbQanananananananananananananananananananananananananananananananananananananananananananananbmanananananananavamamamaxananananananananananananananananananananbmananananananananaCananananananan
+ananananananaCananalalalalalalalanananananananananananananananbmanananananavawaxanchbndVbrchchchchchchanananananananchchchchchchchanananananananananananananananananananananananananananananananananavamamamaxanananananananananananananananananananananananananananananaCananananananan
+ananananananaCananalalalalalalalananananananananananananananananananananananaAananchahdWaicichchcicichanananchchchchchcicicicicichchanchchchchanananananananananananananananananananananananananananavamamamaxanananananananananananananananananananananananananananananaCananananananan
+ananananananaCananalalalalalalalanananananananananananananananananananananananananchcicicicicicicicichchchchchcicicichchchchchchchchchchcichchchchchchchanananananananananbmanananananananananaVananavamamamaxanananananananananananananananananananananananananananananaCananananananan
+ananananananaCananapapapapapapapanananananananananananbsanananananananananananananchchcicicicicickcicicickcicicicicicicickcicichchchchcicicicicicicicichchchchchchanananananananananananananananananavamamamaxananananananananananananananananananananananananbsananananaCananananananan
+ananananananaCananauauauauauauauanananananananananananananananananananananananananchchciamamciciciciciciciciclcicicicicicicicicicicicicicicicicicicicicicicicicichanananananananananananananananananavamamamaxanananananananananananananananananananananananananananananaCananananananan
+ananananananaCananazazazazazazazanananananananananananananananananananananananananchcsciciciciciclcickcicicicicicicicicicicicicicicicicicicicicicicockcicicicicichchchchchchananananananananananaqanavamamamaxanaqanananananananbmanananananananananananananananananananaCananananananan
+ananananananaCananaUaUaUaUaUaUaUananananbmanananananananananananananananbmananananchchcicicicjciamcicicicicicicicicickcicrcicicicicjcicicjcicicicicicicicickciclcicicicicichchananananananananavawaxavamamamaxavawaxananananananananananananananananananananananananananaCananananananan
+ananananananaCananaOaOaOaOaOaOaOanananananananananananananananananananananananananchchcicicicicicicicicNcickamcicicicicicicicicocicicjcicicicicicicicicicicicicicickcicicicichchanbsananananananaAanavamamamaxanaAanananananananananananananananananananananananananananaCananananananan
+ananananananaCananaXaXaXaXaXaXaXanananananananaoaoaoaoaoaoaoaoananananananananananchchdYdmcicicicicocNcicaamcicicicicNcpcicicqciciclcicicicicjcicicicicicicicicicicicidTcicicichaqaqaqaqaqaqaqaqaqaqetamamamaxanananananananananananananananananananananananananananananaCananananananan
+ananananananaCanananananananananananaqanananareAcYcYcYcYeEbeeFatananananaoaoanananchchahdXcickcicicicicicicicicjciamciciamamciciciamcicicicickcicickcicicjciciciamamcicicrciciamamamamamamamamamamamamamamamaxananananananananananananaoaoaoaoaoaoaoaoaoaoaoaoaoananananaCananananananan
+ananananananaCananananananananananavawaxananarbfamagamamamcZbeatanananaragagatananchchcicicicicicicicicicicicNcicicickciciciamcicicpcicickciciciambSciciciamciciamamcicicidTamamamamamamagagamamamamamamamamaxanananananananananananareDaRaRaRaRaRaRaRaRaRaRaReHatanananaCananananananan
+ananananananaCananananananananbsananaAanananarbfamamagamamagblatanananarbRagatananchchcicicicicickcicpcicicicicicicicicicicrcuamciciamamamcicicpamamcicicjcidTcicicickciamamcpamamamamamagdKagamamamamcVamcWaxanananananananananananarewcicjciciciciciciciagamexatanananaCananananananan
+ananananananaCananananananananananaoaoaoananareKeGbwbwbwbwbweLatananananakajananananchchchcicickcBciclcicjcicicockcicicjcicicicjclciciciciciciaecicrcicicicicicicicicocicicicichbbbbbbbbbbbbbbbbbbbbbcbfamblaxanananananananananaoaodIewcpcicicicidTcicrciamamexatanananaCananananananan
+ananananananaCanananananananananaramamamatananakakakakakakakakananananbOapapananananchchchchciciciciciciciciciciciciciclciciciciciciciciciciciciciciciciciciciciclcicicicicichchanananananbmananaqanavbfamblaxanaqananananananeaaiaYcYeycidZcickelemenciciciciexatanananaCananananananan
+ananananananaCananananbmananananaragamamatancPalalalbtalalalaWanananananauauananananananchchchchcicicicickcicicicickcicicicicicicicicicicicicicicicicicicickcicicicicicicichchchanananananananavawaxavbfamblaxavawaxanananananarecdmambgcicicicieoasepciciciciexatanananaCananananananan
+ananananananaCananananananananananakakakanananalalalalalalalalananaqananazazanananananananchchchchchcicicicickcicicicicicicicickcicjcicjcicickcicicicjcicicicicichchchchchchchanananananananananaAanavbnbxbraxanaAananananananaraebnedezcicocrcieqerescicpckamexatanananaCananananananan
+ananananananaCananananananananancPalalalanananalalalalalalalalanavawaxanaUaUananananchchananbsananchchchchchcicqcicicickcicicicicicicjcicicicicicicicicicicichchchchchchchanananananananananananananavaeeeadaxanananananananananakakefewckclcicicicicicichchamexatanananaCananananananan
+ananananananaCananananananananananalalalanananalalalalalalalalananaAananaOaOanananchchcichchananeTananananchchchchcicicicickcicicicicicicicicicicicicicicichchananananananananananananananananananananbbbbbbanbmananananananananbCalegewcicidTebcragcichchchamexatbmananaCananananananan
+ananananananaCananananananananananalalalanananalalalalalalalalanananananaXaXanananchcicicichchchchchanananchchchchchcicicocicjciclcicicjcicocicicicickcichchchanananananananananananananananananananananaqanananananananananananalalegeMeBeBeBeBeBeBeBeBeCeBeBeNatanananaCananananananan
+ananananananaCananananananananananapapapanananalalalalalalalalananananananananbmanchcicicicicicicichanananananchchchchcicicicicicickcicicicicicjcicicichchchchanananananbmananananananananananananananavawaxananananananananananalalalakakakakakakakakakakakakakananananaCananananananan
+ananananananaCananananananananananauauauanananalalalalalalalalananananananananananchchcicicicicicichanananananchchchchchcicicicicicicicicicicicicichchchchchanananananananananananananbsananananananananaAanananananananananananapapapalalalalaWalalalbCalalalalananananaCananananananan
+ananananananaCananananananananananazazazananbmalalalalalalalalanbmanananananananananchchchcicicichchanananbmananchchchchchchchchcicicicicichchchchchananananananananananananananananananananananananananananananananananananananauauaualalalalalalalalalalalalalananananaCananananananan
+ananananananaCananananananananananaUaUaUanananalalalalalalalalanananananananananananananchchchchchananananananananananananchchchchchchchchchchananbsananananananananananananananananananananananananananananananananananananananazazazalalalalalalalalalalalalalananananaCananananananan
+ananananananaCananananananananbmanaOaOaOanananapapapapapapapapanananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananbsanananananaUaUaUapapapapapapapcIapapapapapananananaCananananananan
+ananananananaCananananananananananaXaXaXanananauauauauauauauauanananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananbmanananananananananananananananaOaOaOauauauauauauauauauauauauauananananaCananananananan
+ananananananaCananananananananananananananananazazazazazazazazananananananbmanananananananananananananananananananananananananananananananananananananananbmananananananananananananananananananananananananananananananananananaXaXaXazazazazazazazazazazazazazananananaCananananananan
+ananananananaCananananananananananananananananaUaUaUaUaUaUaUaUananananananananananananananananananananananananananananananananaVanananananananananananananananananananananananananananananananananananananananananananananananbsanananaUaUaUaUaUaUaUaUaUaUaUaUaUananananaCananananananan
+ananananananaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCeieieieieieieieiaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCaCeieieieieieieieieieieieieiaCaCaCaCaCananananananan
+anananananananananananananananananananananananaXaXaXaXaXaXaXaXananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananaXaXaXaXaXaXaXaXaXaXaXaXaXanaqanananananananananan
+anananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananbsavawaxananananananananan
+ananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananbmananananananananananaAanananananananananan
+anananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananan
+anananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananan
+anananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananananan
+"}
diff --git a/maps/atoll/atoll_decals.dm b/maps/atoll/atoll_decals.dm
new file mode 100644
index 0000000000..625c757814
--- /dev/null
+++ b/maps/atoll/atoll_decals.dm
@@ -0,0 +1,62 @@
+/obj/effect/floor_decal/atoll
+ name = "mural"
+ icon = 'maps/atoll/icons/decals/marble_decals.dmi'
+ icon_state = "mural"
+
+/obj/effect/floor_decal/atoll/damage
+ name = "damaged flooring"
+ icon_state = "damage"
+
+/obj/effect/floor_decal/atoll/bronze
+ name = "bronze filling"
+ icon_state = "bronze"
+
+/obj/effect/floor_decal/atoll/border
+ name = "marble border"
+ icon_state = "border"
+
+/obj/effect/floor_decal/atoll/border/invert
+ icon_state = "border_invert"
+
+/obj/effect/floor_decal/atoll/stairs
+ name = "marble stairs"
+ icon_state = "stairs"
+
+/obj/effect/floor_decal/atoll/stairs/Initialize()
+ dir = pick(cardinal)
+ . = ..()
+
+/obj/effect/floor_decal/atoll/moss
+ name = "moss"
+ icon_state = "moss"
+
+/obj/effect/floor_decal/atoll/moss/random/Initialize()
+ dir = pick(alldirs)
+ . = ..()
+
+/obj/effect/floor_decal/atoll/power
+ icon_state = "power"
+
+//Fake shadows and silhouettes
+/obj/effect/decal/shadow
+ icon = 'maps/atoll/icons/decals/wall_decals.dmi'
+ icon_state = "wall_shadow"
+ anchored = 1
+
+/obj/effect/decal/shadow/silhouette
+ icon_state = "silhouette"
+
+/obj/effect/decal/shadow/silhouette/pillar
+ icon_state = "silhouette_p"
+
+/obj/effect/decal/shadow/floor
+ icon_state = "floor_shadow"
+
+/obj/effect/decal/whitecaps
+ icon = 'maps/atoll/icons/turfs/water.dmi'
+ icon_state = "1"
+ anchored = 1
+
+/obj/effect/decal/whitecaps/Initialize()
+ icon_state = pick("1","2","3")
+ . = ..()
\ No newline at end of file
diff --git a/maps/atoll/atoll_objs.dm b/maps/atoll/atoll_objs.dm
new file mode 100644
index 0000000000..5b2a3e1652
--- /dev/null
+++ b/maps/atoll/atoll_objs.dm
@@ -0,0 +1,69 @@
+//THESE AREN'T OBJECTS THESE ARE AREAS WTF BURRITO!!!
+/area/gateway/atoll
+ name = "Away Site - Lake"
+ dynamic_lighting = 0
+
+/area/gateway/atoll/powered
+ requires_power = 0
+
+/obj/structure/railing/overhang
+ name = "bronze ledge"
+ desc = "An overhang made of a bronze-looking material. There's a lip on it to conveniently stub a toe into."
+ icon = 'maps/atoll/icons/objs/bronze_overhang.dmi'
+ icon_modifier = "bronze_"
+ icon_state = "bronze_railing0"
+
+//Escape most railing interactions besides tackling people over them
+/obj/structure/railing/overhang/attackby(obj/item/W)
+ if(!istype(W, /obj/item/weapon/grab))
+ return
+ return ..()
+
+/obj/structure/railing/overhang/waterless
+ icon_modifier = "wbronze_"
+ icon_state = "wbronze_railing0"
+ climbable = 0
+
+/obj/structure/bed/chair/sofa/bench/marble
+ name = "marble bench"
+ desc = "Somewhat of an ornate looking bench with faded blue etchings."
+ icon = 'maps/atoll/icons/objs/benches.dmi'
+ icon_state = "bench"
+
+/obj/structure/lightpost/atoll
+ name = "rusty light post"
+ desc = "Actually it's more like a rod with a trapped gas glowing inside some glass, but that's basically what a lightpost is."
+ icon = 'maps/atoll/icons/objs/lamp.dmi'
+ icon_state = "lamp"
+
+/obj/structure/flora/tree/atoll
+ name = "mossy tree"
+ desc = "A messy looking tree with a purple trunk. Vines seem to droop from it."
+ icon = 'maps/atoll/icons/objs/trees.dmi'
+ icon_state = "green"
+
+/obj/structure/flora/tree/atoll/huge
+ name = "massive mossy tree"
+ icon = 'maps/atoll/icons/objs/trees_xl.dmi'
+ icon_state = "tree"
+
+/obj/structure/flora/moss
+ name = "hanging moss"
+ desc = "Some unsightly moss. Clearly the groundskeepers here aren't doing their jobs."
+ icon = 'maps/atoll/icons/objs/moss.dmi'
+ icon_state = "moss"
+
+//TELEPORTER
+/obj/effect/step_trigger/teleporter/atoll
+ name = "strange field"
+ desc = "A prismatic field of... energy, probably. You should definitely rub your face in it."
+ icon = 'maps/atoll/icons/decals/marble_decals.dmi'
+ icon_state = "teleporter"
+ invisibility = 0
+
+//teleport_z must be populated but this is a gateway map
+//switching between tether or another map will change the z
+//so we just do this lmfao
+/obj/effect/step_trigger/teleporter/atoll/Initialize()
+ . = ..()
+ teleport_z = z
\ No newline at end of file
diff --git a/maps/atoll/atoll_turfs.dm b/maps/atoll/atoll_turfs.dm
new file mode 100644
index 0000000000..48a375671d
--- /dev/null
+++ b/maps/atoll/atoll_turfs.dm
@@ -0,0 +1,55 @@
+//All turfs here meant to be "fullbright", no lighting.
+/turf/simulated/floor/atoll
+ name = "marble floor"
+ desc = "Scuff and weathered etchings make these floors out to be pretty old."
+ icon = 'maps/atoll/icons/turfs/marble.dmi'
+ icon_state = "1"
+ dynamic_lighting = 0
+
+//Pick random sprite states and generate damage decals randomly
+/turf/simulated/floor/atoll/Initialize()
+ . = ..()
+ icon_state = "[rand(1,5)]"
+ if(prob(5))
+ new /obj/effect/floor_decal/atoll/damage(src, pick(alldirs))
+
+//holycrapshitcode
+/turf/simulated/floor/atoll/vertical
+ name = "marble wall"
+ desc = "A sheer face wall, extending up to who-knows-how-high."
+ icon_state = "wall"
+ density = 1
+
+/turf/simulated/floor/atoll/vertical/Initialize()
+ . = ..()
+ icon_state = "wall"
+
+/turf/simulated/floor/water/atoll
+ name = "shallow lake"
+ desc = "This water looks pretty shallow and calm. You'd almost feel bad for hopping in and disturbing it's serene flatness."
+ icon = 'maps/atoll/icons/turfs/water.dmi'
+ icon_state = "shallow"
+ under_state = "shallow"
+ dynamic_lighting = 0
+ outdoors = OUTDOORS_NO
+
+//Cut out the caustics overlay and replace with nothing
+/turf/simulated/floor/water/atoll/update_icon()
+ ..()
+ cut_overlays()
+ var/image/water_sprite = image(icon = 'maps/atoll/icons/turfs/water.dmi', icon_state = "shallow", layer = 3.0)
+ add_overlay(water_sprite)
+
+//Spawn animated whitecaps around
+/turf/simulated/floor/water/atoll/Initialize()
+ . = ..()
+ if(prob(25))
+ new /obj/effect/decal/whitecaps(src)
+
+/turf/simulated/floor/outdoors/grass/heavy/atoll
+ dynamic_lighting = 0
+ outdoors = OUTDOORS_NO
+
+/turf/simulated/floor/beach/sand/outdoors/atoll
+ dynamic_lighting = 0
+ outdoors = OUTDOORS_NO
\ No newline at end of file
diff --git a/maps/atoll/icons/decals/marble_decals.dmi b/maps/atoll/icons/decals/marble_decals.dmi
new file mode 100644
index 0000000000..f7b7a071e9
Binary files /dev/null and b/maps/atoll/icons/decals/marble_decals.dmi differ
diff --git a/maps/atoll/icons/decals/wall_decals.dmi b/maps/atoll/icons/decals/wall_decals.dmi
new file mode 100644
index 0000000000..e05099cf80
Binary files /dev/null and b/maps/atoll/icons/decals/wall_decals.dmi differ
diff --git a/maps/atoll/icons/objs/benches.dmi b/maps/atoll/icons/objs/benches.dmi
new file mode 100644
index 0000000000..5228bfa261
Binary files /dev/null and b/maps/atoll/icons/objs/benches.dmi differ
diff --git a/maps/atoll/icons/objs/bronze_overhang.dmi b/maps/atoll/icons/objs/bronze_overhang.dmi
new file mode 100644
index 0000000000..730c09e4ed
Binary files /dev/null and b/maps/atoll/icons/objs/bronze_overhang.dmi differ
diff --git a/maps/atoll/icons/objs/lamp.dmi b/maps/atoll/icons/objs/lamp.dmi
new file mode 100644
index 0000000000..204fb5d432
Binary files /dev/null and b/maps/atoll/icons/objs/lamp.dmi differ
diff --git a/maps/atoll/icons/objs/moss.dmi b/maps/atoll/icons/objs/moss.dmi
new file mode 100644
index 0000000000..4798478559
Binary files /dev/null and b/maps/atoll/icons/objs/moss.dmi differ
diff --git a/maps/atoll/icons/objs/trees.dmi b/maps/atoll/icons/objs/trees.dmi
new file mode 100644
index 0000000000..e60d10d270
Binary files /dev/null and b/maps/atoll/icons/objs/trees.dmi differ
diff --git a/maps/atoll/icons/objs/trees_xl.dmi b/maps/atoll/icons/objs/trees_xl.dmi
new file mode 100644
index 0000000000..d3f7c66e02
Binary files /dev/null and b/maps/atoll/icons/objs/trees_xl.dmi differ
diff --git a/maps/atoll/icons/turfs/marble.dmi b/maps/atoll/icons/turfs/marble.dmi
new file mode 100644
index 0000000000..939da7768b
Binary files /dev/null and b/maps/atoll/icons/turfs/marble.dmi differ
diff --git a/maps/atoll/icons/turfs/water.dmi b/maps/atoll/icons/turfs/water.dmi
new file mode 100644
index 0000000000..05b828bdbf
Binary files /dev/null and b/maps/atoll/icons/turfs/water.dmi differ
diff --git a/maps/example/example.dm b/maps/example/example.dm
index d2639b8885..e88eaaf7ba 100644
--- a/maps/example/example.dm
+++ b/maps/example/example.dm
@@ -10,6 +10,8 @@
#define USING_MAP_DATUM /datum/map/example
+ #warn Please uncheck example before committing
+
#elif !defined(MAP_OVERRIDE)
#warn A map has already been included, ignoring Northern Star
diff --git a/maps/expedition_vr/beach/beach.dmm b/maps/expedition_vr/beach/beach.dmm
index 86e53b1aaa..1d3c1e6233 100644
--- a/maps/expedition_vr/beach/beach.dmm
+++ b/maps/expedition_vr/beach/beach.dmm
@@ -873,6 +873,10 @@
"nD" = (
/turf/simulated/mineral/ignore_mapgen,
/area/tether_away/beach/water)
+"nP" = (
+/mob/living/simple_mob/animal/passive/fennec/faux,
+/turf/simulated/floor/wood,
+/area/tether_away/beach/resort/kitchen)
"of" = (
/obj/structure/table/woodentable,
/obj/random/drinkbottle,
@@ -1345,16 +1349,16 @@
/turf/simulated/floor/beach/sand/outdoors,
/area/tether_away/beach/resort)
"Bk" = (
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
/obj/item/weapon/reagent_containers/food/condiment/small/sugar,
/obj/item/weapon/reagent_containers/food/condiment/small/sugar,
/obj/item/weapon/reagent_containers/food/condiment/small/sugar,
@@ -1363,10 +1367,10 @@
/obj/item/weapon/reagent_containers/food/condiment/spacespice,
/obj/item/weapon/reagent_containers/food/condiment/spacespice,
/obj/item/weapon/reagent_containers/food/condiment/spacespice,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
/obj/item/weapon/material/knife/butch,
/obj/item/weapon/material/minihoe,
/obj/item/weapon/material/knife/machete/hatchet,
@@ -11048,7 +11052,7 @@ ad
ad
ad
ad
-ad
+nP
ad
ad
ad
diff --git a/maps/gateway_vr/eggnogtown.dmm b/maps/gateway_vr/eggnogtown.dmm
index 175934ba36..02654d71f2 100644
--- a/maps/gateway_vr/eggnogtown.dmm
+++ b/maps/gateway_vr/eggnogtown.dmm
@@ -1000,16 +1000,16 @@
/turf/simulated/floor/tiled,
/area/gateway/eggnogtown/loniabode)
"gk" = (
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
/obj/item/weapon/reagent_containers/food/condiment/small/sugar,
/obj/item/weapon/reagent_containers/food/condiment/small/sugar,
/obj/item/weapon/reagent_containers/food/condiment/small/sugar,
@@ -1018,10 +1018,10 @@
/obj/item/weapon/reagent_containers/food/condiment/spacespice,
/obj/item/weapon/reagent_containers/food/condiment/spacespice,
/obj/item/weapon/reagent_containers/food/condiment/spacespice,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
/obj/structure/closet,
/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker,
/obj/item/weapon/reagent_containers/food/condiment/small/peppermill,
@@ -3649,7 +3649,7 @@
"Rd" = (
/obj/structure/table/marble,
/obj/item/weapon/material/kitchen/rollingpin,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
/obj/item/weapon/reagent_containers/food/condiment/yeast,
/obj/item/weapon/reagent_containers/food/condiment/spacespice,
/obj/item/weapon/reagent_containers/food/condiment/yeast,
diff --git a/maps/gateway_vr/variable/arynthilake_a.dmm b/maps/gateway_vr/variable/arynthilake_a.dmm
index afc16589d3..41a8be8f09 100644
--- a/maps/gateway_vr/variable/arynthilake_a.dmm
+++ b/maps/gateway_vr/variable/arynthilake_a.dmm
@@ -1143,16 +1143,16 @@
/obj/random/meat,
/obj/random/meat,
/obj/random/meat,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/sugar,
-/obj/item/weapon/reagent_containers/food/condiment/sugar,
-/obj/item/weapon/reagent_containers/food/condiment/sugar,
-/obj/item/weapon/reagent_containers/food/condiment/sugar,
-/obj/item/weapon/reagent_containers/food/condiment/sugar,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/sugar,
+/obj/item/weapon/reagent_containers/food/condiment/carton/sugar,
+/obj/item/weapon/reagent_containers/food/condiment/carton/sugar,
+/obj/item/weapon/reagent_containers/food/condiment/carton/sugar,
+/obj/item/weapon/reagent_containers/food/condiment/carton/sugar,
/obj/item/weapon/reagent_containers/food/condiment/spacespice,
/obj/item/weapon/reagent_containers/food/condiment/spacespice,
/obj/item/weapon/reagent_containers/food/condiment/spacespice,
diff --git a/maps/gateway_vr/variable/arynthilake_b.dmm b/maps/gateway_vr/variable/arynthilake_b.dmm
index bbba59342e..53c799bac4 100644
--- a/maps/gateway_vr/variable/arynthilake_b.dmm
+++ b/maps/gateway_vr/variable/arynthilake_b.dmm
@@ -157,16 +157,16 @@
/obj/random/meat,
/obj/random/meat,
/obj/random/meat,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/sugar,
-/obj/item/weapon/reagent_containers/food/condiment/sugar,
-/obj/item/weapon/reagent_containers/food/condiment/sugar,
-/obj/item/weapon/reagent_containers/food/condiment/sugar,
-/obj/item/weapon/reagent_containers/food/condiment/sugar,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/sugar,
+/obj/item/weapon/reagent_containers/food/condiment/carton/sugar,
+/obj/item/weapon/reagent_containers/food/condiment/carton/sugar,
+/obj/item/weapon/reagent_containers/food/condiment/carton/sugar,
+/obj/item/weapon/reagent_containers/food/condiment/carton/sugar,
/obj/item/weapon/reagent_containers/food/condiment/spacespice,
/obj/item/weapon/reagent_containers/food/condiment/spacespice,
/obj/item/weapon/reagent_containers/food/condiment/spacespice,
diff --git a/maps/gateway_vr/wildwest.dmm b/maps/gateway_vr/wildwest.dmm
index 2a42bcc14f..12a79c33ec 100644
--- a/maps/gateway_vr/wildwest.dmm
+++ b/maps/gateway_vr/wildwest.dmm
@@ -676,9 +676,9 @@
/area/awaymission/wwmines)
"fb" = (
/obj/structure/closet/secure_closet/freezer/kitchen,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
/turf/simulated/floor/tiled/eris/cafe,
/area/awaymission/wwmines)
"fc" = (
diff --git a/maps/groundbase/eastwilds/eastwilds1.dmm b/maps/groundbase/eastwilds/eastwilds1.dmm
index 28b038004a..fc499a6095 100644
--- a/maps/groundbase/eastwilds/eastwilds1.dmm
+++ b/maps/groundbase/eastwilds/eastwilds1.dmm
@@ -29,6 +29,12 @@
"r" = (
/turf/simulated/mineral/cave/virgo3c,
/area/submap/groundbase/wilderness/east/cave)
+"u" = (
+/obj/effect/landmark{
+ name = "carpspawn"
+ },
+/turf/simulated/floor/water/deep/virgo3c,
+/area/submap/groundbase/wilderness/east)
"w" = (
/obj/effect/map_effect/portal/master/side_a/gb_wilds/east_west{
dir = 8
@@ -38,6 +44,12 @@
"y" = (
/turf/simulated/mineral/ignore_cavegen,
/area/submap/groundbase/wilderness/east)
+"B" = (
+/obj/effect/landmark{
+ name = "carpspawn"
+ },
+/turf/simulated/floor/water/virgo3c,
+/area/submap/groundbase/wilderness/east)
"F" = (
/turf/simulated/floor/outdoors/grass/virgo3c,
/area/submap/groundbase/wilderness/east/unexplored)
@@ -2383,7 +2395,7 @@ U
U
U
U
-U
+u
U
U
U
@@ -2653,7 +2665,7 @@ U
U
U
U
-U
+u
U
U
U
@@ -2972,7 +2984,7 @@ U
U
U
U
-U
+u
U
U
U
@@ -3421,7 +3433,7 @@ U
U
U
U
-U
+u
U
U
U
@@ -3513,7 +3525,7 @@ U
U
U
U
-U
+u
U
U
U
@@ -4779,7 +4791,7 @@ Z
U
U
U
-U
+u
U
U
U
@@ -4839,7 +4851,7 @@ Z
Z
Z
U
-U
+u
U
U
U
@@ -5212,7 +5224,7 @@ U
U
U
U
-U
+u
U
U
U
@@ -5245,7 +5257,7 @@ Z
Z
U
U
-U
+u
U
U
U
@@ -5414,7 +5426,7 @@ U
U
U
U
-U
+u
Z
Z
Z
@@ -6518,7 +6530,7 @@ F
V
V
Z
-Z
+B
Z
Z
Z
@@ -6908,7 +6920,7 @@ Z
Z
Z
Z
-U
+u
U
U
U
@@ -6971,7 +6983,7 @@ U
U
U
U
-U
+u
U
U
Z
@@ -8192,7 +8204,7 @@ U
U
U
U
-U
+u
U
U
U
@@ -8245,7 +8257,7 @@ U
U
U
U
-U
+u
U
U
U
@@ -9461,7 +9473,7 @@ r
r
Z
Z
-Z
+B
Z
U
U
@@ -10186,7 +10198,7 @@ U
U
U
U
-U
+u
U
U
Z
@@ -10322,7 +10334,7 @@ U
U
U
U
-U
+u
U
U
U
@@ -10374,7 +10386,7 @@ U
U
U
U
-U
+u
U
U
U
@@ -11219,7 +11231,7 @@ Z
U
U
U
-U
+u
U
U
U
@@ -11373,7 +11385,7 @@ U
U
U
U
-U
+u
U
Z
Z
@@ -11476,7 +11488,7 @@ U
U
U
U
-U
+u
U
U
U
@@ -12337,7 +12349,7 @@ U
U
U
U
-U
+u
U
U
U
@@ -12456,7 +12468,7 @@ Z
Z
Z
U
-U
+u
U
U
U
@@ -12778,7 +12790,7 @@ U
U
U
U
-U
+u
U
U
U
@@ -13757,7 +13769,7 @@ Z
Z
U
U
-U
+u
U
U
U
@@ -13767,7 +13779,7 @@ Z
Z
Z
Z
-Z
+B
Z
Z
Z
@@ -15893,7 +15905,7 @@ V
V
V
Z
-Z
+B
Z
Z
Z
diff --git a/maps/groundbase/eastwilds/eastwilds2.dmm b/maps/groundbase/eastwilds/eastwilds2.dmm
index fdd0dfdc34..33a58e58c2 100644
--- a/maps/groundbase/eastwilds/eastwilds2.dmm
+++ b/maps/groundbase/eastwilds/eastwilds2.dmm
@@ -37,6 +37,12 @@
},
/turf/simulated/floor/water/deep/virgo3c,
/area/submap/groundbase/wilderness/east)
+"B" = (
+/obj/effect/landmark{
+ name = "carpspawn"
+ },
+/turf/simulated/floor/water/deep/virgo3c,
+/area/submap/groundbase/wilderness/east)
"F" = (
/turf/simulated/floor/outdoors/grass/virgo3c,
/area/submap/groundbase/wilderness/east/unexplored)
@@ -46,6 +52,12 @@
},
/turf/simulated/floor/outdoors/grass/forest/virgo3c,
/area/submap/groundbase/wilderness/east)
+"I" = (
+/obj/effect/landmark{
+ name = "carpspawn"
+ },
+/turf/simulated/floor/water/virgo3c,
+/area/submap/groundbase/wilderness/east)
"V" = (
/obj/effect/map_effect/portal/master/side_b/gb_wilds/east{
dir = 4
@@ -949,7 +961,7 @@ Z
Z
Z
t
-t
+B
t
t
Z
@@ -3082,7 +3094,7 @@ l
l
Z
Z
-Z
+I
t
t
t
@@ -5071,7 +5083,7 @@ Z
Z
Z
Z
-Z
+I
n
n
F
@@ -5917,7 +5929,7 @@ F
n
Z
Z
-Z
+I
Z
Z
Z
@@ -6912,7 +6924,7 @@ t
t
t
t
-Z
+I
Z
Z
Z
@@ -7225,7 +7237,7 @@ Z
t
t
t
-t
+B
t
t
t
@@ -7515,7 +7527,7 @@ t
t
Z
Z
-Z
+I
Z
n
n
@@ -8044,7 +8056,7 @@ Z
Z
Z
Z
-t
+B
t
t
t
@@ -8128,7 +8140,7 @@ n
n
Z
Z
-Z
+I
Z
Z
Z
@@ -8341,7 +8353,7 @@ t
t
t
t
-Z
+I
Z
Z
Z
@@ -8695,7 +8707,7 @@ Z
Z
t
t
-t
+B
t
t
t
@@ -8904,7 +8916,7 @@ t
t
Z
Z
-Z
+I
Z
Z
Z
@@ -8992,7 +9004,7 @@ t
t
t
t
-t
+B
Z
Z
Z
@@ -9067,7 +9079,7 @@ n
n
Z
Z
-Z
+I
t
Z
Z
@@ -9412,7 +9424,7 @@ t
t
t
t
-t
+B
t
t
t
@@ -9689,7 +9701,7 @@ n
Z
Z
Z
-Z
+I
t
t
t
@@ -10688,7 +10700,7 @@ Z
t
t
t
-t
+B
t
t
t
@@ -11336,7 +11348,7 @@ n
n
n
Z
-Z
+I
Z
n
n
@@ -11513,7 +11525,7 @@ t
t
t
t
-t
+B
t
t
t
@@ -11532,7 +11544,7 @@ Z
Z
t
t
-t
+B
t
t
t
@@ -12521,7 +12533,7 @@ t
t
t
t
-t
+B
t
t
t
@@ -12787,7 +12799,7 @@ t
t
t
t
-t
+B
t
t
t
@@ -13531,7 +13543,7 @@ t
t
t
t
-t
+B
t
Z
Z
@@ -13953,7 +13965,7 @@ t
t
t
t
-t
+B
t
t
t
@@ -14303,7 +14315,7 @@ Z
Z
Z
Z
-Z
+I
Z
Z
Z
@@ -14620,7 +14632,7 @@ n
n
Z
Z
-Z
+I
Z
Z
Z
@@ -14644,6 +14656,7 @@ Z
Z
Z
t
+B
t
t
t
@@ -14655,8 +14668,7 @@ t
t
t
t
-t
-t
+B
t
t
t
@@ -16027,7 +16039,7 @@ Z
Z
Z
Z
-Z
+I
Z
Z
Z
@@ -16081,6 +16093,7 @@ t
t
t
t
+B
t
t
t
@@ -16090,8 +16103,7 @@ t
t
t
t
-t
-t
+B
t
t
t
@@ -16352,7 +16364,7 @@ Z
Z
t
t
-t
+B
t
t
t
@@ -16937,7 +16949,7 @@ t
t
t
t
-t
+B
t
t
t
@@ -17085,7 +17097,7 @@ t
t
t
t
-t
+B
Z
Z
Z
diff --git a/maps/groundbase/gb-wilds.dm b/maps/groundbase/gb-wilds.dm
index ad2969a473..dee73d1c51 100644
--- a/maps/groundbase/gb-wilds.dm
+++ b/maps/groundbase/gb-wilds.dm
@@ -47,6 +47,7 @@
name = "wilderness"
icon = 'icons/turf/areas_vr.dmi'
icon_state = "greblacir"
+ base_turf = /turf/simulated/mineral/floor/virgo3c
/area/submap/groundbase/wilderness/north
/area/submap/groundbase/wilderness/north/unexplored
icon_state = "orablacir"
diff --git a/maps/groundbase/gb-z1.dmm b/maps/groundbase/gb-z1.dmm
index 9961fcef26..dc9a91d3c3 100644
--- a/maps/groundbase/gb-z1.dmm
+++ b/maps/groundbase/gb-z1.dmm
@@ -885,7 +885,7 @@
/obj/random/tech_supply,
/obj/random/tech_supply,
/obj/random/tech_supply,
-/obj/item/device/paicard,
+/obj/random/paicard,
/turf/simulated/floor/tiled,
/area/groundbase/civilian/toolstorage)
"cs" = (
@@ -2033,6 +2033,8 @@
/obj/structure/sign/painting/library_secure{
pixel_y = -30
},
+/obj/item/weapon/reagent_containers/food/drinks/shaker,
+/obj/item/weapon/reagent_containers/glass/rag,
/turf/simulated/floor/lino,
/area/groundbase/civilian/cafe)
"fk" = (
@@ -4302,6 +4304,11 @@
},
/turf/simulated/floor/tiled/dark,
/area/groundbase/security/equipment)
+"kP" = (
+/obj/structure/table/glass,
+/obj/random/paicard,
+/turf/simulated/floor/tiled/dark,
+/area/groundbase/civilian/bar)
"kQ" = (
/obj/machinery/power/apc{
dir = 8;
@@ -5546,7 +5553,7 @@
/area/groundbase/security/lobby)
"nU" = (
/obj/structure/table/reinforced,
-/obj/item/device/paicard,
+/obj/random/paicard,
/obj/machinery/recharger{
pixel_y = 5
},
@@ -6658,8 +6665,8 @@
/obj/machinery/cell_charger{
pixel_y = 7
},
-/obj/item/weapon/cell/high,
-/obj/item/weapon/cell/high,
+/obj/item/weapon/cell/super,
+/obj/item/weapon/cell/super,
/turf/simulated/floor/tiled,
/area/groundbase/cargo/mining)
"qG" = (
@@ -7379,7 +7386,7 @@
/area/groundbase/security/lobby)
"sq" = (
/obj/structure/table/woodentable,
-/obj/item/device/paicard,
+/obj/random/paicard,
/obj/structure/cable/yellow{
icon_state = "2-8"
},
@@ -13713,6 +13720,7 @@
/obj/structure/cable/yellow{
icon_state = "0-4"
},
+/obj/random/paicard,
/turf/simulated/floor/tiled/dark,
/area/groundbase/security/hos)
"Hw" = (
@@ -14170,6 +14178,7 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
},
+/obj/random/paicard,
/turf/simulated/floor/tiled,
/area/groundbase/engineering/ce)
"Iy" = (
@@ -16174,6 +16183,8 @@
pixel_x = -3;
pixel_y = 26
},
+/obj/item/weapon/reagent_containers/food/drinks/shaker,
+/obj/item/weapon/reagent_containers/glass/rag,
/turf/simulated/floor/lino,
/area/groundbase/civilian/bar)
"Nh" = (
@@ -17892,6 +17903,12 @@
},
/turf/simulated/floor/outdoors/sidewalk/side/virgo3c,
/area/groundbase/level1/centsquare)
+"RB" = (
+/obj/effect/landmark{
+ name = "carpspawn"
+ },
+/turf/simulated/floor/water/deep/virgo3c,
+/area/groundbase/level1/eastspur)
"RC" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/obj/machinery/light{
@@ -25353,7 +25370,7 @@ ht
ht
KR
GF
-GF
+kP
oQ
uF
pj
@@ -39104,7 +39121,7 @@ df
uH
uH
eW
-eW
+RB
eW
uH
uH
@@ -39657,7 +39674,7 @@ eW
eW
eW
eW
-eW
+RB
eW
eW
eW
@@ -39688,11 +39705,11 @@ eW
eW
eW
eW
+RB
eW
eW
eW
-eW
-eW
+RB
eW
eW
eW
@@ -39959,13 +39976,13 @@ eW
eW
eW
eW
+RB
eW
eW
eW
eW
eW
-eW
-eW
+RB
eW
eW
eW
@@ -40236,7 +40253,7 @@ uH
uH
uH
eW
-eW
+RB
eW
eW
eW
diff --git a/maps/groundbase/gb-z2.dmm b/maps/groundbase/gb-z2.dmm
index 0b91d7cd41..48d050d8cf 100644
--- a/maps/groundbase/gb-z2.dmm
+++ b/maps/groundbase/gb-z2.dmm
@@ -673,6 +673,7 @@
/obj/machinery/light/small{
dir = 8
},
+/obj/random/paicard,
/turf/simulated/floor/wood,
/area/groundbase/command/captainq)
"bQ" = (
@@ -809,11 +810,8 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable/yellow{
- icon_state = "1-8"
- },
/turf/simulated/floor/tiled/dark,
-/area/groundbase/civilian/bar/upper)
+/area/groundbase/civilian/bar)
"cm" = (
/obj/structure/closet/secure_closet/freezer/meat,
/turf/simulated/floor/tiled/eris/cafe,
@@ -869,7 +867,7 @@
dir = 8
},
/turf/simulated/floor/tiled/dark,
-/area/groundbase/civilian/bar/upper)
+/area/groundbase/civilian/bar)
"ct" = (
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -1025,7 +1023,7 @@
"cU" = (
/obj/structure/table/bench/padded,
/turf/simulated/floor/tiled/dark,
-/area/groundbase/civilian/bar/upper)
+/area/groundbase/civilian/bar)
"cV" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 8
@@ -2672,7 +2670,7 @@
"hL" = (
/obj/machinery/light,
/turf/simulated/floor/tiled/dark,
-/area/groundbase/civilian/bar/upper)
+/area/groundbase/civilian/bar)
"hM" = (
/obj/structure/grille,
/obj/structure/window/reinforced/full,
@@ -2719,7 +2717,7 @@
/area/rnd/xenobiology)
"hU" = (
/obj/machinery/button/remote/blast_door{
- id = "rndshutters";
+ id = "robshutters";
name = "Privacy Shutter Control";
pixel_y = 30
},
@@ -2766,7 +2764,7 @@
pixel_x = 32
},
/turf/simulated/floor/tiled/dark,
-/area/groundbase/civilian/bar/upper)
+/area/groundbase/civilian/bar)
"hZ" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -2795,7 +2793,7 @@
dir = 8
},
/turf/simulated/floor/tiled/dark,
-/area/groundbase/civilian/bar/upper)
+/area/groundbase/civilian/bar)
"ic" = (
/obj/structure/extinguisher_cabinet{
dir = 8;
@@ -2870,7 +2868,7 @@
icon_state = "2-4"
},
/turf/simulated/floor/tiled/dark,
-/area/groundbase/civilian/bar/upper)
+/area/groundbase/civilian/bar)
"ir" = (
/obj/machinery/firealarm{
dir = 8
@@ -2958,7 +2956,7 @@
},
/obj/effect/landmark/start/intern,
/turf/simulated/floor/tiled/dark,
-/area/groundbase/civilian/bar/upper)
+/area/groundbase/civilian/bar)
"iC" = (
/turf/simulated/wall/r_wall,
/area/groundbase/command/hop)
@@ -3271,7 +3269,7 @@
dir = 4
},
/turf/simulated/floor/tiled/dark,
-/area/groundbase/civilian/bar/upper)
+/area/groundbase/civilian/bar)
"jv" = (
/obj/machinery/appliance/cooker/grill,
/turf/simulated/floor/tiled/eris/cafe,
@@ -3450,7 +3448,7 @@
},
/obj/machinery/light,
/turf/simulated/floor/tiled/dark,
-/area/groundbase/civilian/bar/upper)
+/area/groundbase/civilian/bar)
"jU" = (
/obj/machinery/door/firedoor/glass,
/obj/machinery/door/airlock/glass_research{
@@ -3780,7 +3778,7 @@
pixel_y = 5
},
/turf/simulated/floor/tiled/dark,
-/area/groundbase/civilian/bar/upper)
+/area/groundbase/civilian/bar)
"kY" = (
/obj/machinery/power/apc{
dir = 8
@@ -3946,7 +3944,7 @@
},
/obj/effect/landmark/start/visitor,
/turf/simulated/floor/tiled/dark,
-/area/groundbase/civilian/bar/upper)
+/area/groundbase/civilian/bar)
"lv" = (
/obj/structure/closet/secure_closet/hydroponics{
req_access = list(77)
@@ -4446,7 +4444,7 @@
},
/obj/random/coin/sometimes,
/turf/simulated/floor/tiled/dark,
-/area/groundbase/civilian/bar/upper)
+/area/groundbase/civilian/bar)
"mN" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
@@ -4953,7 +4951,9 @@
/turf/simulated/floor/tiled,
/area/groundbase/science/xenobot)
"oy" = (
-/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c,
+/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c{
+ outdoors = 0
+ },
/area/groundbase/level2/se)
"oA" = (
/obj/machinery/door/blast/regular{
@@ -5295,7 +5295,7 @@
/area/groundbase/command/hop)
"pA" = (
/obj/structure/table/hardwoodtable,
-/obj/item/device/paicard,
+/obj/random/paicard,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
@@ -5491,6 +5491,15 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/tiled/dark,
/area/groundbase/dorms)
+"qc" = (
+/obj/structure/railing/grey{
+ dir = 1
+ },
+/obj/structure/railing/grey{
+ dir = 8
+ },
+/turf/simulated/open,
+/area/groundbase/civilian/bar)
"qd" = (
/obj/structure/sign/nanotrasen{
pixel_x = 32;
@@ -5768,10 +5777,18 @@
/turf/simulated/floor/tiled,
/area/groundbase/science/xenobot)
"qQ" = (
-/obj/structure/table/standard,
-/obj/structure/noticeboard{
- pixel_y = -32
+/obj/structure/closet/chefcloset,
+/obj/item/glass_jar,
+/obj/item/device/retail_scanner/civilian,
+/obj/item/weapon/soap/nanotrasen,
+/obj/item/device/destTagger{
+ pixel_x = 4;
+ pixel_y = 3
},
+/obj/item/weapon/packageWrap,
+/obj/item/weapon/packageWrap,
+/obj/item/weapon/packageWrap,
+/obj/item/weapon/tool/wrench,
/turf/simulated/floor/tiled/eris/cafe,
/area/groundbase/civilian/kitchen)
"qS" = (
@@ -5909,7 +5926,7 @@
/obj/structure/window/reinforced/full,
/obj/machinery/door/firedoor,
/turf/simulated/floor,
-/area/groundbase/civilian/bar/upper)
+/area/groundbase/civilian/bar)
"rm" = (
/obj/machinery/light,
/turf/simulated/floor/wood,
@@ -6222,7 +6239,7 @@
},
/obj/effect/landmark/start/intern,
/turf/simulated/floor/tiled/dark,
-/area/groundbase/civilian/bar/upper)
+/area/groundbase/civilian/bar)
"se" = (
/obj/item/device/aicard,
/obj/structure/table/reinforced,
@@ -6266,7 +6283,7 @@
dir = 8
},
/turf/simulated/floor/tiled/dark,
-/area/groundbase/civilian/bar/upper)
+/area/groundbase/civilian/bar)
"sn" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/light{
@@ -6405,7 +6422,7 @@
dir = 5
},
/turf/simulated/floor/tiled/dark,
-/area/groundbase/civilian/bar/upper)
+/area/groundbase/civilian/bar)
"sI" = (
/obj/structure/disposalpipe/sortjunction/flipped{
dir = 1;
@@ -7175,18 +7192,18 @@
/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c,
/area/groundbase/level2/northspur)
"uU" = (
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
/obj/item/weapon/reagent_containers/food/condiment/spacespice,
/obj/item/weapon/reagent_containers/food/condiment/spacespice,
-/obj/item/weapon/reagent_containers/food/condiment/sugar,
-/obj/item/weapon/reagent_containers/food/condiment/sugar,
+/obj/item/weapon/reagent_containers/food/condiment/carton/sugar,
+/obj/item/weapon/reagent_containers/food/condiment/carton/sugar,
/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker,
/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker,
/obj/item/weapon/reagent_containers/food/condiment/small/peppermill,
@@ -7556,7 +7573,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/effect/landmark/start/visitor,
/turf/simulated/floor/tiled/dark,
-/area/groundbase/civilian/bar/upper)
+/area/groundbase/civilian/bar)
"we" = (
/obj/structure/cable/yellow{
icon_state = "2-4"
@@ -7663,7 +7680,7 @@
},
/obj/machinery/hologram/holopad,
/turf/simulated/floor/tiled/dark,
-/area/groundbase/civilian/bar/upper)
+/area/groundbase/civilian/bar)
"ww" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -7907,7 +7924,7 @@
icon_state = "1-2"
},
/turf/simulated/floor/tiled/dark,
-/area/groundbase/civilian/bar/upper)
+/area/groundbase/civilian/bar)
"xo" = (
/obj/structure/table/reinforced,
/obj/machinery/chemical_dispenser/biochemistry/full,
@@ -8105,7 +8122,7 @@
},
/obj/machinery/alarm,
/turf/simulated/floor/tiled/dark,
-/area/groundbase/civilian/bar/upper)
+/area/groundbase/civilian/bar)
"xN" = (
/obj/machinery/door/blast/regular{
density = 0;
@@ -8131,7 +8148,7 @@
/obj/structure/table/glass,
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/tiled/dark,
-/area/groundbase/civilian/bar/upper)
+/area/groundbase/civilian/bar)
"xU" = (
/obj/structure/grille,
/obj/machinery/door/firedoor,
@@ -8230,13 +8247,13 @@
},
/obj/effect/landmark/start/intern,
/turf/simulated/floor/tiled/dark,
-/area/groundbase/civilian/bar/upper)
+/area/groundbase/civilian/bar)
"yh" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/turf/simulated/floor/tiled/dark,
-/area/groundbase/civilian/bar/upper)
+/area/groundbase/civilian/bar)
"yj" = (
/obj/structure/sign/directions/kitchen{
pixel_x = -32
@@ -8424,7 +8441,7 @@
pixel_x = 32
},
/turf/simulated/floor/tiled/dark,
-/area/groundbase/civilian/bar/upper)
+/area/groundbase/civilian/bar)
"yJ" = (
/obj/structure/bed/chair{
dir = 4
@@ -9003,7 +9020,7 @@
pixel_y = 4
},
/obj/item/weapon/circuitboard/teleporter,
-/obj/item/device/paicard{
+/obj/random/paicard{
pixel_x = 4
},
/obj/item/device/taperecorder{
@@ -9066,14 +9083,8 @@
"AK" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/power/apc{
- dir = 8
- },
-/obj/structure/cable/yellow{
- icon_state = "0-2"
- },
/turf/simulated/floor/tiled/dark,
-/area/groundbase/civilian/bar/upper)
+/area/groundbase/civilian/bar)
"AL" = (
/obj/effect/floor_decal/industrial/outline/yellow,
/turf/simulated/floor/tiled/dark,
@@ -9197,7 +9208,7 @@
},
/obj/effect/landmark/start/visitor,
/turf/simulated/floor/tiled/dark,
-/area/groundbase/civilian/bar/upper)
+/area/groundbase/civilian/bar)
"AT" = (
/turf/simulated/floor/outdoors/grass/virgo3c,
/area/groundbase/science/xenobot)
@@ -9485,7 +9496,7 @@
icon_state = "4-8"
},
/turf/simulated/floor/bmarble,
-/area/groundbase/civilian/bar/upper)
+/area/groundbase/civilian/bar)
"BU" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -9627,7 +9638,7 @@
icon_state = "4-8"
},
/turf/simulated/floor/tiled/dark,
-/area/groundbase/civilian/bar/upper)
+/area/groundbase/civilian/bar)
"Cj" = (
/obj/structure/sign/directions/stairs_down{
pixel_y = 38
@@ -9737,7 +9748,7 @@
dir = 1
},
/turf/simulated/open,
-/area/groundbase/civilian/bar/upper)
+/area/groundbase/civilian/bar)
"CE" = (
/turf/simulated/floor/wood,
/area/groundbase/dorms/room8)
@@ -10044,7 +10055,7 @@
pixel_x = 25
},
/turf/simulated/floor/tiled/dark,
-/area/groundbase/civilian/bar/upper)
+/area/groundbase/civilian/bar)
"Du" = (
/turf/simulated/wall,
/area/groundbase/medical/lobby)
@@ -10067,7 +10078,7 @@
},
/obj/machinery/camera/network/civilian,
/turf/simulated/floor/tiled/dark,
-/area/groundbase/civilian/bar/upper)
+/area/groundbase/civilian/bar)
"Dy" = (
/obj/structure/table/reinforced,
/obj/machinery/requests_console{
@@ -10243,7 +10254,7 @@
dir = 1
},
/turf/simulated/floor/tiled/dark,
-/area/groundbase/civilian/bar/upper)
+/area/groundbase/civilian/bar)
"DV" = (
/obj/structure/table/rack,
/obj/item/weapon/tank/jetpack/oxygen,
@@ -10305,13 +10316,13 @@
},
/obj/effect/landmark/start/entertainer,
/turf/simulated/floor/tiled/dark,
-/area/groundbase/civilian/bar/upper)
+/area/groundbase/civilian/bar)
"Ea" = (
/obj/structure/table/bench/padded,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/tiled/dark,
-/area/groundbase/civilian/bar/upper)
+/area/groundbase/civilian/bar)
"Eb" = (
/obj/machinery/atmospherics/portables_connector{
dir = 1
@@ -10828,7 +10839,7 @@
/area/groundbase/cargo/office)
"FF" = (
/turf/simulated/wall,
-/area/groundbase/civilian/bar/upper)
+/area/groundbase/civilian/bar)
"FI" = (
/obj/structure/fence/corner{
dir = 5
@@ -10894,7 +10905,7 @@
},
/obj/machinery/hologram/holopad,
/turf/simulated/floor/tiled/dark,
-/area/groundbase/civilian/bar/upper)
+/area/groundbase/civilian/bar)
"FU" = (
/obj/structure/table/bench/standard,
/obj/effect/landmark/start/rd,
@@ -11024,7 +11035,7 @@
icon_state = "1-4"
},
/turf/simulated/wall,
-/area/groundbase/civilian/bar/upper)
+/area/groundbase/civilian/bar)
"Gp" = (
/turf/simulated/wall,
/area/groundbase/level2/nw)
@@ -11130,6 +11141,12 @@
/obj/machinery/atmospherics/pipe/manifold4w/visible,
/turf/simulated/floor/tiled,
/area/groundbase/science/xenobot/storage)
+"Gz" = (
+/obj/structure/railing/grey{
+ dir = 1
+ },
+/turf/simulated/open,
+/area/groundbase/civilian/bar)
"GA" = (
/obj/structure/table/wooden_reinforced,
/obj/machinery/atmospherics/unary/vent_scrubber/on{
@@ -11646,6 +11663,14 @@
},
/turf/simulated/floor/tiled/white,
/area/groundbase/dorms/room7)
+"HW" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/freezer{
+ name = "Kitchen";
+ req_access = list(28)
+ },
+/turf/simulated/floor/bmarble,
+/area/groundbase/civilian/kitchen)
"HX" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -12250,7 +12275,7 @@
dir = 8
},
/turf/simulated/floor/tiled/dark,
-/area/groundbase/civilian/bar/upper)
+/area/groundbase/civilian/bar)
"JD" = (
/obj/machinery/appliance/cooker/oven,
/turf/simulated/floor/tiled/eris/cafe,
@@ -13092,7 +13117,7 @@
"LS" = (
/obj/structure/table/glass,
/turf/simulated/floor/tiled/dark,
-/area/groundbase/civilian/bar/upper)
+/area/groundbase/civilian/bar)
"LT" = (
/obj/machinery/light/small{
dir = 8
@@ -13113,7 +13138,7 @@
dir = 4
},
/turf/simulated/floor/tiled/dark,
-/area/groundbase/civilian/bar/upper)
+/area/groundbase/civilian/bar)
"LW" = (
/obj/structure/sign/xenobio{
plane = -34
@@ -13391,7 +13416,7 @@
icon_state = "1-2"
},
/turf/simulated/wall,
-/area/groundbase/civilian/bar/upper)
+/area/groundbase/civilian/bar)
"ME" = (
/turf/simulated/wall,
/area/groundbase/civilian/chapel/office)
@@ -13684,7 +13709,7 @@
/area/groundbase/level2/ne)
"Ny" = (
/turf/simulated/floor/tiled/dark,
-/area/groundbase/civilian/bar/upper)
+/area/groundbase/civilian/bar)
"Nz" = (
/obj/structure/bed/chair/sofa/pew/right{
dir = 1
@@ -14086,7 +14111,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/computer/timeclock/premade/east,
/turf/simulated/floor/tiled/dark,
-/area/groundbase/civilian/bar/upper)
+/area/groundbase/civilian/bar)
"OD" = (
/obj/structure/table/reinforced,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -14521,7 +14546,7 @@
dir = 8
},
/turf/simulated/floor/tiled/dark,
-/area/groundbase/civilian/bar/upper)
+/area/groundbase/civilian/bar)
"PT" = (
/obj/machinery/button/remote/airlock{
dir = 8;
@@ -14547,7 +14572,7 @@
dir = 4
},
/turf/simulated/floor/tiled/dark,
-/area/groundbase/civilian/bar/upper)
+/area/groundbase/civilian/bar)
"PV" = (
/turf/simulated/floor/wood,
/area/groundbase/dorms/room2)
@@ -15049,7 +15074,7 @@
dir = 1
},
/turf/simulated/floor/tiled/dark,
-/area/groundbase/civilian/bar/upper)
+/area/groundbase/civilian/bar)
"Rn" = (
/obj/machinery/atmospherics/binary/pump{
dir = 1;
@@ -15276,7 +15301,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/dark,
-/area/groundbase/civilian/bar/upper)
+/area/groundbase/civilian/bar)
"RV" = (
/obj/structure/cable/yellow{
icon_state = "1-8"
@@ -15448,20 +15473,10 @@
/turf/simulated/floor/tiled/dark,
/area/groundbase/dorms)
"Ss" = (
-/obj/structure/closet/chefcloset,
-/obj/item/glass_jar,
-/obj/item/device/retail_scanner/civilian,
-/obj/item/weapon/soap/nanotrasen,
-/obj/item/device/destTagger{
- pixel_x = 4;
- pixel_y = 3
+/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c{
+ outdoors = 0
},
-/obj/item/weapon/packageWrap,
-/obj/item/weapon/packageWrap,
-/obj/item/weapon/packageWrap,
-/obj/item/weapon/tool/wrench,
-/turf/simulated/floor/tiled/eris/cafe,
-/area/groundbase/civilian/kitchen)
+/area/groundbase/level2/nw)
"St" = (
/obj/structure/fence/corner{
dir = 8
@@ -15963,7 +15978,7 @@
/obj/machinery/light,
/obj/effect/landmark/start/entertainer,
/turf/simulated/floor/tiled/dark,
-/area/groundbase/civilian/bar/upper)
+/area/groundbase/civilian/bar)
"TO" = (
/obj/structure/bed/chair/office/dark,
/obj/effect/landmark/start/cargo,
@@ -15981,7 +15996,7 @@
dir = 4
},
/turf/simulated/floor/bmarble,
-/area/groundbase/civilian/bar/upper)
+/area/groundbase/civilian/bar)
"TT" = (
/obj/structure/railing/grey{
dir = 8
@@ -16031,6 +16046,10 @@
},
/turf/simulated/floor/tiled,
/area/rnd/xenobiology)
+"Uc" = (
+/obj/structure/stairs/spawner/south,
+/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c,
+/area/groundbase/level2/nw)
"Ud" = (
/turf/simulated/floor/tiled/white,
/area/groundbase/medical/lobby)
@@ -16072,6 +16091,9 @@
},
/turf/simulated/floor/tiled,
/area/groundbase/science/xenobot/storage)
+"Ui" = (
+/turf/simulated/open,
+/area/groundbase/civilian/bar)
"Uj" = (
/obj/machinery/door/blast/regular{
id = "xenobiodiv4";
@@ -16094,7 +16116,7 @@
icon_state = "1-8"
},
/turf/simulated/floor/tiled/dark,
-/area/groundbase/civilian/bar/upper)
+/area/groundbase/civilian/bar)
"Un" = (
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 10
@@ -16158,14 +16180,14 @@
"Ux" = (
/obj/machinery/hologram/holopad,
/turf/simulated/floor/tiled/dark,
-/area/groundbase/civilian/bar/upper)
+/area/groundbase/civilian/bar)
"Uy" = (
/obj/machinery/light{
dir = 4
},
/obj/random/vendorall,
/turf/simulated/floor/tiled/dark,
-/area/groundbase/civilian/bar/upper)
+/area/groundbase/civilian/bar)
"Uz" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -16749,7 +16771,7 @@
dir = 4
},
/turf/simulated/wall,
-/area/groundbase/civilian/bar/upper)
+/area/groundbase/civilian/bar)
"Wd" = (
/obj/structure/railing/grey{
dir = 8
@@ -16801,7 +16823,7 @@
},
/obj/effect/landmark/start/entertainer,
/turf/simulated/floor/tiled/dark,
-/area/groundbase/civilian/bar/upper)
+/area/groundbase/civilian/bar)
"Wj" = (
/turf/simulated/wall,
/area/groundbase/cargo/office)
@@ -16887,6 +16909,7 @@
dir = 4;
pixel_x = -30
},
+/obj/random/paicard,
/turf/simulated/floor/tiled,
/area/groundbase/science/rd)
"Wz" = (
@@ -17110,7 +17133,7 @@
/obj/structure/table/bench/padded,
/obj/effect/landmark/start/visitor,
/turf/simulated/floor/tiled/dark,
-/area/groundbase/civilian/bar/upper)
+/area/groundbase/civilian/bar)
"Xl" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
@@ -17202,7 +17225,7 @@
pixel_x = -25
},
/turf/simulated/floor/tiled/dark,
-/area/groundbase/civilian/bar/upper)
+/area/groundbase/civilian/bar)
"XB" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
@@ -17417,7 +17440,7 @@
},
/obj/machinery/firealarm,
/turf/simulated/floor/tiled/dark,
-/area/groundbase/civilian/bar/upper)
+/area/groundbase/civilian/bar)
"Yg" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
@@ -17441,7 +17464,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/dark,
-/area/groundbase/civilian/bar/upper)
+/area/groundbase/civilian/bar)
"Ym" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
@@ -17473,7 +17496,7 @@
"Yr" = (
/obj/structure/sign/department/bar,
/turf/simulated/wall,
-/area/groundbase/civilian/bar/upper)
+/area/groundbase/civilian/bar)
"Ys" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
@@ -17612,7 +17635,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/dark,
-/area/groundbase/civilian/bar/upper)
+/area/groundbase/civilian/bar)
"YS" = (
/obj/machinery/biogenerator,
/turf/simulated/floor/tiled,
@@ -18466,7 +18489,7 @@ UH
UH
UH
wS
-Hn
+Ss
Kl
Kl
xE
@@ -18608,7 +18631,7 @@ UH
UH
wS
wS
-Hn
+Ss
Kl
Kl
xE
@@ -21477,11 +21500,11 @@ il
il
LA
bY
-Jc
-Jc
-Jc
bY
bY
+Jc
+Jc
+Jc
bY
bY
bY
@@ -21617,12 +21640,12 @@ bY
bY
bY
bY
-bY
-bY
-bY
-bY
-bY
-bY
+Hn
+Ja
+Hn
+Hn
+Uc
+Gp
bY
bY
bY
@@ -21761,7 +21784,7 @@ Vl
Vl
Vl
Vl
-Vl
+HW
Vl
Vl
JJ
@@ -21903,7 +21926,7 @@ Oz
Ej
ep
LD
-Ss
+Gc
Wp
JO
JJ
@@ -23452,7 +23475,7 @@ Bb
Bb
Iz
yh
-GS
+qc
CD
FF
bY
@@ -23594,8 +23617,8 @@ Ny
Ny
Ny
yh
-YO
-Gl
+Gz
+Ui
rl
bY
sZ
@@ -28289,7 +28312,7 @@ fp
to
to
to
-VR
+fp
fp
fp
fp
diff --git a/maps/groundbase/gb-z3.dmm b/maps/groundbase/gb-z3.dmm
index f8b3d9e6fa..95d87ed2be 100644
--- a/maps/groundbase/gb-z3.dmm
+++ b/maps/groundbase/gb-z3.dmm
@@ -19,6 +19,12 @@
},
/turf/simulated/floor/carpet,
/area/groundbase/medical/cmo)
+"aN" = (
+/obj/item/weapon/stool/padded{
+ dir = 4
+ },
+/turf/simulated/floor/wmarble,
+/area/groundbase/civilian/kitchen)
"aQ" = (
/obj/structure/table/glass,
/obj/item/weapon/folder/white_cmo,
@@ -121,6 +127,12 @@
},
/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c,
/area/groundbase/level3/escapepad)
+"cD" = (
+/obj/structure/railing{
+ dir = 4
+ },
+/turf/simulated/floor/bmarble,
+/area/groundbase/civilian/kitchen)
"cE" = (
/obj/structure/bed/chair/shuttle{
dir = 8
@@ -291,6 +303,11 @@
},
/turf/simulated/floor/tiled/white,
/area/groundbase/medical/uhallway)
+"fn" = (
+/obj/structure/table/steel,
+/obj/random/paicard,
+/turf/simulated/floor/bmarble,
+/area/groundbase/civilian/kitchen)
"fu" = (
/obj/structure/table/bench/marble,
/obj/effect/landmark/start/chemist,
@@ -393,6 +410,11 @@
},
/turf/simulated/floor/tiled/white,
/area/groundbase/medical/uhallway)
+"gV" = (
+/obj/structure/railing,
+/obj/structure/table/steel,
+/turf/simulated/floor/bmarble,
+/area/groundbase/civilian/kitchen)
"gZ" = (
/obj/structure/cable/yellow{
icon_state = "1-4"
@@ -418,6 +440,13 @@
},
/turf/simulated/floor/tiled,
/area/shuttle/groundbase/exploration)
+"hM" = (
+/obj/structure/railing,
+/obj/structure/bed/chair/backed_red{
+ dir = 4
+ },
+/turf/simulated/floor/bmarble,
+/area/groundbase/civilian/kitchen)
"hN" = (
/obj/structure/table/bench/marble,
/obj/effect/landmark/start/medical,
@@ -697,6 +726,16 @@
},
/turf/simulated/wall/r_wall,
/area/groundbase/level3/escapepad)
+"mS" = (
+/obj/structure/railing{
+ dir = 1
+ },
+/obj/structure/table/steel,
+/turf/simulated/floor/bmarble,
+/area/groundbase/civilian/kitchen)
+"mT" = (
+/turf/simulated/floor/wmarble,
+/area/groundbase/civilian/kitchen)
"mU" = (
/obj/structure/cable/yellow{
icon_state = "1-4"
@@ -712,6 +751,12 @@
},
/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c,
/area/groundbase/level3/nw)
+"mY" = (
+/obj/machinery/light{
+ dir = 8
+ },
+/turf/simulated/floor/wmarble,
+/area/groundbase/civilian/kitchen)
"nb" = (
/obj/structure/grille,
/obj/structure/window/reinforced/polarized/full{
@@ -720,6 +765,15 @@
/obj/machinery/door/firedoor,
/turf/simulated/floor,
/area/groundbase/medical/cmo)
+"nh" = (
+/obj/structure/railing{
+ dir = 8
+ },
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/simulated/floor/bmarble,
+/area/groundbase/civilian/kitchen)
"nq" = (
/obj/structure/railing/grey{
dir = 1
@@ -766,8 +820,18 @@
dir = 1
},
/obj/machinery/light,
+/obj/random/paicard,
/turf/simulated/floor/wood,
/area/groundbase/medical/cmo)
+"nD" = (
+/obj/structure/railing{
+ dir = 1
+ },
+/obj/structure/bed/chair/backed_red{
+ dir = 4
+ },
+/turf/simulated/floor/bmarble,
+/area/groundbase/civilian/kitchen)
"nN" = (
/obj/machinery/light,
/obj/effect/landmark/start/explorer,
@@ -824,6 +888,12 @@
/obj/effect/overmap/visitable/sector/virgo3c,
/turf/unsimulated/wall/planetary/virgo3c,
/area/groundbase/level3/sw)
+"oI" = (
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/simulated/floor/wmarble,
+/area/groundbase/civilian/kitchen)
"oK" = (
/obj/structure/grille,
/obj/structure/window/reinforced/full,
@@ -877,6 +947,10 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/tiled/white,
/area/groundbase/medical/patient4)
+"pa" = (
+/obj/item/weapon/stool/padded,
+/turf/simulated/floor/wmarble,
+/area/groundbase/civilian/kitchen)
"pd" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
/obj/machinery/alarm{
@@ -945,6 +1019,12 @@
edge_blending_priority = -1
},
/area/groundbase/exploration/shuttlepad)
+"pP" = (
+/obj/machinery/light{
+ dir = 4
+ },
+/turf/simulated/floor/wmarble,
+/area/groundbase/civilian/kitchen)
"pY" = (
/obj/structure/sign/nanotrasen,
/turf/simulated/wall,
@@ -1025,6 +1105,13 @@
},
/turf/simulated/floor/tiled/white,
/area/groundbase/medical/patient1)
+"rr" = (
+/obj/structure/railing,
+/obj/machinery/light{
+ dir = 8
+ },
+/turf/simulated/floor/bmarble,
+/area/groundbase/civilian/kitchen)
"rD" = (
/obj/structure/bookcase,
/obj/machinery/atmospherics/unary/vent_pump/on,
@@ -1051,6 +1138,13 @@
},
/turf/simulated/floor/tiled,
/area/groundbase/exploration/equipment)
+"sa" = (
+/obj/structure/railing{
+ dir = 8
+ },
+/obj/machinery/light,
+/turf/simulated/floor/bmarble,
+/area/groundbase/civilian/kitchen)
"sb" = (
/obj/machinery/power/apc{
dir = 8
@@ -1141,6 +1235,12 @@
"tZ" = (
/turf/simulated/mineral/cave/virgo3c,
/area/groundbase/level3/se)
+"ud" = (
+/obj/structure/bed/chair/backed_red{
+ dir = 8
+ },
+/turf/simulated/floor/bmarble,
+/area/groundbase/civilian/kitchen)
"ui" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/white,
@@ -1228,6 +1328,15 @@
/obj/structure/bed/chair/sofa/corp/left,
/turf/simulated/floor/carpet/retro,
/area/groundbase/dorms/bathroom)
+"vJ" = (
+/obj/structure/railing{
+ dir = 1
+ },
+/obj/machinery/light{
+ dir = 4
+ },
+/turf/simulated/floor/bmarble,
+/area/groundbase/civilian/kitchen)
"vV" = (
/obj/structure/bed/chair/shuttle{
dir = 8
@@ -1392,6 +1501,10 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/turf/simulated/floor/tiled/white,
/area/groundbase/medical/paramedic)
+"yu" = (
+/obj/machinery/light,
+/turf/simulated/floor/wmarble,
+/area/groundbase/civilian/kitchen)
"yy" = (
/obj/structure/dispenser{
phorontanks = 0
@@ -1529,6 +1642,9 @@
},
/turf/simulated/floor/wood,
/area/groundbase/dorms/bathroom)
+"AZ" = (
+/turf/simulated/floor/bmarble,
+/area/groundbase/civilian/kitchen)
"Bd" = (
/obj/effect/floor_decal/industrial/warning{
dir = 1
@@ -1591,6 +1707,12 @@
"BH" = (
/turf/simulated/wall,
/area/groundbase/medical/patient3)
+"BM" = (
+/obj/structure/catwalk,
+/turf/simulated/floor/virgo3c{
+ edge_blending_priority = -1
+ },
+/area/groundbase/level3/nw/open)
"Ck" = (
/obj/structure/table/woodentable,
/obj/machinery/computer/security/telescreen/entertainment{
@@ -1598,6 +1720,12 @@
},
/turf/simulated/floor/carpet/retro,
/area/groundbase/dorms/bathroom)
+"Ct" = (
+/obj/structure/bed/chair/backed_red{
+ dir = 4
+ },
+/turf/simulated/floor/bmarble,
+/area/groundbase/civilian/kitchen)
"Cv" = (
/obj/structure/bed/padded,
/obj/item/weapon/bedsheet/medical,
@@ -1722,6 +1850,15 @@
},
/turf/simulated/floor/tiled,
/area/groundbase/exploration/equipment)
+"Em" = (
+/obj/structure/railing{
+ dir = 1
+ },
+/obj/machinery/light{
+ dir = 8
+ },
+/turf/simulated/floor/bmarble,
+/area/groundbase/civilian/kitchen)
"Es" = (
/obj/structure/closet/secure_closet/pathfinder{
req_access = list(62,43,67)
@@ -1830,6 +1967,12 @@
"Fh" = (
/turf/simulated/floor/wood,
/area/groundbase/dorms/bathroom)
+"Fr" = (
+/obj/item/weapon/stool/padded{
+ dir = 1
+ },
+/turf/simulated/floor/wmarble,
+/area/groundbase/civilian/kitchen)
"Fx" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -1862,6 +2005,9 @@
},
/turf/simulated/floor/bmarble,
/area/groundbase/civilian/pilot)
+"FU" = (
+/turf/simulated/floor/lino,
+/area/groundbase/civilian/kitchen)
"FV" = (
/obj/item/weapon/storage/backpack/parachute{
pixel_x = 4;
@@ -1912,6 +2058,13 @@
/obj/machinery/light/bigfloorlamp,
/turf/simulated/floor/outdoors/grass/virgo3c,
/area/groundbase/level3/escapepad)
+"Gk" = (
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/machinery/light,
+/turf/simulated/floor/bmarble,
+/area/groundbase/civilian/kitchen)
"Gn" = (
/obj/effect/floor_decal/industrial/warning{
dir = 1
@@ -1942,6 +2095,9 @@
"GW" = (
/turf/simulated/floor/outdoors/sidewalk/virgo3c,
/area/groundbase/level3/escapepad)
+"Ha" = (
+/turf/simulated/wall,
+/area/groundbase/civilian/kitchen)
"Hm" = (
/turf/simulated/floor/reinforced/virgo3c{
edge_blending_priority = -1
@@ -2088,6 +2244,15 @@
"IS" = (
/turf/simulated/open/virgo3c,
/area/groundbase/level3/ne/open)
+"IW" = (
+/obj/structure/railing{
+ dir = 1
+ },
+/obj/structure/bed/chair/backed_red{
+ dir = 8
+ },
+/turf/simulated/floor/bmarble,
+/area/groundbase/civilian/kitchen)
"Jf" = (
/obj/machinery/hologram/holopad,
/turf/simulated/floor/tiled/virgo3c,
@@ -2179,6 +2344,10 @@
"KG" = (
/turf/simulated/floor/tiled,
/area/groundbase/exploration/equipment)
+"KN" = (
+/obj/structure/table/steel,
+/turf/simulated/floor/bmarble,
+/area/groundbase/civilian/kitchen)
"KZ" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -2226,6 +2395,12 @@
},
/turf/simulated/floor/tiled/white,
/area/groundbase/medical/patient3)
+"Ms" = (
+/obj/structure/railing{
+ dir = 8
+ },
+/turf/simulated/floor/bmarble,
+/area/groundbase/civilian/kitchen)
"Mz" = (
/obj/structure/railing{
dir = 4
@@ -2294,6 +2469,12 @@
},
/turf/simulated/floor/tiled/white,
/area/groundbase/medical/paramedic)
+"NR" = (
+/obj/structure/sink/kitchen{
+ pixel_y = 16
+ },
+/turf/simulated/floor/lino,
+/area/groundbase/civilian/kitchen)
"NT" = (
/obj/machinery/alarm{
dir = 8
@@ -2408,6 +2589,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/tiled/white,
/area/groundbase/medical/uhallway)
+"Pq" = (
+/obj/structure/table/steel,
+/turf/simulated/floor/lino,
+/area/groundbase/civilian/kitchen)
"Pr" = (
/obj/machinery/button/remote/airlock{
dir = 8;
@@ -2488,6 +2673,15 @@
"Qa" = (
/turf/simulated/floor/outdoors/grass/forest/virgo3c,
/area/groundbase/level3/nw)
+"Qb" = (
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/simulated/floor/bmarble,
+/area/groundbase/civilian/kitchen)
"Qe" = (
/obj/structure/table/bench/marble,
/obj/structure/cable/yellow{
@@ -2523,6 +2717,13 @@
outdoors = 0
},
/area/groundbase/level3/escapepad)
+"Qs" = (
+/obj/structure/railing,
+/obj/structure/bed/chair/backed_red{
+ dir = 8
+ },
+/turf/simulated/floor/bmarble,
+/area/groundbase/civilian/kitchen)
"QC" = (
/obj/machinery/door/airlock/multi_tile/glass/polarized{
id_tag = null;
@@ -2582,6 +2783,12 @@
"Rq" = (
/turf/simulated/wall/r_wall,
/area/groundbase/dorms/bathroom)
+"RH" = (
+/obj/structure/railing{
+ dir = 1
+ },
+/turf/simulated/floor/bmarble,
+/area/groundbase/civilian/kitchen)
"RM" = (
/obj/machinery/photocopier/faxmachine{
department = "Exploration"
@@ -2876,6 +3083,10 @@
},
/turf/simulated/floor/tiled/white,
/area/groundbase/medical/patient1)
+"Wh" = (
+/obj/structure/railing,
+/turf/simulated/floor/bmarble,
+/area/groundbase/civilian/kitchen)
"Wm" = (
/obj/structure/closet/secure_closet/pilot,
/obj/machinery/light{
@@ -2912,6 +3123,13 @@
"Xv" = (
/turf/simulated/floor/outdoors/grass/forest/virgo3c,
/area/groundbase/unexplored/outdoors)
+"Xz" = (
+/obj/structure/railing,
+/obj/machinery/light{
+ dir = 4
+ },
+/turf/simulated/floor/bmarble,
+/area/groundbase/civilian/kitchen)
"XB" = (
/obj/structure/bed/padded,
/obj/item/weapon/bedsheet/medical,
@@ -2952,6 +3170,11 @@
},
/turf/simulated/floor/tiled/white,
/area/groundbase/dorms/bathroom)
+"YG" = (
+/turf/simulated/floor/virgo3c{
+ edge_blending_priority = -1
+ },
+/area/groundbase/civilian/kitchen)
"YJ" = (
/obj/structure/cable/yellow{
icon_state = "2-8"
@@ -5979,7 +6202,7 @@ QD
QD
QD
QD
-Kr
+ly
Kr
pf
pf
@@ -6121,7 +6344,7 @@ QD
QD
QD
QD
-Kr
+ly
Kr
pf
pf
@@ -6263,7 +6486,7 @@ QD
QD
QD
QD
-Kr
+ly
Kr
Kr
Kr
@@ -6401,6 +6624,7 @@ Kr
Kr
Kr
Kr
+Kr
QO
By
By
@@ -6410,7 +6634,6 @@ Kr
Kr
Kr
Kr
-Kr
pf
pf
pf
@@ -6543,6 +6766,7 @@ Kr
Kr
Kr
Kr
+Kr
QO
By
By
@@ -6552,7 +6776,6 @@ Kr
Kr
Kr
Kr
-Kr
pf
pf
pf
@@ -6685,8 +6908,9 @@ Kr
Kr
Kr
Kr
-QO
-By
+Kr
+QD
+BM
By
ly
Kr
@@ -6694,7 +6918,6 @@ Kr
Kr
Kr
Kr
-Kr
pf
pf
pf
@@ -6819,22 +7042,22 @@ nU
Kr
Kr
Kr
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
+YG
+YG
+YG
+YG
+YG
+YG
+YG
+YG
+YG
+YG
+YG
+YG
+YG
+YG
+YG
+YG
Kr
Kr
pf
@@ -6961,22 +7184,22 @@ pe
Kr
Kr
Kr
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
+YG
+Ha
+nh
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
+Ms
+AZ
+AZ
+Ms
+sa
+Ha
+YG
Kr
Kr
pf
@@ -7103,22 +7326,22 @@ BE
Kr
Kr
Kr
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
+YG
+Em
+AZ
+AZ
+AZ
+AZ
+AZ
+AZ
+AZ
+AZ
+AZ
+AZ
+AZ
+AZ
+rr
+YG
Kr
Kr
pf
@@ -7245,22 +7468,22 @@ BE
Kr
Kr
Kr
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
+YG
+nD
+Ct
+Ct
+AZ
+AZ
+AZ
+AZ
+AZ
+AZ
+AZ
+AZ
+Ct
+Ct
+hM
+YG
Kr
Kr
pf
@@ -7387,22 +7610,22 @@ BE
Kr
Kr
Kr
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
+YG
+mS
+KN
+KN
+mT
+mT
+mT
+mT
+mT
+mT
+mT
+mT
+KN
+KN
+gV
+YG
Kr
Kr
pf
@@ -7529,22 +7752,22 @@ BE
Kr
Kr
Kr
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
+YG
+IW
+ud
+ud
+mT
+mT
+pP
+aN
+aN
+pP
+mT
+mT
+ud
+ud
+Qs
+YG
Kr
Kr
pf
@@ -7671,22 +7894,22 @@ BE
Kr
Kr
Kr
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
+YG
+RH
+AZ
+AZ
+mT
+yu
+Ha
+Pq
+Pq
+Ha
+oI
+mT
+AZ
+AZ
+Wh
+YG
Kr
Kr
pf
@@ -7813,22 +8036,22 @@ BE
Kr
Kr
Kr
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
+YG
+RH
+AZ
+AZ
+mT
+pa
+Pq
+FU
+FU
+Pq
+Fr
+mT
+AZ
+AZ
+Wh
+YG
Kr
Kr
pf
@@ -7955,22 +8178,22 @@ BE
Kr
Kr
Kr
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
+YG
+RH
+AZ
+AZ
+mT
+pa
+Pq
+FU
+FU
+Pq
+Fr
+mT
+AZ
+AZ
+Wh
+YG
Kr
Kr
pf
@@ -8097,22 +8320,22 @@ BE
Kr
Kr
Kr
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
+YG
+RH
+AZ
+AZ
+mT
+pa
+Pq
+FU
+FU
+Pq
+Fr
+mT
+AZ
+AZ
+Wh
+YG
Kr
Kr
pf
@@ -8239,22 +8462,22 @@ BE
Kr
Kr
Kr
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
+YG
+RH
+AZ
+AZ
+mT
+yu
+Ha
+NR
+FU
+Ha
+oI
+mT
+AZ
+AZ
+Wh
+YG
Kr
Kr
pf
@@ -8381,22 +8604,22 @@ BE
Kr
Kr
Kr
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
+YG
+nD
+Ct
+Ct
+mT
+mT
+mY
+mT
+mT
+mY
+mT
+mT
+Ct
+Ct
+hM
+YG
Kr
Kr
pf
@@ -8523,22 +8746,22 @@ BE
Kr
Kr
Kr
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
+YG
+mS
+fn
+KN
+mT
+mT
+mT
+mT
+mT
+mT
+mT
+mT
+KN
+KN
+gV
+YG
Kr
Kr
pf
@@ -8665,22 +8888,22 @@ BE
Kr
Kr
Kr
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
+YG
+IW
+ud
+ud
+AZ
+AZ
+AZ
+AZ
+AZ
+AZ
+AZ
+AZ
+ud
+ud
+Qs
+YG
Kr
Kr
pf
@@ -8807,22 +9030,22 @@ BE
Kr
Kr
Kr
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
+YG
+vJ
+AZ
+AZ
+AZ
+AZ
+AZ
+AZ
+AZ
+AZ
+AZ
+AZ
+AZ
+AZ
+Xz
+YG
Kr
Kr
pf
@@ -8949,22 +9172,22 @@ pe
Kr
Kr
Kr
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
+YG
+Ha
+Qb
+cD
+cD
+cD
+cD
+cD
+cD
+AZ
+AZ
+cD
+cD
+Gk
+Ha
+YG
Kr
Kr
pf
@@ -9091,22 +9314,22 @@ VR
Kr
Kr
Kr
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
-QD
+YG
+YG
+YG
+YG
+YG
+YG
+YG
+YG
+YG
+YG
+YG
+YG
+YG
+YG
+YG
+YG
Kr
Kr
pf
@@ -14891,9 +15114,9 @@ Lf
Lf
Lf
Lf
-Lf
-Lf
-Lf
+IS
+IS
+IS
IS
IS
IS
@@ -15033,9 +15256,9 @@ Lf
Lf
Lf
Lf
-Lf
-Lf
-Lf
+IS
+IS
+IS
IS
IS
IS
@@ -15175,9 +15398,9 @@ Lf
Lf
Lf
Lf
-Lf
-Lf
-Lf
+IS
+IS
+IS
IS
IS
IS
@@ -15317,9 +15540,9 @@ Lf
Lf
Lf
Lf
-Lf
-Lf
-Lf
+IS
+IS
+IS
IS
IS
IS
diff --git a/maps/groundbase/groundbase_poi_stuff.dm b/maps/groundbase/groundbase_poi_stuff.dm
index c2ff36f9bc..23826a464a 100644
--- a/maps/groundbase/groundbase_poi_stuff.dm
+++ b/maps/groundbase/groundbase_poi_stuff.dm
@@ -965,6 +965,7 @@
ambience = AMBIENCE_OUTPOST
flags = AREA_FLAG_IS_NOT_PERSISTENT
requires_power = 0
+ base_turf = /turf/simulated/mineral/floor/virgo3c
/area/submap/groundbase/poi/wildvillage/plot
icon_state = "grewhisqu"
diff --git a/maps/groundbase/southwilds/southwilds1.dmm b/maps/groundbase/southwilds/southwilds1.dmm
index f8fe87f859..f2c050a458 100644
--- a/maps/groundbase/southwilds/southwilds1.dmm
+++ b/maps/groundbase/southwilds/southwilds1.dmm
@@ -10,6 +10,12 @@
edge_blending_priority = -1
},
/area/submap/groundbase/wilderness/south)
+"o" = (
+/obj/effect/landmark{
+ name = "carpspawn"
+ },
+/turf/simulated/floor/water/deep/virgo3c,
+/area/submap/groundbase/wilderness/south)
"p" = (
/turf/simulated/floor/outdoors/grass/virgo3c,
/area/submap/groundbase/wilderness/south)
@@ -34,6 +40,12 @@
"H" = (
/turf/simulated/floor/outdoors/grass/virgo3c,
/area/submap/groundbase/wilderness/south/unexplored)
+"I" = (
+/obj/effect/landmark{
+ name = "carpspawn"
+ },
+/turf/simulated/floor/water/virgo3c,
+/area/submap/groundbase/wilderness/south)
"K" = (
/obj/effect/map_effect/portal/line/side_b,
/turf/simulated/floor/outdoors/grass/forest/virgo3c,
@@ -1243,7 +1255,7 @@ d
d
c
c
-F
+o
c
c
c
@@ -4771,7 +4783,7 @@ H
d
d
c
-c
+I
c
F
F
@@ -4917,7 +4929,7 @@ c
c
F
F
-F
+o
c
c
c
@@ -6511,7 +6523,7 @@ d
d
c
c
-c
+I
c
c
c
@@ -7085,7 +7097,7 @@ c
c
c
c
-F
+o
F
c
c
@@ -10217,7 +10229,7 @@ d
c
c
c
-F
+o
c
c
c
@@ -11761,7 +11773,7 @@ d
c
F
F
-c
+I
c
d
d
@@ -12927,7 +12939,7 @@ d
d
c
c
-c
+I
c
c
c
@@ -13156,7 +13168,7 @@ c
c
c
c
-c
+I
c
c
d
@@ -13784,7 +13796,7 @@ d
d
c
c
-c
+I
c
c
c
@@ -13931,7 +13943,7 @@ d
c
c
c
-F
+o
F
F
c
@@ -14023,7 +14035,7 @@ F
F
F
F
-F
+o
F
F
F
@@ -14878,7 +14890,7 @@ c
c
F
F
-F
+o
F
c
c
@@ -15234,7 +15246,7 @@ d
d
c
F
-F
+o
c
c
c
@@ -16689,7 +16701,7 @@ d
c
c
F
-F
+o
c
c
d
@@ -17687,7 +17699,7 @@ H
d
c
c
-F
+o
c
c
d
@@ -18497,7 +18509,7 @@ d
c
c
F
-F
+o
F
F
F
@@ -18643,7 +18655,7 @@ F
F
F
F
-F
+o
F
c
c
diff --git a/maps/groundbase/southwilds/villagepois/square7.dmm b/maps/groundbase/southwilds/villagepois/square7.dmm
index 5cc3728a75..e92257e2a1 100644
--- a/maps/groundbase/southwilds/villagepois/square7.dmm
+++ b/maps/groundbase/southwilds/villagepois/square7.dmm
@@ -119,18 +119,18 @@
/turf/simulated/floor/tiled/eris/cafe,
/area/submap/groundbase/poi/wildvillage/square/square7)
"G" = (
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
/obj/item/weapon/reagent_containers/food/condiment/spacespice,
/obj/item/weapon/reagent_containers/food/condiment/spacespice,
-/obj/item/weapon/reagent_containers/food/condiment/sugar,
-/obj/item/weapon/reagent_containers/food/condiment/sugar,
+/obj/item/weapon/reagent_containers/food/condiment/carton/sugar,
+/obj/item/weapon/reagent_containers/food/condiment/carton/sugar,
/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker,
/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker,
/obj/item/weapon/reagent_containers/food/condiment/small/peppermill,
diff --git a/maps/offmap_vr/om_ships/abductor.dmm b/maps/offmap_vr/om_ships/abductor.dmm
index 11f3098ca6..c96d1b8994 100644
--- a/maps/offmap_vr/om_ships/abductor.dmm
+++ b/maps/offmap_vr/om_ships/abductor.dmm
@@ -105,8 +105,8 @@
/area/abductor/interior)
"hj" = (
/obj/structure/table/alien,
-/obj/item/device/paicard,
-/obj/item/device/paicard,
+/obj/random/paicard,
+/obj/random/paicard,
/turf/simulated/shuttle/floor/alienplating,
/area/abductor/interior)
"hq" = (
diff --git a/maps/offmap_vr/om_ships/itglight.dmm b/maps/offmap_vr/om_ships/itglight.dmm
index 99c70134b5..8a11ecf0b9 100644
--- a/maps/offmap_vr/om_ships/itglight.dmm
+++ b/maps/offmap_vr/om_ships/itglight.dmm
@@ -1985,16 +1985,16 @@
/turf/simulated/floor,
/area/itglight/portengi)
"lO" = (
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
/obj/item/weapon/reagent_containers/food/condiment/small/sugar,
/obj/item/weapon/reagent_containers/food/condiment/small/sugar,
/obj/item/weapon/reagent_containers/food/condiment/small/sugar,
@@ -2003,10 +2003,10 @@
/obj/item/weapon/reagent_containers/food/condiment/spacespice,
/obj/item/weapon/reagent_containers/food/condiment/spacespice,
/obj/item/weapon/reagent_containers/food/condiment/spacespice,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
/obj/item/weapon/material/knife/butch,
/obj/item/weapon/material/minihoe,
/obj/item/weapon/material/knife/machete/hatchet,
@@ -6353,7 +6353,7 @@
/area/itglight/common)
"MF" = (
/obj/structure/table/wooden_reinforced,
-/obj/item/device/paicard,
+/obj/random/paicard,
/turf/simulated/floor/glass/reinforced,
/area/itglight/common)
"MG" = (
diff --git a/maps/offmap_vr/talon/talon_v2.dmm b/maps/offmap_vr/talon/talon_v2.dmm
index 43f02d7f6e..368368c3a9 100644
--- a/maps/offmap_vr/talon/talon_v2.dmm
+++ b/maps/offmap_vr/talon/talon_v2.dmm
@@ -190,7 +190,7 @@
/obj/machinery/light/small{
dir = 1
},
-/obj/item/device/paicard,
+/obj/random/paicard,
/turf/simulated/floor/tiled/techfloor,
/area/talon_v2/workroom)
"aw" = (
@@ -15549,7 +15549,7 @@
/area/talon_v2/crew_quarters/eng_room)
"Xi" = (
/obj/structure/table/woodentable,
-/obj/item/device/paicard,
+/obj/random/paicard,
/turf/simulated/floor/wood,
/area/talon_v2/crew_quarters/meditation)
"Xl" = (
diff --git a/maps/stellardelight/stellar_delight1.dmm b/maps/stellardelight/stellar_delight1.dmm
index c4e5b2dfaa..6e65aa5629 100644
--- a/maps/stellardelight/stellar_delight1.dmm
+++ b/maps/stellardelight/stellar_delight1.dmm
@@ -21786,7 +21786,7 @@
/area/library)
"Uj" = (
/obj/structure/table/woodentable,
-/obj/item/device/paicard,
+/obj/random/paicard,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
diff --git a/maps/stellardelight/stellar_delight2.dmm b/maps/stellardelight/stellar_delight2.dmm
index 61649271d2..56fef9d146 100644
--- a/maps/stellardelight/stellar_delight2.dmm
+++ b/maps/stellardelight/stellar_delight2.dmm
@@ -5862,7 +5862,7 @@
/area/maintenance/stellardelight/deck2/atmos)
"mJ" = (
/obj/structure/table/woodentable,
-/obj/item/device/paicard,
+/obj/random/paicard,
/turf/simulated/floor/tiled/eris/steel/brown_platform,
/area/crew_quarters/bar)
"mK" = (
@@ -7931,18 +7931,18 @@
pixel_x = -1;
pixel_y = -42
},
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
/obj/item/weapon/reagent_containers/food/condiment/spacespice,
/obj/item/weapon/reagent_containers/food/condiment/spacespice,
-/obj/item/weapon/reagent_containers/food/condiment/sugar,
-/obj/item/weapon/reagent_containers/food/condiment/sugar,
+/obj/item/weapon/reagent_containers/food/condiment/carton/sugar,
+/obj/item/weapon/reagent_containers/food/condiment/carton/sugar,
/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker,
/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker,
/obj/item/weapon/reagent_containers/food/condiment/small/peppermill,
@@ -8066,7 +8066,7 @@
/obj/random/tech_supply,
/obj/random/tech_supply,
/obj/random/tech_supply,
-/obj/item/device/paicard,
+/obj/random/paicard,
/obj/machinery/atmospherics/unary/vent_pump/on,
/obj/machinery/newscaster{
pixel_y = 28
@@ -21981,7 +21981,7 @@
/area/medical/reception)
"WR" = (
/obj/structure/table/wooden_reinforced,
-/obj/item/device/paicard,
+/obj/random/paicard,
/turf/simulated/floor/tiled/eris/dark/cargo,
/area/crew_quarters/recreation_area)
"WS" = (
diff --git a/maps/stellardelight/stellar_delight3.dmm b/maps/stellardelight/stellar_delight3.dmm
index 067cf7585b..418fa680b0 100644
--- a/maps/stellardelight/stellar_delight3.dmm
+++ b/maps/stellardelight/stellar_delight3.dmm
@@ -1606,7 +1606,7 @@
/area/maintenance/stellardelight/deck3/foreportroomb)
"gk" = (
/obj/structure/table/woodentable,
-/obj/item/device/paicard,
+/obj/random/paicard,
/turf/simulated/floor/wood,
/area/stellardelight/deck3/cafe)
"gl" = (
@@ -5054,7 +5054,7 @@
/area/space)
"sI" = (
/obj/structure/table/standard,
-/obj/item/device/paicard,
+/obj/random/paicard,
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/bluegrid,
/area/ai_cyborg_station)
@@ -10254,7 +10254,7 @@
/turf/simulated/floor,
/area/maintenance/stellardelight/deck3/starboardaft)
"Lm" = (
-/obj/item/device/paicard,
+/obj/random/paicard,
/obj/structure/table/glass,
/obj/machinery/camera/network/civilian{
dir = 8
@@ -13710,7 +13710,7 @@
name = "station intercom (Science)";
pixel_y = 24
},
-/obj/item/device/paicard{
+/obj/random/paicard{
pixel_x = 4
},
/obj/item/weapon/paper_bin{
diff --git a/maps/submaps/admin_use_vr/dojo.dmm b/maps/submaps/admin_use_vr/dojo.dmm
index fd50bcf52f..a2bd85f37f 100644
--- a/maps/submaps/admin_use_vr/dojo.dmm
+++ b/maps/submaps/admin_use_vr/dojo.dmm
@@ -432,7 +432,7 @@
/area/ninja_dojo/dojo)
"bc" = (
/obj/structure/table/steel_reinforced,
-/obj/item/device/paicard,
+/obj/random/paicard,
/obj/item/device/pda/syndicate,
/turf/simulated/shuttle/floor/voidcraft/light,
/area/shuttle/ninja)
diff --git a/maps/submaps/admin_use_vr/skipjack.dmm b/maps/submaps/admin_use_vr/skipjack.dmm
index 2c252f6ad8..2e12a90bc4 100644
--- a/maps/submaps/admin_use_vr/skipjack.dmm
+++ b/maps/submaps/admin_use_vr/skipjack.dmm
@@ -14,7 +14,7 @@
/area/skipjack_station)
"ad" = (
/obj/structure/table/standard,
-/obj/item/device/paicard,
+/obj/random/paicard,
/turf/unsimulated/floor{
icon_state = "steel"
},
diff --git a/maps/submaps/admin_use_vr/wizard.dmm b/maps/submaps/admin_use_vr/wizard.dmm
index b85af43205..aa97a3f082 100644
--- a/maps/submaps/admin_use_vr/wizard.dmm
+++ b/maps/submaps/admin_use_vr/wizard.dmm
@@ -240,7 +240,7 @@
/area/wizard_station)
"aB" = (
/obj/structure/table/woodentable,
-/obj/item/device/paicard,
+/obj/random/paicard,
/turf/unsimulated/floor{
dir = 8;
icon_state = "wood"
diff --git a/maps/submaps/surface_submaps/mountains/quarantineshuttle.dmm b/maps/submaps/surface_submaps/mountains/quarantineshuttle.dmm
index c641f359b8..5e8cc12496 100644
--- a/maps/submaps/surface_submaps/mountains/quarantineshuttle.dmm
+++ b/maps/submaps/surface_submaps/mountains/quarantineshuttle.dmm
@@ -344,7 +344,7 @@
},
/area/submap/cave/qShuttle)
"aX" = (
-/obj/item/device/paicard,
+/obj/random/paicard,
/turf/simulated/shuttle/floor{
icon_state = "floor_yellow"
},
diff --git a/maps/submaps/surface_submaps/plains/Diner.dmm b/maps/submaps/surface_submaps/plains/Diner.dmm
index 69f2b63996..d6fa3316b4 100644
--- a/maps/submaps/surface_submaps/plains/Diner.dmm
+++ b/maps/submaps/surface_submaps/plains/Diner.dmm
@@ -43,7 +43,7 @@
/turf/simulated/floor/tiled/white,
/area/submap/Diner)
"ak" = (
-/obj/machinery/vending/cola,
+/obj/machinery/vending/hotfood,
/turf/simulated/floor/tiled/white,
/area/submap/Diner)
"al" = (
@@ -113,8 +113,8 @@
"aw" = (
/obj/machinery/appliance/mixer/cereal,
/obj/machinery/light{
- icon_state = "tube1";
- dir = 4
+ dir = 4;
+ icon_state = "tube1"
},
/turf/simulated/floor/tiled/white,
/area/submap/Diner)
@@ -134,7 +134,7 @@
/obj/item/weapon/reagent_containers/food/drinks/bottle/cream,
/obj/item/weapon/reagent_containers/food/drinks/bottle/cream,
/obj/item/weapon/reagent_containers/food/drinks/bottle/cream,
-/obj/item/weapon/reagent_containers/food/condiment/sugar,
+/obj/item/weapon/reagent_containers/food/condiment/carton/sugar,
/turf/simulated/floor/tiled/white,
/area/submap/Diner)
"az" = (
@@ -180,13 +180,13 @@
/area/submap/Diner)
"aI" = (
/obj/structure/closet/crate/freezer,
-/obj/item/weapon/reagent_containers/food/snacks/meat,
-/obj/item/weapon/reagent_containers/food/snacks/meat,
-/obj/item/weapon/reagent_containers/food/snacks/meat,
-/obj/item/weapon/reagent_containers/food/snacks/meat,
-/obj/item/weapon/reagent_containers/food/snacks/meat,
-/obj/item/weapon/reagent_containers/food/snacks/meat,
-/obj/item/weapon/reagent_containers/food/snacks/meat,
+/obj/random/meat,
+/obj/random/meat,
+/obj/random/meat,
+/obj/random/meat,
+/obj/random/meat,
+/obj/random/meat,
+/obj/random/meat,
/turf/simulated/floor/tiled/freezer,
/area/submap/Diner)
"aJ" = (
@@ -198,8 +198,8 @@
"aK" = (
/obj/effect/floor_decal/corner/red/diagonal,
/obj/machinery/light{
- icon_state = "tube1";
- dir = 4
+ dir = 4;
+ icon_state = "tube1"
},
/turf/simulated/floor/tiled/white,
/area/submap/Diner)
@@ -250,13 +250,13 @@
/area/submap/Diner)
"aQ" = (
/obj/structure/closet/crate/freezer,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
/turf/simulated/floor/tiled/freezer,
/area/submap/Diner)
"aR" = (
@@ -317,8 +317,8 @@
/area/submap/Diner)
"bc" = (
/obj/machinery/light{
- icon_state = "tube1";
- dir = 4
+ dir = 4;
+ icon_state = "tube1"
},
/turf/simulated/floor/tiled/white,
/area/submap/Diner)
@@ -361,6 +361,11 @@
"bi" = (
/turf/simulated/floor/lino,
/area/submap/Diner)
+"bj" = (
+/obj/structure/table/standard,
+/obj/random/mug,
+/turf/simulated/floor/tiled/white,
+/area/submap/Diner)
"bk" = (
/obj/machinery/light/small{
dir = 8
@@ -374,6 +379,7 @@
/area/submap/Diner)
"bm" = (
/obj/structure/table/woodentable,
+/obj/random/mug,
/turf/simulated/floor/lino,
/area/submap/Diner)
"bn" = (
@@ -389,8 +395,8 @@
"bp" = (
/obj/effect/floor_decal/corner/red/diagonal,
/obj/structure/windoor_assembly{
- icon_state = "l_windoor_assembly01";
- dir = 2
+ dir = 2;
+ icon_state = "l_windoor_assembly01"
},
/turf/simulated/floor/tiled/white,
/area/submap/Diner)
@@ -406,8 +412,8 @@
/area/submap/Diner)
"bs" = (
/obj/structure/sink{
- icon_state = "sink";
dir = 8;
+ icon_state = "sink";
pixel_x = -12;
pixel_y = 2
},
@@ -452,6 +458,7 @@
/area/submap/Diner)
"bA" = (
/obj/structure/table/standard,
+/obj/random/soap/anom,
/turf/simulated/floor/tiled/hydro,
/area/submap/Diner)
@@ -863,7 +870,7 @@ aa
(16,1,1) = {"
aa
ad
-ah
+bj
ap
ap
ap
diff --git a/maps/submaps/surface_submaps/plains/Diner_vr.dmm b/maps/submaps/surface_submaps/plains/Diner_vr.dmm
index 1ef47715cb..a2eedcc00d 100644
--- a/maps/submaps/surface_submaps/plains/Diner_vr.dmm
+++ b/maps/submaps/surface_submaps/plains/Diner_vr.dmm
@@ -130,7 +130,7 @@
/obj/item/weapon/reagent_containers/food/drinks/bottle/cream,
/obj/item/weapon/reagent_containers/food/drinks/bottle/cream,
/obj/item/weapon/reagent_containers/food/drinks/bottle/cream,
-/obj/item/weapon/reagent_containers/food/condiment/sugar,
+/obj/item/weapon/reagent_containers/food/condiment/carton/sugar,
/turf/simulated/floor/tiled/white,
/area/submap/Diner)
"az" = (
@@ -245,13 +245,13 @@
/area/submap/Diner)
"aQ" = (
/obj/structure/closet/crate/freezer,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
-/obj/item/weapon/reagent_containers/food/condiment/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
+/obj/item/weapon/reagent_containers/food/condiment/carton/flour,
/turf/simulated/floor/tiled/freezer,
/area/submap/Diner)
"aR" = (
diff --git a/maps/submaps/surface_submaps/plains/lonehome.dmm b/maps/submaps/surface_submaps/plains/lonehome.dmm
index 2b0fca5b59..b610c17a87 100644
--- a/maps/submaps/surface_submaps/plains/lonehome.dmm
+++ b/maps/submaps/surface_submaps/plains/lonehome.dmm
@@ -86,7 +86,7 @@
"zN" = (/obj/item/weapon/paper{info = "Seems to be filled with odd runes drawn with blood"; name = "Blood stained paper"},/turf/simulated/floor/wood,/area/submap/lonehome)
"AQ" = (/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/item/weapon/material/shard,/turf/simulated/floor/outdoors/dirt,/area/submap/lonehome)
"BH" = (/obj/item/weapon/paper{info = "F%$K this detective, I swear I can see them peeking from behind the window, these tinted glasses help but I swear I can still see them snooping around. His days are counted... I am so close to figuring this out, just need a few more days. Then Shepiffany will be part of the family once again, then our two kids and I can go back on having a normal life... a normal life..."; name = "Stained sheet of paper"},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/carpet/sblucarpet,/area/submap/lonehome)
-"Dd" = (/obj/machinery/button/windowtint{id = "h_kitchen"},/obj/item/weapon/storage/box/donkpockets,/obj/item/weapon/storage/box/condimentbottles,/obj/item/weapon/reagent_containers/food/condiment/sugar,/obj/structure/curtain/open/bed,/obj/structure/table/rack,/obj/structure/window/reinforced/polarized{dir = 4; id = "h_kitchen"},/turf/simulated/floor/tiled/white,/area/submap/lonehome)
+"Dd" = (/obj/machinery/button/windowtint{id = "h_kitchen"},/obj/item/weapon/storage/box/donkpockets,/obj/item/weapon/storage/box/condimentbottles,/obj/item/weapon/reagent_containers/food/condiment/carton/sugar,/obj/structure/curtain/open/bed,/obj/structure/table/rack,/obj/structure/window/reinforced/polarized{dir = 4; id = "h_kitchen"},/turf/simulated/floor/tiled/white,/area/submap/lonehome)
"Dk" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/white,/area/submap/lonehome)
"DE" = (/obj/structure/window/reinforced/tinted/frosted{dir = 8},/obj/item/weapon/storage/box/glasses/square{pixel_y = -2},/obj/item/weapon/storage/box/glass_extras/sticks{pixel_y = 4},/obj/item/weapon/storage/box/glass_extras/straws{pixel_y = 7},/obj/item/weapon/packageWrap,/obj/structure/curtain/open/bed,/obj/item/weapon/material/kitchen/utensil/fork,/obj/item/weapon/material/kitchen/utensil/fork,/obj/item/weapon/material/kitchen/utensil/spoon{pixel_x = 2},/obj/item/weapon/material/kitchen/utensil/spoon{pixel_x = 2},/obj/structure/table/rack,/turf/simulated/floor/tiled/white,/area/submap/lonehome)
"DG" = (/obj/structure/simple_door/wood,/turf/simulated/floor,/area/submap/lonehome)
diff --git a/maps/submaps/surface_submaps/plains/lonehome_vr.dmm b/maps/submaps/surface_submaps/plains/lonehome_vr.dmm
index 776d5a25a2..6cee63decc 100644
--- a/maps/submaps/surface_submaps/plains/lonehome_vr.dmm
+++ b/maps/submaps/surface_submaps/plains/lonehome_vr.dmm
@@ -166,7 +166,7 @@
},
/obj/item/weapon/storage/box/donkpockets,
/obj/item/weapon/storage/box/condimentbottles,
-/obj/item/weapon/reagent_containers/food/condiment/sugar,
+/obj/item/weapon/reagent_containers/food/condiment/carton/sugar,
/obj/structure/curtain/open/bed,
/obj/structure/table/rack,
/obj/structure/window/reinforced/polarized{
diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm
index 9cd83ea37d..6d8e8206b1 100644
--- a/maps/tether/tether-01-surface1.dmm
+++ b/maps/tether/tether-01-surface1.dmm
@@ -7759,7 +7759,7 @@
pixel_x = 32
},
/obj/structure/table/standard,
-/obj/item/device/paicard,
+/obj/random/paicard,
/turf/simulated/floor/tiled,
/area/storage/primary)
"amW" = (
@@ -28761,7 +28761,7 @@
dir = 8
},
/obj/structure/table/standard,
-/obj/item/device/paicard,
+/obj/random/paicard,
/turf/simulated/floor/tiled,
/area/crew_quarters/visitor_laundry)
"aWW" = (
@@ -33813,7 +33813,7 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/item/device/paicard,
+/obj/random/paicard,
/turf/simulated/floor/tiled,
/area/crew_quarters/locker)
"hTw" = (
diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm
index f67738972f..6484c366c3 100644
--- a/maps/tether/tether-02-surface2.dmm
+++ b/maps/tether/tether-02-surface2.dmm
@@ -11238,6 +11238,8 @@
/obj/effect/floor_decal/corner/red/border{
dir = 8
},
+/obj/item/clothing/shoes/magboots,
+/obj/item/clothing/shoes/magboots,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/evastorage)
"arK" = (
@@ -13264,7 +13266,7 @@
/obj/machinery/recharger,
/obj/item/weapon/storage/toolbox/mechanical,
/obj/random/drinkbottle,
-/obj/item/device/paicard,
+/obj/random/paicard,
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/lower/bar)
"avg" = (
@@ -22134,7 +22136,7 @@
/obj/item/device/taperecorder{
pixel_x = -3
},
-/obj/item/device/paicard{
+/obj/random/paicard{
pixel_x = 4
},
/obj/item/weapon/circuitboard/teleporter,
@@ -31053,7 +31055,7 @@
/obj/structure/sign/painting/public{
pixel_x = -30
},
-/obj/item/device/paicard,
+/obj/random/paicard,
/turf/simulated/floor/wood,
/area/tether/surfacebase/reading_room)
"biK" = (
@@ -31624,7 +31626,7 @@
pixel_x = -23
},
/obj/random/junk,
-/obj/item/device/paicard,
+/obj/random/paicard,
/turf/simulated/floor/plating,
/area/maintenance/lower/atmos)
"bkE" = (
diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm
index b91bb8c2bc..d21a316752 100644
--- a/maps/tether/tether-03-surface3.dmm
+++ b/maps/tether/tether-03-surface3.dmm
@@ -8328,7 +8328,7 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
},
-/obj/item/device/paicard,
+/obj/random/paicard,
/turf/simulated/floor/wood,
/area/crew_quarters/recreation_area)
"anb" = (
@@ -9784,7 +9784,7 @@
/obj/random/maintenance/medical,
/obj/random/maintenance/clean,
/obj/random/maintenance/clean,
-/obj/item/device/paicard,
+/obj/random/paicard,
/turf/simulated/floor/plating,
/area/tether/surfacebase/surface_three_hall)
"apA" = (
@@ -40756,7 +40756,7 @@
/area/tether/surfacebase/security/hos)
"lHr" = (
/obj/structure/table/woodentable,
-/obj/item/device/paicard,
+/obj/random/paicard,
/turf/simulated/floor/wood,
/area/tether/surfacebase/entertainment)
"lIe" = (
diff --git a/maps/tether/tether-04-transit.dmm b/maps/tether/tether-04-transit.dmm
index 72748da792..2f5e075c78 100644
--- a/maps/tether/tether-04-transit.dmm
+++ b/maps/tether/tether-04-transit.dmm
@@ -683,7 +683,7 @@
/area/tether/midpoint)
"Ud" = (
/obj/structure/table/woodentable,
-/obj/item/device/paicard,
+/obj/random/paicard,
/turf/simulated/floor/midpoint_glass/reinf,
/area/tether/midpoint)
"Ui" = (
diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm
index 6f79a19b09..095f1c4720 100644
--- a/maps/tether/tether-05-station1.dmm
+++ b/maps/tether/tether-05-station1.dmm
@@ -1120,7 +1120,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/item/device/paicard,
+/obj/random/paicard,
/turf/simulated/floor/tiled,
/area/teleporter/departing)
"acc" = (
@@ -15345,6 +15345,7 @@
/obj/machinery/light{
dir = 1
},
+/obj/item/clothing/shoes/magboots,
/turf/simulated/floor/tiled,
/area/quartermaster/belterdock/gear)
"bPl" = (
@@ -22625,6 +22626,7 @@
/obj/effect/floor_decal/corner/brown/bordercorner2{
dir = 4
},
+/obj/item/clothing/shoes/magboots,
/turf/simulated/floor/tiled,
/area/quartermaster/belterdock/gear)
"iEn" = (
@@ -23204,6 +23206,7 @@
/obj/effect/floor_decal/corner/brown/border{
dir = 5
},
+/obj/item/clothing/shoes/magboots,
/turf/simulated/floor/tiled,
/area/quartermaster/belterdock/gear)
"jnG" = (
@@ -26600,7 +26603,7 @@
/obj/random/maintenance/clean,
/obj/random/maintenance/clean,
/obj/random/junk,
-/obj/item/device/paicard,
+/obj/random/paicard,
/turf/simulated/floor,
/area/maintenance/station/exploration)
"lVJ" = (
@@ -28245,7 +28248,7 @@
layer = 2.9
},
/obj/random/junk,
-/obj/item/device/paicard,
+/obj/random/paicard,
/turf/simulated/floor/plating,
/area/maintenance/station/cargo)
"nCS" = (
diff --git a/maps/tether/tether_turfs.dm b/maps/tether/tether_turfs.dm
index b219e15f44..bfaa882bc3 100644
--- a/maps/tether/tether_turfs.dm
+++ b/maps/tether/tether_turfs.dm
@@ -276,6 +276,9 @@ VIRGO3B_TURF_CREATE(/turf/simulated/mineral/floor)
for(var/obj/effect/step_trigger/teleporter/planetary_fall/virgo3b/F in src)
qdel(F)
+/turf/space/v3b_midpoint/CanZPass(atom, direction)
+ return 0 // We're not Space
+
// Tram transit floor
/turf/simulated/floor/tiled/techfloor/grid/transit
icon = 'icons/turf/transit_vr.dmi'
diff --git a/sound/effects/weather/indoorrain_end.ogg b/sound/effects/weather/indoorrain_end.ogg
index c82039d95b..2b83d6b6a4 100644
Binary files a/sound/effects/weather/indoorrain_end.ogg and b/sound/effects/weather/indoorrain_end.ogg differ
diff --git a/sound/effects/weather/indoorrain_mid.ogg b/sound/effects/weather/indoorrain_mid.ogg
index 60ab5f1624..088aec86ef 100644
Binary files a/sound/effects/weather/indoorrain_mid.ogg and b/sound/effects/weather/indoorrain_mid.ogg differ
diff --git a/sound/effects/weather/indoorrain_start.ogg b/sound/effects/weather/indoorrain_start.ogg
index 23165836a1..ca43575d5f 100644
Binary files a/sound/effects/weather/indoorrain_start.ogg and b/sound/effects/weather/indoorrain_start.ogg differ
diff --git a/sound/voice/roboboop.ogg b/sound/voice/roboboop.ogg
new file mode 100644
index 0000000000..6a2d9fd0af
Binary files /dev/null and b/sound/voice/roboboop.ogg differ
diff --git a/sound/voice/robochirp.ogg b/sound/voice/robochirp.ogg
new file mode 100644
index 0000000000..51d534662d
Binary files /dev/null and b/sound/voice/robochirp.ogg differ
diff --git a/tgui/.eslintrc.yml b/tgui/.eslintrc.yml
index 78354939c2..31d1b345d4 100644
--- a/tgui/.eslintrc.yml
+++ b/tgui/.eslintrc.yml
@@ -12,7 +12,7 @@ env:
plugins:
- radar
- react
- ## - unused-imports
+ - unused-imports
settings:
react:
version: '16.10'
@@ -376,6 +376,7 @@ rules:
ignoreUrls: true,
ignoreRegExpLiterals: true,
ignoreStrings: true,
+ ignoreTemplateLiterals: true,
}]
## Enforce a maximum number of lines per file
# max-lines: error
@@ -669,7 +670,7 @@ rules:
# react/sort-prop-types: error
## Enforce the state initialization style to be either in a constructor or
## with a class property
- react/state-in-constructor: error
+ # react/state-in-constructor: error
## Enforces where React component static properties should be positioned.
# react/static-property-placement: error
## Enforce style prop value being an object
@@ -759,4 +760,4 @@ rules:
react/jsx-wrap-multilines: error
## Prevents the use of unused imports.
## This could be done by enabling no-unused-vars, but we're doing this for now
- ## unused-imports/no-unused-imports: error
+ unused-imports/no-unused-imports: error
diff --git a/tgui/.gitignore b/tgui/.gitignore
index 56cb38b290..bcdbd1c91a 100644
--- a/tgui/.gitignore
+++ b/tgui/.gitignore
@@ -14,6 +14,7 @@ package-lock.json
## Build artifacts
/public/.tmp/**/*
+/public/*.map
## Previously ignored locations that are kept to avoid confusing git
## while transitioning to a new project structure.
diff --git a/tgui/.yarn/sdks/eslint/bin/eslint.js b/tgui/.yarn/sdks/eslint/bin/eslint.js
index 4e7554dc1a..4d327a49a0 100644
--- a/tgui/.yarn/sdks/eslint/bin/eslint.js
+++ b/tgui/.yarn/sdks/eslint/bin/eslint.js
@@ -4,7 +4,7 @@ const {existsSync} = require(`fs`);
const {createRequire, createRequireFromPath} = require(`module`);
const {resolve} = require(`path`);
-const relPnpApiPath = "../../../../.pnp.js";
+const relPnpApiPath = "../../../../.pnp.cjs";
const absPnpApiPath = resolve(__dirname, relPnpApiPath);
const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
diff --git a/tgui/.yarn/sdks/eslint/lib/api.js b/tgui/.yarn/sdks/eslint/lib/api.js
index ac3c9fc064..97a052442a 100644
--- a/tgui/.yarn/sdks/eslint/lib/api.js
+++ b/tgui/.yarn/sdks/eslint/lib/api.js
@@ -4,7 +4,7 @@ const {existsSync} = require(`fs`);
const {createRequire, createRequireFromPath} = require(`module`);
const {resolve} = require(`path`);
-const relPnpApiPath = "../../../../.pnp.js";
+const relPnpApiPath = "../../../../.pnp.cjs";
const absPnpApiPath = resolve(__dirname, relPnpApiPath);
const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
diff --git a/tgui/.yarn/sdks/eslint/package.json b/tgui/.yarn/sdks/eslint/package.json
index 4b0d99dbb9..744a773210 100644
--- a/tgui/.yarn/sdks/eslint/package.json
+++ b/tgui/.yarn/sdks/eslint/package.json
@@ -1,6 +1,6 @@
{
"name": "eslint",
- "version": "7.21.0-pnpify",
+ "version": "7.32.0-sdk",
"main": "./lib/api.js",
"type": "commonjs"
}
diff --git a/tgui/.yarn/sdks/integrations.yml b/tgui/.yarn/sdks/integrations.yml
index 76ed42ba94..aa9d0d0ad8 100644
--- a/tgui/.yarn/sdks/integrations.yml
+++ b/tgui/.yarn/sdks/integrations.yml
@@ -1,5 +1,5 @@
-# This file is automatically generated by PnPify.
-# Manual changes will be lost!
+# This file is automatically generated by @yarnpkg/sdks.
+# Manual changes might be lost!
integrations:
- vscode
diff --git a/tgui/.yarn/sdks/typescript/bin/tsc b/tgui/.yarn/sdks/typescript/bin/tsc
index 06e51d0d97..5608e57430 100644
--- a/tgui/.yarn/sdks/typescript/bin/tsc
+++ b/tgui/.yarn/sdks/typescript/bin/tsc
@@ -4,7 +4,7 @@ const {existsSync} = require(`fs`);
const {createRequire, createRequireFromPath} = require(`module`);
const {resolve} = require(`path`);
-const relPnpApiPath = "../../../../.pnp.js";
+const relPnpApiPath = "../../../../.pnp.cjs";
const absPnpApiPath = resolve(__dirname, relPnpApiPath);
const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
diff --git a/tgui/.yarn/sdks/typescript/bin/tsserver b/tgui/.yarn/sdks/typescript/bin/tsserver
index 2d03f3d97b..cd7d557d52 100644
--- a/tgui/.yarn/sdks/typescript/bin/tsserver
+++ b/tgui/.yarn/sdks/typescript/bin/tsserver
@@ -4,7 +4,7 @@ const {existsSync} = require(`fs`);
const {createRequire, createRequireFromPath} = require(`module`);
const {resolve} = require(`path`);
-const relPnpApiPath = "../../../../.pnp.js";
+const relPnpApiPath = "../../../../.pnp.cjs";
const absPnpApiPath = resolve(__dirname, relPnpApiPath);
const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
diff --git a/tgui/.yarn/sdks/typescript/lib/tsc.js b/tgui/.yarn/sdks/typescript/lib/tsc.js
index e030711c5a..16042d01d4 100644
--- a/tgui/.yarn/sdks/typescript/lib/tsc.js
+++ b/tgui/.yarn/sdks/typescript/lib/tsc.js
@@ -4,7 +4,7 @@ const {existsSync} = require(`fs`);
const {createRequire, createRequireFromPath} = require(`module`);
const {resolve} = require(`path`);
-const relPnpApiPath = "../../../../.pnp.js";
+const relPnpApiPath = "../../../../.pnp.cjs";
const absPnpApiPath = resolve(__dirname, relPnpApiPath);
const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
diff --git a/tgui/.yarn/sdks/typescript/lib/tsserver.js b/tgui/.yarn/sdks/typescript/lib/tsserver.js
index 1d6dfb6115..4d90f3879d 100644
--- a/tgui/.yarn/sdks/typescript/lib/tsserver.js
+++ b/tgui/.yarn/sdks/typescript/lib/tsserver.js
@@ -4,15 +4,22 @@ const {existsSync} = require(`fs`);
const {createRequire, createRequireFromPath} = require(`module`);
const {resolve} = require(`path`);
-const relPnpApiPath = "../../../../.pnp.js";
+const relPnpApiPath = "../../../../.pnp.cjs";
const absPnpApiPath = resolve(__dirname, relPnpApiPath);
const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
const moduleWrapper = tsserver => {
+ if (!process.versions.pnp) {
+ return tsserver;
+ }
+
const {isAbsolute} = require(`path`);
const pnpApi = require(`pnpapi`);
+ const isVirtual = str => str.match(/\/(\$\$virtual|__virtual__)\//);
+ const normalize = str => str.replace(/\\/g, `/`).replace(/^\/?/, `/`);
+
const dependencyTreeRoots = new Set(pnpApi.getDependencyTreeRoots().map(locator => {
return `${locator.name}@${locator.reference}`;
}));
@@ -23,9 +30,9 @@ const moduleWrapper = tsserver => {
function toEditorPath(str) {
// We add the `zip:` prefix to both `.zip/` paths and virtual paths
- if (isAbsolute(str) && !str.match(/^\^zip:/) && (str.match(/\.zip\//) || str.match(/\$\$virtual\//))) {
+ if (isAbsolute(str) && !str.match(/^\^zip:/) && (str.match(/\.zip\//) || isVirtual(str))) {
// We also take the opportunity to turn virtual paths into physical ones;
- // this makes is much easier to work with workspaces that list peer
+ // this makes it much easier to work with workspaces that list peer
// dependencies, since otherwise Ctrl+Click would bring us to the virtual
// file instances instead of the real ones.
//
@@ -34,26 +41,49 @@ const moduleWrapper = tsserver => {
// with peer dep (otherwise jumping into react-dom would show resolution
// errors on react).
//
- const resolved = pnpApi.resolveVirtual(str);
+ const resolved = isVirtual(str) ? pnpApi.resolveVirtual(str) : str;
if (resolved) {
const locator = pnpApi.findPackageLocator(resolved);
if (locator && dependencyTreeRoots.has(`${locator.name}@${locator.reference}`)) {
- str = resolved;
+ str = resolved;
}
}
- str = str.replace(/\\/g, `/`)
- str = str.replace(/^\/?/, `/`);
+ str = normalize(str);
- // Absolute VSCode `Uri.fsPath`s need to start with a slash.
- // VSCode only adds it automatically for supported schemes,
- // so we have to do it manually for the `zip` scheme.
- // The path needs to start with a caret otherwise VSCode doesn't handle the protocol
- //
- // Ref: https://github.com/microsoft/vscode/issues/105014#issuecomment-686760910
- //
if (str.match(/\.zip\//)) {
- str = `${isVSCode ? `^` : ``}zip:${str}`;
+ switch (hostInfo) {
+ // Absolute VSCode `Uri.fsPath`s need to start with a slash.
+ // VSCode only adds it automatically for supported schemes,
+ // so we have to do it manually for the `zip` scheme.
+ // The path needs to start with a caret otherwise VSCode doesn't handle the protocol
+ //
+ // Ref: https://github.com/microsoft/vscode/issues/105014#issuecomment-686760910
+ //
+ case `vscode`: {
+ str = `^zip:${str}`;
+ } break;
+
+ // To make "go to definition" work,
+ // We have to resolve the actual file system path from virtual path
+ // and convert scheme to supported by [vim-rzip](https://github.com/lbrayner/vim-rzip)
+ case `coc-nvim`: {
+ str = normalize(resolved).replace(/\.zip\//, `.zip::`);
+ str = resolve(`zipfile:${str}`);
+ } break;
+
+ // Support neovim native LSP and [typescript-language-server](https://github.com/theia-ide/typescript-language-server)
+ // We have to resolve the actual file system path from virtual path,
+ // everything else is up to neovim
+ case `neovim`: {
+ str = normalize(resolved).replace(/\.zip\//, `.zip::`);
+ str = `zipfile:${str}`;
+ } break;
+
+ default: {
+ str = `zip:${str}`;
+ } break;
+ }
}
}
@@ -66,15 +96,29 @@ const moduleWrapper = tsserver => {
: str.replace(/^\^?zip:/, ``);
}
+ // Force enable 'allowLocalPluginLoads'
+ // TypeScript tries to resolve plugins using a path relative to itself
+ // which doesn't work when using the global cache
+ // https://github.com/microsoft/TypeScript/blob/1b57a0395e0bff191581c9606aab92832001de62/src/server/project.ts#L2238
+ // VSCode doesn't want to enable 'allowLocalPluginLoads' due to security concerns but
+ // TypeScript already does local loads and if this code is running the user trusts the workspace
+ // https://github.com/microsoft/vscode/issues/45856
+ const ConfiguredProject = tsserver.server.ConfiguredProject;
+ const {enablePluginsWithOptions: originalEnablePluginsWithOptions} = ConfiguredProject.prototype;
+ ConfiguredProject.prototype.enablePluginsWithOptions = function() {
+ this.projectService.allowLocalPluginLoads = true;
+ return originalEnablePluginsWithOptions.apply(this, arguments);
+ };
+
// And here is the point where we hijack the VSCode <-> TS communications
// by adding ourselves in the middle. We locate everything that looks
// like an absolute path of ours and normalize it.
const Session = tsserver.server.Session;
const {onMessage: originalOnMessage, send: originalSend} = Session.prototype;
- let isVSCode = false;
+ let hostInfo = `unknown`;
- return Object.assign(Session.prototype, {
+ Object.assign(Session.prototype, {
onMessage(/** @type {string} */ message) {
const parsedMessage = JSON.parse(message)
@@ -82,9 +126,9 @@ const moduleWrapper = tsserver => {
parsedMessage != null &&
typeof parsedMessage === `object` &&
parsedMessage.arguments &&
- parsedMessage.arguments.hostInfo === `vscode`
+ typeof parsedMessage.arguments.hostInfo === `string`
) {
- isVSCode = true;
+ hostInfo = parsedMessage.arguments.hostInfo;
}
return originalOnMessage.call(this, JSON.stringify(parsedMessage, (key, value) => {
@@ -98,6 +142,8 @@ const moduleWrapper = tsserver => {
})));
}
});
+
+ return tsserver;
};
if (existsSync(absPnpApiPath)) {
diff --git a/tgui/.yarn/sdks/typescript/lib/tsserverlibrary.js b/tgui/.yarn/sdks/typescript/lib/tsserverlibrary.js
new file mode 100644
index 0000000000..c3de4ff5d7
--- /dev/null
+++ b/tgui/.yarn/sdks/typescript/lib/tsserverlibrary.js
@@ -0,0 +1,157 @@
+#!/usr/bin/env node
+
+const {existsSync} = require(`fs`);
+const {createRequire, createRequireFromPath} = require(`module`);
+const {resolve} = require(`path`);
+
+const relPnpApiPath = "../../../../.pnp.cjs";
+
+const absPnpApiPath = resolve(__dirname, relPnpApiPath);
+const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
+
+const moduleWrapper = tsserver => {
+ if (!process.versions.pnp) {
+ return tsserver;
+ }
+
+ const {isAbsolute} = require(`path`);
+ const pnpApi = require(`pnpapi`);
+
+ const isVirtual = str => str.match(/\/(\$\$virtual|__virtual__)\//);
+ const normalize = str => str.replace(/\\/g, `/`).replace(/^\/?/, `/`);
+
+ const dependencyTreeRoots = new Set(pnpApi.getDependencyTreeRoots().map(locator => {
+ return `${locator.name}@${locator.reference}`;
+ }));
+
+ // VSCode sends the zip paths to TS using the "zip://" prefix, that TS
+ // doesn't understand. This layer makes sure to remove the protocol
+ // before forwarding it to TS, and to add it back on all returned paths.
+
+ function toEditorPath(str) {
+ // We add the `zip:` prefix to both `.zip/` paths and virtual paths
+ if (isAbsolute(str) && !str.match(/^\^zip:/) && (str.match(/\.zip\//) || isVirtual(str))) {
+ // We also take the opportunity to turn virtual paths into physical ones;
+ // this makes it much easier to work with workspaces that list peer
+ // dependencies, since otherwise Ctrl+Click would bring us to the virtual
+ // file instances instead of the real ones.
+ //
+ // We only do this to modules owned by the the dependency tree roots.
+ // This avoids breaking the resolution when jumping inside a vendor
+ // with peer dep (otherwise jumping into react-dom would show resolution
+ // errors on react).
+ //
+ const resolved = isVirtual(str) ? pnpApi.resolveVirtual(str) : str;
+ if (resolved) {
+ const locator = pnpApi.findPackageLocator(resolved);
+ if (locator && dependencyTreeRoots.has(`${locator.name}@${locator.reference}`)) {
+ str = resolved;
+ }
+ }
+
+ str = normalize(str);
+
+ if (str.match(/\.zip\//)) {
+ switch (hostInfo) {
+ // Absolute VSCode `Uri.fsPath`s need to start with a slash.
+ // VSCode only adds it automatically for supported schemes,
+ // so we have to do it manually for the `zip` scheme.
+ // The path needs to start with a caret otherwise VSCode doesn't handle the protocol
+ //
+ // Ref: https://github.com/microsoft/vscode/issues/105014#issuecomment-686760910
+ //
+ case `vscode`: {
+ str = `^zip:${str}`;
+ } break;
+
+ // To make "go to definition" work,
+ // We have to resolve the actual file system path from virtual path
+ // and convert scheme to supported by [vim-rzip](https://github.com/lbrayner/vim-rzip)
+ case `coc-nvim`: {
+ str = normalize(resolved).replace(/\.zip\//, `.zip::`);
+ str = resolve(`zipfile:${str}`);
+ } break;
+
+ // Support neovim native LSP and [typescript-language-server](https://github.com/theia-ide/typescript-language-server)
+ // We have to resolve the actual file system path from virtual path,
+ // everything else is up to neovim
+ case `neovim`: {
+ str = normalize(resolved).replace(/\.zip\//, `.zip::`);
+ str = `zipfile:${str}`;
+ } break;
+
+ default: {
+ str = `zip:${str}`;
+ } break;
+ }
+ }
+ }
+
+ return str;
+ }
+
+ function fromEditorPath(str) {
+ return process.platform === `win32`
+ ? str.replace(/^\^?zip:\//, ``)
+ : str.replace(/^\^?zip:/, ``);
+ }
+
+ // Force enable 'allowLocalPluginLoads'
+ // TypeScript tries to resolve plugins using a path relative to itself
+ // which doesn't work when using the global cache
+ // https://github.com/microsoft/TypeScript/blob/1b57a0395e0bff191581c9606aab92832001de62/src/server/project.ts#L2238
+ // VSCode doesn't want to enable 'allowLocalPluginLoads' due to security concerns but
+ // TypeScript already does local loads and if this code is running the user trusts the workspace
+ // https://github.com/microsoft/vscode/issues/45856
+ const ConfiguredProject = tsserver.server.ConfiguredProject;
+ const {enablePluginsWithOptions: originalEnablePluginsWithOptions} = ConfiguredProject.prototype;
+ ConfiguredProject.prototype.enablePluginsWithOptions = function() {
+ this.projectService.allowLocalPluginLoads = true;
+ return originalEnablePluginsWithOptions.apply(this, arguments);
+ };
+
+ // And here is the point where we hijack the VSCode <-> TS communications
+ // by adding ourselves in the middle. We locate everything that looks
+ // like an absolute path of ours and normalize it.
+
+ const Session = tsserver.server.Session;
+ const {onMessage: originalOnMessage, send: originalSend} = Session.prototype;
+ let hostInfo = `unknown`;
+
+ Object.assign(Session.prototype, {
+ onMessage(/** @type {string} */ message) {
+ const parsedMessage = JSON.parse(message)
+
+ if (
+ parsedMessage != null &&
+ typeof parsedMessage === `object` &&
+ parsedMessage.arguments &&
+ typeof parsedMessage.arguments.hostInfo === `string`
+ ) {
+ hostInfo = parsedMessage.arguments.hostInfo;
+ }
+
+ return originalOnMessage.call(this, JSON.stringify(parsedMessage, (key, value) => {
+ return typeof value === `string` ? fromEditorPath(value) : value;
+ }));
+ },
+
+ send(/** @type {any} */ msg) {
+ return originalSend.call(this, JSON.parse(JSON.stringify(msg, (key, value) => {
+ return typeof value === `string` ? toEditorPath(value) : value;
+ })));
+ }
+ });
+
+ return tsserver;
+};
+
+if (existsSync(absPnpApiPath)) {
+ if (!process.versions.pnp) {
+ // Setup the environment to be able to require typescript/lib/tsserverlibrary.js
+ require(absPnpApiPath).setup();
+ }
+}
+
+// Defer to the real typescript/lib/tsserverlibrary.js your application uses
+module.exports = moduleWrapper(absRequire(`typescript/lib/tsserverlibrary.js`));
diff --git a/tgui/.yarn/sdks/typescript/lib/typescript.js b/tgui/.yarn/sdks/typescript/lib/typescript.js
index 7e3c852fe1..cbdbf1500f 100644
--- a/tgui/.yarn/sdks/typescript/lib/typescript.js
+++ b/tgui/.yarn/sdks/typescript/lib/typescript.js
@@ -4,7 +4,7 @@ const {existsSync} = require(`fs`);
const {createRequire, createRequireFromPath} = require(`module`);
const {resolve} = require(`path`);
-const relPnpApiPath = "../../../../.pnp.js";
+const relPnpApiPath = "../../../../.pnp.cjs";
const absPnpApiPath = resolve(__dirname, relPnpApiPath);
const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
diff --git a/tgui/.yarn/sdks/typescript/package.json b/tgui/.yarn/sdks/typescript/package.json
index 254e665561..ea85e133e8 100644
--- a/tgui/.yarn/sdks/typescript/package.json
+++ b/tgui/.yarn/sdks/typescript/package.json
@@ -1,6 +1,6 @@
{
"name": "typescript",
- "version": "4.2.3-pnpify",
+ "version": "4.3.5-sdk",
"main": "./lib/typescript.js",
"type": "commonjs"
}
diff --git a/tgui/README.md b/tgui/README.md
index bfa9ec3d92..d0f1d1e08d 100644
--- a/tgui/README.md
+++ b/tgui/README.md
@@ -33,6 +33,13 @@ If you were already familiar with an older, Ractive-based tgui, and want
to translate concepts between old and new tgui, read this
[interface conversion guide](docs/converting-old-tgui-interfaces.md).
+### Other Documentation
+
+- [Component Reference](docs/component-reference.md) - UI building blocks
+- [Using TGUI and Byond API for custom HTML popups](docs/tgui-for-custom-html-popups.md)
+- [Chat Embedded Components](docs/chat-embedded-components.md)
+- [Writing Tests](docs/writing-tests.md)
+
## Pre-requisites
You will need these programs to start developing in tgui:
@@ -40,6 +47,7 @@ You will need these programs to start developing in tgui:
- [Node v16.13+](https://nodejs.org/en/download/)
- **LTS** release is recommended instead of latest
- [Yarn v1.22.4+](https://yarnpkg.com/getting-started/install) (optional)
+ - You can run `npm install -g yarn` to install it.
- [Git Bash](https://git-scm.com/downloads)
or [MSys2](https://www.msys2.org/) (optional)
@@ -190,10 +198,6 @@ Add stylesheets here if you really need a fine control over your UI styles.
- `/packages/tgui/styles/themes` - Contains all the various themes you can
use in tgui. Each theme must be registered in `webpack.config.js` file.
-## Component Reference
-
-See: [Component Reference](docs/component-reference.md).
-
## License
Source code is covered by /tg/station's parent license - **AGPL-3.0**
diff --git a/tgui/babel.config.js b/tgui/babel.config.js
index 46fc0b0768..d8ddb75721 100644
--- a/tgui/babel.config.js
+++ b/tgui/babel.config.js
@@ -5,7 +5,7 @@
*/
const createBabelConfig = options => {
- const { mode, presets = [], plugins = [] } = options;
+ const { presets = [], plugins = [], removeConsole } = options;
return {
presets: [
[require.resolve('@babel/preset-typescript'), {
@@ -14,23 +14,23 @@ const createBabelConfig = options => {
[require.resolve('@babel/preset-env'), {
modules: 'commonjs',
useBuiltIns: 'entry',
- corejs: '3.10',
+ corejs: '3',
spec: false,
loose: true,
targets: [],
}],
...presets,
- ],
+ ].filter(Boolean),
plugins: [
[require.resolve('@babel/plugin-proposal-class-properties'), {
loose: true,
}],
require.resolve('@babel/plugin-transform-jscript'),
require.resolve('babel-plugin-inferno'),
- require.resolve('babel-plugin-transform-remove-console'),
+ removeConsole && require.resolve('babel-plugin-transform-remove-console'),
require.resolve('common/string.babel-plugin.cjs'),
...plugins,
- ],
+ ].filter(Boolean),
};
};
diff --git a/tgui/bin/tgui b/tgui/bin/tgui
index 40579fbe47..256f0e579e 100644
--- a/tgui/bin/tgui
+++ b/tgui/bin/tgui
@@ -59,7 +59,7 @@ task-webpack() {
## Runs a development server
task-dev-server() {
cd "${base_dir}"
- yarn node packages/tgui-dev-server/index.esm.js "${@}"
+ yarn node --experimental-modules packages/tgui-dev-server/index.js "${@}"
}
## Run a linter through all packages
@@ -92,7 +92,7 @@ task-clean() {
rm -f .yarn/build-state.yml
rm -f .yarn/install-state.gz
rm -f .yarn/install-target
- rm -f .pnp.js
+ rm -f .pnp.*
## NPM artifacts
rm -rf **/node_modules
rm -f **/package-lock.json
diff --git a/tgui/bin/tgui-bench.bat b/tgui/bin/tgui-bench.bat
new file mode 100644
index 0000000000..da22a7b2ae
--- /dev/null
+++ b/tgui/bin/tgui-bench.bat
@@ -0,0 +1,9 @@
+@echo off
+rem Copyright (c) 2020 Aleksej Komarov
+rem SPDX-License-Identifier: MIT
+call powershell.exe -NoLogo -ExecutionPolicy Bypass -File "%~dp0\tgui_.ps1" --bench %*
+rem Pause if launched in a separate shell unless initiated from powershell
+echo %PSModulePath% | findstr %USERPROFILE% >NUL
+if %errorlevel% equ 0 exit 0
+echo %cmdcmdline% | find /i "/c"
+if %errorlevel% equ 0 pause
diff --git a/tgui/bin/tgui_.ps1 b/tgui/bin/tgui_.ps1
index c8f74b2d21..a1909fe70e 100644
--- a/tgui/bin/tgui_.ps1
+++ b/tgui/bin/tgui_.ps1
@@ -47,7 +47,11 @@ function task-webpack {
## Runs a development server
function task-dev-server {
- yarn node "packages/tgui-dev-server/index.esm.js" @Args
+ yarn node --experimental-modules "packages/tgui-dev-server/index.js" @Args
+}
+
+function task-bench {
+ yarn tgui:bench @Args
}
## Run a linter through all packages
@@ -75,7 +79,7 @@ function task-clean {
Remove-Quiet -Force ".yarn\build-state.yml"
Remove-Quiet -Force ".yarn\install-state.gz"
Remove-Quiet -Force ".yarn\install-target"
- Remove-Quiet -Force ".pnp.js"
+ Remove-Quiet -Force ".pnp.*"
## NPM artifacts
Get-ChildItem -Path "." -Include "node_modules" -Recurse -File:$false | Remove-Item -Recurse -Force
Remove-Quiet -Force "package-lock.json"
@@ -132,6 +136,13 @@ if ($Args.Length -gt 0) {
task-webpack --mode=production --analyze
exit 0
}
+
+ if ($Args[0] -eq "--bench") {
+ $Rest = $Args | Select-Object -Skip 1
+ task-install
+ task-bench --wait-on-error
+ exit 0
+ }
}
## Make a production webpack build
diff --git a/tgui/docs/tgui-for-custom-html-popups.md b/tgui/docs/tgui-for-custom-html-popups.md
new file mode 100644
index 0000000000..f25060e9fa
--- /dev/null
+++ b/tgui/docs/tgui-for-custom-html-popups.md
@@ -0,0 +1,259 @@
+# Using TGUI and Byond API for custom HTML popups
+
+TGUI in its current form would not exist without a very robust underlying layer that interfaces TGUI code with the BYOND browser component. This very layer can also be used to write simple and robust HTML popups, with access to many convenient APIs. In this article, you'll learn how to make a TGUI powered HTML popup and leverage all APIs that it provides.
+
+## How to create a window
+
+TGUI in order to create a window (popup) uses the `/datum/tgui_window` class. Feel free to take a look at its [source code](../../code/modules/tgui/tgui_window.dm), as all of its procs are very well documented. This class takes care of spawning the BYOND's browser element, normalizes the browser environment (because users might have IE8 on their system, or in future, it might be Microsoft Edge) and specifies a very rigid communication protocol between DM and JS.
+
+> **Notice:** Because `/datum/tgui_window` includes a lot of boilerplate in the final html that it displays in the browser, it is somewhat more expensive to render than a traditional, dumb popup using a `browse()` proc call. Therefore, its best to use it with static popups or very custom pieces of client-side code, e.g. stat panel, chat or a background music player.
+Create a window that prints hello world.
+
+```dm
+var/datum/tgui_window/window = new(usr.client, "custom_popup")
+window.initialize(
+ inline_html = "
Hello world!
",
+)
+```
+
+Here, `custom_popup` is a unique id for the BYOND skin element that this window uses, and it can be anything you want. If you want to reference a specific element from `interface/skin.dmf`, you can use that id instead, and UI will initialize inside of that element. This is how for example chat initializes itself, by using a `browseroutput` id, which is also specified in `interface/skin.dmf`.
+
+In case you want to re-initialize it with different content, you can do that as well by calling `initialize` again with different arguments.
+
+```dm
+window.initialize(
+ inline_html = "
Hello world, but smaller!
",
+)
+```
+
+You can close the window as easily as you've opened it.
+
+```dm
+window.close()
+```
+
+## Sending assets
+
+TGUI in /tg/station codebase has `/datum/asset`, that packs scripts and stylesheets for delivery via CDN for efficiency. TGUI internally uses this asset system to render TGUI interfaces *proper* and TGUI chat. This is a snippet from internal TGUI code:
+
+```dm
+window.initialize(
+ fancy = user.client.prefs.read_preference(
+ /datum/preference/toggle/tgui_fancy
+ ),
+ assets = list(
+ get_asset_datum(/datum/asset/simple/tgui),
+ ))
+```
+
+You can see two new arguments:
+
+- `fancy` - See [Fancy mode](#fancy-mode)
+- `assets` - This is a list of asset datums, and all JS and CSS in the assets will be loaded in the page.
+
+Using asset datums has a big benefit over including `
+```
+
+## Inlined HTML, CSS and JS
+
+You can also make a popup that doesn't rely on network requests to get JS and CSS. In the following case, the entirety of the page will be contained in a single HTML file.
+
+```dm
+window.initialize(
+ inline_html = "
Hello world!
",
+ inline_js = "window.alert('Warning!')",
+ inline_css = "h1 { color: red }",
+)
+```
+
+You can also do the same by splitting your code into separate files, and then leveraging tgui window to serve it all as one big HTML file.
+
+```dm
+window.initialize(
+ inline_html = file2text('code/modules/thing/thing.html'),
+ inline_js = file2text('code/modules/thing/thing.js'),
+ inline_css = file2text('code/modules/thing/thing.css'),
+)
+```
+
+If you need to inline multiple JS or CSS files, you can concatenate them for now, and separate contents of each file with an `\n` symbol. *This can be a point of improvement (add support for file lists)*.
+
+## Fancy mode
+
+You may have noticed the fancy mode in previous snippets:
+
+```dm
+window.initialize(fancy = TRUE)
+```
+
+This removes the native window titlebar and border, which effectively turns window into a floating panel. TGUI heavily uses this option to draw completely custom, fancy windows. You can use it too, but not having the default titlebar limits usability of the browser window, since you can't even close it or drag around without implementing that functionality yourself. This mode might be useful for creating popups and tooltips.
+
+## Communication
+
+It is very often necessary to exchange data between DM and JS, and in vanilla BYOND programming it is a huge pain in the butt, because the `browse()` API is very convoluted, out of box it can send only strings, and sending data back to DM requires using hrefs.
+
+```
+location.href = '?src=12345¶m=1'
+```
+
+If you're familiar with the href syntax of BYOND topic calls, then perhaps this doesn't surprise you, but this API artificially limits you to sending 2048 characters of string-typed data; you need to reinvent the wheel if you want to send something more complex than strings. It differs from the way you send messages from DM. And it's very hard to read as well.
+
+Thankfully, TGUI implements a very robust protocol that makes this slightly less of an eye sore and very convenient to use in the long run.
+
+### Message structure
+
+```ts
+{
+ type: string;
+ payload?: any;
+ // ...
+}
+```
+
+Each message always has a **type**, which is usually (but not always) the first argument on all message sending functions. The next property is the **payload**, which contains all the data sent in the message.
+
+You can think of it in these terms:
+
+- **type** - function name
+- **payload** - function arguments
+
+Of course we're not working with functions here, but hopefully this analogy makes the concept easier to understand.
+
+Finally, message can contain custom properties, and how you use them is *completely up to you*. They have an important limitation - all additional properties are string-typed, and require you to use a slightly more verbose API for sending them (more about it in the next section).
+
+```js
+Byond.sendMessage({
+ type: 'click',
+ payload: { buttonId: 1 },
+ popup_section: 'left',
+});
+```
+
+### DM âž¡ JS
+
+To send a message from DM, you can use the `window.send_message()` proc.
+
+```dm
+window.send_message("alert", list(
+ text = "Hello, world!",
+))
+```
+
+To receive it in JS, you have two different syntaxes. First one is the most verbose one, but allows receiving all types of messages, and deciding what to do via `if` conditions.
+
+> NOTE: We're using ECMAScript 5 syntax here, because this is the version that is supported by IE 11 natively without any additional compilation. If you're coding in a compiled environment (TGUI/Webpack), then feel free to use arrow functions and other fancy syntaxes.
+```js
+Byond.subscribe(function (type, payload) {
+ if (type === 'alert') {
+ window.alert(payload.text);
+ return;
+ }
+ if (type === 'other') {
+ // ...
+ return;
+ }
+ // ...
+});
+```
+
+Second one is more compact, because it already filters messages by type and passes the payload directly to the callback.
+
+```js
+Byond.subscribeTo('alert', function (payload) {
+ window.alert(payload.text);
+});
+```
+
+### JS âž¡ DM
+
+To send a message from JS, you can use the `Byond.sendMessage()` function.
+
+```js
+Byond.sendMessage('click', {
+ button: 'explode-mech',
+});
+```
+
+To receive it in DM, you must register a delegate proc (callback) that will receive the messages (usually called `on_message`), and handle the message in that proc.
+
+```dm
+/datum/my_object/proc/initialize()
+ // ...
+ window.subscribe(src, .proc/on_message)
+/datum/my_object/proc/on_message(type, payload)
+ if (type == "click")
+ process_button_click(payload["button"])
+ return
+```
+
+**Advanced variant**
+
+You can send messages with custom fields in case if you want to bypass JSON serialization of the **payload**. Not sending the **payload** is a little bit faster if you send a lot of messages (because BYOND is slow in general with proc calls, especially `json_decode`). All raw message fields are available in the third argument `href_list`.
+
+```js
+Byond.sendMessage({
+ type: "something",
+ ref: "[0x12345678]",
+});
+```
+
+```dm
+/datum/my_object/proc/on_message(type, payload, href_list)
+ if (type == "something")
+ process_something(locate(href_list["ref"]))
+ return
+```
+
+## BYOND Skin API
+
+There is a full assortment of BYOND client-side features that you can access via the `Byond` API object.
+
+Full reference of the `Byond` API object is here: [global.d.ts](../global.d.ts). It's a global type definition file, which provides auto-completion in VSCode when coding TGUI interfaces. When writing custom popups outside of TGUI, autocompletion doesn't work, so you might need to peek into this file sometimes.
+
+Here's the summary of what it has.
+
+- `Byond.winget()` - Returns a property of a skin element. This is an async function call, more on that later.
+- `Byond.winset()` - Sets a property of a skin element.
+- `Byond.topic()` - Makes a Topic call to the server. Similar to `sendMessage`, but all topic calls are native to BYOND, string typed and processed in `/client/Topic()` proc.
+- `Byond.command()` - Runs a command on the client, as if you typed it into the command bar yourself. Can be any verb, or a special client-side command, such as `.output`.
+
+> As of now, `Byond.winget()` requires a Promise polyfill, which is only available in compiled TGUI, but not in plain popups, and if you try using it, you'll get a bluescreen error. If you'd like to have winget in non-compiled contexts, then ping maintainers on Discord to request this feature.
+When working with `winset` and `winget`, it can be very useful to consult [BYOND 5.0 controls and parameters guide](https://secure.byond.com/docs/ref/skinparams.html) to figure out what you can control in the BYOND client. Via these controls and parameters, you can do many interesting things, such as dynamically define BYOND macros, or show/hide and reposition various skin elements.
+
+Another source of information is the official [BYOND Reference](https://secure.byond.com/docs/ref/info.html#/{skin}), which is a much larger, but a more comprehensive doc.
+
+Id of the current tgui window can be accessed via `Byond.windowId`, and below in an example of changing its `size`.
+
+```js
+Byond.winset(Byond.windowId, {
+ size: '1280x640',
+});
+```
+
+Id of the main SS13 window is `'mainwindow'`, as defined in [skin.dmf](../../interface/skin.dmf).
+
+Little known feature, but you can also get non-UI parameters on the client by using a `null` id.
+
+```js
+// Fetch URL of a server client is currently connected to
+Byond.winget(null, 'url').then((serverUrl) => {
+ // Connect to this server
+ Byond.call(serverUrl);
+ // Close our client because it is now connecting in background
+ Byond.command('.quit');
+});
+```
diff --git a/tgui/global.d.ts b/tgui/global.d.ts
index 7f2cc8f728..0f69e37153 100644
--- a/tgui/global.d.ts
+++ b/tgui/global.d.ts
@@ -4,155 +4,180 @@
* @license MIT
*/
-declare global {
- // Webpack asset modules.
- // Should match extensions used in webpack config.
- declare module '*.png' {
- const content: string;
- export default content;
- }
-
- declare module '*.jpg' {
- const content: string;
- export default content;
- }
-
- declare module '*.svg' {
- const content: string;
- export default content;
- }
-
- type ByondType = {
- /**
- * True if javascript is running in BYOND.
- */
- IS_BYOND: boolean;
-
- /**
- * True if browser is IE8 or lower.
- */
- IS_LTE_IE8: boolean;
-
- /**
- * True if browser is IE9 or lower.
- */
- IS_LTE_IE9: boolean;
-
- /**
- * True if browser is IE10 or lower.
- */
- IS_LTE_IE10: boolean;
-
- /**
- * True if browser is IE11 or lower.
- */
- IS_LTE_IE11: boolean;
-
- /**
- * Makes a BYOND call.
- *
- * If path is empty, this will trigger a Topic call.
- * You can reference a specific object by setting the "src" parameter.
- *
- * See: https://secure.byond.com/docs/ref/skinparams.html
- */
- call(path: string, params: object): void;
-
- /**
- * Makes an asynchronous BYOND call. Returns a promise.
- */
- callAsync(path: string, params: object): Promise;
-
- /**
- * Makes a Topic call.
- *
- * You can reference a specific object by setting the "src" parameter.
- */
- topic(params: object): void;
-
- /**
- * Runs a command or a verb.
- */
- command(command: string): void;
-
- /**
- * Retrieves all properties of the BYOND skin element.
- *
- * Returns a promise with a key-value object containing all properties.
- */
- winget(id: string): Promise