Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cryo-Lost Facility Away Site #19851

Draft
wants to merge 42 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
4fe55b2
Start
furrycactus Aug 29, 2024
50870cf
Saving Progress
furrycactus Aug 30, 2024
dc142cb
Saving Progress
furrycactus Aug 30, 2024
fd691fb
i need to go to sleep
furrycactus Aug 30, 2024
7740c18
all i see are squares
furrycactus Sep 1, 2024
ca95a29
Saving
furrycactus Sep 2, 2024
f28bed5
Save
furrycactus Sep 2, 2024
bae1cb6
save again
furrycactus Sep 3, 2024
37fea66
progress
furrycactus Sep 3, 2024
e7940a4
yippee
furrycactus Sep 3, 2024
248a6a0
Merge branch 'master' into cryo-lost-facility
furrycactus Sep 4, 2024
dca3cf1
another save
furrycactus Sep 5, 2024
87b2083
Merge branch 'master' into cryo-lost-facility
furrycactus Sep 5, 2024
e8ff9a0
what a shuttle
furrycactus Sep 6, 2024
6daa193
Save
furrycactus Sep 6, 2024
facf213
Merge branch 'master' into cryo-lost-facility
furrycactus Sep 8, 2024
5c82524
we got solars now
furrycactus Sep 8, 2024
055f272
solars
furrycactus Sep 9, 2024
0362ad2
bridge and sensors
furrycactus Sep 9, 2024
6797472
Merge branch 'master' into cryo-lost-facility
furrycactus Sep 9, 2024
3dfc7f4
Time to start decorating
furrycactus Sep 10, 2024
fc7dc32
Merge branch 'master' into cryo-lost-facility
furrycactus Sep 10, 2024
529f861
Merge branch 'master' into cryo-lost-facility
furrycactus Sep 10, 2024
58deb22
Merge remote-tracking branch 'origin/cryo-lost-facility' into cryo-lo…
furrycactus Sep 10, 2024
a22e781
Disposals and Delivery
furrycactus Sep 10, 2024
728321e
More Decorating
furrycactus Sep 11, 2024
e45defe
Merge branch 'master' into cryo-lost-facility
furrycactus Sep 12, 2024
e715e71
Power and Atmos
furrycactus Sep 12, 2024
122abd6
Merge branch 'master' into cryo-lost-facility
furrycactus Sep 12, 2024
9eff0dd
More Stuff
furrycactus Sep 13, 2024
fda2b29
Time to start Code things and explode
furrycactus Sep 13, 2024
bb1946f
Merge branch 'master' into cryo-lost-facility
furrycactus Sep 14, 2024
e4028a8
Merge branch 'master' into cryo-lost-facility
furrycactus Sep 15, 2024
579e023
Save
furrycactus Sep 16, 2024
114c8f1
Merge branch 'master' into cryo-lost-facility
furrycactus Sep 16, 2024
d65e747
Save
furrycactus Sep 17, 2024
2159388
Another Save
furrycactus Sep 20, 2024
efd862c
Merge branch 'master' into cryo-lost-facility
furrycactus Sep 22, 2024
5bcea59
Asteroid Addition
furrycactus Sep 23, 2024
0b9636b
Merge branch 'master' into cryo-lost-facility
furrycactus Sep 28, 2024
bd91f3b
Merge branch 'master' into cryo-lost-facility
furrycactus Oct 2, 2024
df418b1
Merge branch 'master' into cryo-lost-facility
furrycactus Oct 2, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions code/__DEFINES/access.dm
Original file line number Diff line number Diff line change
Expand Up @@ -815,3 +815,8 @@
id = ACCESS_LONE_SPACER
desc = "Independent Skiff Access"

#define ACCESS_CRYO_LOST_STATION 244
/datum/access/cryo_lost_station_access
id = ACCESS_CRYO_LOST_STATION
desc = "Cryo-Lost Station Access"

5 changes: 5 additions & 0 deletions code/game/turfs/flooring/flooring_premade_.dm
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@
icon_state = "rcircuit"
initial_flooring = /singleton/flooring/reinforced/circuit/red

/turf/simulated/floor/redgrid/airless
name = "airless floor"
initial_gas = null
temperature = TCMB

/turf/simulated/floor/bluegrid/airless
name = "airless floor"
initial_gas = null
Expand Down
11 changes: 11 additions & 0 deletions code/modules/power/solar.dm
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,17 @@
var/obj/machinery/power/tracker/connected_tracker = null
var/list/connected_panels = list()

/obj/machinery/power/solar_control/terminal
name = "\improper solar panel control terminal"
icon = 'icons/obj/machinery/modular_terminal.dmi'
icon_screen = "solar_screen"

Check failure on line 293 in code/modules/power/solar.dm

View workflow job for this annotation

GitHub Actions / Lint SpacemanDMM

undefined var 'icon_screen' on type '/obj/machinery/power/solar_control/terminal'
icon_keyboard = "power_key"

