cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-24 05:30:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Finally fixes SS decay (#12978)

Browse Source 
* wew

* wwwooops

* Update floor.dm

* wew
This commit is contained in:
Gandalf
2022-04-22 00:03:03 +01:00
committed by GitHub
parent b5ee1b34a0
commit 906348bb9a
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/turfs/open/floor.dm
+2 -2
View File
@@ -11,8 +11,8 @@
barefootstep = FOOTSTEP_HARD_BAREFOOT
clawfootstep = FOOTSTEP_HARD_CLAW
heavyfootstep = FOOTSTEP_GENERIC_HEAVY
flags_1 = NO_SCREENTIPS_1
turf_flags = CAN_BE_DIRTY_1 | IS_SOLID/// SKYRAT EDIT - Overriden in modular_skyrat\modules\decay_subsystem\code\decay_turf_handling.dm
flags_1 = CAN_BE_DIRTY_1 | IS_SOLID
turf_flags = IS_SOLID
smoothing_groups = list(SMOOTH_GROUP_TURF_OPEN, SMOOTH_GROUP_OPEN_FLOOR)
canSmoothWith = list(SMOOTH_GROUP_OPEN_FLOOR, SMOOTH_GROUP_TURF_OPEN)
modular_skyrat/modules/decay_subsystem/code/decaySS.dm
+3 -2
View File
@@ -43,11 +43,10 @@ SUBSYSTEM_DEF(decay)
message_admins("SSDecay will not interact with this round.")
log_world("SSDecay will not interact with this round.")
return ..()
for(var/turf/iterating_turf in world)
if(!is_station_level(iterating_turf.z))
continue
if(!(iterating_turf.turf_flags & CAN_BE_DIRTY_1))
if(!(iterating_turf.flags_1 & CAN_BE_DIRTY_1))
continue
possible_turfs += iterating_turf
@@ -87,6 +86,8 @@ SUBSYSTEM_DEF(decay)
new /obj/effect/decal/cleanable/dirt(iterating_floor)
for(var/turf/closed/iterating_wall in possible_turfs)
if(HAS_TRAIT(iterating_wall, TRAIT_RUSTY))
continue
if(prob(WALL_RUST_PERCENT_CHANCE * severity_modifier))
iterating_wall.AddElement(/datum/element/rust)
modular_skyrat/modules/decay_subsystem/code/decay_turf_handling.dm
+6 -3
View File
@@ -1,11 +1,14 @@
/turf/open/floor
turf_flags = CAN_BE_DIRTY_1 | CAN_DECAY_BREAK_1 // We do it this way because we can then easily pick what we don't want to be broken.
turf_flags = CAN_DECAY_BREAK_1 // We do it this way because we can then easily pick what we don't want to be broken.
/turf/closed/wall
flags_1 = CAN_BE_DIRTY_1
/turf/open/floor/plating
turf_flags = CAN_BE_DIRTY_1 /// No breaking the plating
turf_flags = NONE /// No breaking the plating
/turf/open/floor/glass
turf_flags = CAN_BE_DIRTY_1 /// No breaking the glass (doesn't leave plating behind)
turf_flags = NONE /// No breaking the glass (doesn't leave plating behind)
/turf/open/misc/asteroid
turf_flags = NONE /// They shouldn't break and they shouldn't be dirty, it's literally already a dirty turf.