cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-24 12:37:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Deprecate the stream operator

Browse Source
This commit is contained in:
Arokha Sieyes
2020-02-12 19:38:43 -05:00
committed by Leshana
parent c8a8987610
commit 47ccc655db
762 changed files with 4492 additions and 4464 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/singularity/field_generator.dm
+7 -7
View File
@@ -83,7 +83,7 @@ field_generator power level display
if(state == 2)
if(get_dist(src, user) <= 1)//Need to actually touch the thing to turn it on
if(src.active >= 1)
user << "You are unable to turn off the [src.name] once it is online."
to_chat(user, "You are unable to turn off the [src.name] once it is online.")
return 1
else
user.visible_message("[user.name] turns on the [src.name]", \
@@ -95,13 +95,13 @@ field_generator power level display
src.add_fingerprint(user)
else
user << "The [src] needs to be firmly secured to the floor first."
to_chat(user, "The [src] needs to be firmly secured to the floor first.")
return
/obj/machinery/field_generator/attackby(obj/item/W, mob/user)
if(active)
user << "The [src] needs to be off."
to_chat(user, "The [src] needs to be off.")
return
else if(W.is_wrench())
switch(state)
@@ -120,13 +120,13 @@ field_generator power level display
"You hear ratchet")
src.anchored = 0
if(2)
user << "<font color='red'>The [src.name] needs to be unwelded from the floor.</font>"
to_chat(user, "<font color='red'>The [src.name] needs to be unwelded from the floor.</font>")
return
else if(istype(W, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/WT = W
switch(state)
if(0)
user << "<font color='red'>The [src.name] needs to be wrenched to the floor.</font>"
to_chat(user, "<font color='red'>The [src.name] needs to be wrenched to the floor.</font>")
return
if(1)
if (WT.remove_fuel(0,user))
@@ -137,7 +137,7 @@ field_generator power level display
if (do_after(user,20 * WT.toolspeed))
if(!src || !WT.isOn()) return
state = 2
user << "You weld the field generator to the floor."
to_chat(user, "You weld the field generator to the floor.")
else
return
if(2)
@@ -149,7 +149,7 @@ field_generator power level display
if (do_after(user,20 * WT.toolspeed))
if(!src || !WT.isOn()) return
state = 1
user << "You cut the [src] free from the floor."
to_chat(user, "You cut the [src] free from the floor.")
else
return
else
code/modules/power/singularity/particle_accelerator/particle.dm
+1 -1
View File
@@ -78,7 +78,7 @@
var/radiation = (energy*2)
M.apply_effect((radiation*3),IRRADIATE,0)
M.updatehealth()
//M << "<font color='red'>You feel odd.</font>"
//to_chat(M, "<font color='red'>You feel odd.</font>")
/obj/effect/accelerated_particle/proc/move(var/lag)
code/modules/power/singularity/singularity.dm
+6 -6
View File
@@ -37,7 +37,7 @@ GLOBAL_LIST_BOILERPLATE(all_singularities, /obj/singularity)
energy = starting_energy
..()
START_PROCESSING(SSobj, src)
START_PROCESSING(SSobj, src)
for(var/obj/machinery/power/singularity_beacon/singubeacon in machines)
if(singubeacon.active)
target = singubeacon
@@ -427,11 +427,11 @@ GLOBAL_LIST_BOILERPLATE(all_singularities, /obj/singularity)
if (istype(M,/mob/living/carbon/human))
var/mob/living/carbon/human/H = M
if(istype(H.glasses,/obj/item/clothing/glasses/meson) && current_size != STAGE_SUPER)
H << "<span class=\"notice\">You look directly into The [src.name], good thing you had your protective eyewear on!</span>"
to_chat(H, "<span class=\"notice\">You look directly into The [src.name], good thing you had your protective eyewear on!</span>")
return
else
H << "<span class=\"warning\">You look directly into The [src.name], but your eyewear does absolutely nothing to protect you from it!</span>"
M << "<span class='danger'>You look directly into The [src.name] and feel [current_size == STAGE_SUPER ? "helpless" : "weak"].</span>"
to_chat(H, "<span class=\"warning\">You look directly into The [src.name], but your eyewear does absolutely nothing to protect you from it!</span>")
to_chat(M, "<span class='danger'>You look directly into The [src.name] and feel [current_size == STAGE_SUPER ? "helpless" : "weak"].</span>")
M.apply_effect(3, STUN)
for(var/mob/O in viewers(M, null))
O.show_message(text("<span class='danger'>[] stares blankly at The []!</span>", M, src), 1)
@@ -448,8 +448,8 @@ GLOBAL_LIST_BOILERPLATE(all_singularities, /obj/singularity)
to_chat(M, "<span class=\"warning\">You hear an uneartly ringing, then what sounds like a shrilling kettle as you are washed with a wave of heat.</span>")
to_chat(M, "<span class=\"notice\">Miraculously, it fails to kill you.</span>")
else
M << "<span class=\"danger\">You hear an uneartly ringing, then what sounds like a shrilling kettle as you are washed with a wave of heat.</span>"
M << "<span class=\"danger\">You don't even have a moment to react as you are reduced to ashes by the intense radiation.</span>"
to_chat(M, "<span class=\"danger\">You hear an uneartly ringing, then what sounds like a shrilling kettle as you are washed with a wave of heat.</span>")
to_chat(M, "<span class=\"danger\">You don't even have a moment to react as you are reduced to ashes by the intense radiation.</span>")
M.dust()
SSradiation.radiate(src, rand(energy))
return