By The Burning Mother's Light - The Uueoa-Esa Sector

aurorastation.dme

@@ -2367,6 +2367,7 @@
 #include "code\modules\maps\planet_types\lore\konyang.dm"
 #include "code\modules\maps\planet_types\lore\srandmarr.dm"
 #include "code\modules\maps\planet_types\lore\tauceti.dm"
+#include "code\modules\maps\planet_types\lore\uueoaesa.dm"
 #include "code\modules\martial_arts\gunkata.dm"
 #include "code\modules\martial_arts\martial.dm"
 #include "code\modules\martial_arts\plasma_fist.dm"
@@ -2958,11 +2959,13 @@
 #include "code\modules\overmap\exoplanets\decor\turfs\carpet.dm"
 #include "code\modules\overmap\exoplanets\decor\turfs\concrete.dm"
 #include "code\modules\overmap\exoplanets\decor\turfs\crystal.dm"
+#include "code\modules\overmap\exoplanets\decor\turfs\diona.dm"
 #include "code\modules\overmap\exoplanets\decor\turfs\foundation.dm"
 #include "code\modules\overmap\exoplanets\decor\turfs\grass.dm"
 #include "code\modules\overmap\exoplanets\decor\turfs\ice.dm"
 #include "code\modules\overmap\exoplanets\decor\turfs\konyang.dm"
 #include "code\modules\overmap\exoplanets\decor\turfs\linoleum.dm"
+#include "code\modules\overmap\exoplanets\decor\turfs\marble.dm"
 #include "code\modules\overmap\exoplanets\decor\turfs\mineral.dm"
 #include "code\modules\overmap\exoplanets\decor\turfs\plating.dm"
 #include "code\modules\overmap\exoplanets\decor\turfs\sand.dm"
@@ -3744,6 +3747,13 @@
 #include "maps\away\away_site\tajara\scrapper\scrapper_landmarks.dm"
 #include "maps\away\away_site\tajara\taj_safehouse\tajara_safehouse.dm"
 #include "maps\away\away_site\tajara\taj_safehouse\tajara_safehouse_ghostroles.dm"
+#include "maps\away\away_site\uueoaesa\omgolo\omgolosmuggler.dm"
+#include "maps\away\away_site\uueoaesa\omgolo\omgolotourist.dm"
+#include "maps\away\away_site\uueoaesa\reclamation\ihss_reclamation.dm"
+#include "maps\away\away_site\uueoaesa\reclamation\ihss_reclamation_areas.dm"
+#include "maps\away\away_site\uueoaesa\tret\tret_industrial_complex.dm"
+#include "maps\away\away_site\uueoaesa\tret\tret_industrial_complex_areas.dm"
+#include "maps\away\away_site\uueoaesa\tret\tret_industrial_complex_ghostroles.dm"
 #include "maps\away\away_site\wrecked_nt_ship\wrecked_nt_ship.dm"
 #include "maps\away\ships\biesel\tcaf_corvette\tcaf_corvette.dm"
 #include "maps\away\ships\biesel\tcaf_corvette\tcaf_corvette_areas.dm"
@@ -3942,6 +3952,12 @@
 #include "maps\random_ruins\exoplanets\asteroid\old_outpost\old_outpost.dm"
 #include "maps\random_ruins\exoplanets\burzsia\burzsia_dead_ipc.dm"
 #include "maps\random_ruins\exoplanets\burzsia\burzsia_mining.dm"
+#include "maps\random_ruins\exoplanets\chanterel\heph_mining_station.dm"
+#include "maps\random_ruins\exoplanets\chanterel\heph_survey_post.dm"
+#include "maps\random_ruins\exoplanets\chanterel\izweski_probe.dm"
+#include "maps\random_ruins\exoplanets\chanterel\kazhkz_crash.dm"
+#include "maps\random_ruins\exoplanets\chanterel\miners_guild_outpost.dm"
+#include "maps\random_ruins\exoplanets\chanterel\sol_listening_post.dm"
 #include "maps\random_ruins\exoplanets\crashed_pod\crashed_pod.dm"
 #include "maps\random_ruins\exoplanets\delivery\delivery_site.dm"
 #include "maps\random_ruins\exoplanets\desert\desert.dm"
