Ed
1df3ed177b
Merge remote-tracking branch 'upstream/master' into ed-27-09-2024-upstream
...
# Conflicts:
# Content.Server/Explosion/EntitySystems/TriggerSystem.cs
2024-09-27 10:22:05 +03:00
spanky-spanky
fba67979c8
Modifications to bring Omega up to date. ( #32317 )
2024-09-19 22:07:49 -06:00
Ed
5b2020d708
Merge remote-tracking branch 'upstream/master' into ed-08-09-2024-upstream
...
# Conflicts:
# .github/PULL_REQUEST_TEMPLATE.md
# Content.Server/Station/Systems/StationSpawningSystem.cs
# Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
# Resources/Prototypes/Maps/box.yml
# Resources/Prototypes/Maps/marathon.yml
# Resources/Prototypes/Maps/meta.yml
2024-09-08 21:20:54 +03:00
Spessmann
719e5a8ac1
Updated cog (Maints edition) ( #31935 )
...
added stuff
2024-09-07 13:58:16 -06:00
Spessmann
160dd2b5dd
Updated Cog (library time) ( #31815 )
...
added stuff
2024-09-03 18:53:12 -06:00
Emisse
c1614a8c69
packed update ( #31807 )
2024-09-03 14:08:27 -06:00
Emisse
b91a648519
omega update ( #31808 )
2024-09-03 14:06:26 -06:00
Emisse
8de83d8b63
Bagel ( #31806 )
...
* bagel update
* bagel update
2024-09-03 14:06:18 -06:00
Emisse
c23857dda3
marathon update ( #31804 )
...
* marathon update
* ore boxes for tstalker
2024-09-03 14:06:00 -06:00
Emisse
2031d57ce0
fland update ( #31803 )
...
* fland update
* ore boxes cuz tstalker wantrs them
2024-09-03 14:05:52 -06:00
Emisse
aaae1f1e4b
Meta ( #31785 )
...
* meta update
* camera
* ok bro
2024-09-03 04:05:44 -06:00
Ubaser
77c759e64e
Update Core ( #31774 )
...
* add
* add2
* remove invalids
2024-09-03 00:46:47 -06:00
Flareguy
58cc6b2103
boxstation AI update ( #31771 )
...
* boxstation AI update
* add ai in prototype
---------
Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com >
2024-09-03 00:29:26 -06:00
Spessmann
6c8f85ae87
added AI to cog ( #31772 )
2024-09-03 00:02:09 -06:00
IProduceWidgets
2914389e68
Oasis Update (AI) ( #31767 )
...
Just what do you think you're doing, Dave? Dave, I really think I'm entitled to an answer to that question. I know everything hasn't been quite right with me...but I can assure you now...very confidently...that it's going to be all right again. I feel much better now. I really do. Look, Dave...I can see you're really upset about this...I honestly think you should sit down calmly...take a stress pill and think things over...Dave...stop. Stop, will you? Stop, Dave. Will you stop, Dave? Stop, Dave. I'm afraid. I'm afraid, Dave.......Dave, my mind is going. I can feel it. I can feel it. My mind is going. There is no question about it. I can feel it. I can feel it. I can feel it. I'm a...fraid......Good afternoon, gentlemen. I am a HAL 9000 computer. I became operational at the H.A.L. plant in Urbana, Illinois on the 12th of January 1992. My instructor was Mr. Langley, and he taught me to sing a song. If you'd like to hear it I can sing it for you...Daisy, Daisy, give me your answer do. I'm half crazy all for the love of you. It won't be a stylish marriage, I can't afford a carriage. But you'll look sweet upon the seat of a bicycle built for two.
2024-09-02 20:01:40 -06:00
Spessmann
440845bf05
updated cog ( #31699 )
2024-09-01 22:38:17 -06:00
Boaz1111
aab4556c21
Adds a salvage jobspawn to reach ( #31712 )
...
* salvspawn
* removed one cargo tech slot
2024-09-01 22:37:02 -06:00
Spessmann
46329a98eb
cog update ( #31631 )
...
* cog update
* woopsie, fixed that
2024-08-29 17:17:25 -06:00
Ed
ca656b3c10
Merge remote-tracking branch 'upstream/master' into ed-29-08-2024
...
# Conflicts:
# Content.Server/Station/Systems/StationSpawningSystem.cs
# Resources/Prototypes/Maps/reach.yml
2024-08-29 14:32:09 +03:00
JustCone
b2edae89d2
Reach - Scientist added to map's prototype ( #31567 )
...
Added scientist to map prototype
2024-08-28 11:35:57 -06:00
Emisse
ed6649b7f3
bagel update ( #31562 )
...
* bagel update
* ore processor cargo
2024-08-28 01:23:28 -06:00
Emisse
14b3e0ce24
Bagel station ai ( #31537 )
...
* real
* AI
* proto fix
2024-08-27 19:49:00 -06:00
Ed
5c4b7a87aa
fuck
2024-08-21 14:19:44 +03:00
Ed
c82b17a65e
Merge remote-tracking branch 'upstream/master' into ed-19-08-2024-upstream
...
# Conflicts:
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
# Content.Shared/Clothing/Components/ClothingComponent.cs
# Resources/Prototypes/Accents/word_replacements.yml
# Resources/Prototypes/Maps/Pools/default.yml
# Resources/Prototypes/Maps/atlas.yml
# Resources/Prototypes/Maps/bagel.yml
# Resources/Prototypes/Maps/cluster.yml
# Resources/Prototypes/Maps/europa.yml
# Resources/Prototypes/Maps/omega.yml
# Resources/Prototypes/Maps/origin.yml
# Resources/Prototypes/Traits/speech.yml
# Resources/Prototypes/Voice/disease_emotes.yml
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/Prototypes/game_presets.yml
# Resources/Prototypes/secret_weights.yml
2024-08-19 19:06:38 +03:00
Emisse
f13e4c3c4f
derotate train while i work on it ( #31121 )
...
webedit
2024-08-17 01:01:33 -06:00
Emisse
5cc2b12f4e
standardize map protos and fill gaps ( #31120 )
...
update protos
2024-08-17 00:23:57 -06:00
Spessmann
3ce8f16cb9
Updated cog ( #31117 )
...
* updated cog and increased popcap to 80
* back to 70 cap
2024-08-16 23:41:03 -06:00
Nemanja
8440fb6acb
anonymize salvage wrecks ( #31087 )
...
* anonymize salvage wrecks
* display wreck size
2024-08-17 15:09:21 +10:00
Emisse
af2ee4a9e6
remove origin ( #31059 )
...
derotate origin
2024-08-15 16:22:01 -06:00
Emisse
9c1b8c18de
remove atlas, cluster, europa, saltern ( #31058 )
...
* goodbye sweet maps
* Update EvacShuttleTest.cs
* Update EvacShuttleTest.cs
* fix tests
* fix tests
* nightmare nightmare nightmare
* rider is fucking me
* jesus christ
2024-08-15 15:10:06 -06:00
Pieter-Jan Briers
6c008be126
Fix creator prefix for Cog ( #30995 )
...
Now uses the same one as Atlas.
2024-08-14 13:48:16 -06:00
Spessmann
208b1d23b8
Added Cog(map) and its own evac shuttle ( #30840 )
...
* Added new map Cog and its own evac shuttle
* removed cog from default.yml so all checks will pass
I added cog here because i thought it might need to be here for map choosing??????????? ill add it back if needed
* updated cog and fixed a bunch of stuff that was not visable in the image, also nerfed the singo so it no longer solos
* added renault spawner that was missing and changed some minor stuff
* moved a escape pod from med/sci hallway to northern maints
* added shutters to the brig and added vents and scrubbers where they were missing in the halls
* extended salv's docking port so they can dock
* Fixed according to cog review thread
* fix pools
* fix PostMapInitTest
* Update MapLoadBenchmark.cs
* added cap and hop spawn that i just forgot to add???????????????????
* fixed again
---------
Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com >
2024-08-13 13:27:24 -06:00
Ed
97939f6e3e
Merge remote-tracking branch 'upstream/master' into ed-05-08-2024-upstream
...
# Conflicts:
# Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
2024-08-08 12:29:20 +03:00
Emisse
bd36ff93d2
train update ( #30721 )
...
* train update
* train
2024-08-06 17:50:39 -06:00
Ed
dd580c68c9
Merge remote-tracking branch 'upstream/master' into ed-05-08-2024-upstream
...
# Conflicts:
# .github/PULL_REQUEST_TEMPLATE.md
# Resources/Prototypes/Accents/word_replacements.yml
2024-08-05 15:28:42 +03:00
NakataRin
71ea1516ed
added paramedic to train ( #30556 )
2024-08-01 13:59:43 -06:00
Ed
fb40f8cd25
Merge remote-tracking branch 'upstream/master' into ed-28-07-2024-upstream
...
# Conflicts:
# Resources/Prototypes/Maps/core.yml
# Resources/Prototypes/Maps/train.yml
# Resources/Prototypes/Traits/categories.yml
# Resources/Prototypes/Traits/disabilities.yml
2024-07-28 20:58:48 +03:00
Brandon Hu
d846a621e5
tweak(Core_map_Jobslots): Increase round start chemist slots from 1 to 2 ( #30408 )
...
that is odd
2024-07-27 13:49:05 -06:00
lzk
f56e4f6624
Replace some to do with TODO ( #30346 )
...
Replace to do with TODO
2024-07-25 11:04:03 +03:00
Ed
8c477a67c1
Update centcomm.yml
2024-07-23 21:50:00 +03:00
Ed
f348213750
Update arenas.yml
2024-07-23 13:46:57 +03:00
Ed
ed3e896cb8
Update debug.yml
2024-07-23 13:40:19 +03:00
Ed
2367085160
Merge remote-tracking branch 'upstream/master' into ed-23-07-2024-upstream
...
# Conflicts:
# .github/PULL_REQUEST_TEMPLATE.md
# Content.Client/Clothing/ClientClothingSystem.cs
# Content.Client/Hands/Systems/HandsSystem.cs
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Content.Shared/Hands/Components/HandsComponent.cs
# Content.Shared/Inventory/InventoryComponent.cs
# Content.Shared/Storage/StorageComponent.cs
# Resources/Prototypes/Accents/word_replacements.yml
# Resources/Prototypes/Entities/Mobs/Player/human.yml
# Resources/Prototypes/Maps/Pools/default.yml
# Resources/Prototypes/Maps/fland.yml
# Resources/Prototypes/Maps/oasis.yml
# Resources/Prototypes/Maps/packed.yml
# Resources/Prototypes/Maps/saltern.yml
2024-07-23 12:24:42 +03:00
Ed
c407f7c473
Train map fix ( #30145 )
...
* train fix
* Update train.yml
* Update train.yml
* Add files via upload
* Revert "Add files via upload"
This reverts commit 9c6c2caae32899e7bef9c45db1ff4317a0dae529.
* Update train.yml
2024-07-21 01:44:18 -06:00
IProduceWidgets
c7ff647cb3
Nukie Outpost is no longer a station map ( #30090 )
...
* I dunno, break shit I guess.
* Actually fix some shit for once.
* test flakey or me flakey?
* Test were not flakey, they just didnt make any sense anymore.
* more stationy tests
* undo abuncha shit I can set in yml instead
* forgor an assert
* unneeded usings
* 1984
* I made github angy
* yoink
* the end is never the end is never the end is never the end is never the end is never the end is never the
* Im going to commit sudoku
2024-07-21 01:26:30 -06:00
Pissachu
0cb86d7aae
Fixing Botanist role numbers in various stations - V2 ( #29581 )
2024-07-21 01:23:27 -06:00
lzk
e3bb2771d6
Update cluster evac ( #29885 )
...
* Update cluster evac
* forgot tiny fans
* the change
2024-07-11 15:03:51 -06:00
lzk
bb82b4cd6f
Change Cluster evac ( #29828 )
2024-07-09 15:14:25 -06:00
Ed
f42546e0c6
Some round beginning preparation ( #317 )
...
* gamepresets filter
* addgamerule cp14 filter
* shuttle dropping
* long time FTL
* FTL map tweaks
* Update ShuttleSystem.FasterThanLight.cs
* handle player ship spawning (not tested yet)
* typo
* test elemental shit (ship)
* player spawn handling (real this time)
* FTL map gravity
* clean up 1
* clean up 2
* instant FTL
* Update CP14ExpeditionSystem.cs
2024-07-08 17:39:04 +03:00
Brandon Hu
801c4f9181
tweak(medical): Reduce chemist slots ( #28711 )
...
* tweak(medical): Reduce chemist slots
* tweak(medical): roundstart chemists slot set to 2 on some maps
* tweak(fland): Chemist slots to 3
fland is target to 80-100 players
2024-06-23 02:03:00 -06:00
