shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos

Browse Source
This commit is contained in:
Putnam
2021-03-02 01:44:58 -08:00
parent 707cde3903 0d7b25dec6
commit f07a9c13fb
477 changed files with 6805 additions and 1201 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/turfs/simulated/floor.dm
+1 -1
View File
@@ -171,7 +171,7 @@
/turf/open/floor/proc/try_replace_tile(obj/item/stack/tile/T, mob/user, params)
if(T.turf_type == type)
return
var/obj/item/crowbar/CB = user.is_holding_item_of_type(/obj/item/crowbar)
var/obj/item/CB = user.is_holding_tool_quality(TOOL_CROWBAR)
if(!CB)
return
var/turf/open/floor/plating/P = pry_tile(CB, user, TRUE)
code/game/turfs/simulated/floor/fancy_floor.dm
+2 -2
View File
@@ -32,9 +32,9 @@
/turf/open/floor/wood/try_replace_tile(obj/item/stack/tile/T, mob/user, params)
if(T.turf_type == type)
return
var/obj/item/tool = user.is_holding_item_of_type(/obj/item/screwdriver)
var/obj/item/tool = user.is_holding_tool_quality(TOOL_SCREWDRIVER)
if(!tool)
tool = user.is_holding_item_of_type(/obj/item/crowbar)
tool = user.is_holding_tool_quality(TOOL_CROWBAR)
if(!tool)
return
var/turf/open/floor/plating/P = pry_tile(tool, user, TRUE)
code/game/turfs/simulated/wall/reinf_walls.dm
+13 -13
View File
@@ -65,7 +65,7 @@
//DECONSTRUCTION
switch(d_state)
if(INTACT)
if(istype(W, /obj/item/wirecutters))
if(W.tool_behaviour == TOOL_WIRECUTTER)
W.play_tool_sound(src, 100)
d_state = SUPPORT_LINES
update_icon()
@@ -73,7 +73,7 @@
return 1
if(SUPPORT_LINES)
if(istype(W, /obj/item/screwdriver))
if(W.tool_behaviour == TOOL_SCREWDRIVER)
to_chat(user, "<span class='notice'>You begin unsecuring the support lines...</span>")
if(W.use_tool(src, user, 40, volume=100))
if(!istype(src, /turf/closed/wall/r_wall) || d_state != SUPPORT_LINES)
@@ -83,7 +83,7 @@
to_chat(user, "<span class='notice'>You unsecure the support lines.</span>")
return 1
else if(istype(W, /obj/item/wirecutters))
else if(W.tool_behaviour == TOOL_WIRECUTTER)
W.play_tool_sound(src, 100)
d_state = INTACT
update_icon()
@@ -91,7 +91,7 @@
return 1
if(COVER)
if(istype(W, /obj/item/weldingtool) || istype(W, /obj/item/gun/energy/plasmacutter))
if(W.tool_behaviour == TOOL_WELDER || istype(W, /obj/item/gun/energy/plasmacutter))
if(!W.tool_start_check(user, amount=0))
return
to_chat(user, "<span class='notice'>You begin slicing through the metal cover...</span>")
@@ -103,7 +103,7 @@
to_chat(user, "<span class='notice'>You press firmly on the cover, dislodging it.</span>")
return 1
if(istype(W, /obj/item/screwdriver))
if(W.tool_behaviour == TOOL_SCREWDRIVER)
to_chat(user, "<span class='notice'>You begin securing the support lines...</span>")
if(W.use_tool(src, user, 40, volume=100))
if(!istype(src, /turf/closed/wall/r_wall) || d_state != COVER)
@@ -114,7 +114,7 @@
return 1
if(CUT_COVER)
if(istype(W, /obj/item/crowbar))
if(W.tool_behaviour == TOOL_CROWBAR)
to_chat(user, "<span class='notice'>You struggle to pry off the cover...</span>")
if(W.use_tool(src, user, 100, volume=100))
if(!istype(src, /turf/closed/wall/r_wall) || d_state != CUT_COVER)
@@ -124,7 +124,7 @@
to_chat(user, "<span class='notice'>You pry off the cover.</span>")
return 1
if(istype(W, /obj/item/weldingtool))
if(W.tool_behaviour == TOOL_WELDER)
if(!W.tool_start_check(user, amount=0))
return
to_chat(user, "<span class='notice'>You begin welding the metal cover back to the frame...</span>")
@@ -137,7 +137,7 @@
return 1
if(ANCHOR_BOLTS)
if(istype(W, /obj/item/wrench))
if(W.tool_behaviour == TOOL_WRENCH)
to_chat(user, "<span class='notice'>You start loosening the anchoring bolts which secure the support rods to their frame...</span>")
if(W.use_tool(src, user, 40, volume=100))
if(!istype(src, /turf/closed/wall/r_wall) || d_state != ANCHOR_BOLTS)
@@ -147,7 +147,7 @@
to_chat(user, "<span class='notice'>You remove the bolts anchoring the support rods.</span>")
return 1
if(istype(W, /obj/item/crowbar))
if(W.tool_behaviour == TOOL_CROWBAR)
to_chat(user, "<span class='notice'>You start to pry the cover back into place...</span>")
if(W.use_tool(src, user, 20, volume=100))
if(!istype(src, /turf/closed/wall/r_wall) || d_state != ANCHOR_BOLTS)
@@ -158,7 +158,7 @@
return 1
if(SUPPORT_RODS)
if(istype(W, /obj/item/weldingtool) || istype(W, /obj/item/gun/energy/plasmacutter))
if(W.tool_behaviour == TOOL_WELDER || istype(W, /obj/item/gun/energy/plasmacutter))
if(!W.tool_start_check(user, amount=0))
return
to_chat(user, "<span class='notice'>You begin slicing through the support rods...</span>")
@@ -170,7 +170,7 @@
to_chat(user, "<span class='notice'>You slice through the support rods.</span>")
return 1
if(istype(W, /obj/item/wrench))
if(W.tool_behaviour == TOOL_WRENCH)
to_chat(user, "<span class='notice'>You start tightening the bolts which secure the support rods to their frame...</span>")
W.play_tool_sound(src, 100)
if(W.use_tool(src, user, 40))
@@ -182,7 +182,7 @@
return 1
if(SHEATH)
if(istype(W, /obj/item/crowbar))
if(W.tool_behaviour == TOOL_CROWBAR)
to_chat(user, "<span class='notice'>You struggle to pry off the outer sheath...</span>")
if(W.use_tool(src, user, 100, volume=100))
if(!istype(src, /turf/closed/wall/r_wall) || d_state != SHEATH)
@@ -191,7 +191,7 @@
dismantle_wall()
return 1
if(istype(W, /obj/item/weldingtool))
if(W.tool_behaviour == TOOL_WELDER)
if(!W.tool_start_check(user, amount=0))
return
to_chat(user, "<span class='notice'>You begin welding the support rods back together...</span>")
code/game/turfs/simulated/walls.dm
+2 -2
View File
@@ -199,7 +199,7 @@
if((user.a_intent != INTENT_HELP) || !LAZYLEN(dent_decals))
return FALSE
if(istype(W, /obj/item/weldingtool))
if(W.tool_behaviour == TOOL_WELDER)
if(!W.tool_start_check(user, amount=0))
return FALSE
@@ -233,7 +233,7 @@
return FALSE
/turf/closed/wall/proc/try_decon(obj/item/I, mob/user, turf/T)
if(istype(I, /obj/item/weldingtool) || istype(I, /obj/item/gun/energy/plasmacutter))
if(I.tool_behaviour == TOOL_WELDER || istype(I, /obj/item/gun/energy/plasmacutter))
if(!I.tool_start_check(user, amount=0))
return FALSE