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

rej cleanup

Browse Source
This commit is contained in:
LetterJay
2017-05-17 03:50:34 -05:00
parent 3516852582
commit f978e3d56e
20 changed files with 0 additions and 531 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/gravitygenerator.dm.rej
-22
View File
@@ -1,22 +0,0 @@
diff a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm (rejected hunks)
@@ -303,17 +303,17 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne
use_power = on ? 2 : 1
// Sound the alert if gravity was just enabled or disabled.
var/alert = 0
- var/area/area = get_area(src)
+ var/area/A = get_area(src)
if(on && SSticker.IsRoundInProgress()) // If we turned on and the game is live.
if(gravity_in_level() == 0)
alert = 1
investigate_log("was brought online and is now producing gravity for this level.", "gravity")
- message_admins("The gravity generator was brought online. (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>[area.name]</a>)")
+ message_admins("The gravity generator was brought online [A][ADMIN_COORDJMP(src)]")
else
if(gravity_in_level() == 1)
alert = 1
investigate_log("was brought offline and there is now no gravity for this level.", "gravity")
- message_admins("The gravity generator was brought offline with no backup generator. (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>[area.name]</a>)")
+ message_admins("The gravity generator was brought offline with no backup generator. [A][ADMIN_COORDJMP(src)]")
update_icon()
update_list()
code/modules/power/singularity/emitter.dm.rej
-15
View File
@@ -1,15 +0,0 @@
diff a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm (rejected hunks)
@@ -98,9 +98,10 @@
/obj/machinery/power/emitter/Destroy()
if(SSticker && SSticker.IsRoundInProgress())
- message_admins("Emitter deleted at ([x],[y],[z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)",0,1)
- log_game("Emitter deleted at ([x],[y],[z])")
- investigate_log("<font color='red'>deleted</font> at ([x],[y],[z]) at [get_area(src)]","singulo")
+ var/turf/T = get_turf(src)
+ message_admins("Emitter deleted at [ADMIN_COORDJMP(T)]",0,1)
+ log_game("Emitter deleted at [COORD(T)]")
+ investigate_log("<font color='red'>deleted</font> at [get_area(src)] [COORD(T)]","singulo")
QDEL_NULL(sparks)
return ..()
code/modules/power/smes.dm.rej
-17
View File
@@ -1,17 +0,0 @@
diff a/code/modules/power/smes.dm b/code/modules/power/smes.dm (rejected hunks)
@@ -192,10 +192,11 @@
/obj/machinery/power/smes/Destroy()
if(SSticker && SSticker.IsRoundInProgress())
- var/area/area = get_area(src)
- message_admins("SMES deleted at (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>[area.name]</a>)")
- log_game("SMES deleted at ([area.name])")
- investigate_log("<font color='red'>deleted</font> at ([area.name])","singulo")
+ var/area/A = get_area(src)
+ var/turf/T = get_turf(src)
+ message_admins("SMES deleted at [A][ADMIN_JMP(T)]")
+ log_game("SMES deleted at [A][COORD(T)]")
+ investigate_log("<font color='red'>deleted</font> at [A][COORD(T)]","singulo")
if(terminal)
disconnect_terminal()
return ..()