]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Toys entity tables (#41840)
authorāda <ss.adasts@gmail.com>
Sun, 14 Dec 2025 20:39:25 +0000 (14:39 -0600)
committerGitHub <noreply@github.com>
Sun, 14 Dec 2025 20:39:25 +0000 (20:39 +0000)
commit7eb797e7e5779831c6c6fcd39c36957023856fcb
tree13b5f9adb286acb61923bc9fefc3bbe5e8ffbbee
parentcc90ac99f8f5f74be4c5935a8b611272dd2c0f77
Toys entity tables (#41840)

* ai talks

* kill cheepo

* mech figures

* finished

* touchup

* wider net

* final changes

* never final

* fix test fail

* commit

* self review

* self review 2

* buff

* nerf

* microbalance continues until i'm happy

* requested and more

* toys.yml is scary

* pace yourself, hun

* finished tables

* update related tables

* finish tables

* spawners

* new item

* other tables and cargo crate

* move board games

* commit

* last changes

* last last changes

* bounty changes

* remove pies :o(

* readjust prices

* requested microbalance

* friends for life

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
16 files changed:
Resources/Locale/en-US/cargo/bounties.ftl
Resources/Prototypes/Catalog/Bounties/bounties.yml
Resources/Prototypes/Catalog/Fills/Boxes/general.yml
Resources/Prototypes/Catalog/Fills/Crates/cargo.yml
Resources/Prototypes/Catalog/Fills/Crates/fun.yml
Resources/Prototypes/Catalog/Fills/Crates/service.yml
Resources/Prototypes/Entities/Clothing/Back/smuggler.yml
Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml
Resources/Prototypes/Entities/Markers/Spawners/Random/toy_tabletop.yml [new file with mode: 0644]
Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml
Resources/Prototypes/Entities/Objects/Fun/pai.yml
Resources/Prototypes/Entities/Objects/Fun/toys.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml
Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml