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
47 commits
Select commit Hold shift + click to select a range
4071f32
Steals bounty cubes from TG
adamsong Jan 14, 2022
f7a4063
Fixed runtime
adamsong Jan 14, 2022
ee50929
Finish committing files
adamsong Jan 14, 2022
b566429
Added debug cube
adamsong Jan 14, 2022
7c9037a
Add cube machine to yoggers station
adamsong Jan 14, 2022
d8557ac
Forgot the console
adamsong Jan 14, 2022
68c5845
Less punching happens now
adamsong Jan 14, 2022
b7ec3b7
Merge remote-tracking branch 'origin/THE-CUBES' into THE-CUBES
adamsong Jan 14, 2022
b9a5296
Remove references to old bounty list
adamsong Jan 14, 2022
d473554
Configured job specific bounties
adamsong Jan 14, 2022
17454ef
Handle mechs
adamsong Jan 14, 2022
e3c65c9
Reorder jobs modificiation to eliminate conflict
adamsong Jan 14, 2022
dbdc6b9
Fix runtime in high priority bounty
adamsong Jan 14, 2022
0b5d8bd
Prevents overwriting IDs
adamsong Jan 15, 2022
638101d
Merge remote-tracking branch 'origin/master' into THE-CUBES
adamsong Jan 15, 2022
76da5f1
Add to meta
adamsong Jan 15, 2022
0a1e2a7
Added the thing to kilo
adamsong Jan 15, 2022
5d7c1e7
Merge remote-tracking branch 'origin/master' into THE-CUBES
adamsong Feb 22, 2023
c2fb87b
Fix compile errors, remove need to have id in the machine
adamsong Feb 22, 2023
5048e90
Adds bounty packager back to the map
adamsong Feb 22, 2023
328ae3d
Fix some things
adamsong Feb 22, 2023
e6d8a31
Adds bounty cubes to jobs without them
adamsong Feb 22, 2023
8a8582a
Silicons don't get bounties
adamsong Feb 22, 2023
05a63e2
Fixes no id message
adamsong Feb 22, 2023
177871d
Fixes conveyor
adamsong Feb 22, 2023
0e41f74
Merge 177871d22dc18d5534730418a3700e42e567c776 into THE-CUBES
adamsong Feb 22, 2023
bd38648
Merge remote-tracking branch 'origin/master' into THE-CUBES
adamsong Feb 22, 2023
42ccf03
Merge remote-tracking branch 'origin/THE-CUBES' into THE-CUBES
adamsong Feb 22, 2023
38e1a3a
No longer uses decimal minutes
adamsong Feb 22, 2023
3145d1b
Removed wrong units
adamsong Feb 22, 2023
ae56b25
Fixed high priority bounty
adamsong Feb 22, 2023
885797a
Made changes from review
adamsong Feb 22, 2023
8b399d5
Merge remote-tracking branch 'origin/THE-CUBES' into HEAD
adamsong Apr 26, 2024
4409596
Merge economy.dmi
adamsong Apr 26, 2024
ac6272f
Fix build error
adamsong Apr 26, 2024
33e0d6f
Fix lints
adamsong Apr 26, 2024
c540b3b
Fix lint, again
adamsong Apr 26, 2024
b6ec95b
Add cube machine to YogStation
adamsong Apr 26, 2024
5a3de50
More updates YogStation map
adamsong Apr 28, 2024
a49cd66
Update a couple more maps
adamsong Apr 28, 2024
5ccfa71
Does a little bit more to the donut station
adamsong Apr 28, 2024
0b36d12
IceMeta done, just gax left, and the conflict terrify me
adamsong Apr 28, 2024
2148dc4
Update gax
adamsong Jun 11, 2024
92cfb47
Merge remote-tracking branch 'origin/master' into THE-CUBES
adamsong Jun 11, 2024
e434dc0
Re-added yogs and gax changes
adamsong Jun 11, 2024
defe3aa
Merge remote-tracking branch 'origin/master' into THE-CUBES
adamsong Jun 17, 2024
e3145e9
Fix disposals
adamsong Jun 18, 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
275 changes: 150 additions & 125 deletions _maps/map_files/AsteroidStation/AsteroidStation.dmm

Large diffs are not rendered by default.