@@ -3978,6 +3994,62 @@
 #include "maps\random_ruins\exoplanets\konyang\abandoned\office.dm"
 #include "maps\random_ruins\exoplanets\konyang\abandoned\rural_clinic.dm"
 #include "maps\random_ruins\exoplanets\lava\lava.dm"
+#include "maps\random_ruins\exoplanets\moghes\moghes_bar.dm"
+#include "maps\random_ruins\exoplanets\moghes\moghes_dead_guwandi.dm"
+#include "maps\random_ruins\exoplanets\moghes\moghes_diona_traders.dm"
+#include "maps\random_ruins\exoplanets\moghes\moghes_fishing_spot.dm"
+#include "maps\random_ruins\exoplanets\moghes\moghes_gawgaryn_bikers.dm"
+#include "maps\random_ruins\exoplanets\moghes\moghes_gawgaryn_riders.dm"
+#include "maps\random_ruins\exoplanets\moghes\moghes_guild_mining.dm"
+#include "maps\random_ruins\exoplanets\moghes\moghes_guwandi.dm"
+#include "maps\random_ruins\exoplanets\moghes\moghes_hegemony_base.dm"
+#include "maps\random_ruins\exoplanets\moghes\moghes_heph_mining.dm"
+#include "maps\random_ruins\exoplanets\moghes\moghes_kataphract_wasteland.dm"
+#include "maps\random_ruins\exoplanets\moghes\moghes_kung_fu.dm"
+#include "maps\random_ruins\exoplanets\moghes\moghes_memorial.dm"
+#include "maps\random_ruins\exoplanets\moghes\moghes_otzek_herd.dm"
+#include "maps\random_ruins\exoplanets\moghes\moghes_ruined_base.dm"
+#include "maps\random_ruins\exoplanets\moghes\moghes_siakh.dm"
+#include "maps\random_ruins\exoplanets\moghes\moghes_skakh.dm"
+#include "maps\random_ruins\exoplanets\moghes\moghes_thakh.dm"
+#include "maps\random_ruins\exoplanets\moghes\moghes_threshbeast_herd.dm"
+#include "maps\random_ruins\exoplanets\moghes\moghes_untouched_tyrant.dm"
+#include "maps\random_ruins\exoplanets\moghes\moghes_untouched_village.dm"
+#include "maps\random_ruins\exoplanets\moghes\moghes_wasteland_battlefield.dm"
+#include "maps\random_ruins\exoplanets\moghes\moghes_wasteland_bomb.dm"
+#include "maps\random_ruins\exoplanets\moghes\moghes_wasteland_crash.dm"
+#include "maps\random_ruins\exoplanets\moghes\moghes_wasteland_crater.dm"
+#include "maps\random_ruins\exoplanets\moghes\moghes_wasteland_dorviza.dm"
+#include "maps\random_ruins\exoplanets\moghes\moghes_wasteland_izwesk.dm"
+#include "maps\random_ruins\exoplanets\moghes\moghes_wasteland_klax.dm"
+#include "maps\random_ruins\exoplanets\moghes\moghes_wasteland_mikuetz.dm"
+#include "maps\random_ruins\exoplanets\moghes\moghes_wasteland_oasis.dm"
+#include "maps\random_ruins\exoplanets\moghes\moghes_wasteland_ozeuoi.dm"
+#include "maps\random_ruins\exoplanets\moghes\moghes_wasteland_priests.dm"
+#include "maps\random_ruins\exoplanets\moghes\moghes_wasteland_queendom.dm"
+#include "maps\random_ruins\exoplanets\moghes\moghes_wasteland_reclaimer.dm"
+#include "maps\random_ruins\exoplanets\moghes\moghes_wasteland_tomb.dm"
+#include "maps\random_ruins\exoplanets\moghes\moghes_wasteland_tyrant.dm"
+#include "maps\random_ruins\exoplanets\moghes\moghes_wasteland_vihnmes.dm"
+#include "maps\random_ruins\exoplanets\moghes\moghes_wasteland_village.dm"
+#include "maps\random_ruins\exoplanets\ouerea\ouerea_autakh.dm"
+#include "maps\random_ruins\exoplanets\ouerea\ouerea_bar.dm"
+#include "maps\random_ruins\exoplanets\ouerea\ouerea_battlefield.dm"
+#include "maps\random_ruins\exoplanets\ouerea\ouerea_farm.dm"
+#include "maps\random_ruins\exoplanets\ouerea\ouerea_fishing_spot.dm"
+#include "maps\random_ruins\exoplanets\ouerea\ouerea_freewater.dm"
+#include "maps\random_ruins\exoplanets\ouerea\ouerea_guild_mining.dm"
+#include "maps\random_ruins\exoplanets\ouerea\ouerea_hegemony_base.dm"
+#include "maps\random_ruins\exoplanets\ouerea\ouerea_heph_mining.dm"
+#include "maps\random_ruins\exoplanets\ouerea\ouerea_nt_ruin.dm"
+#include "maps\random_ruins\exoplanets\ouerea\ouerea_otzek_herd.dm"
+#include "maps\random_ruins\exoplanets\ouerea\ouerea_rev_memorial.dm"
+#include "maps\random_ruins\exoplanets\ouerea\ouerea_skrell_base.dm"
+#include "maps\random_ruins\exoplanets\ouerea\ouerea_sol_base.dm"
+#include "maps\random_ruins\exoplanets\ouerea\ouerea_threshbeast_herd.dm"
+#include "maps\random_ruins\exoplanets\ouerea\ouerea_village.dm"
+#include "maps\random_ruins\exoplanets\pid\pid_crashed_shuttle.dm"
+#include "maps\random_ruins\exoplanets\pid\pid_kois_farm.dm"
 #include "maps\random_ruins\exoplanets\raskara\pra_exploration_drone.dm"
 #include "maps\random_ruins\exoplanets\raskara\raskara_okon.dm"
 #include "maps\random_ruins\exoplanets\raskara\raskara_ritual.dm"

