cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 02:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2022-05-27 15:56:27 -04:00
committed by GitHub
parent 501bb21152
commit b7d722638a
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/game/turfs/simulated/floor_attackby.dm
View File

@@ -66,10 +66,6 @@
to_chat(user, "<span class='warning'>You must remove the [flooring.descriptor] first.</span>")
return
else if(istype(C, /obj/item/stack/tile))
<<<<<<< HEAD
try_replace_tile(C, user)
return
=======
if(try_replace_tile(C, user))
return
else if(istype(C, /obj/item/stack/tile/floor)) // While we're at it, let's see if this is a raw patch of natural sand, dirt, or whatever that you're trying to put a plating on.
@@ -86,7 +82,6 @@
ChangeTurf(/turf/simulated/floor, preserve_outdoors = TRUE)
return
>>>>>>> 1c2423edf4... Merge pull request #13002 from foopwo/servingupaplating
// Floor is plating (or no flooring)
else