juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
33,652 Commits 57 Branches 0 Tags
581ca2f5efefe8aeb53397af1f02bdf52012abea
Commit Graph

33652 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tayrtahn
d295aed791 Fix loc issues with suicide popup (#36284) 2025-04-04 11:41:21 +02:00
ScarKy0
14b9afff67 Stable merge (#36291) 2025-04-04 11:30:40 +02:00
SlamBamActionman
444ef029bc [Hotfix] Change ID card console admin log severity to Medium (#36283) 
It's that simple
 2025-04-04 11:18:02 +02:00
Ed
b66ee390a6 Dynamic demiplane weather + farming hotfix (#1131) 
* dynamic demiplane weather

* add skeleton sprite

* hotfix farming

* Update wheat.yml
 2025-04-04 10:35:48 +03:00
Tayrtahn
5a25ef08b1 Fix loc issues with syringes (#36285) 
Fix injector loc issues
 2025-04-03 18:28:26 -07:00
PJBot
5d8e0bf954 Automatic changelog update 2025-04-03 22:25:39 +00:00
Luna "YuNii" Henrich
db62336618 Stop ghosts from being logged to Airlocks (#36261) 
* stop ghosts from being logged

* thanks rider for the random import

* add new tag PreventAccessLogging

* once again removing random auto imports

* inverted if for code readability

* switch to ProtoId<> usage
 2025-04-04 00:24:30 +02:00
scrivoy
748e4719eb Merge branch 'master' into meta-remove-wizard-robes 2025-04-03 23:17:14 +02:00
PJBot
f2391cbcc9 Automatic changelog update 2025-04-03 14:46:11 +00:00
Whatstone
983cf150e0 Recipes for curtains and tables using carpets now respect stacks. (#33721) 
* Carpet curtain/table recipes now respect stacks

* remove unused colour carpet tags

* Remove the tags outright
 2025-04-03 17:45:04 +03:00
Nim
e125605f25 fix constructions (#1125) 2025-04-03 17:13:39 +03:00
creamybag
dd9aea718c The guildmaster's rapier was not given out in the round. (#1123) 
* fix

* fix2
 2025-04-03 15:34:35 +03:00
Ed
48831380b4 Give some love to farming (#1124) 
* give some love to farming

* Queryptimization

* Fuck soil!!!

* fuck soil in prototypes!

* seeds improve

* partial merge wild and farm

* some strange fix

* plant kills refactor, add compost

* fix compost

* Update migration.yml

* rain can watering plants

* sage update

* Update seeds.yml

* sage smoking update

* Update seeds.yml
 2025-04-03 15:29:08 +03:00
creamybag
16c4f8be53 Furcoat carcat (#1122) 
* FurcoatCat

* fix
 2025-04-03 10:00:27 +03:00
PJBot
c877941aba Automatic changelog update 2025-04-03 06:59:12 +00:00
pathetic meowmeow
e9b89a1c6b Improve sprite fading behaviour (#35863) 
* Click through faded sprites

* Count the mouse position for which sprites to fade
 2025-04-03 09:58:05 +03:00
scrivoy
5d62d60749 add two fake wizard hats 2025-04-03 08:35:22 +02:00
scrivoy
cea942db7f Merge branch 'master' into meta-remove-wizard-robes 2025-04-03 08:32:40 +02:00
PJBot
ce53629f1d Automatic changelog update 2025-04-03 06:31:00 +00:00
āda
4c73dcc2c8 Diphenhydramine causes drowsiness (#36212) 
* nap time in medbay

* suggested changes

* fake test fail
 2025-04-02 23:29:52 -07:00
Polter
b2f7196e26 Change the name and description of the templar helmet. (#36258) 
Changed the name and description of the knight helmet.

Co-authored-by: Flesh <N/A>
 2025-04-02 23:03:36 -07:00
metalgearsloth
8ad7c9c281 Add autocomplete to controlmob (#36234) 
Expensive for what it is just really annoying in debug to not have it. Worst case I just make it debug only and we don't add it for release.
 2025-04-03 05:32:14 +02:00
Tayrtahn
8007a4ebf7 Fix a few loc bugs with magic mirror/scissors (#36269) 
* Use identity for magic mirror popups

* THE()

* Use correct pronouns in blocked-by-hat message
 2025-04-03 05:30:30 +02:00
Tayrtahn
e4d7f164f6 Localize air alarm states (#36266) 2025-04-02 19:38:26 -07:00
Tayrtahn
bb864f2b56 Fix entities burning to ash not using identity, and bad formatting (#36268) 
* Make burning to ash use identity

* CAPITALIZE(THE())
 2025-04-03 04:02:09 +02:00
J
7e4cf87820 NPC Warnings cleanup (#36189) 
* NPC Warnings cleanup

* Reverting unnecessary changes

* Reverting unnecessary changes, missed

* Using entity GetGrid override instead
 2025-04-02 17:12:25 -07:00
Tayrtahn
7f781e7bda Convert AgentIDCard message to use a Fluent selector (#36263) 
Convert AgentIDCard message to use a selector
 2025-04-02 16:26:36 -07:00
Myra
5d37e77e57 [Stable merge] :3 (#36264) 2025-04-02 23:57:33 +02:00
Vasilis The Pikachu
933984fe6f :3 
This is so we can publish stable again
 2025-04-02 23:55:10 +02:00
PJBot
b72a9170b0 Automatic changelog update 2025-04-02 18:38:43 +00:00
qwerltaz
b204fd9b0e add: Dragon rift color changes based on charge (#36216) 
* use dragon rift sprite colours

* Entity<T>
 2025-04-02 14:37:34 -04:00
PJBot
e920558bb6 Automatic changelog update 2025-04-02 16:12:41 +00:00
Fildrance
3f8deb7aa4 fix: re-add missing RCD deconstruct action #36243 (#36255) 
Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
 2025-04-02 18:11:34 +02:00
Nim
879792be09 Fix mana damage (#1106) 
* fix mana damage

* mana potion

* fix rev

* ehh

* hmm

* nop

* Update target_effect_creation_on_water.yml

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2025-04-02 16:11:48 +03:00
Kirby
8548e062ed Light replacer description typo fix (#36256) 
Replacer description typo fix
 2025-04-02 12:42:05 +02:00
Deerstop
c78b8a806a Merge branch 'space-wizards:master' into elk-new 2025-04-02 17:12:10 +11:00
Tayrtahn
93df56ac16 Fix "other player points at you" message formatting (#36253) 
Fix "other player points at you" message's Fluent functions
 2025-04-01 22:40:49 -07:00
Tayrtahn
593a8fe869 Fix KeyNotFoundException that sometimes happens on server shutdown (#36221) 2025-04-01 23:11:15 -04:00
PJBot
3dba0d2159 Automatic changelog update 2025-04-01 23:28:01 +00:00
MisterImp
899d318f01 New food recipe: World Peazza (#35191) 
* added world peazza

* fixed a comma in the pizza sprite json

* changed attribution comment on ArtisticRoomba's suggestion

* restored accidentally deleted line, thanks Tayrtahn
 2025-04-01 16:26:53 -07:00
J
3192a7fde5 Rotation warnings cleanup (#36197) 
* Rotation warnings cleanup

* Naming convention fix

* Adding component that we already have
 2025-04-01 23:56:37 +02:00
Radezolid
4cf14211f9 Move medical locker fills to entityTables (#36249) 
* Added tables + moved things to EntityTableContainerFill

* YAML convention
 2025-04-01 23:55:43 +02:00
scrivoy
be50544252 remove wizard robes 2025-04-01 22:30:38 +02:00
Ed
fa7aacc103 Update Dev.toml 2025-04-01 23:08:46 +03:00
Ed
937851a72c Update Dev.toml 2025-04-01 21:50:20 +03:00
Ed
504adb6738 Fools day end (#1115) 
* Revert "April fools fix (#1113)"

This reverts commit e2dec03cbb.

* Revert "April fools fix (#1113)"

This reverts commit e2dec03cbb.

* Revert "Update secret_weights.yml"

This reverts commit 256476b576.

* Update Dev.toml
 2025-04-01 21:40:43 +03:00
PJBot
2cc93e23e2 Automatic changelog update 2025-04-01 16:44:28 +00:00
Tayrtahn
c8fe3651e5 Add prediction to electric grills (#36241) 
* Prediction for EntityHeaterSystem

* Switch to Entity<T>

* meh

* Move popup inside ChangeSetting

* Fix grill visually turning on when changing setting while power is off

* Add note about my failed quest

* Why isn't this an IDE warning?

* Move comment above switch expression in SettingPower
 2025-04-01 09:43:19 -07:00
Deerstop
212cafcf14 more maints, new AI, xenobiology, etc, ect 2025-04-01 23:29:02 +11:00
Nim
b9d191c7e4 Fix bandage (#1112) 
* CP14Biological

* storePositionBuy
 2025-04-01 11:26:17 +03:00