diff --git a/baystation12.dme b/baystation12.dme index 3682d72495..25f9664bfd 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -203,6 +203,7 @@ #include "code\game\supplyshuttle.dm" #include "code\game\area\ai_monitored.dm" #include "code\game\area\areas.dm" +#include "code\game\area\asteroid_areas.dm" #include "code\game\area\Space Station 13 areas.dm" #include "code\game\dna\dna2.dm" #include "code\game\dna\dna2_domutcheck.dm" @@ -985,7 +986,6 @@ #include "code\modules\mining\machine_processing.dm" #include "code\modules\mining\machine_stacking.dm" #include "code\modules\mining\machine_unloading.dm" -#include "code\modules\mining\mine_areas.dm" #include "code\modules\mining\mine_items.dm" #include "code\modules\mining\mine_turfs.dm" #include "code\modules\mining\minerals.dm" @@ -1386,7 +1386,6 @@ #include "code\modules\research\rdmachines.dm" #include "code\modules\research\research.dm" #include "code\modules\research\server.dm" -#include "code\modules\research\xenoarchaeology\areas.dm" #include "code\modules\research\xenoarchaeology\chemistry.dm" #include "code\modules\research\xenoarchaeology\geosample.dm" #include "code\modules\research\xenoarchaeology\manuals.dm" diff --git a/code/ATMOSPHERICS/pipes.dm b/code/ATMOSPHERICS/pipes.dm index be63292d83..92ad93c7d0 100644 --- a/code/ATMOSPHERICS/pipes.dm +++ b/code/ATMOSPHERICS/pipes.dm @@ -351,6 +351,13 @@ /obj/machinery/atmospherics/pipe/simple/visible/purple color = PIPE_COLOR_PURPLE +/obj/machinery/atmospherics/pipe/simple/visible/red + color = PIPE_COLOR_RED + +/obj/machinery/atmospherics/pipe/simple/visible/blue + color = PIPE_COLOR_BLUE + + /obj/machinery/atmospherics/pipe/simple/hidden icon_state = "intact" level = 1 @@ -386,6 +393,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/purple color = PIPE_COLOR_PURPLE +/obj/machinery/atmospherics/pipe/simple/hidden/red + color = PIPE_COLOR_RED + +/obj/machinery/atmospherics/pipe/simple/hidden/blue + color = PIPE_COLOR_BLUE + /obj/machinery/atmospherics/pipe/simple/insulated icon = 'icons/obj/atmospherics/red_pipe.dmi' icon_state = "intact" @@ -607,6 +620,13 @@ /obj/machinery/atmospherics/pipe/manifold/visible/purple color = PIPE_COLOR_PURPLE +/obj/machinery/atmospherics/pipe/manifold/visible/red + color = PIPE_COLOR_RED + +/obj/machinery/atmospherics/pipe/manifold/visible/blue + color = PIPE_COLOR_BLUE + + /obj/machinery/atmospherics/pipe/manifold/hidden icon_state = "map" level = 1 @@ -642,6 +662,12 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/purple color = PIPE_COLOR_PURPLE +/obj/machinery/atmospherics/pipe/manifold/hidden/red + color = PIPE_COLOR_RED + +/obj/machinery/atmospherics/pipe/manifold/hidden/blue + color = PIPE_COLOR_BLUE + /obj/machinery/atmospherics/pipe/manifold4w icon = 'icons/atmos/manifold.dmi' icon_state = "" @@ -853,6 +879,12 @@ /obj/machinery/atmospherics/pipe/manifold4w/visible/purple color = PIPE_COLOR_PURPLE +/obj/machinery/atmospherics/pipe/manifold4w/visible/red + color = PIPE_COLOR_RED + +/obj/machinery/atmospherics/pipe/manifold4w/visible/blue + color = PIPE_COLOR_BLUE + /obj/machinery/atmospherics/pipe/manifold4w/hidden icon_state = "map_4way" level = 1 @@ -888,6 +920,12 @@ /obj/machinery/atmospherics/pipe/manifold4w/hidden/purple color = PIPE_COLOR_PURPLE +/obj/machinery/atmospherics/pipe/manifold4w/hidden/red + color = PIPE_COLOR_RED + +/obj/machinery/atmospherics/pipe/manifold4w/hidden/blue + color = PIPE_COLOR_BLUE + /obj/machinery/atmospherics/pipe/cap name = "pipe endcap" desc = "An endcap for pipes" diff --git a/code/controllers/shuttle_controller.dm b/code/controllers/shuttle_controller.dm index 5fb5f0c8bd..95429c01ea 100644 --- a/code/controllers/shuttle_controller.dm +++ b/code/controllers/shuttle_controller.dm @@ -147,13 +147,12 @@ var/global/datum/shuttle_controller/shuttle_controller // Public shuttles shuttle = new() - shuttle.location = 1 shuttle.warmup_time = 10 shuttle.area_offsite = locate(/area/shuttle/constructionsite/site) shuttle.area_station = locate(/area/shuttle/constructionsite/station) shuttle.docking_controller_tag = "engineering_shuttle" shuttle.dock_target_station = "engineering_dock_airlock" - shuttle.dock_target_offsite = "engineering_station_airlock" + shuttle.dock_target_offsite = "edock_airlock" shuttles["Engineering"] = shuttle process_shuttles += shuttle diff --git a/code/game/area/asteroid_areas.dm b/code/game/area/asteroid_areas.dm new file mode 100644 index 0000000000..9c6841c83e --- /dev/null +++ b/code/game/area/asteroid_areas.dm @@ -0,0 +1,134 @@ +// GENERIC MINING 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') + + +// OUTPOSTS + +// Small outposts +/area/outpost/mining_north + name = "North Mining Outpost" + icon_state = "outpost_mine_north" + +/area/outpost/mining_west + name = "West Mining Outpost" + icon_state = "outpost_mine_west" + +/area/outpost/abandoned + name = "Abandoned Outpost" + icon_state = "dark" + +// Main mining outpost +/area/outpost/mining_main + icon_state = "outpost_mine_main" + +/area/outpost/mining_main/dorms + name = "Mining Outpost Dormitory" + +/area/outpost/mining_main/medbay + name = "Mining Outpost Medical" + +/area/outpost/mining_main/maintenance + name = "Mining Outpost Maintenance" + +/area/outpost/mining_main/west_hall + name = "Mining Outpost West Hallway" + +/area/outpost/mining_main/east_hall + name = "Mining Outpost East Hallway" + +/area/outpost/mining_main/eva + name = "Mining Outpost EVA storage" + +/area/outpost/mining_main/refinery + name = "Mining Outpost Refinery" + + + +// Engineering Outpost +/area/outpost/engineering + icon_state = "outpost_engine" + +/area/outpost/engineering/hallway + name = "Engineering Outpost Hallway" + +/area/outpost/engineering/atmospherics + name = "Engineering Outpost Atmospherics" + +/area/outpost/engineering/power + name = "Engineering Outpost Power Distribution" + +/area/outpost/engineering/telecomms + name = "Engineering Outpost Telecommunications" + +/area/outpost/engineering/storage + name = "Engineering Outpost Storage" + +/area/outpost/engineering/meeting + name = "Engineering Outpost Meeting Room" + + + +// Research Outpost +/area/outpost/research + icon_state = "outpost_research" + +/area/outpost/research/hallway + name = "Research Outpost Hallway" + +/area/outpost/research/dock + name = "Research Outpost Shuttle Dock" + +/area/outpost/research/eva + name = "Research Outpost EVA" + +/area/outpost/research/analysis + name = "Research Outpost Sample Analysis" + +/area/outpost/research/chemistry + name = "Research Outpost Chemistry" + +/area/outpost/research/medical + name = "Research Outpost Medical" + +/area/outpost/research/power + name = "Research Outpost Maintenance" + +/area/outpost/research/isolation_a + name = "Research Outpost Isolation A" + +/area/outpost/research/isolation_b + name = "Research Outpost Isolation B" + +/area/outpost/research/isolation_c + name = "Research Outpost Isolation C" + +/area/outpost/research/lab + name = "Research Outpost Laboratory" + +/area/outpost/research/emergency_storage + name = "Research Outpost Emergency Storage" + +/area/outpost/research/anomaly_storage + name = "Research Outpost Anomalous Storage" + +/area/outpost/research/anomaly_analysis + name = "Research Outpost Anomaly Analysis" + +/area/outpost/research/kitchen + name = "Research Outpost Kitchen" + +/area/outpost/research/disposal + name = "Research Outpost Waste Disposal" \ No newline at end of file diff --git a/code/modules/research/xenoarchaeology/areas.dm b/code/game/area/asteroid_areas_old.dm similarity index 63% rename from code/modules/research/xenoarchaeology/areas.dm rename to code/game/area/asteroid_areas_old.dm index 784c78ce28..3097fa0c28 100644 --- a/code/modules/research/xenoarchaeology/areas.dm +++ b/code/game/area/asteroid_areas_old.dm @@ -1,3 +1,48 @@ +// These are OLD and UNUSED areas for asteroid outposts. +// They are kept in separate file which is unticked to make mapping cleaner. However, if downstream server uses the old areas they +// can do so by ticking the file. Do not add more areas to this file, instead add it to asteroid_areas.dm! + + +/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" + +// FOR COMPATIBILITY WITH DOWNSTREAM (Old areas - Research Base) /area/research_outpost name = "Research Outpost" @@ -89,4 +134,4 @@ /area/research_outpost/maintstore2 name = "Maintenance Storage" - icon_state = "auxstorage" + icon_state = "auxstorage" \ No newline at end of file diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index 12ad5d1c3b..fccf40950e 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -76,6 +76,21 @@ name = "Canister \[Phoron\]" icon_state = "orange" canister_color = "orange" +/obj/machinery/portable_atmospherics/canister/empty/nitrogen + name = "Canister \[N2\]" + icon_state = "red" + canister_color = "red" +/obj/machinery/portable_atmospherics/canister/empty/carbon_dioxide + name = "Canister \[CO2\]" + icon_state = "black" + canister_color = "black" +/obj/machinery/portable_atmospherics/canister/empty/sleeping_agent + name = "Canister \[N2O\]" + icon_state = "redws" + canister_color = "redws" + + + /obj/machinery/portable_atmospherics/canister/proc/check_change() var/old_flag = update_flag @@ -226,7 +241,7 @@ update_flag /obj/machinery/portable_atmospherics/canister/bullet_act(var/obj/item/projectile/Proj) if(!(Proj.damage_type == BRUTE || Proj.damage_type == BURN)) return - + if(Proj.damage) src.health -= round(Proj.damage / 2) healthcheck() diff --git a/code/modules/mining/mine_areas.dm b/code/modules/mining/mine_areas.dm deleted file mode 100644 index c1fa4f3ddb..0000000000 --- a/code/modules/mining/mine_areas.dm +++ /dev/null @@ -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" \ No newline at end of file diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index e1cdb23368..a17b3e479d 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -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 off","singulo") - else if(output_attempt && charge > output_level && output_level > 0) + else if(output_attempt && output_level > 0) outputting = 1 else output_used = 0 diff --git a/code/modules/power/smes_construction.dm b/code/modules/power/smes_construction.dm index 504514cd9f..0d89427b03 100644 --- a/code/modules/power/smes_construction.dm +++ b/code/modules/power/smes_construction.dm @@ -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() diff --git a/icons/turf/areas.dmi b/icons/turf/areas.dmi index fdd645fd8a..ccc2fd1f5a 100755 Binary files a/icons/turf/areas.dmi and b/icons/turf/areas.dmi differ