bugfixes. (#4983)

Removes the last few excel miines that kept runtiming. Fixes a divide by 0 runtime in the surgery code for inserting items. Fixes a runtime/bug in wristmounted computer that caused it to A. unable to accept residue and B. thusly runtiime.
sojourn-13 · Jan 29, 2024 · 516fa83 · 516fa83
1 parent 9f78d09
commit 516fa83
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 21 deletions.
diff --git a/code/modules/modular_computers/computers/subtypes/dev_wristbound.dm b/code/modules/modular_computers/computers/subtypes/dev_wristbound.dm
@@ -21,6 +21,7 @@
 	var/hard_drive_type = /obj/item/computer_hardware/hard_drive/small
 	var/processor_unit_type = /obj/item/computer_hardware/processor_unit/small
 	var/network_card_type = /obj/item/computer_hardware/network_card
+	var/gunshot_residue // fucking motherfuck.
 
 /obj/item/modular_computer/wrist/Initialize()
 	. = ..()

diff --git a/code/modules/surgery/internal.dm b/code/modules/surgery/internal.dm
@@ -52,13 +52,13 @@
 				SPAN_WARNING("[user]'s gripper slips, hitting [organ.get_surgery_name()] with \the [tool]!"),
 				SPAN_WARNING("Your gripper slips, hitting [organ.get_surgery_name()] with \the [tool]!")
 			)
-			organ.take_damage(5, BRUTE, 0)
+			organ.take_damage(5, BRUTE)
 	else
 		user.visible_message(
 			SPAN_WARNING("[user]'s hand slips, hitting [organ.get_surgery_name()] with \the [tool]!"),
 			SPAN_WARNING("Your hand slips, hitting [organ.get_surgery_name()] with \the [tool]!")
 		)
-		organ.take_damage(5, BRUTE, 0)
+		organ.take_damage(5, BRUTE)
 
 /datum/surgery_step/insert_item/robotic
 	required_stat = STAT_MEC
@@ -301,4 +301,4 @@
 			organ.removed(user)
 			playsound(get_turf(src), 'sound/effects/squelch1.ogg', 50, 1)
 		else
-			I.forceMove(drop_location())
+			I.forceMove(drop_location())
diff --git a/maps/_DeepForest/map/_Deep_Forest.dmm b/maps/_DeepForest/map/_Deep_Forest.dmm
@@ -21477,16 +21477,6 @@
 /obj/structure/multiz/ladder,
 /turf/simulated/floor/carpet/bcarpet,
 /area/nadezhda/dungeon/outside/prepper)
-"sJY" = (
-/obj/random/junk,
-/obj/item/mine/excelsior{
-	armed = 1
-	},
-/turf/simulated/floor/tiled/dark/brown_platform,
-/area/nadezhda/dungeon/outside/prepper/vault{
-	narrate = "A great, massive structure. Rotting and decayed, though seemingly maintained to some minimum, the whole vault feels as if it could collapse around you at any moment, the shuffling of steel-clad boots echoes through the halls.";
-	name = "Abandoned Bunker"
-	})
 "sKv" = (
 /obj/effect/decal/cleanable/cobweb2,
 /obj/structure/closet/random_hostilemobs,
@@ -57430,7 +57420,7 @@ aHN
 aHN
 aHN
 aHN
-sJY
+snd
 qvg
 aHN
 nZp

diff --git a/maps/__Nadezhda/map/_Nadezhda_Colony_New.dmm b/maps/__Nadezhda/map/_Nadezhda_Colony_New.dmm
@@ -52145,6 +52145,12 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark/brown_perforated,
 /area/nadezhda/maintenance/undergroundfloor1north)
+"lcH" = (
+/obj/random/junk/low_chance,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/mine/armed,
+/turf/simulated/floor/tiled/dark/brown_platform,
+/area/nadezhda/maintenance/undergroundfloor1north)
 "lcI" = (
 /obj/random/scrap/sparse_even,
 /obj/machinery/light/small{
@@ -73984,9 +73990,7 @@
 "pCq" = (
 /obj/machinery/door/airlock/maintenance_common,
 /obj/effect/decal/cleanable/dirt,
-/obj/item/mine/excelsior{
-	armed = 1
-	},
+/obj/item/mine/armed,
 /turf/simulated/floor/tiled/dark/brown_perforated,
 /area/nadezhda/maintenance/undergroundfloor1north)
 "pCr" = (
@@ -103233,9 +103237,7 @@
 /area/nadezhda/maintenance/undergroundfloor1east)
 "vDi" = (
 /obj/machinery/door/airlock/maintenance_common,
-/obj/item/mine/excelsior{
-	armed = 1
-	},
+/obj/item/mine/armed,
 /turf/simulated/floor/tiled/dark/brown_perforated,
 /area/nadezhda/maintenance/undergroundfloor1north)
 "vDn" = (
@@ -136813,7 +136815,7 @@ uyF
 boT
 tkb
 uyF
-sTc
+lcH
 uyZ
 uyZ
 uyF