From f472def10c3b7144f4552aa9488b99928b1f4ff3 Mon Sep 17 00:00:00 2001 From: Vhariik <101156441+Vhariik@users.noreply.github.com> Date: Wed, 3 Apr 2024 22:58:21 -0300 Subject: [PATCH 1/6] nerfed the miracle --- _maps/RandomRuins/SpaceRuins/miracle.dmm | 1 - code/modules/ruins/spaceruin_code/miracle.dm | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/_maps/RandomRuins/SpaceRuins/miracle.dmm b/_maps/RandomRuins/SpaceRuins/miracle.dmm index 8a778858689b..ba22f462361e 100644 --- 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 index 075d43df2545..5613d2c47d18 100644 --- 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/aegisaltlaser) From be56e81c943b351e816df082594d142a8a1db71a Mon Sep 17 00:00:00 2001 From: Vhariik <101156441+Vhariik@users.noreply.github.com> Date: Sat, 6 Apr 2024 21:50:43 -0300 Subject: [PATCH 2/6] re-adds pulse rifle, but with a kaiju pin --- code/modules/ruins/spaceruin_code/miracle.dm | 2 +- modular_splurt/code/modules/projectiles/guns/energy/special.dm | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/code/modules/ruins/spaceruin_code/miracle.dm b/code/modules/ruins/spaceruin_code/miracle.dm index 5613d2c47d18..1b09a74c740d 100644 --- 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/aegisaltlaser) + reward_all_of_these = list(/obj/item/gun/energy/pulse/nerf) diff --git a/modular_splurt/code/modules/projectiles/guns/energy/special.dm b/modular_splurt/code/modules/projectiles/guns/energy/special.dm index f2aa547dfff4..c61c48fb7136 100644 --- a/modular_splurt/code/modules/projectiles/guns/energy/special.dm +++ b/modular_splurt/code/modules/projectiles/guns/energy/special.dm @@ -1,2 +1,5 @@ /obj/item/gun/energy/ionrifle/carbine/with_pin pin = /obj/item/firing_pin + +/obj/item/gun/energy/pulse/nerf + pin = /obj/item/firing_pin/kaiju \ No newline at end of file From 0bc8ddd66b37e5a428ee2fd569ac1c5175a06cff Mon Sep 17 00:00:00 2001 From: Vhariik <101156441+Vhariik@users.noreply.github.com> Date: Sat, 6 Apr 2024 21:58:16 -0300 Subject: [PATCH 3/6] Update special.dm --- modular_splurt/code/modules/projectiles/guns/energy/special.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/modular_splurt/code/modules/projectiles/guns/energy/special.dm b/modular_splurt/code/modules/projectiles/guns/energy/special.dm index c61c48fb7136..377274453f93 100644 --- a/modular_splurt/code/modules/projectiles/guns/energy/special.dm +++ b/modular_splurt/code/modules/projectiles/guns/energy/special.dm @@ -2,4 +2,5 @@ pin = /obj/item/firing_pin /obj/item/gun/energy/pulse/nerf + weapon_weight = WEAPON_HEAVY pin = /obj/item/firing_pin/kaiju \ No newline at end of file From 872ed15558665f3847b61bc648964dce783d13eb Mon Sep 17 00:00:00 2001 From: Vhariik <101156441+Vhariik@users.noreply.github.com> Date: Sat, 6 Apr 2024 21:59:41 -0300 Subject: [PATCH 4/6] Update special.dm --- .../code/modules/projectiles/guns/energy/special.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/modular_splurt/code/modules/projectiles/guns/energy/special.dm b/modular_splurt/code/modules/projectiles/guns/energy/special.dm index 377274453f93..f2aa547dfff4 100644 --- a/modular_splurt/code/modules/projectiles/guns/energy/special.dm +++ b/modular_splurt/code/modules/projectiles/guns/energy/special.dm @@ -1,6 +1,2 @@ /obj/item/gun/energy/ionrifle/carbine/with_pin pin = /obj/item/firing_pin - -/obj/item/gun/energy/pulse/nerf - weapon_weight = WEAPON_HEAVY - pin = /obj/item/firing_pin/kaiju \ No newline at end of file From 0cc4f05645f239d845cd79937ec6f8849df86bbc Mon Sep 17 00:00:00 2001 From: Vhariik <101156441+Vhariik@users.noreply.github.com> Date: Sat, 6 Apr 2024 22:00:01 -0300 Subject: [PATCH 5/6] Update lasers.dm --- modular_splurt/code/modules/projectiles/guns/energy/lasers.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modular_splurt/code/modules/projectiles/guns/energy/lasers.dm b/modular_splurt/code/modules/projectiles/guns/energy/lasers.dm index 9a35f8e4dfe1..ba24482e6c44 100644 --- a/modular_splurt/code/modules/projectiles/guns/energy/lasers.dm +++ b/modular_splurt/code/modules/projectiles/guns/energy/lasers.dm @@ -82,3 +82,6 @@ flight_x_offset = 0 flight_y_offset = -700 selfcharge = TRUE + +/obj/item/gun/energy/pulse/nerf + pin = /obj/item/firing_pin/kaiju \ No newline at end of file From 7673b3fdd6295bec0eb2a9e017e5a8b9c860a515 Mon Sep 17 00:00:00 2001 From: Vhariik <101156441+Vhariik@users.noreply.github.com> Date: Sat, 6 Apr 2024 22:02:48 -0300 Subject: [PATCH 6/6] Update lasers.dm --- modular_splurt/code/modules/projectiles/guns/energy/lasers.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_splurt/code/modules/projectiles/guns/energy/lasers.dm b/modular_splurt/code/modules/projectiles/guns/energy/lasers.dm index ba24482e6c44..a62392d09a46 100644 --- a/modular_splurt/code/modules/projectiles/guns/energy/lasers.dm +++ b/modular_splurt/code/modules/projectiles/guns/energy/lasers.dm @@ -84,4 +84,4 @@ selfcharge = TRUE /obj/item/gun/energy/pulse/nerf - pin = /obj/item/firing_pin/kaiju \ No newline at end of file + pin = /obj/item/firing_pin/kaiju