Merge pull request #1134 from Vhariik/Dum

Nerf of the miracle ruin
SPLURT-Station · Apr 25, 2024 · 2c79561 · 2c79561
2 parents 9c816ad + 7673b3f
commit 2c79561
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/_maps/RandomRuins/SpaceRuins/miracle.dmm b/_maps/RandomRuins/SpaceRuins/miracle.dmm
@@ -1,7 +1,6 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "a" = (
 /obj/item/storage/backpack/satchel/flat/secret/miracle_ruin,
-/obj/machinery/spaceship_navigation_beacon/invion,
 /turf/open/floor/fakespace{
 	initial_gas_mix = "TEMP=2.7"
 	},

diff --git a/code/modules/ruins/spaceruin_code/miracle.dm b/code/modules/ruins/spaceruin_code/miracle.dm
@@ -1,4 +1,4 @@
 ///////////	miracle ruin
 
 /obj/item/storage/backpack/satchel/flat/secret/miracle_ruin
-	reward_all_of_these = list(/obj/item/gun/energy/pulse/prize)
+	reward_all_of_these = list(/obj/item/gun/energy/pulse/nerf)
diff --git a/modular_splurt/code/modules/projectiles/guns/energy/lasers.dm b/modular_splurt/code/modules/projectiles/guns/energy/lasers.dm
@@ -84,3 +84,6 @@
 	flight_x_offset = 0
 	flight_y_offset = -700
 	selfcharge = TRUE
+
+/obj/item/gun/energy/pulse/nerf
+	pin = /obj/item/firing_pin/kaiju