cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-29 23:17:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	code/modules/client/preference/preferences.dm
	icons/mob/uniform.dmi
This commit is contained in:
Tigercat2000
2016-06-13 20:11:29 -07:00
parent 07e5957645 d9b1739b38
commit d5ae124a92
553 changed files with 13704 additions and 6739 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/mob.dm
+1 -16
View File
@@ -904,13 +904,8 @@ var/list/slot_equipment_priority = list( \
/mob/proc/can_use_hands()
return
/mob/proc/is_active()
return (0 >= usr.stat)
/mob/proc/is_mechanical()
if(mind && (mind.assigned_role == "Cyborg" || mind.assigned_role == "AI"))
return 1
return istype(src, /mob/living/silicon) || get_species() == "Machine"
return mind && (mind.assigned_role == "Cyborg" || mind.assigned_role == "AI")
/mob/proc/is_ready()
return client && !!mind
@@ -937,19 +932,9 @@ var/list/slot_equipment_priority = list( \
/mob/proc/get_gender()
return gender
/mob/proc/see(message)
if(!is_active())
return 0
to_chat(src, message)
return 1
/mob/proc/is_muzzled()
return 0
/mob/proc/show_viewers(message)
for(var/mob/M in viewers())
M.see(message)
/mob/Stat()
..()