Fixes #2978
Fixes #3084
This commit is contained in:
skull132
2017-07-18 12:22:52 +03:00
committed by GitHub
parent b39c6b61c7
commit 97817469d2
2 changed files with 11 additions and 25 deletions
+3 -16
View File
@@ -79,7 +79,8 @@
set category = "Object"
set src in view(usr, 1)
set name = "Print Data"
if(usr.stat || !(istype(usr,/mob/living/carbon/human)))
if(use_check(usr))
usr << "No."
return
@@ -159,21 +160,7 @@
P.info = "<tt>[scan_data]</tt>"
P.icon_state = "paper_words"
if(istype(usr,/mob/living/carbon))
// place the item in the usr's hand if possible
if(!usr.r_hand)
P.loc = usr
usr.r_hand = P
P.layer = 20
else if(!usr.l_hand)
P.loc = usr
usr.l_hand = P
P.layer = 20
if (ismob(src.loc))
var/mob/M = src.loc
M.update_inv_l_hand()
M.update_inv_r_hand()
usr.put_in_hands(P)
/obj/item/weapon/autopsy_scanner/attack(mob/living/carbon/human/M as mob, mob/living/carbon/user as mob)
if(!istype(M))
+8 -9
View File
@@ -29,8 +29,8 @@
if (istype(src, /mob/living))
ghostize()
return ..()
return ..()
/mob/proc/remove_screen_obj_references()
flash = null
@@ -211,7 +211,7 @@
/mob/proc/is_physically_disabled()
return incapacitated(INCAPACITATION_DISABLED)
/mob/proc/cannot_stand()
return incapacitated(INCAPACITATION_KNOCKDOWN)
@@ -746,7 +746,7 @@
LAZYREMOVE(client.holder.watched_processes, ctrl)
else
ctrl.stat_entry()
if(statpanel("MC"))
stat("CPU:", world.cpu)
stat("Tick Usage:", world.tick_usage)
@@ -766,7 +766,7 @@
for(var/datum/controller/subsystem/SS in Master.subsystems)
if (!Master.initializing && SS.flags & SS_NO_DISPLAY)
continue
SS.stat_entry()
if(listed_turf && client)
@@ -1137,12 +1137,11 @@ mob/proc/yank_out_object()
return
/mob/verb/face_direction()
set name = "Face Direction"
set category = "IC"
set src = usr
set_face_dir()
set_face_dir(dir)
if(!facing_dir)
usr << "You are now not facing anything."
@@ -1175,11 +1174,11 @@ mob/proc/yank_out_object()
if (dest != loc && istype(dest, /atom/movable))
AM = dest
LAZYADD(AM.contained_mobs, src)
if (istype(loc, /atom/movable))
AM = loc
LAZYREMOVE(AM.contained_mobs, src)
. = ..()
/mob/verb/northfaceperm()