Merge branch 'master' into uueoa_sites

aurorastation.dme

@@ -3802,6 +3802,7 @@
 #include "maps\away\away_site\tajara\mining_jack\mining_jack_landmarks.dm"
 #include "maps\away\away_site\tajara\peoples_station\peoples_station.dm"
 #include "maps\away\away_site\tajara\peoples_station\peoples_station_ghostroles.dm"
+#include "maps\away\away_site\tajara\peoples_station\peoples_station_landmarks.dm"
 #include "maps\away\away_site\tajara\peoples_station\peoples_station_zones.dm"
 #include "maps\away\away_site\tajara\pra_satellite\pra_satellite.dm"
 #include "maps\away\away_site\tajara\saniorios_outpost\saniorios_landmarks.dm"
@@ -3924,12 +3925,13 @@
 #include "maps\away\ships\scc\scc_scout_ship_areas.dm"
 #include "maps\away\ships\scc\scc_scout_ship_ghostroles.dm"
 #include "maps\away\ships\scc\scc_scout_ship_landmarks.dm"
-#include "maps\away\ships\sol_merc\fsf_patrol_ship.dm"
-#include "maps\away\ships\sol_merc\fsf_patrol_ship_ghostroles.dm"
-#include "maps\away\ships\sol_pirate\sfa_patrol_ship.dm"
-#include "maps\away\ships\sol_pirate\sfa_patrol_ship_ghostroles.dm"
-#include "maps\away\ships\sol_ssmd\ssmd_ship.dm"
-#include "maps\away\ships\sol_ssmd\ssmd_ship_ghostroles.dm"
+#include "maps\away\ships\sol\sol_merc\fsf_patrol_ship.dm"
+#include "maps\away\ships\sol\sol_merc\fsf_patrol_ship_areas.dm"
+#include "maps\away\ships\sol\sol_merc\fsf_patrol_ship_ghostroles.dm"
+#include "maps\away\ships\sol\sol_pirate\sfa_patrol_ship.dm"
+#include "maps\away\ships\sol\sol_pirate\sfa_patrol_ship_ghostroles.dm"
+#include "maps\away\ships\sol\sol_ssmd\ssmd_ship.dm"
+#include "maps\away\ships\sol\sol_ssmd\ssmd_ship_ghostroles.dm"
 #include "maps\away\ships\tajara\circus\adhomian_circus.dm"
 #include "maps\away\ships\tajara\circus\adhomian_circus_areas.dm"
 #include "maps\away\ships\tajara\circus\adhomian_circus_items.dm"
@@ -4066,19 +4068,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/game/jobs/faction/idris.dm

@@ -196,11 +196,11 @@
 	name = "Tech Support - Idris"
 	jobtype = /datum/job/librarian
 
-	l_pocket = /obj/item/modular_computer/handheld/preset
+	l_pocket = /obj/item/modular_computer/handheld/preset/generic
 	r_pocket = /obj/item/card/tech_support
 	r_hand = /obj/item/storage/bag/circuits/basic
-	l_hand = /obj/item/modular_computer/laptop/preset
-	gloves = /obj/item/modular_computer/handheld/wristbound/preset/advanced/civilian
+	l_hand = /obj/item/device/debugger
+	wrist = /obj/item/modular_computer/handheld/wristbound/preset/advanced/civilian
 
 /obj/outfit/job/chaplain/idris
 	name = "Chaplain - Idris"

code/game/jobs/faction/orion_express.dm

@@ -173,11 +173,11 @@
 	name = "Tech Support - Orion Express"
 	jobtype = /datum/job/librarian
 
-	l_pocket = /obj/item/modular_computer/handheld/preset
+	l_pocket = /obj/item/modular_computer/handheld/preset/generic
 	r_pocket = /obj/item/card/tech_support
 	r_hand = /obj/item/storage/bag/circuits/basic
