cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-16 13:13:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update floor_attackby.dm

Browse Source
This commit is contained in:
Spades
2018-09-01 18:38:23 -04:00
committed by GitHub
parent 301ef7cc55
commit 9e77d6a16f
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,8 +9,6 @@
attack_tile(C, L) // Be on help intent if you want to decon something. attack_tile(C, L) // Be on help intent if you want to decon something.
return return
<<<<<<< HEAD
=======
if(istype(C, /obj/item/stack/tile/roofing)) if(istype(C, /obj/item/stack/tile/roofing))
var/expended_tile = FALSE // To track the case. If a ceiling is built in a multiz zlevel, it also necessarily roofs it against weather var/expended_tile = FALSE // To track the case. If a ceiling is built in a multiz zlevel, it also necessarily roofs it against weather
var/turf/T = GetAbove(src) var/turf/T = GetAbove(src)
@@ -55,7 +53,6 @@
break break
return return
>>>>>>> 14d8df2... Merge pull request #5424 from Neerti/outdoor_shuttle_fix
if(flooring) if(flooring)
if(istype(C, /obj/item/weapon)) if(istype(C, /obj/item/weapon))
try_deconstruct_tile(C, user) try_deconstruct_tile(C, user)
@@ -159,4 +156,4 @@
return return
if(flooring) if(flooring)
return return
attackby(T, user) attackby(T, user)