cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 20:16:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removes unused latejoin spawners (#17623)

Browse Source 
* Bye bye latejoin spawners

* Empty lists

* All done
This commit is contained in:
GuiltyNeko
2022-04-30 16:14:07 +01:00
committed by GitHub
parent e6aede6f6a
commit 856eec713f
7 changed files with 6 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference/character.dm
+1 -2
View File
@@ -7,7 +7,6 @@
var/be_random_name = FALSE //whether we are a random name every round
var/gender = MALE //gender of character (well duh)
var/age = 30 //age of character
var/spawnpoint = "Arrivals Shuttle" //where this character will spawn (0-2).
var/b_type = "A+" //blood type (not-chooseable)
var/underwear = "Nude" //underwear type
var/undershirt = "Nude" //undershirt type
@@ -862,7 +861,7 @@
icon_state = "[coloured_tail]_s"
else
icon_state = "[current_species.tail]_s"
if(icon)
var/icon/temp = new(icon, icon_state)
if(current_species.bodyflags & HAS_SKIN_COLOR)
code/modules/client/preference/preferences_spawnpoints.dm
-37
View File
@@ -10,17 +10,6 @@ GLOBAL_LIST_EMPTY(spawntypes)
var/msg //Message to display on the arrivals computer.
var/list/turfs //List of turfs to spawn on.
var/display_name //Name used in preference setup.
var/list/restrict_job = null
var/list/disallow_job = null
/datum/spawnpoint/proc/check_job_spawning(job)
if(restrict_job && !(job in restrict_job))
return 0
if(disallow_job && (job in disallow_job))
return 0
return 1
/datum/spawnpoint/arrivals
display_name = "Arrivals Shuttle"
@@ -29,29 +18,3 @@ GLOBAL_LIST_EMPTY(spawntypes)
/datum/spawnpoint/arrivals/New()
..()
turfs = GLOB.latejoin
/datum/spawnpoint/gateway
display_name = "Gateway"
msg = "has completed translation from offsite gateway"
/datum/spawnpoint/gateway/New()
..()
turfs = GLOB.latejoin_gateway
/datum/spawnpoint/cryo
display_name = "Cryogenic Storage"
msg = "has completed cryogenic revival"
disallow_job = list("Cyborg")
/datum/spawnpoint/cryo/New()
..()
turfs = GLOB.latejoin_cryo
/datum/spawnpoint/cyborg
display_name = "Cyborg Storage"
msg = "has been activated from storage"
restrict_job = list("Cyborg")
/datum/spawnpoint/cyborg/New()
..()
turfs = GLOB.latejoin_cyborg
code/modules/mob/new_player/new_player.dm
+4 -16
View File
@@ -242,7 +242,7 @@
to_chat(src, alert("You are currently not whitelisted to play [client.prefs.active_character.species]."))
return FALSE
AttemptLateSpawn(href_list["SelectedJob"],client.prefs.active_character.spawnpoint)
AttemptLateSpawn(href_list["SelectedJob"])
return
if(!ready && href_list["preference"])
@@ -302,7 +302,7 @@
else
return 0
/mob/new_player/proc/AttemptLateSpawn(rank, spawning_at)
/mob/new_player/proc/AttemptLateSpawn(rank)
if(src != usr)
return 0
if(!SSticker || SSticker.current_state != GAME_STATE_PLAYING)
@@ -338,7 +338,6 @@
//Find our spawning point.
var/join_message
var/datum/spawnpoint/S
if(IsAdminJob(rank))
if(IsERTSpawnJob(rank))
@@ -349,19 +348,8 @@
character.forceMove(pick(GLOB.aroomwarp))
join_message = "has arrived"
else
if(spawning_at)
S = GLOB.spawntypes[spawning_at]
if(S && istype(S))
if(S.check_job_spawning(rank))
character.forceMove(pick(S.turfs))
join_message = S.msg
else
to_chat(character, "Your chosen spawnpoint ([S.display_name]) is unavailable for your chosen job. Spawning you at the Arrivals shuttle instead.")
character.forceMove(pick(GLOB.latejoin))
join_message = "has arrived on the station"
else
character.forceMove(pick(GLOB.latejoin))
join_message = "has arrived on the station"
character.forceMove(pick(GLOB.latejoin))
join_message = "has arrived on the station"
character.lastarea = get_area(loc)
// Moving wheelchair if they have one