-	l_hand = /obj/item/modular_computer/laptop/preset
-	gloves = /obj/item/modular_computer/handheld/wristbound/preset/advanced/civilian
+	l_hand = /obj/item/device/debugger
+	wrist = /obj/item/modular_computer/handheld/wristbound/preset/advanced/civilian
 
 /obj/outfit/job/journalist/orion
 	name = "Corporate Reporter - Orion Express"

code/game/jobs/job/civilian.dm

@@ -246,11 +246,11 @@
 	jobtype = /datum/job/librarian
 
 	uniform = /obj/item/clothing/under/suit_jacket/charcoal
-	l_pocket = /obj/item/modular_computer/handheld/preset
+	l_pocket = /obj/item/modular_computer/handheld/preset/generic
 	r_pocket = /obj/item/card/tech_support
 	r_hand = /obj/item/storage/bag/circuits/basic
-	l_hand = /obj/item/modular_computer/laptop/preset
-	gloves = /obj/item/modular_computer/handheld/wristbound/preset/advanced/civilian
+	l_hand = /obj/item/device/debugger
+	wrist = /obj/item/modular_computer/handheld/wristbound/preset/advanced/civilian
 
 /obj/outfit/job/librarian/tech_support/equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 	if(visualsOnly)

code/game/machinery/body_scanner.dm

@@ -318,7 +318,7 @@
 	switch(action)
 		// shouldn't be reachable if occupant is invalid
 		if("print")
-			var/obj/item/paper/medscan/R = new /obj/item/paper/medscan(src, format_occupant_data(connected.get_occupant_data()), "Scan ([connected.occupant])", connected.occupant)
+			var/obj/item/paper/medscan/R = new /obj/item/paper/medscan(src, format_occupant_data(connected.get_occupant_data()), "Scan ([connected.occupant]) ([worldtime2text()])", connected.occupant)
 			print(R, message = "\The [src] beeps, printing \the [R] after a moment.", user = usr)
 
 		if("eject")

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

@@ -721,7 +721,7 @@ BREATH ANALYZER
 		add_fingerprint(user)
 
 /obj/item/device/advanced_healthanalyzer/proc/print_scan(var/mob/M, var/mob/living/user)
-	var/obj/item/paper/medscan/R = new /obj/item/paper/medscan(src, connected.format_occupant_data(get_occupant_data(M)), "Scan ([M.name])", M)
+	var/obj/item/paper/medscan/R = new /obj/item/paper/medscan(src, connected.format_occupant_data(get_occupant_data(M)), "Scan ([M.name]) ([worldtime2text()])", M)
 	connected.print(R, message = "\The [src] beeps, printing \the [R] after a moment.", user = user)
 
 /obj/item/device/advanced_healthanalyzer/proc/get_occupant_data(var/mob/living/carbon/human/H)

code/game/objects/items/weapons/traps.dm

@@ -785,7 +785,7 @@
 			if(isvaurca(L) && prob(50))
 				return
 
-			organ.germ_level += INFECTION_LEVEL_THREE
+			organ.germ_level += INFECTION_LEVEL_TWO
 
 /obj/item/trap/punji/proc/reveal_message(mob/living/victim)
 	if(!message)

code/game/objects/structures/stool_bed_chair_nest/bed.dm

@@ -570,6 +570,7 @@
 	desc = "A collapsed roller bed that can be carried around."
 	icon = 'icons/obj/rollerbed.dmi'
 	icon_state = "standard_folded"
+	base_icon = "standard"
 	item_state = "rbed"
 	contained_sprite = TRUE
 	drop_sound = 'sound/items/drop/axe.ogg'
@@ -582,6 +583,7 @@
 	name = "medical hoverbed"
 	desc = "A collapsed hoverbed that can be carried around."
 	icon_state = "hover_folded"
+	base_icon = "hover"
 	item_state = "rbed_hover"
 	origin_type = /obj/structure/bed/roller/hover
 
