More maptweaks!

This commit is contained in:
Casey
2022-04-03 21:19:21 +00:00
committed by CHOMPStation2
parent c08fe46e9a
commit cf0f70593e
7 changed files with 121432 additions and 3 deletions
+57
View File
@@ -1,3 +1,4 @@
<<<<<<< HEAD:code/modules/planet/virgo4_vr
var/datum/planet/virgo4/planet_virgo4 = null
/datum/time/virgo4
@@ -11,6 +12,42 @@ var/datum/planet/virgo4/planet_virgo4 = null
planetary_wall_type = /turf/unsimulated/wall/planetary/normal/virgo4
/datum/planet/virgo4/New()
=======
#define VIRGO3C_ONE_ATMOSPHERE 92.5 //kPa
#define VIRGO3C_AVG_TEMP 288.15 //kelvin
#define VIRGO3C_PER_N2 0.78 //percent
#define VIRGO3C_PER_O2 0.21
#define VIRGO3C_PER_N2O 0.00 //Currently no capacity to 'start' a turf with this. See turf.dm
#define VIRGO3C_PER_CO2 0.01
#define VIRGO3C_PER_PHORON 0.00
//Math only beyond this point
#define VIRGO3C_MOL_PER_TURF (VIRGO3C_ONE_ATMOSPHERE*CELL_VOLUME/(VIRGO3C_AVG_TEMP*R_IDEAL_GAS_EQUATION))
#define VIRGO3C_MOL_N2 (VIRGO3C_MOL_PER_TURF * VIRGO3C_PER_N2)
#define VIRGO3C_MOL_O2 (VIRGO3C_MOL_PER_TURF * VIRGO3C_PER_O2)
#define VIRGO3C_MOL_N2O (VIRGO3C_MOL_PER_TURF * VIRGO3C_PER_N2O)
#define VIRGO3C_MOL_CO2 (VIRGO3C_MOL_PER_TURF * VIRGO3C_PER_CO2)
#define VIRGO3C_MOL_PHORON (VIRGO3C_MOL_PER_TURF * VIRGO3C_PER_PHORON)
//Turfmakers
#define VIRGO3C_SET_ATMOS nitrogen=VIRGO3C_MOL_N2;oxygen=VIRGO3C_MOL_O2;carbon_dioxide=VIRGO3C_MOL_CO2;phoron=VIRGO3C_MOL_PHORON;temperature=VIRGO3C_AVG_TEMP
#define VIRGO3C_TURF_CREATE(x) x/virgo3c/nitrogen=VIRGO3C_MOL_N2;x/virgo3c/oxygen=VIRGO3C_MOL_O2;x/virgo3c/carbon_dioxide=VIRGO3C_MOL_CO2;x/virgo3c/phoron=VIRGO3C_MOL_PHORON;x/virgo3c/temperature=VIRGO3C_AVG_TEMP;x/virgo3c/outdoors=TRUE;x/virgo3c/update_graphic(list/graphic_add = null, list/graphic_remove = null) return 0
#define VIRGO3C_TURF_CREATE_UN(x) x/virgo3c/nitrogen=VIRGO3C_MOL_N2;x/virgo3c/oxygen=VIRGO3C_MOL_O2;x/virgo3c/carbon_dioxide=VIRGO3C_MOL_CO2;x/virgo3c/phoron=VIRGO3C_MOL_PHORON;x/virgo3c/temperature=VIRGO3C_AVG_TEMP
var/datum/planet/virgo3c/planet_virgo3c = null
/datum/time/virgo3c
seconds_in_day = 6 HOURS
/datum/planet/virgo3c
name = "Virgo-3C"
desc = "A habitable moon of the gas giant Virgo 3. The volcanic activity of this moon keeps its atmosphere warm enough for life to flourish."
current_time = new /datum/time/virgo3c()
planetary_wall_type = /turf/unsimulated/wall/planetary/virgo3c
/datum/planet/virgo3c/New()
>>>>>>> 5b9cd84276... Merge pull request #12627 from Very-Soft/gbtweaks:code/modules/planet/virgo3c_vr.dm
..()
planet_virgo4 = src
weather_holder = new /datum/weather_holder/virgo4(src)
@@ -32,32 +69,52 @@ var/datum/planet/virgo4/planet_virgo4 = null
var/min = 0
switch(sun_position)
<<<<<<< HEAD:code/modules/planet/virgo4_vr
if(0 to 0.30) // Night
low_brightness = 0.1
=======
if(0 to 0.475) // Night
low_brightness = 0.3
>>>>>>> 5b9cd84276... Merge pull request #12627 from Very-Soft/gbtweaks:code/modules/planet/virgo3c_vr.dm
low_color = "#000066"
high_brightness = 0.2
high_color = "#66004D"
min = 0
<<<<<<< HEAD:code/modules/planet/virgo4_vr
if(0.30 to 0.40) // Twilight
low_brightness = 0.4
=======
if(0.475 to 0.50) // Twilight
low_brightness = 0.5
>>>>>>> 5b9cd84276... Merge pull request #12627 from Very-Soft/gbtweaks:code/modules/planet/virgo3c_vr.dm
low_color = "#66004D"
high_brightness = 0.6
high_color = "#CC3300"
min = 0.40
<<<<<<< HEAD:code/modules/planet/virgo4_vr
if(0.40 to 0.50) // Sunrise/set
low_brightness = 0.7
=======
if(0.50 to 0.525) // Sunrise/set
low_brightness = 0.9
>>>>>>> 5b9cd84276... Merge pull request #12627 from Very-Soft/gbtweaks:code/modules/planet/virgo3c_vr.dm
low_color = "#CC3300"
high_brightness = 0.9
high_color = "#FF9933"
min = 0.50
<<<<<<< HEAD:code/modules/planet/virgo4_vr
if(0.50 to 1.00) // Noon
low_brightness = 1
=======
if(0.525 to 1.00) // Noon
low_brightness = 3.0
>>>>>>> 5b9cd84276... Merge pull request #12627 from Very-Soft/gbtweaks:code/modules/planet/virgo3c_vr.dm
low_color = "#DDDDDD"
high_brightness = 2
+5 -3
View File
@@ -289,8 +289,8 @@
icon_state = "reg"
circuit = /obj/item/weapon/circuitboard/machine/reg
irradiate = FALSE
power_gen = 0 //It's big but it gets adjusted based on what you put into it!!!
var/default_power_gen = 1000000
power_gen = 0
var/default_power_gen = 1000000 //It's big but it gets adjusted based on what you put into it!!!
var/part_mult = 0
pixel_x = -32
plane = ABOVE_MOB_PLANE
@@ -300,8 +300,8 @@
density = FALSE
/obj/machinery/power/rtg/d_type_reg/Initialize()
. = ..()
pixel_x = -32
. = ..()
/obj/machinery/power/rtg/d_type_reg/Destroy()
. = ..()
@@ -322,6 +322,7 @@
part_mult = n
/obj/machinery/power/rtg/d_type_reg/attackby(obj/item/I, mob/user, params)
pixel_x = -32
if(default_deconstruction_screwdriver(user, I))
return
else if(default_deconstruction_crowbar(user, I))
@@ -329,6 +330,7 @@
return ..()
/obj/machinery/power/rtg/d_type_reg/update_icon()
pixel_x = -32
if(panel_open)
icon_state = "reg-o"
else if(buckled_mobs && buckled_mobs.len > 0)
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+415
View File
@@ -0,0 +1,415 @@
/area/groundbase
name = "Groundbase"
icon = 'icons/turf/areas_vr.dmi'
icon_state = "blublacir"
requires_power = TRUE
dynamic_lighting = TRUE
ambience = AMBIENCE_RUINS
base_turf = /turf/simulated/mineral/floor/virgo3c
/area/maintenance/groundbase
name = "Maintenance"
icon = 'icons/turf/areas_vr.dmi'
icon_state = "purblasqu"
flags = RAD_SHIELDED
ambience = AMBIENCE_RUINS
flags = AREA_FLAG_IS_NOT_PERSISTENT
base_turf = /turf/simulated/mineral/floor/virgo3c
/area/groundbase/level1
name = "Rascal's Pass Level 1"
flags = AREA_FLAG_IS_NOT_PERSISTENT
/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"
flags = AREA_FLAG_IS_NOT_PERSISTENT
/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/level2/northspur
name = "\improper North Spur"
base_turf = /turf/simulated/open/virgo3c
/area/groundbase/level2/eastspur
name = "\improper East Spur"
base_turf = /turf/simulated/open/virgo3c
/area/groundbase/level2/westspur
name = "\improper West Spur"
base_turf = /turf/simulated/open/virgo3c
/area/groundbase/level2/southeastspur
name = "\improper Southeast Spur"
base_turf = /turf/simulated/open/virgo3c
/area/groundbase/level2/southwestspur
name = "\improper Southwest Spur"
base_turf = /turf/simulated/open/virgo3c
/area/groundbase/level3
name = "Rascal's Pass Level 3"
flags = AREA_FLAG_IS_NOT_PERSISTENT
/area/groundbase/level3/ne
name = "Northeast Rascal's Pass Level 3"
/area/groundbase/level3/ne/open
base_turf = /turf/simulated/open/virgo3c
/area/groundbase/level3/nw
name = "Northwest Rascal's Pass Level 3"
/area/groundbase/level3/nw/open
base_turf = /turf/simulated/open/virgo3c
/area/groundbase/level3/se
name = "Southeast Rascal's Pass Level 3"
/area/groundbase/level3/se/open
base_turf = /turf/simulated/open/virgo3c
/area/groundbase/level3/sw
name = "Southwest Rascal's Pass Level 3"
/area/groundbase/level3/sw/open
base_turf = /turf/simulated/open/virgo3c
/area/groundbase/science
name = "Science"
holomap_color = HOLOMAP_AREACOLOR_SCIENCE
icon_state = "purwhisqu"
ambience = AMBIENCE_GENERIC
/area/groundbase/science/hall
name = "Science Hallway"
/area/groundbase/science/rnd
name = "Research and Development"
/area/groundbase/science/robotics
name = "Rocotics"
/area/groundbase/science/server
name = "Science Server Room"
/area/groundbase/science/rd
name = "Research Director's Office"
/area/groundbase/science/circuits
name = "Circuits Workshop"
/area/groundbase/science/xenohall
name = "Xeno Studies Hallway"
/area/groundbase/science/xenobot
name = "Xenobotany"
/area/groundbase/science/xenobot/storage
name = "Xenobotany Storage"
/area/groundbase/science/picnic
name = "Science Break Room"
/area/groundbase/command
name = "Command"
holomap_color = HOLOMAP_AREACOLOR_COMMAND
icon_state = "bluwhisqu"
ambience = AMBIENCE_GENERIC
/area/groundbase/command/bridge
name = "Bridge"
/area/groundbase/command/captain
name = "Captain's Office"
/area/groundbase/command/captainq
name = "Captain's Quarters"
/area/groundbase/command/hop
name = "Head of Personnel"
/area/groundbase/command/hall
name = "Command Hallway"
/area/groundbase/command/meeting
name = "Command Meeting Room"
/area/groundbase/command/ai
name = "AI Core"
ambience = AMBIENCE_AI
/area/groundbase/command/ai/chamber
name = "AI Chamber"
/area/groundbase/command/ai/upload
name = "AI Upload"
/area/groundbase/command/ai/hall
name = "AI Hall"
/area/groundbase/command/ai/foyer
name = "AI Foyer"
/area/groundbase/command/ai/robot
name = "Robot Storage"
/area/groundbase/command/ai/storage
name = "AI Storage"
/area/groundbase/security
name = "Security"
holomap_color = HOLOMAP_AREACOLOR_SECURITY
icon_state = "redwhisqu"
ambience = AMBIENCE_GENERIC
/area/groundbase/security/lobby
name = "Security Lobby"
/area/groundbase/security/processing
name = "Security Processing"
/area/groundbase/security/halls
name = "Security South Hallway"
/area/groundbase/security/halle
name = "Security East Hallway"
/area/groundbase/security/warden
name = "Warden's Office"
/area/groundbase/security/armory
name = "Security Armory"
ambience = AMBIENCE_HIGHSEC
/area/groundbase/security/briefing
name = "Security Briefing Room"
/area/groundbase/security/equipment
name = "Security Equipment Room"
ambience = AMBIENCE_HIGHSEC
/area/groundbase/security/iaa1
name = "Internal Affairs West Office"
/area/groundbase/security/iaa2
name = "Internal Affairs East Office"
/area/groundbase/security/detective
name = "Detective's Office"
/area/groundbase/security/hos
name = "Head of Security's Office"
/area/prison/cell_block/gb
name = "Brig"
/area/groundbase/medical
name = "Medical"
holomap_color = HOLOMAP_AREACOLOR_MEDICAL
icon_state = "cyawhisqu"
/area/groundbase/medical/lobby
name = "Medical Lobby"
/area/groundbase/medical/psych
name = "Psychiatrist's Office"
/area/groundbase/medical/Chemistry
name = "Chemistry"
/area/groundbase/medical/triage
name = "Medical Triage"
/area/groundbase/medical/lhallway
name = "Medical Lower Hallway"
/area/groundbase/medical/resleeving
name = "Resleeving"
/area/groundbase/medical/autoresleeving
name = "Auto-Resleeving"
/area/groundbase/medical/or1
name = "Medical Operating Room 1"
/area/groundbase/medical/or2
name = "Medical Operating Room 2"
/area/groundbase/medical/equipment
name = "Medical Equipment Room"
/area/groundbase/medical/office
name = "Medical Office"
/area/groundbase/medical/uhallway
name = "Medical Upper Hallway"
/area/groundbase/medical/cmo
name = "Chief Medical Officer's Office"
/area/groundbase/medical/paramedic
name = "Paramedic Equipment Room"
/area/groundbase/medical/patio
name = "Medical Break Room"
/area/groundbase/medical/patient1
name = "Medical Patient Room 1"
/area/groundbase/medical/patient2
name = "Medical Patient Room 2"
/area/groundbase/medical/patient3
name = "Medical Patient Room 3"
/area/groundbase/medical/patient4
name = "Medical Patient Room 4"
/area/groundbase/medical/morgue
name = "Morgue"
/area/groundbase/engineering
name = "Engineering"
holomap_color = HOLOMAP_AREACOLOR_ENGINEERING
icon_state = "yelwhisqu"
ambience = AMBIENCE_ENGINEERING
/area/groundbase/engineering/lobby
name = "Engineering Lobby"
/area/groundbase/engineering/ce
name = "Chief Engineer's Office"
/area/groundbase/engineering/workshop
name = "Engineering Workshop"
/area/groundbase/engineering/eva
name = "Engineering EVA"
/area/groundbase/engineering/storage
name = "Engineering Storage"
/area/groundbase/engineering/techstorage
name = "Engineering Tech Storage"
/area/groundbase/engineering/engine
name = "Engine"
/area/groundbase/engineering/atmos
name = "Atmospherics"
ambience = AMBIENCE_ATMOS
/area/groundbase/engineering/atmos/monitoring
name = "Atmospherics Monitoring"
/area/groundbase/cargo
name = "Cargo"
holomap_color = HOLOMAP_AREACOLOR_CARGO
icon_state = "orawhisqu"
ambience = AMBIENCE_HANGAR
/area/groundbase/cargo/office
name = "Cargo Office"
/area/groundbase/cargo/bay
name = "Cargo Bay"
/area/groundbase/cargo/bay/above
base_turf = /turf/simulated/open/virgo3c
/area/groundbase/cargo/qm
name = "Quartermaster's Office"
/area/groundbase/cargo/mining
name = "Mining"
/area/maintenance/groundbase/trashpit
name = "Trash Pit"
/area/groundbase/civilian
name = "Civilian"
holomap_color = HOLOMAP_AREACOLOR_CIV
icon_state = "grewhisqu"
ambience = AMBIENCE_FOREBODING
/area/groundbase/civilian/arrivals
name = "Arrivals"
/area/groundbase/civilian/toolstorage
name = "Tool Storage"
/area/groundbase/civilian/bar
name = "Bar"
/area/groundbase/civilian/hydroponics
name = "Hydroponics"
/area/groundbase/civilian/hydroponics/out
name = "Hydroponics Animal Pen"
/area/groundbase/civilian/kitchen
name = "Kitchen"
/area/groundbase/civilian/kitchen/freezer
name = "Kitchen Freezer"
/area/groundbase/civilian/kitchen/backroom
name = "Kitchen Back Room"
/area/groundbase/civilian/chapel
name = "Chapel"
ambience = AMBIENCE_CHAPEL
/area/groundbase/civilian/chapel/office
name = "Chaplain's Office"
/area/groundbase/civilian/library
name = "Library"
/area/groundbase/civilian/pilot
name = "Pilot Equipment Room"
/area/groundbase/civilian/gateway
name = "Gateway"
/area/groundbase/civilian/janitor
name = "Janitor's Closet"
/area/groundbase/civilian/foodplace
name = "Uncle Grumslex's Snack Emporium"
/area/groundbase/civilian/apparel
name = "Crew Apparel Care"
/area/groundbase/exploration
name = "Exploration"
holomap_color = HOLOMAP_AREACOLOR_SCIENCE
icon_state = "purwhisqu"
ambience = AMBIENCE_GENERIC
/area/groundbase/exploration/equipment
name = "Exploration Equipment Room"
/area/groundbase/exploration/shuttlepad
name = "Exploration Shuttlepad"
/area/groundbase/dorms
name = "Dormitories"
holomap_color = HOLOMAP_AREACOLOR_DORMS
icon_state = "grawhisqu"
flags = RAD_SHIELDED | BLUE_SHIELDED
ambience = AMBIENCE_GENERIC
/area/groundbase/dorms/bathroom
name = "Dormitory Bathroom"
/area/groundbase/dorms/room1
name = "Dorm Room 1"
/area/groundbase/dorms/room2
name = "Dorm Room 2"
/area/groundbase/dorms/room3
name = "Dorm Room 3"
/area/groundbase/dorms/room4
name = "Dorm Room 4"
/area/groundbase/dorms/room5
name = "Dorm Room 5"
/area/groundbase/dorms/room6
name = "Dorm Room 6"
/area/groundbase/dorms/room7
name = "Dorm Room 7"
/area/groundbase/dorms/room8
name = "Dorm Room 8"
/area/maintenance/groundbase/substation
name = "Substation"
holomap_color = HOLOMAP_AREACOLOR_ENGINEERING
icon_state = "yelwhitri"
ambience = AMBIENCE_SUBSTATION
/area/maintenance/groundbase/substation/medcargo
name = "Medical/Cargo Substation"
/area/maintenance/groundbase/substation/secsci
name = "Security/Research Substation"
/area/maintenance/groundbase/substation/aiciv
name = "AI/Civilian Substation"
/area/maintenance/groundbase/substation/command
name = "Command Substation"
/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"
/area/groundbase/mining
name = "Mining"
ambience = list('sound/ambience/ambimine.ogg', 'sound/ambience/song_game.ogg', 'sound/ambience/old_foreboding/foreboding2.ogg', 'sound/ambience/old_foreboding/foreboding2.ogg')
/area/groundbase/mining/unexplored
icon_state = "orablacir"
/area/groundbase/mining/explored
icon_state = "blublacir"
// Exclude some more areas from the atmos leak event since its outside.
/datum/event/atmos_leak/setup()
excluded |= /area/groundbase/level1/centsquare
excluded |= /area/groundbase/level1/eastspur
excluded |= /area/groundbase/level1/northspur
excluded |= /area/groundbase/level1/southeastspur
excluded |= /area/groundbase/level1/southwestspur
excluded |= /area/groundbase/level1/westspur
excluded |= /area/maintenance/groundbase/level1/netunnel
excluded |= /area/maintenance/groundbase/level1/nwtunnel
excluded |= /area/maintenance/groundbase/level1/stunnel
excluded |= /area/maintenance/groundbase/level1/setunnel
excluded |= /area/maintenance/groundbase/level1/swtunnel
excluded |= /area/groundbase/level2/ne
excluded |= /area/groundbase/level2/nw
excluded |= /area/groundbase/level2/se
excluded |= /area/groundbase/level2/sw
excluded |= /area/groundbase/level3/ne
excluded |= /area/groundbase/level3/nw
excluded |= /area/groundbase/level3/se
excluded |= /area/groundbase/level3/sw
excluded |= /area/groundbase/level2/northspur
excluded |= /area/groundbase/level2/eastspur
excluded |= /area/groundbase/level2/westspur
excluded |= /area/groundbase/level2/southeastspur
excluded |= /area/groundbase/level2/southwestspur
excluded |= /area/groundbase/level3/ne/open
excluded |= /area/groundbase/level3/nw/open
excluded |= /area/groundbase/level3/se/open
excluded |= /area/groundbase/level3/sw/open
..()