cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-26 13:37:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into face_lock

Browse Source 
# Conflicts:
#	code/modules/mob/mob.dm
This commit is contained in:
tigercat2000
2018-05-17 20:21:39 -07:00
parent 3d55fb6a83 709f2b5ff6
commit 85a19c9935
944 changed files with 11247 additions and 15005 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/mob.dm
+4 -4
View File
@@ -169,7 +169,7 @@
/mob/proc/movement_delay()
return 0
/mob/proc/Life()
/mob/proc/Life(seconds, times_fired)
if(forced_look)
if(!isnum(forced_look))
var/atom/A = locateUID(forced_look)
@@ -472,7 +472,7 @@ var/list/slot_equipment_priority = list( \
if(!disable_warning)
to_chat(usr, "The [name] is too big to attach.")
return 0
if( istype(src, /obj/item/device/pda) || istype(src, /obj/item/pen) || is_type_in_list(src, H.wear_suit.allowed) )
if( istype(src, /obj/item/pda) || istype(src, /obj/item/pen) || is_type_in_list(src, H.wear_suit.allowed) )
if(H.s_store)
if(!(H.s_store.flags & NODROP))
return 2
@@ -929,7 +929,7 @@ var/list/slot_equipment_priority = list( \
// If they still have their ID they're not brigged.
for(var/obj/item/card/id/card in src)
return 0
for(var/obj/item/device/pda/P in src)
for(var/obj/item/pda/P in src)
if(P.id)
return 0
@@ -1329,4 +1329,4 @@ var/list/slot_equipment_priority = list( \
if(WEST)
D = NORTH
setDir(D)
spintime -= speed
spintime -= speed