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

8115 Commits

Author SHA1 Message Date
Ed
074ec3e17d Goblin species (#295) 
* Create CP14HandDisplacementMapComponent.cs

* idk if it works, we need goblin first

* some clean up

* add goblin species sprites

* basic goblic species prototype

* hairs, ears

* typo

* hand displacement maps

* shoes displacement

* shirt displacement

* head displacement. Add support different size maps

* +dummy

* eyes displacement

* pants displacement

* gloves displacements

* cloak and mask displacement (final)

* belt displacement!

* add nose customization

* +2 ears customization
 2024-07-03 01:09:57 +03:00
Token
b0ceeb19c3 fix CP14IronGrilleGate sound to chainy metall sound collection (#293) 2024-07-02 23:21:43 +03:00
Ed
7e6be7feac fix lava + affectTemp reagent effect 2024-06-30 11:49:51 +03: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
MureixloI
fef679846c Fix some job's drobes point light (#29590) 
* Fix some job's drobes point light

* Fix some job's drobes point light
 2024-06-30 13:46:31 +10:00
SlamBamActionman
b9fa941ca6 Turn ReagentEffects into generic EntityEffects (#28168) 
* Oh the possibilities

* Merge fixes

* Forgot to remote LavaSystem oops

* Changed EntityEffectArgs to EntityEffectBaseArgs and EntityEffectReagentArgs

* Throw exception for unimplemented effectargs

* Remove Json and overrideable datafields

* Fix test issues

* Actually fix the compiling issue

* Fix comments and remove EntityEffectArgs (no longer used, replaced with EntityEffectBaseArgs)
 2024-06-30 13:43:43 +10: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
slarticodefast
cd2968d849 Add sprite for vent under-pressure lock-out (#29527) 2024-06-28 22:02:48 -07: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
Token
f7e92980ab Mechs now destructable (#29338) 
Add Destructible component to BaseMech
So all mechs are destructable now
 2024-06-29 13:28:46 +10:00
T-Stalker
692a6067e9 Remove rads from bananium (#29545) 
webedit ops
 2024-06-28 19:28:27 -04:00
Guillaume E
c38859b77a Make miners respect AtmosDeviceUpdateEvent.dt (#29522) 
Miners' prototype have been changed to reflect this (I read
somewhere that we have about 1 atmos tick/0.5s, my tests show more
like 1/0.53 but that looks close enough).

This also means that miner's spawnAmount is now expressed in mol/s.

See: #18781
 2024-06-28 10:49:39 -08:00
Pieter-Jan Briers
6409004244 WATTAGE IS NOT A UNIT OF STORED ENERGY (#29538) 2024-06-28 17:00:45 +02:00
slarticodefast
418fc79698 Give passive vents the correct sprite (#29536) 
give passive vents the correct sprite
 2024-06-28 08:33:03 -04:00
Ed
1dbe308527 Entity ru localization sync (#285) 
* first use

* LOCALIZAAATION

* and again

* Update fire.yml

* Update entities.ftl

* Update main.py

* Update main.py

* delete wrong locales

* battle staff locale

* Update main.py

* more remove

* Update wielded-inhand-right.png
 2024-06-28 12:25:20 +03:00
JIPDawg
bb50087dd0 Fixed the sound of pulling back a foam crossbow from a flash sound to a bow pull sound. (#29508) 
Fixed foam Crossbow making a flash sound to just a bow pull sound

Co-authored-by: JIP <jipdawg93@gmail.com>
 2024-06-27 20:23:17 -04:00
metalgearsloth
bc1703323e Revert "Make wearing an Ushanka also apply accent to your name" (#29524) 
Revert "Make wearing an Ushanka also apply accent to your name (#29111)"

This reverts commit e5a85e2a13.
 2024-06-28 10:08:09 +10:00
ArkiveDev
d5b5dafb3a Still immovable rods are now actually still (#29518) 
Set the still rod's max velocity to 0 so it gets a 0 mangintude impulse on init
 2024-06-27 18:07:12 -04:00
Ed
54ecb1b23e added battle staff (#286) 2024-06-27 23:29:27 +03:00
Jaraten
dcfd3f6aa5 New tiles (#274) 
* New tiles

* fix yaml & resprite

* migration fix

* ftl fix

* fix typo

* fix typo +1

* fix C# typo

---------

Co-authored-by: Ed <edwardxperia2000@gmail.com>
 2024-06-27 22:16:05 +03:00
KonstantinAngelov
64192b3506 CookBook name,id and description changed to not be "meta" (#29467) 
* CookBook name,id and description changed

* Id isues with CookBook fixed

* Maps not added
 2024-06-27 11:11:33 -04:00
Ed
798539899d experimental cliffs (#283) 2024-06-27 14:04:57 +03:00
Tayrtahn
f1e7b4c499 Fix double labels on pills and pill canisters (#29499) 2024-06-26 22:08:56 -04:00
VeritableCalamity
4241ad34b6 Give moldy food the "Trash" tag (#29380) 
Make moldy food items have the "Trash" tag, so they can be collected.
 2024-06-25 23:26:59 -04:00
lzk
a540d1ab17 Make blood less satiate hunger (#29433) 2024-06-25 22:27:11 -04:00
Джексон Миссиссиппи
33dd7d4965 Fix dragon ghost role rules (#29474) 
q
 2024-06-26 11:20:45 +10:00
Snicket
231e180ff3 reclaimer-lobby-art (#29343) 
* reclaimer-lobby-art

* fixed attribution from my part-Snicket

* fixed atributions this this time fr

* man

* Grobletombus
 2024-06-25 15:28:37 +02:00
Imperator Shlepa
e12f499594 Craft for stone walls. (#280) 
* 123123

* Update Resources/Prototypes/_CP14/Recipes/Construction/walls.yml

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2024-06-25 12:07:01 +03:00
Elysium206
8c7fc9890c Increase of riot shield durability (#29239) 2024-06-24 23:56:46 -04:00
Emisse
7453f459c9 hardsuit fireproof nerf (#29416) 
hardsuit nerf
 2024-06-24 18:03:05 -04:00
Deserty0
eb8acd223a Size fix (#276) 
* Update eyes.yml

* уэээ
 2024-06-24 18:20:06 +03:00
MureixloI
6888511e03 Fix cargo and salvage's computer point light (#29384) 2024-06-23 18:17:59 -04: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
19bc6f961d ironrock ores (#29381) 2024-06-24 01:02:16 +10:00
eoineoineoin
2762470096 Add "Structure" tag to switches, buttons, and levers (#29378) 
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
 2024-06-23 10:52:30 -04:00
Errant
ba39b6f551 Survival box loadout group cleanup (#29379) 
cleanup
 2024-06-23 08:41:34 -04:00
Brandon Hu
801c4f9181 tweak(medical): Reduce chemist slots (#28711) 
* tweak(medical): Reduce chemist slots

* tweak(medical): roundstart chemists slot set to 2 on some maps

* tweak(fland): Chemist slots to 3

fland is target to 80-100 players
 2024-06-23 02:03:00 -06:00
metalgearsloth
0546c9bf64 Revert "Weapon Reflection Movement Mechanic (#27219)" (#29326) 
* Revert "Weapon Reflection Movement Mechanic (#27219)"

This reverts commit b90373356e.

# Conflicts:
#	Content.Shared/Alert/AlertType.cs
#	Content.Shared/Weapons/Reflect/ReflectSystem.cs

* Add myself to codeowners

* Add myself to codeowners

* Also the alerts
 2024-06-22 22:16:08 -04:00
Cojoke
966aca437c Add the ability to put hats on medibots (#28584) 2024-06-22 20:28:20 -04:00
Floofi
3284c24ece add lemon juice and fix bad sprite allocation (#27465) 2024-06-22 19:46:19 -04:00
Pieter-Jan Briers
f582e690eb Remove robotics and supermatter lobby images (#29355) 
They don't look good, we have way better ones now.
 2024-06-22 17:00:09 -04:00
Ed
34ae041f99 new lobby art (#267) 
* add lobby art

* Update typicalAlchemistDay.webp
 2024-06-22 19:27:57 +03:00
lzk
325ab97a7d Prying reinforced tile now will give you back metal rod (#29084) 
* Reinforced tile can we welded back into metal rod

* more changes

* weh

* fix

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2024-06-23 01:47:02 +10:00
K-Dynamic
2a6fc45ab5 Thief toolbox minor rebalance & description clean-up (#27771) 
* thief clean-up

* anatomy set description change

* description changes
 2024-06-23 01:44:18 +10:00
Partmedia
02fb432b05 Adjust some gas thresholds (#29331) 2024-06-23 01:22:06 +10:00
deltanedas
475c2a0b42 add access reader log wire (#29094) 
* add LoggingDisabled to AccessReader

* add LogWireAction

* -m give everything besides high-security door a log wire

* make LogAccess public and support string arg

* add log when pulsing

* m

* l

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2024-06-23 01:12:58 +10:00
marbow
5ee79b51ca Sound Station 14 like a nukie song (#29345) 
Nukie song!!
 2024-06-23 01:09:41 +10:00
Errant
c418758a3a Fix for missing survival boxes (#29336) 
storagefill order fix
 2024-06-22 20:43:18 +10:00
Partmedia
dfe01c7bb1 Fix comments (#29330) 2024-06-21 23:02:06 -07:00
Partmedia
bb61f44d92 Move air sensor components into abstract base prototype (#29261) 2024-06-21 21:57:14 -07:00