cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 06:29:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/-tg-station into RecursiveHearVisibleMessage

Browse Source 
Conflicts:
	code/game/machinery/doors/windowdoor.dm
	code/game/mecha/mecha.dm
	code/game/objects/structures.dm
	code/game/turfs/simulated/walls.dm
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/mob/living/living_defense.dm
This commit is contained in:
phil235
2014-12-05 22:02:01 +01:00
parent a6b24162e1 d124415c85
commit be1b02059f
98 changed files with 1573 additions and 1538 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures.dm
+1 -1
View File
@@ -12,6 +12,6 @@
/obj/structure/mech_melee_attack(obj/mecha/M)
if(M.damtype == "brute")
visible_message("<span class='danger'>[src] has been hit by [M.name].</span>")
visible_message("<span class='danger'>[M.name] has hit [src].</span>")
return 1
return 0