cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-26 21:49:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Going to slep

Browse Source
This commit is contained in:
VerySoft
2022-03-31 09:02:22 -04:00
parent 539f5c0ded
commit 814b2188c1
11 changed files with 65775 additions and 51607 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__defines/holomap.dm
+1
View File
@@ -62,6 +62,7 @@
#define HOLOMAP_AREACOLOR_ARRIVALS "#0000FFCC"
#define HOLOMAP_AREACOLOR_ESCAPE "#FF0000CC"
#define HOLOMAP_AREACOLOR_DORMS "#CCCC0099"
#define HOLOMAP_AREACOLOR_CIV "#3ea800" //VOREStation Addition
#define LIST_NUMERIC_SET(L, I, V) if(!L) { L = list(); } if (L.len < I) { L.len = I; } L[I] = V
code/game/turfs/simulated/outdoors/outdoors_vr.dm
+1 -1
View File
@@ -69,7 +69,7 @@
desc = "Concrete shaped into a path!"
icon = 'icons/turf/outdoors_vr.dmi'
icon_state = "sidewalk"
edge_blending_priority = 1
edge_blending_priority = -1
movement_cost = -0.5
initial_flooring = /decl/flooring/outdoors/sidewalk
can_dirty = TRUE
code/modules/planet/virgo3c_vr.dm
+7 -7
View File
@@ -23,7 +23,7 @@
var/datum/planet/virgo3c/planet_virgo3c = null
/datum/time/virgo3c
seconds_in_day = 6 HOURS
seconds_in_day = 12 HOURS
/datum/planet/virgo3c
name = "Virgo-3c"
@@ -53,15 +53,15 @@ var/datum/planet/virgo3c/planet_virgo3c = null
var/min = 0
switch(sun_position)
if(0 to 0.20) // Night
low_brightness = 0.3
if(0 to 0.45) // Night
low_brightness = 0.1
low_color = "#000066"
high_brightness = 0.5
high_brightness = 0.2
high_color = "#66004D"
min = 0
if(0.20 to 0.30) // Twilight
if(0.45 to 0.50) // Twilight
low_brightness = 0.5
low_color = "#66004D"
@@ -69,7 +69,7 @@ var/datum/planet/virgo3c/planet_virgo3c = null
high_color = "#CC3300"
min = 0.40
if(0.30 to 0.40) // Sunrise/set
if(0.50 to 0.55) // Sunrise/set
low_brightness = 0.9
low_color = "#CC3300"
@@ -77,7 +77,7 @@ var/datum/planet/virgo3c/planet_virgo3c = null
high_color = "#FF9933"
min = 0.50
if(0.40 to 1.00) // Noon
if(0.55 to 1.00) // Noon
low_brightness = 3.0
low_color = "#DDDDDD"
code/modules/recycling/recycling.dm
+8 -2
View File
@@ -5,7 +5,8 @@
anchored = TRUE
var/working = FALSE
var/negative_dir = null //VOREStation Addition
/obj/machinery/recycling/process()
return PROCESS_KILL // these are all stateful
@@ -85,7 +86,12 @@
/obj/machinery/recycling/crusher/can_accept_item(obj/item/O)
if(LAZYLEN(O.matter))
return ..()
return FALSE
//VOREStation Addition Start - Let's the machine decide to put things it can't accept somewhere else.
else if(negative_dir && isitem(O) && !ishuman(O.loc))
O.forceMove(get_step(src, negative_dir))
else
return FALSE
//VOREStation Addition End
/obj/machinery/recycling/crusher/take_item(obj/item/O)
. = ..()
maps/groundbase/gb-z1.dmm
+22825 -15945
View File
File diff suppressed because it is too large Load Diff
maps/groundbase/gb-z2.dmm
+21971 -16013
View File
File diff suppressed because it is too large Load Diff
maps/groundbase/gb-z3.dmm
+20752 -19631
View File
File diff suppressed because it is too large Load Diff
maps/groundbase/groundbase.dm
+4 -2
View File
@@ -3,11 +3,13 @@
#include "groundbase_areas.dm"
#include "groundbase_defines.dm"
// #include "stellar_delight_shuttle_defs.dm"
// #include "stellar_delight_telecomms.dm"
#include "groundbase_telecomms.dm"
// #include "stellar_delight_things.dm"
#include "..\offmap_vr\common_offmaps.dm"
#include "..\tether\tether_jobs.dm"
#include "..\stellardelight\stellar_delight_areas.dm"
// #include "..\stellardelight\stellar_delight_areas.dm"
// #include "..\tether\tether_areas.dm"
#if !AWAY_MISSION_TEST //Don't include these for just testing away missions
#include "gb-z1.dmm"
maps/groundbase/groundbase_areas.dm
+107
View File
@@ -16,7 +16,114 @@
/area/groundbase/level1
name = "Rascal's Pass Level 1"
/area/groundbase/level1/ne
name = "Northeast Rascal's Pass Level 1"
/area/groundbase/level1/nw
name = "Northwest Rascal's Pass Level 1"
/area/groundbase/level1/se
name = "Southeast Rascal's Pass Level 1"
/area/groundbase/level1/sw
name = "Southwest Rascal's Pass Level 1"
/area/groundbase/level1/centsquare
name = "\improper Central Square"
/area/groundbase/level1/northspur
name = "\improper North Spur"
/area/groundbase/level1/eastspur
name = "\improper East Spur"
/area/groundbase/level1/westspur
name = "\improper West Spur"
/area/groundbase/level1/southeastspur
name = "\improper Southeast Spur"
/area/groundbase/level1/southwestspur
name = "\improper Southwest Spur"
/area/groundbase/level2
name = "Rascal's Pass Level 2"
/area/groundbase/level2/ne
name = "Northeast Rascal's Pass Level 2"
/area/groundbase/level2/nw
name = "Northwest Rascal's Pass Level 2"
/area/groundbase/level2/se
name = "Southeast Rascal's Pass Level 2"
/area/groundbase/level2/sw
name = "Southwest Rascal's Pass Level 2"
/area/groundbase/level3
name = "Rascal's Pass Level 3"
/area/groundbase/level3/ne
name = "Northeast Rascal's Pass Level 3"
/area/groundbase/level3/nw
name = "Northwest Rascal's Pass Level 3"
/area/groundbase/level3/se
name = "Southeast Rascal's Pass Level 3"
/area/groundbase/level3/sw
name = "Southwest Rascal's Pass Level 3"
/area/groundbase/science
name = "Science"
holomap_color = HOLOMAP_AREACOLOR_SCIENCE
icon_state = "purwhisqu"
/area/groundbase/command
name = "Command"
holomap_color = HOLOMAP_AREACOLOR_COMMAND
icon_state = "bluwhisqu"
/area/groundbase/security
name = "Security"
holomap_color = HOLOMAP_AREACOLOR_SECURITY
icon_state = "redwhisqu"
/area/groundbase/medical
name = "Medical"
holomap_color = HOLOMAP_AREACOLOR_MEDICAL
icon_state = "cyawhisqu"
/area/groundbase/engineering
name = "Engineering"
holomap_color = HOLOMAP_AREACOLOR_ENGINEERING
icon_state = "yelwhisqu"
/area/groundbase/cargo
name = "Cargo"
holomap_color = HOLOMAP_AREACOLOR_CARGO
icon_state = "orawhisqu"
/area/groundbase/civilian
name = "Civilian"
holomap_color = HOLOMAP_AREACOLOR_CIV
icon_state = "grewhisqu"
/area/groundbase/exploration
name = "Exploration"
holomap_color = HOLOMAP_AREACOLOR_SCIENCE
icon_state = "purwhisqu"
/area/groundbase/dorms
name = "Dorms"
holomap_color = HOLOMAP_AREACOLOR_DORMS
icon_state = "grewhisqu"
flags = RAD_SHIELDED | BLUE_SHIELDED
/area/maintenance/groundbase/substation
name = "Substation"
holomap_color = HOLOMAP_AREACOLOR_ENGINEERING
icon_state = "yelwhitri"
/area/maintenance/groundbase/level1/netunnel
name = "\improper Level 1 Northeast Tunnel"
/area/maintenance/groundbase/level1/nwtunnel
name = "\improper Level 1 Northwest Tunnel"
/area/maintenance/groundbase/level1/setunnel
name = "\improper Level 1 Southeast Tunnel"
/area/maintenance/groundbase/level1/stunnel
name = "\improper Level 1 South Tunnel"
/area/maintenance/groundbase/level1/swtunnel
name = "\improper Level 1 Southwest Tunnel"
maps/groundbase/groundbase_defines.dm
+5 -6
View File
@@ -119,12 +119,12 @@
default_skybox = /datum/skybox_settings/groundbase
unit_test_exempt_areas = list(
// /area/stellardelight/deck1/exterior,
// /area/stellardelight/deck1/exploshuttle,
// /area/stellardelight/deck1/miningshuttle
/area/groundbase/level1,
/area/groundbase/level2,
/area/groundbase/level3
)
unit_test_exempt_from_atmos = list() //it maint
unit_test_exempt_from_atmos = list()
lateload_z_levels = list(
@@ -180,7 +180,6 @@
new /datum/random_map/noise/ore(null, 1, 1, Z_LEVEL_MINING, 64, 64) // Create the mining ore distribution map.
return 1
/datum/skybox_settings/groundbase
icon_state = "space5"
use_stars = FALSE
@@ -342,7 +341,7 @@
/datum/map_z_level/gb_lateload/mining
z = Z_LEVEL_MINING
name = "V3c Underground"
base_turf = /turf/space
base_turf = /turf/simulated/floor/outdoors/newdirt_nograss/virgo3c
flags = MAP_LEVEL_PLAYER|MAP_LEVEL_CONTACT|MAP_LEVEL_CONSOLES
#include "../expedition_vr/aerostat/_aerostat.dm"
maps/groundbase/groundbase_telecomms.dm
+94
View File
@@ -0,0 +1,94 @@
// ### Preset machines ###
// #### Relays ####
// Telecomms doesn't know about connected z-levels, so we need relays even for the other surface levels.
/obj/machinery/telecomms/relay/preset/station
id = "groundbase Relay"
listening_level = 9
autolinkers = list("groundbase_relay")
// #### Hub ####
/obj/machinery/telecomms/hub/preset/groundbase
id = "Hub"
network = "tcommsat"
autolinkers = list("hub",
"groundbase_relay", "c_relay", "m_relay", "r_relay",
"science", "medical", "supply", "service", "common", "command", "engineering", "security", "explorer", "unused",
"hb_relay", "receiverA", "broadcasterA"
)
/obj/machinery/telecomms/receiver/preset_right/groundbase
id = "groundbase_rx"
freq_listening = list(AI_FREQ, SCI_FREQ, MED_FREQ, SUP_FREQ, SRV_FREQ, COMM_FREQ, ENG_FREQ, SEC_FREQ, ENT_FREQ, EXP_FREQ)
/obj/machinery/telecomms/broadcaster/preset_right/groundbase
id = "groundbase_tx"
/obj/machinery/telecomms/bus/preset_two/groundbase
freq_listening = list(SUP_FREQ, SRV_FREQ, EXP_FREQ)
/obj/machinery/telecomms/server/presets/service/groundbase
freq_listening = list(SRV_FREQ, EXP_FREQ)
autolinkers = list("service", "explorer")
// Telecommunications Satellite
/area/groundbase/command/tcomms
name = "\improper Telecomms"
ambience = list('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg')
/area/groundbase/command/tcomms/entrance
name = "\improper Telecomms Teleporter"
/area/groundbase/command/tcomms/foyer
name = "\improper Telecomms Foyer"
/area/groundbase/command/tcomms/storage
name = "\improper Telecomms Storage"
/area/groundbase/command/tcomms/computer
name = "\improper Telecomms Control Room"
/area/groundbase/command/tcomms/chamber
name = "\improper Telecomms Central Compartment"
flags = BLUE_SHIELDED
/area/maintenance/substation/tcomms
name = "\improper Telecomms Substation"
/area/maintenance/station/tcomms
name = "\improper Telecoms Maintenance"
/datum/map/groundbase/default_internal_channels()
return list(
num2text(PUB_FREQ) = list(),
num2text(AI_FREQ) = list(access_synth),
num2text(ENT_FREQ) = list(),
num2text(ERT_FREQ) = list(access_cent_specops),
num2text(COMM_FREQ)= list(access_heads),
num2text(ENG_FREQ) = list(access_engine_equip, access_atmospherics),
num2text(MED_FREQ) = list(access_medical_equip),
num2text(MED_I_FREQ)=list(access_medical_equip),
num2text(SEC_FREQ) = list(access_security),
num2text(SEC_I_FREQ)=list(access_security),
num2text(SCI_FREQ) = list(access_tox,access_robotics,access_xenobiology),
num2text(SUP_FREQ) = list(access_cargo),
num2text(SRV_FREQ) = list(access_janitor, access_hydroponics),
num2text(EXP_FREQ) = list(access_explorer)
)
/obj/item/device/multitool/groundbase_buffered
name = "pre-linked multitool (groundbase hub)"
desc = "This multitool has already been linked to the groundbase telecomms hub and can be used to configure one (1) relay."
/obj/item/device/multitool/groundbase_buffered/Initialize()
. = ..()
buffer = locate(/obj/machinery/telecomms/hub/preset/groundbase)
/obj/item/device/bluespaceradio/groundbase_prelinked
name = "bluespace radio (Stellar Delight)"
handset = /obj/item/device/radio/bluespacehandset/linked/groundbase_prelinked
/obj/item/device/radio/bluespacehandset/linked/groundbase_prelinked
bs_tx_preload_id = "groundbase_rx" //Transmit to a receiver
bs_rx_preload_id = "groundbase_tx" //Recveive from a transmitter