@@ -633,3 +635,85 @@
 	R.add_fingerprint(user)
 	qdel(held)
 	held = null
+
+/**
+ * # Roller Rack
+ *
+ * A rack structure that can hold up to four roller bed items (Or subtypes i.e. Hoverbeds), stored in the `held` list.
+ *
+ * The `initial_beds` variable controls the number of beds the rack will spawn with.
+*/
+/obj/structure/roller_rack
+	name = "roller bed rack"
+	desc = "A rack for holding collapsed roller beds."
+	icon = 'icons/obj/rollerbed.dmi'
+	icon_state = "holder"
+
+	/**
+	 * List of held roller bed items.
+	 */
+	var/list/obj/item/roller/held = list()
+
+	/**
+	 * The number of beds the rack spawns with
+	 */
+	var/initial_beds = 4
+
+/obj/structure/roller_rack/Initialize()
+	. = ..()
+	for(var/_ in 1 to initial_beds)
+		var/obj/item/roller/RB = new /obj/item/roller(src)
+		held += RB
+	update_icon()
+
+/obj/structure/roller_rack/Destroy()
+	QDEL_LIST(held)
+	return ..()
+
+/obj/structure/roller_rack/update_icon()
+	. = ..()
+	ClearOverlays()
+	var/beds = 0
+	for(var/obj/item/roller/RB in held)
+		var/image/I = overlay_image(icon, "[icon_state]_bed_[RB.base_icon]")
+		I.pixel_x = (5 * beds)
+		beds++
+		AddOverlays(I)
+
+/obj/structure/roller_rack/examine(mob/user)
+	desc = "[initial(desc)] \nIt is holding [LAZYLEN(held)] beds."
+	. = ..()
+
+/obj/structure/roller_rack/attack_hand(mob/user)
+	if(!LAZYLEN(held))
+		to_chat(user, SPAN_NOTICE("The rack is empty."))
+		return
+
+	var/obj/item/roller/RB = held[LAZYLEN(held)]
+	user.put_in_hands(RB)
+	held -= RB
+	to_chat(user, SPAN_NOTICE("You retrieve \the [RB] from the rack."))
+	update_icon()
+
+/obj/structure/roller_rack/attackby(obj/item/attacking_item, mob/user)
+	if(iswrench(attacking_item))
+		anchored = !anchored
+		to_chat(user, SPAN_NOTICE("You [anchored ? "bolt" : "unbolt"] \the [src] [anchored ? "to" : "from"] the ground."))
+
+	if(istype(attacking_item, /obj/item/roller))
+		var/obj/item/roller/RB = attacking_item
+
+		if(LAZYLEN(held) >= 4)
+			to_chat(user, SPAN_NOTICE("The rack has no space for \the [RB]"))
+			return
+
+		user.drop_from_inventory(RB, src)
+		held += RB
+		to_chat(user, SPAN_NOTICE("You place \the [RB] on the rack."))
+		update_icon()
+
+/obj/structure/roller_rack/two
+	initial_beds = 2
+
+/obj/structure/roller_rack/three
+	initial_beds = 3

code/modules/cargo/random_stock/t1_common.dm

@@ -220,6 +220,7 @@ STOCK_ITEM_COMMON(gloves, 3.3)
 	exclusion += typesof(/obj/item/clothing/wrists/watch)
 	exclusion += typesof(/obj/item/clothing/gloves/fluff)
 	exclusion += typesof(/obj/item/clothing/gloves/ballistic)
+	exclusion += typesof(/obj/item/clothing/gloves/unathi/ancient)
 	allgloves -= exclusion
 
 	for (var/i in 1 to rand(1, 3))

code/modules/effects/map_effects/window_spawner.dm

@@ -242,6 +242,10 @@
 	icon_state = "full_rwindow_shuttle_merc"
 	frame_color = "#5B5B5B"
 
