Black Market Trader redesign, now with trading structure! (#2926)

* Push 1 * 2 * Update tgstation.dme * 4 * 3 * id? * 5 * guess those ruin doors cant have ID's? * Update blackmarket.dmm * Update blackmarket.dmm * i may be slightly stupid * tweaks with proper paycheck for ghosts * 1 more power cable * Update blackmarket.dmm * doors got stupid * s p a c e Co-authored-by: Zergspower <[email protected]>
Fluffy-Frontier · Apr 17, 2024 · 9b09d24 · 9b09d24
1 parent c471a2d
commit 9b09d24
Show file tree

Hide file tree

Showing 14 changed files with 1,862 additions and 1,104 deletions.
diff --git a/_maps/RandomRuins/SpaceRuins/nova/blackmarket.dmm b/_maps/RandomRuins/SpaceRuins/nova/blackmarket.dmm
diff --git a/_maps/shuttles/nova/ruin_blackmarket_burst.dmm b/_maps/shuttles/nova/ruin_blackmarket_burst.dmm
diff --git a/_maps/shuttles/nova/ruin_blackmarket_chevvy.dmm b/_maps/shuttles/nova/ruin_blackmarket_chevvy.dmm
diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm
@@ -1,7 +1,7 @@
 /obj/machinery/door/poddoor
 	name = "blast door"
 	desc = "A heavy duty blast door that opens mechanically."
-	icon = 'icons/obj/doors/blastdoor.dmi' //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE
+	icon = 'icons/obj/doors/blastdoor.dmi' //ICON OVERRIDEN IN NOVA AESTHETICS - SEE MODULE
 	icon_state = "closed"
 	layer = BLASTDOOR_LAYER
 	closingLayer = CLOSED_BLASTDOOR_LAYER

diff --git a/modular_nova/master_files/code/modules/jobs/job_types/spawner/blackmarket.dm b/modular_nova/master_files/code/modules/jobs/job_types/spawner/blackmarket.dm
@@ -1,3 +1,4 @@
 /datum/job/blackmarket
 	title = ROLE_BLACK_MARKET_DEALER
 	policy_index = ROLE_BLACK_MARKET_DEALER
+	paycheck = PAYCHECK_ZERO
diff --git a/modular_nova/master_files/code/modules/jobs/job_types/spawner/ds2.dm b/modular_nova/master_files/code/modules/jobs/job_types/spawner/ds2.dm
@@ -1,3 +1,4 @@
 /datum/job/ds2
 	title = ROLE_DS2
 	policy_index = ROLE_DS2
+	paycheck = PAYCHECK_ZERO
diff --git a/modular_nova/master_files/code/modules/jobs/job_types/spawner/freighter_crew.dm b/modular_nova/master_files/code/modules/jobs/job_types/spawner/freighter_crew.dm
@@ -1,3 +1,4 @@
 /datum/job/freighter_crew
 	title = ROLE_FREIGHTER_CREW
 	policy_index = ROLE_FREIGHTER_CREW
+	paycheck = PAYCHECK_ZERO
diff --git a/modular_nova/master_files/code/modules/jobs/job_types/spawner/ghostcafe.dm b/modular_nova/master_files/code/modules/jobs/job_types/spawner/ghostcafe.dm
@@ -1,3 +1,4 @@
 /datum/job/ghostcafe
 	title = ROLE_GHOST_CAFE
 	policy_index = ROLE_GHOST_CAFE
+	paycheck = PAYCHECK_ZERO
diff --git a/modular_nova/master_files/code/modules/jobs/job_types/spawner/interdyne_planetary_base.dm b/modular_nova/master_files/code/modules/jobs/job_types/spawner/interdyne_planetary_base.dm
@@ -1,7 +1,9 @@
 /datum/job/interdyne_planetary_base
 	title = ROLE_INTERDYNE_PLANETARY_BASE
 	policy_index = ROLE_INTERDYNE_PLANETARY_BASE
+	paycheck = PAYCHECK_ZERO
 
 /datum/job/interdyne_planetary_base_icebox
 	title = ROLE_INTERDYNE_PLANETARY_BASE_ICEBOX
 	policy_index = ROLE_INTERDYNE_PLANETARY_BASE_ICEBOX
+	paycheck = PAYCHECK_ZERO
diff --git a/modular_nova/master_files/code/modules/jobs/job_types/spawner/tarkon.dm b/modular_nova/master_files/code/modules/jobs/job_types/spawner/tarkon.dm
@@ -1,3 +1,4 @@
 /datum/job/tarkon
 	title = ROLE_PORT_TARKON
 	policy_index = ROLE_PORT_TARKON
+	paycheck = PAYCHECK_ZERO
diff --git a/modular_nova/modules/mapping/code/areas/shuttles.dm b/modular_nova/modules/mapping/code/areas/shuttles.dm
@@ -8,8 +8,8 @@
 	suffix = "nova"
 	name = "Prison Transporter NSS-74"
 
-/area/shuttle/blackmarket_chevvy
-	name = "Blackmarket Chevvy"
+/area/shuttle/blackmarket_burst
+	name = "Blackmarket Burst"
 
 /area/shuttle/interdyne_cargo
 	name = "Interdyne Cargo Shuttle"

diff --git a/modular_nova/modules/mapping/code/areas/space.dm b/modular_nova/modules/mapping/code/areas/space.dm
@@ -1,14 +1,5 @@
 // Nova Sector space area defines - Mostly for ruins
 
-///Cybersun, Forgotten Ship
-/area/ruin/space/has_grav/cybersun
-	name = "Cybersun"
-	icon_state = "spacecontent1"
-
-/area/ruin/space/has_grav/cybersun/atmospherics
-	name = "Abandoned Atmospherics Wing"
-	icon_state = "atmos"
-
 ///Generic Nova Sector Ruins
 
 /area/ruin/space/has_grav/powered/nova/smugglies
@@ -20,7 +11,7 @@
 /area/ruin/space/has_grav/powered/nova/luna
 	name = "Unexplored Location"
 
-/area/ruin/space/has_grav/powered/nova/blackmarket
+/area/ruin/space/has_grav/nova/blackmarket
 	name = "Shady Market"
 
 /area/ruin/space/has_grav/powered/nova/alien_tool_lab
@@ -29,93 +20,6 @@
 /area/ruin/space/has_grav/powered/nova/scrapheap
 	name = "Scrap Heap"
 
-///Syndicate Deep Space Two
-/area/ruin/space/has_grav/nova/des_two
-	name = "DS-2" //If DS-1 is so great...
-	icon = 'icons/area/areas_centcom.dmi'
-	icon_state = "syndie-ship"
-
-//Cargo
-/area/ruin/space/has_grav/nova/des_two/cargo
-	name = "DS-2 Warehouse"
-
-/area/ruin/space/has_grav/nova/des_two/cargo/hangar
-	name = "DS-2 Hangar"
-
-//Bridge
-/area/ruin/space/has_grav/nova/des_two/bridge
-	name = "DS-2 Bridge"
-	icon_state = "syndie-control"
-
-/area/ruin/space/has_grav/nova/des_two/bridge/cl
-	name = "DS-2 Corporate Liaison's Office"
-	sound_environment = SOUND_AREA_WOODFLOOR
-
-/area/ruin/space/has_grav/nova/des_two/bridge/admiral
-	name = "DS-2 Station Admiral's Office"
-	sound_environment = SOUND_AREA_WOODFLOOR
-
-/area/ruin/space/has_grav/nova/des_two/bridge/vault
-	name = "DS-2 Vault"
-
-/area/ruin/space/has_grav/nova/des_two/bridge/eva
-	name = "DS-2 E.V.A."
-
-//Security
-/area/ruin/space/has_grav/nova/des_two/security
-	name = "DS-2 Security"
-	ambience_index = AMBIENCE_DANGER
-
-/area/ruin/space/has_grav/nova/des_two/security/armory
-	name = "DS-2 Armory"
-
-/area/ruin/space/has_grav/nova/des_two/security/lawyer
-	name = "DS-2 Interrogation Office"
-
-/area/ruin/space/has_grav/nova/des_two/security/prison
-	name = "DS-2 Long-Term Brig"
-
-//Service
-/area/ruin/space/has_grav/nova/des_two/service
-	name = "DS-2 Service Wing"
-
-/area/ruin/space/has_grav/nova/des_two/service/diner
-	name = "DS-2 Diner"
-
-/area/ruin/space/has_grav/nova/des_two/service/dorms
-	name = "DS-2 Dormitories"
-
-/area/ruin/space/has_grav/nova/des_two/service/dorms/fitness
-	name = "DS-2 Fitness Room"
-
-/area/ruin/space/has_grav/nova/des_two/service/lounge
-	name = "DS-2 Lounge"
-
-/area/ruin/space/has_grav/nova/des_two/service/hydroponics
-	name = "DS-2 Hydroponics"
-
-//Hallways
-/area/ruin/space/has_grav/nova/des_two/halls
-	name = "DS-2 Central Halls"
-
-//Engineering
-/area/ruin/space/has_grav/nova/des_two/engineering
-	name = "DS-2 Engineering"
-
-//Research
-/area/ruin/space/has_grav/nova/des_two/research
-	name = "DS-2 Research"
-
-/area/ruin/space/has_grav/nova/des_two/research/robotics
-	name = "DS-2 Robotics Bay"
-
-//Medbay
-/area/ruin/space/has_grav/nova/des_two/medbay
-	name = "DS-2 Medical Bay"
-
-/area/ruin/space/has_grav/nova/des_two/medbay/chem
-	name = "DS-2 Chemistry"
-
 /area/ruin/space/has_grav/shuttle8532engineering
 	name = "Shuttle 8532 Engine Room"
 
@@ -239,7 +143,98 @@
 	has_gravity = STANDARD_GRAVITY
 	outdoors = TRUE
 
-// Cargodise Lost Freighter
+/**
+ * DS2 Syndie Areas
+ */
+/area/ruin/space/has_grav/nova/des_two
+	name = "DS-2" //If DS-1 is so great...
+	icon = 'icons/area/areas_centcom.dmi'
+	icon_state = "syndie-ship"
+
+//Cargo
+/area/ruin/space/has_grav/nova/des_two/cargo
+	name = "DS-2 Warehouse"
+
+/area/ruin/space/has_grav/nova/des_two/cargo/hangar
+	name = "DS-2 Hangar"
+
+//Bridge
+/area/ruin/space/has_grav/nova/des_two/bridge
+	name = "DS-2 Bridge"
+	icon_state = "syndie-control"
+
+/area/ruin/space/has_grav/nova/des_two/bridge/cl
+	name = "DS-2 Corporate Liaison's Office"
+	sound_environment = SOUND_AREA_WOODFLOOR
+
+/area/ruin/space/has_grav/nova/des_two/bridge/admiral
+	name = "DS-2 Station Admiral's Office"
+	sound_environment = SOUND_AREA_WOODFLOOR
+
+/area/ruin/space/has_grav/nova/des_two/bridge/vault
+	name = "DS-2 Vault"
+
+/area/ruin/space/has_grav/nova/des_two/bridge/eva
+	name = "DS-2 E.V.A."
+
+//Security
+/area/ruin/space/has_grav/nova/des_two/security
+	name = "DS-2 Security"
+	ambience_index = AMBIENCE_DANGER
+
+/area/ruin/space/has_grav/nova/des_two/security/armory
+	name = "DS-2 Armory"
+
+/area/ruin/space/has_grav/nova/des_two/security/lawyer
+	name = "DS-2 Interrogation Office"
+
+/area/ruin/space/has_grav/nova/des_two/security/prison
+	name = "DS-2 Long-Term Brig"
+
+//Service
+/area/ruin/space/has_grav/nova/des_two/service
+	name = "DS-2 Service Wing"
+
+/area/ruin/space/has_grav/nova/des_two/service/diner
+	name = "DS-2 Diner"
+
+/area/ruin/space/has_grav/nova/des_two/service/dorms
+	name = "DS-2 Dormitories"
+
+/area/ruin/space/has_grav/nova/des_two/service/dorms/fitness
+	name = "DS-2 Fitness Room"
+
+/area/ruin/space/has_grav/nova/des_two/service/lounge
+	name = "DS-2 Lounge"
+
+/area/ruin/space/has_grav/nova/des_two/service/hydroponics
+	name = "DS-2 Hydroponics"
+
+//Hallways
+/area/ruin/space/has_grav/nova/des_two/halls
+	name = "DS-2 Central Halls"
+
+//Engineering
+/area/ruin/space/has_grav/nova/des_two/engineering
+	name = "DS-2 Engineering"
+
+//Research
+/area/ruin/space/has_grav/nova/des_two/research
+	name = "DS-2 Research"
+
+/area/ruin/space/has_grav/nova/des_two/research/robotics
+	name = "DS-2 Robotics Bay"
+
+//Medbay
+/area/ruin/space/has_grav/nova/des_two/medbay
+	name = "DS-2 Medical Bay"
+
+/area/ruin/space/has_grav/nova/des_two/medbay/chem
+	name = "DS-2 Chemistry"
+
+/**
+ * Cargodise Lost Freighter defines
+ */
 
 /area/ruin/space/has_grav/cargodise_freighter/primaryhall
 	name = "Freighter Primary Hall"

diff --git a/modular_nova/modules/mapping/code/mob_spawns.dm b/modular_nova/modules/mapping/code/mob_spawns.dm
@@ -11,7 +11,7 @@
 	spawned_human.grant_language(/datum/language/common, source = LANGUAGE_SPAWNER)
 
 /obj/effect/mob_spawn/ghost_role/human/blackmarket
-	name = "cryogenics pod"
+	name = "Black Market Trader"
 	prompt_name = "a blackmarket dealer"
 	desc = "A humming cryo pod. The machine is attempting to wake up its occupant."
 	mob_name = "a black market dealer"
@@ -21,7 +21,7 @@
 	you_are_text = "You are a black market dealer, with shop set up in Nanotrasen Space."
 	flavour_text = "FTU, Independent.. whatever, whoever you are. It doesn't matter out here. \
 	You've set up shop in a slightly shady, yet functional little asteroid for your dealings. \
-	Explore space, find valuable artifacts and nice loot - and pawn it off to those stooges at NT. \
+	Explore space, setup shop and find valuable artifacts and nice loot - and pawn it off to those stooges at NT. \
 	Or perhaps more exotic customers are in local space...?"
 	important_text = "You are not an antagonist."
 	outfit = /datum/outfit/black_market
@@ -34,7 +34,7 @@
 	name = "Black Market Trader"
 	uniform = /obj/item/clothing/under/rank/cargo/tech
 	shoes = /obj/item/clothing/shoes/laceup
-	id = /obj/item/card/id/away/blackmarket
+	id = /obj/item/card/id/advanced/chameleon/black/blackmarket
 
 /datum/outfit/black_market/post_equip(mob/living/carbon/human/shady, visualsOnly)
 	handlebank(shady)
@@ -514,7 +514,7 @@
 	desc = "A perfectly generic identification card. Looks like it could use some flavor. This one looks like it belonged to someone important."
 	wildcard_slots = WILDCARD_LIMIT_SILVER
 
-/obj/item/card/id/away/blackmarket
+/obj/item/card/id/advanced/chameleon/black/blackmarket
 	name = "scuffed ID card"
 	desc = "A faded, scuffed, plastic ID card. You can make out the rank \"Deck Crewman\"."
 	trim = /datum/id_trim/away/blackmarket

diff --git a/modular_nova/modules/mapping/code/shuttles.dm b/modular_nova/modules/mapping/code/shuttles.dm
@@ -12,32 +12,33 @@
 	occupancy_limit = 45
 
 /*----- Black Market Shuttle Datum + related code -----*/
-/datum/map_template/shuttle/ruin/blackmarket_chevvy
+/datum/map_template/shuttle/ruin/blackmarket_burst
 	prefix = "_maps/shuttles/nova/"
-	suffix = "blackmarket_chevvy"
-	name = "Black Market Chevvy"
-
-/obj/machinery/computer/shuttle/caravan/blackmarket_chevvy
-	name = "Chevvy Shuttle Console"
-	desc = "Used to control the affectionately named 'Chevvy'."
-	circuit = /obj/item/circuitboard/computer/blackmarket_chevvy
-	shuttleId = "blackmarket_chevvy"
-	possible_destinations = "blackmarket_chevvy_custom;blackmarket_chevvy_home;whiteship_home"
-
-/obj/machinery/computer/camera_advanced/shuttle_docker/blackmarket_chevvy
-	name = "Chevvy Navigation Computer"
-	desc = "Used to designate a precise transit location for the affectionately named 'Chevvy'."
-	shuttleId = "blackmarket_chevvy"
+	suffix = "blackmarket_burst"
+	description = "A small cargo jump freighter, popular among smugglers who enjoy both the cargo space and speed"
+	name = "Black Market Burst"
+
+/obj/machinery/computer/shuttle/caravan/blackmarket_burst
+	name = "Burst Shuttle Console"
+	desc = "Used to control the affectionately named 'Burst'."
+	circuit = /obj/item/circuitboard/computer/blackmarket_burst
+	shuttleId = "blackmarket_burst"
+	possible_destinations = "blackmarket_burst_custom;blackmarket_burst_home;whiteship_home"
+
+/obj/machinery/computer/camera_advanced/shuttle_docker/blackmarket_burst
+	name = "Burst Navigation Computer"
+	desc = "Used to designate a precise transit location for the affectionately named 'Burst'."
+	shuttleId = "blackmarket_burst"
 	lock_override = NONE
-	shuttlePortId = "blackmarket_chevvy_custom"
-	jump_to_ports = list("blackmarket_chevvy_home" = 1, "whiteship_home" = 1)
+	shuttlePortId = "blackmarket_burst_custom"
+	jump_to_ports = list("blackmarket_burst_home" = 1, "whiteship_home" = 1)
 	view_range = 0
 	x_offset = 2
 	y_offset = 0
 
-/obj/item/circuitboard/computer/blackmarket_chevvy
-	name = "Chevvy Control Console (Computer Board)"
-	build_path = /obj/machinery/computer/shuttle/caravan/blackmarket_chevvy
+/obj/item/circuitboard/computer/blackmarket_burst
+	name = "Burst Control Console (Computer Board)"
+	build_path = /obj/machinery/computer/shuttle/caravan/blackmarket_burst
 /*----- End of Black Market Shuttle Code -----*/
 
 /*Interdyne Cargo Shuttle*/