From 6949c2e2a5d64654b08b0e4f6003a544fc2d77b1 Mon Sep 17 00:00:00 2001 From: oranges Date: Fri, 1 Dec 2017 14:22:14 +1300 Subject: [PATCH 1/4] Merge pull request #33120 from QualityVan/glasses Makes glasses handle both nearsightedness and eye damage --- code/modules/mob/living/carbon/human/inventory.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index 71c5dedc26..4f41c2d40c 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -103,6 +103,7 @@ update_tint() if(G.vision_correction) clear_fullscreen("nearsighted") + clear_fullscreen("eye_damage") if(G.vision_flags || G.darkness_view || G.invis_override || G.invis_view || !isnull(G.lighting_alpha)) update_sight() update_inv_glasses() @@ -188,6 +189,7 @@ if(G.vision_correction) if(disabilities & NEARSIGHT) overlay_fullscreen("nearsighted", /obj/screen/fullscreen/impaired, 1) + adjust_eye_damage(0) if(G.vision_flags || G.darkness_view || G.invis_override || G.invis_view || !isnull(G.lighting_alpha)) update_sight() if(!QDELETED(src)) From 1cfff9477c9410947473fdd6f200854861c6c95d Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Fri, 1 Dec 2017 09:20:25 -0500 Subject: [PATCH 3/4] Cyberboss vs LICENSE round 27 (#33174) * Cyberboss vs LICENSE round 27 * Update license name in README.md --- OLD_LICENSE-GPLv3.txt => GPLv3.txt | 0 README.md | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename OLD_LICENSE-GPLv3.txt => GPLv3.txt (100%) diff --git a/OLD_LICENSE-GPLv3.txt b/GPLv3.txt similarity index 100% rename from OLD_LICENSE-GPLv3.txt rename to GPLv3.txt diff --git a/README.md b/README.md index 618f805f94..183f88472c 100644 --- a/README.md +++ b/README.md @@ -140,7 +140,7 @@ All code after [commit 333c566b88108de218d882840e61928a9b759d8f on 2014/31/12 at All code before [commit 333c566b88108de218d882840e61928a9b759d8f on 2014/31/12 at 4:38 PM PST](https://github.com/tgstation/tgstation/commit/333c566b88108de218d882840e61928a9b759d8f) is licensed under [GNU GPL v3](https://www.gnu.org/licenses/gpl-3.0.html). (Including tools unless their readme specifies otherwise.) -See LICENSE and OLD_LICENSE-GPLv3.txt for more details. +See LICENSE and GPLv3.txt for more details. tgui clientside is licensed as a subproject under the MIT license. Font Awesome font files, used by tgui, are licensed under the SIL Open Font License v1.1