+/obj/effect/map_effect/window_spawner/full/shuttle/raider
+	icon_state = "full_rwindow_shuttle_merc"
+	frame_color = "#6C7364"
+
 //Coalition window frames
 /obj/effect/map_effect/window_spawner/full/shuttle/coalition
 	name = "coalition reinforced window spawner"

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/desert.dm

@@ -6,6 +6,7 @@
 	geology = "Non-existent tectonic activity, minimal geothermal signature"
 	weather = "Global full-atmosphere geothermal weather system. Barely-habitable ambient high temperatures. Slow-moving, stagnant meteorological activity prone to unpredictable upset in wind condition"
 	planetary_area = /area/exoplanet/desert
+	initial_weather_state = /singleton/state/weather/calm/desert_planet
 	rock_colors = list(COLOR_BEIGE, COLOR_PALE_YELLOW, COLOR_GRAY80, COLOR_BROWN)
 	plant_colors = list("#efdd6f","#7b4a12","#e49135","#ba6222","#5c755e","#420d22")
 	possible_themes = list(/datum/exoplanet_theme/desert)

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

@@ -133,6 +133,7 @@
 	features_budget = 8
 	flora_diversity = 0
 	has_trees = FALSE
+	initial_weather_state = /singleton/state/weather/calm/jungle_planet
 	small_flora_types = list(/datum/seed/xuizi, /datum/seed/gukhe, /datum/seed/sarezhi, /datum/seed/flower/serkiflower, /datum/seed/sthberry)
 	surface_color = "#e8faff"
 	generated_name = FALSE
@@ -152,13 +153,53 @@
 			possible_themes = list(/datum/exoplanet_theme/grass/moghes) //non-nuked theme
 			surface_color = "#164a14"
 			//Untouched Lands ruins
-			ruin_type_whitelist = list(/datum/map_template/ruin/exoplanet/moghes_village, /datum/map_template/ruin/exoplanet/moghes_heph_mining, /datum/map_template/ruin/exoplanet/moghes_bar, /datum/map_template/ruin/exoplanet/moghes_hegemony_base, /datum/map_template/ruin/exoplanet/moghes_skakh, /datum/map_template/ruin/exoplanet/moghes_thakh, /datum/map_template/ruin/exoplanet/moghes_kung_fu, /datum/map_template/ruin/exoplanet/moghes_fishing_spot, /datum/map_template/ruin/exoplanet/moghes_memorial, /datum/map_template/ruin/exoplanet/moghes_guild_mining, /datum/map_template/ruin/exoplanet/moghes_threshbeast_herd, /datum/map_template/ruin/exoplanet/moghes_diona_traders, /datum/map_template/ruin/exoplanet/moghes_untouched_tyrant)
+			ruin_type_whitelist = list(
+			/datum/map_template/ruin/exoplanet/moghes_village,
+			/datum/map_template/ruin/exoplanet/moghes_heph_mining,
+			/datum/map_template/ruin/exoplanet/moghes_bar,
+			/datum/map_template/ruin/exoplanet/moghes_hegemony_base,
+			/datum/map_template/ruin/exoplanet/moghes_skakh,
+			/datum/map_template/ruin/exoplanet/moghes_thakh,
+			/datum/map_template/ruin/exoplanet/moghes_kung_fu,
+			/datum/map_template/ruin/exoplanet/moghes_fishing_spot,
+			/datum/map_template/ruin/exoplanet/moghes_memorial,
+			/datum/map_template/ruin/exoplanet/moghes_guild_mining,
+			/datum/map_template/ruin/exoplanet/moghes_threshbeast_herd,
+			/datum/map_template/ruin/exoplanet/moghes_diona_traders,
+			/datum/map_template/ruin/exoplanet/moghes_untouched_tyrant
+		)
 
 		if("Wasteland")
 			possible_themes = list(/datum/exoplanet_theme/desert/wasteland) //nuked theme
 			surface_color = "#faeac5"
+			set_weather(/singleton/state/weather/calm/desert_planet)
 			//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)