From 812a7a5b08e62708e3cca80837c268d25ae6d5a1 Mon Sep 17 00:00:00 2001 From: Markolie Date: Mon, 14 Sep 2015 19:06:10 +0200 Subject: [PATCH 1/4] Lower the layer of computer overlays --- code/game/machinery/computer/computer.dm | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm index 0efc24b2ccb..aa306c877df 100644 --- a/code/game/machinery/computer/computer.dm +++ b/code/game/machinery/computer/computer.dm @@ -13,7 +13,12 @@ var/icon_screen = "generic" var/light_range_on = 2 var/light_power_on = 1 + var/overlay_layer +/obj/machinery/computer/New() + overlay_layer = layer + ..() + /obj/machinery/computer/initialize() power_change() update_icon() @@ -64,18 +69,18 @@ /obj/machinery/computer/update_icon() overlays.Cut() - - var/overlay_layer = LIGHTING_LAYER+0.1 - if(stat & NOPOWER) if(icon_keyboard) overlays += image(icon,"[icon_keyboard]_off",overlay_layer) return - overlays += image(icon, icon_keyboard ,overlay_layer) + if(stat & BROKEN) overlays += image(icon,"[icon_state]_broken",overlay_layer) else overlays += image(icon,icon_screen,overlay_layer) + + if(icon_keyboard) + overlays += image(icon, icon_keyboard ,overlay_layer) /obj/machinery/computer/power_change() @@ -86,7 +91,6 @@ else set_light(light_range_on, light_power_on) - /obj/machinery/computer/proc/set_broken() stat |= BROKEN update_icon() From 73bef4ea3eed9bcde38be62804bad1a82b9a321c Mon Sep 17 00:00:00 2001 From: Markolie Date: Mon, 14 Sep 2015 20:44:24 +0200 Subject: [PATCH 2/4] Update light_power_on and light_range_on --- code/game/machinery/computer/computer.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm index aa306c877df..fbac127a73d 100644 --- a/code/game/machinery/computer/computer.dm +++ b/code/game/machinery/computer/computer.dm @@ -11,8 +11,8 @@ var/processing = 0 var/icon_keyboard = "generic_key" var/icon_screen = "generic" - var/light_range_on = 2 - var/light_power_on = 1 + var/light_range_on = 3 + var/light_power_on = 2 var/overlay_layer /obj/machinery/computer/New() From c43987fe3c63d83585beb893ea53d2291087c224 Mon Sep 17 00:00:00 2001 From: Markolie Date: Tue, 15 Sep 2015 17:41:15 +0200 Subject: [PATCH 3/4] Make Poly sit on computers again --- code/modules/mob/living/simple_animal/parrot.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm index 2d2327c190c..c3ab9221a20 100644 --- a/code/modules/mob/living/simple_animal/parrot.dm +++ b/code/modules/mob/living/simple_animal/parrot.dm @@ -77,7 +77,8 @@ /obj/machinery/suit_storage_unit, /obj/machinery/clonepod, \ /obj/machinery/dna_scannernew, /obj/machinery/telecomms, \ /obj/machinery/nuclearbomb, /obj/machinery/particle_accelerator, \ - /obj/machinery/recharge_station, /obj/machinery/smartfridge) + /obj/machinery/recharge_station, /obj/machinery/smartfridge, \ + /obj/machinery/computer) //Parrots are kleptomaniacs. This variable ... stores the item a parrot is holding. var/obj/item/held_item = null From 98f297673923a10bf81f2985e001fc3f2d89d237 Mon Sep 17 00:00:00 2001 From: Markolie Date: Tue, 15 Sep 2015 18:50:57 +0200 Subject: [PATCH 4/4] Missing " --- code/game/machinery/computer/computer.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm index f473ce00e49..f75b07f22be 100644 --- a/code/game/machinery/computer/computer.dm +++ b/code/game/machinery/computer/computer.dm @@ -14,7 +14,7 @@ var/light_range_on = 3 var/light_power_on = 2 var/overlay_layer - atom_say_verb = "beeps + atom_say_verb = "beeps" /obj/machinery/computer/New() overlay_layer = layer