code/datums/outfits/ert/kataphract.dm

@@ -102,7 +102,7 @@
 
 	backpack_contents = list(
 		/obj/item/handcuffs/ziptie = 2,
-		/obj/item/shield/energy/hegemony = 1,
+		/obj/item/shield/energy/hegemony/kataphract = 1,
 		/obj/item/storage/box/donkpockets = 1,
 		/obj/item/crowbar = 1,
 		/obj/item/storage/firstaid/adv = 1,

code/game/ambience.dm

@@ -214,3 +214,21 @@
 #define AMBIENCE_KONYANG_WATER list(\
 	'sound/ambience/konyang/konyang-water.ogg'\
 	)
+
+#define AMBIENCE_DESERT list(\
+	'sound/effects/wind/desert0.ogg',\
+	'sound/effects/wind/desert1.ogg',\
+	'sound/effects/wind/desert2.ogg',\
+	'sound/effects/wind/desert3.ogg',\
+	'sound/effects/wind/desert4.ogg',\
+	'sound/effects/wind/desert5.ogg'\
+	)
+
+#define AMBIENCE_JUNGLE list(\
+	'sound/effects/wind/wind_2_1.ogg',\
+	'sound/effects/wind/wind_2_2.ogg',\
+	'sound/effects/wind/wind_3_1.ogg',\
+	'sound/effects/wind/wind_4_1.ogg',\
+	'sound/ambience/eeriejungle2.ogg',\
+	'sound/ambience/eeriejungle1.ogg'\
+)

code/game/objects/items/weapons/material/misc.dm

@@ -179,3 +179,19 @@
 	throw_speed = 2
 	throw_range = 3
 	w_class = ITEMSIZE_SMALL
