cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] next set of spans (#9247)

Browse Source 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
This commit is contained in:
CHOMPStation2
2024-10-17 16:33:07 -07:00
committed by GitHub
parent bc6662ef9e
commit 7416cbea22
599 changed files with 2619 additions and 2564 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/modules/holodeck/HolodeckObjects.dm
View File

@@ -154,7 +154,7 @@
var/damage = rand(0, 9)
if(!damage)
playsound(target, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
target.visible_message(span_red("<B>[user] has attempted to punch [target]!</B>"))
target.visible_message(span_danger("[user] has attempted to punch [target]!"))
return TRUE
var/obj/item/organ/external/affecting = target.get_organ(ran_zone(user.zone_sel.selecting))
var/armor_block = target.run_armor_check(affecting, "melee")
@@ -165,14 +165,14 @@
playsound(target, "punch", 25, 1, -1)
target.visible_message(span_red("<B>[user] has punched [target]!</B>"))
target.visible_message(span_bolddanger("[user] has punched [target]!"))
if(armor_soak >= damage)
return TRUE
target.apply_damage(damage, HALLOSS, affecting, armor_block, armor_soak)
if(damage >= 9)
target.visible_message(span_red("<B>[user] has weakened [target]!</B>"))
target.visible_message(span_bolddanger("[user] has weakened [target]!"))
target.apply_effect(4, WEAKEN, armor_block)
return TRUE
@@ -239,7 +239,7 @@
if(src.density && istype(I, /obj/item) && !istype(I, /obj/item/card))
var/aforce = I.force
playsound(src, 'sound/effects/Glasshit.ogg', 75, 1)
visible_message(span_red("<B>[src] was hit by [I].</B>"))
visible_message(span_bolddanger("[src] was hit by [I]."))
if(I.damtype == BRUTE || I.damtype == BURN)
take_damage(aforce)
return
@@ -522,5 +522,5 @@
derez()
/mob/living/simple_mob/animal/space/carp/holodeck/proc/derez()
visible_message("<b>\The [src]</b> fades away!")
visible_message(span_infoplain(span_bold("\The [src]") + " fades away!"))
qdel(src)