cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-23 13:05:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into dev-freeze

Browse Source 
Conflicts:
	code/game/objects/items/weapons/material/kitchen.dm
This commit is contained in:
PsiOmegaDelta
2015-12-20 11:22:08 +01:00
parent 1190f5fe4b 1cb2239938
commit 5d3d0c5dc3
10 changed files with 51 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/supermatter/supermatter.dm
+2
View File
@@ -348,6 +348,8 @@
/obj/machinery/power/supermatter/Bumped(atom/AM as mob|obj)
if(istype(AM, /obj/effect))
return
if(istype(AM, /mob/living))
AM.visible_message("<span class=\"warning\">\The [AM] slams into \the [src] inducing a resonance... \his body starts to glow and catch flame before flashing into ash.</span>",\
"<span class=\"danger\">You slam into \the [src] as your ears are filled with unearthly ringing. Your last thought is \"Oh, fuck.\"</span>",\