Revert "Revert "12/10/23 - Map swap update" (#15593)" (#15594)

This reverts commit f00d13da66.
This commit is contained in:
Selis
2023-12-11 00:22:42 +01:00
committed by GitHub
parent f00d13da66
commit 7ccdbb258f
115 changed files with 9957 additions and 3444 deletions
+5 -5
View File
@@ -185,22 +185,22 @@
user.do_attack_animation(src)
shatter()
else if (usr.a_intent == I_HURT)
else if (user.a_intent == I_HURT)
if (istype(usr,/mob/living/carbon/human))
var/mob/living/carbon/human/H = usr
if (istype(user,/mob/living/carbon/human))
var/mob/living/carbon/human/H = user
if(H.species.can_shred(H))
attack_generic(H,25)
return
playsound(src, 'sound/effects/glassknock.ogg', 80, 1)
user.do_attack_animation(src)
usr.visible_message("<span class='danger'>\The [usr] bangs against \the [src]!</span>",
user.visible_message("<span class='danger'>\The [user] bangs against \the [src]!</span>",
"<span class='danger'>You bang against \the [src]!</span>",
"You hear a banging sound.")
else
playsound(src, 'sound/effects/glassknock.ogg', 80, 1)
usr.visible_message("[usr.name] knocks on the [src.name].",
user.visible_message("[user.name] knocks on the [src.name].",
"You knock on the [src.name].",
"You hear a knocking sound.")
return