Minor refactors (#26305)

obj/on_log changed to atom/on_log. Boolean parameter in
No admin irc message now checked in client/Del instead of mob/Logout
Removed an empty New()
1 -> TRUE
removed a potential crash in mob/Login
This commit is contained in:
Cyberboss
2017-04-23 09:52:47 +12:00
committed by oranges
parent ae8b22c49e
commit b9c54f517f
8 changed files with 34 additions and 47 deletions
+4
View File
@@ -500,6 +500,10 @@ GLOBAL_LIST_EMPTY(blood_splatter_icons)
/atom/proc/mech_melee_attack(obj/mecha/M)
return
//If a mob logouts/logins in side of an object you can use this proc
/atom/proc/on_log(login)
if(loc)
loc.on_log(login)
/*
-8
View File
@@ -165,14 +165,6 @@
/obj/proc/hide(h)
return
//If a mob logouts/logins in side of an object you can use this proc
/obj/proc/on_log()
..()
if(isobj(loc))
var/obj/Loc=loc
Loc.on_log()
/obj/singularity_pull(S, current_size)
if(!anchored || current_size >= STAGE_FIVE)
step_towards(src,S)
+2 -4
View File
@@ -24,9 +24,6 @@
var/locked = 0
var/opendir = SOUTH
/obj/structure/bodycontainer/New()
..()
/obj/structure/bodycontainer/Destroy()
open()
if(connected)
@@ -34,7 +31,8 @@
connected = null
return ..()
/obj/structure/bodycontainer/on_log()
/obj/structure/bodycontainer/on_log(login)
..()
update_icon()
/obj/structure/bodycontainer/update_icon()
+19
View File
@@ -340,6 +340,25 @@ GLOBAL_LIST(external_rsc_urls)
adminGreet(1)
holder.owner = null
GLOB.admins -= src
if (!GLOB.admins.len && SSticker.current_state == GAME_STATE_PLAYING) //Only report this stuff if we are currently playing.
if(!GLOB.admins.len) //Apparently the admin logging out is no longer an admin at this point, so we have to check this towards 0 and not towards 1. Awell.
var/cheesy_message = pick(
"I have no admins online!",\
"I'm all alone :(",\
"I'm feeling lonely :(",\
"I'm so lonely :(",\
"Why does nobody love me? :(",\
"I want a man :(",\
"Where has everyone gone?",\
"I need a hug :(",\
"Someone come hold me :(",\
"I need someone on me :(",\
"What happened? Where has everyone gone?",\
"Forever alone :("\
)
send2irc("Server", "[cheesy_message] (No admins online)")
GLOB.ahelp_tickets.ClientLogout(src)
GLOB.directory -= ckey
+1 -1
View File
@@ -5,7 +5,7 @@
mind.show_memory(src, 0)
//Round specific stuff
if(SSticker && SSticker.mode)
if(SSticker.mode)
switch(SSticker.mode.name)
if("sandbox")
CanBuild()
+1 -1
View File
@@ -1,5 +1,5 @@
/mob/living/silicon/Login()
if(mind && SSticker && SSticker.mode)
if(mind && SSticker.mode)
SSticker.mode.remove_cultist(mind, 0, 0)
SSticker.mode.remove_revolutionary(mind, 0)
SSticker.mode.remove_gangster(mind, remove_bosses=1)
+4 -6
View File
@@ -15,13 +15,11 @@
next_move = 1
..()
if (key != client.key)
key = client.key
reset_perspective(loc)
if(isobj(loc))
var/obj/Loc=loc
Loc.on_log()
if(loc)
loc.on_log(TRUE)
//readd this mob's HUDs (antag, med, etc)
reload_huds()
@@ -47,4 +45,4 @@
if(client)
client.click_intercept = null
client.view = world.view // Resets the client.view in case it was changed.
client.view = world.view // Resets the client.view in case it was changed.
+3 -27
View File
@@ -2,34 +2,10 @@
SStgui.on_logout(src)
unset_machine()
GLOB.player_list -= src
if(GLOB.admin_datums[src.ckey])
if (SSticker && SSticker.current_state == GAME_STATE_PLAYING) //Only report this stuff if we are currently playing.
var/admins_number = GLOB.admins.len
if(admins_number == 0) //Apparently the admin logging out is no longer an admin at this point, so we have to check this towards 0 and not towards 1. Awell.
var/cheesy_message = pick( list( \
"I have no admins online!",\
"I'm all alone :(",\
"I'm feeling lonely :(",\
"I'm so lonely :(",\
"Why does nobody love me? :(",\
"I want a man :(",\
"Where has everyone gone?",\
"I need a hug :(",\
"Someone come hold me :(",\
"I need someone on me :(",\
"What happened? Where has everyone gone?",\
"Forever alone :("\
) )
if(cheesy_message)
cheesy_message += " (No admins online)"
send2irc("Server", "[cheesy_message]")
..()
if(isobj(loc))
var/obj/Loc=loc
Loc.on_log()
if(loc)
loc.on_log(FALSE)
return 1
return TRUE