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
+1 -1
View File
@@ -17,7 +17,7 @@
var/mob/living/silicon/ai/AI = locate(/mob/living/silicon/ai) in src
if(AI) //AI is on the card, implies user wants to upload it.
target.transfer_ai(AI_TRANS_FROM_CARD, user, AI, src)
add_logs(AI,user, "carded", object="[name]")
add_logs(user, AI, "carded", object="[name]")
else //No AI on the card, therefore the user wants to download one.
target.transfer_ai(AI_TRANS_TO_CARD, user, null, src)
update_state() //Whatever happened, update the card's state (icon, name) to match.
+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
@@ -276,9 +276,9 @@ obj/item/device/flashlight/lamp/bananalamp
"<span class='userdanger'>[user] blinks \the [src] at \the [A].")
if(ismob(A))
var/mob/M = A
add_logs(M, user, "attacked", object="EMP-light")
to_chat(user, "\The [src] now has [emp_cur_charges] charge\s.")
add_logs(user, M, "attacked", object="EMP-light")
to_chat(user, "[src] now has [emp_cur_charges] charge\s.")
A.emp_act(1)
else
to_chat(user, "<span class='warning'>\The [src] needs time to recharge!</span>")
return
return
@@ -102,7 +102,7 @@
if(iscarbon(target))
var/mob/living/carbon/C = target
if(user.zone_sel.selecting == "eyes")
add_logs(C, user, "shone in the eyes", object="laser pointer")
add_logs(user, C, "shone in the eyes", object="laser pointer")
var/severity = 1
if(prob(33))
@@ -187,4 +187,4 @@
energy = max_energy
recharging = 0
recharge_locked = 0
..()
..()
@@ -47,7 +47,7 @@ effective or pretty fucking useless.
for(var/mob/living/carbon/human/M in oview(7, user))
if(prob(50))
M.Weaken(rand(4,7))
add_logs(M, user, "stunned", src)
add_logs(user, M, "stunned", src)
to_chat(M, "<span class='danger'>You feel a tremendous, paralyzing wave flood your mind.</span>")
else
to_chat(M, "<span class='danger'>You feel a sudden, electric jolt travel through your head.</span>")
@@ -90,7 +90,7 @@ effective or pretty fucking useless.
/obj/item/device/rad_laser/attack(mob/living/M, mob/living/user)
if(!used)
add_logs(M, user, "irradiated", src)
add_logs(user, M, "irradiated", src)
user.visible_message("<span class='notice'>[user] has analyzed [M]'s vitals.</span>")
var/cooldown = round(max(100,(((intensity*8)-(wavelength/2))+(intensity*2))*10))
used = 1
@@ -145,4 +145,4 @@ effective or pretty fucking useless.
attack_self(usr)
add_fingerprint(usr)
return
return