Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
9a7bdd0
add departmental node globals for fast access
ynot01 May 23, 2024
3aae78b
add console
ynot01 May 23, 2024
249d8dc
fix all nodes never showing up
ynot01 May 23, 2024
489e712
more tweaks on the console
ynot01 May 23, 2024
5650f31
move department caching to SSresearch
ynot01 May 23, 2024
13c37a7
security point generation
ynot01 May 23, 2024
947a9a3
boxstation changes
ynot01 May 23, 2024
0245266
rest of the maps
ynot01 May 23, 2024
77949ff
biome suggestions
ynot01 May 23, 2024
96e9a27
add desc
ynot01 May 23, 2024
461ef3e
add special board
ynot01 May 23, 2024
7413416
revert whitespace change
ynot01 May 23, 2024
dbc32c9
oops
ynot01 May 23, 2024
71c7521
Update computer_circuitboards.dm
ynot01 May 23, 2024
9e1ffef
the_station_areas is actually just a list of types
ynot01 May 23, 2024
933ae2a
make sure guy is crew
ynot01 May 23, 2024
265a281
add purchase ability and disable skipping
ynot01 May 23, 2024
94a0bf3
unambiguize "in" statements
ynot01 May 23, 2024
3411830
is_operational & comment
ynot01 May 23, 2024
7c00d3f
reduce iteration overhead
ynot01 May 23, 2024
07e417f
Update code/modules/research/reward_system/_reward_system.dm
ynot01 May 23, 2024
6a9997b
Update _reward_system.dm
ynot01 May 23, 2024
0d38856
patching things up
ynot01 Jun 1, 2024
fb24787
fixes
JohnFulpWillard Jun 1, 2024
75ecbb7
Merge branch 'sec-brig-points' into twenty-two
JohnFulpWillard Jun 1, 2024
db8043d
Merge pull request #4 from JohnFulpWillard/twenty-two
ynot01 Jun 1, 2024
5f2a168
fix john
ynot01 Jun 1, 2024
93eae7f
Merge remote-tracking branch 'upstream/master' into sec-brig-points
ynot01 Jun 4, 2024
f27f9be
add console back to gax
ynot01 Jun 4, 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
280 changes: 82 additions & 198 deletions _maps/map_files/AsteroidStation/AsteroidStation.dmm

Large diffs are not rendered by default.

