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:
CitadelStationBot
committed by
Poojawa
Poojawa
parent
a8c4c86e1c
commit
a905c15dad
@@ -96,7 +96,6 @@
|
||||
return
|
||||
if(!usr || !usr.canUseTopic(src) || usr.incapacitated() || stat || QDELETED(src))
|
||||
return
|
||||
var/image/I = image(src) //For feedback message flavor
|
||||
if(href_list["authenticate"])
|
||||
var/obj/item/weapon/card/id/ID = usr.get_active_held_item()
|
||||
if(!istype(ID))
|
||||
@@ -117,24 +116,24 @@
|
||||
authenticated = FALSE
|
||||
auth_id = "\[NULL\]"
|
||||
if(href_list["restore_logging"])
|
||||
to_chat(usr, "<span class='robot notice'>\icon[I] Logging functionality restored from backup data.</span>")
|
||||
to_chat(usr, "<span class='robot notice'>\icon[src] Logging functionality restored from backup data.</span>")
|
||||
emagged = FALSE
|
||||
LAZYADD(logs, "<b>-=- Logging restored to full functionality at this point -=-</b>")
|
||||
if(href_list["access_apc"])
|
||||
playsound(src, "terminal_type", 50, 0)
|
||||
var/obj/machinery/power/apc/APC = locate(href_list["access_apc"]) in GLOB.apcs_list
|
||||
if(!APC || APC.aidisabled || APC.panel_open || QDELETED(APC))
|
||||
to_chat(usr, "<span class='robot danger'>\icon[I] APC does not return interface request. Remote access may be disabled.</span>")
|
||||
to_chat(usr, "<span class='robot danger'>\icon[src] APC does not return interface request. Remote access may be disabled.</span>")
|
||||
return
|
||||
if(active_apc)
|
||||
to_chat(usr, "<span class='robot danger'>\icon[I] Disconnected from [active_apc].</span>")
|
||||
to_chat(usr, "<span class='robot danger'>\icon[src] Disconnected from [active_apc].</span>")
|
||||
active_apc.say("Remote access canceled. Interface locked.")
|
||||
playsound(active_apc, 'sound/machines/BoltsDown.ogg', 25, 0)
|
||||
playsound(active_apc, 'sound/machines/terminal_alert.ogg', 50, 0)
|
||||
active_apc.locked = TRUE
|
||||
active_apc.update_icon()
|
||||
active_apc = null
|
||||
to_chat(usr, "<span class='robot notice'>\icon[I] Connected to APC in [get_area(APC)]. Interface request sent.</span>")
|
||||
to_chat(usr, "<span class='robot notice'>\icon[src] Connected to APC in [get_area(APC)]. Interface request sent.</span>")
|
||||
log_activity("remotely accessed APC in [get_area(APC)]")
|
||||
APC.interact(usr, GLOB.not_incapacitated_state)
|
||||
playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
|
||||
|
||||
@@ -419,7 +419,7 @@
|
||||
to_chat(H, "\icon[customrecepient] <b>Message from [customsender] ([customjob]), </b>\"[custommessage]\" (<a href='byond://?src=\ref[src];choice=Message;skiprefresh=1;target=\ref[src]'>Reply</a>)")
|
||||
log_pda("[usr]/([usr.ckey]) (PDA: [customsender]) sent \"[custommessage]\" to [customrecepient.owner]")
|
||||
customrecepient.cut_overlays()
|
||||
customrecepient.add_overlay(image('icons/obj/pda.dmi', "pda-r"))
|
||||
customrecepient.add_overlay(mutable_appearance('icons/obj/pda.dmi', "pda-r"))
|
||||
//Sender is faking as someone who exists
|
||||
else
|
||||
src.linkedServer.send_pda_message("[customrecepient.owner]", "[PDARec.owner]","[custommessage]")
|
||||
@@ -432,7 +432,7 @@
|
||||
to_chat(H, "\icon[customrecepient] <b>Message from [PDARec.owner] ([customjob]), </b>\"[custommessage]\" (<a href='byond://?src=\ref[customrecepient];choice=Message;skiprefresh=1;target=\ref[PDARec]'>Reply</a>)")
|
||||
log_pda("[usr]/([usr.ckey]) (PDA: [PDARec.owner]) sent \"[custommessage]\" to [customrecepient.owner]")
|
||||
customrecepient.cut_overlays()
|
||||
customrecepient.add_overlay(image('icons/obj/pda.dmi', "pda-r"))
|
||||
customrecepient.add_overlay(mutable_appearance('icons/obj/pda.dmi', "pda-r"))
|
||||
//Finally..
|
||||
ResetMessage()
|
||||
|
||||
|
||||
@@ -366,13 +366,13 @@
|
||||
set_airlock_overlays(state)
|
||||
|
||||
/obj/machinery/door/airlock/proc/set_airlock_overlays(state)
|
||||
var/image/frame_overlay
|
||||
var/image/filling_overlay
|
||||
var/image/lights_overlay
|
||||
var/image/panel_overlay
|
||||
var/image/weld_overlay
|
||||
var/image/damag_overlay
|
||||
var/image/sparks_overlay
|
||||
var/mutable_appearance/frame_overlay
|
||||
var/mutable_appearance/filling_overlay
|
||||
var/mutable_appearance/lights_overlay
|
||||
var/mutable_appearance/panel_overlay
|
||||
var/mutable_appearance/weld_overlay
|
||||
var/mutable_appearance/damag_overlay
|
||||
var/mutable_appearance/sparks_overlay
|
||||
|
||||
switch(state)
|
||||
if(AIRLOCK_CLOSED)
|
||||
@@ -494,10 +494,8 @@
|
||||
pass(A) //suppress unused warning
|
||||
var/list/airlock_overlays = A.airlock_overlays
|
||||
var/iconkey = "[icon_state][icon_file]"
|
||||
if(airlock_overlays[iconkey])
|
||||
return airlock_overlays[iconkey]
|
||||
airlock_overlays[iconkey] = image(icon_file, icon_state)
|
||||
return airlock_overlays[iconkey]
|
||||
if((!(. = airlock_overlays[iconkey])))
|
||||
. = airlock_overlays[iconkey] = mutable_appearance(icon_file, icon_state)
|
||||
|
||||
/obj/machinery/door/airlock/do_animate(animation)
|
||||
switch(animation)
|
||||
|
||||
@@ -184,7 +184,7 @@
|
||||
if(maptext)
|
||||
maptext = ""
|
||||
cut_overlays()
|
||||
add_overlay(image('icons/obj/status_display.dmi', icon_state=state))
|
||||
add_overlay(mutable_appearance('icons/obj/status_display.dmi', state))
|
||||
|
||||
|
||||
//Checks to see if there's 1 line or 2, adds text-icons-numbers/letters over display
|
||||
|
||||
@@ -36,27 +36,27 @@
|
||||
else
|
||||
add_overlay("beakeridle")
|
||||
if(beaker.reagents.total_volume)
|
||||
var/image/filling = image('icons/obj/iv_drip.dmi', src, "reagent")
|
||||
var/mutable_appearance/filling_overlay = mutable_appearance('icons/obj/iv_drip.dmi', "reagent")
|
||||
|
||||
var/percent = round((beaker.reagents.total_volume / beaker.volume) * 100)
|
||||
switch(percent)
|
||||
if(0 to 9)
|
||||
filling.icon_state = "reagent0"
|
||||
filling_overlay.icon_state = "reagent0"
|
||||
if(10 to 24)
|
||||
filling.icon_state = "reagent10"
|
||||
filling_overlay.icon_state = "reagent10"
|
||||
if(25 to 49)
|
||||
filling.icon_state = "reagent25"
|
||||
filling_overlay.icon_state = "reagent25"
|
||||
if(50 to 74)
|
||||
filling.icon_state = "reagent50"
|
||||
filling_overlay.icon_state = "reagent50"
|
||||
if(75 to 79)
|
||||
filling.icon_state = "reagent75"
|
||||
filling_overlay.icon_state = "reagent75"
|
||||
if(80 to 90)
|
||||
filling.icon_state = "reagent80"
|
||||
filling_overlay.icon_state = "reagent80"
|
||||
if(91 to INFINITY)
|
||||
filling.icon_state = "reagent100"
|
||||
filling_overlay.icon_state = "reagent100"
|
||||
|
||||
filling.icon += mix_color_from_reagents(beaker.reagents.reagent_list)
|
||||
add_overlay(filling)
|
||||
filling_overlay.color = list("#0000", "#0000", "#0000", "#000f", mix_color_from_reagents(beaker.reagents.reagent_list))
|
||||
add_overlay(filling_overlay)
|
||||
|
||||
/obj/machinery/iv_drip/MouseDrop(mob/living/target)
|
||||
if(!ishuman(usr) || !usr.canUseTopic(src,BE_CLOSE) || !isliving(target))
|
||||
|
||||
@@ -146,7 +146,7 @@
|
||||
/obj/machinery/status_display/proc/set_picture(state)
|
||||
picture_state = state
|
||||
remove_display()
|
||||
add_overlay(image('icons/obj/status_display.dmi', icon_state=picture_state))
|
||||
add_overlay(picture_state)
|
||||
|
||||
/obj/machinery/status_display/proc/update_display(line1, line2)
|
||||
var/new_text = {"<div style="font-size:[FONT_SIZE];color:[FONT_COLOR];font:'[FONT_STYLE]';text-align:center;" valign="top">[line1]<br>[line2]</div>"}
|
||||
@@ -278,7 +278,7 @@
|
||||
/obj/machinery/ai_status_display/proc/set_picture(state)
|
||||
picture_state = state
|
||||
cut_overlays()
|
||||
add_overlay(image('icons/obj/status_display.dmi', icon_state=picture_state))
|
||||
add_overlay(picture_state)
|
||||
|
||||
#undef CHARS_PER_LINE
|
||||
#undef FOND_SIZE
|
||||
|
||||
@@ -297,7 +297,7 @@
|
||||
to_chat(user, "<span class='notice'>You [panel_open ? "open" : "close"] the maintenance panel.</span>")
|
||||
cut_overlays()
|
||||
if(panel_open)
|
||||
add_overlay(image(icon, "[initial(icon_state)]-panel"))
|
||||
add_overlay("[initial(icon_state)]-panel")
|
||||
playsound(src.loc, W.usesound, 50, 1)
|
||||
updateUsrDialog()
|
||||
else
|
||||
|
||||
@@ -186,7 +186,7 @@
|
||||
var/full = contents.len ? 1 : 0
|
||||
icon_state = "wm_[state_open]_[full]"
|
||||
if(panel_open)
|
||||
add_overlay(image(icon, icon_state = "wm_panel"))
|
||||
add_overlay("wm_panel")
|
||||
|
||||
/obj/machinery/washing_machine/attackby(obj/item/weapon/W, mob/user, params)
|
||||
if(default_deconstruction_screwdriver(user, null, null, W))
|
||||
|
||||
Reference in New Issue
Block a user