From d9dfb3e8d6c1f788be3d9d135b2b88f7d40545d1 Mon Sep 17 00:00:00 2001 From: Bop Date: Tue, 6 Dec 2022 16:08:30 +0700 Subject: [PATCH 01/16] armor rad --- code/modules/mob/living/living_defense.dm | 5 ++++- .../projectiles/projectile/energy/nuclear_particle.dm | 2 +- .../modules/mob/living/simple_animal/friendly/goats.dm | 7 ++++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index 179906bdd257..b340d2b5197d 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -55,7 +55,10 @@ var/armor = run_armor_check(def_zone, P.flag, "","",P.armour_penetration) if(!P.nodamage) last_damage = P.name - apply_damage(P.damage, P.damage_type, def_zone, armor, wound_bonus = P.wound_bonus, bare_wound_bonus = P.bare_wound_bonus, sharpness = P.get_sharpness()) + if((istype(P, /obj/item/projectile/energy/nuclear_particle)) && (getarmor(null, RAD) >= 100)) + return BULLET_ACT_BLOCK + else + apply_damage(P.damage, P.damage_type, def_zone, armor, wound_bonus = P.wound_bonus, bare_wound_bonus = P.bare_wound_bonus, sharpness = P.get_sharpness()) if(P.dismemberment) check_projectile_dismemberment(P, def_zone) if(P.penetrating && (P.penetration_type == 0 || P.penetration_type == 2) && P.penetrations > 0) diff --git a/code/modules/projectiles/projectile/energy/nuclear_particle.dm b/code/modules/projectiles/projectile/energy/nuclear_particle.dm index 032b5d46cd7d..d29668d30512 100644 --- a/code/modules/projectiles/projectile/energy/nuclear_particle.dm +++ b/code/modules/projectiles/projectile/energy/nuclear_particle.dm @@ -30,7 +30,7 @@ P.fire(angle) /obj/item/projectile/energy/nuclear_particle/wimpy - irradiate = 100 + irradiate = 500 damage = 2 /atom/proc/fire_nuclear_particle_wimpy(angle = rand(0,360)) diff --git a/yogstation/code/modules/mob/living/simple_animal/friendly/goats.dm b/yogstation/code/modules/mob/living/simple_animal/friendly/goats.dm index 72cc15e4e16e..c0b28385601e 100644 --- a/yogstation/code/modules/mob/living/simple_animal/friendly/goats.dm +++ b/yogstation/code/modules/mob/living/simple_animal/friendly/goats.dm @@ -182,13 +182,14 @@ AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/conjure/radiation_anomaly) ADD_TRAIT(src, TRAIT_RADIMMUNE, GENETIC_MUTATION) -/mob/living/simple_animal/hostile/retaliate/goat/radioactive/on_hit(obj/item/projectile/P) - . = ..() +/mob/living/simple_animal/hostile/retaliate/goat/radioactive/bullet_act(obj/item/projectile/P) if(istype(P, /obj/item/projectile/energy/nuclear_particle)) // abosrbs nuclear particle to heal - P.damage = 0 adjustBruteLoss(-10) adjustFireLoss(-10) + return BULLET_ACT_BLOCK //No damaging goat + return ..() + /mob/living/simple_animal/hostile/retaliate/goat/radioactive/Life() if(stat == CONSCIOUS) From d8a8854d0a616c22f19ea5cb71597cbfac636db9 Mon Sep 17 00:00:00 2001 From: Bop Date: Tue, 6 Dec 2022 16:42:16 +0700 Subject: [PATCH 02/16] beter --- code/modules/mob/living/living_defense.dm | 2 +- .../code/modules/mob/living/simple_animal/friendly/goats.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index b340d2b5197d..6a7a677c834f 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -56,7 +56,7 @@ if(!P.nodamage) last_damage = P.name if((istype(P, /obj/item/projectile/energy/nuclear_particle)) && (getarmor(null, RAD) >= 100)) - return BULLET_ACT_BLOCK + P.damage = 0 else apply_damage(P.damage, P.damage_type, def_zone, armor, wound_bonus = P.wound_bonus, bare_wound_bonus = P.bare_wound_bonus, sharpness = P.get_sharpness()) if(P.dismemberment) diff --git a/yogstation/code/modules/mob/living/simple_animal/friendly/goats.dm b/yogstation/code/modules/mob/living/simple_animal/friendly/goats.dm index c0b28385601e..2b4c9f1fc4f5 100644 --- a/yogstation/code/modules/mob/living/simple_animal/friendly/goats.dm +++ b/yogstation/code/modules/mob/living/simple_animal/friendly/goats.dm @@ -185,9 +185,9 @@ /mob/living/simple_animal/hostile/retaliate/goat/radioactive/bullet_act(obj/item/projectile/P) if(istype(P, /obj/item/projectile/energy/nuclear_particle)) // abosrbs nuclear particle to heal + P.damage = 0 //No damaging goat adjustBruteLoss(-10) adjustFireLoss(-10) - return BULLET_ACT_BLOCK //No damaging goat return ..() From f76b2913e0f5d49b2db4860ea502335e3d3c636b Mon Sep 17 00:00:00 2001 From: Bop Date: Tue, 6 Dec 2022 16:45:44 +0700 Subject: [PATCH 03/16] gamin --- code/game/objects/effects/anomalies.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/effects/anomalies.dm b/code/game/objects/effects/anomalies.dm index 0c711435ec04..55765db34e3a 100644 --- a/code/game/objects/effects/anomalies.dm +++ b/code/game/objects/effects/anomalies.dm @@ -368,7 +368,7 @@ /obj/effect/anomaly/radiation/anomalyEffect() ..() - for(var/i = 1 to 10) + for(var/i = 1 to 15) fire_nuclear_particle_wimpy() radiation_pulse(src, 500, 5) From 9b8e754e8b2cddecdf09be554af6287f48525568 Mon Sep 17 00:00:00 2001 From: Bop Date: Wed, 7 Dec 2022 11:31:05 +0700 Subject: [PATCH 04/16] guh --- code/game/objects/effects/anomalies.dm | 2 +- .../modules/projectiles/projectile/energy/nuclear_particle.dm | 2 +- .../code/modules/mob/living/simple_animal/friendly/goats.dm | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/objects/effects/anomalies.dm b/code/game/objects/effects/anomalies.dm index 55765db34e3a..0c711435ec04 100644 --- a/code/game/objects/effects/anomalies.dm +++ b/code/game/objects/effects/anomalies.dm @@ -368,7 +368,7 @@ /obj/effect/anomaly/radiation/anomalyEffect() ..() - for(var/i = 1 to 15) + for(var/i = 1 to 10) fire_nuclear_particle_wimpy() radiation_pulse(src, 500, 5) diff --git a/code/modules/projectiles/projectile/energy/nuclear_particle.dm b/code/modules/projectiles/projectile/energy/nuclear_particle.dm index d29668d30512..032b5d46cd7d 100644 --- a/code/modules/projectiles/projectile/energy/nuclear_particle.dm +++ b/code/modules/projectiles/projectile/energy/nuclear_particle.dm @@ -30,7 +30,7 @@ P.fire(angle) /obj/item/projectile/energy/nuclear_particle/wimpy - irradiate = 500 + irradiate = 100 damage = 2 /atom/proc/fire_nuclear_particle_wimpy(angle = rand(0,360)) diff --git a/yogstation/code/modules/mob/living/simple_animal/friendly/goats.dm b/yogstation/code/modules/mob/living/simple_animal/friendly/goats.dm index 2b4c9f1fc4f5..1a663580c3d9 100644 --- a/yogstation/code/modules/mob/living/simple_animal/friendly/goats.dm +++ b/yogstation/code/modules/mob/living/simple_animal/friendly/goats.dm @@ -186,8 +186,8 @@ if(istype(P, /obj/item/projectile/energy/nuclear_particle)) // abosrbs nuclear particle to heal P.damage = 0 //No damaging goat - adjustBruteLoss(-10) - adjustFireLoss(-10) + adjustBruteLoss(-0.2) + adjustFireLoss(-0.2) return ..() From a34288c58b8f7b236cbcc587e3868a75ce3f914b Mon Sep 17 00:00:00 2001 From: Bop Date: Wed, 7 Dec 2022 11:34:12 +0700 Subject: [PATCH 05/16] gjh --- code/game/objects/effects/anomalies.dm | 2 +- code/modules/projectiles/projectile/energy/nuclear_particle.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/effects/anomalies.dm b/code/game/objects/effects/anomalies.dm index 0c711435ec04..55765db34e3a 100644 --- a/code/game/objects/effects/anomalies.dm +++ b/code/game/objects/effects/anomalies.dm @@ -368,7 +368,7 @@ /obj/effect/anomaly/radiation/anomalyEffect() ..() - for(var/i = 1 to 10) + for(var/i = 1 to 15) fire_nuclear_particle_wimpy() radiation_pulse(src, 500, 5) diff --git a/code/modules/projectiles/projectile/energy/nuclear_particle.dm b/code/modules/projectiles/projectile/energy/nuclear_particle.dm index 032b5d46cd7d..d29668d30512 100644 --- a/code/modules/projectiles/projectile/energy/nuclear_particle.dm +++ b/code/modules/projectiles/projectile/energy/nuclear_particle.dm @@ -30,7 +30,7 @@ P.fire(angle) /obj/item/projectile/energy/nuclear_particle/wimpy - irradiate = 100 + irradiate = 500 damage = 2 /atom/proc/fire_nuclear_particle_wimpy(angle = rand(0,360)) From 27fe760f6bf9217191e243e134519eda51a4af16 Mon Sep 17 00:00:00 2001 From: Bop Date: Wed, 7 Dec 2022 11:37:04 +0700 Subject: [PATCH 06/16] nerf aswell --- .../code/modules/mob/living/simple_animal/friendly/goats.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yogstation/code/modules/mob/living/simple_animal/friendly/goats.dm b/yogstation/code/modules/mob/living/simple_animal/friendly/goats.dm index 1a663580c3d9..ae5f62e396f1 100644 --- a/yogstation/code/modules/mob/living/simple_animal/friendly/goats.dm +++ b/yogstation/code/modules/mob/living/simple_animal/friendly/goats.dm @@ -172,8 +172,8 @@ speed = -0.5 robust_searching = 1 stat_attack = UNCONSCIOUS - health = 200 - maxHealth = 200 + health = 120 + maxHealth = 120 var/datum/action/innate/rad_goat/rad_switch var/rad_emit = TRUE From 9492cc0a6d97be397577b4eae0236f4063582f22 Mon Sep 17 00:00:00 2001 From: Bop Date: Wed, 7 Dec 2022 11:51:29 +0700 Subject: [PATCH 07/16] fix --- .../modules/mob/living/simple_animal/friendly/goats.dm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/yogstation/code/modules/mob/living/simple_animal/friendly/goats.dm b/yogstation/code/modules/mob/living/simple_animal/friendly/goats.dm index ae5f62e396f1..0f3d0b26e907 100644 --- a/yogstation/code/modules/mob/living/simple_animal/friendly/goats.dm +++ b/yogstation/code/modules/mob/living/simple_animal/friendly/goats.dm @@ -184,12 +184,15 @@ /mob/living/simple_animal/hostile/retaliate/goat/radioactive/bullet_act(obj/item/projectile/P) if(istype(P, /obj/item/projectile/energy/nuclear_particle)) - // abosrbs nuclear particle to heal P.damage = 0 //No damaging goat - adjustBruteLoss(-0.2) - adjustFireLoss(-0.2) return ..() +/mob/living/simple_animal/hostile/retaliate/goat/radioactive/on_hit(obj/item/projectile/P) + . = ..() + if(istype(P, /obj/item/projectile/energy/nuclear_particle)) + // abosrbs nuclear particle to heal + adjustBruteLoss(-0.2) + adjustFireLoss(-0.2) /mob/living/simple_animal/hostile/retaliate/goat/radioactive/Life() if(stat == CONSCIOUS) From 703d7e6eb62cc1a333ad5c6d8dd7ed4e675bf89f Mon Sep 17 00:00:00 2001 From: Bop Date: Wed, 7 Dec 2022 12:05:38 +0700 Subject: [PATCH 08/16] ner --- .../code/modules/mob/living/simple_animal/friendly/goats.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yogstation/code/modules/mob/living/simple_animal/friendly/goats.dm b/yogstation/code/modules/mob/living/simple_animal/friendly/goats.dm index 0f3d0b26e907..b038f0df7832 100644 --- a/yogstation/code/modules/mob/living/simple_animal/friendly/goats.dm +++ b/yogstation/code/modules/mob/living/simple_animal/friendly/goats.dm @@ -191,8 +191,8 @@ . = ..() if(istype(P, /obj/item/projectile/energy/nuclear_particle)) // abosrbs nuclear particle to heal - adjustBruteLoss(-0.2) - adjustFireLoss(-0.2) + adjustBruteLoss(1) + adjustFireLoss(1) /mob/living/simple_animal/hostile/retaliate/goat/radioactive/Life() if(stat == CONSCIOUS) From abc729bf1130c138e655069e5c14f77c5b9170bc Mon Sep 17 00:00:00 2001 From: Bop Date: Wed, 7 Dec 2022 19:22:52 +0700 Subject: [PATCH 09/16] fucking goat --- .../code/modules/mob/living/simple_animal/friendly/goats.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yogstation/code/modules/mob/living/simple_animal/friendly/goats.dm b/yogstation/code/modules/mob/living/simple_animal/friendly/goats.dm index b038f0df7832..bb5db08388ab 100644 --- a/yogstation/code/modules/mob/living/simple_animal/friendly/goats.dm +++ b/yogstation/code/modules/mob/living/simple_animal/friendly/goats.dm @@ -172,8 +172,8 @@ speed = -0.5 robust_searching = 1 stat_attack = UNCONSCIOUS - health = 120 - maxHealth = 120 + health = 60 + maxHealth = 60 var/datum/action/innate/rad_goat/rad_switch var/rad_emit = TRUE From 038bfbe9d9db924f363ab83ce9cdb54a83befcf2 Mon Sep 17 00:00:00 2001 From: Bop Date: Wed, 7 Dec 2022 19:25:36 +0700 Subject: [PATCH 10/16] ick --- .../code/modules/mob/living/simple_animal/friendly/goats.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yogstation/code/modules/mob/living/simple_animal/friendly/goats.dm b/yogstation/code/modules/mob/living/simple_animal/friendly/goats.dm index bb5db08388ab..e03a16239063 100644 --- a/yogstation/code/modules/mob/living/simple_animal/friendly/goats.dm +++ b/yogstation/code/modules/mob/living/simple_animal/friendly/goats.dm @@ -172,8 +172,8 @@ speed = -0.5 robust_searching = 1 stat_attack = UNCONSCIOUS - health = 60 - maxHealth = 60 + health = 75 + maxHealth = 75 var/datum/action/innate/rad_goat/rad_switch var/rad_emit = TRUE From cfde1a6de3539fe32cd877454bb0b7148d51dc31 Mon Sep 17 00:00:00 2001 From: Bop Date: Wed, 7 Dec 2022 19:44:30 +0700 Subject: [PATCH 11/16] now dodge --- .../code/modules/mob/living/simple_animal/friendly/goats.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/yogstation/code/modules/mob/living/simple_animal/friendly/goats.dm b/yogstation/code/modules/mob/living/simple_animal/friendly/goats.dm index e03a16239063..63ba14ebb993 100644 --- a/yogstation/code/modules/mob/living/simple_animal/friendly/goats.dm +++ b/yogstation/code/modules/mob/living/simple_animal/friendly/goats.dm @@ -171,6 +171,8 @@ melee_damage_upper = 25 speed = -0.5 robust_searching = 1 + turns_per_move = 5 + dodging = 1 stat_attack = UNCONSCIOUS health = 75 maxHealth = 75 From 9d39d8eb8f55c385c58ee045b6f360504c66a2f3 Mon Sep 17 00:00:00 2001 From: Bop Date: Wed, 7 Dec 2022 19:48:17 +0700 Subject: [PATCH 12/16] better var --- code/game/objects/effects/anomalies.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/objects/effects/anomalies.dm b/code/game/objects/effects/anomalies.dm index 55765db34e3a..bde5f2e76b58 100644 --- a/code/game/objects/effects/anomalies.dm +++ b/code/game/objects/effects/anomalies.dm @@ -364,7 +364,7 @@ icon = 'icons/obj/projectiles.dmi' icon_state = "radiation_anomaly" density = TRUE - var/has_effect = TRUE //For goat spawning + var/spawn_goat = TRUE //For goat spawning /obj/effect/anomaly/radiation/anomalyEffect() ..() @@ -384,7 +384,7 @@ /obj/effect/anomaly/radiation/detonate() INVOKE_ASYNC(src, .proc/rad_Spin) - has_effect = FALSE //Don't want rad anomaly to keep spamming rad goat + spawn_goat = FALSE //Don't want rad anomaly to keep spamming rad goat /obj/effect/anomaly/radiation/proc/rad_Spin() radiation_pulse(src, 5000, 7) @@ -398,7 +398,7 @@ anomalyEffect() if(death_time < world.time) if(loc) - if(has_effect) + if(spawn_goat) INVOKE_ASYNC(src, .proc/makegoat) detonate() addtimer(CALLBACK(GLOBAL_PROC, .proc/qdel, src), 150) From b1e52060c77449c4c268652e169c868833df986c Mon Sep 17 00:00:00 2001 From: Bop Date: Wed, 7 Dec 2022 19:53:25 +0700 Subject: [PATCH 13/16] fix --- code/modules/spells/spell_types/conjure.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/spells/spell_types/conjure.dm b/code/modules/spells/spell_types/conjure.dm index fcfd374e4dde..2c7ebbf8e4f8 100644 --- a/code/modules/spells/spell_types/conjure.dm +++ b/code/modules/spells/spell_types/conjure.dm @@ -146,7 +146,7 @@ . = ..() var/mob/living/simple_animal/hostile/retaliate/goat/radioactive/S = user var/obj/effect/anomaly/radiation/anomaly = new (S.loc, 150) - anomaly.has_effect = FALSE + anomaly.spawn_goat = FALSE playsound(S, 'sound/weapons/resonator_fire.ogg', 100, TRUE) S.visible_message(span_notice("You see \the radiation anomaly emerges from \the [S]."), span_notice("\The radiation anomaly emerges from your body.")) notify_ghosts("The Radioactive Goat has spawned a radiation anomaly!", source = anomaly, action = NOTIFY_ORBIT, flashwindow = FALSE, header = "Radiation Anomaly Spawned!") From 51fd814e2de759fe6d474b530fe696d4f765c2c9 Mon Sep 17 00:00:00 2001 From: Bop Date: Thu, 8 Dec 2022 15:21:47 +0700 Subject: [PATCH 14/16] good --- code/modules/mob/living/living_defense.dm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index 6a7a677c834f..179906bdd257 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -55,10 +55,7 @@ var/armor = run_armor_check(def_zone, P.flag, "","",P.armour_penetration) if(!P.nodamage) last_damage = P.name - if((istype(P, /obj/item/projectile/energy/nuclear_particle)) && (getarmor(null, RAD) >= 100)) - P.damage = 0 - else - apply_damage(P.damage, P.damage_type, def_zone, armor, wound_bonus = P.wound_bonus, bare_wound_bonus = P.bare_wound_bonus, sharpness = P.get_sharpness()) + apply_damage(P.damage, P.damage_type, def_zone, armor, wound_bonus = P.wound_bonus, bare_wound_bonus = P.bare_wound_bonus, sharpness = P.get_sharpness()) if(P.dismemberment) check_projectile_dismemberment(P, def_zone) if(P.penetrating && (P.penetration_type == 0 || P.penetration_type == 2) && P.penetrations > 0) From 694f74d4b3998a224abc3d3dc11fe125ebd656da Mon Sep 17 00:00:00 2001 From: Bop Date: Fri, 9 Dec 2022 11:57:00 +0700 Subject: [PATCH 15/16] Update goats.dm --- .../code/modules/mob/living/simple_animal/friendly/goats.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yogstation/code/modules/mob/living/simple_animal/friendly/goats.dm b/yogstation/code/modules/mob/living/simple_animal/friendly/goats.dm index 63ba14ebb993..c7dfa0b3495f 100644 --- a/yogstation/code/modules/mob/living/simple_animal/friendly/goats.dm +++ b/yogstation/code/modules/mob/living/simple_animal/friendly/goats.dm @@ -193,8 +193,8 @@ . = ..() if(istype(P, /obj/item/projectile/energy/nuclear_particle)) // abosrbs nuclear particle to heal - adjustBruteLoss(1) - adjustFireLoss(1) + adjustBruteLoss(-1) + adjustFireLoss(-1) /mob/living/simple_animal/hostile/retaliate/goat/radioactive/Life() if(stat == CONSCIOUS) From ba932613c97e8085cfb87da36a0f988aac3cb9f8 Mon Sep 17 00:00:00 2001 From: Bop Date: Fri, 9 Dec 2022 12:03:54 +0700 Subject: [PATCH 16/16] breh --- code/game/objects/effects/anomalies.dm | 4 ++-- .../projectiles/projectile/energy/nuclear_particle.dm | 8 -------- .../carbon/human/species_types/preternis/preternis.dm | 2 +- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/code/game/objects/effects/anomalies.dm b/code/game/objects/effects/anomalies.dm index bde5f2e76b58..d307da1097d5 100644 --- a/code/game/objects/effects/anomalies.dm +++ b/code/game/objects/effects/anomalies.dm @@ -369,7 +369,7 @@ /obj/effect/anomaly/radiation/anomalyEffect() ..() for(var/i = 1 to 15) - fire_nuclear_particle_wimpy() + fire_nuclear_particle() radiation_pulse(src, 500, 5) /obj/effect/anomaly/radiation/proc/makegoat() @@ -391,7 +391,7 @@ var/turf/T = get_turf(src) for(var/i=1 to 100) var/angle = i * 10 - T.fire_nuclear_particle_wimpy(angle) + T.fire_nuclear_particle(angle) sleep(0.7) /obj/effect/anomaly/radiation/process() diff --git a/code/modules/projectiles/projectile/energy/nuclear_particle.dm b/code/modules/projectiles/projectile/energy/nuclear_particle.dm index d29668d30512..cc60c8d85b45 100644 --- a/code/modules/projectiles/projectile/energy/nuclear_particle.dm +++ b/code/modules/projectiles/projectile/energy/nuclear_particle.dm @@ -28,11 +28,3 @@ /atom/proc/fire_nuclear_particle(angle = rand(0,360)) //used by fusion to fire random nuclear particles. Fires one particle in a random direction. var/obj/item/projectile/energy/nuclear_particle/P = new /obj/item/projectile/energy/nuclear_particle(src) P.fire(angle) - -/obj/item/projectile/energy/nuclear_particle/wimpy - irradiate = 500 - damage = 2 - -/atom/proc/fire_nuclear_particle_wimpy(angle = rand(0,360)) - var/obj/item/projectile/energy/nuclear_particle/wimpy/P = new /obj/item/projectile/energy/nuclear_particle/wimpy(src) - P.fire(angle) diff --git a/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm b/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm index 903cfd9c2ed6..d6b0c80b8825 100644 --- a/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm +++ b/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm @@ -267,7 +267,7 @@ adjust_charge - take a positive or negative value to adjust the charge level /datum/species/preternis/bullet_act(obj/item/projectile/P, mob/living/carbon/human/H) // called before a projectile hit if(istype(P, /obj/item/projectile/energy/nuclear_particle)) - H.fire_nuclear_particle_wimpy() + H.fire_nuclear_particle() H.visible_message(span_danger("[P] deflects off of [H]!"), span_userdanger("[P] deflects off of you!")) return 1 return 0