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

Merge pull request #5571 from TheDZD/why-the-fuck-was-this-fucking-proc-made-with-the-fucking-args-backwards-of-literally-every-other-fuckmothering-codebase

Browse Source 
add_logs() Un-fuckery
This commit is contained in:
Fox McCloud
2016-08-29 19:36:56 -04:00
committed by GitHub
parent a0f140a42d f5577b4a8f
commit 53893e2b57
49 changed files with 96 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food_and_drinks/drinks/drinks/bottle.dm
+2 -2
View File
@@ -106,7 +106,7 @@
"<span class='userdanger'>[target] hits \himself with a bottle of [src.name][head_attack_message]!</span>")
//Attack logs
add_logs(target, user, "attacked", src)
add_logs(user, target, "attacked", src)
//The reagents in the bottle splash all over the target, thanks for the idea Nodrak
SplashReagents(target)
@@ -343,4 +343,4 @@
return
to_chat(user, "<span class='info'>You snuff out the flame on \the [src].</span>")
overlays -= fire_overlay
active = 0
active = 0
code/modules/food_and_drinks/food/condiment.dm
+1 -1
View File
@@ -47,7 +47,7 @@
if(!reagents || !reagents.total_volume)
return // The condiment might be empty after the delay.
user.visible_message("<span class='warning'>[user] feeds [M] from [src].</span>")
add_logs(M, user, "fed", reagentlist(src))
add_logs(user, M, "fed", reagentlist(src))
var/fraction = min(10/reagents.total_volume, 1)
reagents.reaction(M, INGEST, fraction)
code/modules/hydroponics/grown_inedible.dm
+1 -1
View File
@@ -96,7 +96,7 @@
/obj/item/weapon/grown/nettle/death/afterattack(mob/living/carbon/M, mob/user)
if(istype(M, /mob/living))
to_chat(M, "<span class='danger'>You are stunned by the powerful acid of the Deathnettle!</span>")
add_logs(M, user, "attacked", src)
add_logs(user, M, "attacked", src)
M.eye_blurry += force/7
if(prob(20))
code/modules/martial_arts/brawling.dm
+4 -4
View File
@@ -19,7 +19,7 @@
if(!damage)
playsound(D.loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
D.visible_message("<span class='warning'>[A] has attempted to hit [D] with a [atk_verb]!</span>")
add_logs(D, A, "attempted to hit", atk_verb)
add_logs(A, D, "attempted to hit", atk_verb)
return 0
@@ -32,7 +32,7 @@
"<span class='userdanger'>[A] has hit [D] with a [atk_verb]!</span>")
D.apply_damage(damage, STAMINA, affecting, armor_block)
add_logs(D, A, "punched")
add_logs(A, D, "punched")
if(D.getStaminaLoss() > 50)
var/knockout_prob = D.getStaminaLoss() + rand(-15,15)
if((D.stat != DEAD) && prob(knockout_prob))
@@ -61,7 +61,7 @@
return 1
/datum/martial_art/drunk_brawling/harm_act(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D)
add_logs(D, A, "punched")
add_logs(A, D, "punched")
A.do_attack_animation(D)
var/atk_verb = pick("jab","uppercut","overhand punch","drunken right hook","drunken left hook")
@@ -103,4 +103,4 @@
D.forcesay(hit_appends)
else if(D.lying)
D.forcesay(hit_appends)
return 1
return 1
code/modules/martial_arts/martial.dm
+2 -2
View File
@@ -53,7 +53,7 @@
D.apply_damage(damage, BRUTE, affecting, armor_block)
add_logs(D, A, "punched")
add_logs(A, D, "punched")
if((D.stat != DEAD) && damage >= A.species.punchstunthreshold)
D.visible_message("<span class='danger'>[A] has weakened [D]!!</span>", \
@@ -242,4 +242,4 @@
/obj/item/weapon/twohanded/bostaff/hit_reaction(mob/living/carbon/human/owner, attack_text, final_block_chance)
if(wielded)
return ..()
return 0
return 0
code/modules/martial_arts/mimejutsu.dm
+1 -2
View File
@@ -38,7 +38,7 @@
playsound(get_turf(A), 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
D.apply_damage(damage, STAMINA, affecting, armor_block)
add_logs(D, A, "mimechucked")
add_logs(A, D, "mimechucked")
return 1
return basic_hit(A,D)
@@ -116,4 +116,3 @@
to_chat(usr, "<span class='notice'>Mimechucks</span>: Disarm Harm. Hits the opponent with invisible nunchucks.")
to_chat(usr, "<span class='notice'>Smokebomb</span>: Disarm Disarm. Drops a mime smokebomb.")
to_chat(usr, "<span class='notice'>Silent Palm</span>: Grab Disarm. Using mime energy throw someone back.")
code/modules/martial_arts/wrestleing.dm
+1 -1
View File
@@ -28,7 +28,7 @@
var/armor_block = D.run_armor_check(null, "melee")
D.apply_damage(30, BRUTE, null, armor_block)
D.apply_effect(6, WEAKEN, armor_block)
add_logs(D, A, "suplexed")
add_logs(A, D, "suplexed")
A.SpinAnimation(10,1)
code/modules/mining/equipment_locker.dm
+2 -2
View File
@@ -653,7 +653,7 @@
playsound(src,'sound/weapons/resonator_blast.ogg',50,1)
if(creator)
for(var/mob/living/L in src.loc)
add_logs(L, creator, "used a resonator field on", object="resonator")
add_logs(creator, L, "used a resonator field on", object="resonator")
to_chat(L, "<span class='danger'>The [src.name] ruptured with you in it!</span>")
L.adjustBruteLoss(resonance_damage)
else
@@ -1307,4 +1307,4 @@
if(!charged)
charged = 1
icon_state = "mining_hammer1"
playsound(loc, 'sound/weapons/kenetic_reload.ogg', 60, 1)
playsound(loc, 'sound/weapons/kenetic_reload.ogg', 60, 1)
code/modules/mob/living/carbon/alien/alien_defenses.dm
+2 -2
View File
@@ -35,7 +35,7 @@ In all, this is a lot like the monkey code. /N
visible_message("<span class='danger'>[M.name] bites [src]!</span>", \
"<span class='userdanger'>[M.name] bites [src]!</span>")
adjustBruteLoss(damage)
add_logs(src, M, "attacked", admin=0)
add_logs(M, src, "attacked", admin=0)
updatehealth()
else
to_chat(M, "<span class='warning'>[name] is too injured for that.</span>")
@@ -79,4 +79,4 @@ In all, this is a lot like the monkey code. /N
adjustCloneLoss(damage)
if(STAMINA)
adjustStaminaLoss(damage)
updatehealth()
updatehealth()
code/modules/mob/living/carbon/alien/larva/larva.dm
+2 -2
View File
@@ -116,7 +116,7 @@
"<span class='userdanger'>[M] [M.attacktext] [src]!</span>")
var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)
adjustBruteLoss(damage)
add_logs(src, M, "attacked", admin=0)
add_logs(M, src, "attacked", admin=0)
updatehealth()
@@ -245,4 +245,4 @@
else
var/mob/living/carbon/alien/humanoid/A = new(loc)
A.key = key
qdel(src) */
qdel(src) */
code/modules/mob/living/carbon/carbon.dm
+1 -1
View File
@@ -541,7 +541,7 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump,
var/start_T_descriptor = "<font color='#6b5d00'>tile at [start_T.x], [start_T.y], [start_T.z] in area [get_area(start_T)]</font>"
var/end_T_descriptor = "<font color='#6b4400'>tile at [end_T.x], [end_T.y], [end_T.z] in area [get_area(end_T)]</font>"
add_logs(throwable_mob, src, "thrown", addition="from [start_T_descriptor] with the target [end_T_descriptor]")
add_logs(src, throwable_mob, "thrown", addition="from [start_T_descriptor] with the target [end_T_descriptor]")
else if(!(I.flags & ABSTRACT)) //can't throw abstract items
thrown_thing = I
code/modules/mob/living/carbon/human/human.dm
+1 -1
View File
@@ -410,7 +410,7 @@
M.do_attack_animation(src)
visible_message("<span class='danger'>[M] [M.attacktext] [src]!</span>", \
"<span class='userdanger'>[M] [M.attacktext] [src]!</span>")
add_logs(src, M, "attacked")
add_logs(M, src, "attacked")
var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)
if(check_shields(damage, "the [M.name]", null, MELEE_ATTACK, M.armour_penetration))
return 0
code/modules/mob/living/carbon/human/human_attackhand.dm
+7 -7
View File
@@ -19,7 +19,7 @@
..()
if((M != src) && M.a_intent != "help" && check_shields(0, M.name, attack_type = UNARMED_ATTACK))
add_logs(src, M, "attempted to touch")
add_logs(M, src, "attempted to touch")
visible_message("<span class='warning'>[M] attempted to touch [src]!</span>")
return 0
@@ -63,11 +63,11 @@
if(S.next_step(M, src))
return 1
help_shake_act(M)
add_logs(src, M, "shaked")
add_logs(M, src, "shaked")
return 1
if(health >= config.health_threshold_crit)
help_shake_act(M)
add_logs(src, M, "shaked")
add_logs(M, src, "shaked")
return 1
if(!H.check_has_mouth())
to_chat(H, "<span class='danger'>You don't have a mouth, you cannot perform CPR!</span>")
@@ -94,7 +94,7 @@
to_chat(src, "<span class='notice'>You feel a breath of fresh air enter your lungs. It feels good.</span>")
to_chat(M, "<span class='alert'>Repeat at least every 7 seconds.")
add_logs(src, M, "CPRed")
add_logs(M, src, "CPRed")
return 1
else
to_chat(M, "<span class='danger'>You need to stay still while performing CPR!</span>")
@@ -123,7 +123,7 @@
return
//we're good to suck the blood, blaah
M.mind.vampire.handle_bloodsucking(src)
add_logs(src, M, "vampirebit")
add_logs(M, src, "vampirebit")
msg_admin_attack("[key_name_admin(M)] vampirebit [key_name_admin(src)]")
return
//end vampire codes
@@ -133,7 +133,7 @@
var/datum/unarmed_attack/attack = M.species.unarmed
M.do_attack_animation(src)
add_logs(src, M, "[pick(attack.attack_verb)]ed")
add_logs(M, src, "[pick(attack.attack_verb)]ed")
if(!iscarbon(M))
LAssailant = null
@@ -172,7 +172,7 @@
if(attacker_style && attacker_style.disarm_act(H, src))
return 1
else
add_logs(src, M, "disarmed")
add_logs(M, src, "disarmed")
if(w_uniform)
w_uniform.add_fingerprint(M)
code/modules/mob/living/living.dm
+2 -2
View File
@@ -651,7 +651,7 @@
who.unEquip(what)
if(silent)
put_in_hands(what)
add_logs(who, src, "stripped", addition="of [what]")
add_logs(src, who, "stripped", addition="of [what]")
// The src mob is trying to place an item on someone
// Override if a certain mob should be behave differently when placing items (can't, for example)
@@ -670,7 +670,7 @@
if(what && Adjacent(who))
unEquip(what)
who.equip_to_slot_if_possible(what, where, 0, 1)
add_logs(who, src, "equipped", what)
add_logs(src, who, "equipped", what)
/mob/living/singularity_act()
code/modules/mob/living/living_defense.dm
+1 -1
View File
@@ -235,7 +235,7 @@
to_chat(user, "<span class='notice'>You already grabbed [src].</span>")
return
add_logs(src, user, "grabbed", addition="passively")
add_logs(user, src, "grabbed", addition="passively")
var/obj/item/weapon/grab/G = new /obj/item/weapon/grab(user, src)
if(buckled)
code/modules/mob/living/simple_animal/bot/ed209bot.dm
+1 -1
View File
@@ -548,7 +548,7 @@ Auto Patrol[]"},
C.Weaken(5)
C.stuttering = 5
C.Stun(5)
add_logs(src,C,"stunned")
add_logs(src, C, "stunned")
if(declare_arrests)
var/area/location = get_area(src)
speak("[arrest_type ? "Detaining" : "Arresting"] level [threat] scumbag <b>[C]</b> in [location].", radio_channel)
code/modules/mob/living/simple_animal/bot/secbot.dm
+1 -1
View File
@@ -251,7 +251,7 @@ Auto Patrol: []"},
C.Weaken(5)
C.stuttering = 5
C.Stun(5)
add_logs(src,C,"stunned")
add_logs(src, C, "stunned")
if(declare_arrests)
var/area/location = get_area(src)
speak("[arrest_type ? "Detaining" : "Arresting"] level [threat] scumbag <b>[C]</b> in [location].", radio_channel)
code/modules/paperwork/pen.dm
+1 -1
View File
@@ -114,7 +114,7 @@
// to_chat(M, "<span class='danger'>You feel a tiny prick!</span>")
. = 1
add_logs(M, user, "stabbed", object="[name]")
add_logs(user, M, "stabbed", object="[name]")
else
. = ..()
code/modules/projectiles/projectile.dm
+1 -1
View File
@@ -87,7 +87,7 @@
for(var/datum/reagent/R in reagents.reagent_list)
reagent_note += R.id + " ("
reagent_note += num2text(R.volume) + ") "
add_logs(L, firer, "shot", src, reagent_note)
add_logs(firer, L, "shot", src, reagent_note)
return L.apply_effects(stun, weaken, paralyze, irradiate, slur, stutter, eyeblur, drowsy, blocked, stamina, jitter)
/obj/item/projectile/proc/vol_by_damage()
code/modules/reagents/newchem/medicine.dm
+2 -2
View File
@@ -639,7 +639,7 @@
M.adjustFireLoss(rand(0,15))
M.update_revive()
M.stat = UNCONSCIOUS
add_logs(M, M, "revived", object="strange reagent")
add_logs(M, M, "revived", object="strange reagent") //Yes, the logs say you revived yourself.
..()
/datum/reagent/strange_reagent/on_mob_life(mob/living/M)
@@ -1058,4 +1058,4 @@
else if(effect <= 8)
M.visible_message("<span class='warning'>[M] stumbles and staggers.</span>")
M.Dizzy(5)
M.Weaken(3)
M.Weaken(3)
code/modules/reagents/reagent_containers/hypospray.dm
+2 -2
View File
@@ -37,7 +37,7 @@
var/contained = english_list(injected)
add_logs(M, user, "injected", src, "([contained])")
add_logs(user, M, "injected", src, "([contained])")
/obj/item/weapon/reagent_containers/hypospray/CMO
list_reagents = list("omnizine" = 30)
@@ -110,4 +110,4 @@
amount_per_transfer_from_this = 50
possible_transfer_amounts = list(50)
volume = 50
list_reagents = list("stimulants" = 50)
list_reagents = list("stimulants" = 50)
code/modules/research/xenobiology/xenobiology.dm
+1 -1
View File
@@ -384,7 +384,7 @@
G.change_gender(pick(MALE,FEMALE))
G.loc = src.loc
G.key = ghost.key
add_logs(G, user, "summoned", null, "as a golem")
add_logs(user, G, "summoned", null, "as a golem")
to_chat(G, "You are an adamantine golem. You move slowly, but are highly resistant to heat and cold as well as blunt trauma. You are unable to wear clothes, but can still use most tools. Serve [user], and assist them in completing their goals at any cost.")
qdel(src)
code/modules/surgery/generic.dm
+1 -1
View File
@@ -243,7 +243,7 @@
user.visible_message("<span class='notice'> [user] amputates [target]'s [affected.name] at the [affected.amputation_point] with \the [tool].</span>", \
"<span class='notice'> You amputate [target]'s [affected.name] with \the [tool].</span>")
add_logs(target,user ,"surgically removed [affected.name] from", addition="INTENT: [uppertext(user.a_intent)]")//log it
add_logs(user, target, "surgically removed [affected.name] from", addition="INTENT: [uppertext(user.a_intent)]")//log it
var/atom/movable/thing = affected.droplimb(1,DROPLIMB_EDGE)
if(istype(thing,/obj/item))
code/modules/surgery/organs_internal.dm
+1 -1
View File
@@ -240,7 +240,7 @@
user.visible_message("<span class='notice'> [user] has separated and extracts [target]'s [I] with \the [tool].</span>" , \
"<span class='notice'> You have separated and extracted [target]'s [I] with \the [tool].</span>")
add_logs(target,user, "surgically removed [I.name] from", addition="INTENT: [uppertext(user.a_intent)]")
add_logs(user, target, "surgically removed [I.name] from", addition="INTENT: [uppertext(user.a_intent)]")
spread_germs_to_organ(I, user)
I.status |= ORGAN_CUT_AWAY
var/obj/item/thing = I.remove(target)
code/modules/surgery/robotics.dm
+2 -2
View File
@@ -453,7 +453,7 @@
user.visible_message("<span class='notice'> [user] has decoupled [target]'s [I] with \the [tool].</span>" , \
"<span class='notice'> You have decoupled [target]'s [I] with \the [tool].</span>")
add_logs(target,user, "surgically removed [I.name] from", addition="INTENT: [uppertext(user.a_intent)]")
add_logs(user, target, "surgically removed [I.name] from", addition="INTENT: [uppertext(user.a_intent)]")
spread_germs_to_organ(I, user)
I.status |= ORGAN_CUT_AWAY
var/obj/item/thing = I.remove(target)
@@ -530,7 +530,7 @@
"<span class='notice'> You have decoupled [target]'s [affected.name] with \the [tool].</span>")
add_logs(target,user ,"surgically removed [affected.name] from", addition="INTENT: [uppertext(user.a_intent)]")//log it
add_logs(user, target, "surgically removed [affected.name] from", addition="INTENT: [uppertext(user.a_intent)]")//log it
var/atom/movable/thing = affected.droplimb(1,DROPLIMB_EDGE)
if(istype(thing,/obj/item))