Reverts banana peel and soap to slip whilst walking
No longer slip whilst lying down
No longer slip whilst getting in and out of a closet containing a
slippery item
This commit is contained in:
VampyrBytes
2016-02-10 08:36:19 +00:00
parent 5f16ed4a78
commit eabd94e844
2 changed files with 7 additions and 3 deletions
@@ -23,7 +23,7 @@
/obj/item/weapon/bananapeel/Crossed(AM as mob|obj)
if (istype(AM, /mob/living/carbon))
var/mob/living/carbon/M = AM
M.slip("banana peel", 4, 2, 0, 1)
M.slip("banana peel", 4, 2)
/*
* Soap
@@ -31,7 +31,7 @@
/obj/item/weapon/soap/Crossed(AM as mob|obj) //EXACTLY the same as bananapeel for now, so it makes sense to put it in the same dm -- Urist
if (istype(AM, /mob/living/carbon))
var/mob/living/carbon/M = AM
M.slip("soap", 4, 2, 0, 1)
M.slip("soap", 4, 2)
/obj/item/weapon/soap/afterattack(atom/target, mob/user as mob, proximity)
if(!proximity) return
+5 -1
View File
@@ -771,7 +771,11 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump,
/mob/living/carbon/proc/slip(var/description, var/stun, var/weaken, var/tilesSlipped, var/walkSafely, var/slipAny)
if (flying || buckled || (walkSafely && m_intent == "walk"))
if (flying || buckled || lying || (walkSafely && m_intent == "walk"))
return
if (istype(loc, /obj/structure/closet)) // for getting in a locker
return
for (var/obj/structure/closet/closet in loc.contents) // for getting out of a locker
return
if (!(slipAny))
if (istype(src, /mob/living/carbon/human))