cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Made cables use color var instead of separate icons for each color.

Browse Source 
It allows for wires of ANY color (just set cable_coil var)
and most importantly
40 837 958 b - before
39 506 651 b - after
This commit is contained in:
Chinsky
2014-01-19 03:02:58 +04:00
parent 350b8229af
commit 669ae9a1ae
14 changed files with 77 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
code/defines/obj.dm
View File

@@ -171,11 +171,11 @@ We can't just insert in HTML into the nanoUI so we need the raw data to play wit
var/heads[0]
var/sec[0]
var/eng[0]
var/med[0]
var/med[0]
var/sci[0]
var/civ[0]
var/bot[0]
var/misc[0]
var/civ[0]
var/bot[0]
var/misc[0]
for(var/datum/data/record/t in data_core.general)
var/name = sanitize(t.fields["name"])
var/rank = sanitize(t.fields["rank"])
@@ -195,7 +195,7 @@ We can't just insert in HTML into the nanoUI so we need the raw data to play wit
department = 1
if(depthead && sec.len != 1)
sec.Swap(1,sec.len)
if(real_rank in engineering_positions)
eng[++eng.len] = list("name" = name, "rank" = rank, "active" = isactive)
department = 1
@@ -257,48 +257,40 @@ We can't just insert in HTML into the nanoUI so we need the raw data to play wit
var/list/container = list( )
/obj/structure/cable
level = 1
anchored =1
var/datum/powernet/powernet
name = "power cable"
desc = "A flexible superconducting cable for heavy-duty power transfer"
icon = 'icons/obj/power_cond_red.dmi'
icon = 'icons/obj/power_cond_white.dmi'
icon_state = "0-1"
var/d1 = 0
var/d2 = 1
layer = 2.44 //Just below unary stuff, which is at 2.45 and above pipes, which are at 2.4
var/cable_color = "red"
var/cable_color = COLOR_RED
var/obj/structure/powerswitch/power_switch
/obj/structure/cable/yellow
cable_color = "yellow"
icon = 'icons/obj/power_cond_yellow.dmi'
cable_color = COLOR_YELLOW
/obj/structure/cable/green
cable_color = "green"
icon = 'icons/obj/power_cond_green.dmi'
cable_color = COLOR_GREEN
/obj/structure/cable/blue
cable_color = "blue"
icon = 'icons/obj/power_cond_blue.dmi'
cable_color = COLOR_BLUE
/obj/structure/cable/pink
cable_color = "pink"
icon = 'icons/obj/power_cond_pink.dmi'
cable_color = COLOR_PINK
/obj/structure/cable/orange
cable_color = "orange"
icon = 'icons/obj/power_cond_orange.dmi'
cable_color = COLOR_ORANGE
/obj/structure/cable/cyan
cable_color = "cyan"
icon = 'icons/obj/power_cond_cyan.dmi'
cable_color = COLOR_CYAN
/obj/structure/cable/white
cable_color = "white"
icon = 'icons/obj/power_cond_white.dmi'
cable_color = COLOR_WHITE
/obj/effect/projection
name = "Projection"