Uueoa-Esa, Part 7 - The Wasteland

aurorastation.dme

@@ -4058,19 +4058,43 @@
 #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\new_gibson\gibson_mining.dm"
 #include "maps\random_ruins\exoplanets\new_gibson\gibson_resupply.dm"
 #include "maps\random_ruins\exoplanets\raskara\pra_exploration_drone.dm"

code/__DEFINES/access.dm

@@ -723,6 +723,11 @@
 	id = ACCESS_HOUSE_VOLVALAAD_SHIP
 	access_type = ACCESS_TYPE_CENTCOM
 
+#define ACCESS_OZEUOI 227
+/datum/access/moghes_wasteland_ozeuoi
+	id = ACCESS_OZEUOI
+	access_type = ACCESS_TYPE_CENTCOM
+
 //guest rooms - for any ship/event that requires hotel-esque rooms
 
 #define ACCESS_GUEST_ROOMS 230 //use with req_one_access

code/modules/heavy_vehicle/premade/miner.dm

@@ -22,3 +22,15 @@
 	dummy_colour = "#302e2b"
 	remote_network = REMOTE_PRISON_MECH
 	remote_type = /obj/item/remote_mecha/penal
+
+/mob/living/heavy_vehicle/premade/salvage
+	name = "salvage exosuit"
+	desc = "An exosuit of unknown design, with a closed cockpit and quadruped motivators."
+	e_head = /obj/item/mech_component/sensors/ripley
+	e_body = /obj/item/mech_component/chassis/combat
+	e_arms = /obj/item/mech_component/manipulators/ripley
+	e_legs = /obj/item/mech_component/propulsion/spider
+	e_color = "#b07f0c"
+
+	h_l_hand = /obj/item/mecha_equipment/clamp
+	h_r_hand = /obj/item/mecha_equipment/mounted_system/plasmacutter

code/modules/maps/planet_types/lore/uueoaesa.dm

@@ -158,7 +158,7 @@
 			possible_themes = list(/datum/exoplanet_theme/desert/wasteland) //nuked theme
 			surface_color = "#faeac5"
 			//Wasteland ruins
-			//ruin_type_whitelist = list(/datum/map_template/ruin/exoplanet/moghes_guwandi, /datum/map_template/ruin/exoplanet/moghes_gawgaryn_bikers, /datum/map_template/ruin/exoplanet/moghes_kataphract_wasteland, /datum/map_template/ruin/exoplanet/moghes_wasteland_dorviza, /datum/map_template/ruin/exoplanet/moghes_wasteland_ozeuoi, /datum/map_template/ruin/exoplanet/moghes_wasteland_vihnmes, /datum/map_template/ruin/exoplanet/moghes_wasteland_village, /datum/map_template/ruin/exoplanet/moghes_wasteland_izweski, /datum/map_template/ruin/exoplanet/moghes_siakh, /datum/map_template/ruin/exoplanet/moghes_queendom, /datum/map_template/ruin/exoplanet/moghes_wasteland_klax, /datum/map_template/ruin/exoplanet/moghes_wasteland_reclaimer, /datum/map_template/ruin/exoplanet/moghes_wasteland_mikuetz, /datum/map_template/ruin/exoplanet/moghes_wasteland_crater, /datum/map_template/ruin/exoplanet/moghes_wasteland_oasis, /datum/map_template/ruin/exoplanet/moghes_wasteland_battlefield, /datum/map_template/ruin/exoplanet/moghes_ruined_base, /datum/map_template/ruin/exoplanet/moghes_wasteland_tomb, /datum/map_template/ruin/exoplanet/moghes_wasteland_bomb, /datum/map_template/ruin/exoplanet/moghes_wasteland_crash, /datum/map_template/ruin/exoplanet/moghes_wasteland_priests, /datum/map_template/ruin/exoplanet/moghes_dead_guwandi, /datum/map_template/ruin/exoplanet/moghes_gawgaryn_riders, /datum/map_template/ruin/exoplanet/moghes_wasteland_tyrant)
+			ruin_type_whitelist = list(/datum/map_template/ruin/exoplanet/moghes_guwandi, /datum/map_template/ruin/exoplanet/moghes_gawgaryn_bikers, /datum/map_template/ruin/exoplanet/moghes_kataphract_wasteland, /datum/map_template/ruin/exoplanet/moghes_wasteland_dorviza, /datum/map_template/ruin/exoplanet/moghes_wasteland_ozeuoi, /datum/map_template/ruin/exoplanet/moghes_wasteland_vihnmes, /datum/map_template/ruin/exoplanet/moghes_wasteland_village, /datum/map_template/ruin/exoplanet/moghes_wasteland_izweski, /datum/map_template/ruin/exoplanet/moghes_siakh, /datum/map_template/ruin/exoplanet/moghes_queendom, /datum/map_template/ruin/exoplanet/moghes_wasteland_klax, /datum/map_template/ruin/exoplanet/moghes_wasteland_reclaimer, /datum/map_template/ruin/exoplanet/moghes_wasteland_mikuetz, /datum/map_template/ruin/exoplanet/moghes_wasteland_crater, /datum/map_template/ruin/exoplanet/moghes_wasteland_oasis, /datum/map_template/ruin/exoplanet/moghes_wasteland_battlefield, /datum/map_template/ruin/exoplanet/moghes_ruined_base, /datum/map_template/ruin/exoplanet/moghes_wasteland_tomb, /datum/map_template/ruin/exoplanet/moghes_wasteland_bomb, /datum/map_template/ruin/exoplanet/moghes_wasteland_crash, /datum/map_template/ruin/exoplanet/moghes_wasteland_priests, /datum/map_template/ruin/exoplanet/moghes_dead_guwandi, /datum/map_template/ruin/exoplanet/moghes_gawgaryn_riders, /datum/map_template/ruin/exoplanet/moghes_wasteland_tyrant)
 
 	desc += " The landing sites are located in the [landing_region]."
 

