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

28213 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ed
bc930da84f Merge pull request #435 from crystallpunk-14/ed-08-09-2024-upstream 
Ed 08 09 2024 upstream
 2024-09-17 11:51:51 +03:00
Ed
233b493865 remove autoignite 2024-09-17 11:40:23 +03:00
Ed
4691bdedb4 remove debug furnace 2024-09-09 16:57:58 +03:00
Ed
cb4df21fb9 Update cp14-ignoredPrototypes.yml 2024-09-08 22:33:32 +03:00
Nim
4565f3c574 Voice goblin (#432) 
* voice

* fix
 2024-09-08 21:28:28 +03:00
Ed
16805c8ebe Update cp14-ignoredPrototypes.yml 2024-09-08 21:23:53 +03:00
Ed
5b2020d708 Merge remote-tracking branch 'upstream/master' into ed-08-09-2024-upstream 
# Conflicts:
#	.github/PULL_REQUEST_TEMPLATE.md
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
#	Resources/Prototypes/Maps/box.yml
#	Resources/Prototypes/Maps/marathon.yml
#	Resources/Prototypes/Maps/meta.yml
 2024-09-08 21:20:54 +03:00
PJBot
e6f1492474 Automatic changelog update 2024-09-08 18:09:12 +00:00
K-Dynamic
7eb5c0af03 Radiation blocker values for directional plasma and uranium windows (#31975) 
resistances to directional windows
 2024-09-08 12:08:06 -06:00
lzk
d5b9151680 Update PULL_REQUEST_TEMPLATE.md (#31046) 
* Update PULL_REQUEST_TEMPLATE.md

* Update PULL_REQUEST_TEMPLATE.md 2

* Update PULL_REQUEST_TEMPLATE.md 3

* Update PULL_REQUEST_TEMPLATE.md 3

* Update PULL_REQUEST_TEMPLATE.md 5

* slart suggestions

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

* paste

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2024-09-08 18:57:39 +02:00
PJBot
dbb5da156e Automatic changelog update 2024-09-08 16:11:11 +00:00
beck-thompson
eab318ed39 Rings now give a small amout of gold / silver when scrapped (#31847) 
* Ring

* Silly name fix
 2024-09-08 18:10:05 +02:00
slarticodefast
c46a4ab876 Revert "FTL + AI fixes (#31952)" (#31968) 2024-09-08 17:50:23 +02:00
lzk
a1b27db35f remove HatBase (#31971) 2024-09-08 18:23:01 +03:00
PJBot
2de0858502 Automatic changelog update 2024-09-08 12:11:56 +00:00
Psychpsyo
713abf625a Make random sentience actually happen (#31953) 
Add random sentience to calm events
 2024-09-08 14:10:50 +02:00
PJBot
3d4a811c3f Automatic changelog update 2024-09-08 12:07:07 +00:00
Killerqu00
c7b989598f some securiby contra fixes (#31956) 
* some contra fixes

* whistles change
 2024-09-08 14:06:00 +02:00
PJBot
1a3a686cb9 Automatic changelog update 2024-09-08 10:23:01 +00:00
PopGamer46
0e99ddbc8a Fixes being able to craft the justice helmet with a justice helmet (#31957) 
fix
 2024-09-08 12:21:55 +02:00
PJBot
ef54ea7aed Automatic changelog update 2024-09-08 08:13:30 +00:00
metalgearsloth
f7a87b5f32 FTL + AI fixes (#31952) 2024-09-08 18:12:23 +10:00
metalgearsloth
e93c3ffaa8 Update submodule to 233.1.0 (#31954) 2024-09-08 18:10:33 +10:00
PJBot
5edbd3d447 Automatic changelog update 2024-09-08 07:29:50 +00:00
nikthechampiongr
4b8bedaeef Add completions to addobjective and localize it (#30456) 
* Add completions to addobjective and localise it

* Cleanup

* Fix

* Make a manager to handle subscribtion completion options

This is so we can unsubscribe to prototype reloads properly

* Convert the manager into a system

* Move the system into the systems folder

I forgor

* Merge CompletionsSystem into ObjectivesSystem
 2024-09-08 17:28:43 +10:00
Emisse
b2007bce19 packed update (#31950) 2024-09-08 00:41:03 -06:00
Emisse
b6019cf7bd omega update (#31949) 2024-09-08 00:39:24 -06:00
Emisse
5f6dac6b46 meta update (#31948) 2024-09-08 00:37:06 -06:00
Emisse
35f50f24d2 marathon update (#31947) 2024-09-08 00:35:20 -06:00
Emisse
937276dc92 fland update (#31946) 2024-09-08 00:34:35 -06:00
Emisse
070f38fc84 box update (#31945) 2024-09-08 00:34:09 -06:00
Emisse
5b6e075099 bagel update (#31944) 2024-09-08 00:33:59 -06:00
PJBot
4b152d128e Automatic changelog update 2024-09-08 06:23:33 +00:00
Ed
230ea9be46 Metamorphosis - FoodSequence 3 (#31012) 
* setup some data

* cheeseburger recipe

* Update FoodSequenceSystem.cs

* finalize cheseburger recipe

* remove fun

* return old taco sprites

* full foodsequence data refactor

* return tacos

* well done

* add cutlets to burger

* chickenburger recipe

* +2 burger recipes

* more fun

* Update brain.png

* some slice produce added

* documentation

* watermelon

* skewer work

* flipping

* tomato

* skewer watermelon

* Update skewer.yml

* oopsie, ok, im go to sleep

* fix checks

* Update produce.yml

* screwed

* cheeeeeeeese

* all cooked meat added

* produce added

* aaaaand suppermatter

* key to Tag

* More

* proto string remove

* raw snail

* fix

* Update FoodMetamorphableByAddingComponent.cs

* fixes

* fix3

* fififififx
 2024-09-08 02:22:27 -04:00
PJBot
680b9c9cfb Automatic changelog update 2024-09-08 05:35:29 +00:00
Nemanja
efe54e011e Biogenerator (#30694) 
* biogenerator

* ack

* test success!

* fix tests

* increase price of reagents
 2024-09-07 23:34:22 -06:00
Ubaser
6fcb5cf148 Update core (#31942) 
* add

* fix invalid
 2024-09-07 23:32:02 -06:00
github-actions[bot]
e2bbd59985 Update Credits (#31937) 
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
 2024-09-07 21:41:52 -06:00
PJBot
b61402cdef Automatic changelog update 2024-09-07 23:48:09 +00:00
LucasTheDrgn
b51d9382c0 Returned functionality to industrial reagent grinders (#31903) 
* Returned functionality to industrial reagent grinders without un-nerfing recyclers

* Limited industrial reagent grinder to only extractable solutions
 2024-09-07 17:47:02 -06:00
Kirus59
c5f19fd2ed Damaged by contact fix (#31921) 2024-09-07 17:46:24 -06:00
PJBot
58d220120a Automatic changelog update 2024-09-07 23:46:07 +00:00
Ilya246
447e9c247d fix flammable reagents deigniting you (#31930) 
fix
 2024-09-07 17:44:58 -06:00
qwerltaz
6158bab715 fix wall closet storage range (#31933) 
fix wall closet range
 2024-09-07 17:44:29 -06:00
Boaz1111
66f3b780ef uranium ammo mag being called rubber ammo mag fixed (#31934) 
minor misspelling
 2024-09-07 22:34:42 +02:00
Spessmann
719e5a8ac1 Updated cog (Maints edition) (#31935) 
added stuff
 2024-09-07 13:58:16 -06:00
lzk
53be04195a Update fland disposals (jani rejoice) (#31918) 
Update fland disposals
 2024-09-07 12:16:04 -06:00
lzk
1fab9bc786 Update box disposals (jani rejoice) (#31917) 
Update box disposals
 2024-09-07 12:15:54 -06:00
PJBot
ab1c60d302 Automatic changelog update 2024-09-07 13:23:18 +00:00
lzk
932ff660d0 fix paper label whitelist (#31919) 
* fix paper label whitelist

* forgor

* oh lmao
 2024-09-07 15:22:11 +02:00