Trade Post Remake troi

code/datums/ruins/wasteplanet.dm

@@ -32,9 +32,16 @@
 	suffix = "wasteplanet_abandoned_mechbay.dmm"
 	ruin_tags = list(RUIN_TAG_BOSS_COMBAT, RUIN_TAG_MEDIUM_LOOT, RUIN_TAG_SHELTER, RUIN_TAG_HAZARDOUS)
 
+/datum/map_template/ruin/wasteplanet/tradepost
+	name = "Ruined Tradepost"
+	description = "Formerly a functioning, if not thriving tradepost. Now a graveyard of Inteq soldiers and hivebots."
+	id = "wasteplanet_tradepost"
+	suffix = "wasteplanet_tradepost.dmm"
+
 /datum/map_template/ruin/wasteplanet/yard
 	name = "Abandoned Miskilamo salvage yard"
 	description = "An abandonded shipbreaking yard."
 	id = "wasteplanet_yard"
 	suffix = "wasteplanet_yard.dmm"
+
 	ruin_tags = list(RUIN_TAG_MEDIUM_COMBAT, RUIN_TAG_MEDIUM_LOOT, RUIN_TAG_SHELTER, RUIN_TAG_HAZARDOUS)

code/game/area/areas/ruins/wasteplanet.dm

@@ -44,6 +44,20 @@
 	name = "Abandoned Waste Containment Vault"
 	icon_state = "disposal"
 
+//Wasteplanet_Tradepost
+
+/area/ruin/wasteplanet/tradepost/barracks
+	name = "Abandoned Barracks"
+	icon_state = "red"
+
+/area/ruin/wasteplanet/tradepost/center
+	name = "Abandoned Dome"
+	icon_state = "bridge"
+
+/area/ruin/wasteplanet/tradepost/warehouse
+	name = "Abandoned Warehouse"
+	icon_state = "dk_yellow"
+
 //Abandonded shipbreaking yard
 
 /area/ruin/wasteplanet/wasteplanet_shipbreaking

code/game/objects/effects/spawners/lootdrop.dm

