cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-29 16:10:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactors tool colors + new sprites (#8786)

Browse Source 
* Refactors tool sprites

* yeah

* sort the court

* changelog and worn_overlays

* fuck

* door

* waterloo

* waterloo

* skeeet

* fuck this shit

* stupid color prios

* there
This commit is contained in:
Wowzewow (Wezzy)
2020-06-11 21:27:01 +02:00
committed by GitHub
parent 03a7b8d556
commit 8a5e14b1e8
17 changed files with 251 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/cable.dm
+32 -18
View File
@@ -475,7 +475,7 @@ obj/structure/cable/proc/cableColor(var/colorC)
icon_state = "coil"
amount = MAXCOIL
max_amount = MAXCOIL
color = COLOR_RED
var/our_color = COLOR_RED
desc = "A coil of power cable."
throwforce = 10
w_class = 2.0
@@ -492,9 +492,13 @@ obj/structure/cable/proc/cableColor(var/colorC)
/obj/item/stack/cable_coil/Initialize(mapload, amt, param_color = null)
. = ..(mapload, amt)
icon_state = "coil"
our_color = pick(possible_cable_coil_colours)
add_atom_colour(possible_cable_coil_colours[our_color])
update_icon()
if (param_color) // It should be red by default, so only recolor it if parameter was specified.
color = param_color
our_color = param_color
pixel_x = rand(-2,2)
pixel_y = rand(-2,2)
@@ -597,17 +601,27 @@ obj/structure/cable/proc/cableColor(var/colorC)
to_chat(user, span("warning", "You don't have enough cable for this!"))
/obj/item/stack/cable_coil/update_icon()
if (!color)
color = pick(COLOR_RED, COLOR_BLUE, COLOR_LIME, COLOR_ORANGE, COLOR_WHITE, COLOR_PINK, COLOR_YELLOW, COLOR_CYAN)
if(amount == 1)
icon_state = "coil1"
name = "cable piece"
cut_overlays()
var/mutable_appearance/base_overlay = mutable_appearance(icon, "coil1_end")
base_overlay.appearance_flags = RESET_COLOR
add_overlay(base_overlay)
else if(amount == 2)
icon_state = "coil2"
name = "cable piece"
cut_overlays()
var/mutable_appearance/base_overlay = mutable_appearance(icon, "coil2_end")
base_overlay.appearance_flags = RESET_COLOR
add_overlay(base_overlay)
else
icon_state = "coil"
name = "cable coil"
cut_overlays()
var/mutable_appearance/base_overlay = mutable_appearance(icon, "coil_end")
base_overlay.appearance_flags = RESET_COLOR
add_overlay(base_overlay)
/obj/item/stack/cable_coil/attackby(var/obj/item/W, var/mob/user)
if(W.ismultitool())
@@ -626,7 +640,7 @@ obj/structure/cable/proc/cableColor(var/colorC)
if(!final_color)
final_color = possible_cable_coil_colours["Red"]
selected_color = "red"
color = final_color
our_color = final_color
to_chat(user, "<span class='notice'>You change \the [src]'s color to [lowertext(selected_color)].</span>")
/obj/item/stack/cable_coil/proc/update_wclass()
@@ -660,7 +674,7 @@ obj/structure/cable/proc/cableColor(var/colorC)
to_chat(usr, "<span class='warning'>You need at least 15 lengths to make restraints!</span>")
return
var/obj/item/handcuffs/cable/B = new /obj/item/handcuffs/cable(usr.loc)
B.color = color
B.color = our_color
to_chat(usr, "<span class='notice'>You wind some cable together to make some restraints.</span>")
src.use(15)
else
@@ -754,7 +768,7 @@ obj/structure/cable/proc/cableColor(var/colorC)
var/obj/structure/cable/C = new(F)
var/obj/structure/cable/D = new(GetBelow(F))
C.cableColor(color)
C.cableColor(our_color)
C.d1 = 11
C.d2 = dirn
@@ -787,7 +801,7 @@ obj/structure/cable/proc/cableColor(var/colorC)
var/obj/structure/cable/C = new(F)
C.cableColor(color)
C.cableColor(our_color)
//set up the new cable
C.d1 = 0 //it's a O-X node cable
@@ -852,7 +866,7 @@ obj/structure/cable/proc/cableColor(var/colorC)
return
var/obj/structure/cable/NC = new(U)
NC.cableColor(color)
NC.cableColor(our_color)
NC.d1 = 0
NC.d2 = fdirn
@@ -898,7 +912,7 @@ obj/structure/cable/proc/cableColor(var/colorC)
return
C.cableColor(color)
C.cableColor(our_color)
C.d1 = nd1
C.d2 = nd2
@@ -944,28 +958,28 @@ obj/structure/cable/proc/cableColor(var/colorC)
update_wclass()
/obj/item/stack/cable_coil/yellow
color = COLOR_YELLOW
our_color = COLOR_YELLOW
/obj/item/stack/cable_coil/blue
color = COLOR_BLUE
our_color = COLOR_BLUE
/obj/item/stack/cable_coil/green
color = COLOR_LIME
our_color = COLOR_LIME
/obj/item/stack/cable_coil/pink
color = COLOR_PINK
our_color = COLOR_PINK
/obj/item/stack/cable_coil/orange
color = COLOR_ORANGE
our_color = COLOR_ORANGE
/obj/item/stack/cable_coil/cyan
color = COLOR_CYAN
our_color = COLOR_CYAN
/obj/item/stack/cable_coil/white
color = COLOR_WHITE
our_color = COLOR_WHITE
/obj/item/stack/cable_coil/random/Initialize()
color = pick(COLOR_RED, COLOR_BLUE, COLOR_LIME, COLOR_WHITE, COLOR_PINK, COLOR_YELLOW, COLOR_CYAN)
our_color = pick(COLOR_RED, COLOR_BLUE, COLOR_LIME, COLOR_WHITE, COLOR_PINK, COLOR_YELLOW, COLOR_CYAN)
. = ..()
//nooses - all catbeast/ligger/squiggers/synths must hang