From 328ddaba1f75f066aa04b50e4f51f1c76e42b150 Mon Sep 17 00:00:00 2001 From: Poojawa Date: Wed, 26 Apr 2017 10:15:54 -0500 Subject: [PATCH] Delete window.dm.rej --- code/game/objects/structures/window.dm.rej | 23 ---------------------- 1 file changed, 23 deletions(-) delete mode 100644 code/game/objects/structures/window.dm.rej diff --git a/code/game/objects/structures/window.dm.rej b/code/game/objects/structures/window.dm.rej deleted file mode 100644 index 39a6d57678..0000000000 --- a/code/game/objects/structures/window.dm.rej +++ /dev/null @@ -1,23 +0,0 @@ -diff a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm (rejected hunks) -@@ -18,7 +18,7 @@ - var/fulltile = 0 - var/glass_type = /obj/item/stack/sheet/glass - var/glass_amount = 1 -- var/static/mutable_appearance/crack_overlay = mutable_appearance('icons/obj/structures.dmi') -+ var/mutable_appearance/crack_overlay - var/list/debris = list() - can_be_unanchored = 1 - resistance_flags = ACID_PROOF -@@ -377,10 +377,10 @@ - if(smooth) - queue_smooth(src) - -- cut_overlays() -+ cut_overlay(crack_overlay) - if(ratio > 75) - return -- crack_overlay.icon_state = "damage[ratio]" -+ crack_overlay = mutable_appearance('icons/obj/structures.dmi', "damage[ratio]", -(layer+0.1)) - add_overlay(crack_overlay) - - /obj/structure/window/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)