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
84e07c1ded
Next spellStorage experiment ( #572 )
...
* scroll spells
* refactor magic system
* Update spawners.yml
* safe use
* Update magic-spells.ftl
* fix magic containers
* fix mole
* all scrolls
* remove shadow step ring
* fix scrolls
2024-11-10 16:15:08 +03:00
Ed
b5df675187
Spellcaster slowdown, mole nerf, new shoulder slot, healing staff ( #538 )
...
* healing staff sprite
* new back slot and move all big things to whis slot
* replace ring to staff
* caster sowdown! Mole rebalance
* loadouts fix
* fix weapon rotation
* Update spawners.yml
2024-11-05 19:05:40 +03:00
Ed
16a0b99daf
Magic crystal lanterns + Aftertest balance ( #532 )
...
* lamp visual update
* deleete ice floor spell
* mana gift spell
* magic lantern
* wallmount crystal lamps
* QoL
* crafting
* Update StyleNano.cs
* examining simplify
* rings name
* remove snakes modifier
* trinkets update
* remove snakes, add boars and rabbits to demiplans
* Update flashlight.yml
* fix
* Update test.yml
* Update migration.yml
* ыы
2024-11-04 00:55:15 +03:00
Ed
3e43d0695f
Some tile update + dayflin resprite ( #517 )
...
* foundtion update
* dirt from grass and seedbed craft rebalance
* crowbar, tile prying
* fix high fence
* yellow dayflin sprite update
* fix currency calculation bug
* Update sewing_table.yml
2024-10-27 21:37:15 +03:00
Ed
c31f1ad130
Banker and commandant outfit + fix purchase bugs ( #509 )
...
* reaname QM to commandant, and merchant to banker
* Update game_presets.yml
* add bureaucracy crate
* fix buying
* bowler hats
* reorganize shirt folders
* cloak refactor, add commandant cloak
* Update battle_royale_temp.yml
* Update migration.yml
2024-10-25 00:23:35 +03:00
Ed
dacac22663
Marble ( #502 )
...
* marble floor
* fix
* bank wallpaper, marble floor resprite
* marble window
* rename whitebrick wall to marble wall, delete iron walls
2024-10-21 23:35:06 +03:00
Ed
41d3ccab8b
Locks update ( #501 )
...
* massive code refactor
* fix
* ftl fix
* rider pet pet
* hacking doAfter
* Update SharedCP14LockKeySystem.cs
* optimization
* Update migration.yml
* Update migration.yml
2024-10-21 14:20:05 +03: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
Ed
f14177bf86
Alchemist update ( #497 )
...
* rebalance alchemy resource
* lockers alternative
* map update
2024-10-18 14:56:01 +03:00
Ed
9a8d30022a
Wallpaper update + paper folder ( #495 )
...
* paper folders
* Update CP14WorkbenchSystem.cs
* wallpaper update
* Update walls.yml
* remove cable sprites
* Update migration.yml
2024-10-17 13:08:36 +03: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
NotSoDamn
644d7ab682
BaseAdvancedPen migration (#32638 )
...
* Update migration.yml
* Update Resources/migration.yml
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com >
---------
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com >
2024-10-04 23:13:30 +03:00
Ed
35baaacbce
Blue amanita flower, mana potions! ( #478 )
...
* merge bloodgrass and red flowers
* delete sprites
* add blue amanita sprites
* restruct alchemy reactions folders
* mana heal and damage reagent
* add gatherable to worldgen
* fixes
* Update sewing_table.yml
* Update Alchemy.xml
* Update Alchemy.xml
* Update migration.yml
2024-10-04 19:19:13 +03:00
Ed
dca61c009d
2 new Lobby image, some bugfix ( #468 )
...
* +2 lobby screens
* Update goblin.yml
* workbench recipes remove nesting
* tips update
* Update sewing_table.yml
2024-09-28 01:29:02 +03:00
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
Ed
c2704165d3
Loadout update ( #461 )
...
* some full species sprite
* floral wreath
* alchemist cloak, loadout restruct
* giant head clothing refactor
* Update entities.ftl
* backpacks loadout! yay
* trinkets
* Update general.yml
* oopsie
* Update general.yml
* fixes
* Delete test-ship.yml
2024-09-27 00:36:09 +03:00
Ed
a92c623672
Fences update ( #458 )
...
* small fences update
* Update wooden_fence.yml
* reparent all fences, fix high fence
* iron grille fix
* migration
* Update migration.yml
* construction recipes
* Update migration.yml
* fix dev map
* Update migration.yml
* Update migration.yml
* Update migration.yml
2024-09-26 14:57:24 +03:00
Jaraten
693ba93e44
Content pack jr ( #457 )
...
* 24.09.24
* wallpapers
* backpack parenting setup
* goblin backpack
---------
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com >
2024-09-25 12:31:31 +03:00
Ed
75bc6d4eac
Doors update ( #455 )
...
* sprites
* mirrored + windowed wooden doors
* cooking table sprite
* craftable doors
2024-09-24 21:19:52 +03:00
Ed
07637bd691
Prototypes cleaning: destructable, flammable ( #453 )
...
* damage rethinking, bush fix
* flammable rethink
* trying to fix fire
* airtight false default
* autoignite
* Update fire.yml
* Update fire.yml
* Update fire.yml
2024-09-24 13:46:26 +03:00
Ed
0456d40bef
Content pack ( #444 )
...
* cable sprite
* steel plates
* iron wall
* vladimirs resprite
* resprite cables
* cable item
* lv cable finish
* round table
* curtains! (need resprite)
* plates + cucumbers
* more procedural cooking
* some tweaks
* fix test
* пипяу
* finish
* ah
* l
* pip
* some cool
* hide station ai
* revert localization
* Update crates.yml
* Update crates.yml
* red and blue curtains
* Update crates.yml
* Update crates.yml
* fix cupboard
* Update exp_tavern.yml
* fix sliceable recursion
2024-09-23 14:53:03 +03:00
deltanedas
9b9853439c
make flare recipe roundstart instead of blueprint ( #32303 )
...
* make flare recipe roundstart instead of blueprint
* migrate it
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-09-19 07:45:03 -06:00
Ed
cc02a133e0
Merge remote-tracking branch 'upstream/master' into ed-17-09-2024-upstream2
...
# Conflicts:
# Content.Server/GameTicking/GameTicker.Spawning.cs
2024-09-17 11:54:36 +03:00
IProduceWidgets
62f268cbb0
Impliment visitor ID, reorganize shuttle event and ghost role yml, standardize many visitor roles, add more unknown shuttles. ( #28098 )
...
* Add Protagonists
* Give visitors the right PDA at least, we need that RP value.
* tidy up
* spell check my beloved
* Everything about jobs have the same id names ahhhh!
* s
* rarity scarity.
* Update Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl
Co-authored-by: Tayrtahn <tayrtahn@gmail.com >
* cargo event now no has cargo access doors.
* break everything.
* still WIP, please excuse.
* finish all role loadouts
* extra roles, fix up grids, special pdas.
* Ghost role descriptions and mime powers
* rest of the fucking owl
* I tripped.
* I also fell.
* Fix the broken entity storage?
* hide mess under rug
* Stuff the rest of the mess into a closet.
* I forgor a spinny majig.
* a small lighting tweak.
* 1984 shuttles to new pr.
* 1984 shuttles to new pr 2 electric boogaloo
* poke the tests
* Revert "1984 shuttles to new pr 2 electric boogaloo"
This reverts commit b2ea7053b73cb17b59f8a80b23978a04a6a45a56.
* cowboy boot cleanup
* tableify
* antagimmunities
* Should be functional.
* vox safing
* un1984 clowns I guess
* oops forgor one
* misplaced file
* misplaced file v2
* weird test fail but okay
* Shuttles rarer
* Shuttle testing, fans, and power sanity. Also return of the syndie evac.
* le balance
* no write over fancy paper
* rerun tests
---------
Co-authored-by: Tayrtahn <tayrtahn@gmail.com >
2024-09-10 00:40:00 -06:00
Ed
4691bdedb4
remove debug furnace
2024-09-09 16:57:58 +03: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
lzk
a1b27db35f
remove HatBase ( #31971 )
2024-09-08 18:23:01 +03:00
LankLTE
be94aff304
Remove Antimov and Overlord law boards from maps ( #31908 )
...
Remove Antimov and Overlord
2024-09-07 02:45:51 -06:00
Nemanja
c88666c66e
Salvage Equipment Rebalance [Reclaimer Removal] ( #31333 )
...
* Salvage Equipment Rebalance
* oh yeah!
* make fire extinguisher 100%
2024-09-01 01:39:32 +02:00
lzk
0d51839261
Remove fake centcom stuff ( #30747 )
...
* Remove fake centcom stuff
* forgor
* bruh
* FUCK TOOLBOX
* weh??
2024-08-31 17:45:05 +02: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
lzk
512d27ca6b
Add black suspenders ( #29055 )
...
* Black suspenders
* fix
* fix linter
2024-08-28 11:43:30 +02:00
Ed
a944cd9834
Cloth pack ( #423 )
...
* content
* Update battle_royale_temp.yml
2024-08-27 08:58:58 +05:00
Ed
79515d9303
Convenient Z-Levels ( #421 )
...
* clear ores and herbals frmo generation
* remake simple zlevels system
* GetMapOffset
* woohoo
* autolink between zlevels
* 5am
* somwthing sommetinh work
* Update CP14StationZLevelsSystem.cs
* fix biomespawner portal deletion
* some docs
* Revert "clear ores and herbals frmo generation"
This reverts commit 658d15a602
2024-08-25 17:53:15 +03:00
Ed
d3189b83cf
Pumpkin + Cabbage ( #417 )
...
* seeds
* import Omsoyk plant sprites
* cabbage slicing
* sliceable pumpkin
* some tweaks
* seedbed clean fix, remove shitcode systems
* seed crafting, knife fix
* utencil
* Update base.yml
* cabbage rebalance
* abstract seed
2024-08-22 17:35:00 +03:00
LankLTE
0f6808e16a
Remove the shock collar. ( #31229 )
...
* Remove the shock collar.
* add migration
2024-08-21 13:56:56 -04: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
Nemanja
476c7751c4
Recycler Overhaul ( #30802 )
...
* Recycler overhaul
* remove
2024-08-18 21:39:00 -06:00
potato1234_x
1952618203
Tea Plant and Blue Pumpkin ( #25092 )
...
* tea plant, blumpkin
* fix linter
* fix tests pls
* bloompkin
* forgor rsi
* work please
* WORK PLEASE
* migration of the blumpkins
* it is now glumpkin
* lowercase
* uppercase
* adjust values and fix blorbo
wtf when did blumpkin donut turn into blorbo donut what
* fix test
* update
* fix stupid mistake
* Update meta.json
* totally not a webedit
* not a webedit 2
* nitpicks
2024-08-18 16:28:18 -06:00
Ed
e659eb992f
Custom Taco & Kebabs - FoodSequence 2 ( #30905 )
...
* control layer ordering
* sprite update
* taco!
* taco naming gen
* fix separator naming
* some proto fixes
* default naming separation
* fix taco naming
* rat update
* hamsterburger
* organs taco
* remove from spawners
* fixes
* fix separators and lemons
* Update food-sequence.ftl
* randomization offset
* fix
* kebabs refactor
* fix
* skewer weapon
* Update food_single.yml
* Update migration.yml
* suppermatter
* hamlet centered
* hamsburger
* Update dead-0.png
* 20 -> 4 burger layers max
* Update burger.yml
* canReact: false
* capfruit update
* Update burger.yml
* Update burger.yml
* Update produce.yml
* some fixes
* Update Resources/Textures/Objects/Consumable/Food/taco.rsi/meta.json
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
* Update Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
* Update Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
* chicken
* Update food-sequence.ftl
* documentation
* fixes
* Update meat.yml
* Update meat.yml
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
2024-08-14 15:04:00 +02:00
Ed
d9336781f1
Merge remote-tracking branch 'upstream/master' into ed-05-08-2024-upstream
...
# Conflicts:
# Content.Shared/Inventory/InventorySystem.Equip.cs
# Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
2024-08-12 14:40:15 +03:00
Ubaser
7e17063b86
Removes variant cube migration ( #30934 )
...
add
2024-08-12 02:16:59 -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
lzk
1a672c9c6d
add more logic gates prototypes for mapping ( #30385 )
...
* Add more logic gates types for mapping
* i forgor
* me stupid
* nuh
2024-07-30 09:55:21 -04:00
TurboTracker
2fc9a65da6
Update migration to remove maint detective armor ( #30486 )
...
Jensen migration
2024-07-29 23:41:52 -07:00
Ed
a81465f0d9
Rock and stone mini update ( #344 )
...
* ore resprite
* tools restruct, ore repath, add pickaxr
* fixes
* localizattion sync
* fixes
* Update migration.yml
2024-07-22 18:46:26 +03:00
Ed
2bf17fdc35
Content pack ( #337 )
...
* added rope
* black shirt replace
* Update migration.yml
* more berets
* loadout update
* captain role and jacket
* bruhh captain cap
* add one-handed sword
* shield!
* Update entities.ftl
2024-07-19 00:03:08 +03:00
