Merge branch 'master' of https://github.com/Baystation12/Baystation12

2026-01-30 10:53:24 +00:00 · 2013-01-01 22:26:45 -08:00
parent e7d66f06cd c612dd60da
commit e8f052d0c9
5 changed files with 1 additions and 1 deletions
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -57,6 +57,6 @@
 		P.on_hit(src,2)
 		return 2
 	if(!P.nodamage)
-		apply_damage((P.damage/(absorb+1)), P.damage_type, def_zone, used_weapon = "Projectile([P.name])")
+		apply_damage((P.damage/(absorb+1)), P.damage_type, def_zone)
 	P.on_hit(src, absorb)
 	return absorb
--- a/icons/mob/head.dmi
+++ b/icons/mob/head.dmi
--- a/icons/mob/suit.dmi
+++ b/icons/mob/suit.dmi
--- a/icons/obj/clothing/hats.dmi
+++ b/icons/obj/clothing/hats.dmi
--- a/icons/obj/clothing/suits.dmi
+++ b/icons/obj/clothing/suits.dmi