cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13289 from Heroman3003/tgui-jobstart-fixes

Browse Source 
Fixes tgui issues and also roundstart job slots getting occupied by nothing when spawning fails
This commit is contained in:
Casey
2022-07-07 20:14:43 -04:00
committed by CHOMPStation2
parent ef3e059335
commit 090aa3dc3b
6 changed files with 31 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
code/controllers/subsystems/ticker.dm
View File

@@ -50,9 +50,9 @@ var/global/datum/controller/subsystem/ticker/ticker
pregame_timeleft = config.pregame_time
send2mainirc("Server lobby is loaded and open at byond://[config.serverurl ? config.serverurl : (config.server ? config.server : "[world.address]:[world.port]")]")
SSwebhooks.send(
WEBHOOK_ROUNDPREP,
WEBHOOK_ROUNDPREP,
list(
"map" = station_name(),
"map" = station_name(),
"url" = get_world_url()
)
)
@@ -397,14 +397,19 @@ var/global/datum/controller/subsystem/ticker/ticker
if(player && player.ready && player.mind?.assigned_role)
var/datum/job/J = SSjob.get_job(player.mind.assigned_role)
// Ask their new_player mob to spawn them
if(!player.spawn_checks_vr(player.mind.assigned_role))
var/datum/job/job_datum = job_master.GetJob(J.title)
job_datum.current_positions--
player.mind.assigned_role = null
continue //VOREStation Add
// Snowflakey AI treatment
if(J?.mob_type & JOB_SILICON_AI)
player.close_spawn_windows()
player.AIize(move = TRUE)
continue
// Ask their new_player mob to spawn them
if(!player.spawn_checks_vr(player.mind.assigned_role)) continue //VOREStation Add
var/mob/living/carbon/human/new_char = player.create_character()
// Created their playable character, delete their /mob/new_player