mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-21 04:57:57 +01:00
my only regret is not thinking of this first
This commit is contained in:
File diff suppressed because it is too large
Load Diff
@@ -285,6 +285,7 @@ var/list/bloody_footprints_cache = list()
|
||||
#define TURF_WET_LUBE 2
|
||||
#define TURF_WET_ICE 3
|
||||
#define TURF_WET_PERMAFROST 4
|
||||
#define TURF_WET_SLIDE 5
|
||||
|
||||
//Maximum amount of time, (in approx. seconds.) a tile can be wet for.
|
||||
#define MAXIMUM_WET_TIME 300
|
||||
|
||||
@@ -95,7 +95,7 @@
|
||||
C.spin(1,1)
|
||||
return 1
|
||||
|
||||
/turf/open/proc/MakeSlippery(wet_setting = TURF_WET_WATER, min_wet_time = 0, wet_time_to_add = 0) // 1 = Water, 2 = Lube, 3 = Ice
|
||||
/turf/open/proc/MakeSlippery(wet_setting = TURF_WET_WATER, min_wet_time = 0, wet_time_to_add = 0) // 1 = Water, 2 = Lube, 3 = Ice, 4 = Permafrost, 5 = Slide
|
||||
wet_time = max(wet_time+wet_time_to_add, min_wet_time)
|
||||
if(wet >= wet_setting)
|
||||
return
|
||||
|
||||
@@ -30,6 +30,7 @@ var/list/icons_to_ignore_at_floor_init = list("damaged1","damaged2","damaged3","
|
||||
intact = 1
|
||||
var/broken = 0
|
||||
var/burnt = 0
|
||||
var/pryable = 1 //can we pry up tiles?
|
||||
var/floor_tile = null //tile that this floor drops
|
||||
var/obj/item/stack/tile/builtin_tile = null //needed for performance reasons when the singularity rips off floor tiles
|
||||
var/list/broken_states = list("damaged1", "damaged2", "damaged3", "damaged4", "damaged5")
|
||||
@@ -141,6 +142,8 @@ var/list/icons_to_ignore_at_floor_init = list("damaged1","damaged2","damaged3","
|
||||
return 1
|
||||
if(..())
|
||||
return 1
|
||||
if(pryable == 0)
|
||||
return 1
|
||||
if(intact && istype(C, /obj/item/weapon/crowbar))
|
||||
if(broken || burnt)
|
||||
broken = 0
|
||||
|
||||
@@ -104,12 +104,14 @@
|
||||
if(!M.slip(0, 3, null, NO_SLIP_WHEN_WALKING))
|
||||
M.inertia_dir = 0
|
||||
if(TURF_WET_LUBE)
|
||||
if(M.slip(0, 4, null, (SLIDE|GALOSHES_DONT_HELP)))
|
||||
if(M.slip(0, 4, null, (SLIDE|GALOSHES_DONT_HELP)))
|
||||
M.confused = max(M.confused, 8)
|
||||
if(TURF_WET_ICE)
|
||||
M.slip(0, 6, null, (SLIDE|GALOSHES_DONT_HELP))
|
||||
if(TURF_WET_ICE || TURF_WET_PERMAFROST)
|
||||
M.slip(0, 4, null, (SLIDE|NO_SLIP_WHEN_WALKING))
|
||||
if(TURF_WET_SLIDE)
|
||||
M.slip(0, 4, null, (SLIDE|GALOSHES_DONT_HELP))
|
||||
|
||||
/turf/proc/is_plasteel_floor()
|
||||
return 0
|
||||
|
||||
+1
-1
@@ -43,8 +43,8 @@
|
||||
#include "code\__DEFINES\reagents.dm"
|
||||
#include "code\__DEFINES\role_preferences.dm"
|
||||
#include "code\__DEFINES\say.dm"
|
||||
#include "code\__DEFINES\sight.dm"
|
||||
#include "code\__DEFINES\shuttles.dm"
|
||||
#include "code\__DEFINES\sight.dm"
|
||||
#include "code\__DEFINES\stat.dm"
|
||||
#include "code\__DEFINES\tablecrafting.dm"
|
||||
#include "code\__DEFINES\tgui.dm"
|
||||
|
||||
Reference in New Issue
Block a user