From 6b542e59d2b609463740c84f89aab156de4188c9 Mon Sep 17 00:00:00 2001 From: TheGreatKitsune Date: Thu, 4 Aug 2022 15:04:34 -0500 Subject: [PATCH 01/75] Add reforming --- code/modules/vore/eating/belly_obj_vr.dm | 60 ++++++++++++++-- code/modules/vore/eating/vorepanel_vr.dm | 69 +++++++++++++++++++ .../modules/mob/dead/observer/observer.dm | 7 ++ .../modules/mob/living/carbon/brain/MMI.dm | 7 ++ vorestation.dme | 2 + 5 files changed, 141 insertions(+), 4 deletions(-) create mode 100644 modular_chomp/code/modules/mob/dead/observer/observer.dm create mode 100644 modular_chomp/code/modules/mob/living/carbon/brain/MMI.dm diff --git a/code/modules/vore/eating/belly_obj_vr.dm b/code/modules/vore/eating/belly_obj_vr.dm index ba1d2cd566..2d24b8af80 100644 --- a/code/modules/vore/eating/belly_obj_vr.dm +++ b/code/modules/vore/eating/belly_obj_vr.dm @@ -710,10 +710,30 @@ /obj/belly/proc/digestion_death(mob/living/M) add_attack_logs(owner, M, "Digested in [lowertext(name)]") + //CHOMPEdit Start - Reverts TF on death. This fixes a bug with posibrains or similar, and also makes reforming easier. + if(M.tf_mob_holder && M.tf_mob_holder.loc == M) + M.tf_mob_holder.ckey = M.ckey + M.tf_mob_holder.loc = M.loc + M.tf_mob_holder.forceMove(M.loc) + QDEL_LIST_NULL(M.tf_mob_holder.vore_organs) + M.tf_mob_holder.vore_organs = list() + for(var/obj/belly/B as anything in M.vore_organs) + B.loc = M.tf_mob_holder + B.forceMove(M.tf_mob_holder) + B.owner = M.tf_mob_holder + M.tf_mob_holder.vore_organs |= B + M.vore_organs -= B + + if(M.tf_mob_holder) + M.tf_mob_holder = null + //CHOMPEdit End + // If digested prey is also a pred... anyone inside their bellies gets moved up. if(is_vore_predator(M)) M.release_vore_contents(include_absorbed = TRUE, silent = TRUE) + var/hasMMI = FALSE // CHOMPEdit - Adjust how MMI's are handled + //Drop all items into the belly. if(config.items_survive_digestion) for(var/obj/item/W in M) @@ -722,6 +742,7 @@ var/obj/item/device/mmi/brainbox = MMI.removed() if(brainbox) items_preserved += brainbox + hasMMI = brainbox // CHOMPEdit - Adjust how MMI's are handled for(var/slot in slots) var/obj/item/I = M.get_equipped_item(slot = slot) if(I) @@ -748,10 +769,41 @@ //Incase they have the loop going, let's double check to stop it. M.stop_sound_channel(CHANNEL_PREYLOOP) // Delete the digested mob - var/mob/observer/G = M.ghostize() //CHOMPEdit start. Make sure they're out, so we can copy attack logs and such. - if(G) - G.forceMove(src) //CHOMPEdit end. - qdel(M) + //CHOMPEdit start - Changed qdel to a forceMove to allow reforming, and... handled robots special. + if(isrobot(M)) + var/mob/living/silicon/robot/R = M + if(R.mmi && R.mind && R.mmi.brainmob) + R.mmi.loc = src + items_preserved += R.mmi + var/obj/item/weapon/robot_module/MB = locate() in R.contents + if(MB) + R.mmi.brainmob.languages = MB.original_languages + else + R.mmi.brainmob.languages = R.languages + R.mmi.brainmob.remove_language("Robot Talk") + hasMMI = R.mmi + R.mmi = null + else if(!R.shell) // Shells don't have brainmobs in their MMIs. + to_chat(R, "Oops! Something went very wrong, your MMI was unable to receive your mind. You have been ghosted. Please make a bug report so we can fix this bug.") + if(R.shell) // Let the standard procedure for shells handle this. + qdel(R) + return + + if(hasMMI) + var/obj/item/device/mmi/MMI = hasMMI + M.mind.transfer_to(MMI.brainmob) + MMI.body_backup = M + M.forceMove(MMI) + else + //Another CHOMPEdit started here. I left the comment here, though obviously we're doing a lot more now as well. + var/mob/observer/G = M.ghostize(FALSE) //CHOMPEdit start. Make sure they're out, so we can copy attack logs and such. + if(G) + G.forceMove(src) + G.body_backup = M + M.forceMove(G) + else + qdel(M) + //CHOMPEdit End // Handle a mob being absorbed /obj/belly/proc/absorb_living(mob/living/M) diff --git a/code/modules/vore/eating/vorepanel_vr.dm b/code/modules/vore/eating/vorepanel_vr.dm index e79ddf9b2d..a67d71fe10 100644 --- a/code/modules/vore/eating/vorepanel_vr.dm +++ b/code/modules/vore/eating/vorepanel_vr.dm @@ -722,6 +722,10 @@ var/list/available_options = list("Examine", "Eject", "Move", "Transfer") if(ishuman(target)) available_options += "Transform" + //CHOMPEdit Begin - Add Reforming + if(isobserver(target) || istype(target,/obj/item/device/mmi)) + available_options += "Reform" + //CHOMPEdit End intent = tgui_input_list(user, "What would you like to do with [target]?", "Vore Pick", available_options) switch(intent) if("Examine") @@ -803,6 +807,71 @@ V.tgui_interact(user) return TRUE + //CHOMPEdit Begin - Add Reforming + if("Reform") + if(host.stat) + to_chat(user,"You can't do that in your state!") + return TRUE + + if(isobserver(target)) + var/mob/observer/T = target + if(!ismob(T.body_backup) || prevent_respawns.Find(T.mind.name)) + to_chat(user,"They don't seem to be reformable!") + return TRUE + + var/accepted = tgui_alert(T, "[host] is trying to reform your body! Would you like to get reformed inside [host]'s [lowertext(host.vore_selected.name)]?", "Reforming Attempt", list("Yes", "No")) + if(accepted != "Yes") + to_chat(user,"[T] refused to be reformed!") + return TRUE + + if(isliving(T.body_backup)) + var/mob/living/body_backup = T.body_backup + body_backup.revive() + body_backup.forceMove(T.loc) + body_backup.ajourn = 0 + body_backup.key = T.key + body_backup.teleop = null + T.body_backup = null + host.vore_selected.release_specific_contents(T) + announce_ghost_joinleave(T.mind, 0, "They now occupy their body again.") + if(istype(target,/obj/item/device/mmi)) // A good bit of repeated code, sure, but... cleanest way to do this. + var/obj/item/device/mmi/MMI = target + if(!ismob(MMI.body_backup) || !MMI.brainmob.mind || prevent_respawns.Find(MMI.brainmob.mind.name)) + to_chat(user,"They don't seem to be reformable!") + return TRUE + var/accepted = tgui_alert(MMI.brainmob, "[host] is trying to reform your body! Would you like to get reformed inside [host]'s [lowertext(host.vore_selected.name)]?", "Reforming Attempt", list("Yes", "No")) + if(accepted != "Yes") + to_chat(user,"[MMI] refused to be reformed!") + return TRUE + + if(isliving(MMI.body_backup)) + var/mob/living/body_backup = MMI.body_backup + body_backup.revive() + body_backup.forceMove(MMI.loc) + body_backup.ajourn = 0 + body_backup.teleop = null + //And now installing the MMI into the body... + if(isrobot(body_backup)) //Just do the reverse of getting the MMI pulled out in /obj/belly/proc/digestion_death + var/mob/living/silicon/robot/R = body_backup + MMI.brainmob.mind.transfer_to(R) + MMI.loc = R + R.mmi = MMI + R.mmi.brainmob.add_language("Robot Talk") + else //reference /datum/surgery_step/robotics/install_mmi/end_step + var/obj/item/organ/internal/mmi_holder/holder = new(body_backup, 1) + body_backup.internal_organs_by_name["brain"] = holder + MMI.loc = holder + holder.stored_mmi = MMI + holder.update_from_mmi() + + if(MMI.brainmob && MMI.brainmob.mind) + MMI.brainmob.mind.transfer_to(body_backup) + body_backup.languages = MMI.brainmob.languages + //You've hopefully already named yourself, so... not implementing that bit. + MMI.body_backup = null + return TRUE + //CHOMPEdit End + /datum/vore_look/proc/set_attr(mob/user, params) if(!host.vore_selected) tgui_alert_async(usr, "No belly selected to modify.") diff --git a/modular_chomp/code/modules/mob/dead/observer/observer.dm b/modular_chomp/code/modules/mob/dead/observer/observer.dm new file mode 100644 index 0000000000..7928b41556 --- /dev/null +++ b/modular_chomp/code/modules/mob/dead/observer/observer.dm @@ -0,0 +1,7 @@ +/mob/observer + var/mob/living/body_backup = null //add reforming + +/mob/observer/Destroy() + if(body_backup) + qdel(body_backup) + ..() diff --git a/modular_chomp/code/modules/mob/living/carbon/brain/MMI.dm b/modular_chomp/code/modules/mob/living/carbon/brain/MMI.dm new file mode 100644 index 0000000000..ae2da9c9d3 --- /dev/null +++ b/modular_chomp/code/modules/mob/living/carbon/brain/MMI.dm @@ -0,0 +1,7 @@ +/obj/item/device/mmi + var/mob/living/body_backup = null //add reforming + +/obj/item/device/mmi/Destroy() + if(body_backup) + qdel(body_backup) + ..() diff --git a/vorestation.dme b/vorestation.dme index a78e7b7db3..85ed3bef56 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -4501,7 +4501,9 @@ #include "modular_chomp\code\modules\emotes\definitions\audiable.dm" #include "modular_chomp\code\modules\mob\holder.dm" #include "modular_chomp\code\modules\mob\mob.dm" +#include "modular_chomp\code\modules\mob\dead\observer\observer.dm" #include "modular_chomp\code\modules\mob\living\emote.dm" +#include "modular_chomp\code\modules\mob\living\carbon\brain\MMI.dm" #include "modular_chomp\code\modules\mob\living\carbon\human\species\species.dm" #include "modular_chomp\code\modules\mob\living\carbon\human\species\station\protean\_protean_defines.dm" #include "modular_chomp\code\modules\mob\living\carbon\human\species\station\protean\protean_blob.dm" From 2fe9e2327fc99c666f3ef0399df89d03dca66fbc Mon Sep 17 00:00:00 2001 From: TheGreatKitsune Date: Sun, 7 Aug 2022 19:18:43 -0500 Subject: [PATCH 02/75] Attempt to fix bugs. --- code/modules/vore/eating/vorepanel_vr.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/vore/eating/vorepanel_vr.dm b/code/modules/vore/eating/vorepanel_vr.dm index a67d71fe10..5775dffdcb 100644 --- a/code/modules/vore/eating/vorepanel_vr.dm +++ b/code/modules/vore/eating/vorepanel_vr.dm @@ -832,7 +832,8 @@ body_backup.key = T.key body_backup.teleop = null T.body_backup = null - host.vore_selected.release_specific_contents(T) + host.vore_selected.release_specific_contents(T, TRUE) + T.update_icon() announce_ghost_joinleave(T.mind, 0, "They now occupy their body again.") if(istype(target,/obj/item/device/mmi)) // A good bit of repeated code, sure, but... cleanest way to do this. var/obj/item/device/mmi/MMI = target From 2e7c58bfa86aaf18b4ffce8ae7cf7d101d894f6e Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Mon, 21 Nov 2022 14:33:14 +1000 Subject: [PATCH 03/75] Merge pull request #14096 from Novacat/nova-basicfixes Trash pile adjustments --- code/game/objects/structures/trash_pile_vr.dm | 7 ++++--- code/modules/clothing/under/miscellaneous_vr.dm | 9 +++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/code/game/objects/structures/trash_pile_vr.dm b/code/game/objects/structures/trash_pile_vr.dm index dbcbe447b3..c364425344 100644 --- a/code/game/objects/structures/trash_pile_vr.dm +++ b/code/game/objects/structures/trash_pile_vr.dm @@ -22,8 +22,6 @@ /obj/item/weapon/bluespace_harpoon, /obj/item/clothing/glasses/thermal/syndi, /obj/item/weapon/gun/energy/netgun, - /obj/item/weapon/gun/projectile/pirate, - /obj/item/clothing/accessory/permit/gun, /obj/item/weapon/gun/projectile/dartgun, /obj/item/clothing/gloves/black/bloodletter, /obj/item/weapon/gun/energy/mouseray/metamorphosis @@ -270,7 +268,7 @@ prob(1);/obj/item/device/flashlight/glowstick/yellow, prob(1);/obj/item/device/flashlight/pen, prob(1);/obj/item/device/paicard, - prob(1);/obj/item/weapon/card/emag, + prob(1);/obj/item/clothing/accessory/permit/gun, prob(1);/obj/item/clothing/mask/gas/voice, prob(1);/obj/item/weapon/spacecash/c100, prob(1);/obj/item/weapon/spacecash/c50, @@ -302,6 +300,7 @@ prob(2);/obj/item/clothing/under/hyperfiber/bluespace, prob(2);/obj/item/selectable_item/chemistrykit/size, prob(2);/obj/item/selectable_item/chemistrykit/gender, + prob(2);/obj/item/clothing/gloves/bluespace/emagged, prob(1);/obj/item/clothing/suit/storage/vest/heavy/merc, prob(1);/obj/item/device/nif/bad, prob(1);/obj/item/device/radio_jammer, @@ -317,6 +316,8 @@ prob(1);/obj/item/device/survivalcapsule/popcabin, prob(1);/obj/item/weapon/reagent_containers/syringe/steroid, prob(1);/obj/item/capture_crystal, + prob(1);/obj/item/device/perfect_tele/one_beacon, + prob(1);/obj/item/clothing/gloves/bluespace, prob(1);/obj/item/weapon/gun/energy/mouseray) var/obj/item/I = new path() diff --git a/code/modules/clothing/under/miscellaneous_vr.dm b/code/modules/clothing/under/miscellaneous_vr.dm index e66947796b..90285f561c 100644 --- a/code/modules/clothing/under/miscellaneous_vr.dm +++ b/code/modules/clothing/under/miscellaneous_vr.dm @@ -178,6 +178,15 @@ user.visible_message("\The [user] swipes the [emag_source] over the \the [src].","You swipes the [emag_source] over the \the [src].") return 1 +/obj/item/clothing/gloves/bluespace/emagged + emagged = TRUE + +/obj/item/clothing/gloves/bluespace/emagged/Initialize() + . = ..() + target_size = (rand(1,300)) /100 + if(target_size < 0.1) + target_size = 0.1 + //Same as Nanotrasen Security Uniforms /obj/item/clothing/under/ert armor = list(melee = 5, bullet = 10, laser = 10, energy = 5, bomb = 5, bio = 0, rad = 0) From addf4c7d7ddb3b6a1e64a162c132462b2420d564 Mon Sep 17 00:00:00 2001 From: Casey Date: Sat, 26 Nov 2022 17:40:31 -0500 Subject: [PATCH 05/75] Switches workflows to use Ubuntu 20.04 --- .github/workflows/ci.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4dcbd75275..b0b3e60013 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -64,6 +64,10 @@ jobs: unit_tests: name: Integration Tests +<<<<<<< HEAD +======= + # needs: ['file_tests', 'dreamchecker'] +>>>>>>> c1f532e646... Merge pull request #14135 from TheGreatKitsune/ci-fix runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v3 @@ -105,3 +109,15 @@ jobs: TEST_DEFINE: "AWAY_MISSION_TEST" TEST_FILE: "code/_away_mission_tests.dm" RUN: "0" +<<<<<<< HEAD +======= + + tests_successful: + name: Integration Tests + needs: ['file_tests', 'dreamchecker', 'unit_tests'] + runs-on: ubuntu-20.04 + steps: + - name: Report Success + run: | + echo "Jobs Successful!" +>>>>>>> c1f532e646... Merge pull request #14135 from TheGreatKitsune/ci-fix From 6fbdc3141e81aa4958bb18cd2a35d78c4cca29bb Mon Sep 17 00:00:00 2001 From: Casey Date: Sat, 26 Nov 2022 17:41:32 -0500 Subject: [PATCH 06/75] Buffs library book management --- code/game/magic/archived_book.dm | 51 ++++++++++++++------- code/modules/admin/admin_verb_lists_vr.dm | 3 +- code/modules/admin/admin_verbs_vr.dm | 53 +++++++++++++++++++++- code/modules/library/lib_machines.dm | 54 ++++++++++++++++++++++- maps/groundbase/gb-centcomm.dmm | 1 + maps/stellar_delight/ship_centcom.dmm | 1 + maps/tether/submaps/tether_centcom.dmm | 1 + 7 files changed, 146 insertions(+), 18 deletions(-) diff --git a/code/game/magic/archived_book.dm b/code/game/magic/archived_book.dm index 1aab354815..ea484584df 100644 --- a/code/game/magic/archived_book.dm +++ b/code/game/magic/archived_book.dm @@ -39,25 +39,46 @@ var/global/datum/book_manager/book_mgr = new() if(!src.holder) to_chat(src, "Only administrators may use this command.") return +//VOREStation Edit Start + var/obj/machinery/librarycomp/our_comp + for(var/obj/machinery/librarycomp/l in world) + if(istype(l, /obj/machinery/librarycomp)) + our_comp = l + break - var/isbn = tgui_input_number(usr, "ISBN number?", "Delete Book") - if(!isbn) + if(!our_comp) + to_chat(usr, "Unable to locate a library computer to use for book deleting.") return - if(BOOKS_USE_SQL && config.sql_enabled) - var/DBConnection/dbcon = new() - dbcon.Connect("dbi:mysql:[sqldb]:[sqladdress]:[sqlport]","[sqllogin]","[sqlpass]") - if(!dbcon.IsConnected()) - tgui_alert_async(usr, "Connection to Archive has been severed. Aborting.") - return + var/dat = "Book Inventory Management\n" // + dat += "

ADMINISTRATIVE MANAGEMENT

" + establish_old_db_connection() + + if(!dbcon_old.IsConnected()) + dat += "ERROR: Unable to contact External Archive. Please contact your system administrator for assistance." else - var/DBQuery/query = dbcon.NewQuery("DELETE FROM library WHERE id=[isbn]") - if(!query.Execute()) - to_chat(usr,query.ErrorMsg()) - dbcon.Disconnect() - else - book_mgr.remove(isbn) - log_admin("[usr.key] has deleted the book [isbn]") + dat += {"(Order book by SS13BN)

+ +
TITLEUnable to locate a library computer to use for book deleting.") + return + + var/dat = "Book Inventory Management\n" + dat += "

ADMINISTRATIVE MANAGEMENT

" + establish_old_db_connection() + + if(!dbcon_old.IsConnected()) + dat += "ERROR: Unable to contact External Archive. Please contact your system administrator for assistance." + else + dat += {"
(Order book by SS13BN)

+ +
TITLE>>>>>> 2c6bd88519... Merge pull request #14140 from Very-Soft/bookmanagement diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm index ad915f7f9d..b18ed0ff92 100644 --- a/code/modules/library/lib_machines.dm +++ b/code/modules/library/lib_machines.dm @@ -308,6 +308,43 @@ user << browse(dat, "window=library") onclose(user, "library") +//VOREStation Addition Start +/obj/machinery/librarycomp/attack_ghost(mob/user) + + var/show_admin_options = check_rights(R_ADMIN, show_msg = FALSE) + if(!show_admin_options) + . = ..() + + else + usr.set_machine(src) + var/dat = "Book Inventory Management\n" // + + dat += "

ADMINISTRATIVE MANAGEMENT

" + establish_old_db_connection() + + if(!dbcon_old.IsConnected()) + dat += "ERROR: Unable to contact External Archive. Please contact your system administrator for assistance." + else + dat += {"
(Order book by SS13BN)

