diff --git a/code/WorkInProgress/Cael_Aislinn/Rust/circuits_and_design.dm b/code/WorkInProgress/Cael_Aislinn/Rust/circuits_and_design.dm index f9c62590017..8521e4d1b4c 100644 --- a/code/WorkInProgress/Cael_Aislinn/Rust/circuits_and_design.dm +++ b/code/WorkInProgress/Cael_Aislinn/Rust/circuits_and_design.dm @@ -81,7 +81,7 @@ datum/design/rust_fuel_compressor "/obj/item/weapon/stock_parts/micro_laser/ultra" = 1, "/obj/item/weapon/stock_parts/subspace/crystal" = 1, "/obj/item/weapon/stock_parts/console_screen" = 1, - "/obj/item/weapon/cable_coil" = 5) + "/obj/item/stack/cable_coil" = 5) datum/design/rust_core name = "Internal circuitry (RUST tokamak core)" @@ -107,7 +107,7 @@ datum/design/rust_core "/obj/item/weapon/stock_parts/scanning_module/phasic" = 1, "/obj/item/weapon/stock_parts/matter_bin/super" = 1, "/obj/item/weapon/stock_parts/console_screen" = 1, - "/obj/item/weapon/cable_coil" = 5) + "/obj/item/stack/cable_coil" = 5) datum/design/rust_injector name = "Internal circuitry (RUST tokamak core)" diff --git a/code/WorkInProgress/Cael_Aislinn/Rust/fuel_assembly_port_construction.dm b/code/WorkInProgress/Cael_Aislinn/Rust/fuel_assembly_port_construction.dm index f13780c280d..b012d1c360e 100644 --- a/code/WorkInProgress/Cael_Aislinn/Rust/fuel_assembly_port_construction.dm +++ b/code/WorkInProgress/Cael_Aislinn/Rust/fuel_assembly_port_construction.dm @@ -78,8 +78,8 @@ icon_state = "port2" return - else if (istype(W, /obj/item/weapon/cable_coil) && opened && !(has_electronics & 2)) - var/obj/item/weapon/cable_coil/C = W + else if (istype(W, /obj/item/stack/cable_coil) && opened && !(has_electronics & 2)) + var/obj/item/stack/cable_coil/C = W if(C.amount < 10) user << "\red You need more wires." return @@ -97,7 +97,7 @@ user << "You begin to cut the cables..." playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) if(do_after(user, 50)) - new /obj/item/weapon/cable_coil(loc,10) + new /obj/item/stack/cable_coil(loc,10) user.visible_message(\ "\red [user.name] cut the cabling inside the port.",\ "You cut the cabling inside the port.") diff --git a/code/WorkInProgress/Cael_Aislinn/Rust/fuel_compressor_construction.dm b/code/WorkInProgress/Cael_Aislinn/Rust/fuel_compressor_construction.dm index 5d1c272016a..fab9eb87d5c 100644 --- a/code/WorkInProgress/Cael_Aislinn/Rust/fuel_compressor_construction.dm +++ b/code/WorkInProgress/Cael_Aislinn/Rust/fuel_compressor_construction.dm @@ -105,8 +105,8 @@ user << "You fail to [ locked ? "unlock" : "lock"] the compressor interface." return - else if (istype(W, /obj/item/weapon/cable_coil) && opened && !(has_electronics & 2)) - var/obj/item/weapon/cable_coil/C = W + else if (istype(W, /obj/item/stack/cable_coil) && opened && !(has_electronics & 2)) + var/obj/item/stack/cable_coil/C = W if(C.amount < 10) user << "\red You need more wires." return @@ -124,7 +124,7 @@ user << "You begin to cut the cables..." playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) if(do_after(user, 50)) - new /obj/item/weapon/cable_coil(loc,10) + new /obj/item/stack/cable_coil(loc,10) user.visible_message(\ "\red [user.name] cut the cabling inside the compressor.",\ "You cut the cabling inside the port.") diff --git a/code/WorkInProgress/Cael_Aislinn/ShieldGen/circuits_and_designs.dm b/code/WorkInProgress/Cael_Aislinn/ShieldGen/circuits_and_designs.dm index b85be8f74a3..1ff3f01dea7 100644 --- a/code/WorkInProgress/Cael_Aislinn/ShieldGen/circuits_and_designs.dm +++ b/code/WorkInProgress/Cael_Aislinn/ShieldGen/circuits_and_designs.dm @@ -14,7 +14,7 @@ "/obj/item/weapon/stock_parts/subspace/crystal" = 1, "/obj/item/weapon/stock_parts/subspace/amplifier" = 1, "/obj/item/weapon/stock_parts/console_screen" = 1, - "/obj/item/weapon/cable_coil" = 5) + "/obj/item/stack/cable_coil" = 5) datum/design/shield_gen_ex name = "Circuit Design (Experimental hull shield generator)" @@ -40,7 +40,7 @@ datum/design/shield_gen_ex "/obj/item/weapon/stock_parts/subspace/crystal" = 1, "/obj/item/weapon/stock_parts/subspace/amplifier" = 1, "/obj/item/weapon/stock_parts/console_screen" = 1, - "/obj/item/weapon/cable_coil" = 5) + "/obj/item/stack/cable_coil" = 5) datum/design/shield_gen name = "Circuit Design (Experimental shield generator)" @@ -66,7 +66,7 @@ datum/design/shield_gen "/obj/item/weapon/stock_parts/subspace/treatment" = 1, "/obj/item/weapon/stock_parts/subspace/analyzer" = 1, "/obj/item/weapon/stock_parts/console_screen" = 1, - "/obj/item/weapon/cable_coil" = 5) + "/obj/item/stack/cable_coil" = 5) datum/design/shield_cap name = "Circuit Design (Experimental shield capacitor)" diff --git a/code/WorkInProgress/Sayu/belt.dm b/code/WorkInProgress/Sayu/belt.dm index 1405640b2bb..3544ece08f8 100644 --- a/code/WorkInProgress/Sayu/belt.dm +++ b/code/WorkInProgress/Sayu/belt.dm @@ -117,7 +117,7 @@ new /obj/item/weapon/wirecutters(src) new /obj/item/weapon/wrench(src) new /obj/item/device/multitool(src) - new /obj/item/weapon/cable_coil(src) + new /obj/item/stack/cable_coil(src) new /obj/item/weapon/handcuffs(src) new /obj/item/weapon/dnainjector/xraymut(src) @@ -146,7 +146,7 @@ new /obj/item/weapon/wirecutters(src) new /obj/item/weapon/wrench(src) new /obj/item/device/multitool(src) - new /obj/item/weapon/cable_coil(src) + new /obj/item/stack/cable_coil(src) new /obj/item/device/analyzer(src) new /obj/item/device/healthanalyzer(src) diff --git a/code/WorkInProgress/Sayu/cargoprofile.dm b/code/WorkInProgress/Sayu/cargoprofile.dm index 85d00e44605..257f81d27a0 100644 --- a/code/WorkInProgress/Sayu/cargoprofile.dm +++ b/code/WorkInProgress/Sayu/cargoprofile.dm @@ -135,7 +135,7 @@ name = "Building Supplies" id = "supplies" blacklist = null - whitelist = list(/obj/item/weapon/cable_coil,/obj/item/stack/rods, + whitelist = list(/obj/item/stack/cable_coil,/obj/item/stack/rods, /obj/item/stack/sheet/metal,/obj/item/stack/sheet/plasteel, /obj/item/stack/sheet/glass,/obj/item/stack/sheet/rglass, /obj/item/stack/tile,/obj/item/weapon/light, @@ -375,7 +375,7 @@ universal = 1 blacklist = null - whitelist = list(/obj/item/stack,/obj/item/weapon/cable_coil) + whitelist = list(/obj/item/stack,/obj/item/stack/cable_coil) dedicated_path = /obj/machinery/programmable/stacker @@ -399,12 +399,12 @@ I.loc = master master.types[I.type] = src return I.w_class - if(istype(W,/obj/item/weapon/cable_coil)) - var/obj/item/weapon/cable_coil/I = W + if(istype(W,/obj/item/stack/cable_coil)) + var/obj/item/stack/cable_coil/I = W if(!I.amount) // todo: am I making a bad assumption here? del I return - for(var/obj/item/weapon/cable_coil/O in master.contents) + for(var/obj/item/stack/cable_coil/O in master.contents) if(O.type == I.type && O.amount < MAXCOIL) if(I.amount + O.amount <= MAXCOIL) O.amount += I.amount @@ -427,8 +427,8 @@ if(src.enabled && (I.amount < I.max_amount)) return // Still needs to be stacked ..(W,D) - if(istype(W,/obj/item/weapon/cable_coil)) - var/obj/item/weapon/cable_coil/I = W + if(istype(W,/obj/item/stack/cable_coil)) + var/obj/item/stack/cable_coil/I = W if(src.enabled && (I.amount < MAXCOIL)) return // Still needs to be stacked ..(W,D) @@ -439,7 +439,7 @@ name = "Stack Items" id = "ustacker" blacklist = null - whitelist = list(/obj/item/stack,/obj/item/weapon/cable_coil) + whitelist = list(/obj/item/stack,/obj/item/stack/cable_coil) dedicated_path = /obj/machinery/programmable/unary/stacker @@ -456,11 +456,11 @@ return ..(W,S,remaining) return 0 - if(istype(W,/obj/item/weapon/cable_coil)) - var/obj/item/weapon/cable_coil/I = W + if(istype(W,/obj/item/stack/cable_coil)) + var/obj/item/stack/cable_coil/I = W if(I.amount >= MAXCOIL) return 0 - for(var/obj/item/weapon/cable_coil/other in S.contents) + for(var/obj/item/stack/cable_coil/other in S.contents) if(other != I && other.amount < MAXCOIL) return ..(W,S,remaining) return 0 @@ -481,9 +481,9 @@ //end for I.loc = D return - if(istype(W,/obj/item/weapon/cable_coil)) - var/obj/item/weapon/cable_coil/I = W - for(var/obj/item/weapon/cable_coil/O in D.contents) + if(istype(W,/obj/item/stack/cable_coil)) + var/obj/item/stack/cable_coil/I = W + for(var/obj/item/stack/cable_coil/O in D.contents) if(O.type == I.type && O.amount < MAXCOIL) if(I.amount + O.amount <= MAXCOIL) // Why did they make it a #define. O.amount += I.amount diff --git a/code/WorkInProgress/Sayu/programmable.dm b/code/WorkInProgress/Sayu/programmable.dm index 0de95f75aca..9f5575e0829 100644 --- a/code/WorkInProgress/Sayu/programmable.dm +++ b/code/WorkInProgress/Sayu/programmable.dm @@ -557,7 +557,7 @@ req_components = list( "/obj/item/weapon/stock_parts/scanning_module" = 1, "/obj/item/weapon/stock_parts/manipulator" = 2, - "/obj/item/weapon/cable_coil" = 1) + "/obj/item/stack/cable_coil" = 1) //Customization of the machine var/datum/cargoprofile/default = new/datum/cargoprofile() diff --git a/code/WorkInProgress/computer3/buildandrepair.dm b/code/WorkInProgress/computer3/buildandrepair.dm index 2cb9139f2e8..9240e0114ec 100644 --- a/code/WorkInProgress/computer3/buildandrepair.dm +++ b/code/WorkInProgress/computer3/buildandrepair.dm @@ -154,7 +154,7 @@ user << "\red There's already \an [battery] in [src]!" - if(istype(P, /obj/item/weapon/cable_coil)) + if(istype(P, /obj/item/stack/cable_coil)) if(P:amount >= 5) playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) if(do_after(user, 20)) @@ -173,7 +173,7 @@ user << "\blue You remove the cables." src.state = 2 src.icon_state = "2" - var/obj/item/weapon/cable_coil/A = new /obj/item/weapon/cable_coil( src.loc ) + var/obj/item/stack/cable_coil/A = new /obj/item/stack/cable_coil( src.loc ) A.amount = 5 if(istype(P, /obj/item/weapon/crowbar)) // complicated check diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index 01f5468ff29..90446e59589 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -1261,7 +1261,7 @@ proc/get_mob_with_client_list() //Quick type checks for some tools var/global/list/common_tools = list( -/obj/item/weapon/cable_coil, +/obj/item/stack/cable_coil, /obj/item/weapon/wrench, /obj/item/weapon/weldingtool, /obj/item/weapon/screwdriver, @@ -1285,7 +1285,7 @@ var/global/list/common_tools = list( return 0 /proc/iscoil(O) - if(istype(O, /obj/item/weapon/cable_coil)) + if(istype(O, /obj/item/stack/cable_coil)) return 1 return 0 @@ -1310,7 +1310,7 @@ var/global/list/common_tools = list( return 0 /proc/iswire(O) - if(istype(O, /obj/item/weapon/cable_coil)) + if(istype(O, /obj/item/stack/cable_coil)) return 1 return 0 diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm index a5ef01b80d1..8e490ba0f3f 100644 --- a/code/game/dna/dna_modifier.dm +++ b/code/game/dna/dna_modifier.dm @@ -57,8 +57,8 @@ component_parts += new /obj/item/weapon/stock_parts/manipulator(src) component_parts += new /obj/item/weapon/stock_parts/micro_laser(src) component_parts += new /obj/item/weapon/stock_parts/console_screen(src) - component_parts += new /obj/item/weapon/cable_coil(src) - component_parts += new /obj/item/weapon/cable_coil(src) + component_parts += new /obj/item/stack/cable_coil(src) + component_parts += new /obj/item/stack/cable_coil(src) RefreshParts() /obj/machinery/dna_scannernew/allow_drop() @@ -88,7 +88,7 @@ for(var/obj/O in src) if(!istype(O,/obj/item/weapon/circuitboard/clonescanner) && \ !istype(O,/obj/item/weapon/stock_parts) && \ - !istype(O,/obj/item/weapon/cable_coil) && \ + !istype(O,/obj/item/stack/cable_coil) && \ O != beaker) O.loc = get_turf(src)//Ejects items that manage to get in there (exluding the components and beaker) if(!occupant) diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index 22f6b97b05b..1e42420be6d 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -907,8 +907,8 @@ return if(1) - if(istype(W, /obj/item/weapon/cable_coil)) - var/obj/item/weapon/cable_coil/coil = W + if(istype(W, /obj/item/stack/cable_coil)) + var/obj/item/stack/cable_coil/coil = W if(coil.amount < 5) user << "You need more cable for this!" return @@ -1104,8 +1104,8 @@ FIRE ALARM else user.visible_message("\red [user] has disconnected [src]'s detecting unit!", "You have disconnected [src]'s detecting unit.") if(1) - if(istype(W, /obj/item/weapon/cable_coil)) - var/obj/item/weapon/cable_coil/coil = W + if(istype(W, /obj/item/stack/cable_coil)) + var/obj/item/stack/cable_coil/coil = W if(coil.amount < 5) user << "You need more cable for this!" return diff --git a/code/game/machinery/bots/ed209bot.dm b/code/game/machinery/bots/ed209bot.dm index 3df6dae85d2..7a77f2c87d4 100644 --- a/code/game/machinery/bots/ed209bot.dm +++ b/code/game/machinery/bots/ed209bot.dm @@ -959,8 +959,8 @@ Auto Patrol: []"}, icon_state = "[lasercolor]ed209_prox" if(6) - if( istype(W, /obj/item/weapon/cable_coil) ) - var/obj/item/weapon/cable_coil/coil = W + if( istype(W, /obj/item/stack/cable_coil) ) + var/obj/item/stack/cable_coil/coil = W var/turf/T = get_turf(user) user << "You start to wire [src]..." sleep(40) diff --git a/code/game/machinery/bots/mulebot.dm b/code/game/machinery/bots/mulebot.dm index 547af6f227d..8ee227f7a2b 100644 --- a/code/game/machinery/bots/mulebot.dm +++ b/code/game/machinery/bots/mulebot.dm @@ -897,7 +897,7 @@ var/global/mulebot_count = 0 new /obj/item/device/assembly/prox_sensor(Tsec) new /obj/item/stack/rods(Tsec) new /obj/item/stack/rods(Tsec) - new /obj/item/weapon/cable_coil/cut(Tsec) + new /obj/item/stack/cable_coil/cut(Tsec) if (cell) cell.loc = Tsec cell.update_icon() diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm index d5408d33308..9f6eb2210af 100644 --- a/code/game/machinery/camera/camera_assembly.dm +++ b/code/game/machinery/camera/camera_assembly.dm @@ -57,7 +57,7 @@ if(2) // State 2 if(iscoil(W)) - var/obj/item/weapon/cable_coil/C = W + var/obj/item/stack/cable_coil/C = W if(C.use(2)) user << "You add wires to the assembly." state = 3 @@ -116,7 +116,7 @@ else if(iswirecutter(W)) - new/obj/item/weapon/cable_coil(get_turf(src), 2) + new/obj/item/stack/cable_coil(get_turf(src), 2) playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1) user << "You cut the wires from the circuits." state = 2 diff --git a/code/game/machinery/computer/ai_core.dm b/code/game/machinery/computer/ai_core.dm index 692bfdb3fb3..f6a9ff3e8da 100644 --- a/code/game/machinery/computer/ai_core.dm +++ b/code/game/machinery/computer/ai_core.dm @@ -62,7 +62,7 @@ user << "\blue You unfasten the circuit board." state = 1 icon_state = "1" - if(istype(P, /obj/item/weapon/cable_coil)) + if(istype(P, /obj/item/stack/cable_coil)) if(P:amount >= 5) playsound(loc, 'sound/items/Deconstruct.ogg', 50, 1) if(do_after(user, 20)) @@ -80,7 +80,7 @@ user << "\blue You remove the cables." state = 2 icon_state = "2" - var/obj/item/weapon/cable_coil/A = new /obj/item/weapon/cable_coil( loc ) + var/obj/item/stack/cable_coil/A = new /obj/item/stack/cable_coil( loc ) A.amount = 5 if(istype(P, /obj/item/stack/sheet/rglass)) diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index fdff83ab13b..cb4690d030c 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -355,7 +355,7 @@ user << "\blue You unfasten the circuit board." src.state = 1 src.icon_state = "1" - if(istype(P, /obj/item/weapon/cable_coil)) + if(istype(P, /obj/item/stack/cable_coil)) if(P:amount >= 5) playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) if(do_after(user, 20)) @@ -371,7 +371,7 @@ user << "\blue You remove the cables." src.state = 2 src.icon_state = "2" - var/obj/item/weapon/cable_coil/A = new /obj/item/weapon/cable_coil( src.loc ) + var/obj/item/stack/cable_coil/A = new /obj/item/stack/cable_coil( src.loc ) A.amount = 5 if(istype(P, /obj/item/stack/sheet/glass)) @@ -470,7 +470,7 @@ user << "\blue You unfasten the circuit board." src.state = 1 src.icon_state = "1" - if(istype(P, /obj/item/weapon/cable_coil)) + if(istype(P, /obj/item/stack/cable_coil)) if(P:amount >= 5) playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) if(do_after(user, 20)) @@ -486,7 +486,7 @@ user << "\blue You remove the cables." src.state = 2 src.icon_state = "2" - var/obj/item/weapon/cable_coil/A = new /obj/item/weapon/cable_coil( src.loc ) + var/obj/item/stack/cable_coil/A = new /obj/item/stack/cable_coil( src.loc ) A.amount = 5 if(istype(P, /obj/item/stack/sheet/glass)) diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index b9b4fe0a04e..4e908808c66 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -34,8 +34,8 @@ return switch(state) if(1) - if(istype(P, /obj/item/weapon/cable_coil)) - var/obj/item/weapon/cable_coil/C = P + if(istype(P, /obj/item/stack/cable_coil)) + var/obj/item/stack/cable_coil/C = P if(C.amount >= 5) playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) user << "\blue You start to add cables to the frame." @@ -85,7 +85,7 @@ user << "\blue You remove the cables." state = 1 icon_state = "box_0" - var/obj/item/weapon/cable_coil/A = new /obj/item/weapon/cable_coil( src.loc ) + var/obj/item/stack/cable_coil/A = new /obj/item/stack/cable_coil( src.loc ) A.amount = 5 if(3) @@ -134,11 +134,11 @@ for(var/I in req_components) if(istype(P, text2path(I)) && (req_components[I] > 0)) playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) - if(istype(P, /obj/item/weapon/cable_coil)) - var/obj/item/weapon/cable_coil/CP = P + if(istype(P, /obj/item/stack/cable_coil)) + var/obj/item/stack/cable_coil/CP = P if(CP.amount > 1) var/camt = min(CP.amount, req_components[I]) // amount of cable to take, idealy amount required, but limited by amount provided - var/obj/item/weapon/cable_coil/CC = new /obj/item/weapon/cable_coil(src) + var/obj/item/stack/cable_coil/CC = new /obj/item/stack/cable_coil(src) CC.amount = camt CC.update_icon() CP.use(camt) @@ -153,7 +153,7 @@ update_desc() break user << desc - if(P && P.loc != src && !istype(P, /obj/item/weapon/cable_coil)) + if(P && P.loc != src && !istype(P, /obj/item/stack/cable_coil)) user << "\red You cannot add that component to the machine!" @@ -217,7 +217,7 @@ to destroy them and players will be able to make replacements. req_components = list( "/obj/item/weapon/stock_parts/matter_bin" = 1, "/obj/item/weapon/stock_parts/micro_laser" = 1, - "/obj/item/weapon/cable_coil" = 2, + "/obj/item/stack/cable_coil" = 2, "/obj/item/weapon/stock_parts/capacitor" = 1) /obj/item/weapon/circuitboard/pacman/super @@ -237,7 +237,7 @@ obj/item/weapon/circuitboard/rdserver origin_tech = "programming=3" frame_desc = "Requires 2 pieces of cable, and 1 Scanning Module." req_components = list( - "/obj/item/weapon/cable_coil" = 2, + "/obj/item/stack/cable_coil" = 2, "/obj/item/weapon/stock_parts/scanning_module" = 1) /obj/item/weapon/circuitboard/mechfab @@ -259,7 +259,7 @@ obj/item/weapon/circuitboard/rdserver origin_tech = "programming=3;biotech=3" frame_desc = "Requires 2 Manipulator, 2 Scanning Module, 2 pieces of cable and 1 Console Screen." req_components = list( - "/obj/item/weapon/cable_coil" = 2, + "/obj/item/stack/cable_coil" = 2, "/obj/item/weapon/stock_parts/scanning_module" = 2, "/obj/item/weapon/stock_parts/manipulator" = 2, "/obj/item/weapon/stock_parts/console_screen" = 1) @@ -275,7 +275,7 @@ obj/item/weapon/circuitboard/rdserver "/obj/item/weapon/stock_parts/manipulator" = 1, "/obj/item/weapon/stock_parts/micro_laser" = 1, "/obj/item/weapon/stock_parts/console_screen" = 1, - "/obj/item/weapon/cable_coil" = 2,) + "/obj/item/stack/cable_coil" = 2,) // Telecomms circuit boards: @@ -300,7 +300,7 @@ obj/item/weapon/circuitboard/rdserver frame_desc = "Requires 2 Manipulators, 2 Cable Coil and 2 Hyperwave Filter." req_components = list( "/obj/item/weapon/stock_parts/manipulator" = 2, - "/obj/item/weapon/cable_coil" = 2, + "/obj/item/stack/cable_coil" = 2, "/obj/item/weapon/stock_parts/subspace/filter" = 2) /obj/item/weapon/circuitboard/telecomms/relay @@ -311,7 +311,7 @@ obj/item/weapon/circuitboard/rdserver frame_desc = "Requires 2 Manipulators, 2 Cable Coil and 2 Hyperwave Filters." req_components = list( "/obj/item/weapon/stock_parts/manipulator" = 2, - "/obj/item/weapon/cable_coil" = 2, + "/obj/item/stack/cable_coil" = 2, "/obj/item/weapon/stock_parts/subspace/filter" = 2) /obj/item/weapon/circuitboard/telecomms/bus @@ -322,7 +322,7 @@ obj/item/weapon/circuitboard/rdserver frame_desc = "Requires 2 Manipulators, 1 Cable Coil and 1 Hyperwave Filter." req_components = list( "/obj/item/weapon/stock_parts/manipulator" = 2, - "/obj/item/weapon/cable_coil" = 1, + "/obj/item/stack/cable_coil" = 1, "/obj/item/weapon/stock_parts/subspace/filter" = 1) /obj/item/weapon/circuitboard/telecomms/processor @@ -336,7 +336,7 @@ obj/item/weapon/circuitboard/rdserver "/obj/item/weapon/stock_parts/subspace/filter" = 1, "/obj/item/weapon/stock_parts/subspace/treatment" = 2, "/obj/item/weapon/stock_parts/subspace/analyzer" = 1, - "/obj/item/weapon/cable_coil" = 2, + "/obj/item/stack/cable_coil" = 2, "/obj/item/weapon/stock_parts/subspace/amplifier" = 1) /obj/item/weapon/circuitboard/telecomms/server @@ -347,7 +347,7 @@ obj/item/weapon/circuitboard/rdserver frame_desc = "Requires 2 Manipulators, 1 Cable Coil and 1 Hyperwave Filter." req_components = list( "/obj/item/weapon/stock_parts/manipulator" = 2, - "/obj/item/weapon/cable_coil" = 1, + "/obj/item/stack/cable_coil" = 1, "/obj/item/weapon/stock_parts/subspace/filter" = 1) /obj/item/weapon/circuitboard/telecomms/broadcaster @@ -358,7 +358,7 @@ obj/item/weapon/circuitboard/rdserver frame_desc = "Requires 2 Manipulators, 1 Cable Coil, 1 Hyperwave Filter, 1 Ansible Crystal and 2 High-Powered Micro-Lasers. " req_components = list( "/obj/item/weapon/stock_parts/manipulator" = 2, - "/obj/item/weapon/cable_coil" = 1, + "/obj/item/stack/cable_coil" = 1, "/obj/item/weapon/stock_parts/subspace/filter" = 1, "/obj/item/weapon/stock_parts/subspace/crystal" = 1, "/obj/item/weapon/stock_parts/micro_laser/high" = 2) diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 30844ad33d6..98c682088a0 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -130,7 +130,7 @@ src.health = max(0, src.health - damage) if (src.health <= 0) new /obj/item/weapon/shard(src.loc) - var/obj/item/weapon/cable_coil/CC = new /obj/item/weapon/cable_coil(src.loc) + var/obj/item/stack/cable_coil/CC = new /obj/item/stack/cable_coil(src.loc) CC.amount = 2 var/obj/item/weapon/airlock_electronics/ae if(!electronics) diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm index 1aca992a8bf..c78bc0bb393 100644 --- a/code/game/machinery/rechargestation.dm +++ b/code/game/machinery/rechargestation.dm @@ -90,7 +90,7 @@ // ^ makes sinle list of active (R.contents) and inactive modules (R.module.modules) for(var/obj/O in um) // Engineering - if(istype(O,/obj/item/stack/sheet/metal) || istype(O,/obj/item/stack/sheet/rglass) || istype(O,/obj/item/weapon/cable_coil)) + if(istype(O,/obj/item/stack/sheet/metal) || istype(O,/obj/item/stack/sheet/rglass) || istype(O,/obj/item/stack/cable_coil)) if(O:amount < 50) O:amount += 1 // Security diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index 6b657bda789..826fafcf1b6 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -274,8 +274,8 @@ user << "\blue You open the panel and expose the wiring." is_open = 1 - else if(istype(W, /obj/item/weapon/cable_coil) && malfunction && is_open) - var/obj/item/weapon/cable_coil/coil = W + else if(istype(W, /obj/item/stack/cable_coil) && malfunction && is_open) + var/obj/item/stack/cable_coil/coil = W user << "\blue You begin to replace the wires." //if(do_after(user, min(60, round( ((maxhealth/health)*10)+(malfunction*10) ))) //Take longer to repair heavier damage if(do_after(user, 30)) diff --git a/code/game/machinery/telecomms/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm index 65c5bd0a9fc..62fc11840f3 100644 --- a/code/game/machinery/telecomms/machine_interactions.dm +++ b/code/game/machinery/telecomms/machine_interactions.dm @@ -43,12 +43,12 @@ playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1) user << "You remove the cables." construct_op ++ - var/obj/item/weapon/cable_coil/A = new /obj/item/weapon/cable_coil( user.loc ) + var/obj/item/stack/cable_coil/A = new /obj/item/stack/cable_coil( user.loc ) A.amount = 5 stat |= BROKEN // the machine's been borked! if(3) - if(istype(P, /obj/item/weapon/cable_coil)) - var/obj/item/weapon/cable_coil/A = P + if(istype(P, /obj/item/stack/cable_coil)) + var/obj/item/stack/cable_coil/A = P if(A.amount >= 5) user << "You insert the cables." A.amount -= 5 @@ -78,8 +78,8 @@ newpath = text2path(I) var/obj/item/s = new newpath s.loc = user.loc - if(istype(P, /obj/item/weapon/cable_coil)) - var/obj/item/weapon/cable_coil/A = P + if(istype(P, /obj/item/stack/cable_coil)) + var/obj/item/stack/cable_coil/A = P A.amount = 1 // Drop a circuit board too diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index a6f6810b021..ca01bfca19a 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -827,7 +827,7 @@ icon_state = "tool" icon_deny = "tool-deny" //req_access_txt = "12" //Maintenance access - products = list(/obj/item/weapon/cable_coil/random = 10,/obj/item/weapon/crowbar = 5,/obj/item/weapon/weldingtool = 3,/obj/item/weapon/wirecutters = 5, + products = list(/obj/item/stack/cable_coil/random = 10,/obj/item/weapon/crowbar = 5,/obj/item/weapon/weldingtool = 3,/obj/item/weapon/wirecutters = 5, /obj/item/weapon/wrench = 5,/obj/item/device/analyzer = 5,/obj/item/device/t_scanner = 5,/obj/item/weapon/screwdriver = 5) contraband = list(/obj/item/weapon/weldingtool/hugetank = 2,/obj/item/clothing/gloves/fyellow = 2) premium = list(/obj/item/clothing/gloves/yellow = 1) @@ -852,7 +852,7 @@ products = list(/obj/item/clothing/under/rank/chief_engineer = 4,/obj/item/clothing/under/rank/engineer = 4,/obj/item/clothing/shoes/orange = 4,/obj/item/clothing/head/hardhat = 4, /obj/item/weapon/storage/belt/utility = 4,/obj/item/clothing/glasses/meson = 4,/obj/item/clothing/gloves/yellow = 4, /obj/item/weapon/screwdriver = 12, /obj/item/weapon/crowbar = 12,/obj/item/weapon/wirecutters = 12,/obj/item/device/multitool = 12,/obj/item/weapon/wrench = 12,/obj/item/device/t_scanner = 12, - /obj/item/weapon/cable_coil/heavyduty = 8, /obj/item/weapon/cell = 8, /obj/item/weapon/weldingtool = 8,/obj/item/clothing/head/welding = 8, + /obj/item/stack/cable_coil/heavyduty = 8, /obj/item/weapon/cell = 8, /obj/item/weapon/weldingtool = 8,/obj/item/clothing/head/welding = 8, /obj/item/weapon/light/tube = 10,/obj/item/clothing/suit/fire = 4, /obj/item/weapon/stock_parts/scanning_module = 5,/obj/item/weapon/stock_parts/micro_laser = 5, /obj/item/weapon/stock_parts/matter_bin = 5,/obj/item/weapon/stock_parts/manipulator = 5,/obj/item/weapon/stock_parts/console_screen = 5) // There was an incorrect entry (cablecoil/power). I improvised to cablecoil/heavyduty. @@ -866,7 +866,7 @@ icon_state = "robotics" icon_deny = "robotics-deny" req_access_txt = "29" - products = list(/obj/item/clothing/suit/storage/labcoat = 4,/obj/item/clothing/under/rank/roboticist = 4,/obj/item/weapon/cable_coil = 4,/obj/item/device/flash = 4, + products = list(/obj/item/clothing/suit/storage/labcoat = 4,/obj/item/clothing/under/rank/roboticist = 4,/obj/item/stack/cable_coil = 4,/obj/item/device/flash = 4, /obj/item/weapon/cell/high = 12, /obj/item/device/assembly/prox_sensor = 3,/obj/item/device/assembly/signaler = 3,/obj/item/device/healthanalyzer = 3, /obj/item/weapon/scalpel = 2,/obj/item/weapon/circular_saw = 2,/obj/item/weapon/tank/anesthetic = 2,/obj/item/clothing/mask/breath/medical = 5, /obj/item/weapon/screwdriver = 5,/obj/item/weapon/crowbar = 5) diff --git a/code/game/mecha/equipment/tools/medical_tools.dm b/code/game/mecha/equipment/tools/medical_tools.dm index 6b3700164ac..bce443fc860 100644 --- a/code/game/mecha/equipment/tools/medical_tools.dm +++ b/code/game/mecha/equipment/tools/medical_tools.dm @@ -243,7 +243,7 @@ var/datum/event/event var/turf/old_turf var/obj/structure/cable/last_piece - var/obj/item/weapon/cable_coil/cable + var/obj/item/stack/cable_coil/cable var/max_cable = 1000 New() @@ -270,7 +270,7 @@ chassis.events.clearEvent("onMove",event) return ..() - action(var/obj/item/weapon/cable_coil/target) + action(var/obj/item/stack/cable_coil/target) if(!action_checks(target)) return var/result = load_cable(target) @@ -298,7 +298,7 @@ m = min(m, cable.amount) if(m) use_cable(m) - var/obj/item/weapon/cable_coil/CC = new (get_turf(chassis)) + var/obj/item/stack/cable_coil/CC = new (get_turf(chassis)) CC.amount = m else occupant_message("There's no more cable on the reel.") @@ -310,7 +310,7 @@ return "[output] \[Cable: [cable ? cable.amount : 0] m\][(cable && cable.amount) ? "- [!equip_ready?"Dea":"A"]ctivate|Cut" : null]" return - proc/load_cable(var/obj/item/weapon/cable_coil/CC) + proc/load_cable(var/obj/item/stack/cable_coil/CC) if(istype(CC) && CC.amount) var/cur_amount = cable? cable.amount : 0 var/to_load = max(max_cable - cur_amount,0) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 9246e080fac..ed91e4e4bfa 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -700,9 +700,9 @@ state=2 user << "You close the hatch to the power unit" return - else if(istype(W, /obj/item/weapon/cable_coil)) + else if(istype(W, /obj/item/stack/cable_coil)) if(state == 3 && hasInternalDamage(MECHA_INT_SHORT_CIRCUIT)) - var/obj/item/weapon/cable_coil/CC = W + var/obj/item/stack/cable_coil/CC = W if(CC.amount > 1) CC.use(2) clearInternalDamage(MECHA_INT_SHORT_CIRCUIT) diff --git a/code/game/mecha/mecha_construction_paths.dm b/code/game/mecha/mecha_construction_paths.dm index 05fe1c93d76..44c7933ccee 100644 --- a/code/game/mecha/mecha_construction_paths.dm +++ b/code/game/mecha/mecha_construction_paths.dm @@ -18,8 +18,8 @@ else if(istype(used_atom, /obj/item/weapon/wirecutters)) playsound(holder, 'sound/items/Wirecutter.ogg', 50, 1) - else if(istype(used_atom, /obj/item/weapon/cable_coil)) - var/obj/item/weapon/cable_coil/C = used_atom + else if(istype(used_atom, /obj/item/stack/cable_coil)) + var/obj/item/stack/cable_coil/C = used_atom if(C.amount<4) user << ("There's not enough cable to finish the task.") return 0 @@ -51,8 +51,8 @@ else if(istype(used_atom, /obj/item/weapon/wirecutters)) playsound(holder, 'sound/items/Wirecutter.ogg', 50, 1) - else if(istype(used_atom, /obj/item/weapon/cable_coil)) - var/obj/item/weapon/cable_coil/C = used_atom + else if(istype(used_atom, /obj/item/stack/cable_coil)) + var/obj/item/stack/cable_coil/C = used_atom if(C.amount<4) user << ("There's not enough cable to finish the task.") return 0 @@ -147,7 +147,7 @@ "backkey"=/obj/item/weapon/screwdriver, "desc"="The wiring is added"), //12 - list("key"=/obj/item/weapon/cable_coil, + list("key"=/obj/item/stack/cable_coil, "backkey"=/obj/item/weapon/screwdriver, "desc"="The hydraulic systems are active."), //13 @@ -191,7 +191,7 @@ holder.icon_state = "ripley4" else user.visible_message("[user] removes the wiring from [holder].", "You remove the wiring from [holder].") - var/obj/item/weapon/cable_coil/coil = new /obj/item/weapon/cable_coil(get_turf(holder)) + var/obj/item/stack/cable_coil/coil = new /obj/item/stack/cable_coil(get_turf(holder)) coil.amount = 4 holder.icon_state = "ripley2" if(10) @@ -381,7 +381,7 @@ "backkey"=/obj/item/weapon/screwdriver, "desc"="The wiring is added"), //18 - list("key"=/obj/item/weapon/cable_coil, + list("key"=/obj/item/stack/cable_coil, "backkey"=/obj/item/weapon/screwdriver, "desc"="The hydraulic systems are active."), //19 @@ -425,7 +425,7 @@ holder.icon_state = "gygax4" else user.visible_message("[user] removes the wiring from [holder].", "You remove the wiring from [holder].") - var/obj/item/weapon/cable_coil/coil = new /obj/item/weapon/cable_coil(get_turf(holder)) + var/obj/item/stack/cable_coil/coil = new /obj/item/stack/cable_coil(get_turf(holder)) coil.amount = 4 holder.icon_state = "gygax2" if(16) @@ -643,7 +643,7 @@ "backkey"=/obj/item/weapon/screwdriver, "desc"="The wiring is added"), //13 - list("key"=/obj/item/weapon/cable_coil, + list("key"=/obj/item/stack/cable_coil, "backkey"=/obj/item/weapon/screwdriver, "desc"="The hydraulic systems are active."), //14 @@ -687,7 +687,7 @@ holder.icon_state = "fireripley4" else user.visible_message("[user] removes the wiring from [holder].", "You remove the wiring from [holder].") - var/obj/item/weapon/cable_coil/coil = new /obj/item/weapon/cable_coil(get_turf(holder)) + var/obj/item/stack/cable_coil/coil = new /obj/item/stack/cable_coil(get_turf(holder)) coil.amount = 4 holder.icon_state = "fireripley2" if(11) @@ -963,7 +963,7 @@ "backkey"=/obj/item/weapon/screwdriver, "desc"="The wiring is added"), //18 - list("key"=/obj/item/weapon/cable_coil, + list("key"=/obj/item/stack/cable_coil, "backkey"=/obj/item/weapon/screwdriver, "desc"="The hydraulic systems are active."), //19 @@ -1008,7 +1008,7 @@ holder.icon_state = "durand4" else user.visible_message("[user] removes the wiring from [holder].", "You remove the wiring from [holder].") - var/obj/item/weapon/cable_coil/coil = new /obj/item/weapon/cable_coil(get_turf(holder)) + var/obj/item/stack/cable_coil/coil = new /obj/item/stack/cable_coil(get_turf(holder)) coil.amount = 4 holder.icon_state = "durand2" if(16) @@ -1243,7 +1243,7 @@ "backkey"=/obj/item/weapon/screwdriver, "desc"="The wiring is added"), //12 - list("key"=/obj/item/weapon/cable_coil, + list("key"=/obj/item/stack/cable_coil, "backkey"=/obj/item/weapon/screwdriver, "desc"="The hydraulic systems are active."), //13 @@ -1287,7 +1287,7 @@ holder.icon_state = "odysseus4" else user.visible_message("[user] removes the wiring from [holder].", "You remove the wiring from [holder].") - var/obj/item/weapon/cable_coil/coil = new /obj/item/weapon/cable_coil(get_turf(holder)) + var/obj/item/stack/cable_coil/coil = new /obj/item/stack/cable_coil(get_turf(holder)) coil.amount = 4 holder.icon_state = "odysseus2" if(10) diff --git a/code/game/mecha/mecha_wreckage.dm b/code/game/mecha/mecha_wreckage.dm index 0841a870a88..e9303f0c605 100644 --- a/code/game/mecha/mecha_wreckage.dm +++ b/code/game/mecha/mecha_wreckage.dm @@ -11,7 +11,7 @@ anchored = 0 opacity = 0 var/list/welder_salvage = list(/obj/item/stack/sheet/plasteel,/obj/item/stack/sheet/metal,/obj/item/stack/rods) - var/list/wirecutters_salvage = list(/obj/item/weapon/cable_coil) + var/list/wirecutters_salvage = list(/obj/item/stack/cable_coil) var/list/crowbar_salvage var/salvage_num = 5 diff --git a/code/game/objects/items/apc_frame.dm b/code/game/objects/items/apc_frame.dm index 4ed920fd12e..f2e760a34a5 100644 --- a/code/game/objects/items/apc_frame.dm +++ b/code/game/objects/items/apc_frame.dm @@ -35,7 +35,7 @@ usr << "\red There is another network terminal here." return else - var/obj/item/weapon/cable_coil/C = new /obj/item/weapon/cable_coil(loc) + var/obj/item/stack/cable_coil/C = new /obj/item/stack/cable_coil(loc) C.amount = 10 usr << "You cut the cables and disassemble the unused power terminal." del(T) diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index 7ccd2421477..6c4f35d4312 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -254,12 +254,12 @@ W.loc = src src.cell = W user << "\blue You insert the cell!" - if(istype(W, /obj/item/weapon/cable_coil)) + if(istype(W, /obj/item/stack/cable_coil)) if(src.wires) user << "\blue You have already inserted wire!" return else - var/obj/item/weapon/cable_coil/coil = W + var/obj/item/stack/cable_coil/coil = W coil.use(1) src.wires = 1.0 user << "\blue You insert the wire!" diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index cb2310f3dd3..f0d3d00f4ec 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -25,8 +25,8 @@ /obj/item/stack/sheet/glass/attackby(obj/item/W, mob/user) ..() - if(istype(W,/obj/item/weapon/cable_coil)) - var/obj/item/weapon/cable_coil/CC = W + if(istype(W,/obj/item/stack/cable_coil)) + var/obj/item/stack/cable_coil/CC = W if(CC.amount < 5) user << "\b There is not enough wire in this coil. You need 5 lengths." return diff --git a/code/game/objects/items/stacks/sheets/light.dm b/code/game/objects/items/stacks/sheets/light.dm index 5437fdeccd5..faacdf59df8 100644 --- a/code/game/objects/items/stacks/sheets/light.dm +++ b/code/game/objects/items/stacks/sheets/light.dm @@ -14,7 +14,7 @@ /obj/item/stack/light_w/attackby(var/obj/item/O as obj, var/mob/user as mob) ..() if(istype(O,/obj/item/weapon/wirecutters)) - var/obj/item/weapon/cable_coil/CC = new/obj/item/weapon/cable_coil(user.loc) + var/obj/item/stack/cable_coil/CC = new/obj/item/stack/cable_coil(user.loc) CC.amount = 5 amount-- new/obj/item/stack/sheet/glass(user.loc) diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index b8ac280f7e5..7bf7ead165c 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -182,8 +182,8 @@ user << "You add [A] to [src]!" update_icon() - else if(stage == EMPTY && istype(I, /obj/item/weapon/cable_coil)) - var/obj/item/weapon/cable_coil/C = I + else if(stage == EMPTY && istype(I, /obj/item/stack/cable_coil)) + var/obj/item/stack/cable_coil/C = I C.use(1) stage = WIRED diff --git a/code/game/objects/items/weapons/grenades/ghettobomb.dm b/code/game/objects/items/weapons/grenades/ghettobomb.dm index cea28d538ed..ec87341eebc 100644 --- a/code/game/objects/items/weapons/grenades/ghettobomb.dm +++ b/code/game/objects/items/weapons/grenades/ghettobomb.dm @@ -48,9 +48,9 @@ /obj/item/weapon/grenade/iedcasing/attackby(var/obj/item/I, mob/user as mob) //Wiring the can for ignition - if(istype(I, /obj/item/weapon/cable_coil)) + if(istype(I, /obj/item/stack/cable_coil)) if(assembled == 1) - var/obj/item/weapon/cable_coil/C = I + var/obj/item/stack/cable_coil/C = I C.use(1) assembled = 2 user << "You wire the igniter to detonate the fuel." diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index d86799eaba1..daeae3bf901 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -49,7 +49,7 @@ "/obj/item/weapon/wrench", "/obj/item/device/multitool", "/obj/item/device/flashlight", - "/obj/item/weapon/cable_coil", + "/obj/item/stack/cable_coil", "/obj/item/device/t_scanner", "/obj/item/device/analyzer", "/obj/item/taperoll/engineering") @@ -62,7 +62,7 @@ new /obj/item/weapon/weldingtool(src) new /obj/item/weapon/crowbar(src) new /obj/item/weapon/wirecutters(src) - new /obj/item/weapon/cable_coil(src,30,pick("red","yellow","orange")) + new /obj/item/stack/cable_coil(src,30,pick("red","yellow","orange")) /obj/item/weapon/storage/belt/utility/atmostech/New() diff --git a/code/game/objects/items/weapons/storage/toolbox.dm b/code/game/objects/items/weapons/storage/toolbox.dm index 4223ab88180..2c25e8adacb 100644 --- a/code/game/objects/items/weapons/storage/toolbox.dm +++ b/code/game/objects/items/weapons/storage/toolbox.dm @@ -60,12 +60,12 @@ new /obj/item/weapon/wirecutters(src) new /obj/item/device/t_scanner(src) new /obj/item/weapon/crowbar(src) - new /obj/item/weapon/cable_coil(src,30,color) - new /obj/item/weapon/cable_coil(src,30,color) + new /obj/item/stack/cable_coil(src,30,color) + new /obj/item/stack/cable_coil(src,30,color) if(prob(5)) new /obj/item/clothing/gloves/yellow(src) else - new /obj/item/weapon/cable_coil(src,30,color) + new /obj/item/stack/cable_coil(src,30,color) /obj/item/weapon/storage/toolbox/syndicate name = "suspicious looking toolbox" @@ -81,6 +81,6 @@ new /obj/item/weapon/wrench(src) new /obj/item/weapon/weldingtool(src) new /obj/item/weapon/crowbar(src) - new /obj/item/weapon/cable_coil(src,30,color) + new /obj/item/stack/cable_coil(src,30,color) new /obj/item/weapon/wirecutters(src) new /obj/item/device/multitool(src) \ No newline at end of file diff --git a/code/game/objects/random/random.dm b/code/game/objects/random/random.dm index 26b4307d776..832227b12d7 100644 --- a/code/game/objects/random/random.dm +++ b/code/game/objects/random/random.dm @@ -5,7 +5,7 @@ icon_state = "rup" var/spawn_nothing_percentage = 0 // this variable determines the likelyhood that this random object will not spawn anything - + // creates a new object and deletes itself /obj/random/New() ..() @@ -37,8 +37,8 @@ /obj/item/weapon/crowbar,\ /obj/item/weapon/wrench,\ /obj/item/device/flashlight) - - + + /obj/random/technology_scanner name = "Random Scanner" desc = "This is a random technology scanner." @@ -48,8 +48,8 @@ return pick(prob(5);/obj/item/device/t_scanner,\ prob(2);/obj/item/device/radio/intercom,\ prob(5);/obj/item/device/analyzer) - - + + /obj/random/powercell name = "Random Powercell" desc = "This is a random powercell." @@ -61,8 +61,8 @@ prob(40);/obj/item/weapon/cell/high,\ prob(9);/obj/item/weapon/cell/super,\ prob(1);/obj/item/weapon/cell/hyper) - - + + /obj/random/bomb_supply name = "Bomb Supply" desc = "This is a random bomb supply." @@ -83,8 +83,8 @@ return pick(prob(3);/obj/item/weapon/storage/toolbox/mechanical,\ prob(2);/obj/item/weapon/storage/toolbox/electrical,\ prob(1);/obj/item/weapon/storage/toolbox/emergency) - - + + /obj/random/tech_supply name = "Random Tech Supply" desc = "This is a random piece of technology supplies." @@ -98,7 +98,7 @@ prob(2);/obj/random/bomb_supply,\ prob(1);/obj/item/weapon/extinguisher,\ prob(1);/obj/item/clothing/gloves/fyellow,\ - prob(3);/obj/item/weapon/cable_coil,\ + prob(3);/obj/item/stack/cable_coil,\ prob(2);/obj/random/toolbox,\ prob(2);/obj/item/weapon/storage/belt/utility,\ prob(5);/obj/random/tool) \ No newline at end of file diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm index 76458dbf088..4b4bd46a5ac 100644 --- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm @@ -127,11 +127,11 @@ if(prob(20)) new /obj/item/weapon/storage/belt/utility(src) if(prob(30)) - new /obj/item/weapon/cable_coil/random(src) + new /obj/item/stack/cable_coil/random(src) if(prob(30)) - new /obj/item/weapon/cable_coil/random(src) + new /obj/item/stack/cable_coil/random(src) if(prob(30)) - new /obj/item/weapon/cable_coil/random(src) + new /obj/item/stack/cable_coil/random(src) if(prob(20)) new /obj/item/device/multitool(src) if(prob(5)) diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index ccace6a8f0e..861d4f614ac 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -71,7 +71,7 @@ W.loc = src.loc else if(istype(W, /obj/item/weapon/packageWrap)) return - else if(istype(W, /obj/item/weapon/cable_coil)) + else if(istype(W, /obj/item/stack/cable_coil)) if(rigged) user << "[src] is already rigged!" return @@ -178,7 +178,7 @@ src.toggle(user) /obj/structure/closet/crate/secure/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(is_type_in_list(W, list(/obj/item/weapon/packageWrap, /obj/item/weapon/cable_coil, /obj/item/device/radio/electropack, /obj/item/weapon/wirecutters))) + if(is_type_in_list(W, list(/obj/item/weapon/packageWrap, /obj/item/stack/cable_coil, /obj/item/device/radio/electropack, /obj/item/weapon/wirecutters))) return ..() if(locked && (istype(W, /obj/item/weapon/card/emag)||istype(W, /obj/item/weapon/melee/energy/blade))) overlays.Cut() diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm index 444d1f03738..355ec779efe 100644 --- a/code/game/objects/structures/door_assembly.dm +++ b/code/game/objects/structures/door_assembly.dm @@ -185,8 +185,8 @@ obj/structure/door_assembly user << "\blue You [anchored? "un" : ""]secured the airlock assembly!" anchored = !anchored - else if(istype(W, /obj/item/weapon/cable_coil) && state == 0 && anchored ) - var/obj/item/weapon/cable_coil/coil = W + else if(istype(W, /obj/item/stack/cable_coil) && state == 0 && anchored ) + var/obj/item/stack/cable_coil/coil = W user.visible_message("[user] wires the airlock assembly.", "You start to wire the airlock assembly.") if(do_after(user, 40)) if(!src) return @@ -201,7 +201,7 @@ obj/structure/door_assembly if(do_after(user, 40)) if(!src) return user << "\blue You cut the airlock wires.!" - new/obj/item/weapon/cable_coil(src.loc, 1) + new/obj/item/stack/cable_coil(src.loc, 1) src.state = 0 else if(istype(W, /obj/item/weapon/airlock_electronics) && state == 1 && W:icon_state != "door_electronics_smoked") diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm index 478f6989baa..466ef5ad178 100644 --- a/code/game/objects/structures/windoor_assembly.dm +++ b/code/game/objects/structures/windoor_assembly.dm @@ -126,12 +126,12 @@ obj/structure/windoor_assembly/Del() src.name = "Secure Windoor Assembly" //Adding cable to the assembly. Step 5 complete. - else if(istype(W, /obj/item/weapon/cable_coil) && anchored) + else if(istype(W, /obj/item/stack/cable_coil) && anchored) user.visible_message("[user] wires the windoor assembly.", "You start to wire the windoor assembly.") if(do_after(user, 40)) if(!src) return - var/obj/item/weapon/cable_coil/CC = W + var/obj/item/stack/cable_coil/CC = W CC.use(1) user << "\blue You wire the windoor!" src.state = "02" @@ -153,7 +153,7 @@ obj/structure/windoor_assembly/Del() if(!src) return user << "\blue You cut the windoor wires.!" - new/obj/item/weapon/cable_coil(get_turf(user), 1) + new/obj/item/stack/cable_coil(get_turf(user), 1) src.state = "01" if(src.secure) src.name = "Secure Anchored Windoor Assembly" diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm index 6bb2a6b15b3..e37f354daaa 100644 --- a/code/game/turfs/simulated/floor.dm +++ b/code/game/turfs/simulated/floor.dm @@ -532,9 +532,9 @@ turf/simulated/floor/proc/update_icon() user << "\blue This section is too damaged to support a tile. Use a welder to fix the damage." - if(istype(C, /obj/item/weapon/cable_coil)) + if(istype(C, /obj/item/stack/cable_coil)) if(is_plating() || is_catwalk()) - var/obj/item/weapon/cable_coil/coil = C + var/obj/item/stack/cable_coil/coil = C coil.turf_place(src, user) else user << "\red You must remove the plating first." diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm index 824ad93ea4a..d15a0d16091 100644 --- a/code/modules/mining/ores_coins.dm +++ b/code/modules/mining/ores_coins.dm @@ -123,8 +123,8 @@ icon_state = "coin_mythril" /obj/item/weapon/coin/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W,/obj/item/weapon/cable_coil) ) - var/obj/item/weapon/cable_coil/CC = W + if(istype(W,/obj/item/stack/cable_coil) ) + var/obj/item/stack/cable_coil/CC = W if(string_attached) user << "\blue There already is a string attached to this coin." return @@ -143,7 +143,7 @@ ..() return - var/obj/item/weapon/cable_coil/CC = new/obj/item/weapon/cable_coil(user.loc) + var/obj/item/stack/cable_coil/CC = new/obj/item/stack/cable_coil(user.loc) CC.amount = 1 // CC.updateicon() overlays = list() diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 68fbd672fa9..0499b3a331c 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -578,11 +578,11 @@ user << "Need more welding fuel!" return - else if(istype(W, /obj/item/weapon/cable_coil) && wiresexposed) + else if(istype(W, /obj/item/stack/cable_coil) && wiresexposed) if (!getFireLoss()) user << "Nothing to fix here!" return - var/obj/item/weapon/cable_coil/coil = W + var/obj/item/stack/cable_coil/coil = W adjustFireLoss(-30) updatehealth() coil.use(1) diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index da60742d0bf..ac88a9e5109 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -106,7 +106,7 @@ G.amount = 50 src.modules += G - var/obj/item/weapon/cable_coil/W = new /obj/item/weapon/cable_coil(src) + var/obj/item/stack/cable_coil/W = new /obj/item/stack/cable_coil(src) W.amount = 50 src.modules += W @@ -117,7 +117,7 @@ var/list/what = list ( /obj/item/stack/sheet/metal, /obj/item/stack/sheet/rglass, - /obj/item/weapon/cable_coil, + /obj/item/stack/cable_coil, ) for (var/T in what) if (!(locate(T) in src.modules)) diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 6f77bf407a8..f0af273dcb6 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -307,11 +307,11 @@ update_icon() else user << "You fail to [ locked ? "unlock" : "lock"] the APC interface." - else if (istype(W, /obj/item/weapon/cable_coil) && !terminal && opened && has_electronics!=2) + else if (istype(W, /obj/item/stack/cable_coil) && !terminal && opened && has_electronics!=2) if (src.loc:intact) user << "\red You must remove the floor plating in front of the APC first." return - var/obj/item/weapon/cable_coil/C = W + var/obj/item/stack/cable_coil/C = W if(C.amount < 10) user << "\red You need more wires." return @@ -343,7 +343,7 @@ s.set_up(5, 1, src) s.start() return - new /obj/item/weapon/cable_coil(loc,10) + new /obj/item/stack/cable_coil(loc,10) user.visible_message(\ "\red [user.name] cut the cables and dismantled the power terminal.",\ "You cut the cables and dismantle the power terminal.") diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index fbe97530edd..7a9a87059ec 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -2,9 +2,9 @@ /obj/machinery/power/attackby(obj/item/weapon/W, mob/user) - if(istype(W, /obj/item/weapon/cable_coil)) + if(istype(W, /obj/item/stack/cable_coil)) - var/obj/item/weapon/cable_coil/coil = W + var/obj/item/stack/cable_coil/coil = W var/turf/T = user.loc @@ -128,9 +128,9 @@ return if(src.d1) // 0-X cables are 1 unit, X-X cables are 2 units long - new/obj/item/weapon/cable_coil(T, 2, cable_color) + new/obj/item/stack/cable_coil(T, 2, cable_color) else - new/obj/item/weapon/cable_coil(T, 1, cable_color) + new/obj/item/stack/cable_coil(T, 1, cable_color) for(var/mob/O in viewers(src, null)) O.show_message("\red [user] cuts the cable.", 1) @@ -141,8 +141,8 @@ return - else if(istype(W, /obj/item/weapon/cable_coil)) - var/obj/item/weapon/cable_coil/coil = W + else if(istype(W, /obj/item/stack/cable_coil)) + var/obj/item/stack/cable_coil/coil = W coil.cable_join(src, user) else if(istype(W, /obj/item/device/multitool)) @@ -182,24 +182,24 @@ del(src) if(2.0) if (prob(50)) - new/obj/item/weapon/cable_coil(src.loc, src.d1 ? 2 : 1, cable_color) + new/obj/item/stack/cable_coil(src.loc, src.d1 ? 2 : 1, cable_color) del(src) if(3.0) if (prob(25)) - new/obj/item/weapon/cable_coil(src.loc, src.d1 ? 2 : 1, cable_color) + new/obj/item/stack/cable_coil(src.loc, src.d1 ? 2 : 1, cable_color) del(src) return // the cable coil object, used for laying cable #define MAXCOIL 30 -/obj/item/weapon/cable_coil +/obj/item/stack/cable_coil name = "cable coil" icon = 'icons/obj/power.dmi' icon_state = "coil_red" item_state = "coil_red" - var/amount = MAXCOIL + amount = MAXCOIL _color = "red" desc = "A coil of power cable." throwforce = 10 @@ -220,7 +220,7 @@ return(OXYLOSS) -/obj/item/weapon/cable_coil/New(loc, length = MAXCOIL, var/param_color = null) +/obj/item/stack/cable_coil/New(loc, length = MAXCOIL, var/param_color = null) ..() src.amount = length if (param_color) @@ -229,7 +229,7 @@ pixel_y = rand(-2,2) update_icon() -/obj/item/weapon/cable_coil/update_icon() +/obj/item/stack/cable_coil/update_icon() if (!_color) _color = pick("red", "yellow", "blue", "green") if(amount == 1) @@ -242,7 +242,7 @@ icon_state = "coil_[_color]" name = "cable coil" -/obj/item/weapon/cable_coil/examine() +/obj/item/stack/cable_coil/examine() set src in view(1) if(amount == 1) @@ -252,7 +252,7 @@ else usr << "A coil of power cable. There are [amount] lengths of cable in the coil." -/obj/item/weapon/cable_coil/verb/make_restraint() +/obj/item/stack/cable_coil/verb/make_restraint() set name = "Make Cable Restraints" set category = "Object" var/mob/M = usr @@ -270,17 +270,17 @@ usr << "\blue You cannot do that." ..() -/obj/item/weapon/cable_coil/attackby(obj/item/weapon/W, mob/user) +/obj/item/stack/cable_coil/attackby(obj/item/weapon/W, mob/user) ..() if( istype(W, /obj/item/weapon/wirecutters) && src.amount > 1) src.amount-- - new/obj/item/weapon/cable_coil(user.loc, 1,_color) + new/obj/item/stack/cable_coil(user.loc, 1,_color) user << "You cut a piece off the cable coil." src.update_icon() return - else if( istype(W, /obj/item/weapon/cable_coil) ) - var/obj/item/weapon/cable_coil/C = W + else if( istype(W, /obj/item/stack/cable_coil) ) + var/obj/item/stack/cable_coil/C = W if(C.amount >= MAXCOIL) user << "The coil is too long, you cannot add any more cable to it." return @@ -298,7 +298,7 @@ src.use(amt) return -/obj/item/weapon/cable_coil/proc/use(var/used) +/obj/item/stack/cable_coil/use(var/used) if(src.amount < used) return 0 else if (src.amount == used) @@ -312,7 +312,7 @@ update_icon() return 1 -/obj/item/weapon/cable_coil/proc/give(var/extra) +/obj/item/stack/cable_coil/proc/give(var/extra) if(amount + extra > MAXCOIL) amount = MAXCOIL else @@ -321,7 +321,7 @@ // called when cable_coil is clicked on a turf/simulated/floor -/obj/item/weapon/cable_coil/proc/turf_place(turf/simulated/floor/F, mob/user) +/obj/item/stack/cable_coil/proc/turf_place(turf/simulated/floor/F, mob/user) if(!isturf(user.loc)) return @@ -367,7 +367,7 @@ use(1) if (C.shock(user, 50)) if (prob(50)) //fail - new/obj/item/weapon/cable_coil(C.loc, 1, C.cable_color) + new/obj/item/stack/cable_coil(C.loc, 1, C.cable_color) del(C) //src.laying = 1 //last = C @@ -375,7 +375,7 @@ // called when cable_coil is click on an installed obj/cable -/obj/item/weapon/cable_coil/proc/cable_join(obj/structure/cable/C, mob/user) +/obj/item/stack/cable_coil/proc/cable_join(obj/structure/cable/C, mob/user) var/turf/U = user.loc if(!isturf(U)) @@ -427,7 +427,7 @@ use(1) if (NC.shock(user, 50)) if (prob(50)) //fail - new/obj/item/weapon/cable_coil(NC.loc, 1, NC.cable_color) + new/obj/item/stack/cable_coil(NC.loc, 1, NC.cable_color) del(NC) return @@ -466,7 +466,7 @@ use(1) if (C.shock(user, 50)) if (prob(50)) //fail - new/obj/item/weapon/cable_coil(C.loc, 2, C.cable_color) + new/obj/item/stack/cable_coil(C.loc, 2, C.cable_color) del(C) return @@ -561,46 +561,46 @@ obj/structure/cable/proc/cableColor(var/colorC) if("white") icon = 'icons/obj/power_cond/power_cond_white.dmi' -/obj/item/weapon/cable_coil/cut +/obj/item/stack/cable_coil/cut item_state = "coil_red2" -/obj/item/weapon/cable_coil/cut/New(loc) +/obj/item/stack/cable_coil/cut/New(loc) ..() src.amount = rand(1,2) pixel_x = rand(-2,2) pixel_y = rand(-2,2) update_icon() -/obj/item/weapon/cable_coil/yellow +/obj/item/stack/cable_coil/yellow _color = "yellow" icon_state = "coil_yellow" -/obj/item/weapon/cable_coil/blue +/obj/item/stack/cable_coil/blue _color = "blue" icon_state = "coil_blue" item_state = "coil_blue" -/obj/item/weapon/cable_coil/green +/obj/item/stack/cable_coil/green _color = "green" icon_state = "coil_green" -/obj/item/weapon/cable_coil/pink +/obj/item/stack/cable_coil/pink _color = "pink" icon_state = "coil_pink" -/obj/item/weapon/cable_coil/orange +/obj/item/stack/cable_coil/orange _color = "orange" icon_state = "coil_orange" -/obj/item/weapon/cable_coil/cyan +/obj/item/stack/cable_coil/cyan _color = "cyan" icon_state = "coil_cyan" -/obj/item/weapon/cable_coil/white +/obj/item/stack/cable_coil/white _color = "white" icon_state = "coil_white" -/obj/item/weapon/cable_coil/random/New() +/obj/item/stack/cable_coil/random/New() _color = pick("red","yellow","green","blue","pink") icon_state = "coil_[_color]" ..() diff --git a/code/modules/power/cable_heavyduty.dm b/code/modules/power/cable_heavyduty.dm index 6d701ca4028..36bd4f93eb7 100644 --- a/code/modules/power/cable_heavyduty.dm +++ b/code/modules/power/cable_heavyduty.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/cable_coil/heavyduty +/obj/item/stack/cable_coil/heavyduty name = "heavy cable coil" icon = 'icons/obj/power.dmi' icon_state = "wire" @@ -18,7 +18,7 @@ if(istype(W, /obj/item/weapon/wirecutters)) usr << "\blue These cables are too tough to be cut with those [W.name]." return - else if(istype(W, /obj/item/weapon/cable_coil)) + else if(istype(W, /obj/item/stack/cable_coil)) usr << "\blue You will need heavier cables to connect to these." return else diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index ad75cabc2d6..9d4d9fefb3c 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -128,15 +128,15 @@ src.icon_state = "tube-construct-stage1" if("bulb") src.icon_state = "bulb-construct-stage1" - new /obj/item/weapon/cable_coil(get_turf(src.loc), 1, "red") + new /obj/item/stack/cable_coil(get_turf(src.loc), 1, "red") user.visible_message("[user.name] removes the wiring from [src].", \ "You remove the wiring from [src].", "You hear a noise.") playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1) return - if(istype(W, /obj/item/weapon/cable_coil)) + if(istype(W, /obj/item/stack/cable_coil)) if (src.stage != 1) return - var/obj/item/weapon/cable_coil/coil = W + var/obj/item/stack/cable_coil/coil = W coil.use(1) switch(fixture_type) if ("tube") diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm index 57cc6a04bd4..7281a290b99 100644 --- a/code/modules/power/port_gen.dm +++ b/code/modules/power/port_gen.dm @@ -114,8 +114,8 @@ display round(lastgen) and plasmatank amount component_parts = list() component_parts += new /obj/item/weapon/stock_parts/matter_bin(src) component_parts += new /obj/item/weapon/stock_parts/micro_laser(src) - component_parts += new /obj/item/weapon/cable_coil(src) - component_parts += new /obj/item/weapon/cable_coil(src) + component_parts += new /obj/item/stack/cable_coil(src) + component_parts += new /obj/item/stack/cable_coil(src) component_parts += new /obj/item/weapon/stock_parts/capacitor(src) component_parts += new board_path(src) var/obj/sheet = new sheet_path(null) diff --git a/code/modules/reagents/reagent_containers/food/snacks/grown.dm b/code/modules/reagents/reagent_containers/food/snacks/grown.dm index debde5f7bc5..d3fd9f5bbd4 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/grown.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/grown.dm @@ -179,7 +179,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/potato/attackby(obj/item/weapon/W as obj, mob/user as mob) ..() - if(istype(W, /obj/item/weapon/cable_coil)) + if(istype(W, /obj/item/stack/cable_coil)) if(W:amount >= 5) W:amount -= 5 if(!W:amount) del(W) diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm index 27866c43182..087cafce35c 100644 --- a/code/modules/research/server.dm +++ b/code/modules/research/server.dm @@ -19,8 +19,8 @@ component_parts = list() component_parts += new /obj/item/weapon/circuitboard/rdserver(src) component_parts += new /obj/item/weapon/stock_parts/scanning_module(src) - component_parts += new /obj/item/weapon/cable_coil(src) - component_parts += new /obj/item/weapon/cable_coil(src) + component_parts += new /obj/item/stack/cable_coil(src) + component_parts += new /obj/item/stack/cable_coil(src) RefreshParts() src.initialize(); //Agouri diff --git a/code/modules/surgery/braincore.dm b/code/modules/surgery/braincore.dm index 689ac9e3c2d..b140bd9357c 100644 --- a/code/modules/surgery/braincore.dm +++ b/code/modules/surgery/braincore.dm @@ -151,7 +151,7 @@ /datum/surgery_step/brain/hematoma allowed_tools = list( /obj/item/weapon/FixOVein = 100, \ - /obj/item/weapon/cable_coil = 75 + /obj/item/stack/cable_coil = 75 ) min_duration = 90 diff --git a/code/modules/surgery/eye.dm b/code/modules/surgery/eye.dm index 763fa63bb03..0e98cce021a 100644 --- a/code/modules/surgery/eye.dm +++ b/code/modules/surgery/eye.dm @@ -79,7 +79,7 @@ /datum/surgery_step/eye/mend_eyes allowed_tools = list( /obj/item/weapon/hemostat = 100, \ - /obj/item/weapon/cable_coil = 75, \ + /obj/item/stack/cable_coil = 75, \ /obj/item/device/assembly/mousetrap = 10 //I don't know. Don't ask me. But I'm leaving it because hilarity. ) diff --git a/code/modules/surgery/face.dm b/code/modules/surgery/face.dm index e215487d0b7..f4eda3ef732 100644 --- a/code/modules/surgery/face.dm +++ b/code/modules/surgery/face.dm @@ -47,7 +47,7 @@ /datum/surgery_step/face/mend_vocal allowed_tools = list( /obj/item/weapon/hemostat = 100, \ - /obj/item/weapon/cable_coil = 75, \ + /obj/item/stack/cable_coil = 75, \ /obj/item/device/assembly/mousetrap = 10 //I don't know. Don't ask me. But I'm leaving it because hilarity. ) diff --git a/code/modules/surgery/generic.dm b/code/modules/surgery/generic.dm index 5982d529066..99a696e7039 100644 --- a/code/modules/surgery/generic.dm +++ b/code/modules/surgery/generic.dm @@ -61,7 +61,7 @@ /datum/surgery_step/generic/clamp_bleeders allowed_tools = list( /obj/item/weapon/hemostat = 100, \ - /obj/item/weapon/cable_coil = 75, \ + /obj/item/stack/cable_coil = 75, \ /obj/item/device/assembly/mousetrap = 20 ) diff --git a/code/modules/surgery/headreattach.dm b/code/modules/surgery/headreattach.dm index 90df3582826..4bfe2419f26 100644 --- a/code/modules/surgery/headreattach.dm +++ b/code/modules/surgery/headreattach.dm @@ -51,7 +51,7 @@ /datum/surgery_step/head/shape allowed_tools = list( /obj/item/weapon/FixOVein = 100, \ - /obj/item/weapon/cable_coil = 75, \ + /obj/item/stack/cable_coil = 75, \ /obj/item/device/assembly/mousetrap = 10) //ok chinsky min_duration = 80 @@ -84,7 +84,7 @@ /datum/surgery_step/head/suture allowed_tools = list( /obj/item/weapon/hemostat = 100, \ - /obj/item/weapon/cable_coil = 60, \ + /obj/item/stack/cable_coil = 60, \ /obj/item/weapon/FixOVein = 80) min_duration = 80 diff --git a/code/modules/surgery/other.dm b/code/modules/surgery/other.dm index 55fc59dd35a..eabbf09f990 100644 --- a/code/modules/surgery/other.dm +++ b/code/modules/surgery/other.dm @@ -8,7 +8,7 @@ priority = 2 allowed_tools = list( /obj/item/weapon/FixOVein = 100, \ - /obj/item/weapon/cable_coil = 75 + /obj/item/stack/cable_coil = 75 ) can_infect = 1 blood_level = 1 diff --git a/maps/tgstation-redux-WIP.dmm b/maps/tgstation-redux-WIP.dmm index 36a77186779..bd5bbdd6ae1 100644 --- a/maps/tgstation-redux-WIP.dmm +++ b/maps/tgstation-redux-WIP.dmm @@ -1700,7 +1700,7 @@ "aGJ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/wood,/area/crew_quarters/mrchangs) "aGK" = (/obj/machinery/meter,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9; pixel_y = 0},/turf/simulated/floor/plating,/area/maintenance/fpmaint) "aGL" = (/obj/structure/reagent_dispensers/fueltank,/turf/simulated/floor/plating,/area/maintenance/fpmaint) -"aGM" = (/obj/structure/table/reinforced,/obj/machinery/cell_charger,/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/obj/item/weapon/cable_coil{pixel_x = 3; pixel_y = -7},/obj/item/weapon/cable_coil{pixel_x = 3; pixel_y = -7},/obj/item/device/radio/intercom{freerange = 1; frequency = 1459; name = "Station Intercom (General)"; pixel_x = -30},/obj/item/weapon/book/manual/evaguide,/turf/simulated/floor{dir = 8; icon_state = "warning"},/area/ai_monitored/storage/eva) +"aGM" = (/obj/structure/table/reinforced,/obj/machinery/cell_charger,/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = -7},/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = -7},/obj/item/device/radio/intercom{freerange = 1; frequency = 1459; name = "Station Intercom (General)"; pixel_x = -30},/obj/item/weapon/book/manual/evaguide,/turf/simulated/floor{dir = 8; icon_state = "warning"},/area/ai_monitored/storage/eva) "aGN" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/item/device/radio/intercom{freerange = 1; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 30},/turf/simulated/floor{dir = 4; icon_state = "warning"},/area/ai_monitored/storage/eva) "aGO" = (/obj/machinery/door/airlock/glass{name = "Central Access"},/turf/simulated/floor{dir = 8; icon_state = "bluecorner"},/area/hallway/primary/fore) "aGP" = (/obj/machinery/door/airlock/glass{name = "Central Access"},/turf/simulated/floor,/area/hallway/primary/fore) @@ -2322,7 +2322,7 @@ "aSH" = (/obj/machinery/firealarm{dir = 2; pixel_y = 24},/turf/simulated/floor,/area/crew_quarters/locker) "aSI" = (/obj/structure/closet/secure_closet/personal,/turf/simulated/floor,/area/crew_quarters/locker) "aSJ" = (/obj/machinery/atmospherics/pipe/manifold{color = "blue"; dir = 8; icon_state = "manifold-b-f"; initialize_directions = 11; level = 1; name = "pipe manifold"},/turf/simulated/wall,/area) -"aSK" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/structure/table,/obj/item/weapon/cable_coil/random,/obj/item/weapon/cable_coil/random,/turf/simulated/floor,/area/storage/art) +"aSK" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/structure/table,/obj/item/stack/cable_coil/random,/obj/item/stack/cable_coil/random,/turf/simulated/floor,/area/storage/art) "aSL" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor,/area/storage/art) "aSM" = (/turf/simulated/floor,/area/storage/art) "aSN" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plating,/area/maintenance/port) @@ -2380,7 +2380,7 @@ "aTN" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating,/area/maintenance/port) "aTO" = (/obj/structure/closet/wardrobe/mixed,/obj/item/device/radio/intercom{dir = 0; name = "Station Intercom (General)"; pixel_x = -27},/turf/simulated/floor,/area/crew_quarters/locker) "aTP" = (/obj/effect/landmark{name = "lightsout"},/turf/simulated/floor,/area/crew_quarters/locker) -"aTQ" = (/obj/structure/table,/obj/item/weapon/cable_coil/random,/obj/item/weapon/cable_coil/random,/turf/simulated/floor,/area/storage/art) +"aTQ" = (/obj/structure/table,/obj/item/stack/cable_coil/random,/obj/item/stack/cable_coil/random,/turf/simulated/floor,/area/storage/art) "aTR" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = ""},/turf/simulated/floor,/area/storage/art) "aTS" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/power/apc{dir = 4; name = "Art Storage"; pixel_x = 27; pixel_y = 2},/turf/simulated/floor,/area/storage/art) "aTT" = (/obj/machinery/light_switch{pixel_y = 28},/obj/item/weapon/storage/box/lights/mixed,/turf/simulated/floor/plating,/area/storage/emergency2) @@ -3492,7 +3492,7 @@ "bph" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor,/area/assembly/chargebay) "bpi" = (/obj/machinery/hologram/holopad,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor,/area/assembly/chargebay) "bpj" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area) -"bpk" = (/obj/structure/table,/obj/item/stack/sheet/plasteel{amount = 10},/obj/item/weapon/cable_coil,/obj/item/device/flash,/obj/item/device/flash,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor,/area/assembly/robotics) +"bpk" = (/obj/structure/table,/obj/item/stack/sheet/plasteel{amount = 10},/obj/item/stack/cable_coil,/obj/item/device/flash,/obj/item/device/flash,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor,/area/assembly/robotics) "bpl" = (/obj/structure/stool,/obj/effect/landmark/start{name = "Roboticist"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor,/area/assembly/robotics) "bpm" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{icon_state = "bot"},/area/assembly/robotics) "bpn" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{dir = 8; icon_state = "warnwhite"; tag = "icon-warnwhite (NORTH)"},/area/assembly/robotics) @@ -3656,7 +3656,7 @@ "bsp" = (/obj/structure/table,/obj/machinery/cell_charger,/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "white"},/area/toxins/lab) "bsq" = (/obj/item/weapon/folder/white,/obj/structure/table,/obj/item/weapon/disk/tech_disk{pixel_x = 0; pixel_y = 0},/obj/item/weapon/disk/tech_disk{pixel_x = 0; pixel_y = 0},/obj/item/weapon/disk/design_disk,/obj/item/weapon/disk/design_disk,/obj/item/weapon/reagent_containers/dropper{pixel_y = -4},/turf/simulated/floor{icon_state = "white"},/area/toxins/lab) "bsr" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor{icon_state = "white"},/area/toxins/lab) -"bss" = (/obj/structure/table,/obj/item/weapon/cable_coil,/obj/item/weapon/cable_coil{pixel_x = 3; pixel_y = 3},/obj/item/weapon/stock_parts/scanning_module{pixel_x = 2; pixel_y = 3},/obj/item/weapon/stock_parts/scanning_module,/obj/machinery/light_switch{pixel_x = 27},/turf/simulated/floor{icon_state = "white"},/area/toxins/lab) +"bss" = (/obj/structure/table,/obj/item/stack/cable_coil,/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = 3},/obj/item/weapon/stock_parts/scanning_module{pixel_x = 2; pixel_y = 3},/obj/item/weapon/stock_parts/scanning_module,/obj/machinery/light_switch{pixel_x = 27},/turf/simulated/floor{icon_state = "white"},/area/toxins/lab) "bst" = (/obj/structure/closet/crate,/obj/item/weapon/coin/silver,/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bsu" = (/obj/structure/shuttle/engine/propulsion/burst{dir = 4},/turf/space,/area/shuttle/research/station) "bsv" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/shuttle/engine/heater{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/simulated/floor/plating/airless,/area/shuttle/research/station) @@ -5261,7 +5261,7 @@ "bXi" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/cable,/obj/structure/grille,/turf/simulated/floor/plating,/area) "bXj" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/grille,/obj/structure/cable,/turf/simulated/floor/plating,/area) "bXk" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area) -"bXl" = (/obj/structure/table,/obj/item/weapon/cable_coil{pixel_x = -3; pixel_y = 3},/obj/item/weapon/cable_coil,/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/turf/simulated/floor/plating,/area/storage/tech) +"bXl" = (/obj/structure/table,/obj/item/stack/cable_coil{pixel_x = -3; pixel_y = 3},/obj/item/stack/cable_coil,/obj/item/weapon/cell/high{charge = 100; maxcharge = 15000},/turf/simulated/floor/plating,/area/storage/tech) "bXm" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plating,/area/storage/tech) "bXn" = (/obj/machinery/requests_console{department = "Tech storage"; pixel_x = 0; pixel_y = -32},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/storage/tech) "bXo" = (/obj/machinery/light/small{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/storage/tech) @@ -5272,7 +5272,7 @@ "bXt" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor,/area/engine/break_room) "bXu" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/structure/table,/turf/simulated/floor,/area/engine/break_room) "bXv" = (/obj/structure/table,/obj/item/apc_frame,/turf/simulated/floor,/area/engine/break_room) -"bXw" = (/obj/structure/table,/obj/item/weapon/cable_coil{pixel_x = 3; pixel_y = -7},/obj/item/weapon/cable_coil{pixel_x = 3; pixel_y = -7},/obj/machinery/door_control{id = "engitrain"; name = "Engineering Training"; normaldoorcontrol = 1; pixel_x = 25; pixel_y = 0; req_access_txt = "56"; specialfunctions = 4},/turf/simulated/floor,/area/engine/break_room) +"bXw" = (/obj/structure/table,/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = -7},/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = -7},/obj/machinery/door_control{id = "engitrain"; name = "Engineering Training"; normaldoorcontrol = 1; pixel_x = 25; pixel_y = 0; req_access_txt = "56"; specialfunctions = 4},/turf/simulated/floor,/area/engine/break_room) "bXx" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/simulated/floor,/area/engine/break_room) "bXy" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/closet/secure_closet/medical3,/turf/simulated/floor{icon_state = "white"},/area/medical/surgery) "bXz" = (/turf/simulated/floor{icon_state = "white"},/area/medical/surgery) @@ -5580,7 +5580,7 @@ "cdp" = (/obj/machinery/door/airlock/research{autoclose = 0; frequency = 1449; icon_state = "door_locked"; id_tag = "xeno_airlock_interior"; locked = 1; name = "Xenobiology Internal Airlock"; req_access_txt = "55"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{icon_state = "white"},/area/toxins/xenobiology) "cdq" = (/turf/simulated/floor/plating/airless,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor/plating/airless/catwalk{tag = "icon-catwalk3"; icon_state = "catwalk3"},/area/solar/starboard) "cdr" = (/obj/machinery/door/poddoor{id = "ToxinsVenting"; name = "Toxins Venting Bay Door"; use_power = 0},/turf/simulated/floor/engine,/area/toxins/mixing) -"cds" = (/obj/item/weapon/cable_coil,/turf/simulated/floor{icon_state = "floorgrime"},/area/assembly/assembly_line) +"cds" = (/obj/item/stack/cable_coil,/turf/simulated/floor{icon_state = "floorgrime"},/area/assembly/assembly_line) "cdt" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = ""},/turf/simulated/floor{icon_state = "floorgrime"},/area/assembly/assembly_line) "cdu" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/turf/simulated/floor,/area/assembly/assembly_line) "cdv" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/turf/simulated/floor{icon_state = "floorgrime"},/area/assembly/assembly_line) @@ -5979,7 +5979,7 @@ "ckY" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = ""},/obj/machinery/computer/station_alert,/turf/simulated/floor{dir = 8; icon_state = "neutralfull"},/area/engine/chiefs_office) "ckZ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = ""},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/structure/cable,/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = ""},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = ""},/turf/simulated/floor/plating,/area) "cla" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = ""},/obj/structure/closet/secure_closet/engineering_welding,/turf/simulated/floor,/area/engine/break_room) -"clb" = (/obj/structure/table,/obj/item/weapon/airlock_electronics,/obj/item/weapon/airlock_electronics,/obj/item/weapon/cable_coil,/obj/item/weapon/cable_coil,/turf/simulated/floor,/area/engine/break_room) +"clb" = (/obj/structure/table,/obj/item/weapon/airlock_electronics,/obj/item/weapon/airlock_electronics,/obj/item/stack/cable_coil,/obj/item/stack/cable_coil,/turf/simulated/floor,/area/engine/break_room) "clc" = (/obj/structure/table,/obj/item/device/radio{pixel_y = 6},/obj/item/device/radio{pixel_x = 6; pixel_y = 4},/obj/item/device/radio{pixel_x = -6; pixel_y = 4},/obj/item/device/radio,/turf/simulated/floor,/area/engine/break_room) "cld" = (/obj/structure/table,/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/sheet/plasteel{amount = 10},/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/sheet/metal{amount = 50},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/atmospherics/pipe/simple{color = "blue"; icon_state = "intact-b-f"; level = 1; name = "pipe"},/turf/simulated/floor,/area/engine/break_room) "cle" = (/obj/machinery/atmospherics/trinary/mixer{dir = 1},/turf/simulated/floor,/area/atmos) @@ -6012,7 +6012,7 @@ "clF" = (/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "white"},/area/toxins/xenobiology) "clG" = (/turf/simulated/floor/plating/airless,/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = ""},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = ""},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor/plating/airless/catwalk{tag = "icon-catwalk3"; icon_state = "catwalk3"},/area/solar/port) "clH" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating/airless,/area) -"clI" = (/obj/item/weapon/cable_coil{amount = 5},/turf/simulated/floor/plating,/area/maintenance/aft) +"clI" = (/obj/item/stack/cable_coil{amount = 5},/turf/simulated/floor/plating,/area/maintenance/aft) "clJ" = (/obj/effect/decal/cleanable/oil,/turf/simulated/floor/plating,/area/maintenance/aft) "clK" = (/obj/structure/table,/obj/item/weapon/storage/belt/utility,/obj/item/weapon/storage/belt/utility,/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_x = -30; pixel_y = 0},/turf/simulated/floor,/area/engine/engineering) "clL" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor,/area/engine/engineering) @@ -6396,7 +6396,7 @@ "csZ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/machinery/door/airlock/external{frequency = 1379; icon_state = "door_locked"; id_tag = "engineering_west_inner"; locked = 1; name = "Engineering External Access"; req_access = null; req_access_txt = "10;13"},/turf/simulated/floor/plating,/area/engine/engineering) "cta" = (/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "Singularity"; layer = 2.8; name = "Singularity Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/engine/engineering) "ctb" = (/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "Singularity"; layer = 2.8; name = "Singularity Shutters"; opacity = 0},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor/plating,/area/engine/engineering) -"ctc" = (/obj/item/weapon/cable_coil{pixel_x = 3; pixel_y = -7},/obj/item/weapon/cable_coil{pixel_x = 3; pixel_y = -7},/obj/item/weapon/crowbar,/turf/simulated/floor{dir = 8; icon_state = "warning"},/area/engine/engineering) +"ctc" = (/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = -7},/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = -7},/obj/item/weapon/crowbar,/turf/simulated/floor{dir = 8; icon_state = "warning"},/area/engine/engineering) "ctd" = (/obj/structure/stool,/turf/simulated/floor,/area/engine/engineering) "cte" = (/obj/structure/particle_accelerator/power_box,/turf/simulated/floor/plating,/area/engine/engineering) "ctf" = (/obj/item/weapon/screwdriver,/turf/simulated/floor,/area/engine/engineering) @@ -7225,7 +7225,7 @@ "cIW" = (/obj/structure/table,/obj/item/clothing/gloves/yellow,/obj/item/device/assembly/signaler,/obj/item/clothing/glasses/night,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/syndicate_station/start) "cIX" = (/obj/structure/table,/obj/item/weapon/wrench,/obj/item/clothing/gloves/yellow,/obj/item/device/assembly/infra,/obj/item/clothing/glasses/night,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/syndicate_station/start) "cIY" = (/obj/structure/table,/obj/item/clothing/gloves/yellow,/obj/item/device/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/obj/item/clothing/glasses/night,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/syndicate_station/start) -"cIZ" = (/obj/structure/table,/obj/item/weapon/crowbar,/obj/item/weapon/cable_coil{pixel_x = 3; pixel_y = -7},/obj/item/clothing/gloves/yellow,/obj/item/device/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/obj/item/clothing/glasses/night,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/syndicate_station/start) +"cIZ" = (/obj/structure/table,/obj/item/weapon/crowbar,/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = -7},/obj/item/clothing/gloves/yellow,/obj/item/device/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/obj/item/clothing/glasses/night,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/syndicate_station/start) "cJa" = (/turf/unsimulated/floor{icon = 'icons/turf/snow.dmi'; icon_state = "snow"},/turf/unsimulated/floor{tag = "icon-gravsnow_corner (EAST)"; icon = 'icons/turf/snow.dmi'; icon_state = "gravsnow_corner"; dir = 4},/turf/unsimulated/floor{tag = "icon-gravsnow_corner (WEST)"; icon = 'icons/turf/snow.dmi'; icon_state = "gravsnow_corner"; dir = 8},/area/syndicate_mothership) "cJb" = (/turf/simulated/floor/wood{tag = "icon-wood-broken3"; icon_state = "wood-broken3"},/area/syndicate_mothership) "cJc" = (/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/syndicate_station/start) @@ -8434,7 +8434,7 @@ "dgj" = (/obj/item/weapon/shard,/obj/structure/stool/bed/chair,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/derelict/ship) "dgk" = (/obj/structure/stool/bed/chair,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/derelict/ship) "dgl" = (/obj/structure/cable,/obj/structure/computerframe{anchored = 1},/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/derelict/ship) -"dgm" = (/obj/structure/cable,/obj/structure/computerframe{anchored = 1},/obj/item/weapon/cable_coil/cut,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/derelict/ship) +"dgm" = (/obj/structure/cable,/obj/structure/computerframe{anchored = 1},/obj/item/stack/cable_coil/cut,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/derelict/ship) "dgn" = (/obj/structure/rack,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/tank/emergency_oxygen,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/derelict/ship) "dgo" = (/obj/structure/rack,/obj/item/clothing/suit/space/syndicate,/obj/item/clothing/head/helmet/space/syndicate,/obj/item/clothing/mask/breath,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/derelict/ship) "dgp" = (/obj/structure/rack,/obj/item/weapon/storage/toolbox/syndicate,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/derelict/ship) @@ -8875,9 +8875,9 @@ "doI" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/derelict/bridge/access) "doJ" = (/obj/machinery/door/airlock/command{name = "E.V.A."; req_access = null; req_access_txt = "18"},/turf/simulated/floor,/area/derelict/bridge/access) "doK" = (/obj/machinery/door/firedoor/border_only,/turf/simulated/floor,/area/derelict/bridge/access) -"doL" = (/obj/item/weapon/cable_coil/cut,/turf/simulated/floor/plating/airless,/area) +"doL" = (/obj/item/stack/cable_coil/cut,/turf/simulated/floor/plating/airless,/area) "doM" = (/turf/simulated/floor/airless{icon_state = "solarpanel"},/area) -"doN" = (/obj/item/weapon/cable_coil/cut,/turf/space,/area) +"doN" = (/obj/item/stack/cable_coil/cut,/turf/space,/area) "doO" = (/obj/machinery/light/small{dir = 8},/turf/simulated/floor,/area/derelict/bridge/access) "doP" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor/plating,/area/derelict/bridge/access) "doQ" = (/obj/machinery/door/firedoor/border_only{dir = 8; name = "Firelock West"},/turf/simulated/floor,/area/derelict/bridge/access) @@ -8897,14 +8897,14 @@ "dpe" = (/obj/structure/computerframe,/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor,/area/derelict/bridge) "dpf" = (/obj/structure/table,/turf/simulated/floor,/area/derelict/bridge) "dpg" = (/obj/machinery/computer/security,/turf/simulated/floor,/area/derelict/bridge) -"dph" = (/obj/structure/table,/obj/item/weapon/cable_coil{pixel_x = 3; pixel_y = -7},/turf/simulated/floor,/area/derelict/bridge) +"dph" = (/obj/structure/table,/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = -7},/turf/simulated/floor,/area/derelict/bridge) "dpi" = (/obj/structure/table,/obj/machinery/light/small{dir = 1},/turf/simulated/floor,/area/derelict/bridge) "dpj" = (/obj/structure/table,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/turf/simulated/floor,/area/derelict/bridge) "dpk" = (/obj/item/weapon/grenade/empgrenade,/obj/structure/table,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor,/area/derelict/bridge) "dpl" = (/turf/simulated/floor/airless{icon_state = "damaged3"},/area/derelict/singularity_engine) "dpm" = (/turf/simulated/floor/airless{icon_state = "damaged4"},/area/derelict/singularity_engine) "dpn" = (/turf/simulated/floor/airless{icon_state = "damaged5"},/area/derelict/singularity_engine) -"dpo" = (/obj/item/weapon/cable_coil/cut,/obj/machinery/light/small{dir = 1},/turf/simulated/floor/airless{icon_state = "damaged3"},/area/derelict/singularity_engine) +"dpo" = (/obj/item/stack/cable_coil/cut,/obj/machinery/light/small{dir = 1},/turf/simulated/floor/airless{icon_state = "damaged3"},/area/derelict/singularity_engine) "dpp" = (/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine) "dpq" = (/turf/simulated/wall,/area/derelict/singularity_engine) "dpr" = (/turf/simulated/floor,/area/derelict/bridge) @@ -8934,7 +8934,7 @@ "dpP" = (/obj/structure/stool,/turf/simulated/floor,/area/derelict/bridge) "dpQ" = (/obj/structure/table,/obj/item/weapon/cell,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor,/area/derelict/bridge) "dpR" = (/obj/item/weapon/storage/toolbox/syndicate,/turf/simulated/floor/airless{icon_state = "damaged2"},/area/derelict/singularity_engine) -"dpS" = (/obj/item/weapon/cable_coil/cut,/turf/simulated/floor/airless{icon_state = "damaged4"},/area/derelict/singularity_engine) +"dpS" = (/obj/item/stack/cable_coil/cut,/turf/simulated/floor/airless{icon_state = "damaged4"},/area/derelict/singularity_engine) "dpT" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = ""},/turf/simulated/floor,/area/derelict/bridge/access) "dpU" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/turf/simulated/floor,/area/derelict/bridge/access) "dpV" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/turf/simulated/floor/plating,/area/derelict/bridge/access) @@ -8973,11 +8973,11 @@ "dqC" = (/obj/structure/window/reinforced{dir = 8},/obj/machinery/light/small{dir = 8},/turf/simulated/floor/airless{icon_state = "damaged2"},/area/derelict/singularity_engine) "dqD" = (/obj/structure/window/reinforced{dir = 4},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine) "dqE" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine) -"dqF" = (/obj/item/weapon/cable_coil/cut,/turf/simulated/floor/airless{icon_state = "damaged5"},/area/derelict/singularity_engine) +"dqF" = (/obj/item/stack/cable_coil/cut,/turf/simulated/floor/airless{icon_state = "damaged5"},/area/derelict/singularity_engine) "dqG" = (/turf/simulated/floor/airless,/area/derelict/bridge/access) "dqH" = (/obj/structure/table,/obj/item/device/aicard,/turf/simulated/floor/airless,/area/derelict/bridge/access) "dqI" = (/obj/structure/table,/obj/machinery/light/small{dir = 1},/turf/simulated/floor/airless,/area/derelict/bridge/access) -"dqJ" = (/obj/structure/table,/obj/item/weapon/cable_coil{pixel_x = 3; pixel_y = -7},/turf/simulated/floor/airless,/area/derelict/bridge/access) +"dqJ" = (/obj/structure/table,/obj/item/stack/cable_coil{pixel_x = 3; pixel_y = -7},/turf/simulated/floor/airless,/area/derelict/bridge/access) "dqK" = (/obj/structure/table,/obj/item/weapon/cell{charge = 100; maxcharge = 15000},/turf/simulated/floor/airless,/area/derelict/bridge/access) "dqL" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor/airless,/area/derelict/bridge/access) "dqM" = (/obj/structure/girder,/turf/simulated/floor/plating/airless,/area) @@ -8988,8 +8988,8 @@ "dqR" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/turf/simulated/floor/plating/airless,/area/derelict/bridge/access) "dqS" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = ""},/turf/simulated/floor/airless,/area/derelict/bridge/access) "dqT" = (/obj/machinery/light/small{dir = 4},/turf/simulated/floor/airless,/area/derelict/bridge/access) -"dqU" = (/obj/item/weapon/cable_coil/cut,/turf/simulated/floor/airless{icon_state = "damaged3"},/area/derelict/singularity_engine) -"dqV" = (/obj/item/weapon/cable_coil/cut,/turf/simulated/floor/airless{icon_state = "damaged2"},/area/derelict/singularity_engine) +"dqU" = (/obj/item/stack/cable_coil/cut,/turf/simulated/floor/airless{icon_state = "damaged3"},/area/derelict/singularity_engine) +"dqV" = (/obj/item/stack/cable_coil/cut,/turf/simulated/floor/airless{icon_state = "damaged2"},/area/derelict/singularity_engine) "dqW" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/airless{icon_state = "damaged2"},/area/derelict/singularity_engine) "dqX" = (/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/airless{icon_state = "damaged3"},/area/derelict/singularity_engine) "dqY" = (/obj/item/stack/rods,/turf/simulated/floor/airless{icon_state = "circuit"},/area/derelict/singularity_engine) @@ -9006,7 +9006,7 @@ "drj" = (/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/airless{icon_state = "damaged3"},/area/derelict/singularity_engine) "drk" = (/obj/item/weapon/screwdriver,/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine) "drl" = (/obj/item/stack/rods,/turf/simulated/floor/airless{icon_state = "damaged2"},/area/derelict/singularity_engine) -"drm" = (/obj/item/weapon/shard{icon_state = "medium"},/obj/item/weapon/cable_coil/cut,/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine) +"drm" = (/obj/item/weapon/shard{icon_state = "medium"},/obj/item/stack/cable_coil/cut,/turf/simulated/floor/plating/airless,/area/derelict/singularity_engine) "drn" = (/obj/structure/table,/obj/machinery/light/small{dir = 4},/turf/simulated/floor/airless{icon_state = "damaged2"},/area/derelict/singularity_engine) "dro" = (/turf/simulated/wall,/area/derelict/hallway/primary) "drp" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor/airless{icon_state = "damaged3"},/area/derelict/hallway/primary) @@ -9229,7 +9229,7 @@ "dvy" = (/obj/structure/table,/turf/simulated/floor/airless,/area) "dvz" = (/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/airless,/area) "dvA" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor/airless,/area) -"dvB" = (/obj/structure/lattice,/obj/item/weapon/cable_coil/cut,/turf/space,/area) +"dvB" = (/obj/structure/lattice,/obj/item/stack/cable_coil/cut,/turf/space,/area) "dvC" = (/obj/structure/girder,/turf/simulated/floor/plating,/area/derelict/arrival) "dvD" = (/obj/structure/stool,/turf/simulated/floor/airless,/area/derelict/hallway/primary) "dvE" = (/obj/machinery/door/airlock/maintenance{name = "Atmospherics Access"; req_access_txt = "24"},/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary) @@ -9268,7 +9268,7 @@ "dwl" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/item/weapon/wirecutters,/turf/simulated/floor/airless,/area/derelict/hallway/secondary) "dwm" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating/airless,/area/derelict/hallway/secondary) "dwn" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor/airless,/area/derelict/hallway/secondary) -"dwo" = (/obj/item/weapon/cable_coil/cut,/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary) +"dwo" = (/obj/item/stack/cable_coil/cut,/turf/simulated/floor/plating/airless,/area/derelict/hallway/primary) "dwp" = (/turf/simulated/floor/airless,/area/derelict/hallway/secondary) "dwq" = (/obj/machinery/light/small{dir = 4},/turf/simulated/floor/airless,/area/derelict/hallway/secondary) "dwr" = (/obj/machinery/door/airlock/maintenance{name = "Aux Storage"; req_access_txt = "23"},/turf/simulated/floor/plating/airless,/area/derelict/hallway/secondary) @@ -9411,7 +9411,7 @@ "dyY" = (/obj/structure/transit_tube{icon_state = "S-NE"},/obj/structure/lattice,/turf/space,/area) "dyZ" = (/obj/structure/reagent_dispensers/fueltank,/turf/simulated/floor/plating,/area/research_outpost/maintstore1) "dza" = (/obj/structure/closet/hydrant{pixel_x = 0; pixel_y = 32},/turf/simulated/floor/plating,/area/research_outpost/maintstore1) -"dzb" = (/obj/structure/table,/obj/item/device/analyzer/plant_analyzer,/obj/item/weapon/cell,/obj/item/weapon/cable_coil/random,/obj/item/weapon/cable_coil/random,/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plating,/area/research_outpost/maintstore1) +"dzb" = (/obj/structure/table,/obj/item/device/analyzer/plant_analyzer,/obj/item/weapon/cell,/obj/item/stack/cable_coil/random,/obj/item/stack/cable_coil/random,/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plating,/area/research_outpost/maintstore1) "dzc" = (/obj/structure/transit_tube{icon_state = "D-SW"},/turf/simulated/wall/r_wall,/area/research_outpost/maintstore1) "dzd" = (/obj/structure/transit_tube{icon_state = "D-SE"},/turf/simulated/wall/r_wall,/area/research_outpost/maintstore1) "dze" = (/obj/structure/transit_tube{icon_state = "NE-SW"},/turf/simulated/wall/r_wall,/area/research_outpost/maintstore1)