From 6827be92fced9b0f055dc1babfaaac5ff264a2d4 Mon Sep 17 00:00:00 2001
From: Darkmight9 <45213755+Darkmight9@users.noreply.github.com>
Date: Sat, 26 Jan 2019 18:48:48 -0500
Subject: [PATCH] Now with 100% less c+p!
---
code/game/objects/items/devices/flash.dm | 55 ++++++------------------
1 file changed, 14 insertions(+), 41 deletions(-)
diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm
index eda883c0f84..d0b8637b280 100644
--- a/code/game/objects/items/devices/flash.dm
+++ b/code/game/objects/items/devices/flash.dm
@@ -221,50 +221,23 @@
flash_cur_charges = min(flash_cur_charges+1, flash_max_charges)
return TRUE
-
/obj/item/flash/cameraflash/attack(mob/living/M, mob/user)
- if(flash_cur_charges > 0)
- flash_cur_charges -= 1
- to_chat(user, "[src] now has [flash_cur_charges] charge\s.")
- if(!try_use_flash(user))
- return 0
-
- if(iscarbon(M))
- flash_carbon(M, user, 5, 1)//removed the overcharge check to trim code
-
- else if(issilicon(M))
- if(isrobot(M))
- var/mob/living/silicon/robot/R = M
- if(R.module) // Perhaps they didn't choose a module yet
- for(var/obj/item/borg/combat/shield/S in R.module.modules)
- if(R.activated(S))
- add_attack_logs(user, M, "Flashed with [src]")
- user.visible_message("[user] tries to overloads [M]'s sensors with the [src.name], but is blocked by [M]'s shield!", "You try to overload [M]'s sensors with the [src.name], but are blocked by [M.p_their()] shield!")
- return 1
- add_attack_logs(user, M, "Flashed with [src]")
- if(M.flash_eyes(affect_silicon = 1))
- M.Weaken(rand(5,10))
- user.visible_message("[user] overloads [M]'s sensors with the [src.name]!", "You overload [M]'s sensors with the [src.name]!")
- return 1
-
- user.visible_message("[user] fails to blind [M] with the [src.name]!", "You fail to blind [M] with the [src.name]!")
- else
- to_chat(user, "\The [src] needs time to recharge!")
- return
+ if(flash_cur_charges > 0)
+ flash_cur_charges -= 1
+ to_chat(user, "[src] now has [flash_cur_charges] charge\s.")
+ ..()
+ else
+ to_chat(user, "\The [src] needs time to recharge!")
+ return
/obj/item/flash/cameraflash/attack_self(mob/living/carbon/user, flag = 0)
- if(flash_cur_charges > 0)
- flash_cur_charges -= 1
- to_chat(user, "[src] now has [flash_cur_charges] charge\s.")
- if(!try_use_flash(user))
- return 0
-
- user.visible_message("[user]'s [src.name] emits a blinding light!", "Your [src.name] emits a blinding light!")
- for(var/mob/living/carbon/M in oviewers(3, null))
- flash_carbon(M, user, 3, 0)
- else
- to_chat(user, "\The [src] needs time to recharge!")
- return
+ if(flash_cur_charges > 0)
+ flash_cur_charges -= 1
+ to_chat(user, "[src] now has [flash_cur_charges] charge\s.")
+ ..()
+ else
+ to_chat(user, "\The [src] needs time to recharge!")
+ return
/obj/item/flash/memorizer
name = "memorizer"