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

Fix a few bugs with non-crew

Browse Source
This commit is contained in:
TheGreatKitsune
2022-09-21 13:41:56 -05:00
parent 9e4d474b93
commit d6645adb36
6 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -803,7 +803,8 @@ var/global/datum/controller/occupations/job_master
.["msg"] = spawnpos.msg
.["channel"] = spawnpos.announce_channel
else
if(fail_deadly)
var/datum/job/J = SSjob.get_job(rank)
if(fail_deadly || J?.offmap_spawn)
to_chat(C, "<span class='warning'>Your chosen spawnpoint ([spawnpos.display_name]) is unavailable for your chosen job. Please correct your spawn point choice.</span>")
return
to_chat(C, "Your chosen spawnpoint ([spawnpos.display_name]) is unavailable for your chosen job. Spawning you at the Arrivals shuttle instead.")

8
code/modules/client/preferences_spawnpoints.dm
View File

@@ -41,7 +41,7 @@ var/list/spawntypes = list()
/datum/spawnpoint/arrivals
display_name = "Arrivals Shuttle"
msg = "will arrive to the station shortly by shuttle"
disallow_job = list("Non crew") //CHOMPEdit add
disallow_job = list("Non-Crew") //CHOMPEdit add
/datum/spawnpoint/arrivals/New()
..()
@@ -67,7 +67,7 @@ var/list/spawntypes = list()
display_name = "Cryogenic Storage"
msg = "has completed cryogenic revival"
allowed_mob_types = JOB_CARBON
disallow_job = list("Non crew") //CHOMPEdit add
disallow_job = list("Non-Crew") //CHOMPEdit add
/datum/spawnpoint/cryo/New()
..()
@@ -77,7 +77,7 @@ var/list/spawntypes = list()
display_name = "Cyborg Storage"
msg = "has been activated from storage"
allowed_mob_types = JOB_SILICON
disallow_job = list("Non crew") //CHOMPEdit add
disallow_job = list("Non-Crew") //CHOMPEdit add
/datum/spawnpoint/cyborg/New()
..()
@@ -104,7 +104,7 @@ var/global/list/latejoin_tram = list()
/datum/spawnpoint/tram
display_name = "Tram Station"
msg = "will arrive to the station shortly by shuttle"
disallow_job = list("Non crew") //CHOMPEdit add
disallow_job = list("Non-Crew") //CHOMPEdit add
/datum/spawnpoint/tram/New()
..()

2
code/modules/mob/new_player/new_player.dm
View File

@@ -483,7 +483,7 @@
ticker.mode.latespawn(character)
//CHOMPEdit Begin - non-crew join don't get a message
if(rank == "Non crew")
if(rank == "Non-Crew")
log_and_message_admins("has joined the round as non-crew. (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[T.x];Y=[T.y];Z=[T.z]'>JMP</a>)",character)
if(!(J.mob_type & JOB_SILICON))
ticker.minds += character.mind

20
modular_chomp/code/datums/outfits/jobs/noncrew.dm
View File

@@ -1,10 +1,12 @@
/decl/hierarchy/outfit/job/noncrew
hierarchy_type = /decl/hierarchy/outfit/job/noncrew
r_pocket = /obj/item/weapon/spacecash/ewallet
/decl/hierarchy/outfit/noncrew
name = OUTFIT_JOB_NAME("Non-Crew")
//hierarchy_type = /decl/hierarchy/outfit/noncrew
r_pocket = /obj/item/weapon/spacecash/ewallet
flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL|OUTFIT_COMPREHENSIVE_SURVIVAL
/decl/hierarchy/outfit/job/noncrew/post_equip(mob/living/carbon/human/H)
..()
var/obj/item/weapon/spacecash/ewallet/wallet = H.r_store
if(istype(wallet))
wallet.owner_name = H.real_name
wallet.worth = 1000
/decl/hierarchy/outfit/noncrew/post_equip(mob/living/carbon/human/H)
..()
var/obj/item/weapon/spacecash/ewallet/wallet = H.r_store
if(istype(wallet))
wallet.owner_name = H.real_name
wallet.worth = 1000

4
modular_chomp/code/game/jobs/job/noncrew.dm
View File

@@ -1,5 +1,5 @@
/datum/job/noncrew
title = "Non crew"
title = "Non-Crew"
disallow_jobhop = TRUE
total_positions = -1
spawn_positions = 6
@@ -13,7 +13,7 @@
account_allowed = 0
offmap_spawn = TRUE
outfit_type = /decl/hierarchy/outfit/job/noncrew
outfit_type = /decl/hierarchy/outfit/noncrew
job_description = "Not a crew member."
/datum/job/noncrew/is_species_banned(species_name, brain_type)

4
modular_chomp/code/modules/client/preferences_spawnpoints.dm
View File

@@ -1,7 +1,7 @@
/datum/spawnpoint/stationgateway
display_name = "Station gateway"
msg = "has completed translation from station gateway"
disallow_job = list("Non crew")
disallow_job = list("Non-Crew")
/datum/spawnpoint/stationgateway/New()
..()
@@ -23,7 +23,7 @@
/datum/spawnpoint/plainspath
display_name = "Sif plains"
msg = "has checked in at the plains gate"
restrict_job = list("Non crew")
restrict_job = list("Non-Crew")
/datum/spawnpoint/plainspath/New()
..()