cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-24 05:38:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #884 from Kazzc/SC-MapUpdate

Browse Source 
Civilian sector overhaul.
This commit is contained in:
cadyn
2020-11-22 01:08:56 -08:00
committed by GitHub
parent 254d4b7bf9 f68b35c9ad
commit 425ce61041
9 changed files with 554 additions and 518 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/landmarks.dm
+6
View File
@@ -31,6 +31,12 @@
latejoin_gateway += loc
delete_me = 1
return
//CHOMPEdit Begin
if("JoinLateStationGateway")
latejoin_gatewaystation += loc
delete_me = 1
return
//CHOMPEdit End
if("JoinLateElevator")
latejoin_elevator += loc
delete_me = 1
code/global_ch.dm
+2 -1
View File
@@ -1,4 +1,5 @@
var/list/shell_module_blacklist = list(
"Sci-borg", "Research"
)
)
var/list/latejoin_gatewaystation = list()
code/modules/client/preferences_spawnpoints_ch.dm
+7
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
icons/obj/items.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 66 KiB

After

Width:  |  Height:  |  Size: 66 KiB

maps/southern_cross/southern_cross-2.dmm
+345 -363
View File
File diff suppressed because it is too large Load Diff
maps/southern_cross/southern_cross-3.dmm
+173 -141
View File
File diff suppressed because it is too large Load Diff
maps/southern_cross/southern_cross-8.dmm
+1 -1
View File
@@ -2342,7 +2342,7 @@ vFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivF
vFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFi
vFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFi
vFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFi
vFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFi
vFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFinZCnZCnZCnZCnZCnZCnZCnZCnZCvFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFi
vFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFinZCcrVizUvHCvHCvHCizUbLsnZCvFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFi
vFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFinZCrOyizUvHCvHCvHCizUkSGnZCvFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFi
vFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFinZCnZCnZCvHCvHCvHCnZCnZCnZCvFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFivFi
maps/southern_cross/southern_cross_areas.dm
+19 -11
View File
@@ -185,7 +185,7 @@
/area/surface/outpost/mining_main/gen_room
name = "North Mining Generator Room"
icon_state = "substation"
ambience = AMBIENCE_SUBSTATION //CHOMP Addition
ambience = AMBIENCE_SUBSTATION //CHOMP Addition
/area/surface/outpost/mining_main/emergencystorage
name = "\improper North Mining Emergency Storage"
@@ -220,7 +220,7 @@
name = "\improper Xenoresearch SMES Maintenance"
icon_state = "substation"
sound_env = SMALL_ENCLOSED
ambience = AMBIENCE_SUBSTATION //CHOMP Addition
ambience = AMBIENCE_SUBSTATION //CHOMP Addition
/area/surface/outpost/research/xenoresearch/emergencystorage
name = "\improper Xenoresearch Emergency Storage"
@@ -261,7 +261,7 @@
name = "\improper Xenoarcheology SMES Maintenance"
icon_state = "substation"
sound_env = SMALL_ENCLOSED
ambience = AMBIENCE_SUBSTATION //CHOMP Addition
ambience = AMBIENCE_SUBSTATION //CHOMP Addition
/area/surface/outpost/research/xenoarcheology/emergencystorage
name = "\improper Xenoarcheology Emergency Storage"
@@ -323,7 +323,7 @@
/area/surface/outpost/main/gen_room/smes
name = "\improper Main Outpost Dorm SMES"
icon_state = "substation"
icon_state = "substation"
/area/surface/outpost/main/pool
name = "\improper Main Outpost Pool"
@@ -879,7 +879,7 @@
/area/maintenance/substation/atmospherics
name = "Atmospherics Substation"
ambience = AMBIENCE_SUBSTATION //CHOMP Addition
ambience = AMBIENCE_SUBSTATION //CHOMP Addition
/area/maintenance/emergencyeva
name = "\improper Emergency EVA Maintenance"
@@ -887,7 +887,7 @@
/area/maintenance/substation/central // n/a
name = "Central Substation"
ambience = AMBIENCE_SUBSTATION //CHOMP Addition
ambience = AMBIENCE_SUBSTATION //CHOMP Addition
//CHOMPStation Edit Start TFF 6/2/20 - Added substation
@@ -895,7 +895,7 @@
name = "Substation"
icon_state = "substation"
sound_env = SMALL_ENCLOSED
ambience = AMBIENCE_SUBSTATION //CHOMP Addition
ambience = AMBIENCE_SUBSTATION //CHOMP Addition
//CHOMPStation Edit End
@@ -1178,12 +1178,20 @@ area/crew_quarters/heads/sc/hop/quarters
name = "\improper Third Deck Starboard Hallway"
icon_state = "hallS"
//CHOMPStation Edit Start TFF 6/2/20 KC - Added new hallway for dorms.
//CHOMPStation Edit Start TFF 6/2/20 KC - Added new hallway for dorms. 11/20/20 KC - Added more areas for gateway and halls.
/area/hallway/primary/thirddeck/aftcentral
name = "\improper Third Deck Central Aft Hallway"
/area/hallway/primary/thirddeck/aftportcentral
name = "\improper Third Deck Central Aft Port Hallway"
icon_state = "hallC"
/area/hallway/primary/thirddeck/aftstarboardcentral
name = "\improper Third Deck Central Aft Starboard Hallway"
icon_state = "hallC"
/area/hallway/primary/thirddeck/stationgateway
name = "\improper Third Deck Central Gateway"
icon_state = "teleporter"
/area/hallway/primary/thirddeck/aft
name = "\improper Third Deck Aft Hallway"
icon_state = "hallA"
@@ -1717,7 +1725,7 @@ area/crew_quarters/heads/sc/hop/quarters
/area/surface/outpost/fishing/smes
name = "\improper Fishing SMES Maintenance"
icon_state = "substation"
ambience = AMBIENCE_SUBSTATION //CHOMP Addition
ambience = AMBIENCE_SUBSTATION //CHOMP Addition
//Shuttle 3 CHOMPedit
maps/southern_cross/southern_cross_defines.dm
+1 -1
View File
@@ -84,7 +84,7 @@
NETWORK_SUPPLY
)
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
unit_test_exempt_areas = list(/area/ninja_dojo, /area/shuttle/ninja)
unit_test_exempt_from_atmos = list(/area/tcomm/chamber)