cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-24 05:23:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Animal traps fixes and improvement (#6152)

Browse Source 
Fixes #6150

Animal traps now visually display what prey is inside of them by adding mob's icon as underlay.

Tesla no longer logs spawn of new miniballs

Fixes main changelog where it is supposed to be addition.

Fixes #6158

Examining animal trap with prey now also displays examine message of the prey itself too.
This commit is contained in:
Mykhailo Bykhovtsev
2019-04-05 23:58:10 +03:00
committed by Erki
parent 82da8c4184
commit cfe684a8a4
4 changed files with 84 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/tesla/energy_ball.dm
+7 -5
View File
@@ -51,10 +51,6 @@
pixel_x = 0
pixel_y = 0
// This now does just the animation of all balls shooting main ball
for (var/obj/singularity/energy_ball/ball in orbiting_balls)
ball.Beam(src, icon_state="lightning[rand(1,12)]", icon = 'icons/effects/effects.dmi', time=2)
// Instead of miniballs shooting stuff, decided to make it just count the power produced.
dir = tesla_zap(src, 10, TESLA_DEFAULT_POWER + orbiting_balls.len * TESLA_MINI_POWER, TRUE)
@@ -66,6 +62,12 @@
if(energy < 0)
qdel(src)
/obj/singularity/energy_ball/admin_investigate_setup()
if(orbiting)
return
else
..()
/obj/singularity/energy_ball/examine(mob/user)
..()
if(orbiting_balls.len)
@@ -338,7 +340,7 @@
var/obj/singularity/energy_ball/E = source
if(E.energy && (E.orbiting_balls.len > rods_count * 4)) // so that miniballs don't fry stuff.
melt = TRUE// 1 grounding rod can handle max 4 balls
E.visible_message(span("danger", "All [E.orbiting_balls.len] energize for a second, sending their energy to the main ball, which redirects it at the nearest object! Sacraficing one of its miniballs!"))
E.visible_message(span("danger", "All [E.orbiting_balls.len] energize for a second, sending their energy to the main ball, which redirects it at the nearest object! Sacrificing one of its miniballs!"))
for(var/obj/singularity/energy_ball/mini in E.orbiting_balls)
mini.Beam(source, icon_state="lightning[rand(1,12)]", icon = 'icons/effects/effects.dmi', time=2)
playsound(source.loc, 'sound/magic/lightning_chargeup.ogg', 100, 1, extrarange = 30)