code/modules/overmap/exoplanets/decor/objs/pit.dm

@@ -141,13 +141,18 @@
 /obj/structure/pit/closed/grave
 	name = "grave"
 	icon_state = "pit0"
+	///Will this grave generate a marker?
+	var/marker = TRUE
+	///What species should this grave's marker be for?
+	var/species = SPECIES_HUMAN
 
 /obj/structure/pit/closed/grave/Initialize()
 	var/obj/structure/closet/crate/coffin/C = new(src.loc)
 	var/obj/effect/decal/remains/human/bones = new(C)
 	bones.layer = LYING_MOB_LAYER
-	var/obj/structure/gravemarker/random/R = new(src.loc)
-	R.generate()
+	if(marker)
+		var/obj/structure/gravemarker/random/R = new(src.loc)
+		R.generate(species)
 	. = ..()
 
 /obj/structure/gravemarker
@@ -171,11 +176,9 @@
 	generate()
 	. = ..()
 
-/obj/structure/gravemarker/random/proc/generate()
+/obj/structure/gravemarker/random/proc/generate(var/species)
 	icon_state = pick("wood","cross")
-
-
-	var/nam = random_name(MALE, SPECIES_HUMAN)
+	var/nam = random_name(pick(MALE,FEMALE), species)
 	message = "Here lies [nam]."
 
 /obj/structure/gravemarker/attackby(obj/item/attacking_item, mob/user)

code/modules/vehicles/bike.dm

@@ -527,3 +527,9 @@
 /obj/vehicle/bike/motor/moped/blue
 	icon_state = "bluemoped_on"
 	bike_icon = "bluemoped"
+
+/obj/vehicle/bike/motor/sand
+	name = "sandbike"
+	desc = "A specialised bike, designed for travelling on sand. Often used by Unathi of the Wasteland."
+	icon_state = "sport_on" //replace when we have a unique sprite
+	bike_icon = "sport"

html/changelogs/RustingWithYou - moghes_wasteland.yml

