juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,180 Commits 57 Branches 0 Tags
dcfd3f6aa5329545148d6c8b8cc641abdb24bc77
Commit Graph

17179 Commits

Author SHA1 Message Date
Jaraten
dcfd3f6aa5 New tiles (#274) 
* New tiles

* fix yaml & resprite

* migration fix

* ftl fix

* fix typo

* fix typo +1

* fix C# typo

---------

Co-authored-by: Ed <edwardxperia2000@gmail.com>
 2024-06-27 22:16:05 +03:00
comasqw
b592842a66 fix localization helper & protos descriptions in ftl (#282) 
* fix localization helper & protos descriptions in ftl

* Update main.py

* Update objects.ftl

* добавил ярлык напрямую к файлу локализации

* megasuperduperpuperTWEAK

* Update yml_parser.py

* Update yml_parser.py

* Update yml_parser.py

* Update yml_parser.py

* Update main.py

* tweak

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: Ed <edwardxperia2000@gmail.com>
 2024-06-27 22:07:25 +03:00
Ed
4d5fa91a39 Update hcut.swsl (#284) 2024-06-27 14:35:06 +03:00
Ed
798539899d experimental cliffs (#283) 2024-06-27 14:04:57 +03:00
Imperator Shlepa
e12f499594 Craft for stone walls. (#280) 
* 123123

* Update Resources/Prototypes/_CP14/Recipes/Construction/walls.yml

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2024-06-25 12:07:01 +03:00
Deserty0
eb8acd223a Size fix (#276) 
* Update eyes.yml

* уэээ
 2024-06-24 18:20:06 +03:00
Ed
34ae041f99 new lobby art (#267) 
* add lobby art

* Update typicalAlchemistDay.webp
 2024-06-22 19:27:57 +03:00
Jaraten
294f81bd0f resprite stone&red_brick-walls (#265) 2024-06-22 00:17:10 +03:00
Nim
3492a7892a Mannequin (#253) 
* mannequin

* fix

* fix2

* Update mannequin.yml

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2024-06-21 23:17:49 +03:00
Ed
e440434938 Update arenas.yml 2024-06-21 18:37:24 +03:00
Ed
3a910a7f7f Merge remote-tracking branch 'upstream/master' into ed-21-06-2024-upstream-sync 
# Conflicts:
#	Resources/Prototypes/Maps/europa.yml
#	Resources/Prototypes/Maps/train.yml
 2024-06-21 18:30:31 +03:00
Ed
e2f97ece50 Wallmount update (#262) 
* add wallmount systems

* add construction condition
 2024-06-21 18:27:18 +03:00
PJBot
730a4d289d Automatic changelog update 2024-06-21 12:07:14 +00:00
PJBot
6b13f5f0cb Automatic changelog update 2024-06-21 10:51:58 +00:00
PJBot
38439996e9 Automatic changelog update 2024-06-21 09:43:00 +00:00
TsjipTsjip
949a837720 Ghostrole rule updates (#29249) 
* First batch of ghostrole rule updates

* Second pass

* Re-word free agent

* Apply review comments

Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>

* You heard it here first folks

God rules are weird to write.

Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>

* Honkbot -> Free Agent

Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>

* Mimebot -> Free Agent

Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>

* Jonkbot -> Free Agent

Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>

* Softer blue

---------

Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>
 2024-06-21 04:41:54 -05:00
Alex Pavlenko
711acedfe5 feat: update cyborg parts naming for them to be ordered consistently,… (#29272) 
feat: update cyborg parts naming for them to be ordered consistently, closes #29270
 2024-06-21 09:43:15 +03:00
PJBot
7ef1002101 Automatic changelog update 2024-06-21 05:43:23 +00:00
slarticodefast
d62dddcfcb fix initial infected icons and add a briefing to the character menu (#29259) 2024-06-21 15:42:17 +10:00
Tayrtahn
880fef507d Replace BlockSolutionAccessComponent with an attempt event (#26988) 
* BlockSolutionAccessComponent now only blocks one specified solution.

* Significant overhaul
Separated spilling when worn functionality into its own component/system.
Removed BlockSolutionAccessComponent.
Added an event for solution access.
 2024-06-21 13:04:02 +10:00
PJBot
f94d663452 Automatic changelog update 2024-06-21 03:03:30 +00:00
MilenVolf
9cd2705d6b Make stasis bed power toggleable (#29268) 
Stasis bed is now power toggleable
 2024-06-21 13:02:23 +10:00
Tayrtahn
831d962e5a Make Loadout MinLimit not count failed attempts (#29264) 
Loadout MinLimit doesn't count failed attempts
 2024-06-21 10:15:37 +10:00
Pieter-Jan Briers
c33644532d Rate limit ahelps (#29219) 
* Make chat rate limits a general-purpose system.

Intending to use this with ahelps next.

* Rate limt ahelps

Fixes #28762

* Review comments
 2024-06-21 00:13:02 +02:00
Ed
03adbaf851 Tiles update + iron bards (#260) 
* wooden tiles update

* add iron bars

* dirt tile update

* fix foundation tile
 2024-06-21 00:18:47 +03:00
Ed
ec3efce19c Ed 20 06 2024 grass update (#259) 
* grass update

* +2 grass tile

* Update biomes_template_grasslands.yml

* Update biomes_template_grasslands.yml
 2024-06-20 18:18:29 +03:00
Ghagliiarghii
b90c6acacd golden plunger (#29043) 
* golden plunger

* Add wood material (the handle is still wood)

* 52 hours

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2024-06-21 00:24:36 +10:00
PJBot
0a3b221766 Automatic changelog update 2024-06-20 14:20:29 +00:00
MilenVolf
50146d4b98 Fix prying speed & log (#29210) 
* cleanup prototypes with `PryingComponent` & fix jaws of life prying speed

* Minor cleanup for tools and prying systems

Remove some obsolete methods.

* Fix doafter continues when not held & log

* Modifiy delays for floor prying

* Fix test fail
 2024-06-21 00:19:22 +10:00
PJBot
c91789a78d Automatic changelog update 2024-06-20 14:06:47 +00:00
Errant
d15eafe133 Survival Box Loadouts, Nitrogen Emergency tanks (#29131) 
* Nitrogen survival boxes

* Zero-setup workaround

* clown box

* cleanup and universal tanks

* cleanup

* more cleanup

* hide loadoutgroups

* remaining survival boxes

* space ninja

* Revert "space ninja"

This reverts commit a650f417f83f5861e0001b25418e4a361927c6c6.

* weh

* weh

* undo appearance change of syndicate survival boxes

* indentation fix and missing label
 2024-06-21 00:05:01 +10:00
PJBot
7994175aba Automatic changelog update 2024-06-20 12:35:52 +00:00
Redfire1331
68c414e8ed made cup ramen eatable with anything with the fork component (#27826) 
* made cup ramen eatable with anything with the fork component

* removed extra png

* made cupramen fillable with water, and made hot ramen dry ramen.

---------

Co-authored-by: redfire1331 <Redfire1331@users.noreply.github.com>
 2024-06-20 22:34:46 +10:00
PJBot
514e7600c6 Automatic changelog update 2024-06-20 12:23:10 +00:00
Boaz1111
a74ca54cf8 moves explosive tech to T1 (#29227) 
moves explo tech to T1
 2024-06-20 22:22:04 +10:00
PJBot
0ac1b31e36 Automatic changelog update 2024-06-20 11:59:57 +00:00
lzk
4fe5235e37 Buff cube boxes (#29251) 2024-06-20 14:58:51 +03:00
PJBot
9fbcec1c74 Automatic changelog update 2024-06-20 11:17:18 +00:00
neutrino
9bf4a28f4d fixed Syndicate smokes pack being half-filled (#28371) 2024-06-20 21:16:06 +10:00
PJBot
4ccdc9070f Automatic changelog update 2024-06-20 11:14:04 +00:00
Mr. 27
8c9fcd4ca7 Fix ERT becoming sleeper agents and add sleeper agent preferences (#27817) 
* b

* Update antags.ftl

* m

* ok

* Update events.yml

* antag

* a

* Create InitialInfectedExemptComponent.cs

* Delete InitialInfectedExemptComponent.cs

* yes

* Delete InitialInfectedExemptComponent.cs

* Create AntagImmuneComponent.cs
 2024-06-20 21:12:58 +10:00
Mr. 27
ad89444c58 Make winter coat hood hide certain markings (#29238) 
Update base_clothinghead.yml
 2024-06-20 20:20:20 +10:00
PJBot
f2c0991467 Automatic changelog update 2024-06-20 07:16:46 +00:00
PJBot
625fef00c1 Automatic changelog update 2024-06-20 00:10:50 +00:00
Mr. 27
872e927cc7 Hide moth antenna and lizard frills with hardsuit helmets, fix lizard snouts not being hidden (#29214) 
* inital

* Update ClothingSystem.cs

* Update helmets.yml
 2024-06-19 20:09:44 -04:00
PJBot
a8ad09ebf9 Automatic changelog update 2024-06-19 23:52:13 +00:00
Pieter-Jan Briers
67cc089dd0 Fix terrible portable scrubber unlit layers (#29232) 
Jesus fucking christ man
 2024-06-19 18:14:47 -04:00
PJBot
674409d3bf Automatic changelog update 2024-06-19 18:15:02 +00:00
lzk
912091e24e Add wet floor sign & warning cone to autolathe (#29205) 
* Add wet floor sign & warning cone to autolathe

* removing
 2024-06-19 14:13:55 -04:00
Flareguy
94995460fd Emergency toolbox fill rework (#29202) 
* emergency toolbox fill rework

* Fuck
 2024-06-19 14:13:27 -04:00