Automatic MC Re-Starter 9000 (#319)

* fixed runtime in air.dm

fix was made in LINDA_turf_tile.dm though

* fixes runtime in corpse.dm

* fixes runtime in species.dm

* automatically restarts the MC sometimes

When the timer SS crashes, here's the fix

hardcoded with love

* supermatter area icon

* better admin logs

* better mentorhelp message for admins

* fixes map
This commit is contained in:
TalkingCactus
2017-03-27 03:16:56 -04:00
committed by GitHub
parent e84d099e44
commit 756180afd6
8 changed files with 44001 additions and 111126 deletions
@@ -247,7 +247,10 @@
excited_group.dismantle_cooldown = 0
atmos_cooldown = 0
/turf/open/proc/high_pressure_movements()
/turf/proc/high_pressure_movements()
return
/turf/open/high_pressure_movements()
for(var/atom/movable/M in src)
M.experience_pressure_difference(pressure_difference, pressure_direction)
+2 -1
View File
@@ -120,7 +120,8 @@
if (NOAROUSAL in H.dna.species.species_traits)
H.canbearoused = FALSE
else
H.canbearoused = H.client.prefs.arousable
if(H.client)
H.canbearoused = H.client.prefs.arousable
if(husk)
H.Drain()
+3 -2
View File
@@ -14,7 +14,8 @@
if(!mob) return //this doesn't happen
var/show_char = config.mentors_mobname_only
var/mentor_msg = "<span class='mentornotice'><b><font color='purple'>MENTORHELP:</b> <b>[key_name_mentor(src, 1, 0, 1, show_char)]</b>: [msg]</font></span>"
var/mentor_msg = "<span class='mentornotice'><b><font color='purple'>MENTORHELP:</b> <b>[key_name_mentor(src, 1, 0, 0, show_char)]</b>: [msg]</font></span>"
var/admin_msg = "<span class='mentornotice'><b><font color='purple'>MENTORHELP:</b> <b>[ADMIN_FULLMONTY(src.mob)]</b>: [msg]</font></span>"
log_mentor("MENTORHELP: [key_name_mentor(src, 0, 0, 0, 0)]: [msg]")
for(var/client/X in mentors)
@@ -23,7 +24,7 @@
for(var/client/A in admins)
to_chat(A, 'sound/items/bikehorn.ogg')
to_chat(A, mentor_msg)
to_chat(A, admin_msg)
to_chat(src, "<span class='mentornotice'><font color='purple'>PM to-<b>Mentors</b>: [msg]</font></span>")
return
@@ -162,7 +162,8 @@
if(NOAROUSAL in species_traits)
C.canbearoused = FALSE
else
C.canbearoused = C.client.prefs.arousable
if(C.client)
C.canbearoused = C.client.prefs.arousable
/datum/species/proc/on_species_loss(mob/living/carbon/C)
if(C.dna.species.exotic_bloodtype)
+8 -5
View File
@@ -156,14 +156,17 @@
stop_pulling()
// Inform Admins
var/prey_braindead
var/prey_stat
if(prey.ckey)
prey_stat = prey.stat//only return this if they're not an unmonkey or whatever
if(!prey.client)//if they disconnected, tell us
prey_braindead = 1
if (pred == user)
message_admins("[key_name(pred)] ate [key_name(prey)]. ([pred ? "<a href='?_src_=holder;adminplayerobservecoodjump=1;X=[pred.x];Y=[pred.y];Z=[pred.z]'>JMP</a>" : "null"])")
message_admins("[ADMIN_LOOKUPFLW(pred)] ate [ADMIN_LOOKUPFLW(prey)][!prey_braindead ? "" : " (BRAINDEAD)"][prey_stat ? " (DEAD/UNCONSCIOUS)" : ""].")
log_attack("[key_name(pred)] ate [key_name(prey)]")
else if (prey == !client && stat != DEAD)
message_admins("[key_name(pred)] ate [key_name(prey)] (braindead) ([pred ? "<a href='?_src_=holder;adminplayerobservecoodjump=1;X=[pred.x];Y=[pred.y];Z=[pred.z]'>JMP</a>" : "null"])")
log_attack("[key_name(pred)] ate [key_name(prey)] (braindead)")
else
message_admins("[key_name(user)] forced [key_name(pred)] to eat [key_name(prey)]. ([pred ? "<a href='?_src_=holder;adminplayerobservecoodjump=1;X=[pred.x];Y=[pred.y];Z=[pred.z]'>JMP</a>" : "null"])")
message_admins("[ADMIN_LOOKUPFLW(user)] forced [ADMIN_LOOKUPFLW(pred)] to eat [ADMIN_LOOKUPFLW(prey)].")
log_attack("[key_name(user)] forced [key_name(pred)] to eat [key_name(prey)].")
return TRUE