cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-17 18:13:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds a funny little message if you focus too hard on a singulo/teslo (#20815)

Browse Source 
* tele thingy

* grammar!

* new singulo message

* clasuse guarded (and more grammar)

* grammar, indentations, removes a useless return

* Update code/modules/power/singularity/singularity.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
This commit is contained in:
1080pCat
2023-04-22 17:29:02 +10:00
committed by GitHub
parent 4a5fb011e6
commit d315a74ca5
3 changed files with 34 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/singularity/singularity.dm
+13 -1
View File
@@ -75,6 +75,19 @@
consume(user)
return 1
/obj/singularity/attack_tk(mob/user)
if(!iscarbon(user))
return
var/mob/living/carbon/C = user
investigate_log("has consumed the brain of [key_name(C)] after being touched with telekinesis", "singulo")
C.visible_message("<span class='danger'>[C] suddenly slumps over.</span>", \
"<span class='userdanger'>As you concentrate on the singularity, your understanding of the cosmos expands exponentially. An immense wealth of raw information is at your fingertips, and you're determined not to squander a single morsel. Within mere microseconds, you absorb a staggering amount of information—more than any AI could ever hope to access—and you can't help but feel a godlike sense of power. However, the gravity of this situation swiftly sinks in. As you sense your skull starting to collapse under pressure, you can't help but admit to yourself: That was a really dense idea, wasn't it?</span>")
var/obj/item/organ/internal/brain/B = C.get_int_organ(/obj/item/organ/internal/brain)
C.ghostize(0)
if(B)
B.remove(C)
qdel(B)
/obj/singularity/Process_Spacemove() //The singularity stops drifting for no man!
return 0
@@ -421,7 +434,6 @@
M.Stun(6 SECONDS)
M.visible_message("<span class='danger'>[M] stares blankly at [src]!</span>", \
"<span class='userdanger'>You look directly into [src] and feel weak.</span>")
return
/obj/singularity/proc/emp_area()
code/modules/power/supermatter/supermatter.dm
+10 -9
View File
@@ -672,16 +672,17 @@
Consume(B)
/obj/machinery/atmospherics/supermatter_crystal/attack_tk(mob/user)
if(iscarbon(user))
var/mob/living/carbon/C = user
investigate_log("has consumed the brain of [key_name(C)] after being touched with telekinesis", "supermatter")
C.visible_message("<span class='danger'>[C] suddenly slumps over.</span>", \
if(!iscarbon(user))
return
var/mob/living/carbon/C = user
investigate_log("has consumed the brain of [key_name(C)] after being touched with telekinesis", "supermatter")
C.visible_message("<span class='danger'>[C] suddenly slumps over.</span>", \
"<span class='userdanger'>As you mentally focus on the supermatter you feel the contents of your skull start melting away. That was a really dense idea.</span>")
var/obj/item/organ/internal/brain/B = C.get_int_organ(/obj/item/organ/internal/brain)
C.ghostize(0)
if(B)
B.remove(C)
qdel(B)
var/obj/item/organ/internal/brain/B = C.get_int_organ(/obj/item/organ/internal/brain)
C.ghostize(0)
if(B)
B.remove(C)
qdel(B)
/obj/machinery/atmospherics/supermatter_crystal/attack_alien(mob/user)
dust_mob(user, cause = "alien attack")
code/modules/power/tesla/energy_ball.dm
+11 -8
View File
@@ -160,14 +160,17 @@
dust_mobs(AM)
/obj/singularity/energy_ball/attack_tk(mob/user)
if(iscarbon(user))
var/mob/living/carbon/C = user
to_chat(C, "<span class='userdanger'>That was a shockingly dumb idea.</span>")
var/obj/item/organ/internal/brain/B = C.get_int_organ(/obj/item/organ/internal/brain)
C.ghostize(0)
if(B)
B.remove(C)
qdel(B)
if(!iscarbon(user))
return
var/mob/living/carbon/C = user
investigate_log("has consumed the brain of [key_name(C)] after being touched with telekinesis", "singulo")
C.visible_message("<span class='danger'>[C] suddenly slumps over.</span>", \
"<span class='userdanger'>As you mentally focus on the energy ball you feel the contents of your skull become overcharged. That was shockingly stupid.</span>")
var/obj/item/organ/internal/brain/B = C.get_int_organ(/obj/item/organ/internal/brain)
C.ghostize(0)
if(B)
B.remove(C)
qdel(B)
/// When we get orbited, add the orbiter to our tracked balls
/obj/singularity/energy_ball/proc/on_start_orbit(atom/movable/this, atom/orbiter)