From e850988a800f01d42fdc8ac2cce4df4d521117e1 Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Tue, 31 Jan 2017 21:38:49 -0600 Subject: [PATCH 1/3] Removes weakeyes --- .../changeling/powers/augmented_eyesight.dm | 12 ------------ code/game/machinery/flasher.dm | 3 --- code/game/objects/items/devices/laserpointer.dm | 2 -- .../game/objects/items/weapons/grenades/flashbang.dm | 8 +------- code/modules/assembly/flash.dm | 2 -- code/modules/mob/living/carbon/carbon.dm | 9 ++------- code/modules/mob/living/carbon/carbon_defense.dm | 2 -- code/modules/mob/mob_defines.dm | 2 -- 8 files changed, 3 insertions(+), 37 deletions(-) diff --git a/code/game/gamemodes/changeling/powers/augmented_eyesight.dm b/code/game/gamemodes/changeling/powers/augmented_eyesight.dm index ca45e620da4..1644c4325da 100644 --- a/code/game/gamemodes/changeling/powers/augmented_eyesight.dm +++ b/code/game/gamemodes/changeling/powers/augmented_eyesight.dm @@ -63,15 +63,3 @@ /obj/item/organ/cyberimp/eyes/thermals/ling/emp_act(severity) return - -/obj/item/organ/cyberimp/eyes/thermals/ling/Insert(mob/living/carbon/M, special = 0) - ..() - if(ishuman(owner)) - var/mob/living/carbon/human/H = owner - H.weakeyes = 1 - -/obj/item/organ/cyberimp/eyes/thermals/ling/Remove(mob/living/carbon/M, special = 0) - if(ishuman(owner)) - var/mob/living/carbon/human/H = owner - H.weakeyes = 0 - ..() diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index d09a28ab64f..c0c78d9dafc 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -120,9 +120,6 @@ if(L.flash_act(affect_silicon = 1)) L.Weaken(strength) - if(L.weakeyes) - L.Weaken(strength * 1.5) - L.visible_message("[L] gasps and shields their eyes!") return 1 diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm index 72c957f82d9..a2defbfed18 100644 --- a/code/game/objects/items/devices/laserpointer.dm +++ b/code/game/objects/items/devices/laserpointer.dm @@ -99,8 +99,6 @@ //20% chance to actually hit the eyes if(prob(effectchance * diode.rating) && C.flash_act(severity)) outmsg = "You blind [C] by shining [src] in their eyes." - if(C.weakeyes) - C.Stun(1) else outmsg = "You fail to blind [C] by shining [src] at their eyes!" diff --git a/code/game/objects/items/weapons/grenades/flashbang.dm b/code/game/objects/items/weapons/grenades/flashbang.dm index 3fb31bd2414..0802656f8a1 100644 --- a/code/game/objects/items/weapons/grenades/flashbang.dm +++ b/code/game/objects/items/weapons/grenades/flashbang.dm @@ -24,13 +24,7 @@ var/distance = max(0,get_dist(get_turf(src),T)) //Flash - if(M.weakeyes) - M.visible_message("[M] screams and collapses!") - M << "AAAAGH!" - M.Weaken(15) //hella stunned - M.Stun(15) - M.adjust_eye_damage(8) - else if(M.flash_act(affect_silicon = 1)) + if(M.flash_act(affect_silicon = 1)) M.Stun(max(10/max(1,distance), 3)) M.Weaken(max(10/max(1,distance), 3)) //Bang diff --git a/code/modules/assembly/flash.dm b/code/modules/assembly/flash.dm index 376cb01f50a..c8ff7aaa39f 100644 --- a/code/modules/assembly/flash.dm +++ b/code/modules/assembly/flash.dm @@ -87,8 +87,6 @@ /obj/item/device/assembly/flash/proc/flash_carbon(mob/living/carbon/M, mob/user = null, power = 15, targeted = 1) add_logs(user, M, "flashed", src) if(user && targeted) - if(M.weakeyes) - M.Weaken(3) //quick weaken bypasses eye protection but has no eye flash if(M.flash_act(1, 1)) M.confused += power terrible_conversion_proc(M, user) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 772b8bc54d7..14953110ae8 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -533,18 +533,13 @@ see_in_dark = initial(see_in_dark) sight = initial(sight) + + if(client.eye != src) var/atom/A = client.eye if(A.update_remote_sight(src)) //returns 1 if we override all other sight updates. return - for(var/obj/item/organ/cyberimp/eyes/E in internal_organs) - sight |= E.sight_flags - if(E.dark_view) - see_in_dark = max(see_in_dark,E.dark_view) - if(E.see_invisible) - see_invisible = min(see_invisible, E.see_invisible) - if(see_override) see_invisible = see_override diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm index d619d6f54bf..c112139b0cb 100644 --- a/code/modules/mob/living/carbon/carbon_defense.dm +++ b/code/modules/mob/living/carbon/carbon_defense.dm @@ -227,8 +227,6 @@ if(.) // we've been flashed if(visual) return - if(weakeyes) - Stun(2) if (damage == 1) src << "Your eyes sting a little." diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index 4cab0731dca..e6ce7a37443 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -129,8 +129,6 @@ var/digitalinvis = 0 //Are they ivisible to the AI? var/image/digitaldisguise = null //what does the AI see instead of them? - var/weakeyes = 0 //Are they vulnerable to flashes? - var/has_unlimited_silicon_privilege = 0 // Can they interact with station electronics var/force_compose = 0 //If this is nonzero, the mob will always compose it's own hear message instead of using the one given in the arguments. From b550f76adee3326ac1c982e02c0671000cc6da0e Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Tue, 31 Jan 2017 21:41:25 -0600 Subject: [PATCH 2/3] Readds code that shouldn't have been removed --- code/modules/mob/living/carbon/carbon.dm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 14953110ae8..772b8bc54d7 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -533,13 +533,18 @@ see_in_dark = initial(see_in_dark) sight = initial(sight) - - if(client.eye != src) var/atom/A = client.eye if(A.update_remote_sight(src)) //returns 1 if we override all other sight updates. return + for(var/obj/item/organ/cyberimp/eyes/E in internal_organs) + sight |= E.sight_flags + if(E.dark_view) + see_in_dark = max(see_in_dark,E.dark_view) + if(E.see_invisible) + see_invisible = min(see_invisible, E.see_invisible) + if(see_override) see_invisible = see_override From 67f35fd6355c36fb8979b1c4031eca145f29cb36 Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Tue, 31 Jan 2017 21:46:52 -0600 Subject: [PATCH 3/3] More weakeyes --- code/modules/assembly/flash.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/modules/assembly/flash.dm b/code/modules/assembly/flash.dm index c8ff7aaa39f..4e06fb0b9d4 100644 --- a/code/modules/assembly/flash.dm +++ b/code/modules/assembly/flash.dm @@ -94,9 +94,6 @@ visible_message("[user] blinds [M] with the flash!") user << "You blind [M] with the flash!" M << "[user] blinds you with the flash!" - if(M.weakeyes) - M.Stun(2) - M.visible_message("[M] gasps and shields their eyes!", "You gasp and shield your eyes!") else visible_message("[user] fails to blind [M] with the flash!") user << "You fail to blind [M] with the flash!"