cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 03:25:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

add_logs() un-fuckery

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items.dm
+2 -2
View File
@@ -460,7 +460,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d
"<span class='userdanger'>You stab yourself in the eyes with [src]!</span>" \
)
add_logs(M, user, "attacked", "[src.name]", "(INTENT: [uppertext(user.a_intent)])")
add_logs(user, M, "attacked", "[name]", "(INTENT: [uppertext(user.a_intent)])")
if(istype(H))
var/obj/item/organ/internal/eyes/eyes = H.get_int_organ(/obj/item/organ/internal/eyes)
@@ -567,4 +567,4 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d
return 1
/obj/item/proc/is_crutch() //Does an item prop up a human mob and allow them to stand if they are missing a leg/foot?
return 0
return 0
code/game/objects/items/devices/aicard.dm
+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.
code/game/objects/items/devices/flash.dm
+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
code/game/objects/items/devices/flashlight.dm
+3 -3
View File
@@ -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
code/game/objects/items/devices/laserpointer.dm
+2 -2
View File
@@ -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
..()
..()
code/game/objects/items/devices/traitordevices.dm
+3 -3
View File
@@ -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
code/game/objects/items/robot/robot_items.dm
+1 -1
View File
@@ -28,7 +28,7 @@
playsound(loc, 'sound/weapons/Egloves.ogg', 50, 1, -1)
add_logs(M, user, "stunned", src, "(INTENT: [uppertext(user.a_intent)])")
add_logs(user, M, "stunned", src, "(INTENT: [uppertext(user.a_intent)])")
/obj/item/borg/overdrive
name = "Overdrive"
code/game/objects/items/weapons/defib.dm
+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>")
code/game/objects/items/weapons/flamethrower.dm
+1 -1
View File
@@ -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)
code/game/objects/items/weapons/handcuffs.dm
+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>")
code/game/objects/items/weapons/implants/implant.dm
+1 -1
View File
@@ -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
code/game/objects/items/weapons/pneumaticCannon.dm
+1 -1
View File
@@ -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)
code/game/objects/items/weapons/powerfist.dm
+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)
code/game/objects/items/weapons/stunbaton.dm
+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
code/game/objects/items/weapons/swords_axes_etc.dm
+1 -1
View File
@@ -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>")
code/game/objects/structures/tables_racks.dm
+2 -2
View File
@@ -211,7 +211,7 @@
G.affecting.Weaken(2)
G.affecting.visible_message("<span class='danger'>[G.assailant] pushes [G.affecting] onto [src].</span>", \
"<span class='userdanger'>[G.assailant] pushes [G.affecting] onto [src].</span>")
add_logs(G.affecting, G.assailant, "pushed onto a table")
add_logs(G.assailant, G.affecting, "pushed onto a table")
qdel(I)
return 1
qdel(I)
@@ -632,4 +632,4 @@
icon_state = "minibar_left"
/obj/structure/rack/skeletal_bar/right
icon_state = "minibar_right"
icon_state = "minibar_right"