548 changes: 135 additions & 413 deletions _maps/map_files/DonutStation/DonutStation.dmm

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions _maps/map_files/GaxStation/GaxStation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -29920,6 +29920,9 @@
/obj/structure/cable{
icon_state = "0-8"
},
/obj/machinery/computer/department_reward/security{
dir = 8
},
/turf/open/floor/plasteel,
/area/security/main)
"ozt" = (
Expand Down
50 changes: 24 additions & 26 deletions _maps/map_files/IceMeta/IceMeta.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2513,7 +2513,7 @@
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
/area/security/brig)
/area/security/brig_cell)
"aMq" = (
/obj/machinery/door/poddoor/shutters{
id = "Skynet_launch";
Expand Down Expand Up @@ -11987,7 +11987,7 @@
dir = 5
},
/turf/open/floor/plasteel,
/area/security/brig)
/area/security/brig_cell)
"dzV" = (
/obj/structure/table,
/obj/item/storage/firstaid/regular{
Expand Down Expand Up @@ -12156,7 +12156,7 @@
dir = 4
},
/turf/open/floor/plasteel,
/area/security/brig)
/area/security/brig_cell)
"dCG" = (
/obj/effect/turf_decal/stripes/line{
dir = 6
Expand Down Expand Up @@ -13443,9 +13443,7 @@
/obj/structure/cable/yellow{
icon_state = "0-2"
},
/obj/machinery/power/apc/auto_name/west{
pixel_x = -25
},
/obj/machinery/power/apc/auto_name/west,
/turf/open/floor/plasteel,
/area/engine/engine_smes)
"dWi" = (
Expand Down Expand Up @@ -13834,7 +13832,7 @@
dir = 4
},
/turf/open/floor/plasteel,
/area/security/brig)
/area/security/brig_cell)
"eco" = (
/turf/open/floor/circuit/green,
/area/science/robotics/mechbay)
Expand Down Expand Up @@ -20228,7 +20226,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/item/bedsheet/prisoner,
/turf/open/floor/plasteel,
/area/security/brig)
/area/security/brig_cell)
"fYg" = (
/obj/machinery/requests_console{
announcementConsole = 1;
Expand Down Expand Up @@ -21105,7 +21103,7 @@
dir = 8
},
/turf/open/floor/plasteel,
/area/security/brig)
/area/security/brig_cell)
"gjH" = (
/obj/structure/table,
/obj/item/toner,
Expand Down Expand Up @@ -21446,7 +21444,7 @@
dir = 4
},
/turf/open/floor/plasteel,
/area/security/brig)
/area/security/brig_cell)
"gov" = (
/obj/structure/sign/warning/vacuum/external{
pixel_y = -32
Expand Down Expand Up @@ -23473,8 +23471,7 @@
},
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
/obj/machinery/computer/atmos_sim{
dir = 4;
mode = 1
dir = 4
},
/turf/open/floor/plasteel,
/area/science/mixing)
Expand Down Expand Up @@ -32397,6 +32394,7 @@
/obj/effect/turf_decal/trimline/secred/filled/line/lower{
dir = 8
},
/obj/machinery/computer/department_reward/security,
/turf/open/floor/plasteel,
/area/security/main)
"jvl" = (
Expand Down Expand Up @@ -33804,7 +33802,7 @@
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
/area/security/brig)
/area/security/brig_cell)
"jPB" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
Expand Down Expand Up @@ -34210,7 +34208,7 @@
dir = 5
},
/turf/open/floor/plasteel,
/area/security/brig)
/area/security/brig_cell)
"jWr" = (
/obj/machinery/door/airlock/maintenance_hatch{
name = "Cargo Bay Bridge Access"
Expand Down Expand Up @@ -51599,8 +51597,7 @@
"oPd" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/computer/atmos_sim{
dir = 4;
mode = 1
dir = 4
},
/turf/open/floor/plasteel,
/area/maintenance/disposal/incinerator)
Expand Down Expand Up @@ -58073,6 +58070,9 @@
},
/turf/open/floor/carpet/royalblue,
/area/crew_quarters/heads/cmo)
"qHR" = (
/turf/closed/wall,
/area/security/brig_cell)
"qHT" = (
/obj/structure/cable{
icon_state = "4-8"
Expand Down Expand Up @@ -61366,7 +61366,7 @@
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
/area/security/brig)
/area/security/brig_cell)
"rJq" = (
/obj/structure/window/reinforced,
/obj/structure/table,
Expand Down Expand Up @@ -62666,9 +62666,7 @@
/turf/open/floor/plasteel/white,
/area/medical/sleeper)
"san" = (
/obj/machinery/airalarm/directional/west{
pixel_x = -24
},
/obj/machinery/airalarm/directional/west,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
Expand Down Expand Up @@ -75761,7 +75759,7 @@
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
/area/security/brig)
/area/security/brig_cell)
"vGd" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
Expand Down Expand Up @@ -82094,7 +82092,7 @@
dir = 9
},
/turf/open/floor/plasteel,
/area/security/brig)
/area/security/brig_cell)
"xti" = (
/obj/machinery/atmospherics/pipe/manifold/yellow/visible{
dir = 4
Expand Down Expand Up @@ -242195,8 +242193,8 @@ suD
aoc
mdB
ulr
ulr
ulr
qHR
qHR
qin
aqS
cMp
Expand Down Expand Up @@ -243223,8 +243221,8 @@ suD
aoc
cyq
ulr
ulr
ulr
qHR
qHR
qin
gQX
qcv
Expand Down
Loading