234 changes: 130 additions & 104 deletions _maps/map_files/DonutStation/DonutStation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -642,6 +642,17 @@
},
/turf/open/floor/plasteel,
/area/janitor)
"anq" = (
/obj/effect/turf_decal/trimline/brown/filled/line/lower{
dir = 1
},
/obj/machinery/conveyor{
dir = 4;
id = "bounty"
},
/obj/machinery/bounty_packager,
/turf/open/floor/plasteel,
/area/quartermaster/office)
"ans" = (
/obj/machinery/atmospherics/pipe/simple/cyan/visible{
dir = 9
Expand Down Expand Up @@ -1658,6 +1669,16 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"aJG" = (
/obj/effect/turf_decal/trimline/brown/filled/line/lower{
dir = 1
},
/obj/machinery/conveyor{
dir = 4;
id = "bounty"
},
/turf/open/floor/plasteel,
/area/quartermaster/office)
"aJJ" = (
/obj/structure/plasticflaps,
/obj/machinery/conveyor{
Expand Down Expand Up @@ -6813,6 +6834,11 @@
},
/turf/open/space/basic,
/area/space/nearstation)
"cIm" = (
/obj/effect/turf_decal/trimline/brown/filled/line/lower,
/obj/machinery/vending/modularpc,
/turf/open/floor/plasteel,
/area/quartermaster/office)
"cIr" = (
/turf/closed/wall,
/area/lawoffice)
Expand Down Expand Up @@ -15742,6 +15768,19 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/engine,
/area/science/explab)
"grm" = (
/obj/machinery/light{
dir = 1
},
/obj/effect/turf_decal/trimline/brown/filled/line/lower{
dir = 9
},
/obj/machinery/conveyor{
dir = 4;
id = "bounty"
},
/turf/open/floor/plasteel,
/area/quartermaster/office)
"grI" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
Expand Down Expand Up @@ -17823,16 +17862,6 @@
},
/turf/open/floor/plasteel,
/area/engine/engineering)
"hpJ" = (
/obj/machinery/light{
dir = 1
},
/obj/effect/turf_decal/trimline/brown/filled/line/lower{
dir = 9
},
/obj/machinery/vending/modularpc,
/turf/open/floor/plasteel,
/area/quartermaster/office)
"hpK" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
Expand Down Expand Up @@ -21175,28 +21204,6 @@
/obj/item/wirecutters,
/turf/open/space/basic,
/area/engine/engineering)
"iSo" = (
/obj/machinery/computer/bounty{
dir = 4
},
/obj/item/radio/intercom{
pixel_x = -31;
pixel_y = -6
},
/obj/machinery/camera{
c_tag = "Cargo - Quartermaster's Office";
dir = 4;
network = list("ss13")
},
/obj/effect/turf_decal/trimline/brown/filled/line/lower{
dir = 9
},
/obj/machinery/light_switch{
pixel_x = -24;
pixel_y = 8
},
/turf/open/floor/plasteel,
/area/quartermaster/qm)
"iSC" = (
/obj/structure/table/wood,
/obj/item/toy/figure/lawyer,
Expand Down Expand Up @@ -21417,19 +21424,6 @@
"iWz" = (
/turf/template_noop,
/area/maintenance/port/fore)
"iWA" = (
/obj/structure/chair{
dir = 4
},
/obj/effect/turf_decal/trimline/brown/filled/line/lower{
dir = 8
},
/obj/machinery/firealarm{
dir = 4;
pixel_x = -24
},
/turf/open/floor/plasteel,
/area/quartermaster/office)
"iWG" = (
/mob/living/carbon/monkey{
dir = 1
Expand Down Expand Up @@ -26651,6 +26645,23 @@
},
/turf/open/floor/plasteel,
/area/engine/atmos)
"liA" = (
/obj/machinery/light{
dir = 8
},
/obj/machinery/requests_console{
department = "Cargo Bay";
departmentType = 2;
pixel_x = -30
},
/obj/effect/turf_decal/trimline/brown/filled/line/lower{
dir = 8
},
/obj/machinery/modular_computer/console/preset/cargo/qm{
dir = 4
},
/turf/open/floor/plasteel,
/area/quartermaster/qm)
"liB" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
Expand Down Expand Up @@ -30129,13 +30140,6 @@
/obj/structure/closet/lasertag/red,
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"mIc" = (
/obj/effect/turf_decal/trimline/brown/filled/line/lower{
dir = 1
},
/obj/machinery/computer/bounty,
/turf/open/floor/plasteel,
/area/quartermaster/office)
"mIh" = (
/obj/structure/closet/wardrobe/mixed,
/turf/open/floor/plating{
Expand Down Expand Up @@ -31386,6 +31390,16 @@
},
/turf/open/floor/plasteel/white,
/area/medical/chemistry)
"ngM" = (
/obj/effect/turf_decal/trimline/brown/filled/line/lower{
dir = 8
},
/obj/machinery/firealarm{
dir = 4;
pixel_x = -24
},
/turf/open/floor/plasteel,
/area/quartermaster/office)
"ngQ" = (
/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
Expand Down Expand Up @@ -33269,6 +33283,23 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/chapel/office)
"nTn" = (
/obj/machinery/status_display/supply{
pixel_x = -32
},
/obj/effect/turf_decal/trimline/brown/filled/line/lower{
dir = 8
},
/obj/machinery/camera{
c_tag = "Cargo - Front Lobby";
dir = 4;
network = list("ss13")
},
/obj/machinery/conveyor_switch{
id = "bounty"
},
/turf/open/floor/plasteel,
/area/quartermaster/office)
"nTH" = (
/obj/machinery/smartfridge/food,
/turf/open/floor/plasteel/cafeteria{
Expand Down Expand Up @@ -33336,15 +33367,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/plasteel/white,
/area/science/research)
"nUV" = (
/obj/structure/chair{
dir = 4
},
/obj/effect/turf_decal/trimline/brown/filled/line/lower{
dir = 10
},
/turf/open/floor/plasteel,
/area/quartermaster/office)
"nVh" = (
/obj/structure/window/reinforced{
dir = 4
Expand Down Expand Up @@ -36235,21 +36257,6 @@
},
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"pmR" = (
/obj/machinery/status_display/supply{
pixel_x = -32
},
/obj/effect/turf_decal/trimline/brown/filled/line/lower{
dir = 8
},
/obj/machinery/lapvend,
/obj/machinery/camera{
c_tag = "Cargo - Front Lobby";
dir = 4;
network = list("ss13")
},
/turf/open/floor/plasteel,
/area/quartermaster/office)
"pmT" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable{
Expand Down Expand Up @@ -36617,23 +36624,6 @@
},
/turf/open/floor/plasteel,
/area/engine/atmos)
"ptc" = (
/obj/machinery/computer/security/qm{
dir = 4
},
/obj/machinery/light{
dir = 8
},
/obj/machinery/requests_console{
department = "Cargo Bay";
departmentType = 2;
pixel_x = -30
},
/obj/effect/turf_decal/trimline/brown/filled/line/lower{
dir = 8
},
/turf/open/floor/plasteel,
/area/quartermaster/qm)
"ptd" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 4
Expand Down Expand Up @@ -45821,6 +45811,28 @@
},
/turf/open/floor/plasteel,
/area/maintenance/disposal/incinerator)
"tpE" = (
/obj/item/radio/intercom{
pixel_x = -31;
pixel_y = -6
},
/obj/machinery/camera{
c_tag = "Cargo - Quartermaster's Office";
dir = 4;
network = list("ss13")
},
/obj/effect/turf_decal/trimline/brown/filled/line/lower{
dir = 9
},
/obj/machinery/light_switch{
pixel_x = -24;
pixel_y = 8
},
/obj/machinery/computer/security/qm{
dir = 4
},
/turf/open/floor/plasteel,
/area/quartermaster/qm)
"tpK" = (
/obj/effect/turf_decal/trimline/blue/filled/line/lower{
dir = 1
Expand Down Expand Up @@ -46504,6 +46516,13 @@
/obj/item/restraints/legcuffs/beartrap,
/turf/open/floor/plasteel,
/area/janitor)
"tCp" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 4
},
/obj/machinery/computer/bounty,
/turf/open/floor/plasteel,
/area/quartermaster/office)
"tCS" = (
/obj/structure/grille/broken,
/turf/open/floor/plating,
Expand Down Expand Up @@ -56200,6 +56219,13 @@
},
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"xCg" = (
/obj/effect/turf_decal/trimline/brown/filled/line/lower{
dir = 10
},
/obj/machinery/lapvend,
/turf/open/floor/plasteel,
/area/quartermaster/office)
"xCh" = (
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
Expand Down Expand Up @@ -94818,19 +94844,19 @@ foN
mdj
mHy
lwl
iSo
ptc
tpE
liA
qwB
saU
lwl
cyW
wgo
hgq
pww
hpJ
pmR
iWA
nUV
grm
nTn
ngM
xCg
gAv
uTm
oZy
Expand Down Expand Up @@ -95084,10 +95110,10 @@ fvV
gNx
igx
cOe
usN
gWw
anq
tCp
gNx
igx
cIm
gAv
pln
rHh
Expand Down Expand Up @@ -95341,7 +95367,7 @@ awv
gWw
igx
cOe
usN
aJG
bsf
gNx
atp
Expand Down Expand Up @@ -96360,7 +96386,7 @@ hpj
dcG
wLL
uJQ
mIc
usN
gNx
bdW
gNx
Expand Down
Loading