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

2716 Commits

Author SHA1 Message Date
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
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
Boaz1111
3a3a5fbaf4 makes the maple wing marking have a primary and a secondary color (#31691) 
bogos binted
 2024-09-07 15:48:40 +10:00
themias
f49d83ac81 Add justice helm (#31905) 
* Add justice helm

* backslash moment

* spinny light

* remove power cell from recipe
 2024-09-06 21:04:31 -06:00
Ps3Moira
45b252e1b6 fix pump shotgun wielded sprite (#31885) 
* fix shotgun sprite

* fix take 2
 2024-09-06 17:26:46 -06:00
Nemanja
8599251825 Mineral Scanner (#31390) 
* Mineral Scanner

* doink

* review

* sunday funday

* review and fix bugs i think?

* Update MiningOverlay.cs
 2024-09-07 00:05:53 +10:00
Ed
1a4d58816f Tech Anomaly (#31764) 
* A

* B

* C

* D

* Update TechAnomalySystem.cs

* idle anim

* Update meta.json

* new animation
 2024-09-06 10:24:17 +03:00
Pieter-Jan Briers
1b1d63f5d6 Vox sign/N2 locker update (#31845) 
* Vox sign/N2 locker update

The "vox area" sign and N2 locker sprite were both taken from /vg/station. These sprites have bad racist connotations as discussed in https://github.com/space-wizards/space-station-14/issues/31840, and do not fit our server culture.

The new N2 locker is not a taped on piece of trash. It now also has a blue stripe to mimic the regular O2 locker and make it more distinct from fire safety closets.

The new "vox area" sign sprite follows the same style as other "area indicator" signs used throughout the blue and isn't an explicit warning sign anymore. It still has "No O2" on it to fill that role though.

* emogarbage adjustments

---------

Co-authored-by: EmoGarbage404 <retron404@gmail.com>
 2024-09-05 23:26:26 -06:00
drakewill-CRL
511d759a70 A kit to help new botanists discover chemistry (#31738) 
* Add a kit for botanists to do some limited chemistry to the NutriMax. Intended to help new botanists learn in-game about chemistry.

* remove exclamation marks from names

* naming fix

* Rejected trademark application for 'Farmers Helper'.

---------

Co-authored-by: PraxisMapper <praxismapper@gmail.com>
 2024-09-05 18:43:00 +02:00
ScarKy0
ecc38ad782 Fixed AI Actions (#31823) 
* Updated sprites for AI HUD

* Epic test fail

* Merged AGhost actions and AI actions together again.

* Seperate comms and bugfix. Fixed broadcast.
 2024-09-05 22:49:20 +10:00
chromiumboy
63ba0f61ea Atmospheric alerts computer (#25938) 
* Atmospheric alerts computer

* Moved components, restricted access to them

* Minor tweaks

* The screen will now turn off when the computer is not powered

* Bug fix

* Adjusted label

* Updated to latest master version
 2024-09-04 21:13:17 -04:00
Vasilis
2e93354f5d Recompress some lobby images to be under a 1mb (#31404) 
* Recompress some lobby images to be under a 1mb

* oops
 2024-09-05 01:37:52 +10:00
IProduceWidgets
c8e59ebdd5 Add Snails (#30765) 
* add snails

* scuffix

* migrate

* mo-grate

* oopsied the ftls

* Revert "oopsied the ftls"

This reverts commit 0d3c6c17f31ec904679d6a48799cea71e77c1f99.

* the curse of staging the wrong file, resolved.

* Snoth

* fix my dumbs

* reviews 1

* anti space technology

* salt hurty

* spelling

* Its a slotherhouse out here

* sequencing

* cooked snail

* volfix

* speed reversal
 2024-09-03 12:33:44 +02:00
Арт
0c018769a6 Return Long2 and Long3 hairstyles (#30963) 
* Sprites

* Prototype_&_Locale

* sorted_in_alphabetical_order
 2024-09-03 18:29:24 +10:00
Moomoobeef
93728e4b8e fixed broken pipe sprites (#31773) 2024-09-03 17:33:46 +10:00
godisdeadLOL
a112c24b54 Added in-hand sprite for Smile the Slime (#31731) 
added smile the slime in-hand texture

Co-authored-by: YourUsername <you@example.com>
 2024-09-01 22:36:05 -06:00
Nemanja
f710b34573 Roundstart Grappling Gun (#31737) 
Roundstart grappling hook
 2024-09-01 22:33:25 -06:00
Ed
ca318a1849 Cucumber! Potato! (#430) 
* some ambient loops tweak

* cucumber! potato!

* seed craft

* fix CLA

* Update CP14DayCycleSystem.cs

* Update CP14DayCycleSystem.cs

* weather
 2024-09-01 16:14:56 +03:00
Ed
3b0af98a2e Weather backend start (#407) 
* DayCycke StartWithRandomEntry

* add weather rule

* fix

* yep, its work

* finalize weather

* fix again

* weather resprite
 2024-09-01 15:22:16 +03:00
Julian Giebel
417d3a87a2 Station Anchor (#26098) 
* Work on abstracting out chargeup functionality/ui from grav gen

* Work on station anchor

* Finish implementing station anchors

* uhh yeah

* ok.

* fix tests

* whoops

* Get the last extraneous yaml fail

* PJB review

* beast mode... ACTIVATE!

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: EmoGarbage404 <retron404@gmail.com>
 2024-08-31 10:40:28 -04:00
DieselMohawk
bdfc57c5ac Added Armband Onto Back Sprite of Security Jumpsuit (#31635) 
* Fixed Minor Mistake

* Fixed the NEW sprite and added Jumpskirt Fix
 2024-08-29 21:46:46 -04:00
Ed
37a4068334 CLA license update (#429) 
* pupu

* Update LICENSE.TXT

* CLA

* CLA!

* Revert "CLA!"

This reverts commit f999e341a1.

* CLA2

* Update rsi.json

* CLA3

* Workbench sublicense
 2024-08-29 18:23:33 +03:00
Ed
ca656b3c10 Merge remote-tracking branch 'upstream/master' into ed-29-08-2024 
# Conflicts:
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Resources/Prototypes/Maps/reach.yml
 2024-08-29 14:32:09 +03:00
SlamBamActionman
ff5acf7877 Add Command Glasses (#30447) 
* Initial commit

* Removed wanted and mindshield status display

* Updated glasses visuals & contraband status

* Added Command Hud

* Changed name to administration glasses/hud
 2024-08-29 11:58:16 +10:00
RumiTiger
d9b1369dae Cherry (#28962) 
* Add files via upload

* Update produce.yml

* Update produce.yml

* Update seeds.yml

* Update flavor-profiles.ftl

* Update flavors.yml

* Update meal_recipes.yml

* Update food_produce.yml

* Update meta.json

* Update seeds.yml

* Update botany.yml

* Delete Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/meta.json

* Create meta.json

* Delete Resources/Textures/Objects/Specific/Hydroponics/cherry.rsi/meta.json

* Create meta.json

* Update produce.yml

* Update produce.yml

* Update produce.yml

* Update food_produce.yml

* Update food_produce.yml

* Update produce.yml

* Apply suggestions from code review

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

* Update seeds.yml

* Update juice.yml

* Update juice.ftl

* Update seeds.ftl

* Update seeds.yml

* Update cargo_botany.yml

* Update cargo_botany.yml

* Update cargo_botany.yml

* Update cargo_vending.yml

* Update cargo_vending.yml

* Update seeds.yml

* Update seeds.yml

* Update meta.json

* Update produce.yml

* Cherry Tree

* Alphabetical order

* Update food_produce.yml

* Update food-sequence.ftl

* Update food-sequence.ftl

* Update produce.yml

* Update produce.yml

* Update food-sequence.ftl

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
 2024-08-29 11:30:58 +10:00
DieselMohawk
26ba9918f3 Sec Webbing Icon Resprite and Rename (#29599) 
* Sec Webbing Icon Resprite and Rename

* Renamed To Security Carrier
 2024-08-29 11:23:59 +10:00
beck-thompson
50791db750 Add rings (Salvage loot real)! (#31372) 
* First commit

* I'm silly

* Another fix

* How could I forget the descriptions!

* Forgot

* Made textures alligned properly

* Removed the stuff!

* Opps

* Typo fixes
 2024-08-28 22:48:46 +02:00
Ed
e02a9951a7 Flowers + some love for Alchemy (#427) 
* red rose proto and sprite

* 242 changed files guys

* yellow dayflin

* jitter + drunk solution, also refactor alchemy recipes

* dyes entity

* dye crafting, dye using

* add flowers to generation
 2024-08-29 00:31:09 +05:00
lzk
98680ce0f2 Change my copyright (#31599) 2024-08-28 21:12:09 +02:00
deltanedas
6808558df6 add construction for carp statue (#31261) 
* separate eyes and teeth

* make it buildable and make fixture less abusable

* norot

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2024-08-28 15:08:55 +02:00
Skilets
e938b2f9ed Icon (#426) 
* Fix Hud

* skulls wall

---------

Co-authored-by: SkiletsKir <113713080+Skilets@users.noreply.github.com>
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2024-08-28 15:32:22 +03:00
Ed
aa5f9104df Wallpaper (#424) 
* wallpaper system

* fix startup ordering

* cool doAfters

* green test wallpapers

* wallpaper finite stacks

* dev update

* Update CP14ClientWallpaperSystem.cs

* fix wall rotations

* yippee

* Update battle_royale.yml

* Update test-ship.yml
 2024-08-28 15:11:32 +03:00
saintmuntzer
d8dbfa92d7 recolor riot helmet (#31530) 
* recolor riot helmet

resolves #31256
match riot helmet to default security helmet

* further color tweaks for consistency; update meta.json

Tweaked equipped sprites to more closely match the security helmet.
 2024-08-28 21:27:08 +10:00
lzk
512d27ca6b Add black suspenders (#29055) 
* Black suspenders

* fix

* fix linter
 2024-08-28 11:43:30 +02:00
lunarcomets
a02bdd09e4 update AI job icon to 8x8 (#31565) 
icon and meta.json
 2024-08-28 02:18:51 -06:00
metalgearsloth
af79603d9d Update AI holo sprite to camera (#31558) 
Update AI camera to 13 default

Holo was a placeholder. This is better in the interim.
 2024-08-28 15:45:15 +10:00
metalgearsloth
afd0618a60 Station AI (#30944) 
* Station AI overlay

* implement

* Bunch of ports

* Fix a heap of bugs and basic scouting

* helldivers

* Shuffle interactions a bit

* navmap stuff

* Revert "navmap stuff"

This reverts commit d1f89dd4be83233e22cf5dd062b2581f3c6da062.

* AI wires implemented

* Fix examines

* Optimise the overlay significantly

* Back to old static

* BUI radial working

* lots of work

* Saving work

* thanks fork

* alright

* pc

* AI upload console

* AI upload

* stuff

* Fix copy-paste shitcode

* AI actions

* navmap work

* Fixes

* first impressions

* a

* reh

* Revert "navmap work"

This reverts commit 6f63fea6e9245e189f368f97be3e32e9b210580e.

# Conflicts:
#	Content.Client/Silicons/StationAi/StationAiOverlay.cs

* OD

* radar

* weh

* Fix examines

* scoop mine eyes

* fixes

* reh

* Optimise

* Final round of optimisations

* Fixes

* fixes
 2024-08-28 10:57:12 +10:00
lzk
3492ca185b Fix stray pixel in officer beersky barsign (#31517) 2024-08-27 23:46:53 +10:00
Ed
a944cd9834 Cloth pack (#423) 
* content

* Update battle_royale_temp.yml
 2024-08-27 08:58:58 +05:00
lzk
2871e69268 Moff cooking. Part one. (#30668) 
* yml part

* guidebook

* commit

* some fixes

* a little

* change
 2024-08-26 12:46:16 +10:00
lzk
ff3d79797d Fix-Resprite emote icons (#31447) 
* Fix-Resprite emote icons

* change scream
 2024-08-26 12:20:58 +10:00
Nemanja
85b7d183bd Blueprints (#31138) 
* Blueprints

* Update tables_loot.yml

* doink

* mark as required
 2024-08-25 22:06:50 +10:00
ArtisticRoomba
adea4c91de Adds the Head of Greytide stamp (#30189) 
suggested changes from discord discussion, sprite change, add to refactored loot table
 2024-08-25 20:35:22 +10:00
achookh
95b3d05efa Change anomaly sign to have the same m as the other ones (#31394) 
* Delete Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly.png

* Add files via upload
 2024-08-24 19:30:14 +10:00
Rouge2t7
34a1e2c073 Emote sprites rework and update. (#30887) 
Emoji eye change
 2024-08-23 15:08:10 +10:00
Mr. 27
df88c93574 Added clown skirt (#31207) 
inital
 2024-08-23 14:59:17 +10:00
Flareguy
f76001959c box update: vox box edition (#31317) 
box vox vox box box vox vox box
 2024-08-22 16:26:24 -06:00
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
Rouge2t7
7e60431754 Long human ears (#30490) 
Long human ears colour fix. Shortcut removed.
 2024-08-21 17:44:43 -06:00
beck-thompson
d44bbec05d Fix nukies not getting station codes (#31272) 
First commit
 2024-08-21 12:53:04 -06:00