mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-23 05:00:55 +01:00
Fixes Persistence not spawning on icebox (also adds a roof so it stops having holes) (ready) (#3857)
## About The Pull Request (new version of original PR because github was being really annoying, see original here https://github.com/Bubberstation/Bubberstation/pull/3595) First of all, credit to https://github.com/IgiariValkyr (Otome on discord or Aster Briar in game) for getting the initial stuff setup for the map and giving me the basis for this PR. It saved me a ton of time and effort and turned this from a day long project to just a couple of hours. This PR turns persistence back into a static spawn ruin and also adds a roof area above it to prevent having holes in the roof. The roof itself does not feature notable items. As for its significant areas it does have the main roof access hatch, six ship clamps for moving the ship (fluff), additional cargo storage with a hopefully soon to be working elevator, small grill, logos, and two watch posts. On a more contentious note, I have added a shield generator setup as seen on previous iterations of the interdyne map in lieu of significant turret placements (There are still turrets). This is something I am testing as an alternative to turrets as there has been complaints about the turrets being a bit much. There are still two turrets in the main access hatch and the shield does need to be setup to function which can be done by multitooling all of the parts together (takes about 3 minutes). Additionally, cleaned up some additional items like a bottle of whiskey someone added with my ckey, making sure botany had space for a bee hive, To Do: Add: moon station version ## Why It's Good For The Game I adding a shipping container ranch and no one can stop me. Even worse, I added an elevator.  On a more serious note, I have had several complaints about persistence not spawning correctly due to a lack of safe areas to do it, so I am properly fixing it this time. ## Proof Of Testing https://youtu.be/0YoZErQ7cOA <details> <summary>Screenshots/Videos</summary> </details> ## Changelog 🆑 add: Persistence now has an accessible roof on icebox fix: Swapped scientist modsuit to infiltrator so they could use provided mod module. fix: Persistence is now a static spawn again map: The persistence janitor has a bedroom again /🆑 --------- Co-authored-by: Roxy <75404941+TealSeer@users.noreply.github.com> Co-authored-by: The Sharkening <95130227+StrangeWeirdKitten@users.noreply.github.com>
This commit is contained in:
co-authored by
Roxy
The Sharkening
parent
3367902b5a
commit
164ca07390
@@ -318,6 +318,22 @@ required_map = "IceBoxStation.dmm"
|
||||
coordinates = [114, 65, 3]
|
||||
trait_name = "Station"
|
||||
|
||||
# IceBoxStation SW Persistence
|
||||
[templates.iceboxstation_persistence]
|
||||
map_files = ["iceboxstation_persistence.dmm"]
|
||||
directory = "_maps/bubber/automapper/templates/IceBoxStation/"
|
||||
required_map = "IceBoxStation.dmm"
|
||||
coordinates = [19, 5, 1]
|
||||
trait_name = "Station"
|
||||
|
||||
# IceBoxStation SW Persistence Roof
|
||||
[templates.iceboxstation_persistence_roof]
|
||||
map_files = ["iceboxstation_persistence_roof.dmm"]
|
||||
directory = "_maps/bubber/automapper/templates/IceBoxStation/"
|
||||
required_map = "IceBoxStation.dmm"
|
||||
coordinates = [19, 5, 2]
|
||||
trait_name = "Station"
|
||||
|
||||
# KILOSTATION MAP EDITS
|
||||
# KiloStation Book of Kindred
|
||||
[templates.kilostation_book_of_kindred]
|
||||
|
||||
+1029
-744
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
@@ -231,3 +231,20 @@
|
||||
/datum/weather/rad_storm/New()
|
||||
. = ..()
|
||||
protected_areas += /area/ruin/space/has_grav/bubbers/persistance
|
||||
|
||||
//roof areas
|
||||
/area/ruin/space/has_grav/bubbers/persistance/roof
|
||||
name= "Persistence Roof"
|
||||
outdoors = TRUE
|
||||
sound_environment = SOUND_AREA_ICEMOON
|
||||
ignore_weather_sfx = FALSE
|
||||
|
||||
/area/ruin/space/has_grav/bubbers/persistance/shieldgen
|
||||
name= "Persistence Shield Generator"
|
||||
outdoors = TRUE
|
||||
sound_environment = SOUND_AREA_ICEMOON
|
||||
ignore_weather_sfx = FALSE
|
||||
|
||||
/area/ruin/space/has_grav/bubbers/persistance/controltower
|
||||
name= "Persistence Shuttle Controller"
|
||||
sound_environment = SOUND_AREA_SMALL_ENCLOSED
|
||||
|
||||
@@ -1,14 +0,0 @@
|
||||
/*Code to enable spawning of persistence on icemoon. Unlike the lava map, we let this one be random to avoid issues with
|
||||
missing roofs*/
|
||||
|
||||
/datum/map_template/ruin/icemoon/bubberstation/syndicate_crawler
|
||||
name = "Syndicate Ice Moon Land Crawler"
|
||||
id = "ice-crawler"
|
||||
description = "A syndicate mining operation used to mine materials in spite of NT claims. Also setup to provide agent support and comms monitoring"
|
||||
suffix = "icemoon_persistence.dmm"
|
||||
allow_duplicates = FALSE
|
||||
|
||||
/datum/map_template/ruin/icemoon/bubberstation/syndicate_crawler
|
||||
always_place = TRUE
|
||||
ruin_type = ZTRAIT_ICE_RUINS_UNDERGROUND
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
//Bubber specific mapping turfs, currently used for persistence
|
||||
|
||||
/turf/open/floor/iron/dark/icebox
|
||||
initial_gas_mix = ICEMOON_DEFAULT_ATMOS
|
||||
planetary_atmos = TRUE
|
||||
temperature = ICEBOX_MIN_TEMPERATURE
|
||||
|
||||
/turf/open/floor/catwalk_floor/iron_dark/icebox
|
||||
initial_gas_mix = ICEMOON_DEFAULT_ATMOS
|
||||
planetary_atmos = TRUE
|
||||
temperature = ICEBOX_MIN_TEMPERATURE
|
||||
|
||||
/turf/open/floor/mineral/plastitanium/red/icebox
|
||||
initial_gas_mix = ICEMOON_DEFAULT_ATMOS
|
||||
planetary_atmos = TRUE
|
||||
temperature = ICEBOX_MIN_TEMPERATURE
|
||||
|
||||
/turf/open/floor/mineral/plastitanium/icebox
|
||||
initial_gas_mix = ICEMOON_DEFAULT_ATMOS
|
||||
planetary_atmos = TRUE
|
||||
temperature = ICEBOX_MIN_TEMPERATURE
|
||||
|
||||
/turf/open/floor/engine/hull/icebox
|
||||
initial_gas_mix = ICEMOON_DEFAULT_ATMOS
|
||||
planetary_atmos = TRUE
|
||||
temperature = ICEBOX_MIN_TEMPERATURE
|
||||
|
||||
/turf/open/floor/iron/smooth/icebox
|
||||
initial_gas_mix = ICEMOON_DEFAULT_ATMOS
|
||||
planetary_atmos = TRUE
|
||||
temperature = ICEBOX_MIN_TEMPERATURE
|
||||
|
||||
/turf/open/floor/iron/colony/texture/icebox
|
||||
initial_gas_mix = ICEMOON_DEFAULT_ATMOS
|
||||
planetary_atmos = TRUE
|
||||
temperature = ICEBOX_MIN_TEMPERATURE
|
||||
|
||||
/turf/open/floor/plating/elevatorshaft/icebox
|
||||
initial_gas_mix = ICEMOON_DEFAULT_ATMOS
|
||||
planetary_atmos = TRUE
|
||||
temperature = ICEBOX_MIN_TEMPERATURE
|
||||
|
||||
/turf/open/floor/plating/reinforced/icebox
|
||||
initial_gas_mix = ICEMOON_DEFAULT_ATMOS
|
||||
planetary_atmos = TRUE
|
||||
temperature = ICEBOX_MIN_TEMPERATURE
|
||||
+1
-1
@@ -9762,8 +9762,8 @@
|
||||
#include "modular_zubbers\maps\offstation\persistence\laws.dm"
|
||||
#include "modular_zubbers\maps\offstation\persistence\mob_spawns.dm"
|
||||
#include "modular_zubbers\maps\offstation\persistence\robot_upgrade.dm"
|
||||
#include "modular_zubbers\maps\offstation\persistence\ruins.dm"
|
||||
#include "modular_zubbers\maps\offstation\persistence\turf.dm"
|
||||
#include "modular_zubbers\maps\turfs\icemoon.dm"
|
||||
#include "modular_zubbers\master_files\code\controllers\subsystem\id_access.dm"
|
||||
#include "modular_zubbers\master_files\code\datums\announcers\default_announcer.dm"
|
||||
#include "modular_zubbers\master_files\code\datums\diseases\chronic_ilness.dm"
|
||||
|
||||
Reference in New Issue
Block a user