Most of fox's changes

This commit is contained in:
Crazylemon64
2017-07-21 15:20:12 -07:00
parent a8e7716649
commit 807084e304
7 changed files with 18 additions and 11 deletions
+4 -5
View File
@@ -88,10 +88,10 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d
var/list/species_fit = null //This object has a different appearance when worn by these species
var/trip_verb = TV_TRIP
var/trip_bonus = 0
var/trip_chance = 0
var/trip_stun = 0
var/trip_weaken = 2
var/trip_weaken = 0
var/trip_any = FALSE
var/trip_walksafe = TRUE
var/trip_tiles = 0
@@ -541,10 +541,9 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d
return I == src
/obj/item/Crossed(atom/movable/AM)
if(ishuman(AM))
if(prob(trip_chance) && ishuman(AM))
var/mob/living/carbon/human/H = AM
if(prob(trip_bonus))
on_trip(H)
on_trip(H)
/obj/item/proc/on_trip(mob/living/carbon/human/H)
if(H.slip(src, trip_stun, trip_weaken, trip_tiles, trip_walksafe, trip_any, trip_verb))
@@ -55,7 +55,7 @@
trip_tiles = 4
trip_walksafe = FALSE
trip_bonus = 100
trip_chance = 100
/obj/item/weapon/grown/bananapeel/traitorpeel/on_trip(mob/living/carbon/human/H)
+1 -1
View File
@@ -12,7 +12,7 @@
trip_stun = 4
trip_weaken = 2
trip_bonus = 100
trip_chance = 100
trip_walksafe = FALSE
trip_verb = TV_SLIP