cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-26 13:36:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into aro-tether-wip

Browse Source 
# Conflicts:
#	code/ZAS/_docs.dm
#	code/game/area/areas.dm
#	code/game/objects/explosion.dm
#	code/modules/holodeck/HolodeckControl.dm
#	code/modules/mob/living/say.dm
This commit is contained in:
Leshana
2017-05-16 00:26:32 -04:00
parent 036af69b78 86daf319f0
commit 5ae26332fa
220 changed files with 2121 additions and 1183 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/resleeving/infomorph.dm
+1 -1
View File
@@ -158,7 +158,7 @@ var/list/infomorph_emotions = list(
if(prob(20))
var/turf/T = get_turf_or_move(src.loc)
for (var/mob/M in viewers(T))
M.show_message("\red A shower of sparks spray from [src]'s inner workings.", 3, "\red You hear and smell the ozone hiss of electrical sparks being expelled violently.", 2)
M.show_message("<span class='warning'>A shower of sparks spray from \the [src]'s inner workings.</span>", 3, "<span class='warning'>You hear and smell the ozone hiss of electrical sparks being expelled violently.</span>", 2)
return src.death(0)
/mob/living/silicon/infomorph/death(gibbed,var/message = "beeps once, then goes offline.")