Commit Graph

1174 Commits

Author SHA1 Message Date
mubururu_
588bc52f26 inhands for Syndicate Things (and thief beacon) (#37682)
* initial

* splitting this b

* thief bacon 1 handed

* why is test fail

* dont fail please

* "requires"

* evil tests
2025-05-21 11:39:29 -04:00
B_Kirill
f07b2aa6c3 New fun meteors (#37327)
* New fun meteors

* Forgot about newline

* Fix

* Wow, a new test

* Okay

* Fix

* Fix 2

* I hope this is correct enough

* Attribution

* Attribution 2
2025-05-20 23:04:27 +10:00
SeamLesss
926248e235 Magazine Sprite Fix (#37615)
* first

* long mag + mk58 color
2025-05-19 16:29:47 -04:00
ScarKy0
30537e13a4 Bomb Deliveries (#37069)
* init

* BOMB!!!

* review

* partial review

* review
2025-05-18 10:57:22 +02:00
ArtisticRoomba
95cc36c41d Atmos Air Grenades (#37531) 2025-05-17 21:32:51 -07:00
Archee
dcd5bb16d5 Bikehorn Retextures (#37413)
* Bananium Horn .rsi

* Bike Horn .rsi

* Cluwne Horn .rsi

* Gold Bike Horn .rsi

* Push Horn .rsi

* Bike horn (Instrument) .rsi

* better inhand sprite for pushhorn

* Revert "Push Horn .rsi"

This reverts commit 243b3662c6bd23abad331658eb2c75b5c9183d1d.

* rsi meta attributions

* slight tweak to the golden honkers colour and energy

* adds back castShadows false

* position corrections for inhand and belt for bananium

* inhand corrections for bikehorn inhands and belt

* inhand corrections for cluwnehorn

* inhand corrections for goldbikehorn

* inhand corrections for bike_horn (instrument)

* adds 'far-side held' sprites, bikehorn

* adds 'far-side held' sprites, bikehorn(instrument)

* bikehorn belt, i made the horn cone a shade too dark whoops

* adds 'far-side held' sprites, goldbikehorn

* adds 'far-side held' sprites, cluwnehorn

* adds 'far-side held' sprites, bananiumhorn

* cluwnehorn belt, same change as bikehorn belt earlier
2025-05-14 18:05:45 -04:00
MisterImp
9868932cfe New food recipe: Draco (dragon taco) (#37212)
* Added draco (dragon taco)

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

* fix whitespace

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-05-14 21:33:37 +02:00
K-Dynamic
fa74dcd4ec Recoloured several service job and ID icons (#36580) 2025-05-13 00:43:31 -07:00
Nemanja
ec66c70295 New Salvage Mob: Basilisk (#37135)
* Basilisk

* Less health

* Unique projectile

* Selfmerge incoming

* Update Resources/Textures/Mobs/Aliens/Asteroid/basilisk.rsi/meta.json

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

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-05-12 19:42:51 -04:00
mubururu_
a9d50da0ba push horn resprite (#37392)
* inishal

* centering
2025-05-12 19:32:07 -04:00
Gentleman-Bird
3e9af2ef4c Add utensil box, add muffin tins to Kitchen Dinnerware Crate (#36948)
* Adds muffin tins to dinnerware crate

* removed forks and spoons

* Added utensile box, added utensile box to dinnerware crate
2025-05-12 10:52:04 -07:00
pathetic meowmeow
cfba56c2b4 Make departmental orders consoles print slips (#36944)
* Make departmental orders consoles print slips

* feed back cycle
2025-05-06 15:04:18 -04:00
Prole
6cdc436f5f Water bottle dispenser fix & Bottle Yaml Organizing (#37108)
* A New Parent/Category For The Soda & Tonic Water Bottle

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

* New Parent For water bottle & Cleanup

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

* More Cleanup

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

* Details

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

* Organizing For Additions

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

* Streamlining waterbottle to be compatible with DrinkBottleVisualsAll Parent

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

* Replacing/Renaming Parents

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

* New Tonic/Soda Water Bottle Sprites

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

* Misc Fixes

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

* New Parent for Small Glass Bottles & Organizing

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

* Organizing & uSize Parity.

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

* File Parity

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

* Merged Categories & Misc Fixes

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

* Removed Silly

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

* Parent Name Parity & Cleanup

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

* Large Glass Bottles Category & Cleanup

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

---------

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>
2025-05-06 14:13:33 -04:00
Whatstone
afc55d6573 Show other speso colours, add larger denominations (Frontier#1496) (#37030) 2025-04-29 14:44:47 -07:00
SlamBamActionman
e366230458 Add inhand sprites for mini jetpack (#37041)
* Inhand sprites for mini jetpack

* Attribution
2025-04-29 19:43:09 +02:00
Boaz1111
3f1ba3b6e7 Added Space Carp Tooth Arrows and Sharkminnow Spears, buffs sharkminnow teeth. (#31257)
* carp arrow, sharkminnow tooth spear

* review

---------

Co-authored-by: EmoGarbage404 <retron404@gmail.com>
2025-04-29 12:36:53 -04:00
Thinbug
ce080276db Push horn (#36009)
* Empty commit

* epic super duper cool fr push horn draft

* whoops turns out theres a system that does that thingi already x.x

* bunch of like fixis and generalization

* general progress

* most stuffies done

* last thingi hopefully

* small fixies, mostly preventing bypassing the delay by spamming

* rename to fit better

* rename for real i forgor to add

* weird fixie but last commit didn workie

* oki shold be fine now

* lastish cleanup

* fixies

* missed a space

* removed unnecessary component check

* getting the typos out of the way first

* moved the component to shared

* rest of fixies
2025-04-29 09:07:57 -04:00
kosticia
9e9726f81b Add borders to the asteroid sand (#35397)
* tiles

* Fix

* borderless

* Astrosand

* Add tile

* Fix
2025-04-29 08:58:39 -04:00
Princess Cheeseballs
aeed6b3954 More Mail Sprites (#37023)
* Commit

* Sprite update

* Last push for real for real

* Final Commit for real for real for real
2025-04-29 01:27:14 -04:00
Samuka-C
02b5592d69 Xenoborgs part 2 (#36844)
* add lawsets for the xenoborgs and mothership core

* add xenoborg names

* add xenoborg radio

* add xenoborg device frequency

* add xenoborg access

* add xenoborg contraband

* Update Resources/Locale/en-US/station-laws/laws.ftl

Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>

* add xenoborg access to the universal Id card and universal access config

* remove 6th law of xenoborg and mothership lawset (got jointed into the 5th law)

* added xenoborg and mothership law boards

* add more names

* add Xenoborg faction

* moved all lawboards into a separate yml file

* removed custom xenoborg contraband severity

* add Xenoborg and Mothership components

* add xenoborg laser guns

* add self recharging fire extinguisher

* add mothership pinpointer

* add material bag

* add infinite jetpack

* add a only blue energy dagger

* add xenoborg jammer

* add refueling welding tool

* add nocturine hypo

* add nuclear small power cell

* add cloaking device

* add xenoborg door remote

* add custom sprites for xenoborg modules

* add custom sprites for xenoborg module actions

* removed Xenoborg Comp until is actually needed

* add xenoborg module tags

* spelling

* add xenoborg module bases

* organazied xenoborg modules sprites better

* add generic xenoborg modules

* add heavy xenoborg modules

* add engi xenoborg modules

* small fix to meta file in actions_borg.rsi

* renamed mothership comp to XenoborgMothership

* fixed the base for the xenoborg engi modules

* add scout xenoborg modules

* add stealth xenoborg modules

* localization for names and descriptions of the xenoborg modules

* fixed issues related to the XenoborgMothership component

* revert localization (it wasn't working for some reason)

* fixes

* fixed issue with container slot in the cloaking device

* Update description of small capacity nuclear power cell

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

* Fix indentation in material bag

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

* Spelling

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

* fix parameter order in some prototypes

* rename proto id InfiniteJetpack to JetpackXenoborg

* localize pinpointer targets

* Revert "localize pinpointer targets"

doesn't work

* added lines in the end of files (and in the middle of one)

* reorder paramenter in some entities

* fixed some descriptions

* minor fixes

---------

Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-04-28 18:10:35 -04:00
Tiniest Shark
bb9c6dbe9d Ammo Mag + Speedloader Inhand Sprites (#34235)
* Added inhand visuals to (most) ammo magazines and speedloaders

* whoops mixed up a single inhand on the rifle mag

* Didn't realize rubber ammo got removed.

* added attributions

* adjusted inhand visuals to account for magazine types

* missed one :eye:👁️

---------

Co-authored-by: EmoGarbage404 <retron404@gmail.com>
2025-04-26 19:36:01 -04:00
Centronias
90582f27ee Adds Parcel Wrap (#34471)
* Parcel Wrap

* fix TG sprite licenses
update attribution on modified `unwrapped` sprite to better conform to CC's guidance

* ContainerContainer test failure fix

* Just easy changes for now.

* Imagine building your code before pushing it for review

* The rest of the PR comments

* PR comments

* more comments + cargo orderability

* whitespace: deduplicated.

* use limitedcharges
replace mostly-duped client/server with if(onserver)

* cabinet perspective sprites

* web edit detected

fite me

* @ps3moira 's new sprites for me :)

* add a touch of attribution

* EmoGarbage Review

* Merge with master

* Merge with master

---------

Co-authored-by: EmoGarbage404 <retron404@gmail.com>
2025-04-26 19:24:25 -04:00
RedBookcase
b0dedb9770 Changed the storage sizes of different swords. (#36564)
Co-authored-by: RedBookcase <Usualmoves@gmail.com>
2025-04-26 13:45:08 -07:00
Wolfkey-SomeoneElseTookMyUsername
0dd9ffe8bf Add Cotton Burgers (#36405)
* Adds cotton burgers

* Rephrased copyright

* Added an extra comment

* Adds CottonBurger to tags.yml, Not sure if i am supposed to do this or not.

* Reordered Cotton bun YAML, and fixed overwritten tags

* Merge issue fix?

* Add experiment plushie and remove rubber chicken from cotton burgers

* Minor comment change

---------

Co-authored-by: beck-thompson <beck314159@hotmail.com>
2025-04-25 18:54:14 -07:00
Nemanja
f900d9f8b2 PKA Modkits + Rebalance (#31247) 2025-04-25 11:18:23 -07:00
Nox
a92ad620b2 Cyborg Rebalance (#34186)
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2025-04-24 19:29:16 -07:00
SG6732
b0edf7106f Meat Patty (#34896)
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-04-23 20:45:27 -07:00
Smith
8478125fe8 Cotton Grilled Cheese Sandwich (#36135)
* Working entity.

* New sprite by MadeOfHeartAndStone

* Removed deadspace, changed attribution in meta.json

* review

---------

Co-authored-by: Milon <milonpl.git@proton.me>
2025-04-24 05:24:37 +02:00
No Elka
a8f05f5547 Make toy sword less obvious (#34199)
* YAML fuckery

* Remove toy_sword.rsi

Not a webedit btw
2025-04-24 03:21:35 +02:00
Winkarst
3ac8bc71f1 Cleanup: Move folders out of bureaucracy.rsi and paper.yml (#35108)
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-04-22 23:31:42 -07:00
kosticia
2076e8b02d Moth-pockets (#34517)
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-04-22 22:36:54 -07:00
Hanz
bd1f2af691 Ashtray Resprite and Fix (#31643)
* The meat and potatoes

Yup

* Stupid recycler

bruh

* guh

guh
2025-04-22 15:34:39 -04:00
Hrosts
ae8b5c6097 Add rehydratable mop bucket cube, refactor the rehydratable yml (#34586)
* Refactor rehydratable items

* Finish main refactor

* Add mop bucket cube

* Move cube sprite and item size to RehydratableAnimalCube

* Fix sprite attribution

* Make it follow the conventions

* Refactor wrapped cube, leave MonkeyCube tag only on the cube and the Syndie Sponge

* Fix DehydratedSpaceCarp inheritance overwriting needed components

* no need for this comment

* remove whitespace

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

* indentation

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

* Restore lost description

* reorder stuff

* line

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-04-21 13:16:25 -04:00
uhbg
94b46a9edc The Bartender can now make Eggnog (#34065)
* Preliminary eggnog changes (egg in shaker crashes?)

* Fixed eggnog reagent name and description

* added - to flavor

* deleted a space

* Added eggnog glass sprite

* changed fill levels to match rsi

* Added two more fill levels to eggnog

* Removed fizziness, changed physical description, and fixed rsi

---------

Co-authored-by: uhbg <29674581+uhbg@users.noreply.github.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2025-04-20 17:27:35 -04:00
Prole
58fb282023 The Beverage Jug Can Now Look Open (#36070)
* GenJug-Changes

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

* Guh

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

* Support For the Rest

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

* New Sprites

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

* Newest Sprites

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

---------

Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>
2025-04-20 16:36:22 -04:00
lzk
63350853f0 change MV cable outline (#36751)
* change MV cable outline

* zamn
2025-04-20 16:30:37 -04:00
GrownSamoyedDog
36999e5a06 Gave Bartender Pineapple Juice Cartons (#34769)
pineapple juice core pina colada maxxed
2025-04-19 10:25:09 -04:00
Southbridge
aa5d344a57 ERT Janitor Weapon - Hydra (#34416)
* checkpointing work

* Got this fully working and all sprites done

* Exchanged my sprites with the ones made by AugustSun

* Changed the name to Hydra Launcher, and adjusted it to function like a revolver instead.

* Modified the hydra to be a revolver

* fixed container issue

* Swapped in even newer sprites

* review

---------

Co-authored-by: Milon <milonpl.git@proton.me>
2025-04-19 16:03:05 +02:00
SharkSnake98
9599f582f3 New Drinks (#36287)
Co-authored-by: RedBookcase <crazykid1590@gmail.com>
Co-authored-by: SharkSnake98 <sharksnake87@gmail.com>
2025-04-18 22:12:10 -07:00
Centronias
98f9149883 Add inhand sprites for the drink shaker (#36382)
* Add inhand sprites for the drink shaker

* Update Resources/Textures/Objects/Consumable/Drinks/shaker.rsi/meta.json

oop that's not actually their discord name

* Co-Authored-By: Failed <158702813+failed5@users.noreply.github.com>
2025-04-18 10:12:37 -07:00
T-Stalker
4d457db9e9 Add Experiment plushie (#36663)
* Plushie

* Add to fills and fix license

* minor spelling issue
2025-04-18 12:38:34 +10:00
Alexandre Courtin
6c1b350c12 Banjo can now be worn on your back. (#34057)
* Banjo can now be worn on your back

* Added banjo backpack sprite

* Reduced banjo backpack sprite size

* Added my username to copyright

* 2nd try banjo backpack sprite

* 3rd banjo backpack sprite

* EmoGarbage Review - Adjust Strap Color

---------

Co-authored-by: Hoodie <hoodie>
Co-authored-by: EmoGarbage404 <retron404@gmail.com>
2025-04-17 16:05:27 +02:00
ScarKy0
bfe739e0af Hydroponic trays can now be bought (#36630) 2025-04-16 16:51:00 -07:00
SpaceRox1244
6ef5f8e2f1 Adds handheld artifact container to cargo orders (#33327)
* Adds handheld artifact container

* Adds inhands and missing details

* Reduces use delay on unlocking and opening hand arti container

* Adds handheld arti container to cargo orders

* Fixes build error i think

* Removes extra whitespace

* Adds static price to handheld arti container
2025-04-16 19:35:57 -04:00
Linkbro
0d70d6bfdf New Sprites for cables (#34955)
* initial textures

* Makes it have layers because Milon wanted it

* Makes it have layers because Milon wanted it

* in do NOT understand github

* tested, works

* Update Content.Client/Power/Visualizers/CableVisualizerComponent.cs

Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>

* Update Content.Client/Power/Visualizers/CableVisualizerComponent.cs

Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>

* remove extra newline

* EmoGarbage Review - Adjust MV cables to use orange stripes

---------

Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
Co-authored-by: Milon <milonpl.git@proton.me>
Co-authored-by: EmoGarbage404 <retron404@gmail.com>
2025-04-16 16:26:25 -04:00
ScarKy0
56412d4b4e Basic Resources Crate (#36419)
* init

* 1660

* I never webedit

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

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
2025-04-16 15:20:36 -04:00
ArtisticRoomba
a94f64d942 New Arsenal T3: Temperature Gun Revitalization (#35447)
* tempgun real

* fixin shit

* Warios Couch

* fix tests. i hope

* add to lathes

* tests begone

* RIP svalinn

* maintainer for the project btw

---------

Co-authored-by: Flareguy <woaj9999@outlook.com>
Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com>
2025-04-16 13:58:35 -04:00
RedBookcase
ca1e5e0942 Blueprint tweaks. (#36609)
* Blueprint tweaks.

* Inhand fixes.

---------

Co-authored-by: RedBookcase <Usualmoves@gmail.com>
2025-04-16 12:12:22 +02:00
Flareguy
92b0f62500 New Experimental Science T3: Desynchronizer (#35752)
* desynchronizer real

* yaml stuff from slarti branch

* C# stuff

* oops

* review

* improve

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-04-16 11:33:39 +10:00
TheProNoob678
f611b6ea5e Inhand sprites for figurines (#36017)
* figurine sprite update

* Updated meta.json to credit inhand sprites

* Update meta.json to credit inhand sprites

* Updated meta.json because crlf check

* potentially fixing CRLF issues in meta.json + consistent spacing

* Fix CRLF, maybe?

* properly credited myself for all my amazing work in the community

* Reformat meta.json as per the newly merged "fix as you go" procedure.

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-04-14 21:15:49 -07:00