Commit Graph

402 Commits

Author SHA1 Message Date
Chris V
94a0bc92b7 Salvage mining, ore processing, and material clean-up (#7406)
* adding stuff cuz new computer

* removed unused materials

* remove unused materials and such, lathe things

* material volume no longer hardcoded

* fixed mining system

* add 5 stacks of materials, and add them to the ore processor

* fix copyright for ores and handdrill

* comma momma

* whyyyyy

* more fixes to make the yaml linter happy

* i should get my eyes checked

* silver proper

* more cleanup

* leftovers

* remove more references to material doors

* couldn't bear to be without bearhide

* added uranium, added more lathe recipes

* copyright fix, stack fix

* ore processor sprite and such

* ore processing some binches

* MaterialCotton removal

* 1 uranium ore means 1 sheet

* fix merge conflict? idk

* time to ketchup

* lathe recognizes material volume again

* yaml cleanup

* forgot to remove adamantine lol

* re-added diamond for now

* diamond stacks

* functional ore processor

* added ignoreColor to lathe visuals

* ore processor machine board

* add board to industrial tech and circuit printer

* provided lathes their whitelists

* fix wonky ore spawning, added insert sound to lathe, adjusted ore chance

* re-added ore processor

* typos and cleanup

* Update Content.Client/Lathe/LatheSystem.cs

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* Update Content.Server/Lathe/LatheSystem.cs

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* revert mapchange

* VV ignorecolor, pass entitymanager, move canceltoken to pickaxe, removed foreach from orespawn

* actually null canceltoken

* remove five-stacks, ore processor produces full stacks or single sheets/ingots

* VV proper

* adjust ore chances

* readd Cotton

* Update Content.Server/Mining/MineableSystem.cs

* tweaks

* Material is now dict (material, volume)

* removed unused property

* Space crystal -> space quartz

* forgor asteroid space quartz

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-04-28 20:41:04 +10:00
EmoGarbage404
f83de4015a vehicles (#7826) 2022-04-27 22:17:37 -05:00
Emisse
04a8ca6240 Add files via upload (#7827) 2022-04-27 20:43:51 -05:00
Emisse
50512efab5 Atlas Update Vehicles (#7784) 2022-04-25 16:39:34 -07:00
Emisse
36a2a2e79a Add files via upload (#7785) 2022-04-25 16:39:22 -07:00
Emisse
2b87833490 Marathon Update Vehicles (#7787) 2022-04-25 16:38:54 -07:00
Emisse
ad141ba7f0 Moose Update Vehicles (#7788) 2022-04-25 16:38:47 -07:00
Emisse
721a60c03d Saltern Update Vehicles (#7789) 2022-04-25 16:38:32 -07:00
Peptide90
b1a4a697b0 splitstation minor update (#7779) 2022-04-25 12:07:53 -05:00
TimrodDX
644f363e15 Adds the arrivals shuttle and vehicles to Delta. (#7772)
* Adds the arrivals shuttle to Delta

* Forgot to fixgridatmos
2022-04-25 09:50:03 -05:00
EmoGarbage404
1dc309a715 NT Barratry Update (#7759)
* first draft

* smol update, do not take heed

* Update animals.yml

* big update

* adressing feedback

* drone room

* update

* Update ntbarratry.yml
2022-04-25 09:45:54 -05:00
Peptide90
ad7d959102 Splitstation fixes and QoL improvements (#7692)
* increased min players to 60

* lots of fixes

* decal pass and lots of fixes

* lots more signs and some QoL and naming of stuff.

* moved all head spawns and lockers to their departments.

* new content and morgue
2022-04-24 08:10:43 -05:00
Emisse
2e91acf172 Moose Update 2.0 (#7747)
* Add files via upload

* Add files via upload
2022-04-23 23:05:26 -05:00
Emisse
1f05aafb80 Add files via upload (#7750) 2022-04-23 23:04:55 -05:00
Emisse
a2da1580d0 Add files via upload (#7742) 2022-04-23 22:36:07 -05: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
a8939faba8 Bagel Update 12.4 (#7744)
* Add files via upload

* Add files via upload
2022-04-23 22:35:28 -05:00
TimrodDX
eb787456c4 Adds vehicles to Delta (#7741) 2022-04-23 19:26:50 -07:00
Emisse
071aa49b5a Pirate ship and prototypes for admemes (#7552) 2022-04-23 18:06:38 -07:00
Emisse
72d9902038 Moose Update 1.9 (#7664) 2022-04-23 17:25:30 -07:00
Emisse
68e3a49219 Atlas Update 1 (#7704) 2022-04-23 16:44:42 -07:00
EmoGarbage404
085545bff4 NT Barratry [NEW MAP] (#7621)
* first draft

* smol update, do not take heed

* Update animals.yml

* big update

* adressing feedback

* drone room
2022-04-23 14:44:07 -05:00
Peptide90
b996465c63 splitstation massive update (#7674)
* splitstation massive update

* lighting fixes, additional secret location.

* more spawn points and pet spawns

* various fixes and small changes
2022-04-21 08:19:44 -05:00
Emisse
34aded2c19 Atlas Ship (#7676)
* Add files via upload

* Add files via upload

* Update Resources/Prototypes/Maps/atlas.yml

* Update Resources/Prototypes/Maps/atlas.yml

Co-authored-by: Moony <moonheart08@users.noreply.github.com>

Co-authored-by: Moony <moonheart08@users.noreply.github.com>
2022-04-20 16:08:43 -05:00
Emisse
80138a5a13 Saltern Update 2.91 (#7665)
* Saltern Update 2.91

* Fix LoadSaveTicksSaveSaltern test

* God help me

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-04-20 22:09:50 +10:00
Emisse
5b79348b6e Marathon Update 1.3 (#7662) 2022-04-20 20:53:05 +10:00
Emisse
24760ca75a Bagel Update 12.3 (#7661) 2022-04-20 20:47:32 +10:00
Leon Friedrich
66b28c4524 fix airlock collision (#7623) 2022-04-18 13:25:19 +10:00
TimrodDX
383f9c1d43 Adds airlock painters and map posters to Delta (#7591) 2022-04-18 12:22:56 +10:00
Emisse
3255411324 Saltern Update 2.9 (#7585) 2022-04-16 09:16:52 -05:00
Emisse
2f6e88ee1e Moose Update 1.8 (#7584) 2022-04-16 09:16:10 -05:00
Emisse
c0c20edd7c Marathon Update 1.2 (#7583) 2022-04-16 09:15:58 -05:00
Emisse
a427fe38bb Bagel Update 12.2 (#7582) 2022-04-16 09:15:44 -05:00
Peptide90
579df1d020 Split Station 2.1 (Minor fixes) (#7565) 2022-04-15 11:43:39 -07:00
TimrodDX
fbb2b741b0 Fixes Delta's atmos (#7549) 2022-04-14 17:23:26 +10:00
Emisse
5b5ece57b1 Pillar Update 5.4 (#7522)
* Pillar Update 5.4

* Add files via upload
2022-04-12 10:12:31 -05:00
TimrodDX
0d76a7961e Adds stamps and the janitor trolley to Delta (#7520) 2022-04-11 22:00:50 -05:00
Emisse
c4ebfc22e3 Bagel Update 12.1 (#7512) 2022-04-11 16:12:45 -05:00
Emisse
55ec01f748 Bagel Update 1.1 (#7514) 2022-04-11 16:12:39 -05:00
Emisse
efa12f1025 Moose Update 1.7 (#7515)
* Moose Update 1.7

* Add files via upload
2022-04-11 16:12:31 -05:00
Emisse
ed70076734 Saltern Update 2.8 (#7516) 2022-04-11 16:12:18 -05:00
TimrodDX
8d8b0e6376 Fixes wires in salvage on Delta (#7489) 2022-04-10 01:32:42 -05:00
Leon Friedrich
1317f0214a Fix decal crash (#7484) 2022-04-09 10:36:24 -05:00
mirrorcult
60226cb2e6 Bear hospital salvage (#7326) 2022-04-08 15:26:40 -07:00
EmoGarbage404
0ff9385748 5 New Salvage Maps (#7334) 2022-04-08 15:07:42 -07:00
Veritius
b880dd5770 Fix various misspellings and grammatical errors (#7397)
Co-authored-by: mirrorcult <lunarautomaton6@gmail.com>
2022-04-08 14:05:53 -07:00
TimrodDX
032cfe7d5b Updates Packed (#7459) 2022-04-07 11:08:02 -05:00
Emisse
f09abee8b7 Saltern Update 2.7 (#7422) 2022-04-07 08:43:26 -05:00
Emisse
c3e2758b61 Add files via upload (#7457) 2022-04-07 08:16:12 -05:00
TimrodDX
bafdec4d18 Fixes a number of issues on Delta, also links most shutters and blast doors (#7444) 2022-04-06 18:32:46 -05:00