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

here we go again (#2456)

Browse Source
This commit is contained in:
LetterJay
2017-08-24 19:24:25 -07:00
committed by kevinz000
parent c7ed043fd5
commit 188193eb61
1107 changed files with 25420 additions and 25417 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/turfs/simulated/dirtystation.dm
+1 -1
View File
@@ -87,7 +87,7 @@
new /obj/effect/decal/cleanable/blood/old(src)
else if(prob(30))
if(istype(A, /area/medical/morgue))
new /obj/item/weapon/ectoplasm(src)
new /obj/item/ectoplasm(src)
else
new /obj/effect/decal/cleanable/vomit/old(src)
return
code/game/turfs/simulated/floor.dm
+5 -5
View File
@@ -135,7 +135,7 @@
return 1
if(..())
return 1
if(intact && istype(C, /obj/item/weapon/crowbar))
if(intact && istype(C, /obj/item/crowbar))
return pry_tile(C, user)
if(intact && istype(C, /obj/item/stack/tile))
try_replace_tile(C, user, params)
@@ -144,7 +144,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/weapon/crowbar/CB = user.is_holding_item_of_type(/obj/item/weapon/crowbar)
var/obj/item/crowbar/CB = user.is_holding_item_of_type(/obj/item/crowbar)
if(!CB)
return
var/turf/open/floor/plating/P = pry_tile(CB, user, TRUE)
@@ -201,7 +201,7 @@
/turf/open/floor/acid_melt()
ChangeTurf(baseturf)
/turf/open/floor/rcd_vals(mob/user, obj/item/weapon/construction/rcd/the_rcd)
/turf/open/floor/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd)
switch(the_rcd.mode)
if(RCD_FLOORWALL)
return list("mode" = RCD_FLOORWALL, "delay" = 20, "cost" = 16)
@@ -215,7 +215,7 @@
return list("mode" = RCD_WINDOWGRILLE, "delay" = 10, "cost" = 4)
return FALSE
/turf/open/floor/rcd_act(mob/user, obj/item/weapon/construction/rcd/the_rcd, passed_mode)
/turf/open/floor/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode)
switch(passed_mode)
if(RCD_FLOORWALL)
to_chat(user, "<span class='notice'>You build a wall.</span>")
@@ -227,7 +227,7 @@
to_chat(user, "<span class='notice'>You build an airlock.</span>")
var/obj/machinery/door/airlock/A = new the_rcd.airlock_type(src)
A.electronics = new/obj/item/weapon/electronics/airlock(A)
A.electronics = new/obj/item/electronics/airlock(A)
if(the_rcd.conf_access)
A.electronics.accesses = the_rcd.conf_access.Copy()
code/game/turfs/simulated/floor/fancy_floor.dm
+9 -9
View File
@@ -15,16 +15,16 @@
/turf/open/floor/wood/attackby(obj/item/C, mob/user, params)
if(..())
return
if(istype(C, /obj/item/weapon/screwdriver))
if(istype(C, /obj/item/screwdriver))
pry_tile(C, user)
return
/turf/open/floor/wood/try_replace_tile(obj/item/stack/tile/T, mob/user, params)
if(T.turf_type == type)
return
var/obj/item/weapon/tool = user.is_holding_item_of_type(/obj/item/weapon/screwdriver)
var/obj/item/tool = user.is_holding_item_of_type(/obj/item/screwdriver)
if(!tool)
tool = user.is_holding_item_of_type(/obj/item/weapon/crowbar)
tool = user.is_holding_item_of_type(/obj/item/crowbar)
if(!tool)
return
var/turf/open/floor/plating/P = pry_tile(tool, user, TRUE)
@@ -33,7 +33,7 @@
P.attackby(T, user, params)
/turf/open/floor/wood/pry_tile(obj/item/C, mob/user, silent = FALSE)
var/is_screwdriver = istype(C, /obj/item/weapon/screwdriver)
var/is_screwdriver = istype(C, /obj/item/screwdriver)
playsound(src, C.usesound, 80, 1)
return remove_tile(user, silent, make_tile = is_screwdriver)
@@ -67,7 +67,7 @@
floor_tile = /obj/item/stack/tile/grass
broken_states = list("sand")
flags_1 = NONE
var/ore_type = /obj/item/weapon/ore/glass
var/ore_type = /obj/item/ore/glass
var/turfverb = "uproot"
/turf/open/floor/grass/Initialize()
@@ -75,7 +75,7 @@
update_icon()
/turf/open/floor/grass/attackby(obj/item/C, mob/user, params)
if(istype(C, /obj/item/weapon/shovel) && params)
if(istype(C, /obj/item/shovel) && params)
new ore_type(src)
new ore_type(src) //Make some sand if you shovel grass
user.visible_message("<span class='notice'>[user] digs up [src].</span>", "<span class='notice'>You [src.turfverb] [src].</span>")
@@ -96,7 +96,7 @@
slowdown = 2
/turf/open/floor/grass/snow/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/weapon/crowbar))//You need to dig this turf out instead of crowbarring it
if(istype(W, /obj/item/crowbar))//You need to dig this turf out instead of crowbarring it
return
..()
@@ -104,7 +104,7 @@
name = "volcanic floor"
icon = 'icons/turf/floors.dmi'
icon_state = "basalt"
ore_type = /obj/item/weapon/ore/glass/basalt
ore_type = /obj/item/ore/glass/basalt
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
slowdown = 0
@@ -121,7 +121,7 @@
icon = 'icons/turf/floors.dmi'
icon_state = "basalt"
floor_tile = /obj/item/stack/tile/basalt
ore_type = /obj/item/weapon/ore/glass/basalt
ore_type = /obj/item/ore/glass/basalt
turfverb = "dig up"
slowdown = 0
code/game/turfs/simulated/floor/light_floor.dm
+1 -1
View File
@@ -67,7 +67,7 @@
/turf/open/floor/light/attackby(obj/item/C, mob/user, params)
if(..())
return
if(istype(C, /obj/item/weapon/light/bulb)) //only for light tiles
if(istype(C, /obj/item/light/bulb)) //only for light tiles
if(state && user.drop_item())
qdel(C)
state = 0 //fixing it by bashing it with a light bulb, fun eh?
code/game/turfs/simulated/floor/mineral_floor.dm
+3 -3
View File
@@ -42,7 +42,7 @@
if(exposed_temperature > 300)
PlasmaBurn(exposed_temperature)
/turf/open/floor/mineral/plasma/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
/turf/open/floor/mineral/plasma/attackby(obj/item/W as obj, mob/user as mob, params)
if(W.is_hot() > 300)//If the temperature of the object is over 300, then ignite
message_admins("Plasma flooring was ignited by [ADMIN_LOOKUPFLW(user)] in [ADMIN_COORDJMP(src)]",0,1)
log_game("Plasma flooring was ignited by [key_name(user)] in [COORD(src)]")
@@ -135,7 +135,7 @@
if(istype(AM))
squeek()
/turf/open/floor/mineral/bananium/attackby(obj/item/weapon/W, mob/user, params)
/turf/open/floor/mineral/bananium/attackby(obj/item/W, mob/user, params)
.=..()
if(!.)
honk()
@@ -187,7 +187,7 @@
if(istype(AM))
radiate()
/turf/open/floor/mineral/uranium/attackby(obj/item/weapon/W, mob/user, params)
/turf/open/floor/mineral/uranium/attackby(obj/item/W, mob/user, params)
.=..()
if(!.)
radiate()
code/game/turfs/simulated/floor/misc_floor.dm
+1 -1
View File
@@ -187,7 +187,7 @@
L.adjustToxLoss(-3, TRUE, TRUE)
/turf/open/floor/clockwork/attackby(obj/item/I, mob/living/user, params)
if(istype(I, /obj/item/weapon/crowbar))
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))
code/game/turfs/simulated/floor/plating.dm
+2 -2
View File
@@ -60,8 +60,8 @@
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/weapon/weldingtool))
var/obj/item/weapon/weldingtool/welder = C
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>")
code/game/turfs/simulated/floor/plating/asteroid.dm
+10 -10
View File
@@ -12,7 +12,7 @@
var/environment_type = "asteroid"
var/turf_type = /turf/open/floor/plating/asteroid //Because caves do whacky shit to revert to normal
var/dug = 0 //0 = has not yet been dug, 1 = has already been dug
var/sand_type = /obj/item/weapon/ore/glass
var/sand_type = /obj/item/ore/glass
var/floor_variance = 20 //probability floor has a different icon state
/turf/open/floor/plating/asteroid/Initialize()
@@ -42,16 +42,16 @@
if(1)
src.gets_dug()
/turf/open/floor/plating/asteroid/attackby(obj/item/weapon/W, mob/user, params)
/turf/open/floor/plating/asteroid/attackby(obj/item/W, mob/user, params)
//note that this proc does not call ..()
if(!W || !user)
return 0
var/digging_speed = 0
if (istype(W, /obj/item/weapon/shovel))
var/obj/item/weapon/shovel/S = W
if (istype(W, /obj/item/shovel))
var/obj/item/shovel/S = W
digging_speed = S.digspeed
else if (istype(W, /obj/item/weapon/pickaxe))
var/obj/item/weapon/pickaxe/P = W
else if (istype(W, /obj/item/pickaxe))
var/obj/item/pickaxe/P = W
digging_speed = P.digspeed
if (digging_speed)
var/turf/T = user.loc
@@ -71,10 +71,10 @@
gets_dug()
SSblackbox.add_details("pick_used_mining","[W.type]")
if(istype(W, /obj/item/weapon/storage/bag/ore))
var/obj/item/weapon/storage/bag/ore/S = W
if(istype(W, /obj/item/storage/bag/ore))
var/obj/item/storage/bag/ore/S = W
if(S.collection_mode == 1)
for(var/obj/item/weapon/ore/O in src.contents)
for(var/obj/item/ore/O in src.contents)
O.attackby(W,user)
return
@@ -125,7 +125,7 @@
icon_state = "basalt"
icon_plating = "basalt"
environment_type = "basalt"
sand_type = /obj/item/weapon/ore/glass/basalt
sand_type = /obj/item/ore/glass/basalt
floor_variance = 15
/turf/open/floor/plating/asteroid/basalt/lava //lava underneath
code/game/turfs/simulated/floor/reinf_floor.dm
+2 -2
View File
@@ -20,10 +20,10 @@
..()
return //unplateable
/turf/open/floor/engine/attackby(obj/item/weapon/C, mob/user, params)
/turf/open/floor/engine/attackby(obj/item/C, mob/user, params)
if(!C || !user)
return
if(istype(C, /obj/item/weapon/wrench))
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))
code/game/turfs/simulated/lava.dm
+2 -2
View File
@@ -35,13 +35,13 @@
if(!burn_stuff())
STOP_PROCESSING(SSobj, src)
/turf/open/lava/rcd_vals(mob/user, obj/item/weapon/construction/rcd/the_rcd)
/turf/open/lava/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd)
switch(the_rcd.mode)
if(RCD_FLOORWALL)
return list("mode" = RCD_FLOORWALL, "delay" = 0, "cost" = 3)
return FALSE
/turf/open/lava/rcd_act(mob/user, obj/item/weapon/construction/rcd/the_rcd, passed_mode)
/turf/open/lava/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode)
switch(passed_mode)
if(RCD_FLOORWALL)
to_chat(user, "<span class='notice'>You build a floor.</span>")
code/game/turfs/simulated/minerals.dm
+14 -14
View File
@@ -50,12 +50,12 @@
return ..()
/turf/closed/mineral/attackby(obj/item/weapon/pickaxe/P, mob/user, params)
/turf/closed/mineral/attackby(obj/item/pickaxe/P, mob/user, params)
if (!user.IsAdvancedToolUser())
to_chat(usr, "<span class='warning'>You don't have the dexterity to do this!</span>")
return
if (istype(P, /obj/item/weapon/pickaxe))
if (istype(P, /obj/item/pickaxe))
var/turf/T = user.loc
if (!isturf(T))
return
@@ -102,13 +102,13 @@
..()
if(ishuman(AM))
var/mob/living/carbon/human/H = AM
var/obj/item/I = H.is_holding_item_of_type(/obj/item/weapon/pickaxe)
var/obj/item/I = H.is_holding_item_of_type(/obj/item/pickaxe)
if(I)
attackby(I,H)
return
else if(iscyborg(AM))
var/mob/living/silicon/robot/R = AM
if(istype(R.module_active, /obj/item/weapon/pickaxe))
if(istype(R.module_active, /obj/item/pickaxe))
src.attackby(R.module_active,R)
return
/* else if(istype(AM, /obj/mecha))
@@ -232,7 +232,7 @@
/turf/closed/mineral/iron
mineralType = /obj/item/weapon/ore/iron
mineralType = /obj/item/ore/iron
spreadChance = 20
spread = 1
scan_state = "rock_Iron"
@@ -246,7 +246,7 @@
/turf/closed/mineral/uranium
mineralType = /obj/item/weapon/ore/uranium
mineralType = /obj/item/ore/uranium
spreadChance = 5
spread = 1
scan_state = "rock_Uranium"
@@ -260,7 +260,7 @@
/turf/closed/mineral/diamond
mineralType = /obj/item/weapon/ore/diamond
mineralType = /obj/item/ore/diamond
spreadChance = 0
spread = 1
scan_state = "rock_Diamond"
@@ -274,7 +274,7 @@
/turf/closed/mineral/gold
mineralType = /obj/item/weapon/ore/gold
mineralType = /obj/item/ore/gold
spreadChance = 5
spread = 1
scan_state = "rock_Gold"
@@ -288,7 +288,7 @@
/turf/closed/mineral/silver
mineralType = /obj/item/weapon/ore/silver
mineralType = /obj/item/ore/silver
spreadChance = 5
spread = 1
scan_state = "rock_Silver"
@@ -302,7 +302,7 @@
/turf/closed/mineral/titanium
mineralType = /obj/item/weapon/ore/titanium
mineralType = /obj/item/ore/titanium
spreadChance = 5
spread = 1
scan_state = "rock_Titanium"
@@ -316,7 +316,7 @@
/turf/closed/mineral/plasma
mineralType = /obj/item/weapon/ore/plasma
mineralType = /obj/item/ore/plasma
spreadChance = 8
spread = 1
scan_state = "rock_Plasma"
@@ -330,7 +330,7 @@
/turf/closed/mineral/clown
mineralType = /obj/item/weapon/ore/bananium
mineralType = /obj/item/ore/bananium
mineralAmt = 3
spreadChance = 0
spread = 0
@@ -338,7 +338,7 @@
/turf/closed/mineral/bscrystal
mineralType = /obj/item/weapon/ore/bluespace_crystal
mineralType = /obj/item/ore/bluespace_crystal
mineralAmt = 1
spreadChance = 0
spread = 0
@@ -461,7 +461,7 @@
stage = GIBTONITE_DETONATE
explosion(bombturf,1,2,5, adminlog = 0)
if(stage == GIBTONITE_STABLE) //Gibtonite deposit is now benign and extractable. Depending on how close you were to it blowing up before defusing, you get better quality ore.
var/obj/item/weapon/twohanded/required/gibtonite/G = new /obj/item/weapon/twohanded/required/gibtonite/(src)
var/obj/item/twohanded/required/gibtonite/G = new /obj/item/twohanded/required/gibtonite/(src)
if(det_time <= 0)
G.quality = 3
G.icon_state = "Gibtonite ore 3"
code/game/turfs/simulated/wall/mineral_walls.dm
+2 -2
View File
@@ -82,7 +82,7 @@
radiate()
..()
/turf/closed/wall/mineral/uranium/attackby(obj/item/weapon/W, mob/user, params)
/turf/closed/wall/mineral/uranium/attackby(obj/item/W, mob/user, params)
radiate()
..()
@@ -99,7 +99,7 @@
thermal_conductivity = 0.04
canSmoothWith = list(/turf/closed/wall/mineral/plasma, /obj/structure/falsewall/plasma)
/turf/closed/wall/mineral/plasma/attackby(obj/item/weapon/W, mob/user, params)
/turf/closed/wall/mineral/plasma/attackby(obj/item/W, mob/user, params)
if(W.is_hot() > 300)//If the temperature of the object is over 300, then ignite
message_admins("Plasma wall ignited by [ADMIN_LOOKUPFLW(user)] in [ADMIN_COORDJMP(src)]",0,1)
log_game("Plasma wall ignited by [key_name(user)] in [COORD(src)]")
code/game/turfs/simulated/wall/reinf_walls.dm
+25 -25
View File
@@ -47,9 +47,9 @@
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/weapon/W, mob/user, turf/T)
if(istype(W, /obj/item/weapon/pickaxe/drill/jackhammer))
var/obj/item/weapon/pickaxe/drill/jackhammer/D = W
/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>")
if(do_after(user, 50, target = src))
if(!istype(src, /turf/closed/wall/r_wall) || !W)
@@ -60,11 +60,11 @@
return 1
return 0
/turf/closed/wall/r_wall/try_decon(obj/item/weapon/W, mob/user, turf/T)
/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/weapon/wirecutters))
if(istype(W, /obj/item/wirecutters))
playsound(src, W.usesound, 100, 1)
d_state = SUPPORT_LINES
update_icon()
@@ -72,7 +72,7 @@
return 1
if(SUPPORT_LINES)
if(istype(W, /obj/item/weapon/screwdriver))
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))
@@ -83,7 +83,7 @@
to_chat(user, "<span class='notice'>You unsecure the support lines.</span>")
return 1
else if(istype(W, /obj/item/weapon/wirecutters))
else if(istype(W, /obj/item/wirecutters))
playsound(src, W.usesound, 100, 1)
d_state = INTACT
update_icon()
@@ -91,8 +91,8 @@
return 1
if(COVER)
if(istype(W, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/WT = W
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)
@@ -104,7 +104,7 @@
to_chat(user, "<span class='notice'>You press firmly on the cover, dislodging it.</span>")
return 1
if(istype(W, /obj/item/weapon/gun/energy/plasmacutter))
if(istype(W, /obj/item/gun/energy/plasmacutter))
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))
@@ -115,7 +115,7 @@
to_chat(user, "<span class='notice'>You press firmly on the cover, dislodging it.</span>")
return 1
if(istype(W, /obj/item/weapon/screwdriver))
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))
@@ -127,7 +127,7 @@
return 1
if(CUT_COVER)
if(istype(W, /obj/item/weapon/crowbar))
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))
@@ -138,8 +138,8 @@
to_chat(user, "<span class='notice'>You pry off the cover.</span>")
return 1
if(istype(W, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/WT = W
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)
@@ -152,7 +152,7 @@
return 1
if(BOLTS)
if(istype(W, /obj/item/weapon/wrench))
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))
@@ -163,7 +163,7 @@
to_chat(user, "<span class='notice'>You remove the bolts anchoring the support rods.</span>")
return 1
if(istype(W, /obj/item/weapon/crowbar))
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))
@@ -175,8 +175,8 @@
return 1
if(SUPPORT_RODS)
if(istype(W, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/WT = W
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)
@@ -188,7 +188,7 @@
to_chat(user, "<span class='notice'>You slice through the support rods.</span>")
return 1
if(istype(W, /obj/item/weapon/gun/energy/plasmacutter))
if(istype(W, /obj/item/gun/energy/plasmacutter))
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))
@@ -199,7 +199,7 @@
to_chat(user, "<span class='notice'>You slice through the support rods.</span>")
return 1
if(istype(W, /obj/item/weapon/wrench))
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))
@@ -211,7 +211,7 @@
return 1
if(SHEATH)
if(istype(W, /obj/item/weapon/crowbar))
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))
@@ -221,8 +221,8 @@
dismantle_wall()
return 1
if(istype(W, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/WT = W
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)
@@ -251,12 +251,12 @@
if(prob(30))
dismantle_wall()
/turf/closed/wall/r_wall/rcd_vals(mob/user, obj/item/weapon/construction/rcd/the_rcd)
/turf/closed/wall/r_wall/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd)
if(!the_rcd.canRturf)
return FALSE
return ..()
/turf/closed/wall/r_wall/rcd_act(mob/user, obj/item/weapon/construction/rcd/the_rcd, passed_mode)
/turf/closed/wall/r_wall/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode)
if(!the_rcd.canRturf)
return FALSE
return ..()
code/game/turfs/simulated/walls.dm
+13 -13
View File
@@ -140,7 +140,7 @@
..()
/turf/closed/wall/attackby(obj/item/weapon/W, mob/user, params)
/turf/closed/wall/attackby(obj/item/W, mob/user, params)
user.changeNext_move(CLICK_CD_MELEE)
if (!user.IsAdvancedToolUser())
to_chat(user, "<span class='warning'>You don't have the dexterity to do this!</span>")
@@ -165,7 +165,7 @@
return
/turf/closed/wall/proc/try_wallmount(obj/item/weapon/W, mob/user, turf/T)
/turf/closed/wall/proc/try_wallmount(obj/item/W, mob/user, turf/T)
//check for wall mounted frames
if(istype(W, /obj/item/wallframe))
var/obj/item/wallframe/F = W
@@ -173,16 +173,16 @@
F.attach(src, user)
return 1
//Poster stuff
else if(istype(W, /obj/item/weapon/poster))
else if(istype(W, /obj/item/poster))
place_poster(W,user)
return 1
return 0
/turf/closed/wall/proc/try_decon(obj/item/weapon/W, mob/user, turf/T)
if( istype(W, /obj/item/weapon/weldingtool) )
var/obj/item/weapon/weldingtool/WT = W
/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)
@@ -193,7 +193,7 @@
to_chat(user, "<span class='notice'>You remove the outer plating.</span>")
dismantle_wall()
return 1
else if( istype(W, /obj/item/weapon/gun/energy/plasmacutter) )
else if( istype(W, /obj/item/gun/energy/plasmacutter) )
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))
@@ -207,9 +207,9 @@
return 0
/turf/closed/wall/proc/try_destroy(obj/item/weapon/W, mob/user, turf/T)
if(istype(W, /obj/item/weapon/pickaxe/drill/jackhammer))
var/obj/item/weapon/pickaxe/drill/jackhammer/D = W
/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)
return 1
if( user.loc == T && user.get_active_held_item() == W )
@@ -263,7 +263,7 @@
if(.)
ChangeTurf(/turf/closed/wall/clockwork)
/turf/closed/wall/storage_contents_dump_act(obj/item/weapon/storage/src_object, mob/user)
/turf/closed/wall/storage_contents_dump_act(obj/item/storage/src_object, mob/user)
return 0
/turf/closed/wall/acid_act(acidpwr, acid_volume)
@@ -274,13 +274,13 @@
/turf/closed/wall/acid_melt()
dismantle_wall(1)
/turf/closed/wall/rcd_vals(mob/user, obj/item/weapon/construction/rcd/the_rcd)
/turf/closed/wall/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd)
switch(the_rcd.mode)
if(RCD_DECONSTRUCT)
return list("mode" = RCD_DECONSTRUCT, "delay" = 40, "cost" = 26)
return FALSE
/turf/closed/wall/rcd_act(mob/user, obj/item/weapon/construction/rcd/the_rcd, passed_mode)
/turf/closed/wall/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode)
switch(passed_mode)
if(RCD_DECONSTRUCT)
to_chat(user, "<span class='notice'>You deconstruct the wall.</span>")