diff --git a/GainStation13/code/mechanics/helplessness.dm b/GainStation13/code/mechanics/helplessness.dm
index fe88e9af97..cf06e7e09a 100644
--- a/GainStation13/code/mechanics/helplessness.dm
+++ b/GainStation13/code/mechanics/helplessness.dm
@@ -9,7 +9,7 @@
to_chat(H, "You are too fat to wear anything on your back.")
return FALSE
- if(HAS_TRAIT(H, TRAIT_NO_JUMPSUIT) && slot == ITEM_SLOT_ICLOTHING)
+ if(I.modular_icon_location == null && HAS_TRAIT(H, TRAIT_NO_JUMPSUIT) && slot == ITEM_SLOT_ICLOTHING)
to_chat(H, "You are too fat to wear [I].")
return FALSE
diff --git a/GainStation13/code/mechanics/permanent_fat.dm b/GainStation13/code/mechanics/permanent_fat.dm
index 7a26daa980..9492f6b8ff 100644
--- a/GainStation13/code/mechanics/permanent_fat.dm
+++ b/GainStation13/code/mechanics/permanent_fat.dm
@@ -2,7 +2,7 @@
var/savekey
var/ckeyslot
-/mob/living/carbon/proc/perma_fat_save(mob/living/carbon/character)
+/mob/living/carbon/proc/perma_fat_save()
var/key = savekey
if(!key)
return FALSE
@@ -13,26 +13,34 @@
if(!path)
return FALSE
- if(character.ckeyslot)
- var/slot = character.ckeyslot
+ if(ckeyslot)
+ var/slot = ckeyslot
S.cd = "/character[slot]"
var/persi
S["weight_gain_persistent"] >> persi
if(persi)
- WRITE_FILE(S["starting_weight"] , character.fatness_real)
+ WRITE_FILE(S["starting_weight"] , fatness_real)
+ client.prefs.starting_weight = fatness_real
+ to_chat(src, span_notice("Your starting weight has been updated!"))
var/perma
S["weight_gain_permanent"] >> perma
if(S["weight_gain_permanent"])
- WRITE_FILE(S["permanent_fat"] , character.fatness_perma)
+ WRITE_FILE(S["permanent_fat"] , fatness_perma)
+ client.prefs.permanent_fat = fatness_perma
+ to_chat(src, span_notice("Your permanent fat has been updated!"))
-/datum/controller/subsystem/ticker/gather_roundend_feedback()
+/mob/living/carbon/proc/queue_perma_save()
+ to_chat(src,"Your permanence options are being saved, please wait." )
+ addtimer(CALLBACK(src, PROC_REF(perma_fat_save), TRUE, silent), 3 SECONDS, TIMER_STOPPABLE)
+
+/datum/controller/subsystem/ticker/declare_completion()
+ . = ..()
for(var/mob/m in GLOB.player_list)
if(iscarbon(m))
var/mob/living/carbon/C = m
if(C)
- C.perma_fat_save(C)
- . = ..()
+ C.queue_perma_save()
/obj/machinery/cryopod/despawn_occupant()
var/mob/living/mob_occupant = occupant
diff --git a/GainStation13/code/mechanics/water_sponge.dm b/GainStation13/code/mechanics/water_sponge.dm
index 84d4b1e788..b3bf8b287d 100644
--- a/GainStation13/code/mechanics/water_sponge.dm
+++ b/GainStation13/code/mechanics/water_sponge.dm
@@ -6,6 +6,9 @@
lose_text = "You don't feel absorbant anymore."
mob_trait = TRAIT_WATER_SPONGE
+/datum/reagent/water
+ var/bloat_coeff = 3.5
+
/datum/reagent/water/on_mob_add(mob/living/L, amount)
if(HAS_TRAIT(L, TRAIT_WATER_SPONGE))
if(iscarbon(L))
@@ -30,7 +33,7 @@
/datum/reagent/water/proc/fat_hide(mob/living/carbon/user)
- return volume * 3.5
+ return volume * bloat_coeff
/obj/machinery/shower/process()
..()
@@ -57,6 +60,9 @@
water_check(breath, H)
. = ..()
+/datum/reagent/water/overdose_start(mob/living/M)
+ . = 1
+
/obj/structure/sink
var/mob/living/attached
diff --git a/GainStation13/code/mechanics/web_weaving.dm b/GainStation13/code/mechanics/web_weaving.dm
index d334a04d74..fbd7c2ae52 100644
--- a/GainStation13/code/mechanics/web_weaving.dm
+++ b/GainStation13/code/mechanics/web_weaving.dm
@@ -41,7 +41,7 @@
var/obj/item/clothing/suit = target.wear_suit
if(istype(suit, /obj/item/clothing/suit/straight_jacket/web))
user.visible_message("[user] begins to fully encase [target] in a cocoon!", "You begin to fully encase [target] in a cocoon.")
- if(!do_after_mob(user, target, 30 SECONDS))
+ if(!do_after(user, 30 SECONDS, target))
return FALSE
var/obj/structure/spider/cocoon/quirk/spawned_cocoon = new(target.loc)
@@ -60,7 +60,7 @@
return TRUE
user.visible_message("[user] attempts to remove [target]'s [target.wear_suit]!", "You attempt to remove [target]'s [target.wear_suit].")
- if(!do_after_mob(user, target, 10 SECONDS) || !target.dropItemToGround(suit))
+ if(!do_after(user, 10 SECONDS, target) || !target.dropItemToGround(suit))
return FALSE
var/obj/item/clothing/suit/straight_jacket/web/wrapping = new
@@ -68,7 +68,7 @@
return FALSE
user.visible_message("[user] attempts to wrap [target] inside of [wrapping]!", "You attempt to wrap [target] inside of [wrapping].")
- if(!do_after_mob(user, target, 20 SECONDS) || !target.equip_to_slot_if_possible(wrapping, ITEM_SLOT_OCLOTHING, TRUE, TRUE))
+ if(!do_after(user, 20 SECONDS, target) || !target.equip_to_slot_if_possible(wrapping, ITEM_SLOT_OCLOTHING, TRUE, TRUE))
user.visible_message("[user] fails to wrap [target] inside of [wrapping]!", "You fail to wrap [target] inside of [wrapping].")
return FALSE
@@ -105,9 +105,28 @@
/datum/action/innate/make_web/Activate()
var/turf/T = get_turf(owner)
owner.visible_message("[owner] begins spinning a web!", "You begin spinning a web.")
- if(!do_after(owner, 10 SECONDS, 1, null, 1))
+ var/obj/structure/spider/stickyweb/W = locate() in get_turf(src)
+ if(W || !do_after(owner, 10 SECONDS, T))
owner.visible_message("[owner] fails to spin a web!", "You fail to spin web.")
return FALSE
- T.ChangeTurf(/obj/structure/spider/stickyweb)
- owner.visible_message("[owner] spin a sticky web!", "You spin a sticky web.")
+ new /obj/structure/spider/stickyweb(T)
+ owner.visible_message("[owner] spins a sticky web!", "You spin a sticky web.")
+ return TRUE
+
+/obj/structure/spider/stickyweb/CanPass(atom/movable/mover, turf/target)
+ if (genetic)
+ return
+ if(istype(mover, /mob/living/simple_animal/hostile/poison/giant_spider) || HAS_TRAIT(mover, TRAIT_WEB_WEAVER))
+ return TRUE
+ else if(isliving(mover))
+ if(istype(mover.pulledby, /mob/living/simple_animal/hostile/poison/giant_spider))
+ return TRUE
+ if(mover.pulledby)
+ if(HAS_TRAIT(mover.pulledby, TRAIT_WEB_WEAVER))
+ return TRUE
+ if(prob(50))
+ to_chat(mover, "You get stuck in \the [src] for a moment.")
+ return FALSE
+ else if(istype(mover, /obj/item/projectile))
+ return prob(30)
return TRUE
diff --git a/GainStation13/code/modules/client/loadout/uniform.dm b/GainStation13/code/modules/client/loadout/uniform.dm
new file mode 100644
index 0000000000..f7b572108a
--- /dev/null
+++ b/GainStation13/code/modules/client/loadout/uniform.dm
@@ -0,0 +1,3 @@
+/datum/gear/uniform/modularjumpsuit
+ name = "Grey jumpsuit (Modular)"
+ path = /obj/item/clothing/under/color/grey
diff --git a/GainStation13/code/modules/clothing/under/jobs/modular_items.dm b/GainStation13/code/modules/clothing/under/jobs/modular_items.dm
index 6435c66202..13c3073f1f 100644
--- a/GainStation13/code/modules/clothing/under/jobs/modular_items.dm
+++ b/GainStation13/code/modules/clothing/under/jobs/modular_items.dm
@@ -1,41 +1,150 @@
+//////////////////////////////////////
+// MODULAR ITEMS 2.0 //
+// BETTER AND BIGGER THAN EVER //
+//////////////////////////////////////
+
+//HOW TO CREATE A NEW MODULAR ITEM
+// 1) DRAW THE SPRITES (see already made modular sprites)
+// 2) FIND THE ITEM YOU WANT TO MAKE MODULAR (example: the grey jumpsuit is /obj/item/clothing/under/color/grey )
+// 3) CHANGE IT'S modular_icon_location TO BE THE LOCATION OF THE SPRITES YOU'VE MADE (example: modular_icon_location = 'GainStation13/icons/mob/modclothes/modular_grey.dmi')
+// 4) YOU ARE DONE. YOUR ITEM IS NOW MODULAR
+
+//Many functions of the system can be customized by overloading the various procs
+//If you know what you are doing then I encoourage you to tweak your item to work better for the idea you had in mind
+
/mob/living/carbon
var/modular_items = list()
+
+// Called by handle_fatness, this is called periodically to tell all items to check for sprites and, if needed, build new ones
/mob/living/carbon/proc/handle_modular_items(adjustment_amount, type_of_fattening = FATTENING_TYPE_ITEM)
for(var/obj/item/item in modular_items)
item.update_modular_overlays(src)
/obj/item
- var/modular_icon_location = null
- var/mod_overlays = list()
- var/mod_breasts_size = 0
- var/mod_butt_size = 0
- var/mod_belly_size = 0
+ var/modular_icon_location = null //Locates the sprites, null if it is not a modular item. Changing this makes the item modular
+ var/mod_overlays = list() //Keeps track of the modular sprite overlays for the item
+ var/mod_breasts_rec //Records the last used sprite for breasts to avoid building sprites if no change occurred
+ var/mod_butt_rec //^^^ for butt
+ var/mod_belly_rec //^^^ for belly
+//General condition for activating modular sprites for an item.
+//When equipped to that item's appropriate slot, if the item has modular icons then initialize it as a modular item
/obj/item/equipped(mob/user, slot)
- if(modular_icon_location != null && slot == slot_flags) //if(slot == ITEM_SLOT_ICLOTHING)
+ if(modular_icon_location != null && slot == slot_flags)
add_modular_item(user)
..()
+//General condition for deactivating modular sprites for an item.
+//When dropped. And/or moved to another slot, works together with equipped checking the approporiate slot
/obj/item/dropped(mob/user)
remove_modular_item(user)
..()
+//Initialize a modular item by resetting any recorded sprite names and force a sprite update
/obj/item/proc/add_modular_item(mob/user)
- mod_breasts_size = 0
- mod_butt_size = 0
- mod_belly_size = 0
+ mod_breasts_rec = null
+ mod_butt_rec = null
+ mod_belly_rec = null
update_modular_overlays(user)
+//Remove a modular item by deleting it from the user's list of tracked modular items
+//and forcing sprite deletion
+/obj/item/proc/remove_modular_item(mob/user)
+ if(!iscarbon(user))
+ return
+ delete_modular_overlays(user)
+ var/mob/living/carbon/U = user
+ if(src in U.modular_items)
+ U.modular_items -= src
+
+//The meat of the system, checks the genitals, compares to recorded size and request
+//the sprites if new ones are needed
+/obj/item/proc/update_modular_overlays(mob/user)
+ if(!iscarbon(user))
+ return
+ var/mob/living/carbon/U = user
+
+ var/list/genitals_list
+ var/build_modular = FALSE
+
+ //Before requesting sprites we must make sure new ones are actually needed
+ //Go through the genitals of the user to detect belly, butt and breasts (individually, not all 3 are needed)
+ //Add it to a list of found genitals to not go through all organs again
+ //Get the sprite name of the sprites needed and compare it to the ones recorded
+ //If they are different, record the sprites and build_modular to TRUE to signal that new sprites are needed
+ var/obj/item/organ/genital/O
+ for(O in U.internal_organs)
+ if(istype(O, /obj/item/organ/genital/belly))
+ genitals_list += list(O)
+ var/belly = get_modular_belly(O)
+ if(belly != mod_belly_rec)
+ mod_belly_rec = belly
+ build_modular = TRUE
+ if(istype(O, /obj/item/organ/genital/butt))
+ genitals_list += list(O)
+ var/butt = get_modular_butt(O)
+ if(butt != mod_butt_rec)
+ mod_butt_rec = butt
+ build_modular = TRUE
+ if(istype(O, /obj/item/organ/genital/breasts))
+ genitals_list += list(O)
+ var/breasts = get_modular_breasts(O)
+ if(breasts != mod_breasts_rec)
+ mod_breasts_rec = breasts
+ build_modular = TRUE
+ if(!build_modular) //Stop early if no new sprites are needed
+ return
+ delete_modular_overlays(U) //Delete the old sprites
+
+ if(!(src in U.modular_items)) //Make sure the item is inside the user's tracked modular items
+ U.modular_items += src //used on the first sprite request and to ensure it's being tracked for future updates
+
+ //Go through the list of genitals previously found and for each add the modular sprite overlays to the user
+ var/obj/item/organ/genital/G
+ for(G in genitals_list)
+ if(istype(G, /obj/item/organ/genital/belly))
+ add_modular_overlay(U, mod_belly_rec, MODULAR_BELLY_LAYER, color)
+ add_modular_overlay(U, "[mod_belly_rec]_SOUTH", BELLY_FRONT_LAYER, color)
+ if(istype(G, /obj/item/organ/genital/butt))
+ add_modular_overlay(U, mod_butt_rec, MODULAR_BUTT_LAYER, color)
+ add_modular_overlay(U, "[mod_butt_rec]_NORTH", BUTT_BEHIND_LAYER, color)
+ if(istype(G, /obj/item/organ/genital/breasts))
+ add_modular_overlay(U, mod_breasts_rec, MODULAR_BREASTS_LAYER, color)
+ add_modular_overlay(U, "[mod_breasts_rec]_NORTH", BREASTS_BEHIND_LAYER, color)
+ add_modular_overlay(U, "[mod_breasts_rec]_SOUTH", BREASTS_FRONT_LAYER, color)
+
+//Remove the previously built modular sprite overlays and empty the list of tracked overlays
+/obj/item/proc/delete_modular_overlays(mob/user)
+ if(!iscarbon(user))
+ return
+ var/mob/living/carbon/U = user
+ if(!(src in U.modular_items))
+ return
+ for(var/mutable_appearance/overlay in mod_overlays)
+ U.cut_overlay(overlay)
+ mod_overlays -= mod_overlays
+
+//Function to easily add a requested overlay
+//Create the appropriate sprite object (mod_overlay) using the icon previously found, from the item's modular sprites file, on the appropriate overlay and with the item's color
+//The sprite is then added to the item's list of built modular sprites overlay
+//Added to the appropriate layer of the user
+//Then the layer is applied
+//
+// Why is the layer in mutable appearance entered as its negative version?
+// No. Damn. Clue. SS13, I don't question it further.
+//
/obj/item/proc/add_modular_overlay(mob/living/carbon/U, modular_icon, modular_layer, sprite_color)
var/mutable_appearance/mod_overlay = mutable_appearance(modular_icon_location, modular_icon, -(modular_layer), color = sprite_color)
mod_overlays += mod_overlay
U.overlays_standing[modular_layer] = mod_overlay
U.apply_overlay(modular_layer)
+//General function to generate the right icon_state for belly modular sprites
/obj/item/proc/get_modular_belly(obj/item/organ/genital/G)
return "belly_[get_belly_size(G)][get_belly_alt()]"
+//General function to get the appropriate shape and size for the belly, accounting for fullness
/obj/item/proc/get_belly_size(obj/item/organ/genital/G)
var/size = G.size
if(G.size > 9)
@@ -61,18 +170,19 @@
return "[shape]_[size]"
+//Placeholder function for alternate variants of the shape and size sprites for belly
/obj/item/proc/get_belly_alt()
return ""
-/obj/item/clothing/under/get_belly_alt()
- return "[(adjusted) ? "_d" : ""]"
-
+//General function to get the appropriate shape and size for the butt
/obj/item/proc/get_modular_butt(obj/item/organ/genital/G)
return "butt_[(G.size <= 10 ) ? "[G.size]" : "10"][get_butt_alt()]"
+//General function to get the alternate variants for butt sprites, used for digitigrade characters
/obj/item/proc/get_butt_alt()
return "[(mutantrace_variation == STYLE_DIGITIGRADE) ? "_l" : ""]"
+//General function to get the appropriate size for the breasts
/obj/item/proc/get_modular_breasts(obj/item/organ/genital/G)
var/size
if(G.size <= "o")
@@ -89,80 +199,21 @@
size = "impossible"
return "breasts_[size][get_breasts_alt()]"
+//Placeholder function for alternate variants of the breasts
/obj/item/proc/get_breasts_alt()
return ""
-/obj/item/proc/update_modular_overlays(mob/user)
- if(!iscarbon(user))
- return
- var/mob/living/carbon/U = user
-
- var/list/genitals_list
- var/build_modular = FALSE
-
- var/obj/item/organ/genital/O
- for(O in U.internal_organs)
- if(istype(O, /obj/item/organ/genital/belly))
- genitals_list += list(O)
- if(O.size != mod_belly_size)
- mod_belly_size = O.size
- build_modular = TRUE
- if(istype(O, /obj/item/organ/genital/butt))
- genitals_list += list(O)
- if(O.size != mod_butt_size)
- mod_butt_size = O.size
- build_modular = TRUE
- if(istype(O, /obj/item/organ/genital/breasts))
- genitals_list += list(O)
- var/obj/item/organ/genital/breasts/G = O
- if(G.cached_size != mod_breasts_size)
- mod_breasts_size = G.cached_size
- build_modular = TRUE
- if(!build_modular)
- return
- delete_modular_overlays(U)
-
- if(!(src in U.modular_items))
- U.modular_items += src
- var/obj/item/organ/genital/G
- for(G in genitals_list) //check the user for the organs they have
- if(istype(G, /obj/item/organ/genital/belly)) //if that organ is a belly
- var/modular_sprite = get_modular_belly(G)
- add_modular_overlay(U, modular_sprite, MODULAR_BELLY_LAYER, color)
- add_modular_overlay(U, "[modular_sprite]_SOUTH", BELLY_FRONT_LAYER, color)
- if(istype(G, /obj/item/organ/genital/butt)) //if that organ is the butt
- var/modular_sprite = get_modular_butt(G)
- add_modular_overlay(U, modular_sprite, MODULAR_BUTT_LAYER, color)
- add_modular_overlay(U, "[modular_sprite]_NORTH", BUTT_BEHIND_LAYER, color)
- if(istype(G, /obj/item/organ/genital/breasts)) //if the organ is the breasts
- var/modular_sprite = get_modular_breasts(G)
- add_modular_overlay(U, modular_sprite, MODULAR_BREASTS_LAYER, color)
- add_modular_overlay(U, "[modular_sprite]_NORTH", BREASTS_BEHIND_LAYER, color)
- add_modular_overlay(U, "[modular_sprite]_SOUTH", BREASTS_FRONT_LAYER, color)
-
-/obj/item/proc/delete_modular_overlays(mob/user)
- if(!iscarbon(user))
- return
- var/mob/living/carbon/U = user
- if(!(src in U.modular_items))
- return
- for(var/mutable_appearance/overlay in mod_overlays)
- U.cut_overlay(overlay)
- mod_overlays -= mod_overlays
-
-/obj/item/proc/remove_modular_item(mob/user)
- if(!iscarbon(user))
- return
- delete_modular_overlays(user)
- var/mob/living/carbon/U = user
- if(src in U.modular_items)
- U.modular_items -= src
-
+//The modular grey jumpsuit. The foundation of modular items and our holy grail
/obj/item/clothing/under/color/grey
- name = "grey jumpsuit (Modular)"
- modular_icon_location = 'GainStation13/icons/mob/modclothes/modular_grey.dmi'
+ name = "grey jumpsuit (Modular)" //(Modular) to tell players it is modular
+ modular_icon_location = 'GainStation13/icons/mob/modclothes/modular_grey.dmi' //Location of the sprites, to make it modular
desc = "A tasteful grey jumpsuit that reminds you of the good old days."
+//Overload of the alt belly sprites function, for adjusteable clothing
+/obj/item/clothing/under/get_belly_alt()
+ return "[(adjusted) ? "_d" : ""]"
+
+//The placeholder colored jumpsuits
/obj/item/clothing/under/color/grey/service
name = "service grey jumpsuit (Modular)"
desc = "Grey only in name"
diff --git a/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm b/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm
index 29ffcf5391..dda2bde3c1 100644
--- a/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm
+++ b/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm
@@ -1,11 +1,10 @@
//GS13 - markings, ported or our own (preferably mark where you took them from)
-/datum/sprite_accessory/hair/elize
- name = "Elize"
- icon = 'GainStation13/icons/mob/human_face.dmi'
- icon_state = "hair_elize"
+#define NEWHAIR(_name, new_state) /datum/sprite_accessory/hair/##new_state/icon_state=#new_state;/datum/sprite_accessory/hair/##new_state/name = #_name;/datum/sprite_accessory/hair/##new_state/icon = 'GainStation13/icons/mob/human_face.dmi'
+
+NEWHAIR(Elize, hair_elize)
+NEWHAIR(Lem, hair_lem)
+NEWHAIR(Straight (Floorlength), hair_straightfloorlength)
+
+#undef NEWHAIR
-/datum/sprite_accessory/hair/lem
- name = "Lem"
- icon = 'GainStation13/icons/mob/human_face.dmi'
- icon_state = "hair_lem"
diff --git a/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/snouts.dm b/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/snouts.dm
index 96786439c4..d2d58b7b43 100644
--- a/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/snouts.dm
+++ b/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/snouts.dm
@@ -53,3 +53,10 @@
icon_state = "feasterndnw"
color_src = MATRIXED
matrixed_sections = MATRIX_RED_GREEN
+
+/datum/sprite_accessory/snouts/mam_snouts/hhorse
+ name = "Horse"
+ icon = 'GainStation13/icons/mob/markings/mam_snouts.dmi'
+ icon_state = "hhorse"
+ color_src = MATRIXED
+ matrixed_sections = MATRIX_RED_GREEN
diff --git a/GainStation13/code/modules/mob/living/species.dm b/GainStation13/code/modules/mob/living/species.dm
index 133b41d9bc..c18bda8f14 100644
--- a/GainStation13/code/modules/mob/living/species.dm
+++ b/GainStation13/code/modules/mob/living/species.dm
@@ -142,7 +142,7 @@
ADD_TRAIT(fatty, TRAIT_NO_JUMPSUIT, HELPLESSNESS_TRAIT)
var/obj/item/clothing/under/jumpsuit = fatty.w_uniform
- if(istype(jumpsuit))
+ if(istype(jumpsuit) && jumpsuit.modular_icon_location == null)
to_chat(fatty, "[jumpsuit] can no longer contain your weight!")
fatty.dropItemToGround(jumpsuit)
diff --git a/GainStation13/code/modules/vore/fatten_vore.dm b/GainStation13/code/modules/vore/fatten_vore.dm
new file mode 100644
index 0000000000..de78c1dd3e
--- /dev/null
+++ b/GainStation13/code/modules/vore/fatten_vore.dm
@@ -0,0 +1,53 @@
+
+/obj/belly/release_all_contents(var/include_absorbed = FALSE, var/silent = FALSE)
+ if(iscarbon(owner))
+ var/mob/living/carbon/predator = owner
+ predator.hider_remove(src)
+ . = ..()
+
+/obj/belly/release_specific_contents(var/atom/movable/M, var/silent = FALSE)
+ if(iscarbon(owner))
+ var/mob/living/carbon/predator = owner
+ var/found = FALSE
+ for(var/prey in contents)
+ if(istype(prey, /mob/living/carbon))
+ found = TRUE
+ if(found)
+ predator.hider_add(src)
+ else
+ predator.hider_remove(src)
+ . = ..()
+
+/obj/belly/process_belly(var/times_fired,var/wait)
+////////////////////////// Vore Fatness /////////////////////////////
+ if(iscarbon(owner))
+ var/mob/living/carbon/predator = owner
+ var/found = FALSE
+ for(var/prey in contents)
+ if(istype(prey, /mob/living/carbon))
+ found = TRUE
+ if(found)
+ predator.hider_add(src)
+ else
+ predator.hider_remove(src)
+///////////////////////////// DM_FATTEN /////////////////////////////
+ if(digest_mode == DM_FATTEN)
+ if(iscarbon(owner))
+ var/mob/living/carbon/predator = owner
+ for(var/mob/living/M in contents)
+ var/mob/living/carbon/prey = M
+ if(iscarbon(prey) && predator.fatness_real)
+ if(predator.fatness_real > 50)
+ prey.adjust_fatness(predator.fatness_real * 0.02, FATTENING_TYPE_FOOD)
+ predator.adjust_fatness(-predator.fatness_real * 0.02, FATTENING_TYPE_FOOD)
+ if(predator.nutrition > NUTRITION_LEVEL_HUNGRY)
+ predator.nutrition -= 3
+ . = ..()
+
+/obj/belly/proc/fat_hide(var/mob/living/carbon/user)
+ var/preys_fatness = 0
+ for(var/prey in contents)
+ if(iscarbon(prey))
+ var/mob/living/carbon/cprey = prey
+ preys_fatness += cprey.fatness
+ return preys_fatness
diff --git a/_maps/map_files/FestiveBall/FestiveStation.dmm b/_maps/map_files/FestiveBall/FestiveStation.dmm
index 8c82b47c85..27b413e632 100644
--- a/_maps/map_files/FestiveBall/FestiveStation.dmm
+++ b/_maps/map_files/FestiveBall/FestiveStation.dmm
@@ -321,8 +321,13 @@
/turf/open/floor/plasteel,
/area/command/bridge)
"aba" = (
-/turf/closed/festive/whitebrick,
-/area/edina/street)
+/obj/machinery/door/airlock/command/glass{
+ name = "Bridge Access";
+ req_access_txt = "19";
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/command/meeting_room/council)
"abb" = (
/obj/machinery/computer/security,
/obj/effect/turf_decal/tile/red{
@@ -584,7 +589,7 @@
/obj/effect/turf_decal/tile/green{
dir = 8
},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
/area/command/bridge)
"abM" = (
/obj/structure/window/reinforced{
@@ -596,7 +601,7 @@
/obj/effect/turf_decal/tile/green{
dir = 8
},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
/area/command/bridge)
"abN" = (
/obj/structure/window/reinforced{
@@ -615,7 +620,7 @@
/obj/effect/turf_decal/tile/green{
dir = 8
},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
/area/command/bridge)
"abO" = (
/obj/structure/table/glass,
@@ -689,7 +694,7 @@
name = "Keycard Authentication Device \[Bridge]";
pixel_x = -26
},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
/area/command/bridge)
"abV" = (
/obj/structure/window/reinforced{
@@ -699,7 +704,7 @@
/obj/effect/turf_decal/tile/green{
dir = 4
},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
/area/command/bridge)
"abW" = (
/obj/structure/table/glass,
@@ -750,7 +755,7 @@
/obj/effect/turf_decal/tile/green{
dir = 1
},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
/area/command/bridge)
"acc" = (
/obj/effect/turf_decal/tile/green{
@@ -760,7 +765,7 @@
dir = 4
},
/obj/machinery/light/floor,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
/area/command/bridge)
"acd" = (
/obj/machinery/door/window{
@@ -771,7 +776,7 @@
/obj/effect/turf_decal/tile/green{
dir = 4
},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
/area/command/bridge)
"ace" = (
/obj/structure/window/reinforced{
@@ -812,19 +817,19 @@
name = "Command Parking"
},
/turf/open/floor/festive/cobblestone/safe,
-/area/edina/street)
+/area/command/meeting_room/council)
"ack" = (
/obj/machinery/light/small{
dir = 1;
light_color = "#ffc1c1"
},
/turf/open/floor/festive/cobblestone/safe,
-/area/edina/street)
+/area/command/meeting_room/council)
"acl" = (
/obj/structure/table/reinforced,
/obj/item/aicard,
/obj/item/multitool,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
/area/command/bridge)
"acm" = (
/obj/effect/turf_decal/tile/green{
@@ -833,7 +838,7 @@
/obj/effect/turf_decal/tile/green{
dir = 1
},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
/area/command/bridge)
"acn" = (
/obj/machinery/airalarm/directional/south,
@@ -947,7 +952,7 @@
/turf/open/floor/wood,
/area/command/heads_quarters/captain)
"acF" = (
-/obj/structure/chair/comfy/brown,
+/obj/structure/fireplace,
/turf/open/floor/wood,
/area/command/heads_quarters/captain)
"acG" = (
@@ -1015,7 +1020,8 @@
"acR" = (
/obj/machinery/door/airlock/command{
name = "Captain's Office";
- req_access_txt = "20"
+ req_access_txt = "20";
+ dir = 4
},
/turf/open/floor/wood,
/area/command/meeting_room/council)
@@ -1023,11 +1029,12 @@
/turf/open/floor/carpet/royalblue,
/area/command/heads_quarters/captain)
"acT" = (
-/obj/structure/table/wood/fancy/red,
/obj/machinery/light{
dir = 4;
light_color = "#c1caff"
},
+/obj/structure/table/wood,
+/obj/item/reagent_containers/food/drinks/bottle/lizardwine,
/turf/open/floor/wood,
/area/command/heads_quarters/captain)
"acU" = (
@@ -1066,7 +1073,7 @@
light_color = "#c1caff"
},
/turf/open/floor/festive/cobblestone/safe,
-/area/edina/street)
+/area/command/meeting_room/council)
"acY" = (
/obj/machinery/light/floor,
/turf/open/floor/carpet/purple,
@@ -1099,6 +1106,7 @@
dir = 8;
light_color = "#e8eaff"
},
+/obj/structure/bookcase/random,
/turf/open/floor/wood,
/area/command/heads_quarters/captain)
"ade" = (
@@ -1165,7 +1173,7 @@
"adr" = (
/obj/effect/festive/street/streetlinenm,
/turf/open/floor/festive/cobblestone/safe,
-/area/edina/street)
+/area/command/meeting_room/council)
"ads" = (
/obj/machinery/light{
dir = 8;
@@ -1213,7 +1221,7 @@
/obj/structure/window/reinforced{
dir = 8
},
-/turf/open/floor/wood,
+/turf/open/floor/festive/wooden/wooden1,
/area/command/heads_quarters/captain)
"adB" = (
/obj/machinery/status_display{
@@ -1279,7 +1287,7 @@
"adN" = (
/obj/machinery/airalarm/directional/north,
/obj/effect/decal/festive/fairylights,
-/turf/open/floor/wood,
+/turf/open/floor/carpet/royalblue,
/area/command/heads_quarters/hop/private)
"adO" = (
/obj/machinery/light{
@@ -1289,14 +1297,14 @@
/turf/open/floor/wood,
/area/commons/dorms)
"adP" = (
-/obj/effect/decal/festive/fairylights,
-/turf/open/floor/wood,
+/obj/structure/fireplace,
+/turf/open/floor/carpet/royalblue,
/area/command/heads_quarters/hop/private)
"adQ" = (
/obj/effect/decal/festive/red_stockings,
/obj/structure/bed/double,
/obj/item/bedsheet/hop/double,
-/turf/open/floor/wood,
+/turf/open/floor/carpet/royalblue,
/area/command/heads_quarters/hop/private)
"adR" = (
/obj/effect/festive/street/streetlinenm,
@@ -1304,7 +1312,7 @@
dir = 8
},
/turf/open/floor/festive/cobblestone/safe,
-/area/edina/street)
+/area/command/meeting_room/council)
"adS" = (
/obj/machinery/airalarm/directional/west,
/turf/open/floor/wood,
@@ -1336,29 +1344,31 @@
dir = 4;
network = list("ss13","rd")
},
-/obj/machinery/vending/cigarette,
+/obj/structure/bookcase/random,
/turf/open/floor/wood,
/area/command/heads_quarters/captain)
"adX" = (
/obj/structure/table/wood,
/obj/item/card/id/captains_spare,
-/obj/structure/window/reinforced{
- dir = 8
+/obj/machinery/door/window{
+ dir = 8;
+ name = "Captain's Desk Access";
+ req_access_txt = "20"
},
-/turf/open/floor/wood,
+/turf/open/floor/festive/wooden/wooden1,
/area/command/heads_quarters/captain)
"adY" = (
/obj/structure/chair/comfy/brown{
dir = 8
},
/obj/effect/landmark/start/captain,
-/turf/open/floor/wood,
+/turf/open/floor/festive/wooden/wooden1,
/area/command/heads_quarters/captain)
"adZ" = (
/obj/machinery/computer/communications{
dir = 8
},
-/turf/open/floor/wood,
+/turf/open/floor/festive/wooden/wooden1,
/area/command/heads_quarters/captain)
"aea" = (
/obj/structure/grille,
@@ -1397,13 +1407,13 @@
light_color = "#c1caff"
},
/obj/effect/landmark/start/head_of_personnel,
-/turf/open/floor/wood,
+/turf/open/floor/carpet/royalblue,
/area/command/heads_quarters/hop/private)
"aeh" = (
/obj/effect/festive/street/streetlinenm,
/obj/effect/festive/street/streetlinesm,
/turf/open/floor/festive/cobblestone/safe,
-/area/edina/street)
+/area/command/meeting_room/council)
"aei" = (
/obj/structure/table/wood/fancy/black,
/obj/item/storage/photo_album,
@@ -1421,13 +1431,13 @@
/obj/structure/window/reinforced{
dir = 8
},
-/turf/open/floor/wood,
+/turf/open/floor/festive/wooden/wooden1,
/area/command/heads_quarters/captain)
"aek" = (
/obj/machinery/computer/card{
dir = 8
},
-/turf/open/floor/wood,
+/turf/open/floor/festive/wooden/wooden1,
/area/command/heads_quarters/captain)
"ael" = (
/obj/structure/grille,
@@ -1510,11 +1520,11 @@
dir = 1
},
/turf/open/floor/festive/cobblestone/safe,
-/area/edina/street)
+/area/command/meeting_room/council)
"aev" = (
/obj/effect/turf_decal/delivery/white,
/turf/open/floor/festive/cobblestone/safe,
-/area/edina/street)
+/area/command/meeting_room/council)
"aew" = (
/obj/structure/reagent_dispensers/water_cooler,
/turf/open/floor/wood,
@@ -1545,11 +1555,11 @@
req_access_txt = "20"
},
/obj/machinery/light,
-/turf/open/floor/wood,
+/turf/open/floor/festive/wooden/wooden1,
/area/command/heads_quarters/captain)
"aeB" = (
/obj/structure/displaycase/captain,
-/turf/open/floor/wood,
+/turf/open/floor/festive/wooden/wooden1,
/area/command/heads_quarters/captain)
"aeC" = (
/turf/closed/festive/whitebrick,
@@ -1789,6 +1799,10 @@
"aeZ" = (
/obj/structure/grille,
/obj/structure/festive/whitebrick/windowWERightEnd,
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "hop";
+ name = "Privacy Shutters"
+ },
/turf/open/floor/plasteel/dark,
/area/command/heads_quarters/hop/private)
"afa" = (
@@ -1876,6 +1890,11 @@
/area/command/corporate_showroom)
"afh" = (
/obj/effect/decal/festive/christmas_ivy_string,
+/obj/effect/turf_decal/loading_area{
+ dir = 8;
+ icon_state = "borderfloor";
+ name = "drain"
+ },
/turf/open/floor/plasteel,
/area/command/corporate_showroom)
"afi" = (
@@ -2067,10 +2086,14 @@
"afI" = (
/obj/structure/grille,
/obj/structure/festive/whitebrick/windowWEMiddle,
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "hop";
+ name = "Privacy Shutters"
+ },
/turf/open/floor/plasteel/dark,
/area/command/heads_quarters/hop/private)
"afK" = (
-/turf/open/floor/carpet/red,
+/turf/open/floor/carpet/royalblue,
/area/command/heads_quarters/hop/private)
"afL" = (
/obj/effect/turf_decal/tile/blue,
@@ -2293,11 +2316,15 @@
"agi" = (
/obj/structure/grille,
/obj/structure/festive/whitebrick/windowWELeftEnd,
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "hop";
+ name = "Privacy Shutters"
+ },
/turf/open/floor/plasteel/dark,
/area/command/heads_quarters/hop/private)
"agj" = (
/obj/machinery/holopad,
-/turf/open/floor/carpet/red,
+/turf/open/floor/carpet/royalblue,
/area/command/heads_quarters/hop/private)
"agk" = (
/obj/effect/turf_decal/tile/blue,
@@ -2343,7 +2370,7 @@
pixel_y = 1
},
/obj/item/clothing/head/HoS/beret/syndicate,
-/turf/open/floor/festive/wooden/wooden1,
+/turf/open/floor/carpet/royalblue,
/area/command/corporate_showroom)
"agp" = (
/obj/machinery/door/window{
@@ -2351,7 +2378,7 @@
name = "Showcase Access";
req_access_txt = "20"
},
-/turf/open/floor/festive/wooden/wooden1,
+/turf/open/floor/carpet/royalblue,
/area/command/corporate_showroom)
"agq" = (
/obj/structure/table/wood/fancy/red,
@@ -2364,10 +2391,15 @@
},
/obj/item/clothing/accessory/armband/hydro,
/obj/item/banhammer,
-/turf/open/floor/festive/wooden/wooden1,
+/turf/open/floor/carpet/royalblue,
/area/command/corporate_showroom)
"agr" = (
/obj/machinery/airalarm/directional/east,
+/obj/effect/turf_decal/loading_area{
+ dir = 8;
+ icon_state = "drain";
+ name = "drain"
+ },
/turf/open/floor/plasteel,
/area/command/corporate_showroom)
"ags" = (
@@ -2610,6 +2642,11 @@
/area/command/corporate_showroom)
"agO" = (
/obj/machinery/light/floor,
+/obj/effect/turf_decal/loading_area{
+ dir = 8;
+ icon_state = "borderfloor";
+ name = "drain"
+ },
/turf/open/floor/plasteel,
/area/command/corporate_showroom)
"agP" = (
@@ -2645,12 +2682,12 @@
desc = "A replica beret resembling that of a special operations officer under Nanotrasen.";
name = "replica officer's beret"
},
-/turf/open/floor/festive/wooden/wooden1,
+/turf/open/floor/carpet/royalblue,
/area/command/corporate_showroom)
"agU" = (
/obj/structure/showcase/mecha/marauder,
/obj/machinery/light/floor,
-/turf/open/floor/festive/wooden/wooden1,
+/turf/open/floor/carpet/royalblue,
/area/command/corporate_showroom)
"agV" = (
/obj/structure/table/wood/fancy/red,
@@ -2662,7 +2699,7 @@
desc = "A replica hat of a Central Commander's attire. It has a small tag on it saying, 'It's good to be emperor.'";
name = "Replica CentCom hat"
},
-/turf/open/floor/festive/wooden/wooden1,
+/turf/open/floor/carpet/royalblue,
/area/command/corporate_showroom)
"agW" = (
/obj/structure/table/wood/fancy/green,
@@ -2684,6 +2721,11 @@
dir = 4;
light_color = "#c1caff"
},
+/obj/effect/turf_decal/loading_area{
+ dir = 8;
+ icon_state = "drain";
+ name = "drain"
+ },
/turf/open/floor/plasteel,
/area/command/corporate_showroom)
"aha" = (
@@ -2905,11 +2947,11 @@
dir = 8
},
/obj/item/clothing/neck/cloak/festive,
-/turf/open/floor/festive/wooden/wooden1,
+/turf/open/floor/carpet/royalblue,
/area/command/corporate_showroom)
"ahv" = (
/obj/structure/window/reinforced,
-/turf/open/floor/festive/wooden/wooden1,
+/turf/open/floor/carpet/royalblue,
/area/command/corporate_showroom)
"ahw" = (
/obj/structure/table/wood/fancy/red,
@@ -2918,7 +2960,7 @@
dir = 4
},
/obj/item/clothing/suit/armor/centcom,
-/turf/open/floor/festive/wooden/wooden1,
+/turf/open/floor/carpet/royalblue,
/area/command/corporate_showroom)
"ahx" = (
/obj/machinery/light{
@@ -3118,6 +3160,10 @@
/obj/structure/chair/comfy/black{
dir = 1
},
+/obj/effect/turf_decal/loading_area{
+ icon_state = "drain";
+ name = "drain"
+ },
/turf/open/floor/festive/wooden/wooden1,
/area/command/corporate_showroom)
"ahV" = (
@@ -3342,7 +3388,7 @@
/obj/machinery/light{
light_color = "#e8eaff"
},
-/turf/open/floor/festive/wooden/wooden1,
+/turf/open/floor/plasteel,
/area/command/corporate_showroom)
"ais" = (
/obj/structure/dresser,
@@ -3548,16 +3594,28 @@
"aiO" = (
/obj/structure/grille,
/obj/structure/festive/whitebrick/windowNSRightEnd,
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "hop";
+ name = "Privacy Shutters"
+ },
/turf/open/floor/plasteel/dark,
/area/command/heads_quarters/hop/private)
"aiP" = (
/obj/structure/grille,
/obj/structure/festive/whitebrick/windowNSMiddle,
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "hop";
+ name = "Privacy Shutters"
+ },
/turf/open/floor/plasteel/dark,
/area/command/heads_quarters/hop/private)
"aiQ" = (
/obj/structure/grille,
/obj/structure/festive/whitebrick/windowNSLeftEnd,
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "hop";
+ name = "Privacy Shutters"
+ },
/turf/open/floor/plasteel/dark,
/area/command/heads_quarters/hop/private)
"aiR" = (
@@ -3780,17 +3838,8 @@
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat/hallway)
"ajA" = (
-/obj/machinery/door/poddoor/shutters{
- id = "evashutter";
- name = "E.V.A. Storage Shutter"
- },
-/obj/effect/turf_decal/delivery,
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/ai_monitored/command/storage/eva)
+/turf/open/floor/carpet/orange,
+/area/commons/dorms)
"ajB" = (
/obj/effect/turf_decal/stripes/line{
dir = 10
@@ -3899,21 +3948,105 @@
/turf/open/floor/festive/sidewalk,
/area/edina/street/secondary/command)
"ajO" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/structure/cable{
- icon_state = "2-4"
- },
-/turf/open/floor/engine,
-/area/engineering/main)
-"ajP" = (
/obj/structure/cable{
icon_state = "2-8"
},
-/obj/machinery/light/floor,
-/turf/open/floor/engine,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plating,
/area/engineering/main)
+"ajP" = (
+/obj/structure/closet/crate/wooden,
+/obj/item/clothing/gloves/mittens/random,
+/obj/item/clothing/gloves/mittens/random,
+/obj/item/clothing/gloves/mittens/random,
+/obj/item/clothing/gloves/mittens/random,
+/obj/item/clothing/gloves/mittens/random,
+/obj/item/clothing/gloves/mittens/random,
+/obj/item/clothing/gloves/mittens/random,
+/obj/item/clothing/gloves/mittens/random,
+/obj/item/clothing/gloves/mittens/random,
+/obj/item/clothing/gloves/mittens/random,
+/obj/item/clothing/gloves/mittens/random,
+/obj/item/clothing/gloves/mittens/random,
+/obj/item/clothing/gloves/mittens/random,
+/obj/item/clothing/gloves/mittens/random,
+/obj/item/clothing/gloves/mittens/random,
+/obj/item/clothing/gloves/mittens/random,
+/obj/item/clothing/gloves/mittens/random,
+/obj/item/clothing/gloves/mittens/random,
+/obj/item/clothing/gloves/mittens/random,
+/obj/item/clothing/gloves/mittens/random,
+/obj/item/clothing/gloves/mittens/random,
+/obj/item/clothing/gloves/mittens/random,
+/obj/item/clothing/gloves/mittens/random,
+/obj/item/clothing/gloves/mittens/random,
+/obj/item/clothing/gloves/mittens/random,
+/obj/item/clothing/gloves/mittens/random,
+/obj/item/clothing/gloves/mittens/random,
+/obj/item/clothing/gloves/mittens/random,
+/obj/item/clothing/gloves/mittens/random,
+/obj/item/clothing/gloves/mittens/random,
+/obj/item/clothing/gloves/mittens/random,
+/obj/item/clothing/gloves/mittens/random,
+/obj/item/clothing/gloves/mittens/random,
+/obj/item/clothing/gloves/mittens/random,
+/obj/item/clothing/gloves/mittens/random,
+/obj/item/clothing/gloves/mittens/random,
+/obj/item/clothing/gloves/mittens/random,
+/obj/item/clothing/gloves/mittens/random,
+/obj/item/clothing/neck/scarf/christmas,
+/obj/item/clothing/neck/scarf/christmas,
+/obj/item/clothing/neck/scarf/christmas,
+/obj/item/clothing/neck/scarf/christmas,
+/obj/item/clothing/neck/scarf/christmas,
+/obj/item/clothing/neck/scarf/christmas,
+/obj/item/clothing/neck/scarf/christmas,
+/obj/item/clothing/neck/scarf/christmas,
+/obj/item/clothing/neck/scarf/christmas,
+/obj/item/clothing/neck/scarf/christmas,
+/obj/item/clothing/neck/scarf/christmas,
+/obj/item/clothing/neck/scarf/christmas,
+/obj/item/clothing/neck/scarf/christmas,
+/obj/item/clothing/neck/scarf/christmas,
+/obj/item/clothing/neck/scarf/christmas,
+/obj/item/clothing/neck/scarf/christmas,
+/obj/item/clothing/neck/scarf/christmas,
+/obj/item/clothing/neck/scarf/christmas,
+/obj/item/clothing/neck/scarf/christmas,
+/obj/item/clothing/neck/scarf/christmas,
+/obj/item/clothing/neck/scarf/christmas,
+/obj/item/clothing/neck/scarf/christmas,
+/obj/item/clothing/neck/scarf/christmas,
+/obj/item/clothing/neck/scarf/christmas,
+/obj/item/clothing/neck/scarf/christmas,
+/obj/item/clothing/neck/scarf/christmas,
+/obj/item/clothing/neck/scarf/christmas,
+/obj/item/clothing/neck/scarf/christmas,
+/obj/item/clothing/neck/scarf/christmas,
+/obj/item/clothing/neck/scarf/christmas,
+/obj/item/clothing/suit/hooded/wintercoat,
+/obj/item/clothing/suit/hooded/wintercoat,
+/obj/item/clothing/suit/hooded/wintercoat,
+/obj/item/clothing/suit/hooded/wintercoat,
+/obj/item/clothing/suit/hooded/wintercoat,
+/obj/item/clothing/suit/hooded/wintercoat,
+/obj/item/clothing/suit/hooded/wintercoat,
+/obj/item/clothing/suit/hooded/wintercoat,
+/obj/item/clothing/shoes/winterboots,
+/obj/item/clothing/shoes/winterboots,
+/obj/item/clothing/shoes/winterboots,
+/obj/item/clothing/shoes/winterboots,
+/obj/item/clothing/shoes/winterboots,
+/obj/item/clothing/shoes/winterboots,
+/obj/item/clothing/shoes/winterboots,
+/obj/item/clothing/shoes/winterboots,
+/obj/item/clothing/head/santa,
+/obj/item/clothing/head/santa,
+/obj/item/clothing/head/santa,
+/turf/open/floor/festive/trainplatform,
+/area/edina/street/primary/perimeter)
"ajQ" = (
/obj/machinery/power/port_gen/pacman,
/obj/item/stack/sheet/mineral/plasma{
@@ -3956,7 +4089,10 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/turf/open/floor/engine,
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/turf/open/floor/plating,
/area/engineering/main)
"ajY" = (
/obj/machinery/power/grounding_rod,
@@ -4047,38 +4183,33 @@
/area/edina/crew_quarters/store/pet)
"akp" = (
/obj/structure/cable{
- icon_state = "2-4"
+ icon_state = "4-8"
},
-/obj/machinery/light/floor,
-/turf/open/floor/engine,
+/turf/open/floor/plating,
/area/engineering/main)
"akq" = (
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
/obj/structure/cable{
icon_state = "4-8"
},
-/turf/open/floor/engine,
+/turf/open/floor/plating,
/area/engineering/main)
"akr" = (
-/obj/structure/cable{
- icon_state = "2-8"
+/obj/structure/reflector/single/anchored{
+ dir = 10
},
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/open/floor/engine,
+/turf/open/floor/plating,
/area/engineering/main)
"aks" = (
-/obj/structure/cable{
- icon_state = "2-8"
- },
/obj/structure/cable{
icon_state = "4-8"
},
/obj/structure/cable{
icon_state = "2-4"
},
-/obj/machinery/light/floor,
-/turf/open/floor/engine,
+/turf/open/floor/plating,
/area/engineering/main)
"akt" = (
/obj/machinery/light/small{
@@ -4100,10 +4231,10 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/structure/cable{
- icon_state = "1-4"
+/obj/structure/reflector/single/anchored{
+ dir = 6
},
-/turf/open/floor/engine,
+/turf/open/floor/plating,
/area/engineering/main)
"akv" = (
/obj/machinery/power/tesla_coil,
@@ -4120,13 +4251,13 @@
/turf/open/floor/engine,
/area/engineering/main)
"akx" = (
-/obj/structure/cable{
- icon_state = "1-8"
- },
/obj/structure/cable{
icon_state = "1-2"
},
-/turf/open/floor/engine,
+/obj/structure/reflector/single/anchored{
+ dir = 10
+ },
+/turf/open/floor/plating,
/area/engineering/main)
"aky" = (
/obj/machinery/holopad,
@@ -4226,10 +4357,14 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/structure/reflector/single/anchored{
- dir = 6
+/obj/structure/cable{
+ icon_state = "1-4"
},
-/turf/open/floor/engine,
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/machinery/light/floor,
+/turf/open/floor/plating,
/area/engineering/main)
"akM" = (
/obj/machinery/field/generator{
@@ -4238,13 +4373,17 @@
/turf/open/floor/engine,
/area/engineering/main)
"akN" = (
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/structure/reflector/single/anchored{
- dir = 10
- },
-/turf/open/floor/engine,
+/obj/machinery/light/floor,
+/turf/open/floor/plating,
/area/engineering/main)
"akO" = (
/obj/machinery/recharge_station,
@@ -4318,30 +4457,10 @@
/turf/open/floor/wood,
/area/maintenance/starboard/fore)
"ala" = (
-/obj/structure/cable{
- icon_state = "1-2"
+/obj/structure/reflector/single/anchored{
+ dir = 6
},
-/obj/structure/cable{
- icon_state = "1-4"
- },
-/obj/structure/cable{
- icon_state = "2-4"
- },
-/obj/machinery/light/floor,
-/turf/open/floor/engine,
-/area/engineering/main)
-"alb" = (
-/obj/structure/cable{
- icon_state = "2-8"
- },
-/obj/structure/cable{
- icon_state = "1-8"
- },
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/light/floor,
-/turf/open/floor/engine,
+/turf/open/floor/plating,
/area/engineering/main)
"alc" = (
/turf/open/floor/plasteel/stairs/right,
@@ -4392,17 +4511,31 @@
/turf/open/floor/wood,
/area/maintenance/starboard/fore)
"alk" = (
-/obj/structure/reflector/single/anchored{
- dir = 6
+/obj/structure/cable{
+ icon_state = "1-8"
},
-/turf/open/floor/engine,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/machinery/light/floor,
+/turf/open/floor/plating,
/area/engineering/main)
"all" = (
-/obj/structure/reflector/single/anchored{
- dir = 10
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
-/turf/open/floor/engine,
-/area/engineering/main)
+/obj/structure/fluff/lightpost/light,
+/turf/open/floor/festive/sidewalk,
+/area/edina/street/primary/servitor)
"alm" = (
/obj/effect/spawner/structure/window/plasma/reinforced,
/obj/structure/cable/yellow{
@@ -4445,14 +4578,13 @@
/turf/open/floor/wood,
/area/maintenance/starboard/fore)
"als" = (
-/obj/structure/cable{
- icon_state = "1-2"
+/obj/effect/decal/festive/christmas_ivy_string,
+/obj/machinery/vending/clothing{
+ extended_inventory = 1;
+ scan_id = 0
},
-/obj/structure/cable{
- icon_state = "2-4"
- },
-/turf/open/floor/engine,
-/area/engineering/main)
+/turf/open/floor/plasteel/dark,
+/area/commons/cryopod)
"alt" = (
/obj/effect/turf_decal/weather/snow/corner{
dir = 1
@@ -4506,9 +4638,13 @@
icon_state = "2-8"
},
/obj/structure/cable{
- icon_state = "1-2"
+ icon_state = "4-8"
},
-/turf/open/floor/engine,
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/obj/machinery/light/floor,
+/turf/open/floor/plating,
/area/engineering/main)
"alB" = (
/turf/closed/wall/r_wall,
@@ -4626,7 +4762,7 @@
/area/maintenance/starboard/fore)
"alT" = (
/turf/open/floor/festive/cobblestone/safe,
-/area/edina/street)
+/area/command/meeting_room/council)
"alU" = (
/obj/effect/turf_decal/weather/snow/corner{
color = "#FFFFFE";
@@ -4856,10 +4992,10 @@
/area/security/office)
"amC" = (
/obj/structure/cable{
- icon_state = "1-4"
+ icon_state = "2-4"
},
/obj/machinery/light/floor,
-/turf/open/floor/engine,
+/turf/open/floor/plating,
/area/engineering/main)
"amD" = (
/obj/structure/cable{
@@ -4868,26 +5004,14 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/turf/open/floor/engine,
+/turf/open/floor/plating,
/area/engineering/main)
"amE" = (
-/obj/structure/cable{
- icon_state = "1-8"
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
/obj/structure/cable{
icon_state = "1-4"
},
-/obj/structure/cable{
- icon_state = "2-8"
- },
-/obj/structure/cable{
- icon_state = "2-4"
- },
/obj/machinery/light/floor,
-/turf/open/floor/engine,
+/turf/open/floor/plating,
/area/engineering/main)
"amF" = (
/obj/structure/fence,
@@ -4895,20 +5019,15 @@
/area/edina)
"amG" = (
/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/structure/cable{
- icon_state = "1-4"
- },
-/turf/open/floor/engine,
-/area/engineering/main)
-"amH" = (
-/obj/structure/cable{
- icon_state = "1-8"
+ icon_state = "2-8"
},
/obj/machinery/light/floor,
-/turf/open/floor/engine,
+/turf/open/floor/plating,
/area/engineering/main)
+"amH" = (
+/obj/structure/chair/bench,
+/turf/open/floor/festive/trainplatform,
+/area/edina/street/primary/perimeter)
"amI" = (
/obj/machinery/light/floor,
/turf/open/floor/carpet/royalblue,
@@ -5136,8 +5255,12 @@
/turf/closed/wall/mineral/iron,
/area/command/heads_quarters/hos)
"anp" = (
-/turf/closed/wall/mineral/iron,
-/area/security/detectives_office)
+/obj/machinery/light/small{
+ dir = 1;
+ light_color = "#ffc1c1"
+ },
+/turf/open/floor/plasteel/checker,
+/area/maintenance/bar/cafe)
"anq" = (
/obj/machinery/button/door{
id = "atmos";
@@ -5539,7 +5662,7 @@
/obj/structure/table/wood,
/obj/item/taperecorder,
/turf/open/floor/carpet,
-/area/security/detectives_office)
+/area/security/office)
"aoh" = (
/obj/effect/spawner/lootdrop/maintenance,
/obj/structure/rack,
@@ -5548,14 +5671,14 @@
"aoi" = (
/obj/structure/closet/secure_closet/detective,
/turf/open/floor/carpet,
-/area/security/detectives_office)
+/area/security/office)
"aoj" = (
/obj/machinery/computer/med_data,
/obj/machinery/newscaster{
pixel_y = 32
},
/turf/open/floor/carpet,
-/area/security/detectives_office)
+/area/security/office)
"aok" = (
/obj/machinery/computer/secure_data,
/obj/machinery/firealarm{
@@ -5563,10 +5686,10 @@
},
/obj/machinery/camera,
/turf/open/floor/carpet,
-/area/security/detectives_office)
+/area/security/office)
"aol" = (
/turf/open/floor/carpet,
-/area/security/detectives_office)
+/area/security/office)
"aom" = (
/obj/machinery/computer/apc_control{
dir = 4
@@ -5876,11 +5999,6 @@
/obj/item/storage/secure/safe/HoS{
pixel_x = 32
},
-/obj/item/radio/intercom{
- name = "Station Intercom";
- pixel_x = 26;
- pixel_y = -26
- },
/turf/open/floor/carpet/red,
/area/command/heads_quarters/hos)
"apd" = (
@@ -5890,17 +6008,17 @@
/obj/structure/rack,
/obj/item/storage/briefcase,
/turf/open/floor/carpet,
-/area/security/detectives_office)
+/area/security/office)
"ape" = (
/obj/machinery/holopad,
/turf/open/floor/carpet,
-/area/security/detectives_office)
+/area/security/office)
"apf" = (
/obj/item/radio/intercom{
pixel_x = 26
},
/turf/open/floor/carpet,
-/area/security/detectives_office)
+/area/security/office)
"apg" = (
/obj/machinery/computer/card/minor/ce{
dir = 4
@@ -6150,6 +6268,20 @@
/obj/machinery/light{
dir = 4
},
+/obj/item/radio/intercom{
+ name = "Station Intercom";
+ pixel_x = 26;
+ pixel_y = -26
+ },
+/obj/structure/cable/yellow{
+ icon_state = "0-8"
+ },
+/obj/machinery/power/apc{
+ areastring = "/area/command/heads_quarters/hos";
+ dir = 8;
+ name = "Head of Security's Office APC";
+ pixel_x = 25
+ },
/turf/open/floor/carpet/red,
/area/command/heads_quarters/hos)
"apM" = (
@@ -6159,24 +6291,24 @@
},
/obj/item/lighter,
/turf/open/floor/carpet,
-/area/security/detectives_office)
+/area/security/office)
"apN" = (
/obj/structure/chair/comfy/brown,
/obj/effect/landmark/start/detective,
/turf/open/floor/carpet,
-/area/security/detectives_office)
+/area/security/office)
"apO" = (
/obj/structure/table/wood,
/obj/item/camera/detective,
/turf/open/floor/carpet,
-/area/security/detectives_office)
+/area/security/office)
"apP" = (
/obj/machinery/airalarm{
dir = 8;
pixel_x = 24
},
/turf/open/floor/carpet,
-/area/security/detectives_office)
+/area/security/office)
"apQ" = (
/obj/machinery/computer/station_alert{
dir = 4
@@ -6572,23 +6704,23 @@
"aqG" = (
/obj/structure/filingcabinet,
/turf/open/floor/carpet,
-/area/security/detectives_office)
+/area/security/office)
"aqH" = (
/obj/structure/table/wood,
/obj/machinery/computer/security/wooden_tv,
/turf/open/floor/carpet,
-/area/security/detectives_office)
+/area/security/office)
"aqI" = (
/obj/structure/table/wood,
/obj/item/storage/fancy/cigarettes,
/obj/item/clothing/glasses/sunglasses,
/turf/open/floor/carpet,
-/area/security/detectives_office)
+/area/security/office)
"aqJ" = (
/obj/structure/table/wood,
/obj/item/flashlight/lamp/green,
/turf/open/floor/carpet,
-/area/security/detectives_office)
+/area/security/office)
"aqK" = (
/obj/machinery/light/floor,
/turf/open/floor/plasteel,
@@ -6598,7 +6730,7 @@
pixel_x = 27
},
/turf/open/floor/carpet,
-/area/security/detectives_office)
+/area/security/office)
"aqM" = (
/obj/structure/cable{
icon_state = "0-4"
@@ -6772,7 +6904,7 @@
req_access_txt = "4"
},
/turf/open/floor/carpet,
-/area/security/detectives_office)
+/area/security/office)
"arf" = (
/obj/machinery/computer/station_alert{
dir = 4
@@ -7097,6 +7229,9 @@
/obj/item/assembly/flash/handheld,
/obj/item/assembly/flash/handheld,
/obj/structure/rack,
+/obj/machinery/light{
+ dir = 1
+ },
/turf/open/floor/wood,
/area/security/office)
"arS" = (
@@ -7320,6 +7455,9 @@
/area/command/heads_quarters/hos)
"ast" = (
/obj/machinery/holopad,
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
/turf/open/floor/wood,
/area/security/office)
"asu" = (
@@ -8528,6 +8666,9 @@
"avy" = (
/obj/machinery/recharger,
/obj/structure/table/reinforced,
+/obj/machinery/light{
+ dir = 1
+ },
/turf/open/floor/wood,
/area/security/processing)
"avz" = (
@@ -9403,8 +9544,12 @@
/turf/open/floor/wood,
/area/security/brig)
"axI" = (
-/turf/closed/wall/mineral/iron,
-/area/service/lawoffice)
+/obj/machinery/light/small{
+ dir = 1;
+ light_color = "#ffc1c1"
+ },
+/turf/open/floor/festive/cobblestone/safe,
+/area/cargo/qm)
"axJ" = (
/obj/machinery/door/airlock{
name = "Law Office";
@@ -9415,7 +9560,7 @@
},
/obj/effect/decal/festive/christmas_reef,
/turf/open/floor/wood,
-/area/service/lawoffice)
+/area/security/brig)
"axK" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/preopen{
@@ -9424,7 +9569,7 @@
},
/obj/structure/cable/yellow,
/turf/open/floor/plating,
-/area/service/lawoffice)
+/area/security/brig)
"axL" = (
/obj/machinery/power/apc{
areastring = "/area/security/processing";
@@ -9700,7 +9845,7 @@
/obj/structure/rack,
/obj/item/storage/briefcase,
/turf/open/floor/wood,
-/area/service/lawoffice)
+/area/security/brig)
"ayu" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -9711,21 +9856,27 @@
/turf/open/floor/wood,
/area/service/bar/atrium)
"ayv" = (
-/obj/structure/cable/yellow{
- icon_state = "1-2"
- },
+/obj/structure/table/wood/poker,
+/obj/item/toy/cards/deck,
/turf/open/floor/wood,
-/area/service/lawoffice)
+/area/service/cafeteria/lunchroom)
"ayw" = (
/obj/item/radio/intercom{
pixel_y = 25
},
/obj/machinery/holopad,
/turf/open/floor/wood,
-/area/service/lawoffice)
+/area/security/brig)
"ayx" = (
-/turf/open/floor/wood,
-/area/service/lawoffice)
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 4
+ },
+/obj/machinery/light/small{
+ dir = 4;
+ light_color = "#d8b1b1"
+ },
+/turf/open/floor/festive/alleyway,
+/area/edina/backstreet/supply)
"ayy" = (
/obj/machinery/photocopier,
/obj/machinery/button/door{
@@ -9738,7 +9889,7 @@
pixel_y = 23
},
/turf/open/floor/wood,
-/area/service/lawoffice)
+/area/security/brig)
"ayz" = (
/obj/machinery/gulag_teleporter,
/turf/open/floor/wood,
@@ -9873,25 +10024,25 @@
"ayR" = (
/obj/machinery/vending/cigarette,
/turf/open/floor/wood,
-/area/service/lawoffice)
+/area/security/brig)
"ayS" = (
/obj/structure/chair/comfy/brown{
dir = 4
},
/turf/open/floor/wood,
-/area/service/lawoffice)
+/area/security/brig)
"ayT" = (
/obj/structure/table/wood,
/obj/item/pen/red,
/obj/item/book/manual/wiki/security_space_law,
/turf/open/floor/wood,
-/area/service/lawoffice)
+/area/security/brig)
"ayU" = (
/obj/structure/table/wood,
/obj/item/folder/blue,
/obj/item/stamp/law,
/turf/open/floor/wood,
-/area/service/lawoffice)
+/area/security/brig)
"ayV" = (
/obj/structure/filingcabinet/employment,
/obj/machinery/firealarm{
@@ -9899,11 +10050,14 @@
pixel_x = 24
},
/turf/open/floor/wood,
-/area/service/lawoffice)
+/area/security/brig)
"ayW" = (
/obj/machinery/computer/prisoner/gulag_teleporter_computer{
dir = 4
},
+/obj/machinery/light{
+ dir = 8
+ },
/turf/open/floor/wood,
/area/security/processing)
"ayX" = (
@@ -9918,14 +10072,16 @@
/turf/open/floor/wood,
/area/command/heads_quarters/ce)
"ayZ" = (
-/obj/effect/decal/festive/fairylights,
-/turf/open/floor/engine/plasma,
-/area/engineering/atmos)
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/machinery/light/floor,
+/turf/open/floor/plating,
+/area/engineering/main)
"aza" = (
/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxin_input{
dir = 4
},
-/obj/effect/decal/festive/fairylights,
/turf/open/floor/engine/plasma,
/area/engineering/atmos)
"azb" = (
@@ -10008,17 +10164,10 @@
/turf/open/floor/holofloor/ice,
/area/edina)
"azn" = (
-/obj/machinery/door/poddoor/shutters{
- id = "evashutter";
- name = "E.V.A. Storage Shutter"
- },
-/obj/effect/turf_decal/delivery,
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/ai_monitored/command/storage/eva)
+/obj/machinery/cryopod/tele,
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plasteel/dark,
+/area/commons/cryopod)
"azo" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -10079,22 +10228,22 @@
dir = 8
},
/turf/open/floor/wood,
-/area/service/lawoffice)
+/area/security/brig)
"azx" = (
/obj/structure/table/wood,
/turf/open/floor/wood,
-/area/service/lawoffice)
+/area/security/brig)
"azy" = (
/obj/effect/landmark/start/lawyer,
/obj/structure/chair/office/dark{
dir = 8
},
/turf/open/floor/wood,
-/area/service/lawoffice)
+/area/security/brig)
"azz" = (
/obj/effect/landmark/start/lawyer,
/turf/open/floor/wood,
-/area/service/lawoffice)
+/area/security/brig)
"azA" = (
/obj/machinery/vending/wardrobe/law_wardrobe,
/obj/machinery/light{
@@ -10104,7 +10253,7 @@
pixel_x = 26
},
/turf/open/floor/wood,
-/area/service/lawoffice)
+/area/security/brig)
"azB" = (
/obj/item/storage/box/prisoner,
/obj/structure/table/reinforced,
@@ -10178,7 +10327,7 @@
/obj/structure/rack,
/obj/item/storage/briefcase,
/turf/open/floor/wood,
-/area/service/lawoffice)
+/area/security/brig)
"azN" = (
/obj/structure/chair/comfy/brown{
dir = 4
@@ -10187,7 +10336,7 @@
pixel_y = -23
},
/turf/open/floor/wood,
-/area/service/lawoffice)
+/area/security/brig)
"azO" = (
/obj/structure/table/wood,
/obj/machinery/camera{
@@ -10199,13 +10348,13 @@
pixel_y = 5
},
/turf/open/floor/wood,
-/area/service/lawoffice)
+/area/security/brig)
"azP" = (
/obj/structure/table/wood,
/obj/item/taperecorder,
/obj/item/cartridge/lawyer,
/turf/open/floor/wood,
-/area/service/lawoffice)
+/area/security/brig)
"azQ" = (
/obj/structure/table/wood,
/obj/item/paper_bin{
@@ -10218,11 +10367,11 @@
pixel_y = -27
},
/turf/open/floor/wood,
-/area/service/lawoffice)
+/area/security/brig)
"azR" = (
/obj/machinery/disposal/bin,
/turf/open/floor/wood,
-/area/service/lawoffice)
+/area/security/brig)
"azS" = (
/obj/structure/table/reinforced,
/obj/item/restraints/handcuffs,
@@ -10547,14 +10696,16 @@
/turf/open/floor/plating,
/area/security/processing)
"aAM" = (
-/obj/effect/decal/festive/fairylights,
-/turf/open/floor/engine/co2,
-/area/engineering/atmos)
+/obj/effect/decal/festive/christmas_ivy_string,
+/obj/machinery/vending/kink{
+ extended_inventory = 1
+ },
+/turf/open/floor/plasteel/dark,
+/area/commons/cryopod)
"aAN" = (
/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/carbon_input{
dir = 4
},
-/obj/effect/decal/festive/fairylights,
/turf/open/floor/engine/co2,
/area/engineering/atmos)
"aAO" = (
@@ -10696,8 +10847,12 @@
/turf/open/floor/festive/cobblestone,
/area/security)
"aBn" = (
+/obj/effect/decal/festive/christmas_ivy_string,
+/obj/machinery/computer/cryopod{
+ pixel_y = 26
+ },
/turf/open/floor/plasteel/dark,
-/area/service/bar/atrium)
+/area/commons/cryopod)
"aBo" = (
/obj/effect/festive/street/streetlinesouth,
/turf/open/floor/festive/cobblestone,
@@ -10790,14 +10945,15 @@
/turf/open/floor/festive/cobblestone,
/area/science/robotics/mechbay)
"aBG" = (
-/obj/effect/decal/festive/christmas_ivy_string,
-/turf/open/floor/engine/n2o,
-/area/engineering/atmos)
+/obj/structure/chair/bench{
+ dir = 4
+ },
+/turf/open/floor/festive/trainplatform,
+/area/edina/street/primary/perimeter)
"aBH" = (
/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nitrous_input{
dir = 4
},
-/obj/effect/decal/festive/christmas_ivy_string,
/turf/open/floor/engine/n2o,
/area/engineering/atmos)
"aBI" = (
@@ -11629,7 +11785,7 @@
"aEr" = (
/obj/effect/festive/street/sidewalknsm,
/turf/open/floor/festive/cobblestone/safe,
-/area/edina/street)
+/area/command/meeting_room/council)
"aEs" = (
/obj/structure/chair/stool,
/obj/structure/disposalpipe/segment{
@@ -12437,13 +12593,17 @@
dir = 8;
on = 1
},
-/obj/effect/decal/festive/christmas_ivy_string,
/turf/open/floor/engine/vacuum,
/area/engineering/atmos)
"aGu" = (
-/obj/effect/decal/festive/christmas_ivy_string,
-/turf/open/floor/engine/vacuum,
-/area/engineering/atmos)
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/turf/open/floor/plating,
+/area/engineering/main)
"aGv" = (
/obj/machinery/light/small{
dir = 8
@@ -15990,6 +16150,11 @@
name = "Research and Development Shutter"
},
/obj/machinery/door/firedoor,
+/obj/machinery/door/window/southright{
+ name = "Research and Development Desk";
+ req_one_access_txt = "7;29";
+ dir = 8
+ },
/turf/open/floor/festive/wooden/wooden1,
/area/science/lab)
"aPn" = (
@@ -17624,7 +17789,7 @@
/area/science)
"aTh" = (
/turf/open/floor/carpet/red,
-/area/service/bar)
+/area/service/cafeteria/lunchroom)
"aTi" = (
/obj/structure/chair/stool,
/obj/machinery/airalarm{
@@ -18643,7 +18808,7 @@
/turf/closed/wall/mineral/iron,
/area/service/chapel/office)
"aVW" = (
-/obj/effect/spawner/structure/window/reinforced/indestructable,
+/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/service/chapel/office)
"aVX" = (
@@ -18681,7 +18846,6 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
-/obj/item/toy/plush/catgirl/fermis,
/turf/open/floor/plasteel/white,
/area/science/mixing)
"aWe" = (
@@ -18865,7 +19029,7 @@
/area/medical/morgue)
"aWw" = (
/obj/structure/curtain,
-/obj/effect/spawner/structure/window/reinforced/indestructable,
+/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/medical/morgue)
"aWx" = (
@@ -19071,7 +19235,6 @@
dir = 4
},
/obj/effect/turf_decal/tile/purple,
-/obj/item/toy/plush/catgirl/fermis,
/turf/open/floor/plasteel/white,
/area/command/heads_quarters/rd)
"aWV" = (
@@ -19172,7 +19335,6 @@
name = "Robotics Shutters"
},
/obj/machinery/door/firedoor,
-/obj/item/toy/plush/aiplush,
/turf/open/floor/plasteel,
/area/science/robotics/lab)
"aXi" = (
@@ -20912,7 +21074,7 @@
icon_state = "0-4"
},
/turf/open/floor/wood,
-/area/service/bar/atrium)
+/area/service/cafeteria)
"bcl" = (
/obj/item/wrench,
/obj/item/wirecutters,
@@ -20972,7 +21134,7 @@
icon_state = "4-8"
},
/turf/open/floor/wood,
-/area/service/bar/atrium)
+/area/service/cafeteria)
"bct" = (
/obj/structure/disposalpipe/segment{
dir = 10
@@ -20981,7 +21143,7 @@
icon_state = "2-8"
},
/turf/open/floor/wood,
-/area/service/bar/atrium)
+/area/service/cafeteria)
"bcv" = (
/obj/machinery/door/airlock/wood/glass{
name = "Pet Store"
@@ -21003,8 +21165,8 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/turf/open/floor/plasteel/dark,
-/area/service/bar/atrium)
+/turf/open/floor/plasteel/stairs/right,
+/area/service/cafeteria)
"bcy" = (
/obj/machinery/vending/hydronutrients,
/obj/effect/turf_decal/bot,
@@ -21487,6 +21649,7 @@
dir = 1;
light_color = "#ffc1c1"
},
+/obj/structure/musician/piano,
/turf/open/indestructible{
dir = 4;
icon_state = "chapel"
@@ -21499,6 +21662,9 @@
/obj/machinery/airalarm{
pixel_y = 22
},
+/obj/structure/chair/wood/wings{
+ dir = 8
+ },
/turf/open/indestructible{
dir = 1;
icon_state = "chapel"
@@ -21984,7 +22150,7 @@
/turf/open/floor/festive/alleyway,
/area/science/research)
"bfp" = (
-/obj/structure/table/wood/fancy/green,
+/obj/structure/table/wood/fancy/red,
/turf/open/indestructible{
icon_state = "darkfull"
},
@@ -22038,7 +22204,7 @@
/obj/structure/cable/yellow{
icon_state = "2-4"
},
-/turf/open/floor/carpet/royalblue,
+/turf/open/floor/wood,
/area/service/cafeteria)
"bfw" = (
/turf/open/floor/festive/sidewalk,
@@ -22066,7 +22232,7 @@
/turf/open/indestructible/hotelwood,
/area/service/chapel/main)
"bfA" = (
-/obj/effect/spawner/structure/window/reinforced/indestructable,
+/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/service/chapel/main)
"bfB" = (
@@ -23508,7 +23674,7 @@
/obj/structure/cable/yellow{
icon_state = "1-8"
},
-/turf/open/floor/carpet/royalblue,
+/turf/open/floor/wood,
/area/service/cafeteria)
"bjA" = (
/obj/machinery/holopad,
@@ -24046,8 +24212,7 @@
/turf/open/floor/plasteel/white,
/area/medical/genetics)
"bkM" = (
-/obj/structure/grille,
-/obj/effect/spawner/structure/window,
+/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/grass,
/area/medical/genetics)
"bkN" = (
@@ -24671,6 +24836,9 @@
/area/medical/genetics)
"blP" = (
/obj/structure/flora/junglebush/large,
+/obj/structure/window/reinforced{
+ dir = 8
+ },
/turf/open/floor/grass,
/area/medical/virology)
"blQ" = (
@@ -25148,6 +25316,9 @@
"bmZ" = (
/obj/structure/flora/junglebush/c,
/mob/living/carbon/monkey,
+/obj/structure/window/reinforced{
+ dir = 8
+ },
/turf/open/floor/grass,
/area/medical/virology)
"bna" = (
@@ -25353,7 +25524,7 @@
/obj/structure/chair/sofa/corner{
dir = 1
},
-/turf/open/floor/festive/wooden/wooden1,
+/turf/open/floor/carpet/orange,
/area/commons/dorms)
"bnE" = (
/obj/structure/chair/stool/bar,
@@ -25507,10 +25678,6 @@
/turf/open/floor/plasteel/white,
/area/medical/genetics)
"bog" = (
-/obj/machinery/door/window/eastleft{
- name = "Monkey Pen";
- req_one_access_txt = "9"
- },
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -25521,6 +25688,11 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 8
},
+/obj/machinery/door/window/eastleft{
+ name = "Monkey Pen";
+ req_one_access_txt = "9";
+ dir = 8
+ },
/turf/open/floor/grass,
/area/medical/genetics)
"boi" = (
@@ -25634,6 +25806,9 @@
},
/obj/structure/flora/ausbushes/grassybush,
/obj/item/reagent_containers/food/snacks/grown/banana,
+/obj/structure/window/reinforced{
+ dir = 8
+ },
/turf/open/floor/grass,
/area/medical/virology)
"bot" = (
@@ -25777,7 +25952,7 @@
/obj/machinery/light{
dir = 4
},
-/turf/open/floor/festive/wooden/wooden1,
+/turf/open/floor/wood,
/area/commons/dorms)
"boQ" = (
/obj/effect/spawner/structure/window,
@@ -26058,6 +26233,11 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
+/obj/machinery/door/window/eastleft{
+ name = "Monkey Pen";
+ req_one_access_txt = "9";
+ dir = 8
+ },
/turf/open/floor/grass,
/area/medical/genetics)
"bpu" = (
@@ -26096,6 +26276,9 @@
dir = 4
},
/mob/living/carbon/monkey,
+/obj/structure/window/reinforced{
+ dir = 8
+ },
/turf/open/floor/grass,
/area/medical/virology)
"bpy" = (
@@ -26290,17 +26473,17 @@
/turf/closed/wall/r_wall,
/area/command/heads_quarters/cmo)
"bpX" = (
-/obj/effect/turf_decal/tile/blue{
+/obj/effect/turf_decal/bot,
+/obj/machinery/light/small{
+ brightness = 3;
dir = 8
},
-/obj/effect/turf_decal/tile/blue{
- dir = 4
+/obj/structure/disposalpipe/trunk,
+/obj/machinery/disposal/deliveryChute{
+ dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
- dir = 4
- },
-/turf/closed/wall/r_wall,
-/area/command/heads_quarters/cmo)
+/turf/open/floor/plasteel/dark,
+/area/service/hydroponics)
"bpY" = (
/obj/effect/turf_decal/tile/blue{
dir = 8
@@ -26350,7 +26533,8 @@
pixel_x = -7;
pixel_y = 26
},
-/turf/open/floor/festive/wooden/wooden1,
+/obj/item/kirbyplants,
+/turf/open/floor/carpet/orange,
/area/commons/dorms)
"bqh" = (
/obj/machinery/newscaster{
@@ -26534,7 +26718,7 @@
},
/area/service/chapel/main/monastery)
"bqH" = (
-/obj/effect/spawner/structure/window/reinforced/indestructable,
+/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/service/chapel/main/monastery)
"bqI" = (
@@ -26664,8 +26848,6 @@
/turf/open/floor/plasteel/white,
/area/medical/genetics)
"bqT" = (
-/obj/structure/grille,
-/obj/effect/spawner/structure/window,
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -26675,11 +26857,10 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
+/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/grass,
/area/medical/genetics)
"bqU" = (
-/obj/structure/grille,
-/obj/effect/spawner/structure/window,
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -26687,6 +26868,7 @@
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
+/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/grass,
/area/medical/genetics)
"bqV" = (
@@ -27942,11 +28124,7 @@
/turf/open/floor/carpet/black,
/area/commons/dorms)
"btu" = (
-/obj/structure/table/reinforced,
-/obj/machinery/microwave{
- desc = "Cooks and boils stuff, somehow.";
- pixel_y = 8
- },
+/obj/structure/bookcase/random,
/turf/open/floor/plasteel/checker,
/area/commons/dorms)
"btv" = (
@@ -27996,7 +28174,7 @@
icon_state = "2-4"
},
/turf/open/floor/carpet/red,
-/area/service/bar)
+/area/service/cafeteria/lunchroom)
"btB" = (
/obj/structure/table/wood,
/obj/structure/cable/yellow{
@@ -28004,12 +28182,12 @@
},
/obj/effect/decal/festive/christmas_reef,
/turf/open/floor/plasteel/dark,
-/area/service/bar)
+/area/service/cafeteria/lunchroom)
"btC" = (
-/obj/structure/chair/stool,
/obj/structure/cable/yellow{
icon_state = "4-8"
},
+/obj/structure/chair/stool/bar,
/turf/open/floor/wood,
/area/service/cafeteria/lunchroom)
"btD" = (
@@ -28033,7 +28211,7 @@
icon_state = "1-2"
},
/turf/open/floor/carpet/red,
-/area/service/bar)
+/area/service/cafeteria/lunchroom)
"btG" = (
/obj/effect/festive/street/streetlinene,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -28251,14 +28429,14 @@
/turf/open/floor/plasteel,
/area/science/circuit)
"bui" = (
-/obj/structure/chair/stool,
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/turf/open/floor/carpet/green,
+/obj/structure/chair/stool/bar,
+/turf/open/floor/wood,
/area/service/cafeteria)
"buj" = (
/obj/structure/grille,
@@ -28438,7 +28616,7 @@
icon_state = "4-8"
},
/turf/open/floor/plasteel/dark,
-/area/service/bar)
+/area/service/cafeteria/lunchroom)
"buC" = (
/turf/open/floor/carpet/blue,
/area/command/heads_quarters/cmo)
@@ -28554,7 +28732,7 @@
icon_state = "4-8"
},
/turf/open/floor/carpet/red,
-/area/service/bar)
+/area/service/cafeteria/lunchroom)
"buV" = (
/obj/effect/turf_decal/tile/purple{
dir = 1
@@ -29061,19 +29239,16 @@
/turf/open/floor/plasteel/checker,
/area/commons/dorms)
"bwd" = (
-/obj/structure/table,
-/obj/item/reagent_containers/food/condiment/enzyme{
- layer = 5;
- pixel_x = -4
- },
-/obj/item/storage/box/donkpockets,
-/obj/item/reagent_containers/rag/towel,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/obj/structure/cable/yellow{
icon_state = "0-2"
},
+/obj/structure/disposalpipe/trunk,
+/obj/structure/disposaloutlet{
+ dir = 1
+ },
/turf/open/floor/plasteel/cafeteria,
/area/service/kitchen)
"bwe" = (
@@ -29109,6 +29284,15 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
+/obj/item/reagent_containers/food/condiment/enzyme{
+ layer = 5;
+ pixel_x = -4
+ },
+/obj/item/storage/box/donkpockets,
+/obj/item/reagent_containers/rag/towel,
/turf/open/floor/plasteel/cafeteria,
/area/service/kitchen)
"bwk" = (
@@ -29157,18 +29341,10 @@
/turf/open/floor/plasteel,
/area/cargo/miningoffice)
"bwq" = (
-/obj/structure/table,
-/obj/item/paper_bin{
- pixel_x = -3;
- pixel_y = 7
- },
/obj/effect/turf_decal/tile/brown,
/obj/effect/turf_decal/tile/brown{
dir = 8
},
-/obj/item/stack/medical/bruise_pack,
-/obj/item/stack/medical/ointment,
-/obj/item/stack/medical/gauze,
/obj/machinery/light,
/turf/open/floor/plasteel,
/area/cargo/miningoffice)
@@ -33066,7 +33242,7 @@
/obj/structure/chair/sofa/left{
dir = 4
},
-/turf/open/floor/festive/wooden/wooden1,
+/turf/open/floor/carpet/orange,
/area/commons/dorms)
"bEu" = (
/obj/vehicle/sealed/vectorcraft/ambulance{
@@ -33300,7 +33476,7 @@
/obj/machinery/light{
dir = 4
},
-/turf/open/floor/festive/wooden/wooden1,
+/turf/open/floor/carpet/orange,
/area/commons/dorms)
"bEX" = (
/obj/effect/turf_decal/weather/snow/corner{
@@ -33593,31 +33769,34 @@
/area/medical/chemistry)
"bFN" = (
/turf/closed/festive/greybrick/greybrickcornernw,
-/area/service/bar/atrium)
+/area/service/cafeteria)
"bFO" = (
/obj/structure/grille,
/obj/structure/festive/greybrick/windowNSRightEnd,
/turf/open/floor/wood,
-/area/service/bar/atrium)
+/area/service/cafeteria)
"bFP" = (
/obj/structure/grille,
/obj/structure/festive/greybrick/windowNSMiddle,
/turf/open/floor/wood,
-/area/service/bar/atrium)
+/area/service/cafeteria)
"bFQ" = (
/obj/structure/grille,
/obj/structure/festive/greybrick/windowNSLeftEnd,
/turf/open/floor/wood,
-/area/service/bar/atrium)
+/area/service/cafeteria)
"bFR" = (
/turf/closed/festive/greybrick/greybrickns,
-/area/service/bar/atrium)
+/area/service/cafeteria)
"bFS" = (
-/turf/closed/festive/greybrick,
-/area/service/bar/atrium)
+/obj/structure/cable/yellow{
+ icon_state = "1-4"
+ },
+/turf/open/floor/wood,
+/area/security/office)
"bFT" = (
/turf/closed/festive/greybrick/greybrickts,
-/area/service/bar/atrium)
+/area/service/cafeteria)
"bFU" = (
/obj/structure/grille,
/obj/structure/festive/greybrick/windowNSRightEnd,
@@ -33699,11 +33878,13 @@
/area/cargo/office)
"bGi" = (
/obj/structure/table/reinforced,
-/turf/open/floor/festive/wooden/wooden1,
+/obj/item/storage/box/donkpockets,
+/obj/item/storage/box/donkpockets,
+/turf/open/floor/wood,
/area/commons/dorms)
"bGj" = (
/obj/structure/reagent_dispensers/water_cooler,
-/turf/open/floor/festive/wooden/wooden1,
+/turf/open/floor/wood,
/area/commons/dorms)
"bGk" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -33730,10 +33911,10 @@
/turf/open/floor/plating,
/area/cargo)
"bGn" = (
-/obj/structure/chair/sofa/right{
+/obj/structure/chair/sofa/left{
dir = 1
},
-/turf/open/floor/festive/wooden/wooden1,
+/turf/open/floor/carpet/orange,
/area/commons/dorms)
"bGo" = (
/obj/machinery/button/door{
@@ -33744,7 +33925,7 @@
req_one_access_txt = "2;19"
},
/turf/closed/festive/whitebrick,
-/area/edina/street)
+/area/command/meeting_room/council)
"bGp" = (
/obj/effect/turf_decal/weather/snow/corner{
dir = 1
@@ -33902,6 +34083,9 @@
dir = 1;
light_color = "#ffc1c1"
},
+/obj/structure/chair/bench/left{
+ dir = 4
+ },
/turf/open/floor/festive/trainplatform,
/area/edina/street/primary/perimeter)
"bGG" = (
@@ -34122,52 +34306,51 @@
/turf/open/floor/festive/wooden/wooden1,
/area/medical/chemistry)
"bHd" = (
-/obj/structure/grille,
-/obj/structure/festive/greybrick/windowWERightEnd,
+/obj/structure/table/wood/poker,
/turf/open/floor/wood,
-/area/service/bar/atrium)
+/area/service/cafeteria/lunchroom)
"bHe" = (
/obj/structure/chair/sofa/corner{
dir = 4
},
/obj/effect/decal/festive/fairylights,
/turf/open/floor/wood,
-/area/service/bar/atrium)
+/area/service/cafeteria)
"bHf" = (
/obj/structure/chair/sofa,
/turf/open/floor/wood,
-/area/service/bar/atrium)
+/area/service/cafeteria)
"bHg" = (
/obj/structure/chair/sofa/corner,
/turf/open/floor/wood,
-/area/service/bar/atrium)
+/area/service/cafeteria)
"bHh" = (
/obj/structure/fireplace,
/turf/open/floor/wood,
-/area/service/bar/atrium)
+/area/service/cafeteria)
"bHi" = (
/obj/machinery/computer/arcade/battle{
dir = 8
},
/turf/open/floor/wood,
-/area/service/bar/atrium)
+/area/service/cafeteria)
"bHj" = (
/obj/structure/chair/sofa/corner{
dir = 4
},
/obj/effect/decal/festive/fairylights,
/turf/open/floor/carpet/royalblack,
-/area/service/bar/atrium)
+/area/service/cafeteria)
"bHk" = (
/obj/structure/chair/sofa,
/obj/effect/decal/festive/fairylights,
/turf/open/floor/carpet/royalblack,
-/area/service/bar/atrium)
+/area/service/cafeteria)
"bHl" = (
/obj/structure/chair/sofa/corner,
/obj/effect/decal/festive/fairylights,
/turf/open/floor/carpet/royalblack,
-/area/service/bar/atrium)
+/area/service/cafeteria)
"bHm" = (
/turf/open/floor/carpet/green,
/area/service/cafeteria/lunchroom)
@@ -34234,10 +34417,10 @@
/turf/open/floor/wood,
/area/commons/storage/tools)
"bHx" = (
-/obj/structure/chair/sofa/left{
+/obj/structure/chair/sofa/right{
dir = 1
},
-/turf/open/floor/festive/wooden/wooden1,
+/turf/open/floor/carpet/orange,
/area/commons/dorms)
"bHy" = (
/obj/machinery/vending/wardrobe/chef_wardrobe,
@@ -34305,7 +34488,6 @@
/obj/effect/turf_decal/tile/brown{
dir = 4
},
-/obj/effect/landmark/start/cargo_technician,
/obj/effect/decal/festive/fairylights{
pixel_y = 32
},
@@ -34318,7 +34500,6 @@
/obj/effect/turf_decal/tile/brown{
dir = 4
},
-/obj/structure/chair,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 6
},
@@ -34335,7 +34516,6 @@
/obj/effect/turf_decal/tile/brown{
dir = 4
},
-/obj/structure/chair,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -34353,9 +34533,6 @@
/turf/open/indestructible,
/area/cargo/office)
"bHI" = (
-/obj/machinery/autolathe{
- name = "public autolathe"
- },
/obj/effect/turf_decal/tile/brown{
dir = 4
},
@@ -34368,6 +34545,7 @@
/obj/effect/decal/festive/christmas_reef{
pixel_y = 24
},
+/obj/structure/chair,
/turf/open/indestructible,
/area/cargo/office)
"bHJ" = (
@@ -34520,7 +34698,7 @@
/obj/structure/chair/sofa/corner{
dir = 8
},
-/turf/open/floor/festive/wooden/wooden1,
+/turf/open/floor/carpet/orange,
/area/commons/dorms)
"bHV" = (
/obj/machinery/conveyor_switch/oneway{
@@ -35005,22 +35183,25 @@
/turf/open/floor/festive/wooden/wooden1,
/area/medical/chemistry)
"bIO" = (
-/obj/structure/grille,
-/obj/structure/festive/greybrick/windowWEMiddle,
-/turf/open/floor/wood,
-/area/service/bar/atrium)
+/obj/effect/turf_decal/loading_area{
+ dir = 8;
+ icon_state = "drain";
+ name = "drain"
+ },
+/turf/open/floor/plasteel,
+/area/command/corporate_showroom)
"bIP" = (
/obj/structure/chair/sofa{
dir = 4
},
/turf/open/floor/wood,
-/area/service/bar/atrium)
+/area/service/cafeteria)
"bIQ" = (
/obj/structure/chair/sofa{
dir = 8
},
/turf/open/floor/wood,
-/area/service/bar/atrium)
+/area/service/cafeteria)
"bIR" = (
/obj/machinery/computer/arcade/orion_trail{
dir = 8
@@ -35029,28 +35210,26 @@
pixel_x = 24
},
/turf/open/floor/wood,
-/area/service/bar/atrium)
+/area/service/cafeteria)
"bIS" = (
/obj/structure/chair/sofa{
dir = 4
},
/turf/open/floor/carpet/royalblack,
-/area/service/bar/atrium)
+/area/service/cafeteria)
"bIT" = (
/obj/structure/table/wood,
/turf/open/floor/carpet/royalblack,
-/area/service/bar/atrium)
+/area/service/cafeteria)
"bIU" = (
/obj/structure/chair/sofa{
dir = 8
},
/turf/open/floor/carpet/royalblack,
-/area/service/bar/atrium)
+/area/service/cafeteria)
"bIV" = (
-/obj/structure/chair/comfy/lime{
- color = "#51ad6a";
- dir = 4;
- name = "cozy chair"
+/obj/structure/chair/comfy/brown{
+ dir = 4
},
/turf/open/floor/carpet/green,
/area/service/cafeteria/lunchroom)
@@ -35059,10 +35238,8 @@
/turf/open/floor/carpet/green,
/area/service/cafeteria/lunchroom)
"bIX" = (
-/obj/structure/chair/comfy/lime{
- color = "#51ad6a";
- dir = 8;
- name = "cozy chair"
+/obj/structure/chair/comfy/brown{
+ dir = 8
},
/turf/open/floor/carpet/green,
/area/service/cafeteria/lunchroom)
@@ -35125,10 +35302,9 @@
"bJi" = (
/obj/machinery/door/firedoor,
/obj/effect/decal/festive/christmas_reef,
-/obj/machinery/door/airlock/mining/glass{
- name = "Cargo Bay";
- req_one_access_txt = "31;48";
- dir = 8
+/obj/machinery/door/airlock/public/glass{
+ name = "Aft Primary Hallway";
+ dir = 4
},
/turf/open/indestructible,
/area/cargo/office)
@@ -35601,6 +35777,9 @@
/area/edina/street/primary/perimeter)
"bKh" = (
/obj/machinery/light/small,
+/obj/structure/chair/bench/left{
+ dir = 8
+ },
/turf/open/floor/festive/trainplatform,
/area/edina/street/primary/perimeter)
"bKi" = (
@@ -35687,22 +35866,21 @@
/turf/open/floor/festive/wooden/wooden1,
/area/medical/chemistry)
"bKq" = (
-/obj/structure/grille,
-/obj/structure/festive/greybrick/windowWELeftEnd,
-/turf/open/floor/wood,
-/area/service/bar/atrium)
+/obj/structure/festive/greybrick/windowNSRightEnd,
+/turf/open/floor/plasteel/dark,
+/area/service/kitchen)
"bKr" = (
/obj/structure/chair/sofa/right{
dir = 4
},
/turf/open/floor/wood,
-/area/service/bar/atrium)
+/area/service/cafeteria)
"bKs" = (
/obj/structure/chair/sofa/left{
dir = 8
},
/turf/open/floor/wood,
-/area/service/bar/atrium)
+/area/service/cafeteria)
"bKt" = (
/obj/machinery/vending/dinnerware{
desc = "A vending machine stocked full of condiments to put on food.";
@@ -35710,7 +35888,7 @@
products = list(/obj/item/storage/bag/tray = 10, /obj/item/kitchen/fork = 6, /obj/item/kitchen/knife = 6, /obj/item/reagent_containers/food/drinks/drinkingglass = 20, /obj/item/clothing/suit/apron/chef = 2, /obj/item/storage/box/cups = 10, /obj/item/reagent_containers/food/condiment/pack/ketchup = 20, /obj/item/reagent_containers/food/condiment/pack/mustard = 20, /obj/item/reagent_containers/food/condiment/pack/hotsauce = 20, /obj/item/reagent_containers/food/condiment/pack/astrotame = 20, /obj/item/reagent_containers/food/condiment/saltshaker = 20, /obj/item/reagent_containers/food/condiment/peppermill = 20, /obj/item/reagent_containers/glass/bowl = 30)
},
/turf/open/floor/wood,
-/area/service/bar/atrium)
+/area/service/cafeteria)
"bKu" = (
/obj/structure/chair/sofa/right{
dir = 4
@@ -35720,7 +35898,7 @@
dir = 8
},
/turf/open/floor/carpet/royalblack,
-/area/service/bar/atrium)
+/area/service/cafeteria)
"bKv" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/food/drinks/bottle/patron{
@@ -35728,7 +35906,7 @@
pixel_y = 16
},
/turf/open/floor/carpet/royalblack,
-/area/service/bar/atrium)
+/area/service/cafeteria)
"bKw" = (
/obj/structure/chair/sofa/left{
dir = 8
@@ -35737,7 +35915,7 @@
dir = 4
},
/turf/open/floor/carpet/royalblack,
-/area/service/bar/atrium)
+/area/service/cafeteria)
"bKx" = (
/obj/machinery/light{
dir = 8
@@ -35850,7 +36028,6 @@
/turf/open/indestructible,
/area/cargo/office)
"bKL" = (
-/obj/structure/table/wood/fancy/green,
/obj/effect/turf_decal/tile/brown{
dir = 1
},
@@ -35863,10 +36040,12 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/structure/window/reinforced{
- dir = 8
- },
/obj/machinery/door/firedoor,
+/obj/machinery/autolathe,
+/obj/machinery/door/window/westleft{
+ name = "Cargo Desk";
+ req_access_txt = "50"
+ },
/turf/open/indestructible,
/area/cargo/office)
"bKM" = (
@@ -36389,7 +36568,7 @@
/obj/effect/decal/festive/mistletoe,
/obj/effect/decal/festive/christmas_reef,
/turf/open/floor/plasteel/dark,
-/area/service/bar/atrium)
+/area/service/cafeteria)
"bLL" = (
/obj/machinery/light{
dir = 8
@@ -36398,7 +36577,7 @@
/area/service/bar/atrium)
"bLM" = (
/turf/open/floor/festive/stairs/stairseast,
-/area/service/bar/atrium)
+/area/service/cafeteria)
"bLN" = (
/obj/structure/bed/dogbed{
name = "cat bed"
@@ -36975,7 +37154,7 @@
dir = 8
},
/turf/open/floor/wood,
-/area/service/bar/atrium)
+/area/service/cafeteria)
"bMZ" = (
/obj/structure/closet/crate/trashcart,
/obj/effect/spawner/lootdrop/maintenance{
@@ -37131,10 +37310,10 @@
/area/cargo/office)
"bNs" = (
/obj/effect/turf_decal/bot,
-/obj/machinery/autolathe,
/obj/structure/sign/poster/official/cohiba_robusto_ad{
pixel_x = 32
},
+/obj/machinery/rnd/production/protolathe/department/cargo,
/turf/open/indestructible,
/area/cargo/office)
"bNt" = (
@@ -37655,35 +37834,40 @@
/turf/closed/wall/mineral/wood,
/area/medical/chemistry)
"bOr" = (
-/turf/closed/festive/greybrick/greybrickte,
-/area/service/bar/atrium)
+/obj/structure/chair/sofa/right/old{
+ dir = 1
+ },
+/turf/open/floor/wood,
+/area/command/heads_quarters/captain)
"bOs" = (
/obj/structure/filingcabinet,
/turf/open/floor/festive/wooden/wooden2,
/area/cargo/qm)
"bOt" = (
/turf/closed/festive/greybrick/greybrickts,
-/area/service/bar)
+/area/service/cafeteria/lunchroom)
"bOu" = (
-/obj/structure/grille,
-/obj/structure/festive/greybrick/windowNSRightEnd,
-/turf/open/floor/wood,
-/area/service/bar)
+/obj/effect/turf_decal/loading_area{
+ dir = 4;
+ icon_state = "drain";
+ name = "drain"
+ },
+/turf/open/floor/plasteel,
+/area/command/corporate_showroom)
"bOv" = (
/obj/structure/grille,
/obj/structure/festive/greybrick/windowNSMiddle,
/turf/open/floor/wood,
-/area/service/bar)
+/area/service/cafeteria/lunchroom)
"bOw" = (
-/obj/structure/grille,
-/obj/structure/festive/greybrick/windowNSLeftEnd,
+/obj/structure/bookcase/random,
/turf/open/floor/wood,
-/area/service/bar)
+/area/command/heads_quarters/captain)
"bOx" = (
/turf/closed/festive/greybrick,
/area/service/cafeteria/lunchroom)
"bOy" = (
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel/stairs/left,
/area/service/cafeteria/lunchroom)
"bOz" = (
/obj/structure/table/glass,
@@ -37750,11 +37934,8 @@
/turf/open/floor/carpet/royalblue,
/area/edina/crew_quarters/store/pet)
"bOK" = (
-/obj/structure/sign/logo,
-/turf/closed/festive/whitebrick{
- color = "#967832"
- },
-/area/cargo/office)
+/turf/open/floor/wood,
+/area/service/cafeteria)
"bOL" = (
/obj/structure/closet/secure_closet/quartermaster,
/obj/item/clothing/suit/hooded/wintercoat/cargo,
@@ -38592,11 +38773,12 @@
/obj/structure/closet/crate/bin{
pixel_y = 8
},
-/turf/open/floor/carpet/green,
+/turf/open/floor/wood,
/area/service/cafeteria)
"bQj" = (
-/turf/closed/festive/greybrick,
-/area/service/bar)
+/obj/effect/decal/festive/christmas_ivy_string,
+/turf/open/floor/festive/wooden/wooden1,
+/area/command/corporate_showroom)
"bQk" = (
/obj/structure/table/wood,
/obj/machinery/chem_dispenser/drinks/beer,
@@ -38604,56 +38786,21 @@
pixel_x = -24
},
/turf/open/floor/carpet/red,
-/area/service/bar)
+/area/service/cafeteria/lunchroom)
"bQl" = (
/obj/structure/table/wood,
/obj/machinery/vending/boozeomat,
/turf/open/floor/carpet/red,
-/area/service/bar)
+/area/service/cafeteria/lunchroom)
"bQm" = (
/obj/structure/table/wood,
/obj/machinery/chem_dispenser/drinks,
/turf/open/floor/carpet/red,
-/area/service/bar)
+/area/service/cafeteria/lunchroom)
"bQn" = (
-/obj/structure/table/wood,
-/obj/item/reagent_containers/food/condiment/saltshaker{
- pixel_x = -10;
- pixel_y = 17
- },
-/obj/item/reagent_containers/food/condiment/saltshaker{
- pixel_x = -5;
- pixel_y = 17
- },
-/obj/item/reagent_containers/food/condiment/saltshaker{
- pixel_y = 17
- },
-/obj/item/reagent_containers/food/condiment/saltshaker{
- pixel_x = 5;
- pixel_y = 17
- },
-/obj/item/reagent_containers/food/condiment/saltshaker{
- pixel_x = 10;
- pixel_y = 17
- },
-/obj/item/reagent_containers/food/condiment/peppermill{
- pixel_x = -10;
- pixel_y = 10
- },
-/obj/item/reagent_containers/food/condiment/peppermill{
- pixel_x = -5;
- pixel_y = 10
- },
-/obj/item/reagent_containers/food/condiment/peppermill{
- pixel_y = 10
- },
-/obj/item/reagent_containers/food/condiment/peppermill{
- pixel_x = 5;
- pixel_y = 10
- },
-/obj/item/reagent_containers/food/condiment/peppermill{
- pixel_x = 10;
- pixel_y = 10
+/obj/structure/musician/piano{
+ icon_state = "piano";
+ pixel_y = 0
},
/turf/open/floor/wood,
/area/service/cafeteria/lunchroom)
@@ -39452,16 +39599,14 @@
/turf/open/floor/carpet/green,
/area/service/cafeteria)
"bRY" = (
-/obj/structure/chair/comfy/lime{
- color = "#51ad6a";
- dir = 8;
- name = "cozy chair"
+/obj/structure/chair/wood{
+ dir = 8
},
-/turf/open/floor/carpet/green,
-/area/service/cafeteria)
+/turf/open/floor/wood,
+/area/service/cafeteria/lunchroom)
"bRZ" = (
-/obj/structure/chair/stool,
-/turf/open/floor/carpet/green,
+/obj/structure/chair/stool/bar,
+/turf/open/floor/wood,
/area/service/cafeteria)
"bSa" = (
/obj/structure/table/wood,
@@ -39469,11 +39614,11 @@
dir = 1
},
/turf/open/floor/plasteel/dark,
-/area/service/bar)
+/area/service/cafeteria/lunchroom)
"bSb" = (
/obj/effect/landmark/start/bartender,
/turf/open/floor/carpet/red,
-/area/service/bar)
+/area/service/cafeteria/lunchroom)
"bSc" = (
/obj/structure/closet/cardboard,
/obj/effect/turf_decal/delivery/white,
@@ -39495,15 +39640,15 @@
/turf/open/floor/festive/cobblestone,
/area/edina/street/intersection/progcastaux)
"bSg" = (
-/obj/structure/chair/stool,
+/obj/structure/chair/stool/bar,
/turf/open/floor/wood,
/area/service/cafeteria/lunchroom)
"bSh" = (
-/obj/structure/chair/comfy/brown{
- dir = 4
+/obj/machinery/light{
+ light_color = "#c9d3e8"
},
-/turf/open/floor/wood,
-/area/service/cafeteria/lunchroom)
+/turf/open/floor/plasteel/dark,
+/area/commons/cryopod)
"bSi" = (
/obj/structure/table/wood,
/turf/open/floor/wood,
@@ -39715,12 +39860,12 @@
"bSM" = (
/obj/structure/table/wood,
/turf/open/floor/plasteel/dark,
-/area/service/bar)
+/area/service/cafeteria/lunchroom)
"bSN" = (
/obj/structure/table/wood,
/obj/item/storage/fancy/donut_box,
/turf/open/floor/plasteel/dark,
-/area/service/bar)
+/area/service/cafeteria/lunchroom)
"bSO" = (
/obj/effect/turf_decal/tile/green,
/obj/effect/turf_decal/tile/blue{
@@ -39943,7 +40088,7 @@
pixel_y = 4
},
/turf/open/floor/carpet/red,
-/area/service/bar)
+/area/service/cafeteria/lunchroom)
"bTo" = (
/obj/machinery/jukebox,
/turf/open/floor/wood,
@@ -40141,7 +40286,7 @@
pixel_y = 5
},
/turf/open/floor/carpet/red,
-/area/service/bar)
+/area/service/cafeteria/lunchroom)
"bTM" = (
/turf/closed/festive/greybrick,
/area/service/kitchen/coldroom)
@@ -40329,7 +40474,7 @@
/obj/structure/table/wood,
/obj/item/reagent_containers/rag/towel,
/turf/open/floor/plasteel/dark,
-/area/service/bar)
+/area/service/cafeteria/lunchroom)
"bUk" = (
/obj/effect/turf_decal/tile/yellow{
dir = 4
@@ -40807,7 +40952,7 @@
/obj/structure/table/wood,
/obj/machinery/light,
/turf/open/floor/plasteel/dark,
-/area/service/bar)
+/area/service/cafeteria/lunchroom)
"bVt" = (
/obj/structure/chair/sofa/right{
dir = 4
@@ -41226,7 +41371,7 @@
"bWr" = (
/obj/structure/cable/yellow,
/turf/open/floor/carpet/red,
-/area/service/bar)
+/area/service/cafeteria/lunchroom)
"bWs" = (
/turf/closed/festive/greybrick,
/area/service/kitchen)
@@ -41557,7 +41702,7 @@
/area/service/cafeteria)
"bXh" = (
/obj/machinery/light,
-/obj/structure/chair/sofa/right{
+/obj/structure/chair/sofa/left{
dir = 1
},
/turf/open/floor/carpet/green,
@@ -41568,7 +41713,7 @@
req_one_access_txt = "25;26;28;35"
},
/turf/open/floor/plasteel/dark,
-/area/service/bar)
+/area/service/cafeteria/lunchroom)
"bXj" = (
/obj/effect/festive/street/streetlinesouth,
/obj/effect/turf_decal/arrows/white{
@@ -41582,6 +41727,9 @@
pixel_x = 2;
pixel_y = 10
},
+/obj/structure/extinguisher_cabinet{
+ pixel_y = 32
+ },
/turf/open/floor/plasteel/cafeteria,
/area/service/kitchen)
"bXl" = (
@@ -41600,9 +41748,6 @@
/area/service/kitchen)
"bXn" = (
/obj/machinery/vending/dinnerware,
-/obj/structure/extinguisher_cabinet{
- pixel_y = 32
- },
/turf/open/floor/plasteel/cafeteria,
/area/service/kitchen)
"bXo" = (
@@ -41848,13 +41993,19 @@
/turf/open/floor/festive/wooden/wooden1,
/area/commons/lounge)
"bXR" = (
-/turf/open/indestructible,
-/area/commons/lounge)
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plating,
+/area/engineering/main)
"bXS" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/structure/disposalpipe/segment,
-/turf/open/indestructible,
-/area/commons/lounge)
+/obj/effect/decal/festive/christmas_ivy_string,
+/obj/machinery/vending/gato,
+/turf/open/floor/plasteel/dark,
+/area/commons/cryopod)
"bXT" = (
/obj/structure/extinguisher_cabinet{
dir = 4;
@@ -41918,7 +42069,7 @@
icon_state = "2-8"
},
/turf/open/floor/carpet/red,
-/area/service/bar)
+/area/service/cafeteria/lunchroom)
"bYe" = (
/obj/machinery/door/window/westleft{
dir = 1;
@@ -41926,7 +42077,7 @@
req_one_access_txt = "25;26;28;35"
},
/turf/open/floor/plasteel/stairs,
-/area/service/bar)
+/area/service/cafeteria/lunchroom)
"bYf" = (
/obj/effect/landmark/start/cook,
/turf/open/floor/plasteel/cafeteria,
@@ -41980,7 +42131,7 @@
icon_state = "1-8"
},
/turf/open/floor/carpet/red,
-/area/service/bar)
+/area/service/cafeteria/lunchroom)
"bYo" = (
/obj/effect/landmark/start/chief_medical_officer,
/turf/open/floor/carpet/royalblack,
@@ -42077,11 +42228,23 @@
dir = 1;
light_color = "#e8eaff"
},
+/obj/structure/chair/beanbag/gato,
/turf/open/floor/carpet/royalblue,
/area/service/cafeteria)
"bYB" = (
-/turf/open/floor/carpet/orange,
-/area/service/bar)
+/obj/machinery/door/poddoor/shutters/preopen{
+ id = "rndlab1";
+ name = "Research and Development Shutter"
+ },
+/obj/machinery/door/firedoor,
+/obj/machinery/autolathe,
+/obj/machinery/door/window/southright{
+ name = "Research and Development Desk";
+ req_one_access_txt = "7;29";
+ dir = 8
+ },
+/turf/open/floor/festive/wooden/wooden1,
+/area/science/lab)
"bYC" = (
/obj/structure/closet/secure_closet/freezer/meat,
/obj/item/reagent_containers/food/snacks/meat/slab/monkey,
@@ -42295,7 +42458,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
-/turf/open/indestructible,
+/turf/open/floor/carpet/red,
/area/commons/lounge)
"bZc" = (
/obj/structure/displaycase/captain,
@@ -42330,7 +42493,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
-/turf/open/indestructible,
+/turf/open/floor/carpet/red,
/area/commons/lounge)
"bZh" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
@@ -42416,8 +42579,8 @@
req_one_access_txt = "25;26;28;35"
},
/obj/structure/rack,
-/turf/open/floor/carpet/orange,
-/area/service/bar)
+/turf/open/floor/plasteel/dark,
+/area/service/cafeteria/lunchroom)
"bZr" = (
/obj/structure/closet/secure_closet/freezer/fridge,
/obj/structure/disposalpipe/segment,
@@ -42901,8 +43064,8 @@
req_one_access_txt = "25;26;28;35"
},
/obj/structure/rack,
-/turf/open/floor/carpet/orange,
-/area/service/bar)
+/turf/open/floor/plasteel/dark,
+/area/service/cafeteria/lunchroom)
"can" = (
/obj/structure/sink/kitchen{
dir = 4;
@@ -43396,8 +43559,8 @@
/area/service/library)
"cbk" = (
/obj/machinery/light/small,
-/turf/open/floor/carpet/orange,
-/area/service/bar)
+/turf/open/floor/wood,
+/area/service/cafeteria/lunchroom)
"cbl" = (
/obj/structure/window{
dir = 1
@@ -43408,8 +43571,8 @@
req_one_access_txt = "25;26;28;35"
},
/obj/structure/rack,
-/turf/open/floor/carpet/orange,
-/area/service/bar)
+/turf/open/floor/plasteel/dark,
+/area/service/cafeteria/lunchroom)
"cbm" = (
/obj/structure/table,
/obj/item/book/manual/wiki/cooking_to_serve_man,
@@ -43524,6 +43687,10 @@
/obj/structure/sign/poster/official/twelve_gauge{
pixel_y = 32
},
+/obj/machinery/light/small{
+ dir = 1;
+ light_color = "#ffc1c1"
+ },
/turf/open/floor/carpet/orange,
/area/cargo/qm)
"cbv" = (
@@ -43817,15 +43984,18 @@
/obj/structure/grille,
/obj/structure/festive/greybrick/windowNSMiddle,
/turf/open/floor/plasteel/dark,
-/area/service/bar)
+/area/service/cafeteria/lunchroom)
"ccb" = (
/obj/structure/grille,
/obj/structure/festive/greybrick/windowNSLeftEnd,
/turf/open/floor/plasteel/dark,
-/area/service/bar)
+/area/service/cafeteria/lunchroom)
"ccc" = (
-/turf/closed/festive/greybrick/greybrickns,
-/area/service/bar)
+/obj/structure/chair/comfy/black{
+ dir = 4
+ },
+/turf/open/floor/wood,
+/area/command/heads_quarters/captain)
"ccd" = (
/turf/closed/festive/greybrick/greybrickns,
/area/service/kitchen)
@@ -44164,10 +44334,16 @@
/obj/machinery/cryopod{
dir = 1
},
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
/turf/open/floor/plasteel/dark,
/area/commons/cryopod)
"ccY" = (
-/obj/machinery/cryopod,
+/obj/machinery/cryopod/tele,
+/obj/effect/turf_decal/stripes/line{
+ dir = 10
+ },
/turf/open/floor/plasteel/dark,
/area/commons/cryopod)
"ccZ" = (
@@ -46460,12 +46636,9 @@
/turf/open/floor/plating,
/area/cargo/qm)
"ciy" = (
-/obj/machinery/door/airlock/mining/glass{
- name = "Cargo Bay";
- req_one_access_txt = "31;48"
- },
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/machinery/door/airlock/public/glass,
/turf/open/indestructible{
icon_state = "sepia"
},
@@ -46654,14 +46827,15 @@
/turf/open/indestructible,
/area/cargo/office)
"ciV" = (
-/obj/machinery/door/airlock/mining/glass{
- name = "Cargo Office";
- req_access_txt = "50"
- },
/obj/effect/decal/festive/christmas_reef,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
+/obj/machinery/door/airlock/mining/glass{
+ name = "Cargo Office";
+ req_access_txt = "50";
+ dir = 8
+ },
/turf/open/indestructible,
/area/cargo/office)
"ciW" = (
@@ -46958,10 +47132,6 @@
/obj/effect/turf_decal/loading_area{
dir = 8
},
-/obj/structure/sign/logo{
- icon_state = "nanotrasen_sign2";
- pixel_y = 32
- },
/obj/effect/decal/festive/christmas_ivy_string,
/turf/open/indestructible,
/area/cargo/sorting)
@@ -46973,10 +47143,6 @@
dir = 8;
id = "QMLoad2"
},
-/obj/structure/sign/logo{
- icon_state = "nanotrasen_sign3";
- pixel_y = 32
- },
/obj/effect/decal/festive/christmas_ivy_string,
/turf/open/floor/festive/alleyway,
/area/cargo/sorting)
@@ -46989,10 +47155,6 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
-/obj/structure/sign/logo{
- icon_state = "nanotrasen_sign2";
- pixel_y = 32
- },
/obj/effect/decal/festive/christmas_ivy_string,
/turf/open/floor/festive/alleyway,
/area/cargo/sorting)
@@ -47005,10 +47167,6 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
-/obj/structure/sign/logo{
- icon_state = "nanotrasen_sign3";
- pixel_y = 32
- },
/obj/machinery/light{
dir = 1;
light_color = "#706891"
@@ -47017,21 +47175,16 @@
/turf/open/floor/festive/alleyway,
/area/cargo/sorting)
"cjG" = (
-/obj/machinery/conveyor{
+/obj/machinery/light{
dir = 8;
- id = "QMLoad2"
+ light_color = "#e8eaff"
},
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
+/obj/structure/window/reinforced{
+ dir = 2;
+ layer = 2.9
},
-/obj/structure/sign/logo{
- icon_state = "nanotrasen_sign4";
- pixel_y = 32
- },
-/obj/effect/decal/festive/christmas_ivy_string,
-/turf/open/floor/festive/alleyway,
-/area/cargo/sorting)
+/turf/open/floor/plasteel,
+/area/command/bridge)
"cjH" = (
/obj/machinery/conveyor{
dir = 8;
@@ -47042,10 +47195,6 @@
dir = 1
},
/obj/structure/plasticflaps,
-/obj/structure/sign/logo{
- icon_state = "nanotrasen_sign5";
- pixel_y = 32
- },
/obj/machinery/door/firedoor,
/turf/open/floor/festive/alleyway,
/area/cargo/sorting)
@@ -47860,7 +48009,7 @@
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk,
/turf/open/floor/carpet/red,
-/area/service/bar)
+/area/service/cafeteria/lunchroom)
"clC" = (
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/delivery,
@@ -49699,11 +49848,15 @@
/turf/open/floor/festive/cobblestone,
/area/edina/street/primary/perimeter)
"cqb" = (
-/obj/machinery/door/airlock/mining/glass,
/obj/machinery/door/firedoor,
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/machinery/door/airlock/mining/glass{
+ dir = 4;
+ name = "Mining Dock";
+ req_access_txt = "48"
+ },
/turf/open/floor/plasteel,
/area/cargo/miningoffice)
"cqc" = (
@@ -51979,12 +52132,15 @@
/turf/open/floor/wood,
/area/maintenance/bar)
"cwf" = (
-/obj/structure/mirror/magic/lesser{
- pixel_x = 32
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 1
},
-/obj/structure/table/wood,
-/turf/open/floor/wood,
-/area/maintenance/bar)
+/obj/machinery/light/small{
+ dir = 1;
+ light_color = "#ffc1c1"
+ },
+/turf/open/floor/festive/alleyway,
+/area/edina/backstreet/supply)
"cwg" = (
/turf/open/floor/plating/beach/coastline_t{
dir = 10
@@ -52041,17 +52197,20 @@
/area/edina)
"cwo" = (
/obj/structure/closet/secure_closet/personal/cabinet,
+/obj/item/clothing/head/santa,
/turf/open/floor/wood,
/area/maintenance/bar)
"cwp" = (
/obj/structure/closet/secure_closet/personal/cabinet,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/item/clothing/head/santa,
/turf/open/floor/wood,
/area/maintenance/bar)
"cwq" = (
/obj/structure/closet/secure_closet/personal/cabinet,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/item/clothing/head/santa,
/turf/open/floor/wood,
/area/maintenance/bar)
"cwr" = (
@@ -52293,7 +52452,7 @@
"cxb" = (
/obj/effect/festive/street/streetlineem,
/turf/open/floor/festive/cobblestone/safe,
-/area/edina/street)
+/area/command/meeting_room/council)
"cxc" = (
/obj/effect/festive/street/sidewalknsm,
/obj/effect/festive/street/streetliftedtile1,
@@ -52519,6 +52678,7 @@
/obj/machinery/light/small{
dir = 8
},
+/obj/structure/chair/bench/left,
/turf/open/floor/festive/trainplatform,
/area/edina/street/primary/perimeter)
"cxU" = (
@@ -52526,6 +52686,7 @@
dir = 4;
light_color = "#d8b1b1"
},
+/obj/structure/chair/bench/right,
/turf/open/floor/festive/trainplatform,
/area/edina/street/primary/perimeter)
"cxZ" = (
@@ -53034,11 +53195,9 @@
/turf/open/floor/festive/wooden/wooden1,
/area/commons/dorms)
"czG" = (
-/obj/machinery/light{
- light_color = "#e8eaff"
- },
-/turf/open/floor/plasteel/checker,
-/area/maintenance/bar/cafe)
+/obj/structure/rack/shelf,
+/turf/open/floor/plasteel/dark,
+/area/commons/cryopod)
"czH" = (
/obj/structure/chair/sofa/corner{
dir = 4
@@ -53510,6 +53669,21 @@
},
/turf/closed/indestructible/rock/snow,
/area/edina)
+"cGi" = (
+/obj/effect/turf_decal/tile/green{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/blue{
+ dir = 8
+ },
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/machinery/conveyor_switch{
+ id = "botany_delivery"
+ },
+/turf/open/floor/plasteel,
+/area/service/hydroponics)
"cHo" = (
/obj/machinery/door/airlock/wood/glass,
/turf/open/floor/plasteel/cafeteria,
@@ -53593,6 +53767,13 @@
},
/turf/open/floor/plasteel/cafeteria,
/area/maintenance/bar/cafe)
+"ddP" = (
+/obj/machinery/suit_storage_unit/security,
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/open/floor/wood,
+/area/security/office)
"dfl" = (
/obj/structure/table,
/obj/item/reagent_containers/food/condiment/enzyme{
@@ -53823,6 +54004,30 @@
icon_state = "wood-broken3"
},
/area/commons/dorms)
+"eIK" = (
+/obj/effect/turf_decal/loading_area{
+ dir = 8;
+ icon_state = "borderfloor";
+ name = "drain"
+ },
+/turf/open/floor/plasteel,
+/area/command/corporate_showroom)
+"eJH" = (
+/obj/machinery/cryopod{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 5
+ },
+/turf/open/floor/plasteel/dark,
+/area/commons/cryopod)
+"eKi" = (
+/obj/structure/window/reinforced{
+ dir = 2;
+ layer = 2.9
+ },
+/turf/open/floor/plasteel,
+/area/command/bridge)
"eKm" = (
/obj/structure/window/reinforced{
dir = 8
@@ -53909,6 +54114,10 @@
/mob/living/simple_animal/jacq/car_spawner,
/turf/open/floor/festive/cobblestone,
/area/edina/street/primary/progress)
+"fmE" = (
+/obj/structure/table/wood,
+/turf/open/floor/wood,
+/area/service/cafeteria)
"fqI" = (
/obj/machinery/door/airlock{
glass = 1;
@@ -53934,6 +54143,15 @@
/obj/structure/flora/tree/dead,
/turf/open/floor/grass,
/area/edina)
+"fvB" = (
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "1-8"
+ },
+/turf/open/floor/wood,
+/area/security/office)
"fwK" = (
/turf/open/floor/plasteel/white,
/area/commons/dorms)
@@ -54025,6 +54243,13 @@
},
/turf/open/floor/plating/dirt/space,
/area/edina)
+"fZi" = (
+/obj/machinery/light/small{
+ dir = 1;
+ light_color = "#ffc1c1"
+ },
+/turf/open/floor/plating,
+/area/cargo/warehouse)
"fZm" = (
/obj/structure/chair/sofa/left{
dir = 1;
@@ -54106,6 +54331,12 @@
/obj/item/reagent_containers/food/snacks/sausage,
/turf/open/floor/carpet/royalblack,
/area/maintenance/bar)
+"gFo" = (
+/obj/structure/chair/sofa/left/old{
+ dir = 1
+ },
+/turf/open/floor/carpet/royalblue,
+/area/command/heads_quarters/captain)
"gFH" = (
/obj/structure/table/wood,
/obj/machinery/chem_dispenser/drinks/beer/fullupgrade,
@@ -54121,6 +54352,10 @@
},
/turf/open/floor/carpet/red,
/area/security/brig)
+"gKY" = (
+/obj/structure/festive/greybrick/windowNSLeftEnd,
+/turf/open/floor/plasteel/dark,
+/area/service/kitchen)
"gMa" = (
/obj/structure/curtain{
color = "#B22222"
@@ -54196,6 +54431,9 @@
/mob/living/simple_animal/pet/penguin/emperor/shamebrero,
/turf/open/floor/holofloor/ice,
/area/edina)
+"hpa" = (
+/turf/open/floor/festive/stairs/stairswest,
+/area/service/cafeteria)
"hqI" = (
/obj/structure/closet/crate,
/obj/item/storage/fancy/candle_box,
@@ -54210,6 +54448,13 @@
icon_state = "wood-broken5"
},
/area/commons/dorms)
+"hrT" = (
+/obj/effect/turf_decal/bot,
+/obj/machinery/conveyor{
+ id = "botany_delivery"
+ },
+/turf/open/floor/plasteel/dark,
+/area/service/hydroponics)
"hxw" = (
/obj/structure/mineral_door/wood,
/turf/closed/wall/mineral/wood,
@@ -54484,11 +54729,23 @@
},
/turf/open/floor/plasteel/cafeteria,
/area/maintenance/bar/cafe)
+"juK" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/closed/festive/greybrick,
+/area/service/kitchen)
"jvh" = (
/obj/structure/bookcase/random/adult,
/obj/machinery/light/small,
/turf/open/floor/wood,
/area/maintenance/bar)
+"jwU" = (
+/obj/structure/chair/comfy/black{
+ dir = 1
+ },
+/turf/open/floor/plasteel/dark,
+/area/command/bridge)
"jzG" = (
/obj/structure/table,
/obj/machinery/smartfridge/disks,
@@ -54527,6 +54784,13 @@
/obj/structure/flora/grass/green,
/turf/open/floor/grass,
/area/edina)
+"jTI" = (
+/obj/effect/turf_decal/weather/snow/corner{
+ color = "#FFFFFE";
+ dir = 5
+ },
+/turf/open/floor/holofloor/ice,
+/area/edina)
"jUo" = (
/obj/machinery/vending/mealdor,
/turf/open/floor/plasteel/dark,
@@ -54604,6 +54868,12 @@
},
/turf/open/floor/plating/beach/sand,
/area/edina)
+"kxm" = (
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/open/floor/wood,
+/area/security/brig)
"kyR" = (
/mob/living/simple_animal/pet/dog/corgi,
/turf/open/floor/grass,
@@ -54655,11 +54925,10 @@
/turf/open/floor/festive/sidewalk,
/area/edina/street/primary/perimeter)
"kWd" = (
-/obj/structure/sign/directions/cells{
- dir = 8
- },
-/turf/closed/wall/mineral/iron,
-/area/security/brig)
+/obj/structure/curtain,
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/service/chapel/main/monastery)
"kXA" = (
/obj/structure/chair/wood/normal{
dir = 1
@@ -54679,11 +54948,17 @@
},
/area/commons/dorms)
"lcg" = (
-/obj/structure/sign/directions/cells{
- dir = 4
+/obj/machinery/cryopod{
+ dir = 1
},
-/turf/closed/wall/mineral/iron,
-/area/security/brig)
+/obj/effect/turf_decal/stripes/line{
+ dir = 9
+ },
+/turf/open/floor/plasteel/dark,
+/area/commons/cryopod)
+"lcv" = (
+/turf/open/floor/carpet/royalblack,
+/area/service/cafeteria)
"lde" = (
/obj/structure/chair/stool/bar,
/turf/open/floor/wood,
@@ -54921,6 +55196,14 @@
},
/turf/open/floor/festive/wooden/wooden1,
/area/medical/chemistry)
+"mNI" = (
+/obj/machinery/mineral/ore_redemption{
+ input_dir = 2;
+ output_dir = 1
+ },
+/obj/structure/fans/tiny,
+/turf/open/floor/plating,
+/area/cargo/miningoffice)
"mRs" = (
/obj/structure/bookcase/random/religion,
/obj/machinery/light{
@@ -55015,6 +55298,15 @@
},
/turf/open/floor/carpet/royalblue,
/area/edina/crew_quarters/store/pet)
+"nCI" = (
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 1
+ },
+/obj/machinery/light/small{
+ dir = 1
+ },
+/turf/open/floor/festive/alleyway,
+/area/edina/backstreet/supply)
"nEs" = (
/obj/structure/statue/gold/ce{
anchored = 1
@@ -55025,6 +55317,16 @@
/mob/living/simple_animal/pet/fox,
/turf/open/floor/grass,
/area/edina)
+"nNo" = (
+/obj/machinery/cryopod/tele,
+/obj/effect/turf_decal/stripes/line{
+ dir = 6
+ },
+/turf/open/floor/plasteel/dark,
+/area/commons/cryopod)
+"nNE" = (
+/turf/open/floor/plasteel/stairs/right,
+/area/service/cafeteria/lunchroom)
"nOZ" = (
/turf/closed/wall/r_wall,
/area/engineering/engine_smes)
@@ -55046,6 +55348,17 @@
},
/turf/open/floor/carpet/red,
/area/commons/dorms)
+"nUc" = (
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment,
+/obj/machinery/light/small{
+ dir = 4;
+ light_color = "#d8b1b1"
+ },
+/turf/open/floor/festive/cobblestone,
+/area/edina/street/primary/servitor)
"nWq" = (
/obj/item/toy/beach_ball,
/obj/structure/window/reinforced{
@@ -55057,12 +55370,19 @@
/obj/structure/flora/grass/brown,
/turf/open/floor/grass,
/area/edina)
+"nXE" = (
+/turf/open/floor/festive/wooden/wooden1,
+/area/command/heads_quarters/captain)
"nZW" = (
/obj/effect/turf_decal/weather/snow/corner{
dir = 8
},
/turf/open/floor/festive/alleyway,
/area/science)
+"obM" = (
+/obj/machinery/vending/cigarette,
+/turf/open/floor/festive/wooden/wooden1,
+/area/command/heads_quarters/captain)
"oeX" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -55288,6 +55608,18 @@
/mob/living/simple_animal/jacq/car_spawner,
/turf/open/floor/festive/alleyway,
/area/edina/street/secondary/castle)
+"pCc" = (
+/obj/structure/cable/yellow{
+ icon_state = "0-2"
+ },
+/obj/machinery/power/apc{
+ areastring = "/area/security/office";
+ dir = 4;
+ name = "Security Office APC";
+ pixel_y = 24
+ },
+/turf/open/floor/wood,
+/area/security/office)
"pCu" = (
/obj/structure/rack,
/obj/item/clothing/accessory/waistcoat,
@@ -55405,8 +55737,17 @@
"qkz" = (
/obj/effect/decal/festive/fairylights,
/obj/machinery/vending/gato,
-/turf/open/floor/carpet/royalblue,
+/turf/open/floor/wood,
/area/service/cafeteria)
+"qoo" = (
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/festive/cobblestone,
+/area/edina/street/primary/servitor)
"qua" = (
/obj/machinery/door/airlock/wood/glass,
/turf/open/floor/plasteel/dark,
@@ -55463,6 +55804,21 @@
},
/turf/open/floor/wood,
/area/maintenance/bar)
+"qRx" = (
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/festive/cobblestone,
+/area/edina/street/primary/servitor)
+"qST" = (
+/obj/structure/fence/door/opened,
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/festive/alleyway,
+/area/edina/backstreet/supply)
"qUh" = (
/obj/structure/closet/secure_closet/freezer/kitchen/maintenance,
/turf/open/floor/wood,
@@ -55531,11 +55887,29 @@
"rni" = (
/turf/closed/indestructible/rock,
/area/edina)
+"rnE" = (
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 9
+ },
+/turf/open/floor/festive/cobblestone,
+/area/edina/street/primary/servitor)
"rqO" = (
/obj/structure/table/wood,
/obj/machinery/microwave,
/turf/open/floor/wood,
/area/maintenance/bar)
+"rtQ" = (
+/obj/structure/fireplace{
+ dir = 8;
+ pixel_x = -24;
+ pixel_y = 26
+ },
+/obj/item/kirbyplants,
+/turf/open/floor/carpet/orange,
+/area/commons/dorms)
"ruk" = (
/turf/open/floor/plasteel/white/side{
dir = 1
@@ -55639,6 +56013,12 @@
/obj/machinery/vending/boozeomat,
/turf/closed/festive/greybrick,
/area/maintenance/bar)
+"rTU" = (
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
+/turf/open/floor/festive/alleyway,
+/area/edina/backstreet/supply)
"scn" = (
/turf/open/floor/plasteel/dark,
/area/engineering/atmos)
@@ -55714,11 +56094,10 @@
/turf/open/floor/wood,
/area/maintenance/bar)
"ssr" = (
-/obj/structure/sign/directions/cells{
- dir = 1
- },
-/turf/closed/wall/mineral/iron,
-/area/security/brig)
+/obj/structure/table/reinforced,
+/obj/machinery/microwave,
+/turf/open/floor/wood,
+/area/commons/dorms)
"ssY" = (
/obj/structure/chair/sofa/right{
dir = 1
@@ -55726,8 +56105,9 @@
/turf/open/floor/wood,
/area/commons/dorms)
"suS" = (
-/obj/structure/table/wood,
/obj/effect/decal/festive/christmas_reef,
+/obj/structure/table/wood/poker,
+/obj/item/reagent_containers/food/drinks/bottle/whiskey,
/turf/open/floor/wood,
/area/service/cafeteria/lunchroom)
"szb" = (
@@ -55902,6 +56282,12 @@
color = "#967832"
},
/area/cargo)
+"tCK" = (
+/obj/structure/chair/sofa{
+ dir = 8
+ },
+/turf/open/floor/wood,
+/area/service/cafeteria/lunchroom)
"tHL" = (
/obj/effect/turf_decal/weather/snow/corner{
dir = 4
@@ -56017,6 +56403,13 @@
"uAY" = (
/turf/closed/festive/redbrick/redbrickcornersw,
/area/commons/dorms)
+"uBb" = (
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 4
+ },
+/obj/machinery/vending/kink,
+/turf/open/floor/festive/cobblestone,
+/area/edina/street/primary/servitor)
"uBp" = (
/obj/structure/flora/rock/pile/icy,
/turf/open/floor/grass,
@@ -56052,6 +56445,16 @@
/obj/structure/fluff/lightpost/light,
/turf/open/floor/grass,
/area/edina)
+"uJZ" = (
+/obj/effect/turf_decal/weather/snow/corner{
+ dir = 8
+ },
+/obj/machinery/light/small{
+ brightness = 3;
+ dir = 8
+ },
+/turf/open/floor/festive/cobblestone,
+/area/edina/street/primary/servitor)
"uMK" = (
/obj/structure/table/wood/fancy/green,
/obj/item/book/lorebooks/welcome_to_gato,
@@ -56077,6 +56480,10 @@
/obj/machinery/vending/gato,
/turf/open/floor/wood,
/area/engineering/main)
+"uVN" = (
+/obj/structure/table/wood,
+/turf/open/floor/carpet/royalblue,
+/area/command/heads_quarters/captain)
"uWR" = (
/obj/structure/chair/wood/wings{
dir = 1
@@ -56099,13 +56506,24 @@
/turf/open/floor/carpet/orange,
/area/command/heads_quarters/ce)
"vgD" = (
-/obj/structure/sign/directions/cells,
-/turf/closed/wall/mineral/iron,
-/area/security/brig)
+/obj/effect/turf_decal/weather/snow/corner{
+ color = "#FFFFFE";
+ dir = 8
+ },
+/obj/machinery/rnd/production/techfab/department/service,
+/turf/open/floor/festive/alleyway,
+/area/edina/backstreet/supply)
"viT" = (
/obj/effect/turf_decal/stripes/white/full,
/turf/open/floor/plating/beach/sand,
/area/edina)
+"vlA" = (
+/obj/effect/turf_decal/loading_area{
+ icon_state = "drain";
+ name = "drain"
+ },
+/turf/open/floor/festive/wooden/wooden1,
+/area/command/corporate_showroom)
"vmW" = (
/mob/living/simple_animal/pet/penguin/baby,
/turf/open/floor/holofloor/ice,
@@ -56376,6 +56794,10 @@
/obj/item/clothing/shoes/winterboots,
/obj/item/clothing/shoes/winterboots,
/obj/item/clothing/shoes/winterboots,
+/obj/item/clothing/head/santa,
+/obj/item/clothing/head/santa,
+/obj/item/clothing/head/santa,
+/obj/item/clothing/head/santa,
/turf/open/floor/festive/trainplatform,
/area/edina/street/primary/perimeter)
"wWV" = (
@@ -56419,6 +56841,10 @@
/mob/living/simple_animal/jacq/car_spawner,
/turf/open/floor/festive/cobblestone,
/area/edina/street/primary/perimeter)
+"xmi" = (
+/obj/machinery/vending/cigarette,
+/turf/open/floor/wood,
+/area/service/cafeteria)
"xpf" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -56499,6 +56925,12 @@
/obj/item/reagent_containers/food/snacks/waffles,
/turf/open/floor/wood,
/area/maintenance/bar)
+"xHo" = (
+/obj/structure/cable/yellow{
+ icon_state = "2-4"
+ },
+/turf/open/floor/carpet/red,
+/area/command/heads_quarters/hos)
"xJM" = (
/obj/effect/turf_decal/weather/snow/corner{
dir = 1
@@ -62320,20 +62752,20 @@ aal
aal
aal
bKW
-aqg
-aqg
-aqg
-aqg
-aqg
-aqg
-aqg
-aqg
-aqg
-aqg
-aqg
-aqg
-aqg
-aqg
+acP
+cdq
+cdq
+cdq
+cdq
+cdq
+cdq
+cdq
+cdq
+cdq
+cdq
+cdq
+cdq
+bQh
aal
aal
aal
@@ -62577,7 +63009,7 @@ noa
kfS
aIA
aIA
-aqg
+apm
aqg
aqg
aqg
@@ -62590,7 +63022,7 @@ aqg
aqg
aqg
aqg
-aqg
+ayF
aal
aal
aal
@@ -62834,6 +63266,7 @@ cwl
knK
aIA
aIA
+apm
aqg
aqg
aqg
@@ -62846,8 +63279,7 @@ aqg
aqg
aqg
aqg
-aqg
-aqg
+ayF
aal
aal
aal
@@ -63091,6 +63523,7 @@ cwl
knK
fhW
aIA
+apm
aqg
aqg
aqg
@@ -63103,8 +63536,7 @@ aqg
aqg
aqg
aqg
-aqg
-aqg
+ayF
aal
aal
aal
@@ -63348,7 +63780,7 @@ cwl
cqI
fhW
aIA
-aqg
+apm
aqg
aqg
wHw
@@ -63361,7 +63793,7 @@ aqg
aqg
aqg
aqg
-aqg
+ayF
aal
aal
aal
@@ -63605,7 +64037,7 @@ cwl
cqI
fhW
aIA
-aqg
+apm
aqg
aqg
aqg
@@ -63618,7 +64050,7 @@ vmW
aqg
aqg
aqg
-aqg
+ayF
aal
aal
aal
@@ -63680,19 +64112,19 @@ awB
axo
scn
atB
-ayZ
+azC
azC
azC
atB
scn
atB
-aAM
+aAX
aAX
aAX
atB
scn
atB
-aBG
+aCa
aCa
aCa
atB
@@ -63862,6 +64294,7 @@ cwl
lNU
fhW
aIA
+apm
aqg
aqg
aqg
@@ -63874,8 +64307,7 @@ aqg
aqg
aqg
aqg
-aqg
-aqg
+ayF
aal
aal
aal
@@ -63937,25 +64369,25 @@ awC
axp
rvT
atB
-ayZ
+azC
azD
azU
atB
scn
atB
-aAM
+aAX
aAY
aBb
atB
scn
atB
-aBG
+aCa
aCb
aCG
atB
scn
atB
-aGu
+aBO
aBO
aCV
atB
@@ -64119,6 +64551,7 @@ cwl
gud
fhW
aIA
+apm
aqg
aqg
aqg
@@ -64131,8 +64564,7 @@ aqg
aqg
aqg
aqg
-aqg
-aqg
+ayF
aal
aal
aal
@@ -64212,7 +64644,7 @@ aCI
atB
scn
atB
-aGu
+aBO
aBO
aIb
atB
@@ -64376,7 +64808,7 @@ cwl
lLP
fhW
aIA
-aqg
+apm
aqg
aqg
aqg
@@ -64389,7 +64821,7 @@ aqg
aqg
aqg
aqg
-aqg
+ayF
aal
aal
aal
@@ -64633,7 +65065,7 @@ cwl
cqI
fhW
aIA
-aqg
+apm
aqg
aqg
aqg
@@ -64646,7 +65078,7 @@ aqg
aqg
aqg
aqg
-aqg
+ayF
aal
aal
aal
@@ -64890,7 +65322,7 @@ cwl
cqI
fhW
aIA
-aqg
+apm
aqg
aqg
aqg
@@ -64903,7 +65335,7 @@ aqg
vmW
aqg
aqg
-aqg
+ayF
aal
aal
aal
@@ -65147,6 +65579,7 @@ cwl
cqI
fhW
aIA
+apm
aqg
aqg
aqg
@@ -65159,8 +65592,7 @@ aqg
aqg
aqg
aqg
-aqg
-aqg
+ayF
aal
aal
aal
@@ -65404,6 +65836,7 @@ cwl
kfS
ewh
aIA
+apm
aqg
aqg
aqg
@@ -65416,8 +65849,7 @@ aqg
aqg
aqg
aqg
-aqg
-aqg
+ayF
aal
aal
aal
@@ -65661,7 +66093,7 @@ kfS
kfS
aIA
cAL
-aqg
+apm
aqg
vmW
aqg
@@ -65674,7 +66106,7 @@ aqg
aqg
aqg
aqg
-aqg
+ayF
aal
aal
aal
@@ -65802,7 +66234,7 @@ bqA
btX
bvm
bwu
-btR
+kWd
aal
aal
aal
@@ -65918,20 +66350,20 @@ aal
aal
aal
aal
-aqg
-aqg
-aqg
-aqg
-aqg
-aqg
-aqg
-aqg
-aqg
-aqg
-aqg
-aqg
-aqg
-aqg
+jTI
+aqh
+aqh
+aqh
+aqh
+aqh
+aqh
+aqh
+aqh
+aqh
+aqh
+aqh
+aqh
+bQU
aal
aal
aal
@@ -66059,7 +66491,7 @@ bqA
btY
bvn
bwv
-btR
+kWd
aal
aal
aal
@@ -66573,7 +67005,7 @@ bqA
bua
bvn
bwv
-btR
+kWd
aal
aal
aal
@@ -66830,7 +67262,7 @@ bqA
bub
bvo
bvp
-btR
+kWd
aal
aal
aal
@@ -68534,7 +68966,7 @@ aad
aal
aal
aad
-aad
+ajK
ajK
ajK
ajK
@@ -68791,18 +69223,18 @@ aad
aal
aad
aad
-aad
ajK
-ajU
-ajU
-ajU
-ajU
-ajU
-ajU
-ajU
-ajU
-ajU
-ajU
+aow
+aow
+aow
+aow
+aow
+aow
+aow
+aow
+aow
+aow
+aow
ang
cBd
cBd
@@ -69048,18 +69480,18 @@ aal
aal
aad
aad
-aad
ajK
-ajU
-ajU
-ajU
-ajU
-ajU
-ajU
-alk
-ajU
-ajU
-ajU
+aow
+aow
+aow
+aow
+aow
+aow
+ala
+aow
+aow
+aow
+aow
anh
anx
aos
@@ -69156,8 +69588,8 @@ bvU
bvU
aXQ
bGF
-bvU
-bvU
+aBG
+aBG
bKh
aXQ
bvU
@@ -69167,7 +69599,7 @@ bvU
bvU
aXQ
bGF
-bvU
+aBG
bKh
aXQ
bvU
@@ -69177,8 +69609,8 @@ bvU
bvU
aXQ
bGF
-bvU
-bvU
+aBG
+aBG
bKh
aXQ
bvU
@@ -69305,18 +69737,18 @@ aal
aad
aad
aad
-aad
ajK
-ajU
-akp
-ajX
+aow
+amC
+aox
+apV
aku
akL
-ala
+aox
ajX
-als
-ajX
-amC
+aox
+amE
+aow
anh
anx
aot
@@ -69562,10 +69994,9 @@ aal
aad
aad
aad
-aad
ajK
-ajU
-akq
+aow
+akp
ajY
akv
ajU
@@ -69573,7 +70004,8 @@ akv
ajU
akv
ajY
-akq
+akp
+aow
anh
ajK
aou
@@ -69819,10 +70251,9 @@ aad
aad
aad
aad
-aac
ajK
-ajU
-akr
+aow
+akq
akh
ajU
ajU
@@ -69831,6 +70262,7 @@ ajU
ajU
alW
amD
+aow
anh
any
aov
@@ -70076,10 +70508,9 @@ aad
aad
aad
aad
-aac
ajK
-ajU
-akq
+aow
+akp
ajU
ajU
akM
@@ -70087,7 +70518,8 @@ ajU
akM
ajU
ajU
-akq
+akp
+aow
anh
cBd
aow
@@ -70184,8 +70616,8 @@ bvU
bvU
aXQ
bGF
-bvU
-bvU
+aBG
+aBG
bKh
aXQ
bvU
@@ -70195,7 +70627,7 @@ bvU
bvU
aXQ
bGF
-bvU
+aBG
bKh
aXQ
bvU
@@ -70205,8 +70637,8 @@ bvU
bvU
aXQ
bGF
-bvU
-bvU
+aBG
+aBG
bKh
aXQ
bvU
@@ -70333,10 +70765,9 @@ aad
aad
aad
aac
-aac
ajK
-ajU
-aks
+aow
+alA
akh
ajU
ajU
@@ -70344,7 +70775,8 @@ ajU
ajU
ajU
alW
-amE
+alk
+aox
ani
anz
aox
@@ -70590,10 +71022,9 @@ aad
aad
aad
aac
-aac
ajK
-ajU
-akq
+aow
+akp
ajU
ajU
akM
@@ -70601,7 +71032,8 @@ ajU
akM
ajU
ajU
-akq
+akp
+aow
anh
cBd
aow
@@ -70847,10 +71279,9 @@ aad
aad
aad
aac
-aac
ajK
-ajU
-ajO
+aow
+aks
akh
ajU
ajU
@@ -70858,7 +71289,8 @@ ajU
ajU
ajU
alW
-amG
+aGu
+aow
anh
cBc
aoy
@@ -71104,10 +71536,9 @@ aad
aad
aad
aac
-aac
ajK
-ajU
-akq
+aow
+akp
ajY
akw
ajU
@@ -71115,7 +71546,8 @@ akw
ajU
akw
ajY
-akq
+akp
+aow
anh
ajK
aou
@@ -71361,18 +71793,18 @@ aad
aad
aad
aac
-aac
ajK
-ajU
-ajP
-ajX
+aow
+amG
+aox
+bXR
akx
akN
-alb
-ajX
-alA
-ajX
-amH
+aox
+ajO
+aox
+ayZ
+aow
anh
anx
aoz
@@ -71618,18 +72050,18 @@ aad
aad
aad
aad
-aac
ajK
-ajU
-ajU
-ajU
-ajU
-ajU
-ajU
-all
-ajU
-ajU
-ajU
+aow
+aow
+aow
+aow
+aow
+aow
+akr
+aow
+aow
+aow
+aow
anh
anx
aoA
@@ -71875,18 +72307,18 @@ aal
aad
aad
aad
-aac
ajK
-ajU
-ajU
-ajU
-ajU
-ajU
-ajU
-ajU
-ajU
-ajU
-ajU
+aow
+aow
+aow
+aow
+aow
+aow
+aow
+aow
+aow
+aow
+aow
ang
cBd
cBd
@@ -72132,7 +72564,7 @@ aal
aad
aad
aad
-aad
+ajK
ajK
ajK
ajK
@@ -75522,9 +75954,9 @@ bWz
btt
bsp
bWz
-bDp
-boM
-bGi
+apa
+adO
+ssr
bWz
bhX
aKN
@@ -75779,8 +76211,8 @@ cyK
aEQ
aEQ
brI
-bDp
-bDp
+apa
+apa
bGi
bWz
bhX
@@ -76036,8 +76468,8 @@ bWz
aER
buL
bWz
-bDp
-bDp
+apa
+apa
bGj
bWz
bhX
@@ -76293,7 +76725,7 @@ bWz
bWz
bWz
bWz
-bDp
+apa
bWz
bWz
bWz
@@ -76548,9 +76980,9 @@ nRW
bDp
bWz
btu
-brJ
+btu
bWz
-bDp
+apa
bEt
bnD
bWz
@@ -76807,8 +77239,8 @@ bwc
brJ
cjX
brJ
-bDp
-bDp
+apa
+ajA
bGn
bWz
bhh
@@ -77064,9 +77496,9 @@ bWz
brN
bDQ
buM
-bDp
-bDp
-bqf
+apa
+ajA
+rtQ
bWz
bhh
bij
@@ -77578,8 +78010,8 @@ bWz
brN
btw
buM
-bDp
-bDp
+apa
+ajA
bqg
bWz
bhh
@@ -77835,8 +78267,8 @@ bwc
brJ
cjX
brJ
-bDp
-bDp
+apa
+ajA
bHx
bWz
bhh
@@ -78090,9 +78522,9 @@ lPf
bDp
bWz
btu
-brJ
+btu
bWz
-bDp
+apa
bEW
bHU
bWz
@@ -78349,7 +78781,7 @@ bWz
bWz
bWz
bWz
-bDp
+apa
bWz
bWz
bWz
@@ -78606,8 +79038,8 @@ bWz
btt
bsp
bWz
-bDp
-bDp
+apa
+apa
bGj
bWz
bhY
@@ -78863,8 +79295,8 @@ cyK
aEQ
aEQ
brI
-bDp
-bDp
+apa
+apa
bGi
bWz
bhY
@@ -79120,9 +79552,9 @@ bWz
aER
buL
bWz
-bDp
+apa
boN
-bGi
+ssr
bWz
bhY
bdO
@@ -80098,8 +80530,8 @@ afC
afC
afC
afC
-ajA
-azn
+afC
+afC
afC
akE
aso
@@ -83164,12 +83596,12 @@ aal
aal
aal
aal
-aba
+acq
acj
acj
bGo
-aba
-aba
+acq
+acq
aeG
aeZ
afI
@@ -83421,10 +83853,10 @@ aqf
aqf
aqf
bQh
-aba
+acq
alT
alT
-aba
+acq
alT
alT
aeG
@@ -83678,10 +84110,10 @@ aqg
aqg
aqg
ayF
-aba
+acq
ack
alT
-aba
+acq
ack
alT
adq
@@ -83935,15 +84367,15 @@ acL
acL
acL
awM
-aba
+acq
alT
alT
-aba
+acq
alT
alT
aeG
adN
-adM
+afK
adM
aeG
afc
@@ -84192,15 +84624,15 @@ acf
acf
aaS
acf
-aba
+acq
alT
alT
-aba
+acq
alT
alT
aeG
adP
-adM
+afK
aes
aeG
afd
@@ -84449,10 +84881,10 @@ aal
aal
aal
aal
-aba
+acq
ack
alT
-aba
+acq
ack
alT
aeG
@@ -84709,7 +85141,7 @@ aaL
aaL
alT
alT
-aba
+acq
aEr
aEr
aeG
@@ -84973,7 +85405,7 @@ alT
alT
alT
cxb
-aba
+acq
aff
afN
agm
@@ -85230,7 +85662,7 @@ alT
alT
alT
aeu
-aba
+acq
afg
afO
afO
@@ -85487,14 +85919,14 @@ alT
alT
alT
cxb
-aba
+acq
afh
-afp
-afp
+eIK
+eIK
agO
-afp
-afp
-afp
+eIK
+eIK
+eIK
aiR
akg
akg
@@ -85618,8 +86050,8 @@ bUf
bUY
bWe
bWX
-bXR
-bXR
+bYx
+bYx
bZb
bUf
cnx
@@ -85745,12 +86177,12 @@ adR
aeh
aev
aba
-afh
-afp
-afp
-afp
-afp
-afp
+bOu
+bOu
+bOu
+bOu
+bOu
+bOu
afp
aiS
akg
@@ -85875,7 +86307,7 @@ bUf
bUZ
bUS
bWX
-bXR
+bYx
bYx
bZc
bUf
@@ -86008,7 +86440,7 @@ agn
agP
ahr
ahU
-afl
+afp
aiT
akg
akg
@@ -86132,7 +86564,7 @@ bUf
bVa
bWf
bWX
-bXR
+bYx
bYx
bZd
cac
@@ -86264,8 +86696,8 @@ afl
afl
agQ
ahs
-afl
-afl
+vlA
+afp
aiT
akg
akg
@@ -86389,7 +86821,7 @@ bUg
bVb
bWg
bWY
-bXS
+bYy
bYy
bZe
cad
@@ -86502,7 +86934,7 @@ aaZ
abi
abr
abs
-abr
+cjG
abL
abU
acb
@@ -86522,7 +86954,7 @@ agn
agR
aht
ahU
-afl
+afp
aiU
akl
akl
@@ -86646,7 +87078,7 @@ bUf
bVc
bWh
bWX
-bXR
+bYx
bYx
bZf
bUf
@@ -86759,9 +87191,9 @@ abb
abj
abs
abs
-abs
+eKi
abM
-abj
+jwU
acc
acm
acq
@@ -86773,12 +87205,12 @@ acY
acz
acz
aeI
-afl
+bQj
afl
afl
agS
afl
-afl
+vlA
air
aiR
pkQ
@@ -86903,8 +87335,8 @@ bUf
bVd
bWi
bWX
-bXR
-bXR
+bYx
+bYx
bZg
bUf
cny
@@ -87016,7 +87448,7 @@ abc
abk
abs
abs
-abs
+eKi
abN
abV
acd
@@ -87030,13 +87462,13 @@ adT
acz
acz
aeJ
-afl
+bQj
afl
ago
agT
ahu
-afl
-afl
+vlA
+afp
aiV
akm
akm
@@ -87287,13 +87719,13 @@ adU
acz
acz
aeJ
-afl
+bQj
afl
agp
agU
ahv
-afl
-afl
+vlA
+afp
aiW
akm
akm
@@ -87544,13 +87976,13 @@ adV
acz
acz
aeJ
-afl
+bQj
afl
agq
agV
ahw
-afl
-afl
+vlA
+afp
aiV
akm
akm
@@ -87801,12 +88233,12 @@ acY
acz
acz
aeK
-afl
+bQj
afl
afl
agS
afl
-afl
+vlA
air
aiR
pkQ
@@ -88064,7 +88496,7 @@ agn
agW
agY
ahU
-afl
+afp
aiS
akB
akB
@@ -88320,8 +88752,8 @@ afl
afl
agX
agY
-afl
-afl
+vlA
+afp
aiT
akg
akg
@@ -88578,7 +89010,7 @@ agn
agY
uMK
ahU
-afl
+afp
aiT
akg
akg
@@ -88821,20 +89253,20 @@ abK
aci
aaM
acs
-acD
+adz
acD
add
-adz
+bOw
adW
add
acD
aeL
-afp
-afp
+bIO
+bIO
agr
agZ
-afp
-afp
+bIO
+bIO
afp
aiU
akg
@@ -88926,7 +89358,7 @@ blj
bmj
bnr
bmj
-bpX
+bpW
bru
bti
bvQ
@@ -89236,7 +89668,7 @@ cxo
cdB
bvU
bvU
-bvU
+czy
aXQ
cAx
cAJ
@@ -89335,9 +89767,9 @@ acw
acw
acw
acs
-acD
-acS
-acS
+acF
+uVN
+gFo
acS
acS
acS
@@ -89594,9 +90026,9 @@ ayG
acs
acF
acT
+bOr
acD
-acD
-acD
+ccc
acD
acD
acs
@@ -89747,11 +90179,11 @@ aVo
aGl
cpH
cxq
-bvU
+amH
bvU
bvU
czy
-bvU
+amH
cxq
cAJ
cAM
@@ -90004,11 +90436,11 @@ aVo
aGl
cpH
cxp
-bvU
+amH
bvU
bvU
czy
-bvU
+amH
cxp
cAJ
cAM
@@ -90109,10 +90541,10 @@ acs
acG
acU
adf
-acD
+nXE
adY
-acD
-acD
+nXE
+nXE
aeM
aft
afR
@@ -90183,7 +90615,7 @@ aMG
aNA
aOq
aPm
-aOq
+bYB
aNA
aRG
bBU
@@ -90366,7 +90798,7 @@ acs
acH
acH
acs
-acD
+obM
adZ
aek
aeB
@@ -90521,7 +90953,7 @@ cxr
cdC
bvU
bvU
-bvU
+czy
aXQ
cAy
cAJ
@@ -90774,7 +91206,7 @@ aFK
aVo
aGl
cpH
-wQO
+ajP
bvU
bvU
bvU
@@ -92063,7 +92495,7 @@ cxo
cdB
bvU
bvU
-bvU
+czy
aXQ
cAx
cAJ
@@ -92574,11 +93006,11 @@ ctG
ctH
ctJ
cxq
-bvU
+amH
bvU
bvU
czy
-bvU
+amH
cxq
cAJ
cAM
@@ -92831,11 +93263,11 @@ ctG
ctH
ctJ
cxp
-bvU
+amH
bvU
bvU
czy
-bvU
+amH
cxp
cAJ
cAM
@@ -93348,7 +93780,7 @@ cxr
cdC
bvU
bvU
-bvU
+czy
aXQ
cAy
cAJ
@@ -94351,7 +94783,7 @@ boV
aSx
aSL
ccV
-wJY
+aAM
ccW
ccV
cda
@@ -94608,8 +95040,8 @@ boV
aSx
aSL
ccV
-wJY
-ccW
+bXS
+bSh
ccV
cdb
cdd
@@ -94865,7 +95297,7 @@ boV
aSx
aSL
ccV
-wJY
+als
ccW
ccV
ccV
@@ -95124,8 +95556,8 @@ aSL
ccV
wJY
ccW
-ccW
-ccW
+czG
+czG
ccV
fCF
cdh
@@ -95380,8 +95812,8 @@ aSx
aSL
ccV
wJY
-ccX
-ccY
+ccW
+ccW
ccW
ccV
fCF
@@ -95636,10 +96068,10 @@ boV
aSx
aSL
ccV
-wJY
-ccX
+aBn
+lcg
ccY
-ccW
+bSh
ccV
fCF
cdh
@@ -95895,7 +96327,7 @@ aSL
ccV
wJY
ccX
-ccY
+azn
ccW
ccV
fCF
@@ -96152,7 +96584,7 @@ aSL
ccV
wJY
ccX
-ccY
+azn
ccW
cdc
cde
@@ -96407,9 +96839,9 @@ boV
aSx
aSL
ccV
-wJY
-ccX
-ccY
+aBn
+eJH
+nNo
ccW
ccZ
cde
@@ -96654,7 +97086,7 @@ csI
cre
ctO
boV
-bwk
+axI
bwk
boV
oMB
@@ -97907,12 +98339,12 @@ bRw
avu
cdo
bFN
-bHd
-bIO
-bKq
+bQd
+bRV
+bXg
bLK
-bFS
-bOr
+bYb
+bXY
bQd
bRV
bRV
@@ -98167,23 +98599,23 @@ bFO
bHe
bIP
bKr
-aqp
+bOK
bMY
-bFS
+bYb
bQe
bRW
-bSL
+bSK
bQe
bTK
-bSL
+bSK
bQe
bRW
-bSL
+bSK
bYb
qkz
-bYz
-bYz
-bYz
+bOK
+bOK
+bOK
bYb
coF
cre
@@ -98422,17 +98854,17 @@ avu
cdo
bFP
bHf
-aHO
-aHO
-aqp
+fmE
+fmE
+bOK
bck
-bFS
+bYb
bQg
bRX
-bSK
+bSL
bTm
bRW
-bSK
+bSL
bTm
bRW
bXh
@@ -98440,7 +98872,7 @@ bYb
bYA
bYz
bYz
-bYz
+bOK
cbY
coG
coH
@@ -98681,17 +99113,17 @@ bFQ
bHg
bIQ
bKs
-aqp
+bOK
bcs
-aBn
-bvs
-bRY
+bYc
+bvs
+bvs
+bvs
+bvs
bvs
bvs
-bRY
bvs
bvs
-bRY
bvs
bYc
bYz
@@ -98936,9 +99368,9 @@ bFg
ccI
bFR
bHh
-aqp
-aqp
-aqp
+bOK
+bOK
+bOK
bct
bcx
bmI
@@ -99191,13 +99623,13 @@ bAF
bWE
bFg
ccI
-bFS
+bYb
bHi
bIR
bKt
-aqp
-aqp
-bFS
+bOK
+bOK
+bYb
bQi
bRZ
bRZ
@@ -99205,13 +99637,13 @@ bRZ
bRZ
bRZ
bui
-bvs
-bvs
-bQj
-bSM
-bSM
-bSM
-bSM
+xmi
+bOK
+bOx
+bSi
+bSi
+bSi
+bSi
cca
cbW
ckO
@@ -99257,9 +99689,9 @@ beB
cpF
cnB
cxA
+anp
cyM
cyM
-czG
cxA
cAE
kld
@@ -99449,25 +99881,25 @@ bWE
bFg
ccI
bFT
-bFS
-bFS
-bFS
-aEV
-aEV
+bYb
+bYb
+bYb
+hpa
+hpa
bOt
-bQj
+bOx
bSa
bSM
bSM
bSM
bUj
buB
-bQj
+bOx
bXi
-bQj
-bYB
-bYB
-bYB
+bOx
+bQo
+bQo
+bQo
cbk
ccb
cbW
@@ -99709,9 +100141,9 @@ bFO
bHj
bIS
bKu
-aIF
-aIF
-bOu
+lcv
+lcv
+bFU
bQk
bSb
aTh
@@ -99722,11 +100154,11 @@ bYd
bWr
aTh
bYe
-bYB
+bQo
bZq
cam
cbl
-ccc
+bFW
cbW
cli
cmv
@@ -99911,7 +100343,7 @@ ash
ash
arC
arC
-avi
+kxm
awg
axa
auI
@@ -99919,7 +100351,7 @@ auI
auI
auI
auI
-vgD
+auI
aAg
aAg
aVr
@@ -99966,8 +100398,8 @@ bFP
bHk
bIT
bKv
-aIF
-aIF
+lcv
+lcv
bOv
bQl
aTh
@@ -100223,9 +100655,9 @@ bFQ
bHl
bIU
bKw
-aIF
-aIF
-bOw
+lcv
+lcv
+bFV
bQm
aTh
aTh
@@ -100477,13 +100909,13 @@ bWE
ccw
ccI
bFT
-bFS
-bFS
-bFS
+bYb
+bYb
+bYb
bLM
bLM
bOt
-bQj
+bOx
bSa
bSN
bSM
@@ -100947,7 +101379,7 @@ auI
auI
auI
auI
-ssr
+auI
aAg
aAg
aAC
@@ -100997,7 +101429,7 @@ bIV
bIV
bHm
bOx
-bQo
+bRY
bQo
bQo
bQo
@@ -101261,7 +101693,7 @@ bTo
btD
bUl
bVt
-bWs
+bKq
bXn
buZ
bYg
@@ -101510,7 +101942,7 @@ bIX
bIX
bIX
bHm
-bOy
+nNE
bQo
bQo
bQo
@@ -101518,7 +101950,7 @@ bTp
btD
bUm
bSi
-bWs
+gKY
bXo
bvF
bwd
@@ -101769,7 +102201,7 @@ bHm
bHm
mXT
bQp
-bSh
+bQo
bQo
bQo
btD
@@ -101779,7 +102211,7 @@ bWs
bWs
bYh
bWs
-bWs
+juK
bwz
bWs
bUs
@@ -101799,7 +102231,7 @@ ciU
bKO
cjr
bNs
-bOK
+bGh
cjA
bSv
bSR
@@ -101975,7 +102407,7 @@ auI
auI
auI
auI
-lcg
+auI
aAg
aAg
aAC
@@ -102027,7 +102459,7 @@ bFr
bOx
bQq
suS
-bQo
+bHd
bQo
btD
bUl
@@ -102035,8 +102467,8 @@ bVt
bOx
bFn
bPw
-bPw
-bPw
+uJZ
+qoo
bTX
bVx
bVx
@@ -102283,8 +102715,8 @@ bOx
bFX
bOx
bQr
-bSi
-bQo
+ayv
+bHd
bQo
btD
bSi
@@ -102293,7 +102725,7 @@ bOx
bFo
bQF
bQF
-bQG
+ciF
bUx
bQG
bQG
@@ -102540,9 +102972,9 @@ bOx
bHo
bOx
bQs
+tCK
bSk
bQo
-bQo
chw
bUn
bSk
@@ -102550,7 +102982,7 @@ bOx
bGN
bQG
bQG
-bQG
+ciF
bUx
bQG
bQG
@@ -102807,11 +103239,11 @@ bOx
bFo
bQF
bQF
-bQG
+ciF
bUx
bQG
bQG
-ciG
+all
ckO
coE
cqk
@@ -103003,7 +103435,7 @@ auI
auI
auI
auI
-kWd
+auI
aAg
aAg
aAC
@@ -103059,12 +103491,12 @@ bDB
bEP
bDB
bDB
-bDB
+vgD
bSm
bMm
bRn
bSc
-bQG
+ciF
bUx
bQG
bQG
@@ -103085,7 +103517,7 @@ bKQ
bWy
bKV
bOM
-cjG
+cjE
bSv
bSR
bTw
@@ -103309,22 +103741,22 @@ byQ
byQ
byQ
byQ
-byQ
+ayx
pRU
bHN
bJx
-bEP
-byQ
-byQ
-byQ
-byC
-bNi
-bNi
-bNi
-bNi
+rTU
+bSW
+bSW
+bSW
+qST
+qRx
+qRx
+nUc
+rnE
bUx
bNi
-bNi
+uBb
cjt
bWy
bWy
@@ -103570,7 +104002,7 @@ aZi
aZi
aZi
bDN
-bQO
+bMi
bTM
bTM
bTM
@@ -103823,11 +104255,11 @@ aXB
aXB
aZt
aXB
-aXB
-aZt
-aZi
-bDN
-bQO
+hrT
+bpX
+bTq
+bDO
+bMj
bTM
bUo
bVB
@@ -104080,7 +104512,7 @@ aZm
aZm
aZm
aZm
-aZm
+cGi
aZn
aZo
bJz
@@ -104272,7 +104704,7 @@ amX
ano
arF
uyg
-apb
+xHo
aqB
ard
aqB
@@ -104283,12 +104715,12 @@ auL
avj
awn
avi
-axI
+auI
ayt
ayR
azw
azM
-axI
+auI
amy
amy
aAF
@@ -104340,7 +104772,7 @@ aly
bbd
bsd
aZi
-bDN
+nCI
bQO
bTM
bUq
@@ -104541,10 +104973,10 @@ avn
awp
avj
axJ
-ayv
-ayv
-ayv
-ayv
+avj
+avj
+avj
+avj
axJ
aAh
aAt
@@ -104797,12 +105229,12 @@ auK
avp
awq
avi
-axI
+auI
ayw
ayS
ayS
azN
-axI
+auI
aAi
aAu
aAH
@@ -105040,7 +105472,7 @@ ayF
alo
amm
amY
-anp
+amz
aog
apd
apM
@@ -105055,11 +105487,11 @@ avn
awg
axb
axK
-ayx
+avi
ayT
azx
azO
-axI
+auI
aAj
aAv
aAI
@@ -105297,12 +105729,12 @@ ayF
alo
amm
amZ
-anp
+amz
aoi
aol
aol
aqH
-anp
+amz
arQ
arQ
asZ
@@ -105312,11 +105744,11 @@ avq
awr
axi
axK
-ayx
+avi
ayU
azy
azP
-axI
+auI
aAk
aAu
aAI
@@ -105554,12 +105986,12 @@ ayF
alo
amm
amZ
-anp
+amz
aoj
ape
apN
aqI
-anp
+amz
arQ
ant
ata
@@ -105569,11 +106001,11 @@ avr
awt
axd
axK
-ayx
-ayx
+avi
+avi
azz
azQ
-axI
+auI
aAl
aAv
aAI
@@ -105811,26 +106243,26 @@ ayF
alo
amo
ana
-anp
+amz
aok
aol
apO
aqJ
-anp
-ant
-ant
+amz
+pCc
+bFS
auQ
ant
awP
avs
awg
avi
-axI
+auI
ayy
ayV
azA
azR
-axI
+auI
aAk
aAu
aAI
@@ -106068,26 +106500,26 @@ ayF
alo
amm
ana
-anp
+amz
aol
apf
apP
aqL
are
ant
-ant
+aqE
auQ
atZ
amz
avt
awu
axj
-axI
-axI
-axI
-axI
-axI
-axI
+auI
+auI
+auI
+auI
+auI
+auI
aAj
aAw
aAI
@@ -106325,12 +106757,12 @@ ayF
alo
amm
ana
-anp
-anp
-anp
-anp
-anp
-anp
+amz
+amz
+amz
+amz
+amz
+amz
arR
ast
atb
@@ -106408,7 +106840,7 @@ ior
bqw
bqw
bxk
-bTP
+bQO
byT
bzC
bAi
@@ -106589,7 +107021,7 @@ ars
ars
amz
atw
-ant
+aqE
auQ
avV
awP
@@ -106665,7 +107097,7 @@ bqw
bqw
bwp
bnY
-bSl
+bQO
byT
bzD
bAi
@@ -106676,7 +107108,7 @@ byT
byT
byT
byT
-bDN
+cwf
bEP
bEP
bUb
@@ -106840,13 +107272,13 @@ alo
amm
alo
amz
-apG
+ddP
aqD
ans
ans
asJ
ans
-ans
+fvB
auR
avW
awQ
@@ -106921,15 +107353,15 @@ bqw
bqw
bvc
bwq
-bnY
-bSl
+mNI
+bTP
byT
bzE
bAj
bBd
bOP
byT
-bQD
+fZi
bQD
bQD
civ
@@ -107957,7 +108389,7 @@ bAl
bEs
bQC
byT
-bQD
+fZi
bQD
bQD
byT
@@ -107987,9 +108419,9 @@ aal
aal
aal
cvS
-cwf
+cqI
ccS
-cwf
+cqI
cvS
cwN
cwl
@@ -116094,7 +116526,7 @@ cwD
cwD
cwD
cwD
-vzt
+cwD
cwD
cwD
twg
@@ -116345,7 +116777,7 @@ cwD
cwD
lVW
cwD
-vzt
+cwD
cwD
cwD
cwD
@@ -116853,7 +117285,7 @@ cwD
cwD
cwD
cwD
-vzt
+cwD
cwD
cwD
cwD
diff --git a/_maps/map_files/Mining/Lavaland_Lower.dmm b/_maps/map_files/Mining/Lavaland_Lower.dmm
index 7cf3e86c64..6282917cf7 100644
--- a/_maps/map_files/Mining/Lavaland_Lower.dmm
+++ b/_maps/map_files/Mining/Lavaland_Lower.dmm
@@ -101,16 +101,19 @@
/turf/open/floor/plasteel/dark,
/area/xenoarch/gen)
"av" = (
-/obj/machinery/airalarm{
- name = "Theatre air alarm";
- pixel_y = 24
+/obj/effect/turf_decal/tile/bar{
+ dir = 4
},
+/obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/loading_area{
- dir = 1;
- icon_state = "drain";
+ dir = 4;
+ icon_state = "borderfloor";
name = "drain"
},
-/turf/open/floor/plasteel/dark,
+/obj/effect/turf_decal/tile/bar{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
/area/xenoarch/gen)
"aw" = (
/turf/open/floor/plasteel/white,
@@ -126,7 +129,7 @@
dir = 8
},
/turf/open/floor/plasteel/dark,
-/area/xenoarch/gen)
+/area/xenoarch/arch)
"ay" = (
/turf/open/lava/smooth/lava_land_surface,
/area/lavaland/surface/outdoors)
@@ -209,6 +212,11 @@
"aK" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1,
/obj/structure/chair/bench/left,
+/obj/effect/turf_decal/loading_area{
+ dir = 8;
+ icon_state = "drain";
+ name = "drain"
+ },
/turf/open/floor/plasteel/dark,
/area/xenoarch/gen)
"aL" = (
@@ -219,9 +227,12 @@
dir = 4;
name = "Theather Room"
},
-/turf/open/floor/plasteel/dark/side{
- dir = 1
+/obj/effect/turf_decal/loading_area{
+ dir = 2;
+ icon_state = "borderfloor";
+ name = "drain"
},
+/turf/open/floor/plasteel/dark,
/area/xenoarch/gen)
"aM" = (
/obj/structure/cable{
@@ -231,6 +242,11 @@
/area/xenoarch/gen)
"aN" = (
/obj/structure/chair/bench/right,
+/obj/effect/turf_decal/loading_area{
+ dir = 4;
+ icon_state = "drain";
+ name = "drain"
+ },
/turf/open/floor/plasteel/dark,
/area/xenoarch/gen)
"aO" = (
@@ -238,12 +254,14 @@
/turf/open/floor/plasteel/dark,
/area/xenoarch/gen)
"aP" = (
+/obj/structure/punching_bag,
/obj/effect/turf_decal/loading_area{
dir = 1;
- icon_state = "drain";
+ icon_state = "borderfloorcee";
name = "drain"
},
-/turf/open/floor/plasteel/dark,
+/obj/effect/turf_decal/box/red,
+/turf/open/floor/plasteel,
/area/xenoarch/gen)
"aR" = (
/obj/structure/cable{
@@ -255,9 +273,15 @@
/obj/effect/turf_decal/tile/bar{
dir = 4
},
-/turf/open/floor/plasteel/dark/side{
- dir = 1
+/obj/effect/turf_decal/loading_area{
+ dir = 1;
+ icon_state = "borderfloor";
+ name = "drain"
},
+/obj/effect/turf_decal/tile/bar{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
/area/xenoarch/gen)
"aS" = (
/obj/structure/disposalpipe/segment{
@@ -302,6 +326,11 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
dir = 5
},
+/obj/effect/turf_decal/loading_area{
+ dir = 8;
+ icon_state = "drain";
+ name = "drain"
+ },
/turf/open/floor/plasteel/dark,
/area/xenoarch/gen)
"aY" = (
@@ -363,8 +392,11 @@
/obj/effect/turf_decal/tile/red{
dir = 4
},
+/obj/structure/sign/poster/official/space_cops{
+ pixel_y = 32
+ },
/turf/open/floor/plasteel/dark,
-/area/xenoarch/gen)
+/area/xenoarch/arch)
"bg" = (
/obj/structure/filingcabinet,
/obj/machinery/light{
@@ -381,7 +413,7 @@
dir = 4
},
/turf/open/floor/plasteel/dark,
-/area/xenoarch/gen)
+/area/xenoarch/arch)
"bh" = (
/obj/machinery/vending/wardrobe/sec_wardrobe,
/obj/effect/turf_decal/tile/red{
@@ -390,8 +422,11 @@
/obj/effect/turf_decal/tile/red{
dir = 4
},
+/obj/machinery/newscaster{
+ pixel_y = 32
+ },
/turf/open/floor/plasteel/dark,
-/area/xenoarch/gen)
+/area/xenoarch/arch)
"bi" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1,
/obj/structure/cable{
@@ -430,6 +465,11 @@
"bo" = (
/obj/machinery/light,
/obj/structure/chair/bench/left,
+/obj/effect/turf_decal/loading_area{
+ dir = 8;
+ icon_state = "drain";
+ name = "drain"
+ },
/turf/open/floor/plasteel/dark,
/area/xenoarch/gen)
"bp" = (
@@ -459,12 +499,24 @@
/turf/open/floor/plasteel/dark,
/area/xenoarch/gen)
"bt" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/effect/turf_decal/loading_area{
+ dir = 8;
+ icon_state = "drain";
+ name = "drain"
},
-/obj/structure/punching_bag,
-/obj/effect/turf_decal/box/red,
-/turf/open/floor/plasteel/dark,
+/obj/effect/turf_decal/loading_area{
+ dir = 4;
+ icon_state = "steel_decals"
+ },
+/obj/effect/turf_decal/loading_area{
+ dir = 2;
+ icon_state = "steel_decals6"
+ },
+/obj/effect/turf_decal/loading_area{
+ dir = 4;
+ icon_state = "steel_decals6"
+ },
+/turf/open/floor/plasteel,
/area/xenoarch/gen)
"bu" = (
/obj/effect/turf_decal/loading_area{
@@ -482,7 +534,12 @@
dir = 4;
name = "Theather Room"
},
-/turf/open/floor/plasteel/dark/side,
+/obj/effect/turf_decal/loading_area{
+ dir = 1;
+ icon_state = "borderfloor";
+ name = "drain"
+ },
+/turf/open/floor/plasteel/dark,
/area/xenoarch/gen)
"bw" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1,
@@ -504,13 +561,8 @@
/turf/open/floor/plating,
/area/xenoarch/arch)
"bA" = (
-/obj/machinery/vending/gato,
-/obj/effect/turf_decal/loading_area{
- dir = 1;
- icon_state = "drain";
- name = "drain"
- },
-/turf/open/floor/plasteel/dark,
+/obj/structure/flora/junglebush/large,
+/turf/open/water/decorative,
/area/xenoarch/gen)
"bB" = (
/obj/structure/cable{
@@ -526,6 +578,16 @@
icon_state = "drain";
name = "drain"
},
+/obj/structure/rack/shelf,
+/obj/item/reagent_containers/rag/towel/random{
+ pixel_y = -6
+ },
+/obj/item/reagent_containers/rag/towel/random{
+ pixel_y = -2
+ },
+/obj/item/reagent_containers/rag/towel/random{
+ pixel_y = 2
+ },
/turf/open/floor/plasteel/dark,
/area/xenoarch/gen)
"bD" = (
@@ -538,6 +600,7 @@
icon_state = "drain";
name = "drain"
},
+/obj/structure/table,
/turf/open/floor/plasteel/dark,
/area/xenoarch/gen)
"bE" = (
@@ -567,7 +630,7 @@
dir = 8
},
/turf/open/floor/plasteel/dark,
-/area/xenoarch/gen)
+/area/xenoarch/arch)
"bH" = (
/obj/item/radio/intercom{
dir = 8;
@@ -582,7 +645,7 @@
dir = 4
},
/turf/open/floor/plasteel/dark,
-/area/xenoarch/gen)
+/area/xenoarch/arch)
"bI" = (
/obj/structure/cable{
icon_state = "0-4"
@@ -1752,15 +1815,16 @@
/turf/open/floor/plasteel/white,
/area/xenoarch/bot)
"ef" = (
-/obj/machinery/door/airlock/external{
- glass = 1;
- name = "Mining External Airlock";
- opacity = 0
- },
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/obj/structure/fans/tiny,
+/obj/machinery/door/airlock/external{
+ glass = 1;
+ name = "Mining External Airlock";
+ opacity = 0;
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/xenoarch/gen)
"eg" = (
@@ -1808,15 +1872,16 @@
/turf/open/floor/plasteel/dark,
/area/xenoarch/gen)
"em" = (
-/obj/machinery/door/airlock/external{
- glass = 1;
- name = "Mining External Airlock";
- opacity = 0
- },
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/obj/structure/fans/tiny,
+/obj/machinery/door/airlock/external{
+ glass = 1;
+ name = "Mining External Airlock";
+ opacity = 0;
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/xenoarch/gen)
"en" = (
@@ -2452,11 +2517,11 @@
/turf/open/floor/plasteel,
/area/xenoarch/gen)
"fE" = (
-/turf/open/water,
+/turf/open/water/decorative,
/area/xenoarch/gen)
"fF" = (
/obj/structure/flora/ausbushes/reedbush,
-/turf/open/water,
+/turf/open/water/decorative,
/area/xenoarch/gen)
"fG" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
@@ -2510,7 +2575,15 @@
dir = 8
},
/obj/effect/turf_decal/tile/bar,
-/turf/open/floor/plasteel/dark/side,
+/obj/effect/turf_decal/loading_area{
+ dir = 2;
+ icon_state = "borderfloor";
+ name = "drain"
+ },
+/obj/effect/turf_decal/tile/bar{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
/area/xenoarch/gen)
"fQ" = (
/obj/structure/flora/ausbushes/ywflowers,
@@ -2817,7 +2890,7 @@
/area/xenoarch/arch)
"gv" = (
/mob/living/simple_animal/butterfly,
-/turf/open/water,
+/turf/open/water/decorative,
/area/xenoarch/gen)
"gw" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -3164,7 +3237,7 @@
/area/xenoarch/arch)
"hn" = (
/obj/item/statuebust,
-/turf/open/water,
+/turf/open/water/decorative,
/area/xenoarch/gen)
"ho" = (
/obj/structure/table,
@@ -5537,19 +5610,31 @@
"mu" = (
/obj/structure/flora/ausbushes/reedbush,
/mob/living/simple_animal/butterfly,
-/turf/open/water,
+/turf/open/water/decorative,
/area/xenoarch/gen)
"mv" = (
/obj/structure/rack,
/turf/open/floor/plating,
/area/xenoarch/gen)
"mw" = (
-/obj/structure/closet/emcloset,
-/turf/open/floor/wood,
+/obj/machinery/light/small{
+ dir = 8
+ },
+/obj/structure/rack/shelf,
+/obj/item/paper_bin,
+/obj/item/pen,
+/obj/structure/sign/poster/contraband/lizard{
+ pixel_y = 32
+ },
+/obj/item/toy/cards/deck,
+/turf/open/indestructible/hotelwood,
/area/xenoarch/gen)
"mx" = (
-/obj/structure/closet/firecloset,
-/turf/open/floor/wood,
+/obj/machinery/vending/games,
+/obj/structure/sign/poster/official/foam_force_ad{
+ pixel_y = 32
+ },
+/turf/open/indestructible/hotelwood,
/area/xenoarch/gen)
"my" = (
/obj/machinery/airalarm{
@@ -5564,7 +5649,7 @@
/turf/open/indestructible/necropolis,
/area/lavaland/surface/outdoors)
"mA" = (
-/turf/open/floor/wood,
+/turf/open/floor/carpet/green,
/area/xenoarch/gen)
"mB" = (
/turf/open/chasm/lavaland,
@@ -5597,14 +5682,19 @@
req_access_txt = "1"
},
/turf/open/floor/plasteel/dark,
-/area/xenoarch/gen)
+/area/xenoarch/arch)
"mI" = (
/obj/effect/decal/cleanable/insectguts,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"mJ" = (
-/obj/structure/table/wood,
-/turf/open/floor/wood,
+/obj/structure/table/wood/poker,
+/obj/item/toy/figure/dsquad{
+ pixel_y = 7;
+ pixel_x = 6
+ },
+/obj/item/toy/figure/syndie,
+/turf/open/floor/carpet/green,
/area/xenoarch/gen)
"mK" = (
/obj/machinery/light/small{
@@ -5637,21 +5727,17 @@
/turf/open/floor/carpet,
/area/xenoarch/gen)
"mO" = (
-/obj/machinery/vending/boozeomat{
- req_access = null
+/obj/structure/chair/beanbag/red,
+/obj/machinery/light/small{
+ dir = 8
},
-/turf/open/floor/wood,
+/obj/structure/sign/poster/official/fashion{
+ pixel_x = -32
+ },
+/turf/open/indestructible/hotelwood,
/area/xenoarch/gen)
"mP" = (
-/obj/structure/table/wood,
-/obj/item/circuitboard/machine/chem_dispenser/drinks{
- pixel_x = 2;
- pixel_y = 3
- },
-/obj/item/circuitboard/machine/chem_dispenser/drinks/beer{
- pixel_x = -2
- },
-/turf/open/floor/wood,
+/turf/open/indestructible/hotelwood,
/area/xenoarch/gen)
"mQ" = (
/obj/machinery/light/small{
@@ -6226,7 +6312,7 @@
/area/xenoarch/gen)
"oj" = (
/obj/structure/flora/ausbushes/sparsegrass,
-/turf/open/water,
+/turf/open/water/decorative,
/area/xenoarch/gen)
"ok" = (
/obj/effect/turf_decal/loading_area{
@@ -7082,21 +7168,8 @@
/turf/open/floor/plasteel,
/area/xenoarch/arch)
"qJ" = (
-/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game{
- pixel_x = 2;
- pixel_y = 7
- },
-/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game{
- pixel_x = -4;
- pixel_y = 3
- },
-/obj/effect/turf_decal/loading_area{
- dir = 1;
- icon_state = "drain";
- name = "drain"
- },
-/turf/open/floor/plasteel/dark,
+/obj/machinery/computer/security/telescreen/entertainment,
+/turf/closed/wall,
/area/xenoarch/gen)
"qK" = (
/obj/machinery/door/airlock/vault{
@@ -7381,7 +7454,7 @@
dir = 8
},
/turf/open/floor/plasteel/dark,
-/area/xenoarch/gen)
+/area/xenoarch/arch)
"rR" = (
/obj/effect/turf_decal/tile/neutral{
dir = 8
@@ -7407,6 +7480,17 @@
},
/turf/open/floor/mineral/basaltstone_floor,
/area/xenoarch/caloriteresearch_powered)
+"rV" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/loading_area{
+ dir = 4;
+ icon_state = "borderfloor";
+ name = "drain"
+ },
+/turf/open/floor/plasteel,
+/area/xenoarch/gen)
"rW" = (
/obj/machinery/power/emitter{
dir = 1
@@ -7416,6 +7500,10 @@
},
/turf/open/floor/plating,
/area/xenoarch/caloriteresearch_powered)
+"rZ" = (
+/obj/structure/fireplace,
+/turf/open/indestructible/hotelwood,
+/area/xenoarch/gen)
"sa" = (
/obj/structure/door_assembly/door_assembly_vault,
/turf/open/floor/plasteel/dark,
@@ -7563,6 +7651,12 @@
/obj/item/trash/can,
/turf/open/floor/plasteel/dark,
/area/xenoarch/caloriteresearch_powered)
+"sH" = (
+/obj/structure/sign/poster/contraband/energy_swords{
+ pixel_x = -32
+ },
+/turf/open/indestructible/hotelwood,
+/area/xenoarch/gen)
"sI" = (
/obj/item/melee/cultblade{
pixel_x = -20
@@ -7598,13 +7692,12 @@
"sN" = (
/obj/effect/turf_decal/loading_area{
dir = 1;
- icon_state = "drain";
+ icon_state = "borderfloorfull";
name = "drain"
},
-/obj/structure/sign/poster/official/space_cops{
- pixel_y = 32
- },
-/turf/open/floor/plasteel/dark,
+/obj/effect/turf_decal/box/red,
+/obj/structure/scale,
+/turf/open/floor/plasteel,
/area/xenoarch/gen)
"sO" = (
/obj/structure/cable{
@@ -7838,6 +7931,10 @@
/obj/machinery/vending/engivend,
/turf/open/floor/plating,
/area/xenoarch/caloriteresearch_powered)
+"tU" = (
+/obj/item/toy/cards/singlecard,
+/turf/open/floor/plasteel,
+/area/xenoarch/gen)
"tW" = (
/obj/effect/decal/cleanable/oil,
/obj/effect/decal/cleanable/robot_debris,
@@ -7868,6 +7965,12 @@
},
/turf/open/floor/plating,
/area/xenoarch/caloriteresearch_unpowered)
+"ug" = (
+/obj/structure/sign/poster/contraband/buzzfuzz{
+ pixel_x = -32
+ },
+/turf/open/indestructible/hotelwood,
+/area/xenoarch/gen)
"uh" = (
/obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/tile/bar{
@@ -7986,7 +8089,7 @@
dir = 8
},
/turf/open/floor/plasteel/dark,
-/area/xenoarch/gen)
+/area/xenoarch/arch)
"uG" = (
/obj/item/projectile/beam/fattening/cannon,
/turf/open/floor/mineral/calorite,
@@ -8025,6 +8128,14 @@
},
/turf/open/floor/plating,
/area/xenoarch/caloriteresearch_powered)
+"uS" = (
+/obj/effect/turf_decal/loading_area{
+ dir = 4;
+ icon_state = "borderfloor";
+ name = "drain"
+ },
+/turf/open/floor/plasteel,
+/area/xenoarch/gen)
"uT" = (
/obj/effect/turf_decal/tile/brown{
dir = 8
@@ -8084,8 +8195,14 @@
/turf/open/floor/plasteel,
/area/xenoarch/caloriteresearch_powered)
"vg" = (
-/obj/structure/table,
-/obj/item/reagent_containers/glass/beaker/waterbottle,
+/obj/machinery/light{
+ dir = 4;
+ light_color = "#e8eaff"
+ },
+/obj/item/chair/stool,
+/obj/structure/sign/poster/contraband/pwr_game{
+ pixel_x = 32
+ },
/turf/open/floor/plasteel/dark,
/area/xenoarch/gen)
"vh" = (
@@ -8101,6 +8218,12 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/dark,
/area/xenoarch/caloriteresearch_powered)
+"vi" = (
+/obj/structure/chair/beanbag/blue{
+ dir = 8
+ },
+/turf/open/indestructible/hotelwood,
+/area/xenoarch/gen)
"vk" = (
/obj/effect/turf_decal/stripes{
dir = 1
@@ -8173,6 +8296,11 @@
},
/turf/open/candyfloor,
/area/ruin/powered/candyland)
+"vF" = (
+/obj/structure/chair/bronze,
+/obj/item/toy/figure/ian,
+/turf/open/floor/carpet/green,
+/area/xenoarch/gen)
"vG" = (
/obj/machinery/conveyor_switch{
id = "calorietrash"
@@ -8183,6 +8311,15 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/xenoarch/caloriteresearch_powered)
+"vH" = (
+/obj/machinery/computer/security/telescreen/entertainment{
+ pixel_x = -31
+ },
+/obj/item/trash/boritos{
+ pixel_x = -6
+ },
+/turf/open/indestructible/hotelwood,
+/area/xenoarch/gen)
"vI" = (
/obj/structure/sink{
dir = 8;
@@ -8227,6 +8364,22 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
/area/xenoarch/caloriteresearch_powered)
+"vN" = (
+/obj/machinery/light/small{
+ dir = 4
+ },
+/obj/structure/chair/beanbag/gato{
+ dir = 8
+ },
+/obj/structure/sign/poster/official/nanomichi_ad{
+ pixel_x = 32
+ },
+/turf/open/indestructible/hotelwood,
+/area/xenoarch/gen)
+"vP" = (
+/obj/structure/mirror,
+/turf/closed/wall,
+/area/xenoarch/gen)
"vQ" = (
/obj/structure/trap/fattening,
/turf/open/floor/carpet/orange,
@@ -8252,6 +8405,15 @@
icon_state = "platingdmg1"
},
/area/xenoarch/caloriteresearch_powered)
+"vW" = (
+/obj/structure/sink{
+ pixel_y = 20
+ },
+/obj/structure/mirror{
+ pixel_y = 32
+ },
+/turf/open/floor/plasteel/dark,
+/area/xenoarch/gen)
"vX" = (
/obj/machinery/light{
dir = 1
@@ -8335,6 +8497,17 @@
},
/turf/closed/wall,
/area/xenoarch/caloriteresearch_powered)
+"wp" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
+ dir = 8
+ },
+/obj/effect/turf_decal/loading_area{
+ dir = 4;
+ icon_state = "drain";
+ name = "drain"
+ },
+/turf/open/floor/plasteel/dark,
+/area/xenoarch/gen)
"wt" = (
/obj/effect/turf_decal/tile/bar{
dir = 8
@@ -8356,6 +8529,12 @@
/mob/living/simple_animal/hostile/feed/chocolate_slime,
/turf/open/chocolateriver,
/area/ruin/powered/candyland)
+"ww" = (
+/obj/machinery/treadmill{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/xenoarch/gen)
"wx" = (
/obj/structure/tank_dispenser/oxygen,
/turf/open/floor/plasteel/dark,
@@ -8479,8 +8658,29 @@
/turf/open/floor/plasteel/rockvault,
/area/xenoarch/nothinghere)
"xa" = (
-/obj/machinery/space_heater,
-/turf/open/floor/wood,
+/obj/structure/fireplace,
+/obj/item/stack/sheet/mineral/wood,
+/obj/item/stack/sheet/mineral/wood,
+/obj/item/stack/sheet/mineral/wood,
+/obj/item/stack/sheet/mineral/wood,
+/obj/item/stack/sheet/mineral/wood,
+/obj/item/stack/sheet/mineral/wood,
+/obj/item/stack/sheet/mineral/wood,
+/obj/item/stack/sheet/mineral/wood,
+/obj/item/stack/sheet/mineral/wood,
+/obj/item/stack/sheet/mineral/wood,
+/obj/item/stack/sheet/mineral/wood,
+/obj/item/stack/sheet/mineral/wood,
+/obj/item/stack/sheet/mineral/wood,
+/obj/item/stack/sheet/mineral/wood,
+/obj/item/stack/sheet/mineral/wood,
+/obj/item/stack/sheet/mineral/wood,
+/obj/item/stack/sheet/mineral/wood,
+/obj/item/stack/sheet/mineral/wood,
+/obj/item/stack/sheet/mineral/wood,
+/obj/item/stack/sheet/mineral/wood,
+/obj/item/stack/sheet/mineral/wood,
+/turf/open/indestructible/hotelwood,
/area/xenoarch/gen)
"xb" = (
/obj/structure/fans/tiny/invisible,
@@ -8558,6 +8758,11 @@
dir = 1
},
/area/xenoarch/gen)
+"xp" = (
+/obj/structure/chair/bronze,
+/obj/item/pen/red,
+/turf/open/floor/carpet/green,
+/area/xenoarch/gen)
"xq" = (
/obj/effect/turf_decal/loading_area{
dir = 9;
@@ -8623,6 +8828,13 @@
/obj/structure/reagent_dispensers/cooking_oil,
/turf/open/floor/plating,
/area/xenoarch/gen)
+"xC" = (
+/obj/structure/chair/beanbag/purple{
+ dir = 4
+ },
+/obj/item/trash/popcorn,
+/turf/open/indestructible/hotelwood,
+/area/xenoarch/gen)
"xF" = (
/obj/structure/table,
/turf/open/floor/plating{
@@ -8658,6 +8870,30 @@
/obj/structure/trash_pile,
/turf/open/floor/plasteel,
/area/xenoarch/caloriteresearch_powered)
+"xM" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/tile/bar{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/bar{
+ dir = 4
+ },
+/obj/effect/turf_decal/loading_area{
+ dir = 2;
+ icon_state = "steel_decals10"
+ },
+/obj/effect/turf_decal/loading_area{
+ dir = 1;
+ icon_state = "borderfloor";
+ name = "drain"
+ },
+/obj/effect/turf_decal/tile/bar{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/xenoarch/gen)
"xQ" = (
/obj/structure/flora/grass/both,
/obj/structure/window/reinforced/fulltile,
@@ -8775,6 +9011,16 @@
},
/turf/open/floor/plasteel,
/area/xenoarch/caloriteresearch_powered)
+"yj" = (
+/obj/structure/weightmachine/weightlifter,
+/obj/effect/turf_decal/loading_area{
+ dir = 1;
+ icon_state = "borderfloorfull";
+ name = "drain"
+ },
+/obj/effect/turf_decal/bot_red,
+/turf/open/floor/plasteel,
+/area/xenoarch/gen)
"yk" = (
/obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/tile/bar{
@@ -8904,6 +9150,14 @@
},
/turf/open/floor/plating/lavaland_baseturf,
/area/xenoarch/caloriteresearch_powered)
+"yM" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/table,
+/obj/item/reagent_containers/glass/beaker/waterbottle/large,
+/turf/open/floor/plasteel/dark,
+/area/xenoarch/gen)
"yN" = (
/obj/structure/closet/secure_closet/personal,
/obj/effect/turf_decal/tile/bar{
@@ -8981,6 +9235,13 @@
icon_state = "platingdmg1"
},
/area/xenoarch/caloriteresearch_powered)
+"zb" = (
+/obj/item/paperplane{
+ pixel_x = 7;
+ pixel_y = -20
+ },
+/turf/open/floor/carpet/green,
+/area/xenoarch/gen)
"zc" = (
/obj/structure/lollipop,
/turf/open/candyfloor,
@@ -9064,6 +9325,25 @@
},
/turf/open/floor/plating,
/area/xenoarch/caloriteresearch_powered)
+"zt" = (
+/obj/effect/turf_decal/tile/bar{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/bar,
+/obj/structure/sign/poster/contraband/bountyhunters{
+ pixel_y = 32
+ },
+/obj/structure/chair/stool,
+/obj/effect/turf_decal/loading_area{
+ dir = 4;
+ icon_state = "borderfloor";
+ name = "drain"
+ },
+/obj/effect/turf_decal/tile/bar{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/xenoarch/gen)
"zu" = (
/obj/structure/fans/tiny/invisible,
/obj/structure/barricade/wooden,
@@ -9133,6 +9413,24 @@
/obj/structure/reagent_dispensers/water_cooler,
/turf/open/floor/plasteel,
/area/xenoarch/caloriteresearch_powered)
+"zR" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/tile/bar{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/bar{
+ dir = 4
+ },
+/obj/effect/turf_decal/loading_area{
+ dir = 1;
+ icon_state = "borderfloor";
+ name = "drain"
+ },
+/obj/effect/turf_decal/tile/bar,
+/turf/open/floor/plasteel,
+/area/xenoarch/gen)
"zS" = (
/obj/item/reagent_containers/food/snacks/store/cake/apple,
/turf/open/indestructible/chocolate,
@@ -9158,8 +9456,16 @@
/turf/open/floor/plating,
/area/lavaland/surface/outdoors)
"zY" = (
-/obj/structure/table,
-/obj/item/reagent_containers/rag/towel,
+/obj/machinery/light{
+ dir = 8
+ },
+/obj/item/trash/can{
+ pixel_x = 7;
+ pixel_y = 12
+ },
+/obj/structure/mirror{
+ pixel_x = -24
+ },
/turf/open/floor/plasteel/dark,
/area/xenoarch/gen)
"zZ" = (
@@ -9226,6 +9532,25 @@
/obj/structure/lattice,
/turf/open/floor/plating/lavaland_baseturf,
/area/xenoarch/caloriteresearch_unpowered)
+"Am" = (
+/obj/effect/turf_decal/loading_area{
+ dir = 1;
+ icon_state = "borderfloorcee";
+ name = "drain"
+ },
+/obj/structure/rack,
+/obj/item/dumbbell{
+ pixel_y = -3
+ },
+/obj/item/dumbbell{
+ pixel_y = 1
+ },
+/obj/item/dumbbell{
+ pixel_y = 5
+ },
+/obj/effect/turf_decal/bot_red,
+/turf/open/floor/plasteel,
+/area/xenoarch/gen)
"Aq" = (
/obj/structure/table,
/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko{
@@ -9248,6 +9573,29 @@
/obj/machinery/computer/operating,
/turf/open/floor/plating,
/area/xenoarch/caloriteresearch_powered)
+"Au" = (
+/obj/machinery/light/small{
+ dir = 4
+ },
+/obj/item/storage/belt/military/snack,
+/obj/structure/closet/secure_closet/personal/cabinet,
+/obj/structure/sign/poster/contraband/busty_backdoor_xeno_babes_6{
+ pixel_x = 32
+ },
+/obj/structure/sign/poster/contraband/lusty_xenomorph{
+ pixel_y = 32
+ },
+/obj/item/gun/ballistic/automatic/toy/pistol/haydee,
+/obj/item/toy/plush/slimeplushie,
+/obj/item/toy/plush/lizardplushie,
+/obj/item/toy/gun/m41,
+/obj/item/toy/fluff/frisbee_poly/red,
+/obj/item/toy/fluff/bone_poly/squeak,
+/obj/item/circuitboard/machine/vending/donksofttoyvendor,
+/obj/item/throwing_star/toy,
+/obj/item/throwing_star/toy,
+/turf/open/indestructible/hotelwood,
+/area/xenoarch/gen)
"Av" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -9262,8 +9610,34 @@
icon_state = "drain";
name = "drain"
},
+/obj/structure/rack/shelf,
+/obj/item/reagent_containers/glass/beaker/waterbottle{
+ pixel_x = -8
+ },
+/obj/item/reagent_containers/glass/beaker/waterbottle,
+/obj/item/reagent_containers/glass/beaker/waterbottle{
+ pixel_x = 8
+ },
+/obj/structure/sign/poster/official/nanomichi_ad{
+ pixel_y = -32
+ },
/turf/open/floor/plasteel/dark,
/area/xenoarch/gen)
+"AA" = (
+/obj/effect/turf_decal/tile/bar{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/loading_area{
+ dir = 2;
+ icon_state = "borderfloor";
+ name = "drain"
+ },
+/obj/effect/turf_decal/tile/bar{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/xenoarch/gen)
"AB" = (
/obj/structure/scale,
/obj/effect/turf_decal/box,
@@ -9274,12 +9648,17 @@
/turf/open/floor/plasteel,
/area/xenoarch/caloriteresearch_powered)
"AC" = (
-/obj/structure/table,
-/obj/item/surgicaldrill{
- pixel_y = 12;
- pixel_x = 12
+/obj/structure/weightmachine/weightlifter,
+/obj/effect/turf_decal/loading_area{
+ dir = 1;
+ icon_state = "borderfloorfull";
+ name = "drain"
},
-/turf/open/floor/plating,
+/obj/structure/sign/poster/contraband/lizard{
+ pixel_x = -32
+ },
+/obj/effect/turf_decal/bot_red,
+/turf/open/floor/plasteel,
/area/xenoarch/gen)
"AD" = (
/obj/effect/decal/cleanable/vomit/old,
@@ -9604,6 +9983,13 @@
/obj/structure/flora/redgrass/redg,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
+"BR" = (
+/obj/item/trash/can{
+ pixel_y = 8;
+ pixel_x = 12
+ },
+/turf/open/indestructible/hotelwood,
+/area/xenoarch/gen)
"BS" = (
/obj/structure/window/reinforced/fulltile,
/turf/open/floor/plating,
@@ -9749,8 +10135,10 @@
/turf/open/floor/plasteel/dark,
/area/xenoarch/caloriteresearch_powered)
"CH" = (
-/obj/structure/table,
-/turf/open/floor/plating,
+/obj/machinery/computer/security/telescreen/entertainment{
+ pixel_x = -31
+ },
+/turf/open/floor/plasteel/dark,
/area/xenoarch/gen)
"CI" = (
/obj/effect/decal/cleanable/dirt,
@@ -9876,6 +10264,9 @@
name = "drain"
},
/obj/structure/reagent_dispensers/water_cooler,
+/obj/structure/sign/poster/contraband/robust_softdrinks{
+ pixel_y = -32
+ },
/turf/open/floor/plasteel/dark,
/area/xenoarch/gen)
"De" = (
@@ -10040,7 +10431,7 @@
dir = 4
},
/turf/open/floor/plasteel/dark,
-/area/xenoarch/gen)
+/area/xenoarch/arch)
"DU" = (
/obj/effect/turf_decal/tile/brown{
dir = 8
@@ -10086,6 +10477,22 @@
/obj/item/book/manual/wiki/barman_recipes,
/turf/open/floor/mineral/basaltstone_floor,
/area/xenoarch/caloriteresearch_powered)
+"DZ" = (
+/obj/effect/turf_decal/loading_area{
+ dir = 8;
+ icon_state = "drain";
+ name = "drain"
+ },
+/obj/effect/turf_decal/loading_area{
+ dir = 4;
+ icon_state = "steel_decals"
+ },
+/obj/effect/turf_decal/loading_area{
+ dir = 4;
+ icon_state = "steel_decals_central4"
+ },
+/turf/open/floor/plasteel,
+/area/xenoarch/gen)
"Eb" = (
/obj/effect/turf_decal/stripes/line{
dir = 9
@@ -10531,9 +10938,9 @@
/turf/open/floor/plasteel,
/area/xenoarch/caloriteresearch_powered)
"FQ" = (
-/obj/structure/weightmachine/weightlifter,
-/obj/effect/turf_decal/box/red,
-/turf/open/floor/plasteel/dark,
+/obj/structure/table,
+/obj/item/reagent_containers/glass/beaker/waterbottle/large,
+/turf/open/floor/plasteel,
/area/xenoarch/gen)
"FT" = (
/obj/machinery/light/broken{
@@ -10571,11 +10978,18 @@
/turf/open/floor/plasteel/white,
/area/xenoarch/caloriteresearch_powered)
"Ge" = (
-/obj/item/restraints/handcuffs/cable{
- pixel_y = -10;
- pixel_x = 13
+/obj/structure/cable{
+ icon_state = "4-8"
},
-/turf/open/floor/plating,
+/obj/effect/turf_decal/loading_area{
+ dir = 1;
+ icon_state = "steel_grid";
+ name = "drain"
+ },
+/obj/effect/turf_decal/tile/bar{
+ dir = 2
+ },
+/turf/open/floor/plasteel,
/area/xenoarch/gen)
"Gf" = (
/obj/effect/turf_decal/loading_area,
@@ -10677,6 +11091,10 @@
},
/turf/open/floor/plating,
/area/xenoarch/caloriteresearch_powered)
+"GJ" = (
+/obj/structure/sign/warning/radiation,
+/turf/closed/wall,
+/area/xenoarch/gen)
"GP" = (
/obj/item/stack/ore/calorite,
/obj/machinery/conveyor{
@@ -10785,8 +11203,8 @@
/turf/open/floor/mineral/basaltstone_floor,
/area/xenoarch/caloriteresearch_powered)
"Hm" = (
-/obj/item/taperecorder/empty,
-/turf/open/floor/plating,
+/obj/structure/flora/junglebush,
+/turf/open/water/decorative,
/area/xenoarch/gen)
"Hn" = (
/obj/effect/turf_decal/stripes/white/line{
@@ -10851,6 +11269,16 @@
},
/turf/open/floor/plasteel/dark,
/area/xenoarch/caloriteresearch_powered)
+"HI" = (
+/obj/structure/weightmachine/stacklifter,
+/obj/effect/turf_decal/loading_area{
+ dir = 1;
+ icon_state = "borderfloorfull";
+ name = "drain"
+ },
+/obj/effect/turf_decal/bot_red,
+/turf/open/floor/plasteel,
+/area/xenoarch/gen)
"HJ" = (
/turf/closed/wall/r_wall,
/area/xenoarch/caloriteresearch_powered)
@@ -10881,7 +11309,7 @@
dir = 4
},
/turf/open/floor/plasteel/dark,
-/area/xenoarch/gen)
+/area/xenoarch/arch)
"HQ" = (
/obj/structure/table/wood,
/obj/machinery/light/small/broken{
@@ -11110,6 +11538,12 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
/area/xenoarch/caloriteresearch_powered)
+"IV" = (
+/obj/structure/chair/sofa/right/old{
+ dir = 1
+ },
+/turf/open/floor/carpet/green,
+/area/xenoarch/gen)
"IX" = (
/obj/machinery/door/airlock/maintenance_hatch,
/turf/open/floor/plating,
@@ -11250,6 +11684,26 @@
},
/turf/open/floor/plating,
/area/xenoarch/caloriteresearch_powered)
+"Jz" = (
+/obj/effect/turf_decal/tile/bar{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/bar{
+ dir = 8
+ },
+/obj/structure/sign/poster/contraband/c20r{
+ pixel_y = 32
+ },
+/obj/effect/turf_decal/loading_area{
+ dir = 8;
+ icon_state = "borderfloor";
+ name = "drain"
+ },
+/obj/effect/turf_decal/tile/bar{
+ dir = 2
+ },
+/turf/open/floor/plasteel,
+/area/xenoarch/gen)
"JB" = (
/obj/effect/turf_decal/stripes,
/obj/effect/decal/cleanable/glass,
@@ -11264,6 +11718,18 @@
/obj/item/hand_labeler,
/turf/open/floor/plasteel,
/area/xenoarch/caloriteresearch_powered)
+"JD" = (
+/obj/structure/table,
+/obj/effect/turf_decal/loading_area{
+ dir = 1;
+ icon_state = "borderfloorcee";
+ name = "drain"
+ },
+/obj/item/reagent_containers/glass/beaker/waterbottle/large{
+ pixel_y = 6
+ },
+/turf/open/floor/plasteel,
+/area/xenoarch/gen)
"JF" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/engine,
@@ -11445,6 +11911,29 @@
/obj/item/pen,
/turf/open/floor/plating,
/area/xenoarch/caloriteresearch_powered)
+"Kl" = (
+/obj/structure/table,
+/obj/effect/turf_decal/loading_area{
+ dir = 1;
+ icon_state = "borderfloorcee";
+ name = "drain"
+ },
+/obj/item/reagent_containers/rag/towel,
+/turf/open/floor/plasteel,
+/area/xenoarch/gen)
+"Km" = (
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/structure/sign/poster/contraband/revolver{
+ pixel_y = 32
+ },
+/obj/item/dumbbell{
+ pixel_y = -12;
+ pixel_x = -16
+ },
+/turf/open/floor/plasteel/dark,
+/area/xenoarch/gen)
"Kn" = (
/obj/effect/turf_decal/tile/brown{
dir = 1
@@ -11520,6 +12009,12 @@
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/plating,
/area/xenoarch/caloriteresearch_powered)
+"KA" = (
+/obj/structure/chair/sofa/left/old{
+ dir = 8
+ },
+/turf/open/floor/carpet/green,
+/area/xenoarch/gen)
"KC" = (
/obj/effect/turf_decal/box,
/obj/structure/mecha_wreckage/ripley/firefighter,
@@ -11565,6 +12060,15 @@
/obj/item/taperecorder,
/turf/open/floor/plasteel/dark,
/area/xenoarch/caloriteresearch_powered)
+"KO" = (
+/obj/structure/chair/sofa/right/old{
+ dir = 8
+ },
+/obj/item/reagent_containers/food/drinks/bigbottle/cola{
+ pixel_x = -3
+ },
+/turf/open/floor/carpet/green,
+/area/xenoarch/gen)
"KP" = (
/obj/effect/turf_decal/tile/bar{
dir = 1
@@ -11601,15 +12105,34 @@
},
/area/xenoarch/caloriteresearch_powered)
"KW" = (
-/obj/structure/chair/office{
+/obj/effect/turf_decal/tile/bar{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/bar{
dir = 8
},
-/turf/open/floor/plating,
+/obj/effect/turf_decal/loading_area{
+ dir = 8;
+ icon_state = "borderfloor";
+ name = "drain"
+ },
+/obj/effect/turf_decal/tile/bar{
+ dir = 2
+ },
+/turf/open/floor/plasteel,
/area/xenoarch/gen)
"KX" = (
/obj/item/reagent_containers/food/snacks/candy_corn,
/turf/open/indestructible/chocolate,
/area/ruin/powered/candyland)
+"KZ" = (
+/obj/machinery/airalarm{
+ name = "Theatre air alarm";
+ pixel_y = 24
+ },
+/obj/structure/chair/stool,
+/turf/open/floor/plasteel/dark,
+/area/xenoarch/gen)
"La" = (
/obj/structure/fans/tiny/invisible,
/turf/open/floor/plating{
@@ -11794,12 +12317,13 @@
/turf/open/floor/engine,
/area/xenoarch/caloriteresearch_powered)
"LV" = (
-/obj/item/flashlight/seclite{
- pixel_y = 8;
- pixel_x = -12
+/obj/machinery/newscaster{
+ pixel_y = 32
},
-/turf/open/floor/plating,
-/area/xenoarch/gen)
+/turf/open/floor/plasteel/dark/side{
+ dir = 1
+ },
+/area/xenoarch/arch)
"LW" = (
/obj/structure/bed/double,
/obj/item/bedsheet/double_blue,
@@ -11942,6 +12466,9 @@
/obj/structure/flora/rock,
/turf/closed/mineral/random/volcanic/strangerock,
/area/lavaland/surface/outdoors)
+"MB" = (
+/turf/open/floor/plasteel/dark,
+/area/xenoarch/arch)
"MC" = (
/obj/item/radio/off,
/turf/open/floor/circuit,
@@ -12000,6 +12527,16 @@
/obj/structure/trash_pile,
/turf/open/floor/plating,
/area/xenoarch/caloriteresearch_powered)
+"MO" = (
+/obj/item/lighter{
+ pixel_x = -9;
+ pixel_y = 4
+ },
+/obj/machinery/computer/security/telescreen/entertainment{
+ pixel_y = 32
+ },
+/turf/open/indestructible/hotelwood,
+/area/xenoarch/gen)
"MP" = (
/obj/structure/trap/fattening,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
@@ -12148,6 +12685,13 @@
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
+"Nv" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/chair/stool,
+/turf/open/floor/plasteel/dark,
+/area/xenoarch/gen)
"Ny" = (
/turf/closed/wall/rust,
/area/xenoarch/caloriteresearch_powered)
@@ -12276,6 +12820,10 @@
/obj/structure/fans/tiny/invisible,
/turf/open/lava/smooth/lava_land_surface,
/area/xenoarch/caloriteresearch_powered)
+"Og" = (
+/obj/structure/bookcase/random,
+/turf/open/indestructible/hotelwood,
+/area/xenoarch/gen)
"Oi" = (
/obj/structure/table,
/obj/effect/turf_decal/loading_area{
@@ -12525,6 +13073,16 @@
/obj/structure/scale,
/turf/open/floor/mineral/calorite,
/area/xenoarch/caloriteresearch_powered)
+"Pj" = (
+/obj/structure/table/wood/poker,
+/obj/item/pen,
+/obj/item/pen,
+/obj/item/pen,
+/obj/item/pen,
+/obj/item/pen,
+/obj/item/pen,
+/turf/open/floor/carpet/green,
+/area/xenoarch/gen)
"Pn" = (
/obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/tile/bar{
@@ -12593,12 +13151,15 @@
/turf/open/candyfloor,
/area/ruin/powered/candyland)
"Py" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/effect/turf_decal/loading_area{
+ dir = 1;
+ icon_state = "steel_decals5"
},
-/obj/structure/scale,
-/obj/effect/turf_decal/bot_red,
-/turf/open/floor/plasteel/dark,
+/obj/effect/turf_decal/loading_area{
+ icon_state = "drain";
+ name = "drain"
+ },
+/turf/open/floor/plasteel,
/area/xenoarch/gen)
"Pz" = (
/obj/structure/disposalpipe/trunk{
@@ -12624,6 +13185,25 @@
/obj/item/clothing/accessory/armband/medblue,
/turf/open/floor/wood,
/area/xenoarch/caloriteresearch_powered)
+"PD" = (
+/obj/effect/turf_decal/tile/bar{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/loading_area{
+ dir = 4;
+ icon_state = "steel_decals10"
+ },
+/obj/effect/turf_decal/loading_area{
+ dir = 2;
+ icon_state = "borderfloor";
+ name = "drain"
+ },
+/obj/effect/turf_decal/tile/bar{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/xenoarch/gen)
"PF" = (
/obj/structure/table,
/obj/item/trash/tray,
@@ -12706,6 +13286,13 @@
},
/turf/open/floor/plasteel/dark,
/area/xenoarch/caloriteresearch_powered)
+"Qh" = (
+/obj/structure/chair/sofa/right/old{
+ dir = 4
+ },
+/obj/item/toy/katana,
+/turf/open/floor/carpet/green,
+/area/xenoarch/gen)
"Qj" = (
/obj/machinery/processor,
/turf/open/floor/plasteel/freezer,
@@ -12797,15 +13384,8 @@
/turf/open/floor/plasteel/dark,
/area/xenoarch/caloriteresearch_powered)
"QL" = (
-/obj/machinery/newscaster{
- pixel_y = 32
- },
-/obj/effect/turf_decal/loading_area{
- dir = 1;
- icon_state = "drain";
- name = "drain"
- },
-/turf/open/floor/plasteel/dark,
+/obj/structure/flora/junglebush/c,
+/turf/open/water/decorative,
/area/xenoarch/gen)
"QM" = (
/obj/effect/turf_decal/stripes{
@@ -12924,6 +13504,19 @@
},
/turf/open/floor/plating,
/area/xenoarch/caloriteresearch_unpowered)
+"Rl" = (
+/obj/structure/weightmachine/weightlifter,
+/obj/effect/turf_decal/loading_area{
+ dir = 1;
+ icon_state = "borderfloorfull";
+ name = "drain"
+ },
+/obj/structure/sign/poster/contraband/lusty_xenomorph{
+ pixel_x = -32
+ },
+/obj/effect/turf_decal/bot_red,
+/turf/open/floor/plasteel,
+/area/xenoarch/gen)
"Rm" = (
/obj/structure/disposalpipe/trunk{
dir = 1
@@ -12937,6 +13530,12 @@
},
/turf/open/floor/plasteel,
/area/xenoarch/caloriteresearch_powered)
+"Ro" = (
+/obj/structure/chair/sofa/left/old{
+ dir = 4
+ },
+/turf/open/floor/carpet/green,
+/area/xenoarch/gen)
"Rp" = (
/obj/item/reagent_containers/food/snacks/bluecherrycupcake,
/turf/open/indestructible/bubblegum,
@@ -12945,6 +13544,29 @@
/obj/structure/window/plastitanium,
/turf/open/floor/plating,
/area/xenoarch/caloriteresearch_unpowered)
+"Rs" = (
+/obj/structure/table/wood/poker,
+/obj/item/flashlight/lamp{
+ pixel_x = -5;
+ pixel_y = 12
+ },
+/obj/item/toy/figure/wizard{
+ pixel_y = 6;
+ pixel_x = 16
+ },
+/turf/open/floor/carpet/green,
+/area/xenoarch/gen)
+"Ru" = (
+/obj/effect/turf_decal/loading_area{
+ icon_state = "drain";
+ name = "drain"
+ },
+/obj/structure/table,
+/obj/structure/sign/poster/official/mothdelamination{
+ pixel_y = -32
+ },
+/turf/open/floor/plasteel/dark,
+/area/xenoarch/gen)
"Rx" = (
/obj/structure/girder,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
@@ -12995,6 +13617,13 @@
/obj/machinery/mineral/processing_unit_console,
/turf/closed/wall,
/area/xenoarch/caloriteresearch_powered)
+"RJ" = (
+/obj/structure/sign/poster/contraband/gl{
+ pixel_y = 32
+ },
+/obj/structure/chair/stool,
+/turf/open/floor/plasteel/dark,
+/area/xenoarch/gen)
"RL" = (
/obj/structure/closet/crate{
icon_state = "crateopen"
@@ -13007,6 +13636,12 @@
/obj/effect/decal/cleanable/ash,
/turf/open/floor/plasteel/dark,
/area/xenoarch/caloriteresearch_powered)
+"RQ" = (
+/obj/structure/chair/sofa/left/old{
+ dir = 1
+ },
+/turf/open/floor/carpet/green,
+/area/xenoarch/gen)
"RR" = (
/obj/structure/chair/bench/right,
/obj/effect/decal/cleanable/dirt,
@@ -13333,10 +13968,12 @@
/area/lavaland/surface/outdoors)
"Tb" = (
/obj/structure/table,
-/obj/item/scalpel{
- pixel_y = 7
+/obj/effect/turf_decal/loading_area{
+ dir = 1;
+ icon_state = "borderfloorcee";
+ name = "drain"
},
-/turf/open/floor/plating,
+/turf/open/floor/plasteel,
/area/xenoarch/gen)
"Te" = (
/obj/structure/table/wood,
@@ -13643,6 +14280,15 @@
},
/turf/open/floor/carpet,
/area/xenoarch/gen)
+"Ud" = (
+/obj/machinery/newscaster{
+ pixel_y = 32
+ },
+/obj/machinery/treadmill{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/xenoarch/gen)
"Ug" = (
/obj/effect/turf_decal{
dir = 4
@@ -13721,6 +14367,25 @@
/mob/living/simple_animal/hostile/feed/chocolate_slime,
/turf/open/candyfloor,
/area/ruin/powered/candyland)
+"Ux" = (
+/obj/structure/table/wood/poker,
+/obj/item/dice{
+ pixel_y = 4;
+ pixel_x = 9
+ },
+/obj/item/toy/figure/ninja{
+ pixel_x = -7;
+ pixel_y = -8
+ },
+/turf/open/floor/carpet/green,
+/area/xenoarch/gen)
+"Uy" = (
+/obj/machinery/door/airlock/maintenance{
+ dir = 4;
+ name = "The Atomic Banzai"
+ },
+/turf/open/floor/plating,
+/area/xenoarch/gen)
"UA" = (
/obj/structure/chair/stool,
/turf/open/floor/plasteel,
@@ -13860,6 +14525,12 @@
/obj/structure/rack/shelf,
/turf/open/floor/plasteel/dark,
/area/xenoarch/caloriteresearch_powered)
+"Va" = (
+/obj/structure/sign/poster/contraband/punch_shit{
+ pixel_x = 32
+ },
+/turf/open/floor/plasteel/dark,
+/area/xenoarch/gen)
"Ve" = (
/obj/structure/table,
/obj/machinery/light/small/broken{
@@ -14086,6 +14757,13 @@
/obj/effect/turf_decal/candy/bluewhite1,
/turf/open/candyfloor,
/area/ruin/powered/candyland)
+"Wg" = (
+/obj/item/trash/can{
+ pixel_x = -3;
+ pixel_y = -9
+ },
+/turf/open/indestructible/hotelwood,
+/area/xenoarch/gen)
"Wh" = (
/obj/item/wallframe/apc,
/turf/open/floor/plating{
@@ -14541,6 +15219,11 @@
icon_state = "platingdmg1"
},
/area/xenoarch/caloriteresearch_powered)
+"Yb" = (
+/obj/structure/table,
+/obj/item/reagent_containers/rag/towel,
+/turf/open/floor/plasteel,
+/area/xenoarch/gen)
"Yd" = (
/obj/effect/turf_decal/tile/bar,
/turf/open/floor/plasteel,
@@ -14552,9 +15235,10 @@
/turf/open/floor/plasteel,
/area/xenoarch/caloriteresearch_powered)
"Yf" = (
-/obj/structure/weightmachine/stacklifter,
-/obj/effect/turf_decal/box/red,
-/turf/open/floor/plasteel/dark,
+/obj/effect/turf_decal/loading_area{
+ icon_state = "steel_decals_central6"
+ },
+/turf/open/floor/plasteel,
/area/xenoarch/gen)
"Yg" = (
/obj/effect/spawner/structure/window/plasma/reinforced,
@@ -14717,6 +15401,10 @@
/obj/structure/trash_pile,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/xenoarch/caloriteresearch_unpowered)
+"Zf" = (
+/obj/item/trash/energybar,
+/turf/open/floor/plasteel/dark,
+/area/xenoarch/gen)
"Zg" = (
/obj/machinery/conveyor{
dir = 5;
@@ -14783,6 +15471,14 @@
},
/turf/open/floor/mineral/basaltstone_floor,
/area/xenoarch/caloriteresearch_powered)
+"Zv" = (
+/obj/effect/turf_decal/loading_area{
+ icon_state = "drain";
+ name = "drain"
+ },
+/obj/machinery/vending/gato,
+/turf/open/floor/plasteel/dark,
+/area/xenoarch/gen)
"Zw" = (
/obj/item/stack/cable_coil/cut/red,
/turf/open/floor/plating{
@@ -14862,6 +15558,13 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
/area/xenoarch/caloriteresearch_powered)
+"ZG" = (
+/obj/effect/turf_decal/loading_area{
+ dir = 1;
+ icon_state = "steel_decals5"
+ },
+/turf/open/floor/plasteel,
+/area/xenoarch/gen)
"ZH" = (
/turf/open/floor/carpet/orange,
/area/lavaland/surface/outdoors)
@@ -14881,8 +15584,18 @@
/turf/open/floor/plasteel/grimy,
/area/xenoarch/nothinghere)
"ZM" = (
-/obj/structure/falsewall,
-/turf/open/floor/plating,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/effect/turf_decal/loading_area{
+ dir = 4;
+ icon_state = "steel_grid";
+ name = "drain"
+ },
+/obj/effect/turf_decal/tile/bar{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
/area/xenoarch/gen)
"ZP" = (
/obj/structure/chair/stool/bar,
@@ -15639,10 +16352,10 @@ ab
ab
Sy
by
+ZG
fK
fK
-fK
-fK
+Yf
Sy
bS
Sy
@@ -15896,7 +16609,7 @@ ab
ab
Sy
aj
-fK
+Py
aK
aX
bo
@@ -16153,7 +16866,7 @@ ab
ab
Sy
by
-fK
+Py
IL
dO
ni
@@ -16410,9 +17123,9 @@ Sy
Sy
Sy
am
-fK
+Py
aN
-dO
+wp
aN
Sy
bS
@@ -16667,7 +17380,7 @@ gD
gD
Sy
aq
-fK
+ZG
ad
cC
dI
@@ -16924,7 +17637,7 @@ hJ
hJ
nG
fK
-fK
+Yf
aM
fK
aO
@@ -17182,8 +17895,8 @@ bu
Sy
at
aE
-aM
-fK
+rV
+uS
bs
Sy
bX
@@ -17431,7 +18144,7 @@ ab
ab
ab
ab
-ab
+Sy
Sy
Sy
Sy
@@ -17688,17 +18401,17 @@ ab
ab
ab
ab
-ab
Sy
+KZ
AC
CH
-jN
-Sy
-bA
+Rl
+CH
+HI
zY
-aR
-fP
-aA
+zR
+AA
+Nv
Dd
ar
cj
@@ -17945,18 +18658,18 @@ ab
ab
ab
ab
-ab
Sy
+au
+JD
+el
Tb
-jN
-jN
-Sy
-QL
-FQ
-aR
-fP
-bt
-Ax
+el
+Kl
+el
+zR
+AA
+aA
+Zv
ar
ck
cI
@@ -18202,16 +18915,16 @@ ab
ab
ab
ab
-ab
Sy
-jN
-Ge
-jN
-ZM
+vW
+yj
+el
sN
el
-aR
-fP
+HI
+el
+zR
+AA
aA
Ax
ar
@@ -18459,17 +19172,17 @@ ab
ab
ab
ab
-ab
Sy
-LV
+Jz
KW
-Hm
-Sy
-aP
-Yf
-aR
-fP
-Py
+KW
+KW
+KW
+KW
+KW
+Ge
+AA
+aA
bC
ar
ar
@@ -18716,15 +19429,15 @@ ab
ab
ab
ab
-ab
-Sy
-Sy
-Sy
-Sy
Sy
+zt
av
-el
-aR
+av
+av
+av
+av
+av
+ZM
fP
aA
bD
@@ -18973,18 +19686,18 @@ ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
Sy
+RJ
+Am
+el
aP
-FQ
+el
+aP
+el
aR
fP
-bt
-Ax
+Nv
+Ru
ar
ck
cN
@@ -19230,17 +19943,17 @@ ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
Sy
-qJ
+Km
+el
+el
+el
+Zf
+Va
vg
aR
fP
-aA
+yM
Jd
ar
cn
@@ -19487,16 +20200,16 @@ ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
Sy
-dv
-dv
-aR
-fP
+DZ
+bt
+bt
+DZ
+vP
+Sy
+Sy
+xM
+PD
cP
dv
ar
@@ -19744,11 +20457,11 @@ ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
+Sy
+Ud
+FQ
+Yb
+ww
fL
EJ
aS
@@ -20001,13 +20714,13 @@ ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
+Sy
+qJ
+ei
+ei
+qJ
fL
-Kg
+LV
aU
bV
bj
@@ -20258,11 +20971,11 @@ ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
+Sy
+Hm
+bA
+QL
+Hm
fL
aF
aV
@@ -20515,15 +21228,15 @@ ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
+Sy
+Sy
+Sy
+Sy
+Sy
fL
aG
qI
-Sy
+fL
bf
ax
rL
@@ -20780,9 +21493,9 @@ ab
fL
Kg
qI
-Sy
+fL
bg
-el
+MB
uF
fL
nj
@@ -21037,9 +21750,9 @@ ab
fL
aI
qI
-Sy
+fL
bh
-el
+MB
bG
fL
cp
@@ -21551,10 +22264,10 @@ ab
fL
aG
qI
-Sy
-dv
-Sy
-Sy
+fL
+be
+fL
+fL
fL
fL
fL
@@ -25681,18 +26394,18 @@ mj
iv
Sy
fx
-fK
+tU
jN
hp
mM
mv
+jN
Sy
kw
Sy
Sy
Sy
Sy
-Sy
FZ
qv
FZ
@@ -25937,14 +26650,14 @@ eX
lf
gL
Sy
-Sy
-hF
+GJ
+Uy
+Sy
Sy
Sy
Sy
Sy
Sy
-jN
jN
jN
jN
@@ -26195,14 +26908,14 @@ eX
gL
Sy
mw
-mA
-mA
-mA
-mA
+mP
+vH
+sH
+ug
mO
+Og
Sy
jN
-jN
Fe
jN
jN
@@ -26453,17 +27166,17 @@ Vu
Sy
mx
mA
+Ro
+Qh
mA
-mJ
-mA
-mJ
+xC
+Og
Sy
jN
jN
jN
jN
jN
-jN
FZ
FL
Ed
@@ -26709,14 +27422,14 @@ Sy
Sy
Sy
xa
-mA
-mA
-mJ
-mA
-mJ
+xp
+Pj
+Rs
+RQ
+mP
+Og
Sy
-jN
-jN
+Mt
jN
jN
kw
@@ -26965,14 +27678,14 @@ lQ
lQ
lQ
Sy
-mA
-mA
-mA
+rZ
+vF
+Ux
mJ
-mA
+IV
mP
+Og
Sy
-Mt
jN
jN
jN
@@ -27222,13 +27935,13 @@ lQ
lQ
lQ
Sy
-dv
-dv
-dv
-Sy
-Sy
-Sy
-Sy
+MO
+mA
+KO
+KA
+zb
+mP
+Og
Sy
jN
jN
@@ -27478,14 +28191,14 @@ lQ
lQ
lQ
lQ
-lQ
-lQ
-lQ
-lQ
-lQ
-lQ
-lQ
-ab
+Sy
+Au
+mP
+Wg
+BR
+vi
+vN
+Og
Sy
Sy
Sy
@@ -27735,15 +28448,15 @@ lQ
lQ
lQ
lQ
-lQ
-lQ
-lQ
-lQ
-lQ
-lQ
-lQ
-ab
-ab
+Sy
+Sy
+dv
+dv
+dv
+dv
+Sy
+Sy
+Sy
ab
ab
ab
diff --git a/code/__DEFINES/voreconstants.dm b/code/__DEFINES/voreconstants.dm
index 372c5b776c..93253a2aec 100644
--- a/code/__DEFINES/voreconstants.dm
+++ b/code/__DEFINES/voreconstants.dm
@@ -6,6 +6,7 @@
#define DM_DRAGON "Dragon"
#define DM_ABSORB "Absorb"
#define DM_UNABSORB "Un-absorb"
+#define DM_FATTEN "Fatten" // GS13 Edit - Added Fatten mode
#define DIGESTABLE (1<<0)
#define DEVOURABLE (1<<1)
diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm
index b7d4cadfaa..8f5f69ab35 100644
--- a/code/_globalvars/lists/flavor_misc.dm
+++ b/code/_globalvars/lists/flavor_misc.dm
@@ -135,6 +135,10 @@ GLOBAL_LIST_INIT(ai_core_display_screens, list(
"Girl-Malf",
"Database",
"Dorf",
+ //GS13 CONTENT START
+ "Fat",
+ "Fat hair",
+ //GS13 CONTENT END
"Firewall",
"Fuzzy",
"Gentoo",
diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm
index 7d81aec281..934842c05e 100644
--- a/code/controllers/subsystem/vote.dm
+++ b/code/controllers/subsystem/vote.dm
@@ -253,7 +253,7 @@ SUBSYSTEM_DEF(vote)
calculate_highest_median(vote_title_text)
var/list/winners = list()
if(mode == "transfer")
- var/amount_required = 1 + transfer_votes_done
+ var/amount_required = 0 //gs13 tweaked from 1 to 0
transfer_votes_done = 0 //gs13 tweaked from 1 to 0 (also removed it incrementing with each vote)
text += "\nExtending requires at least [amount_required] votes to win."
if(choices[VOTE_CONTINUE] < amount_required || choices[VOTE_TRANSFER] >= choices[VOTE_CONTINUE])
diff --git a/code/datums/traits/good.dm b/code/datums/traits/good.dm
index e0793e952a..602c2abfbb 100644
--- a/code/datums/traits/good.dm
+++ b/code/datums/traits/good.dm
@@ -172,7 +172,7 @@
/datum/quirk/voracious
name = "Voracious"
- desc = "Nothing gets between you and your food. You eat twice as fast as everyone else!"
+ desc = "Nothing gets between you and your food. You eat and recover from stuffing twice as fast, while getting less full!" //GS13 Edit - Changed description
value = 1
mob_trait = TRAIT_VORACIOUS
gain_text = "You feel HONGRY."
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index a7113c1a06..5f2875df34 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -1862,6 +1862,8 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
var/aim_for_groin = user.zone_selected == "groin"
var/target_aiming_for_groin = target.zone_selected == "groin"
+ var/opposite_dir = user.dir == DIRFLIP(target.dir) //GS13 edit, slap gut
+
if(target.check_martial_melee_block()) //END EDIT
target.visible_message("[target] blocks [user]'s disarm attempt!", target = user, \
target_message = "[target] blocks your disarm attempt!")
@@ -1883,25 +1885,51 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
if (!HAS_TRAIT(target, TRAIT_PERMABONER))
stop_wagging_tail(target)
return FALSE
- else if(aim_for_groin && (target == user || target.lying || same_dir) && (target_on_help || target_restrained || target_aiming_for_groin))
- if(target.client?.prefs.cit_toggles & NO_ASS_SLAP)
- to_chat(user,"A force stays your hand, preventing you from slapping \the [target]'s ass!")
- return FALSE
- if(!user.UseStaminaBuffer(3, warn = TRUE))
- return FALSE
- user.do_attack_animation(target, ATTACK_EFFECT_ASS_SLAP)
- target.adjust_arousal(20,"masochism", maso = TRUE)
- if (ishuman(target) && HAS_TRAIT(target, TRAIT_MASO) && target.has_dna() && prob(10))
- target.mob_climax(forced_climax=TRUE, cause = "masochism")
- if (!HAS_TRAIT(target, TRAIT_PERMABONER))
- stop_wagging_tail(target)
- playsound(target.loc, 'sound/weapons/slap.ogg', 50, 1, -1)
- target.visible_message(\
- "\The [user] slaps [user == target ? "[user.p_their()] own" : "\the [target]'s"] ass!",\
- "[user] slaps your ass! ",\
- "You hear a slap.", target = user, target_message = "You slap [user == target ? "your own" : "\the [target]'s"] ass! ")
+ //GS13 edit - checks for opposite_dir in else if, and then again to determine whether it's gut or ass slap.
+ else if(aim_for_groin && (target == user || target.lying || same_dir || opposite_dir) && (target_on_help || target_restrained || target_aiming_for_groin))
+ if(!opposite_dir)
+ if(target.client?.prefs.cit_toggles & NO_ASS_SLAP)
+ to_chat(user,"A force stays your hand, preventing you from slapping \the [target]'s ass!")
+ return FALSE
+ if(!user.UseStaminaBuffer(3, warn = TRUE))
+ return FALSE
+ user.do_attack_animation(target, ATTACK_EFFECT_ASS_SLAP)
+ target.adjust_arousal(20,"masochism", maso = TRUE)
+ if (ishuman(target) && HAS_TRAIT(target, TRAIT_MASO) && target.has_dna() && prob(10))
+ target.mob_climax(forced_climax=TRUE, cause = "masochism")
+ if (!HAS_TRAIT(target, TRAIT_PERMABONER))
+ stop_wagging_tail(target)
+ playsound(target.loc, 'sound/weapons/slap.ogg', 50, 1, -1)
+ target.visible_message(\
+ "\The [user] slaps [user == target ? "[user.p_their()] own" : "\the [target]'s"] ass!",\
+ "[user] slaps your ass! ",\
+ "You hear a slap.", target = user, target_message = "You slap [user == target ? "your own" : "\the [target]'s"] ass! ")
- return FALSE
+ return FALSE
+
+
+ else
+ if(target.client?.prefs.cit_toggles & NO_ASS_SLAP)
+ to_chat(user,"A force stays your hand, preventing you from slapping \the [target]'s gut!")
+ return FALSE
+ if(!user.UseStaminaBuffer(3, warn = TRUE))
+ return FALSE
+ user.do_attack_animation(target, ATTACK_EFFECT_ASS_SLAP)
+ target.adjust_arousal(20,"masochism", maso = TRUE)
+ if (ishuman(target) && HAS_TRAIT(target, TRAIT_MASO) && target.has_dna() && prob(10))
+ target.mob_climax(forced_climax=TRUE, cause = "masochism")
+ if (!HAS_TRAIT(target, TRAIT_PERMABONER))
+ stop_wagging_tail(target)
+ playsound(target.loc, 'sound/weapons/slap.ogg', 50, 1, -1)
+ target.visible_message(\
+ "\The [user] slaps [user == target ? "[user.p_their()] own" : "\the [target]'s"] gut!",\
+ "[user] slaps your gut! ",\
+ "You hear a slap.", target = user, target_message = "You slap [user == target ? "your own" : "\the [target]'s"] gut! ")
+ to_chat(target, "The pressure on your stomach causes you to belch!")
+ target.emote(pick("belch","burp"))
+
+ return FALSE
+ //end of GS13 edit
else
user.do_attack_animation(target, ATTACK_EFFECT_DISARM)
diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm
index 69ac3ef5ee..bd9a87687a 100644
--- a/code/modules/vending/clothesmate.dm
+++ b/code/modules/vending/clothesmate.dm
@@ -8,6 +8,7 @@
products = list(/obj/item/clothing/head/that = 4,
/obj/item/clothing/head/fedora = 3,
//GS13 EDIT START
+ /obj/item/clothing/under/color/grey = 20,
/obj/item/clothing/suit/jacket/letterman_gato = 5,
//GS13 EDIT END
/obj/item/clothing/head/beret = 3,
diff --git a/code/modules/vore/eating/belly_obj.dm b/code/modules/vore/eating/belly_obj.dm
index ba698b2eb4..9abd76a8b1 100644
--- a/code/modules/vore/eating/belly_obj.dm
+++ b/code/modules/vore/eating/belly_obj.dm
@@ -43,7 +43,7 @@
var/wet_loop = TRUE // Does this belly have a slimy internal loop?
//I don't think we've ever altered these lists. making them static until someone actually overrides them somewhere.
- var/tmp/static/list/digest_modes = list(DM_HOLD,DM_DIGEST,DM_HEAL,DM_NOISY,DM_ABSORB,DM_UNABSORB) // Possible digest modes
+ var/tmp/static/list/digest_modes = list(DM_HOLD,DM_DIGEST,DM_HEAL,DM_NOISY,DM_ABSORB,DM_UNABSORB,DM_FATTEN) // GS13 Edit- Added DM_FATTEN
var/tmp/mob/living/owner // The mob whose belly this is.
var/tmp/digest_mode = DM_HOLD // Current mode the belly is set to from digest_modes (+transform_modes if human)
diff --git a/icons/mob/AI.dmi b/icons/mob/AI.dmi
index 279a3e76ef..11f0a4488e 100644
Binary files a/icons/mob/AI.dmi and b/icons/mob/AI.dmi differ
diff --git a/tgstation.dme b/tgstation.dme
index 29796f6586..982f5ba153 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -4013,6 +4013,7 @@
#include "GainStation13\code\modules\cargo\packs.dm"
#include "GainStation13\code\modules\client\border_control.dm"
#include "GainStation13\code\modules\client\loadout\head.dm"
+#include "GainStation13\code\modules\client\loadout\uniform.dm"
#include "GainStation13\code\modules\client\preferences\preferences.dm"
#include "GainStation13\code\modules\clothing\under\jobs\modular_items.dm"
#include "GainStation13\code\modules\events\vent_clog.dm\vent_clog.dm"
@@ -4075,6 +4076,7 @@
#include "GainStation13\code\modules\vehicles\grocery_cart_scooter_unmortorized.dm"
#include "GainStation13\code\modules\vending\gatocola.dm"
#include "GainStation13\code\modules\vending\mealdor.dm"
+#include "GainStation13\code\modules\vore\fatten_vore.dm"
#include "GainStation13\code\modules\weapons\grenades.dm"
#include "GainStation13\code\obj\items\bluespace_belt.dm"
#include "GainStation13\code\obj\items\circuits.dm"