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

Make the station gateway work :p

Browse Source
This commit is contained in:
cadyn
2020-11-21 13:24:49 -08:00
parent fd064a92c5
commit ca04b0ef72
6 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/game/objects/effects/landmarks.dm
View File

@@ -31,6 +31,12 @@
latejoin_gateway += loc latejoin_gateway += loc
delete_me = 1 delete_me = 1
return return
//CHOMPEdit Begin
if("JoinLateStationGateway")
latejoin_gatewaystation += loc
delete_me = 1
return
//CHOMPEdit End
if("JoinLateElevator") if("JoinLateElevator")
latejoin_elevator += loc latejoin_elevator += loc
delete_me = 1 delete_me = 1

3
code/global_ch.dm
View File

@@ -1,4 +1,5 @@
var/list/shell_module_blacklist = list( var/list/shell_module_blacklist = list(
"Sci-borg", "Research" "Sci-borg", "Research"
) )
var/list/latejoin_gatewaystation = list()

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

@@ -31,7 +31,7 @@ var/list/spawntypes = list()
if(!(J.mob_type & allowed_mob_types)) if(!(J.mob_type & allowed_mob_types))
return 0 return 0
return 1 return 1
/datum/spawnpoint/proc/get_spawn_position() /datum/spawnpoint/proc/get_spawn_position()
@@ -77,15 +77,4 @@ var/list/spawntypes = list()
/datum/spawnpoint/cyborg/New() /datum/spawnpoint/cyborg/New()
..() ..()
turfs = latejoin_cyborg turfs = latejoin_cyborg
//KSC test
/*
/datum/spawnpoint/stationgateway
display_name = "Station gateway"
msg = "has completed translation from station gateway"
/datum/spawnpoint/stationgateway/New()
..()
turfs = latejoin_stationgateway
*/

7
code/modules/client/preferences_spawnpoints_ch.dm Normal file
View File

@@ -0,0 +1,7 @@
/datum/spawnpoint/stationgateway
display_name = "Station gateway"
msg = "has completed translation from station gateway"
/datum/spawnpoint/stationgateway/New()
..()
turfs = latejoin_gatewaystation

2
maps/southern_cross/southern_cross_defines.dm
View File

@@ -84,7 +84,7 @@
NETWORK_SUPPLY NETWORK_SUPPLY
) )
usable_email_tlds = list("freemail.nt") usable_email_tlds = list("freemail.nt")
allowed_spawns = list("Arrivals Shuttle","Gateway", "Cryogenic Storage", "Cyborg Storage") allowed_spawns = list("Arrivals Shuttle","Gateway", "Cryogenic Storage", "Cyborg Storage", "Station gateway")
default_skybox = /datum/skybox_settings/southern_cross default_skybox = /datum/skybox_settings/southern_cross
unit_test_exempt_areas = list(/area/ninja_dojo, /area/shuttle/ninja) unit_test_exempt_areas = list(/area/ninja_dojo, /area/shuttle/ninja)
unit_test_exempt_from_atmos = list(/area/tcomm/chamber) unit_test_exempt_from_atmos = list(/area/tcomm/chamber)

1
vorestation.dme
View File

@@ -1862,6 +1862,7 @@
#include "code\modules\client\preferences_factions.dm" #include "code\modules\client\preferences_factions.dm"
#include "code\modules\client\preferences_savefile.dm" #include "code\modules\client\preferences_savefile.dm"
#include "code\modules\client\preferences_spawnpoints.dm" #include "code\modules\client\preferences_spawnpoints.dm"
#include "code\modules\client\preferences_spawnpoints_ch.dm"
#include "code\modules\client\preferences_toggle_procs.dm" #include "code\modules\client\preferences_toggle_procs.dm"
#include "code\modules\client\preferences_vr.dm" #include "code\modules\client\preferences_vr.dm"
#include "code\modules\client\preferences_yw.dm" #include "code\modules\client\preferences_yw.dm"