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

new logging system

Browse Source
This commit is contained in:
uraniummeltdown
2018-04-23 21:43:58 +05:00
parent f685a74733
commit 0665c0ac27
10 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
+1 -1
View File
@@ -84,7 +84,7 @@
if(M.is_adult)
damage = rand(10, 40)
adjustBruteLoss(damage)
add_logs(M, src, "attacked", admin=0)
add_attack_logs(src, M, "Slime'd for [damage] damage")
updatehealth()
return
code/modules/mob/living/carbon/alien/humanoid/humanoid_defense.dm
+2 -2
View File
@@ -20,7 +20,7 @@
"<span class='userdanger'>[M] has weakened [src]!</span>", \
"<span class='danger'>You hear someone fall.</span>")
adjustBruteLoss(damage)
add_logs(M, src, "attacked", admin=0)
add_attack_logs(M, src, "Melee attacked with fists")
updatehealth()
else
playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
@@ -31,7 +31,7 @@
if(prob(5))//Very small chance to push an alien down.
Paralyse(2)
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
add_logs(M, src, "pushed", admin=0)
add_attack_logs(M, src, "Pushed over")
visible_message("<span class='danger'>[M] has pushed down [src]!</span>", \
"<span class='userdanger'>[M] has pushed down [src]!</span>")
else
code/modules/mob/living/carbon/alien/larva/larva.dm
+1 -1
View File
@@ -79,7 +79,7 @@
if(M.is_adult)
damage = rand(20, 40)
adjustBruteLoss(damage)
add_attack_logs(M, src, "Slime attacked")
add_attack_logs(src, M, "Slime'd for [damage] damage")
updatehealth()
return
code/modules/mob/living/carbon/alien/larva/larva_defense.dm
+1 -1
View File
@@ -10,7 +10,7 @@
sleep(3)
step_away(src, M, 15)
playsound(loc, "punch", 25, 1, -1)
add_logs(M, src, "attacked", admin=0)
add_attack_logs(M, src, "Melee attacked with fists")
visible_message("<span class='danger'>[M] has kicked [src]!</span>", \
"<span class='userdanger'>[M] has kicked [src]!</span>")
if((stat != DEAD) && (damage > 4.9))
code/modules/mob/living/carbon/human/human.dm
+1 -1
View File
@@ -1756,7 +1756,7 @@ Eyes need to have significantly high darksight to shine unless the mob has the X
to_chat(H, "<span class='notice'>You feel a breath of fresh air enter your lungs. It feels good.</span>")
to_chat(src, "<span class='alert'>Repeat at least every 7 seconds.")
add_logs(src, H, "CPRed")
add_attack_logs(src, H, "CPRed", FALSE)
return 1
else
to_chat(src, "<span class='danger'>You need to stay still while performing CPR!</span>")
code/modules/mob/living/carbon/human/human_defense.dm
+2 -2
View File
@@ -391,7 +391,7 @@ emp_act
visible_message("<span class='danger'>[M] has wounded [src]!</span>", \
"<span class='userdanger'>[M] has wounded [src]!</span>")
apply_effect(4, WEAKEN, armor_block)
add_logs(M, src, "attacked", admin=0)
add_attack_logs(M, src, "Alien attacked")
updatehealth()
if(M.a_intent == INTENT_DISARM)
@@ -399,7 +399,7 @@ emp_act
var/obj/item/organ/external/affecting = get_organ(ran_zone(M.zone_sel.selecting))
playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1)
apply_effect(5, WEAKEN, run_armor_check(affecting, "melee"))
add_logs(M, src, "tackled", admin=0)
add_attack_logs(M, src, "Alien tackled")
visible_message("<span class='danger'>[M] has tackled down [src]!</span>")
else
if(prob(99)) //this looks fucking stupid but it was previously 'var/randn = rand(1, 100); if(randn <= 99)'
code/modules/mob/living/living_defense.dm
+3 -3
View File
@@ -290,7 +290,7 @@
s.set_up(5, 1, src)
s.start()
return 1
add_logs(M, src, "attacked", admin=0)
add_attack_logs(src, M, "Slime'd")
return
/mob/living/attack_animal(mob/living/simple_animal/M)
@@ -303,7 +303,7 @@
M.do_attack_animation(src)
visible_message("<span class='danger'>\The [M] [M.attacktext] [src]!</span>", \
"<span class='userdanger'>\The [M] [M.attacktext] [src]!</span>")
add_logs(M, src, "attacked", admin=0)
add_attack_logs(M, src, "Animal attacked")
return 1
/mob/living/attack_larva(mob/living/carbon/alien/larva/L)
@@ -315,7 +315,7 @@
else
L.do_attack_animation(src)
if(prob(90))
add_logs(L, src, "attacked", admin=0)
add_attack_logs(L, src, "Larva attacked")
visible_message("<span class='danger'>[L.name] bites [src]!</span>", \
"<span class='userdanger'>[L.name] bites [src]!</span>")
playsound(loc, 'sound/weapons/bite.ogg', 50, 1, -1)
code/modules/mob/living/silicon/robot/robot_defense.dm
+1 -1
View File
@@ -7,7 +7,7 @@
step(src, get_dir(M,src))
spawn(5)
step(src, get_dir(M,src))
add_logs(M, src, "pushed", admin=0)
add_attack_logs(M, src, "Alien pushed over")
playsound(loc, 'sound/weapons/pierce.ogg', 50, 1, -1)
visible_message("<span class='danger'>[M] has forced back [src]!</span>",\
"<span class='userdanger'>[M] has forced back [src]!</span>")
code/modules/mob/living/silicon/silicon_defense.dm
+2 -3
View File
@@ -5,13 +5,12 @@
if(..()) //if harm or disarm intent
var/damage = rand(10, 20)
if(prob(90))
add_logs(M, src, "attacked", admin=0)
playsound(loc, 'sound/weapons/slash.ogg', 25, 1, -1)
visible_message("<span class='danger'>[M] has slashed at [src]!</span>", \
"<span class='userdanger'>[M] has slashed at [src]!</span>")
if(prob(8))
flash_eyes(affect_silicon = 1)
add_logs(M, src, "attacked", admin=0)
add_attack_logs(M, src, "Alien attacked")
adjustBruteLoss(damage)
updatehealth()
else
@@ -55,7 +54,7 @@
if(HULK in M.mutations)
var/damage = rand(10,15)
adjustBruteLoss(damage)
add_logs(M, src, "attacked", admin=0)
add_attack_logs(M, src, "Melee attacked with fists")
playsound(loc, "punch", 25, 1, -1)
visible_message("<span class='danger'>[M] has punched [src]!</span>", \
"<span class='userdanger'>[M] has punched [src]!</span>")
code/modules/mob/living/simple_animal/animal_defense.dm
+2 -2
View File
@@ -15,7 +15,7 @@
visible_message("<span class='danger'>[M] [response_harm] [src]!</span>")
playsound(loc, "punch", 25, 1, -1)
attack_threshold_check(harm_intent_damage)
add_logs(M, src, "attacked", admin=0)
add_attack_logs(M, src, "Melee attacked with fists")
updatehealth()
return 1
@@ -25,7 +25,7 @@
visible_message("<span class='danger'>[M] has slashed at [src]!</span>", \
"<span class='userdanger'>[M] has slashed at [src]!</span>")
playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1)
add_logs(M, src, "attacked", admin=0)
add_attack_logs(M, src, "Alien attacked")
attack_threshold_check(damage)
return