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

Neerti is Satan, updates map. Updates files.

Browse Source
This commit is contained in:
Woodrat
2015-07-07 20:31:00 -07:00
parent 8f7f145b6c
commit c5b30257f7
8 changed files with 11041 additions and 9759 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/__defines/machinery.dm
View File

@@ -35,6 +35,9 @@ var/list/restricted_camera_networks = list("thunder","ERT","NUKE","Secret")
// Camera networks
#define NETWORK_CRESCENT "Crescent"
#define NETWORK_CAFE_DOCK "Cafe Dock"
#define NETWORK_CARGO "Cargo"
#define NETWORK_CIVILIAN "Civilian"
#define NETWORK_CIVILIAN_EAST "Civilian East"
#define NETWORK_CIVILIAN_WEST "Civilian West"
#define NETWORK_COMMAND "Command"

32
code/controllers/shuttle_controller.dm
View File

@@ -89,7 +89,19 @@ var/global/datum/shuttle_controller/shuttle_controller
process_shuttles += shuttle
shuttles["Escape Pod 3"] = shuttle
//There is no pod 4, apparently.
shuttle = new/datum/shuttle/ferry/escape_pod()
shuttle.location = 0
shuttle.warmup_time = 0
shuttle.area_station = locate(/area/shuttle/escape_pod4/station)
shuttle.area_offsite = locate(/area/shuttle/escape_pod4/centcom)
shuttle.area_transition = locate(/area/shuttle/escape_pod4/transit)
shuttle.docking_controller_tag = "escape_pod_4"
shuttle.dock_target_station = "escape_pod_4_berth"
shuttle.dock_target_offsite = "escape_pod_4_recovery"
shuttle.transit_direction = EAST //should this be WEST? I have no idea.
shuttle.move_time = SHUTTLE_TRANSIT_DURATION_RETURN + rand(-30, 60) //randomize this so it seems like the pods are being picked up one by one
process_shuttles += shuttle
shuttles["Escape Pod 4"] = shuttle
shuttle = new/datum/shuttle/ferry/escape_pod()
shuttle.location = 0
@@ -105,13 +117,29 @@ var/global/datum/shuttle_controller/shuttle_controller
process_shuttles += shuttle
shuttles["Escape Pod 5"] = shuttle
shuttle = new/datum/shuttle/ferry/escape_pod()
shuttle.location = 0
shuttle.warmup_time = 0
shuttle.area_station = locate(/area/shuttle/escape_pod6/station)
shuttle.area_offsite = locate(/area/shuttle/escape_pod6/centcom)
shuttle.area_transition = locate(/area/shuttle/escape_pod6/transit)
shuttle.docking_controller_tag = "escape_pod_6"
shuttle.dock_target_station = "escape_pod_6_berth"
shuttle.dock_target_offsite = "escape_pod_6_recovery"
shuttle.transit_direction = EAST //should this be WEST? I have no idea.
shuttle.move_time = SHUTTLE_TRANSIT_DURATION_RETURN + rand(-30, 60) //randomize this so it seems like the pods are being picked up one by one
process_shuttles += shuttle
shuttles["Escape Pod 6"] = shuttle
//give the emergency shuttle controller it's shuttles
emergency_shuttle.shuttle = shuttles["Escape"]
emergency_shuttle.escape_pods = list(
shuttles["Escape Pod 1"],
shuttles["Escape Pod 2"],
shuttles["Escape Pod 3"],
shuttles["Escape Pod 4"],
shuttles["Escape Pod 5"],
shuttles["Escape Pod 6"],
)
// Supply shuttle
@@ -173,7 +201,7 @@ var/global/datum/shuttle_controller/shuttle_controller
shuttle.area_station = locate(/area/shuttle/mining/station)
shuttle.docking_controller_tag = "mining_shuttle"
shuttle.dock_target_station = "mining_dock_airlock"
shuttle.dock_target_offsite = "mdock_control"
shuttle.dock_target_offsite = "mining_outpost_airlock"
shuttles["Mining"] = shuttle
process_shuttles += shuttle

54
code/game/area/Space Station 13 areas.dm
View File

@@ -208,7 +208,20 @@ area/space/atmosalert()
/area/shuttle/escape_pod3/transit
icon_state = "shuttle"
/area/shuttle/escape_pod5 //Pod 4 was lost to meteors
/area/shuttle/escape_pod4
name = "\improper Escape Pod Four"
music = "music/escape.ogg"
/area/shuttle/escape_pod4/station
icon_state = "shuttle2"
/area/shuttle/escape_pod4/centcom
icon_state = "shuttle"
/area/shuttle/escape_pod4/transit
icon_state = "shuttle"
/area/shuttle/escape_pod5
name = "\improper Escape Pod Five"
music = "music/escape.ogg"
@@ -221,6 +234,45 @@ area/space/atmosalert()
/area/shuttle/escape_pod5/transit
icon_state = "shuttle"
/area/shuttle/escape_pod6
name = "\improper Escape Pod Six"
music = "music/escape.ogg"
/area/shuttle/escape_pod6/station
icon_state = "shuttle2"
/area/shuttle/escape_pod6/centcom
icon_state = "shuttle"
/area/shuttle/escape_pod6/transit
icon_state = "shuttle"
/area/shuttle/large_escape_pod1
name = "\improper Large Escape Pod One"
music = "music/escape.ogg"
/area/shuttle/large_escape_pod1/station
icon_state = "shuttle2"
/area/shuttle/large_escape_pod1/centcom
icon_state = "shuttle"
/area/shuttle/large_escape_pod1/transit
icon_state = "shuttle"
/area/shuttle/large_escape_pod2
name = "\improper Large Escape Pod Two"
music = "music/escape.ogg"
/area/shuttle/large_escape_pod2/station
icon_state = "shuttle2"
/area/shuttle/large_escape_pod2/centcom
icon_state = "shuttle"
/area/shuttle/large_escape_pod2/transit
icon_state = "shuttle"
/area/shuttle/mining
name = "\improper Mining Shuttle"
music = "music/escape.ogg"