@@ -124,6 +124,7 @@
 /obj/effect/spawner/lootdrop/grille_or_trash
 	name = "maint grille or trash spawner"
 	loot = list(/obj/structure/grille = 5,
+			/obj/item/flashlight/flare/burnt = 1,
 			/obj/item/cigbutt = 1,
 			/obj/item/trash/cheesie = 1,
 			/obj/item/trash/candy = 1,
@@ -1016,6 +1017,7 @@
 	loot = list(
 		/obj/structure/grille/broken = 5,
 		/obj/structure/grille = 5,
+		/obj/item/flashlight/flare/burnt = 1,
 		/obj/item/cigbutt = 1,
 		/obj/item/trash/cheesie = 1,
 		/obj/item/trash/candy = 1,
@@ -1048,6 +1050,7 @@
 
 /obj/effect/spawner/lootdrop/waste/trash //debatable if this is actually loot
 	loot = list(
+		/obj/item/flashlight/flare/burnt = 30,
 		/obj/effect/decal/cleanable/greenglow/filled = 30,
 		/obj/effect/decal/cleanable/greenglow/ecto = 1,
 		/obj/effect/decal/cleanable/glass = 30,

code/game/objects/items/devices/flashlight.dm

@@ -259,13 +259,13 @@
 
 /obj/item/flashlight/flare
 	name = "flare"
-	desc = "A red Nanotrasen issued flare. There are instructions on the side, it reads 'pull cord, make light'."
+	desc = "A generic red flare. There are instructions on the side, it reads 'pull cord, make light'."
 	w_class = WEIGHT_CLASS_SMALL
 	light_range = 7 // Pretty bright.
 	icon_state = "flare"
 	item_state = "flare"
 	actions_types = list()
-	var/fuel = 0
+	var/fuel = 900
 	var/on_damage = 7
 	var/produce_heat = 1500
 	heat = 1000
@@ -275,9 +275,14 @@
 	light_color = "#FA421A" //Cit lighting
 	light_power = 0.8 //Cit lighting
 
+/obj/item/flashlight/flare/burnt
+	desc = "A burnt out red flare."
+	icon_state = "flare-empty"
+	fuel = 0
+	grind_results = list(/datum/reagent/sulfur = 2)
+
 /obj/item/flashlight/flare/Initialize()
 	. = ..()
-	fuel = rand(800, 1000) // Sorry for changing this so much but I keep under-estimating how long X number of ticks last in seconds.
 
 /obj/item/flashlight/flare/process()
 	open_flame(heat)

code/game/turfs/open/floor/plating/wasteplanet.dm

@@ -32,31 +32,56 @@
 	desc = "Corrupted steel."
 	icon_state = "plating_rust"
 
-/turf/open/floor/wood/waste
-	initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
-	planetary_atmos = TRUE
-
 /turf/open/indestructible/hierophant/waste
 	initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
 	planetary_atmos = TRUE
+	light_color = LIGHT_COLOR_FLARE
 
 /turf/open/indestructible/hierophant/two/waste
 	initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
 	planetary_atmos = TRUE
 	light_color = LIGHT_COLOR_FLARE
 
-/turf/open/water/waste
+/turf/open/floor/wood/waste
 	initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
 	planetary_atmos = TRUE
 
-/turf/open/floor/plating/grass/wasteplanet
-	icon_state = "junglegrass"
+///Cement Turfs
+
+/turf/open/floor/concrete/wasteplanet
 	initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
 	planetary_atmos = TRUE
+	baseturfs = /turf/open/floor/plating/asteroid/wasteplanet
 
-/turf/open/floor/plating/dirt/old/waste
+/turf/open/floor/concrete/wasteplanet/Initialize()
+	. = ..()
+	icon_state = pick(list(
+		"conc_smooth",
+		"conc_slab_1",
+		"conc_slab_2",
+		"conc_slab_3",
+		"conc_slab_4",
+		"conc_tiles"
+	))
+
+/turf/open/floor/concrete/wasteplanet/MakeSlippery(wet_setting, min_wet_time, wet_time_to_add, max_wet_time, permanent)
+	return
+
+/turf/open/floor/concrete/reinforced/wasteplanet
 	initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
 	planetary_atmos = TRUE
+	baseturfs = /turf/open/floor/plating/asteroid/wasteplanet
+
+/turf/open/floor/concrete/reinforced/wasteplanet/MakeSlippery(wet_setting, min_wet_time, wet_time_to_add, max_wet_time, permanent)
+	return
+
+/turf/open/floor/concrete/pavement/wasteplanet
+	initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
+	planetary_atmos = TRUE
+	baseturfs = /turf/open/floor/plating/asteroid/wasteplanet
+
+/turf/open/floor/concrete/pavement/wasteplanet/MakeSlippery(wet_setting, min_wet_time, wet_time_to_add, max_wet_time, permanent)
+	return
 
 /turf/open/floor/plasteel/wasteplanet
 	initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
@@ -128,11 +153,33 @@
 	light_power = 0.2
 	light_color = LIGHT_COLOR_FLARE
 
-/turf/open/water/waste/lit //do not drink
+/turf/open/floor/concrete/wasteplanet/lit
 	light_range = 2
 	light_power = 0.2
 	light_color = LIGHT_COLOR_FLARE
 
+/turf/open/floor/concrete/reinforced/wasteplanet/lit
+	light_range = 2
+	light_power = 0.2
+	light_color = LIGHT_COLOR_FLARE
+
+/turf/open/floor/concrete/pavement/wasteplanet/lit
+	light_range = 2
+	light_power = 0.2
+	light_color = LIGHT_COLOR_FLARE
+
+///Biological Turfs
+
+/turf/open/floor/plating/grass/wasteplanet
+	icon_state = "junglegrass"
+	initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
+	planetary_atmos = TRUE
+
+/turf/open/floor/plating/dirt/old/waste
+	initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS
+	planetary_atmos = TRUE
+	baseturfs = /turf/open/floor/plating/asteroid/wasteplanet
+
 /turf/open/floor/plating/dirt/old/waste/lit
 	light_range = 2
 	light_power = 0.2
@@ -143,6 +190,13 @@
 	light_power = 0.2
 	light_color = LIGHT_COLOR_FLARE
 
+/turf/open/water/waste/lit //do not drink
+	light_range = 2
+	light_power = 0.2
+	light_color = LIGHT_COLOR_FLARE
+
+//cement
+
 /turf/open/floor/concrete/wasteplanet/lit
 	light_range = 2
 	light_power = 0.2

code/modules/mining/equipment/marker_beacons.dm

@@ -32,6 +32,12 @@ GLOBAL_LIST_INIT(marker_beacon_colors, sortList(list(
 /obj/item/stack/marker_beacon/thirty //and they're bought in stacks of 1, 10, or 30
 	amount = 30
 
+/obj/item/stack/marker_beacon/ten
+	amount = 10
+
+/obj/item/stack/marker_beacon/thirty
+	amount = 30
+
 /obj/item/stack/marker_beacon/Initialize(mapload)
 	. = ..()
 	update_appearance()

code/modules/mob/living/simple_animal/corpse.dm

@@ -270,6 +270,38 @@
 	outfit = /datum/outfit/job/solgov/sonnensoldner
 	id_access_list = list(ACCESS_SOLGOV)
 
+//inteq
+
+/obj/effect/mob_spawn/human/corpse/inteq
+	name = "Avery Inteq"
+
+/obj/effect/mob_spawn/human/corpse/inteq/recruit
+	name = "IRMG Recruit"
+	id_job = "Recruit"
+	outfit = /datum/outfit/job/inteq/assistant
+
+/obj/effect/mob_spawn/human/corpse/inteq/medic
+	name = "IRMG Corpsman"
+	id_job = "Corpsman"
+	outfit = /datum/outfit/job/inteq/paramedic
+
+/obj/effect/mob_spawn/human/corpse/inteq/enforcer
+	name = "IRMG Enforcer"
+	id_job = "Enforcer"
+	outfit = /datum/outfit/job/inteq/security
+
+/obj/effect/mob_spawn/human/corpse/inteq/vanguard
+	name = "IRMG Vanguard"
+	id_job = "Vanguard"
+	outfit = /datum/outfit/job/inteq/captain
+
+/obj/effect/mob_spawn/human/corpse/inteq/artificer
+	name = "IRMG Artificer"
+	id_job = "Artificer"
+	outfit = /datum/outfit/job/inteq/engineer
+
+/* SRM */
+
 /obj/effect/mob_spawn/human/corpse/srm/hunter
 	name = "SRM Hunter"
 	id_job = "Hunter"

code/modules/ruins/wasteplanet_ruin_code/tradepost.dm

@@ -0,0 +1,61 @@
+/obj/item/tape/random/preset/tradepost/one
+	ruined = 1
+	used_capacity = 120
+
+/obj/item/tape/random/preset/tradepost/one/Initialize()
+	. = ..()
+	storedinfo = list(
+		"\[00:00\] Recording started.",
+		"\[00:06\] [span_name("firm elzousa")] drawls \"Now I figure that... give or take a few months a' tradin out here, I'll 'ave enough money t' pay you boys forra 'nother year.\"",
+		"\[00:14\] [span_name("muffled rachnid woman")] declares \"Caelum. If you don't have payment rendered soon we this contract is called.\"",
+		"\[00:23\] [span_name("firm elzousa")] drawls \"I know. I know. I gotcha few more weeks of pay annif I don' make any trades, then 's done.\"",
+		"\[00:32\] [span_name("firm elzousa")] drawls \"Don'tcha wave those things at me.\"",
+		"\[00:37\] [span_name("muffled rachnid woman")] declares \"You have two weeks. My enforcers are reporting that the area is drawing the attention of scrapbots.\"",
+		"\[00:46\] [span_name("muffled rachnid woman")] declares \"If we don't have the money to buy more ammo, I don't need to tell you what'll happen.\"",
+		"\[00:50\] [span_name("firm elzousa")] lets out a sigh.",
+		"\[00:53\] [span_name("firm elzousa")] drawls \" Cour ma'am. Cour. \"",
+	)
+	timestamp = list(
+		0,
+		6,
+		14,
+		23,
+		32,
+		37,
+		46,
+		50,
+		53
+	)
+
+/obj/effect/mob_spawn/human/corpse/inteq/medic/tradepost
+	mob_name = "Jenny Amasatsu"
+	brute_damage = 140
+	burn_damage = 78
+	mob_gender = FEMALE
+	outfit = /datum/outfit/job/inteq/paramedic/tradepost
+
+/obj/effect/mob_spawn/human/corpse/inteq/vanguard/tradepost
+	outfit = /datum/outfit/job/inteq/captain/tradepost
+	mob_species = /datum/species/spider
+	gender = FEMALE
+
+/obj/effect/mob_spawn/human/corpse/indie/engineer
+	outfit = /datum/outfit/job/independent/engineer
+
+/obj/effect/mob_spawn/human/corpse/indie/manager
+	outfit = /datum/outfit/job/independent/captain/manager
+	mob_species = /datum/species/elzuose
+	backpack_contents = null
+
+
+/datum/outfit/job/inteq/paramedic/tradepost
+	name = "Trade Post Corpsman"
+	belt = /obj/item/storage/belt/medical/webbing
+
+/datum/outfit/job/inteq/captain/tradepost
+	name = "Trade Post Vanguard"
+
+	r_pocket = null
+	l_pocket = null
+
+	backpack_contents = null

shiptest.dme

@@ -3274,6 +3274,7 @@
 #include "code\modules\ruins\objects_and_mobs\sin_ruins.dm"
 #include "code\modules\ruins\spaceruin_code\bigderelict1.dm"
 #include "code\modules\ruins\spaceruin_code\TheDerelict.dm"
+#include "code\modules\ruins\wasteplanet_ruin_code\tradepost.dm"
 #include "code\modules\screen_alerts\_screen_alerts.dm"
 #include "code\modules\security_levels\keycard_authentication.dm"
 #include "code\modules\security_levels\security_levels.dm"