cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into dev-freeze

Browse Source
This commit is contained in:
PsiOmega
2015-03-13 14:21:38 +01:00
parent caf55dff1f eafa205818
commit ac25b0a614
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/mob/mob.dm
View File

@@ -617,7 +617,7 @@ var/list/slot_equipment_priority = list( \
pulling.pulledby = null pulling.pulledby = null
pulling = null pulling = null
if(pullin) if(pullin)
pullin.icon_state = "pull1" pullin.icon_state = "pull0"
/mob/proc/start_pulling(var/atom/movable/AM) /mob/proc/start_pulling(var/atom/movable/AM)
if ( !AM || !usr || src==AM || !isturf(src.loc) ) //if there's no person pulling OR the person is pulling themself OR the object being pulled is inside something: abort! if ( !AM || !usr || src==AM || !isturf(src.loc) ) //if there's no person pulling OR the person is pulling themself OR the object being pulled is inside something: abort!
@@ -645,7 +645,7 @@ var/list/slot_equipment_priority = list( \
AM.pulledby = src AM.pulledby = src
if(pullin) if(pullin)
pullin.icon_state = "pull0" pullin.icon_state = "pull1"
if(ishuman(AM)) if(ishuman(AM))
var/mob/living/carbon/human/H = AM var/mob/living/carbon/human/H = AM