Replaces /image with /mutable_appearance (#556)
* Replaces /image with /mutable_appearance, where appropriate * Update miscellaneous.dm * Delete miscellaneous.dm.rej * Delete pet.dm.rej * Update pet.dm * Update species.dm * Update miscellaneous.dm * Update species.dm * Update miscellaneous.dm * Delete species.dm.rej * Update species.dm pretty sure I got all the indentation correct THIS time, ffs * Update species.dm * Update species.dm fucking tabs man, fucking tabs.
This commit is contained in:
committed by
Poojawa
parent
a8c4c86e1c
commit
a905c15dad
@@ -201,17 +201,10 @@ Pipelines + Other Objects -> Pipe network
|
||||
//Generate a unique identifier for this image combination
|
||||
var/identifier = iconsetids[iconset] + "_[iconstate]_[direction]_[col]"
|
||||
|
||||
var/image/img
|
||||
if(pipeimages[identifier] == null)
|
||||
img = image(iconset, icon_state=iconstate, dir=direction)
|
||||
img.color = col
|
||||
|
||||
pipeimages[identifier] = img
|
||||
|
||||
else
|
||||
img = pipeimages[identifier]
|
||||
|
||||
return img
|
||||
if((!(. = pipeimages[identifier])))
|
||||
var/image/pipe_overlay
|
||||
pipe_overlay = . = pipeimages[identifier] = image(iconset, iconstate, dir = direction)
|
||||
pipe_overlay.color = col
|
||||
|
||||
/obj/machinery/atmospherics/on_construction(pipe_type, obj_color)
|
||||
if(can_unwrench)
|
||||
|
||||
@@ -98,12 +98,11 @@
|
||||
/obj/machinery/atmospherics/miner/update_icon()
|
||||
overlays.Cut()
|
||||
if(broken)
|
||||
var/image/A = image(icon, "broken")
|
||||
add_overlay(A)
|
||||
add_overlay("broken")
|
||||
else if(active)
|
||||
var/image/A = image(icon, "on")
|
||||
A.color = overlay_color
|
||||
add_overlay(A)
|
||||
var/mutable_appearance/on_overlay = mutable_appearance(icon, "on")
|
||||
on_overlay.color = overlay_color
|
||||
add_overlay(on_overlay)
|
||||
|
||||
/obj/machinery/atmospherics/miner/process()
|
||||
update_power()
|
||||
|
||||
Reference in New Issue
Block a user