Slipping Refactor and Floors

This commit is contained in:
Fox-McCloud
2016-01-04 21:22:59 -05:00
parent 103372e92b
commit 4221d033ab
25 changed files with 194 additions and 83 deletions
@@ -70,4 +70,26 @@
throw_range = 7
flags = CONDUCT
turf_type = /turf/simulated/floor/plasteel
mineralType = "metal"
mineralType = "metal"
/obj/item/stack/tile/fakespace
name = "astral carpet"
singular_name = "astral carpet"
desc = "A piece of carpet with a convincing star pattern."
icon_state = "tile_space"
turf_type = /turf/simulated/floor/fakespace
/obj/item/stack/tile/fakespace/loaded
amount = 30
//High-traction
/obj/item/stack/tile/noslip
name = "high-traction floor tile"
singular_name = "high-traction floor tile"
desc = "A high-traction floor tile. It feels rubbery in your hand."
icon_state = "tile_noslip"
turf_type = /turf/simulated/floor/noslip
origin_tech = "materials=3"
/obj/item/stack/tile/noslip/loaded
amount = 20
@@ -116,6 +116,7 @@
/obj/item/clothing/under/syndicate/tacticool,
/obj/item/weapon/storage/box/fakesyndiesuit,
/obj/item/toy/crossbow/tommygun,
/obj/item/stack/tile/fakespace/loaded,
)
if(!ispath(gift_type,/obj/item)) return
+1 -1
View File
@@ -80,7 +80,7 @@
handle_rotation()
if(istype(src.loc, /turf/simulated))
var/turf/simulated/T = src.loc
if(T.wet == 2) //Lube! Fall off!
if(T.wet == TURF_WET_LUBE) //Lube! Fall off!
playsound(src, 'sound/misc/slip.ogg', 50, 1, -3)
buckled_mob.Stun(7)
buckled_mob.Weaken(7)