+
+/obj/item/material/scythe/sickle/warsickle
+	name = "war sickle"
+	desc = "A short and wickedly curved blade, this sickle was often used as a melee weapon by ancient Unathi civilisation."
+	icon = 'icons/obj/unathi_ruins.dmi'
+	icon_state = "warsickle"
+	item_state = "warsickle"
+	contained_sprite = TRUE
+	slot_flags = SLOT_BELT
+	force_divisor = 0.7 // 42 when wielded with hardnes 60 (steel)
+	thrown_force_divisor = 0.5 // 10 when thrown with weight 20 (steel)
+	applies_material_colour = FALSE
+
+/obj/item/material/scythe/sickle/warsickle/bronze/Initialize(newloc, material_key)
+	. = ..(newloc, MATERIAL_BRONZE)
+

code/game/objects/items/weapons/material/twohanded.dm

@@ -670,3 +670,15 @@
 	reach = 2
 	attack_verb = list("attacked", "poked", "jabbed", "torn", "gored")
 	armor_penetration = wielded_ap
+
+/obj/item/material/twohanded/pike/halberd/warscythe
+	name = "war scythe"
+	desc = "An ancient Unathi weapon, this heavy polearm was frequently wielded by cavalry forces of pre-Hegemony kingdoms."
+	icon = 'icons/obj/unathi_ruins.dmi'
+	icon_state = "warspike0"
+	base_icon = "warspike"
+	contained_sprite = TRUE
+	applies_material_colour = FALSE
+
+/obj/item/material/twohanded/pike/halberd/warscythe/bronze/Initialize(newloc, material_key)
+	. = ..(newloc, MATERIAL_BRONZE)

code/game/objects/structures/crates_lockers/closets/gimmick.dm

@@ -134,3 +134,67 @@
 	canbemoved = FALSE
 	open_sound = 'sound/machines/wooden_closet_open.ogg'
 	close_sound = 'sound/machines/wooden_closet_close.ogg'
+
+/obj/structure/closet/sarcophagus
+	name = "sandstone sarcophagus"
+	desc = "An ancient sarcophagus made of sandstone."
+	icon_state = "sarcophagus-base"
+	dense_when_open = TRUE
+	open_sound = 'sound/effects/stonedoor_openclose.ogg'
+	close_sound = 'sound/effects/stonedoor_openclose.ogg'
+	layer = 2.98
+	var/lid_icon = "sarcophagus-lid"
+	var/trapped = FALSE
+	var/triggered = FALSE
+
+/obj/structure/closet/sarcophagus/update_icon()
+	if(!opened)
+		layer = OBJ_LAYER
+		add_overlay(lid_icon)
+
+	else
+		layer = BELOW_OBJ_LAYER
+		cut_overlays()
+
+/obj/structure/closet/sarcophagus/animate_door(var/closing = FALSE)
+	return
+
+/obj/structure/closet/sarcophagus/attack_hand(mob/user as mob)
+	..()
+	if(ishuman(user))
+		var/mob/living/carbon/human/H = user
+		if(trapped && !triggered)
+			do_trap_effect(H)
+
+/obj/structure/closet/sarcophagus/proc/do_trap_effect(var/mob/living/carbon/human/H)
+	if(triggered)
+		return
+	var/trap = pick("arrow", "fire", "poison")
+	switch(trap)
+		if("arrow")
+			var/turf/T = get_turf(src)
+			var/obj/item/arrow/arrow = new(T)
+			playsound(usr.loc, 'sound/weapons/crossbow.ogg', 75, 1)
+			arrow.throw_at(H, 10, 9, src) //same values as a full draw crossbow shot would have
+
+		if("fire")
+			visible_message(SPAN_DANGER("Flames engulf \the [H]!"))
+			H.adjustFireLoss(30)
+			H.IgniteMob(5)
+
+		if("poison")
+			var/datum/reagents/R = new/datum/reagents(20)
+			R.my_atom = src
+			R.add_reagent(/singleton/reagent/toxin,20)
+			var/datum/effect/effect/system/smoke_spread/chem/S = new /datum/effect/effect/system/smoke_spread/chem(/singleton/reagent/toxin) // have to explicitly say the type to avoid issues with warnings
+			S.show_log = 0
+			S.set_up(R, 10, 0, src, 40)
+			S.start()
+			qdel(R)
+
+	triggered = TRUE
+
+/obj/structure/closet/sarcophagus/random/Initialize() //low chance of being trapped
+	. = ..()
+	if(prob(10))
+		trapped = TRUE