12
code/game/machinery/camera/presets.dm
View File

@@ -1,5 +1,8 @@
// PRESETS
var/global/list/station_networks = list(
NETWORK_CAFE_DOCK,
NETWORK_CARGO,
NETWORK_CIVILIAN,
NETWORK_CIVILIAN_EAST,
NETWORK_CIVILIAN_WEST,
NETWORK_COMMAND,
@@ -24,6 +27,15 @@ var/global/list/engineering_networks = list(
/obj/machinery/camera/network/crescent
network = list(NETWORK_CRESCENT)
/obj/machinery/camera/network/cafe_dock
network = list(NETWORK_CAFE_DOCK)
/obj/machinery/camera/network/cargo
network = list(NETWORK_CARGO)
/obj/machinery/camera/network/civilian
network = list(NETWORK_CIVILIAN)
/obj/machinery/camera/network/civilian_east
network = list(NETWORK_CIVILIAN_EAST)

14689
maps/colony-1.dmm
View File

File diff suppressed because it is too large Load Diff

4757
maps/colony-2.dmm
View File

File diff suppressed because it is too large Load Diff

1192
maps/colony-5.dmm Normal file
View File

File diff suppressed because it is too large Load Diff

61
polaris.dme
View File

@@ -5,6 +5,67 @@
// END_INTERNALS
// BEGIN_FILE_DIR
#define FILE_DIR .
#define FILE_DIR "html"
#define FILE_DIR "html/images"
#define FILE_DIR "icons"
#define FILE_DIR "icons/48x48"
#define FILE_DIR "icons/atmos"
#define FILE_DIR "icons/effects"
#define FILE_DIR "icons/mecha"
#define FILE_DIR "icons/misc"
#define FILE_DIR "icons/mob"
#define FILE_DIR "icons/mob/human_races"
#define FILE_DIR "icons/mob/human_races/cyberlimbs"
#define FILE_DIR "icons/mob/human_races/masks"
#define FILE_DIR "icons/mob/human_races/monkeys"
#define FILE_DIR "icons/mob/human_races/xenos"
#define FILE_DIR "icons/mob/items"
#define FILE_DIR "icons/mob/species"
#define FILE_DIR "icons/mob/species/skrell"
#define FILE_DIR "icons/mob/species/tajaran"
#define FILE_DIR "icons/mob/species/unathi"
#define FILE_DIR "icons/mob/species/vox"
#define FILE_DIR "icons/NTOS"
#define FILE_DIR "icons/NTOS/battery_icons"
#define FILE_DIR "icons/obj"
#define FILE_DIR "icons/obj/assemblies"
#define FILE_DIR "icons/obj/atmospherics"
#define FILE_DIR "icons/obj/clothing"
#define FILE_DIR "icons/obj/clothing/species"
#define FILE_DIR "icons/obj/clothing/species/skrell"
#define FILE_DIR "icons/obj/clothing/species/tajaran"
#define FILE_DIR "icons/obj/clothing/species/unathi"
#define FILE_DIR "icons/obj/doors"
#define FILE_DIR "icons/obj/flora"
#define FILE_DIR "icons/obj/machines"
#define FILE_DIR "icons/obj/pipes"
#define FILE_DIR "icons/pda_icons"
#define FILE_DIR "icons/spideros_icons"
#define FILE_DIR "icons/Testing"
#define FILE_DIR "icons/turf"
#define FILE_DIR "icons/vending_icons"
#define FILE_DIR "maps"
#define FILE_DIR "maps/overmap"
#define FILE_DIR "maps/overmap/bearcat"
#define FILE_DIR "nano"
#define FILE_DIR "nano/images"
#define FILE_DIR "sound"
#define FILE_DIR "sound/AI"
#define FILE_DIR "sound/ambience"
#define FILE_DIR "sound/effects"
#define FILE_DIR "sound/effects/turret"
#define FILE_DIR "sound/effects/wind"
#define FILE_DIR "sound/hallucinations"
#define FILE_DIR "sound/items"
#define FILE_DIR "sound/machines"
#define FILE_DIR "sound/mecha"
#define FILE_DIR "sound/misc"
#define FILE_DIR "sound/music"
#define FILE_DIR "sound/piano"
#define FILE_DIR "sound/violin"
#define FILE_DIR "sound/voice"
#define FILE_DIR "sound/voice/Serithi"
#define FILE_DIR "sound/weapons"
// END_FILE_DIR
// BEGIN_PREFERENCES
#define DEBUG