TGS Test Merge (#6921)

citadel.dme

@@ -3142,6 +3142,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"

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

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"

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"

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

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 = 150,
+		/obj/item/gps/survival = 10,
+		/obj/item/gun/ballistic/shotgun/flare = 100,
+		/obj/item/clothing/accessory/holster/machete/occupied = 250,
+		/obj/item/clothing/accessory/holster/machete/occupied/deluxe = 300,
+		/obj/item/material/knife/machete/hatchet = 220,
+		/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 = 200,
+		/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 = 300,
+		/obj/item/clothing/suit/storage/vest/press = 250,
+		/obj/item/clothing/suit/armor/vest = 250,
+	)
+
+/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,
+	)

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."

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)

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
+
+