Skip to content

Commit

Permalink
Minor atmos board rework.
Browse files Browse the repository at this point in the history
  • Loading branch information
MistakeNot4892 committed Jan 7, 2024
1 parent 8b62db2 commit e41314a
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 19 deletions.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
/obj/item/stock_parts/circuitboard/atmoscontrol
name = "\improper Central Atmospherics Computer Circuitboard"
build_path = /obj/machinery/computer/atmoscontrol

/obj/machinery/computer/atmoscontrol
/obj/machinery/computer/central_atmos
name = "\improper Central Atmospherics Computer"
icon = 'icons/obj/computer.dmi'
icon_keyboard = "generic_key"
Expand All @@ -11,24 +7,26 @@
density = TRUE
anchored = TRUE
initial_access = list(list(access_engine_equip, access_atmospherics))
base_type = /obj/machinery/computer/central_atmos
var/list/monitored_alarm_ids = null
var/datum/nano_module/atmos_control/atmos_control
base_type = /obj/machinery/computer/atmoscontrol

// TODO: replace this with a modular computer at some point
/obj/machinery/computer/atmoscontrol/laptop
/obj/machinery/computer/central_atmos/laptop
name = "atmospherics laptop"
desc = "A cheap laptop."
icon_state = "laptop"
icon_keyboard = "laptop_key"
icon_screen = "atmoslaptop"
density = FALSE
construct_state = null
base_type = /obj/machinery/computer/central_atmos/laptop

/obj/machinery/computer/atmoscontrol/interface_interact(user)
/obj/machinery/computer/central_atmos/interface_interact(user)
ui_interact(user)
return TRUE

/obj/machinery/computer/atmoscontrol/ui_interact(var/mob/user)
/obj/machinery/computer/central_atmos/ui_interact(var/mob/user)
if(!atmos_control)
atmos_control = new(src, monitored_alarm_ids)
atmos_control.set_monitored_alarms(monitored_alarm_ids)
Expand Down
14 changes: 11 additions & 3 deletions code/game/objects/items/weapons/circuitboards/computer/computer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -92,15 +92,23 @@
name = "circuitboard (design database console)"
build_path = /obj/machinery/computer/design_console

/obj/item/stock_parts/circuitboard/central_atmos
name = "circuitboard (central atmospherics computer)"
build_path = /obj/machinery/computer/central_atmos
origin_tech = "{'programming':2}"

/obj/item/stock_parts/circuitboard/area_atmos
name = "circuitboard (area air control console)"
name = "circuitboard (air control console)"
build_path = /obj/machinery/computer/area_atmos
origin_tech = "{'programming':2}"

/obj/item/stock_parts/circuitboard/tag_scrubber_control
/obj/item/stock_parts/circuitboard/area_atmos/area
name = "circuitboard (area air control console)"
build_path = /obj/machinery/computer/area_atmos/area

/obj/item/stock_parts/circuitboard/area_atmos/tag
name = "circuitboard (wireless scrubber control console)"
build_path = /obj/machinery/computer/area_atmos/tag
origin_tech = "{'programming':2}"

/obj/item/stock_parts/circuitboard/account_database
name = "circuitboard (accounts uplink terminal)"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -218,9 +218,6 @@
/datum/fabricator_recipe/imprinter/circuit/chemical_dispenser
path = /obj/item/stock_parts/circuitboard/chemical_dispenser

/datum/fabricator_recipe/imprinter/circuit/atmos_control
path = /obj/item/stock_parts/circuitboard/atmoscontrol

/datum/fabricator_recipe/imprinter/circuit/pipe_dispenser
path = /obj/item/stock_parts/circuitboard/pipedispensor

Expand Down Expand Up @@ -485,5 +482,14 @@
/datum/fabricator_recipe/imprinter/circuit/geothermal_generator
path = /obj/item/stock_parts/circuitboard/geothermal

/datum/fabricator_recipe/imprinter/circuit/area_atmos
path = /obj/item/stock_parts/circuitboard/area_atmos

/datum/fabricator_recipe/imprinter/circuit/area_atmos_control
path = /obj/item/stock_parts/circuitboard/area_atmos/area

/datum/fabricator_recipe/imprinter/circuit/tag_scrubber_control
path = /obj/item/stock_parts/circuitboard/tag_scrubber_control
path = /obj/item/stock_parts/circuitboard/area_atmos/tag

/datum/fabricator_recipe/imprinter/circuit/central_atmos
/obj/item/stock_parts/circuitboard/central_atmos

Check warning on line 495 in code/modules/fabrication/designs/imprinter/designs_misc_circuits.dm

View workflow job for this annotation

GitHub Actions / DreamChecker

nested absolute path inside /datum/fabricator_recipe/imprinter/circuit/central_atmos
2 changes: 1 addition & 1 deletion maps/random_ruins/exoplanet_ruins/lodge/lodge.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@
/area/template_noop)
"C" = (
/obj/structure/table/woodentable,
/obj/machinery/computer/atmoscontrol/laptop{
/obj/machinery/computer/central_atmos/laptop{
desc = "A cheap, beat-up old laptop.";
name = "old laptop"
},
Expand Down
4 changes: 2 additions & 2 deletions nebula.dme
Original file line number Diff line number Diff line change
Expand Up @@ -865,7 +865,6 @@
#include "code\game\machinery\_machines_base\stock_parts\radio\stock_parts_radio.dm"
#include "code\game\machinery\_machines_base\stock_parts\radio\transmitter.dm"
#include "code\game\machinery\atmoalter\_atmos_connection.dm"
#include "code\game\machinery\atmoalter\area_atmos_computer.dm"
#include "code\game\machinery\atmoalter\canister.dm"
#include "code\game\machinery\atmoalter\meter.dm"
#include "code\game\machinery\atmoalter\portable_atmospherics.dm"
Expand All @@ -879,9 +878,10 @@
#include "code\game\machinery\computer\ai_core.dm"
#include "code\game\machinery\computer\arcade.dm"
#include "code\game\machinery\computer\arcade_orion.dm"
#include "code\game\machinery\computer\area_atmos.dm"
#include "code\game\machinery\computer\atmos_alert.dm"
#include "code\game\machinery\computer\atmos_control.dm"
#include "code\game\machinery\computer\buildandrepair.dm"
#include "code\game\machinery\computer\central_atmos.dm"
#include "code\game\machinery\computer\computer.dm"
#include "code\game\machinery\computer\guestpass.dm"
#include "code\game\machinery\computer\law.dm"
Expand Down
3 changes: 3 additions & 0 deletions tools/map_migrations/3560_central_atmos_computer.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/obj/machinery/computer/atmoscontrol : /obj/machinery/computer/central_atmos{@OLD}
/obj/item/stock_parts/circuitboard/atmoscontrol : /obj/item/stock_parts/circuitboard/central_atmos{@OLD}
/obj/item/stock_parts/circuitboard/area_atmos : /obj/item/stock_parts/circuitboard/area_atmos/area{@OLD}

0 comments on commit e41314a

Please sign in to comment.