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

Attempts to make it possible to vore belly spawn without an annoucement

Browse Source
This commit is contained in:
lbnesquik
2021-08-07 06:52:13 +02:00
parent e5bbed59f1
commit 83b7b4c75d
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/game/jobs/job_controller.dm
View File

@@ -687,6 +687,9 @@ var/global/datum/controller/occupations/job_master
var/backup = alert(C, "Do you want a mind backup?", "Confirm", "Yes", "No") var/backup = alert(C, "Do you want a mind backup?", "Confirm", "Yes", "No")
if(backup == "Yes") if(backup == "Yes")
backup = 1 backup = 1
var/announcement = alert(C, "Do you want your arrival to be announced?", "Confirm", "Yes", "No")
if(announcement == "Yes")
announcement = 1
vore_spawn_gut = input(C, "Choose a Belly.", "Belly Spawnpoint") as null|anything in available_bellies vore_spawn_gut = input(C, "Choose a Belly.", "Belly Spawnpoint") as null|anything in available_bellies
if(!vore_spawn_gut) if(!vore_spawn_gut)
return return
@@ -737,6 +740,7 @@ var/global/datum/controller/occupations/job_master
if(spawnpos && istype(spawnpos) && spawnpos.turfs.len) if(spawnpos && istype(spawnpos) && spawnpos.turfs.len)
if(spawnpos.check_job_spawning(rank)) if(spawnpos.check_job_spawning(rank))
.["turf"] = spawnpos.get_spawn_position() .["turf"] = spawnpos.get_spawn_position()
if(announcement)
.["msg"] = spawnpos.msg .["msg"] = spawnpos.msg
.["channel"] = spawnpos.announce_channel .["channel"] = spawnpos.announce_channel
else else
@@ -746,10 +750,12 @@ var/global/datum/controller/occupations/job_master
to_chat(C, "Your chosen spawnpoint ([spawnpos.display_name]) is unavailable for your chosen job. Spawning you at the Arrivals shuttle instead.") to_chat(C, "Your chosen spawnpoint ([spawnpos.display_name]) is unavailable for your chosen job. Spawning you at the Arrivals shuttle instead.")
var/spawning = pick(latejoin) var/spawning = pick(latejoin)
.["turf"] = get_turf(spawning) .["turf"] = get_turf(spawning)
if(announcement)
.["msg"] = "will arrive at the station shortly" .["msg"] = "will arrive at the station shortly"
else if(!fail_deadly) else if(!fail_deadly)
var/spawning = pick(latejoin) var/spawning = pick(latejoin)
.["turf"] = get_turf(spawning) .["turf"] = get_turf(spawning)
if(announcement)
.["msg"] = "has arrived on the station" .["msg"] = "has arrived on the station"
/datum/controller/occupations/proc/m_backup_client(var/client/C) //Same as m_backup, but takes a client entry. Used for vore late joining. /datum/controller/occupations/proc/m_backup_client(var/client/C) //Same as m_backup, but takes a client entry. Used for vore late joining.