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

33949 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PJBot
e05d9e944b Automatic changelog update 2025-09-15 00:37:56 +00:00
Nox
f1d52e0c13 Plasma Armory Restock (#39763) 
* made some tweaks and fixes to the equipment in armory, security, and genpop.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* implemented minor fixes

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added changes from #40012

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Removed warden gun, tweaked some things, fixed camera coverage and atmos devices etc

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Got comp to sign off on changes, finished everything up, good to merge!

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Tested for issues and fixed

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

---------

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
 2025-09-14 18:37:41 -06:00
SlamBamActionman
97d4153d84 Add jetpacks to the Nukie Infiltrator (#39887) 2025-09-14 18:36:47 -06:00
PJBot
b4f4d6e295 Automatic changelog update 2025-09-14 23:47:14 +00:00
ToastEnjoyer
2ffe0db61f Linked radiation shields on bagel (#40358) 2025-09-14 16:46:03 -07:00
Princess Cheeseballs
11d434818e Merge staging into master (#40356) 2025-09-14 13:57:50 -07:00
Princess Cheeseballs
d8e818283c [STAGING/HOTFIX] Butcher entities in containers. (#40299) 
* Kitchen spike and sharp system

* Use transform and parent

* A

* Works

* A

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
 2025-09-14 22:41:42 +02:00
PJBot
cc6aa626da Automatic changelog update 2025-09-14 19:27:49 +00:00
Winkarst-cpu
9c3af67cd1 Fix wizard's recharge spell not adding charges to wands that use LimitedChargesComponent (#40347) 
* Fix

* Update
 2025-09-14 21:26:42 +02:00
ScarKy0
9e204c3023 Vulpkanin Color Clamping (#40348) 2025-09-14 20:55:26 +02:00
slarticodefast
a38c6c1aca Revert "Add heat distortion shader for hot gases" (#40352) 2025-09-14 20:48:24 +02:00
Vasilis The Pikachu
b9ddcc9e9f Revert "Can't crawl over counters (#40099)" 
This reverts commit 01a7fc66f0.

@Princess-Cheeseballs

This is being reverted per maintainer vote for the release cycle, check out the meeting video here https://youtu.be/N5-UYCLha2I?t=872
 2025-09-14 20:42:51 +02:00
Stefano Pigozzi
8c67c5b5a2 Add myself to credits (#40345) 
Co-authored-by: Steffo99 <1540885+Steffo99@users.noreply.github.com>
 2025-09-14 20:27:10 +02:00
PJBot
3732885713 Automatic changelog update 2025-09-14 15:19:56 +00:00
Huaqas
7616b9aa1c Fix Heterochromia for Vulpkanin (#40320) 
* Add More Holy Books

* Revert "Add More Holy Books"

This reverts commit 665eb0de10fe0784d634f9eaf672e60f18a62995.

* Fix eyes

* Add the undergarments and ftl designations.

* Missed something.

* second edited line didnt save for some reason

* Im tired dont judge me

* Fix eyes

* Reverting stuff

* fix markings

* Its joever

* Update meta.json

* small tweak

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
 2025-09-14 11:18:48 -04:00
PJBot
1908317e3c Automatic changelog update 2025-09-14 07:40:46 +00:00
ScarKy0
fdd4789d32 Give vulps correct undergarments (#40341) 
init
 2025-09-14 00:39:38 -07:00
PJBot
29da03b4e4 Automatic changelog update 2025-09-14 05:45:42 +00:00
MissKay1994
c317fa9840 Massively reduce how lethal Man-O-War shuttle is (#40339) 
no longer nukies in disguise
 2025-09-13 23:44:32 -06:00
pathetic meowmeow
d9c24b3d10 De-enumify humanoid species skin colours (#39175) 
* De-enumify humanoid species skin colours

* Change index to resolve

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
 2025-09-13 22:30:17 -07:00
github-actions[bot]
e7dc6ae990 Update Credits (#40342) 
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
 2025-09-14 03:18:18 +02:00
Winkarst-cpu
3aece8d46c Fix throwing objects causing pushback on the player who threw them in a not weightless environment (#40335) 
* Fix

* Update Content.Shared/Gravity/SharedGravitySystem.cs

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

* Update

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-09-13 21:51:13 +02:00
PJBot
52a4e95651 Automatic changelog update 2025-09-13 17:37:36 +00:00
Huaqas
f1ae8ecdfe Add Undergarments to Vulpkanin (#40321) 
Putting underwear on dogs.
 2025-09-13 13:36:28 -04:00
PJBot
6768ff1e91 Automatic changelog update 2025-09-13 15:54:55 +00:00
slarticodefast
d17182c162 Change listplayers command permissions to require the PII flag (#40324) 2025-09-13 17:53:48 +02:00
IProduceWidgets
a4b7cd73c5 +1 Spam mail (#40310) 
* 2nd edition

* remove OOC

* oop

* double oops
 2025-09-13 09:15:10 +02:00
PJBot
659648b03d Automatic changelog update 2025-09-13 07:02:21 +00:00
FungiFellow
bcc30813e9 Cockroach Gib when Stepped on (#40103) 
* Cockroach Gib

* Prevent Cockroaches From Gibbing Eachother

* Added - type: RandomChanceTriggerCondition

* Update animals.yml

* Named SuccessChance Datafield

* successChance

* Revert Change

* Uncapitalize C

* RECAPITALIZE THE C
 2025-09-13 00:01:13 -07:00
PJBot
0ba1a7c4dd Automatic changelog update 2025-09-12 23:25:05 +00:00
Princess Cheeseballs
ab40b1ab73 Chameleon Projector Physics Fix (#37960) 
* One commit

* Move files

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
 2025-09-13 01:23:57 +02:00
PJBot
79a34556e5 Automatic changelog update 2025-09-12 22:48:32 +00:00
SurrealShibe
71bcda1fec Toilet fixes: Exception when constructing, proper seat layering (#40313) 
they call me a plumber the
the way i fix da toiler
 2025-09-12 15:47:21 -07:00
slarticodefast
82e7cb020c Delete DrinkComponent, migrate prototypes to EdibleComponent (#40308) 2025-09-12 15:26:56 -07:00
Princess Cheeseballs
928e6c8079 Edible Sound Specifier Override (#40312) 
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
 2025-09-12 23:49:12 +02:00
Red
2820882754 Stop microwaving! (#40132) 
* Create KillMicrowaveTest.cs

* Update KillMicrowaveTest.cs

* Update Content.IntegrationTests/Tests/Microwave/KillMicrowaveTest.cs

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

* Update Content.IntegrationTests/Tests/Microwave/KillMicrowaveTest.cs

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

* Update Content.IntegrationTests/Tests/Microwave/KillMicrowaveTest.cs

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

* documentation

* Apply suggestions from code review

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-09-12 12:17:29 +02:00
InsoPL
49fb6fdd6c Fix for can't stop pulling when cuffed (#40233) 
* fix

* fix

* spaces added
 2025-09-11 20:39:25 -07:00
ApolloVector
8cc1b29ba4 Clake frag round fix (#40294) 
make the frag work
 2025-09-11 18:36:10 -07:00
slarticodefast
321331e664 move all the radio components and system to Shared (#40293) 
* move all the radio components and system to Shared.

* duh split impl

* address reviews

* cleanup

---------

Co-authored-by: walksanatora <walkerffo22@gmail.com>
 2025-09-12 01:26:47 +02:00
PJBot
d8c55aef3c Automatic changelog update 2025-09-11 22:08:44 +00:00
UpAndLeaves
1245487c9a storage and inventory toolshed commands (#39046) 
* First commit

* CommandImplementation on singletons is die, a la moony

* Fix duplicated thingy because yes

* Prototypes, bugfixes, refactoring oh my

* Remember to actually stage your ftl changes next time, leaf
 2025-09-11 15:07:37 -07:00
PJBot
bb970970c9 Automatic changelog update 2025-09-11 20:00:29 +00:00
Lillian Industries
7396d9e54c Added SmartFridge circuitboards (#39879) 2025-09-11 22:59:20 +03:00
Perry Fraser
fbf65b7f74 Make vending machine restocks predicted (and its sound not spammable) (#38609) 
* feat: make vending machine restocks predicted

* refactor: VendingMachineRestockComponent cleanup

* refactor: minor simplification

* revert: refactor: minor simplification; load bearing IsFirstTimePredicted

lol second guessed myself

* chore: unneeded VendingMachineSystem dep

* Update Content.Shared/VendingMachines/VendingMachineComponent.cs

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-09-11 20:27:54 +02:00
PJBot
77eca4a570 Automatic changelog update 2025-09-11 16:00:24 +00:00
SlamBamActionman
ff3f0c6997 Reorganize and refactor drinks yml (#39221) 2025-09-11 17:59:11 +02:00
SlamBamActionman
690b4d1edd Merge remote-tracking branch 'upstream-origin/master' into fork/iaada/more-trash 2025-09-11 17:08:39 +02:00
ScarKy0
1f1c71919b Remove unused BulletTennis (#40285) 
init
 2025-09-11 16:36:39 +02:00
SlamBamActionman
9519eb5f7a Fix Linter errors (#40283) 
Fix yoml
 2025-09-11 15:17:37 +02:00
SlamBamActionman
b3e06de0e5 They're milk jugs, not milk cartons! 2025-09-11 14:02:05 +02:00