Check failure on line 294 in code/modules/power/solar.dm

View workflow job for this annotation

GitHub Actions / Lint SpacemanDMM

undefined var 'icon_keyboard' on type '/obj/machinery/power/solar_control/terminal'
icon_keyboard_emis = "power_key_mask"

Check failure on line 295 in code/modules/power/solar.dm

View workflow job for this annotation

GitHub Actions / Lint SpacemanDMM

undefined var 'icon_keyboard_emis' on type '/obj/machinery/power/solar_control/terminal'
is_connected = TRUE

Check failure on line 296 in code/modules/power/solar.dm

View workflow job for this annotation

GitHub Actions / Lint SpacemanDMM

undefined var 'is_connected' on type '/obj/machinery/power/solar_control/terminal'
has_off_keyboards = TRUE

Check failure on line 297 in code/modules/power/solar.dm

View workflow job for this annotation

GitHub Actions / Lint SpacemanDMM

undefined var 'has_off_keyboards' on type '/obj/machinery/power/solar_control/terminal'
can_pass_under = FALSE

Check failure on line 298 in code/modules/power/solar.dm

View workflow job for this annotation

GitHub Actions / Lint SpacemanDMM

undefined var 'can_pass_under' on type '/obj/machinery/power/solar_control/terminal'
light_power_on = 1

Check failure on line 299 in code/modules/power/solar.dm

View workflow job for this annotation

GitHub Actions / Lint SpacemanDMM

undefined var 'light_power_on' on type '/obj/machinery/power/solar_control/terminal'

/obj/machinery/power/solar_control/drain_power()
return -1

Expand Down
22 changes: 22 additions & 0 deletions code/modules/research/rdconsole.dm
Original file line number Diff line number Diff line change
Expand Up @@ -875,7 +875,29 @@ won't update every console in existence) but it's more of a hassle to do. Also,
req_access = list(ACCESS_ROBOTICS)
allow_analyzer = FALSE

/obj/machinery/computer/rdconsole/robotics/terminal
name = "\improper robotics R&D terminal"
icon = 'icons/obj/machinery/modular_terminal.dmi'
icon_screen = "rdcomp"
icon_keyboard = "tech_key"
icon_keyboard_emis = "tech_key_mask"
is_connected = TRUE
has_off_keyboards = TRUE
can_pass_under = FALSE
light_power_on = 1

/obj/machinery/computer/rdconsole/core
name = "core R&D console"
desc = "A console which is used to operate various research devices. It is the backbone of any megacorporate research division."
id = 1

/obj/machinery/computer/rdconsole/core/terminal
name = "\improper core R&D terminal"
icon = 'icons/obj/machinery/modular_terminal.dmi'
icon_screen = "rdcomp"
icon_keyboard = "tech_key"
icon_keyboard_emis = "tech_key_mask"
is_connected = TRUE
has_off_keyboards = TRUE
can_pass_under = FALSE
light_power_on = 1
11 changes: 11 additions & 0 deletions code/modules/telesci/telesci_computer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,17 @@
circuit = /obj/item/circuitboard/telesci_console
var/sending = 1

/obj/machinery/computer/telescience/terminal
name = "\improper Telepad Control Terminal"
icon = 'icons/obj/machinery/modular_terminal.dmi'
icon_screen = "teleport"
icon_keyboard = "teleport_key"
icon_keyboard_emis = "teleport_key_mask"
is_connected = TRUE
has_off_keyboards = TRUE
can_pass_under = FALSE
light_power_on = 1

/**
* The telepad that this console controls
*/
Expand Down Expand Up @@ -105,8 +116,8 @@

recalibrate()

for(var/i = 1; i <= starting_crystals; i++)

Check failure on line 119 in code/modules/telesci/telesci_computer.dm

View workflow job for this annotation

GitHub Actions / Lint SpacemanDMM

undefined var: "starting_crystals"
crystals += new /obj/item/bluespace_crystal/artificial(null) // starting crystals

Check failure on line 120 in code/modules/telesci/telesci_computer.dm

View workflow job for this annotation

GitHub Actions / Lint SpacemanDMM

undefined var: "crystals"

return INITIALIZE_HINT_LATELOAD

Expand All @@ -122,7 +133,7 @@
if(linked)
for(var/zlevel in GLOB.map_sectors)
if(GLOB.map_sectors["[zlevel]"] == linked)
our_zlevels += text2num(zlevel)

Check failure on line 136 in code/modules/telesci/telesci_computer.dm

View workflow job for this annotation

GitHub Actions / Lint SpacemanDMM

undefined var: "our_zlevels"


/obj/machinery/computer/telescience/Destroy()
Expand Down
171 changes: 171 additions & 0 deletions maps/away/away_site/cryo_lost_station/cryo_lost_station_.dm

Large diffs are not rendered by default.

Loading
Loading