Commit Graph

1078 Commits

Author SHA1 Message Date
GaussiArson 59f97dfa6d 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-14 16:10:00 +00:00
August Sun b6c46db9f1 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-14 16:09:58 +00:00
Ignaz "Ian" Kraft 8b82c779ee 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-14 16:09:58 +00:00
ScarKy0 51c1e5dcbf Wizard Item Recall Spell (#34411) 2025-02-14 16:09:58 +00:00
ScarKy0 f6166b86a4 Wizard shuttle preperation (#34932)
FIREBALL MOTHERF-
2025-02-14 16:09:57 +00:00
GaussiArson a7589fb2f2 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-14 16:09:57 +00:00
Gavin TC 2c2b8c30c5 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-14 16:09:54 +00:00
K-Dynamic ef0a0cedca 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-14 16:09:54 +00:00
slarticodefast ab6797bf44 Add binoculars (#34687)
* add binoculars

* tabs evil

* give one to warden

* buff
2025-02-14 16:09:53 +00:00
keronshb 0e19934c9c DSword Replacement - the Hypereutactic Blade (#32414)
* hypereutactic textures

* adds hypereutactic blade

* adjusts attack speed and damage

* adjust attack speed and adds movement modifier

* Adds structural damage

* Readjusts the attack rate to be 0.8

* Adds Hypereutactic blade to the upliink

* Adds use delay and structural damage, fixes disappearing wielded sprite

* Changes wideAngleAnimation to 180 and range to 2.5

* Adds copyright. Changes range to 2.0

* Required wield

* Changes reflect chance to 100%

* Comments for future todos

* Description update

* Removes duplicate mapping

* removes from uplink

* Reorder and remove indents
2025-02-14 16:09:53 +00:00
Errant 3816440034 HOTFIX revert lecter visual update #34589 (#34826) 2025-02-14 16:09:52 +00:00
keronshb d775cc8f54 Void's Applause (#34591)
* Adds single clap emote

* Adds missing single clap loc

* Adds void blink effects, sound, and sprite

* Adds VoidApplauseEvent and implements it into the Magic System and Grimoire

* Removes commented Spawn code in Shared Magic System. Adds comments to replace pointlight with a negative light in the future.

* Makes spells Mono

* Changes to swap positions.

* Makes Void Applause target body only

* Update Content.Shared/Magic/Events/VoidApplauseSpellEvent.cs

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

* Update Content.Client/Magic/MagicSystem.cs

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

* Update Resources/Audio/Effects/Emotes/attributions.yml

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

* Update Resources/Prototypes/SoundCollections/emotes.yml

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

* Update Content.Shared/Magic/Events/VoidApplauseSpellEvent.cs

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

* Removes duplicate effect spawning from server

* Puts Void Applause effect on server, lets lizards hear clap

* Adds single clap to diona

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-02-14 16:09:49 +00:00
Southbridge 4b3dd30851 Astro Asteroid Sand (#34463)
* Added astro asteroid sand

* fixed the stack name

* adjusted tile sprites for asteroid and ice

* Adjusted meta.json

* Realized the other tile sprites all have solid lines on their perimeters

* Update Resources/Prototypes/Stacks/floor_tile_stacks.yml

that works

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>

* Update tiles.yml

* Update Resources/Locale/en-US/tiles/tiles.ftl

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>

* adjusted the snow sprite

* Update meta.json

---------

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>
2025-02-14 16:09:47 +00:00
ScarKy0 fd77e8d86b Seperate EMAG into EMAG and Authentication Disruptor (#34337) 2025-02-14 16:09:47 +00:00
Emisse ef32756dee drozd visual update (#34574)
* drozd visual update

* fix wielded sprotes

* update sprotes
2025-02-14 16:09:45 +00:00
deltanedas e5e82f0de5
move all nuke core stuff to _DV (#2902)
* move store-objective stuff to _DV

* radiation fix

* move SealingCabinet to _DV

* move textures to _DV

* move yml stuff to _DV

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2025-02-06 13:22:28 +00:00
Ed 95c4eafe5f C4 Helmet (#34076)
* worn bomb

* Update meta.json

* Update meta.json
2025-01-28 04:33:55 +00:00
Emisse 1d4140a686 lecter visual update (#34589) 2025-01-28 04:33:25 +00:00
pathetic meowmeow c26ef7e899 Give the chef access to cloth boxes (#34403)
* Give the chef access to fiber bags

* Update Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-01-28 04:31:31 +00:00
ArtisticRoomba 701ed7cf30 Space lizard plushie can now be worn on your head (#33809)
* space weh can now be work on top of head

* space weh can now be worn on top of head

* trim out unnecessary comps
2025-01-28 04:31:28 +00:00
Alpaccalypse d9444ebe9a Added missing details from worn capes to head of department beadsheets (#34396)
* Added key and missing details from worn cape to HOP bedsheet

* Corrected canvas size for sprite

* Subtle tweak to shading to reduce color blurring at pillow edge

* Matched Hue and tone to cape

* Tweak chekered pattern marks for gold trim

* Removed accidental palette inclusion

* Clearer wording and corrected attribution name.

* Tweaked shading on key image to fit in better with bed aesthetics

* Added CE cape icon to bedsheet

* Added cape image to HOP bedsheet. Made gold trim better match cape visuals

* RD cape icon added. Colour tweaked to better match cape.

* Updates json

* Tweaks to gold trim shading to match bed aesthetics

* Added better shading for HOP sheet side. Halved file size.

* Optimised HOS RD and CE sheet sprites

* Corrected sprite title in attribution
2025-01-28 04:31:22 +00:00
Pieter-Jan Briers 7979aef7e7 Disable meta-atlas for big rare RSIs (#33643) 2025-01-28 04:31:21 +00:00
frobnic8 8cfa89883f Darkened Service job interface icons for better contrast (#34270)
* Darkened Service job interface icons for better contrast

* Fixed Botanist job interface icon dark handle hole

* Change to new, darker, service color in all resource yml files

* Revert Map file service color changes

* Use new darker service color on id cards

* Revert Service color change in mapping_actions.yml

* Revert salvage difficulties service color

* Redo service ID and job colors to match advanced palette

* Revert all service color yml file changes

* Switch icons to use existing service pallete colors from advanced pallete

* Update meta.json for darkened service icons

---------

Co-authored-by: Erskin Cherry <frobnic8@gmail.com>
2025-01-28 03:19:44 +00:00
ArtisticRoomba 174d8ce87a Fix rainbow lizard plushie inhands (#34128)
* fix rainbow plushie inhands

* address requested changes

* attribute sprites
2025-01-12 08:08:17 +00:00
Alpaccalypse cd08942368 Sprites defined for all non-generic computer boards. Added new syndicate computer board sprite. (#34104)
* Defined sprites for non-generic computer boards. Added new syndicate computer board sprite.

* Added new sprite to meta.json and updated attribution.

* Reformatted module.rsi meta.json to match other meta file styles.

* Syndicate board sprite made less yellow/gold, changed outer chips to black. Using grey/silver for CPU centre, akin to syndie agent PDA theme, and to keep distinctive from security board.

* Corrected indentation spacing for currently edited entities.

* Update Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml

* add pr link to attribution

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>
2025-01-12 07:45:54 +00:00
Alpaccalypse 31e3a3f1cb Renamed "Irish Car Bomb" drink to "Irish Slammer" (#34107)
* Renamed "Irish Car Bomb" drink to "Irish Slammer", due to concerns over insensitivity.

* Fixing some missed references

* Added prototype id changes to migration.yml. Removed any reference to the troubles (and corrected ale to stout for flavour text).

* Corrected description back to "Irish Cream"

* Removed non-entities from migration.yml
2025-01-12 07:44:34 +00:00
deltanedas 83a8002922
Merge pull request #2542 from deltanedas/shitmed-ops
shitmed real
2025-01-07 17:15:23 +00:00
ArtisticRoomba 87ee3bf6e4 New cotton baguette, crostini, chevre-chaud, bagel, and croissant foods for moffs (#33508)
* A looooooooot of new cotton foods for the moffs

* address slam's comments on the food for moffs not having any moff food in the food (the food that's intended for moffs)

* alternative sprites for bagel-cottondough.png, baguette-cotton.png, and croissant-cotton.png

* update requested sprites

* change requested sprites

* address part of sloth's review, awaiting response

* address second half of review, fix magical food nutriment mitosis bug
2025-01-01 17:18:38 +00:00
Ed 4bef289200 Multiple items in loadouts (#33193)
* loadouts update

* Update loadout_groups.yml

* darts to candles

* Update Resources/Prototypes/Loadouts/dummy_entities.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-01-01 17:10:42 +00:00
deltanedas 9ece272884 merge master 2025-01-01 09:14:40 +00:00
Radezolid 33d14d8c05
Administrative assistant (#2523)
* Added admin assistant

* Fix ID

* Fix loadout wrong name

* Minor errors

* Fixing other dumb mistakes

* Fix loadout + final touches

* Fix stupid spaces + make stamp work

* Indent fixes + untouch

* Forgor the comment

* Me when I untouch the wrong file

* Time requirement change

---------

Signed-off-by: Radezolid <snappednexus@gmail.com>
2024-12-31 00:02:05 +00:00
gluesniffler fd11cee0e0 Shitmed Update 2 - bottom text (#956)
* full fucking send

* ope forgot to remove the EE scripts

* fix test

* fix shitcode fail

* DELTA THAT VALUE IS NULLABLE

* whoopsie daysie

* fixed???

* chat is this real
2024-12-27 17:02:58 +00:00
beck-thompson ae8e1d9c27 Add clearer defib cooldowns! (#31251)
* First commit

* Fix silly test

* Swiched stuff up

* Update Content.Shared/Medical/DefibrillatorComponent.cs

* remove unneeded visuals

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-12-21 10:25:22 +00:00
LevitatingTree 36a6003af7 Remove plushie_lizard_mirrored.png (#33855)
* Remove plushie_lizard_mirrored.png

* Remove from meta.json

* Replace mirrored state from yml

---------

Co-authored-by: LevitatingTree <None>
2024-12-21 10:20:57 +00:00
Hannah Giovanna Dawson 54aa904ef4 [Christmas] Y'all want a Smite Cranberry? (#33922)
* Add a festive lemon-lime soda variant: cranberry!

* Gave lemon-lime a brand name

* Make the CrateFoodSoftdrinksLarge slightly larger to accomodate the extra drinks.

* Extend the Christmas anomaly with extra jolliness

* Minor spelling mistake. Jollyness will not be denied.

* Removed redundant delay from meta file
2024-12-21 10:20:32 +00:00
ArtisticRoomba fa7682b435 New Drazil plushie (inverse lizard plushie) (#33776)
* Hew

* properly attribute hew.ogg

* add to maints locker plushie pool with low chance, clear up grammar

* shhhh nobody saw that linter failure

* adds localization support for Weh and Hew emotes

* fix capitalization error present since circa 2/25/2024

* resolve conflicts, fix sprite, add reversed inhands

* clear up cursed formatting
2024-12-21 10:19:59 +00:00
Tiniest Shark f14f020e42 Anomaly Scanner In-hand Sprites (#33427)
* Adds in-hand sprites to the Anomaly Scanner.

* Revert "Adds in-hand sprites to the Anomaly Scanner."

This reverts commit 257efd032a15d6459043f47106bd537abfe18fad.

im very stupid and need to undo my dumb commit.

* okay actually making sure these are committed this time like a smart boi

* Better version of the sprites based off of /tg station's health analyzer.

* Updated copyright to include link to sprite

* Updated copyright license and commit link

* Update Resources/Textures/Objects/Specific/Research/anomalyscanner.rsi/meta.json

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>

* Update Resources/Textures/Objects/Specific/Research/anomalyscanner.rsi/meta.json

Aeshus adjusted indentation to better match original file.

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>

---------

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>
2024-12-21 10:13:27 +00:00
Ed e4db6ecf1f Flora clean up (#33839)
* first migrate

* clean up prototypes

* Update polymorph.yml

* Update flora.yml

* and this one

* and this one x2

* and this one x3

* Update migration.yml
2024-12-21 10:13:11 +00:00
SlamBamActionman 37666f8ad7 Add Holy damage (#32755)
* Initial commit

* hoili moili

* now to add sherlock and doctor who

* funny stick

* Oops it was meant to be called metaphysical

* Attribution

* Even BETTER attribution
2024-12-21 10:07:05 +00:00
dragonryan06 413264eff7 Add the Zombie, a new cocktail (#32802) 2024-12-21 09:58:03 +00:00
KieueCaprie 802f0d1245 Add an in-hand sprite for the lizard plushie (#32583)
* add hold sprites for lizard plushie

* make the lizard plushie sprites slightly chonkier for those who are not wearing winter clothes.

* me when i hit the noise button and pretend it's shading.

* lizard plushie is not legally-distinct green dinosaur with a long tongue™ (front sprite tongue has been shortened)

* update meta.json
2024-12-21 09:58:03 +00:00
beck-thompson 9a36746d5f Add generator scrap (Plasma / uranium scrap) (#32198)
* First commit

* Forgot the shading!

* tweaked  values

* sprite update

* Radiation
2024-12-21 09:58:02 +00:00
deltanedas 9f39931732
early merge of rebalanced salv weapon researching (#2077)
* add fauna protection module

* re-add crusher recipes to secfab, move pka to secfab, t1 -> t2

* remove shovel from mining module, add recipes to emagged lathes

* you have died of dissin terry

* add an icon

* re-add crusher recipes to secfab, move pka to secfab, t1 -> t2

---------

Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-12-20 05:38:08 +00:00
deltanedas dce230fdb2
port ore bag magnet toggle from white dream (#2467)
* add on textures for ore bags

* add code for toggling magnet and working in-hand

* update ore bag yml

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-12-18 11:33:37 +00:00
0tito a0ac0665ff Add Sprite changes to Logic Gates to show the input/output state (#33277) 2024-12-07 22:05:25 +00:00
keronshb ef52ced9c5 Adds Store on Collide and Wand of the Locker (#33710)
* Adds wand of locker and locker projectile

* Adds IsOpen method to check if storage is open

* Adds store on collide

* Adds Store On Collide to Wizard Locker

* Adds Lock API

* Adds locking support

* Adds resist override and custom visual layers

* Fixes decursed states, adds comment for a future visualizer

* adds locker wand visuals and descriptions

* shrinks locker radius, moves TODO for throw support

* Adds whitelist and moves storage and lock logic into their own methods

* Adds support to disable store on collide after the first open. Fixes prediction issues with disabling.

* Adds wand of locker to the grimoire

* Adds wizard access prototype

* Adds Wizard to universal access

* Moves Lock on collide to on collide method

* Comments

* Changes layer order

* Fixes prediction issues when locking.

* Adds Wiz access to universal ID
2024-12-07 22:02:12 +00:00
mubururu_ 5f0c684ce5 various material & ore inhands (#33342)
* begin

* bones + pyrotten + goliath hide inhands

* Update Resources/Prototypes/Entities/Objects/Materials/materials.yml

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

* Update Resources/Textures/Objects/Materials/materials.rsi/meta.json

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

* Update Resources/Textures/Objects/Materials/materials.rsi/meta.json

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

* Update Resources/Textures/Objects/Materials/materials.rsi/meta.json

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

* pyrottOn

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-12-07 21:45:22 +00:00
Spanky d9f8382148 Service Worker Job Icon Change (#33361)
* Changes the Server Worker job icon to a bowtie.

* Removes grey from icon to better fit existing art.

* Updated ID card sprite.

* Edit respective meta.json files.
2024-12-07 16:20:41 +00:00
SpaceRox1244 05fe5b701f Adds gorilla gauntlet storage sprite and updates hit sound (#33167)
* Adds storage sprite for gorilla gauntlet

* Specifies a heavier hitsound for gorilla gauntlet

* Modifies gauntlet icon and storage sprite

* Updates credit to my new username
2024-12-07 15:42:29 +00:00
deltanedas 11807309de
cherry pick portable charger (#2206)
* Portable Recharger: Arsenal T3 (#26655)

* sys

* item

* ahm.

* Update Content.Server/Power/Components/ChargerComponent.cs

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>

* remove funny spaces

* funny fix

---------

Co-authored-by: icekot8 <93311212+icekot8@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-11-24 11:09:31 +01:00