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

Merge pull request #5097 from phil235/Msg1Fix

Browse Source 
Fixing a lot of messages
This commit is contained in:
Cheridan
2014-10-07 12:09:01 -05:00
parent 0d0ae75102 dd7a3b7fbc
commit f96b017149
52 changed files with 201 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/morgue.dm
+5 -9
View File
@@ -144,8 +144,7 @@
O.loc = src.loc
if (user != O)
for(var/mob/B in viewers(user, 3))
if ((B.client && !( B.blinded )))
B << text("<span class='danger'>[] stuffs [] into []!</span>", user, O, src)
B.show_message("<span class='danger'>[user] stuffs [O] into [src]!</span>", 1)
return
@@ -235,13 +234,11 @@
return //don't let you cremate something twice or w/e
if(contents.len <= 1)
for (var/mob/M in viewers(src))
M.show_message("<span class='danger'>You hear a hollow crackle.</span>", 1)
return
audible_message("<span class='danger'>You hear a hollow crackle.</span>")
return
else
for (var/mob/M in viewers(src))
M.show_message("<span class='danger'>You hear a roar as the crematorium activates.</span>", 1)
audible_message("<span class='danger'>You hear a roar as the crematorium activates.</span>")
cremating = 1
locked = 1
@@ -324,8 +321,7 @@
O.loc = src.loc
if (user != O)
for(var/mob/B in viewers(user, 3))
if ((B.client && !( B.blinded )))
B << text("<span class='danger'>[] stuffs [] into []!</span>", user, O, src)
B.show_message("<span class='danger'>[user] stuffs [O] into [src]!</span>", 1)
//Foreach goto(99)
return
code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm
+1 -2
View File
@@ -64,8 +64,7 @@
var/aforce = W.force
health = max(0, health - aforce)
playsound(loc, 'sound/effects/attackblob.ogg', 100, 1)
for(var/mob/M in viewers(src, 7))
M.show_message("<span class='warning'>[user] hits [src] with [W]!</span>", 1)
visible_message("<span class='danger'>[user] hits [src] with [W]!</span>")
healthcheck()
/obj/structure/stool/bed/nest/proc/healthcheck()