@@ -0,0 +1,58 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#     - (fixes bugs)
+#   wip
+#     - (work in progress)
+#   qol
+#     - (quality of life)
+#   soundadd
+#     - (adds a sound)
+#   sounddel
+#     - (removes a sound)
+#   rscadd
+#     - (adds a feature)
+#   rscdel
+#     - (removes a feature)
+#   imageadd
+#     - (adds an image or sprite)
+#   imagedel
+#     - (removes an image or sprite)
+#   spellcheck
+#     - (fixes spelling or grammar)
+#   experiment
+#     - (experimental change)
+#   balance
+#     - (balance changes)
+#   code_imp
+#     - (misc internal code change)
+#   refactor
+#     - (refactors code)
+#   config
+#     - (makes a change to the config files)
+#   admin
+#     - (makes changes to administrator tools)
+#   server
+#     - (miscellaneous changes to server)
+#################################
+
+# Your name.
+author: RustingWithYou
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, this gets changed to [] after reading.  Just remove the brackets when you add new shit.
+# Please surround your changes in  double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - rscadd: "Adds several ruins for the Wasteland of Moghes."

maps/random_ruins/exoplanets/moghes/moghes_dead_guwandi.dm

@@ -0,0 +1,65 @@
+/datum/map_template/ruin/exoplanet/moghes_dead_guwandi
+	name = "Dead Guwandi"
+	id = "moghes_dead_guwandi"
+	description = "A Guwandi warrior, who found an honorable death"
+
+	template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED
+	sectors = list(SECTOR_UUEOAESA)
+	prefix = "moghes/"
+	suffixes = list("moghes_dead_guwandi.dmm")
+	unit_test_groups = list(2)
+
+/obj/effect/landmark/corpse/moghes_dead_guwandi
+	name = "Guwandi"
+	corpseuniform = /obj/item/clothing/under/unathi/zazali
+	corpsesuit = /obj/item/clothing/suit/unathi/robe/kilt
+	corpseshoes = /obj/item/clothing/shoes/sandals/caligae
+	corpsehelmet = /obj/item/clothing/accessory/sinta_hood
+	corpsebelt = /obj/item/material/sword/longsword
+
+/obj/effect/landmark/corpse/moghes_dead_guwandi/do_extra_customization(mob/living/carbon/human/M)
+	M.ChangeToHusk()
+	M.adjustBruteLoss(rand(200,400))
+	M.dir = pick(GLOB.cardinal)
+	if(M?.w_uniform)
+		M.w_uniform.color = "#181a19"
+	if(M?.wear_suit)
+		M.wear_suit.color = "#d4d3ab"
+	if(M?.head)
+		M.head.color = "#d4d3ab"
+
+
+/obj/item/paper/fluff/guwandi
+	name = "final words"
+	desc = "A scrap of paper, with a few words jotted down on it."
+	info = "A drum with no head,<BR>\
+	A blade with no hilt,<BR>\
+	A song with no voice,<BR>\
+	Still, it is mine."
+
+/obj/item/paper/fluff/guwandi/Initialize()
+	. = ..()
+	var/languagetext = "\[lang=p\]"
+	languagetext += "[info]\[/lang\]"
+	info = parsepencode(languagetext)
+	icon_state = "paper_words"
+
+/obj/effect/landmark/corpse/moghes_dead_raider
+	name = "Wasteland Raider"
+	corpseuniform = /obj/item/clothing/under/unathi
+	corpseshoes = /obj/item/clothing/shoes/sandals/caligae
+	corpsesuit = /obj/item/clothing/accessory/poncho/unathimantle
+
+/obj/effect/landmark/corpse/moghes_dead_raider/do_extra_customization(mob/living/carbon/human/M)
+	M.ChangeToHusk()
+	M.adjustBruteLoss(rand(200,400))
+	M.dir = pick(GLOB.cardinal)
+	var/uniform_color = "[pick("#42330f", "#DBC684")]"
+	if(M?.w_uniform)
+		M.w_uniform.color = uniform_color
+	if(M?.wear_suit)
+		M.wear_suit.color = uniform_color
+	if(prob(10))
+		M.equip_to_slot_or_del(new /obj/random/civgun(M), slot_belt)
+	if(prob(5))
+		M.equip_to_slot_or_del(new /obj/random/civgun/rifle, slot_back)