cleanup p1

code/controllers/subsystem/overmap.dm

@@ -413,6 +413,7 @@ SUBSYSTEM_DEF(overmap)
 
 /datum/overmap_star_system/ngr
 	name = "Gorlex Controlled - Ecbatana"
+	starname = "Ecbatana"
 
 	//main colors, used for dockable terrestrials, and background
 	primary_color = "#d9ad82"
@@ -446,12 +447,15 @@ SUBSYSTEM_DEF(overmap)
 	override_object_colors = TRUE
 	overmap_icon_state = "overmap_dark"
 
+//default shiptest overmap
 /datum/overmap_star_system/shiptest
 	has_outpost = TRUE
 	can_be_selected_randomly = FALSE
+	size = 30
 
 /datum/overmap_star_system/shiptest/New(generate_now=TRUE)
-	if(!prob(100))
+	//1/20 rounds
+	if(!prob(5))
 		return ..()
 
 	//Small easter egg so all these palletes doesn't go to waste in the event mines

code/datums/mapgen/planetary/moon_generator.dm

@@ -253,8 +253,8 @@
 	desc = "Supposedly poisonous to humanoids."
 	baseturfs = /turf/open/floor/plating/asteroid/moon_coarse/dark
 	icon = 'icons/turf/planetary/moon.dmi'
-	icon_state = "moonsand"
-	base_icon_state = "moonsand"
+	icon_state = "sand"
+	base_icon_state = "sand"
 	footstep = FOOTSTEP_SAND
 	barefootstep = FOOTSTEP_SAND
 	clawfootstep = FOOTSTEP_SAND
@@ -266,14 +266,19 @@
 	smoothing_groups = list(SMOOTH_GROUP_TURF_OPEN, SMOOTH_GROUP_FLOOR_ASH)
 	canSmoothWith = list(SMOOTH_GROUP_CLOSED_TURFS, SMOOTH_GROUP_FLOOR_ASH)
 
-	floor_variance = 0
-	max_icon_states = 0
+	floor_variance = 89
+	max_icon_states = 9
 
 	has_footsteps = TRUE
 	footstep_icon_state = "moon"
 
 	smooth_icon = 'icons/turf/floors/moonsand.dmi'
 
+/turf/open/floor/plating/asteroid/moon/Initialize(mapload, inherited_virtual_z)
+	. = ..()
+	if(prob(floor_variance))
+		add_overlay("sandalt_[rand(1,max_icon_states)]")
+
 /turf/open/floor/plating/asteroid/sand/Initialize(mapload, inherited_virtual_z)
 	. = ..()
 	if(smoothing_flags)

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

@@ -61,12 +61,20 @@
 	has_footsteps = TRUE
 	footstep_icon_state = "shrouded"
 
+	floor_variance = 83
+	max_icon_states = 5
+
 	layer = SAND_TURF_LAYER
 	smoothing_flags = SMOOTH_BITMASK
 	smoothing_groups = list(SMOOTH_GROUP_TURF_OPEN, SMOOTH_GROUP_FLOOR_ASH)
 	canSmoothWith = list(SMOOTH_GROUP_CLOSED_TURFS, SMOOTH_GROUP_FLOOR_ASH)
 
 
+/turf/open/floor/plating/asteroid/purple/Initialize(mapload, inherited_virtual_z)
+	. = ..()
+	if(prob(floor_variance))
+		add_overlay("sandalt_[rand(1,max_icon_states)]")
+
 /turf/open/floor/plating/asteroid/purple/lit
 	light_range = 2
 	light_power = 0.3

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

@@ -6,8 +6,8 @@
 	icon_state = "sand-255"
 	base_icon_state = "sand"
 
-	floor_variance = 20
-	max_icon_states = 8
+	floor_variance = 83
+	max_icon_states = 5
 	slowdown = 1.5
 	planetary_atmos = TRUE
 	initial_gas_mix = SHROUDED_DEFAULT_ATMOS
