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

Switching cable coils to stacks

Browse Source
This commit is contained in:
ZomgPonies
2014-01-21 21:23:26 -05:00
parent 8f71ea55e3
commit cb5367ed96
57 changed files with 228 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/ores_coins.dm
+3 -3
View File
@@ -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()
code/modules/mob/living/silicon/robot/robot.dm
+2 -2
View File
@@ -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)
code/modules/mob/living/silicon/robot/robot_modules.dm
+2 -2
View File
@@ -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))
code/modules/power/apc.dm
+3 -3
View File
@@ -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.")
code/modules/power/cable.dm
+35 -35
View File
@@ -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]"
..()
code/modules/power/cable_heavyduty.dm
+2 -2
View File
@@ -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
code/modules/power/lighting.dm
+3 -3
View File
@@ -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")
code/modules/power/port_gen.dm
+2 -2
View File
@@ -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)
code/modules/reagents/reagent_containers/food/snacks/grown.dm
+1 -1
View File
@@ -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)
code/modules/research/server.dm
+2 -2
View File
@@ -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
code/modules/surgery/braincore.dm
+1 -1
View File
@@ -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
code/modules/surgery/eye.dm
+1 -1
View File
@@ -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.
)
code/modules/surgery/face.dm
+1 -1
View File
@@ -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.
)
code/modules/surgery/generic.dm
+1 -1
View File
@@ -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
)
code/modules/surgery/headreattach.dm
+2 -2
View File
@@ -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
code/modules/surgery/other.dm
+1 -1
View File
@@ -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