From 056b865be72529cb891e84c656cfbfc59755fec3 Mon Sep 17 00:00:00 2001 From: Alberyk Date: Fri, 27 Aug 2021 00:49:01 -0300 Subject: [PATCH] codethings --- code/__defines/machinery.dm | 7 ------ .../overmap/ships/engines/gas_thruster.dm | 8 +++---- ...eholder_engine.dmi => scc_ship_engine.dmi} | Bin maps/placeholder/code/placeholder.dm | 22 ++++++++++++------ maps/placeholder/code/placeholder_areas.dm | 11 +++++++++ 5 files changed, 30 insertions(+), 18 deletions(-) rename icons/atmos/{placeholder_engine.dmi => scc_ship_engine.dmi} (100%) diff --git a/code/__defines/machinery.dm b/code/__defines/machinery.dm index 933a702b281..8c99b5e419e 100644 --- a/code/__defines/machinery.dm +++ b/code/__defines/machinery.dm @@ -70,13 +70,6 @@ #define NETWORK_THIRD_DECK "Third Deck" #define NETWORK_INTREPID "Intrepid" -//temporary, for now -#define NETWORK_DECK_ONE_AFT "Deck 1 Aft" -#define NETWORK_DECK_ONE_FORE "Deck 1 Fore" -#define NETWORK_DECK_TWO_AFT "Deck 2 Aft" -#define NETWORK_DECK_TWO_FORE "Deck 2 Fore" -#define NETWORK_DECK_THREE_AFT "Deck 3 Aft" -#define NETWORK_DECK_THREE_FORE "Deck 3 Fore" // Those networks can only be accessed by pre-existing terminals. AIs and new terminals can't use them. var/list/restricted_camera_networks = list(NETWORK_ERT,NETWORK_MERCENARY,"Secret") diff --git a/code/modules/overmap/ships/engines/gas_thruster.dm b/code/modules/overmap/ships/engines/gas_thruster.dm index 494a0a74d26..694789e3945 100644 --- a/code/modules/overmap/ships/engines/gas_thruster.dm +++ b/code/modules/overmap/ships/engines/gas_thruster.dm @@ -73,14 +73,14 @@ var/next_on var/blockage -/obj/machinery/atmospherics/unary/engine/placeholder - name = "placeholder thruster" - icon = 'icons/atmos/placeholder_engine.dmi' +/obj/machinery/atmospherics/unary/engine/scc_ship_engine + name = "ship thruster" + icon = 'icons/atmos/scc_ship_engine.dmi' icon_state = "engine_0" opacity = FALSE pixel_x = -64 -/obj/machinery/atmospherics/unary/engine/placeholder/check_blockage() +/obj/machinery/atmospherics/unary/engine/scc_ship_engine/check_blockage() return 0 /obj/machinery/atmospherics/unary/engine/CanPass(atom/movable/mover, turf/target, height=0, air_group=0) diff --git a/icons/atmos/placeholder_engine.dmi b/icons/atmos/scc_ship_engine.dmi similarity index 100% rename from icons/atmos/placeholder_engine.dmi rename to icons/atmos/scc_ship_engine.dmi diff --git a/maps/placeholder/code/placeholder.dm b/maps/placeholder/code/placeholder.dm index b80961f1149..83dfac59698 100644 --- a/maps/placeholder/code/placeholder.dm +++ b/maps/placeholder/code/placeholder.dm @@ -34,14 +34,22 @@ use_overmap = TRUE -//These too are placeholders station_networks = list( - NETWORK_DECK_ONE_AFT, - NETWORK_DECK_ONE_FORE, - NETWORK_DECK_TWO_AFT, - NETWORK_DECK_TWO_FORE, - NETWORK_DECK_THREE_AFT, - NETWORK_DECK_THREE_FORE + NETWORK_COMMAND, + NETWORK_ENGINE, + NETWORK_ENGINEERING, + NETWORK_MEDICAL, + NETWORK_MINE, + NETWORK_RESEARCH, + NETWORK_ROBOTS, + NETWORK_PRISON, + NETWORK_SECURITY, + NETWORK_SERVICE, + NETWORK_SUPPLY, + NETWORK_FIRST_DECK, + NETWORK_SECOND_DECK, + NETWORK_THIRD_DECK, + NETWORK_INTREPID ) shuttle_docked_message = "The scheduled crew transfer shuttle to %dock% has docked with the station. It will depart in approximately %ETA% minutes." diff --git a/maps/placeholder/code/placeholder_areas.dm b/maps/placeholder/code/placeholder_areas.dm index 43d1c952a70..56af5cbbc4f 100644 --- a/maps/placeholder/code/placeholder_areas.dm +++ b/maps/placeholder/code/placeholder_areas.dm @@ -188,3 +188,14 @@ /area/maintenance/wing/port/deck1 name = "Lower Wing Frame Interior - Port" + +//Propulsion + +/area/engineering/atmos/propulsion + name = "Port Propulsion" + icon_state = "blue2" + sound_env = SMALL_ENCLOSED + +/area/engineering/atmos/propulsion/starboard + name = "Starboard Propulsion" + icon_state = "blue-red2" \ No newline at end of file