Merge pull request #2253 from Markolie/darkness

Make darkness clickable
This commit is contained in:
Fox McCloud
2015-10-01 17:11:31 -04:00
13 changed files with 68 additions and 18 deletions
+2 -1
View File
@@ -47,7 +47,8 @@
preload_rsc = 1 // This is 0 so we can set it to an URL once the player logs in and have them download the resources from a different server.
var/global/obj/screen/click_catcher/void
var/karma = 0
var/karma_spent = 0
var/karma_tab = 0
+5
View File
@@ -292,6 +292,11 @@
convert_notes_sql(ckey)
send_resources()
if(!void)
void = new()
screen += void
//////////////
//DISCONNECT//
@@ -80,7 +80,8 @@
/mob/living/simple_animal/Login()
if(src && src.client)
src.client.screen = null
src.client.screen = list()
client.screen += client.void
..()
/mob/living/simple_animal/updatehealth()
+7 -4
View File
@@ -29,7 +29,7 @@
world.update_status()
client.images = null //remove the images such as AIs being unable to see runes
client.screen = null //remove hud items just in case
client.screen = list() //remove hud items just in case
if(hud_used) del(hud_used) //remove the hud objects
hud_used = new /datum/hud(src)
@@ -46,9 +46,9 @@
if(ckey in deadmins)
verbs += /client/proc/readmin
//Clear ability list and update from mob.
verbs += /client/proc/readmin
//Clear ability list and update from mob.
client.verbs -= ability_verbs
if(abilities)
@@ -58,6 +58,9 @@
var/mob/living/carbon/human/H = src
if(H.species && H.species.abilities)
client.verbs |= H.species.abilities
client.screen += client.void
CallHook("Login", list("client" = src.client, "mob" = src))
+2 -1
View File
@@ -667,12 +667,13 @@ var/list/slot_equipment_priority = list( \
log_game("[key_name(usr)] has respawned.")
usr << "\blue <B>Make sure to play a different character, and please roleplay correctly!</B>"
usr << "<span class='boldnotice'>Make sure to play a different character, and please roleplay correctly!</span>"
if(!client)
log_game("[key_name(usr)] respawn failed due to disconnect.")
return
client.screen.Cut()
client.screen += client.void
if(!client)
log_game("[key_name(usr)] respawn failed due to disconnect.")