diff --git a/citadel.dme b/citadel.dme index abf6e2030471..fb865fe211d0 100644 --- a/citadel.dme +++ b/citadel.dme @@ -3131,6 +3131,7 @@ #include "code\modules\jobs\job_types\station\admin\centcom_officer.dm" #include "code\modules\jobs\job_types\station\admin\emergency_responder.dm" #include "code\modules\jobs\job_types\station\civillian\assistant.dm" +#include "code\modules\jobs\job_types\station\civillian\outsider.dm" #include "code\modules\jobs\job_types\station\civillian\chaplain.dm" #include "code\modules\jobs\job_types\station\civillian\clown.dm" #include "code\modules\jobs\job_types\station\civillian\entertainer.dm" diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index 16b87969854f..75fa4b75379b 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -411,6 +411,35 @@ STANDARD_ACCESS_DATUM(ACCESS_FACTION_PIRATE, faction/pirate, "Pirate") #define ACCESS_FACTION_TRADER 160//General Beruang Trader Access STANDARD_ACCESS_DATUM(ACCESS_FACTION_TRADER, faction/trader, "Trader") +//? Motel + +#define ACCESS_FACTION_MOTEL1 161//Motel-Inn-Room1 +STANDARD_ACCESS_DATUM(ACCESS_FACTION_MOTEL1, faction/motelroom1, "Nebula-Room-1") + +#define ACCESS_FACTION_MOTEL2 162//Motel-Inn-Room2 +STANDARD_ACCESS_DATUM(ACCESS_FACTION_MOTEL2, faction/motelroom2, "Nebula-Room-2") + +#define ACCESS_FACTION_MOTEL3 163//Motel-Inn-Room3 +STANDARD_ACCESS_DATUM(ACCESS_FACTION_MOTEL3, faction/motelroom3, "Nebula-Room-3") + +#define ACCESS_FACTION_MOTEL4 164//Motel-Inn-Room4 +STANDARD_ACCESS_DATUM(ACCESS_FACTION_MOTEL4, faction/motelroom4, "Nebula-Room-4") + +#define ACCESS_FACTION_MOTEL5 165//Motel-Inn-Room5 +STANDARD_ACCESS_DATUM(ACCESS_FACTION_MOTEL5, faction/motelroom5, "Nebula-Room-5") + +#define ACCESS_FACTION_MOTEL6 166//Motel-Inn-Room6 +STANDARD_ACCESS_DATUM(ACCESS_FACTION_MOTEL6, faction/motelroom6, "Nebula-Room-6") + +#define ACCESS_FACTION_MOTEL7 167//Motel-Inn-Room7 +STANDARD_ACCESS_DATUM(ACCESS_FACTION_MOTEL7, faction/motelroom7, "Nebula-Room-7") + +#define ACCESS_FACTION_MOTEL8 169//Motel-Inn-Room8 168 is taken by Pirate +STANDARD_ACCESS_DATUM(ACCESS_FACTION_MOTEL8, faction/motelroom8, "Nebula-Room-8") + +#define ACCESS_FACTION_MOTEL_VIP 170//Motel-Inn-VIP +STANDARD_ACCESS_DATUM(ACCESS_FACTION_MOTEL_VIP, faction/motelroomvip, "Nebula-Room-VIP") + //? Gaia Station #define ACCESS_GAIA_GUEST 250//Gaia Station Basic Access diff --git a/code/__DEFINES/jobs/jobs.dm b/code/__DEFINES/jobs/jobs.dm index 2a31a90d9aaf..1d54713e0fcd 100644 --- a/code/__DEFINES/jobs/jobs.dm +++ b/code/__DEFINES/jobs/jobs.dm @@ -47,6 +47,7 @@ #define JOB_ID_LIBRARIAN "librarian" #define JOB_ID_LAWYER "lawyer" // IAA #define JOB_ID_ASSISTANT "assistant" +#define JOB_ID_OUTSIDER "traveler" #define JOB_ID_CLOWN "clown" #define JOB_ID_MIME "mime" diff --git a/code/game/landmarks/spawnpoint/station/jobs.dm b/code/game/landmarks/spawnpoint/station/jobs.dm index 96ac821e63a4..8b01ed2aaa8c 100644 --- a/code/game/landmarks/spawnpoint/station/jobs.dm +++ b/code/game/landmarks/spawnpoint/station/jobs.dm @@ -8,6 +8,16 @@ latejoin = TRUE priority = 5 +/obj/landmark/spawnpoint/job/outsider + name = "Traveler" + icon_state = "Assistant" + job_path = /datum/role/job/station/outsider + +/obj/landmark/spawnpoint/job/outsider/override + spawns_left = INFINITY + latejoin = TRUE + priority = 5 + /obj/landmark/spawnpoint/job/janitor name = "Janitor" icon_state = "Janitor" diff --git a/code/game/landmarks/spawnpoint/tradeport.dm b/code/game/landmarks/spawnpoint/tradeport.dm index 24adc1185e24..40f217d262a6 100644 --- a/code/game/landmarks/spawnpoint/tradeport.dm +++ b/code/game/landmarks/spawnpoint/tradeport.dm @@ -7,3 +7,13 @@ /obj/landmark/spawnpoint/latejoin/tradeport name = "Tradeport Latejoin" faction = JOB_FACTION_TRADEPORT + +/obj/landmark/spawnpoint/job/outsider + name = "Traveler" + job_path = /datum/role/job/station/outsider + latejoin = TRUE + latejoin_override = TRUE + +/obj/landmark/spawnpoint/latejoin/outsider + name = "Traveler Latejoin" + faction = JOB_FACTION_TRADEPORT diff --git a/code/game/machinery/vending/misc.dm b/code/game/machinery/vending/misc.dm index 7da4832bdc2b..84fed03a186d 100644 --- a/code/game/machinery/vending/misc.dm +++ b/code/game/machinery/vending/misc.dm @@ -270,3 +270,213 @@ /obj/item/card/id/external/gaia = 150, /obj/item/card/id/external/gaia/vip = 250, ) + +/obj/machinery/vending/farmer + name = "Miaphus Farm vendor" + desc = "A vending machine put here by some farmers from Miaphus." + icon = 'icons/obj/vending.dmi' + icon_state = "generic" + icon_deny = "generic-deny" + icon_vend = "generic-vend" + product_slogans = "Its always fresh when it comes out from the ground !" + product_ads = "Buy my fruits and Vegetable !; Milk, eggs, You should totaly buy some !; Buy or else ill get mad !; No negociations !" + + products = list( + /obj/item/reagent_containers/food/condiment/flour = 10, + /obj/item/reagent_containers/food/drinks/bottle/milk = 10, + /obj/item/storage/fancy/egg_box = 10, + /obj/item/reagent_containers/food/drinks/bottle/tomatojuice = 5, + /obj/item/reagent_containers/food/snacks/tomatomeat = 15, + /obj/item/reagent_containers/food/condiment/enzyme = 10, + /obj/item/farmbot_arm_assembly = 1, + /obj/item/seeds/tomatoseed = 10, + /obj/item/seeds/potatoseed = 15, + /obj/item/seeds/wheatseed = 15, + ) + + contraband = list( + /obj/item/gun/ballistic/shotgun/doublebarrel = 2, + /obj/item/storage/box/shotgunshells = 2, + ) + + prices = list( + /obj/item/reagent_containers/food/condiment/flour = 5, + /obj/item/reagent_containers/food/drinks/bottle/milk = 5, + /obj/item/storage/fancy/egg_box = 5, + /obj/item/reagent_containers/food/drinks/bottle/tomatojuice = 4, + /obj/item/reagent_containers/food/snacks/tomatomeat = 3, + /obj/item/reagent_containers/food/condiment/enzyme = 8, + /obj/item/farmbot_arm_assembly = 50, + /obj/item/seeds/tomatoseed = 2, + /obj/item/seeds/potatoseed = 1, + /obj/item/seeds/wheatseed = 1, + ) + +/obj/machinery/vending/voidsuit + name = "Spacesuit Vendor" + desc = "A vending machine selling spacesuits." + icon = 'icons/obj/vending.dmi' + icon_state = "generic" + icon_deny = "generic-deny" + icon_vend = "generic-vend" + product_slogans = "My suits will protect you from space !" + product_ads = "Please buy my suits !; I just wanted this orange one, but I had to buy the full bundle ! Help me !; Look ! Those voidsuit are Fleeexible !" + + products = list( + /obj/item/clothing/suit/space/emergency = 5, + /obj/item/clothing/head/helmet/space/emergency = 5, + /obj/item/clothing/suit/space/syndicate = 2, + /obj/item/clothing/suit/space/syndicate/blue = 2, + /obj/item/clothing/suit/space/syndicate/green/dark = 2, + /obj/item/clothing/suit/space/syndicate/green = 2, + /obj/item/clothing/suit/space/syndicate/black = 2, + /obj/item/clothing/head/helmet/space/syndicate = 2, + /obj/item/clothing/head/helmet/space/syndicate/blue = 2, + /obj/item/clothing/head/helmet/space/syndicate/green/dark = 2, + /obj/item/clothing/head/helmet/space/syndicate/green = 2, + /obj/item/clothing/head/helmet/space/syndicate/black = 2, + /obj/item/clothing/head/helmet/space/void/explorer = 3, + /obj/item/clothing/suit/space/void/explorer = 3, + /obj/item/tank/emergency/oxygen = 10, + /obj/item/tank/emergency/oxygen/double = 2, + /obj/item/clothing/mask/gas/clear = 10, + ) + + prices = list( + /obj/item/clothing/suit/space/emergency = 10, + /obj/item/clothing/head/helmet/space/emergency = 10, + /obj/item/clothing/suit/space/syndicate = 15, + /obj/item/clothing/suit/space/syndicate/blue = 15, + /obj/item/clothing/suit/space/syndicate/green/dark = 15, + /obj/item/clothing/suit/space/syndicate/green = 15, + /obj/item/clothing/suit/space/syndicate/black = 15, + /obj/item/clothing/head/helmet/space/syndicate = 15, + /obj/item/clothing/head/helmet/space/syndicate/blue = 15, + /obj/item/clothing/head/helmet/space/syndicate/green/dark = 15, + /obj/item/clothing/head/helmet/space/syndicate/green = 15, + /obj/item/clothing/head/helmet/space/syndicate/black = 15, + /obj/item/clothing/head/helmet/space/void/explorer = 20, + /obj/item/clothing/suit/space/void/explorer = 20, + /obj/item/tank/emergency/oxygen = 5, + /obj/item/tank/emergency/oxygen/double = 30, + /obj/item/clothing/mask/gas/clear = 5, + ) + +/obj/machinery/vending/winter + name = "Wintergear Vendor" + desc = "A vending machine selling coats and winter gear." + icon = 'icons/obj/vending.dmi' + icon_state = "generic" + icon_deny = "generic-deny" + icon_vend = "generic-vend" + product_slogans = "snif... Lots of... Place here are ... Freezing... This will heat you up..." + product_ads = "2 ... Cold worlds here.; ATCHOOO !; ATCHOOO- snif; Snif-..." + + products = list( + /obj/item/clothing/mask/warmer = 10, + /obj/item/clothing/suit/storage/hooded/wintercoat = 10, + /obj/item/clothing/shoes/boots/winter = 10, + /obj/item/clothing/suit/storage/hooded/wintercoat/olive = 5, + /obj/machinery/space_heater = 4 + ) + + prices = list( + /obj/item/clothing/mask/warmer = 10, + /obj/item/clothing/suit/storage/hooded/wintercoat = 15, + /obj/item/clothing/shoes/boots/winter = 10, + /obj/item/clothing/suit/storage/hooded/wintercoat/olive = 15, + /obj/machinery/space_heater = 90, + ) + +/obj/machinery/vending/survivalist + name = "SDF Surplus Gear Vendor" + desc = "A vending machine put here by the System Defence Force, because of the rising ammount of pirates and danger in the sector." + icon = 'icons/obj/vending.dmi' + icon_state = "generic" + icon_deny = "generic-deny" + icon_vend = "generic-vend" + product_slogans = "Barely used only for 40 years !" + product_ads = "The SDF needs more funds !; By buying here you defend the system !; Better than a donation !;20 years of services..." + + products = list( + /obj/item/storage/box/survival_knife = 6, + /obj/item/storage/toolbox/lunchbox/survival = 4, + /obj/item/survivalcapsule = 2, + /obj/item/gps/survival = 10, + /obj/item/gun/ballistic/shotgun/flare = 8, + /obj/item/clothing/accessory/holster/machete/occupied = 2, + /obj/item/clothing/accessory/holster/machete/occupied/deluxe = 1, + /obj/item/material/knife/machete/hatchet = 4, + /obj/item/gun/ballistic/pistol = 4, + /obj/item/storage/box/flare = 10, + /obj/item/storage/box/handcuffs = 5, + /obj/item/storage/box/beanbags = 6, + /obj/item/storage/box/flashshells = 10, + /obj/item/storage/box/stunshells = 6, + /obj/item/storage/box/shotgunshells = 5, + /obj/item/ammo_magazine/a9mm/compact/rubber = 15, + /obj/item/ammo_magazine/a9mm/compact = 10, + /obj/item/storage/single_use/mre/random = 15, + /obj/item/clothing/suit/storage/vest/heavy = 1, + /obj/item/clothing/suit/storage/vest/press = 2, + /obj/item/clothing/suit/armor/vest = 4, + ) + + prices = list( + /obj/item/storage/box/survival_knife = 80, + /obj/item/storage/toolbox/lunchbox/survival = 5, + /obj/item/survivalcapsule = 100, + /obj/item/gps/survival = 10, + /obj/item/gun/ballistic/shotgun/flare = 100, + /obj/item/clothing/accessory/holster/machete/occupied = 100, + /obj/item/clothing/accessory/holster/machete/occupied/deluxe = 150, + /obj/item/material/knife/machete/hatchet = 120, + /obj/item/gun/ballistic/pistol = 300, + /obj/item/storage/box/flare = 50, + /obj/item/storage/box/handcuffs = 80, + /obj/item/storage/box/beanbags = 80, + /obj/item/storage/box/flashshells = 60, + /obj/item/storage/box/stunshells = 100, + /obj/item/storage/box/shotgunshells = 100, + /obj/item/ammo_magazine/a9mm/compact/rubber = 90, + /obj/item/ammo_magazine/a9mm/compact = 100, + /obj/item/storage/single_use/mre/random = 40, + /obj/item/clothing/suit/storage/vest/heavy = 350, + /obj/item/clothing/suit/storage/vest/press = 150, + /obj/item/clothing/suit/armor/vest = 150, + ) + +/obj/machinery/vending/motel + name = "Nebula Motel Vendor" + desc = "A vending machine selling the Keycards to the rooms on Nebula." + icon = 'icons/obj/vending.dmi' + icon_state = "laptop" + icon_deny = "laptop-deny" + icon_vend = "laptop-vend" + product_slogans = "A place to rest after a long journey !" + product_ads = "The VIP Room has a cool shuttle bundled in !; You can maybe see the zoo with Room 5 to 8 !; We clean regulary !; Pretty cheap !" + + products = list( + /obj/item/card/id/external/nebula/room1 = 1, + /obj/item/card/id/external/nebula/room2 = 1, + /obj/item/card/id/external/nebula/room3 = 1, + /obj/item/card/id/external/nebula/room4 = 1, + /obj/item/card/id/external/nebula/room5 = 1, + /obj/item/card/id/external/nebula/room6 = 1, + /obj/item/card/id/external/nebula/room7 = 1, + /obj/item/card/id/external/nebula/room8 = 1, + /obj/item/card/id/external/nebula/room9 = 1, + + ) + + prices = list( + /obj/item/card/id/external/nebula/room1 = 30, + /obj/item/card/id/external/nebula/room2 = 30, + /obj/item/card/id/external/nebula/room3 = 30, + /obj/item/card/id/external/nebula/room4 = 30, + /obj/item/card/id/external/nebula/room5 = 15, + /obj/item/card/id/external/nebula/room6 = 15, + /obj/item/card/id/external/nebula/room7 = 15, + /obj/item/card/id/external/nebula/room8 = 15, + /obj/item/card/id/external/nebula/room9 = 80, + ) diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 4a9e633a83bd..8a7624eae6f7 100755 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -109,6 +109,11 @@ origin_tech = list(TECH_ILLEGAL = 3) ks1type = /obj/item/encryptionkey/binary +/obj/item/radio/headset/trader/outsider + name = "Traveler headset" + desc = "While being a normal headset, it was upgraded with a shortwave frenquency... Altho the upgrade was done with just duck taping circuits of a shortwave radio to the headset" + adhoc_fallback = TRUE + /obj/item/radio/headset/headset_sec name = "security radio headset" desc = "This is used by your elite security force." diff --git a/code/game/objects/items/id_cards/station_ids.dm b/code/game/objects/items/id_cards/station_ids.dm index df5ef7a9e202..8a455e75cccc 100644 --- a/code/game/objects/items/id_cards/station_ids.dm +++ b/code/game/objects/items/id_cards/station_ids.dm @@ -705,3 +705,67 @@ desc = "Issued to staff of the Happy Trails Company." icon_state = "gaia_staff" access = list(250,251,252) + +/obj/item/card/id/external/nebula/room1 + name = "Card to Room 1" + desc = "A card that grants usage of Room 1 of the Nebula Motel" + icon_state = "guest" + job_access_type = null + access = list(161) + +/obj/item/card/id/external/nebula/room2 + name = "Card to Room 2" + desc = "A card that grants usage of Room 2 of the Nebula Motel" + icon_state = "guest" + job_access_type = null + access = list(162) + +/obj/item/card/id/external/nebula/room3 + name = "Card to Room 3" + desc = "A card that grants usage of Room 3 of the Nebula Motel" + icon_state = "guest" + job_access_type = null + access = list(163) + +/obj/item/card/id/external/nebula/room4 + name = "Card to Room 4" + desc = "A card that grants usage of Room 4 of the Nebula Motel" + icon_state = "guest" + job_access_type = null + access = list(164) + +/obj/item/card/id/external/nebula/room5 + name = "Card to Room 5" + desc = "A card that grants usage of Room 5 of the Nebula Motel" + icon_state = "guest" + job_access_type = null + access = list(165) + +/obj/item/card/id/external/nebula/room6 + name = "Card to Room 6" + desc = "A card that grants usage of Room 6 of the Nebula Motel" + icon_state = "guest" + job_access_type = null + access = list(166) + +/obj/item/card/id/external/nebula/room7 + name = "Card to Room 7" + desc = "A card that grants usage of Room 7 of the Nebula Motel" + icon_state = "guest" + job_access_type = null + access = list(167) + +/obj/item/card/id/external/nebula/room8 + name = "Card to Room 8" + desc = "A card that grants usage of Room 8 of the Nebula Motel" + icon_state = "guest" + job_access_type = null + access = list(169) + +/obj/item/card/id/external/nebula/room9 + name = "Card to the VIP Suit" + color = "#ffbd17" + desc = "A card that grants usage to the VIP suite of the Nebula Motel, and its Arrowhead shuttle." + icon_state = "guest" + job_access_type = null + access = list(170) diff --git a/code/modules/jobs/job_types/station/civillian/assistant.dm b/code/modules/jobs/job_types/station/civillian/assistant.dm index 7537c89fc28d..df32b6a506e5 100644 --- a/code/modules/jobs/job_types/station/civillian/assistant.dm +++ b/code/modules/jobs/job_types/station/civillian/assistant.dm @@ -83,3 +83,5 @@ name = OUTFIT_JOB_NAME("Server") uniform = /obj/item/clothing/under/waiter l_ear = /obj/item/radio/headset/headset_service + + diff --git a/code/modules/jobs/job_types/station/civillian/outsider.dm b/code/modules/jobs/job_types/station/civillian/outsider.dm new file mode 100644 index 000000000000..8356d824d64f --- /dev/null +++ b/code/modules/jobs/job_types/station/civillian/outsider.dm @@ -0,0 +1,82 @@ +/datum/role/job/station/outsider + id = JOB_ID_OUTSIDER + title = "Traveler" + flag = OUTSIDER + departments = list(DEPARTMENT_CIVILIAN) + sorting_order = -1 + department_flag = CIVILIAN + total_positions = -1 + spawn_positions = -1 + desc = "You are in the sector for various reason, may it be visiting or simply exploring. You start on the Nebula Gas Station, and can use the services here. (This is not a antag role)" + supervisors = "Nobody !" + selection_color = "#515151" + outfit_type = /datum/outfit/job/station/outsider + alt_titles = list( + "Contractor" = /datum/prototype/struct/alt_title/contractor, + "Freelancer" = /datum/prototype/struct/alt_title/freelancer, + "Frontier Colonist" = /datum/prototype/struct/alt_title/colonist, + "Tourist" = /datum/prototype/struct/alt_title/tourist, + "Independant Reporter" = /datum/prototype/struct/alt_title/indyreport + ) + +/datum/outfit/job/station/outsider + name = OUTFIT_JOB_NAME("outsider") + id_type = /obj/item/card/id/assistant + l_ear = /obj/item/radio/headset/trader/outsider + shoes = /obj/item/clothing/shoes/black + uniform = /obj/item/clothing/under/laconic + suit = /obj/item/clothing/suit/storage/tajaran/jacket + gloves = /obj/item/clothing/gloves/fingerless + id_slot = SLOT_ID_WORN_ID + pda_slot = SLOT_ID_BELT + pda_type = /obj/item/pda + flags = OUTFIT_HAS_BACKPACK|OUTFIT_COMPREHENSIVE_SURVIVAL + backpack_contents = list(/obj/item/spacecash/c200 = 1) + +/datum/prototype/struct/alt_title/contractor + title = "Contractor" + title_outfit = /datum/outfit/job/station/outsider/contractor + title_blurb = "You are a independant contractor, working for a faction." + +/datum/prototype/struct/alt_title/freelancer + title = "Freelancer" + title_outfit = /datum/outfit/job/station/outsider/freelancer + title_blurb = "You are a independant freelancer." + +/datum/prototype/struct/alt_title/colonist + title = "Frontier Colonist" + title_outfit = /datum/outfit/job/station/outsider/colonist + title_blurb = "You are a colonist in the frontier! Make yourself a home on any place in the sector." + +/datum/prototype/struct/alt_title/tourist + title = "Tourist" + title_outfit = /datum/outfit/job/station/outsider/tourist + title_blurb = "You are a tourist, visiting the sector." + +/datum/prototype/struct/alt_title/indyreport + title = "Independant Reporter" + title_outfit = /datum/outfit/job/station/outsider/indyreport + title_blurb = "You are a tourist, visiting the sector." + +/datum/outfit/job/station/outsider/contractor + id_pda_assignment = "Contractor" + +/datum/outfit/job/station/outsider/freelancer + id_pda_assignment = "Freelancer" + +/datum/outfit/job/station/outsider/colonist + id_pda_assignment = "Colonist" + +/datum/outfit/job/station/outsider/tourist + id_pda_assignment = "Tourist" + +/datum/outfit/job/station/outsider/indyreport + name = OUTFIT_JOB_NAME("Independant Reporter") + uniform = /obj/item/clothing/under/suit_jacket/red + id_type = /obj/item/card/id/assistant + pda_type = /obj/item/pda/librarian + belt = /obj/item/camera + backpack_contents = list(/obj/item/clothing/accessory/badge/corporate_tag/press = 1, + /obj/item/tape_recorder = 1, + /obj/item/camera_film = 1 + ) diff --git a/code/modules/jobs/jobs.dm b/code/modules/jobs/jobs.dm index 53c094292974..5cce9bc8d511 100644 --- a/code/modules/jobs/jobs.dm +++ b/code/modules/jobs/jobs.dm @@ -55,6 +55,7 @@ var/const/BRIDGE =(1<<12) var/const/PILOT =(1<<13) var/const/ENTERTAINER =(1<<14) var/const/TRADER =(1<<15) +var/const/OUTSIDER =(1<<16) /proc/guest_jobbans(job) diff --git a/code/modules/lore_hardcoded/faction.dm b/code/modules/lore_hardcoded/faction.dm index d07bbfcfc95d..2dfc76581f02 100644 --- a/code/modules/lore_hardcoded/faction.dm +++ b/code/modules/lore_hardcoded/faction.dm @@ -102,6 +102,7 @@ /datum/role/job/station/janitor::id, /datum/role/job/station/librarian::id, /datum/role/job/station/mime::id, + /datum/role/job/station/outsider::id, // med staff - paramedic only /datum/role/job/station/paramedic::id, // engineering staff - engi and atmos tech @@ -150,6 +151,8 @@ /datum/role/job/station/scientist::id, // not their specialty /datum/role/job/station/chief_medical_officer::id, + //Outside NT + /datum/role/job/station/outsider::id, ) /datum/lore/character_background/faction/oculum @@ -174,6 +177,7 @@ /datum/role/job/station/janitor::id, /datum/role/job/station/librarian::id, /datum/role/job/station/mime::id, + /datum/role/job/station/outsider::id, // off duty /datum/role/job/station/off_duty/civilian::id, ) @@ -211,4 +215,6 @@ /datum/role/job/station/scientist::id, // not their specialty /datum/role/job/station/chief_engineer::id, + //Outside NT + /datum/role/job/station/outsider::id, ) diff --git a/code/modules/maps/overmap/space/trade_station/trade_station.dm b/code/modules/maps/overmap/space/trade_station/trade_station.dm index 24b37cdd11ed..20409aee18a6 100644 --- a/code/modules/maps/overmap/space/trade_station/trade_station.dm +++ b/code/modules/maps/overmap/space/trade_station/trade_station.dm @@ -74,6 +74,24 @@ announce_channel = "Trade" on_store_name = "Beruang Trading Corp Storage" +/datum/spawnpoint/trade/visitor + display_name = "Nebula Visitor Arrival" + restrict_job = list("Traveler") + announce_channel = "Trade" + method = LATEJOIN_METHOD_ARRIVALS_SHUTTLE + +/obj/machinery/cryopod/robot/door/gateway/trade/visitor + name = "Trade public teleporter" + desc = "The short-range teleporter you might've came in from. You could leave easily using this." + icon = 'icons/obj/machines/teleporter.dmi' + icon_state = "pad_idle" + announce_channel = "Trade" + base_icon_state = "pad" + occupied_icon_state = "pad_active" + on_store_message = "has departed via short-range teleport." + on_enter_occupant_message = "The teleporter activates, and you step into the swirling portal." + spawnpoint_type = /datum/role/job/station/outsider + // Their shuttle // Shuttle landmarks. Need to be removed at some point and generic waypoints used diff --git a/maps/endeavour/endeavour.dm b/maps/endeavour/endeavour.dm index f31553fc93bd..f89981482b75 100644 --- a/maps/endeavour/endeavour.dm +++ b/maps/endeavour/endeavour.dm @@ -104,7 +104,7 @@ bot_patrolling = FALSE - allowed_spawns = list(LATEJOIN_METHOD_ARRIVALS_SHUTTLE,LATEJOIN_METHOD_GATEWAY,LATEJOIN_METHOD_CRYOGENIC_STORAGE,LATEJOIN_METHOD_ROBOT_STORAGE,"Beruang Trading Corp Cryo") + allowed_spawns = list(LATEJOIN_METHOD_ARRIVALS_SHUTTLE,LATEJOIN_METHOD_GATEWAY,LATEJOIN_METHOD_CRYOGENIC_STORAGE,LATEJOIN_METHOD_ROBOT_STORAGE,"Beruang Trading Corp Cryo","Nebula Visitor Arrival") spawnpoint_died = /datum/spawnpoint/arrivals spawnpoint_left = /datum/spawnpoint/arrivals spawnpoint_stayed = /datum/spawnpoint/cryo diff --git a/maps/rift/levels/rift-10-west_plains.dmm b/maps/rift/levels/rift-10-west_plains.dmm index 7f531c74e37d..a29286873e8c 100644 --- a/maps/rift/levels/rift-10-west_plains.dmm +++ b/maps/rift/levels/rift-10-west_plains.dmm @@ -1122,6 +1122,12 @@ /obj/machinery/light/small, /turf/simulated/floor/tiled/steel_dirty/lythios43c, /area/rift/surfacebase/outside/west) +"fi" = ( +/obj/effect/shuttle_landmark/automatic{ + base_turf = /turf/simulated/floor/outdoors/snow/lythios43c + }, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/surfacebase/outside/west) "fj" = ( /obj/machinery/power/apc/alarms_hidden/north_mount{ cell_type = null; @@ -7096,6 +7102,10 @@ }, /turf/simulated/floor, /area/rnd/outpost/anomaly_lab/storage) +"Hf" = ( +/obj/tether_away_spawner/lythios_animals, +/turf/simulated/floor/outdoors/snow/lythios43c, +/area/rift/exterior/bunker) "Hg" = ( /obj/structure/cable/heavyduty{ icon_state = "0-8" @@ -19002,7 +19012,7 @@ PP PP PP sv -sv +cL sv sv sv @@ -20167,7 +20177,7 @@ PP PP PP sv -cL +sv sv sv sv @@ -20559,7 +20569,7 @@ sv sv sv sv -sv +fi sv sv sv @@ -22121,7 +22131,7 @@ sv sv sv sv -sv +fi sv sv sv @@ -22296,7 +22306,7 @@ PP sv sv sv -sv +cL sv sv sv @@ -23474,7 +23484,7 @@ sv sv sv sv -cL +sv sv sv sv @@ -26180,7 +26190,7 @@ nz nz nz nz -nz +Hf nz YE sv @@ -26188,7 +26198,7 @@ sv sv sv sv -sv +fi sv sv sv @@ -29094,7 +29104,7 @@ sv sv sv sv -sv +cL sv sv sv diff --git a/maps/rift/rift.dm b/maps/rift/rift.dm index 1dc514bcffc9..126512285c8b 100644 --- a/maps/rift/rift.dm +++ b/maps/rift/rift.dm @@ -142,7 +142,7 @@ bot_patrolling = FALSE - allowed_spawns = list(LATEJOIN_METHOD_ARRIVALS_SHUTTLE,"Beruang Trading Corp Cryo","Cryogenic Storage") + allowed_spawns = list(LATEJOIN_METHOD_ARRIVALS_SHUTTLE,"Beruang Trading Corp Cryo","Cryogenic Storage","Nebula Visitor Arrival") spawnpoint_died = /datum/spawnpoint/arrivals spawnpoint_left = /datum/spawnpoint/arrivals spawnpoint_stayed = /datum/spawnpoint/cryo diff --git a/maps/sectors/nebula_tradeport/levels/nebula_tradeport.dmm b/maps/sectors/nebula_tradeport/levels/nebula_tradeport.dmm index c16757b54c69..24df2a46ad3e 100644 --- a/maps/sectors/nebula_tradeport/levels/nebula_tradeport.dmm +++ b/maps/sectors/nebula_tradeport/levels/nebula_tradeport.dmm @@ -298,6 +298,7 @@ name = "Adventurer Airtight Hatch"; req_one_access = null }, +/obj/machinery/atmospheric_field_generator/perma, /turf/simulated/floor/tiled/techfloor/monogrid, /area/shuttle/adventurer) "aaS" = ( @@ -323,7 +324,7 @@ dir = 1 }, /obj/item/paper{ - info = "WELCOME TO THE NEBULA MOTEL \ TO BUY A PASS, SEEK M4RIA, AT BEHIND THE COUNTER. \ \ We have 9 rooms. \ Room 1 to 4 have a small kitchen, and washing room. \ Room 1 and 4 have 1 Double bed. \ 2 has 1 single bed \ 3 have 2 single beds. \ Those rooms are 30 Thrallers the 3 to 5 hours. \ \ Room 5 to 8 have no kitchen, and washing room. \ Room 6 and 8 have 1 Double bed. \ 5 has 1 single bed \ 7 have 2 single beds. \ Those rooms are 15 Thrallers the 3 to 5 hours. \ \ Room 9 is our VIP Suite. This suite has 2 bed rooms, 1 office, 1 fully equipped kitchen, 1 washroom, 1 laundry room, And its own shuttle call the Arrowhead, used by ex Tajaran racer Cheuk'Yager. the suite is 80 Thrallers the 3 to 5 hours. \ \ The Sauna is free to use. The public laundry machine and public bathroom are free to use. Guest pass are available if the rooms are shared."; + info = "WELCOME TO THE NEBULA MOTEL \ TO BUY A PASS, SEEK THE MOTEL VENDING MACHINE NEAR THE COUNTER. \ \ We have 9 rooms. \ Room 1 to 4 have a small kitchen, and washing room. \ Room 1 and 4 have 1 Double bed. \ 2 has 1 single bed \ 3 have 2 single beds. \ Those rooms are 30 Thrallers the 3 to 5 hours. \ \ Room 5 to 8 have no kitchen, and washing room. \ Room 6 and 8 have 1 Double bed. \ 5 has 1 single bed \ 7 have 2 single beds. \ Those rooms are 15 Thrallers the 3 to 5 hours. \ \ Room 9 is our VIP Suite. This suite has 2 bed rooms, 1 office, 1 fully equipped kitchen, 1 washroom, 1 laundry room, And its own shuttle call the Arrowhead, used by ex Tajaran racer Cheuk'Yager. the suite is 80 Thrallers the 3 to 5 hours. \ \ The Sauna is free to use. The public laundry machine and public bathroom are free to use. Guest pass are available if the rooms are shared."; name = "Nebula Motel" }, /obj/effect/floor_decal/corner/green/border, @@ -455,6 +456,7 @@ /area/tradeport) "abr" = ( /obj/spawner/window/low_wall/full/firelocks/nogrille, +/obj/structure/curtain/open/black, /turf/simulated/floor/wood, /area/sector/nebula_tradeport/motel) "abs" = ( @@ -916,10 +918,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/tradeport/engineering) -"acK" = ( -/obj/structure/bed/chair/bay/chair/padded/teal, -/turf/simulated/floor/tiled/techfloor/grid, -/area/sector/nebula_tradeport/engineering) "acL" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -1046,7 +1044,9 @@ /turf/simulated/floor/carpet/bcarpet, /area/shuttle/trade_ship/general) "adb" = ( -/obj/machinery/air_alarm/alarms_hidden/north_mount, +/obj/machinery/air_alarm/alarms_hidden/north_mount{ + req_one_access = null + }, /obj/structure/window/reinforced/tinted{ dir = 4 }, @@ -1250,9 +1250,6 @@ /turf/simulated/wall/r_wall, /area/tradeport/dock) "adC" = ( -/obj/structure/window/reinforced/tinted{ - dir = 1 - }, /obj/structure/window/reinforced/tinted, /obj/structure/cable/green{ icon_state = "1-8" @@ -1260,6 +1257,9 @@ /obj/machinery/atmospherics/pipe/tank/air{ dir = 1 }, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor/monogrid, /area/shuttle/tug) "adD" = ( @@ -1384,6 +1384,7 @@ name = "Tug hauler shuttle Airlock"; opacity = 0 }, +/obj/machinery/atmospheric_field_generator/perma, /turf/simulated/floor/tiled/monotechmaint, /area/shuttle/tug) "adV" = ( @@ -2124,7 +2125,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/cryopod/robot/door/gateway, +/obj/machinery/cryopod/robot/door/gateway/trade/visitor, /turf/simulated/floor/tiled/old_tile/beige, /area/tradeport/commhall) "afS" = ( @@ -2172,6 +2173,7 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 9 }, +/obj/machinery/photocopier, /turf/simulated/floor/tiled/techfloor/grid, /area/sector/nebula_tradeport/dock2) "afY" = ( @@ -2655,6 +2657,7 @@ icon_state = "1-2" }, /obj/effect/floor_decal/rust, +/obj/machinery/air_alarm/alarms_hidden/east_mount, /turf/simulated/floor/plating, /area/shuttle/udang/main) "ahi" = ( @@ -2667,7 +2670,9 @@ "ahk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /obj/machinery/computer/shuttle_control/explore/utilitymicro, -/obj/machinery/air_alarm/alarms_hidden/north_mount, +/obj/machinery/air_alarm/alarms_hidden/north_mount{ + req_one_access = null + }, /obj/item/gps/internal/base{ name = "UtilityMicro beacon"; gps_tag = "UTILITY" @@ -3050,6 +3055,7 @@ /obj/structure/sign/nosmoking_2{ pixel_y = 32 }, +/obj/machinery/space_heater, /turf/simulated/floor/tiled/techfloor/monogrid, /area/sector/nebula_tradeport/dock2) "aig" = ( @@ -3188,7 +3194,8 @@ /area/space) "aiz" = ( /obj/machinery/computer/ship/helm{ - dir = 4 + dir = 4; + req_one_access = null }, /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -3634,6 +3641,11 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/door/blast/shutters{ + dir = 2; + id = "clerk2"; + name = "Clerk Shutters" + }, /turf/simulated/floor/tiled/dark, /area/tradeport/commons) "ajB" = ( @@ -4034,6 +4046,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/sector/nebula_tradeport/dock2) "akD" = ( +/obj/landmark/spawnpoint/latejoin/outsider, /turf/simulated/floor/tiled/old_tile/beige, /area/tradeport/commhall) "akE" = ( @@ -4107,7 +4120,9 @@ /obj/machinery/computer/ship/sensors{ dir = 4 }, -/obj/machinery/power/apc/alarms_hidden/south_mount, +/obj/machinery/power/apc/alarms_hidden/south_mount{ + req_access = null + }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/adventurer) "akP" = ( @@ -4406,6 +4421,7 @@ name = "Teshari Runabout Airlock"; opacity = 0 }, +/obj/structure/fans/tiny, /turf/simulated/floor/tiled/techfloor, /area/shuttle/runabout) "alF" = ( @@ -4696,6 +4712,7 @@ dir = 4; old_wall = 1 }, +/obj/machinery/space_heater, /turf/simulated/floor/tiled/techfloor/monogrid, /area/shuttle/adventurer) "amu" = ( @@ -5088,7 +5105,7 @@ /turf/space, /area/tradeport/spine) "anA" = ( -/obj/machinery/cryopod/robot/door/gateway, +/obj/machinery/cryopod/robot/door/gateway/trade/visitor, /turf/simulated/floor/tiled/old_tile/beige, /area/tradeport/commhall) "anB" = ( @@ -5215,7 +5232,9 @@ }, /obj/machinery/computer/ship/engines, /obj/structure/railing/grey, -/obj/machinery/air_alarm/alarms_hidden/north_mount, +/obj/machinery/air_alarm/alarms_hidden/north_mount{ + req_one_access = null + }, /turf/simulated/floor/tiled/monodark, /area/shuttle/runabout) "anT" = ( @@ -5228,6 +5247,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, /turf/simulated/floor/tiled/monotechmaint, /area/shuttle/utilitymicro) "anV" = ( @@ -5307,6 +5329,7 @@ name = "Spacenat Caravan Airlock"; opacity = 0 }, +/obj/structure/fans/tiny, /turf/simulated/floor/plating, /area/shuttle/caravan) "aof" = ( @@ -5625,11 +5648,6 @@ /obj/machinery/appliance/cooker/oven, /turf/simulated/floor/wmarble, /area/sector/nebula_tradeport/motel/vip) -"apb" = ( -/obj/effect/floor_decal/techfloor, -/obj/machinery/light, -/turf/simulated/wall/r_wall, -/area/tradeport/commhall) "apc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -6100,8 +6118,8 @@ /turf/simulated/floor/tiled/old_tile/yellow, /area/tradeport/safari) "aqq" = ( -/obj/item/modular_computer/console/preset/civilian{ - dir = 1 +/obj/structure/bed/chair/bay/chair/padded/teal{ + dir = 8 }, /turf/simulated/floor/glass/reinforced, /area/sector/nebula_tradeport/engineering) @@ -6574,7 +6592,6 @@ /turf/simulated/floor/tiled/dark, /area/sector/nebula_tradeport/motel/vip) "arA" = ( -/obj/machinery/photocopier, /obj/effect/floor_decal/spline/fancy/wood{ dir = 6 }, @@ -6634,7 +6651,9 @@ /area/tradeport/cafeteria) "arL" = ( /obj/structure/table/steel_reinforced, -/obj/machinery/computer/ship/helm, +/obj/machinery/computer/ship/helm{ + req_one_access = null + }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/adventurer) "arM" = ( @@ -6823,6 +6842,7 @@ /area/shuttle/udang/main) "aso" = ( /obj/machinery/light, +/obj/structure/reagent_dispensers/beerkeg, /turf/simulated/floor/plating, /area/shuttle/tug) "asp" = ( @@ -7062,6 +7082,7 @@ name = "Caravan Airtight Hatch"; req_one_access = null }, +/obj/structure/fans/tiny, /turf/simulated/floor/plating, /area/shuttle/caravan) "asV" = ( @@ -7075,10 +7096,6 @@ }, /turf/simulated/floor/airless, /area/space) -"asZ" = ( -/obj/structure/loot_pile/surface/drone, -/turf/simulated/mineral/floor/vacuum, -/area/space) "ata" = ( /obj/machinery/door/firedoor{ dir = 8 @@ -7219,7 +7236,6 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/window/reinforced, /turf/simulated/floor/tiled/monodark, /area/sector/nebula_tradeport/comroom) "att" = ( @@ -7896,6 +7912,11 @@ req_one_access = null }, /obj/map_helper/access_helper/airlock/station/external_airlock, +/obj/machinery/door/blast/shutters{ + dir = 2; + id = "clerk2"; + name = "Clerk Shutters" + }, /turf/simulated/floor/tiled/dark, /area/tradeport/commons) "ave" = ( @@ -8125,9 +8146,6 @@ /obj/structure/bed/chair/shuttle{ dir = 4 }, -/obj/structure/window/reinforced/polarized{ - id = "udang_cargo" - }, /obj/effect/floor_decal/borderfloorblack, /turf/simulated/floor/tiled/old_tile/yellow, /area/shuttle/udang/main) @@ -8644,7 +8662,9 @@ /turf/simulated/floor/tiled/techfloor, /area/shuttle/adventurer) "awJ" = ( -/obj/machinery/computer/ship/helm, +/obj/machinery/computer/ship/helm{ + req_one_access = null + }, /obj/structure/table/steel_reinforced, /obj/machinery/embedded_controller/radio/airlock/docking_port{ pixel_y = 30; @@ -8825,11 +8845,9 @@ /turf/simulated/floor/tiled/old_tile/purple, /area/tradeport/cafeteria) "axh" = ( -/obj/structure/fuel_port{ - dir = 4; - pixel_x = 29 +/obj/machinery/air_alarm/alarms_hidden/east_mount{ + req_one_access = null }, -/obj/machinery/air_alarm/alarms_hidden/east_mount, /obj/machinery/computer/shuttle_control/explore/tug{ dir = 8 }, @@ -8840,6 +8858,9 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/tiled/monotechmaint, /area/shuttle/tug) "axi" = ( @@ -8873,7 +8894,12 @@ /obj/machinery/computer/ship/sensors{ pixel_x = -27 }, -/obj/machinery/power/apc/alarms_hidden/north_mount, +/obj/machinery/power/apc/alarms_hidden/north_mount{ + req_access = null + }, +/obj/structure/cable/green{ + icon_state = "0-2" + }, /turf/simulated/floor/tiled/monotechmaint, /area/shuttle/utilitymicro) "axo" = ( @@ -9437,9 +9463,6 @@ /obj/structure/bed/chair/shuttle{ dir = 4 }, -/obj/structure/window/reinforced/polarized{ - id = "udang_cargo" - }, /obj/effect/floor_decal/borderfloorblack, /turf/simulated/floor/tiled/old_tile/yellow, /area/shuttle/udang/main) @@ -9490,11 +9513,15 @@ /turf/simulated/floor/outdoors/beach/sand/desert/indoors, /area/tradeport/safarizoo) "ayY" = ( -/obj/structure/metal_edge{ - layer = 2.8 - }, /obj/structure/closet/crate/corporate/nanotrasen, /obj/structure/handrail, +/obj/structure/window/reinforced/polarized{ + id = "udang_cargo"; + dir = 1 + }, +/obj/structure/metal_edge{ + layer = 1 + }, /turf/simulated/floor/plating, /area/shuttle/udang/main) "ayZ" = ( @@ -9904,7 +9931,6 @@ /turf/simulated/floor/outdoors/dirt, /area/tradeport/cyndishow) "aAb" = ( -/obj/structure/window/reinforced/tinted, /obj/structure/window/reinforced/tinted{ dir = 1 }, @@ -10048,7 +10074,8 @@ dir = 1 }, /obj/machinery/computer/ship/helm{ - dir = 1 + dir = 1; + req_one_access = null }, /obj/structure/railing/grey{ dir = 1 @@ -10060,9 +10087,6 @@ /turf/simulated/floor/tiled/monodark, /area/shuttle/runabout) "aAu" = ( -/obj/structure/metal_edge{ - layer = 2.8 - }, /obj/structure/table/rack/shelf/steel, /obj/item/clothing/head/helmet/space/void/explorer, /obj/item/clothing/head/helmet/space/void/explorer, @@ -10076,6 +10100,13 @@ /obj/machinery/light{ dir = 1 }, +/obj/structure/window/reinforced/polarized{ + id = "udang_cargo"; + dir = 1 + }, +/obj/structure/metal_edge{ + layer = 1 + }, /turf/simulated/floor/plating, /area/shuttle/udang/main) "aAv" = ( @@ -10184,7 +10215,9 @@ }, /obj/machinery/computer/ship/sensors, /obj/structure/railing/grey, -/obj/machinery/power/apc/alarms_hidden/north_mount, +/obj/machinery/power/apc/alarms_hidden/north_mount{ + req_access = null + }, /obj/structure/cable/green{ icon_state = "0-2" }, @@ -10224,6 +10257,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 1 }, +/obj/machinery/space_heater, /turf/simulated/floor/plating, /area/sector/nebula_tradeport/engineering) "aAQ" = ( @@ -11023,20 +11057,6 @@ /obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/tradeport/commons) -"aCN" = ( -/obj/machinery/door/blast/shutters{ - id = "Tug2" - }, -/obj/machinery/door/blast/regular{ - density = 0; - dir = 4; - icon_state = "pdoorc0"; - id = "tugdoor2"; - name = "Tug hauler shuttle Airlock"; - opacity = 0 - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/tug) "aCP" = ( /obj/effect/floor_decal/techfloor{ dir = 1 @@ -11072,7 +11092,9 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/air_alarm/alarms_hidden/north_mount, +/obj/machinery/air_alarm/alarms_hidden/north_mount{ + req_one_access = null + }, /turf/simulated/floor/tiled/old_tile/white, /area/shuttle/caravan) "aCU" = ( @@ -11280,9 +11302,6 @@ /turf/simulated/floor/tiled/old_tile/purple, /area/tradeport/spine) "aDx" = ( -/obj/machinery/light{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/manifold/hidden, /obj/structure/cable/orange{ icon_state = "1-2" @@ -11703,6 +11722,7 @@ charge = 15000; cur_coils = 3 }, +/obj/structure/cable/green, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/utilitymicro) "aEL" = ( @@ -12075,9 +12095,6 @@ /obj/structure/bed/chair/shuttle{ dir = 4 }, -/obj/structure/window/reinforced/polarized{ - id = "udang_cargo" - }, /obj/effect/floor_decal/borderfloorblack, /turf/simulated/floor/tiled/old_tile/yellow, /area/shuttle/udang/main) @@ -12121,6 +12138,7 @@ /area/tradeport/spine) "aFJ" = ( /obj/effect/floor_decal/spline/plain, +/obj/machinery/vending/voidsuit, /turf/simulated/floor/tiled/techfloor/lythios43c, /area/tradeport/spine) "aFK" = ( @@ -12546,6 +12564,7 @@ name = "Spacenat Caravan Airlock"; opacity = 0 }, +/obj/machinery/atmospheric_field_generator/perma, /turf/simulated/floor/plating, /area/shuttle/adventurer) "aGV" = ( @@ -12733,6 +12752,7 @@ name = "Tug hauler shuttle Airlock"; opacity = 0 }, +/obj/machinery/atmospheric_field_generator/perma, /turf/simulated/floor/tiled/techfloor, /area/shuttle/tug) "aHv" = ( @@ -12786,6 +12806,7 @@ /area/tradeport/commons) "aHD" = ( /obj/effect/floor_decal/spline/plain, +/obj/machinery/vending/winter, /turf/simulated/floor/carpet/purcarpet, /area/tradeport/spine) "aHE" = ( @@ -12833,6 +12854,7 @@ /obj/effect/floor_decal/grass_edge{ dir = 8 }, +/obj/machinery/vending/farmer, /turf/simulated/floor/tiled/monotechmaint, /area/tradeport/spine) "aHM" = ( @@ -12881,9 +12903,6 @@ /area/shuttle/trade_ship/general) "aHR" = ( /obj/structure/railing/grey, -/obj/structure/window/reinforced/polarized{ - id = "udang_cargo" - }, /obj/structure/bed/chair/shuttle{ dir = 4 }, @@ -13010,6 +13029,7 @@ /obj/item/reagent_containers/glass/beaker{ pixel_x = 5 }, +/obj/machinery/appliance/cooker/oven, /turf/simulated/floor/tiled/old_tile/white, /area/shuttle/caravan) "aIj" = ( @@ -13029,6 +13049,9 @@ /area/tradeport/safari) "aIl" = ( /obj/machinery/telecomms/relay/preset/telecomms, +/obj/structure/cable/green{ + icon_state = "2-8" + }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/utilitymicro) "aIm" = ( @@ -13778,7 +13801,9 @@ /obj/machinery/computer/ship/sensors{ dir = 1 }, -/obj/machinery/power/apc/alarms_hidden/south_mount, +/obj/machinery/power/apc/alarms_hidden/south_mount{ + req_access = null + }, /turf/simulated/floor/tiled/old_tile/beige, /area/shuttle/caravan) "aKm" = ( @@ -14239,13 +14264,18 @@ /turf/simulated/floor/tiled/neutral, /area/tradeport/facility) "aLD" = ( -/obj/structure/metal_edge{ - layer = 2.8 - }, /obj/structure/curtain/open/shower/engineering, /obj/structure/railing/grey{ dir = 8 }, +/obj/structure/window/reinforced/polarized{ + id = "udang_cargo"; + dir = 1 + }, +/obj/structure/reagent_dispensers/beerkeg, +/obj/structure/metal_edge{ + layer = 1 + }, /turf/simulated/floor/plating, /area/shuttle/udang/main) "aLE" = ( @@ -14343,12 +14373,16 @@ /turf/space, /area/sector/nebula_tradeport/motel/vip) "aLT" = ( -/obj/structure/metal_edge{ - layer = 2.8 - }, /obj/machinery/portable_atmospherics/canister/empty/phoron, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /obj/structure/handrail, +/obj/structure/window/reinforced/polarized{ + id = "udang_cargo"; + dir = 1 + }, +/obj/structure/metal_edge{ + layer = 1 + }, /turf/simulated/floor/plating, /area/shuttle/udang/main) "aLU" = ( @@ -14731,14 +14765,17 @@ }, /obj/effect/shuttle_landmark/triumph/trade/utilitymicro, /obj/overmap/entity/visitable/ship/landable/trade/utilitymicro, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/monotechmaint, /area/shuttle/utilitymicro) "aMX" = ( /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 9 }, /turf/simulated/floor/carpet/patterened/blue, /area/shuttle/caravan) @@ -14916,6 +14953,9 @@ /obj/structure/window/reinforced{ dir = 4 }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/utilitymicro) "aNx" = ( @@ -15129,6 +15169,7 @@ name = "Tug Airtight Hatch"; req_one_access = null }, +/obj/machinery/atmospheric_field_generator/perma, /turf/simulated/floor/tiled/monotechmaint, /area/shuttle/tug) "aNV" = ( @@ -15316,6 +15357,7 @@ /obj/machinery/door/firedoor{ req_one_access = list(160) }, +/obj/structure/curtain/open/black, /turf/simulated/floor/wood, /area/sector/nebula_tradeport/motel) "aOA" = ( @@ -15702,7 +15744,7 @@ icon_state = "4-8" }, /turf/simulated/floor/airless, -/area/tradeport/exterior) +/area/space) "aPJ" = ( /obj/machinery/door/firedoor, /obj/machinery/door/blast/regular{ @@ -15717,6 +15759,7 @@ name = "Adventurer Airtight Hatch"; req_one_access = null }, +/obj/machinery/atmospheric_field_generator/perma, /turf/simulated/floor/tiled/techfloor/monogrid, /area/shuttle/adventurer) "aPK" = ( @@ -15830,14 +15873,14 @@ /turf/simulated/floor/tiled/old_tile/blue, /area/tradeport/cafeteria) "aQb" = ( -/obj/structure/window/reinforced/tinted{ - dir = 1 - }, /obj/structure/window/reinforced/tinted, /obj/machinery/power/smes/buildable{ charge = 15000; cur_coils = 3 }, +/obj/structure/cable/green{ + icon_state = "0-4" + }, /turf/simulated/floor/tiled/techfloor/monogrid, /area/shuttle/tug) "aQd" = ( @@ -15987,6 +16030,9 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/trade_ship/general) "aQz" = ( +/obj/structure/fuel_port{ + pixel_x = -27 + }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/tug) "aQA" = ( @@ -16523,7 +16569,6 @@ /turf/space/basic, /area/space) "aRU" = ( -/obj/structure/window/reinforced/tinted, /obj/structure/window/reinforced/tinted{ dir = 1 }, @@ -16929,16 +16974,6 @@ }, /turf/simulated/floor/tiled/neutral, /area/tradeport/commons) -"aTi" = ( -/obj/item/paper{ - info = "WELCOME TO THE NEBULA MOTEL \ TO BUY A PASS, SEEK M4RIA, AT BEHIND THE COUNTER. \ \ We have 9 rooms. \ Room 1 to 4 have a small kitchen, and washing room. \ Room 1 and 4 have 1 Double bed. \ 2 has 1 single bed \ 3 have 2 single beds. \ Those rooms are 30 Thrallers the 3 to 5 hours. \ \ Room 5 to 8 have no kitchen, and washing room. \ Room 6 and 8 have 1 Double bed. \ 5 has 1 single bed \ 7 have 2 single beds. \ Those rooms are 15 Thrallers the 3 to 5 hours. \ \ Room 9 is our VIP Suite. This suite has 2 bed rooms, 1 office, 1 fully equipped kitchen, 1 washroom, 1 laundry room, And its own shuttle call the Arrowhead, used by ex Tajaran racer Cheuk'Yager. the suite is 80 Thrallers the 3 to 5 hours. \ \ The Sauna is free to use. The public laundry machine and public bathroom are free to use. Guest pass are available if the rooms are shared."; - name = "Nebula Motel" - }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor/monogrid, -/area/sector/nebula_tradeport/dock2) "aTj" = ( /obj/effect/floor_decal/techfloor, /obj/structure/sign/warning/mail_delivery{ @@ -17524,7 +17559,9 @@ /obj/structure/cable/green{ icon_state = "0-8" }, -/obj/machinery/power/apc/alarms_hidden/south_mount, +/obj/machinery/power/apc/alarms_hidden/south_mount{ + req_access = null + }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/tug) "aUz" = ( @@ -17622,23 +17659,21 @@ }, /turf/simulated/floor/wood, /area/shuttle/trade_ship/general) -"aUI" = ( -/obj/structure/bed/chair/bay/chair/padded/teal{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/sector/nebula_tradeport/engineering) "aUJ" = ( /obj/structure/stasis_cage, /obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled/old_tile/yellow, /area/tradeport/safari) "aUK" = ( -/obj/structure/metal_edge{ - layer = 2.8 - }, /obj/machinery/portable_atmospherics/canister/empty/phoron, /obj/structure/handrail, +/obj/structure/window/reinforced/polarized{ + id = "udang_cargo"; + dir = 1 + }, +/obj/structure/metal_edge{ + layer = 1 + }, /turf/simulated/floor/plating, /area/shuttle/udang/main) "aUL" = ( @@ -17890,7 +17925,8 @@ /area/shuttle/adventurer) "aVw" = ( /obj/machinery/computer/ship/helm/adv{ - dir = 4 + dir = 4; + req_one_access = null }, /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/monotechmaint, @@ -18230,7 +18266,7 @@ /turf/space/basic, /area/sector/nebula_tradeport/motel/vip) "aWu" = ( -/obj/machinery/vending/security, +/obj/structure/table/rack/shelf/steel, /turf/simulated/floor/tiled/old_tile/red, /area/sector/nebula_tradeport/security) "aWv" = ( @@ -19041,6 +19077,7 @@ name = "Shuttle Utility Door"; pixel_x = 30 }, +/obj/structure/fans/tiny, /turf/simulated/floor/tiled/monotechmaint, /area/shuttle/utilitymicro) "aYJ" = ( @@ -19069,13 +19106,6 @@ id = "tugdoor1"; name = "Tug Barge door" }, -/obj/machinery/button/remote/blast_door{ - pixel_x = 33; - pixel_y = -2; - dir = 8; - id = "Tug2"; - name = "Tug Air refuel" - }, /obj/machinery/button/remote/blast_door{ pixel_x = 23; pixel_y = -2; @@ -19135,6 +19165,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, +/obj/machinery/space_heater, /turf/simulated/floor/plating, /area/sector/nebula_tradeport/engineering) "aYV" = ( @@ -19226,7 +19257,9 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/trade_ship/general) "aZf" = ( -/obj/machinery/door/blast/regular, +/obj/machinery/door/blast/regular{ + id = "tugdoor1" + }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/tug) "aZg" = ( @@ -19376,6 +19409,9 @@ /turf/simulated/floor/carpet/patterened/blue/alt, /area/sector/nebula_tradeport/motel/vip) "aZE" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/utilitymicro) "aZF" = ( @@ -19436,9 +19472,6 @@ pixel_x = 32; pixel_y = -3 }, -/obj/structure/window/reinforced/polarized{ - id = "udang_cargo" - }, /obj/effect/floor_decal/borderfloorblack{ dir = 6 }, @@ -19496,8 +19529,11 @@ /turf/simulated/floor/tiled/neutral, /area/tradeport/commons) "aZT" = ( -/obj/structure/railing, -/turf/simulated/mineral/floor/vacuum, +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/obj/machinery/power/solar, +/turf/simulated/floor/airless, /area/tradeport/exterior) "aZU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -19651,7 +19687,7 @@ /area/sector/nebula_tradeport/motel) "bqy" = ( /turf/simulated/wall/prepainted/exploration, -/area/shuttle/scoophead/office) +/area/shuttle/scoophead/main2) "bqF" = ( /obj/effect/floor_decal/corner/red/border{ dir = 9 @@ -19699,7 +19735,7 @@ id = "scoophead_office" }, /turf/simulated/floor/plating, -/area/shuttle/scoophead/office) +/area/shuttle/scoophead/main2) "bsc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -19720,7 +19756,7 @@ dir = 9 }, /turf/simulated/floor/tiled/techfloor, -/area/shuttle/scoophead/office) +/area/shuttle/scoophead/main2) "btw" = ( /obj/machinery/atmospherics/portables_connector{ dir = 1 @@ -19760,7 +19796,7 @@ /obj/machinery/atmospherics/valve{ dir = 4 }, -/turf/simulated/floor/tiled/steel_dirty/dark, +/turf/simulated/floor/tiled/steel_dirty/red, /area/shuttle/arrowhead) "bAO" = ( /obj/machinery/camera{ @@ -19805,7 +19841,7 @@ id = "scoophead_office" }, /turf/simulated/floor/carpet/patterened/red, -/area/shuttle/scoophead/office) +/area/shuttle/scoophead/main2) "bEl" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 10 @@ -19848,7 +19884,7 @@ icon_state = "4-8" }, /turf/simulated/floor/carpet/patterened/red, -/area/shuttle/scoophead/office) +/area/shuttle/scoophead/main2) "bHd" = ( /obj/structure/aquarium/prefilled, /turf/simulated/floor/carpet/turcarpet, @@ -19908,15 +19944,12 @@ /turf/simulated/floor/wood, /area/tradeport/commons) "bXL" = ( -/obj/structure/table/hardwoodtable, /obj/item/material/knife, -/obj/machinery/recharger{ - pixel_x = 9; - pixel_y = 2 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/machinery/appliance/cooker/oven, +/obj/structure/table/hardwoodtable, /turf/simulated/floor/tiled/dark, /area/sector/nebula_tradeport/motel/room3) "bYr" = ( @@ -20049,20 +20082,18 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/silver{ - id_tag = "motel5" + id_tag = "motel5"; + req_access = list(165) }, /turf/simulated/floor/wood, /area/sector/nebula_tradeport/motel/room5) "crj" = ( -/obj/structure/table/hardwoodtable, /obj/item/material/knife, -/obj/machinery/recharger{ - pixel_x = 9; - pixel_y = 2 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/machinery/appliance/cooker/oven, +/obj/structure/table/hardwoodtable, /turf/simulated/floor/tiled/dark, /area/sector/nebula_tradeport/motel/room1) "csb" = ( @@ -20090,7 +20121,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/red{ dir = 4 }, -/turf/simulated/floor/tiled/steel_dirty/dark, +/turf/simulated/floor/tiled/steel_dirty/red, /area/shuttle/arrowhead) "cyy" = ( /obj/machinery/portable_atmospherics/canister/empty/phoron, @@ -20233,6 +20264,7 @@ "cQi" = ( /obj/structure/bed/padded, /obj/structure/curtain/open/bed, +/obj/item/bedsheet, /turf/simulated/floor/carpet/patterened/blue, /area/sector/nebula_tradeport/motel/room2) "cQQ" = ( @@ -20268,6 +20300,10 @@ /obj/machinery/gear_painter, /turf/simulated/floor/tiled/steel, /area/tradeport/commons) +"cTW" = ( +/obj/structure/catwalk, +/turf/space/basic, +/area/space) "cUz" = ( /obj/structure/shuttle/engine/heater{ dir = 4 @@ -20485,7 +20521,7 @@ req_one_access = null }, /turf/simulated/floor/plating, -/area/shuttle/scoophead/office) +/area/shuttle/scoophead/main2) "dzE" = ( /obj/structure/toilet{ dir = 4 @@ -20523,7 +20559,7 @@ id = "scoophead_room" }, /turf/simulated/floor/plating, -/area/shuttle/scoophead/office) +/area/shuttle/scoophead/main2) "dCd" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 9 @@ -20580,7 +20616,7 @@ dir = 4 }, /turf/simulated/floor/tiled/techfloor, -/area/shuttle/scoophead/office) +/area/shuttle/scoophead/main2) "dGF" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/structure/curtain/black, @@ -20656,12 +20692,25 @@ /obj/machinery/light/small, /turf/simulated/floor/carpet/patterened/blue, /area/sector/nebula_tradeport/motel/room4) +"dPa" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/fire_alarm/south_mount, +/turf/simulated/floor/wood, +/area/sector/nebula_tradeport/motel/room1) "dPi" = ( /obj/structure/cable/pink{ icon_state = "1-8" }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/scoophead/main) +"dQr" = ( +/obj/structure/bed/padded, +/obj/machinery/fire_alarm/north_mount, +/obj/item/bedsheet, +/turf/simulated/floor/carpet/patterened/blue, +/area/sector/nebula_tradeport/motel/room7) "dQx" = ( /obj/structure/bed/chair/comfy/black{ dir = 1 @@ -20698,6 +20747,10 @@ }, /turf/simulated/floor/tiled/white, /area/sector/nebula_tradeport/medical/public) +"dUe" = ( +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/turf/simulated/floor/tiled/steel_dirty/red, +/area/shuttle/arrowhead) "dVq" = ( /obj/machinery/button/remote/blast_door{ id = "Arrowhead Airlock"; @@ -20713,6 +20766,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/machinery/atmospheric_field_generator/perma, /turf/simulated/floor/tiled/steel_dirty/dark, /area/shuttle/arrowhead) "dWa" = ( @@ -20757,6 +20811,15 @@ }, /turf/simulated/floor/plating, /area/shuttle/scoophead/main) +"dYD" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/carpet/patterened/blue, +/area/shuttle/caravan) "dYK" = ( /obj/structure/transit_tube, /obj/effect/floor_decal/industrial/warning{ @@ -20826,6 +20889,16 @@ /obj/item/storage/bag/trash, /turf/simulated/floor/carpet/turcarpet, /area/sector/nebula_tradeport/motel) +"eiO" = ( +/obj/structure/table/steel_reinforced, +/obj/fiftyspawner/glass, +/obj/fiftyspawner/steel, +/obj/fiftyspawner/plastic, +/obj/effect/floor_decal/corner_oldtile/blue{ + dir = 10 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/sector/nebula_tradeport/engineering) "eiW" = ( /obj/structure/railing/grey, /turf/space/basic, @@ -20920,8 +20993,17 @@ name = "Arrowhead beacon"; gps_tag = "ARROWHEAD" }, -/turf/simulated/floor/tiled/steel_dirty/dark, +/turf/simulated/floor/tiled/steel_dirty/red, /area/shuttle/arrowhead) +"evN" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/turf/simulated/floor/airless, +/area/space) "evZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -21007,7 +21089,7 @@ pixel_x = -32 }, /turf/simulated/floor/carpet/patterened/blue, -/area/shuttle/scoophead/office) +/area/shuttle/scoophead/main2) "eEX" = ( /obj/structure/simple_door/hardwood, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -21213,10 +21295,13 @@ id = "scoophead_office" }, /turf/simulated/floor/plating, -/area/shuttle/scoophead/office) +/area/shuttle/scoophead/main2) "fir" = ( /obj/machinery/computer/ship/sensors, -/turf/simulated/floor/tiled/steel_dirty/dark, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel_dirty/red, /area/shuttle/arrowhead) "fkY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -21275,6 +21360,12 @@ }, /turf/simulated/floor/wood, /area/sector/nebula_tradeport/motel/room6) +"fwS" = ( +/obj/item/modular_computer/console/preset/civilian{ + dir = 8 + }, +/turf/simulated/floor/glass/reinforced, +/area/sector/nebula_tradeport/engineering) "fxW" = ( /turf/simulated/floor/carpet/patterened/blue, /area/sector/nebula_tradeport/motel/room3) @@ -21293,6 +21384,16 @@ }, /turf/simulated/wall/r_wall/prepainted, /area/sector/nebula_tradeport/motel/arcade) +"fBW" = ( +/obj/machinery/button/remote/blast_door{ + pixel_x = 23; + pixel_y = 7; + dir = 8; + id = "tugdoor1"; + name = "Tug Barge door" + }, +/turf/simulated/floor/plating, +/area/shuttle/tug) "fCA" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 @@ -21322,7 +21423,7 @@ }, /obj/machinery/power/apc/alarms_hidden/south_mount, /turf/simulated/floor/tiled/techfloor, -/area/shuttle/scoophead/office) +/area/shuttle/scoophead/main2) "fFF" = ( /obj/structure/table/steel_reinforced, /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -21567,6 +21668,15 @@ }, /turf/simulated/floor/tiled/old_tile/red, /area/tradeport/cafeteria) +"gCI" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/obj/machinery/fire_alarm/west_mount{ + pixel_x = -26 + }, +/turf/simulated/floor/airless, +/area/sector/nebula_tradeport/motel) "gCP" = ( /obj/structure/table/glass, /obj/item/reagent_containers/food/snacks/milosoup, @@ -21712,7 +21822,8 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/silver{ - id_tag = "motel8" + id_tag = "motel8"; + req_access = list(169) }, /turf/simulated/floor/wood, /area/sector/nebula_tradeport/motel/room8) @@ -21821,6 +21932,13 @@ /obj/structure/barricade, /turf/simulated/floor/wood, /area/tradeport/safarizoo) +"hhH" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/fire_alarm/south_mount, +/turf/simulated/floor/wood, +/area/sector/nebula_tradeport/motel/room4) "hhI" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 @@ -21891,7 +22009,8 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/silver{ - id_tag = "motel4" + id_tag = "motel4"; + req_access = list(164) }, /turf/simulated/floor/wood, /area/sector/nebula_tradeport/motel/room4) @@ -21950,7 +22069,7 @@ id = "scoophead_office" }, /turf/simulated/floor/plating, -/area/shuttle/scoophead/office) +/area/shuttle/scoophead/main2) "hyI" = ( /obj/structure/table/hardwoodtable, /obj/machinery/chemical_dispenser/catering/bar_coffee{ @@ -22358,6 +22477,17 @@ }, /turf/simulated/floor/tiled/white, /area/sector/nebula_tradeport/medical/public) +"itp" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/effect/floor_decal/techfloor, +/obj/effect/floor_decal/corner/green/border{ + dir = 1 + }, +/obj/landmark/spawnpoint/latejoin/outsider, +/turf/simulated/floor/tiled, +/area/tradeport/commhall) "itB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -22454,7 +22584,7 @@ icon_state = "4-8" }, /turf/simulated/floor/carpet/patterened/red, -/area/shuttle/scoophead/office) +/area/shuttle/scoophead/main2) "iQo" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/meter, @@ -22503,7 +22633,7 @@ /obj/structure/curtain/open/shower, /obj/structure/simple_door/wood, /turf/simulated/floor/tiled/neutral, -/area/shuttle/scoophead/office) +/area/shuttle/scoophead/main2) "jdu" = ( /obj/machinery/washing_machine, /obj/item/storage/laundry_basket{ @@ -22585,7 +22715,7 @@ pixel_x = 32 }, /turf/simulated/floor/carpet/patterened/red, -/area/shuttle/scoophead/office) +/area/shuttle/scoophead/main2) "jpc" = ( /obj/structure/window/reinforced/polarized{ dir = 8; @@ -22593,7 +22723,7 @@ }, /obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, -/area/shuttle/scoophead/office) +/area/shuttle/scoophead/main2) "juq" = ( /obj/effect/debris/cleanable/dirt, /turf/simulated/floor/tiled/old_tile/blue, @@ -22692,6 +22822,10 @@ }, /turf/simulated/floor/carpet/arcadecarpet, /area/sector/nebula_tradeport/motel/arcade) +"jGT" = ( +/mob/living/simple_mob/animal/passive/cat, +/turf/simulated/floor/wood, +/area/sector/nebula_tradeport/motel) "jHF" = ( /obj/structure/table/rack/shelf/steel, /obj/machinery/air_alarm/alarms_hidden{ @@ -22772,7 +22906,7 @@ dir = 4 }, /turf/simulated/floor/tiled/techfloor, -/area/shuttle/scoophead/office) +/area/shuttle/scoophead/main2) "jQe" = ( /obj/machinery/computer/ship/helm{ dir = 1 @@ -22781,7 +22915,7 @@ pixel_y = 7; pixel_x = -6 }, -/turf/simulated/floor/tiled/steel_dirty/dark, +/turf/simulated/floor/tiled/steel_dirty/red, /area/shuttle/arrowhead) "jQK" = ( /obj/structure/handrail, @@ -22893,6 +23027,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/item/storage/box/glasses/meta, /turf/simulated/floor/tiled/dark, /area/sector/nebula_tradeport/motel/room4) "keh" = ( @@ -22935,6 +23070,9 @@ /obj/structure/closet/secure_closet/personal, /obj/item/storage/box/glasses/meta, /obj/item/storage/box/donkpockets, +/obj/item/pizzabox/meat{ + pixel_y = 8 + }, /turf/simulated/floor/wood, /area/sector/nebula_tradeport/motel/room6) "kji" = ( @@ -22948,6 +23086,10 @@ "kjD" = ( /obj/structure/table/hardwoodtable, /obj/effect/floor_decal/spline/fancy/wood, +/obj/item/paper{ + info = "WELCOME TO THE NEBULA MOTEL \ TO BUY A PASS, SEEK THE MOTEL VENDING MACHINE NEAR THE COUNTER. \ \ We have 9 rooms. \ Room 1 to 4 have a small kitchen, and washing room. \ Room 1 and 4 have 1 Double bed. \ 2 has 1 single bed \ 3 have 2 single beds. \ Those rooms are 30 Thrallers the 3 to 5 hours. \ \ Room 5 to 8 have no kitchen, and washing room. \ Room 6 and 8 have 1 Double bed. \ 5 has 1 single bed \ 7 have 2 single beds. \ Those rooms are 15 Thrallers the 3 to 5 hours. \ \ Room 9 is our VIP Suite. This suite has 2 bed rooms, 1 office, 1 fully equipped kitchen, 1 washroom, 1 laundry room, And its own shuttle call the Arrowhead, used by ex Tajaran racer Cheuk'Yager. the suite is 80 Thrallers the 3 to 5 hours. \ \ The Sauna is free to use. The public laundry machine and public bathroom are free to use. Guest pass are available if the rooms are shared."; + name = "Nebula Motel" + }, /turf/simulated/floor/carpet/turcarpet, /area/sector/nebula_tradeport/motel) "koU" = ( @@ -23019,15 +23161,12 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/silver{ - id_tag = "motel4" + id_tag = "motel4"; + req_access = list(163) }, /turf/simulated/floor/wood, /area/sector/nebula_tradeport/motel/room3) "kDN" = ( -/obj/structure/table/bench/wooden, -/obj/item/pizzabox/meat{ - pixel_y = 8 - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -23100,15 +23239,12 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/scoophead/engineering) "kKj" = ( -/obj/structure/table/hardwoodtable, /obj/item/material/knife, -/obj/machinery/recharger{ - pixel_x = 9; - pixel_y = 2 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/machinery/appliance/cooker/oven, +/obj/structure/table/hardwoodtable, /turf/simulated/floor/tiled/dark, /area/sector/nebula_tradeport/motel/room2) "kKq" = ( @@ -23150,6 +23286,18 @@ }, /turf/simulated/floor/tiled/neutral, /area/tradeport/facility) +"kRE" = ( +/obj/structure/bed/chair/comfy/black{ + dir = 4 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 8 + }, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/carpet/patterened/red, +/area/sector/nebula_tradeport/motel/vip) "kVa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -23240,6 +23388,17 @@ }, /turf/simulated/mineral/floor/vacuum, /area/tradeport/pads) +"lcX" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/effect/floor_decal/techfloor, +/obj/effect/floor_decal/corner/green/border{ + dir = 1 + }, +/obj/machinery/light, +/turf/simulated/floor/tiled, +/area/tradeport/commhall) "lfu" = ( /obj/machinery/chemical_dispenser/catering/bar_soft{ dir = 4 @@ -23359,12 +23518,19 @@ /area/sector/nebula_tradeport/motel) "luK" = ( /turf/simulated/floor/wood, -/area/shuttle/scoophead/office) +/area/shuttle/scoophead/main2) "luQ" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/structure/curtain/open/black, /turf/simulated/floor/tiled/techmaint, /area/sector/nebula_tradeport/motel/room6) +"lwa" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/obj/machinery/fire_alarm/alarms_hidden/west_mount, +/turf/simulated/floor/wood, +/area/sector/nebula_tradeport/motel) "lwk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -23398,15 +23564,14 @@ /turf/simulated/floor/tiled/dark, /area/sector/nebula_tradeport/motel/room2) "lAe" = ( -/obj/machinery/door/firedoor{ - req_one_access = list(160) - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, /obj/machinery/door/airlock/silver{ - id_tag = "motel1" + id_tag = "motel1"; + req_access = list(161) }, +/obj/machinery/door/firedoor, /turf/simulated/floor/wood, /area/sector/nebula_tradeport/motel/room1) "lAm" = ( @@ -23525,8 +23690,7 @@ }, /obj/machinery/button/remote/blast_door{ id = "nebulacafe"; - pixel_y = 27; - req_access = list(160) + pixel_y = 27 }, /obj/machinery/door/window/westleft, /turf/simulated/floor/wood, @@ -23829,6 +23993,10 @@ "mGF" = ( /obj/structure/table/hardwoodtable, /obj/random/alcohol, +/obj/machinery/recharger{ + pixel_x = 9; + pixel_y = 2 + }, /turf/simulated/floor/wood, /area/sector/nebula_tradeport/motel/room1) "mHd" = ( @@ -23879,7 +24047,7 @@ /area/shuttle/arrowhead) "mLx" = ( /turf/simulated/wall/prepainted/command, -/area/shuttle/scoophead/office) +/area/shuttle/scoophead/main2) "mMt" = ( /obj/effect/shuttle_landmark/triumph/trade/arrowhead, /obj/overmap/entity/visitable/ship/landable/trade/arrowhead, @@ -23918,6 +24086,10 @@ "mOb" = ( /obj/structure/table/hardwoodtable, /obj/random/alcohol, +/obj/machinery/recharger{ + pixel_x = 9; + pixel_y = 2 + }, /turf/simulated/floor/wood, /area/sector/nebula_tradeport/motel/room2) "mOl" = ( @@ -23971,7 +24143,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 }, -/turf/simulated/floor/tiled/steel_dirty/dark, +/turf/simulated/floor/tiled/steel_dirty/red, /area/shuttle/arrowhead) "ncQ" = ( /obj/structure/cable/yellow{ @@ -23997,6 +24169,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/item/storage/box/glasses/meta, /turf/simulated/floor/tiled/dark, /area/sector/nebula_tradeport/motel/room1) "ngf" = ( @@ -24030,15 +24203,17 @@ icon_state = "4-8" }, /turf/simulated/floor/tiled/techfloor, -/area/shuttle/scoophead/office) +/area/shuttle/scoophead/main2) "nkf" = ( /obj/machinery/atmospherics/pipe/tank/air{ dir = 8 }, -/obj/machinery/air_alarm/alarms_hidden/north_mount, /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/air_alarm/alarms_hidden/north_mount{ + req_one_access = null + }, /turf/simulated/floor/tiled/techfloor/monogrid, /area/shuttle/arrowhead) "nlw" = ( @@ -24138,9 +24313,18 @@ }, /turf/simulated/floor/tiled/old_tile/blue, /area/tradeport/commons) +"nHT" = ( +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/green/border, +/obj/landmark/spawnpoint/job/outsider, +/turf/simulated/floor/tiled, +/area/tradeport/commhall) "nIB" = ( /obj/structure/curtain/open/bed, /obj/structure/bed/double/padded, +/obj/item/bedsheet/double, /turf/simulated/floor/carpet/patterened/blue, /area/sector/nebula_tradeport/motel/room4) "nIU" = ( @@ -24471,7 +24655,7 @@ /obj/item/pen/fountain, /obj/item/pen, /turf/simulated/floor/carpet/patterened/red, -/area/shuttle/scoophead/office) +/area/shuttle/scoophead/main2) "oFP" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -24580,7 +24764,7 @@ id = "scoophead_room" }, /turf/simulated/floor/wood, -/area/shuttle/scoophead/office) +/area/shuttle/scoophead/main2) "pfv" = ( /obj/structure/cable/yellow{ icon_state = "0-8" @@ -24642,6 +24826,7 @@ "phM" = ( /obj/structure/bed/padded, /obj/structure/curtain/open/bed, +/obj/item/bedsheet, /turf/simulated/floor/carpet/patterened/blue, /area/sector/nebula_tradeport/motel/room3) "piK" = ( @@ -24762,6 +24947,13 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, +/obj/machinery/vending/motel, +/obj/item/paper{ + info = "WELCOME TO THE NEBULA MOTEL \ TO BUY A PASS, SEEK THE MOTEL VENDING MACHINE NEAR THE COUNTER. \ \ We have 9 rooms. \ Room 1 to 4 have a small kitchen, and washing room. \ Room 1 and 4 have 1 Double bed. \ 2 has 1 single bed \ 3 have 2 single beds. \ Those rooms are 30 Thrallers the 3 to 5 hours. \ \ Room 5 to 8 have no kitchen, and washing room. \ Room 6 and 8 have 1 Double bed. \ 5 has 1 single bed \ 7 have 2 single beds. \ Those rooms are 15 Thrallers the 3 to 5 hours. \ \ Room 9 is our VIP Suite. This suite has 2 bed rooms, 1 office, 1 fully equipped kitchen, 1 washroom, 1 laundry room, And its own shuttle call the Arrowhead, used by ex Tajaran racer Cheuk'Yager. the suite is 80 Thrallers the 3 to 5 hours. \ \ The Sauna is free to use. The public laundry machine and public bathroom are free to use. Guest pass are available if the rooms are shared."; + name = "Nebula Motel"; + pixel_x = -7; + pixel_y = 1 + }, /turf/simulated/floor/wood, /area/sector/nebula_tradeport/motel) "pJb" = ( @@ -24785,6 +24977,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/item/storage/box/glasses/meta, /turf/simulated/floor/tiled/dark, /area/sector/nebula_tradeport/motel/room2) "pSM" = ( @@ -24895,6 +25088,8 @@ /area/sector/nebula_tradeport/motel/room4) "qnM" = ( /obj/structure/bed/double/padded, +/obj/machinery/fire_alarm/north_mount, +/obj/item/bedsheet/double, /turf/simulated/floor/carpet/patterened/blue, /area/sector/nebula_tradeport/motel/room6) "qnU" = ( @@ -24903,6 +25098,12 @@ }, /turf/simulated/floor/tiled/old_tile/white, /area/sector/nebula_tradeport/motel/room3) +"qox" = ( +/obj/item/modular_computer/console/preset/civilian{ + dir = 4 + }, +/turf/simulated/floor/glass/reinforced, +/area/sector/nebula_tradeport/engineering) "qoI" = ( /obj/machinery/camera{ dir = 8 @@ -25039,13 +25240,15 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/silver{ - id_tag = "motel2" + id_tag = "motel2"; + req_access = list(162) }, /turf/simulated/floor/wood, /area/sector/nebula_tradeport/motel/room2) "qOg" = ( /obj/structure/curtain/open/bed, /obj/structure/bed/double/padded, +/obj/item/bedsheet/double, /turf/simulated/floor/carpet/patterened/blue, /area/sector/nebula_tradeport/motel/room1) "qOs" = ( @@ -25234,7 +25437,19 @@ /obj/structure/bed/pod, /obj/item/bedsheet/brown, /turf/simulated/floor/carpet/patterened/blue, -/area/shuttle/scoophead/office) +/area/shuttle/scoophead/main2) +"rbV" = ( +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/obj/machinery/air_alarm/alarms_hidden{ + pixel_y = 22; + req_one_access = list(160) + }, +/obj/effect/floor_decal/corner/green/border, +/obj/landmark/spawnpoint/job/outsider, +/turf/simulated/floor/tiled, +/area/tradeport/commhall) "rch" = ( /obj/structure/closet/crate/bin{ anchored = 1 @@ -25248,6 +25463,13 @@ /obj/item/reagent_containers/food/snacks/candy_corn, /turf/simulated/floor/tiled/old_tile/blue, /area/tradeport/commons) +"rdP" = ( +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/utilitymicro) "rfq" = ( /obj/machinery/newscaster{ pixel_y = 35 @@ -25358,8 +25580,17 @@ /area/sector/nebula_tradeport/motel/arcade) "rEe" = ( /obj/machinery/computer/ship/engines, -/turf/simulated/floor/tiled/steel_dirty/dark, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel_dirty/red, /area/shuttle/arrowhead) +"rIw" = ( +/obj/structure/bed/chair/bay/chair/padded/teal{ + dir = 4 + }, +/turf/simulated/floor/glass/reinforced, +/area/sector/nebula_tradeport/engineering) "rJb" = ( /obj/machinery/door/firedoor/glass, /obj/structure/grille, @@ -25414,6 +25645,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/item/storage/box/glasses/meta, /turf/simulated/floor/tiled/dark, /area/sector/nebula_tradeport/motel/room3) "rMJ" = ( @@ -25491,6 +25723,13 @@ }, /turf/simulated/floor/tiled/old_tile/white, /area/sector/nebula_tradeport/motel/room2) +"rXg" = ( +/obj/effect/floor_decal/corner_oldtile/blue{ + dir = 10 + }, +/obj/machinery/lathe/autolathe, +/turf/simulated/floor/tiled/techfloor/grid, +/area/sector/nebula_tradeport/engineering) "rXJ" = ( /obj/structure/undies_wardrobe, /turf/simulated/floor/wood, @@ -25508,7 +25747,7 @@ icon_state = "4-8" }, /turf/simulated/floor/plating, -/area/shuttle/scoophead/office) +/area/shuttle/scoophead/main2) "rYV" = ( /obj/machinery/light, /obj/structure/flora/pottedplant/drooping, @@ -25554,7 +25793,7 @@ /obj/item/modular_computer/console/preset/civilian{ dir = 4 }, -/turf/simulated/floor/tiled/steel_dirty/dark, +/turf/simulated/floor/tiled/steel_dirty/red, /area/shuttle/arrowhead) "sjP" = ( /turf/simulated/floor/tiled/white, @@ -25658,6 +25897,15 @@ /obj/structure/inflatable, /turf/simulated/floor/tiled/old_tile/yellow, /area/tradeport/spine) +"sEm" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/valve{ + dir = 4 + }, +/turf/simulated/floor/carpet/patterened/blue, +/area/shuttle/caravan) "sFL" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 @@ -25716,6 +25964,8 @@ /area/sector/nebula_tradeport/motel/sauna) "sKi" = ( /obj/structure/bed/double/padded, +/obj/machinery/fire_alarm/north_mount, +/obj/item/bedsheet/double, /turf/simulated/floor/carpet/patterened/blue, /area/sector/nebula_tradeport/motel/room8) "sLr" = ( @@ -25724,6 +25974,13 @@ }, /turf/simulated/floor/carpet/turcarpet, /area/sector/nebula_tradeport/motel) +"sLJ" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/fire_alarm/south_mount, +/turf/simulated/floor/wood, +/area/sector/nebula_tradeport/motel/room2) "sMT" = ( /obj/machinery/power/apc/alarms_hidden/north_mount, /obj/structure/cable/yellow{ @@ -25787,7 +26044,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/red{ dir = 4 }, -/turf/simulated/floor/tiled/steel_dirty/dark, +/turf/simulated/floor/tiled/steel_dirty/red, /area/shuttle/arrowhead) "tcJ" = ( /obj/structure/flora/pottedplant/smelly, @@ -25969,7 +26226,7 @@ /obj/item/storage/single_use/mre/random, /obj/item/storage/single_use/mre/random, /turf/simulated/floor/carpet/patterened/blue, -/area/shuttle/scoophead/office) +/area/shuttle/scoophead/main2) "tBI" = ( /obj/structure/closet/secure_closet/personal, /obj/item/storage/box/glasses/meta, @@ -26194,7 +26451,7 @@ gps_tag = "SCOOP" }, /turf/simulated/floor/tiled/techfloor, -/area/shuttle/scoophead/office) +/area/shuttle/scoophead/main2) "umU" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 10 @@ -26237,7 +26494,7 @@ dir = 4 }, /turf/simulated/wall/prepainted/command, -/area/shuttle/scoophead/office) +/area/shuttle/scoophead/main2) "uuk" = ( /obj/structure/noticeboard{ pixel_y = 29 @@ -26332,6 +26589,7 @@ /area/sector/nebula_tradeport/motel) "uyE" = ( /obj/structure/bed/padded, +/obj/item/bedsheet, /turf/simulated/floor/carpet/patterened/blue, /area/sector/nebula_tradeport/motel/room7) "uBu" = ( @@ -26356,7 +26614,7 @@ "uFC" = ( /obj/structure/table/woodentable, /turf/simulated/floor/carpet/patterened/red, -/area/shuttle/scoophead/office) +/area/shuttle/scoophead/main2) "uHN" = ( /obj/machinery/light{ dir = 1 @@ -26389,7 +26647,8 @@ "uNh" = ( /obj/machinery/door/airlock/multi_tile/metal{ dir = 8; - id_tag = "motel9" + id_tag = "motel9"; + req_access = list(170) }, /obj/machinery/door/firedoor{ req_one_access = list(160) @@ -26404,6 +26663,14 @@ /obj/machinery/atmospheric_field_generator/perma, /turf/simulated/floor/plating, /area/shuttle/scoophead/main) +"uQS" = ( +/obj/machinery/button/remote/blast_door{ + id = "clerk2"; + pixel_y = 27; + req_access = list(160) + }, +/turf/simulated/floor/tiled, +/area/tradeport/commons) "uRl" = ( /obj/structure/fuel_port{ pixel_x = -26 @@ -26430,6 +26697,10 @@ /obj/machinery/light, /turf/simulated/floor/tiled/steel_dirty/dark, /area/shuttle/arrowhead) +"uVC" = ( +/obj/structure/reagent_dispensers/beerkeg, +/turf/simulated/floor/plating, +/area/shuttle/tug) "uWr" = ( /obj/effect/floor_decal/corner/red/border{ dir = 1 @@ -26455,6 +26726,10 @@ /obj/effect/floor_decal/spline/plain, /turf/simulated/floor/wmarble, /area/tradeport/commons) +"uZU" = ( +/obj/machinery/vending/survivalist, +/turf/simulated/floor/tiled/monotechmaint, +/area/tradeport/spine) "ves" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -26475,7 +26750,7 @@ pixel_x = 32 }, /turf/simulated/floor/wood, -/area/shuttle/scoophead/office) +/area/shuttle/scoophead/main2) "vff" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -26537,6 +26812,15 @@ }, /turf/simulated/floor/bmarble, /area/tradeport/commons) +"vqO" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/sector/nebula_tradeport/motel/vip) "vrJ" = ( /obj/structure/bed/chair/sofa/red/corner{ dir = 8 @@ -26585,15 +26869,12 @@ /turf/simulated/floor/wood, /area/sector/nebula_tradeport/motel/room3) "vym" = ( -/obj/structure/table/hardwoodtable, /obj/item/material/knife, -/obj/machinery/recharger{ - pixel_x = 9; - pixel_y = 2 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/machinery/appliance/cooker/oven, +/obj/structure/table/hardwoodtable, /turf/simulated/floor/tiled/dark, /area/sector/nebula_tradeport/motel/room4) "vzd" = ( @@ -26765,7 +27046,7 @@ dir = 4 }, /turf/simulated/floor/carpet/patterened/red, -/area/shuttle/scoophead/office) +/area/shuttle/scoophead/main2) "wlu" = ( /obj/machinery/shipsensors, /turf/simulated/floor/plating, @@ -26817,7 +27098,7 @@ dir = 4 }, /turf/simulated/floor/tiled/neutral, -/area/shuttle/scoophead/office) +/area/shuttle/scoophead/main2) "wqt" = ( /obj/structure/shuttle/engine/heater{ dir = 4 @@ -26859,11 +27140,18 @@ dir = 9 }, /turf/simulated/floor/carpet/patterened/red, -/area/shuttle/scoophead/office) +/area/shuttle/scoophead/main2) "wvG" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/neutral, /area/tradeport/facility) +"wwE" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/fire_alarm/south_mount, +/turf/simulated/floor/wood, +/area/sector/nebula_tradeport/motel/room3) "wAb" = ( /obj/machinery/atmospherics/component/unary/engine{ dir = 8 @@ -26916,7 +27204,6 @@ /turf/simulated/floor/tiled/old_tile/blue, /area/tradeport/commons) "wEN" = ( -/obj/structure/table/hardwoodtable, /obj/item/reagent_containers/food/drinks/shaker{ pixel_x = -6 }, @@ -26936,6 +27223,7 @@ /obj/item/reagent_containers/food/snacks/pancakes, /obj/item/reagent_containers/food/snacks/pancakes, /obj/item/reagent_containers/food/snacks/pancakes, +/obj/machinery/appliance/cooker/oven, /turf/simulated/floor/wood, /area/tradeport/cafeteria) "wFr" = ( @@ -27027,11 +27315,21 @@ "wSZ" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, -/area/shuttle/scoophead/office) +/area/shuttle/scoophead/main2) "wUd" = ( /obj/structure/bed/padded, +/obj/machinery/fire_alarm/north_mount, +/obj/item/bedsheet, /turf/simulated/floor/carpet/patterened/blue, /area/sector/nebula_tradeport/motel/room5) +"wWl" = ( +/obj/effect/floor_decal/techfloor, +/obj/effect/floor_decal/corner/green/border{ + dir = 1 + }, +/obj/landmark/spawnpoint/latejoin/outsider, +/turf/simulated/floor/tiled, +/area/tradeport/commhall) "wWB" = ( /turf/simulated/wall/r_wall, /area/sector/nebula_tradeport/motel/room7) @@ -27114,7 +27412,8 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/silver{ - id_tag = "motel7" + id_tag = "motel7"; + req_access = list(167) }, /turf/simulated/floor/airless, /area/sector/nebula_tradeport/motel/room7) @@ -27242,13 +27541,13 @@ }, /obj/machinery/computer/shuttle_control/explore/trade/scoophead, /turf/simulated/floor/tiled/techfloor, -/area/shuttle/scoophead/office) +/area/shuttle/scoophead/main2) "xvE" = ( /obj/structure/bed/chair/shuttle{ dir = 8 }, /turf/simulated/floor/tiled/techfloor, -/area/shuttle/scoophead/office) +/area/shuttle/scoophead/main2) "xwL" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 @@ -27308,6 +27607,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, /area/sector/nebula_tradeport/motel) +"xTF" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/obj/machinery/fire_alarm/west_mount{ + pixel_x = -26 + }, +/turf/simulated/floor/carpet/patterened, +/area/sector/nebula_tradeport/motel) "xTL" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -27426,7 +27734,8 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/silver{ - id_tag = "motel6" + id_tag = "motel6"; + req_access = list(166) }, /turf/simulated/floor/wood, /area/sector/nebula_tradeport/motel/room6) @@ -27458,6 +27767,9 @@ }, /turf/simulated/floor/tiled/old_tile/white, /area/sector/nebula_tradeport/motel/room3) +"yjZ" = ( +/turf/simulated/floor/tiled/old_tile/beige, +/area/tradeport/commhall) (1,1,1) = {" acd @@ -29863,8 +30175,8 @@ acd aDh aDh nBl -nBl -nBl +dUe +dUe aDh acd acd @@ -30056,9 +30368,9 @@ acd acd aDh aDh -nBl +dUe sfh -nBl +dUe aDh acd acd @@ -30250,10 +30562,10 @@ acd acd aDh nBl -nBl +dUe naT -nBl -nBl +dUe +dUe acd acd aDh @@ -30447,7 +30759,7 @@ nBl fir tbk jQe -nBl +dUe acd acd aDh @@ -30641,7 +30953,7 @@ nBl rEe cuq etX -nBl +dUe acd acd acd @@ -33745,7 +34057,7 @@ aei sSX eok dMM -dMM +vqO mtk aCH aAF @@ -34138,7 +34450,7 @@ asa aAg ayA aIZ -aLh +kRE aLh aSb aMf @@ -35131,7 +35443,7 @@ adU aog aog aNU -aCN +aog aCS aEd aKa @@ -35503,7 +35815,7 @@ aMf aVE aXl aIh -anj +dYD aHO aXl atV @@ -35684,7 +35996,7 @@ tFV tFV wtb sFL -sFL +lwa mAL umU aFw @@ -35697,11 +36009,11 @@ aMf aVE aPx aQK -anj +sEm aRn aXl atV -aTp +aIs aza aZQ aId @@ -36243,22 +36555,22 @@ vTE tsd lfZ uci -xAe +hhH vLz dgI tEL gPE -vHl +wwE vey byE lxm pFo -rpe +sLJ sqy bOU ikV lLF -uMy +dPa sqy vLW mHz @@ -36272,7 +36584,7 @@ cXs aOy aHW aJz -akD +yjZ axS aoN apv @@ -36852,10 +37164,10 @@ cXs lFD jlU abr -aby +nHT awO aYp -aVm +wWl aoN apv aWO @@ -36873,7 +37185,7 @@ avN aeg aog aVM -avI +aij agT agT agT @@ -37049,7 +37361,7 @@ abr awu aCZ akM -aWb +itp aoN apv aeh @@ -37068,7 +37380,7 @@ aeg aog aXG aij -agT +uVC agT agT axJ @@ -37232,7 +37544,7 @@ lAe sqy wMY pIG -ime +jGT kji vuw gPc @@ -37240,7 +37552,7 @@ eSp cXs koU aFw -aDJ +rbV fNR adj dWa @@ -37264,7 +37576,7 @@ acC aij agT agT -agT +fBW avI aog aEd @@ -37408,7 +37720,7 @@ dIo hjC jNt fCA -qfx +gCI ooi dXo mHd @@ -37419,7 +37731,7 @@ kKq bbg fCA ltU -ltU +xTF cUF bbg fCA @@ -38379,7 +38691,7 @@ dhw pSM snj cWp -uyE +dQr nZW uyE rXJ @@ -38416,7 +38728,7 @@ aHl aEd ahe aLz -aLz +rdP aBm aEd aHv @@ -38792,10 +39104,10 @@ eaJ kXi gaH asP -aBb +apj anJ aoq -apb +apj atf aif aHw @@ -38989,7 +39301,7 @@ aSQ awu aFe akM -aWb +lcX aoN azZ aHw @@ -40552,7 +40864,7 @@ auX atP arA afX -aTi +aOq dRV aOq aOq @@ -41151,7 +41463,7 @@ aIp aIp aRR aGH -aGH +qox aXk ajk acd @@ -41342,11 +41654,11 @@ aiJ aqu azw aKw -aUI -aQZ -amc -aqq +aIp +rXg aGH +aqq +qox ajk acd acd @@ -41536,11 +41848,11 @@ aiJ aJr aJu aMb -aUI +aIp aQZ -acK -aqq aGH +aGH +amc ajk acd acd @@ -41730,11 +42042,11 @@ aiJ ajT aCv aJQ -aUI -aQZ -amc -aqq +aIp +eiO aGH +rIw +fwS ajk acd acd @@ -41927,7 +42239,7 @@ asi aIp aZo aGH -aGH +fwS aXk ajk acd @@ -45548,7 +45860,7 @@ acd acd acd aDh -aDh +acd aDh aDh aDh @@ -45740,8 +46052,6 @@ acd acd acd acd -acd -aDh aDh abs abs @@ -45750,6 +46060,8 @@ abs abs abs abs +abs +abs aWv apJ adm @@ -45934,8 +46246,6 @@ acd acd acd acd -acd -aDh aMr aEi aEi @@ -45945,6 +46255,8 @@ aEi aEi aEi aEi +aEi +aEi acT aEi aEi @@ -46128,8 +46440,6 @@ acd acd acd acd -acd -aDh aMr aBg aVZ @@ -46139,6 +46449,8 @@ aVZ aVZ aVZ aVZ +aVZ +aVZ aPp aPQ aPQ @@ -46322,8 +46634,6 @@ acd acd acd acd -acd -aDh aMr aag aag @@ -46333,6 +46643,8 @@ aag aag aag aag +aag +aag acT aag aag @@ -46516,8 +46828,6 @@ acd acd acd acd -acd -aDh aMr aiv aiv @@ -46527,6 +46837,8 @@ aiv aiv aiv aiv +aiv +aiv acT aiv aiv @@ -46710,8 +47022,6 @@ acd acd acd acd -acd -aDh aMr aEi aEi @@ -46721,6 +47031,8 @@ aEi aEi aEi aEi +aEi +aEi acT aEi aEi @@ -46904,8 +47216,6 @@ acd acd acd acd -acd -aDh aMr aBg aVZ @@ -46915,6 +47225,8 @@ aVZ aVZ aVZ aVZ +aVZ +aVZ aPp aPQ aPQ @@ -47098,8 +47410,6 @@ acd acd acd acd -acd -aDh aMr aag aag @@ -47109,6 +47419,8 @@ aag aag aag aag +aag +aag acT aag aag @@ -47292,8 +47604,6 @@ aDh aDh aDh aDh -aDh -aDh aMr aiv aiv @@ -47303,6 +47613,8 @@ aiv aiv aiv aiv +aiv +aiv acT aiv aiv @@ -47486,8 +47798,6 @@ aDh aDh aDh aDh -aDh -aDh aMr aEi aEi @@ -47497,6 +47807,8 @@ aEi aEi aEi aEi +aEi +aEi acT aEi aEi @@ -47680,8 +47992,6 @@ aDh aDh aDh aDh -aDh -aDh aMr aBg aVZ @@ -47691,6 +48001,8 @@ aVZ aVZ aVZ aVZ +aVZ +aVZ aPp aPQ aPQ @@ -47874,8 +48186,6 @@ aDh aDh aDh aDh -aDh -aDh aMr aag aag @@ -47885,6 +48195,8 @@ aag aag aag aag +aag +aag acT aag aag @@ -48068,8 +48380,6 @@ aDh aDh aDh aDh -aDh -aDh aMr aiv aiv @@ -48079,6 +48389,8 @@ aiv aiv aiv aiv +aiv +aiv acT aiv aiv @@ -48262,8 +48574,6 @@ aDh aDh aDh aDh -aDh -aDh aMr aEi aEi @@ -48273,6 +48583,8 @@ aEi aEi aEi aEi +aEi +aEi acT aEi aEi @@ -48456,13 +48768,13 @@ aDh aDh aDh aDh -aDh -aDh aMr aBg aVZ aVZ aVZ +aVZ +aVZ ark aEU aEU @@ -48650,8 +48962,6 @@ aDh aDh aDh aDh -aDh -aDh aQv aag aag @@ -48661,6 +48971,8 @@ aag aag aag aag +aag +aag acT aag aag @@ -48844,8 +49156,6 @@ avW avW aDh aDh -aDh -aDh aQv aOe aiv @@ -48855,6 +49165,8 @@ aiv aiv aiv aiv +aiv +aiv acT aiv aiv @@ -49038,8 +49350,6 @@ avW avW avW avW -aDh -aDh aQv aEi aEi @@ -49049,6 +49359,8 @@ aEi aEi aEi aEi +aEi +aEi acT aEi aEi @@ -49232,13 +49544,13 @@ avW avW avW avW -avW -aDh aQv aBg aVZ aVZ aVZ +aVZ +aVZ ark aEU aEU @@ -49426,8 +49738,6 @@ avW avW avW avW -avW -avW aQv aag aag @@ -49437,6 +49747,8 @@ aag aag aag aag +aag +aag acT aag aag @@ -49620,13 +49932,13 @@ avW avW avW avW -avW -avW aQv aOe aOe aOe aOe +aOe +aOe aiv aiv aiv @@ -49814,8 +50126,6 @@ avW avW avW avW -abk -avW aQv aEi aEi @@ -49825,6 +50135,8 @@ aEi aEi aEi aEi +aEi +aEi acT aEi aEi @@ -49850,7 +50162,7 @@ aMr xsx abK bNF -aWh +uZU amU aWh aWh @@ -50008,13 +50320,13 @@ avW avW avW avW -avW -avW aQv aBg aVZ aVZ aVZ +aVZ +aVZ ark aEU aEU @@ -50179,8 +50491,7 @@ aDh aDh aDh aEh -aEh -avW +axY avW avW avW @@ -50203,7 +50514,8 @@ avW avW avW avW -axY +aQv +aZT aZT aag aag @@ -50408,25 +50720,25 @@ auG auG auG acT -auG -auG -auG -auG -auG -aew -aew -aew -aew -aew -aew -aew -aew -aew -aew -aew -aew -aew -aDh +cTW +cTW +cTW +cTW +cTW +cTW +cTW +cTW +cTW +cTW +cTW +cTW +cTW +cTW +cTW +cTW +cTW +cTW +aSY aTq aMr xsx @@ -50602,25 +50914,25 @@ avW avW avW acT -avW -avW -avW -avW -avW -avW -aDh -aDh -aDh -aDh -aDh -aDh -aDh -aDh -aDh -aDh -aDh -aDh -aDh +aEi +aEi +aEi +aEi +aEi +aEi +aEi +aEi +aEi +aEi +aEi +aEi +aEi +aEi +aEi +aEi +aEi +aEi +aSY aTq aMr xsx @@ -50795,26 +51107,26 @@ avW avW avW avW -acT -asZ -avW -avW -awV -awV -abk -avW -aDh -aDh -aDh -aDh -aDh -aDh -aDh -aDh -aDh -aDh -aDh -aDh +evN +akv +akv +akv +aml +aPQ +akv +akv +aml +akv +akv +aml +aPQ +aPQ +aPQ +aPQ +aPQ +aPQ +aET +aSY aTq aMr xsx @@ -50990,25 +51302,25 @@ avW awV awV aPI -awV -awV -awV -awV -awV -awV -avW -awV -aDh -aDh -aDh -aDh -aDh -aDh -aDh -aDh -aDh -aDh -aDh +aag +aag +aag +aag +aag +aag +aag +aag +aag +aag +aag +aag +aag +aag +aag +aag +aag +aag +aSY aTq aMr xsx @@ -51193,15 +51505,15 @@ awV avt awV awV -aDh -aDh -aDh -aDh -aDh -aDh -aDh -aDh -aDh +aew +aew +aew +aew +aew +aew +aew +aew +aew aDh aTq aMr @@ -58786,7 +59098,7 @@ anq agq aCM anq -agH +uQS abG anq akf diff --git a/maps/tether/tether.dm b/maps/tether/tether.dm index 69b9b3ffad5d..fe8a32781d51 100644 --- a/maps/tether/tether.dm +++ b/maps/tether/tether.dm @@ -101,7 +101,7 @@ bot_patrolling = FALSE - allowed_spawns = list("Tram Station","Gateway","Cryogenic Storage","Cyborg Storage","Beruang Trading Corp Cryo") + allowed_spawns = list("Tram Station","Gateway","Cryogenic Storage","Cyborg Storage","Beruang Trading Corp Cryo","Nebula Visitor Arrival") spawnpoint_died = /datum/spawnpoint/tram spawnpoint_left = /datum/spawnpoint/tram spawnpoint_stayed = /datum/spawnpoint/cryo diff --git a/maps/triumph/triumph.dm b/maps/triumph/triumph.dm index 936024523176..751d7b24292b 100644 --- a/maps/triumph/triumph.dm +++ b/maps/triumph/triumph.dm @@ -99,7 +99,7 @@ bot_patrolling = FALSE - allowed_spawns = list(LATEJOIN_METHOD_ARRIVALS_SHUTTLE,LATEJOIN_METHOD_GATEWAY,LATEJOIN_METHOD_CRYOGENIC_STORAGE,LATEJOIN_METHOD_ROBOT_STORAGE,"Beruang Trading Corp Cryo") + allowed_spawns = list(LATEJOIN_METHOD_ARRIVALS_SHUTTLE,LATEJOIN_METHOD_GATEWAY,LATEJOIN_METHOD_CRYOGENIC_STORAGE,LATEJOIN_METHOD_ROBOT_STORAGE,"Beruang Trading Corp Cryo","Nebula Visitor Arrival") spawnpoint_died = /datum/spawnpoint/arrivals spawnpoint_left = /datum/spawnpoint/arrivals spawnpoint_stayed = /datum/spawnpoint/cryo