code/game/objects/structures/survey_probe.dm

@@ -127,10 +127,12 @@
 		"
 
 		// print the report
-		playsound(get_turf(src), 'sound/machines/dotprinter.ogg', 30, 1)
-		new/obj/item/paper/(get_turf(src), report_contents, report_name)
+		printout(report_contents, report_name)
 
 		// fin
 		timer_id = null
 		icon_state = "surveying_probe_deployed"
 
+/obj/structure/survey_probe/proc/printout(var/report_contents, var/report_name) //For variants printing in non-TCB languages
+	playsound(get_turf(src), 'sound/machines/dotprinter.ogg', 30, 1)
+	new/obj/item/paper/(get_turf(src), report_contents, report_name)

code/game/turfs/flooring/flooring_premade_.dm

@@ -277,6 +277,10 @@
 	broken_overlay = null
 	burned_overlay = null
 
+/turf/simulated/floor/tiled/slate/airless
+	name = "airless tiles"
+	initial_gas = null
+
 // ------------------------------- cargo
 
 /turf/simulated/floor/tiled/cargo

code/game/turfs/simulated/wall_types.dm

@@ -169,3 +169,8 @@
 	canSmoothWith = list(src.type)
 	. = ..(mapload, MATERIAL_CONCRETE)
 	canSmoothWith = list(src.type)
+
+/turf/simulated/wall/marble/Initialize(mapload)
+	canSmoothWith = list(src.type)
+	. = ..(mapload, MATERIAL_MARBLE)
+	canSmoothWith = list(src.type)

code/modules/asset_cache/asset_cache.dm

@@ -575,6 +575,8 @@ var/list/asset_datums = list()
 		"asteroid.png" = 'html/images/scans/exoplanets/asteroid.png',
 		"konyang.png" = 'html/images/scans/exoplanets/konyang.png',
 		"konyang_point_verdant.png" = 'html/images/scans/exoplanets/konyang_point_verdant.png',
+		"moghes.png" = 'html/images/scans/exoplanets/moghes.png',
+		"chanterel.png" = 'html/images/scans/exoplanets/chanterel.png',
 		//end scan images
 		"bluebird.woff" = 'html/fonts/OFL/Bluebird.woff',
 		"grandhotel.woff" = 'html/fonts/OFL/GrandHotel.woff',

code/modules/background/space_sectors/badlands.dm

@@ -109,7 +109,29 @@
 	name = SECTOR_UUEOAESA
 	description = "The home of the Unathi race, Uueoa-Esa is a solar system with 4 rocky planets and 1 gas giant. Moghes is the homeworld of the Unathi species and third from its mother star. \
 	It is similar in density and composition to Earth and held host to varied and complex environments and local fauna and flora. It's surface area of salt water is much lower than most other habitable planets. \
-	Moghes is currently experiencing immense environmental degradation following a global nuclear war in the 2430's."
-	starlight_color = COLOR_WHITE
-	starlight_power = 5
-	starlight_range = 1
+	Moghes is currently experiencing immense environmental degradation following a global nuclear war in the 2430s."
+	skybox_icon = "uueoaesa"
+	starlight_color = "#f8711e"
+	starlight_power = 2
+	starlight_range = 4
+	cargo_price_coef = list("nt" = 1.5, "hpi" = 0.5, "zhu" = 1.5, "een" = 1.5, "get" = 1.2, "arz" = 0.5, "blm" = 1.2, "iac" = 1.0, "zsc" = 0.9, "vfc" = 1.2, "bis" = 1.5, "xmg" = 0.6, "npi" = 1.5)
+	sector_welcome_message = 'sound/AI/welcome_hegemony.ogg'
+	scheduled_port_visits = list("Thursday", "Sunday")
+	ports_of_call = list("the city of Skalamar")
+
+	possible_exoplanets = list(
+		/obj/effect/overmap/visitable/sector/exoplanet/barren/omzoli,
+		/obj/effect/overmap/visitable/sector/exoplanet/barren/pid,
+		/obj/effect/overmap/visitable/sector/exoplanet/barren/asteroid/chanterel,
+		/obj/effect/overmap/visitable/sector/exoplanet/barren/asteroid/ytizi,
+		/obj/effect/overmap/visitable/sector/exoplanet/ouerea,
+		/obj/effect/overmap/visitable/sector/exoplanet/moghes
+
+	)
+
+	lore_radio_stations = list(
+		"72.4 Radio Free Ouerea" = "config/lore_radio/uueoaesa/72.4_Radio_Free_Ouerea.txt",
+		"83.3 Canyon City Radio" = "config/lore_radio/uueoaesa/83.3_Canyon_City_Radio.txt",
+		"132.6 SkaldFM" = "config/lore_radio/uueoaesa/132.6_Skald_FM.txt",
+		"166.8 Discontinued Emergency Broadcast" = "config/lore_radio/uueoaesa/166.8_Azarak_Emergency_Broadcast.txt"
+	)

