juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,655 Commits 57 Branches 0 Tags
79515d930321b71ca3ebddc4202d9b87f7484455
Commit Graph

2663 Commits

Author SHA1 Message Date
Ed
d3189b83cf Pumpkin + Cabbage (#417) 
* seeds

* import Omsoyk plant sprites

* cabbage slicing

* sliceable pumpkin

* some tweaks

* seedbed clean fix, remove shitcode systems

* seed crafting, knife fix

* utencil

* Update base.yml

* cabbage rebalance

* abstract seed
 2024-08-22 17:35:00 +03:00
Ed
c82b17a65e Merge remote-tracking branch 'upstream/master' into ed-19-08-2024-upstream 
# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
#	Content.Shared/Clothing/Components/ClothingComponent.cs
#	Resources/Prototypes/Accents/word_replacements.yml
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/Prototypes/Maps/atlas.yml
#	Resources/Prototypes/Maps/bagel.yml
#	Resources/Prototypes/Maps/cluster.yml
#	Resources/Prototypes/Maps/europa.yml
#	Resources/Prototypes/Maps/omega.yml
#	Resources/Prototypes/Maps/origin.yml
#	Resources/Prototypes/Traits/speech.yml
#	Resources/Prototypes/Voice/disease_emotes.yml
#	Resources/Prototypes/Voice/speech_emotes.yml
#	Resources/Prototypes/game_presets.yml
#	Resources/Prototypes/secret_weights.yml
 2024-08-19 19:06:38 +03:00
Nim
34f90f1bce clothing and armour package (#408) 
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2024-08-19 18:41:35 +03:00
Ed
4cb93fc965 Food update (#412) 
* meat refactor

* document and remove verb

* cooking table

* cutlets

* dough and cheese update

* flat dough

* size edit, egg added

* Update test-ship.yml

* meat and cheese randomsprite
 2024-08-19 18:39:47 +03:00
Caconym27
7a0ee1a074 Added nose coverings on gaiters (#31116) 
Added 2 pixels on the front of the left and right views of the red and black gaiter sprites so that they would properly cover the nose of their wearers, as they do in reality.
 2024-08-20 00:00:16 +10:00
Boaz1111
2f923d88e4 New head of security weapon:Energy Shotgun (#30643) 
* Reset hopefully?

* removes the emergency security orders

* Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

Rewrites the description based on review

Co-authored-by: NakataRin <45946146+NakataRin@users.noreply.github.com>

* 7 shots, recharge taking 42 seconds

* minor renaming :godo:

* please work

* Revert "please work"

This reverts commit e84a2618d95ec17f5fd608331176df2ab8b0966c.

* please fix

---------

Co-authored-by: NakataRin <45946146+NakataRin@users.noreply.github.com>
 2024-08-19 21:14:30 +10:00
Nemanja
476c7751c4 Recycler Overhaul (#30802) 
* Recycler overhaul

* remove
 2024-08-18 21:39:00 -06:00
Flareguy
94c746abe9 Minor vox customization update: new hairstyles & facial hair (#30815) 
* new vox customization stuff

* tests fix
 2024-08-18 21:32:15 -06:00
DieselMohawk
802d478e21 Security Helmet Reshape (#30961) 
Mildly Reshapes The Sec Helmet
 2024-08-18 21:21:44 -06:00
Nemanja
0a05ee9a27 add space carp and sharkminnow teeth (#31070) 2024-08-18 21:04:59 -06:00
Moomoobeef
529e4b767c Added a pitcher for the chef to use in serving beverages (#31105) 
* changed weird red pixel on pitcher sprite

* added pitcher prototype

* added pitcher to dinnervend

* realized I need to change the other icon sprites too :P
 2024-08-18 21:01:26 -06:00
tosatur
68d650653f Made hydroponics alert light more orange (#31088) 
made light more orange
 2024-08-18 20:48:47 -06:00
Goldminermac
864956c66b Pancakes Fix (#31123) 
* Edited blueberry pancake textures to seem more blueberry-stained

* Added new blueberry pancake sprites to allow stacking up to 9

* Added more sprites for chocolate pancakes so they can stack up to 9

* Fixed up the blueberry pancake sprites to be more consistent

* Updated the stack components of blueberry and chocolate pancakes in the yml prototype file.

* Updates the stack size in the consumable stacks yaml file.

* Added the new pancake sprites to the sprite meta json file.

* Removed an unnecessary space from the baked food YAML file

* Updated branch and fully resolved merge conflict

* Decreased the copy-pastiness of some of the blueberry sprites to make them less repetitive

* Diversified the textures some more for good measure.

* Fixed some missing rims around the pancakes because I'm bored
 2024-08-18 20:42:58 -06:00
deltanedas
ad691931c6 add memory cell and rework logic construction (#24983) 
* rework construction to be deconstructable, add memory cell

* update textures

* add code

* add memory cell and ports, empty circuit

* d

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2024-08-18 16:34:43 -06:00
potato1234_x
1952618203 Tea Plant and Blue Pumpkin (#25092) 
* tea plant, blumpkin

* fix linter

* fix tests pls

* bloompkin

* forgor rsi

* work please

* WORK PLEASE

* migration of the blumpkins

* it is now glumpkin

* lowercase

* uppercase

* adjust values and fix blorbo

wtf when did blumpkin donut turn into blorbo donut what

* fix test

* update

* fix stupid mistake

* Update meta.json

* totally not a webedit

* not a webedit 2

* nitpicks
 2024-08-18 16:28:18 -06:00
Nemanja
a540b8840e Goliath mob (#30839) 
* Goliath mob

* Update asteroid.yml

* mcfuck yourself

* add cloak

* fixes

* Update materials.yml
 2024-08-18 12:22:36 -04:00
SlamBamActionman
7d48cc5e24 Add atmos directional sign (#31155) 
* Xeno walls

* Fix icon smoothing for the walls

* Added a bunch of items, and the map/shuttle

* Fixed construction graphs

* Put the map in the right place gosh

* Fix shuttle walls rusting, invalid IDs, latejoin cryo, deprecated properties

* Fix APC names and stuff

* Updated to v1.1
 2024-08-18 11:44:09 -04:00
themias
ef3de39364 Add croissant recipe (#30825) 
* Add croissant recipe

* comma

* fix description

* fix merge error
 2024-08-18 00:09:42 +10:00
Nemanja
c41fe93040 Salvage Spawners (#31020) 
* treasure entities and spawners

* no more smiles
 2024-08-15 13:26:02 -06:00
Nim
84af71eb7c Golden toilet (#31049) 
* golden toilet

* Destructible

* sprite

* fix

* copyright
 2024-08-15 13:23:59 -06:00
to4no_fix
6567fa36e4 Adding shock collar and electropack (#30529) 
* Adding shock collar with the new ShockOnTrigger

* Cleaning and updating the shock collar

* Add StripDelay datafield to ClothingComponent

* Adding SelfUnremovableClothingComponent

* ShockCollar Update

* Correction of the shock collar

* Correction of the shock collar 2

* Renaming the DamageSpecifier DataField to Damage

* Fixing the damage field in ShockCollar

* Cleaning the ShockCollar

* Renaming ShockCollar to ClothingNeckShockCollar

* Adding ClothingNeckShockCollar as a stealTarget to a thief

* Fixing a typo of the sprite path in ClothingNeckShockCollar

* Cleaning the ShockOnTriggerComponent

* Revision of SelfUnremovableClothing

* Adding a ClothingBackpackElectropack

* Sprite fix

* Code review

* Shock Collar sprite update

* add commit hash

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
 2024-08-15 10:30:39 -04:00
PoorMansDreams
793eb87f31 Adds a Dinky Star Sticker for security officers (#29767) 
* Sec-Star-TASTIC

* fix license

* now counts as trash

* Sticks to people + wearable

* no more sticky

* no more sticky

* mystery-space

* Update Loadout Yaml
 2024-08-15 11:50:55 +10:00
Ed
e659eb992f Custom Taco & Kebabs - FoodSequence 2 (#30905) 
* control layer ordering

* sprite update

* taco!

* taco naming gen

* fix separator naming

* some proto fixes

* default naming separation

* fix taco naming

* rat update

* hamsterburger

* organs taco

* remove from spawners

* fixes

* fix separators and lemons

* Update food-sequence.ftl

* randomization offset

* fix

* kebabs refactor

* fix

* skewer weapon

* Update food_single.yml

* Update migration.yml

* suppermatter

* hamlet centered

* hamsburger

* Update dead-0.png

* 20 -> 4 burger layers max

* Update burger.yml

* canReact: false

* capfruit update

* Update burger.yml

* Update burger.yml

* Update produce.yml

* some fixes

* Update Resources/Textures/Objects/Consumable/Food/taco.rsi/meta.json

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

* Update Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs

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

* Update Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs

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

* chicken

* Update food-sequence.ftl

* documentation

* fixes

* Update meat.yml

* Update meat.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2024-08-14 15:04:00 +02:00
PoorMansDreams
02521d59dd Throngler Plushie Sprite (#30969) 
Throngonkler Plush sprite
 2024-08-13 23:32:53 +03:00
Ubaser
135d52406a Add capfruit, a gatfruit mutation. (#30850) 
* add base

* add fake suffix and flavor fix

* address some reviews

* parent it

* fix test fail

* add FoodSequence support and address small review
 2024-08-13 13:08:40 +02:00
pigeonpeas
329a0a875b Grey mantle in winterdrobe (#29774) 
* add the mantle

* fix a few things

* fix merge conflict stuff, remove from winterdrobe and lathe.

* Add mantle to loadouts (20 hour requirement)
 2024-08-13 19:20:12 +10:00
Ed
d9336781f1 Merge remote-tracking branch 'upstream/master' into ed-05-08-2024-upstream 
# Conflicts:
#	Content.Shared/Inventory/InventorySystem.Equip.cs
#	Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
 2024-08-12 14:40:15 +03:00
Ubaser
d220249902 Hotfix #30291 (#30932) 
* add

* Revert "add"

This reverts commit 2b4ae87c4fbdd80d224ab19a655c9c547fcc43fd.

* add
 2024-08-12 17:04:21 +10:00
DieselMohawk
6759d6a614 Sec Vest & Helmet Resprite (Attempt 2) (#30291) 
* Sec Vest & Helmet Resprite

* Made Helmet side sprites better

* Vest Alterations In Line With Feedback

* Feedback Based Alterations PT.2 (How did I miss that?)

* Alterations in line with Art Director Feedback
 2024-08-12 16:20:56 +10:00
Alzore
bcd7085a3e Add diamond mining drills, buff regular mining drills (#30814) 
* why do I have to change so much just to add drills

* diamon
 2024-08-12 11:49:09 +10:00
Zachary Yona
7aaac2c179 Minor sprite fix to inhand med hardsuits and HoS turtleneck jumpsuit (#30918) 
* Fixes inhand hardsuit cross color from https://github.com/space-wizards/space-station-14/issues/26516#issue-2213917971

* Fixed HoS Turtle not covering all butt pixels

---------

Co-authored-by: Zachary Yona <magicalusf@gmail.com>
 2024-08-12 07:45:28 +10:00
Ed
8ecae1288f Merge branch 'master' into ed-05-08-2024-upstream 2024-08-11 18:13:17 +03:00
mhamster
e26e662023 Small json files fixes (#30907) 
Small json fixes

Resources/Textures/Interface/Default/meta.json: trailing comma
Resources/Textures/Objects/Specific/Hydroponics/attribution.json: proper json
Resources/Textures/Tiles/Planet/Snow/meta.json: trailing commas
 2024-08-11 23:26:45 +10:00
Flareguy
179534f18d Vox Minor Clothing Update 2: Electric Boogaloo (#30838) 
* more vox masks n stuff

* cluwne

* fix

* merc gas mask

* bunny tail height fix
 2024-08-11 00:06:50 +03:00
Ed
4d75cb54c8 Custom burgers - FoodSequence system (#30755) 
* setup foodsequence

* name generation and max layers limit

* move to nutrition

* move code to serverside

* move to appearance data

* marked fields as required

* Update foodsequence.yml

* b

* burgeers!

* Update produce.yml

* Update meat.yml

* Update burger.yml

* fix duplicate naming

* Update Resources/Locale/en-US/nutrition/components/food-sequence.ftl

Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>

* merge flavor profiles

* make food trash List<>

* merge trash

* Update FoodComponent.cs

* Update FoodComponent.cs

* organs and cannabis support

---------

Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>
 2024-08-10 22:31:32 +03:00
Nemanja
fc1446e73a Cursed Mask (#29659) 
* Cursed Mask

* extra expressions

* block ingestion

* mind returning

* okay fix the removal shit
 2024-08-10 11:14:58 -04:00
Ubaser
c812bd8ff4 Partially revert light tube sprites (#29091) 
* add

* reduce contrast
 2024-08-10 11:00:21 -04:00
TakoDragon
9bc1fabdb3 Added suitskirt for psychologist (#30709) 
* Added jumpskirt

* added locale

* Added spaces in code

* Updated the meta
 2024-08-10 08:51:54 -04:00
Nim
bf256b25e9 Two new spells of light (#404) 
* light spell

* fix
 2024-08-10 13:08:14 +03:00
Ko4ergaPunk
1fe46a7210 Changed chemistry airlock color (#30666) 
* chem

* re-check

* re-check. again

* checks just die. last try

* re-check :blessrng:
 2024-08-09 23:23:46 -04:00
Jaraten
32ce8f2164 directional window (#401) 
* pu-pu-piri-pu

* fx remove
 2024-08-10 01:10:22 +03:00
Ubaser
ed3ec4dc5f Crowbar variants (#28988) 
* add

* comma

* sprites

* yaml-ify

* add s

* lathe and engi belt

* yes

* fix maybe

* progress

* nearly there

* fix

* fix yaml linter having a stroke
 2024-08-09 13:29:00 -06:00
MureixloI
3f4e093eaf [Sprites/Fix] In hand for BlueSpace beaker & CMO's equipped cloak (#28719) 
* [Fix] CMO's equipped cloak

* [Fix] CMO's equipped cloak

* [Sprites] In hands for bluespace beaker

* [Sprites] In hands for bluespace beaker

* [Sprites] In hands for bluespace beaker

* [Sprites] In hands for bluespace beaker
 2024-08-09 22:02:26 +10:00
Jaraten
f70e3051ed update update (#403) 2024-08-09 14:08:50 +03:00
Ubaser
c1797b769c Resprite the equipped gas canister suit slots (#30809) 
* add

* red and generic

* add meta
 2024-08-09 20:32:55 +10:00
Ed
e3e142592a add art (#402) 2024-08-09 11:03:39 +03:00
Ko4ergaPunk
55d400b1b9 New decals for mapping (#30374) 
* new decals

* license

* re-check
 2024-08-09 17:06:37 +10:00
themias
8ebe105458 Add butter slices (#30789) 2024-08-09 09:32:42 +10:00
Nemanja
1b1008ad85 Scrap (#30762) 
* jnk sprites

* scrap pt 2

* metal inhands

* hell yeah brudda

* Update meta.json

* Update scrap.yml

---------

Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com>
 2024-08-09 09:31:53 +10:00
Ed
03745efc7f Thief beacons (try 2) (#29997) 
content
 2024-08-08 16:17:50 +03:00