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

881 Commits

Author SHA1 Message Date
Ed
fb40f8cd25 Merge remote-tracking branch 'upstream/master' into ed-28-07-2024-upstream 
# Conflicts:
#	Resources/Prototypes/Maps/core.yml
#	Resources/Prototypes/Maps/train.yml
#	Resources/Prototypes/Traits/categories.yml
#	Resources/Prototypes/Traits/disabilities.yml
 2024-07-28 20:58:48 +03:00
Plykiya
0a07203121 Lets atmos build gas pipes in walls (#28707) 
Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-07-25 16:26:06 -07:00
BombasterDS
8b27ef8a78 Fix: Shelfs and Mannequin disassemble (#30313) 
fix shelfs
 2024-07-24 01:57:03 -07:00
mkanke-real
e1f3bdc748 Add spicy rock pizza (#30116) 
* Added all the parts to implement spicy rock pizza

* Added sprites for pizza

* Fixed coma formatting in meta.json for pizzas

* Fix formatting and rebalance reagent quantities in pizza.yml

* Flipped Uranium and Radium values to be the correct ratio

* Updated meta.json file to have credit for sprite
 2024-07-23 16:22:11 -07:00
Ed
2367085160 Merge remote-tracking branch 'upstream/master' into ed-23-07-2024-upstream 
# Conflicts:
#	.github/PULL_REQUEST_TEMPLATE.md
#	Content.Client/Clothing/ClientClothingSystem.cs
#	Content.Client/Hands/Systems/HandsSystem.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Shared/Hands/Components/HandsComponent.cs
#	Content.Shared/Inventory/InventoryComponent.cs
#	Content.Shared/Storage/StorageComponent.cs
#	Resources/Prototypes/Accents/word_replacements.yml
#	Resources/Prototypes/Entities/Mobs/Player/human.yml
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/Prototypes/Maps/fland.yml
#	Resources/Prototypes/Maps/oasis.yml
#	Resources/Prototypes/Maps/packed.yml
#	Resources/Prototypes/Maps/saltern.yml
 2024-07-23 12:24:42 +03:00
lzk
4ff34458cf Lowercase some prototypes names (#29990) 
* Lowercase some prototypes names

* huh

* return altar

* apply

* meta map
 2024-07-23 11:16:11 +03:00
Sphiral
1e89c07573 The Shelfs Update (#27858) 
* goofed up

* wip, mostly test sprites

* Nearly done, just need to fix storage locks

* everything done to my knowledge

* Alright, construction tested and working, and updated health spread

* remove a single comment I forgot. Pending sprite changes.

* Update sprites and add chemistry locked preset

* Forgot to remove a comment
 2024-07-21 11:16:58 -06:00
Ed
028c1ee478 Merge remote-tracking branch 'upstream/master' into ed-15-07-2024-upstream 2024-07-15 12:58:23 +03:00
Ed
1b0c434a9f Shiny Diamonds (#25750) 
* shiny

* add

* reresprite

* rereresprite

* Add files via upload

* Update ore.yml
 2024-07-13 15:15:57 +03:00
Ed
0931c9e7d1 Merge remote-tracking branch 'upstream/master' into ed-12-07-2024-upstream 
# Conflicts:
#	Resources/Prototypes/Maps/cluster.yml
#	Resources/Prototypes/Maps/europa.yml
 2024-07-12 12:53:42 +03:00
themias
3a9b1eaa16 Allow notice boards to be built on walls (#29851) 2024-07-12 12:18:32 +03:00
saga3152
a5ec01792b Crafting pizza boxes. (#29680) 
* We can now craft pizza boxes

* Fixing errors
 2024-07-10 15:52:33 +10:00
slarticodefast
7e087a6eb8 fix passive vent sprite in construction menu (#29820) 2024-07-09 23:39:47 +10:00
Verm
13b84870ec Bartending+: Shaking and Stirring (#29243) 
* Shaking and Stirring

* Remove shake message

* Switch if order a bit

* Add doafter supprot for reactionmixer

* Fix nullability

* Timespan zero

* Forgot to remove loc string

* Reorganize usings

* Remove unneeded usings, fix b52 needing to be shaken
 2024-07-08 00:21:53 +10:00
Nemanja
0e9ed36b85 Intercom buffs and fixes (#29580) 
* Intercom buffs and fixes

* remove unused bui state

* mild sec intercom buff

* reinforce sec intercoms
 2024-07-08 00:19:10 +10:00
Ed
bd011bf418 Merge remote-tracking branch 'upstream/master' into ed-05-07-2024-upstream 
# Conflicts:
#	Content.IntegrationTests/Tests/Round/JobTest.cs
#	Resources/Prototypes/Traits/speech.yml
 2024-07-04 18:14:21 +03:00
ArkiveDev
54c659f4aa Allow construction of rotated railings (#29687) 
* Remove southRotation from railing structures

* Curly Braces
 2024-07-03 12:59:29 -04:00
Ed
dbdb81381b Merge remote-tracking branch 'upstream/master' into ed-30-06-2024-upstream 
# Conflicts:
#	Resources/Prototypes/Maps/box.yml
#	Resources/Prototypes/Maps/meta.yml
#	Resources/Prototypes/Maps/oasis.yml
#	Resources/Prototypes/Maps/origin.yml
#	Resources/Prototypes/lobbyscreens.yml
 2024-06-30 11:18:30 +03:00
Pieter-Jan Briers
2a7bdd9b08 Revert "plutonium core steal objective" (#29578) 
Revert "plutonium core steal objective (#26786)"

This reverts commit f6ce07289a.
 2024-06-30 01:23:03 +10:00
deltanedas
f6ce07289a plutonium core steal objective (#26786) 
* add textures

* add SealingCabinet system

* add StoreUnlocker/ObjectiveUnlock system

* add plutonium core and nuke core container

* make nuke deconstructable

* add steal core objective

* add core extraction toolbox to new category

* typo ops wrench fuel

* use queries and resolve, have it resolve instead of using Comp

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2024-06-29 14:11:31 +10:00
DrEnzyme
659010993f Add bagels (#24799) 
Bagels are made by using a rolling pin on a dough slice to make a dough rope, then cooking the dough rope in a microwave for 5 seconds. There are two types: a normal bagel and a poppyseed bagel. The poppyseed bagel requires a poppy and a dough rope and has a small (5u) quantity of Bicaridine inside of it in addition to its nutriment.

Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>
 2024-06-23 12:33:12 -07:00
Nemanja
be7ffd89e2 AME Deconstruction Changes (#29317) 
* AME deconstruction complexity

* review

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2024-06-22 14:15:21 +10:00
Ed
3a910a7f7f Merge remote-tracking branch 'upstream/master' into ed-21-06-2024-upstream-sync 
# Conflicts:
#	Resources/Prototypes/Maps/europa.yml
#	Resources/Prototypes/Maps/train.yml
 2024-06-21 18:30:31 +03:00
lzk
912091e24e Add wet floor sign & warning cone to autolathe (#29205) 
* Add wet floor sign & warning cone to autolathe

* removing
 2024-06-19 14:13:55 -04:00
Ed
04d29b6268 Merge remote-tracking branch 'upstream/master' into ed-17-06-2024-upstream 
# Conflicts:
#	Resources/Prototypes/Maps/oasis.yml
 2024-06-17 14:20:38 +03:00
BombasterDS
81e41f8e8d Mannequin (#29004) 
* Mannequin

* rsi license fix

* damage container fix

* container fix

hope this works

* layers fix + appearance comp (mb it help?)

* maybe fixed?

* one day it will work...

* can't even understand why test failing... (maybe fix?)

* last try?
 2024-06-15 13:50:55 -04:00
Nemanja
748e5831e8 Add moon boots (#29009) 2024-06-14 20:43:23 -07:00
Ed
8ff09f552b Merge remote-tracking branch 'upstream/master' into ed-13-06-2024-upstream2 
# Conflicts:
#	Content.Client/Guidebook/GuidebookSystem.cs
#	Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
#	Content.Shared/Guidebook/GuideEntry.cs
#	Content.Shared/Preferences/HumanoidCharacterProfile.cs
#	Resources/Prototypes/Accents/word_replacements.yml
#	Resources/Prototypes/Maps/arenas.yml
#	Resources/Prototypes/Maps/atlas.yml
#	Resources/Prototypes/Maps/bagel.yml
#	Resources/Prototypes/Maps/box.yml
#	Resources/Prototypes/Maps/cluster.yml
#	Resources/Prototypes/Maps/core.yml
#	Resources/Prototypes/Maps/debug.yml
#	Resources/Prototypes/Maps/europa.yml
#	Resources/Prototypes/Maps/fland.yml
#	Resources/Prototypes/Maps/marathon.yml
#	Resources/Prototypes/Maps/meta.yml
#	Resources/Prototypes/Maps/oasis.yml
#	Resources/Prototypes/Maps/omega.yml
#	Resources/Prototypes/Maps/origin.yml
#	Resources/Prototypes/Maps/packed.yml
#	Resources/Prototypes/Maps/reach.yml
#	Resources/Prototypes/Maps/saltern.yml
#	Resources/Prototypes/Maps/train.yml
#	Resources/Prototypes/lobbyscreens.yml
 2024-06-13 12:35:00 +03:00
Cojoke
865810c6e1 New Sprites for Tranq Shells + Add consistancy to printing Tranqs (#28903) 
* New Sprites for Tranq

* Add consistancy to secfab print
 2024-06-12 22:17:35 -04:00
blueDev2
f2792e98b7 Return medicine recipe solid material costs to 1 (#28679) 
Set material costs of medicine recipes to 1
 2024-06-06 21:24:07 -04:00
blueDev2
0e93d13cb7 Microwave recipes now uses stacktype id instead of entity prototype id for stacked entities (#28225) 2024-06-04 13:12:01 -04:00
Ed
6a5fae3403 Merge remote-tracking branch 'space-station-14/master' into ed-02-06-2024-upstream 2024-06-02 11:01:34 +03:00
NazrinNya
9eb3239fcc make it so you cant build disposal pipes in impassable objects (#28447) 
make it so you cant build disposal pipes in impassable objects (like walls)
 2024-05-31 10:49:00 -04:00
Ed
209f02a0dd Merge remote-tracking branch 'upstream/master' into ed-30-05-2024-upstream 
# Conflicts:
#	Resources/Prototypes/Maps/Pools/default.yml
 2024-05-30 13:29:19 +03:00
Leon Friedrich
4735cb7d2d Fix dud modular grenade visuals (#28265) 2024-05-25 16:03:05 -04:00
Ed
6d51ea95a1 Merge remote-tracking branch 'upstream/master' into ed-22-05-2024-upstream 2024-05-22 13:29:42 +03:00
Teemu Kauhanen
d5875fd4a1 add WhiteCane recipe (#28146) 2024-05-19 16:22:45 -06:00
Ed
dda8ea2b09 Merge remote-tracking branch 'refs/remotes/upstream/master' into ed-13-05-2024-upstream 
# Conflicts:
#	Content.Shared/Lock/LockSystem.cs
#	Resources/Prototypes/Maps/oasis.yml
 2024-05-13 18:32:59 +03:00
Hanz
77ee0088f9 CMO Drip DLC (#26153) 
* All the stuff

yes yes

* THE GOD DAMN META

bruh

* New sprites and all that jazz

yay

* loadouts working?
 2024-05-09 17:53:55 -04:00
Plykiya
4c68fce064 Adds supplybot to crafting menu (#27827) 
Add supplybot to crafting menu

Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-05-08 22:54:48 -07:00
Ed
b92032fdd7 Merge remote-tracking branch 'refs/remotes/upstream/master' into ed-08-05-2024-upstream 
# Conflicts:
#	Content.Server/GameTicking/GameTicker.Spawning.cs
#	Content.Shared/Preferences/HumanoidCharacterProfile.cs
#	Resources/Prototypes/lobbyscreens.yml
 2024-05-08 12:26:05 +03:00
Plykiya
1952ae3267 Reimplement supplybots as non-vehicles (#27769) 
* Reimplement supplybots as non-vehicles

* what the hell is a container container?

* Dumpable

* let them hear supply comms

* unmigrate

* no more QM access

* Skill issue

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-05-08 10:30:03 +03:00
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
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
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
Ed
7d11ff5562 Merge remote-tracking branch 'space-station-14/master' into 02-05-2024-upstream 2024-05-02 20:46:45 +03: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
K-Dynamic
446f516590 Simplified and consistent honkbot & jonkbot recipes (#27535) 
simplified honkbot & jonkbot recipes
 2024-05-01 13:27:21 +10: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
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