Merge branch 'master' into upstream-merge-26131

This commit is contained in:
LetterJay
2017-05-02 09:19:49 -05:00
committed by GitHub
422 changed files with 16923 additions and 9597 deletions
@@ -93,6 +93,7 @@
connect_to_network()
sparks = new
sparks.attach(src)
sparks.set_up(5, TRUE, src)
/obj/machinery/power/emitter/Destroy()
+1 -1
View File
@@ -32,7 +32,7 @@
if(energy > 0)
if(energy >= 200)
var/turf/T = get_turf(src)
feedback_add_details("engine_started","[src.type]")
SSblackbox.add_details("engine_started","[src.type]")
var/obj/singularity/S = new creation_type(T, 50)
transfer_fingerprints_to(S)
qdel(src)
+1 -1
View File
@@ -39,7 +39,7 @@
narsie_spawn_animation()
sleep(70)
SSshuttle.emergency.request(null, 0.1) // Cannot recall
SSshuttle.emergency.request(null, set_coefficient = 0.1) // Cannot recall
/obj/singularity/narsie/large/attack_ghost(mob/dead/observer/user as mob)