code/modules/background/space_sectors/space_sector.dm

@@ -12,6 +12,8 @@
 	var/list/possible_exoplanets = list(/obj/effect/overmap/visitable/sector/exoplanet/snow, /obj/effect/overmap/visitable/sector/exoplanet/desert)
 	///Guaranteed planets to spawn. This ignores the map exoplanet limit, so don't put too many planets in here.
 	var/list/guaranteed_exoplanets = list()
+	///Banned exoplanets. These will be removed from the possible exoplanets list.
+	var/list/banned_exoplanets = list()
 	var/list/cargo_price_coef = list("nt" = 1, "hpi" = 1, "zhu" = 1, "een" = 1, "get" = 1, "arz" = 1, "blm" = 1,
 								"iac" = 1, "zsc" = 1, "vfc" = 1, "bis" = 1, "xmg" = 1, "npi" = 1) //how much the space sector afffects how expensive is ordering from that cargo supplier
 	var/skybox_icon = "ceti"

code/modules/clothing/clothing.dm

@@ -24,6 +24,9 @@
 
 	var/list/refittable_species //used with modkits, which species it can be refit to
 
+	///Species to refit the item for on initialize so that we can map in specific items for specific species easier. This should be set to the BODYTYPE of the species in question, not the species name or type itself.
+	var/refit_initialize = null
+
 	//material things
 	var/material/material = null
 	var/applies_material_color = TRUE
@@ -52,6 +55,10 @@
 			var/obj/item/clothing/accessory/tie = new T(src)
 			src.attach_accessory(null, tie)
 	update_icon()
+	if(refit_initialize)
+		if(contained_sprite)
+			refit_contained(refit_initialize)
+		refit_for_species(refit_initialize)
 
 /obj/item/clothing/Destroy()
 	STOP_PROCESSING(SSprocessing, src)

code/modules/clothing/gloves/xeno/unathi.dm

@@ -9,3 +9,22 @@
 	slot_flags = SLOT_GLOVES|SLOT_WRISTS
 	drop_sound = 'sound/items/drop/cloth.ogg'
 	pickup_sound = 'sound/items/pickup/cloth.ogg'
+
+/obj/item/clothing/gloves/unathi/ancient
+	name = "ancient bronze gauntlets"
+	desc = "A set of heavy bronze gauntlets, tarnished from centuries of age. They appear to be made to fit clawed hands."
+	icon = 'icons/obj/unathi_ruins.dmi'
+	icon_state = "ancient_gauntlets"
+	item_state = "ancient_gauntlets"
+	species_restricted = list(BODYTYPE_UNATHI)
+	contained_sprite = TRUE
+	armor = list( //not designed to hold up to bullets or lasers, but still better than nothing.
+		melee = ARMOR_MELEE_RESISTANT,
+		bullet = ARMOR_BALLISTIC_MINOR,
+		laser = ARMOR_LASER_SMALL
+	)
+	force = 5
+	punch_force = 5
+	drop_sound = 'sound/items/drop/sword.ogg'
+	pickup_sound = /singleton/sound_category/sword_pickup_sound
+	matter = list(MATERIAL_BRONZE = 1000)