shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tesla light

Browse Source
This commit is contained in:
CitadelStationBot
2017-05-05 10:27:18 -05:00
parent 1bb43eb7ae
commit 55c71ff5a9
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/singularity/narsie.dm
+2 -2
View File
@@ -26,8 +26,8 @@
grav_pull = 10 grav_pull = 10
consume_range = 12 //How many tiles out do we eat consume_range = 12 //How many tiles out do we eat
/obj/singularity/narsie/large/New() /obj/singularity/narsie/large/Initialize()
..() . = ..()
send_to_playing_players("<span class='narsie'>NAR-SIE HAS RISEN</span>") send_to_playing_players("<span class='narsie'>NAR-SIE HAS RISEN</span>")
send_to_playing_players(pick('sound/hallucinations/im_here1.ogg', 'sound/hallucinations/im_here2.ogg')) send_to_playing_players(pick('sound/hallucinations/im_here1.ogg', 'sound/hallucinations/im_here2.ogg'))
code/modules/power/singularity/singularity.dm
+2 -2
View File
@@ -29,12 +29,12 @@
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
dangerous_possession = TRUE dangerous_possession = TRUE
/obj/singularity/New(loc, var/starting_energy = 50, var/temp = 0) /obj/singularity/Initialize(mapload, starting_energy = 50)
//CARN: admin-alert for chuckle-fuckery. //CARN: admin-alert for chuckle-fuckery.
admin_investigate_setup() admin_investigate_setup()
src.energy = starting_energy src.energy = starting_energy
..() . = ..()
START_PROCESSING(SSobj, src) START_PROCESSING(SSobj, src)
GLOB.poi_list |= src GLOB.poi_list |= src
GLOB.singularities |= src GLOB.singularities |= src
code/modules/power/tesla/energy_ball.dm
+6 -1
View File
@@ -40,6 +40,11 @@ GLOBAL_LIST_INIT(blacklisted_tesla_types, typecacheof(list(/obj/machinery/atmosp
var/energy_to_raise = 32 var/energy_to_raise = 32
var/energy_to_lower = -20 var/energy_to_lower = -20
/obj/singularity/energy_ball/Initialize(mapload, starting_energy = 50, is_miniball = FALSE)
. = ..()
if(!is_miniball)
set_light(10, 7, "#EEEEFF")
/obj/singularity/energy_ball/ex_act(severity, target) /obj/singularity/energy_ball/ex_act(severity, target)
return return
@@ -117,7 +122,7 @@ GLOBAL_LIST_INIT(blacklisted_tesla_types, typecacheof(list(/obj/machinery/atmosp
/obj/singularity/energy_ball/proc/new_mini_ball() /obj/singularity/energy_ball/proc/new_mini_ball()
if(!loc) if(!loc)
return return
var/obj/singularity/energy_ball/EB = new(loc) var/obj/singularity/energy_ball/EB = new(loc, 0, TRUE)
EB.transform *= pick(0.3, 0.4, 0.5, 0.6, 0.7) EB.transform *= pick(0.3, 0.4, 0.5, 0.6, 0.7)
var/icon/I = icon(icon,icon_state,dir) var/icon/I = icon(icon,icon_state,dir)