juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,974 Commits 57 Branches 0 Tags
7924cf235fd5ee2ea13efd86aab48493962b7f76
Commit Graph

24974 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ed
7924cf235f remove Guidebook 2024-04-30 19:13:39 +03:00
Ed
0169cb55d8 Alchemy instruments (#122) 
* add beer barrel

* add vet

* add storage to vat

* make bucket viable!

* bandage vat item fix

* Update vat.yml

* add small vial

* tiny vial

* Update SharedStorageSystem.cs

* Create biological.yml

* spilable and bonfire climbing
 2024-04-30 16:48:08 +03:00
Ed
743c732162 Merge pull request #121 from crystallpunk-14/29-04-2024-upstream 
29 04 2024 upstream
 2024-04-29 16:39:56 +03:00
Ed
9520f63aa1 Merge remote-tracking branch 'space-station-14/master' into 29-04-2024-upstream 
# Conflicts:
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
 2024-04-29 16:28:04 +03:00
Ed
098111948e Disposal aftermerg fix (#27488) 
* wtf

* fix

* delta fixes

* Update ThrowInsertContainerSystem.cs
 2024-04-29 23:26:28 +10:00
PJBot
5dda487db4 Automatic changelog update 2024-04-29 13:13:36 +00:00
Ed
bf8002569c Throwing into disposals logic splitting (#27487) 
* wtf

* fix
 2024-04-29 23:12:42 +10:00
DrSmugleaf
6b5e99f5eb Make bullets inherit the velocity of the grid, not the gun or player (#27484) 2024-04-29 23:12:29 +10:00
metalgearsloth
386454706b Fix snappop (#27264) 
* Fix snappop

Bunch of stuff slipped through.

* name
 2024-04-29 19:54:40 +10:00
Nemanja
e2087115af Fix position swapping with QSI and artifacts (#26364) 2024-04-29 19:11:07 +10:00
metalgearsloth
569253940f Update submodule to 221.0.0 (#27477) 2024-04-29 19:09:43 +10:00
Leon Friedrich
3c154abb5b Content changes for engine exception tolerance PR (#27455) 
* Content changes for engine exception tolerance PR

* Poke tests
 2024-04-29 18:43:15 +10:00
metalgearsloth
6d619c9420 Tippy fixes (#27475) 
How does that UISystemDependency not crash.
 2024-04-29 18:41:58 +10:00
PJBot
5aece1679a Automatic changelog update 2024-04-29 08:37:24 +00:00
Leon Friedrich
6471f55a49 Action UI fixes (#27468) 2024-04-29 18:36:18 +10:00
PJBot
0ab5696391 Automatic changelog update 2024-04-29 06:39:45 +00:00
Plykiya
7dae58c9f8 Late join thieves! (#27466) 
Co-authored-by: Plykiya <plykiya@protonmail.com>
 2024-04-28 23:38:38 -07:00
Kara
f59a4f2a86 Make events generally much more common (#27469) 
Make events generally more common
 2024-04-28 23:38:14 -07:00
PJBot
571cff8cab Automatic changelog update 2024-04-29 04:53:41 +00:00
KrasnoshchekovPavel
199e05fb34 fixed formatting of floating point numbers during localization (#27441) 2024-04-28 21:52:35 -07:00
PJBot
4c66e4f9dc Automatic changelog update 2024-04-29 04:39:38 +00:00
MilenVolf
7ee18433c8 New borg sounds (#27205) 
* New borg sounds

* Add manic laughter of an assault borg

Never wanted, but needed

* Fix wrong attribution

* Some requested changes

* Change borgwalk sounds

* Forgor
 2024-04-28 21:38:31 -07:00
Morb
16b3e2233a Emotes Menu (#26702) 
* Basic emote radial menu

* Move out from corvax

* Move to UI controller & add to top menu bar and key bind

* Make emote play

* Add name localization for emotes

* Localize chat messages

* Fix emote menu

* Add categories localization

* Fixes

* Fix

* Add emotes entity blacklist

* Fix entity whitelist required all logic

* Remove unused wagging emote

* Revert sprite

* Set default texture for emote icon

* Update Resources/keybinds.yml

---------

Co-authored-by: Kara <lunarautomaton6@gmail.com>
 2024-04-28 21:38:23 -07:00
SlamBamActionman
373c368b94 Tippy, the helpful hint clown! (#26767) 
* Tippy is BACK

* Clean up clippy from aprils fools

* Changed names from clippy to tippy, added localization, removed local_clippy command, made it easier to target a specific player

* Rename clippy.yml to tippy.yml

---------

Co-authored-by: Kara <lunarautomaton6@gmail.com>
 2024-04-28 21:38:16 -07:00
lzk
eb9ee4541f Add more telecomms variations (#26822) 
* Add more telecomms variations

* fox :fox:

* oops
 2024-04-28 21:26:17 -07:00
TsjipTsjip
aab103865e Update PR Labeler to v5 (#26845) 
* Update PR Labeler to v5

* Change conflict labeler.

* Implement draft filtering functionality

* Actually, pull_request_target is appropriate here.
 2024-04-28 21:23:49 -07:00
PJBot
328134ab18 Automatic changelog update 2024-04-29 04:17:10 +00:00
Mangohydra
8afae8a1f1 Martyr Cyborg Module, borg law 2 explode (#25815) 
* borg law 2 explode

* attributions fix + CL fix

* please dear god work i beg you

* maybe this will work :godo:

* 50% off deal + disc change

* absolving merge conflict

* merge conflict fix

* Update Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml

* Update Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml

* Update Resources/Audio/Effects/Grenades/SelfDestruct/attributions.yml

* Apply suggestions from code review

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Kara <lunarautomaton6@gmail.com>
 2024-04-28 21:16:04 -07:00
PJBot
16f65f42fc Automatic changelog update 2024-04-29 04:14:20 +00:00
Gotimanga
eb41f1da5f Adding new Cryogenics Reagent - Opporozidone (Attempt 2) (#24074) 
* Fixing mistakes

* How did I make the same mistake twice

---------

Co-authored-by: Kara <lunarautomaton6@gmail.com>
 2024-04-28 21:13:14 -07:00
PJBot
5f216ef1ee Automatic changelog update 2024-04-29 04:07:33 +00:00
Leon Friedrich
7c7d8eb645 ActivatableUI tweaks (#27448) 
* ActivatableUI tweaks

* EntGotRemovedFromContainerMessage

* A
 2024-04-29 14:06:43 +10:00
potato1234_x
cd90c05ce5 Rainbow Weed (#25759) 
* rainbow weed

* Lipolicide

* psicodine + mannitol

* happiness

* ground + dried + smokables

* damn you notepad++

* fix

WHY NOT TELL ME ALL THE PROBLEMS AT THE SAME TIME!!!

* work

* work i beg you

* recipe good

* possibly fix merge conflict

* remove reagents
 2024-04-28 21:06:27 -07:00
Kukutis96513
9cb3287de4 Senior physician sleeve symmetry (#27016) 
* weh.

* get the weh out of my repository

* add best lizard figurine

* remove umbra stuff from master

* sprite time!!

* revert stuff?

* newer spritesss
 2024-04-29 00:02:46 -04:00
Leon Friedrich
8f1a44fe05 Prevent SecretRule from picking invalid presets (#27456) 
* Prevent SecretRule from picking invalid presets

* remove lonely semicolon

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
 2024-04-29 00:00:41 -04:00
PJBot
2393ce1ceb Automatic changelog update 2024-04-29 03:39:51 +00:00
Hanz
33e1752a49 HoP and QM Stamps (#25604) 
the meat and potatoes

yup
 2024-04-28 20:38:45 -07:00
PJBot
511d8a7267 Automatic changelog update 2024-04-29 03:37:17 +00:00
Magnus Larsen
5118865d47 Allow more items to be recycled (#24435) 
Give more items a PhysicalComposition for recycling
 2024-04-28 20:36:11 -07:00
Leon Friedrich
1eb81427d3 Stop admin verb pop-in (#27450) 2024-04-29 13:24:10 +10:00
Leon Friedrich
a466b35b27 Move UnpoweredFlashlight to shared (#27449) 2024-04-29 13:22:11 +10:00
PJBot
a1b12f95a5 Automatic changelog update 2024-04-29 03:09:47 +00:00
beck-thompson
cdd900cef6 Infinate chem dupe fixed (Toilet, drain) + dirty water toilet fix (#27446) 
innital commit
 2024-04-29 13:08:41 +10:00
Plykiya
405e020bfa Fix doubled gas mask action message (#27463) 
Fix doubled message

Co-authored-by: Plykiya <plykiya@protonmail.com>
 2024-04-29 13:02:30 +10:00
PJBot
757d59cbdd Automatic changelog update 2024-04-29 02:46:00 +00:00
Plykiya
4416a21dd5 Make Smile the Slime grabbable like geras (#27458) 
Make smile grabbable like geras

Co-authored-by: Plykiya <plykiya@protonmail.com>
 2024-04-29 12:44:54 +10:00
beck-thompson
2135cbdb23 Fixed some mop .ftl capitalization (#27447) 2024-04-29 02:26:44 +02:00
Ed
6cb97502aa KBAS5 clothing + Jaraten Structures (#120) 
* add barbarian clothes

* add jaraten floors and wall

* locale

* add stonebrick walls and gold\silver ore cave walls

* fix brick black, update cave arena

* Update roundstart.yml

* Update cave-arena.yml
 2024-04-28 22:47:01 +03:00
PJBot
f89133b3ad Automatic changelog update 2024-04-28 11:08:42 +00:00
Ubaser
008935f6ec New plant mutation: Pyrotton (#27200) 
* WIP

* sprites n stuff

* flavour

* maybe fix

* add stack

* fix parent
 2024-04-28 13:07:36 +02:00