Merge pull request #8464 from PsiOmegaDelta/dev-freeze

Dev freeze
This commit is contained in:
PsiOmegaDelta
2015-03-13 14:22:21 +01:00
+2 -2
View File
@@ -617,7 +617,7 @@ var/list/slot_equipment_priority = list( \
pulling.pulledby = null
pulling = null
if(pullin)
pullin.icon_state = "pull1"
pullin.icon_state = "pull0"
/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!
@@ -645,7 +645,7 @@ var/list/slot_equipment_priority = list( \
AM.pulledby = src
if(pullin)
pullin.icon_state = "pull0"
pullin.icon_state = "pull1"
if(ishuman(AM))
var/mob/living/carbon/human/H = AM