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

2530 Commits

Author SHA1 Message Date
Ed
20d6ccffdb Scythe (#311) 
* Scythe

* Update entities.ftl
 2024-07-07 12:55:03 +03:00
Ed
01f97a8aaa +3 berets (#306) 2024-07-05 08:56:38 +03:00
Ed
3182447fbf Grass update v2 (#303) 
* high bush

* update worldgen
 2024-07-04 23:25:22 +03:00
Ed
9280ca8830 Merge pull request #301 from crystallpunk-14/ed-05-07-2024-upstream 
Upstream sync
 2024-07-04 19:46:27 +03:00
Jaraten
b7e2d66557 wood&paper walls (#299) 2024-07-04 19:46:10 +03:00
Jaraten
a9cb687899 resprite decals (#302) 2024-07-04 19:45:24 +03: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
Errant
223ade9b3f Starting gear for vox crewmembers (#29685) 
* tank harness

* weh

* Suit Storage Whitelist

* Revert "Suit Storage Whitelist"

This reverts commit b1f503573c2936642a2d7627c4852153ec71ce79.

* suit storage filter

* vox spawn gear

* weh
 2024-07-04 12:01:03 +10:00
Ed
7477b7c869 Cloud shadows (#298) 
* not worked

* fix

* Update CP14CloudShadowsComponent.cs

* more params in component
 2024-07-03 17:33:38 +03:00
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
Ed
9eb86caa82 CC-BY-SA-3.0 for some assets (#290) 
* Update meta.json

* Update attribution.yml

* Update attribution.yml

* Update attribution.yml

* Update meta.json

* Update attribution.yml

* Update attribution.yml

* Update meta.json

* Update meta.json
 2024-07-01 12:32:59 +03:00
metalgearsloth
b6cf2ce524 Add FTL arrival visuals (#29402) 
* Add FTL arrival visuals

* weh

* Update Content.Shared/Shuttles/Components/FTLComponent.cs

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
 2024-07-01 16:11:30 +10:00
~DreamlyJack~
881f3e4255 New Color Dress (#29473) 
* add dress

* add dress

* add dress

* add dress

* add dress

* add dress

* add dress

* add dress

* add dress yml

* add dress in dresser
 2024-06-30 09:49:35 -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
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
Moomoobeef
cb6aeb4f96 Fixed the pipe in the TEG sprite (#29543) 
fixed sprites
 2024-06-28 22:03:45 -04: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
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
Ed
4d5fa91a39 Update hcut.swsl (#284) 2024-06-27 14:35:06 +03:00
Ed
798539899d experimental cliffs (#283) 2024-06-27 14:04:57 +03:00
DieselMohawk
90c33da521 Security Webbing Resprite (#29441) 2024-06-25 22:00:16 -04: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
Vasilis
27665e44a9 Fix filter yml names in the lobby so they actually work (#29435) 
Fix filter yml names so they actually work
 2024-06-25 02:53:16 +02:00
deathride58
bd3508d803 Colorblind friendly thermomachine LED colors (#29397) 
Colorblind friendly thermomachines
 2024-06-24 15:40:19 -07:00
Pieter-Jan Briers
c1ad5cded0 Fix gay nuke layering (#29410) 
I fucked up while exporting from aseprite whoops.
 2024-06-24 20:01:24 +02: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
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
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
Flareguy
45a4596e8b Disk """resprite""" (#29277) 
* disk ""resprite""

* fix holodisk
 2024-06-22 23:06:17 +10:00
Alex Evgrashin
b7c088fbf3 Fix SSD indicator for scaled humanoids (#29310) 
Fix ssd
 2024-06-22 11:11:40 +10:00
Jaraten
294f81bd0f resprite stone&red_brick-walls (#265) 2024-06-22 00:17:10 +03:00
Nim
3492a7892a Mannequin (#253) 
* mannequin

* fix

* fix2

* Update mannequin.yml

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2024-06-21 23:17:49 +03: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
Ed
03adbaf851 Tiles update + iron bards (#260) 
* wooden tiles update

* add iron bars

* dirt tile update

* fix foundation tile
 2024-06-21 00:18:47 +03:00
Ed
ec3efce19c Ed 20 06 2024 grass update (#259) 
* grass update

* +2 grass tile

* Update biomes_template_grasslands.yml

* Update biomes_template_grasslands.yml
 2024-06-20 18:18:29 +03:00
Ghagliiarghii
b90c6acacd golden plunger (#29043) 
* golden plunger

* Add wood material (the handle is still wood)

* 52 hours

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2024-06-21 00:24:36 +10:00
Errant
d15eafe133 Survival Box Loadouts, Nitrogen Emergency tanks (#29131) 
* Nitrogen survival boxes

* Zero-setup workaround

* clown box

* cleanup and universal tanks

* cleanup

* more cleanup

* hide loadoutgroups

* remaining survival boxes

* space ninja

* Revert "space ninja"

This reverts commit a650f417f83f5861e0001b25418e4a361927c6c6.

* weh

* weh

* undo appearance change of syndicate survival boxes

* indentation fix and missing label
 2024-06-21 00:05:01 +10:00
Redfire1331
68c414e8ed made cup ramen eatable with anything with the fork component (#27826) 
* made cup ramen eatable with anything with the fork component

* removed extra png

* made cupramen fillable with water, and made hot ramen dry ramen.

---------

Co-authored-by: redfire1331 <Redfire1331@users.noreply.github.com>
 2024-06-20 22:34:46 +10:00
Pieter-Jan Briers
67cc089dd0 Fix terrible portable scrubber unlit layers (#29232) 
Jesus fucking christ man
 2024-06-19 18:14:47 -04:00
Flareguy
94995460fd Emergency toolbox fill rework (#29202) 
* emergency toolbox fill rework

* Fuck
 2024-06-19 14:13:27 -04:00
Flareguy
7c01ac931f hos cap resprite (#29208) 
* hos cap resprite

* 1. 2. 3 4 Oh
 2024-06-19 10:49:19 -04:00
lzk
2b885272c8 Musician's skirt (#29203) 
* Sprites&Meta

* Changing prototypes

* Adding to Theater vend

* Sprite_Change

* Sprite_Change

* Prototype_Changes

Is this exactly how it should be?...

* FUCKING FIX

* weh

---------

Co-authored-by: Арт <123451459+JustArt1m@users.noreply.github.com>
 2024-06-19 17:06:03 +03:00
Ubaser
69afba67b6 Fix Underwing wings (#29092) 
* add

* tweak thickness of stripe
 2024-06-18 22:24:28 -04:00
Flareguy
4cf60f805e Security Resprite (#29082) 
* security resprite

* hos cap fix

* i forgor

* further fixes

* my furniture is broken

* fedora update
 2024-06-18 22:04:03 -04:00