Commit Graph

498 Commits

Author SHA1 Message Date
Emisse
3dd0bf1217 water (#8903) 2022-06-16 18:10:01 -05:00
metalgearsloth
da2394da3c Fix bagel yml artifact (#8885) 2022-06-16 20:24:56 +10:00
metalgearsloth
a18ba5c2b5 Power cell culling (#8814) 2022-06-16 18:37:07 +10:00
metalgearsloth
1ae44b39b5 Fix SMG box sizes (#8793) 2022-06-12 18:43:41 +10:00
Leon Friedrich
6aa2050b96 temporary test fix (#8791) 2022-06-12 17:14:35 +10:00
Peptide90
f09cec77a9 ERT Update (#8617)
* removes ert shuttle and adds dartv2 by Schiene

* missing headsets

* makes ghost role sentient

* fixes duplicating helmets

* culling

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-06-12 16:17:16 +10:00
Peptide90
28e96be2e9 Adds new APC types (#8763)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-06-12 15:34:16 +10:00
metalgearsloth
9ca56df024 Cull waystation prototypes (#8788) 2022-06-12 15:08:55 +10:00
metalgearsloth
f3a53b0e85 Cull syndiepuddle prototypes (#8787) 2022-06-12 15:07:45 +10:00
metalgearsloth
3dd30b2173 Cull packedstation prototypes (#8782) 2022-06-12 15:06:06 +10:00
metalgearsloth
3cc7e6fa1d Cull splitstation prototypes (#8786) 2022-06-12 15:05:34 +10:00
metalgearsloth
680d08785d Cull saltern prototypes (#8785) 2022-06-12 15:03:20 +10:00
metalgearsloth
180afca96b Cull pillar prototypes (#8781) 2022-06-12 15:02:21 +10:00
metalgearsloth
9491903f42 Cull pirate prototypes (#8784) 2022-06-12 15:01:31 +10:00
metalgearsloth
674f23ccf8 Cuttle shuttleert + fix prototype (#8783) 2022-06-12 15:01:21 +10:00
metalgearsloth
9715ba7a7c Cull moose prototypes (#8780) 2022-06-12 14:49:41 +10:00
metalgearsloth
877057921d Cull marathon prototypes (#8779) 2022-06-12 14:46:15 +10:00
metalgearsloth
88381f3b1f Cull knightship prototypes (#8778) 2022-06-12 14:46:04 +10:00
metalgearsloth
1256e10a71 Cull infiltrator prototypes (#8777) 2022-06-12 14:45:53 +10:00
metalgearsloth
16561341f8 Cull barratry prototypes (#8776) 2022-06-12 14:45:42 +10:00
metalgearsloth
62708ee263 Cull atlas prototypes (#8775) 2022-06-12 14:45:31 +10:00
metalgearsloth
f872ea3c3d Cull delta components (#8774) 2022-06-12 14:40:32 +10:00
metalgearsloth
01d70fbab7 Fix master + prototypes (#8772) 2022-06-12 13:50:07 +10:00
metalgearsloth
a983b5e2f5 More container pruning (#8576) 2022-06-12 13:29:03 +10:00
Peptide90
500430a82a Fully remove Saltern Power prototypes / file (#8545)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-06-12 13:03:29 +10:00
TaralGit
43dc0be57c Revamp guns: Revival (#8675)
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-06-12 12:39:52 +10:00
TimrodDX
25e914b566 Adds cameras to Waystation (#8733)
* Adds cameras to Waystation

* Fixes the salvage maint door
2022-06-12 11:28:19 +10:00
Emisse
8cfa11f290 Marathon Update 1.9 moment (#8764) 2022-06-11 15:56:48 -05:00
Emisse
dbb9466309 Atlas: The Video Game (Update 2.0) (#8725) 2022-06-09 14:59:16 +10:00
Emisse
818bdf3170 blurgy bop boo botto (#8689) 2022-06-08 04:26:32 -05:00
Emisse
949fbd0194 Bagel Update 13.7 (#8690)
* fuck shit ass shit

* Add files via upload
2022-06-08 04:25:59 -05:00
Emisse
c4d0feb8a2 Marathon Update 1.8 (#8647)
* Add files via upload

* Name sec medical camera

Co-authored-by: wrexbe <wrexbe@protonmail.com>
2022-06-04 11:28:20 -07:00
wrexbe
566e90fd78 Change map prototype for gloves/mask 2022-06-03 22:54:12 -07:00
Peptide90
79c265efb3 Fixes ID/Names for Sterile masks / latex gloves. Adds nitrile glove box (#8607)
* fixes box ID/names for mask and gloves. Adds nitrile box

* map update for ID change

* crate fills fix
2022-06-03 22:05:18 -07:00
Moony
6b49933edd Fix pirates. Whoops. (#8623)
* Fix pirates. Whoops.

* Remove debug logs.
2022-06-03 12:14:36 -05:00
Peptide90
b93286fc61 Emergency Response Team (#6258)
* Clothing pass 1

Backpacks, hardsuits and helmets pass 1

* ERT Leader Role first pass

* ERT Backpacks (nearly there)

* ERT Backpacks final

* ERT helmets pass 1

* remaining hardsuit sprites added.

* ERT leader ID

* removed duplicates

* hardsuits + helmets entities

* ID + PDA for ERT

* ERT leader role pass 1

* job icons / markers for ERT

* military / ert name dataset

* starting gear pass 1 for ERT

* removed in favor of singular ERT roles file

* ERT mobs for spawning

* ERT spawn points added

* fixed case on ERT name

* Increased ERT access to most areas

* ERT ghost role takeover fixes

* ERT removed invalid parent

* path issue resolved

* more file path fixes

* fixes random naming pt 1

* Buffs ERT hardsuits and integrates helmet

parents ert to syndie hardsuit and adds toggleable helmet

* Adds suit storage slot and cargo access

* Adds backpack fills for ERT

* Updates ERT loadout for filled backpacks

+ other misc changes

* buff ERT backpack storage

* fixes ert jani backpack fills

* tweaks spawn loadout to EVA

* gave centcom official AA

* formatting

* ERT shuttle mapped with spawners

* update access
2022-06-03 20:48:28 +10:00
TimrodDX
ee6be5bf11 Adds security cameras to Delta, also more decals. (#8605) 2022-06-03 00:32:57 -05:00
EmoGarbage404
1fab6af506 wakemkiaofalliance (#8603) 2022-06-03 00:30:50 -05:00
Emisse
5b3a87180f Add files via upload (#8591) 2022-06-02 21:58:42 +10:00
metalgearsloth
7f984792a1 Cleanup gun containers (probably last time) (#8575)
- snake_case instead of kebab-case
- Remove old MagazineBarrel containers
- Remove old event
2022-06-02 00:37:55 +10:00
Emisse
ffad61b751 Marathon Update 1.7 (#8566) 2022-06-01 23:04:12 +10:00
Emisse
aeff013bf9 Bagel Update 13.6 (#8563) 2022-06-01 23:00:44 +10:00
Emisse
765125ddc8 Saltern Update 3.5 (#8567) 2022-06-01 23:00:01 +10:00
metalgearsloth
fb943a61dc Gun refactor (#8301)
Co-authored-by: Kara <lunarautomaton6@gmail.com>
Co-authored-by: T-Stalker <le0nel_1van@hotmail.com>
Co-authored-by: T-Stalker <43253663+DogZeroX@users.noreply.github.com>
Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
2022-06-01 19:59:58 +10:00
TimrodDX
72ed837cbe Waystation: The Station That Will Succeed Packed's Legacy (#8398)
* Waystation: The Station That Will Succeed Packed's Legacy

* Hopefully fixes YAML errors

* Fixes missing HV wires

* Security door

* Addresses review

* Add station component to waystation

* Fix minor stuff

* BecomeStation Casing Weh

Co-authored-by: wrexbe <wrexbe@protonmail.com>
2022-05-29 09:18:16 -07:00
Peptide90
9fb2710f50 pillar minor update (#8466) 2022-05-27 09:00:05 -07:00
TimrodDX
942e64f696 Nukes the arrivals shuttle thrusters on Delta. (#8473) 2022-05-26 20:22:38 -07:00
Peptide90
04780fd837 Pillar update 090522 (#8386) 2022-05-25 19:35:25 +10:00
Emisse
a536d3b5c5 Bagel Update 13.5 (#8410) 2022-05-25 19:00:08 +10:00
EmoGarbage404
5c44abc3f2 Barratry Hotfix (#8391)
* unbork

* fIXES
2022-05-23 17:26:54 -07:00