cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Apparently organs are being worked on.

Browse Source 
They have been moved back and checked for Rockdtben.
As the attempted list dead people's names as their real_name did not work, dead people's names are back to the old style.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2869 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
mport2004@gmail.com
2011-12-30 17:09:02 +00:00
parent ec0cd3b973
commit 67efff9bae
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
code/unused/organs/implants.dm → code/WorkInProgress/organs/implants.dm
View File

0
code/unused/organs/organs.dm → code/WorkInProgress/organs/organs.dm
View File

26
code/modules/mob/say.dm
View File

@@ -23,23 +23,20 @@
usr.emote(message) usr.emote(message)
/mob/proc/say_dead(var/message) /mob/proc/say_dead(var/message)
var/m_name = src.real_name var/name = src.real_name
if(!m_name) var/alt_name = ""
m_name = src.name
//var/alt_name = ""
//if (istype(src, /mob/living/carbon/human) && src.name != src.real_name) if (istype(src, /mob/living/carbon/human) && src.name != src.real_name)
//var/mob/living/carbon/human/H = src var/mob/living/carbon/human/H = src
//alt_name = " (as [H.get_authentification_name()])" alt_name = " (as [H.get_authentification_name()])"
//else if (istype(src, /mob/dead/observer)) if (!istype(src, /mob/living/carbon/human))
// name = "Ghost" name = src.name
// alt_name = " ([src.real_name])" if (istype(src, /mob/dead/observer))
//else if (!istype(src, /mob/living/carbon/human)) name = "Ghost"
// name = src.name alt_name = " ([src.real_name])"
message = src.say_quote(message) message = src.say_quote(message)
var/rendered = "<span class='game deadsay'><span class='prefix'>DEAD:</span> <span class='name'>[name]</span>[alt_name] <span class='message'>[message]</span></span>"
var/rendered = "<span class='game deadsay'><span class='prefix'>DEAD:</span> <span class='name'>[m_name]</span> <span class='message'>[message]</span></span>"
for (var/mob/M in world) for (var/mob/M in world)
if (istype(M, /mob/new_player)) if (istype(M, /mob/new_player))
@@ -47,6 +44,7 @@
if (M.stat == 2 || (M.client && M.client.holder && M.client.deadchat)) //admins can toggle deadchat on and off. This is a proc in admin.dm and is only give to Administrators and above if (M.stat == 2 || (M.client && M.client.holder && M.client.deadchat)) //admins can toggle deadchat on and off. This is a proc in admin.dm and is only give to Administrators and above
if(M.client && !M.client.STFU_ghosts) //Admin shut-off for ghosts chatter if(M.client && !M.client.STFU_ghosts) //Admin shut-off for ghosts chatter
M.show_message(rendered, 2) M.show_message(rendered, 2)
return
/mob/proc/say_understands(var/mob/other) /mob/proc/say_understands(var/mob/other)
if (src.stat == 2) if (src.stat == 2)

4
tgstation.dme
View File

@@ -135,12 +135,12 @@
#define FILE_DIR "code/unused/hivebot" #define FILE_DIR "code/unused/hivebot"
#define FILE_DIR "code/unused/mining" #define FILE_DIR "code/unused/mining"
#define FILE_DIR "code/unused/optics" #define FILE_DIR "code/unused/optics"
#define FILE_DIR "code/unused/organs"
#define FILE_DIR "code/unused/pda2" #define FILE_DIR "code/unused/pda2"
#define FILE_DIR "code/unused/powerarmor" #define FILE_DIR "code/unused/powerarmor"
#define FILE_DIR "code/unused/spacecraft" #define FILE_DIR "code/unused/spacecraft"
#define FILE_DIR "code/WorkInProgress" #define FILE_DIR "code/WorkInProgress"
#define FILE_DIR "code/WorkInProgress/mapload" #define FILE_DIR "code/WorkInProgress/mapload"
#define FILE_DIR "code/WorkInProgress/organs"
#define FILE_DIR "code/WorkInProgress/virus2" #define FILE_DIR "code/WorkInProgress/virus2"
#define FILE_DIR "html" #define FILE_DIR "html"
#define FILE_DIR "icons" #define FILE_DIR "icons"
@@ -981,6 +981,8 @@
#include "code\WorkInProgress\explosion_particles.dm" #include "code\WorkInProgress\explosion_particles.dm"
#include "code\WorkInProgress\mapload\dmm_suite.dm" #include "code\WorkInProgress\mapload\dmm_suite.dm"
#include "code\WorkInProgress\mapload\reader.dm" #include "code\WorkInProgress\mapload\reader.dm"
#include "code\WorkInProgress\organs\implants.dm"
#include "code\WorkInProgress\organs\organs.dm"
#include "code\WorkInProgress\virus2\analyser.dm" #include "code\WorkInProgress\virus2\analyser.dm"
#include "code\WorkInProgress\virus2\antibodies.dm" #include "code\WorkInProgress\virus2\antibodies.dm"
#include "code\WorkInProgress\virus2\base.dm" #include "code\WorkInProgress\virus2\base.dm"