juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,912 Commits 57 Branches 0 Tags
110ed2736f5d801b00a27e2caec3ef83107dd058
Commit Graph

1123 Commits

Author SHA1 Message Date
SlamBamActionman
69f9d531f9 Add SolutionContainerVisuals to the hypospray (#30703) 
* Hypovisuals

* Syndie hypo

* Include attribution
 2025-04-14 08:58:55 -07:00
YoungThug
dc41bd33f3 Binocular Neck Slots! (#35759) 
* binoculartweaks

* WhoNeedsArtApprovalQuestionMark

* Roomba Can You Merge Now?
 2025-04-13 23:34:20 -07:00
Tiniest Shark
d50703d7a4 Hypospray Inhand Fix (#36452) 
* fixed the cmo hypospray inhands

* whoops it was the gorlex one too
 2025-04-11 02:53:31 +02:00
SlamBamActionman
7f6756135b Add cooked dragon steak and cutlets (#36273) 
* Add cooked dragon steak and cutlets

* If it's worse for you it's even more of a delicacy

* Attribution
 2025-04-10 08:59:18 -07:00
Tiniest Shark
bfac77b53f Add inhands for Holoprojectors, labelers, cone, brb sign, fartbag (#36036) 
* Add inhands for Holoprojectors, labelers, cone, brb sign, whoopie cushion

* Update Resources/Textures/Objects/Devices/Holoprojectors/atmos.rsi/meta.json

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
 2025-04-08 23:27:07 +02:00
K-Dynamic
5b4e3b46a6 New security box fills, renamed and replaced sechud box icon (#35057) 
* secglasses and sechud icons, new box fills

* sunglasses box

* fixes indentation
 2025-04-08 10:23:12 +02:00
RedBookcase
b5616d22a9 Salvage melee weapon tweaks (#35914) 
* Minor salvage melee tweaks.

* Minor salvage melee tweaks.

---------

Co-authored-by: RedBookcase <Usualmoves@gmail.com>
 2025-04-05 23:48:18 -07:00
MisterImp
899d318f01 New food recipe: World Peazza (#35191) 
* added world peazza

* fixed a comma in the pizza sprite json

* changed attribution comment on ArtisticRoomba's suggestion

* restored accidentally deleted line, thanks Tayrtahn
 2025-04-01 16:26:53 -07:00
Chaoticaa
db65e3241e Updates to Hydroponic sprites (#35004) 
* changes to some hydroponics plant sprites

* tomato changes

* added tomatoes and further changes

* added tomatoes and adjustments

* added tomatoes and adjustments

* added apples and meatwheat

* watermelon + adjustments

* sugarcane

* blood tomatoes & pumpkin harvest

* final changes for a while

* poppy harvest repaint

* smoller melon + holy melon stages

* final changes + attributions added to json files

* oops

* changes

* changes x2

* egg success + tree changes and additions

* bagel mistake

* lemon lime garlic fly

* grapes and stuff

* Potate

* peas and attributes

* more veg while my monitor flashbangs me repeatedly trying to find source links

* soyyyyyyy

* eggplant and berries yuuumm

* corn life

* grape disaster

* my computer is slow

* Pray

---------

Co-authored-by: Your Name <[you@example.com])>
Co-authored-by: beck-thompson <beck314159@hotmail.com>
 2025-03-27 10:11:02 -07:00
āda
1b74de6dbb Fix Wizard/Librarian PDA flashlight visual (#36064) 
the other light
 2025-03-25 02:21:59 +01:00
āda
2bc3561868 Fix misplaced pixel on Wizard/Librarian PDA (#36060) 
* nudge that pixel

* new base

* whoops, leftovers
 2025-03-25 01:11:04 +01:00
Tiniest Shark
e72a086815 Grenade + Throwable Inhands (#35974) 
* Added inhands to grenades, bolas, ninja stars, and some bombs.

* whoops bolas were wrong hands

* Couple more quick fixes whoops
 2025-03-21 12:37:02 +03:00
SeamLesss
a0c78e7b18 Medical Item In-Hand Sprites (#34984) 
* Bruizepack fix and Gauze

* tourniquet sprites added

* medipen sprites

* bodybag sprites

* handheld crew moniter sprites

* implanter sprites

* rollerbed sprites

* health analyzer sprite

* bloodpack sprite

* small rollerbed change

* attributuions + spacing fix

* fixed?

* RAAAAAGH ITS DONE

* actually good code

* Update Resources/Textures/Objects/Specific/Medical/handheldcrewmonitor.rsi/meta.json

* Update Resources/Textures/Objects/Specific/Medical/healthanalyzer.rsi/meta.json
 2025-03-19 22:18:01 -04:00
mubururu_
d3ee9f8bc5 some robotics inhands (#33676) 
* real

* spacing stuff and fix tiny issue
 2025-03-19 21:43:00 -04:00
Velken
003b667aa6 Mail Bag (#35702) 
* mail bag

* fix

* cute envelope in the bag sprite

* Update Resources/Textures/Objects/Specific/Cargo/mail_bag.rsi/meta.json

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

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-03-19 18:32:39 -07:00
SeamLesss
4bb1a62f22 Add In-hand Sprites for miscellaneous items (#35433) 
* guh???

* Merge branch 'master' of https://github.com/SeamLesss/space-station-14

* incomplete baseball bat

* bling

* attribution

* camera bug

* damp rag

* cap cap

* centcom cap

* Update Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json
 2025-03-19 21:04:41 -04:00
mubururu_
eb5610b745 inhand sprites for Produce (#35151) 
* awakening

* fix test fail

* attribution fix

* tomater killer inhandered

* extrorange inhand spin rate nerfed

* fuck webedit
 2025-03-19 20:53:48 -04:00
MisterImp
7a539b3568 Fix recipe and animation for copypasta (#35925) 
* Fixed animation and recipe for Copypasta

* Update Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml

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

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-03-19 17:35:34 -07:00
mubururu_
752477bff3 consistent grapes (#35125) 
* grape

* seedtributions
 2025-03-19 20:09:50 -04:00
Tiniest Shark
b1c89d059c snake can now be seen inhand and worn on neck like friend (#35323) 
* snake can now be seen inhand and worn like friend

* Roomba's additions

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>

* Update Resources/Textures/Objects/Fun/toys.rsi/meta.json

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>

* Spacing adjustment

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
 2025-03-19 16:14:17 -07:00
Coolsurf6
5d296d2dbb Added Bacchus' Blessing Drink (#35306) 
* added start to bacchus blessing with few more things left to do

* added sprites and trying to get the empty sprite to work

* fixed empty sprite will fill layer

* added missing fill image

* made flavor, physical description, recipe reaction and tweaked reagent threshold

* fixed fill levels

* removed name from drinks.yml, updated suffix instead

* delay is weird and broken, removing the difference

* updated copyright
 2025-03-13 23:49:26 -07:00
onesch
b3482fd737 Tools/Devices: In-hand Sprites (#33689) 
* Adds in-hand sprites to the barber scissors.

* adds in-hand sprites to the floodlight.

* adds in-hand sprites to the gas analyzer.

* adds in-hand sprites to the gps.

* Update copyright wording, linting

* resprite gps inhand sprites.

* adds in-hand sprites to the mass scanner.

* adds in-hand sprites to the spray_painter.

* resprite in-hand sprites to the mass_scanner.

* fix in-hand sprites to the mass_scanner.

* Resprite mass_scanner in-hand sprites.
 2025-03-13 01:46:58 +03:00
Princess Cheeseballs
81a1ae1623 Mail Resprite (#35776) 
* init commit

* init commit

* delete those

* added github to copyright info
 2025-03-11 13:44:32 +01:00
RedBookcase
80e674a9ae Added New Cocktails and new fill level sprites to existing drinks. (#33570) 
* Added New Cocktails and new fill level sprites to existing drinks

* Updated copyright info and fixed recipies for Caipirinha/Mojito.

---------

Co-authored-by: RedBookcase <Usualmoves@gmail.com>
 2025-03-10 19:08:23 -04:00
Prole
b5b92d5f3d Python Suit Storage Visual (#35593) 
* Python-SUITSTORAGE-Visuals

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

* REVised Sprite

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

* Copyright

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>

* Update Resources/Textures/Objects/Weapons/Guns/Revolvers/python.rsi/meta.json

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>

---------

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
 2025-03-09 22:06:21 +01:00
ScarKy0
3281f408eb Cargo Mail System (#35429) 
* shitcode init

* biocoding, SpawnTableOnUse, Moving shit to shared

* server :(

* fixes

* ok works

* Discard changes to Content.Shared/Interaction/Events/GettingUsedAttemptEvent.cs

* Discard changes to Content.Shared/Forensics/Components/FingerprintMaskComponent.cs

* Discard changes to Content.Shared/Forensics/Components/FingerprintComponent.cs

* Discard changes to Content.Server/Forensics/Systems/ForensicsSystem.cs

* Discard changes to Content.Server/StationRecords/Systems/StationRecordsSystem.cs

* Discard changes to Content.Server/Storage/EntitySystems/SpawnItemsOnUseSystem.cs

* Discard changes to Content.Shared/Interaction/Events/GettingUsedAttemptEvent.cs

* big stuff

* preperation

* temperory spawning thing for testing

* Update CargoDeliveryDataComponent.cs

* kinda proper spawning idk god save me

* cleanup (kinda)

* preparation 2.0

* stuff i think

* entity table work

* renames

* spawn ratio based on players

* comment

* letter tables

* more spam

* package tables

* comment

* biocodedn't

* builds correctly

* cleaning

* Update deliveries_tables.yml

* labels

* package sprites

* mail teleporter

* revert testing value

* fix test

* fix other test

* i love tests

* mail teleporter enabled by default

* random cooldowns

* fixtures

* Discard changes to Content.Shared/FingerprintReader/FingerprintReaderComponent.cs

* Discard changes to Content.Shared/FingerprintReader/FingerprintReaderSystem.cs

* Discard changes to Content.Shared/Interaction/Events/GettingUsedAttemptEvent.cs

* Discard changes to Resources/Locale/en-US/fingerprint-reader/fingerprint-reader.ftl

* clean

* fuck paper scrap

* oops

* fuck SpawnTableOnUse

* mail teleporter board in QM locker + addressed review

* oops

* clean

* sound on delivery spawn

* address review

* partial review address

* partial review addressing

* addressing partial review

* pratarial revivew address

* misprediction hell

* stuff

* more stuff

* unrelated

* TODO

* link

* partial review

* DirtyField

---------

Co-authored-by: Milon <milonpl.git@proton.me>
 2025-03-07 14:51:08 +01:00
Ps3Moira
0d01bb8894 Open State for cowtools (#35666) 
Open State
 2025-03-04 21:38:33 +01:00
Velken
7a89fe5d33 Wizard's Magical Pen (#35623) 
* wizard pen

* description change
 2025-03-03 16:54:43 +01:00
hivehum
a926c53979 Give the station map inhand sprites (#35605) 
map has inhands
 2025-03-01 21:31:44 +01:00
Velken
30a6ebdb26 Wizard PDA (#35572) 
* wizard PDA

* colour change to brown
 2025-03-01 03:12:24 +01:00
Brassica Prime
f850b69e89 Wizard Stamp (#35552) 
* First go around adds everything necessary to work

* fixes issues with attribution and a whitespace

* Update Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>

* Update Resources/Textures/Objects/Misc/stamps.rsi/meta.json

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>

---------

Co-authored-by: Pumkin69 <judeb@DESKTOP-M4B8G5D>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
 2025-02-27 11:26:30 +03:00
ScarKy0
7c6028bc80 Wizard ID (#35530) 
* init

* comment

* agentless

* sprite changes
 2025-02-26 15:06:18 +01:00
keronshb
ee31a1f293 Wizard: Repulse Spell (#35377) 2025-02-22 10:56:54 -05:00
keronshb
a9054c5e9c Mjollnir and Singularity Hammer for Wizard (#34446) 2025-02-20 18:38:52 -05:00
SeamLesss
33b9149a56 Space Lizard Plushie In-hands (#35295) 
* space lizard

* attributions

* attribution fix
 2025-02-19 20:27:57 +01:00
ScarKy0
c1b3577e6c init 2025-02-17 13:23:57 +01:00
keronshb
db732a2581 Supermatter Grenade Rework (#35122) 
* Renames Supermatter grenade to singularity grenade. Removes explosion from Singularity Grenade.

* Adjusts Singularity Grenade to account for engine changes, small buff to max range

* Adjusts further

* fix order

---------

Co-authored-by: Milon <milonpl.git@proton.me>
 2025-02-14 16:01:40 +01:00
Smith
3c8fb2e865 Grilled Cheese Sandwich Entity and Recipe (#33807) 
* Grilled Cheese Prototype

* Typos

* Removed butter reagent to test flavour changes.

* Flavour corrections.

* CC-BY-SA-3.0 attribution

* Fixing meta.json

* I lost an hour of my life to a missing comma in meta.json

* Merge Conflict Rebase and Test Fixing

* Cook time to 10 seconds.

* Sandwich nutritional balance

* Grilled cheese sprite fixed, found the actual original source for copyright.
 2025-02-13 00:00:38 -08:00
chromiumboy
a2ac503201 Sentry turrets - Part 1: Art assets (#35025) 
* Initial commit

* Updated sprites

* Updated base.png and base_shadow.png

* Updated meta file
 2025-02-11 00:25:30 -06:00
K-Dynamic
1f0d68c24e Grenade resprites part 1, stinger sound change, projectile grenade animation fix (#34421) 
* flashbang resprite

* emp grenade resprite

* smoke grenade resprite

* tear gas resprite

* stinger grenade resprite

* adds missing animations for projectile grenades
 2025-02-10 19:23:11 -08:00
GaussiArson
03bab30fc6 Wooden Grip for Antique Laser Pistol (#34886) 
* wooden grip on antique laser, changes description to match.

* darker grip

* update meta.json

* redesigned shape similar to ps3moira, edited mag to match, changed lights colors to match each other

* fixing an only SLIGHTLY catastrophic fuckup with an experimental inhand sprite that I didn't mean to save and sleepily added to the previous commit

* I DID IT AGAIN

---------

Co-authored-by: gaussiarson-admin <stephenkitchens0306@gmail.com>
 2025-02-09 19:33:55 -07:00
August Sun
e650bbce23 Lecter + Magazine Resprite (#34974) 
* Full resprite of lecter and associated magazine

* Minor fixes

* More fixes

* fixed meta.json indentation

* More meta.json fixes

* Attribution fixes

* Update Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/meta.json

---------

Co-authored-by: august-sun <45527070+august.sun@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-02-09 01:12:47 +01:00
Ignaz "Ian" Kraft
36b59c69f4 allow paper labels on seeds (#34450) 
* allow paper labels on seeds

* added the components required by PaperLabel to the SeedBase

* localize insert/eject for PaperLabel

* visualize the paper label on seeds

* new paper layer for seeds

* eject the seed label on use

* different looking paper label

* forgot to turn on a layer
 2025-02-08 15:16:06 -08:00
ScarKy0
bf6fd4d581 Wizard Item Recall Spell (#34411) 2025-02-08 16:56:08 -05:00
ScarKy0
f6c0e6d3d2 Wizard shuttle preperation (#34932) 
FIREBALL MOTHERF-
 2025-02-08 16:37:46 +01:00
GaussiArson
87a868459f Drozd Colors for Kammerer (#34930) 
* wooden grip on antique laser, changes description to match.

* darker grip

* update meta.json

* redesigned shape similar to ps3moira, edited mag to match, changed lights colors to match each other

* fixing an only SLIGHTLY catastrophic fuckup with an experimental inhand sprite that I didn't mean to save and sleepily added to the previous commit

* I DID IT AGAIN

* red kammerer bottom text

* killed the cap laser things (hopefully)

---------

Co-authored-by: gaussiarson-admin <stephenkitchens0306@gmail.com>
 2025-02-08 01:15:00 -07:00
Vasilis The Pikachu
36e42fb4b2 Merge branch 'master' of ssh://github.com/space-wizards/space-station-14 into staging 2025-02-06 01:11:50 +01:00
Gavin TC
13be8de848 Changed utensil sprites to appear smaller. (#34277) 
* Changed utensil sprites to appear smaller.

* Added self to author section

* Added my name and update to copyright section

* Adjusted plastic spoon sprite

* Adjusted spoon sprite
 2025-02-05 14:08:53 +01:00
K-Dynamic
e9c0338884 Remove Vector assets and renames Vector SMG magazines (#34603) 
* remove vector and assets

* reverts vector magazine removal; vector magazines renamed to SMG magazine (.45 magnum)

* remove vector from suspicion loot table

* vector migration set to null
 2025-02-05 13:39:26 +01:00
slarticodefast
8035455022 Add binoculars (#34687) 
* add binoculars

* tabs evil

* give one to warden

* buff
 2025-02-04 22:46:49 +01:00