mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-22 03:27:05 +01:00
- Removed the 'midis' variable from mobs. This one's supposed to be a client thing, so it's now a client side var instead of being doubled in mobs.
- Made ooccolor, be_pai, be_alien, midis and ghost_ears actually properly copy over from the preferences when observing! Incredible, isn't it? git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3087 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -2,9 +2,6 @@
|
||||
log_access("Login: [key_name(src)] from [src.client.address ? src.client.address : "localhost"]")
|
||||
src.lastKnownIP = src.client.address
|
||||
src.computer_id = src.client.computer_id
|
||||
if(!src.client.midis || !src.midis)
|
||||
src.client.midis = 0
|
||||
src.midis = 0
|
||||
if (config.log_access)
|
||||
for (var/mob/M in world)
|
||||
if(M == src)
|
||||
|
||||
@@ -58,7 +58,7 @@
|
||||
I'll make some notes on where certain variable defines should probably go.
|
||||
Changing this around would probably require a good look-over the pre-existing code.
|
||||
*/
|
||||
var/midis = 1 //Check if midis should be played for someone
|
||||
//var/midis = 1 //Check if midis should be played for someone - no, this is something that is tied to clients, not mobs.
|
||||
var/alien_egg_flag = 0//Have you been infected?
|
||||
var/last_special = 0
|
||||
var/obj/screen/zone_sel/zone_sel = null
|
||||
|
||||
@@ -208,6 +208,8 @@
|
||||
observer.real_name = observer.name
|
||||
observer.original_name = observer.name //Original name is only used in ghost chat! It is not to be edited by anything!
|
||||
|
||||
preferences.copy_to_observer(observer)
|
||||
|
||||
del(src)
|
||||
return 1
|
||||
|
||||
|
||||
@@ -523,7 +523,7 @@ datum/preferences
|
||||
UI = UI_OLD
|
||||
|
||||
if(link_tags["midis"])
|
||||
midis = (midis+1)%2
|
||||
midis = !midis
|
||||
|
||||
if(link_tags["ghost_ears"])
|
||||
ghost_ears = !ghost_ears
|
||||
@@ -637,11 +637,21 @@ datum/preferences
|
||||
if(!safety)//To prevent run-time errors due to null datum when using randomize_appearance_for()
|
||||
spawn(10)
|
||||
if(character&&character.client)
|
||||
character.client.midis = midis
|
||||
character.client.ooccolor = ooccolor
|
||||
character.client.be_alien = be_special&BE_ALIEN
|
||||
character.client.be_pai = be_special&BE_PAI
|
||||
character.client.ghost_ears = ghost_ears
|
||||
setup_client(character.client)
|
||||
|
||||
proc/copy_to_observer(mob/dead/observer/character)
|
||||
spawn(10)
|
||||
if(character && character.client)
|
||||
setup_client(character.client)
|
||||
|
||||
proc/setup_client(var/client/C)
|
||||
if(C)
|
||||
C.midis = src.midis
|
||||
C.ooccolor = src.ooccolor
|
||||
C.be_alien = be_special & BE_ALIEN
|
||||
C.be_pai = be_special & BE_PAI
|
||||
C.ghost_ears = src.ghost_ears
|
||||
|
||||
|
||||
#undef UI_OLD
|
||||
#undef UI_NEW
|
||||
Reference in New Issue
Block a user