much better

code/__DEFINES/footsteps.dm

@@ -24,7 +24,6 @@
 #define FOOTSTEP_MOB_SHOE 4
 #define FOOTSTEP_MOB_HUMAN 5 //Warning: Only works on /mob/living/carbon/human
 #define FOOTSTEP_MOB_SLIME 6
-#define FOOTSTEP_MOB_MECHA 7
 
 /*
 

code/datums/components/footstep.dm

@@ -33,8 +33,6 @@
 			footstep_sounds = GLOB.footstep
 		if(FOOTSTEP_MOB_SLIME)
 			footstep_sounds = 'sound/effects/footstep/slime1.ogg'
-		if(FOOTSTEP_MOB_MECHA)
-			footstep_sounds = 'sound/mecha/mechstep.ogg'
 	RegisterSignal(parent, list(COMSIG_MOVABLE_MOVED), .proc/play_simplestep) //Note that this doesn't get called for humans.
 
 ///Prepares a footstep. Determines if it should get played. Returns the turf it should get played on. Note that it is always a /turf/open

code/datums/mapgen/Cavegens/RockplanetCaves.dm

@@ -6,43 +6,49 @@
 	closed_turf_types =  list(/turf/closed/mineral/random/asteroid/rockplanet = 45,
 							/turf/closed/wall/rust = 10,)
 
-	mob_spawn_chance = 3
-	flora_spawn_chance = 6
+	mob_spawn_chance = 2
+	flora_spawn_chance = 5
 
 	mob_spawn_list = list(
 		//'regular' fauna, not too difficult
-		/mob/living/simple_animal/hostile/netherworld/asteroid = 50,
-		/mob/living/simple_animal/hostile/asteroid/fugu/asteroid = 50,
-		/mob/living/simple_animal/hostile/netherworld/migo/asteroid = 40, //mariuce
+		/mob/living/simple_animal/hostile/netherworld/asteroid = 60,
+		/mob/living/simple_animal/hostile/asteroid/fugu/asteroid = 60,
+		/mob/living/simple_animal/hostile/netherworld/migo/asteroid = 50, //mariuce
 		//crystal mobs, very difficult
 		/mob/living/simple_animal/hostile/asteroid/goliath/beast/ancient/crystal = 1,
 		/mob/living/simple_animal/hostile/asteroid/basilisk/watcher/forgotten = 1,
 		/mob/living/simple_animal/hostile/asteroid/hivelord/legion/crystal = 1,
 		//bots, are hostile
-		/mob/living/simple_animal/bot/medbot/rockplanet = 15,
 		/mob/living/simple_animal/bot/firebot/rockplanet = 15,
-		/mob/living/simple_animal/bot/secbot/ed209/rockplanet = 5,
+		/mob/living/simple_animal/bot/secbot/ed209/rockplanet = 3,
 		/mob/living/simple_animal/hostile/abandoned_minebot = 15,
 		/mob/living/simple_animal/bot/floorbot/rockplanet = 15)
 
-	flora_spawn_list = list(/obj/structure/mecha_wreckage/ripley = 5,
-		/obj/structure/mecha_wreckage/ripley/firefighter = 3,
-		/obj/structure/mecha_wreckage/ripley/mkii = 3,
+	flora_spawn_list = list(
+		/obj/structure/mecha_wreckage/ripley = 15,
+		/obj/structure/mecha_wreckage/ripley/firefighter = 9,
+		/obj/structure/mecha_wreckage/ripley/mkii = 9,
+		/obj/structure/girder = 90,
 		/obj/structure/reagent_dispensers/fueltank = 30,
-		/obj/structure/girder = 30,
-		/obj/item/stack/ore/slag = 10,
-		/obj/item/stack/rods = 10,
-		/obj/item/shard = 10,
-		/obj/item/stack/cable_coil/cut = 10,
-		/obj/effect/spawner/lootdrop/maintenance = 30,
-		/obj/effect/decal/cleanable/greenglow = 20,
-		/obj/structure/closet/crate/secure/loot = 1,
-		/obj/machinery/portable_atmospherics/canister/toxins = 1,
-		/obj/machinery/portable_atmospherics/canister/miasma = 1,
-		/obj/machinery/portable_atmospherics/canister/carbon_dioxide = 1,
-		/obj/structure/radioactive = 2,
-		/obj/structure/radioactive/stack = 2,
-		/obj/structure/radioactive/waste = 2)
+		/obj/item/stack/cable_coil/cut = 30,
+		/obj/effect/decal/cleanable/greenglow = 60,
+		/obj/effect/decal/cleanable/glass = 30,
+		/obj/structure/closet/crate/secure/loot = 3,
+		/obj/machinery/portable_atmospherics/canister/toxins = 3,
+		/obj/machinery/portable_atmospherics/canister/miasma = 3,
+		/obj/machinery/portable_atmospherics/canister/carbon_dioxide = 3,
+		/obj/structure/radioactive = 6,
+		/obj/structure/radioactive/stack = 6,
+		/obj/structure/radioactive/waste = 6,
+
+		/obj/structure/salvageable/machine = 20,
+		/obj/structure/salvageable/autolathe = 15,
+		/obj/structure/salvageable/computer = 10,
+		/obj/structure/salvageable/protolathe = 10,
+		/obj/structure/salvageable/circuit_imprinter = 8,
+		/obj/structure/salvageable/destructive_analyzer = 8,
+		/obj/structure/salvageable/server = 8)
+
 	feature_spawn_list = list(/obj/structure/geyser/random = 1, /obj/effect/mine/shrapnel/human_only = 1)
 
 	initial_closed_chance = 45

code/game/objects/items/stacks/sheets/glass.dm

@@ -40,6 +40,12 @@ GLOBAL_LIST_INIT(glass_recipes, list ( \
 /obj/item/stack/sheet/glass/two
 	amount = 2
 
+/obj/item/stack/sheet/glass/five
+	amount = 5
+
+/obj/item/stack/sheet/glass/twenty
+	amount = 20
+
 /obj/item/stack/sheet/glass/fifty
 	amount = 50
 

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -185,6 +185,9 @@ GLOBAL_LIST_INIT(plasteel_recipes, list ( \
 	. = ..()
 	. += GLOB.plasteel_recipes
 
+/obj/item/stack/sheet/plasteel/five
+	amount = 5
+
 /obj/item/stack/sheet/plasteel/twenty
 	amount = 20
 
@@ -696,6 +699,9 @@ GLOBAL_LIST_INIT(plastic_recipes, list(
 /obj/item/stack/sheet/plastic/fifty
 	amount = 50
 
+/obj/item/stack/sheet/plastic/twenty
+	amount = 20
+
 /obj/item/stack/sheet/plastic/five
 	amount = 5
 

code/game/objects/structures/salvaging.dm

@@ -14,6 +14,12 @@
 			new path (loc)
 	return
 
+/obj/structure/salvageable/attackby(obj/item/I, mob/living/user, params)
+	if((!(user.a_intent == INTENT_HELP)) && I.tool_behaviour == TOOL_CROWBAR)
+		return
+	else
+		return ..()
+
 /obj/structure/salvageable/crowbar_act(mob/living/user, obj/item/I)
 	. = ..()
 	user.visible_message(user,"<span class='notice'>[user] starts to salvage \the [src].</span>", \
@@ -82,7 +88,7 @@
 	name = "broken autolathe"
 	icon_state = "wreck_autolathe"
 	salvageable_parts = list(
-		/obj/item/stock_parts/console_screen = 80,
+		/obj/item/stack/sheet/glass/two = 80,
 		/obj/item/stack/cable_coil/cut = 80,
 		/obj/item/stack/ore/salvage/scraptitanium/five = 60,
 		/obj/item/stack/ore/salvage/scrapmetal/five = 60,
@@ -185,7 +191,7 @@
 		/obj/effect/spawner/lootdrop/salvage_manipulator = 30,
 
 		/obj/item/storage/toolbox/syndicate/empty = 80,
-		/obj/effect/spawner/lootdrop/destructive_anal_loot = 40,
+		/obj/effect/spawner/lootdrop/destructive_anal_loot = 60,
 
 		/obj/item/stack/sheet/metal/five = 15, //same as above but more geared towards stuff used by circuit imprinter
 		/obj/item/stack/sheet/glass/five = 15,
@@ -271,40 +277,40 @@
 		if(40 to 45)
 			playsound(src, 'sound/machines/buzz-two.ogg', 100, FALSE, FALSE)
 			src.audible_message("<span class='danger'>You hear a buzz from the [src] and a voice,</span>")
-			say("SECURITY BREACH DETECTED, SENDING BACKUP IMMEDIATELY, PRIORITY GREEN, SENDING IN THE MEDBOT.")
+			say("SECURITY BREACH DETECTED, SENDING IN THE MEDBOT.")
 			src.visible_message("<span class=danger>A strange target appears on the ground.</span>")
 
-			var/obj/structure/closet/supplypod/bluespacepod/pod = new()
+			var/obj/structure/closet/supplypod/bluespacepod/pod = new(get_turf(src))
 			new /mob/living/simple_animal/bot/medbot/rockplanet(pod)
 			pod.style = STYLE_STANDARD
 			pod.explosionSize = list(0,0,0,0)
 
 		if(26 to 40)
 			playsound(src, 'sound/machines/buzz-two.ogg', 100, FALSE, FALSE)
 			src.audible_message("<span class='danger'>You hear a buzz from the [src] and a voice,</span>")
-			say("SECURITY BREACH DETECTED, SENDING BACKUP IMMEDIATELY, PRIORITY BLUE, SENDING IN THE FIREBOT.")
+			say("SECURITY BREACH DETECTED, SENDING IN THE FIREBOT.")
 			src.visible_message("<span class=danger>A strange target appears on the ground.</span>")
 
-			var/obj/structure/closet/supplypod/bluespacepod/pod = new()
+			var/obj/structure/closet/supplypod/bluespacepod/pod = new(get_turf(src))
 			new /mob/living/simple_animal/bot/firebot/rockplanet(pod)
 			pod.style = STYLE_STANDARD
 			pod.explosionSize = list(0,0,0,0)
 
 		if(1 to 25)
 			playsound(src, 'sound/machines/buzz-two.ogg', 100, FALSE, FALSE)
 			src.audible_message("<span class='danger'>You hear as buzz from the [src] and a voice,</span>")
-			say("SECURITY BREACH DETECTED, SENDING BACKUP IMMEDIATELY, PRIORITY RED, SENDING IN THE ED 209.")
+			say("SECURITY BREACH DETECTED, SENDING IN THE ED 209.")
 			src.visible_message("<span class=danger>A strange target appears on the ground.</span>")
 
-			var/obj/structure/closet/supplypod/bluespacepod/pod = new()
+			var/obj/structure/closet/supplypod/bluespacepod/pod = new(get_turf(src))
 			new /mob/living/simple_animal/bot/secbot/ed209/rockplanet(pod)
 			pod.style = STYLE_STANDARD
 			pod.explosionSize = list(0,0,0,0)
 /*
 		if(1 to 3)
 			playsound(src, 'sound/machines/warning-buzzer.ogg', 100, FALSE, FALSE)
 			src.audible_message("<span class='boldwarning'>You hear a loud buzzing from the [src] and a voice,</span>")
-			say("SECURITY BREACH DETECTED, SENDING BACKUP IMMEDIATELY, PRIORITY DELTA, SENDING IN THE LOBSTER.")
+			say("SECURITY BREACH DETECTED, SENDING BACKUP IMMEDIATELY, PRIORITY RED, SENDING IN THE LOBSTER.")
 			src.visible_message("<span class=danger>A strange target appears on the ground. It might be best to step back!</span>")
 
 			var/obj/structure/closet/supplypod/bluespacepod/pod = new()
@@ -422,43 +428,43 @@
 //GENERIC
 /obj/effect/spawner/lootdrop/salvage_capacitor
 	loot = list(
-			/obj/item/stock_parts/capacitor = 100,
+			/obj/item/stock_parts/capacitor = 150,
 			/obj/item/stock_parts/capacitor/adv = 20,
 			/obj/item/stock_parts/capacitor/super = 5
 		)
 
 /obj/effect/spawner/lootdrop/salvage_scanning
 	loot = list(
-			/obj/item/stock_parts/scanning_module = 100,
+			/obj/item/stock_parts/scanning_module = 150,
 			/obj/item/stock_parts/scanning_module/adv = 20,
 			/obj/item/stock_parts/scanning_module/phasic = 5
 		)
 
 /obj/effect/spawner/lootdrop/salvage_manipulator
 	loot = list(
-			/obj/item/stock_parts/manipulator = 100,
-			/obj/item/stock_parts/manipulator/adv = 20,
+			/obj/item/stock_parts/manipulator = 150,
+			/obj/item/stock_parts/manipulator/nano = 20,
 			/obj/item/stock_parts/manipulator/pico = 5
 		)
 
 /obj/effect/spawner/lootdrop/salvage_matter_bin
 	loot = list(
-			/obj/item/stock_parts/matter_bin = 100,
+			/obj/item/stock_parts/matter_bin = 150,
 			/obj/item/stock_parts/matter_bin/adv = 20,
 			/obj/item/stock_parts/matter_bin/super = 5
 		)
 
 /obj/effect/spawner/lootdrop/salvage_laser
 	loot = list(
-			/obj/item/stock_parts/micro_laser = 100,
-			/obj/item/stock_parts/micro_laser/adv = 20,
+			/obj/item/stock_parts/micro_laser = 150,
+			/obj/item/stock_parts/micro_laser/high = 20,
 			/obj/item/stock_parts/micro_laser/ultra = 5
 		)
 
 //PROTOLATHE
 /obj/effect/spawner/lootdrop/tool_engie_proto
 	loot = list(
-			/obj/effect/spawner/lootdrop/tool_engie_common = 100,
+			/obj/effect/spawner/lootdrop/tool_engie_common = 150,
 			/obj/effect/spawner/lootdrop/tool_engie_sydnie = 20,
 			/obj/effect/spawner/lootdrop/tool_engie_adv = 5
 		)
@@ -477,7 +483,7 @@
 	loot = list(
 			/obj/item/wrench/syndie = 1,
 			/obj/item/screwdriver/nuke = 1,
-			/obj/item/weldingtool/industrial = 1,
+			/obj/item/weldingtool/largetank = 1,
 			/obj/item/crowbar/syndie = 1,
 			/obj/item/wirecutters/syndie = 1,
 			/obj/item/multitool/syndie = 1
@@ -492,7 +498,7 @@
 
 /obj/effect/spawner/lootdrop/tool_surgery_proto
 	loot = list(
-			/obj/effect/spawner/lootdrop/tool_surgery_common = 100,
+			/obj/effect/spawner/lootdrop/tool_surgery_common = 150,
 			/obj/effect/spawner/lootdrop/tool_surgery_adv = 10,
 		)
 
@@ -631,3 +637,39 @@
 			/obj/item/circuitboard/computer/operating = 5,
 			/obj/item/circuitboard/computer/med_data = 5
 		)
+
+//DESTRUCTIVE ANAL
+/obj/effect/spawner/lootdrop/destructive_anal_loot //what do people usually put in these things anayways
+	loot = list(
+			/obj/item/storage/toolbox/syndicate/empty = 900,
+			/obj/item/gun/ballistic/automatic/pistol/no_mag = 600,
+			/obj/item/camera_bug = 600,
+			/obj/item/pen = 400,
+			/obj/item/clothing/gloves/combat = 300,
+			/obj/item/clothing/head/chameleon = 300,
+			/obj/item/pen/sleepy = 300,
+			/obj/item/reagent_containers/hypospray/medipen/stimpack/traitor = 100,
+
+			/obj/item/grenade/c4 = 100,
+
+			/obj/item/wrench/syndie = 30,
+			/obj/item/screwdriver/nuke = 30,
+			/obj/item/crowbar/syndie = 30,
+			/obj/item/wirecutters/syndie = 30,
+			/obj/item/multitool/syndie = 30,
+
+			/obj/item/scalpel/alien = 1,
+			/obj/item/hemostat/alien = 1,
+			/obj/item/cautery/alien = 1,
+			/obj/item/retractor/alien = 1,
+			/obj/item/circular_saw/alien = 1,
+			/obj/item/surgicaldrill/alien = 1,
+
+			/obj/item/wrench/abductor = 1,
+			/obj/item/screwdriver/abductor = 1,
+			/obj/item/weldingtool/abductor = 1,
+			/obj/item/crowbar/abductor = 1,
+			/obj/item/wirecutters/abductor = 1,
+			/obj/item/multitool/abductor = 1
+
+		)