mirror of
https://github.com/yogstation13/Yogstation.git
synced 2025-02-26 09:04:50 +00:00
Fixes slips
This commit is contained in:
@@ -95,7 +95,7 @@
|
|||||||
/obj/effect/particle_effect/foam/Crossed(atom/movable/AM)
|
/obj/effect/particle_effect/foam/Crossed(atom/movable/AM)
|
||||||
if(istype(AM, /mob/living/carbon))
|
if(istype(AM, /mob/living/carbon))
|
||||||
var/mob/living/carbon/M = AM
|
var/mob/living/carbon/M = AM
|
||||||
M.slip(5, src)
|
M.slip(100, src)
|
||||||
|
|
||||||
/obj/effect/particle_effect/foam/metal/Crossed(atom/movable/AM)
|
/obj/effect/particle_effect/foam/metal/Crossed(atom/movable/AM)
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
/obj/item/device/pda/clown/Crossed(AM as mob|obj)
|
/obj/item/device/pda/clown/Crossed(AM as mob|obj)
|
||||||
if (istype(AM, /mob/living/carbon))
|
if (istype(AM, /mob/living/carbon))
|
||||||
var/mob/living/carbon/M = AM
|
var/mob/living/carbon/M = AM
|
||||||
if(M.slip(6, src, NO_SLIP_WHEN_WALKING))
|
if(M.slip(120, src, NO_SLIP_WHEN_WALKING))
|
||||||
if (ishuman(M) && (M.real_name != src.owner))
|
if (ishuman(M) && (M.real_name != src.owner))
|
||||||
if (istype(src.cartridge, /obj/item/weapon/cartridge/virus/clown))
|
if (istype(src.cartridge, /obj/item/weapon/cartridge/virus/clown))
|
||||||
var/obj/item/weapon/cartridge/virus/cart = src.cartridge
|
var/obj/item/weapon/cartridge/virus/cart = src.cartridge
|
||||||
|
|||||||
@@ -50,7 +50,7 @@
|
|||||||
/obj/item/weapon/soap/Crossed(AM as mob|obj)
|
/obj/item/weapon/soap/Crossed(AM as mob|obj)
|
||||||
if (istype(AM, /mob/living/carbon))
|
if (istype(AM, /mob/living/carbon))
|
||||||
var/mob/living/carbon/M = AM
|
var/mob/living/carbon/M = AM
|
||||||
M.slip(4, src)
|
M.slip(80, src)
|
||||||
|
|
||||||
/obj/item/weapon/soap/afterattack(atom/target, mob/user, proximity)
|
/obj/item/weapon/soap/afterattack(atom/target, mob/user, proximity)
|
||||||
if(!proximity || !check_allowed_items(target))
|
if(!proximity || !check_allowed_items(target))
|
||||||
|
|||||||
@@ -281,7 +281,7 @@
|
|||||||
var/mob/living/L = O
|
var/mob/living/L = O
|
||||||
if(wash_mob(L)) //it's a carbon mob.
|
if(wash_mob(L)) //it's a carbon mob.
|
||||||
var/mob/living/carbon/C = L
|
var/mob/living/carbon/C = L
|
||||||
C.slip(4,null,NO_SLIP_WHEN_WALKING)
|
C.slip(80,null,NO_SLIP_WHEN_WALKING)
|
||||||
else
|
else
|
||||||
wash_obj(O)
|
wash_obj(O)
|
||||||
|
|
||||||
|
|||||||
@@ -168,17 +168,17 @@
|
|||||||
return
|
return
|
||||||
switch(wet)
|
switch(wet)
|
||||||
if(TURF_WET_WATER)
|
if(TURF_WET_WATER)
|
||||||
if(!M.slip(3, null, NO_SLIP_WHEN_WALKING))
|
if(!M.slip(60, null, NO_SLIP_WHEN_WALKING))
|
||||||
M.inertia_dir = 0
|
M.inertia_dir = 0
|
||||||
if(TURF_WET_LUBE)
|
if(TURF_WET_LUBE)
|
||||||
if(M.slip(4, null, (SLIDE|GALOSHES_DONT_HELP)))
|
if(M.slip(80, null, (SLIDE|GALOSHES_DONT_HELP)))
|
||||||
M.confused = max(M.confused, 8)
|
M.confused = max(M.confused, 8)
|
||||||
if(TURF_WET_ICE)
|
if(TURF_WET_ICE)
|
||||||
M.slip(6, null, (SLIDE|GALOSHES_DONT_HELP))
|
M.slip(120, null, (SLIDE|GALOSHES_DONT_HELP))
|
||||||
if(TURF_WET_PERMAFROST)
|
if(TURF_WET_PERMAFROST)
|
||||||
M.slip(6, null, (SLIDE_ICE|GALOSHES_DONT_HELP))
|
M.slip(120, null, (SLIDE_ICE|GALOSHES_DONT_HELP))
|
||||||
if(TURF_WET_SLIDE)
|
if(TURF_WET_SLIDE)
|
||||||
M.slip(4, null, (SLIDE|GALOSHES_DONT_HELP))
|
M.slip(80, null, (SLIDE|GALOSHES_DONT_HELP))
|
||||||
//melting
|
//melting
|
||||||
if(isobj(AM) && air && air.temperature > T0C)
|
if(isobj(AM) && air && air.temperature > T0C)
|
||||||
var/obj/O = AM
|
var/obj/O = AM
|
||||||
|
|||||||
@@ -117,5 +117,5 @@
|
|||||||
/obj/item/weapon/grown/bananapeel/specialpeel/Crossed(AM)
|
/obj/item/weapon/grown/bananapeel/specialpeel/Crossed(AM)
|
||||||
if(iscarbon(AM))
|
if(iscarbon(AM))
|
||||||
var/mob/living/carbon/carbon = AM
|
var/mob/living/carbon/carbon = AM
|
||||||
if(carbon.slip(2, src, FALSE))
|
if(carbon.slip(40, src, FALSE))
|
||||||
qdel(src)
|
qdel(src)
|
||||||
|
|||||||
@@ -214,9 +214,9 @@
|
|||||||
return
|
return
|
||||||
|
|
||||||
if(!istype(G, /obj/item/weapon/grown/bananapeel) && (!G.reagents || !G.reagents.has_reagent("lube")))
|
if(!istype(G, /obj/item/weapon/grown/bananapeel) && (!G.reagents || !G.reagents.has_reagent("lube")))
|
||||||
stun_len /= 3
|
stun_len /= 1.5
|
||||||
|
|
||||||
var/knockdown = min(stun_len, 7)
|
var/knockdown = min(stun_len, 14)
|
||||||
|
|
||||||
if(M.slip(knockdown, G))
|
if(M.slip(knockdown, G))
|
||||||
for(var/datum/plant_gene/trait/T in seed.genes)
|
for(var/datum/plant_gene/trait/T in seed.genes)
|
||||||
|
|||||||
@@ -555,7 +555,7 @@
|
|||||||
addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound, get_turf(user), 'sound/items/bikehorn.ogg', 300, 1), 25)
|
addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound, get_turf(user), 'sound/items/bikehorn.ogg', 300, 1), 25)
|
||||||
if(user.mind && user.mind.assigned_role == "Clown")
|
if(user.mind && user.mind.assigned_role == "Clown")
|
||||||
for(var/mob/living/carbon/C in listeners)
|
for(var/mob/living/carbon/C in listeners)
|
||||||
C.slip(0,7 * power_multiplier)
|
C.slip(140 * power_multiplier)
|
||||||
cooldown = COOLDOWN_MEME
|
cooldown = COOLDOWN_MEME
|
||||||
|
|
||||||
//RIGHT ROUND
|
//RIGHT ROUND
|
||||||
|
|||||||
Reference in New Issue
Block a user