Ed
|
5bcc378bbe
|
Clean up, increase build stability (#583)
* Update base.yml
* bandit -> sociopath
* some fixes
* syringe
* vaults
* Update ContentAudioSystem.CP14AmbientLoop.cs
|
2024-11-13 17:56:07 +03:00 |
|
Ed
|
b106554cfe
|
Prototypes work (#579)
* wrench
* station crates
* bottles
* barrel openable
* Update crates.yml
* mop fix
* broom fix
* crossbolt size fix
* bottles fix
* Update closets.yml
* Update anvil.yml
* Update crates.yml
|
2024-11-12 12:42:45 +03:00 |
|
Ed
|
87dc3f9fa5
|
Order board (#546)
* orders board! work for the Witcher
* stamps
* wtf
* Update closets.yml
|
2024-11-08 00:10:59 +03:00 |
|
Ed
|
ab7296ff4a
|
Demiplan ruins (#544)
* ruins
* Update spawners.yml
|
2024-11-07 17:45:21 +03:00 |
|
Ed
|
955145a9a5
|
Merge remote-tracking branch 'upstream/master' into ed-06-11-2024-upstream
# Conflicts:
# Resources/Changelog/Changelog.yml
# Resources/Credits/GitHub.txt
# Resources/Prototypes/Entities/Mobs/Player/silicon.yml
|
2024-11-06 16:53:24 +03:00 |
|
Ed
|
ae27cf7e08
|
Revert "Merge remote-tracking branch 'upstream/master' into ed-06-11-2024-upstream"
This reverts commit 1579da881a, reversing
changes made to a9bdab0705.
|
2024-11-06 16:52:08 +03:00 |
|
Ed
|
1579da881a
|
Merge remote-tracking branch 'upstream/master' into ed-06-11-2024-upstream
|
2024-11-06 16:51:42 +03:00 |
|
Ed
|
54c7a40967
|
Blacksmith role (#534)
* disable crowbar door prying
* blacksmith role
* finish role
* map update
* more recipes to anvil
* Update arenas.yml
* glass!
* ores rebalance
|
2024-11-04 16:25:19 +03:00 |
|
Preston Smith
|
146ae8a6a6
|
Give Nukies a Hand Labeler (#33053)
* Add hand-labeler to nukie planet
* Rearrange nukie chem table
|
2024-11-02 01:44:15 +01:00 |
|
Ed
|
2b9d949eea
|
Demiplan polishing 2 (#528)
* wizden PR copy
* starter rooms
* grass geode location, new modifiers
|
2024-11-02 00:59:55 +03:00 |
|
Ed
|
5c4b5d1572
|
Demiplans expeditions (#523)
* simple expedition generation
* add simple test key
* expedition map component
* some funny procedural testing
* refactor expeditions from planetbiome to islanddungeons
* some work
* fix: grid dungeon, not map planet dungeon
* unhardcode map components
* finish T1 expedition generation
* Update preset.yml
* indestructable stone
* mob water occlusion
* caves T1 expedition
* Update CP14SpawnExpeditionJob.cs
* Delete shared MissionParams
* rename to demiplans
* pass mapid into job
* demiplan connections
* demiplan exits
* random entry points
* Update config.yml
* some cleanup and renaming
* radius one-time teleport
* rename connections to exitPoint
* merge entry and exit point into rift component
* demipan closing - all rifts deletion
* demiplanEEEEEE
* fixes
* delete floating visuals
* Update CP14DemiplaneTravelingSystem.cs
* intro and outro demiplan music
* rift cores and flashing
* pulling support
* pulling fix + generatordata fix?
* auto destrot demiplans??
|
2024-10-31 19:13:44 +03:00 |
|
Ed
|
16e23098db
|
Merge pull request #520 from crystallpunk-14/ed-29-10-2024-upstream
Stable upstream sync
|
2024-10-29 15:15:14 +03:00 |
|
Ed
|
df53f9a01f
|
remove ship target point
|
2024-10-29 14:18:27 +03:00 |
|
Ed
|
817c53d98f
|
Merge branch 'master' into ed-29-10-2024-upstream
|
2024-10-29 11:51:03 +03:00 |
|
Ed
|
cc80518d2f
|
World minor changes (#519)
* x2 weather time
* remove alchemy test and battle royale maps, add simple island map
* island map + ocean parallax
* map floor occluder sys
* undercliff test
* update sand and ocean sprite
* Revert "undercliff test"
This reverts commit c484fe630a.
* more experiments
* Revert "more experiments"
This reverts commit a7f30fd608.
* Update default.yml
* Update debug.yml
|
2024-10-29 11:48:52 +03:00 |
|
Ed
|
ae3cbd6092
|
Merge remote-tracking branch 'upstream/stable' into ed-29-10-2024-upstream
# Conflicts:
# Content.Server/Chat/Managers/ChatSanitizationManager.cs
# Content.Server/Temperature/Systems/TemperatureSystem.cs
# Content.Shared/Localizations/ContentLocalizationManager.cs
|
2024-10-29 11:16:56 +03:00 |
|
joshepvodka
|
7ac2d9a8bd
|
Adds beacon to core station's vox box (#33004)
* added vox beacon
* changed name to vox break room
* added vox box station beacon
* fixes messed up diff
|
2024-10-28 16:05:01 -06:00 |
|
joshepvodka
|
dbef6cbecc
|
Adds beacon to oasis station's vox box (#33003)
* added vox beacon
* changed name to vox break room
* added vox box station beacon
|
2024-10-28 16:04:49 -06:00 |
|
joshepvodka
|
e900ad7742
|
Adds beacon to bagel station's vox box (#33002)
* added vox beacon
* changed name to vox break room
* added voxbox station beacon
|
2024-10-28 16:04:37 -06:00 |
|
joshepvodka
|
93315d4695
|
Adds beacon to box station's vox box (#33001)
* added vox beacon
* changed name to vox break room
* added vox box station beacon
|
2024-10-28 16:04:10 -06:00 |
|
joshepvodka
|
30017bc2d8
|
Adds beacon to cog station vox box (#33000)
* added vox beacon
* changed name to vox break room
* added vox box station beacon
|
2024-10-28 16:03:13 -06:00 |
|
Ed
|
2850665e33
|
Tavern map update (#516)
* recursive currency calculation
* map update
* fix
|
2024-10-27 17:09:06 +03:00 |
|
Ed
|
08a4c4340d
|
Bank implementation (#512)
* get currency refactor
* bank work
* finish vault markers
* add bank doors
* map update
* loadouts
* Update CP14StationTravelingStoreShipTargetComponent.cs
* oopsie
|
2024-10-26 18:18:30 +03:00 |
|
Ilya246
|
5a10bf0954
|
add atmosia to devmap (#32460)
change
|
2024-10-25 22:04:27 -05:00 |
|
Spanky
|
92c49afcf2
|
Packed Update (#32971)
Packed map update, significantly changes arrivals, perma, AI core, and misc other QOL.
|
2024-10-23 16:19:35 -06:00 |
|
Spessmann
|
8142ac007f
|
Cog sec maints updated (#32948)
updated sec maints
|
2024-10-22 00:30:31 -06:00 |
|
Southbridge
|
a227c3bb42
|
Box Station - Resolved #32771, #32949, and #32921 (#32950)
* Resolved #32771, #32949, and #32921
* Resolved build issue
|
2024-10-21 23:39:34 -06:00 |
|
Ed
|
85463d380f
|
Bank preparation (#499)
* TownSend condition
* personal objectives update
* add common objectives
* add common objectives
* tweaks
* quartermaster and merchant
* job spawner icons
* add merchants to tavern map
|
2024-10-20 21:20:16 +03:00 |
|
Spessmann
|
4c3fd3130d
|
Cog small update (#32922)
based sigma
|
2024-10-19 22:17:10 -06:00 |
|
Ed
|
78e94b1623
|
Airship + Unittest (#496)
* wings
* update cargo shuttle
* update goblin sound
* add new unit test
* Update CP14EntityTest.cs
* Update CP14RitualTest.cs
* add buy and sell hints
* paper reading
* hardwork
* clean task
* body forkfiltered
* Update crystal.yml
* more fork flitered
* Update basic.yml
* Update wild.yml
* Update CP14EntityTest.cs
* realise pusharing
* pusharing alchemical vials
* coin disappear works
* Fix
|
2024-10-19 01:09:15 +03:00 |
|
Ed
|
f14177bf86
|
Alchemist update (#497)
* rebalance alchemy resource
* lockers alternative
* map update
|
2024-10-18 14:56:01 +03:00 |
|
Spessmann
|
81c654ddce
|
Cog update (engi buff) (#32875)
krill issue
|
2024-10-17 19:46:06 -06:00 |
|
Scribbles0
|
48f8aac732
|
Fland AI core LV change (#32770)
small ai core lv change
|
2024-10-17 12:18:43 -06:00 |
|
Ed
|
dc47bb2283
|
Merge remote-tracking branch 'upstream/stable' into ed-15-10-2024-upstream
# Conflicts:
# Content.Server/Station/Systems/StationSpawningSystem.cs
|
2024-10-15 15:25:44 +03:00 |
|
Ed
|
d259191d3d
|
Cargo system (#487)
* simple storeship arriving
* pupu
* ship cycling
* buy positions prototypes
* i hate UI
* PriceControl
* second tab ui
* baloon! pallets!
* update shop in town
* setup billboard timer
* split to sell and buy categories
* renaming gaming
* actually selling
* fix infinity selling
* improve timer
* move description too rigt part UI
* bar selling
* iron cabinet
* purge currency categories
* remove town balance, add money box
* special proposal, FTLImmune anchor
* fix UI
* remove tests buying
* Update CP14StoreWindow.xaml.cs
* currency converter
* currency clean up
* Update CP14CargoSystem.cs
* clean up part 2
* rider petpet
* coins audio
* coin improvment
* Update coins.yml
* translate
* more coins roundstart
* Update wallet.yml
* Update wallet.yml
* generate coin problem fix
* refactor proto reading
* fixes
* huh
* shuttle logshit fix, add to tavern map
* Update CP14StationTravelingStoreShipTargetComponent.cs
|
2024-10-15 15:22:06 +03:00 |
|
scrivoy
|
8c17624896
|
Marathon: Add EVA Helmets to Perma and add Disposal Unit front of Atmos (#32799)
add: EVA helmets to perma, disposals bin atmos
|
2024-10-14 05:23:41 -06:00 |
|
lzk
|
b999752e88
|
Update omega evac (#32748)
- rename to evac omega
- add screens
|
2024-10-12 13:03:55 -06:00 |
|
Scribbles0
|
561297495f
|
Marathon AI tweaks (#32756)
* camera tweaks
* add intercoms
|
2024-10-12 13:03:31 -06:00 |
|
Saphire Lattice
|
729de28844
|
Fix Centcom cloning scanner (#32746)
* Fix Centcom cloning scanner
* Fix uid conflict
|
2024-10-11 03:00:54 -06:00 |
|
lzk
|
7a4cefa8ac
|
update fland (#32747)
add captain id card
|
2024-10-11 02:35:46 -06:00 |
|
Ed
|
844b4d4616
|
underworld (#485)
|
2024-10-09 16:19:38 +03:00 |
|
Ubaser
|
38fd54a1bf
|
Update Core (#32665)
* add
* remove invalids
* fix
* yes
|
2024-10-07 19:59:06 -06:00 |
|
Scribbles0
|
6b10e00da4
|
oasis update (#32679)
sec apcs and ai core wiring
|
2024-10-06 19:24:44 -06:00 |
|
Spessmann
|
126c1786de
|
Cog update fix (#32657)
* fixes for cog
* ok fixed that
|
2024-10-05 20:30:10 -06:00 |
|
Spessmann
|
2287df13bd
|
Cog engineering DIY update (#32651)
engineers forced to do work, sobbing
|
2024-10-05 12:08:39 -06:00 |
|
TakoDragon
|
db64ad9c4d
|
Marathon Removed double walls and a wrong cable (#32603)
removed double walls and cable fucks
|
2024-10-04 17:18:46 -06:00 |
|
Southbridge
|
c0d67429ab
|
Box Station - Connected Recycler, rerouted power for Singlo Substation, added law boards to AI upload room (#32608)
* Fixed #32443 and #30375
* Fixed duplicate ID issue, and added lawboards to resolve #32581
* Removed Overlord board and added Crewsimov
* Removed invalid UserInterface component
|
2024-10-03 19:12:59 -06:00 |
|
Ed
|
ab1e071fdf
|
Merge remote-tracking branch 'upstream/master' into ed-03-10-2024-upstream
# Conflicts:
# Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
|
2024-10-03 17:34:08 +03:00 |
|
Preston Smith
|
2df61e4e71
|
Added LV cables to Marathon SMES room (#32574)
Added LV cables to SMES room, powering light and computers.
|
2024-10-01 23:30:58 -06:00 |
|
Scribbles0
|
20aa14e4f7
|
Cog update (#32585)
* ai core upgrades
* fix distro color
|
2024-10-01 19:45:54 -06:00 |
|