Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
11,173 Commits 1 Branch 0 Tags
207a07157a51e30893da0571757101c1187f814f
Commit Graph

45 Commits

Author SHA1 Message Date
Emisse
69354d47a7 marathon cloning update (#10298) 2022-08-04 12:56:18 -05:00
Emisse
8a1c7faa64 Marathon Update 2.9 (#10238) 2022-08-02 13:16:51 +10:00
Emisse
4e44f610cf marathon 2.8 (#10132) 2022-07-29 04:28:27 -05:00
metalgearsloth
55692d4d71 Revert map PRs (#10079) 
* Revert "Fix Saltern cvar (#10077)"

This reverts commit 0f0420eca9.

* Revert "Map ID fixes (Take 2) (#10075)"

This reverts commit c15e14676d.
 2022-07-27 22:27:23 +10:00
Peptide90
c15e14676d Map ID fixes (Take 2) (#10075) 2022-07-27 03:13:55 -07:00
Emisse
eef6977954 Marathon Update 2.7 (#9989) 2022-07-23 18:38:52 -07:00
Emisse
9b3fdc874f a (#9837) 2022-07-17 07:32:10 -05:00
Emisse
134c1c2a17 remove 1 taser (#9725) 2022-07-14 06:19:30 -07:00
Emisse
ae70a71f27 mathaotnont (#9711) 2022-07-14 05:58:52 -05:00
Emisse
e963f7ec37 Marathon Ore Processor and misc (#9580) 2022-07-10 02:40:19 +10:00
Emisse
b26178e848 marathon e lights (#9575) 2022-07-09 03:32:54 -07:00
Emisse
d88bdb1465 Marathon Update 2.4 (#9553) 2022-07-09 13:15:05 +10:00
Emisse
4ffde357c7 Marathon Update 2.3 (#9490) 2022-07-06 22:09:12 +10:00
metalgearsloth
40eecdd78a Stamina damage (#9230) 2022-07-06 18:06:12 +10:00
Emisse
41fdb4e482 Marathon Update 2.2 (#9349) 2022-07-02 18:29:34 -07:00
Emisse
c452e09e04 Marathon Evac Compat Update (#9168) 2022-06-26 16:21:38 +10:00
Emisse
6dd1472d0a Marathon Update 2.1 (#9108) 2022-06-24 03:57:51 -07:00
metalgearsloth
77a8e16104 Add cargo shuttle (#8686) 2022-06-23 14:36:47 +10:00
Emisse
3dd0bf1217 water (#8903) 2022-06-16 18:10:01 -05:00
metalgearsloth
a18ba5c2b5 Power cell culling (#8814) 2022-06-16 18:37:07 +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
877057921d Cull marathon prototypes (#8779) 2022-06-12 14:46:15 +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
Emisse
8cfa11f290 Marathon Update 1.9 moment (#8764) 2022-06-11 15:56:48 -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
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
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
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
Emisse
3ce3827b5d Marathon Update 1.6 (#8344) 2022-05-22 13:32:58 -07:00
Emisse
362f8512a6 Marathon Station Component (#8097) 
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
 2022-05-12 21:07:27 +10:00
Jacob Tong
8c853476fb Rework CollisionGroups (#7656) 
* Replace Mob, Vault, and Small impassable with Mid, High, Low

* Remove CollisionGroup.Underplating

* Remove CollisionGroup.Passable

* Fix constructed APCs not being interactable

* Change firelocks to occlude

* Make pipe inherit from BaseItem

* Clean up pipes

* Remove duplicate physics and fixtures from bucket

* Rework CollisionGroups on all entities

* Add SlipLayer

* Remove fixture from delta

* Fix maps

* Address reviews

* Add SubfloorMask

* Fix glass collisions for flying mobs

* Fix maps

* Update new items

* Fix bagel again

* Fix slug

* Fix maps

* Touchups

* Fix tables blocking high pressure movement

* Update StandingState to allow going under flaps

* Cleanup

* More formatting
 2022-05-10 17:57:20 -07:00
Emisse
d5c165bdb5 Marathon Intern Update (#8034) 
* Add files via upload

* Add files via upload

* Add files via upload
 2022-05-09 15:18:03 +10:00
Emisse
f11cc6ccba Marathon Update 1.5 (#7961) 2022-05-08 00:50:13 -07:00
Emisse
2b87833490 Marathon Update Vehicles (#7787) 2022-04-25 16:38:54 -07:00
Emisse
a50c7a281d Marathon Update 1.4 (#7745) 
* Add files via upload

* Add files via upload
 2022-04-23 22:35:53 -05:00
Emisse
5b79348b6e Marathon Update 1.3 (#7662) 2022-04-20 20:53:05 +10:00
Emisse
c0c20edd7c Marathon Update 1.2 (#7583) 2022-04-16 09:15:58 -05:00
Emisse
55ec01f748 Bagel Update 1.1 (#7514) 2022-04-11 16:12:39 -05:00
Emisse
f3dd284ee5 Marathon (#7386) 2022-04-02 14:09:14 +11:00
Emisse
1270d9b0d1 Marathon hotfix 1 (#7371) 2022-03-31 19:16:16 -05:00
Emisse
f1f24ca8ae Marathon Station (#7364) 
* Add files via upload

* Add files via upload

* Update Resources/Prototypes/Maps/marathon.yml

Co-authored-by: Moony <moonheart08@users.noreply.github.com>
 2022-03-31 14:08:25 -05:00