@@ -22,3 +22,8 @@
 	smoothing_groups = list(SMOOTH_GROUP_TURF_OPEN, SMOOTH_GROUP_FLOOR_ASH)
 	canSmoothWith = list(SMOOTH_GROUP_CLOSED_TURFS, SMOOTH_GROUP_FLOOR_ASH)
 	smooth_icon = 'icons/turf/floors/shroudedsand.dmi'
+
+/turf/open/floor/plating/asteroid/shrouded/Initialize(mapload, inherited_virtual_z)
+	. = ..()
+	if(prob(floor_variance))
+		add_overlay("sandalt_[rand(1,max_icon_states)]")

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

@@ -13,8 +13,8 @@
 	clawfootstep = FOOTSTEP_SAND
 	layer = SAND_TURF_LAYER
 	digResult = /obj/item/stack/ore/glass/whitesands
-	max_icon_states = 0
-	floor_variance = 0
+	max_icon_states = 9
+	floor_variance = 40
 	slowdown = 1.5
 	smoothing_flags = SMOOTH_BITMASK
 	smoothing_groups = list(SMOOTH_GROUP_TURF_OPEN, SMOOTH_GROUP_FLOOR_ASH)
@@ -34,6 +34,8 @@
 		transform = translation
 		icon = smooth_icon
 		icon_plating = null
+	if(prob(floor_variance))
+		add_overlay("sandalt_[rand(1,max_icon_states)]")
 
 /turf/open/floor/plating/asteroid/whitesands/lit
 	light_range = 2

code/modules/cargo/packs.dm

@@ -1,36 +1,3 @@
-#define CARGOTYPE_FOOD "food"
-#define CARGOTYPE_CLOTHING "clothing"
-#define CARGOTYPE_ORES "ores"
-#define CARGOTYPE_METALS "metals"
-#define CARGOTYPE_HEAVYMETALS "heavy metals"
-#define CARGOTYPE_PLASTICS "plastics"
-#define CARGOTYPE_EQUIPMENT "heavy metals"
-#define CARGOTYPE_MILITARY_EQUIPMENT "military equipment"
-#define CARGOTYPE_MEDICAL "military equipment"
-#define CARGOTYPE_INDUSTRIAL "industrial"
-#define CARGOTYPE_ELECTRONICS "electronics"
-#define CARGOTYPE_CONSUMERGOODS "consumer goods"
-#define CARGOTYPE_LUXURYGOODS "luxury goods"
-#define CARGOTYPE_CIV_FIREARMS "civillian-grade firearms"
-#define CARGOTYPE_MILITARY_FIREARMS "military-grade firearms"
-#define CARGOTYPE_GARBAGE "garbage"
-#define CARGOTYPE_CONSTRUCTION "construction"
-#define CARGOTYPE_SHIP_PARTS "ship parts"
-#define CARGOTYPE_SHIP_ALLOYS "ship alloys"
-#define CARGOTYPE_FIRSTAID "ship alloys"
-
-#define CARGOTYPE_DRUGS "recreational drugs"
-#define CARGOTYPE_DRUGS_REGULATED "controlled substances"
-#define CARGOTYPE_DRUGS_NARCOTICS "narcotics"
-
-#define CARGOTYPE_ILLEGAL_CARGO "illegal"
-#define CARGOTYPE_VERY_ILLEGAL_CARGO "very illegal"
-
-
-/datum/cargo_type
-	var/name = "genric cargotype"
-	var/desc
-
 /datum/supply_pack
 	var/name = "Crate"
 	var/group = "UNCATEGORIZED BULLSHIT"

code/modules/overmap/objects/event_datum.dm

@@ -389,7 +389,7 @@
 					continue
 				light_to_mess.stop_flickering()
 
-			for(var/mob/affected_mob as anything in affected_mob)
+			for(var/mob/affected_mob as anything in affected_mobs)
 				if(!istype(affected_mob))
 					continue
 				var/datum/overmap/mobs_overmap = SSovermap.get_overmap_object_by_location(affected_mob)