Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

[s] #7292

Merged
alexkar598 merged 2 commits into from
Dec 11, 2019
Merged

[s] #7292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1fd738e
Update reinf_floor.dm
alexkar598 Dec 10, 2019
8f6edb6
Update pipe.dm
alexkar598 Dec 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion code/game/turfs/simulated/floor/reinf_floor.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

/turf/open/floor/engine
name = "reinforced floor"
desc = "Extremely sturdy."
Expand Down Expand Up @@ -33,6 +32,9 @@
/turf/open/floor/engine/try_replace_tile(obj/item/stack/tile/T, mob/user, params)
return

/turf/open/floor/engine/remove_tile(mob/user, silent = FALSE, make_tile = TRUE)
return
Copy link
Contributor

@Amelia0010 Amelia0010 Dec 10, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
return
.=..()
ScrapeAway(flags = CHANGETURF_INHERIT_AIR)

Copy link
Member Author

@alexkar598 alexkar598 Dec 10, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No that makes it be stupid and counter the point of reinforced floors being nearly indestructible by any means


/turf/open/floor/engine/crowbar_act(mob/living/user, obj/item/I)
return

Expand Down
4 changes: 1 addition & 3 deletions code/modules/recycling/disposal/pipe.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,7 @@

if(isfloorturf(T)) //intact floor, pop the tile
floorturf = T
if(floorturf.floor_tile)
new floorturf.floor_tile(T)
floorturf.make_plating()
floorturf.remove_tile()

if(direction) // direction is specified
if(isspaceturf(T)) // if ended in space, then range is unlimited
Expand Down