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
@@ -334,7 +334,7 @@
H.emote("gasp")
if(!H.heart_attack && (prob(10) || defib.combat)) // Your heart explodes.
H.heart_attack = 1
add_logs(M, user, "stunned", object="defibrillator")
add_logs(user, M, "stunned", object="defibrillator")
defib.deductcharge(revivecost)
cooldown = 1
busy = 0
@@ -413,7 +413,7 @@
if(tplus > tloss)
H.setBrainLoss( max(0, min(99, ((tlimit - tplus) / tlimit * 100))))
defib.deductcharge(revivecost)
add_logs(M, user, "revived", object="defibrillator")
add_logs(user, M, "revived", object="defibrillator")
else
if(tplus > tlimit|| !H.get_int_organ(/obj/item/organ/internal/heart))
user.visible_message("<span class='boldnotice'>[defib] buzzes: Resuscitation failed - Heart tissue damage beyond point of no return for defibrillation.</span>")
@@ -477,7 +477,7 @@
H.heart_attack = 1
playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 50, 1, -1)
H.emote("gasp")
add_logs(M, user, "stunned", object="defibrillator")
add_logs(user, M, "stunned", object="defibrillator")
if(isrobot(user))
var/mob/living/silicon/robot/R = user
R.cell.use(revivecost)
@@ -534,7 +534,7 @@
if(isrobot(user))
var/mob/living/silicon/robot/R = user
R.cell.use(revivecost)
add_logs(M, user, "revived", object="defibrillator")
add_logs(user, M, "revived", object="defibrillator")
else
if(tplus > tlimit)
user.visible_message("<span class='warning'>[user] buzzes: Resuscitation failed - Heart tissue damage beyond point of no return for defibrillation.</span>")
@@ -71,7 +71,7 @@
var/turf/target_turf = get_turf(target)
if(target_turf)
var/turflist = getline(user, target_turf)
add_logs(target, user, "flamethrowered", addition="at [target.x],[target.y],[target.z]")
add_logs(user, target, "flamethrowered", addition="at [target.x],[target.y],[target.z]")
flame_turf(turflist)
/obj/item/weapon/flamethrower/attackby(obj/item/W as obj, mob/user as mob, params)
+2 -2
View File
@@ -46,7 +46,7 @@
else
feedback_add_details("handcuffs","H")
add_logs(C, user, "handcuffed", src)
add_logs(user, C, "handcuffed", src)
else
to_chat(user, "<span class='warning'>You fail to handcuff [C].</span>")
@@ -154,7 +154,7 @@
C.handcuffed = new /obj/item/weapon/restraints/handcuffs/cable/zipties/used(C)
C.update_handcuffed()
to_chat(user, "<span class='notice'>You handcuff [C].</span>")
add_logs(C, user, "ziptie-cuffed")
add_logs(user, C, "ziptie-cuffed")
else
to_chat(user, "<span class='warning'>You fail to handcuff [C].</span>")
@@ -53,7 +53,7 @@
H.sec_hud_set_implants()
if(user)
add_logs(source, user, "implanted", object="[name]")
add_logs(user, source, "implanted", object="[name]")
return 1
@@ -118,7 +118,7 @@
if(!discharge)
user.visible_message("<span class='danger'>[user] fires \the [src]!</span>", \
"<span class='danger'>You fire \the [src]!</span>")
add_logs(target, user, "fired at", src)
add_logs(user, target, "fired at", src)
playsound(src.loc, 'sound/weapons/sonic_jackhammer.ogg', 50, 1)
for(var/obj/item/ITD in loadedItems) //Item To Discharge
spawn(0)
+2 -2
View File
@@ -95,6 +95,6 @@
spawn(0)
target.throw_at(throw_target, 5 * fisto_setting, 0.2)
add_logs(target, user, "power fisted", src)
add_logs(user, target, "power fisted", src)
user.changeNext_move(CLICK_CD_MELEE * click_delay)
user.changeNext_move(CLICK_CD_MELEE * click_delay)
+2 -2
View File
@@ -166,7 +166,7 @@
var/mob/living/carbon/human/H = L
H.forcesay(hit_appends)
add_logs(L, user, "stunned", object="stunbaton")
add_logs(user, L, "stunned", object="stunbaton")
/obj/item/weapon/melee/baton/emp_act(severity)
if(bcell)
@@ -204,4 +204,4 @@
throwforce = 5
stunforce = 5
hitcost = 3750
slot_flags = null
slot_flags = null
@@ -57,7 +57,7 @@
return 0
playsound(get_turf(src), 'sound/effects/woodhit.ogg', 75, 1, -1)
target.Weaken(3)
add_logs(target, user, "stunned", object="[src]")
add_logs(user, target, "stunned", object="[src]")
src.add_fingerprint(user)
target.visible_message("<span class ='danger'>[user] has knocked down [target] with \the [src]!</span>", \
"<span class ='userdanger'>[user] has knocked down [target] with \the [src]!</span>")