merge fixes

This commit is contained in:
Seris02
2020-02-07 15:28:05 +08:00
198 changed files with 7137 additions and 6861 deletions
+12
View File
@@ -428,6 +428,18 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
return I
return null
/proc/canGhostWrite(var/mob/A, var/obj/target, var/desc="", var/allow_all=FALSE)
if(allow_all & TRUE)
if(!target.GetComponent(/datum/component/anti_magic))
return 1
if(IsAdminGhost(A))
if (desc != "")
log_admin("GHOST: [key_name(A)] [desc] ([target.name] at [loc_name(target)])")
else
log_admin("GHOST: [key_name(A)] fucked with the [target.name] at [loc_name(target)]")
return 1
return 0
/proc/offer_control(mob/M)
to_chat(M, "Control of your mob has been offered to dead players.")
if(usr)