Merge pull request #4004 from volas/master

Minor fixes
This commit is contained in:
Zuhayr
2013-12-05 02:56:06 -08:00
3 changed files with 11 additions and 6 deletions

View File

@@ -109,10 +109,13 @@ var/list/alldepartments = list("Central Command")
if(href_list["remove"]) if(href_list["remove"])
if(tofax) if(tofax)
tofax.loc = usr.loc if(!ishuman(usr))
usr.put_in_hands(tofax) usr << "<span class='warning'>You can't do it.</span>"
usr << "<span class='notice'>You take the paper out of \the [src].</span>" else
tofax = null tofax.loc = usr.loc
usr.put_in_hands(tofax)
usr << "<span class='notice'>You take the paper out of \the [src].</span>"
tofax = null
if(href_list["scan"]) if(href_list["scan"])
if (scan) if (scan)

View File

@@ -423,6 +423,8 @@
set desc = "Flips a non-reinforced table" set desc = "Flips a non-reinforced table"
set category = "Object" set category = "Object"
set src in oview(1) set src in oview(1)
if(ismouse(usr))
return
if (!can_touch(usr)) if (!can_touch(usr))
return return
if(!flip(get_cardinal_dir(usr,src))) if(!flip(get_cardinal_dir(usr,src)))

View File

@@ -869,8 +869,8 @@ obj/item/weapon/organ/head/New(loc, mob/living/carbon/human/H)
H.regenerate_icons() H.regenerate_icons()
H.stat = 2 brainmob.stat = 2
H.death() brainmob.death()
obj/item/weapon/organ/head/proc/transfer_identity(var/mob/living/carbon/human/H)//Same deal as the regular brain proc. Used for human-->head obj/item/weapon/organ/head/proc/transfer_identity(var/mob/living/carbon/human/H)//Same deal as the regular brain proc. Used for human-->head
brainmob = new(src) brainmob = new(src)