From 8efb4d25ddb4e99bba6acaebf7ff43a34e88872f Mon Sep 17 00:00:00 2001 From: Waterpig <49160555+Majkl-J@users.noreply.github.com> Date: Sat, 6 Jul 2024 06:08:59 +0200 Subject: [PATCH] Event horizon rebalance (#28653) --- code/modules/projectiles/guns/energy/beam_rifle.dm | 2 ++ .../modules/projectiles/guns/energy/beam_rifle.dm | 12 ++++++++++++ tgstation.dme | 1 + 3 files changed, 15 insertions(+) create mode 100644 modular_skyrat/master_files/code/modules/projectiles/guns/energy/beam_rifle.dm diff --git a/code/modules/projectiles/guns/energy/beam_rifle.dm b/code/modules/projectiles/guns/energy/beam_rifle.dm index 0bda1930c62..c9550e0fc2d 100644 --- a/code/modules/projectiles/guns/energy/beam_rifle.dm +++ b/code/modules/projectiles/guns/energy/beam_rifle.dm @@ -52,6 +52,7 @@ hitscan = TRUE tracer_type = /obj/effect/projectile/tracer/tracer/beam_rifle +/* SKYRAT EDIT REMOVE - God /obj/projectile/beam/event_horizon/on_hit(atom/target, blocked, pierce_hit) . = ..() @@ -62,3 +63,4 @@ var/obj/reality_tear/temporary/tear = new(rift_loc) tear.start_disaster() message_admins("[ADMIN_LOOKUPFLW(target)] has been hit by an anti-existential beam at [ADMIN_VERBOSEJMP(rift_loc)], creating a singularity.") +*/ diff --git a/modular_skyrat/master_files/code/modules/projectiles/guns/energy/beam_rifle.dm b/modular_skyrat/master_files/code/modules/projectiles/guns/energy/beam_rifle.dm new file mode 100644 index 00000000000..c60c9983578 --- /dev/null +++ b/modular_skyrat/master_files/code/modules/projectiles/guns/energy/beam_rifle.dm @@ -0,0 +1,12 @@ +/obj/item/gun/energy/event_horizon + name = "\improper Event Horizon anti-existential beam rifle" + desc = "Nanotrasen developed experimental weapons platform for accelerating heated sub-atomic particles at near-lightspeed by utilizing a\ + blackhole generator to accelerate them past an immense gravitational field. Keep your fingers away from the barrel during firing.\ + Might cause unexpected spaggetification" + +/obj/projectile/beam/event_horizon + damage = HUMAN_HEALTH_MODIFIER * 100 + damage_type = BRUTE + armor_flag = ENERGY + range = 150 + jitter = 5 SECONDS diff --git a/tgstation.dme b/tgstation.dme index 97acc1fe778..fd234356478 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6763,6 +6763,7 @@ #include "modular_skyrat\master_files\code\modules\projectiles\guns\ballistic\bows\_bow.dm" #include "modular_skyrat\master_files\code\modules\projectiles\guns\ballistic\bows\bow_quivers.dm" #include "modular_skyrat\master_files\code\modules\projectiles\guns\ballistic\bows\bow_types.dm" +#include "modular_skyrat\master_files\code\modules\projectiles\guns\energy\beam_rifle.dm" #include "modular_skyrat\master_files\code\modules\reagents\bottle.dm" #include "modular_skyrat\master_files\code\modules\reagents\reagent_containers.dm" #include "modular_skyrat\master_files\code\modules\reagents\chemistry\colors.dm"