-Fixed an issue where you would compare your name with yourself to see if it was available.

-Fixed an issue with the Upgrade Camera malf module.
-Fixed an issue with HTML codes in whisper.
-Ghost ears and eyes default to 0.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4700 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
giacomand@gmail.com
2012-09-16 05:43:27 +00:00
parent d85e161c4d
commit 33c738de3e
4 changed files with 7 additions and 5 deletions

View File

@@ -311,6 +311,8 @@ Turf and target are seperate in case you want to teleport some distance from a t
newname = reject_bad_name(newname,allow_numbers) //returns null if the name doesn't meet some basic requirements. Tidies up a few other things like bad-characters. newname = reject_bad_name(newname,allow_numbers) //returns null if the name doesn't meet some basic requirements. Tidies up a few other things like bad-characters.
for(var/mob/living/M in player_list) for(var/mob/living/M in player_list)
if(M == src)
continue
if(!newname || M.real_name == newname) if(!newname || M.real_name == newname)
newname = null newname = null
break break

View File

@@ -167,11 +167,11 @@ rcd light flash thingy on matter drain
C.upgradeMotion() C.upgradeMotion()
upgraded = 1 upgraded = 1
// Add it to machines that process // Add it to machines that process
machines |= src machines |= C
if(upgraded) if(upgraded)
UC.uses -- UC.uses --
C.visible_message("<span class='notice'>\icon[src] *beep*</span>") C.visible_message("<span class='notice'>\icon[C] *beep*</span>")
usr << "Camera successully upgraded!" usr << "Camera successully upgraded!"
else else
usr << "This camera is already upgraded!" usr << "This camera is already upgraded!"

View File

@@ -1,6 +1,6 @@
//Lallander was here //Lallander was here
/mob/living/carbon/human/whisper(message as text) /mob/living/carbon/human/whisper(message as text)
message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN)) message = trim(copytext(strip_html_simple(message), 1, MAX_MESSAGE_LEN))
if (!message || silent || miming) if (!message || silent || miming)
return return

View File

@@ -401,7 +401,7 @@ var/list/slot_equipment_priority = list( \
src << browse('html/changelog.html', "window=changes;size=675x650") src << browse('html/changelog.html', "window=changes;size=675x650")
client.changes = 1 client.changes = 1
/client/var/ghost_ears = 1 /client/var/ghost_ears = 0
/client/verb/toggle_ghost_ears() /client/verb/toggle_ghost_ears()
set name = "Ghost ears" set name = "Ghost ears"
set category = "OOC" set category = "OOC"
@@ -412,7 +412,7 @@ var/list/slot_equipment_priority = list( \
else else
usr << "\blue Now you hear speech only from nearest creatures." usr << "\blue Now you hear speech only from nearest creatures."
/client/var/ghost_sight = 1 /client/var/ghost_sight = 0
/client/verb/toggle_ghost_sight() /client/verb/toggle_ghost_sight()
set name = "Ghost sight" set name = "Ghost sight"
set category = "OOC" set category = "OOC"