mirror of
https://github.com/PolarisSS13/Polaris.git
synced 2026-01-05 15:03:48 +00:00
Mapping changes preparation
- Adds Red and Blue simple pipes for mapping use. - Adds empty CO2 PH and N2O canisters for mapping use. - Reworks asteroid outpost areas. Old areas kept in separate file for downstream compatibility - Modifies engineering shuttle to work with next commit. - SMESs no longer have to be charged above certain level (~5%?) to actually begin outputting power. - Fixes SMES related bug caused by previous commit
This commit is contained in:
@@ -1,54 +0,0 @@
|
||||
/**********************Mine areas**************************/
|
||||
|
||||
/area/mine
|
||||
icon_state = "mining"
|
||||
music = 'sound/ambience/song_game.ogg'
|
||||
|
||||
/area/mine/explored
|
||||
name = "Mine"
|
||||
icon_state = "explored"
|
||||
ambience = list('sound/ambience/ambimine.ogg', 'sound/ambience/song_game.ogg')
|
||||
|
||||
/area/mine/unexplored
|
||||
name = "Mine"
|
||||
icon_state = "unexplored"
|
||||
ambience = list('sound/ambience/ambimine.ogg', 'sound/ambience/song_game.ogg')
|
||||
|
||||
/area/mine/lobby
|
||||
name = "Mining station"
|
||||
|
||||
/area/mine/storage
|
||||
name = "Mining station Storage"
|
||||
|
||||
/area/mine/production
|
||||
name = "Mining Station Starboard Wing"
|
||||
icon_state = "mining_production"
|
||||
|
||||
/area/mine/abandoned
|
||||
name = "Abandoned Mining Station"
|
||||
|
||||
/area/mine/living_quarters
|
||||
name = "Mining Station Port Wing"
|
||||
icon_state = "mining_living"
|
||||
|
||||
/area/mine/eva
|
||||
name = "Mining Station EVA"
|
||||
icon_state = "mining_eva"
|
||||
|
||||
/area/mine/maintenance
|
||||
name = "Mining Station Communications"
|
||||
|
||||
/area/mine/cafeteria
|
||||
name = "Mining station Cafeteria"
|
||||
|
||||
/area/mine/hydroponics
|
||||
name = "Mining station Hydroponics"
|
||||
|
||||
/area/mine/sleeper
|
||||
name = "Mining station Emergency Sleeper"
|
||||
|
||||
/area/mine/north_outpost
|
||||
name = "North Mining Outpost"
|
||||
|
||||
/area/mine/west_outpost
|
||||
name = "West Mining Outpost"
|
||||
@@ -138,7 +138,7 @@
|
||||
if(output_used < 0.0001) // either from no charge or set to 0
|
||||
outputting(0)
|
||||
investigate_log("lost power and turned <font color='red'>off</font>","singulo")
|
||||
else if(output_attempt && charge > output_level && output_level > 0)
|
||||
else if(output_attempt && output_level > 0)
|
||||
outputting = 1
|
||||
else
|
||||
output_used = 0
|
||||
|
||||
@@ -42,14 +42,14 @@
|
||||
// These are used on individual outposts as backup should power line be cut, or engineering outpost lost power.
|
||||
// 1M Charge, 150K I/O
|
||||
/obj/machinery/power/smes/buildable/outpost_substation/New()
|
||||
..(1)
|
||||
..(0)
|
||||
component_parts += new /obj/item/weapon/smes_coil/weak(src)
|
||||
recalc_coils()
|
||||
|
||||
// This one is pre-installed on engineering shuttle. Allows rapid charging/discharging for easier transport of power to outpost
|
||||
// 11M Charge, 2.5M I/O
|
||||
/obj/machinery/power/smes/buildable/power_shuttle/New()
|
||||
..(1)
|
||||
..(0)
|
||||
component_parts += new /obj/item/weapon/smes_coil/super_io(src)
|
||||
component_parts += new /obj/item/weapon/smes_coil/super_io(src)
|
||||
recalc_coils()
|
||||
@@ -105,14 +105,14 @@
|
||||
// Proc: New()
|
||||
// Parameters: None
|
||||
// Description: Adds standard components for this SMES, and forces recalculation of properties.
|
||||
/obj/machinery/power/smes/buildable/New(var/coils_installed = 0)
|
||||
/obj/machinery/power/smes/buildable/New(var/install_coils = 1)
|
||||
component_parts = list()
|
||||
component_parts += new /obj/item/stack/cable_coil(src,30)
|
||||
component_parts += new /obj/item/weapon/circuitboard/smes(src)
|
||||
src.wires = new /datum/wires/smes(src)
|
||||
|
||||
// Allows for mapped-in SMESs with larger capacity/IO
|
||||
if(!coils_installed)
|
||||
if(install_coils)
|
||||
for(var/i = 1, i <= cur_coils, i++)
|
||||
component_parts += new /obj/item/weapon/smes_coil(src)
|
||||
recalc_coils()
|
||||
|
||||
@@ -1,92 +0,0 @@
|
||||
|
||||
/area/research_outpost
|
||||
name = "Research Outpost"
|
||||
icon_state = "anomaly"
|
||||
|
||||
/area/research_outpost/filtering
|
||||
name = "Research Outpost Filtering"
|
||||
icon_state = "anofilter"
|
||||
|
||||
/area/research_outpost/hallway
|
||||
name = "Research Outpost Hallway"
|
||||
icon_state = "anohallway"
|
||||
|
||||
/area/research_outpost/gearstore
|
||||
name = "Expedition Preparation"
|
||||
icon_state = "anog"
|
||||
|
||||
/area/research_outpost/power
|
||||
name = "Research Outpost Power"
|
||||
icon_state = "engine"
|
||||
|
||||
/area/research_outpost/atmos
|
||||
name = "Research Outpost Atmospherics"
|
||||
icon_state = "atmos"
|
||||
|
||||
/area/research_outpost/maint
|
||||
name = "Research Outpost Maintenance"
|
||||
icon_state = "maintcentral"
|
||||
|
||||
/area/research_outpost/iso1
|
||||
name = "Isolation Cell 1"
|
||||
icon_state = "iso1"
|
||||
|
||||
/area/research_outpost/iso1_access
|
||||
name = "Isolation Cell 1 - Access"
|
||||
icon_state = "iso1"
|
||||
|
||||
/area/research_outpost/iso2
|
||||
name = "Isolation Cell 2"
|
||||
icon_state = "iso2"
|
||||
|
||||
/area/research_outpost/iso2_access
|
||||
name = "Isolation Cell 2 - Access"
|
||||
icon_state = "iso2"
|
||||
|
||||
/area/research_outpost/iso3
|
||||
name = "Isolation Cell 3"
|
||||
icon_state = "iso3"
|
||||
|
||||
/area/research_outpost/iso3_access
|
||||
name = "Isolation Cell 3 - Access"
|
||||
icon_state = "iso3"
|
||||
|
||||
/area/research_outpost/harvesting
|
||||
name = "Exotic Particles Collection"
|
||||
icon_state = "anolab"
|
||||
|
||||
/area/research_outpost/sample
|
||||
name = "Sample Preparation Room"
|
||||
icon_state = "anosample"
|
||||
|
||||
/area/research_outpost/spectro
|
||||
name = "Mass Spectrometry Lab"
|
||||
icon_state = "anospectro"
|
||||
|
||||
/area/research_outpost/anomaly
|
||||
name = "Anomalous Materials Lab"
|
||||
icon_state = "anolab"
|
||||
|
||||
/area/research_outpost/med
|
||||
name = "Research Outpost Medbay"
|
||||
icon_state = "medbay3"
|
||||
|
||||
/area/research_outpost/entry
|
||||
name = "Research Outpost Shuttle Dock"
|
||||
icon_state = "anoentry"
|
||||
|
||||
/area/research_outpost/longtermstorage
|
||||
name = "Long-Term Storage"
|
||||
icon_state = "primarystorage"
|
||||
|
||||
/area/research_outpost/tempstorage
|
||||
name = "Temporary Storage"
|
||||
icon_state = "storage"
|
||||
|
||||
/area/research_outpost/maintstore1
|
||||
name = "Auxiliary Storage"
|
||||
icon_state = "auxstorage"
|
||||
|
||||
/area/research_outpost/maintstore2
|
||||
name = "Maintenance Storage"
|
||||
icon_state = "auxstorage"
|
||||
Reference in New Issue
Block a user