Bug fixes, map fixes

This commit is contained in:
Markolie
2014-12-22 14:47:58 +01:00
parent 37aa0254fc
commit 47f4161fbb
12 changed files with 442 additions and 398 deletions
@@ -1605,10 +1605,6 @@
if(istype(idcard, /obj/item/weapon/card/id/syndicate))
threatcount -= 5
// Pingsky now actually harbors anti-human sentiment! -Dave
if(istype(judgebot, /obj/machinery/bot/secbot/pingsky) && istype(src, /mob/living/carbon/human/human/))
threatcount += 1
return threatcount
/mob/living/carbon/human/canBeHandcuffed()
+1 -1
View File
@@ -83,7 +83,7 @@
if (!message)
return
var/obj/machinery/hologram/holopad/T = src.current
var/obj/machinery/hologram/holopad/T = src.holo
if(istype(T) && T.hologram && T.master == src)//If there is a hologram and its master is the user.
var/message_a = say_quote(message)