juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,083 Commits 57 Branches 0 Tags
445f08ae07353c16309ad41d6d4cbac109a8cd34
Commit Graph

25083 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ed
445f08ae07 Merge remote-tracking branch 'space-station-14/master' into 04-05-2024-upstream 
# Conflicts:
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/Prototypes/Maps/train.yml
 2024-05-04 21:13:30 +03:00
Ed
72b8fcf99c Tiles rework (#131) 
* tile restruct

* filter tiles

* Update ContentTileDefinition.cs

* oopsie

* Update migration.yml

* Update cave-arena.yml

* floors fix
 2024-05-04 16:35:59 +03:00
PJBot
540c45cbe9 Automatic changelog update 2024-05-04 11:12:52 +00:00
Flareguy
0e829eb380 Vox customization fixes & updating (#27663) 
vox customization
 2024-05-04 04:12:11 -07:00
Ed
5ab1cc0c84 Pathological Liar (#27618) 
* content

* upgrade

* n't

* ye ya

* Update speech-liar.ftl

* Mith replacement ideas

* fix

* more!

* Revert "more!"

This reverts commit 6d10bdf694985c525a2b451ed39380f975059b44.

* Update Content.Server/Speech/Components/ReplacementAccentComponent.cs

---------

Co-authored-by: Kara <lunarautomaton6@gmail.com>
 2024-05-04 04:11:46 -07:00
PJBot
07d43af4a6 Automatic changelog update 2024-05-04 11:11:14 +00:00
Ed
e7d24b5648 Added Train station into map rotation (#27534) 
* Update default.yml

* more sec
 2024-05-04 04:10:08 -07:00
Agoichi
ba009f34fa Crystal/ punk-update (#129) 
* Crystalpunk-update

* Crystalpunk-update

* Update Resources/Prototypes/_CP14/SoundCollections/hit_impacts.yml

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

* Update Resources/Prototypes/_CP14/Entities/Structures/crystal.yml

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

* Update Resources/Prototypes/_CP14/Entities/Structures/crystal.yml

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

* clean up

* Update crystal.yml

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: Ed <edwardxperia2000@gmail.com>
 2024-05-04 13:39:32 +03:00
Litogin
1d233226bb Animation of tails (#128) 
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2024-05-04 13:31:14 +03:00
Ed
ba05b56d51 Fence fix + Navy revolver (#130) 
* Update fence_wood.yml

* added revolver navy

* Update guns.yml

* Update wooden_fence.yml
 2024-05-04 13:20:21 +03:00
Vasilis
1b3481f094 Rename Lizard urist (#27652) 2024-05-03 23:18:01 -07:00
Mr. 27
96a3967c3f Change return to continue in gamerulesystem (#27656) 
Update GameRuleSystem.cs
 2024-05-04 13:03:56 +10:00
PJBot
1d5392f86b Automatic changelog update 2024-05-04 00:04:58 +00:00
Mr. 27
6ecbf0a04c Fix some gamerules' round summary not working (#27654) 
Update GameRuleSystem.cs
 2024-05-03 20:03:52 -04:00
PJBot
960f268d1c Automatic changelog update 2024-05-03 20:24:49 +00:00
nikthechampiongr
6fc684812d Ninja's pinpointer tracks the research server (#27552) 
Change the tracked component on the ninja's pinpointer from BecomesStation to Research Server
 2024-05-03 22:23:43 +02:00
Ed
acd8f93b36 added Kocherga fences 2024-05-03 21:33:24 +03:00
Ed
dd84d48fed Refactors, bugfixs + Crystals (#127) 
* fix dwarf displacement map

* Big Fireplace update

* add crystalls placeholder

* bonfire update

* displaccement update

* Update wallmount_torch.yml
 2024-05-03 20:40:31 +03:00
PJBot
c045e2488e Automatic changelog update 2024-05-03 17:27:16 +00:00
Just-a-Unity-Dev
76ecdee946 Geras bug fixes (#27308) 
* Geras bug fixes

* oops

* its as shrimple as that

toggled transferName in the polymorph yml instead of using the system to manually change it

* its as shrimple as that (2.0)

fixed reviews for zombies having a dummy action, instead - properly implemented removal of action

* its as shrimple as that (3.0)

fixed tests by removing nameidentifier from slime (its already inherited, anyway)
 2024-05-03 19:26:09 +02:00
Ed
e5246f1e76 doors update (#126) 2024-05-03 18:22:10 +03:00
Ed
0450a416e2 Revert "Make immovable rod announce at the end of the event" and "Rod event has a proper annoucement" (#27645) 
* Revert "Make immovable rod announce at the end of the event (#27587)"

This reverts commit efceaa89e0.

* Update immovable-rod.ftl
 2024-05-03 04:10:24 -07:00
PJBot
bedec83cd9 Automatic changelog update 2024-05-03 07:52:39 +00:00
Jay
0056befd4b Allow EMP implants to be used while stunned or cuffed. (#27644) 
Update types.yml
 2024-05-03 09:51:33 +02:00
PJBot
40a4eeaa39 Automatic changelog update 2024-05-03 06:58:43 +00:00
Hanz
a8bf2689a4 Red bool update (#27597) 
* the meat and potatoes

yuh yuh yuh

* what the hell is a copyright?

am I right?
 2024-05-03 08:57:37 +02:00
Lamrr
a28296433b Fixes the grammar for the captain's supervisor (#27638) 
Fixes the grammar on the captain's supervisor
 2024-05-03 12:12:34 +10:00
PJBot
4ede46003a Automatic changelog update 2024-05-03 01:25:27 +00:00
Errant
f64dd5f45f Space Ninjas auto-toggle internals after spawning (#25083) 
* fix engine version

* actually fix engine version

* Automatically activated breathing masks

* weh

* who needed that component anyway

* check if internals are already running

* Update Content.Server/Atmos/Components/BreathToolComponent.cs

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* Update Content.Server/Body/Systems/InternalsSystem.cs

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* prediction

* record struct event

* remove delayed activation, instead ensure that masks spawn last

* leftover

* engine version

* re-implement

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2024-05-03 11:24:21 +10:00
PJBot
192de3d9cb Automatic changelog update 2024-05-03 00:14:41 +00:00
Mr. 27
c69bf2f2aa Add syndicate sleeper agents random event (#27501) 
* Intercept rule (#10)

* add

* b

* add this back lol

* fix test fails (alert levels dont have prototypes)

* tweaks
 2024-05-03 10:13:35 +10:00
Leon Friedrich
f348e6aa30 Add EntityWhitelistSystem (#27632) 
* Add EntityWhitelistSystem

* Sandbox fix

* update test
 2024-05-03 10:10:15 +10:00
PJBot
291ecf9643 Automatic changelog update 2024-05-03 00:04:58 +00:00
Plykiya
71dbb955ce Increase Blast Grenade Recipe Cost and Add Research Requirement (#27580) 
* Adjust blast grenade recipe

* Move blast grenades into tier 2 research

* Move blast grenades to dynamic recipes for secfab and autolathe

---------

Co-authored-by: Plykiya <plykiya@protonmail.com>
 2024-05-03 10:03:52 +10:00
PJBot
f76a471e5a Automatic changelog update 2024-05-02 23:38:26 +00:00
Leon Friedrich
3c3c2daf26 Fix UI interaction priority (#27631) 2024-05-03 09:37:20 +10:00
Ed
f9204832d2 Merge pull request #125 from crystallpunk-14/02-05-2024-upstream 
02 05 2024 upstream
 2024-05-02 21:01:59 +03:00
Ed
7d11ff5562 Merge remote-tracking branch 'space-station-14/master' into 02-05-2024-upstream 2024-05-02 20:46:45 +03:00
Ed
4c692d7d4a Alchemy + Guidebook initialization (#124) 
* remove Guidebook

* water and blood

* localization things

* added vital extract

* some fixes

* added bloodgrass

* guidebook localization

* fixes icons and remove unnecesary fields

* added inhand cauldron

* fix wallmount board

* Update bonfire.yml

* Update bonfire.yml

* alchemy furnace + mist

* fixes

* Guidebook localization

* Update drinks.yml

* Revert "remove Guidebook"

This reverts commit 7924cf235f.

* fix filtering guidebook

* test fix

* Update heater.yml
 2024-05-02 20:41:11 +03:00
PJBot
8a7f709794 Automatic changelog update 2024-05-02 17:10:44 +00:00
Tayrtahn
9b17693396 Fix SpawnItemsOnUse not playing sound (#27621) 
Made SpamItemsOnUse play sound at entity coordinates instead of parenting
 2024-05-02 13:10:20 -04:00
deltanedas
8909dc7d40 make ducky slippers waddle (#27628) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2024-05-02 20:09:38 +03:00
slarticodefast
eab276a12d small SpawnItemsOnUse cleanup (#27625) 
* small SpawnItemsOnUse cleanup

* that one was not needed
 2024-05-02 20:08:26 +03:00
PJBot
09b6f5c128 Automatic changelog update 2024-05-02 16:18:43 +00:00
Lamrr
b728f36f30 Wine and beer bottles can be inserted into booze dispenser (#27626) 
Fixes tags on wine and beer bottles
 2024-05-02 12:17:36 -04:00
PJBot
64a732ad7b Automatic changelog update 2024-05-02 14:50:59 +00:00
Vasilis
a4b0a34bc7 Remove airtight flaps from the construction menu (#27619) 
They are meant to be mapping only items.
 2024-05-02 10:49:53 -04:00
PJBot
235091b377 Automatic changelog update 2024-05-02 12:38:18 +00:00
Michael
131c269e2b Improve CMO's lab coat (#27551) 
This Aims at balancing the viability of the CMO's lab coat compared to his other available options, those being his winter coat (which is just a straight up upgrade) and his hardsuit.

and also its suppose to level him with RD since RD's lab coat has special rad protection

Co-authored-by: Michael <107807667+Bugfinder1@users.noreply.github.com>
 2024-05-02 15:37:12 +03:00
PJBot
ce3ba577e0 Automatic changelog update 2024-05-02 12:36:17 +00:00