Commit Graph

1380 Commits

Author SHA1 Message Date
metalgearsloth
c08349a947 Revert "Storage TEST MERGE" (#21258) 2023-10-26 00:46:22 -07:00
Nemanja
41795720da [TEST MERGE] Slot-based Storage (#21212) 2023-10-25 18:53:38 -04:00
TsjipTsjip
190b1f61f2 Kettle updates (#21164) 2023-10-22 12:00:36 -06:00
Leon Friedrich
7032a5a89a Update dev map (#21016) 2023-10-15 23:31:14 -06:00
JoeHammad1844
abf80c572e Barratry update (#20810) 2023-10-14 15:51:33 -06:00
JoeHammad1844
d2ad01741c meta update (#20916) 2023-10-14 15:50:44 -06:00
JustCone
38387ef9a6 atmos buttons and new jani sign (#20969) 2023-10-14 15:43:42 -06:00
deltanedas
d59dd0de36 saltern update (#20986)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-10-14 03:36:10 -06:00
JoeHammad1844
0cb46632fd nukie shuttle gets syndicate airlocks (#20417) 2023-10-11 19:47:25 +03:00
Emisse
ab75941bc0 box update (#20897) 2023-10-10 16:46:54 -06:00
Emisse
6f2f0b492f Bagel Update (#20896)
* bagel update

* bagel update
2023-10-10 16:46:47 -06:00
TsjipTsjip
cc47fb2712 Kettle update (#20808)
* Kettle map upload

* Kettle map proto upload
2023-10-07 14:00:34 -06:00
JustCone
544b9ea5ed New Signs to Packed (#20796) 2023-10-06 13:35:25 -06:00
Emisse
f3ae0bfb95 bagel update (#20795) 2023-10-06 13:29:33 -06:00
TsjipTsjip
c5c1105261 Power infra names for Kettle (#20762) 2023-10-05 15:17:54 -06:00
JustCone
5abc3a38da Fland Power Infrastructure Names (#20764) 2023-10-05 15:17:17 -06:00
JustCone
7f3d4e121c Marathon Power Infrastructure Names (#20763) 2023-10-05 15:16:58 -06:00
TsjipTsjip
2b87bc3419 Power infra names for Barratry (#20760) 2023-10-05 15:16:18 -06:00
TsjipTsjip
14256dee03 Barratry seniors (#20720)
* Update barratry proto to accomodate senior roles

* Add senior role spawnpoints to barratry
2023-10-05 03:14:36 -06:00
Ubaser
4df0f0ef38 Add trading ship for future implementation (#20715)
* add ship

* update

* update

* update again :3
2023-10-04 12:57:39 -06:00
JustCone
37f22a8baf Add names to unnamed SMES and Subs (#20712) 2023-10-03 13:52:44 -06:00
brainfood1183
1bdb2ce4be Origin Station Update 22.09.2023 (remove mines, fix telecoms) (#20411)
* Origin Station Update 22.09.2023 (remove mines, add smile slime, fix telecoms)

* ore boxes in salv, fixed hv power teg

* name substations and smes
2023-10-03 13:15:43 -06:00
JustCone
edd1757834 Box Power Infrastructure Names (#20693) 2023-10-02 16:42:50 -06:00
JustCone
8dda8a145b Add names for power infrastructure on Packed (#20689) 2023-10-02 12:27:13 -08:00
TsjipTsjip
66c5549640 Rename power infra on omega station (#20654) 2023-10-01 23:27:42 -06:00
TsjipTsjip
56c306f9d9 Rename power infra on cluster (#20655) 2023-10-01 23:27:27 -06:00
TsjipTsjip
dbbeb9b0ec Replace paramedic with medical windoor (#20653) 2023-10-01 23:25:11 -06:00
JustCone
716fea9df0 Packed records computer changes (#20667) 2023-10-01 23:25:01 -06:00
deltanedas
1eb2b905c4 saltern update (#20325)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-30 14:47:41 -07:00
TsjipTsjip
fbbb8fd7d3 Kettle medical rework (#20435)
* Initial try at medical rework for kettle

* Re-add decal decorations to Kettle's medical

* Add more lockers to kettle's med

* Actually upload kettle's map, not its proto
2023-09-29 13:14:53 -06:00
Emisse
f120b247f3 bagel update (#20491) 2023-09-25 03:03:15 -06:00
TsjipTsjip
5bb381dd4b Add chef closet to aspid (#20423) 2023-09-23 18:15:35 +10:00
daerSeebaer
42104bb56a Add SMES and substation names (#20414) 2023-09-22 23:13:09 -08:00
Emisse
c42567c280 fland update (#20319) 2023-09-18 15:45:17 -06:00
Emisse
ba7e82be27 box update (#20318) 2023-09-18 15:45:09 -06:00
Emisse
174d9cab5d bagel update (#20315) 2023-09-18 15:45:03 -06:00
brainfood1183
c4bb9753d5 Origin Station Update 16.09.2023 (ninjabombwaypoints, training bomb) (#20270) 2023-09-18 13:15:27 -06:00
deltanedas
640633c26b fix striker gyroscope (#20211)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-16 15:52:14 +10:00
daerSeebaer
4759b1b739 Add names for HV&MV power infrastrucutre on Aspid (#20106)
* add names for power infrastructureon aspid

* added missing SMES names on Aspid
2023-09-13 16:01:12 -06:00
TsjipTsjip
1fa34f4033 Add training bomb to kettle.yml (#20110) 2023-09-13 15:17:40 -06:00
Ubaser
9c2f11d0eb Add map "Europa" (#19930)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-09-13 22:22:21 +10:00
deltanedas
89b670d0c0 run fixgridatmos on dev (#20099)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-13 00:52:12 -06:00
deltanedas
ef869b1cff saltern updat (#20075)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-12 14:25:59 -06:00
deltanedas
6953070d40 ninja bombing target whitelist warp point (#19977)
* ninja bombing target whitelist

* :trollface:

* add bombing targets to saltern

* oops remove jordans

* remove aspid js too

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-10 16:04:00 -06:00
DrSmugleaf
b37a33444b Revert "Revert "Small Fixes (#19929)" (#19937)" (#19939)
This reverts commit c5a1c3dedd.
2023-09-09 01:37:04 -06:00
Emisse
c5a1c3dedd Revert "Small Fixes (#19929)" (#19937)
This reverts commit 70076361bd.
2023-09-09 01:28:54 -06:00
Nairod
70076361bd Small Fixes (#19929) 2023-09-08 23:44:14 -06:00
DrSmugleaf
c71f97e3a2 Refactor actions to be entities with components (#19900) 2023-09-08 18:16:05 -07:00
Kevin Zheng
de9354a562 Add powered SCI to dev map (#19915) 2023-09-08 13:43:47 -06:00
deltanedas
ffe04b41e7 saltern 4.21 (#19908)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-08 13:22:11 -06:00