cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6976 from uraniummeltdown/tilefix

Browse Source 
Fixes Tile Quick-Replacing
This commit is contained in:
Fox McCloud
2017-03-28 17:51:34 -04:00
committed by GitHub
parent 804d304aca 7ed224ace8
commit a90d78bd71
2 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/turfs/simulated/floor.dm
+14 -10
View File
@@ -142,16 +142,7 @@ var/list/icons_to_ignore_at_floor_init = list("damaged1","damaged2","damaged3","
pry_tile(C, user)
return 1
if(intact && istype(C, /obj/item/stack/tile))
var/obj/item/stack/tile/T = C
if(T.turf_type == type)
return
var/obj/item/weapon/crowbar/CB = user.get_inactive_hand(/obj/item/weapon/crowbar)
if(!CB)
return
var/turf/simulated/floor/plating/P = pry_tile(CB, user, TRUE)
if(!istype(P))
return
P.attackby(T, user, params)
try_replace_tile(C, user, params)
if(istype(C, /obj/item/pipe))
var/obj/item/pipe/P = C
if(P.pipe_type != -1) // ANY PIPE
@@ -177,6 +168,19 @@ var/list/icons_to_ignore_at_floor_init = list("damaged1","damaged2","damaged3","
return 1
return 0
/turf/simulated/floor/proc/try_replace_tile(obj/item/stack/tile/T, mob/user, params)
if(T.turf_type == type)
return
var/obj/item/weapon/crowbar/CB
if(iscrowbar(user.get_inactive_hand()))
CB = user.get_inactive_hand()
if(!CB)
return
var/turf/simulated/floor/plating/P = pry_tile(CB, user, TRUE)
if(!istype(P))
return
P.attackby(T, user, params)
/turf/simulated/floor/proc/pry_tile(obj/item/C, mob/user, silent = FALSE)
playsound(src, C.usesound, 80, 1)
return remove_tile(user, silent)
code/game/turfs/simulated/floor/fancy_floor.dm
+15
View File
@@ -15,6 +15,21 @@
pry_tile(C, user)
return
/turf/simulated/floor/wood/try_replace_tile(obj/item/stack/tile/T, mob/user, params)
if(T.turf_type == type)
return
var/obj/item/weapon/tool
if(isscrewdriver(user.get_inactive_hand()))
tool = user.get_inactive_hand()
if(!tool && iscrowbar(user.get_inactive_hand()))
tool = user.get_inactive_hand()
if(!tool)
return
var/turf/simulated/floor/plating/P = pry_tile(tool, user, TRUE)
if(!istype(P))
return
P.attackby(T, user, params)
/turf/simulated/floor/wood/pry_tile(obj/item/C, mob/user, silent = FALSE)
var/is_screwdriver = isscrewdriver(C)
playsound(src, C.usesound, 80, 1)