mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-26 14:31:59 +01:00
Merge branch 'master' into prepare_stuff_for_second_week
This commit is contained in:
@@ -19,6 +19,7 @@
|
||||
|
||||
using = new /obj/screen/new_player/selection/join_game(src)
|
||||
using.name = "Join Game"
|
||||
using.hud = src
|
||||
adding += using
|
||||
|
||||
using = new /obj/screen/new_player/selection/settings(src)
|
||||
|
||||
@@ -380,7 +380,7 @@ INITIALIZE_IMMEDIATE(/mob/abstract/new_player)
|
||||
SSrecords.open_manifest_vueui(src)
|
||||
|
||||
/mob/abstract/new_player/Move()
|
||||
return 0
|
||||
return TRUE
|
||||
|
||||
/mob/abstract/new_player/proc/close_spawn_windows()
|
||||
src << browse(null, "window=playersetup") //closes the player setup window
|
||||
|
||||
@@ -62,7 +62,7 @@
|
||||
|
||||
src.custom_emote(VISIBLE_MESSAGE, "politely beeps as its lights start to flash.")
|
||||
spark(src, 5, alldirs)
|
||||
addtimer(CALLBACK(GLOBAL_PROC, .proc/qdel, src), 10, TIMER_CLIENT_TIME)
|
||||
QDEL_IN(src, 10)
|
||||
animate(src, alpha = 0, time = 9, easing = QUAD_EASING)
|
||||
|
||||
if(key)
|
||||
|
||||
Reference in New Issue
Block a user