add_logs() un-fuckery

This commit is contained in:
TheDZD
2016-08-29 17:27:56 -04:00
parent c65b0342ab
commit f5577b4a8f
49 changed files with 96 additions and 97 deletions
+4 -4
View File
@@ -76,7 +76,7 @@
/obj/item/device/flash/proc/flash_carbon(var/mob/living/carbon/M, var/mob/user = null, var/power = 5, targeted = 1)
add_logs(M, user, "flashed", object="[src.name]")
add_logs(user, M, "flashed", object="[src.name]")
if(user && targeted)
if(M.weakeyes)
M.Weaken(3) //quick weaken bypasses eye protection but has no eye flash
@@ -116,10 +116,10 @@
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_logs(M, user, "flashed", object="[src.name]")
add_logs(user, M, "flashed", object="[src.name]")
user.visible_message("<span class='disarm'>[user] tries to overloads [M]'s sensors with the [src.name], but if blocked by [M]'s shield!</span>", "<span class='danger'>You try to overload [M]'s sensors with the [src.name], but are blocked by his shield!</span>")
return 1
add_logs(M, user, "flashed", object="[src.name]")
add_logs(user, M, "flashed", object="[src.name]")
if(M.flash_eyes(affect_silicon = 1))
M.Weaken(rand(5,10))
user.visible_message("<span class='disarm'>[user] overloads [M]'s sensors with the [src.name]!</span>", "<span class='danger'>You overload [M]'s sensors with the [src.name]!</span>")
@@ -196,4 +196,4 @@
icon_state = "memorizer"
item_state = "nullrod"
/obj/item/device/flash/synthetic //just a regular flash now
/obj/item/device/flash/synthetic //just a regular flash now