cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-25 14:00:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

67 errors, 0 warnings (#4)

Browse Source
This commit is contained in:
Bedshaped
2016-10-16 12:34:07 +03:00
committed by skull132
parent 0b5e0b7961
commit 0dba7bc83f
6 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/mob.dm
+3 -3
View File
@@ -192,7 +192,7 @@
/mob/proc/is_physically_disabled()
return incapacitated(INCAPACITATION_DISABLED)
/mob/proc/incapacitated(var/incapacitation_flags = INCAPACITATION_DEFAULT)
if ((incapacitation_flags & INCAPACITATION_DISABLED) && (stat || paralysis || stunned || weakened || resting || sleeping || (status_flags & FAKEDEATH)))
return 1
@@ -1027,13 +1027,13 @@ mob/proc/yank_out_object()
if (ishuman(U))
var/mob/living/carbon/human/human_user = U
human_user.bloody_hands(H)
else if(issilicon(src))
var/mob/living/silicon/robot/R = src
R.embedded -= selection
R.adjustBruteLoss(5)
R.adjustFireLoss(10)
selection.forceMove(get_turf(src))
if(!(U.l_hand && U.r_hand))
U.put_in_hands(selection)