Commit Graph

2704 Commits

Author SHA1 Message Date
pathetic meowmeow
4576555e5b NanoTask (#34095) 2025-03-15 09:24:23 -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
slarticodefast
bce9b4b05b Paradox Clone (#35794)
* polymorph fixes

* paradox clone

* forensics cleanup

* bump doors

* 4

* attribution

* polymorphn't

* clean up objectives

* Update Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml

* review

* add virtual items to blacklist

* allow them to roll sleeper agent
2025-03-13 10:09:07 -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
Firewars763
212bf99688 Add Gold and Coal Rock Anomalies (#34809)
* This commit adds 2 new Rock Anomaly types, Coal and Gold. It also adds Resource Crabs, colored crystals, and lights for both.

* Added crafting recipes for yellow and black light tubes. Somehow I forgot that the first time.

* Sorted tags.yml alphabetically this time instead of not doing that.

* Updated Texture Copyright information

* Attempted to fix Merge Conflict

* Added bulb light variants for both yellow and black crystals.
2025-03-13 01:45:22 +03:00
Łukasz Lindert
8f81e55711 Cryo and grinder cleanup (#34842)
* cryopod and grinder cleanup

* lower case name

* 4 spaces

* prototype clean

* looks like there is some kind of test that prevents removing this

* grinder too

* both should be empty

* cleanup
2025-03-13 01:44:05 +03:00
Velcroboy
9005183e6e Add wallmount N2 closets, Revived (#34042)
* Add standard, wallmount and improvised N2 closets, Revived

* remove improvised locker

* Parent>ID

* Undo sprite replacement

* Update meta.json

---------

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
Co-authored-by: Milon <milonpl.git@proton.me>
2025-03-13 01:42:15 +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
Velken
4e37bcc40e Performer's Wig (#35764)
* miku wig

* fix to correct json convention

Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.com>

---------

Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.com>
2025-03-10 19:17:23 -04: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
Momo
2412b4f634 Aroace pride pin, scarf, and cloak (#35718)
cloak, pin, and scarf added yayyyy
2025-03-08 16:21: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
Boaz1111
3bf38a4d46 More scars! (#35644)
* :3

* whitespace, stomach scar
2025-03-05 11:26:31 +01:00
SlamBamActionman
27cfc0939c Add undergarments & "Censor Nudity" toggle to options (#33185)
* Initial commit

* Attribution

* Review changes

* Added comment for upstream
2025-03-05 10:14:01 +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
HTML/Crystal
8fc78f63d9 Better Insectoid Glasses (#31812)
Sprites and file changes

Adds the variants for arachnid and moth glasses, adds the code for those in the meta.json files, and adds the speciesID tag in both arachnid and moth prototype files.
2025-03-02 15:58:15 -05:00
slarticodefast
ceff2bea00 Cloning Refactor and bugfixes (#35555)
* cloning refactor

* cleanup and fixes

* don't pick from 0

* give dwarves the correct species

* fix dna and bloodstream reagent data cloning

* don't copy helmets

* be less redundant
2025-03-02 16:50:12 +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
Momo
f65ff0bd37 Lizard Plushie Slippers (#35381)
* added the lizard plushie slippers yippeegit status

* fixed attributions so that the links arent broken

* update meta.json links

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

* four spacing in meta.json

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-02-25 18:18:42 -08:00
keronshb
c922b4f843 Wizard: Smoke Spell (#35403)
* Adds smoke spell for wizard

* Adds the actual sprites oops

* Removes repulse attract change

* Removes change again?
2025-02-22 15:04:42 -08: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
robinthedragon
22254a14e6 ports two barsigns from frontier (#35296)
* adds two new barsigns

* webedit to fix a typo

* the typo was in two locations

* reformatted meta.json and added attribution links
2025-02-19 20:25:17 +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
Джексон Миссиссиппи
c0dd8edc09 Move the soles of the feet on the backward facing part of the RD's vox hardsuit sprite to the left by 1 pixel (#35134)
ok
2025-02-13 21:09:06 +01:00
Velken
7495081c40 Paramedic Void Suit update (#34657)
* Made paramedic void suit into proper hardsuit (was softsuit before)
Added light to the paramedic void suit helmet
Added siren with light to the paramedic void suit

* Changed paramed helmet flashlight icon and textures

* fixed siren action icon

* BigAction

* updated icon-siren.png

* fixed not being able to add it to containers (like when it parented off eva suit)

* changed light to cyan, made it less brighter and reduced siren volume

* changed ambulancesiren.ogg to a different one (hopefully less hard on the ears)

* created ClothingHeadEVAHelmetWithLightBase in base_clothinghead.yml
replaced ambulancesiren.ogg (again, this time with better fading on the audio loop)
credited myself for the siren icon art
reverted parents to original (but kept it in hardsuits yml, since void suits are light hardsuits) - [ the adoption was revoked 😢 ]
fixed indentations
removed un-used sprite and sprite state

* final final siren sound change (for real this time?)

* fixed license type

* final FINAL final (for real this time, please?) ambulancesiren.ogg change

* ContainerContainerContainerContainerContainerContainerContainerContainerContainerContainerContainerContainerContainerContainer

* attributions updated (turns out, i have to give myself credit when i make stuff);
fixed identation;
moved action to Action/types.yml.

* hopefully fixed everything this time

* sync shenanigans

* final final final final final for real final ambulancesiren.ogg change pinky promise this time and if you don't like it, make a new PR yourself and offer a new sound

* typo

* done the suggested changes

* cleaning up some forgotten stuff :p

* oops, cleaned up a bit too much

* aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa

* Update Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml

* Update Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml

* Update attributions.yml

* evil web edit never again

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com>
2025-02-13 20:52:21 +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
robinthedragon
a849d2c989 ancient jumpsuit copyright info (#35061)
* update meta.json with copyright info

* unblob

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

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-02-11 15:06:53 -08:00
Terraspark4941
2c728dcca9 Make Advanced Spray more tolerable to use (#34209)
* initial commit

* Fixed the eject order

* FINALLY got a new sprite, its ready to merge!

* I FORGOT THE ATTRIBUTIONS DAMMIT

* Remove extra whitespace

* Sprite update!
2025-02-11 11:05:34 -08:00
justdie12
78c951c790 Fixed trooper uniform sprite (#35065) 2025-02-11 10:04:42 -08:00
Killerqu00
a62ffdc740 Move contraband text to a separate examine tab (#32250) 2025-02-12 01:06:22 +11: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
Boaz1111
3b621a0245 long bacon scarf (#34950)
* went to the long bacon store.

* obtainable :3
2025-02-09 16:10:10 +01: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
lzk
50ba607bf5 add straight ally pin (#34977) 2025-02-08 18:02:00 -05: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
centcomofficer24
a0fe21ac2f Added Genderqueer pin! (Properly this time.) (#34561)
* Added Genderqueer pin! (Properly this time.)

* Update meta.json
2025-02-05 21:49:41 -08: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