+ + " + dat += "
TITLE\[Del\]" + dat += "
" + dat += "
(Return to main menu)
" + + user << browse(dat, "window=library") + onclose(user, "library") +//VOREStation Addition End + /obj/machinery/librarycomp/emag_act(var/remaining_charges, var/mob/user) if (src.density && !src.emagged) src.emagged = 1 @@ -455,7 +492,22 @@ B.item_state = B.icon_state src.visible_message("[src]'s printer hums as it produces a completely bound book. How did it do that?") break +<<<<<<< HEAD qdel(query) //CHOMPEdit TGSQL +======= + + if(href_list["delid"]) + if(!check_rights(R_ADMIN)) + return + var/sqlid = sanitizeSQL(href_list["delid"]) + establish_old_db_connection() + if(!dbcon_old.IsConnected()) + tgui_alert_async(usr, "Connection to Archive has been severed. Aborting.") + else + var/DBQuery/query = dbcon_old.NewQuery("DELETE FROM library WHERE id=[sqlid]") + query.Execute() + log_admin("[usr.key] has deleted the book [sqlid]") //VOREStation Addition +>>>>>>> 2c6bd88519... Merge pull request #14140 from Very-Soft/bookmanagement if(href_list["orderbyid"]) var/orderid = tgui_input_number(usr, "Enter your order:") @@ -567,4 +619,4 @@ b.icon_state = "book[rand(1,7)]" qdel(O) else - ..() \ No newline at end of file + ..() diff --git a/maps/groundbase/gb-centcomm.dmm b/maps/groundbase/gb-centcomm.dmm index 2e9ff9cff0..89864b7f4f 100644 --- a/maps/groundbase/gb-centcomm.dmm +++ b/maps/groundbase/gb-centcomm.dmm @@ -13678,6 +13678,7 @@ /area/centcom/terminal) "SK" = ( /obj/structure/table/reinforced, +/obj/machinery/librarycomp, /turf/simulated/floor/tiled, /area/centcom/control) "SL" = ( diff --git a/maps/stellar_delight/ship_centcom.dmm b/maps/stellar_delight/ship_centcom.dmm index 18b7e0ce50..54048e59db 100644 --- a/maps/stellar_delight/ship_centcom.dmm +++ b/maps/stellar_delight/ship_centcom.dmm @@ -4501,6 +4501,7 @@ /area/shuttle/ccboat) "qB" = ( /obj/structure/table/reinforced, +/obj/machinery/librarycomp, /turf/simulated/floor/tiled, /area/centcom/control) "qE" = ( diff --git a/maps/tether/submaps/tether_centcom.dmm b/maps/tether/submaps/tether_centcom.dmm index 292c438f30..ef54e274f3 100644 --- a/maps/tether/submaps/tether_centcom.dmm +++ b/maps/tether/submaps/tether_centcom.dmm @@ -7043,6 +7043,7 @@ /area/centcom/medical) "DJ" = ( /obj/structure/table/reinforced, +/obj/machinery/librarycomp, /turf/simulated/floor/tiled, /area/centcom/control) "DK" = ( From fd64ab9142fc015bbe6ec9ffef800f77a59f5e2e Mon Sep 17 00:00:00 2001 From: Fluff Date: Wed, 30 Nov 2022 15:05:44 -0500 Subject: [PATCH 07/75] MuchSpiders and Minour Changes Changing/updating the manor to actually pose a threat, and give loot. Adjusted the windows of the cult bar. Added more loot to the --- .../surface_submaps/wilderness/AmbushBase.dmm | 106 +- .../surface_submaps/wilderness/CultBar.dmm | 262 ++- .../surface_submaps/wilderness/DoomP.dmm | 24 +- .../surface_submaps/wilderness/Manor1.dmm | 1677 ++++++++++++----- 4 files changed, 1477 insertions(+), 592 deletions(-) diff --git a/maps/submaps/surface_submaps/wilderness/AmbushBase.dmm b/maps/submaps/surface_submaps/wilderness/AmbushBase.dmm index 1fcdb16c2a..7cd7734054 100644 --- a/maps/submaps/surface_submaps/wilderness/AmbushBase.dmm +++ b/maps/submaps/surface_submaps/wilderness/AmbushBase.dmm @@ -93,12 +93,27 @@ /area/submap/DugOutMercs) "dI" = ( /obj/structure/table/rack, +/obj/item/weapon/gun/energy/vepr, +/obj/item/weapon/gun/energy/laser, /obj/random/energy, /obj/random/energy, -/obj/random/energy, -/obj/random/energy, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, /turf/simulated/floor/tiled/techmaint, /area/submap/DugOutMercs) +"eg" = ( +/obj/structure/table/standard, +/obj/effect/floor_decal/corner/blue/border{ + dir = 1 + }, +/obj/random/material/precious, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/submap/DugOutMercs) "el" = ( /obj/random/mob/merc/all, /obj/effect/floor_decal/corner/paleblue/diagonal, @@ -127,6 +142,7 @@ /obj/structure/table/standard, /obj/item/weapon/gun/magnetic/gasthrower, /obj/item/weapon/strangerock, +/obj/item/weapon/cell/device/weapon/recharge/alien/omni, /turf/simulated/floor/tiled/techmaint, /area/submap/DugOutMercs) "fL" = ( @@ -171,6 +187,7 @@ /obj/structure/table/bench/padded, /mob/living/simple_mob/humanoid/merc/ranged/deagle, /obj/effect/floor_decal/corner/red/diagonal, +/obj/machinery/light, /turf/simulated/floor/tiled, /area/submap/DugOutMercs) "iL" = ( @@ -188,6 +205,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 10 }, +/obj/machinery/light, /turf/simulated/floor/tiled, /area/submap/DugOutMercs) "jz" = ( @@ -242,6 +260,13 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 5 }, +/obj/structure/table/rack, +/obj/item/weapon/card/id/silver{ + access = list(103) + }, +/obj/item/weapon/card/id/silver{ + access = list(103) + }, /turf/simulated/floor/tiled/techmaint, /area/submap/DugOutMercs) "mv" = ( @@ -255,6 +280,7 @@ /obj/random/maintenance/research, /obj/random/maintenance/research, /obj/item/weapon/weldingtool/alien, +/obj/item/weapon/cell/device/weapon/recharge/alien/hybrid, /turf/simulated/floor/tiled/techmaint, /area/submap/DugOutMercs) "mY" = ( @@ -268,6 +294,12 @@ }, /turf/simulated/floor/tiled, /area/submap/DugOutMercs) +"op" = ( +/obj/effect/floor_decal/corner/blue/border, +/obj/machinery/portable_atmospherics/canister/empty/oxygen, +/obj/machinery/light, +/turf/simulated/floor/tiled, +/area/submap/DugOutMercs) "oq" = ( /obj/structure/ledge/ledge_stairs, /mob/living/simple_mob/humanoid/merc/melee/sword, @@ -282,6 +314,9 @@ /obj/item/clothing/suit/space/syndicate/black/blue, /obj/item/clothing/head/helmet/space/syndicate/black/blue, /obj/item/weapon/tank/oxygen/welded, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/submap/DugOutMercs) "oN" = ( @@ -292,7 +327,9 @@ /turf/simulated/floor/water/deep, /area/submap/DugOutMercs) "oU" = ( -/obj/machinery/door/airlock/engineering, +/obj/machinery/door/airlock/engineering{ + locked = 1 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/submap/DugOutMercs) "pf" = ( @@ -310,10 +347,24 @@ "po" = ( /turf/simulated/floor/water/deep, /area/submap/DugOutMercs) +"qN" = ( +/obj/effect/floor_decal/corner/lightgrey/diagonal, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/hydro, +/area/submap/DugOutMercs) "qR" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 6 }, +/obj/structure/table/rack, +/obj/item/weapon/card/id/silver{ + access = list(103) + }, +/obj/item/weapon/card/id/silver{ + access = list(103) + }, /turf/simulated/floor/tiled/techmaint, /area/submap/DugOutMercs) "rd" = ( @@ -338,6 +389,7 @@ /obj/effect/floor_decal/borderfloor{ dir = 6 }, +/obj/machinery/light, /turf/simulated/floor/tiled, /area/submap/DugOutMercs) "rr" = ( @@ -459,6 +511,12 @@ /obj/item/weapon/tank/oxygen/welded, /turf/simulated/floor/tiled, /area/submap/DugOutMercs) +"xy" = ( +/obj/machinery/door/airlock/highsecurity{ + locked = 1 + }, +/turf/simulated/floor/tiled, +/area/submap/DugOutMercs) "xC" = ( /obj/effect/floor_decal/corner/mauve/diagonal, /obj/structure/table/standard, @@ -532,10 +590,14 @@ /area/submap/DugOutMercs) "Ca" = ( /obj/structure/table/rack, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, +/obj/random/projectile/shotgun, +/obj/random/projectile/shotgun, +/obj/item/weapon/gun/projectile/automatic/as24, +/obj/item/ammo_magazine/ammo_box/b12g/flechette, +/obj/item/ammo_magazine/ammo_box/b12g/flechette, +/obj/item/ammo_magazine/ammo_box/b12g/flechette, +/obj/item/ammo_magazine/ammo_box/b12g/flechette, +/obj/item/weapon/gun/projectile/shotgun/compact, /turf/simulated/floor/tiled/techmaint, /area/submap/DugOutMercs) "Cl" = ( @@ -774,6 +836,9 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 9 }, +/obj/structure/table/rack, +/obj/item/weapon/rig/pmc/security, +/obj/item/weapon/rig/pmc/medical, /turf/simulated/floor/tiled/techmaint, /area/submap/DugOutMercs) "Lg" = ( @@ -890,6 +955,11 @@ /obj/effect/floor_decal/corner/red/diagonal, /turf/simulated/floor/tiled, /area/submap/DugOutMercs) +"Sl" = ( +/obj/effect/floor_decal/corner/blue/border, +/obj/machinery/light, +/turf/simulated/floor/tiled, +/area/submap/DugOutMercs) "Sn" = ( /obj/machinery/light{ dir = 1 @@ -984,6 +1054,9 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 10 }, +/obj/structure/table/rack, +/obj/item/weapon/rig/pmc/security, +/obj/item/weapon/rig/pmc/medical, /turf/simulated/floor/tiled/techmaint, /area/submap/DugOutMercs) "Wx" = ( @@ -1021,6 +1094,11 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 8 }, +/obj/structure/table/rack, +/obj/item/ammo_magazine/ammo_box/b145, +/obj/item/ammo_magazine/ammo_box/b145, +/obj/item/ammo_magazine/ammo_box/b145, +/obj/item/ammo_magazine/ammo_box/b145/highvel, /turf/simulated/floor/tiled/techmaint, /area/submap/DugOutMercs) "YD" = ( @@ -1344,7 +1422,7 @@ OP RS Rz sc -sc +qN sc sc uv @@ -1848,7 +1926,7 @@ uv uv uv uv -yc +xy uv uv uv @@ -2100,7 +2178,7 @@ aQ uv uv uv -yc +xy uv uv uv @@ -2182,11 +2260,11 @@ Rz Qf Qf uv -kW +eg fS fS Jh -YD +op uv nZ yG @@ -2438,10 +2516,10 @@ oC NM Zt SN -Fr +Sl uv nZ -Nr +yG Da Qf Qf diff --git a/maps/submaps/surface_submaps/wilderness/CultBar.dmm b/maps/submaps/surface_submaps/wilderness/CultBar.dmm index 0696c6ebc5..b57eea005e 100644 --- a/maps/submaps/surface_submaps/wilderness/CultBar.dmm +++ b/maps/submaps/surface_submaps/wilderness/CultBar.dmm @@ -85,10 +85,6 @@ /obj/effect/floor_decal/corner/red/diagonal, /turf/simulated/floor/tiled/asteroid_steel, /area/submap/CultBar) -"dh" = ( -/obj/structure/flora/lily1, -/turf/simulated/floor/water/ocean, -/area/template_noop) "dt" = ( /turf/simulated/floor/wood/sif/broken, /area/submap/CultBar) @@ -114,9 +110,6 @@ /obj/effect/floor_decal/corner/lightgrey/diagonal, /turf/simulated/floor/tiled/freezer, /area/submap/CultBar) -"ei" = ( -/turf/simulated/floor/outdoors/grass, -/area/template_noop) "ez" = ( /obj/effect/decal/cleanable/blood, /obj/effect/decal/cleanable/dirt, @@ -339,11 +332,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/wood/sif, /area/submap/CultBar) -"mD" = ( -/obj/structure/flora/ausbushes/reedbush, -/obj/structure/flora/ausbushes/sparsegrass, -/turf/simulated/floor/water/ocean, -/area/template_noop) "mQ" = ( /obj/effect/decal/cleanable/blood/gibs, /turf/simulated/floor/carpet, @@ -508,10 +496,6 @@ /obj/structure/loot_pile/surface/bones, /turf/simulated/floor/tiled/freezer, /area/submap/CultBar) -"va" = ( -/obj/structure/flora/lily2, -/turf/simulated/floor/water/ocean, -/area/template_noop) "wr" = ( /mob/living/simple_mob/humanoid/cultist/hunter, /obj/effect/decal/cleanable/dirt, @@ -674,10 +658,6 @@ /obj/effect/floor_decal/corner/red/diagonal, /turf/simulated/floor/tiled/asteroid_steel, /area/submap/CultBar) -"DS" = ( -/obj/structure/flora/ausbushes/reedbush, -/turf/simulated/floor/water/ocean, -/area/template_noop) "DY" = ( /obj/effect/gibspawner/human, /turf/simulated/floor/wood/sif, @@ -1095,10 +1075,6 @@ /obj/effect/floor_decal/corner/lightgrey/diagonal, /turf/simulated/floor/tiled/freezer, /area/submap/CultBar) -"Ww" = ( -/obj/structure/flora/ausbushes/sunnybush, -/turf/simulated/floor/outdoors/grass, -/area/template_noop) "WL" = ( /obj/machinery/light/small/flicker, /obj/effect/decal/cleanable/blood, @@ -1189,7 +1165,7 @@ /turf/simulated/floor/wood/sif/broken, /area/submap/CultBar) "ZZ" = ( -/obj/structure/window/basic, +/obj/structure/window/plastitanium, /obj/structure/curtain, /turf/simulated/floor/wood/sif, /area/submap/CultBar) @@ -1271,36 +1247,36 @@ ok (3,1,1) = {" ok ok -ok -ok -ok -ok -ok -ok -ok -ID -ei -ei -ID -ei -Ww -ei -ID -ID -ok -ok -ok -ok -ID -ID -ID -ID -ok -ok -ok -ok -ok -ok +Ti +Ti +Ti +Ti +Ti +Ti +Ti +wt +fF +fF +wt +fF +jy +fF +wt +wt +Ti +Ti +Ti +Ti +wt +wt +wt +wt +Ti +Ti +Ti +Ti +Ti +Ti ok ok ok @@ -1308,7 +1284,7 @@ ok (4,1,1) = {" ok ok -ok +Ti Wf wt wt @@ -1337,7 +1313,7 @@ wt Ti wt wt -ok +Ti ok ok ok @@ -1345,7 +1321,7 @@ ok (5,1,1) = {" ok ok -ok +Ti wt VZ VZ @@ -1374,7 +1350,7 @@ fF Om wt wt -ID +wt ok ok ok @@ -1382,7 +1358,7 @@ ok (6,1,1) = {" ok ok -ID +wt wt VZ Sn @@ -1411,7 +1387,7 @@ wt wt Cp Cp -ID +wt ID ok ok @@ -1419,7 +1395,7 @@ ok (7,1,1) = {" ok ok -ID +wt fF VZ EJ @@ -1448,7 +1424,7 @@ wt Cp Px Cp -EM +Cp ID ID ok @@ -1456,7 +1432,7 @@ ok (8,1,1) = {" ok ID -Ww +jy fF VZ zU @@ -1485,7 +1461,7 @@ Cp Cp Nw Cp -EM +Cp XI ID ok @@ -1493,7 +1469,7 @@ ok (9,1,1) = {" ok ID -ei +fF fF VZ HK @@ -1522,7 +1498,7 @@ Cp Cp Cp Cp -va +rH EM ID ok @@ -1530,7 +1506,7 @@ ok (10,1,1) = {" ok ok -ID +wt CC VZ yP @@ -1559,7 +1535,7 @@ Cp Cp Cp fs -EM +Cp EM ID ok @@ -1567,7 +1543,7 @@ ok (11,1,1) = {" ok ok -ID +wt fF VZ dt @@ -1596,7 +1572,7 @@ Cp cJ Cp Cp -EM +Cp EM ID ok @@ -1604,7 +1580,7 @@ ok (12,1,1) = {" ok ok -ok +Ti wt VZ zU @@ -1633,7 +1609,7 @@ Cp Cp rH Cp -DS +Nw EM ID ok @@ -1641,7 +1617,7 @@ ok (13,1,1) = {" ok ok -ID +wt fF VZ Fb @@ -1670,7 +1646,7 @@ Cp Cp Cp Cp -EM +Cp EM ID ok @@ -1678,7 +1654,7 @@ ok (14,1,1) = {" ok ID -ei +fF fF VZ Xs @@ -1707,7 +1683,7 @@ wt Cp Cp Px -EM +Cp ID ID ok @@ -1715,7 +1691,7 @@ ok (15,1,1) = {" ok ok -ID +wt zk VZ zU @@ -1744,7 +1720,7 @@ wt Cp Cp Cp -ID +wt ID ok ok @@ -1752,7 +1728,7 @@ ok (16,1,1) = {" ok ok -ID +wt fF VZ Sn @@ -1781,7 +1757,7 @@ wt wt Cp Cp -ID +wt ID ok ok @@ -1789,7 +1765,7 @@ ok (17,1,1) = {" ok ok -ID +wt fF VZ VZ @@ -1818,7 +1794,7 @@ fF wt wt wt -ID +wt ok ok ok @@ -1826,7 +1802,7 @@ ok (18,1,1) = {" ok ok -ok +Ti Wf VZ dO @@ -1855,7 +1831,7 @@ IU cT wt Om -ID +wt ID ok ok @@ -1863,7 +1839,7 @@ ok (19,1,1) = {" ok ok -ok +Ti wt VZ nO @@ -1892,7 +1868,7 @@ fF fF wt wt -EM +Cp ID ID ok @@ -1900,7 +1876,7 @@ ok (20,1,1) = {" ok ok -ok +Ti wt VZ AO @@ -1929,7 +1905,7 @@ fF wt wt Cp -dh +fs EM ID ok @@ -1937,7 +1913,7 @@ ok (21,1,1) = {" ok ok -ok +Ti wt VZ VZ @@ -1966,7 +1942,7 @@ wt wt Cp Cp -EM +Cp EM ID ok @@ -1974,7 +1950,7 @@ ok (22,1,1) = {" ok ok -ok +Ti wt VZ MF @@ -2003,7 +1979,7 @@ wt wt Cp Cp -mD +cJ EM ID ok @@ -2011,7 +1987,7 @@ ok (23,1,1) = {" ok ok -ID +wt fF VZ Gy @@ -2040,7 +2016,7 @@ wt Px Cp Cp -EM +Cp EM ID ok @@ -2048,7 +2024,7 @@ ok (24,1,1) = {" ok ok -ID +wt zk VZ hN @@ -2077,7 +2053,7 @@ wt Cp Nw Cp -EM +Cp ID ID ok @@ -2085,7 +2061,7 @@ ok (25,1,1) = {" ok ID -ei +fF fF VZ ug @@ -2114,7 +2090,7 @@ Cp Cp Cp Cp -ID +wt ID ok ok @@ -2122,7 +2098,7 @@ ok (26,1,1) = {" ok ID -Ww +jy fF QX Gd @@ -2151,7 +2127,7 @@ Cp Cp Cp wt -ID +wt ok ok ok @@ -2159,7 +2135,7 @@ ok (27,1,1) = {" ok ID -ei +fF fF VZ Mx @@ -2188,7 +2164,7 @@ cJ Cp Px wt -ID +wt ok ok ok @@ -2196,7 +2172,7 @@ ok (28,1,1) = {" ok ok -ID +wt zk VZ YU @@ -2225,7 +2201,7 @@ Cp Cp Px wt -ID +wt ok ok ok @@ -2233,7 +2209,7 @@ ok (29,1,1) = {" ok ok -ok +Ti wt VZ ij @@ -2262,7 +2238,7 @@ Cp wt wt wt -ok +Ti ok ok ok @@ -2270,7 +2246,7 @@ ok (30,1,1) = {" ok ok -ok +Ti wt VZ fB @@ -2299,7 +2275,7 @@ wt wt Om Ti -ok +Ti ok ok ok @@ -2307,7 +2283,7 @@ ok (31,1,1) = {" ok ok -ok +Ti wt VZ VZ @@ -2336,7 +2312,7 @@ wt Ti Ti Ti -ok +Ti ok ok ok @@ -2344,7 +2320,7 @@ ok (32,1,1) = {" ok ok -ok +Ti Wf wt wt @@ -2373,7 +2349,7 @@ Ti Ti Ti Ti -ok +Ti ok ok ok @@ -2381,36 +2357,36 @@ ok (33,1,1) = {" ok ok -ok -ok -ok -ok -ID -ID -ID -ID -ok -ok -ok -ok -ok -ok -ok -ok -ok -ok -ok -ok -ok -ID -ID -ID -ok -ok -ok -ok -ok -ok +Ti +Ti +Ti +Ti +wt +wt +wt +wt +Ti +Ti +Ti +Ti +Ti +Ti +Ti +Ti +Ti +Ti +Ti +Ti +Ti +wt +wt +wt +Ti +Ti +Ti +Ti +Ti +Ti ok ok ok diff --git a/maps/submaps/surface_submaps/wilderness/DoomP.dmm b/maps/submaps/surface_submaps/wilderness/DoomP.dmm index a06b674ad8..e780dc90ca 100644 --- a/maps/submaps/surface_submaps/wilderness/DoomP.dmm +++ b/maps/submaps/surface_submaps/wilderness/DoomP.dmm @@ -364,22 +364,29 @@ "bo" = ( /obj/structure/table/rack, /obj/item/weapon/storage/box/smokes, -/turf/simulated/floor/tiled/techfloor, -/area/submap/DoomP) -"bp" = ( -/obj/structure/table/rack, /obj/item/weapon/storage/box/handcuffs, /turf/simulated/floor/tiled/techfloor, /area/submap/DoomP) "bq" = ( /obj/structure/table/rack, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, +/obj/item/clothing/gloves/tactical, +/obj/item/clothing/gloves/tactical, +/obj/item/clothing/head/helmet/tactical, +/obj/item/clothing/accessory/armor/armorplate/tactical, +/obj/item/clothing/suit/storage/vest/tactical, +/obj/item/clothing/shoes/boots/tactical, +/obj/item/clothing/shoes/boots/tactical, +/obj/item/clothing/head/helmet/tactical, /turf/simulated/floor/tiled/techfloor, /area/submap/DoomP) "br" = ( /obj/structure/table/rack, /obj/random/energy, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/random/energy, /turf/simulated/floor/tiled/techfloor, /area/submap/DoomP) "bs" = ( @@ -387,6 +394,9 @@ /obj/item/weapon/gun/projectile/contender, /obj/item/ammo_magazine/s357, /obj/item/ammo_magazine/s357, +/obj/item/weapon/gun/projectile/contender, +/obj/item/ammo_magazine/s357, +/obj/item/ammo_magazine/s357, /turf/simulated/floor/tiled/techfloor, /area/submap/DoomP) "bt" = ( @@ -2206,7 +2216,7 @@ aN bg be at -bp +bq bL at ac diff --git a/maps/submaps/surface_submaps/wilderness/Manor1.dmm b/maps/submaps/surface_submaps/wilderness/Manor1.dmm index cf4bccf5b9..a9fc9053bd 100644 --- a/maps/submaps/surface_submaps/wilderness/Manor1.dmm +++ b/maps/submaps/surface_submaps/wilderness/Manor1.dmm @@ -19,6 +19,7 @@ "ae" = ( /obj/structure/table/woodentable, /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle, +/obj/random/medical, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "af" = ( @@ -43,11 +44,15 @@ /obj/structure/table/woodentable, /obj/item/clothing/mask/smokable/cigarette/cigar, /obj/item/weapon/material/ashtray/glass, +/obj/effect/spider/stickyweb, +/obj/random/medical, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "ak" = ( /obj/structure/flora/pottedplant/dead, /obj/effect/decal/cleanable/cobweb, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "al" = ( @@ -57,6 +62,7 @@ "am" = ( /obj/structure/table/woodentable, /obj/item/device/flashlight, +/obj/effect/spider/stickyweb, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "an" = ( @@ -93,6 +99,8 @@ /obj/structure/bed, /obj/item/weapon/bedsheet, /obj/effect/decal/cleanable/blood/oil, +/obj/effect/decal/cleanable/dirt, +/mob/living/simple_mob/animal/giant_spider/pepper, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "av" = ( @@ -107,10 +115,14 @@ /area/submap/Manor1) "ax" = ( /obj/structure/closet/cabinet, +/obj/item/clothing/suit/storage/hooded/wintercoat/kilanocoat, +/obj/item/clothing/shoes/boots/winter/climbing, +/obj/random/projectile/random, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "ay" = ( /obj/effect/decal/cleanable/blood/gibs/robot/limb, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "az" = ( @@ -132,6 +144,7 @@ "aC" = ( /obj/structure/table/woodentable, /obj/item/device/flashlight/maglight, +/obj/effect/spider/stickyweb, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "aD" = ( @@ -143,13 +156,14 @@ /obj/structure/closet/cabinet, /obj/effect/decal/cleanable/cobweb2, /obj/item/clothing/head/hood/winter, -/obj/item/clothing/shoes/boots/winter, -/obj/item/clothing/suit/storage/hooded/wintercoat, +/obj/item/clothing/shoes/boots/winter/climbing, +/obj/item/clothing/suit/storage/hooded/wintercoat/kilanocoat, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "aF" = ( /obj/structure/table/woodentable, /obj/effect/decal/cleanable/cobweb, +/obj/item/stack/material/void_opal, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "aG" = ( @@ -185,7 +199,7 @@ /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "aN" = ( -/obj/effect/decal/cleanable/cobweb2, +/mob/living/simple_mob/animal/giant_spider/nurse, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "aO" = ( @@ -212,6 +226,8 @@ "aT" = ( /obj/structure/closet/cabinet, /obj/random/projectile/shotgun, +/obj/item/clothing/suit/storage/hooded/wintercoat/kilanocoat, +/obj/item/clothing/shoes/boots/winter/climbing, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "aU" = ( @@ -270,14 +286,16 @@ "bf" = ( /obj/structure/closet/cabinet, /obj/item/clothing/head/hood/winter, -/obj/item/clothing/shoes/boots/winter, +/obj/item/clothing/shoes/boots/winter/climbing, /obj/item/clothing/suit/storage/hooded/wintercoat, /obj/random/contraband, +/obj/item/clothing/suit/storage/hooded/wintercoat/kilanocoat, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "bg" = ( /obj/structure/table/woodentable, /obj/item/weapon/paper_bin, +/obj/effect/spider/stickyweb, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "bh" = ( @@ -295,6 +313,7 @@ /area/submap/Manor1) "bj" = ( /obj/effect/decal/cleanable/cobweb, +/obj/effect/spider/stickyweb, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "bk" = ( @@ -344,6 +363,7 @@ icon_state = "wooden_chair" }, /obj/effect/decal/cleanable/dirt, +/obj/effect/spider/stickyweb, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "bu" = ( @@ -357,6 +377,7 @@ "bv" = ( /obj/structure/table/standard, /obj/item/weapon/reagent_containers/food/condiment/small/sugar, +/obj/effect/spider/stickyweb, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "bw" = ( @@ -372,9 +393,9 @@ /area/submap/Manor1) "by" = ( /obj/structure/closet/cabinet, -/obj/item/clothing/suit/storage/hooded/wintercoat, +/obj/item/clothing/suit/storage/hooded/wintercoat/kilanocoat, /obj/item/clothing/head/hood/winter, -/obj/item/clothing/shoes/boots/winter, +/obj/item/clothing/shoes/boots/winter/climbing, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "bz" = ( @@ -386,16 +407,19 @@ /obj/structure/table/standard, /obj/item/weapon/material/kitchen/utensil/fork, /obj/item/weapon/material/kitchen/utensil/fork, +/obj/effect/spider/stickyweb, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "bB" = ( /obj/structure/closet/secure_closet/freezer/fridge, /obj/item/weapon/reagent_containers/food/snacks/stew, /obj/item/weapon/reagent_containers/food/snacks/stew, +/obj/item/weapon/reagent_containers/food/snacks/meat/worm, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "bC" = ( /obj/item/weapon/shovel, +/obj/effect/spider/stickyweb, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "bD" = ( @@ -404,6 +428,7 @@ icon_state = "wooden_chair" }, /obj/effect/decal/cleanable/dirt, +/obj/effect/spider/stickyweb, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "bE" = ( @@ -423,16 +448,20 @@ /obj/structure/closet/secure_closet/freezer/fridge, /obj/item/weapon/reagent_containers/food/snacks/sausage, /obj/item/weapon/reagent_containers/food/snacks/sausage, +/obj/effect/spider/stickyweb, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "bH" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/flora/pottedplant/drooping, +/obj/effect/spider/stickyweb, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "bI" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/flora/pottedplant/dead, +/obj/effect/spider/stickyweb, +/obj/item/weapon/material/sword, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "bJ" = ( @@ -444,6 +473,7 @@ "bK" = ( /obj/structure/table/standard, /obj/item/weapon/reagent_containers/glass/bottle/stoxin, +/obj/effect/spider/stickyweb, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "bL" = ( @@ -461,11 +491,16 @@ /area/submap/Manor1) "bO" = ( /obj/machinery/icecream_vat, +/obj/effect/spider/stickyweb, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "bP" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/carpet/blucarpet, +/obj/structure/bed/chair/wood{ + dir = 4; + icon_state = "wooden_chair" + }, +/obj/effect/spider/stickyweb, +/turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "bQ" = ( /obj/effect/decal/cleanable/blood, @@ -488,11 +523,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/carpet/purcarpet, /area/submap/Manor1) -"bV" = ( -/turf/simulated/floor/holofloor/wood{ - icon_state = "wood_broken6" - }, -/area/submap/Manor1) "bW" = ( /obj/machinery/washing_machine, /turf/simulated/floor/holofloor/wood, @@ -505,12 +535,19 @@ /area/submap/Manor1) "bY" = ( /obj/structure/table/rack, +/obj/random/carp_plushie, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "bZ" = ( /obj/structure/closet/crate, /obj/item/stack/cable_coil/random_belt, /obj/random/cash, +/obj/random/contraband, +/obj/random/contraband/nofail, +/obj/random/cash/huge, +/obj/item/stack/material/gold{ + amount = 18 + }, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "ca" = ( @@ -521,13 +558,15 @@ "cb" = ( /obj/structure/closet/cabinet, /obj/random/gun/random, +/obj/item/clothing/suit/storage/hooded/wintercoat/kilanocoat, +/obj/item/clothing/shoes/boots/winter/climbing, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "cc" = ( /obj/structure/closet/cabinet, /obj/item/weapon/cell/device/weapon, /obj/item/weapon/cell/device/weapon, -/obj/random/medical, +/obj/item/weapon/storage/firstaid/combat, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "cd" = ( @@ -544,11 +583,14 @@ "cf" = ( /obj/structure/table/woodentable, /obj/item/weapon/storage/wallet/random, +/obj/effect/spider/stickyweb, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "cg" = ( /obj/structure/flora/pottedplant/dead, /obj/effect/decal/cleanable/cobweb2, +/mob/living/simple_mob/animal/giant_spider/lurker, +/obj/effect/spider/stickyweb, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "ch" = ( @@ -560,18 +602,24 @@ /obj/structure/closet/crate, /obj/item/weapon/flame/lighter/random, /obj/random/powercell, +/obj/random/contraband, +/obj/random/contraband/nofail, +/obj/random/cash/huge, +/obj/item/stack/material/durasteel{ + amount = 18 + }, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "cj" = ( /obj/structure/closet/cabinet, -/obj/item/clothing/shoes/boots/winter, -/obj/item/clothing/suit/storage/hooded/wintercoat, +/obj/item/clothing/shoes/boots/winter/climbing, +/obj/item/clothing/suit/storage/hooded/wintercoat/kilanocoat, /obj/item/clothing/head/hood/winter, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "ck" = ( -/obj/effect/decal/cleanable/spiderling_remains, -/turf/simulated/floor/holofloor/wood, +/mob/living/simple_mob/animal/giant_spider/carrier, +/turf/simulated/floor/carpet/turcarpet, /area/submap/Manor1) "cl" = ( /turf/simulated/floor/carpet/turcarpet, @@ -587,6 +635,12 @@ "cn" = ( /obj/structure/closet/crate, /obj/item/weapon/storage/wallet/random, +/obj/random/contraband, +/obj/random/contraband/nofail, +/obj/random/cash/huge, +/obj/item/stack/material/tritium{ + amount = 20 + }, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "co" = ( @@ -612,12 +666,15 @@ /area/submap/Manor1) "cs" = ( /obj/item/weapon/material/twohanded/spear, +/obj/effect/spider/stickyweb, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "ct" = ( /obj/structure/closet/cabinet{ opened = 1 }, +/obj/item/clothing/suit/storage/hooded/wintercoat/kilanocoat, +/obj/item/clothing/shoes/boots/winter/climbing, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "cu" = ( @@ -637,6 +694,7 @@ "cx" = ( /obj/structure/table/standard, /obj/effect/decal/cleanable/cobweb2, +/obj/effect/spider/stickyweb, /turf/simulated/floor/tiled/hydro, /area/submap/Manor1) "cy" = ( @@ -652,13 +710,9 @@ /area/submap/Manor1) "cA" = ( /obj/item/weapon/paper/crumpled, +/obj/effect/spider/stickyweb, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) -"cB" = ( -/turf/simulated/floor/holofloor/wood{ - icon_state = "wood_broken3" - }, -/area/submap/Manor1) "cC" = ( /obj/effect/decal/cleanable/spiderling_remains, /obj/effect/spider/stickyweb, @@ -666,11 +720,12 @@ /area/submap/Manor1) "cD" = ( /obj/structure/closet/crate, -/obj/item/clothing/suit/armor/vest, +/obj/item/weapon/gun/energy/locked/frontier/handbow, +/obj/item/weapon/gun/energy/locked/frontier/handbow, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "cE" = ( -/obj/structure/closet/crate, +/obj/random/humanoidremains, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "cF" = ( @@ -694,6 +749,7 @@ /area/submap/Manor1) "cI" = ( /obj/item/stack/material/wood, +/obj/effect/spider/stickyweb, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "cJ" = ( @@ -719,6 +775,7 @@ "cM" = ( /obj/structure/table/woodentable, /obj/item/modular_computer/laptop/preset/custom_loadout/cheap, +/obj/effect/spider/stickyweb, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) "cN" = ( @@ -728,6 +785,770 @@ /obj/structure/flora/tree/sif, /turf/template_noop, /area/submap/Manor1) +"cP" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spider/stickyweb/dark, +/turf/simulated/floor/carpet/purcarpet, +/area/submap/Manor1) +"dt" = ( +/obj/structure/bed/chair/wood{ + dir = 8; + icon_state = "wooden_chair" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spider/stickyweb, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"eq" = ( +/obj/effect/spider/stickyweb, +/obj/effect/spider/stickyweb, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"ew" = ( +/obj/effect/decal/cleanable/dirt, +/mob/living/simple_mob/animal/giant_spider/lurker, +/obj/effect/spider/stickyweb, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"eA" = ( +/turf/simulated/wall/wood{ + can_open = 1 + }, +/area/submap/Manor1) +"eI" = ( +/obj/structure/table/woodentable, +/obj/item/weapon/reagent_containers/food/snacks/sandwich, +/obj/item/weapon/gun/projectile/revolver/cappeacekeeper, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"eL" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spider/stickyweb, +/turf/simulated/floor/carpet/bcarpet, +/area/submap/Manor1) +"eT" = ( +/obj/effect/decal/cleanable/blood/drip, +/obj/structure/bed/chair/wood{ + dir = 8; + icon_state = "wooden_chair" + }, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"fo" = ( +/obj/structure/table/rack, +/obj/random/firstaid, +/obj/random/firstaid, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"fx" = ( +/obj/structure/table/woodentable, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spider/stickyweb, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"fT" = ( +/obj/structure/loot_pile/surface/bones, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"gc" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spider/stickyweb, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"gf" = ( +/obj/structure/coatrack, +/obj/effect/spider/stickyweb, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"gF" = ( +/obj/structure/table/woodentable, +/obj/item/weapon/flame/candle/everburn, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"gY" = ( +/obj/structure/table/woodentable, +/obj/effect/spider/stickyweb, +/obj/effect/spider/stickyweb, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"hu" = ( +/obj/effect/decal/cleanable/greenglow, +/obj/item/slime_extract/rainbow, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"hM" = ( +/obj/structure/bed/chair/wood{ + dir = 1; + icon_state = "wooden_chair" + }, +/obj/effect/spider/stickyweb/dark, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"hN" = ( +/obj/structure/table/woodentable, +/obj/item/device/soulstone, +/obj/item/weapon/spellbook/oneuse/smoke, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"ie" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/mob/living/simple_mob/animal/giant_spider/carrier, +/obj/effect/spider/stickyweb, +/turf/simulated/floor/carpet/purcarpet, +/area/submap/Manor1) +"ja" = ( +/obj/effect/spider/stickyweb, +/obj/effect/spider/stickyweb, +/turf/simulated/floor/carpet/purcarpet, +/area/submap/Manor1) +"jc" = ( +/obj/structure/table/woodentable, +/obj/item/weapon/reagent_containers/food/snacks/meatsteak, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"jd" = ( +/obj/structure/table/woodentable, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spider/stickyweb/dark, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"jl" = ( +/mob/living/simple_mob/animal/giant_spider/frost, +/turf/simulated/floor/tiled/hydro, +/area/submap/Manor1) +"jr" = ( +/obj/structure/table/woodentable, +/obj/item/weapon/reagent_containers/food/snacks/sandwich, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"jD" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spider/stickyweb, +/obj/item/weapon/material/whip, +/turf/simulated/floor/carpet/purcarpet, +/area/submap/Manor1) +"jG" = ( +/obj/structure/bed/chair/wood{ + dir = 8; + icon_state = "wooden_chair" + }, +/obj/effect/spider/stickyweb, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"jK" = ( +/obj/effect/spider/stickyweb, +/turf/simulated/floor/carpet/blucarpet, +/area/submap/Manor1) +"kb" = ( +/obj/structure/table/woodentable, +/obj/item/weapon/reagent_containers/food/snacks/meatsteak, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"ks" = ( +/obj/structure/flora/pottedplant/dead, +/mob/living/simple_mob/animal/giant_spider/lurker, +/obj/effect/spider/stickyweb, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"kv" = ( +/obj/structure/simple_door/wood, +/obj/effect/spider/stickyweb, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"le" = ( +/obj/random/humanoidremains, +/turf/simulated/floor/carpet/bcarpet, +/area/submap/Manor1) +"lz" = ( +/mob/living/simple_mob/animal/giant_spider/electric, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"lU" = ( +/obj/structure/flora/pottedplant/drooping, +/obj/random/humanoidremains, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"my" = ( +/obj/structure/table, +/obj/effect/spider/stickyweb, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"nq" = ( +/obj/effect/spider/stickyweb, +/obj/random/humanoidremains, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"nr" = ( +/obj/structure/table/woodentable, +/obj/effect/spider/stickyweb, +/obj/item/weapon/gun/energy/medigun, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"oM" = ( +/obj/structure/table/woodentable, +/obj/item/trash/candle, +/obj/effect/spider/stickyweb, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"pf" = ( +/mob/living/simple_mob/animal/giant_spider/ion, +/turf/simulated/floor/carpet/bcarpet, +/area/submap/Manor1) +"pl" = ( +/mob/living/simple_mob/animal/giant_spider/broodmother, +/obj/effect/spider/stickyweb/dark, +/turf/simulated/floor/carpet/purcarpet, +/area/submap/Manor1) +"pA" = ( +/obj/structure/table/woodentable, +/obj/item/weapon/paper{ + info = "I am done with all of you. Father has gone missing, and no one cares. Mother contunies to stay up all day, chanting, and staring into space. Brother keeps going out hunting with his gang of friends. The spiders are watching me and just keep getting bigger. I am done. After the feast tonight, I am leaving, and I am taking our squish butler."; + name = "Goodbye" + }, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"pI" = ( +/obj/structure/bed/chair/wood{ + dir = 4; + icon_state = "wooden_chair" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spider/stickyweb, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"pR" = ( +/obj/structure/bed/chair/wood{ + dir = 8; + icon_state = "wooden_chair" + }, +/mob/living/simple_mob/animal/giant_spider/electric, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"rg" = ( +/obj/effect/spider/stickyweb, +/turf/simulated/floor/carpet/purcarpet, +/area/submap/Manor1) +"rj" = ( +/obj/structure/loot_pile/surface/bones, +/turf/simulated/floor/carpet/purcarpet, +/area/submap/Manor1) +"ro" = ( +/obj/item/weapon/bone/skull/unknown, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"rS" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/carpet/bcarpet, +/area/submap/Manor1) +"sD" = ( +/obj/structure/table/woodentable, +/obj/effect/spider/stickyweb/dark, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"sL" = ( +/obj/effect/spider/stickyweb, +/obj/effect/spider/stickyweb, +/turf/simulated/floor/carpet/bcarpet, +/area/submap/Manor1) +"sV" = ( +/obj/structure/sink{ + pixel_y = 30 + }, +/obj/effect/spider/stickyweb, +/turf/simulated/floor/tiled/hydro, +/area/submap/Manor1) +"tt" = ( +/obj/effect/decal/cleanable/blood/drip, +/obj/effect/spider/stickyweb, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"tM" = ( +/obj/structure/table/standard, +/obj/item/weapon/reagent_containers/food/snacks/lasagna, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"ua" = ( +/obj/item/weapon/material/knife, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"ut" = ( +/obj/structure/bed/chair/wood, +/obj/effect/spider/stickyweb, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"uA" = ( +/obj/structure/closet/cabinet, +/obj/item/clothing/shoes/boots/winter/climbing, +/obj/item/clothing/suit/storage/hooded/wintercoat/kilanocoat, +/obj/item/clothing/head/hood/winter, +/obj/effect/spider/stickyweb, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"vd" = ( +/obj/structure/table/woodentable, +/obj/item/toy/plushie/carp/void, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"vI" = ( +/mob/living/simple_mob/animal/giant_spider/thermic, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"wp" = ( +/mob/living/simple_mob/animal/giant_spider/electric, +/turf/simulated/floor/carpet/bcarpet, +/area/submap/Manor1) +"ws" = ( +/obj/item/weapon/material/kitchen/utensil/spoon, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"ww" = ( +/obj/structure/table/standard, +/obj/item/weapon/reagent_containers/food/snacks/sausage, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"xH" = ( +/obj/structure/table/woodentable, +/obj/item/weapon/reagent_containers/food/snacks/sharkmeatcooked, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"xI" = ( +/obj/item/weapon/bone/ribs, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"yI" = ( +/obj/effect/decal/cleanable/dirt, +/mob/living/simple_mob/animal/giant_spider/carrier, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"zV" = ( +/obj/structure/table/standard, +/obj/item/weapon/reagent_containers/food/snacks/jelliedtoast, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"Aq" = ( +/mob/living/simple_mob/animal/giant_spider/nurse, +/obj/effect/spider/stickyweb, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"At" = ( +/obj/effect/decal/cleanable/dirt, +/mob/living/simple_mob/animal/giant_spider/thermic, +/turf/simulated/floor/carpet/bcarpet, +/area/submap/Manor1) +"AJ" = ( +/obj/structure/bed, +/obj/item/weapon/bedsheet, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"AM" = ( +/obj/effect/spider/stickyweb, +/turf/simulated/floor/carpet/bcarpet, +/area/submap/Manor1) +"AQ" = ( +/obj/structure/table/woodentable, +/obj/random/explorer_shield, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"Bb" = ( +/mob/living/simple_mob/construct/wraith, +/obj/effect/decal/cleanable/blood/splatter, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"Bz" = ( +/obj/item/weapon/bone/leg, +/turf/simulated/floor/carpet/turcarpet, +/area/submap/Manor1) +"BC" = ( +/obj/random/humanoidremains, +/turf/simulated/floor/carpet/purcarpet, +/area/submap/Manor1) +"BE" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spider/stickyweb, +/turf/simulated/floor/carpet/purcarpet, +/area/submap/Manor1) +"CL" = ( +/obj/effect/rune, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"CO" = ( +/obj/structure/bed/chair/wood{ + dir = 1; + icon_state = "wooden_chair" + }, +/obj/effect/spider/stickyweb, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"DL" = ( +/obj/structure/table/woodentable, +/obj/item/weapon/reagent_containers/food/snacks/meatsteak, +/obj/effect/spider/stickyweb, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"DW" = ( +/obj/structure/table/woodentable, +/obj/item/weapon/gun/energy/locked/frontier/rifle, +/obj/item/clothing/suit/storage/hooded/techpriest{ + armor = list("melee"=20,"bullet"=10,"laser"=50,"energy"=60,"bomb"=25,"bio"=50,"rad"=25) + }, +/obj/item/weapon/shield/energy/imperial, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"Fc" = ( +/obj/effect/decal/cleanable/cobweb2, +/obj/effect/spider/stickyweb, +/obj/random/humanoidremains, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"FA" = ( +/obj/structure/bed/chair/wood{ + dir = 4; + icon_state = "wooden_chair" + }, +/obj/effect/spider/stickyweb/dark, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"FH" = ( +/obj/effect/decal/cleanable/blood/splatter, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"FU" = ( +/obj/structure/bed/chair/wood{ + dir = 4; + icon_state = "wooden_chair" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/mob/living/simple_mob/animal/giant_spider/carrier, +/obj/effect/spider/stickyweb, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"Gg" = ( +/obj/structure/loot_pile/surface/bones, +/obj/effect/spider/stickyweb, +/obj/item/weapon/gun/projectile/gyropistol, +/turf/simulated/floor/carpet/purcarpet, +/area/submap/Manor1) +"GM" = ( +/mob/living/simple_mob/animal/giant_spider/ion, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"GU" = ( +/obj/structure/bed/chair/wood{ + dir = 4; + icon_state = "wooden_chair" + }, +/obj/effect/spider/stickyweb/dark, +/obj/effect/spider/stickyweb/dark, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"Hd" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spider/stickyweb, +/obj/effect/spider/stickyweb, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"Hl" = ( +/mob/living/simple_mob/animal/giant_spider/nurse, +/turf/simulated/floor/carpet/turcarpet, +/area/submap/Manor1) +"Hu" = ( +/obj/structure/table/woodentable, +/obj/item/device/flashlight/lamp, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"HJ" = ( +/obj/structure/table/woodentable, +/obj/item/weapon/material/kitchen/utensil/fork, +/obj/effect/spider/stickyweb, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"Ig" = ( +/obj/structure/bed/chair/wood{ + dir = 4; + icon_state = "wooden_chair" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spider/stickyweb/dark, +/mob/living/simple_mob/animal/giant_spider/electric, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"Iz" = ( +/obj/effect/spider/stickyweb, +/mob/living/simple_mob/animal/giant_spider/webslinger, +/turf/simulated/floor/tiled/hydro, +/area/submap/Manor1) +"Jh" = ( +/obj/structure/toilet{ + dir = 8; + icon_state = "toilet00" + }, +/mob/living/simple_mob/animal/giant_spider/lurker, +/turf/simulated/floor/tiled/hydro, +/area/submap/Manor1) +"Jn" = ( +/obj/structure/table/woodentable, +/obj/random/drinksoft, +/obj/effect/spider/stickyweb/dark, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"Js" = ( +/obj/structure/bed/chair/wood{ + dir = 8; + icon_state = "wooden_chair" + }, +/obj/random/humanoidremains, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"KN" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"LR" = ( +/obj/structure/table/woodentable, +/obj/item/weapon/reagent_containers/food/snacks/sharkmeatcooked, +/obj/effect/spider/stickyweb, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"Md" = ( +/mob/living/simple_mob/animal/giant_spider/carrier, +/obj/effect/spider/stickyweb, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"Ms" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spider/stickyweb, +/obj/effect/spider/stickyweb, +/obj/item/weapon/gun/projectile/automatic/advanced_smg, +/obj/random/humanoidremains, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"ML" = ( +/obj/structure/bed/chair/comfy/purp{ + dir = 4; + icon_state = "comfychair_preview" + }, +/obj/effect/spider/stickyweb, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"MZ" = ( +/obj/effect/spider/stickyweb/dark, +/mob/living/simple_mob/animal/giant_spider/nurse, +/turf/simulated/floor/carpet/purcarpet, +/area/submap/Manor1) +"Nc" = ( +/obj/effect/decal/cleanable/dirt, +/mob/living/simple_mob/animal/giant_spider/nurse, +/obj/effect/spider/stickyweb, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"ND" = ( +/obj/structure/table/woodentable, +/obj/item/weapon/material/knife/ritual, +/obj/item/weapon/material/sharpeningkit, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"Oo" = ( +/obj/structure/bed/chair/wood{ + dir = 8; + icon_state = "wooden_chair" + }, +/obj/effect/decal/cleanable/dirt, +/obj/random/humanoidremains, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"ON" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spider/stickyweb/dark, +/turf/simulated/floor/carpet/purcarpet, +/area/submap/Manor1) +"OZ" = ( +/obj/structure/table/rack, +/obj/random/grenade/lethal, +/obj/random/grenade/lethal, +/obj/random/grenade/lethal, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"Pg" = ( +/obj/item/weapon/bone/arm, +/obj/effect/spider/stickyweb, +/turf/simulated/floor/carpet/turcarpet, +/area/submap/Manor1) +"Pi" = ( +/obj/structure/table/woodentable, +/obj/item/weapon/gun/projectile/deagle/gold, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"Pw" = ( +/obj/effect/decal/cleanable/dirt, +/obj/random/humanoidremains, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"PY" = ( +/obj/structure/table/standard, +/obj/effect/spider/stickyweb, +/obj/item/weapon/reagent_containers/food/snacks/slice/meatbread/filled, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"Qh" = ( +/obj/structure/bed/chair/wood{ + dir = 8; + icon_state = "wooden_chair" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/mob/living/simple_mob/animal/giant_spider/carrier, +/obj/effect/spider/stickyweb/dark, +/obj/effect/spider/stickyweb/dark, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"QW" = ( +/obj/structure/table/woodentable, +/obj/item/device/flashlight/lamp, +/obj/effect/spider/stickyweb, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"RI" = ( +/obj/structure/table/woodentable, +/obj/effect/spider/stickyweb, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"RX" = ( +/obj/structure/table/woodentable, +/obj/item/weapon/gun/energy/hooklauncher/ring, +/obj/random/medical/pillbottle, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"Sl" = ( +/obj/item/weapon/material/kitchen/utensil/fork, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"Sx" = ( +/obj/structure/table/woodentable, +/obj/item/weapon/paper, +/obj/effect/spider/stickyweb, +/obj/effect/spider/stickyweb, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"Sy" = ( +/obj/structure/table/woodentable, +/obj/random/drinksoft, +/obj/effect/spider/stickyweb, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"SC" = ( +/obj/structure/table/woodentable, +/obj/random/drinksoft, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"Tv" = ( +/obj/structure/flora/pottedplant/drooping, +/obj/effect/spider/stickyweb, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"Uh" = ( +/mob/living/simple_mob/animal/giant_spider/pepper, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"UD" = ( +/mob/living/simple_mob/animal/giant_spider/webslinger, +/turf/simulated/floor/carpet/bcarpet, +/area/submap/Manor1) +"UF" = ( +/mob/living/simple_mob/animal/giant_spider/webslinger, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"VX" = ( +/mob/living/simple_mob/animal/giant_spider/carrier, +/turf/simulated/floor/carpet/bcarpet, +/area/submap/Manor1) +"VY" = ( +/obj/effect/spider/stickyweb, +/turf/simulated/floor/tiled/hydro, +/area/submap/Manor1) +"WS" = ( +/obj/effect/spider/stickyweb, +/turf/simulated/floor/carpet/turcarpet, +/area/submap/Manor1) +"Xc" = ( +/obj/structure/bed/chair/wood{ + dir = 4; + icon_state = "wooden_chair" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spider/stickyweb/dark, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"XE" = ( +/obj/item/weapon/bone/leg, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"YL" = ( +/obj/effect/spider/stickyweb/dark, +/obj/item/weapon/bone, +/obj/item/weapon/bone, +/obj/item/weapon/bone/arm, +/obj/item/weapon/bone/arm, +/obj/item/weapon/bone/leg, +/obj/item/weapon/bone/leg, +/obj/item/weapon/bone/ribs, +/obj/item/weapon/bone/ribs, +/obj/item/weapon/bone/skull, +/obj/item/weapon/gun/energy/pummeler, +/turf/simulated/floor/carpet/purcarpet, +/area/submap/Manor1) +"YY" = ( +/obj/item/weapon/bone, +/obj/effect/spider/stickyweb, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"Za" = ( +/obj/structure/bed/chair/wood{ + dir = 4; + icon_state = "wooden_chair" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spider/stickyweb, +/obj/random/humanoidremains, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"ZG" = ( +/obj/structure/bed/chair/wood{ + dir = 8; + icon_state = "wooden_chair" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spider/stickyweb/dark, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"ZK" = ( +/obj/structure/bed/chair/wood{ + dir = 8; + icon_state = "wooden_chair" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spider/stickyweb/dark, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) +"ZV" = ( +/obj/effect/decal/cleanable/blood/drip, +/mob/living/simple_mob/animal/giant_spider/nurse, +/obj/effect/spider/stickyweb, +/turf/simulated/floor/holofloor/wood, +/area/submap/Manor1) (1,1,1) = {" cN @@ -959,7 +1780,7 @@ aa ab ab ag -ag +xI ab ab aa @@ -1009,9 +1830,9 @@ ab ab ab ab +aN ag -ag -ag +XE ag ab ab @@ -1035,23 +1856,23 @@ ax ab ag as -ag -ag -aD +an +an +Hu ab -aD +QW +aK +YY ag ag -ag -ag -ag -ag -ag -ag -az +aN +aK +aK +aK +oM ab bR -ag +cE ag ag bQ @@ -1073,32 +1894,32 @@ aa ab ab at -ag +an as ag ab ag -ag -al +Pw +bz ab -al -bh +RI +CO ag ag ag ag ag -ag -ag -al +ro +aK +RI ab az ag -ag +xI bq bQ ag -ag +aN al ab ab @@ -1121,10 +1942,10 @@ ag ab aT aM -aO +AJ ab bg -ag +cE bk aO al @@ -1132,7 +1953,7 @@ by ag ag ag -ag +aK ab bS ag @@ -1197,21 +2018,21 @@ aa aa ab ak -ag -ag -ag -ag -ag -ag -ag -ag -ag -ag -al -az -al -ag -ag +an +an +an +KN +an +KN +aK +aK +aK +aK +RI +oM +RI +aK +aK an an ag @@ -1222,10 +2043,10 @@ bq ag bq ag -ah +aI ab -cv -cw +sV +VY cw cw cw @@ -1238,21 +2059,21 @@ cN aa aa ab -ag -aq -aq -aq -aq -aq -aq -aq -aq -aq +KN +ar +ar +ar aq aq aq aq +le +AM +AM +AM +AM aq +VX ar ar ar @@ -1262,11 +2083,11 @@ aq aq aq aq +wp aq -aq -aq -as -cw +AM +kv +Iz ab cF ab @@ -1280,18 +2101,18 @@ cN aa aa ab -ag -aq +an +rS aq ag ag ag ag ag +UF ag -ag -ag -ag +aK +aK ag ag an @@ -1305,12 +2126,12 @@ ag ag ag ag -ag -ag +aK +aK ab cx ab -cG +Jh ab cG ab @@ -1322,7 +2143,7 @@ cN aa aa ab -ag +aK aq aq ag @@ -1364,16 +2185,16 @@ cN aa aa ab -al -aq +RI aq +UD az ab aF ag ag -ag -ag +gF +ab ag ag ag @@ -1394,7 +2215,7 @@ bW ab cy cw -cw +jl cw cw ab @@ -1411,11 +2232,11 @@ ar aq al ab -aG +aH +FH +CL ag aU -aU -aU ag aU aU @@ -1448,21 +2269,21 @@ cN aa aa ab -al -ar +RI +eL aq al ab +hN +bh +Bb +DW +ab ag ag -ag -ag -ag -ag -ag -ag -an +cE an +yI an an an @@ -1490,15 +2311,15 @@ cN aa aa ab -ag -ar +aK +eL aq ag ab -al +gF ag -aU -aU +CL +FH aU ag aU @@ -1532,16 +2353,16 @@ cN aa aa ab -an +aA ar ar an ab -aH -ag -ag -ag +ND ag +FH +gF +ab an an an @@ -1553,7 +2374,7 @@ ag ag ai ab -an +aA an ab ab @@ -1574,7 +2395,7 @@ cN aa ab ab -an +aA ar ar an @@ -1595,15 +2416,15 @@ ab ab ab ab -an -an +aA +aA ab bY ag ag ag -bY -bY +fo +OZ ab ab ab @@ -1616,7 +2437,7 @@ cN ab ab ag -ag +cE ar ar an @@ -1626,25 +2447,25 @@ aK ag ag ag +cE ag -ag -ag -ag -an -an -an -an +fT +aK +aA +aA +aA +Ms bH ab ab -an -an +aA +aA ab +lz ag +cE ag -ag -ag -ag +aN cC ab ab @@ -1670,16 +2491,16 @@ ad ad ad ad -ad -ad -ad +bP +bP +bP bt bt -an -an +Nc +aA ab ab -an +aA an ab bZ @@ -1700,7 +2521,7 @@ cN ac ae ag -ag +vI aq ar aB @@ -1708,17 +2529,17 @@ ab aK aP al +Pi +SC al -al -al -al -aG -al -al -al +DL +Sx +Sy +RI +jr al bh -an +aA ab ab as @@ -1751,27 +2572,27 @@ ag aP aV al +kb +sD +Jn +jd +xH al -al -al -al -al -al -al +SC al bh -ag +aK ab al ag ag -al -al -cj +RI +RI +uA ab ab -cz -cE +Fc +cD ab aa aa @@ -1782,7 +2603,7 @@ cN (26,1,1) = {" cN ac -ag +Md ag an ar @@ -1790,16 +2611,16 @@ ar ag ab ag -ag -af -af -af -af -af -af +fT af af af +ZG +Qh +ZK +ZK +Oo +pR af ag ag @@ -1808,9 +2629,9 @@ al ag ag ag -ag -ck -co +Md +cC +gf ab ab ab @@ -1824,25 +2645,25 @@ cN (27,1,1) = {" cN ab -ah -ag +aI +nq an ar ar an ab aL +BC aQ -aQ -aQ -aQ -aQ -aQ -aQ -aQ -aQ -aQ -aQ +bU +BE +ie +cP +cP +MZ +cP +bU +rj aQ aQ bN @@ -1852,7 +2673,7 @@ aQ bU bU bU -bU +BE cr bU bU @@ -1866,8 +2687,8 @@ cN (28,1,1) = {" cN ab -ai -ag +Tv +aK an ar ar @@ -1875,18 +2696,18 @@ an ab aL aQ +ja +Gg +jD +BE +BE +pl +ON +YL +ON aQ aQ -aQ -aQ -aQ -aQ -aQ -aQ -aQ -aQ -aQ -aQ +rg bN aQ aQ @@ -1908,30 +2729,30 @@ cN (29,1,1) = {" cN ac -ag -ag +Md +aK an ar ar ag ab ag +eq +bP +bt +Za +bt +FU +pI +Xc +FA +Ig +GU ag -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ag -ag +aK ab al -ag +aN ag ag ag @@ -1950,29 +2771,29 @@ cN (30,1,1) = {" cN ac -ad -ag -ag -ar +bP +aK +aK ar +At ag ab -ag -aP -aV -al -al -al -al -al -al -al -al -al -bh -an +aK +ut +HJ +gY +LR +RI +Sy +fx +jc +sD +Jn +sD +hM +aA ab -al +RI ag ag al @@ -1980,8 +2801,8 @@ ca cj ab ab -az -al +oM +RI ab aa aa @@ -1993,26 +2814,26 @@ cN cN ac aj -ag +aK ag ar ar ag ab -ag -aP +aK +ut +nr +RI +Sy al +kb al +SC al -al -al -al -al -al -al -bz +eI +jd bD -an +aA ab ab as @@ -2021,9 +2842,9 @@ ab ab ab ab -ag -af -ag +aK +jG +nq ab aa aa @@ -2034,27 +2855,27 @@ cN (32,1,1) = {" cN ac -af -ag +jG +aK ag aq ar ag ab -ag -ag -af -af -af +aK +Aq +jG +jG af af af af +Js af bu -bu -an -an +dt +ew +aA ab ab ag @@ -2064,8 +2885,8 @@ cb ag ag ag -ag -ag +aK +aK ab aa aa @@ -2083,19 +2904,19 @@ aq aq ag ab -ah +aI +aK +aK +ag +ag +fT ag ag ag ag -ag -ag -ag -ag -ag -an -an -an +aA +aA +Hd bI ab ab @@ -2105,9 +2926,9 @@ ab cc cl cl +Bz cl -cl -ag +aK ab ab aa @@ -2146,11 +2967,11 @@ ag ab ag cl +Hl cl cl -cl -ag -ah +aK +aI ab ab ab @@ -2169,18 +2990,18 @@ ag ab ag aR -aR -aR +tM +zV bb ag ag ag ag ag +Sl ag ag -ag -ag +UF bO ab ag @@ -2192,8 +3013,8 @@ cl cl cl ag -ag -al +aK +RI cM ab aa @@ -2204,10 +3025,10 @@ cN aa aa ab -ag +aK +UD aq -aq -ag +aK ab aM ag @@ -2215,14 +3036,14 @@ ag ag ag ag +aN ag ag ag ag ag ag -ag -ag +aK aK ab ag @@ -2236,7 +3057,7 @@ cl cl cl cl -al +RI ab aa cN @@ -2246,12 +3067,12 @@ cN aa aa ab -ag +aK aq -aq -ag +AM +aK ab -ag +aK aR aW aZ @@ -2261,7 +3082,7 @@ ag ag ag ag -aR +bF bA bE bF @@ -2275,10 +3096,10 @@ cl cl cl cl +ck cl cl -cl -al +RI ab aa cN @@ -2288,32 +3109,32 @@ cN aa aa ab -al -aq -aq -al +RI +AM +AM +RI ab -ag +aK aR aX -aR +ww bc ag -ag +ua ag ag ag bv -aR bF +PY bJ aK ab -ag +aK ag ab -ag -cl +aK +WS cl cl cl @@ -2330,33 +3151,33 @@ cN aa aa ab -al -aq -aq -al +RI +AM +AM +RI ab +aK ag ag ag ag +cE ag ag +aN ag ag -ag -ag -ag -ag -ag -ag +aK +aK +aK +aK +ab +aK ag ab -ag -ag -ab -ag -cl -cl +aK +Pg +WS cl cl cl @@ -2372,34 +3193,34 @@ cN aa aa ab -al -aq +RI +AM aq aC ab -aN +cz aS aY ba bd ag ag -ag +ws ag ag ag bB bG bK -ag +aK ab -ag -ag +aK +aK ab cg -aD -al -al +QW +RI +RI ag cl cl @@ -2414,10 +3235,10 @@ cN aa aa ab -ag +aK +AM aq -aq -ag +aK ab ab ab @@ -2435,16 +3256,16 @@ ab ab ab ab -ag -ag +aK +aK ab ab ab ab ab ag -cl -cl +Bz +Hl cl ag ab @@ -2456,39 +3277,39 @@ cN aa aa ab -ag +aK aq aq -ag -ag -ag +aK +aK +lz ag al +aK +aK +aK +aK +aK ag ag ag ag ag ag -ag -ag -ag -ag -ag -ag -ag -ag -ag -ag -ag -ag +aK +aK +aK +Md +aK +aK +aK ah ab ag cl cl cl -ag +aK ab aa cN @@ -2507,6 +3328,8 @@ aq aq aq aq +AM +sL aq aq aq @@ -2516,21 +3339,19 @@ aq aq aq aq -aq -aq -aq -aq -aq -aq -aq +AM +AM +AM +AM +pf aq aq as ag cl cl -cl -ag +WS +aK ab aa cN @@ -2540,39 +3361,39 @@ cN aa aa ab -ai -ag -ag -ag -ag -ag -ag -ag -ag -ag -ag -ag -ag -ag -ag -ag -ag -ag +lU +GM +ag +ag +ag +Uh +ag +aK +aK +aK +aK +aK ag ag ag ag ag ag +aK +aK +aK +aK +aK +aK ag ag ah ab ah ag -ag -ag -ah +aK +aK +ks ab aa cN @@ -2641,20 +3462,20 @@ ag ag ag ag -al aD -al -al +ab az +pA +ab al ag ag -bq -ag +tt +aK cs -ag +aK cA -ag +aK cI ab ab @@ -2667,8 +3488,8 @@ aa aa ab ap -ag -ag +aN +hu ab ag ag @@ -2683,19 +3504,19 @@ bl bo bl bl -bl -bl -bl -bw -bl -bl +RI +ab +RX +eT +ab +al bl bp bw bw -bl +jK cA -bq +ZV cI ab ab @@ -2712,32 +3533,32 @@ ab ab aw ab -ag +aN ag as ag as ag -ag +aN ab ag bm bp bw -bl -bl -bl -bl -bP -bP +jK +RI +ab +vd +an +ab +al bT -bl ch bl bl bw -cB ag +aK ab ab aa @@ -2755,7 +3576,7 @@ ab ab ab aE -al +AQ ab ag ab @@ -2765,18 +3586,18 @@ ab ag ag bq -ag -ag -ag -al -al -al +Aq +aA +gc +eA +KN +an +ab al ag -bV -ag ag ag +cE ag ag ab @@ -2807,7 +3628,7 @@ ab ab ag br -bx +ML bC ab ab @@ -2815,7 +3636,7 @@ ab ab ab ab -ag +lz bx cm cp @@ -2849,7 +3670,7 @@ aa ab ab bs -bs +my ab ab aa From 51d3d2d5f448a981fe4d6042eeaa01f8dc2589b2 Mon Sep 17 00:00:00 2001 From: SarmentiCampbell <111698205+UniquaSa@users.noreply.github.com> Date: Fri, 2 Dec 2022 17:51:58 +0100 Subject: [PATCH 08/75] done --- .../code/modules/mining/shelter_atoms_ch.dm | 2 + .../code/modules/mining/shelters_ch.dm | 8 +- .../shelters/RestaurationBar-32x32.dmm | 360 ++++++++++++++++++ 3 files changed, 369 insertions(+), 1 deletion(-) create mode 100644 modular_chomp/maps/submaps/shelters/RestaurationBar-32x32.dmm diff --git a/modular_chomp/code/modules/mining/shelter_atoms_ch.dm b/modular_chomp/code/modules/mining/shelter_atoms_ch.dm index 8c4046ba1e..bcf39dec62 100644 --- a/modular_chomp/code/modules/mining/shelter_atoms_ch.dm +++ b/modular_chomp/code/modules/mining/shelter_atoms_ch.dm @@ -83,6 +83,8 @@ /area/survivalpod/superpose/AnimalHospital +/area/survivalpod/superpose/RestaurationBar + /obj/item/device/survivalcapsule/superpose name = "superposed surfluid shelter capsule" desc = "A proprietary hyperstructure of many three-dimensional spaces superposed around a supermatter nano crystal; use a pen to reach the reset button. There's a license for use printed on the bottom." diff --git a/modular_chomp/code/modules/mining/shelters_ch.dm b/modular_chomp/code/modules/mining/shelters_ch.dm index 111737147e..208b3a4496 100644 --- a/modular_chomp/code/modules/mining/shelters_ch.dm +++ b/modular_chomp/code/modules/mining/shelters_ch.dm @@ -252,4 +252,10 @@ shelter_id = "AnimalHospital" mappath = "modular_chomp/maps/submaps/shelters/AnimalHospital-20x28.dmm" name = "Low-Tech Hospital." - description = "An animal hospital, doesnt not contain high end medical supplies, better then nothing." \ No newline at end of file + description = "An animal hospital, doesnt not contain high end medical supplies, better then nothing." + +/datum/map_template/shelter/superpose/RestaurationBar + shelter_id = "RestaurationBar" + mappath = "modular_chomp/maps/submaps/shelters/RestaurationBar-32x32.dmm" + name = "Resto-Bar" + description = "A large restaurant for food and drink, two overnight rental rooms and a small garden." diff --git a/modular_chomp/maps/submaps/shelters/RestaurationBar-32x32.dmm b/modular_chomp/maps/submaps/shelters/RestaurationBar-32x32.dmm new file mode 100644 index 0000000000..52c24e2db6 --- /dev/null +++ b/modular_chomp/maps/submaps/shelters/RestaurationBar-32x32.dmm @@ -0,0 +1,360 @@ +"aS" = (/obj/item/weapon/gun/energy/sizegun,/obj/item/device/bodysnatcher,/obj/item/weapon/handcuffs/fuzzy,/obj/item/weapon/handcuffs/legcuffs/fuzzy,/obj/item/clothing/accessory/collar,/obj/item/weapon/tape_roll,/obj/item/device/perfect_tele/one_beacon,/obj/item/weapon/disk/nifsoft/compliance,/obj/item/selectable_item/chemistrykit,/obj/item/selectable_item/chemistrykit,/obj/item/selectable_item/chemistrykit,/obj/item/capture_crystal,/obj/structure/closet/secure_closet/personal,/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) +"aY" = (/obj/structure/table/reinforced,/obj/random/drinksoft,/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) +"bj" = (/obj/machinery/vending/giftvendor,/turf/simulated/floor/carpet/purcarpet,/area/survivalpod/superpose/RestaurationBar) +"bl" = (/obj/machinery/atm{pixel_x = 30},/obj/effect/floor_decal/spline/fancy/wood{dir = 9},/obj/item/weapon/stool/padded,/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) +"bm" = (/obj/structure/bed/chair/oldsofa{dir = 1},/obj/effect/floor_decal/spline/fancy/wood,/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) +"bo" = (/obj/effect/floor_decal/corner/lime/border,/turf/simulated/floor/tiled/hydro,/area/survivalpod/superpose/RestaurationBar) +"br" = (/obj/structure/table/marble,/obj/item/weapon/reagent_containers/food/drinks/drinkingglass,/turf/simulated/floor/lino,/area/survivalpod/superpose/RestaurationBar) +"bB" = (/obj/machinery/atm{pixel_x = 30},/obj/effect/floor_decal/spline/fancy{dir = 5},/turf/simulated/floor/carpet/purple,/area/survivalpod/superpose/RestaurationBar) +"bH" = (/obj/structure/bookcase,/obj/item/weapon/book/bundle/custom_library/reference/ThermodynamicReactionsandResearch,/obj/item/weapon/book/bundle/custom_library/fiction/ghostship,/turf/simulated/floor/carpet/purcarpet,/area/survivalpod/superpose/RestaurationBar) +"bJ" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/structure/sink/kitchen{dir = 8; pixel_x = -13},/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/RestaurationBar) +"bN" = (/obj/structure/toilet{dir = 8},/obj/effect/floor_decal/corner/purple/diagonal,/obj/item/toy/plushie/suswhite,/turf/simulated/floor/tiled/freezer,/area/survivalpod/superpose/RestaurationBar) +"bU" = (/obj/machinery/newscaster{pixel_y = 30},/obj/structure/bed/chair/office,/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) +"ci" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 4},/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) +"cB" = (/obj/structure/bookcase,/obj/item/weapon/book/codex/lore/robutt,/obj/item/weapon/book/bundle/custom_library/fiction/metalglen,/obj/item/weapon/book/bundle/custom_library/fiction/silence,/obj/item/weapon/book/bundle/custom_library/fiction/taleoftherainbowcat,/obj/item/weapon/book/bundle/custom_library/religious/zoroastrianism,/obj/machinery/light{dir = 1; layer = 3},/turf/simulated/floor/carpet/purcarpet,/area/survivalpod/superpose/RestaurationBar) +"cK" = (/obj/structure/bed/double/padded,/obj/item/weapon/bedsheet/orangedouble,/turf/simulated/floor/carpet/oracarpet,/area/survivalpod/superpose/RestaurationBar) +"cL" = (/obj/machinery/button/remote/airlock{id = "awaydorm_restaurationbar1"; name = "Bolt Control"; pixel_y = -29; specialfunctions = 4},/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) +"cT" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1; health = 1e+006; req_access = list(5)},/obj/structure/window/reinforced{health = 1e+006},/turf/space,/area/survivalpod/superpose/RestaurationBar) +"da" = (/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/effect/floor_decal/spline/fancy/wood{dir = 10},/obj/item/weapon/stool/padded,/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) +"ds" = (/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/structure/window/reinforced{dir = 1},/obj/structure/grille,/turf/simulated/floor,/area/survivalpod/superpose/RestaurationBar) +"dN" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/machinery/light{dir = 8; icon_state = "tube1"},/obj/structure/closet/crate/bin,/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/RestaurationBar) +"dP" = (/obj/machinery/honey_extractor,/obj/effect/floor_decal/corner/lime/border{dir = 1},/turf/simulated/floor/tiled/hydro,/area/survivalpod/superpose/RestaurationBar) +"ec" = (/obj/machinery/computer/security/telescreen/entertainment{pixel_x = 32},/obj/item/weapon/material/ashtray/glass,/obj/effect/floor_decal/spline/fancy/wood{dir = 8},/obj/item/weapon/flame/lighter/random,/obj/item/weapon/storage/fancy/cigarettes/professionals,/obj/item/weapon/storage/fancy/cigar/havana,/obj/structure/table/hardwoodtable,/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) +"ei" = (/obj/structure/table/gamblingtable,/obj/item/weapon/paper_bin,/obj/item/weapon/pen,/turf/simulated/floor/carpet/purcarpet,/area/survivalpod/superpose/RestaurationBar) +"el" = (/obj/machinery/light{layer = 3},/obj/effect/floor_decal/corner/purple/diagonal,/turf/simulated/floor/tiled/freezer,/area/survivalpod/superpose/RestaurationBar) +"ep" = (/obj/structure/flora/ausbushes/ppflowers,/turf/simulated/floor/outdoors/grass/sif,/area/template_noop) +"ex" = (/obj/structure/bed/chair/wood{dir = 8},/turf/simulated/floor/carpet/purcarpet,/area/survivalpod/superpose/RestaurationBar) +"eB" = (/obj/machinery/space_heater,/turf/simulated/floor/carpet/purple,/area/survivalpod/superpose/RestaurationBar) +"eD" = (/obj/structure/table/gamblingtable,/obj/item/weapon/storage/pill_bottle/dice,/turf/simulated/floor/carpet/purcarpet,/area/survivalpod/superpose/RestaurationBar) +"eE" = (/obj/structure/table/hardwoodtable,/obj/effect/floor_decal/spline/fancy/wood{dir = 1},/obj/item/weapon/flame/candle,/obj/item/device/taperecorder,/obj/random/instrument,/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) +"eF" = (/obj/structure/table/fancyblack,/obj/effect/floor_decal/spline/fancy/wood{dir = 1},/obj/item/weapon/cane,/obj/item/device/radio/subspace{desc = "A heavy duty radio that can pick up all manor of shortwave and subspace frequencies. It's a bit bulkier than a normal radio thanks to the extra hardware. An engraving on the frame reads: IF FOUND, RETURN TO THE BAR!"; name = "Bar subspace radio"; pixel_y = 5},/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) +"eK" = (/obj/structure/closet/crate/bin,/turf/simulated/floor/tiled/freezer,/area/survivalpod/superpose/RestaurationBar) +"eN" = (/obj/structure/sink{pixel_y = 16},/obj/structure/mirror{pixel_y = 32},/obj/effect/floor_decal/corner/yellow/diagonal,/turf/simulated/floor/tiled/freezer,/area/survivalpod/superpose/RestaurationBar) +"fa" = (/obj/machinery/appliance/cooker/oven,/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/machinery/light{dir = 1; layer = 3},/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/RestaurationBar) +"fc" = (/obj/structure/bed/chair/wood,/obj/effect/floor_decal/spline/fancy/wood{dir = 8},/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) +"ff" = (/obj/effect/floor_decal/corner/lime/bordercorner{dir = 4},/turf/simulated/floor/tiled/hydro,/area/survivalpod/superpose/RestaurationBar) +"fi" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1; health = 1e+006; req_access = list(5)},/obj/structure/window/reinforced{dir = 8; health = null},/obj/structure/window/reinforced{health = 1e+006},/turf/simulated/floor,/area/survivalpod/superpose/RestaurationBar) +"fq" = (/obj/machinery/light{layer = 3},/obj/effect/floor_decal/corner/yellow/diagonal,/turf/simulated/floor/tiled/freezer,/area/survivalpod/superpose/RestaurationBar) +"ft" = (/obj/structure/table/marble,/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/item/weapon/reagent_containers/food/snacks/mint,/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/whetstone,/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/RestaurationBar) +"fZ" = (/obj/structure/flora/ausbushes/brflowers,/turf/simulated/floor/outdoors/grass/sif,/area/template_noop) +"go" = (/obj/machinery/chem_master/condimaster,/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/RestaurationBar) +"gC" = (/obj/machinery/firealarm/alarms_hidden,/turf/simulated/wall,/area/survivalpod/superpose/RestaurationBar) +"gG" = (/turf/simulated/floor/lino,/area/survivalpod/superpose/RestaurationBar) +"hk" = (/obj/structure/bed/chair/wood,/turf/simulated/floor/carpet/purcarpet,/area/survivalpod/superpose/RestaurationBar) +"hr" = (/obj/structure/table/bench/glass,/obj/effect/floor_decal/spline/fancy/wood{dir = 6},/obj/machinery/light{layer = 3},/obj/structure/flora/pottedplant/thinbush{pixel_y = 10},/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) +"hu" = (/obj/machinery/appliance/cooker/fryer,/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/RestaurationBar) +"hw" = (/obj/structure/closet/walllocker_double/north{name = "Survival Cabinet"},/obj/item/weapon/storage/backpack/messenger,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/material/knife/tacknife/survival,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/reagent_containers/hypospray/autoinjector/trauma,/obj/item/weapon/reagent_containers/hypospray/autoinjector/oxy,/obj/item/weapon/storage/box/survival/space,/obj/item/device/radio,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/weapon/reagent_containers/pill/dylovene,/obj/item/device/flashlight/maglight,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/random/soap,/obj/item/weapon/gun/energy/locked/frontier/handbow/unlocked,/obj/item/device/fbp_backup_cell,/obj/item/device/pda,/obj/item/device/starcaster_news,/obj/item/device/suit_cooling_unit/emergency,/obj/item/device/gps,/obj/item/weapon/flame/lighter/zippo/royal,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/clothing/accessory/permit/gun,/obj/item/device/binoculars,/obj/item/bodybag/cryobag,/obj/item/weapon/cell/device/hyper,/obj/item/sticky_pad/random,/obj/item/weapon/card/id/external{desc = s},/obj/item/weapon/pen/multi,/obj/item/weapon/storage/box/khcrystal,/obj/item/weapon/storage/box/survival/comp,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting,/obj/item/stack/nanopaste,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine,/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) +"hE" = (/obj/random/pottedplant,/turf/simulated/floor/carpet/purcarpet,/area/survivalpod/superpose/RestaurationBar) +"hI" = (/obj/structure/grille,/obj/structure/window/reinforced{health = 1e+006},/obj/structure/window/reinforced{dir = 1; health = 1e+006},/turf/simulated/floor,/area/survivalpod/superpose/RestaurationBar) +"ii" = (/obj/structure/simple_door/wood,/obj/structure/simple_door/wood,/turf/simulated/floor/carpet,/area/survivalpod/superpose/RestaurationBar) +"ik" = (/obj/structure/window/reinforced{dir = 8; health = null},/obj/structure/window/reinforced{health = 1e+006},/obj/structure/curtain/black{icon_state = "open"; layer = 2; name = "privacy curtain"; opacity = 0},/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) +"iy" = (/obj/structure/window/basic{dir = 1},/obj/structure/curtain/open/shower,/obj/machinery/shower{dir = 1},/obj/effect/floor_decal/corner/yellow/diagonal,/turf/simulated/floor/tiled/freezer,/area/survivalpod/superpose/RestaurationBar) +"iz" = (/obj/structure/table/marble,/turf/simulated/floor/lino,/area/survivalpod/superpose/RestaurationBar) +"jv" = (/turf/simulated/wall/r_wall,/area/survivalpod/superpose/RestaurationBar) +"jL" = (/obj/structure/table/marble,/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{pixel_x = -3},/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{pixel_x = 3},/turf/simulated/floor/lino,/area/survivalpod/superpose/RestaurationBar) +"jV" = (/obj/effect/floor_decal/corner/lime/border,/obj/machinery/portable_atmospherics/hydroponics,/obj/machinery/light{layer = 3},/turf/simulated/floor/tiled/hydro,/area/survivalpod/superpose/RestaurationBar) +"ke" = (/obj/structure/bed/chair/wood{dir = 1},/obj/effect/floor_decal/spline/fancy/wood{dir = 6},/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) +"kz" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1; health = 1e+006; req_access = list(5)},/obj/structure/window/reinforced{health = 1e+006},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor,/area/survivalpod/superpose/RestaurationBar) +"kD" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/turf/simulated/floor,/area/survivalpod/superpose/RestaurationBar) +"ld" = (/obj/structure/bed,/obj/item/weapon/bedsheet/purple,/obj/structure/curtain/open/bed,/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) +"ll" = (/obj/effect/floor_decal/spline/fancy{dir = 1; icon_state = "spline_fancy_corner"},/turf/simulated/floor/carpet/purple,/area/survivalpod/superpose/RestaurationBar) +"ln" = (/obj/machinery/smartfridge/produce,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8; health = null},/turf/simulated/floor/tiled/hydro,/area/survivalpod/superpose/RestaurationBar) +"lo" = (/obj/structure/bed/chair/comfy/black{dir = 4},/turf/simulated/floor/carpet/oracarpet,/area/survivalpod/superpose/RestaurationBar) +"ls" = (/obj/effect/floor_decal/corner/purple/diagonal,/turf/simulated/floor/tiled/freezer,/area/survivalpod/superpose/RestaurationBar) +"lN" = (/obj/machinery/light{dir = 1},/obj/structure/extinguisher_cabinet{pixel_y = 30},/obj/machinery/door/window/eastleft,/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) +"lT" = (/obj/structure/table/gamblingtable,/obj/item/weapon/pen,/obj/item/weapon/paper_bin,/turf/simulated/floor/carpet/purcarpet,/area/survivalpod/superpose/RestaurationBar) +"lZ" = (/obj/machinery/autolathe{hacked = 1},/obj/fiftyspawner/glass,/obj/fiftyspawner/glass,/obj/fiftyspawner/steel,/obj/fiftyspawner/steel,/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) +"mp" = (/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) +"mx" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 9},/obj/machinery/light{dir = 8; icon_state = "tube1"},/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) +"mz" = (/obj/machinery/recharger/wallcharger{pixel_x = 4; pixel_y = -34},/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) +"mU" = (/obj/machinery/door/airlock{id_tag = "awaydorm_restaurationbar1"},/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) +"mZ" = (/obj/structure/casino_table/roulette_table,/obj/structure/casino_table/roulette_chart,/turf/simulated/floor/carpet/purcarpet,/area/survivalpod/superpose/RestaurationBar) +"nj" = (/obj/structure/window/reinforced{dir = 1; health = 1e+006; req_access = list(5)},/obj/structure/window/reinforced{health = 1e+006},/obj/structure/grille,/turf/simulated/floor,/area/survivalpod/superpose/RestaurationBar) +"nm" = (/obj/machinery/door/window/eastleft,/obj/effect/floor_decal/corner/lime/border{dir = 4},/turf/simulated/floor/tiled/hydro,/area/survivalpod/superpose/RestaurationBar) +"nz" = (/obj/structure/window/reinforced{dir = 4},/obj/effect/floor_decal/corner/lime/border{dir = 4},/turf/simulated/floor/tiled/hydro,/area/survivalpod/superpose/RestaurationBar) +"nB" = (/obj/structure/table/marble,/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/machinery/microwave,/obj/effect/map_effect/perma_light,/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/RestaurationBar) +"nJ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/window/reinforced{health = 1e+006},/turf/simulated/floor,/area/survivalpod/superpose/RestaurationBar) +"og" = (/obj/effect/floor_decal/spline/fancy{dir = 1},/obj/structure/prop/statue/pillar/dark,/obj/effect/map_effect/perma_light,/turf/simulated/floor/carpet/purple,/area/survivalpod/superpose/RestaurationBar) +"ow" = (/obj/machinery/computer/security/telescreen/entertainment{pixel_x = 32},/turf/simulated/floor/lino,/area/survivalpod/superpose/RestaurationBar) +"oQ" = (/obj/effect/floor_decal/spline/fancy{dir = 8},/turf/simulated/floor/carpet/purple,/area/survivalpod/superpose/RestaurationBar) +"po" = (/obj/structure/casino_table/blackjack_m,/obj/item/weapon/deck/cards,/obj/machinery/light/floortube,/turf/simulated/floor/carpet/purcarpet,/area/survivalpod/superpose/RestaurationBar) +"pv" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/structure/closet/secure_closet/freezer/meat,/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/RestaurationBar) +"pB" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 5},/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) +"pF" = (/obj/structure/flora/ausbushes/ppflowers,/mob/living/simple_mob/vore/alienanimals/teppi/baby,/turf/simulated/floor/grass,/area/survivalpod/superpose/RestaurationBar) +"pW" = (/obj/machinery/computer/arcade{dir = 4},/turf/simulated/floor/carpet/purcarpet,/area/survivalpod/superpose/RestaurationBar) +"qp" = (/obj/machinery/space_heater,/turf/simulated/floor/carpet/brown,/area/survivalpod/superpose/RestaurationBar) +"qt" = (/obj/machinery/light,/turf/simulated/floor/tiled/freezer,/area/survivalpod/superpose/RestaurationBar) +"qv" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 9},/obj/effect/floor_decal/spline/fancy/wood{dir = 9},/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) +"qx" = (/obj/structure/table/fancyblack,/obj/random/mug,/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) +"qy" = (/obj/structure/bed,/obj/item/weapon/bedsheet/blue,/obj/structure/curtain/open/bed,/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) +"qD" = (/obj/machinery/space_heater,/turf/simulated/floor/carpet/oracarpet,/area/survivalpod/superpose/RestaurationBar) +"qO" = (/obj/effect/floor_decal/corner/lime/border{dir = 10},/obj/structure/sink{dir = 8; pixel_x = -12},/obj/structure/extinguisher_cabinet{pixel_y = -30},/turf/simulated/floor/tiled/hydro,/area/survivalpod/superpose/RestaurationBar) +"qV" = (/obj/structure/flora/ausbushes/stalkybush,/turf/simulated/floor/outdoors/grass/sif,/area/template_noop) +"qZ" = (/obj/machinery/biogenerator,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/tiled/hydro,/area/survivalpod/superpose/RestaurationBar) +"rd" = (/obj/structure/table/reinforced,/obj/item/weapon/deskbell,/turf/simulated/floor/wood/broken,/area/survivalpod/superpose/RestaurationBar) +"rg" = (/obj/structure/table/rack/shelf,/obj/random/soap,/obj/item/weapon/towel/random,/obj/item/weapon/makeover,/obj/effect/floor_decal/corner/yellow/diagonal,/turf/simulated/floor/tiled/freezer,/area/survivalpod/superpose/RestaurationBar) +"rh" = (/obj/machinery/replicator/clothing,/turf/simulated/floor/tiled/freezer,/area/survivalpod/superpose/RestaurationBar) +"rO" = (/obj/machinery/vending/dinnerware{req_log_access = null},/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/RestaurationBar) +"rS" = (/obj/machinery/recharger/wallcharger{pixel_x = 4; pixel_y = 26},/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) +"si" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/structure/extinguisher_cabinet{pixel_x = -28},/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/RestaurationBar) +"sj" = (/obj/structure/flora/ausbushes/leafybush,/turf/simulated/floor/outdoors/grass/sif,/area/template_noop) +"sl" = (/obj/machinery/door/airlock{name = "Toilet"},/turf/simulated/floor/tiled/freezer,/area/survivalpod/superpose/RestaurationBar) +"sy" = (/obj/effect/floor_decal/spline/fancy/wood,/obj/effect/floor_decal/spline/fancy/wood/corner{dir = 4},/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) +"sA" = (/obj/structure/bed/double/padded,/obj/item/weapon/bedsheet/purpledouble,/turf/simulated/floor/carpet/purple,/area/survivalpod/superpose/RestaurationBar) +"sC" = (/obj/machinery/appliance/cooker/grill,/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/RestaurationBar) +"sI" = (/obj/structure/table/marble,/obj/item/weapon/reagent_containers/glass/rag,/turf/simulated/floor/lino,/area/survivalpod/superpose/RestaurationBar) +"sJ" = (/obj/structure/curtain/black,/turf/simulated/floor/carpet/purcarpet,/area/survivalpod/superpose/RestaurationBar) +"sP" = (/obj/structure/table/marble,/obj/item/weapon/storage/box/glasses/meta/metapint,/turf/simulated/floor/lino,/area/survivalpod/superpose/RestaurationBar) +"sY" = (/obj/machinery/vending/hydronutrients{req_log_access = null},/obj/machinery/light{dir = 1; layer = 3},/obj/effect/floor_decal/corner/lime/border{dir = 1},/turf/simulated/floor/tiled/hydro,/area/survivalpod/superpose/RestaurationBar) +"sZ" = (/obj/structure/bed/chair/wood{dir = 8},/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) +"tc" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/curtain/black{icon_state = "open"; layer = 2; name = "privacy curtain"; opacity = 0},/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) +"tj" = (/obj/item/weapon/deck/cards,/obj/structure/table/fancyblack,/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) +"tz" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1; health = 1e+006; req_access = list(5)},/obj/structure/window/reinforced{health = 1e+006},/obj/structure/grille,/turf/simulated/floor,/area/survivalpod/superpose/RestaurationBar) +"tA" = (/obj/structure/flora/ausbushes/ywflowers,/turf/simulated/floor/grass,/area/survivalpod/superpose/RestaurationBar) +"tC" = (/obj/machinery/vending/snack{dir = 4},/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) +"tQ" = (/obj/structure/casino_table/blackjack_r,/turf/simulated/floor/carpet/purcarpet,/area/survivalpod/superpose/RestaurationBar) +"uo" = (/obj/structure/bed/chair/wood{dir = 1},/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) +"uu" = (/obj/structure/bed/chair/oldsofa/left{dir = 1},/obj/effect/floor_decal/spline/fancy/wood,/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) +"uw" = (/obj/structure/table/standard,/obj/item/device/flashlight/lamp,/turf/simulated/floor/carpet/purple,/area/survivalpod/superpose/RestaurationBar) +"uJ" = (/obj/structure/closet/walllocker_double/north{name = "Survival Cabinet"},/obj/item/weapon/storage/backpack/messenger,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/material/knife/tacknife/survival,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/reagent_containers/hypospray/autoinjector/trauma,/obj/item/weapon/reagent_containers/hypospray/autoinjector/oxy,/obj/item/weapon/storage/box/survival/space,/obj/item/device/radio,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/weapon/reagent_containers/pill/dylovene,/obj/item/device/flashlight/maglight,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/random/soap,/obj/item/weapon/gun/energy/locked/frontier/rifle/unlocked,/obj/item/device/fbp_backup_cell,/obj/item/device/pda,/obj/item/device/starcaster_news,/obj/item/device/suit_cooling_unit/emergency,/obj/item/device/gps,/obj/item/weapon/flame/lighter/zippo/black,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/clothing/accessory/permit/gun,/obj/item/device/binoculars,/obj/item/bodybag/cryobag,/obj/item/weapon/cell/device/hyper,/obj/item/sticky_pad/random,/obj/item/weapon/card/id/external{desc = s},/obj/item/weapon/pen/multi,/obj/item/weapon/storage/box/khcrystal,/obj/item/weapon/storage/box/survival/comp,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting,/obj/item/stack/nanopaste,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine,/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) +"uM" = (/obj/effect/floor_decal/spline/fancy/wood,/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) +"uO" = (/obj/structure/table/marble,/obj/item/weapon/reagent_containers/food/drinks/shaker,/turf/simulated/floor/lino,/area/survivalpod/superpose/RestaurationBar) +"uX" = (/obj/machinery/appliance/mixer/cereal,/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/RestaurationBar) +"vf" = (/turf/simulated/floor/carpet,/area/survivalpod/superpose/RestaurationBar) +"vq" = (/obj/structure/table/gamblingtable,/obj/item/weapon/storage/dicecup/loaded,/turf/simulated/floor/carpet/purcarpet,/area/survivalpod/superpose/RestaurationBar) +"vs" = (/obj/effect/floor_decal/spline/fancy,/turf/simulated/floor/carpet/purple,/area/survivalpod/superpose/RestaurationBar) +"vz" = (/obj/structure/bed/chair/wood{dir = 1},/turf/simulated/floor/carpet/purcarpet,/area/survivalpod/superpose/RestaurationBar) +"vB" = (/obj/structure/window/basic,/obj/structure/curtain/open/shower,/obj/machinery/shower{pixel_y = 16},/obj/effect/floor_decal/corner/purple/diagonal,/turf/simulated/floor/tiled/freezer,/area/survivalpod/superpose/RestaurationBar) +"vG" = (/obj/machinery/media/jukebox/hacked,/obj/effect/floor_decal/spline/fancy/wood{dir = 6},/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) +"vM" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1; health = 1e+006; req_access = list(5)},/obj/structure/window/reinforced{health = 1e+006},/turf/simulated/floor,/area/survivalpod/superpose/RestaurationBar) +"wg" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 4},/obj/machinery/computer/security/telescreen/entertainment{pixel_x = 32},/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) +"wm" = (/obj/structure/closet/toolcloset,/obj/item/weapon/storage/firstaid/regular,/obj/item/weapon/storage/firstaid/fire,/obj/item/weapon/storage/firstaid/toxin,/obj/item/weapon/storage/firstaid/o2,/obj/item/weapon/module/id_auth,/obj/item/weapon/module/card_reader,/obj/item/weapon/module/cell_power,/obj/item/weapon/module/power_control,/obj/item/weapon/circuitboard/microwave,/obj/item/weapon/circuitboard/mass_driver,/obj/item/weapon/circuitboard/jukebox,/obj/item/weapon/circuitboard/intercom,/obj/item/weapon/circuitboard/firealarm,/obj/item/weapon/circuitboard/airalarm,/obj/item/weapon/cell/high,/obj/item/weapon/cell/high,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/weapon/tape_roll,/obj/item/weapon/tape_roll,/obj/item/weapon/reagent_containers/spray/cleaner,/obj/item/weapon/storage/box/lights/mixed,/obj/item/weapon/storage/box/lights/mixed,/obj/item/weapon/storage/belt/utility/full/multitool,/obj/item/weapon/storage/bag/trash,/obj/item/weapon/storage/bag/trash,/obj/item/weapon/storage/backpack/dufflebag/eng,/obj/item/device/geiger,/obj/item/device/mapping_unit,/obj/item/clothing/under/waiter,/obj/item/clothing/under/waiter,/obj/item/clothing/shoes/dress,/obj/item/clothing/shoes/dress,/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) +"wp" = (/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/machinery/recharger/wallcharger{pixel_x = 36; pixel_y = 3},/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) +"xj" = (/obj/machinery/button/remote/airlock{id = "awaydorm_restaurationbar"; name = "Bolt Control"; pixel_y = 30; specialfunctions = 4},/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) +"xn" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 4},/obj/effect/map_effect/perma_light,/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) +"xo" = (/obj/machinery/seed_storage/garden,/obj/effect/floor_decal/corner/lime/border{dir = 9},/turf/simulated/floor/tiled/hydro,/area/survivalpod/superpose/RestaurationBar) +"xq" = (/obj/structure/table/fancyblack,/obj/item/trash/plate,/obj/item/weapon/material/kitchen/utensil/spoon,/obj/effect/map_effect/perma_light,/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) +"xt" = (/obj/structure/table/rack,/obj/effect/map_effect/perma_light,/turf/simulated/floor/carpet,/area/survivalpod/superpose/RestaurationBar) +"xG" = (/obj/structure/bed/chair/wood{dir = 1},/obj/effect/floor_decal/spline/fancy/wood{dir = 8},/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) +"xK" = (/obj/structure/toilet{dir = 4},/obj/effect/floor_decal/corner/yellow/diagonal,/turf/simulated/floor/tiled/freezer,/area/survivalpod/superpose/RestaurationBar) +"xM" = (/obj/effect/floor_decal/spline/fancy{dir = 9},/turf/simulated/floor/carpet/purple,/area/survivalpod/superpose/RestaurationBar) +"xN" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/RestaurationBar) +"xO" = (/turf/simulated/floor/carpet/purple,/area/survivalpod/superpose/RestaurationBar) +"xP" = (/obj/item/capture_crystal,/turf/simulated/floor/tiled/freezer,/area/survivalpod/superpose/RestaurationBar) +"yv" = (/obj/structure/table/marble,/obj/machinery/light{layer = 3},/obj/machinery/chemical_dispenser/bar_soft/full{dir = 1},/obj/item/weapon/reagent_containers/chem_disp_cartridge/gelatin,/turf/simulated/floor/lino,/area/survivalpod/superpose/RestaurationBar) +"yL" = (/obj/effect/floor_decal/corner/yellow/diagonal,/turf/simulated/floor/tiled/freezer,/area/survivalpod/superpose/RestaurationBar) +"yS" = (/obj/effect/floor_decal/corner/lime/border{dir = 8},/turf/simulated/floor/tiled/hydro,/area/survivalpod/superpose/RestaurationBar) +"yT" = (/obj/structure/table/fancyblack,/obj/item/weapon/reagent_containers/food/drinks/drinkingglass,/obj/random/drinkbottle,/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) +"zA" = (/obj/machinery/vending/boozeomat{req_log_access = null; req_access = null},/turf/simulated/floor/lino,/area/survivalpod/superpose/RestaurationBar) +"zG" = (/obj/structure/bed/chair/wood{dir = 4},/obj/effect/floor_decal/spline/fancy/wood{dir = 8},/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) +"zN" = (/obj/structure/bed/chair/wood,/obj/effect/floor_decal/spline/fancy/wood{dir = 5},/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) +"Ae" = (/turf/simulated/wall,/area/survivalpod/superpose/RestaurationBar) +"Af" = (/obj/structure/table/marble,/obj/item/weapon/material/ashtray/glass,/obj/machinery/recharger,/turf/simulated/floor/lino,/area/survivalpod/superpose/RestaurationBar) +"Aq" = (/obj/machinery/smartfridge/drinks,/turf/simulated/floor/lino,/area/survivalpod/superpose/RestaurationBar) +"As" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/grille,/obj/structure/window/reinforced/polarized{id = "gamble_restaurationbar_ch"},/turf/simulated/floor,/area/survivalpod/superpose/RestaurationBar) +"AG" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{dir = 1; health = 1e+006; req_access = list(5)},/turf/simulated/floor,/area/survivalpod/superpose/RestaurationBar) +"AJ" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 1},/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) +"AR" = (/obj/structure/table/gamblingtable,/obj/item/weapon/deck/holder,/obj/random/drinksoft,/turf/simulated/floor/carpet/purcarpet,/area/survivalpod/superpose/RestaurationBar) +"AT" = (/obj/item/weapon/stool/padded,/turf/simulated/floor/lino,/area/survivalpod/superpose/RestaurationBar) +"AW" = (/obj/machinery/vending/hydroseeds{req_log_access = null},/obj/effect/floor_decal/corner/lime/border{dir = 1},/obj/machinery/light{dir = 1; layer = 3},/turf/simulated/floor/tiled/hydro,/area/survivalpod/superpose/RestaurationBar) +"Bl" = (/turf/simulated/floor/tiled/freezer,/area/survivalpod/superpose/RestaurationBar) +"Br" = (/obj/structure/bed/chair/wood{dir = 4},/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) +"BC" = (/obj/structure/closet/crate,/obj/item/stack/material/cardboard{amount = 50},/obj/item/stack/material/cardboard{amount = 50},/obj/item/stack/material/cardboard{amount = 50},/obj/item/stack/material/cardboard{amount = 50},/obj/fiftyspawner/blucarpet,/obj/fiftyspawner/oracarpet,/obj/fiftyspawner/purcarpet,/obj/fiftyspawner/sblucarpet,/obj/fiftyspawner/tealcarpet,/obj/fiftyspawner/turcarpet,/obj/item/stack/material/wood{amount = 50; color = "#824B28"},/obj/item/stack/material/wood{amount = 50; color = "#824B28"},/obj/item/stack/material/wood/hard{amount = 50},/obj/item/stack/material/wood/hard{amount = 50},/obj/item/stack/material/wood/sif{amount = 50},/obj/item/stack/material/wood/sif{amount = 50},/obj/item/stack/material/marble{amount = 50},/obj/item/stack/material/marble{amount = 50},/obj/item/stack/material/marble{amount = 50},/obj/item/stack/material/cloth{amount = 50},/obj/item/stack/material/cloth{amount = 50},/obj/item/stack/material/algae{amount = 50},/obj/item/stack/material/sandstone,/obj/item/stack/material/sandstone,/obj/item/stack/material/sandstone,/obj/item/stack/material/lead{amount = 30},/obj/item/stack/material/plasteel{amount = 30; pixel_y = 5},/obj/item/stack/material/resin{amount = 50},/obj/item/stack/material/smolebricks{amount = 50},/obj/item/stack/material/smolebricks{amount = 50},/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) +"BK" = (/obj/machinery/vending/wallmed1{name = "NanoMed Wall"; pixel_y = 28},/turf/simulated/floor/tiled/freezer,/area/survivalpod/superpose/RestaurationBar) +"BX" = (/obj/structure/extinguisher_cabinet{dir = 1; pixel_y = -30},/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/structure/closet/crate/bin,/turf/simulated/floor/carpet/brown,/area/survivalpod/superpose/RestaurationBar) +"Ci" = (/turf/simulated/floor/carpet/brown,/area/survivalpod/superpose/RestaurationBar) +"Cj" = (/obj/structure/table/rack,/turf/simulated/floor/carpet,/area/survivalpod/superpose/RestaurationBar) +"CW" = (/obj/structure/grille,/obj/structure/window/reinforced{health = 1e+006},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor,/area/survivalpod/superpose/RestaurationBar) +"Dc" = (/obj/structure/table/fancyblack,/obj/item/weapon/newspaper,/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) +"Di" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/structure/closet/secure_closet/freezer/kitchen{req_access = null},/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/RestaurationBar) +"Do" = (/obj/structure/window/reinforced{dir = 8; health = null},/obj/structure/window/reinforced{dir = 1; health = 1e+006; req_access = list(5)},/obj/structure/curtain/black{icon_state = "open"; layer = 2; name = "privacy curtain"; opacity = 0},/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) +"DF" = (/obj/structure/table/marble,/obj/structure/reagent_dispensers/beerkeg,/turf/simulated/floor/lino,/area/survivalpod/superpose/RestaurationBar) +"DU" = (/obj/structure/bed/chair/oldsofa{dir = 1},/turf/simulated/floor/carpet/purcarpet,/area/survivalpod/superpose/RestaurationBar) +"DV" = (/obj/structure/bed/chair/wood{dir = 8},/obj/effect/floor_decal/spline/fancy/wood{dir = 1},/obj/machinery/light{dir = 1; layer = 3},/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) +"Ee" = (/obj/structure/closet/secure_closet/freezer/fridge,/obj/item/weapon/storage/fancy/egg_box,/obj/item/weapon/storage/fancy/egg_box,/obj/item/weapon/reagent_containers/food/drinks/bottle/milk,/obj/item/weapon/reagent_containers/food/drinks/bottle/milk,/obj/item/weapon/reagent_containers/food/drinks/bottle/milk,/obj/item/weapon/reagent_containers/food/drinks/bottle/cream,/obj/item/weapon/reagent_containers/food/drinks/bottle/cream,/obj/item/weapon/reagent_containers/food/drinks/bottle/cream,/obj/item/weapon/reagent_containers/food/drinks/bottle/cream,/obj/item/weapon/reagent_containers/food/condiment/carton/sugar,/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/RestaurationBar) +"Eh" = (/obj/structure/bed/chair/wood{dir = 8},/obj/effect/floor_decal/spline/fancy/wood{dir = 1},/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) +"Ez" = (/obj/machinery/power/apc/alarms_hidden,/turf/simulated/wall,/area/survivalpod/superpose/RestaurationBar) +"EA" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 8},/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) +"EQ" = (/obj/structure/bed/chair/comfy/black{dir = 8},/turf/simulated/floor/carpet/oracarpet,/area/survivalpod/superpose/RestaurationBar) +"ET" = (/obj/machinery/vending/wallmed1{name = "NanoMed Wall"; pixel_y = -30},/turf/simulated/floor/carpet/brown,/area/survivalpod/superpose/RestaurationBar) +"Ff" = (/obj/structure/table/standard,/obj/random/donkpocketbox,/obj/item/device/starcaster_news,/turf/simulated/floor/carpet/oracarpet,/area/survivalpod/superpose/RestaurationBar) +"Fi" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/structure/table/marble,/obj/item/weapon/material/kitchen/utensil/fork,/obj/item/weapon/material/kitchen/utensil/fork,/obj/item/weapon/material/kitchen/utensil/fork,/obj/item/weapon/material/kitchen/utensil/fork,/obj/item/weapon/material/kitchen/utensil/fork,/obj/item/weapon/material/kitchen/utensil/fork,/obj/item/weapon/material/kitchen/utensil/fork,/obj/item/weapon/material/kitchen/utensil/fork,/obj/item/weapon/material/kitchen/utensil/spoon,/obj/item/weapon/material/kitchen/utensil/spoon,/obj/item/weapon/material/kitchen/utensil/spoon,/obj/item/weapon/material/kitchen/utensil/spoon,/obj/item/weapon/material/kitchen/utensil/spoon,/obj/item/weapon/material/kitchen/utensil/spoon,/obj/item/weapon/material/kitchen/utensil/spoon,/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/RestaurationBar) +"Fk" = (/obj/machinery/appliance/mixer/candy,/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/RestaurationBar) +"Fl" = (/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/floor/lino,/area/survivalpod/superpose/RestaurationBar) +"FE" = (/obj/machinery/vending/cola{dir = 4},/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) +"FI" = (/turf/simulated/floor/carpet/oracarpet,/area/survivalpod/superpose/RestaurationBar) +"FO" = (/obj/structure/table/hardwoodtable,/obj/effect/floor_decal/spline/fancy/wood{dir = 10},/obj/item/weapon/pen,/obj/item/device/taperecorder,/obj/item/weapon/paper_bin,/obj/effect/map_effect/perma_light,/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) +"FV" = (/obj/machinery/light{dir = 8; icon_state = "tube1"},/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) +"FW" = (/obj/structure/window/reinforced{health = 1e+006},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/structure/grille,/turf/simulated/floor,/area/survivalpod/superpose/RestaurationBar) +"Gj" = (/turf/simulated/floor/grass,/area/survivalpod/superpose/RestaurationBar) +"Gx" = (/obj/effect/floor_decal/corner/lime/border{dir = 1},/obj/machinery/seed_extractor,/turf/simulated/floor/tiled/hydro,/area/survivalpod/superpose/RestaurationBar) +"GB" = (/obj/structure/table/marble,/obj/item/weapon/reagent_containers/food/snacks/pancakes,/turf/simulated/floor/lino,/area/survivalpod/superpose/RestaurationBar) +"GC" = (/obj/structure/window/reinforced{health = 1e+006},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/structure/grille,/turf/simulated/floor,/area/survivalpod/superpose/RestaurationBar) +"GD" = (/obj/structure/window/reinforced{health = 1e+006},/obj/effect/floor_decal/corner/lime/border{dir = 6},/turf/simulated/floor/tiled/hydro,/area/survivalpod/superpose/RestaurationBar) +"GI" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{health = 1e+006},/turf/simulated/floor,/area/survivalpod/superpose/RestaurationBar) +"GN" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8; health = null},/turf/simulated/floor,/area/survivalpod/superpose/RestaurationBar) +"GU" = (/obj/item/weapon/stool/padded,/obj/effect/floor_decal/spline/fancy/wood,/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) +"HC" = (/obj/structure/closet/crate,/obj/item/stack/material/plastic{amount = 50},/obj/item/stack/material/plastic{amount = 50},/obj/item/stack/material/plastic{amount = 50},/obj/item/stack/material/plastic{amount = 50},/obj/item/stack/material/steel{amount = 50},/obj/item/stack/material/steel{amount = 50},/obj/item/stack/material/steel{amount = 50},/obj/item/stack/material/steel{amount = 50},/obj/item/stack/material/glass{amount = 50},/obj/item/stack/material/glass{amount = 50},/obj/item/stack/material/glass{amount = 50},/obj/item/stack/material/glass{amount = 50},/obj/item/stack/rods{amount = 50},/obj/item/stack/rods{amount = 50},/obj/item/stack/rods{amount = 50},/obj/item/stack/rods{amount = 50},/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = 3},/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = 3},/obj/item/stack/cable_coil/green,/obj/item/stack/cable_coil/blue,/obj/item/weapon/storage/briefcase/inflatable,/obj/item/weapon/storage/briefcase/inflatable,/obj/item/weapon/storage/briefcase/inflatable,/obj/item/weapon/storage/briefcase/inflatable,/obj/item/weapon/storage/toolbox/syndicate/powertools{pixel_y = 9},/obj/item/weapon/storage/toolbox/mechanical{pixel_y = 5},/obj/item/weapon/storage/toolbox/electrical,/obj/item/weapon/storage/belt/utility/full/multitool,/obj/item/weapon/storage/belt/utility/full/multitool,/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) +"HH" = (/obj/machinery/door/airlock/glass,/turf/simulated/floor/tiled/hydro,/area/survivalpod/superpose/RestaurationBar) +"HK" = (/obj/machinery/door/airlock{name = "Unit 1"},/turf/simulated/floor/tiled/freezer,/area/survivalpod/superpose/RestaurationBar) +"HL" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 1},/obj/effect/floor_decal/spline/fancy/wood/corner,/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) +"HQ" = (/obj/effect/floor_decal/spline/fancy{dir = 1},/turf/simulated/floor/carpet/purple,/area/survivalpod/superpose/RestaurationBar) +"HV" = (/obj/effect/floor_decal/corner/lime/bordercorner,/turf/simulated/floor/tiled/hydro,/area/survivalpod/superpose/RestaurationBar) +"Ix" = (/obj/structure/bed/chair/oldsofa{dir = 8},/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/item/toy/plushie/blue_fox,/turf/simulated/floor/carpet/purcarpet,/area/survivalpod/superpose/RestaurationBar) +"IB" = (/turf/simulated/floor/tiled/hydro,/area/survivalpod/superpose/RestaurationBar) +"II" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/structure/table/marble,/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/RestaurationBar) +"IO" = (/obj/effect/floor_decal/spline/fancy{dir = 6},/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/structure/closet/crate/bin,/turf/simulated/floor/carpet/purple,/area/survivalpod/superpose/RestaurationBar) +"IR" = (/obj/effect/map_effect/perma_light,/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) +"Jb" = (/obj/structure/bed/chair/oldsofa/corner{dir = 8},/turf/simulated/floor/carpet/purcarpet,/area/survivalpod/superpose/RestaurationBar) +"Jf" = (/obj/structure/table/standard,/obj/item/device/flashlight/lamp,/turf/simulated/floor/carpet/oracarpet,/area/survivalpod/superpose/RestaurationBar) +"Jg" = (/obj/structure/table/reinforced,/obj/machinery/recharger,/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) +"Jj" = (/obj/machinery/light{layer = 3},/obj/machinery/vending/wallmed1{name = "NanoMed Wall"; pixel_y = -30},/turf/simulated/floor/carpet/brown,/area/survivalpod/superpose/RestaurationBar) +"Jo" = (/obj/structure/table/fancyblack,/obj/item/weapon/reagent_containers/food/drinks/drinkingglass,/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) +"JH" = (/obj/machinery/computer/arcade{dir = 8},/turf/simulated/floor/carpet/purcarpet,/area/survivalpod/superpose/RestaurationBar) +"JQ" = (/obj/effect/floor_decal/corner/lime/border{dir = 5},/obj/machinery/smartfridge/drying_rack,/turf/simulated/floor/tiled/hydro,/area/survivalpod/superpose/RestaurationBar) +"JS" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/structure/window/reinforced{health = 1e+006},/turf/simulated/floor,/area/survivalpod/superpose/RestaurationBar) +"JU" = (/obj/structure/table/hardwoodtable,/obj/effect/floor_decal/spline/fancy/wood{dir = 9},/obj/random/mug,/obj/item/weapon/reagent_containers/food/snacks/croissant,/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) +"Kc" = (/turf/template_noop,/area/template_noop) +"Kh" = (/obj/structure/casino_table/blackjack_l,/obj/random/contraband,/turf/simulated/floor/carpet/purcarpet,/area/survivalpod/superpose/RestaurationBar) +"Kl" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/turf/simulated/floor,/area/survivalpod/superpose/RestaurationBar) +"Km" = (/obj/structure/table/marble,/obj/machinery/chemical_dispenser/bar_coffee/full{dir = 1},/obj/item/weapon/reagent_containers/chem_disp_cartridge/nothing,/turf/simulated/floor/lino,/area/survivalpod/superpose/RestaurationBar) +"Ko" = (/obj/structure/table/marble,/obj/item/weapon/paper_bin,/obj/item/weapon/pen/multi,/turf/simulated/floor/lino,/area/survivalpod/superpose/RestaurationBar) +"Kw" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/machinery/door/airlock/glass,/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/RestaurationBar) +"KP" = (/obj/effect/floor_decal/spline/fancy/wood/cee{dir = 8},/obj/machinery/light{dir = 8; icon_state = "tube1"},/obj/structure/flora/pottedplant/tall,/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) +"KR" = (/mob/living/simple_mob/vore/alienanimals/teppi/baby,/turf/simulated/floor/grass,/area/survivalpod/superpose/RestaurationBar) +"KS" = (/obj/structure/flora/ausbushes/fullgrass,/turf/simulated/floor/grass,/area/survivalpod/superpose/RestaurationBar) +"La" = (/obj/machinery/door/airlock{id_tag = "awaydorm_restaurationbar"},/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) +"Lc" = (/obj/structure/extinguisher_cabinet{pixel_x = 25},/obj/effect/floor_decal/spline/fancy/wood{dir = 4},/obj/machinery/space_heater,/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) +"Lk" = (/obj/structure/grille,/obj/structure/window/reinforced{health = 1e+006},/obj/structure/window/reinforced{dir = 1; health = 1e+006},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor,/area/survivalpod/superpose/RestaurationBar) +"Lo" = (/obj/effect/floor_decal/corner/lime/bordercorner{dir = 1},/turf/simulated/floor/tiled/hydro,/area/survivalpod/superpose/RestaurationBar) +"Ly" = (/obj/effect/floor_decal/spline/fancy/wood/corner,/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) +"LA" = (/obj/structure/bed/chair/oldsofa/corner{dir = 1},/obj/effect/floor_decal/spline/fancy/wood{dir = 10},/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) +"LE" = (/obj/structure/window/basic{dir = 1},/turf/simulated/floor/tiled/freezer,/area/survivalpod/superpose/RestaurationBar) +"LG" = (/obj/machinery/beehive,/turf/simulated/floor/grass,/area/survivalpod/superpose/RestaurationBar) +"LH" = (/obj/machinery/door/airlock{name = "Unit 2"},/turf/simulated/floor/tiled/freezer,/area/survivalpod/superpose/RestaurationBar) +"LL" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced/polarized{id = "gamble_restaurationbar_ch"},/turf/simulated/floor,/area/survivalpod/superpose/RestaurationBar) +"LR" = (/obj/effect/floor_decal/spline/fancy{dir = 10},/turf/simulated/floor/carpet/purple,/area/survivalpod/superpose/RestaurationBar) +"LV" = (/obj/machinery/newscaster,/turf/simulated/wall,/area/survivalpod/superpose/RestaurationBar) +"LY" = (/obj/structure/table/rack/shelf,/obj/random/soap,/obj/item/weapon/towel/random,/obj/item/weapon/makeover,/obj/effect/floor_decal/corner/purple/diagonal,/turf/simulated/floor/tiled/freezer,/area/survivalpod/superpose/RestaurationBar) +"Mb" = (/obj/machinery/button/windowtint{id = "gamble_restaurationbar_ch"; pixel_x = -12; pixel_y = -24},/turf/simulated/floor/carpet/purcarpet,/area/survivalpod/superpose/RestaurationBar) +"Mi" = (/obj/structure/sign/nosmoking_2,/turf/simulated/wall,/area/survivalpod/superpose/RestaurationBar) +"MB" = (/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) +"MF" = (/obj/structure/grille,/obj/structure/window/reinforced{health = 1e+006},/obj/structure/window/reinforced{dir = 1; health = 1e+006},/obj/structure/window/reinforced{dir = 8; health = null},/turf/simulated/floor,/area/survivalpod/superpose/RestaurationBar) +"MM" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8; health = null},/obj/structure/window/reinforced{dir = 1; health = 1e+006; req_access = list(5)},/turf/simulated/floor,/area/survivalpod/superpose/RestaurationBar) +"MY" = (/obj/structure/table/standard,/obj/random/soap,/obj/item/weapon/towel/random,/obj/item/weapon/towel/random,/obj/random/soap,/obj/random/soap,/obj/item/weapon/towel/random,/turf/simulated/floor/tiled/freezer,/area/survivalpod/superpose/RestaurationBar) +"Nb" = (/obj/structure/table/gamblingtable,/obj/item/weapon/storage/pill_bottle/dice,/obj/item/device/communicator,/obj/item/weapon/lipstick/random,/obj/item/weapon/material/ashtray/glass,/turf/simulated/floor/carpet/purcarpet,/area/survivalpod/superpose/RestaurationBar) +"Nd" = (/obj/machinery/door/airlock/maintenance/common{name = "Restricted Area"},/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) +"Ne" = (/obj/machinery/space_heater,/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) +"Nj" = (/obj/structure/table/marble,/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/machinery/reagentgrinder,/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/RestaurationBar) +"Nn" = (/obj/machinery/vending/cigarette,/turf/simulated/floor/carpet/brown,/area/survivalpod/superpose/RestaurationBar) +"NE" = (/obj/item/weapon/stool/padded,/turf/simulated/floor/carpet/purcarpet,/area/survivalpod/superpose/RestaurationBar) +"NR" = (/obj/structure/bed/chair/wood{dir = 4},/obj/effect/floor_decal/spline/fancy/wood{dir = 1},/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) +"Oj" = (/obj/structure/flora/ausbushes/sunnybush,/turf/simulated/floor/outdoors/grass/sif,/area/template_noop) +"Ok" = (/obj/effect/floor_decal/corner/lime/border,/obj/machinery/portable_atmospherics/hydroponics,/turf/simulated/floor/tiled/hydro,/area/survivalpod/superpose/RestaurationBar) +"Ov" = (/obj/machinery/door/airlock{name = "Unit 3"},/turf/simulated/floor/tiled/freezer,/area/survivalpod/superpose/RestaurationBar) +"OA" = (/obj/structure/table/marble,/obj/item/weapon/storage/box/donut,/turf/simulated/floor/lino,/area/survivalpod/superpose/RestaurationBar) +"OI" = (/obj/structure/sink/puddle,/turf/simulated/floor/grass,/area/survivalpod/superpose/RestaurationBar) +"OP" = (/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/item/weapon/melee/umbrella/random,/obj/item/weapon/melee/umbrella/random,/obj/structure/table/rack,/turf/simulated/floor/carpet,/area/survivalpod/superpose/RestaurationBar) +"OR" = (/turf/simulated/floor/carpet/purcarpet,/area/survivalpod/superpose/RestaurationBar) +"Ps" = (/obj/structure/bed/chair/oldsofa/right{dir = 1},/turf/simulated/floor/carpet/purcarpet,/area/survivalpod/superpose/RestaurationBar) +"PE" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 6},/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) +"PH" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1; health = 1e+006; req_access = list(5)},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor,/area/survivalpod/superpose/RestaurationBar) +"PJ" = (/obj/structure/bed/chair/comfy/black{dir = 4},/turf/simulated/floor/carpet/purple,/area/survivalpod/superpose/RestaurationBar) +"PO" = (/obj/effect/floor_decal/spline/fancy{dir = 4},/turf/simulated/floor/carpet/purple,/area/survivalpod/superpose/RestaurationBar) +"Qa" = (/obj/structure/sign/directions/exit,/turf/simulated/wall,/area/survivalpod/superpose/RestaurationBar) +"Qh" = (/obj/structure/table/fancyblack,/obj/random/drinksoft,/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) +"Qm" = (/obj/effect/floor_decal/spline/fancy{dir = 4; icon_state = "spline_fancy_corner"},/turf/simulated/floor/carpet/purple,/area/survivalpod/superpose/RestaurationBar) +"QD" = (/obj/structure/bed/chair/wood,/obj/effect/floor_decal/spline/fancy/wood{dir = 1},/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) +"QK" = (/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/machinery/button/holosign{id = "baropen_restaurationbar_ch"; name = "Open Sign"; pixel_x = 36; pixel_y = 6},/turf/simulated/floor/lino,/area/survivalpod/superpose/RestaurationBar) +"QQ" = (/obj/structure/bed/chair/oldsofa/right,/turf/simulated/floor/carpet/purcarpet,/area/survivalpod/superpose/RestaurationBar) +"QS" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1; health = 1e+006; req_access = list(5)},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1; health = 1e+006},/obj/structure/window/reinforced{health = 1e+006},/turf/simulated/floor,/area/survivalpod/superpose/RestaurationBar) +"QX" = (/obj/structure/bed/chair/oldsofa/left{dir = 4},/obj/effect/floor_decal/spline/fancy/wood{dir = 8},/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) +"Rn" = (/obj/structure/bed/chair/oldsofa/corner,/turf/simulated/floor/carpet/purcarpet,/area/survivalpod/superpose/RestaurationBar) +"Rt" = (/turf/simulated/floor/outdoors/dirt,/area/template_noop) +"Rx" = (/obj/item/weapon/stool/padded,/obj/effect/floor_decal/spline/fancy/wood{dir = 4},/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) +"Sj" = (/obj/structure/table/hardwoodtable,/obj/effect/floor_decal/spline/fancy/wood{dir = 8},/obj/item/weapon/reagent_containers/food/snacks/berrymuffin,/obj/item/weapon/reagent_containers/food/drinks/cup{pixel_x = 8},/obj/effect/map_effect/perma_light,/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) +"Su" = (/obj/structure/sink{pixel_y = 16},/obj/structure/mirror{pixel_y = 32},/turf/simulated/floor/tiled/freezer,/area/survivalpod/superpose/RestaurationBar) +"Sz" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8; health = null},/obj/structure/window/reinforced{health = 1e+006},/turf/simulated/floor,/area/survivalpod/superpose/RestaurationBar) +"SJ" = (/obj/machinery/holosign/bar{id = "baropen_restauration_ch"},/turf/simulated/wall,/area/survivalpod/superpose/RestaurationBar) +"SS" = (/obj/effect/floor_decal/spline/fancy/wood/corner{dir = 8},/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) +"Tf" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp/green,/turf/simulated/floor/carpet/oracarpet,/area/survivalpod/superpose/RestaurationBar) +"Ti" = (/obj/machinery/holoposter,/turf/simulated/wall,/area/survivalpod/superpose/RestaurationBar) +"Tn" = (/obj/structure/simple_door/wood,/turf/simulated/floor/carpet,/area/survivalpod/superpose/RestaurationBar) +"Tu" = (/obj/structure/flora/ausbushes/fullgrass,/turf/simulated/floor/outdoors/grass/sif,/area/template_noop) +"TE" = (/obj/effect/floor_decal/spline/fancy{dir = 5},/turf/simulated/floor/carpet/purple,/area/survivalpod/superpose/RestaurationBar) +"TT" = (/obj/machinery/atm{pixel_y = -30},/turf/simulated/floor/carpet/brown,/area/survivalpod/superpose/RestaurationBar) +"TW" = (/obj/machinery/light{dir = 8; icon_state = "tube1"},/turf/simulated/floor/carpet/purcarpet,/area/survivalpod/superpose/RestaurationBar) +"Uq" = (/obj/effect/floor_decal/corner/lime/bordercorner{dir = 8},/obj/effect/floor_decal/corner/lime/bordercorner{dir = 1},/turf/simulated/floor/tiled/hydro,/area/survivalpod/superpose/RestaurationBar) +"UH" = (/obj/structure/table/hardwoodtable,/obj/effect/floor_decal/spline/fancy/wood{dir = 4},/obj/item/trash/plate,/obj/item/weapon/reagent_containers/food/snacks/hotdog,/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) +"UV" = (/obj/structure/casino_table/roulette_table,/turf/simulated/floor/carpet/purcarpet,/area/survivalpod/superpose/RestaurationBar) +"Vf" = (/turf/simulated/floor/outdoors/grass/sif,/area/template_noop) +"Vg" = (/obj/machinery/recharge_station,/obj/machinery/light/small,/turf/simulated/floor/tiled/freezer,/area/survivalpod/superpose/RestaurationBar) +"Vh" = (/obj/machinery/light{dir = 8; icon_state = "tube1"},/turf/simulated/floor/carpet/brown,/area/survivalpod/superpose/RestaurationBar) +"Vy" = (/obj/structure/sink{pixel_y = 16},/obj/structure/mirror{pixel_y = 32},/obj/effect/floor_decal/corner/purple/diagonal,/turf/simulated/floor/tiled/freezer,/area/survivalpod/superpose/RestaurationBar) +"VD" = (/obj/structure/table/standard,/obj/item/device/starcaster_news,/obj/item/weapon/reagent_containers/food/snacks/meatsteak,/turf/simulated/floor/carpet/purple,/area/survivalpod/superpose/RestaurationBar) +"VF" = (/obj/machinery/door/window/westleft{name = "Bar"},/turf/simulated/floor/lino,/area/survivalpod/superpose/RestaurationBar) +"VJ" = (/obj/structure/table/marble,/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{pixel_x = -3},/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{pixel_x = 3},/obj/item/weapon/reagent_containers/food/condiment/enzyme,/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/RestaurationBar) +"VK" = (/obj/structure/flora/ausbushes/lavendergrass,/turf/simulated/floor/outdoors/grass/sif,/area/template_noop) +"VO" = (/obj/structure/closet/crate/hydroponics{desc = "All you need to start your own honey farm."; name = "beekeeping crate"},/obj/item/beehive_assembly,/obj/item/bee_smoker,/obj/item/honey_frame,/obj/item/honey_frame,/obj/item/honey_frame,/obj/item/weapon/tool/crowbar,/obj/item/honey_frame,/obj/item/honey_frame,/obj/item/bee_pack,/obj/machinery/portable_atmospherics/hydroponics/soil,/obj/machinery/light{layer = 3},/turf/simulated/floor/grass,/area/survivalpod/superpose/RestaurationBar) +"VQ" = (/obj/structure/bed/chair/wood{dir = 8},/obj/effect/floor_decal/spline/fancy/wood,/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) +"VT" = (/obj/structure/flora/ausbushes/palebush,/turf/simulated/floor/outdoors/grass/sif,/area/template_noop) +"Wc" = (/obj/machinery/portable_atmospherics/hydroponics,/obj/effect/map_effect/perma_light,/turf/simulated/floor/tiled/hydro,/area/survivalpod/superpose/RestaurationBar) +"Wt" = (/obj/structure/table/gamblingtable,/obj/item/weapon/deck/holder,/turf/simulated/floor/carpet/purcarpet,/area/survivalpod/superpose/RestaurationBar) +"WA" = (/obj/machinery/computer/arcade/clawmachine,/obj/machinery/light{dir = 1; layer = 3},/turf/simulated/floor/carpet/purcarpet,/area/survivalpod/superpose/RestaurationBar) +"WV" = (/obj/structure/closet/crate/bin,/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) +"WZ" = (/obj/effect/floor_decal/spline/fancy,/obj/structure/prop/statue/pillar/dark,/obj/effect/map_effect/perma_light,/turf/simulated/floor/carpet/purple,/area/survivalpod/superpose/RestaurationBar) +"Xp" = (/obj/structure/table/marble,/obj/item/weapon/storage/box/glasses/meta,/obj/item/weapon/storage/box/glasses/meta,/obj/item/weapon/storage/box/glasses/coffeemug{pixel_x = -6; pixel_y = 12},/obj/item/weapon/storage/box/glasses/coffeecup{pixel_x = -6; pixel_y = 1},/turf/simulated/floor/lino,/area/survivalpod/superpose/RestaurationBar) +"Xs" = (/obj/machinery/light{dir = 8; icon_state = "tube1"},/obj/item/weapon/melee/umbrella/random,/obj/item/weapon/melee/umbrella/random,/obj/structure/table/rack,/turf/simulated/floor/carpet,/area/survivalpod/superpose/RestaurationBar) +"Xt" = (/obj/machinery/light{dir = 8; icon_state = "tube1"},/obj/structure/flora/pottedplant/tropical,/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) +"XA" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/structure/window/reinforced{dir = 8; health = 1e+006},/turf/simulated/floor,/area/survivalpod/superpose/RestaurationBar) +"XI" = (/obj/structure/window/reinforced{health = 1e+006},/obj/effect/floor_decal/corner/lime/border,/turf/simulated/floor/tiled/hydro,/area/survivalpod/superpose/RestaurationBar) +"XS" = (/obj/structure/window/reinforced{health = 1e+006},/obj/structure/window/reinforced{dir = 8},/obj/structure/curtain/black{icon_state = "open"; layer = 2; name = "privacy curtain"; opacity = 0},/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) +"Yc" = (/obj/structure/table/marble,/obj/machinery/chemical_dispenser/bar_alc/full{dispense_reagents = list("iron","radium","lemon_lime","sugar","orangejuice","limejuice","sodawater","tonic","beer","kahlua","whiskey","redwine","whitewine","vodka","cider","gin","rum","tequilla","vermouth","cognac","ale","mead","bitters"); dir = 1},/obj/item/weapon/reagent_containers/chem_disp_cartridge/ethanol,/turf/simulated/floor/lino,/area/survivalpod/superpose/RestaurationBar) +"Yf" = (/obj/structure/table/hardwoodtable,/obj/effect/floor_decal/spline/fancy/wood{dir = 4},/obj/item/device/communicator,/obj/item/trash/plate,/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) +"Yg" = (/obj/structure/table/marble,/obj/item/weapon/book/manual/chef_recipes,/obj/item/weapon/material/knife/butch,/obj/item/weapon/material/kitchen/rollingpin,/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/RestaurationBar) +"Ym" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/closet/secure_closet/hydroponics{req_access = null},/obj/effect/floor_decal/corner/lime/border{dir = 6},/turf/simulated/floor/tiled/hydro,/area/survivalpod/superpose/RestaurationBar) +"Yn" = (/obj/structure/window/reinforced{dir = 8; health = null},/obj/structure/window/reinforced{dir = 1; health = 1e+006; req_access = list(5)},/obj/structure/window/reinforced{health = 1e+006},/obj/structure/grille,/turf/simulated/floor,/area/survivalpod/superpose/RestaurationBar) +"Yq" = (/obj/machinery/portable_atmospherics/hydroponics,/turf/simulated/floor/tiled/hydro,/area/survivalpod/superpose/RestaurationBar) +"YX" = (/obj/item/weapon/gun/energy/sizegun,/obj/item/device/bodysnatcher,/obj/item/weapon/handcuffs/fuzzy,/obj/item/weapon/handcuffs/legcuffs/fuzzy,/obj/item/clothing/accessory/collar,/obj/item/weapon/tape_roll,/obj/item/device/perfect_tele/one_beacon,/obj/item/weapon/disk/nifsoft/compliance,/obj/item/selectable_item/chemistrykit,/obj/item/selectable_item/chemistrykit,/obj/item/selectable_item/chemistrykit,/obj/item/selectable_item/chemistrykit,/obj/item/capture_crystal,/obj/structure/closet/secure_closet/personal,/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) +"Zb" = (/obj/structure/flora/ausbushes/grassybush,/turf/simulated/floor/outdoors/grass/sif,/area/template_noop) +"Zo" = (/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/structure/grille,/turf/simulated/floor,/area/survivalpod/superpose/RestaurationBar) +"Zz" = (/obj/structure/bed/chair/oldsofa,/turf/simulated/floor/carpet/purcarpet,/area/survivalpod/superpose/RestaurationBar) +"ZL" = (/obj/machinery/door/airlock{name = "Unisex Restrooms"},/turf/simulated/floor/tiled/freezer,/area/survivalpod/superpose/RestaurationBar) +"ZR" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp/green,/turf/simulated/floor/carpet/purple,/area/survivalpod/superpose/RestaurationBar) +"ZS" = (/obj/structure/bed/chair/comfy/black{dir = 8},/turf/simulated/floor/carpet/purple,/area/survivalpod/superpose/RestaurationBar) +"ZU" = (/obj/structure/toilet{dir = 1},/obj/machinery/light/small,/turf/simulated/floor/tiled/freezer,/area/survivalpod/superpose/RestaurationBar) + +(1,1,1) = {" +KcKcKcKcKcKcKcKcKcAeAeAeCWLLAsAsAsAsGCAeAeAeKcKcKcKcKcKcKcKcKcKc +KcKcKcKcKcKcKcKcAeTibHcBhEsJeiNEMbsJhEWAbjTiAeKcKcKcKcVfRtRtRtKc +KcKcKcKcKcKcKcqVdshkhkhkORsJKhpotQsJpWNENEJHkDZbKcKcVfVfRtRtfZKc +KcKcKcKcKcKcKcepZoWtvqeDexsJNENENEsJpWNENEJHXAVTKcVfVfTuRtRtVfKc +KcKcKcKcKcKcVfVfZovzvzvzORsJsJsJsJsJpWNENEJHXAVfVfVfVfVfRtVfVfKc +KcKcKcKcKcVfVfOjFWORORORORORORORORORORORORORnJsjVfVKVfAeTnAeAeKc +KcKcKcKcVfVfVfVfAeORNElTORORORORORORORQQZzRnAeVfVfVfVfQavfCjAeKc +KcKcKcVffZfZfZVfAeTWmZUVORORxMogTEORORNbARIxAefZfZfZfZAevfxtAeKc +TuVfVfVffZPHQSAeAeNENENEORORoQxOPOORORPsDUJbAekzvMvMcTAeTnAeAeKc +AeAeAeAefiJSmpbUlNxMHQHQHQHQQmxOllHQHQHQbBAeTiJUEhNReEDVAJzNMMKc +AeXsOPAeXtNerdaYJgLRvsvsvsvsvsWZvsvsvsvsIOAeKPuMuMuMuMuMSSYfGNKc +TnvfvfTnCiCiCiCiCiCiCiCiCiCiCiCiCiCiCiCiCiCiCiCiCiCiCiCiEAxnGNKc +iivfvfTnCiETCiCiCiTTCiCiCiCiCiCiCiCiCiCiCiCiCiCiCiCiCiCiEAUHGNKc +AeAeAeAeAeAeAeMiSJAeCiCiCiqvQDQDAJNReFEhpBAemxAJAJAJAJHLsykeSzKc +AeBKSuBlSuBlSueKMYTiCiCiCizGDcxqsZBryTsZwgAeQXDcqxMBMBLcAeAeAeKc +AeBlqtBlqtxPqtBlBlAeVhCiCizGQhtjsZBrJosZcigCLAbmuuuMuMhrAeKcKcKc +AeOvAeLHAeHKAeLEBlAeCiCiCiEAuoLyuMGUGUGUvGAeAeAeAeKwKwAeAeAeAeKc +AerhAeVgAeZUAeBlBlslCiCiCiEAMBciOAjLizizAfTihufasCxNxNuXFkrOAeKc +AeAeAeAeAeAegCAeAeAeAeCiCifcMBRxbrgGgGgGQKAexNxNxNxNxNxNxNxNAGKc +KcAeaSmprSmpmpmpmpxjLaCiCiSjsZRxsIgGgGXpgGGBxNxNxNxNxNxNxNxNKlKc +KctcmploFfEQmpFIFIqDAeCiCixGMBRxizATgGsPowAebJxNVJNjftxNxNFiKlKc +KcXSmploJfEQIRFIFIcKAeVhCiEAMBRxizgGgGDFgGKwxNxNgoYgnBxNxNIIKlKc +KcAeWVmpmpmpmpFIFITfLVCiCifcMBciKogGgGuOFlAeAesixNxNxNxNxNIIGIKc +KcAeAejvZLAeAeAeAeAeTiCiCiFOVQPEVFgGgGgGgGAqMidNxNxNxNxNxNDiAeKc +KcAexKeNyLAeLYVyvBAeFECiCiCiCiBXAeKmyvYcgGzAAeEexNxNxNxNxNpvAeKc +KcAeiyfqrgAelselbNAetCCiCiCiqpAeAeAeAeAeEzAeAeAeqZKwlnAeAeAeAeKc +KcAejvjvjvAeZLAeAeAeAeCiCiCiblAeqyuJhwldAexoAWGxLoIBffdPsYJQAeKc +KcAeYXmpmpmpmpxOxOZRAeCiCiCiecAewmmpmpBCAeySIBIBIBIBHVXIXIGDMiKc +KcDompPJuwZSmpxOxOsAgCVhCiCidaAeAeFVwpAeAeySYqIBWcIBnmKRpFOIAeKc +KcikmpPJVDZSIRxOxOeBAeCiCiCiCiNnAempmprSHHUqYqIBYqIBnztAGjKSAeKc +KcAeWVmpmzmpmpmpmpcLmUCiJjCiCiCiNdmplZHCAeqOjVOkOkboYmLGVOLGAeKc +KcAeAeAeAeAegCAeAeAeAeTiAeMFhILkAeAeAeAeAeAeAeYnnjnjtzAeAeAeAeKc +"} From f191548509cbac1632d87ce43ae71904b339b7f2 Mon Sep 17 00:00:00 2001 From: Nadyr <41974248+Darlantanis@users.noreply.github.com> Date: Fri, 2 Dec 2022 20:38:48 -0500 Subject: [PATCH 09/75] powder that makes you say yes --- code/modules/admin/admin_verbs_vr.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/admin/admin_verbs_vr.dm b/code/modules/admin/admin_verbs_vr.dm index 31194cd080..d52ff386e2 100644 --- a/code/modules/admin/admin_verbs_vr.dm +++ b/code/modules/admin/admin_verbs_vr.dm @@ -73,9 +73,6 @@ log_and_message_admins("removed a security ticket from the global list: \"[input]\"", usr) else -<<<<<<< HEAD - tgui_alert_async(usr, "The ticket list is empty.","Empty") -======= tgui_alert_async(usr, "The ticket list is empty.","Empty") /client/proc/delbook() @@ -124,4 +121,3 @@ usr << browse(dat, "window=library") onclose(usr, "library") ->>>>>>> 2c6bd88519... Merge pull request #14140 from Very-Soft/bookmanagement From e2c025186084e4b9d6d40f9225db781eda9f59eb Mon Sep 17 00:00:00 2001 From: Nadyr <41974248+Darlantanis@users.noreply.github.com> Date: Fri, 2 Dec 2022 20:41:26 -0500 Subject: [PATCH 10/75] powder that makes you say yes --- code/modules/library/lib_machines.dm | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm index b18ed0ff92..593e5f72cf 100644 --- a/code/modules/library/lib_machines.dm +++ b/code/modules/library/lib_machines.dm @@ -492,22 +492,7 @@ B.item_state = B.icon_state src.visible_message("[src]'s printer hums as it produces a completely bound book. How did it do that?") break -<<<<<<< HEAD qdel(query) //CHOMPEdit TGSQL -======= - - if(href_list["delid"]) - if(!check_rights(R_ADMIN)) - return - var/sqlid = sanitizeSQL(href_list["delid"]) - establish_old_db_connection() - if(!dbcon_old.IsConnected()) - tgui_alert_async(usr, "Connection to Archive has been severed. Aborting.") - else - var/DBQuery/query = dbcon_old.NewQuery("DELETE FROM library WHERE id=[sqlid]") - query.Execute() - log_admin("[usr.key] has deleted the book [sqlid]") //VOREStation Addition ->>>>>>> 2c6bd88519... Merge pull request #14140 from Very-Soft/bookmanagement if(href_list["orderbyid"]) var/orderid = tgui_input_number(usr, "Enter your order:") From ed01c5e99735807c6c0eabc006d91eb2d027cf62 Mon Sep 17 00:00:00 2001 From: SarmentiCampbell <111698205+UniquaSa@users.noreply.github.com> Date: Sun, 4 Dec 2022 12:17:18 +0100 Subject: [PATCH 11/75] Update RestaurationBar-32x32.dmm Update RestaurationBar-32x32.dmm --- .../maps/submaps/shelters/RestaurationBar-32x32.dmm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/modular_chomp/maps/submaps/shelters/RestaurationBar-32x32.dmm b/modular_chomp/maps/submaps/shelters/RestaurationBar-32x32.dmm index 52c24e2db6..21fdb29c02 100644 --- a/modular_chomp/maps/submaps/shelters/RestaurationBar-32x32.dmm +++ b/modular_chomp/maps/submaps/shelters/RestaurationBar-32x32.dmm @@ -140,7 +140,6 @@ "xM" = (/obj/effect/floor_decal/spline/fancy{dir = 9},/turf/simulated/floor/carpet/purple,/area/survivalpod/superpose/RestaurationBar) "xN" = (/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/RestaurationBar) "xO" = (/turf/simulated/floor/carpet/purple,/area/survivalpod/superpose/RestaurationBar) -"xP" = (/obj/item/capture_crystal,/turf/simulated/floor/tiled/freezer,/area/survivalpod/superpose/RestaurationBar) "yv" = (/obj/structure/table/marble,/obj/machinery/light{layer = 3},/obj/machinery/chemical_dispenser/bar_soft/full{dir = 1},/obj/item/weapon/reagent_containers/chem_disp_cartridge/gelatin,/turf/simulated/floor/lino,/area/survivalpod/superpose/RestaurationBar) "yL" = (/obj/effect/floor_decal/corner/yellow/diagonal,/turf/simulated/floor/tiled/freezer,/area/survivalpod/superpose/RestaurationBar) "yS" = (/obj/effect/floor_decal/corner/lime/border{dir = 8},/turf/simulated/floor/tiled/hydro,/area/survivalpod/superpose/RestaurationBar) @@ -173,7 +172,7 @@ "DV" = (/obj/structure/bed/chair/wood{dir = 8},/obj/effect/floor_decal/spline/fancy/wood{dir = 1},/obj/machinery/light{dir = 1; layer = 3},/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) "Ee" = (/obj/structure/closet/secure_closet/freezer/fridge,/obj/item/weapon/storage/fancy/egg_box,/obj/item/weapon/storage/fancy/egg_box,/obj/item/weapon/reagent_containers/food/drinks/bottle/milk,/obj/item/weapon/reagent_containers/food/drinks/bottle/milk,/obj/item/weapon/reagent_containers/food/drinks/bottle/milk,/obj/item/weapon/reagent_containers/food/drinks/bottle/cream,/obj/item/weapon/reagent_containers/food/drinks/bottle/cream,/obj/item/weapon/reagent_containers/food/drinks/bottle/cream,/obj/item/weapon/reagent_containers/food/drinks/bottle/cream,/obj/item/weapon/reagent_containers/food/condiment/carton/sugar,/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/RestaurationBar) "Eh" = (/obj/structure/bed/chair/wood{dir = 8},/obj/effect/floor_decal/spline/fancy/wood{dir = 1},/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) -"Ez" = (/obj/machinery/power/apc/alarms_hidden,/turf/simulated/wall,/area/survivalpod/superpose/RestaurationBar) +"Ez" = (/obj/machinery/firealarm/alarms_hidden{dir = 8},/turf/simulated/floor/tiled/freezer,/area/survivalpod/superpose/RestaurationBar) "EA" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 8},/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) "EQ" = (/obj/structure/bed/chair/comfy/black{dir = 8},/turf/simulated/floor/carpet/oracarpet,/area/survivalpod/superpose/RestaurationBar) "ET" = (/obj/machinery/vending/wallmed1{name = "NanoMed Wall"; pixel_y = -30},/turf/simulated/floor/carpet/brown,/area/survivalpod/superpose/RestaurationBar) @@ -292,7 +291,7 @@ "Vh" = (/obj/machinery/light{dir = 8; icon_state = "tube1"},/turf/simulated/floor/carpet/brown,/area/survivalpod/superpose/RestaurationBar) "Vy" = (/obj/structure/sink{pixel_y = 16},/obj/structure/mirror{pixel_y = 32},/obj/effect/floor_decal/corner/purple/diagonal,/turf/simulated/floor/tiled/freezer,/area/survivalpod/superpose/RestaurationBar) "VD" = (/obj/structure/table/standard,/obj/item/device/starcaster_news,/obj/item/weapon/reagent_containers/food/snacks/meatsteak,/turf/simulated/floor/carpet/purple,/area/survivalpod/superpose/RestaurationBar) -"VF" = (/obj/machinery/door/window/westleft{name = "Bar"},/turf/simulated/floor/lino,/area/survivalpod/superpose/RestaurationBar) +"VF" = (/obj/machinery/door/window/westleft{name = "Bar"},/obj/machinery/power/apc/alarms_hidden,/turf/simulated/floor/lino,/area/survivalpod/superpose/RestaurationBar) "VJ" = (/obj/structure/table/marble,/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{pixel_x = -3},/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{pixel_x = 3},/obj/item/weapon/reagent_containers/food/condiment/enzyme,/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/RestaurationBar) "VK" = (/obj/structure/flora/ausbushes/lavendergrass,/turf/simulated/floor/outdoors/grass/sif,/area/template_noop) "VO" = (/obj/structure/closet/crate/hydroponics{desc = "All you need to start your own honey farm."; name = "beekeeping crate"},/obj/item/beehive_assembly,/obj/item/bee_smoker,/obj/item/honey_frame,/obj/item/honey_frame,/obj/item/honey_frame,/obj/item/weapon/tool/crowbar,/obj/item/honey_frame,/obj/item/honey_frame,/obj/item/bee_pack,/obj/machinery/portable_atmospherics/hydroponics/soil,/obj/machinery/light{layer = 3},/turf/simulated/floor/grass,/area/survivalpod/superpose/RestaurationBar) @@ -340,17 +339,17 @@ TnvfvfTnCiCiCiCiCiCiCiCiCiCiCiCiCiCiCiCiCiCiCiCiCiCiCiCiEAxnGNKc iivfvfTnCiETCiCiCiTTCiCiCiCiCiCiCiCiCiCiCiCiCiCiCiCiCiCiEAUHGNKc AeAeAeAeAeAeAeMiSJAeCiCiCiqvQDQDAJNReFEhpBAemxAJAJAJAJHLsykeSzKc AeBKSuBlSuBlSueKMYTiCiCiCizGDcxqsZBryTsZwgAeQXDcqxMBMBLcAeAeAeKc -AeBlqtBlqtxPqtBlBlAeVhCiCizGQhtjsZBrJosZcigCLAbmuuuMuMhrAeKcKcKc +AeBlqtBlqtBlqtBlBlAeVhCiCizGQhtjsZBrJosZcigCLAbmuuuMuMhrAeKcKcKc AeOvAeLHAeHKAeLEBlAeCiCiCiEAuoLyuMGUGUGUvGAeAeAeAeKwKwAeAeAeAeKc -AerhAeVgAeZUAeBlBlslCiCiCiEAMBciOAjLizizAfTihufasCxNxNuXFkrOAeKc -AeAeAeAeAeAegCAeAeAeAeCiCifcMBRxbrgGgGgGQKAexNxNxNxNxNxNxNxNAGKc +AerhAeVgAeZUAeEzBlslCiCiCiEAMBciOAjLizizAfTihufasCxNxNuXFkrOAeKc +AeAeAeAeAeAeAeAeAeAeAeCiCifcMBRxbrgGgGgGQKAexNxNxNxNxNxNxNxNAGKc KcAeaSmprSmpmpmpmpxjLaCiCiSjsZRxsIgGgGXpgGGBxNxNxNxNxNxNxNxNKlKc KctcmploFfEQmpFIFIqDAeCiCixGMBRxizATgGsPowAebJxNVJNjftxNxNFiKlKc KcXSmploJfEQIRFIFIcKAeVhCiEAMBRxizgGgGDFgGKwxNxNgoYgnBxNxNIIKlKc KcAeWVmpmpmpmpFIFITfLVCiCifcMBciKogGgGuOFlAeAesixNxNxNxNxNIIGIKc KcAeAejvZLAeAeAeAeAeTiCiCiFOVQPEVFgGgGgGgGAqMidNxNxNxNxNxNDiAeKc KcAexKeNyLAeLYVyvBAeFECiCiCiCiBXAeKmyvYcgGzAAeEexNxNxNxNxNpvAeKc -KcAeiyfqrgAelselbNAetCCiCiCiqpAeAeAeAeAeEzAeAeAeqZKwlnAeAeAeAeKc +KcAeiyfqrgAelselbNAetCCiCiCiqpAeAeAeAeAeAeAeAeAeqZKwlnAeAeAeAeKc KcAejvjvjvAeZLAeAeAeAeCiCiCiblAeqyuJhwldAexoAWGxLoIBffdPsYJQAeKc KcAeYXmpmpmpmpxOxOZRAeCiCiCiecAewmmpmpBCAeySIBIBIBIBHVXIXIGDMiKc KcDompPJuwZSmpxOxOsAgCVhCiCidaAeAeFVwpAeAeySYqIBWcIBnmKRpFOIAeKc From 3706180db42fb66fca1f9e4cd9c68456ebb2fe5e Mon Sep 17 00:00:00 2001 From: Verkister Date: Mon, 5 Dec 2022 17:42:50 +0200 Subject: [PATCH 12/75] A tiny sprinkle of new sprite accessories -Adds 3 new markings (forward fangs, further forward fangs, normal eyes) -Adds 2 new earstyles (floppy goat ears, floppy goat ears with horns) --- .../new_player/sprite_accessories_ear_ch.dm | 15 +++++++++++++++ icons/mob/human_races/markings_ch.dmi | Bin 34819 -> 35057 bytes icons/mob/vore/ears_ch.dmi | Bin 2385 -> 2698 bytes .../new_player/sprite_accessories_extra.dm | 18 ++++++++++++++++++ 4 files changed, 33 insertions(+) diff --git a/code/modules/mob/new_player/sprite_accessories_ear_ch.dm b/code/modules/mob/new_player/sprite_accessories_ear_ch.dm index 95a41df36a..05533bcc76 100644 --- a/code/modules/mob/new_player/sprite_accessories_ear_ch.dm +++ b/code/modules/mob/new_player/sprite_accessories_ear_ch.dm @@ -139,3 +139,18 @@ icon_state = "chorn_chub" do_colouration = 1 color_blend_mode = ICON_MULTIPLY + +/datum/sprite_accessory/ears/goatflops + name = "Floppy Goat Ears" + icon = 'icons/mob/vore/ears_ch.dmi' + icon_state = "goatflops" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + +/datum/sprite_accessory/ears/goatflops_horn + name = "Floppy Goat Ears (with horns)" + icon = 'icons/mob/vore/ears_ch.dmi' + icon_state = "goatflops" + extra_overlay = "goatflops_horn" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY \ No newline at end of file diff --git a/icons/mob/human_races/markings_ch.dmi b/icons/mob/human_races/markings_ch.dmi index 02eac76358a18984b9400c44daafe20c891c646e..66334e4f8252adab7f80372aa4daf4dbee211843 100644 GIT binary patch delta 19479 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 Z`Oj>s|Mq`}oM0-5@9FC2vd$@?2>=gR%C!Ih diff --git a/icons/mob/vore/ears_ch.dmi b/icons/mob/vore/ears_ch.dmi index 02b20c340e262545ba2b870f862f212b6867b937..08497fe609d9bdb746a42f51387f25741f5ef2d8 100644 GIT binary patch delta 2652 zcmY+Fc{JN;7srFv)@e4Q280Hn$}wT8b+xq zL6KS$X%($?v?PRtG?teTM3aajuX*2h&dhtydCqg6`^Wd*&-dJOo{=L@<$x#7jy4CS zPe_A6po3RzFJA+JMEv&71xc~J3SQRTcJE>0eAUgGL?Q`=!l|h#4u`Y2xVXk<>p;y0 z1_mPR)bCX%LX(4Unk#H=ZL!&GYqSTIO6~3KO-oCA^5jWJN5|W@Z|m#pOG`@=6BE=h_J5R@q*A_tJk zWImrC78XXQ(?5Os#AGrT78V2o0guP~`t|GV>@1hdou8kdo}Om0SPTYZX=#Z!gy_YLSyLq54`-k5O3kpRAAwxhQbW!%`AVN&_ zdx^CTwyWO9){48)D-}Ni<)-KAPBPgwb^`-v5LR1XePuuV?tD((Wpk(305uUC@}@nu zd6$mY%9_b*OJnZ{D(()2{1%~HL#OtXoi(P5t6IHpZOybk zL(B+EyMXuil~MD-$bs4U1DAd^Y+iqTdHBqADqYjJ{IO~(wvyvJUC}otWcG(N!r`5- z;9}^2^!HJ}MuI?q#Q2rV7v0cBE3|d^XYz^O^?i0ONBan(x-?D0{kPQ%VRcaRqN~Qu zjG{Xz<{5vJTH=&Ys4_KsPTwJBXyZqROGy~Itko%kvngsA>r}UM}f_ytn%;hvU%|+@s&jRxtmh;vSmIFGIu*t?#F9!1x+J zQ3y{qn-hU;L4o(3`4SS0DPO;VEqrC^rm=n~`n1?FOt39f<<-3d0opY#8W?@B+4URHeym+nzAmdSZ?-SD&O{V@dgOfyzDonj3y3{+ zKm@)LtyGE`BLqCfd~UoK@_Dz$$gd(KuNxPT^D0=e$*sQOkPz*hn7U1cBZ z1LGFkD8;EJ^O=eId^s_mS-+3BRKHE8C;FRnw8^T$Ex)$PmFnSwpFi^N*iYoQ{T|s=^NnyW)4z&5ow7YZ|PjSj&Jj#5yyO6@Jht% zI|v4b$q<9Sqi)-~yd$)F>isO>mHZa{#pO|K31F#k10Z1UR@K~nYy+O}q^}thvB+^T zpO}sYS>qqfr_bL@j@}qz_i;GQg_KBQwWUK2*1dDGl_*%@aQfIvHhZ%3TGOY)$$RkrHSo-sZi-(MoJtu0?tuCwjLQ>a(SzOS#I9r zyXYfuI53V8AKmy8m7+cK_>YTbB7?`G#H(C!m4jYsYB>R5hS>(UNjCjo*;RkM*snNt zB2{wo+Y>49@Vvr74L`gxU!nAubMJHqe$bm~+)#T&(MdVQQ2lVY{>4PpB2axUqxjKI z%7Nn0dj*{_^wre3?wH85`m-XFEn{cv2Z7k6?OeEBb8I3GNof`+iWD;U=^yszIXq^5wdrTmU`uTA){uqsFx~MZK@p9-%bC_X0|si?vmSl`u@|H6+I%fNbo{(jqn~HS~IXNc_Rrh+# zk9)y6lG0F#X_@#-jToMxq+aF6(ZL*mKws2!G8lVEN+Qch48=WU_gFl-aNL60Zq#{> zG{cI-gPuo!Gm)0wT&r(?JsRW1|6a7J_j|Ha8vdxr3*}pDhyFPzshb(Y;aK9Z?b}54 znfQZ@_4?Mn=az4YbQ^f7UbcXE)BU=L*x*NYJw{A z@O*pxd&Wavzu$d-G`VkSQG5ZHqG zro|I}9R|}Q=1V~_M&1d+R#9HzaAK_OYBm$R-cxuhn1I?MHzA$uc_J-w{>b3M7ql7z ze$P0>3!GB17t4oatqupp{!M)9%-sY*;pU`2Af%Z`J&s)E@f%er)||wnGt=wM{Sn*x z9&#I#@N7PD)3IO>LK~y3gT*7mJ}C-1Wuu0RO(>l=wXxw+^2zosem?K4Z~dD`L YGPW?jFn49d_0QrJYsbsAR(|pS20untW&i*H delta 2327 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 Date: Tue, 6 Dec 2022 15:35:02 +0200 Subject: [PATCH 13/75] Fixes grid check announcement I'm quite sure that neither centcom nor sif infrastructure are affected by the event occuring on the station. --- code/modules/power/grid_checker.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/power/grid_checker.dm b/code/modules/power/grid_checker.dm index 1409be9fef..4c302c2191 100644 --- a/code/modules/power/grid_checker.dm +++ b/code/modules/power/grid_checker.dm @@ -64,8 +64,8 @@ /obj/machinery/power/grid_checker/proc/power_failure(var/announce = TRUE) if(announce) command_announcement.Announce("Abnormal activity detected in [station_name()]'s powernet. As a precautionary measure, \ - the colony's power will be shut off for an indeterminate duration while the powernet monitor restarts automatically, or \ - when Engineering can manually resolve the issue.", + the station's power will be shut off for an indeterminate duration while the powernet monitor restarts automatically, or \ + when Engineering can manually resolve the issue.", //CHOMPEdit "Critical Power Failure", new_sound = 'sound/AI/poweroff.ogg') power_failing = TRUE From af0eeb8b56c7d4bd642db444ee92d3850357efb1 Mon Sep 17 00:00:00 2001 From: SarmentiCampbell <111698205+UniquaSa@users.noreply.github.com> Date: Wed, 7 Dec 2022 01:57:43 +0100 Subject: [PATCH 14/75] Update RestaurationBar-32x32.dmm --- modular_chomp/maps/submaps/shelters/RestaurationBar-32x32.dmm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modular_chomp/maps/submaps/shelters/RestaurationBar-32x32.dmm b/modular_chomp/maps/submaps/shelters/RestaurationBar-32x32.dmm index 21fdb29c02..59ee5cb20f 100644 --- a/modular_chomp/maps/submaps/shelters/RestaurationBar-32x32.dmm +++ b/modular_chomp/maps/submaps/shelters/RestaurationBar-32x32.dmm @@ -43,7 +43,7 @@ "hk" = (/obj/structure/bed/chair/wood,/turf/simulated/floor/carpet/purcarpet,/area/survivalpod/superpose/RestaurationBar) "hr" = (/obj/structure/table/bench/glass,/obj/effect/floor_decal/spline/fancy/wood{dir = 6},/obj/machinery/light{layer = 3},/obj/structure/flora/pottedplant/thinbush{pixel_y = 10},/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) "hu" = (/obj/machinery/appliance/cooker/fryer,/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/RestaurationBar) -"hw" = (/obj/structure/closet/walllocker_double/north{name = "Survival Cabinet"},/obj/item/weapon/storage/backpack/messenger,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/material/knife/tacknife/survival,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/reagent_containers/hypospray/autoinjector/trauma,/obj/item/weapon/reagent_containers/hypospray/autoinjector/oxy,/obj/item/weapon/storage/box/survival/space,/obj/item/device/radio,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/weapon/reagent_containers/pill/dylovene,/obj/item/device/flashlight/maglight,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/random/soap,/obj/item/weapon/gun/energy/locked/frontier/handbow/unlocked,/obj/item/device/fbp_backup_cell,/obj/item/device/pda,/obj/item/device/starcaster_news,/obj/item/device/suit_cooling_unit/emergency,/obj/item/device/gps,/obj/item/weapon/flame/lighter/zippo/royal,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/clothing/accessory/permit/gun,/obj/item/device/binoculars,/obj/item/bodybag/cryobag,/obj/item/weapon/cell/device/hyper,/obj/item/sticky_pad/random,/obj/item/weapon/card/id/external{desc = s},/obj/item/weapon/pen/multi,/obj/item/weapon/storage/box/khcrystal,/obj/item/weapon/storage/box/survival/comp,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting,/obj/item/stack/nanopaste,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine,/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) +"hw" = (/obj/structure/closet/walllocker_double/north{name = "Survival Cabinet"},/obj/item/weapon/storage/backpack/messenger,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/material/knife/tacknife/survival,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/reagent_containers/hypospray/autoinjector/trauma,/obj/item/weapon/reagent_containers/hypospray/autoinjector/oxy,/obj/item/weapon/storage/box/survival/space,/obj/item/device/radio,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/weapon/reagent_containers/pill/dylovene,/obj/item/device/flashlight/maglight,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/random/soap,/obj/item/weapon/gun/energy/locked/frontier/handbow/unlocked,/obj/item/device/fbp_backup_cell,/obj/item/device/pda,/obj/item/device/starcaster_news,/obj/item/device/suit_cooling_unit/emergency,/obj/item/device/gps,/obj/item/weapon/flame/lighter/zippo/royal,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/clothing/accessory/permit/gun,/obj/item/device/binoculars,/obj/item/bodybag/cryobag,/obj/item/weapon/cell/device/hyper,/obj/item/sticky_pad/random,/obj/item/weapon/card/id/external,/obj/item/weapon/pen/multi,/obj/item/weapon/storage/box/khcrystal,/obj/item/weapon/storage/box/survival/comp,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting,/obj/item/stack/nanopaste,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine,/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) "hE" = (/obj/random/pottedplant,/turf/simulated/floor/carpet/purcarpet,/area/survivalpod/superpose/RestaurationBar) "hI" = (/obj/structure/grille,/obj/structure/window/reinforced{health = 1e+006},/obj/structure/window/reinforced{dir = 1; health = 1e+006},/turf/simulated/floor,/area/survivalpod/superpose/RestaurationBar) "ii" = (/obj/structure/simple_door/wood,/obj/structure/simple_door/wood,/turf/simulated/floor/carpet,/area/survivalpod/superpose/RestaurationBar) @@ -116,7 +116,7 @@ "uo" = (/obj/structure/bed/chair/wood{dir = 1},/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) "uu" = (/obj/structure/bed/chair/oldsofa/left{dir = 1},/obj/effect/floor_decal/spline/fancy/wood,/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) "uw" = (/obj/structure/table/standard,/obj/item/device/flashlight/lamp,/turf/simulated/floor/carpet/purple,/area/survivalpod/superpose/RestaurationBar) -"uJ" = (/obj/structure/closet/walllocker_double/north{name = "Survival Cabinet"},/obj/item/weapon/storage/backpack/messenger,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/material/knife/tacknife/survival,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/reagent_containers/hypospray/autoinjector/trauma,/obj/item/weapon/reagent_containers/hypospray/autoinjector/oxy,/obj/item/weapon/storage/box/survival/space,/obj/item/device/radio,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/weapon/reagent_containers/pill/dylovene,/obj/item/device/flashlight/maglight,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/random/soap,/obj/item/weapon/gun/energy/locked/frontier/rifle/unlocked,/obj/item/device/fbp_backup_cell,/obj/item/device/pda,/obj/item/device/starcaster_news,/obj/item/device/suit_cooling_unit/emergency,/obj/item/device/gps,/obj/item/weapon/flame/lighter/zippo/black,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/clothing/accessory/permit/gun,/obj/item/device/binoculars,/obj/item/bodybag/cryobag,/obj/item/weapon/cell/device/hyper,/obj/item/sticky_pad/random,/obj/item/weapon/card/id/external{desc = s},/obj/item/weapon/pen/multi,/obj/item/weapon/storage/box/khcrystal,/obj/item/weapon/storage/box/survival/comp,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting,/obj/item/stack/nanopaste,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine,/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) +"uJ" = (/obj/structure/closet/walllocker_double/north{name = "Survival Cabinet"},/obj/item/weapon/storage/backpack/messenger,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,/obj/item/weapon/material/knife/tacknife/survival,/obj/item/weapon/reagent_containers/food/snacks/sosjerky,/obj/item/weapon/cell/device/hyper,/obj/item/weapon/reagent_containers/hypospray/autoinjector/trauma,/obj/item/weapon/reagent_containers/hypospray/autoinjector/oxy,/obj/item/weapon/storage/box/survival/space,/obj/item/device/radio,/obj/item/clothing/accessory/storage/black_drop_pouches,/obj/item/weapon/reagent_containers/pill/dylovene,/obj/item/device/flashlight/maglight,/obj/item/device/flashlight/flare,/obj/item/device/flashlight/flare,/obj/random/soap,/obj/item/weapon/gun/energy/locked/frontier/rifle/unlocked,/obj/item/device/fbp_backup_cell,/obj/item/device/pda,/obj/item/device/starcaster_news,/obj/item/device/suit_cooling_unit/emergency,/obj/item/device/gps,/obj/item/weapon/flame/lighter/zippo/black,/obj/item/weapon/storage/mre/random,/obj/item/weapon/storage/mre/random,/obj/item/clothing/accessory/permit/gun,/obj/item/device/binoculars,/obj/item/bodybag/cryobag,/obj/item/weapon/cell/device/hyper,/obj/item/sticky_pad/random,/obj/item/weapon/card/id/external,/obj/item/weapon/pen/multi,/obj/item/weapon/storage/box/khcrystal,/obj/item/weapon/storage/box/survival/comp,/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting,/obj/item/stack/nanopaste,/obj/item/weapon/extinguisher/mini,/obj/item/weapon/reagent_containers/glass/beaker/vial/tricordrazine,/turf/simulated/floor/wood,/area/survivalpod/superpose/RestaurationBar) "uM" = (/obj/effect/floor_decal/spline/fancy/wood,/turf/simulated/floor/carpet/bcarpet,/area/survivalpod/superpose/RestaurationBar) "uO" = (/obj/structure/table/marble,/obj/item/weapon/reagent_containers/food/drinks/shaker,/turf/simulated/floor/lino,/area/survivalpod/superpose/RestaurationBar) "uX" = (/obj/machinery/appliance/mixer/cereal,/obj/effect/floor_decal/corner/grey/diagonal{dir = 4},/turf/simulated/floor/tiled/white,/area/survivalpod/superpose/RestaurationBar) From 3edc682b1a414d88faeb3a491199716af4d1f24b Mon Sep 17 00:00:00 2001 From: SlaysInCode <105664656+SlaysInCode@users.noreply.github.com> Date: Wed, 7 Dec 2022 22:43:22 -0500 Subject: [PATCH 15/75] Quantum Checkpoint Adds a functional Security Checkpoint to the Quantum Pad. - Processing Booth complete with a Checkpoint office. Assessable by Security and Command. - Turrets as well as Turret Control. - Locker room for storing any declared items while visiting the station. - Lounge for those waiting for a guest or for a friend. - Prep room along with bathroom. - Full lockdown system in the event of an emergency. --- maps/southern_cross/southern_cross-1.dmm | 2790 ++++++++++++++++------ 1 file changed, 1997 insertions(+), 793 deletions(-) diff --git a/maps/southern_cross/southern_cross-1.dmm b/maps/southern_cross/southern_cross-1.dmm index 1ff2161fcc..c81a0fc980 100644 --- a/maps/southern_cross/southern_cross-1.dmm +++ b/maps/southern_cross/southern_cross-1.dmm @@ -3,10 +3,17 @@ /turf/space, /area/space) "aab" = ( -/obj/effect/decal/cleanable/blood, -/obj/random/humanoidremains, -/turf/simulated/floor/plating, -/area/maintenance/firstdeck/foreport) +/obj/effect/landmark{ + name = "carpspawn" + }, +/obj/effect/landmark{ + name = "carpspawn" + }, +/obj/effect/landmark{ + name = "carpspawn" + }, +/turf/space, +/area/space) "aac" = ( /obj/effect/shuttle_landmark{ base_area = /area/space; @@ -74,10 +81,8 @@ /turf/simulated/floor/tiled/monotile, /area/hallway/primary/firstdeck/port) "aaj" = ( -/obj/structure/table/rack, -/obj/random/maintenance/medical, -/obj/random/maintenance/medical, -/obj/random/maintenance/medical, +/obj/effect/wingrille_spawn/reinforced, +/obj/machinery/door/firedoor/border_only, /turf/simulated/floor/plating, /area/maintenance/firstdeck/foreport) "aak" = ( @@ -109,8 +114,8 @@ /turf/simulated/floor/tiled, /area/hallway/primary/firstdeck/port) "aam" = ( -/obj/machinery/alarm{ - pixel_y = 22 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 }, /turf/simulated/floor/tiled, /area/teleporter/firstdeck) @@ -200,14 +205,11 @@ /turf/simulated/floor/plating, /area/maintenance/firstdeck/aftport) "aax" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/tiled/monotile, -/area/teleporter/firstdeck) -"aay" = ( -/obj/effect/floor_decal/borderfloor/corner, -/obj/effect/floor_decal/corner/green/bordercorner, -/obj/machinery/light{ - dir = 4 +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 8 }, /turf/simulated/floor/tiled, /area/teleporter/firstdeck) @@ -220,15 +222,13 @@ /turf/simulated/floor, /area/hallway/primary/firstdeck/auxdockaft) "aaA" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/effect/floor_decal/industrial/warning{ - dir = 5 - }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/deployable/barrier, /obj/machinery/light{ dir = 8 }, /turf/simulated/floor/tiled, -/area/teleporter/firstdeck/prep) +/area/teleporter/firstdeck) "aaC" = ( /obj/structure/table/standard, /obj/item/bodybag/cryobag, @@ -254,62 +254,37 @@ /turf/simulated/floor/plating, /area/maintenance/firstdeck/foreport) "aaF" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/effect/floor_decal/steeldecal/monofloor{ + dir = 1 }, -/turf/simulated/floor/tiled/monotile, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled, /area/teleporter/firstdeck) "aaG" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/obj/structure/dispenser/oxygen, -/turf/simulated/floor/tiled, -/area/teleporter/firstdeck/prep) -"aaH" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/effect/floor_decal/borderfloor/corner, +/obj/effect/floor_decal/corner/red/bordercorner, +/obj/machinery/turretid/stun{ + check_access = 0; + check_anomalies = 0; + check_down = 0; + check_records = 0; + pixel_x = 27; + pixel_y = 6; + req_access = null; + req_one_access = list(1,19) }, /turf/simulated/floor/tiled, -/area/teleporter/firstdeck/prep) -"aaI" = ( -/obj/structure/table/steel, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/device/multitool, -/obj/structure/cable{ - d2 = 8; - icon_state = "0-8" - }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, -/turf/simulated/floor/tiled, -/area/teleporter/firstdeck/prep) +/area/teleporter/firstdeck) "aaM" = ( /turf/simulated/shuttle/floor, /area/shuttle/large_escape_pod2/station) @@ -323,47 +298,34 @@ /turf/simulated/floor/tiled/monotile, /area/hangar/two) "aaQ" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = -27 - }, -/obj/effect/floor_decal/industrial/warning/corner, -/turf/simulated/floor/tiled/dark, +/obj/machinery/door/firedoor/border_only, +/obj/effect/wingrille_spawn/reinforced, +/turf/simulated/floor/plating, /area/teleporter/firstdeck) "aaR" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 +/obj/structure/flora/pottedplant/smelly, +/obj/effect/floor_decal/spline/fancy{ + dir = 10 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/carpet/sblucarpet, /area/teleporter/firstdeck) "aaT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/steeldecal/monofloor, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/effect/floor_decal/borderfloor/corner{ - dir = 4 - }, -/obj/effect/floor_decal/corner/green/bordercorner{ - dir = 4 - }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/teleporter/firstdeck) "aaU" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 6 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/teleporter/firstdeck/prep) +/turf/simulated/floor/tiled/steel_grid, +/area/teleporter/firstdeck) "aaX" = ( /obj/structure/bed/chair{ dir = 1 @@ -392,14 +354,16 @@ /turf/simulated/floor/plating, /area/maintenance/firstdeck/foreport) "abe" = ( -/obj/structure/closet/secure_closet/guncabinet/phase{ - req_one_access = null +/obj/item/device/radio/intercom{ + dir = 4; + name = "Station Intercom (General)"; + pixel_x = 21 + }, +/obj/effect/floor_decal/corner_steel_grid{ + dir = 10 }, -/obj/item/clothing/accessory/permit/gun/planetside, -/obj/item/clothing/accessory/permit/gun/planetside, -/obj/item/clothing/accessory/permit/gun/planetside, /turf/simulated/floor/tiled, -/area/teleporter/firstdeck/prep) +/area/teleporter/firstdeck) "abg" = ( /turf/simulated/shuttle/wall/no_join, /area/shuttle/large_escape_pod2/station) @@ -436,6 +400,10 @@ /turf/simulated/floor/plating, /area/maintenance/firstdeck/foreport) "abq" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/green/border, +/obj/structure/table/glass, +/obj/item/weapon/folder/yellow, /obj/machinery/firealarm{ dir = 1; pixel_y = -24 @@ -443,40 +411,25 @@ /turf/simulated/floor/tiled, /area/teleporter/firstdeck) "abs" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - dir = 1; - name = "Outpost Prep" +/obj/effect/floor_decal/borderfloor/corner, +/obj/effect/floor_decal/corner/green/bordercorner, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/obj/machinery/camera/network/security{ + c_tag = "CP - Hallway"; + dir = 8 }, -/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled, -/area/teleporter/firstdeck/prep) +/area/teleporter/firstdeck) "abt" = ( /obj/machinery/shield_diffuser, /turf/simulated/floor/airless, /area/hallway/primary/firstdeck/auxdockfore) -"abw" = ( -/obj/machinery/vending/wallmed1{ - name = "NanoMed Wall"; - pixel_y = -30 - }, -/turf/simulated/floor/tiled, -/area/teleporter/firstdeck/prep) "abx" = ( /turf/space, /turf/simulated/wall/r_wall, /area/hangar/two) -"aby" = ( -/obj/structure/closet/secure_closet/guncabinet/phase{ - req_one_access = null - }, -/obj/item/clothing/accessory/permit/gun/planetside, -/obj/item/clothing/accessory/permit/gun/planetside, -/obj/item/clothing/accessory/permit/gun/planetside, -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/teleporter/firstdeck/prep) "abz" = ( /obj/machinery/door/firedoor/border_only, /obj/effect/wingrille_spawn/reinforced, @@ -546,14 +499,7 @@ /turf/simulated/floor/plating, /area/construction/firstdeck/construction1) "acd" = ( -/obj/structure/table/steel, -/obj/item/weapon/tank/emergency/oxygen/engi, -/obj/random/tech_supply, -/obj/random/toolbox, -/obj/machinery/alarm{ - pixel_y = 22 - }, -/turf/simulated/floor, +/turf/simulated/floor/plating, /area/construction/firstdeck/construction1) "acg" = ( /obj/effect/floor_decal/industrial/hatch/yellow, @@ -1047,6 +993,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/green/bordercorner{ + dir = 1 + }, /turf/simulated/floor/tiled/monotile, /area/hallway/primary/firstdeck/port) "adS" = ( @@ -1709,23 +1661,42 @@ /turf/simulated/shuttle/plating, /area/shuttle/escape_pod1/station) "agq" = ( -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/tiled/monotile, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 8 + }, +/obj/machinery/alarm{ + dir = 4; + pixel_x = -22 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, /area/teleporter/firstdeck) "agr" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 6 +/obj/structure/table/glass, +/obj/effect/floor_decal/spline/fancy{ + dir = 8 }, -/turf/simulated/floor/tiled/monotile, -/area/teleporter/firstdeck) -"agt" = ( -/turf/simulated/floor/tiled/monotile, +/turf/simulated/floor/carpet/sblucarpet, /area/teleporter/firstdeck) "agv" = ( -/obj/structure/table/steel, -/obj/machinery/recharger, +/obj/item/device/radio/intercom{ + dir = 1; + name = "Station Intercom (General)"; + pixel_y = 22 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 8 + }, /turf/simulated/floor/tiled, -/area/teleporter/firstdeck/prep) +/area/teleporter/firstdeck) "agy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -1832,38 +1803,29 @@ /turf/simulated/floor/plating, /area/maintenance/firstdeck/centralport) "agW" = ( -/obj/structure/cable{ - d2 = 4; - icon_state = "0-4" +/obj/machinery/vending/wallmed1{ + name = "NanoMed Wall"; + pixel_x = -27 }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -24 +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 8 }, /turf/simulated/floor/tiled, /area/teleporter/firstdeck) "agZ" = ( +/obj/machinery/hologram/holopad, +/obj/effect/floor_decal/industrial/outline/grey, /obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/turf/simulated/floor/tiled, -/area/teleporter/firstdeck) -"aha" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/tiled/monotile, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/dark, /area/teleporter/firstdeck) "ahh" = ( /obj/structure/cable{ @@ -1983,17 +1945,28 @@ /turf/simulated/shuttle/floor, /area/shuttle/large_escape_pod2/station) "ahC" = ( -/turf/simulated/floor/tiled, -/area/teleporter/firstdeck) -"ahD" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 6 + }, +/obj/structure/closet/secure_closet/security, +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/camera/network/security{ + c_tag = "CP - Office"; dir = 1 }, -/turf/simulated/floor/tiled/monotile, +/turf/simulated/floor/tiled, /area/teleporter/firstdeck) "ahF" = ( +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 4 + }, /turf/simulated/floor/tiled, -/area/teleporter/firstdeck/prep) +/area/teleporter/firstdeck) "ahH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -2151,9 +2124,9 @@ /area/ai_monitored/storage/eva/aux) "ail" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 4 + dir = 1 }, -/turf/simulated/floor/tiled/monotile, +/turf/simulated/floor/holofloor/tiled/dark, /area/teleporter/firstdeck) "ain" = ( /obj/structure/bed/chair{ @@ -2222,23 +2195,24 @@ /turf/simulated/floor/tiled, /area/hallway/primary/firstdeck/auxdockfore) "aiD" = ( -/obj/machinery/light{ - dir = 8 +/obj/effect/floor_decal/borderfloor{ + dir = 10 }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 4 +/obj/effect/floor_decal/corner/green/border{ + dir = 10 }, -/turf/simulated/floor/tiled/dark, -/area/teleporter/firstdeck) -"aiE" = ( -/obj/effect/floor_decal/industrial/warning{ +/obj/machinery/vending/cola{ dir = 1 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/teleporter/firstdeck) -"aiF" = ( -/obj/machinery/light, -/turf/simulated/floor/tiled/monotile, +"aiE" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/green/border, +/obj/machinery/vending/snack{ + dir = 1 + }, +/turf/simulated/floor/tiled, /area/teleporter/firstdeck) "aiI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -2331,13 +2305,13 @@ /turf/simulated/wall/r_wall, /area/hallway/secondary/escape/firstdeck/ep_port) "aiX" = ( -/obj/machinery/door/airlock/glass_mining{ - id_tag = "hangar_1_door"; - name = "Teleporter Bay Core"; - req_one_access = null +/obj/effect/floor_decal/borderfloor{ + dir = 4 }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/steel_grid, +/obj/effect/floor_decal/corner/green/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, /area/teleporter/firstdeck) "aiY" = ( /turf/simulated/wall/r_wall, @@ -2530,20 +2504,24 @@ /turf/simulated/floor/plating, /area/maintenance/firstdeck/foreport) "aki" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 +/obj/machinery/alarm{ + dir = 4; + pixel_x = -22 }, -/obj/machinery/light{ +/obj/effect/floor_decal/borderfloor{ dir = 8 }, -/obj/effect/floor_decal/borderfloor/corner{ +/obj/effect/floor_decal/corner/green/border{ dir = 8 }, -/obj/effect/floor_decal/corner/green/bordercorner{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, /turf/simulated/floor/tiled, -/area/hallway/primary/firstdeck/port) +/area/teleporter/firstdeck) "akk" = ( /obj/machinery/alarm{ dir = 4; @@ -2605,14 +2583,14 @@ /turf/simulated/wall, /area/construction/firstdeck/construction1) "akP" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/effect/floor_decal/corner/green/border{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/tiled, -/area/hallway/primary/firstdeck/port) +/area/teleporter/firstdeck) "akQ" = ( /turf/simulated/floor/tiled/monotile, /area/hallway/primary/firstdeck/port) @@ -4852,13 +4830,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/firstdeck/ascenter) -"axI" = ( -/obj/machinery/camera/network/first_deck{ - c_tag = "First Deck - Teleporter Prep Room"; - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/teleporter/firstdeck/prep) "axK" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 9 @@ -5102,8 +5073,17 @@ /turf/simulated/floor/plating, /area/maintenance/firstdeck/aftstarboard) "azG" = ( -/turf/simulated/wall/r_wall, -/area/teleporter/firstdeck/prep) +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 4 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "azI" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 1 @@ -5262,10 +5242,10 @@ dir = 4; icon_state = "pipe-c" }, -/obj/effect/floor_decal/borderfloor/corner{ +/obj/effect/floor_decal/borderfloor{ dir = 1 }, -/obj/effect/floor_decal/corner/green/bordercorner{ +/obj/effect/floor_decal/corner/green/border{ dir = 1 }, /turf/simulated/floor/tiled, @@ -5323,12 +5303,18 @@ /turf/simulated/floor/tiled, /area/hangar/two) "aAK" = ( -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 +/obj/machinery/recharge_station, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 5 }, -/turf/simulated/floor/tiled, -/area/teleporter/firstdeck/prep) +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 8 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/teleporter/firstdeck) "aAL" = ( /obj/machinery/camera/network/cargo{ c_tag = "CRG - Cargo Hallway"; @@ -7230,6 +7216,18 @@ /obj/effect/wingrille_spawn/reinforced, /turf/simulated/floor/plating, /area/hallway/primary/firstdeck/fore) +"aKL" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 9 + }, +/turf/simulated/floor/tiled/white, +/area/teleporter/firstdeck) "aKO" = ( /obj/structure/cable{ d2 = 8; @@ -7680,12 +7678,7 @@ /turf/simulated/shuttle/floor/darkred, /area/shuttle/expoutpost/station) "aMG" = ( -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/obj/structure/closet/crate, -/obj/random/firstaid, -/obj/random/maintenance/medical, -/obj/item/weapon/storage/belt/utility/full, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/maintenance/firstdeck/foreport) "aMJ" = ( @@ -7693,40 +7686,36 @@ /turf/simulated/floor/plating, /area/maintenance/firstdeck/foreport) "aML" = ( -/obj/structure/closet/crate, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/obj/random/firstaid, -/obj/random/contraband, -/turf/simulated/floor/plating, -/area/maintenance/firstdeck/foreport) -"aMM" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = 30 +/obj/effect/floor_decal/industrial/warning{ + dir = 8 }, -/turf/simulated/floor/plating, -/area/maintenance/firstdeck/foreport) +/turf/simulated/floor/holofloor/tiled/dark, +/area/teleporter/firstdeck) +"aMM" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, +/turf/simulated/floor/holofloor/tiled/dark, +/area/teleporter/firstdeck) "aMN" = ( -/obj/structure/closet, -/obj/item/weapon/storage/backpack, -/obj/random/maintenance/medical, -/obj/random/maintenance/medical, -/obj/random/maintenance/medical, -/turf/simulated/floor/plating, -/area/maintenance/firstdeck/foreport) +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/turf/simulated/floor/holofloor/tiled/dark, +/area/teleporter/firstdeck) "aMO" = ( -/obj/structure/closet/crate, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/obj/random/powercell, -/turf/simulated/floor/plating, -/area/maintenance/firstdeck/foreport) +/obj/structure/toilet, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 8 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/teleporter/firstdeck) "aMU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ @@ -8600,23 +8589,30 @@ /turf/simulated/floor/tiled/dark, /area/hallway/primary/firstdeck/auxdockaft) "aSi" = ( -/obj/machinery/light/small, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/firstdeck/foreport) -"aSk" = ( -/obj/machinery/alarm{ - dir = 1; - pixel_y = -22 +/obj/effect/floor_decal/industrial/warning{ + dir = 4 }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/firstdeck/foreport) +/turf/simulated/floor/holofloor/tiled/dark, +/area/teleporter/firstdeck) +"aSk" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "aSm" = ( -/obj/machinery/light/small, -/obj/random/mob/mouse, -/turf/simulated/floor/plating, -/area/maintenance/firstdeck/foreport) +/obj/machinery/hyperpad/centre{ + map_pad_id = "pad_1_station"; + map_pad_link_id = "pad_1_away" + }, +/turf/simulated/floor/holofloor/tiled/dark, +/area/teleporter/firstdeck) "aSu" = ( /obj/structure/sign/greencross{ name = "Medical Pod" @@ -10038,9 +10034,10 @@ /turf/simulated/shuttle/floor, /area/shuttle/escape_pod5/station) "brx" = ( -/obj/machinery/oxygen_pump/mobile/anesthetic, -/turf/simulated/floor/plating, -/area/maintenance/firstdeck/foreport) +/obj/machinery/door/airlock, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/white, +/area/teleporter/firstdeck) "brP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -10054,12 +10051,17 @@ /turf/simulated/floor/tiled, /area/hallway/primary/firstdeck/aft) "brQ" = ( -/obj/structure/table/steel, -/obj/item/weapon/surgical/cautery/cyborg, -/obj/item/weapon/surgical/FixOVein, -/obj/item/weapon/handcuffs/cable/white, -/turf/simulated/floor/plating, -/area/maintenance/firstdeck/foreport) +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "bsm" = ( /obj/structure/closet/crate, /obj/random/maintenance/clean, @@ -10074,10 +10076,14 @@ /turf/simulated/floor/tiled, /area/hallway/primary/firstdeck/auxdockaft) "bwf" = ( -/obj/structure/table/steel, -/obj/item/weapon/surgical/retractor, -/turf/simulated/floor/plating, -/area/maintenance/firstdeck/foreport) +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "bwS" = ( /obj/machinery/door/airlock/glass_external{ frequency = 1380; @@ -10136,13 +10142,38 @@ }, /turf/simulated/floor/tiled/steel_dirty, /area/engineering/auxiliary_engineering) +"bBI" = ( +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "bBQ" = ( -/obj/structure/table/steel, -/obj/item/weapon/surgical/scalpel, -/obj/item/weapon/surgical/hemostat, -/obj/item/weapon/storage/toolbox/mechanical, -/turf/simulated/floor/plating, -/area/maintenance/firstdeck/foreport) +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "bCF" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 9 @@ -10407,6 +10438,13 @@ }, /turf/simulated/floor/tiled, /area/engineering/auxiliary_engineering) +"bMq" = ( +/obj/effect/floor_decal/steeldecal/steel_decals_central5, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "bMw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -10556,6 +10594,19 @@ }, /turf/simulated/floor/plating, /area/maintenance/firstdeck/forestarboard) +"bVz" = ( +/obj/structure/table/glass, +/obj/item/toy/plushie/white_cat{ + desc = "A rather chubby looking white cat plushy. Oddly enough it looks hungry."; + name = "Frostella Plushie"; + pixel_x = 2; + pixel_y = 5 + }, +/obj/effect/floor_decal/spline/fancy{ + dir = 8 + }, +/turf/simulated/floor/carpet/sblucarpet, +/area/teleporter/firstdeck) "bVF" = ( /obj/structure/cable/green{ d1 = 4; @@ -10742,34 +10793,49 @@ /turf/simulated/floor/plating, /area/maintenance/firstdeck/foreport) "cfp" = ( -/obj/machinery/microscope, -/obj/structure/table/steel, -/turf/simulated/floor/plating, -/area/maintenance/firstdeck/foreport) -"cfU" = ( -/obj/machinery/optable, -/obj/random/toy, -/turf/simulated/floor/plating, -/area/maintenance/firstdeck/foreport) -"chy" = ( -/obj/structure/bed/chair{ +/obj/machinery/alarm{ + dir = 4; + pixel_x = -22 + }, +/obj/effect/floor_decal/borderfloor{ dir = 8 }, -/obj/random/trash, -/turf/simulated/floor/plating, -/area/maintenance/firstdeck/foreport) +/obj/effect/floor_decal/corner/green/border{ + dir = 8 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) +"cfU" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/turf/simulated/floor/holofloor/tiled/dark, +/area/teleporter/firstdeck) +"chy" = ( +/obj/effect/wingrille_spawn/reinforced, +/obj/machinery/door/firedoor/glass, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" + }, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 4; + icon_state = "pdoor0"; + id = "qpdld"; + name = "Checkpoint Lockdown"; + opacity = 0 + }, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "chC" = ( -/obj/structure/closet/crate, -/obj/random/firstaid, -/obj/random/firstaid, -/obj/random/maintenance/medical, -/obj/random/maintenance/medical, -/obj/random/maintenance/medical, -/obj/random/maintenance/medical, -/obj/random/maintenance/medical, -/obj/random/maintenance/medical, -/turf/simulated/floor/plating, -/area/maintenance/firstdeck/foreport) +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/steel_grid, +/area/teleporter/firstdeck) "chO" = ( /obj/structure/table/standard, /obj/item/device/t_scanner, @@ -11165,6 +11231,23 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/storage/emergency_storage/firstdeck/fs_emergency) +"cys" = ( +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) +"cyK" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/window/brigdoor/southright{ + dir = 4; + req_access = null; + req_one_access = list(1,19) + }, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/blast/regular{ + id = "qpwld"; + name = "Checkpoint Lockdown" + }, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "cyL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -11303,18 +11386,64 @@ /turf/simulated/floor/tiled, /area/expoutpost/stationshuttle) "cFh" = ( -/obj/structure/table/steel, -/obj/item/weapon/storage/box/bodybags, -/turf/simulated/floor/plating, -/area/maintenance/firstdeck/foreport) +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 9 + }, +/obj/item/device/radio/intercom{ + dir = 1; + name = "Station Intercom (General)"; + pixel_y = 22 + }, +/obj/item/device/radio/intercom/department/security{ + dir = 8; + icon_override = "secintercom"; + pixel_x = -21 + }, +/obj/structure/table/reinforced, +/obj/machinery/recharger/wallcharger{ + pixel_x = 5; + pixel_y = 33 + }, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) +"cGE" = ( +/obj/effect/floor_decal/industrial/outline/grey, +/obj/machinery/hologram/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/dark, +/area/teleporter/firstdeck) +"cHp" = ( +/obj/structure/bed/chair/sofa{ + dir = 8 + }, +/turf/simulated/floor/carpet/sblucarpet, +/area/teleporter/firstdeck) "cIq" = ( -/obj/random/humanoidremains, -/turf/simulated/floor/plating, -/area/maintenance/firstdeck/foreport) +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/filingcabinet/chestdrawer, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "cIr" = ( -/obj/machinery/light/small, -/turf/simulated/floor/plating, -/area/maintenance/firstdeck/foreport) +/obj/effect/floor_decal/borderfloor/corner, +/obj/effect/floor_decal/corner/green/bordercorner, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "cJx" = ( /obj/machinery/door/firedoor/border_only, /obj/effect/wingrille_spawn/reinforced, @@ -11344,6 +11473,10 @@ /obj/effect/floor_decal/corner/green/bordercorner, /turf/simulated/floor/tiled/monotile, /area/hallway/primary/firstdeck/ascenter) +"cOl" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "cOQ" = ( /obj/machinery/door/blast/regular{ density = 0; @@ -11365,6 +11498,12 @@ /obj/random/trash_pile, /turf/simulated/floor/plating, /area/maintenance/firstdeck/aftport) +"cRu" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/teleporter/firstdeck) "cSw" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -11388,10 +11527,17 @@ /turf/simulated/floor/tiled, /area/hallway/secondary/escape/firstdeck/ep_starboard) "cSK" = ( -/obj/effect/decal/cleanable/blood, -/obj/machinery/light/small, -/turf/simulated/floor/plating, -/area/maintenance/firstdeck/foreport) +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "cTd" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -11465,6 +11611,31 @@ /obj/structure/loot_pile/maint/boxfort, /turf/simulated/floor/plating, /area/storage/emergency_storage/firstdeck/fp_emergency) +"cVJ" = ( +/obj/machinery/button/remote/airlock{ + id = "qpdoorout"; + name = "Outer Door Bolts"; + pixel_x = -1; + pixel_y = 24; + req_one_access = list(1,19); + specialfunctions = 4 + }, +/obj/machinery/computer/secure_data{ + pixel_y = 9 + }, +/obj/machinery/button/remote/airlock{ + id = "qpdoorin"; + name = "Inner Door Bolts"; + pixel_x = 8; + pixel_y = 24; + req_one_access = list(1,19); + specialfunctions = 4 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "cWs" = ( /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 4 @@ -11474,6 +11645,20 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/firstdeck/auxdockaft) +"cXx" = ( +/obj/item/device/radio/intercom{ + dir = 1; + name = "Station Intercom (General)"; + pixel_y = 22 + }, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/green/bordercorner{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "cYg" = ( /obj/structure/ladder/up, /obj/effect/floor_decal/industrial/outline/yellow, @@ -11615,6 +11800,12 @@ }, /turf/simulated/floor/plating, /area/maintenance/firstdeck/forestarboard) +"dix" = ( +/obj/structure/bed/chair/office/dark{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "djy" = ( /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled/steel_dirty, @@ -11670,6 +11861,21 @@ }, /turf/simulated/floor, /area/hallway/secondary/escape/firstdeck/ep_starboard) +"doa" = ( +/obj/effect/floor_decal/steeldecal/monofloor{ + dir = 1 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "doi" = ( /obj/effect/floor_decal/borderfloor{ dir = 10 @@ -11786,6 +11992,17 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/firstdeck/aft) +"dtR" = ( +/obj/structure/table/steel, +/obj/item/weapon/tank/emergency/oxygen/engi, +/obj/random/tech_supply, +/obj/random/toolbox, +/obj/machinery/alarm{ + pixel_y = 22 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/construction/firstdeck/construction1) "dtT" = ( /obj/effect/floor_decal/industrial/warning{ dir = 6 @@ -11896,6 +12113,32 @@ /obj/machinery/door/firedoor/border_only, /turf/simulated/floor/tiled/steel_grid, /area/hallway/primary/firstdeck/ascenter) +"dDr" = ( +/obj/machinery/flasher, +/obj/effect/floor_decal/steeldecal/monofloor{ + dir = 8 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) +"dEi" = ( +/obj/effect/floor_decal/spline/fancy, +/obj/machinery/camera/network/security{ + c_tag = "CP - Lounge"; + dir = 8 + }, +/turf/simulated/floor/carpet/sblucarpet, +/area/teleporter/firstdeck) "dEs" = ( /obj/machinery/camera/network/first_deck{ c_tag = "Hangar Two - Exploration Locker Room Two"; @@ -11920,6 +12163,16 @@ }, /turf/simulated/floor/plating, /area/storage/emergency_storage/firstdeck/fp_emergency) +"dGO" = ( +/obj/machinery/alarm{ + dir = 8; + pixel_x = 22 + }, +/obj/effect/floor_decal/corner_steel_grid{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "dHq" = ( /obj/structure/catwalk, /turf/simulated/floor/plating, @@ -12256,43 +12509,45 @@ /turf/simulated/floor/tiled/white, /area/rnd/xenobiology/xenoflora_isolation) "dVQ" = ( -/obj/structure/closet/crate, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/obj/random/contraband, -/obj/random/maintenance/medical, -/obj/random/maintenance/medical, -/turf/simulated/floor/plating, -/area/maintenance/firstdeck/foreport) -"dVT" = ( -/obj/structure/table/rack, -/obj/random/powercell, -/obj/random/powercell, -/obj/random/powercell, -/obj/item/weapon/storage/toolbox/mechanical, -/turf/simulated/floor/plating, -/area/maintenance/firstdeck/foreport) -"dVU" = ( -/obj/structure/closet, -/obj/item/weapon/storage/backpack, -/obj/random/maintenance/medical, -/obj/random/maintenance/medical, -/obj/random/maintenance/medical, -/obj/random/firstaid, -/turf/simulated/floor/plating, -/area/maintenance/firstdeck/foreport) -"dVV" = ( -/obj/machinery/light/small{ +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 8 }, -/obj/structure/extinguisher_cabinet{ - pixel_y = 30 +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/turf/simulated/floor/plating, -/area/maintenance/firstdeck/foreport) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) +"dVT" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) +"dVU" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/teleporter/firstdeck) +"dVV" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/holofloor/tiled/dark, +/area/teleporter/firstdeck) "dVW" = ( /obj/item/device/t_scanner, /obj/item/weapon/storage/box/lights/mixed, @@ -12713,12 +12968,12 @@ /turf/simulated/floor/plating, /area/maintenance/firstdeck/foreport) "dXe" = ( -/obj/machinery/alarm{ - dir = 1; - pixel_y = -22 +/obj/machinery/light{ + dir = 1 }, -/turf/simulated/floor/plating, -/area/maintenance/firstdeck/foreport) +/obj/structure/closet/secure_closet/personal, +/turf/simulated/floor/tiled/techmaint, +/area/teleporter/firstdeck) "dXf" = ( /turf/simulated/wall/r_wall, /area/hallway/primary/firstdeck/fpcenter) @@ -13030,12 +13285,13 @@ /turf/simulated/floor/plating, /area/rnd/xenobiology/xenoflora_isolation) "dXR" = ( -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/airlock/maintenance{ - req_access = null; - req_one_access = null +/obj/effect/floor_decal/borderfloor/corner{ + dir = 1 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/corner/green/bordercorner{ + dir = 1 + }, +/turf/simulated/floor/tiled, /area/teleporter/firstdeck) "dXU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -13728,54 +13984,75 @@ /turf/simulated/floor/plating, /area/maintenance/firstdeck/foreport) "dZu" = ( -/obj/machinery/light{ - dir = 8 +/obj/machinery/door/airlock/security{ + name = "Checkpoint Office"; + req_one_access = list(1,19) }, -/turf/simulated/floor/tiled/monotile, +/obj/machinery/door/firedoor/glass, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/steel_grid, /area/teleporter/firstdeck) "dZv" = ( -/obj/machinery/camera/network/first_deck{ - c_tag = "First Deck - Teleporter Main Room"; - dir = 6 +/obj/effect/wingrille_spawn/reinforced, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/plating, +/area/teleporter/firstdeck) +"dZw" = ( +/obj/effect/floor_decal/borderfloor/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/green/bordercorner{ + dir = 4 + }, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = 24 }, /turf/simulated/floor/tiled, /area/teleporter/firstdeck) -"dZw" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = 30 - }, -/turf/simulated/floor/tiled, -/area/teleporter/firstdeck/prep) "dZx" = ( -/obj/structure/table/steel, -/obj/machinery/alarm{ - pixel_y = 22 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, -/obj/item/weapon/storage/firstaid/regular, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled, -/area/teleporter/firstdeck/prep) +/area/teleporter/firstdeck) "dZy" = ( -/obj/structure/table/steel, -/obj/item/roller, -/obj/item/roller, -/turf/simulated/floor/tiled, -/area/teleporter/firstdeck/prep) -"dZz" = ( -/obj/structure/table/steel, -/obj/item/weapon/storage/box/backup_kit{ - pixel_x = 5; - pixel_y = 5 +/obj/structure/table/rack/shelf, +/obj/item/clothing/shoes/boots/winter, +/obj/item/clothing/suit/storage/hooded/wintercoat, +/obj/item/weapon/tank/emergency/oxygen/engi, +/obj/item/clothing/mask/gas, +/obj/effect/floor_decal/borderfloor{ + dir = 4 }, -/obj/item/weapon/storage/box/cdeathalarm_kit, -/obj/machinery/light{ +/obj/effect/floor_decal/corner/green/border{ dir = 4 }, /turf/simulated/floor/tiled, -/area/teleporter/firstdeck/prep) +/area/teleporter/firstdeck) +"dZz" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 8 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "dZB" = ( -/obj/random/junk, -/turf/simulated/floor/plating, -/area/maintenance/firstdeck/foreport) +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/holofloor/tiled/dark, +/area/teleporter/firstdeck) "dZF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -14426,11 +14703,17 @@ /turf/simulated/floor/plating, /area/maintenance/firstdeck/foreport) "eew" = ( -/obj/machinery/hyperpad/centre{ - map_pad_id = "pad_1_station"; - map_pad_link_id = "pad_1_away" +/obj/machinery/disposal, +/obj/effect/floor_decal/borderfloor{ + dir = 8 }, -/turf/simulated/floor/tiled/monotile, +/obj/effect/floor_decal/corner/green/border{ + dir = 8 + }, +/obj/machinery/status_display{ + pixel_y = 31 + }, +/turf/simulated/floor/tiled, /area/teleporter/firstdeck) "eeZ" = ( /obj/structure/grille, @@ -14453,9 +14736,19 @@ /turf/simulated/floor/plating, /area/maintenance/firstdeck/aftport) "efm" = ( -/obj/structure/table/steel, +/obj/structure/table/rack/shelf, +/obj/item/clothing/shoes/boots/winter, +/obj/item/clothing/suit/storage/hooded/wintercoat, +/obj/item/weapon/tank/emergency/oxygen/engi, +/obj/item/clothing/mask/gas, +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 6 + }, /turf/simulated/floor/tiled, -/area/teleporter/firstdeck/prep) +/area/teleporter/firstdeck) "efN" = ( /obj/structure/closet/crate, /obj/random/action_figure, @@ -14497,6 +14790,12 @@ "ekI" = ( /turf/simulated/floor/tiled, /area/hallway/primary/firstdeck/elevator) +"elz" = ( +/obj/structure/sink{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/teleporter/firstdeck) "elZ" = ( /obj/effect/floor_decal/borderfloor, /obj/structure/cable/green{ @@ -14786,6 +15085,23 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/firstdeck/auxdockaft) +"ezu" = ( +/obj/machinery/door/airlock/multi_tile/glass{ + id_tag = "qpdoorout" + }, +/obj/machinery/door/firedoor/multi_tile, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 4; + icon_state = "pdoor0"; + id = "qpdld"; + name = "Checkpoint Lockdown"; + opacity = 0 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/teleporter/firstdeck) "eAy" = ( /obj/effect/floor_decal/borderfloor{ dir = 5 @@ -14836,6 +15152,15 @@ /obj/structure/catwalk, /turf/simulated/floor, /area/maintenance/firstdeck/forestarboard) +"eDy" = ( +/obj/effect/floor_decal/corner_steel_grid{ + dir = 10 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "eDP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -14925,6 +15250,22 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/firstdeck/elevator) +"eKA" = ( +/obj/effect/floor_decal/steeldecal/steel_decals_central5{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 9 + }, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "eKQ" = ( /obj/structure/table/glass, /obj/item/weapon/storage/box/beakers{ @@ -14985,6 +15326,31 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/storage) +"eSR" = ( +/obj/structure/table/reinforced, +/obj/item/weapon/melee/umbrella{ + color = "#7c0d0d" + }, +/obj/item/weapon/melee/umbrella{ + color = "#7c0d0d" + }, +/obj/item/weapon/melee/umbrella{ + color = "#7c0d0d" + }, +/obj/item/weapon/melee/umbrella{ + color = "#7c0d0d" + }, +/obj/item/weapon/melee/umbrella{ + color = "#7c0d0d" + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "eTN" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -15133,10 +15499,6 @@ /obj/effect/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/tiled, /area/hallway/primary/firstdeck/auxdockaft) -"fdz" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/tiled/monotile, -/area/teleporter/firstdeck/prep) "fdW" = ( /obj/item/stack/rods, /turf/space, @@ -15388,6 +15750,15 @@ }, /turf/simulated/floor/tiled, /area/hallway/secondary/escape/firstdeck/ep_aftport) +"ftb" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "ftR" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/status_display{ @@ -15629,6 +16000,17 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/firstdeck/aft) +"fID" = ( +/obj/machinery/door/blast/regular{ + density = 0; + dir = 4; + icon_state = "pdoor0"; + id = "qpdld"; + name = "Checkpoint Lockdown"; + opacity = 0 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/teleporter/firstdeck) "fKj" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -15655,6 +16037,21 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/xenobiology/xenoflora) +"fKT" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 8 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "fLW" = ( /obj/machinery/vending/hydronutrients{ categories = 3; @@ -15692,6 +16089,24 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/xenobiology) +"fMV" = ( +/obj/machinery/power/apc{ + dir = 8; + name = "west bump"; + pixel_x = -24 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 8 + }, +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "fNk" = ( /obj/structure/cable/green{ d1 = 4; @@ -15850,6 +16265,16 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/xenobiology/xenoflora) +"fYU" = ( +/obj/effect/floor_decal/borderfloor/corner, +/obj/effect/floor_decal/corner/red/bordercorner, +/obj/structure/table/reinforced, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "fZp" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 6 @@ -15976,6 +16401,11 @@ }, /turf/simulated/floor/tiled/steel, /area/quartermaster/storage) +"ggJ" = ( +/obj/structure/table/steel, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/construction/firstdeck/construction1) "ghB" = ( /obj/structure/grille, /obj/structure/shuttle/window, @@ -16046,66 +16476,25 @@ /turf/simulated/floor/tiled, /area/quartermaster/hallway) "gnl" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, +/obj/effect/floor_decal/steeldecal/monofloor, /obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/green/border{ - dir = 4 + d1 = 1; + d2 = 2; + icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/teleporter/firstdeck) "gnU" = ( -/obj/effect/wingrille_spawn/reinforced, -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/effect/floor_decal/industrial/warning{ + dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/teleporter/firstdeck/prep) +/turf/simulated/floor/holofloor/tiled/dark, +/area/teleporter/firstdeck) "goA" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/tiled/monotile, -/area/teleporter/firstdeck/prep) +/obj/structure/closet/secure_closet/personal, +/turf/simulated/floor/tiled/techmaint, +/area/teleporter/firstdeck) "gqi" = ( /obj/effect/shuttle_landmark{ base_area = /area/space; @@ -16129,13 +16518,14 @@ /turf/simulated/floor/plating, /area/maintenance/firstdeck/centralport) "gux" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/effect/floor_decal/corner_steel_grid{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/tiled, -/area/teleporter/firstdeck/prep) +/area/teleporter/firstdeck) "gwv" = ( /obj/structure/table/rack, /obj/item/clothing/glasses/sunglasses, @@ -16321,6 +16711,22 @@ /obj/effect/floor_decal/corner/purple/bordercorner, /turf/simulated/floor/tiled/white, /area/rnd/research/firstdeck/hallway) +"gEu" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/glass, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/teleporter/firstdeck) "gGZ" = ( /obj/structure/closet/emcloset/legacy, /turf/simulated/floor/tiled/dark, @@ -16367,6 +16773,35 @@ /obj/machinery/smartfridge/produce, /turf/simulated/wall, /area/rnd/xenobiology/xenoflora) +"gLc" = ( +/obj/structure/table/reinforced, +/obj/structure/window/reinforced{ + dir = 4; + health = 1e+006 + }, +/obj/item/device/radio/phone{ + pixel_y = 3 + }, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/blast/regular{ + id = "qpwld"; + name = "Checkpoint Lockdown" + }, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) +"gMA" = ( +/obj/effect/floor_decal/borderfloor/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/bordercorner{ + dir = 1 + }, +/obj/machinery/alarm{ + dir = 4; + pixel_x = -22 + }, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "gMT" = ( /obj/machinery/ai_status_display, /turf/simulated/wall, @@ -16553,15 +16988,30 @@ /turf/simulated/shuttle/floor/white, /area/shuttle/large_escape_pod2/station) "hfa" = ( -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/tiled/dark, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, /area/teleporter/firstdeck) "hga" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 +/obj/machinery/light{ + dir = 4 }, -/turf/simulated/floor/tiled/monotile, -/area/teleporter/firstdeck/prep) +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "hgs" = ( /obj/structure/table/rack{ dir = 8; @@ -17038,6 +17488,21 @@ }, /turf/simulated/floor/tiled, /area/hallway/secondary/escape/firstdeck/ep_aftstarboard) +"hLP" = ( +/obj/effect/floor_decal/corner_steel_grid{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals_central5{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "hMY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -17062,6 +17527,15 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/firstdeck/auxdockaft) +"hND" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 8 + }, +/turf/simulated/floor/tiled/monotile, +/area/hallway/primary/firstdeck/port) "hOg" = ( /obj/structure/extinguisher_cabinet{ pixel_x = 25 @@ -17411,6 +17885,10 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, /area/rnd/xenobiology) +"ipW" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "iqu" = ( /turf/simulated/floor/tiled, /area/hallway/secondary/escape/firstdeck/ep_aftstarboard) @@ -17572,14 +18050,33 @@ /turf/simulated/floor/plating, /area/maintenance/firstdeck/aftstarboard) "iCq" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 +/obj/effect/floor_decal/borderfloor{ + dir = 8 }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/corner/green/border{ + dir = 8 + }, +/obj/item/device/radio/intercom{ + dir = 8; + name = "Station Intercom (General)"; + pixel_x = -21 + }, +/turf/simulated/floor/tiled, /area/teleporter/firstdeck) "iCS" = ( -/obj/machinery/mech_recharger, -/turf/simulated/floor/tiled/dark, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + dir = 4; + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/tiled, /area/teleporter/firstdeck) "iDD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -17594,19 +18091,54 @@ /turf/simulated/floor/tiled, /area/hallway/primary/firstdeck/aft) "iDI" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/turf/simulated/floor/tiled/dark, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, /area/teleporter/firstdeck) -"iFn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +"iEp" = ( +/obj/machinery/door/airlock/multi_tile/glass{ + id_tag = "qpdoorin" + }, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 4; + icon_state = "pdoor0"; + id = "qpdld"; + name = "Checkpoint Lockdown"; + opacity = 0 + }, +/obj/machinery/door/firedoor/multi_tile, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/steel_grid, +/area/teleporter/firstdeck) +"iFn" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /turf/simulated/floor/tiled, /area/teleporter/firstdeck) "iFo" = ( @@ -17775,6 +18307,9 @@ temperature = 80 }, /area/tcomm/chamber) +"iQH" = ( +/turf/simulated/wall, +/area/teleporter/firstdeck) "iRg" = ( /obj/structure/cable/cyan{ d1 = 4; @@ -18427,6 +18962,29 @@ /obj/effect/floor_decal/corner/purple/border, /turf/simulated/floor/tiled/white, /area/rnd/research/firstdeck/hallway) +"jDV" = ( +/obj/structure/table/reinforced, +/obj/machinery/light{ + dir = 8 + }, +/obj/item/weapon/tool/crowbar/red, +/obj/item/weapon/tool/crowbar/red, +/obj/item/weapon/tool/crowbar/red, +/obj/item/weapon/tool/crowbar/red, +/obj/item/weapon/tool/crowbar/red, +/obj/item/device/flashlight, +/obj/item/device/flashlight, +/obj/item/device/flashlight, +/obj/item/device/flashlight, +/obj/item/device/flashlight, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "jFk" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/cable/green{ @@ -18685,12 +19243,24 @@ }, /turf/simulated/floor/plating, /area/rnd/xenobiology) +"jTA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "jUm" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 }, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) +"jUt" = ( +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, +/turf/simulated/floor/tiled/white, +/area/teleporter/firstdeck) "jUv" = ( /obj/structure/cable{ d1 = 4; @@ -18714,14 +19284,21 @@ /turf/simulated/floor/airless, /area/space) "jWC" = ( -/obj/machinery/camera/network/first_deck{ - c_tag = "First Deck - Teleporter Main Room"; - dir = 1 +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/green/border, +/obj/structure/table/glass, +/obj/item/weapon/paper_bin, +/obj/item/weapon/pen, +/obj/item/weapon/pen/blue{ + pixel_x = -5; + pixel_y = -1 }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 +/obj/item/weapon/pen/red{ + pixel_x = 3; + pixel_y = 5 }, -/turf/simulated/floor/tiled/dark, +/obj/machinery/light, +/turf/simulated/floor/tiled, /area/teleporter/firstdeck) "jXQ" = ( /obj/item/weapon/storage/toolbox/syndicate, @@ -19041,6 +19618,22 @@ /obj/structure/sign/warning/caution, /turf/simulated/wall/r_wall, /area/tcomm/computer) +"krK" = ( +/obj/effect/floor_decal/borderfloor/corner{ + dir = 8 + }, +/obj/effect/floor_decal/corner/green/bordercorner{ + dir = 8 + }, +/obj/machinery/camera/network/security{ + c_tag = "CP - Quantum Pad"; + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "ksz" = ( /obj/structure/cable/cyan{ d1 = 1; @@ -19507,6 +20100,17 @@ /obj/machinery/recharge_station, /turf/simulated/floor/tiled/dark, /area/rnd/research/firstdeck/hallway) +"lcw" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "lcJ" = ( /obj/item/device/flashlight, /turf/simulated/floor/plating, @@ -19533,6 +20137,15 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/firstdeck/auxdockaft) +"leD" = ( +/obj/effect/floor_decal/steeldecal/monofloor{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "lfT" = ( /obj/structure/table/glass, /obj/machinery/firealarm{ @@ -19724,19 +20337,13 @@ /turf/simulated/floor/plating, /area/maintenance/firstdeck/foreport) "lvn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/glass_mining{ - id_tag = "hangar_1_door"; - name = "Teleporter Bay Core"; - req_one_access = null - }, /turf/simulated/floor/tiled/steel_grid, /area/teleporter/firstdeck) "lvp" = ( @@ -20524,6 +21131,11 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/firstdeck/auxdockaft) +"muZ" = ( +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/deployable/barrier, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "mvz" = ( /obj/structure/cable/green{ d1 = 4; @@ -20794,6 +21406,38 @@ }, /turf/simulated/floor/tiled/steel, /area/construction/firstdeck/construction3) +"mKw" = ( +/obj/machinery/computer/security{ + pixel_x = 5; + pixel_y = 9 + }, +/obj/machinery/button/remote/blast_door{ + id = "qpwld"; + name = "Desk Lockdown"; + pixel_x = -4; + pixel_y = 24; + req_one_access = list(1,19) + }, +/obj/machinery/button/remote/blast_door{ + id = "qpdld"; + name = "Door Lockdown"; + pixel_x = 5; + pixel_y = 24; + req_one_access = list(1,19) + }, +/obj/machinery/button/flasher{ + pixel_x = 17; + pixel_y = 22; + req_one_access = list(1,19) + }, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "mKZ" = ( /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, @@ -20812,6 +21456,17 @@ }, /turf/simulated/floor/tiled, /area/tcomm/entrance) +"mMT" = ( +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "mNh" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -21127,6 +21782,15 @@ /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled, /area/tcomm/computer) +"mZr" = ( +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/green/border, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "mZN" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -21480,6 +22144,12 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/firstdeck/auxdockaft) +"nyV" = ( +/obj/structure/bed/chair/sofa/left{ + dir = 8 + }, +/turf/simulated/floor/carpet/sblucarpet, +/area/teleporter/firstdeck) "nzc" = ( /obj/effect/floor_decal/industrial/warning/corner, /obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod_berth{ @@ -21500,6 +22170,14 @@ }, /turf/simulated/shuttle/plating/airless/carry, /area/shuttle/escape_pod5/station) +"nCB" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/green/border, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "nEc" = ( /obj/structure/cable{ d2 = 2; @@ -21645,6 +22323,18 @@ }, /turf/simulated/floor/tiled, /area/hallway/secondary/firstdeck/research_access) +"nRa" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "nRi" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -21988,9 +22678,19 @@ /turf/simulated/floor/plating, /area/rnd/xenobiology) "olL" = ( -/obj/machinery/door/firedoor/glass, +/obj/effect/floor_decal/steeldecal/steel_decals4, +/obj/machinery/alarm{ + dir = 1; + pixel_y = -22 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, -/area/teleporter/firstdeck/prep) +/area/teleporter/firstdeck) "oma" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -22228,11 +22928,28 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/firstdeck/centralport) +"oBe" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 4 + }, +/obj/machinery/alarm{ + dir = 8; + pixel_x = 22 + }, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "oBK" = ( -/obj/effect/floor_decal/rust, -/obj/structure/table/steel, -/turf/simulated/floor/tiled/steel_dirty, -/area/construction/firstdeck/construction1) +/obj/effect/floor_decal/corner_steel_grid{ + dir = 5 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "oCD" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -22682,6 +23399,16 @@ }, /turf/simulated/floor/tiled, /area/tcomm/computer) +"pjl" = ( +/obj/structure/bed/chair/sofa/right, +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/floor_decal/spline/fancy{ + dir = 8 + }, +/turf/simulated/floor/carpet/sblucarpet, +/area/teleporter/firstdeck) "pjq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/monotile, @@ -22823,6 +23550,21 @@ }, /turf/simulated/floor/plating, /area/hangar/lockerroomthree) +"psM" = ( +/obj/structure/table/reinforced, +/obj/structure/window/reinforced{ + dir = 4; + health = 1e+006 + }, +/obj/item/weapon/paper_bin, +/obj/item/weapon/pen, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/blast/regular{ + id = "qpwld"; + name = "Checkpoint Lockdown" + }, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "ptP" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced{ @@ -22988,6 +23730,17 @@ /obj/random/junk, /turf/simulated/floor/plating, /area/maintenance/firstdeck/aftport) +"pAv" = ( +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/white, +/area/teleporter/firstdeck) "pAY" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -23033,6 +23786,18 @@ /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/firstdeck/research_access) +"pCf" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 8 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "pDa" = ( /obj/structure/cable{ d1 = 1; @@ -23133,6 +23898,21 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/firstdeck/centralstarboard) +"pKZ" = ( +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "pLh" = ( /obj/machinery/firealarm{ dir = 1; @@ -23530,6 +24310,12 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/firstdeck/ascenter) +"qhA" = ( +/obj/machinery/camera/network/security{ + c_tag = "CP - Prep" + }, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "qhH" = ( /obj/machinery/alarm{ dir = 8; @@ -23543,15 +24329,32 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology) +"qii" = ( +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "qiR" = ( /obj/machinery/space_heater, /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/firstdeck/centralport) "qjI" = ( -/obj/structure/table/steel, -/turf/simulated/floor/plating, -/area/construction/firstdeck/construction1) +/obj/structure/table/rack/shelf, +/obj/item/clothing/shoes/boots/winter, +/obj/item/clothing/suit/storage/hooded/wintercoat, +/obj/item/weapon/tank/emergency/oxygen/engi, +/obj/item/clothing/mask/gas, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/green/border, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "qkX" = ( /obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ @@ -23568,9 +24371,18 @@ /turf/simulated/floor/tiled/steel_grid, /area/ai_monitored/storage/eva/aux) "qlf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, +/obj/effect/floor_decal/borderfloor/corner{ + dir = 8 + }, +/obj/effect/floor_decal/corner/green/bordercorner{ + dir = 8 + }, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled/monotile, /area/hallway/primary/firstdeck/port) "qls" = ( @@ -23754,6 +24566,13 @@ /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled, /area/hallway/primary/firstdeck/aft) +"qxq" = ( +/obj/structure/bed/chair/sofa/corner, +/obj/machinery/ai_status_display{ + pixel_y = 31 + }, +/turf/simulated/floor/carpet/sblucarpet, +/area/teleporter/firstdeck) "qyi" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/wall/r_wall, @@ -24046,6 +24865,19 @@ "qOB" = ( /turf/simulated/wall, /area/hallway/secondary/firstdeck/research_access) +"qQS" = ( +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "qSb" = ( /turf/simulated/floor/plating, /area/maintenance/firstdeck/centralstarboard) @@ -24407,6 +25239,12 @@ }, /turf/simulated/wall, /area/maintenance/firstdeck/foreport) +"roG" = ( +/obj/effect/floor_decal/corner_steel_grid{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "roU" = ( /obj/structure/sign/directions/security{ dir = 8 @@ -24524,6 +25362,21 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor, /area/tcomm/tcomstorage) +"ryn" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 8 + }, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + dir = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "ryB" = ( /obj/structure/loot_pile/maint/junk, /turf/simulated/floor, @@ -24839,10 +25692,38 @@ }, /turf/simulated/wall/r_wall, /area/hallway/primary/firstdeck/ascenter) +"rUK" = ( +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 1 + }, +/obj/machinery/door/firedoor/multi_tile{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/teleporter/firstdeck) "rVv" = ( /obj/structure/sign/warning/secure_area, /turf/simulated/wall/r_wall, /area/tcomm/entrance) +"rVE" = ( +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 5 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "rWn" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -24906,6 +25787,18 @@ "sal" = ( /turf/simulated/shuttle/wall, /area/shuttle/large_escape_pod1/station) +"saC" = ( +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 9 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/teleporter/firstdeck) "sbb" = ( /obj/machinery/alarm{ pixel_y = 23 @@ -24942,9 +25835,17 @@ /turf/simulated/floor/tiled/white, /area/rnd/research/firstdeck/hallway) "sdx" = ( -/obj/effect/decal/cleanable/blood, -/turf/simulated/floor/plating, -/area/maintenance/firstdeck/foreport) +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "sdN" = ( /obj/structure/filingcabinet/chestdrawer, /obj/effect/floor_decal/borderfloor{ @@ -25490,10 +26391,16 @@ /turf/simulated/floor/tiled/monotile, /area/hangar/two) "sND" = ( -/obj/structure/table/steel, -/obj/machinery/microwave, -/turf/simulated/floor/plating, -/area/maintenance/firstdeck/foreport) +/obj/item/device/radio/intercom{ + dir = 1; + name = "Station Intercom (General)"; + pixel_y = 22 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/teleporter/firstdeck) "sNE" = ( /obj/machinery/light{ dir = 1 @@ -25519,6 +26426,11 @@ /obj/effect/floor_decal/corner/green/border, /turf/simulated/floor/tiled, /area/hallway/primary/firstdeck/auxdockaft) +"sQR" = ( +/obj/machinery/door/airlock/multi_tile/glass, +/obj/machinery/door/firedoor/multi_tile, +/turf/simulated/floor/tiled/steel_grid, +/area/teleporter/firstdeck) "sRn" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -25797,6 +26709,24 @@ }, /turf/simulated/floor/tiled/white, /area/medical/first_aid_station/firstdeck) +"thl" = ( +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 9 + }, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "thp" = ( /obj/structure/window/reinforced{ dir = 8 @@ -25851,6 +26781,15 @@ }, /turf/simulated/floor/tiled/white, /area/medical/first_aid_station/firstdeck) +"tiM" = ( +/obj/effect/floor_decal/steeldecal/steel_decals_central5{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "tkF" = ( /obj/effect/floor_decal/industrial/warning{ dir = 6 @@ -26499,6 +27438,15 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/firstdeck/aftport) +"tUx" = ( +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, +/obj/machinery/light, +/obj/structure/closet/secure_closet/personal, +/turf/simulated/floor/tiled/techmaint, +/area/teleporter/firstdeck) "tUz" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -26986,6 +27934,23 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/hallway) +"uyp" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 8 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "uyM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -27550,6 +28515,38 @@ /obj/machinery/shield_diffuser, /turf/space, /area/space) +"uXJ" = ( +/obj/structure/table/rack/shelf, +/obj/machinery/light{ + dir = 4 + }, +/obj/item/clothing/shoes/boots/winter, +/obj/item/clothing/suit/storage/hooded/wintercoat, +/obj/item/weapon/tank/emergency/oxygen/engi, +/obj/item/clothing/mask/gas, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) +"uYj" = ( +/obj/effect/floor_decal/corner_steel_grid{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals_central5{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "uZM" = ( /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 8 @@ -27682,6 +28679,14 @@ /obj/structure/sign/warning/biohazard, /turf/simulated/wall/r_wall, /area/rnd/xenobiology) +"vgG" = ( +/obj/machinery/hologram/holopad, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark, +/area/teleporter/firstdeck) "vgS" = ( /obj/structure/table/standard, /obj/item/weapon/paper_bin{ @@ -27817,6 +28822,17 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/xenobiology) +"vlU" = ( +/obj/effect/floor_decal/borderfloor/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/green/bordercorner{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "vmg" = ( /obj/structure/stairs/spawner/east, /turf/simulated/floor/tiled/dark, @@ -27928,6 +28944,20 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/firstdeck/port) +"vpN" = ( +/obj/effect/floor_decal/steeldecal/steel_decals_central5, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 8 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "vpX" = ( /obj/effect/floor_decal/industrial/warning{ dir = 9 @@ -28153,6 +29183,10 @@ }, /turf/simulated/floor/tiled/white, /area/medical/first_aid_station/firstdeck) +"vGL" = ( +/obj/structure/table/steel, +/turf/simulated/floor/plating, +/area/construction/firstdeck/construction1) "vHb" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -28169,6 +29203,27 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/hallway) +"vHC" = ( +/obj/machinery/disposal, +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/effect/floor_decal/corner/green/border{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) +"vIo" = ( +/obj/structure/table/rack/shelf, +/obj/item/clothing/shoes/boots/winter, +/obj/item/clothing/suit/storage/hooded/wintercoat, +/obj/item/weapon/tank/emergency/oxygen/engi, +/obj/item/clothing/mask/gas, +/obj/machinery/light, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/green/border, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "vIM" = ( /obj/machinery/computer/crew{ dir = 8 @@ -28227,6 +29282,16 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/firstdeck/elevator) +"vOZ" = ( +/obj/structure/dispenser/oxygen, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/holofloor/tiled/dark, +/area/teleporter/firstdeck) "vPp" = ( /obj/structure/table/standard, /obj/item/weapon/stock_parts/subspace/ansible, @@ -28269,6 +29334,26 @@ /obj/effect/floor_decal/corner/green/border, /turf/simulated/floor/tiled, /area/hallway/primary/firstdeck/starboard) +"vQw" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 4 + }, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = 24 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/obj/machinery/camera/network/security{ + c_tag = "CP - Booth"; + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "vQU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/borderfloor, @@ -28406,6 +29491,12 @@ /obj/structure/closet/emcloset, /turf/simulated/floor/tiled, /area/hallway/secondary/escape/firstdeck/ep_aftstarboard) +"vYA" = ( +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "vYH" = ( /obj/structure/table/steel, /obj/random/tech_supply, @@ -28918,6 +30009,13 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/firstdeck/auxdockaft) +"wEy" = ( +/obj/machinery/alarm{ + dir = 4; + pixel_x = -22 + }, +/turf/simulated/floor/tiled/white, +/area/teleporter/firstdeck) "wFd" = ( /obj/machinery/door/airlock/glass_external{ frequency = 1380; @@ -28960,6 +30058,16 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/xenobiology) +"wIA" = ( +/obj/machinery/porta_turret/crescent, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "wLF" = ( /obj/structure/sink{ dir = 8; @@ -29057,6 +30165,18 @@ }, /turf/space, /area/space) +"wOD" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 8 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "wPy" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -29303,6 +30423,21 @@ }, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) +"xdN" = ( +/obj/machinery/porta_turret/crescent, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 4 + }, +/obj/item/device/radio/intercom{ + name = "Station Intercom (General)"; + pixel_y = -22 + }, +/obj/machinery/light, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "xdS" = ( /obj/turbolift_map_holder/southern_cross/center, /turf/unsimulated/mask, @@ -29468,6 +30603,15 @@ /obj/effect/floor_decal/corner/red/border, /turf/simulated/floor/tiled, /area/hallway/secondary/escape/firstdeck/ep_starboard) +"xrz" = ( +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "xrX" = ( /obj/structure/lattice, /obj/structure/grille/broken, @@ -29633,6 +30777,21 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel_grid, /area/hallway/secondary/escape/firstdeck/ep_starboard) +"xFC" = ( +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/tiled/white, +/area/teleporter/firstdeck) "xGs" = ( /obj/structure/flora/pottedplant/stoutbush, /obj/structure/extinguisher_cabinet{ @@ -29693,6 +30852,13 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/firstdeck/apcenter) +"xOi" = ( +/obj/machinery/camera/network/security{ + c_tag = "CP - Locker Room" + }, +/obj/structure/closet/secure_closet/personal, +/turf/simulated/floor/tiled/techmaint, +/area/teleporter/firstdeck) "xPQ" = ( /obj/structure/catwalk, /turf/simulated/floor/plating, @@ -29716,6 +30882,26 @@ }, /turf/simulated/shuttle/floor, /area/shuttle/escape_pod6/station) +"xQs" = ( +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 6 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "xRw" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 1 @@ -29890,6 +31076,24 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, /area/rnd/xenobiology) +"xWc" = ( +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/teleporter/firstdeck) "xYR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -53418,7 +54622,7 @@ aaf aaf tOo tOo -aau +ajn ajn ajn ajn @@ -53675,9 +54879,9 @@ aaa aaa aaa tOo -aau +ajn +aVW aVW -aSf aVW cfo ajn @@ -53932,16 +55136,16 @@ vYi aaa aaa aaa -tOo -aMG +aaj +ajn ajn aFf aFf -aFf -aFf -aFf -ajn -aSi +aiY +aiY +aiY +aiY +aiY aiY aiY aiY @@ -54191,21 +55395,21 @@ aaa aaa aaa aCl -aMJ -aSf -aFf -sND -cfp -cFh -aFf -aTE -aVW +ajn +aMG +ajn +ajn aiY -dZu -agt +cFh +fMV +gMA +aaA +muZ +aiY +eew agq agW -aaQ +fKT iCq aiD aiY @@ -54448,20 +55652,20 @@ aaf aaa aaa aaa -aCl +tOo +ajn +ajn +ajn ajn -aSi -aFf -brx -sdx -cIq -aFf -aMM -dXe aiY -agt -eew -agq +cIq +mMT +lcw +cSK +dVQ +dZu +bBI +nRa agZ hfa iCS @@ -54706,28 +55910,28 @@ xrX aaa aaa aaa -aCl -ajn -aVW -aFf -sdx -ajn -cIr -aFf -ajn -ajn aiY -ail -ail +aiY +aiY +aiY +aiY +aiY +mKw +aam +vgG +dVT +fYU +aiY +pjl agr -agZ +bVz aaR iDI jWC aiY acd -oBK -qjI +mKZ +mKZ akN asq akV @@ -54964,28 +56168,28 @@ vYi aaa aaa aaa -tOo -aML -aVW -aFf -ajn -aab -ajn -aFf -aau -aVW aiY -dZv -ahC -ahC -agZ -ahC +aiY +aiY +aiY +aiY +aiY +cVJ +dix +cys +aaG ahC +aiY +qxq +cHp +nyV +dEi +xWc abq aiY -akN -akN -akN +dtR +ggJ +vGL akN alC akV @@ -55222,29 +56426,29 @@ vYi aaa aaa aaa -tOo -aTE -aSk -aFf -sdx -cfU -sdx -aFf -akg -aSi aiY -aam -agt -agt -aaF -agt -agt -agt -aiX -acg -acC -aki -akP +agv +aSk +cfp +sdx +aiY +gLc +cyK +psM +aiY +aiY +aiY +aiY +dZv +dZv +aiY +gEu +aiY +aiY +akN +akN +akN +akN aAy aer afd @@ -55480,29 +56684,29 @@ vYi aaf aaf aaf -tOo +aaQ aMM -aVW -aFf -ajn +aML +cfU +krK chy -ajn -aFf -dVQ -ajn -dXR -ahC -agt +uyp +wOD +wIA +chy +ryn +dZz +iCq aax -aha -ahD -agt -aiF -aiY +pCf +dXR +xQs +vYA +sQR acg acC qlf -akQ +hND adR aes akQ @@ -55738,24 +56942,24 @@ aaf aaa aaa aaa -tOo -ajn +aaQ +ail aSm -aFf +dZB brQ -ajn -aTE -aFf -aTE -ajn -aiY -ahC -ahC -aay +ezu +eKA +dDr +vpN +iEp +thl +aaF gnl +agZ +doa aaT iFn -iFn +rVE lvn mNh oCD @@ -55996,25 +57200,25 @@ aaf aaa aaa aaa -tOo +aaQ aMN -ajn -aFf -bwf -ajn -cIr -aFf -ajn -aVW -azG -olL -abs -azG +aSi gnU -azG -olL +bwf +fID +tiM +leD +bMq +fID +ahF +qQS abs azG +dZw +xrz +olL +aiY +aiY amq acD amq @@ -56254,25 +57458,25 @@ aaa aaa aaa aaa -aCl -ajn -aTE -aFf +aiY +aiX +aiX +hga bBQ -aTE -sdx -aFf -dVT -aSf -azG -ahF -ahF -aaA -aaG +aiY +oBe +vQw +xdN +aiY +aiY +dVU +aiY +aiY +aiY aaU -ahF -aAK -azG +rUK +aiY +aiY acm oDZ qlN @@ -56512,25 +57716,25 @@ aaa aaa aaa aaa -aCl -ajn -aVW -aFf -aau -ajn -ajn -aFf -dVU -aVW -azG -dZw -ahF -ahF -aaH -ahF -ahF -abw -azG +aiY +aiY +aiY +aiY +aiY +aiY +aiY +aiY +aiY +aiY +ftb +pKZ +qjI +aiY +goA +uYj +hLP +goA +aiY acn acE qlQ @@ -56770,25 +57974,25 @@ aaf aaa aaa aaa -aCl -ajn -aVW -aFf -ajn -sdx -ajn -aFf -ajn -aSi -azG +aiY +aAK +brx +saC +wEy +aiY +vHC +jDV +eSR +aki +vlU dZx -ahF -fdz -goA -hga -ahF -abw -azG +vIo +aiY +xOi +gux +eDy +tUx +aiY mNj acK qrm @@ -57028,25 +58232,25 @@ vYi aaa aaa aaa -tOo -aTE -aSi -aFf -aFf -aaj -ajn -aFf -aTE -ajn -azG -dZy -ahF -ahF -gux -ahF -ahF -axI -azG +aiY +aiY +aiY +sND +jUt +aiY +cXx +cys +cys +akP +cys +dVT +mZr +aiY +dXe +oBK +roG +goA +aiY amq amq amq @@ -57286,25 +58490,25 @@ vYi aaa aaa aaa -tOo +aiY aMO -aVW -aSf -aFf +brx +xFC +pAv chC -cSK -aFf -aau -ajn -azG -dZz +qii +jTA +cGE +cIr +dZy +uXJ efm -agv -aaI -agv +aiY +goA +dGO abe -aby -azG +goA +aiY aco acL adk @@ -57544,25 +58748,25 @@ vYi aaf aaf aaf -tOo -tOo -aau -aVW -aFf -aau -ajn -aFf -aFf -ajE -azG -azG -azG -azG -azG -azG -azG -azG -azG +aiY +aiY +aiY +cRu +elz +aiY +qhA +cOl +ipW +nCB +aiY +aiY +aiY +aiY +aiY +aiY +aiY +aiY +aiY ajn ajM adm @@ -57802,18 +59006,18 @@ vYi aaa aaa aaa -aaa -tOo -aFf -ajE -aFf -aFf -aFf -aFf +aiY +aMO +brx +aKL +elz +aiY dVV +vOZ +dVV +aiY +aiY ajn -aFf -dZB afN aMJ gwv @@ -58060,16 +59264,16 @@ aaa ean aaa aaa -aaa -tOo -ajn -ajn -aFf -aFf -ajn -aTE -ajn -ajn +aiY +aiY +aiY +aiY +aiY +iQH +aiY +aiY +aiY +aiY ajn aTE ajn @@ -68893,7 +70097,7 @@ xrX vYi vYi aaa -ean +aab aaa aaa aaa From 8e96fb6b18e9fbe0ea759397a0cd221baa567b28 Mon Sep 17 00:00:00 2001 From: TheGreatKitsune Date: Thu, 8 Dec 2022 10:59:50 -0600 Subject: [PATCH 16/75] Let dead folk see/hear stuff like ghosts --- code/modules/mob/hear_say.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/hear_say.dm b/code/modules/mob/hear_say.dm index f1d2c94226..7c4bbae2da 100644 --- a/code/modules/mob/hear_say.dm +++ b/code/modules/mob/hear_say.dm @@ -111,7 +111,7 @@ if(is_preference_enabled(/datum/client_preference/ghost_ears) && (speaker in view(src))) message = "[message]" - if(is_deaf()) + if(is_deaf() && stat != DEAD) //CHOMPEdit - Dead people should be able to hear stuff like ghosts can if(speaker == src) to_chat(src, "You cannot hear yourself speak!") else From 23ce23f6bfae0a4e709efd5f991a87f42ab963fa Mon Sep 17 00:00:00 2001 From: Verkister Date: Thu, 8 Dec 2022 20:55:27 +0200 Subject: [PATCH 17/75] Adds sound volume setting to vorebellies Vorgan sound volume can now be adjusted per-belly to allow certain vorgans to sound more muffled etc. --- code/modules/vore/eating/belly_obj_vr.dm | 13 ++++++++----- code/modules/vore/eating/bellymodes_vr.dm | 8 ++++---- code/modules/vore/eating/vorepanel_vr.dm | 6 ++++++ tgui/packages/tgui/interfaces/VorePanel.js | 10 ++++++++-- tgui/public/tgui.bundle.js | 2 +- 5 files changed, 27 insertions(+), 12 deletions(-) diff --git a/code/modules/vore/eating/belly_obj_vr.dm b/code/modules/vore/eating/belly_obj_vr.dm index d6493b3842..43ce4a33cc 100644 --- a/code/modules/vore/eating/belly_obj_vr.dm +++ b/code/modules/vore/eating/belly_obj_vr.dm @@ -57,6 +57,7 @@ var/special_entrance_sound // CHOMPEdit: Mob specific custom entry sound set by mob's init_vore when applicable var/slow_digestion = FALSE // CHOMPEdit: Gradual corpse digestion var/slow_brutal = FALSE // CHOMPEdit: Gradual corpse digestion: Stumpy's Special + var/sound_volume = 100 // CHOMPEdit: Volume knob. // Generally just used by AI var/autotransferchance = 0 // % Chance of prey being autotransferred to transfer location @@ -276,7 +277,8 @@ "autotransfer_min_amount", "autotransfer_max_amount", "slow_digestion", - "slow_brutal", //CHOMP end of variables from CHOMP + "slow_brutal", + "sound_volume", //CHOMP end of variables from CHOMP "egg_type", "save_digest_mode" ) @@ -334,7 +336,7 @@ if(special_entrance_sound) //CHOMPEdit: Custom sound set by mob's init_vore or ingame varedits. soundfile = special_entrance_sound if(soundfile) - playsound(src, soundfile, vol = 100, vary = 1, falloff = VORE_SOUND_FALLOFF, preference = /datum/client_preference/eating_noises, volume_channel = VOLUME_CHANNEL_VORE) + playsound(src, soundfile, vol = sound_volume, vary = 1, falloff = VORE_SOUND_FALLOFF, preference = /datum/client_preference/eating_noises, volume_channel = VOLUME_CHANNEL_VORE) //CHOPEdit recent_sound = TRUE //Messages if it's a mob @@ -499,7 +501,7 @@ else soundfile = fancy_release_sounds[release_sound] if(soundfile) - playsound(src, soundfile, vol = 100, vary = 1, falloff = VORE_SOUND_FALLOFF, preference = /datum/client_preference/eating_noises, volume_channel = VOLUME_CHANNEL_VORE) + playsound(src, soundfile, vol = sound_volume, vary = 1, falloff = VORE_SOUND_FALLOFF, preference = /datum/client_preference/eating_noises, volume_channel = VOLUME_CHANNEL_VORE) //CHOPEdit return count @@ -569,7 +571,7 @@ else soundfile = fancy_release_sounds[release_sound] if(soundfile) - playsound(src, soundfile, vol = 100, vary = 1, falloff = VORE_SOUND_FALLOFF, preference = /datum/client_preference/eating_noises, volume_channel = VOLUME_CHANNEL_VORE) + playsound(src, soundfile, vol = sound_volume, vary = 1, falloff = VORE_SOUND_FALLOFF, preference = /datum/client_preference/eating_noises, volume_channel = VOLUME_CHANNEL_VORE) //CHOPEdit //Should fix your view not following you out of mobs sometimes! if(ismob(M)) var/mob/ourmob = M @@ -1330,7 +1332,8 @@ dupe.autotransfer_min_amount = autotransfer_min_amount dupe.autotransfer_max_amount = autotransfer_max_amount dupe.slow_digestion = slow_digestion - dupe.slow_brutal = slow_brutal //CHOMP end of variables from CHOMP + dupe.slow_brutal = slow_brutal + dupe.sound_volume = sound_volume //CHOMP end of variables from CHOMP dupe.belly_fullscreen = belly_fullscreen dupe.disable_hud = disable_hud diff --git a/code/modules/vore/eating/bellymodes_vr.dm b/code/modules/vore/eating/bellymodes_vr.dm index 3147b04ffd..490416960b 100644 --- a/code/modules/vore/eating/bellymodes_vr.dm +++ b/code/modules/vore/eating/bellymodes_vr.dm @@ -105,9 +105,9 @@ continue if(isturf(M.loc) || (M.loc != src)) //to avoid people on the inside getting the outside sounds and their direct sounds + built in sound pref check if(fancy_vore) - M.playsound_local(get_turf(owner), play_sound, vol = 100, vary = 1, falloff = VORE_SOUND_FALLOFF) + M.playsound_local(get_turf(owner), play_sound, vol = sound_volume, vary = 1, falloff = VORE_SOUND_FALLOFF) //CHOMPEdit else - M.playsound_local(get_turf(owner), play_sound, vol = 100, vary = 1, falloff = VORE_SOUND_FALLOFF) + M.playsound_local(get_turf(owner), play_sound, vol = sound_volume, vary = 1, falloff = VORE_SOUND_FALLOFF) //CHOMPEdit //these are all external sound triggers now, so it's ok. return @@ -132,9 +132,9 @@ continue if(isturf(M.loc) || (M.loc != src)) //to avoid people on the inside getting the outside sounds and their direct sounds + built in sound pref check if(fancy_vore) - M.playsound_local(get_turf(owner), play_sound, vol = 100, vary = 1, falloff = VORE_SOUND_FALLOFF) + M.playsound_local(get_turf(owner), play_sound, vol = sound_volume, vary = 1, falloff = VORE_SOUND_FALLOFF) //CHOMPEdit else - M.playsound_local(get_turf(owner), play_sound, vol = 100, vary = 1, falloff = VORE_SOUND_FALLOFF) + M.playsound_local(get_turf(owner), play_sound, vol = sound_volume, vary = 1, falloff = VORE_SOUND_FALLOFF) //CHOMPEdit //these are all external sound triggers now, so it's ok. if(emote_active) diff --git a/code/modules/vore/eating/vorepanel_vr.dm b/code/modules/vore/eating/vorepanel_vr.dm index ce7a438a16..8ab067efca 100644 --- a/code/modules/vore/eating/vorepanel_vr.dm +++ b/code/modules/vore/eating/vorepanel_vr.dm @@ -200,6 +200,7 @@ "belly_fullscreen_color" = selected.belly_fullscreen_color, "colorization_enabled" = selected.colorization_enabled, "vorespawn_blacklist" = selected.vorespawn_blacklist, //CHOMP Addition: vorespawn blacklist + "sound_volume" = selected.sound_volume, //CHOMPAdd //CHOMP add: vore sprite options "affects_voresprite" = selected.affects_vore_sprites, "absorbed_voresprite" = selected.count_absorbed_prey_for_sprite, @@ -1294,6 +1295,11 @@ if(voretest) SEND_SOUND(user, voretest) . = TRUE + if("b_sound_volume") //CHOMPAdd + var/sound_volume_input = tgui_input_number(user, "Set belly sound volume percentage.", "Sound Volume", null, 100, 0) + if(!isnull(sound_volume_input)) //These have to be 'null' because both cancel and 0 are valid, separate options + host.vore_selected.sound_volume = sanitize_integer(sound_volume_input, 0, 100, initial(host.vore_selected.sound_volume)) + . = TRUE if("b_tastes") host.vore_selected.can_taste = !host.vore_selected.can_taste . = TRUE diff --git a/tgui/packages/tgui/interfaces/VorePanel.js b/tgui/packages/tgui/interfaces/VorePanel.js index 0c159870ed..3357ef5109 100644 --- a/tgui/packages/tgui/interfaces/VorePanel.js +++ b/tgui/packages/tgui/interfaces/VorePanel.js @@ -49,7 +49,7 @@ const digestModeToPreyMode = { * show_liq, liq_interacts, liq_reagent_gen, liq_reagent_type, liq_reagent_name, * liq_reagent_transfer_verb, liq_reagent_nutri_rate, liq_reagent_capacity, liq_sloshing, liq_reagent_addons, * show_liq_fullness, liq_messages, liq_msg_toggle1, liq_msg_toggle2, liq_msg_toggle3, liq_msg_toggle4, - * liq_msg_toggle5, liq_msg1, liq_msg2, liq_msg3, liq_msg4, liq_msg5, + * liq_msg_toggle5, liq_msg1, liq_msg2, liq_msg3, liq_msg4, liq_msg5, sound_volume, * * To the tabs section of VoreSelectedBelly return * setTabIndex(5)}> @@ -792,7 +792,7 @@ const VoreSelectedBellySounds = (props, context) => { const { act } = useBackend(context); const { belly } = props; - const { is_wet, wet_loop, fancy, sound, release_sound } = belly; + const { is_wet, wet_loop, fancy, sound, release_sound, sound_volume } = belly; return ( @@ -830,6 +830,12 @@ const VoreSelectedBellySounds = (props, context) => {