diff --git a/code/defines/obj.dm b/code/defines/obj.dm index e6a4a7a4cb..baa19b1e4d 100644 --- a/code/defines/obj.dm +++ b/code/defines/obj.dm @@ -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" diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index 80b3403a9b..1955a9d538 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -95,32 +95,32 @@ /obj/item/weapon/handcuffs/cable name = "cable restraints" desc = "Looks like some cables tied together. Could be used to tie something up." - icon_state = "cuff_red" + icon_state = "cuff_white" breakouttime = 300 //Deciseconds = 30s /obj/item/weapon/handcuffs/cable/red - icon_state = "cuff_red" + color = "#DD0000" /obj/item/weapon/handcuffs/cable/yellow - icon_state = "cuff_yellow" + color = "#DDDD00" /obj/item/weapon/handcuffs/cable/blue - icon_state = "cuff_blue" + color = "#0000DD" /obj/item/weapon/handcuffs/cable/green - icon_state = "cuff_green" + color = "#00DD00" /obj/item/weapon/handcuffs/cable/pink - icon_state = "cuff_pink" + color = "#DD00DD" /obj/item/weapon/handcuffs/cable/orange - icon_state = "cuff_orange" + color = "#DD8800" /obj/item/weapon/handcuffs/cable/cyan - icon_state = "cuff_cyan" + color = "#00DDDD" /obj/item/weapon/handcuffs/cable/white - icon_state = "cuff_white" + color = "#FFFFFF" /obj/item/weapon/handcuffs/cyborg dispenser = 1 \ No newline at end of file diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index bbcbdb9c9d..95f52ee74c 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -57,10 +57,8 @@ updateicon() /obj/structure/cable/proc/updateicon() - if(invisibility) - icon_state = "[d1]-[d2]-f" - else - icon_state = "[d1]-[d2]" + icon_state = "[d1]-[d2]" + alpha = invisibility ? 127 : 255 // returns the powernet this cable belongs to @@ -91,7 +89,7 @@ new/obj/item/weapon/cable_coil(T, 1, cable_color) for(var/mob/O in viewers(src, null)) - O.show_message("\red [user] cuts the cable.", 1) + O.show_message("[user] cuts the cable.", 1) del(src) @@ -107,10 +105,10 @@ var/datum/powernet/PN = get_powernet() // find the powernet if(PN && (PN.avail > 0)) // is it powered? - user << "\red [PN.avail]W in power network." + user << "[PN.avail]W in power network." else - user << "\red The cable is not powered." + user << "The cable is not powered." shock(user, 5, 0.2) @@ -154,9 +152,9 @@ /obj/item/weapon/cable_coil name = "cable coil" icon = 'icons/obj/power.dmi' - icon_state = "coil_red" + icon_state = "coil" var/amount = MAXCOIL - item_color = "red" + item_color = COLOR_RED desc = "A coil of power cable." throwforce = 10 w_class = 2.0 @@ -166,11 +164,11 @@ g_amt = 20 flags = TABLEPASS | FPRINT | CONDUCT slot_flags = SLOT_BELT - item_state = "coil_red" + item_state = "coil" attack_verb = list("whipped", "lashed", "disciplined", "flogged") suicide_act(mob/user) - viewers(user) << "\red [user] is strangling \himself with the [src.name]! It looks like \he's trying to commit suicide." + viewers(user) << "[user] is strangling \himself with the [src.name]! It looks like \he's trying to commit suicide." return(OXYLOSS) @@ -185,15 +183,16 @@ /obj/item/weapon/cable_coil/proc/updateicon() if (!item_color) - item_color = pick("red", "yellow", "blue", "green") + item_color = pick(COLOR_RED, COLOR_BLUE, COLOR_GREEN, COLOR_ORANGE, COLOR_WHITE, COLOR_PINK, COLOR_YELLOW, COLOR_CYAN) + color = item_color if(amount == 1) - icon_state = "coil_[item_color]1" + icon_state = "coil1" name = "cable piece" else if(amount == 2) - icon_state = "coil_[item_color]2" + icon_state = "coil2" name = "cable piece" else - icon_state = "coil_[item_color]" + icon_state = "coil" name = "cable coil" /obj/item/weapon/cable_coil/examine() @@ -214,14 +213,14 @@ if(ishuman(M) && !M.restrained() && !M.stat && !M.paralysis && ! M.stunned) if(!istype(usr.loc,/turf)) return if(src.amount <= 14) - usr << "\red You need at least 15 lengths to make restraints!" + usr << "You need at least 15 lengths to make restraints!" return var/obj/item/weapon/handcuffs/cable/B = new /obj/item/weapon/handcuffs/cable(usr.loc) - B.icon_state = "cuff_[item_color]" - usr << "\blue You wind some cable together to make some restraints." + B.color = item_color + usr << "You wind some cable together to make some restraints." src.use(15) else - usr << "\blue You cannot do that." + usr << "\blue You cannot do that." ..() /obj/item/weapon/cable_coil/attackby(obj/item/weapon/W, mob/user) @@ -229,25 +228,25 @@ if( istype(W, /obj/item/weapon/wirecutters) && src.amount > 1) src.amount-- new/obj/item/weapon/cable_coil(user.loc, 1,item_color) - user << "You cut a piece off the cable coil." + user << "You cut a piece off the cable coil." src.updateicon() return else if( istype(W, /obj/item/weapon/cable_coil) ) var/obj/item/weapon/cable_coil/C = W if(C.amount == MAXCOIL) - user << "The coil is too long, you cannot add any more cable to it." + user << "The coil is too long, you cannot add any more cable to it." return if( (C.amount + src.amount <= MAXCOIL) ) C.amount += src.amount - user << "You join the cable coils together." + user << "You join the cable coils together." C.updateicon() del(src) return else - user << "You transfer [MAXCOIL - src.amount ] length\s of cable from one coil to the other." + user << "You transfer [MAXCOIL - src.amount ] length\s of cable from one coil to the other." src.amount -= (MAXCOIL-C.amount) src.updateicon() C.amount = MAXCOIL @@ -272,11 +271,11 @@ return if(get_dist(F,user) > 1) - user << "You can't lay cable at a place that far away." + user << "You can't lay cable at a place that far away." return if(F.intact) // if floor is intact, complain - user << "You can't lay cable there unless the floor tiles are removed." + user << "You can't lay cable there unless the floor tiles are removed." return else @@ -289,7 +288,7 @@ for(var/obj/structure/cable/LC in F) if((LC.d1 == dirn && LC.d2 == 0 ) || ( LC.d2 == dirn && LC.d1 == 0)) - user << "There's already a cable at that position." + user << "There's already a cable at that position." return var/obj/structure/cable/C = new(F) @@ -332,7 +331,7 @@ return if(get_dist(C, user) > 1) // make sure it's close enough - user << "You can't lay cable at a place that far away." + user << "You can't lay cable at a place that far away." return @@ -343,7 +342,7 @@ if(C.d1 == dirn || C.d2 == dirn) // one end of the clicked cable is pointing towards us if(U.intact) // can't place a cable if the floor is complete - user << "You can't lay cable there unless the floor tiles are removed." + user << "You can't lay cable there unless the floor tiles are removed." return else // cable is pointing at us, we're standing on an open tile @@ -353,7 +352,7 @@ for(var/obj/structure/cable/LC in U) // check to make sure there's not a cable there already if(LC.d1 == fdirn || LC.d2 == fdirn) - user << "There's already a cable at that position." + user << "There's already a cable at that position." return var/obj/structure/cable/NC = new(U) @@ -391,7 +390,7 @@ if(LC == C) // skip the cable we're interacting with continue if((LC.d1 == nd1 && LC.d2 == nd2) || (LC.d1 == nd2 && LC.d2 == nd1) ) // make sure no cable matches either direction - user << "There's already a cable at that position." + user << "There's already a cable at that position." return @@ -484,30 +483,14 @@ obj/structure/cable/proc/cableColor(var/colorC) - var/color_n = "red" + var/color_n = "#DD0000" if(colorC) color_n = colorC cable_color = color_n - switch(colorC) - if("red") - icon = 'icons/obj/power_cond_red.dmi' - if("yellow") - icon = 'icons/obj/power_cond_yellow.dmi' - if("green") - icon = 'icons/obj/power_cond_green.dmi' - if("blue") - icon = 'icons/obj/power_cond_blue.dmi' - if("pink") - icon = 'icons/obj/power_cond_pink.dmi' - if("orange") - icon = 'icons/obj/power_cond_orange.dmi' - if("cyan") - icon = 'icons/obj/power_cond_cyan.dmi' - if("white") - icon = 'icons/obj/power_cond_white.dmi' + color = color_n /obj/item/weapon/cable_coil/cut - item_state = "coil_red2" + item_state = "coil2" /obj/item/weapon/cable_coil/cut/New(loc) ..() @@ -517,36 +500,28 @@ obj/structure/cable/proc/cableColor(var/colorC) updateicon() /obj/item/weapon/cable_coil/yellow - item_color = "yellow" - icon_state = "coil_yellow" + item_color = COLOR_YELLOW /obj/item/weapon/cable_coil/blue - item_color = "blue" - icon_state = "coil_blue" + item_color = COLOR_BLUE /obj/item/weapon/cable_coil/green - item_color = "green" - icon_state = "coil_green" + item_color = COLOR_GREEN /obj/item/weapon/cable_coil/pink - item_color = "pink" - icon_state = "coil_pink" + item_color = COLOR_PINK /obj/item/weapon/cable_coil/orange - item_color = "orange" - icon_state = "coil_orange" + item_color = COLOR_ORANGE /obj/item/weapon/cable_coil/cyan - item_color = "cyan" - icon_state = "coil_cyan" + item_color = COLOR_CYAN /obj/item/weapon/cable_coil/white - item_color = "white" - icon_state = "coil_white" + item_color = COLOR_WHITE /obj/item/weapon/cable_coil/random/New() - item_color = pick("red","yellow","green","blue","pink") - icon_state = "coil_[item_color]" + item_color = pick(COLOR_RED, COLOR_BLUE, COLOR_GREEN, COLOR_WHITE, COLOR_PINK, COLOR_YELLOW, COLOR_CYAN) ..() /obj/item/weapon/cable_coil/attack(mob/M as mob, mob/user as mob) @@ -557,12 +532,12 @@ obj/structure/cable/proc/cableColor(var/colorC) if(S.burn_dam > 0 && use(1)) S.heal_damage(0,15,0,1) if(user != M) - user.visible_message("\red \The [user] repairs some burn damage on their [S.display_name] with \the [src]",\ - "\red You repair some burn damage on your [S.display_name]",\ + user.visible_message("\The [user] repairs some burn damage on [M]'s [S.display_name] with \the [src]",\ + "\The [user] repairs some burn damage on your [S.display_name]",\ "You hear wires being cut.") else - user.visible_message("\red \The [user] repairs some burn damage on their [S.display_name] with \the [src]",\ - "\red You repair some burn damage on your [S.display_name]",\ + user.visible_message("\The [user] repairs some burn damage on their [S.display_name] with \the [src]",\ + "You repair some burn damage on your [S.display_name]",\ "You hear wires being cut.") else user << "Nothing to fix!" diff --git a/code/setup.dm b/code/setup.dm index 37b99246f9..7f77df4a9a 100644 --- a/code/setup.dm +++ b/code/setup.dm @@ -747,3 +747,13 @@ var/list/RESTRICTED_CAMERA_NETWORKS = list( //Those networks can only be accesse //Flags for zone sleeping #define ZONE_ACTIVE 1 #define ZONE_SLEEPING 0 + +//some colors +#define COLOR_RED "#FF0000" +#define COLOR_GREEN "#00FF00" +#define COLOR_BLUE "#0000FF" +#define COLOR_CYAN "#00FFFF" +#define COLOR_PINK "#FF00FF" +#define COLOR_YELLOW "#FFFF00" +#define COLOR_ORANGE "#FF9900" +#define COLOR_WHITE "#FFFFFF" \ No newline at end of file diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi index 2a48f951e8..626af845c1 100644 Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ diff --git a/icons/obj/power.dmi b/icons/obj/power.dmi index b0130821d4..01a6d24aee 100644 Binary files a/icons/obj/power.dmi and b/icons/obj/power.dmi differ diff --git a/icons/obj/power_cond_blue.dmi b/icons/obj/power_cond_blue.dmi deleted file mode 100644 index e224fa549c..0000000000 Binary files a/icons/obj/power_cond_blue.dmi and /dev/null differ diff --git a/icons/obj/power_cond_cyan.dmi b/icons/obj/power_cond_cyan.dmi deleted file mode 100644 index 34d981f55f..0000000000 Binary files a/icons/obj/power_cond_cyan.dmi and /dev/null differ diff --git a/icons/obj/power_cond_green.dmi b/icons/obj/power_cond_green.dmi deleted file mode 100644 index c8aa279bc2..0000000000 Binary files a/icons/obj/power_cond_green.dmi and /dev/null differ diff --git a/icons/obj/power_cond_orange.dmi b/icons/obj/power_cond_orange.dmi deleted file mode 100644 index e3c3d0aa8c..0000000000 Binary files a/icons/obj/power_cond_orange.dmi and /dev/null differ diff --git a/icons/obj/power_cond_pink.dmi b/icons/obj/power_cond_pink.dmi deleted file mode 100644 index 931d486e1e..0000000000 Binary files a/icons/obj/power_cond_pink.dmi and /dev/null differ diff --git a/icons/obj/power_cond_red.dmi b/icons/obj/power_cond_red.dmi deleted file mode 100644 index 962936479a..0000000000 Binary files a/icons/obj/power_cond_red.dmi and /dev/null differ diff --git a/icons/obj/power_cond_white.dmi b/icons/obj/power_cond_white.dmi index 9036341ee1..fc13e3b9d4 100644 Binary files a/icons/obj/power_cond_white.dmi and b/icons/obj/power_cond_white.dmi differ diff --git a/icons/obj/power_cond_yellow.dmi b/icons/obj/power_cond_yellow.dmi deleted file mode 100644 index 7506cc2385..0000000000 Binary files a/icons/obj/power_cond_yellow.dmi and /dev/null differ