Merge branch 'master' into upstream-merge-32188

This commit is contained in:
deathride58
2017-11-18 05:31:42 +00:00
committed by GitHub
109 changed files with 452 additions and 425 deletions
+5
View File
@@ -537,6 +537,11 @@
admin_delete(D)
href_list["datumrefresh"] = href_list["delete"]
else if(href_list["osay"])
if(!check_rights(R_FUN, 0))
return
usr.client.object_say(locate(href_list["osay"]))
else if(href_list["regenerateicons"])
if(!check_rights(0))
return
+1 -1
View File
@@ -416,7 +416,7 @@
for(var/datum/disease/advance/AD in SSdisease.active_diseases)
AD.Refresh()
for(var/mob/living/carbon/human/H in shuffle(GLOB.living_mob_list))
for(var/mob/living/carbon/human/H in shuffle(GLOB.alive_mob_list))
if(!(H.z in GLOB.station_z_levels))
continue
if(!H.HasDisease(D))
+2 -2
View File
@@ -944,7 +944,7 @@
log_admin("[key_name(usr)] has rev'ed [current].")
else
return
if("headrev")
if(has_antag_datum(/datum/antagonist/rev))
var/datum/antagonist/rev/rev = has_antag_datum(/datum/antagonist/rev)
@@ -1046,7 +1046,7 @@
log_admin("[key_name(usr)] has de-changeling'ed [current].")
if("changeling")
var/datum/antagonist/changeling/C = make_Changling()
to_chat(current, "<span class='boldannounce'>Your powers are awoken. A flash of memory returns to us...we are [C.changelingID], a changeling!</span>")
to_chat(current, "<span class='boldannounce'>Our powers have awoken. A flash of memory returns to us...we are [C.changelingID], a changeling!</span>")
message_admins("[key_name_admin(usr)] has changeling'ed [current].")
log_admin("[key_name(usr)] has changeling'ed [current].")
if("autoobjectives")