Commit Graph

1155 Commits

Author SHA1 Message Date
Pieter-Jan Briers
2a7bdd9b08 Revert "plutonium core steal objective" (#29578)
Revert "plutonium core steal objective (#26786)"

This reverts commit f6ce07289a.
2024-06-30 01:23:03 +10:00
deltanedas
f6ce07289a plutonium core steal objective (#26786)
* add textures

* add SealingCabinet system

* add StoreUnlocker/ObjectiveUnlock system

* add plutonium core and nuke core container

* make nuke deconstructable

* add steal core objective

* add core extraction toolbox to new category

* typo ops wrench fuel

* use queries and resolve, have it resolve instead of using Comp

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-06-29 14:11:31 +10:00
Pieter-Jan Briers
c1ad5cded0 Fix gay nuke layering (#29410)
I fucked up while exporting from aseprite whoops.
2024-06-24 20:01:24 +02:00
DrEnzyme
659010993f Add bagels (#24799)
Bagels are made by using a rolling pin on a dough slice to make a dough rope, then cooking the dough rope in a microwave for 5 seconds. There are two types: a normal bagel and a poppyseed bagel. The poppyseed bagel requires a poppy and a dough rope and has a small (5u) quantity of Bicaridine inside of it in addition to its nutriment.

Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>
2024-06-23 12:33:12 -07:00
Floofi
3284c24ece add lemon juice and fix bad sprite allocation (#27465) 2024-06-22 19:46:19 -04:00
Flareguy
45a4596e8b Disk """resprite""" (#29277)
* disk ""resprite""

* fix holodisk
2024-06-22 23:06:17 +10:00
Ghagliiarghii
b90c6acacd golden plunger (#29043)
* golden plunger

* Add wood material (the handle is still wood)

* 52 hours

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-06-21 00:24:36 +10:00
Errant
d15eafe133 Survival Box Loadouts, Nitrogen Emergency tanks (#29131)
* Nitrogen survival boxes

* Zero-setup workaround

* clown box

* cleanup and universal tanks

* cleanup

* more cleanup

* hide loadoutgroups

* remaining survival boxes

* space ninja

* Revert "space ninja"

This reverts commit a650f417f83f5861e0001b25418e4a361927c6c6.

* weh

* weh

* undo appearance change of syndicate survival boxes

* indentation fix and missing label
2024-06-21 00:05:01 +10:00
Redfire1331
68c414e8ed made cup ramen eatable with anything with the fork component (#27826)
* made cup ramen eatable with anything with the fork component

* removed extra png

* made cupramen fillable with water, and made hot ramen dry ramen.

---------

Co-authored-by: redfire1331 <Redfire1331@users.noreply.github.com>
2024-06-20 22:34:46 +10:00
Flareguy
94995460fd Emergency toolbox fill rework (#29202)
* emergency toolbox fill rework

* Fuck
2024-06-19 14:13:27 -04:00
IProduceWidgets
801d405919 Add the most anticipated gun in the game. Foam Force. (#29103)
* Foam Force

* make it available somewhere

* add clumsyproof and nuke dev item

* reorganize

* oopsy files

* Strap!

* woopsie layering

* fix grammar to rerun tests for rogue unrelated test fail.

* cleanup

* I eepy layer forgetti spaghetti

* For real last necessary commit

* Oops I broke the law! feexed

* Decided to just change it to the same source as the poster source in our repo for consistency.
2024-06-19 01:04:15 +10:00
Nemanja
f136657b38 Revamped Meteor Swarm (#28974)
* meteor code and balanced values

* Meteor Swarms

* Update meteors.yml

* Update meteors.yml

* HOO! (fix overkill bug and buff space dust)

* undo BloodstreamComponent.cs changes

* DamageDistribution -> DamageTypes

* part 2.
2024-06-14 20:38:43 -07:00
Verm
68807cb25e Changes all the uplink ally icons to be a combination of the mob + radio (#28954)
* New Icons!

* Better meta info
2024-06-14 17:44:23 -04:00
Pieter-Jan Briers
ba6853d386 It is pride month, nukies. You know what that means. (#28992)
* Make the nuke gay

* I forgot to commit the gay

* Add pride month

* Use holiday visualizer for nuke

* Fix pride month

* Trans too
2024-06-14 19:22:01 +02:00
Ubaser
e70131e5b4 Lighten throwing knive's border (#28977)
add
2024-06-14 10:55:30 +03:00
Moomoobeef
adad6b2b04 cargo can now order fax machines (#28968)
* cargo can now order fax machines

* removed fax manual
2024-06-14 16:24:18 +10:00
Moomoobeef
22b1ec9775 added a new sprite for the super synthesizer. (#28884) 2024-06-12 22:20:28 -04:00
Cojoke
865810c6e1 New Sprites for Tranq Shells + Add consistancy to printing Tranqs (#28903)
* New Sprites for Tranq

* Add consistancy to secfab print
2024-06-12 22:17:35 -04:00
Flareguy
9a32a1949c Removes Trials of Mana grassland sprites: Bare Minimum Edition (#28868)
* replace the grass sprites. again

* Fix dirt

---------

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
2024-06-11 23:04:43 -07:00
Ps3Moira
f223931ed3 Fix Cigars Sprites + YAML fix for Inhand unlit cigars/cigs (#28641) 2024-06-05 17:16:32 -04:00
Tayrtahn
a4881f56b0 Add "fill level" sprites to mops and damp rag (#28590) 2024-06-04 14:48:24 -04:00
Leon Friedrich
4735cb7d2d Fix dud modular grenade visuals (#28265) 2024-05-25 16:03:05 -04:00
TsjipTsjip
daac303783 Admin access configurator (#28107)
* Port spritework and initial prototypes by @Arimah

Co-authored-by: Alice 'Arimah' Heurlin <30327355+arimah@users.noreply.github.com>

* Make Admin PDA's spawn with a universal ID card

* Add universal access configurator to aghost satchel of holding

* Add Admin suffixes to adminonly items: AdminPDA, UniversalIDCard, AccessConfiguratorUniversal

* Admin jobicon

---------

Co-authored-by: Alice 'Arimah' Heurlin <30327355+arimah@users.noreply.github.com>
2024-05-19 17:04:16 -06:00
lzk
e06b58abce Resprite zookeper id (#28131)
Change zookeper id
2024-05-19 16:05:12 -06:00
lzk
37382b3186 Move pens out of paper.yml mess (#28044)
* Move pens out of paper.yml mess

* forgor

* fix tests

* fux

* fix 2
2024-05-18 12:51:02 +03:00
RiceMar1244
2287f59e8a Adds wielding for all large guns (#26970)
* Adds wielding assets

* Modifies meta.json files and adds artist credit

* Adds wieldable component to a bunch of weapons

* Moves shotgun inhands and wield inhands to their own folders (because its the only way the sprites would work)

* Removes the wieldable component from some guns

* Adds wielding sprites for wieldable guns that didnt have them

* Adds gun wielding bonuses and base innaccuracy to wieldable guns.

* Corrects wielded accuracy to be default accuracy instead of perfect

* Makes the drozd smg and bulldog shotgun wieldable

* Makes nukie c20r wieldable and adds sprites

* Adds BaseGunWieldable

* Makes all the newly wieldable gun use the base inheritable

* Adds accuracy to smgs to resolve inheritance conflict

* Makes all wieldable shotguns require wielding to fire because of a bug involving spread innacuracy

* Adds wield bonus message on examine
2024-05-09 19:58:15 -07:00
Verm
70d3cf7ba4 Emergency Tank + Plasma Can visible on suit storage slot (#27598)
* Suitstorage Sprites + Plasma tank slots

* Fix some extra brackets
2024-05-06 00:42:22 +03:00
lzk
ead78b72d2 Add default whistle + whistles reorganize (#27676)
* Add default whistle + whistle reorganize

* aaa

* fux?

* fiiiiix???

* Revert "fiiiiix???"

This reverts commit 15353465d58db615185afa8c549e1819099c1a5b.

* Apply suggestions from code review

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

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
2024-05-05 16:42:35 +02:00
Hanz
a8bf2689a4 Red bool update (#27597)
* the meat and potatoes

yuh yuh yuh

* what the hell is a copyright?

am I right?
2024-05-03 08:57:37 +02:00
NotSoDana
9ca1d01218 Gildlager empty bottle fix (#27581)
* rename goldschlager bottle

* migration

* fix rsi
2024-05-01 11:24:05 -04:00
Mangohydra
8afae8a1f1 Martyr Cyborg Module, borg law 2 explode (#25815)
* borg law 2 explode

* attributions fix + CL fix

* please dear god work i beg you

* maybe this will work :godo:

* 50% off deal + disc change

* absolving merge conflict

* merge conflict fix

* Update Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml

* Update Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml

* Update Resources/Audio/Effects/Grenades/SelfDestruct/attributions.yml

* Apply suggestions from code review

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Kara <lunarautomaton6@gmail.com>
2024-04-28 21:16:04 -07:00
potato1234_x
cd90c05ce5 Rainbow Weed (#25759)
* rainbow weed

* Lipolicide

* psicodine + mannitol

* happiness

* ground + dried + smokables

* damn you notepad++

* fix

WHY NOT TELL ME ALL THE PROBLEMS AT THE SAME TIME!!!

* work

* work i beg you

* recipe good

* possibly fix merge conflict

* remove reagents
2024-04-28 21:06:27 -07:00
Ubaser
008935f6ec New plant mutation: Pyrotton (#27200)
* WIP

* sprites n stuff

* flavour

* maybe fix

* add stack

* fix parent
2024-04-28 13:07:36 +02:00
RumiTiger
f5b8b5fbdc Sprites for drinks without sprite (attempt 2) (#27227)
* A beer can and a wine can

* fix wrong file locations


---------

Signed-off-by: c4llv07e <kseandi@gmail.com>
Co-authored-by: c4llv07e <kseandi@gmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-04-28 14:43:45 +10:00
NotSoDana
f5aa5f1f22 Several new bartender tools (#27406)
* added bar specs

* specs in boozeomat

* added jigger in bartender guide

* fixed ice bucket

* cdn

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-04-28 14:40:07 +10:00
icekot8
a7ad59f6ba 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>
2024-04-28 13:19:33 +10:00
RiceMar1244
8869fc3bb2 Resprite antique laser pistol (#27037)
* Resprites the captain's antique laser pistol

* Adds artist credit

* Improves icon outline and shading

* Replaces new sprites with something more resembling the in-game version
2024-04-27 13:08:38 -06:00
Terraspark4941
34ab1e760d The Honored Quran (Sprite addition) (#27400)
The Honored Quran
2024-04-28 02:36:04 +10:00
Ramlik
db555a7c79 Add a handy security radio (#25913)
* Add a handy security radio

I've always wanted to have a handy security radio in game and I thought it would be cool to have one in game.

Demonstation can be found in here: https://youtu.be/VQOLiTQAmKc

* Merged radio files and changed sprite location

* Fixed RSI not having license and copyright

* Added a chance to spawn in security closets

All security closets will have 50% chance to spawn a handy security radio in it

* Update radio id

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

* Change id in locker spawn

* Change id in locker spawn

* Changed id to RadioHandheldSecurity as suggested

* Add radio to vending machine instead of locker

Removed radio from lockers and added it to security vending machine

* Fixed radio not having a sprite

---------

Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
2024-04-27 23:27:18 +10:00
Plykiya
cafb41c161 Printable Special Mags and Empty Mags and Material Rebalance for Ammo (#26178)
* Printable Empty Magazines

* Adjust values of ammo boxes, adjust material costs, add empty lethal/non-lethal mags, swap secfab shotgun shells with shotgun ammo boxes, add recipe for shotgun ammo boxes

* Adds fully loaded pistol mags at secfab, removes printing respective cartridges at secfab

* Adds fully loaded rifle mags at secfab, removes respective cartridges

* Adds fully loaded light rifle mags at secfab, removes respective cartridges from secfab

* Adds fully loaded speedloader to secfab, removes respective cartridges from secfab

* small id mismatch fix

* another wrong ID fix

* capitalize Ls in speedloader

* Add missing SpeedLoader recipe

* Adds fully loaded shotgun drums to secfab, removes respective shells from secfab

* add rifle ammo unlocks back in, forgot ammo unlocks affect other fabs as well

* Moves tranquilizer shells to the non-lethal ammunition research

* Account for the removal of rubbers, adds in craftable disablers

* rubber rounds don't exist, remove empty non-lethal mags to just have empty mags

* Add in WT550 mags

* Convert latheRecipes to use LayeredTextureRect instead of TextureRect

* Fix for issue, texture layering now works

* Add in missing shell uranium box art

* add shelluranium to meta.json

* Fix yml issue

* Get rid of unused single ammo printing unlocks

---------

Co-authored-by: Plykiya <plykiya@protonmail.com>
2024-04-27 20:38:59 +10:00
Ps3Moira
77d7c77f59 Canes + Cane Blade for Syndicate Librarians (#25873)
* Cane + Cane Blade

* Add - type: ContainerContainer

* Add another - type: ContainerContainer

* Fix and add proper ContainerContainer component

* Add UserInterface component

* Remove Space

* Stat Changes

* review

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-04-27 20:22:10 +10:00
Redfire1331
080b1b1e0c Added Chopsticks (#27298)
* added chopstick sprites

* Create chopsticks.yml

* added chopstick yml

* hopfully it acts like a forke

* added chopsticks to dinnerware vendor

* uncapitalized the name

* Update Resources/Prototypes/Entities/Objects/Misc/chopsticks.yml

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

* made the chopsticks icon a reasonable size

* added chopsticks to chang vendor

* made paired chopsticks you can break apart

* added them to vendors

---------

Co-authored-by: redfire1331 <Redfire1331@users.noreply.github.com>
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
2024-04-26 22:39:32 +10:00
beck-thompson
d3b1178428 Radio jammer update! (#25912)
* Added selectable power level to radio jammer

* Cleaned up OnGetVerb

* Settings are now stored in the .yml file. Simplified stuff a lot!

* Minor fixes!

* Small little baby fix :)

* Added the power level switch to the examine menu and also removed the ftl file as it was in the incorrect location.

* Minor code cleanup

* Changed byte -> int

* Update sprite

* Fixed licence

* Added power LED that changes if the jammer is on low power.

* Removed tabs

* Changed github link to the commit

* Changed all the RemComp to RemComDeferred

* Moved NetworkedComponent to shared

* Changed radio jammer textures back with minor edits

* Added a space because it was annoying me

* Jammer now updates range for suit sensors properly! Thanks nikthechampiongr :)

* Removed useless comment

* Cleaned up code that updates the range of tracking devices.

* Fixed client namespace and removed newline

* Cleaned up ChangeLEDState and ChangeChargeLevel.

* Added comments

* Read only

* Fixed another comment

* Locked in

* Made server inherit shared

* Update Content.Shared/Radio/EntitySystems/SharedJammerSystem.cs

* Update Content.Shared/Radio/EntitySystems/SharedJammerSystem.cs

* review fixes

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-04-25 12:19:16 +10:00
pigeonpeas
c129bb177c Allow the purchase of emitters from cargo. (#27229)
add emitter crates back to cargo + changes the contents of an emittercrate from emitter to emitterflatpack

👍
2024-04-23 21:34:09 +10:00
Gyrandola
fa5b93871f chili/chilly peppers sprite alignment fix & minor refactorization (#25971)
* png alignment and minor refactorization

* Update migration.yml

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-04-20 12:06:48 +10:00
Ed
f3a97fc0c5 Killer tomatoes (#26053)
* make tomatoes

* many friends! many mommies

* finish

* renaming system

* fix

* Update miscellaneous.yml

* Update Content.Server/NPC/Systems/NPCImpritingBehaviourSystem.cs

Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com>

* N

* deleete exception?

* merge conflict fix

* fix?

* fuck you

* sloth fixes

* fixess?

* fix

---------

Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-04-18 21:21:56 +10:00
Flareguy
7b94e244b3 Ports a fuckton of vox clothing from Paradise and /vg/station (#27021)
* adds a bunch of vox clothing sprites

* bird up

* bee mask

* fix test fails. i hope. this better be the only damn one

* fix "eqipped"

* A.

* outerclohting

* ???

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-04-18 16:43:42 +10:00
Flareguy
66f32d4289 Partially reverts the remote signaller resprite (#27073)
de-sprites the remote signaller
2024-04-17 21:16:48 -04:00
deltanedas
395c33024c prop hunt ss14 (real) (#26691)
* texture appropriation

* add code for projector

* add chameleon projector yml

* damage and actions

* prevent small props being killed round removing you (700 damage from a single shot)

* tweak default

* oop

* do appearance properly, need engine update

* fix bugs, blacklist pda

* remove status icons

* amou

* sus

* fix test + make props fast

* amouuuung

* remove funny log

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-04-17 14:48:35 -07:00
Verm
96ad9002f1 You can now see paper on crates (with color!) (#26834)
* Implement changes on not-cooked branch

* Made it work

* Fix update appearance calls

* Fix extra indents, clean-up code, fix tests hopefully

* Fix hammy cagecrate

* Fix messing up the yml, add artifact crate specific labels back in

* Visual Studio hates yml, sad

* Seperate the colors for cargonia

* sorry json

* make label move with artifact door

* Apply suggestion changes

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

* Fix remaining crate offsets, add a few for livestock and graves (why are you labeling graves) and coffin label sprites (why are you labeling coffins??)

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2024-04-14 13:39:02 +10:00