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

code folder. 221 files changed wew

Browse Source
This commit is contained in:
deathride58
2018-02-12 21:03:40 -05:00
parent e3ad2643b2
commit 72ff7be9bd
221 changed files with 2797 additions and 2172 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/turfs/simulated/floor.dm
+2 -2
View File
@@ -156,8 +156,8 @@
return
P.attackby(T, user, params)
/turf/open/floor/proc/pry_tile(obj/item/C, mob/user, silent = FALSE)
playsound(src, C.usesound, 80, 1)
/turf/open/floor/proc/pry_tile(obj/item/I, mob/user, silent = FALSE)
I.play_tool_sound(src, 80)
return remove_tile(user, silent)
/turf/open/floor/proc/remove_tile(mob/user, silent = FALSE, make_tile = TRUE)
code/game/turfs/simulated/floor/fancy_floor.dm
+1 -1
View File
@@ -39,7 +39,7 @@
/turf/open/floor/wood/pry_tile(obj/item/C, mob/user, silent = FALSE)
var/is_screwdriver = istype(C, /obj/item/screwdriver)
playsound(src, C.usesound, 80, 1)
C.play_tool_sound(src, 80)
return remove_tile(user, silent, make_tile = is_screwdriver)
/turf/open/floor/wood/remove_tile(mob/user, silent = FALSE, make_tile = TRUE)
code/game/turfs/simulated/floor/misc_floor.dm
+5 -10
View File
@@ -196,19 +196,14 @@
flick_overlay(I, viewing, 8)
L.adjustToxLoss(-3, TRUE, TRUE)
/turf/open/floor/clockwork/attackby(obj/item/I, mob/living/user, params)
/turf/open/floor/clockwork/crowbar_act(mob/living/user, obj/item/I)
if(baseturfs == type)
return
if(istype(I, /obj/item/crowbar))
user.visible_message("<span class='notice'>[user] begins slowly prying up [src]...</span>", "<span class='notice'>You begin painstakingly prying up [src]...</span>")
playsound(src, I.usesound, 20, 1)
if(!do_after(user, 70*I.toolspeed, target = src))
return 0
return TRUE
user.visible_message("<span class='notice'>[user] begins slowly prying up [src]...</span>", "<span class='notice'>You begin painstakingly prying up [src]...</span>")
if(I.use_tool(src, user, 70, volume=80))
user.visible_message("<span class='notice'>[user] pries up [src]!</span>", "<span class='notice'>You pry up [src]!</span>")
playsound(src, I.usesound, 80, 1)
make_plating()
return 1
return ..()
return TRUE
/turf/open/floor/clockwork/make_plating()
new /obj/item/stack/tile/brass(src)
code/game/turfs/simulated/floor/plating.dm
+9 -9
View File
@@ -78,15 +78,15 @@
playsound(src, 'sound/weapons/genhit.ogg', 50, 1)
else
to_chat(user, "<span class='warning'>This section is too damaged to support a tile! Use a welder to fix the damage.</span>")
else if(istype(C, /obj/item/weldingtool))
var/obj/item/weldingtool/welder = C
if( welder.isOn() && (broken || burnt) )
if(welder.remove_fuel(0,user))
to_chat(user, "<span class='danger'>You fix some dents on the broken plating.</span>")
playsound(src, welder.usesound, 80, 1)
icon_state = icon_plating
burnt = 0
broken = 0
/turf/open/floor/plating/welder_act(mob/living/user, obj/item/I)
if((broken || burnt) && I.use_tool(src, user, 0, volume=80))
to_chat(user, "<span class='danger'>You fix some dents on the broken plating.</span>")
icon_state = icon_plating
burnt = FALSE
broken = FALSE
return TRUE
/turf/open/floor/plating/foam
name = "metal foam plating"
code/game/turfs/simulated/floor/reinf_floor.dm
+8 -12
View File
@@ -25,18 +25,14 @@
..()
return //unplateable
/turf/open/floor/engine/attackby(obj/item/C, mob/user, params)
if(!C || !user)
return
if(istype(C, /obj/item/wrench))
to_chat(user, "<span class='notice'>You begin removing rods...</span>")
playsound(src, C.usesound, 80, 1)
if(do_after(user, 30*C.toolspeed, target = src))
if(!istype(src, /turf/open/floor/engine))
return
new /obj/item/stack/rods(src, 2)
ChangeTurf(/turf/open/floor/plating)
return
/turf/open/floor/engine/wrench_act(mob/living/user, obj/item/I)
to_chat(user, "<span class='notice'>You begin removing rods...</span>")
if(I.use_tool(src, user, 30, volume=80))
if(!istype(src, /turf/open/floor/engine))
return TRUE
new /obj/item/stack/rods(src, 2)
ChangeTurf(/turf/open/floor/plating)
return TRUE
/turf/open/floor/engine/acid_act(acidpwr, acid_volume)
acidpwr = min(acidpwr, 50) //we reduce the power so reinf floor never get melted.
code/game/turfs/simulated/lava.dm
+1 -1
View File
@@ -139,7 +139,7 @@
/turf/open/lava/smooth/lava_land_surface
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
planetary_atmos = TRUE
baseturfs = /turf/open/chasm/lavaland
baseturfs = /turf/open/lava/smooth/lava_land_surface
/turf/open/lava/smooth/airless
initial_gas_mix = "TEMP=2.7"
code/game/turfs/simulated/minerals.dm
-1
View File
@@ -60,7 +60,6 @@
return
last_act = world.time
to_chat(user, "<span class='notice'>You start picking...</span>")
P.playDigSound()
if(do_after(user,P.digspeed, target = src))
if(ismineralturf(src))
code/game/turfs/simulated/wall/reinf_walls.dm
+55 -88
View File
@@ -50,25 +50,24 @@
playsound(src, 'sound/effects/bang.ogg', 50, 1)
to_chat(M, "<span class='warning'>This wall is far too strong for you to destroy.</span>")
/turf/closed/wall/r_wall/try_destroy(obj/item/W, mob/user, turf/T)
if(istype(W, /obj/item/pickaxe/drill/jackhammer))
var/obj/item/pickaxe/drill/jackhammer/D = W
to_chat(user, "<span class='notice'>You begin to smash though the [name]...</span>")
/turf/closed/wall/r_wall/try_destroy(obj/item/I, mob/user, turf/T)
if(istype(I, /obj/item/pickaxe/drill/jackhammer))
to_chat(user, "<span class='notice'>You begin to smash though [src]...</span>")
if(do_after(user, 50, target = src))
if(!istype(src, /turf/closed/wall/r_wall) || !W)
return 1
D.playDigSound()
visible_message("<span class='warning'>[user] smashes through the [name] with the [D.name]!</span>", "<span class='italics'>You hear the grinding of metal.</span>")
if(!istype(src, /turf/closed/wall/r_wall))
return TRUE
I.play_tool_sound(src)
visible_message("<span class='warning'>[user] smashes through [src] with [I]!</span>", "<span class='italics'>You hear the grinding of metal.</span>")
dismantle_wall()
return 1
return 0
return TRUE
return FALSE
/turf/closed/wall/r_wall/try_decon(obj/item/W, mob/user, turf/T)
//DECONSTRUCTION
switch(d_state)
if(INTACT)
if(istype(W, /obj/item/wirecutters))
playsound(src, W.usesound, 100, 1)
W.play_tool_sound(src, 100)
d_state = SUPPORT_LINES
update_icon()
to_chat(user, "<span class='notice'>You cut the outer grille.</span>")
@@ -77,9 +76,8 @@
if(SUPPORT_LINES)
if(istype(W, /obj/item/screwdriver))
to_chat(user, "<span class='notice'>You begin unsecuring the support lines...</span>")
playsound(src, W.usesound, 100, 1)
if(do_after(user, 40*W.toolspeed, target = src))
if(!istype(src, /turf/closed/wall/r_wall) || !W || d_state != SUPPORT_LINES)
if(W.use_tool(src, user, 40, volume=100))
if(!istype(src, /turf/closed/wall/r_wall) || d_state != SUPPORT_LINES)
return 1
d_state = COVER
update_icon()
@@ -87,31 +85,19 @@
return 1
else if(istype(W, /obj/item/wirecutters))
playsound(src, W.usesound, 100, 1)
W.play_tool_sound(src, 100)
d_state = INTACT
update_icon()
to_chat(user, "<span class='notice'>You repair the outer grille.</span>")
return 1
if(COVER)
if(istype(W, /obj/item/weldingtool))
var/obj/item/weldingtool/WT = W
if(WT.remove_fuel(0,user))
to_chat(user, "<span class='notice'>You begin slicing through the metal cover...</span>")
playsound(src, W.usesound, 100, 1)
if(do_after(user, 60*W.toolspeed, target = src))
if(!istype(src, /turf/closed/wall/r_wall) || !WT || !WT.isOn() || d_state != COVER)
return 1
d_state = CUT_COVER
update_icon()
to_chat(user, "<span class='notice'>You press firmly on the cover, dislodging it.</span>")
return 1
if(istype(W, /obj/item/gun/energy/plasmacutter))
if(istype(W, /obj/item/weldingtool) || 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>")
playsound(src, 'sound/items/welder.ogg', 100, 1)
if(do_after(user, 60*W.toolspeed, target = src))
if(!istype(src, /turf/closed/wall/r_wall) || !W || d_state != COVER)
if(W.use_tool(src, user, 60, volume=100))
if(!istype(src, /turf/closed/wall/r_wall) || d_state != COVER)
return 1
d_state = CUT_COVER
update_icon()
@@ -120,9 +106,8 @@
if(istype(W, /obj/item/screwdriver))
to_chat(user, "<span class='notice'>You begin securing the support lines...</span>")
playsound(src, W.usesound, 100, 1)
if(do_after(user, 40*W.toolspeed, target = src))
if(!istype(src, /turf/closed/wall/r_wall) || !W || d_state != COVER)
if(W.use_tool(src, user, 40, volume=100))
if(!istype(src, /turf/closed/wall/r_wall) || d_state != COVER)
return 1
d_state = SUPPORT_LINES
update_icon()
@@ -132,9 +117,8 @@
if(CUT_COVER)
if(istype(W, /obj/item/crowbar))
to_chat(user, "<span class='notice'>You struggle to pry off the cover...</span>")
playsound(src, W.usesound, 100, 1)
if(do_after(user, 100*W.toolspeed, target = src))
if(!istype(src, /turf/closed/wall/r_wall) || !W || d_state != CUT_COVER)
if(W.use_tool(src, user, 100, volume=100))
if(!istype(src, /turf/closed/wall/r_wall) || d_state != CUT_COVER)
return 1
d_state = BOLTS
update_icon()
@@ -142,24 +126,22 @@
return 1
if(istype(W, /obj/item/weldingtool))
var/obj/item/weldingtool/WT = W
if(WT.remove_fuel(0,user))
to_chat(user, "<span class='notice'>You begin welding the metal cover back to the frame...</span>")
playsound(src, WT.usesound, 100, 1)
if(do_after(user, 60*WT.toolspeed, target = src))
if(!istype(src, /turf/closed/wall/r_wall) || !WT || !WT.isOn() || d_state != CUT_COVER)
return 1
d_state = COVER
update_icon()
to_chat(user, "<span class='notice'>The metal cover has been welded securely to the frame.</span>")
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>")
if(W.use_tool(src, user, 60, volume=100))
if(!istype(src, /turf/closed/wall/r_wall) || d_state != CUT_COVER)
return TRUE
d_state = COVER
update_icon()
to_chat(user, "<span class='notice'>The metal cover has been welded securely to the frame.</span>")
return 1
if(BOLTS)
if(istype(W, /obj/item/wrench))
to_chat(user, "<span class='notice'>You start loosening the anchoring bolts which secure the support rods to their frame...</span>")
playsound(src, W.usesound, 100, 1)
if(do_after(user, 40*W.toolspeed, target = src))
if(!istype(src, /turf/closed/wall/r_wall) || !W || d_state != BOLTS)
if(W.use_tool(src, user, 40, volume=100))
if(!istype(src, /turf/closed/wall/r_wall) || d_state != BOLTS)
return 1
d_state = SUPPORT_RODS
update_icon()
@@ -168,9 +150,8 @@
if(istype(W, /obj/item/crowbar))
to_chat(user, "<span class='notice'>You start to pry the cover back into place...</span>")
playsound(src, W.usesound, 100, 1)
if(do_after(user, 20*W.toolspeed, target = src))
if(!istype(src, /turf/closed/wall/r_wall) || !W || d_state != BOLTS)
if(W.use_tool(src, user, 20, volume=100))
if(!istype(src, /turf/closed/wall/r_wall) || d_state != BOLTS)
return 1
d_state = CUT_COVER
update_icon()
@@ -178,24 +159,12 @@
return 1
if(SUPPORT_RODS)
if(istype(W, /obj/item/weldingtool))
var/obj/item/weldingtool/WT = W
if(WT.remove_fuel(0,user))
to_chat(user, "<span class='notice'>You begin slicing through the support rods...</span>")
playsound(src, W.usesound, 100, 1)
if(do_after(user, 100*W.toolspeed, target = src))
if(!istype(src, /turf/closed/wall/r_wall) || !WT || !WT.isOn() || d_state != SUPPORT_RODS)
return 1
d_state = SHEATH
update_icon()
to_chat(user, "<span class='notice'>You slice through the support rods.</span>")
return 1
if(istype(W, /obj/item/gun/energy/plasmacutter))
if(istype(W, /obj/item/weldingtool) || 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>")
playsound(src, 'sound/items/welder.ogg', 100, 1)
if(do_after(user, 100*W.toolspeed, target = src))
if(!istype(src, /turf/closed/wall/r_wall) || !W || d_state != SUPPORT_RODS)
if(W.use_tool(src, user, 100, volume=100))
if(!istype(src, /turf/closed/wall/r_wall) || d_state != SUPPORT_RODS)
return 1
d_state = SHEATH
update_icon()
@@ -204,9 +173,9 @@
if(istype(W, /obj/item/wrench))
to_chat(user, "<span class='notice'>You start tightening the bolts which secure the support rods to their frame...</span>")
playsound(src, W.usesound, 100, 1)
if(do_after(user, 40*W.toolspeed, target = src))
if(!istype(src, /turf/closed/wall/r_wall) || !W || d_state != SUPPORT_RODS)
W.play_tool_sound(src, 100)
if(W.use_tool(src, user, 40))
if(!istype(src, /turf/closed/wall/r_wall) || d_state != SUPPORT_RODS)
return 1
d_state = BOLTS
update_icon()
@@ -216,26 +185,24 @@
if(SHEATH)
if(istype(W, /obj/item/crowbar))
to_chat(user, "<span class='notice'>You struggle to pry off the outer sheath...</span>")
playsound(src, W.usesound, 100, 1)
if(do_after(user, 100*W.toolspeed, target = src))
if(!istype(src, /turf/closed/wall/r_wall) || !W || d_state != SHEATH)
if(W.use_tool(src, user, 100, volume=100))
if(!istype(src, /turf/closed/wall/r_wall) || d_state != SHEATH)
return 1
to_chat(user, "<span class='notice'>You pry off the outer sheath.</span>")
dismantle_wall()
return 1
if(istype(W, /obj/item/weldingtool))
var/obj/item/weldingtool/WT = W
if(WT.remove_fuel(0,user))
to_chat(user, "<span class='notice'>You begin welding the support rods back together...</span>")
playsound(src, WT.usesound, 100, 1)
if(do_after(user, 100*WT.toolspeed, target = src))
if(!istype(src, /turf/closed/wall/r_wall) || !WT || !WT.isOn() || d_state != SHEATH)
return 1
d_state = SUPPORT_RODS
update_icon()
to_chat(user, "<span class='notice'>You weld the support rods back together.</span>")
return 1
if(!W.tool_start_check(user, amount=0))
return
to_chat(user, "<span class='notice'>You begin welding the support rods back together...</span>")
if(W.use_tool(src, user, 100, volume=100))
if(!istype(src, /turf/closed/wall/r_wall) || d_state != SHEATH)
return TRUE
d_state = SUPPORT_RODS
update_icon()
to_chat(user, "<span class='notice'>You weld the support rods back together.</span>")
return 1
return 0
/turf/closed/wall/r_wall/proc/update_icon()
code/game/turfs/simulated/walls.dm
+24 -32
View File
@@ -190,18 +190,21 @@
return ..()
/turf/closed/wall/proc/try_clean(obj/item/W, mob/user, turf/T)
if((user.a_intent != INTENT_HELP) || !LAZYLEN(dent_decals) || !istype(W, /obj/item/weldingtool))
if((user.a_intent != INTENT_HELP) || !LAZYLEN(dent_decals))
return FALSE
var/obj/item/weldingtool/WT = W
if(WT.remove_fuel(0, user))
if(istype(W, /obj/item/weldingtool))
if(!W.tool_start_check(user, amount=0))
return FALSE
to_chat(user, "<span class='notice'>You begin fixing dents on the wall...</span>")
playsound(src, W.usesound, 100, 1)
if(do_after(user, slicing_duration * W.toolspeed * 0.1, target = src))
if(iswallturf(src) && user && !QDELETED(WT) && WT.isOn() && !QDELETED(T) && (user.loc == T) && (user.get_active_held_item() == WT) && LAZYLEN(dent_decals))
if(W.use_tool(src, user, slicing_duration, volume=100))
if(iswallturf(src) && LAZYLEN(dent_decals))
to_chat(user, "<span class='notice'>You fix some dents on the wall.</span>")
cut_overlay(dent_decals)
LAZYCLEARLIST(dent_decals)
return TRUE
return FALSE
/turf/closed/wall/proc/try_wallmount(obj/item/W, mob/user, turf/T)
@@ -218,40 +221,29 @@
return FALSE
/turf/closed/wall/proc/try_decon(obj/item/W, mob/user, turf/T)
if(istype(W, /obj/item/weldingtool))
var/obj/item/weldingtool/WT = W
if(WT.remove_fuel(0, user))
to_chat(user, "<span class='notice'>You begin slicing through the outer plating...</span>")
playsound(src, W.usesound, 100, 1)
if(do_after(user, slicing_duration * W.toolspeed, target = src))
if(iswallturf(src) && user && !QDELETED(WT) && WT.isOn() && !QDELETED(T) && (user.loc == T) && (user.get_active_held_item() == WT))
to_chat(user, "<span class='notice'>You remove the outer plating.</span>")
dismantle_wall()
return TRUE
else if(istype(W, /obj/item/gun/energy/plasmacutter))
/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_start_check(user, amount=0))
return FALSE
to_chat(user, "<span class='notice'>You begin slicing through the outer plating...</span>")
playsound(src, 'sound/items/welder.ogg', 100, 1)
if(do_after(user, slicing_duration * W.toolspeed, target = src))
if(!iswallturf(src) || !user || QDELETED(W) || QDELETED(T))
return TRUE
if((user.loc == T) && (user.get_active_held_item() == W))
if(I.use_tool(src, user, slicing_duration, volume=100))
if(iswallturf(src))
to_chat(user, "<span class='notice'>You remove the outer plating.</span>")
dismantle_wall()
visible_message("The wall was sliced apart by [user]!", "<span class='italics'>You hear metal being sliced apart.</span>")
return TRUE
return TRUE
return FALSE
/turf/closed/wall/proc/try_destroy(obj/item/W, mob/user, turf/T)
if(istype(W, /obj/item/pickaxe/drill/jackhammer))
var/obj/item/pickaxe/drill/jackhammer/D = W
if(!iswallturf(src) || !user || !W || !T)
/turf/closed/wall/proc/try_destroy(obj/item/I, mob/user, turf/T)
if(istype(I, /obj/item/pickaxe/drill/jackhammer))
if(!iswallturf(src))
return TRUE
if( user.loc == T && user.get_active_held_item() == W )
D.playDigSound()
if(user.loc == T)
I.play_tool_sound(src)
dismantle_wall()
visible_message("<span class='warning'>[user] smashes through the [name] with the [W.name]!</span>", "<span class='italics'>You hear the grinding of metal.</span>")
visible_message("<span class='warning'>[user] smashes through [src] with [I]!</span>", "<span class='italics'>You hear the grinding of metal.</span>")
return TRUE
return FALSE