Skip to content

Commit

Permalink
[MIRROR] Fixes misapplication of CAN_BE_DIRTY_1 (floors should now …
Browse files Browse the repository at this point in the history
…spawn dirty) [MDB IGNORE] (#25420) (#966)

* Fixes misapplication of `CAN_BE_DIRTY_1` (floors should now spawn dirty)

* Update floor.dm

---------

Co-authored-by: SkyratBot <[email protected]>
Co-authored-by: san7890 <[email protected]>
Co-authored-by: Bloop <[email protected]>
  • Loading branch information
4 people authored Dec 4, 2023
1 parent da9be9f commit ac0dccb
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
3 changes: 2 additions & 1 deletion code/game/turfs/open/asteroid.dm
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,8 @@ GLOBAL_LIST_EMPTY(dug_up_basalt)

/// Exact subtype as parent, just used in ruins to prevent other ruins/chasms from spawning on top of it.
/turf/open/misc/asteroid/snow/icemoon/do_not_chasm
turf_flags = CAN_BE_DIRTY_1 | IS_SOLID | NO_RUST | NO_RUINS
flags_1 = CAN_BE_DIRTY_1
turf_flags = IS_SOLID | NO_RUST | NO_RUINS

/turf/open/misc/asteroid/snow/icemoon/do_not_scrape
flags_1 = CAN_BE_DIRTY_1
Expand Down
2 changes: 1 addition & 1 deletion code/game/turfs/open/floor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
barefootstep = FOOTSTEP_HARD_BAREFOOT
clawfootstep = FOOTSTEP_HARD_CLAW
heavyfootstep = FOOTSTEP_GENERIC_HEAVY
flags_1 = CAN_BE_DIRTY_1 | NO_SCREENTIPS_1
flags_1 = NO_SCREENTIPS_1 | CAN_BE_DIRTY_1
turf_flags = IS_SOLID
smoothing_groups = SMOOTH_GROUP_TURF_OPEN + SMOOTH_GROUP_OPEN_FLOOR
canSmoothWith = SMOOTH_GROUP_TURF_OPEN + SMOOTH_GROUP_OPEN_FLOOR
Expand Down
4 changes: 2 additions & 2 deletions code/game/turfs/open/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
name = "coder/mapper fucked up"
desc = "report on github please"

flags_1 = NO_SCREENTIPS_1
turf_flags = CAN_BE_DIRTY_1 | IS_SOLID | NO_RUST
flags_1 = NO_SCREENTIPS_1 | CAN_BE_DIRTY_1
turf_flags = IS_SOLID | NO_RUST

footstep = FOOTSTEP_FLOOR
barefootstep = FOOTSTEP_HARD_BAREFOOT
Expand Down

0 comments on commit ac0dccb

Please sign in to comment.