Bug fixes (#2109, #1437, and AI Slipper) (#2227)

Fixes #2109
Fixes #1437
This commit is contained in:
Ron
2017-05-14 06:34:10 -04:00
committed by skull132
parent 2e2a92b39a
commit 9543d5628b
3 changed files with 10 additions and 2 deletions

View File

@@ -8,7 +8,6 @@
idle_power_usage = 10
var/uses = 20
var/disabled = 1
var/lethal = 0
var/locked = 1
var/cooldown_time = 0
var/cooldown_timeleft = 0

View File

@@ -231,6 +231,9 @@
if (!customname)
usr << "<span class='warning'>Cancelled.</span>"
return
var/announce = alert(user, "Do you wish to announce the fax being sent?", "Announce Fax", "Yes", "No")
if(announce == "Yes")
announce = 1
// Create the reply message
var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( null ) //hopefully the null loc won't cause trouble for us
@@ -248,6 +251,8 @@
P.stamps += "<HR><i>This paper has been stamped by the Central Command Quantum Relay.</i>"
if(fax.recievefax(P))
if(announce == 1)
command_announcement.Announce("A fax has been sent to the [department] fax machine.", "Fax Sent")
usr << "<span class='notice'>Message transmitted successfully.</span>"
log_and_message_admins("sent a fax message to the [department] fax machine. (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[fax.x];Y=[fax.y];Z=[fax.z]'>JMP</a>)")

View File

@@ -250,7 +250,7 @@
if(O.mind && O.mind.current && O.mind.current.stat != DEAD) continue
ghost = O
break
if(ghost)
if(ghost && !(ghost.has_enabled_antagHUD && config.antag_hud_restricted))
icon_state = "golem2"
else
icon_state = "golem"
@@ -265,6 +265,10 @@
if(!ghost)
user << "The rune fizzles uselessly. There is no spirit nearby."
return
if(ghost.has_enabled_antagHUD && config.antag_hud_restricted)
ghost <<"You can not join as a golem with antagHUD on!"
user << "The rune fizzles uselessly. There is no spirit nearby."
return
var/mob/living/carbon/human/G = new(src.loc)
G.set_species("Golem")
G.key = ghost.key