Commit Graph

28428 Commits

Author SHA1 Message Date
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
038201bfde Ed 26 09 2024 server fix 2 (#460)
* fix server rules

* update tavern map, add arena

* Update exp_tavern.yml

* Update arenas.yml
2024-09-26 19:14:47 +03:00
Ed
622f1a23f3 fix Game map, set only Sandbox Gamemode, add game rules (#459)
* fix map and gamemod, add rule file

* move
2024-09-26 17:35:21 +03:00
Ed
d8263f0298 Shield Parry (#456)
* simple parry disarm

* idk, need testing

* parry fix
2024-09-26 16:59:22 +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
6b6a96e8d6 Create CP14Publish.yml 2024-09-25 00:08:42 +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
Tornado Tech
f3e9209af5 Added CP14 options menu (#454) 2024-09-24 13:30:19 +03:00
Ed
468e3c9f69 Some issues (#452)
* possible UI theming fix

* gob blood

* filter guidebooks by Culture settings

* deleted lobby track
2024-09-23 18:34:04 +03:00
Ed
ecdb02650b Update README.md 2024-09-23 17:30:49 +03:00
comasqw
8e27ef22ed Local helper update (#420)
* local helper update

* Delete entities.ftl

* Helper Refactor

* Revert "Helper Refactor"

This reverts commit 4aca315593.

* Helper Refactor

* Жееесть, я не знал про setdefault у словарей

* Update localization_helper.py

* Ревёрт "Жееесть, я не знал про setdefault у словарей"

Лучше бы я продолжал не знать о них

* чтооооо

* Update yml_parser.py

* Update entities.ftl

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
2024-09-23 15:43:02 +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
Ed
22171de45a Fix soil refilling (#442)
* fix soil

* Revert "fix soil"

This reverts commit 8176355286.

* Reapply "fix soil"

This reverts commit 0c958f4c9c.
2024-09-18 15:56:50 +03:00
vladimir.s
2eb120d529 Water resprite (#437) 2024-09-18 12:23:54 +03:00
vladimir.s
8d022dd502 Wooden objects and structures resprite (#436) 2024-09-17 13:06:34 +03:00
Ed
a638188943 Merge pull request #441 from crystallpunk-14/ed-17-09-2024-upstream2
Ed 17 09 2024 upstream
2024-09-17 13:04:27 +03:00
Ed
012223f4d3 Update directional.yml 2024-09-17 12:41:34 +03:00
Tornado Tech
8609efdd4a Added configuration for wave shader (#439) 2024-09-17 12:24:12 +03:00
Ed
db9e7e8f67 loc steal target 2024-09-17 12:14:13 +03:00
Ed
2cb094372c Update simple.yml 2024-09-17 12:08:07 +03: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
Ed
bc930da84f Merge pull request #435 from crystallpunk-14/ed-08-09-2024-upstream
Ed 08 09 2024 upstream
2024-09-17 11:51:51 +03:00
Ed
233b493865 remove autoignite 2024-09-17 11:40:23 +03:00
PJBot
5eaac00432 Automatic changelog update 2024-09-17 00:37:05 +00:00
Kanashi-Panda
41617b9754 Crayons buffed to 45 uses (#32061)
* Buffs crayons to 45 uses

* Update Resources/Prototypes/Entities/Objects/Fun/crayons.yml

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-09-17 02:35:57 +02:00
chavonadelal
ccc5f61584 Localization of steal targets (#30153)
* Localization of steal targets

* Correction of localization of theft objects

* The second correction of the localization of theft targets

* Update steal-target-groups.ftl

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>

* Revision of the localization method

* Choosing a simple option for localization

* Fix TechnologyDisk name

* Corrections based on feedback received

* correction of declension

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
2024-09-16 14:50:14 +02:00
PJBot
af53d55329 Automatic changelog update 2024-09-16 12:46:21 +00:00
MissKay1994
4abb6a7dd1 Lizards now metabolize chocolate (#32147)
* Eat the chocolate

* Update toxins.yml

* fully delete threshold lines

* Update snacks.yml

* Fix tags

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-09-16 14:45:15 +02:00
august-sun
b2dbad3779 Immovable Rod Spawn Addition: Lizard Plushie (#32113)
* a deadly weh

* Updated meteorswarms.yml

Updated probabilities to match exactly 1

* Updated immovable_rod.yml

Removed rotation

---------

Co-authored-by: august-sun <45527070+august.sun@users.noreply.github.com>
2024-09-16 12:37:26 +02:00
PJBot
f05498e851 Automatic changelog update 2024-09-16 10:02:55 +00:00
ArtisticRoomba
65329ab38d Change the binary translator key's contraband designation to syndicate contraband + minor sprite change for consistency (#32193)
* adds new icon, changes binary key icon and frame, changes contraband designation

* added back the regular key as admeme because it makes sense (why am I not thinking about these things)

* hehe I cannot read!
2024-09-16 12:01:49 +02:00
PJBot
b940d85156 Automatic changelog update 2024-09-16 09:00:06 +00:00
ArtisticRoomba
65bf3c61b6 Adds the syndicate Booze-O-Mat (Bruise-O-Mat) to nukie planet (#32107) 2024-09-16 02:59:00 -06:00
PJBot
a5850236dd Automatic changelog update 2024-09-16 08:53:00 +00:00
DrSmugleaf
4adbb8d969 Fix examine flickering until you examine something around you (#32205) 2024-09-16 18:51:53 +10:00
lzk
d872adc7aa Add glass morgue airlock (#32163) 2024-09-16 02:16:24 +02:00
PJBot
63ff116361 Automatic changelog update 2024-09-16 00:05:51 +00:00
drakewill-CRL
a61f425bd7 Fix sentient produce (#32192)
sentient does not apply to produce

Co-authored-by: PraxisMapper <praxismapper@gmail.com>
2024-09-16 02:04:44 +02:00
xprospero
aa6d5f9573 Rubber chicken toy (#29637)
* -added rubber chicken toy

* -Removed faulty SolutionContainerManager type

-Replaced default toy squeak sound with rubber chicken sound for on-trigger and on-collide.

* fixed raw material cost

* adjusted material composition

* - Added rubber chicken to CrateFunToyBox
- Added rubber chicken to MaintFluffTable under "uncommon group" so that it will spawn in maintenance

* Update Resources/Prototypes/Entities/Objects/Fun/toys.yml

---------

Co-authored-by: gambesun <116504990+gambesun@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-09-16 01:57:53 +02:00
lzk
1d4207a9f0 Fix plushie cutlass swing animation (#32157)
Fix plushie cutlass animation
2024-09-16 01:04:27 +02:00
PJBot
cb90fc42a6 Automatic changelog update 2024-09-15 20:05:43 +00:00
Plykiya
096ab07bf1 Nerfs meteor penetration force (#32109)
nerf meteor penetration force
2024-09-15 22:04:37 +02:00
PJBot
117a923c4a Automatic changelog update 2024-09-15 20:04:22 +00:00
TakoDragon
d8a0dadd18 French and Spanish traits (#30966)
* Traits languages

* Update traits.ftl

Silly thing

* No russian

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
2024-09-15 22:03:15 +02:00
lzk
7fed39d511 localize skeleton accent (#32166)
* localize skeleton accent

* commit number 2

* remove that from this

* this

* babushka
2024-09-15 21:49:05 +02:00
PJBot
12e2371c8d Automatic changelog update 2024-09-15 19:05:39 +00:00
deltanedas
02c7662617 prevent using holo inside containers (#32068)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-09-15 21:04:31 +02:00
Plykiya
540b1b15b1 Fix build and lint (#32180) 2024-09-14 21:00:06 -07:00