mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-26 06:40:08 +01:00
Makes VR and fuel depot modular, changes SC/SS defines (#9100)
This commit is contained in:
tacoguy7765093
@@ -20,7 +20,7 @@
|
||||
#include "gateway/maddnesslab.dmm"
|
||||
#include "gateway/snowfield.dmm"
|
||||
#include "gateway/hiddeneclipse.dmm"
|
||||
#include "virtual_reality/constructVR.dmm"
|
||||
#include "modular_chomp/maps/virtual_reality/constructVR.dmm"
|
||||
#endif
|
||||
|
||||
|
||||
@@ -88,14 +88,15 @@
|
||||
|
||||
//VR maps go here, tell me if theres a better way to load this
|
||||
// #include "virtual_reality/constructVR.dm" Virtual Reality areas included by default.
|
||||
//#include "modular_chomp/maps/virtual_reality/constructVR.dm" //Included in .dme
|
||||
/datum/map_template/sc_lateload/vr_world
|
||||
name = "VR World"
|
||||
desc = "A dynamic, virtual world."
|
||||
mappath = 'virtual_reality/constructVR.dmm'
|
||||
mappath = 'modular_chomp/maps/virtual_reality/constructVR.dmm' //Use modular
|
||||
associated_map_datum = /datum/map_z_level/sc_lateload/vr_world
|
||||
|
||||
/datum/map_z_level/sc_lateload/vr_world
|
||||
name = "Away Mission - Fuel Depot"
|
||||
name = "VR World"
|
||||
z = Z_LEVEL_VR_REALM
|
||||
|
||||
/datum/map_template/sc_lateload/thor
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
/datum/map_template/sc_lateload/away_fueldepot
|
||||
name = "Fuel Depot - Z1 Space"
|
||||
desc = "An unmanned fuel depot floating in space."
|
||||
mappath = 'maps/southern_cross/overmap/space/fueldepot.dmm' //This is where it is in our file system.
|
||||
mappath = 'modular_chomp/maps/overmap/space/fueldepot.dmm' //Use the modular map file
|
||||
associated_map_datum = /datum/map_z_level/sc_lateload/away_fueldepot
|
||||
|
||||
/datum/map_z_level/sc_lateload/away_fueldepot
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
#include "gateway/maddnesslab.dmm"
|
||||
#include "gateway/snowfield.dmm"
|
||||
#include "gateway/hiddeneclipse.dmm"
|
||||
#include "virtual_reality/constructVR.dmm"
|
||||
#include "modular_chomp/maps/virtual_reality/constructVR.dmm"
|
||||
#endif
|
||||
|
||||
|
||||
@@ -88,14 +88,15 @@
|
||||
|
||||
//VR maps go here, tell me if theres a better way to load this
|
||||
// #include "virtual_reality/constructVR.dm" Virtual Reality areas included by default.
|
||||
//#include "modular_chomp/maps/virtual_reality/constructVR.dm" Included in .dme
|
||||
/datum/map_template/sc_lateload/vr_world
|
||||
name = "VR World"
|
||||
desc = "A dynamic, virtual world."
|
||||
mappath = 'virtual_reality/constructVR.dmm'
|
||||
mappath = 'modular_chomp/maps/virtual_reality/constructVR.dmm' //Use modular
|
||||
associated_map_datum = /datum/map_z_level/sc_lateload/vr_world
|
||||
|
||||
/datum/map_z_level/sc_lateload/vr_world
|
||||
name = "Away Mission - Fuel Depot"
|
||||
name = "VR World"
|
||||
z = Z_LEVEL_VR_REALM
|
||||
|
||||
/datum/map_template/sc_lateload/thor
|
||||
|
||||
@@ -1,218 +0,0 @@
|
||||
// -- Areas -- //
|
||||
|
||||
/area/vr
|
||||
name = "VR world"
|
||||
icon_state = "green"
|
||||
base_turf = /turf/simulated/floor/outdoors/dirt
|
||||
limit_mob_size = FALSE
|
||||
limit_dark_respite = TRUE
|
||||
|
||||
/area/vr/space
|
||||
name = "VR Space" //copypasta time
|
||||
icon_state = "space"
|
||||
requires_power = 1
|
||||
always_unpowered = 1
|
||||
dynamic_lighting = 0
|
||||
has_gravity = 0
|
||||
power_light = 0
|
||||
power_equip = 0
|
||||
power_environ = 0
|
||||
ambience = list('sound/ambience/ambispace.ogg','sound/music/title2.ogg','sound/music/space.ogg','sound/music/main.ogg','sound/music/traitor.ogg','sound/ambience/space/space_serithi.ogg','sound/music/freefallin.mid')
|
||||
base_turf = /turf/space
|
||||
ambience = AMBIENCE_SPACE
|
||||
flags = AREA_FLAG_IS_NOT_PERSISTENT
|
||||
|
||||
/area/space/atmosalert()
|
||||
return
|
||||
|
||||
/area/space/fire_alert()
|
||||
return
|
||||
|
||||
/area/space/fire_reset()
|
||||
return
|
||||
|
||||
/area/space/readyalert()
|
||||
return
|
||||
|
||||
/area/space/partyalert()
|
||||
return
|
||||
|
||||
|
||||
/area/vr/outdoors
|
||||
outdoors = OUTDOORS_YES
|
||||
ambience = AMBIENCE_SIF
|
||||
|
||||
/area/vr/powered
|
||||
name = "Powered VR World Inside"
|
||||
icon_state = "away1"
|
||||
requires_power = 0
|
||||
power_equip = 1
|
||||
power_environ = 1
|
||||
power_light = 1
|
||||
|
||||
/area/vr/powered/rocks
|
||||
name = "VR World Underground"
|
||||
icon_state = "darkred"
|
||||
|
||||
/area/vr/outdoors/powered
|
||||
name = "Powered VR World Outside"
|
||||
icon_state = "away"
|
||||
requires_power = 0
|
||||
power_equip = 1
|
||||
power_environ = 1
|
||||
power_light = 1
|
||||
|
||||
/area/vr/powered/bluebase
|
||||
name = "Blue Base"
|
||||
icon_state = "bluenew"
|
||||
|
||||
/area/vr/powered/redbase
|
||||
name = "Red Base"
|
||||
icon_state = "red"
|
||||
|
||||
/area/vr/outdoors/powered/lava
|
||||
name = "VR Lava Bridge"
|
||||
|
||||
/area/vr/powered/vendor
|
||||
name = "VR Vendor Room"
|
||||
icon_state = "green"
|
||||
|
||||
/area/vr/powered/material
|
||||
name = "VR Material Room"
|
||||
icon_state = "green"
|
||||
|
||||
/area/vr/powered/building1
|
||||
name = "VR Building 1"
|
||||
icon_state = "green"
|
||||
|
||||
/area/vr/powered/building2
|
||||
name = "VR Building 2"
|
||||
icon_state = "green"
|
||||
|
||||
/area/vr/powered/conspawn
|
||||
name = "VR Construct Spawn"
|
||||
icon_state = "green"
|
||||
|
||||
/area/vr/powered/armory
|
||||
name = "VR Armory"
|
||||
icon_state = "firingrange"
|
||||
|
||||
/area/vr/powered/cult
|
||||
name = "VR Cultist Base"
|
||||
icon_state = "green"
|
||||
|
||||
/area/vr/outdoors/powered/cult
|
||||
name = "Cultist Outside"
|
||||
ambience = AMBIENCE_UNHOLY
|
||||
|
||||
//City section
|
||||
/area/vr/powered/bar
|
||||
name = "VR Bar"
|
||||
icon_state = "green"
|
||||
|
||||
/area/vr/powered/cafe
|
||||
name = "VR Ghost Cafe"
|
||||
icon_state = "green"
|
||||
|
||||
/area/vr/powered/gunshop
|
||||
name = "VR GunShop"
|
||||
icon_state = "green"
|
||||
|
||||
/area/vr/powered/vet
|
||||
name = "VR Vet"
|
||||
icon_state = "green"
|
||||
|
||||
/area/vr/powered/shop
|
||||
name = "VR Shop"
|
||||
icon_state = "green"
|
||||
|
||||
/area/vr/powered/art
|
||||
name = "VR Art Gallery"
|
||||
icon_state = "green"
|
||||
|
||||
/area/vr/powered/constore
|
||||
name = "VR Convenience Store"
|
||||
icon_state = "green"
|
||||
|
||||
/area/vr/powered/nuke
|
||||
name = "VR Violation"
|
||||
icon_state = "green"
|
||||
|
||||
/area/vr/powered/motel
|
||||
name = "VR Motel"
|
||||
icon_state = "green"
|
||||
|
||||
/area/vr/powered/dungeon
|
||||
name = "VR Dungeon"
|
||||
icon_state = "darkred"
|
||||
|
||||
/area/vr/powered/mall
|
||||
name = "VR Mall"
|
||||
icon_state = "yellow"
|
||||
|
||||
/area/vr/powered/mall/vw
|
||||
name = "VR Vibe"
|
||||
icon_state = "pink"
|
||||
ambience = list('sound/ambience/vaporwave.ogg')
|
||||
|
||||
/area/vr/powered/mall/dorms
|
||||
name = "VR Mall Dorms"
|
||||
icon_state = "Sleep"
|
||||
soundproofed = TRUE
|
||||
limit_mob_size = FALSE
|
||||
block_suit_sensors = TRUE
|
||||
flags = RAD_SHIELDED
|
||||
block_tracking = TRUE
|
||||
|
||||
/area/vr/outdoors/powered/mall
|
||||
name = "VR Mall Outdoors"
|
||||
icon_state = "bluenew"
|
||||
|
||||
/area/vr/powered/mall/backrooms
|
||||
name = "VR ???"
|
||||
icon_state = "darkred"
|
||||
forced_ambience = list('sound/ambience/fluorescentlight.ogg')
|
||||
|
||||
/area/vr/powered/dungeon/indoors
|
||||
name = "VR Sewers"
|
||||
icon_state = "red"
|
||||
|
||||
/area/vr/powered/space
|
||||
name = "VR Space Vessel"
|
||||
icon_state = "away2"
|
||||
base_turf = /turf/space
|
||||
/area/vr/powered/space/whiteship
|
||||
name = "VR Whiteship"
|
||||
icon_state = "green"
|
||||
|
||||
/area/vr/powered/space/sciship
|
||||
name = "VR Sci Ship"
|
||||
icon_state = "green"
|
||||
|
||||
/area/vr/powered/space/mechfactory
|
||||
name = "VR Mech Factory"
|
||||
icon_state = "green"
|
||||
|
||||
// -- Objects -- //
|
||||
/obj/effect/fake_sun/always_day
|
||||
name = "fake sun"
|
||||
desc = "Deletes itself, but first updates all the lighting on outdoor turfs to cool colors."
|
||||
possible_light_setups = list(
|
||||
|
||||
list(
|
||||
"brightness" = 6.0,
|
||||
"color" = "#ABfff7"
|
||||
),
|
||||
list(
|
||||
"brightness" = 4.0,
|
||||
"color" = "#F4EA55"
|
||||
),
|
||||
list(
|
||||
"brightness" = 2.5,
|
||||
"color" = "#EE9AC6"
|
||||
),
|
||||
list(
|
||||
"brightness" = 1.0,
|
||||
"color" = "#F07AD8"
|
||||
)
|
||||
)
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large
Load Diff
+1
-1
@@ -4692,7 +4692,6 @@
|
||||
#include "maps\southern_cross\structures\closets\misc.dm"
|
||||
#include "maps\southern_cross\structures\closets\research.dm"
|
||||
#include "maps\southern_cross\structures\closets\security.dm"
|
||||
#include "maps\southern_cross\submaps\virtual_reality\constructVR.dm"
|
||||
#include "maps\southern_cross\turfs\outdoors.dm"
|
||||
#include "maps\southern_sun\southern_cross.dm"
|
||||
#include "maps\submaps\_helpers.dm"
|
||||
@@ -5122,4 +5121,5 @@
|
||||
#include "modular_chomp\maps\submaps\surface_submaps\valleyend\valleyend_areas.dm"
|
||||
#include "modular_chomp\maps\submaps\surface_submaps\wilderness\wilderness.dm"
|
||||
#include "modular_chomp\maps\submaps\surface_submaps\wilderness\wilderness_areas.dm"
|
||||
#include "modular_chomp\maps\virtual_reality\constructVR.dm"
|
||||
// END_INCLUDE
|
||||
|
||||
Reference in New Issue
Block a user