Commit Graph

2431 Commits

Author SHA1 Message Date
Ed
4d75cb54c8 Custom burgers - FoodSequence system (#30755)
* setup foodsequence

* name generation and max layers limit

* move to nutrition

* move code to serverside

* move to appearance data

* marked fields as required

* Update foodsequence.yml

* b

* burgeers!

* Update produce.yml

* Update meat.yml

* Update burger.yml

* fix duplicate naming

* Update Resources/Locale/en-US/nutrition/components/food-sequence.ftl

Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>

* merge flavor profiles

* make food trash List<>

* merge trash

* Update FoodComponent.cs

* Update FoodComponent.cs

* organs and cannabis support

---------

Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>
2024-08-10 22:31:32 +03:00
Nemanja
fc1446e73a Cursed Mask (#29659)
* Cursed Mask

* extra expressions

* block ingestion

* mind returning

* okay fix the removal shit
2024-08-10 11:14:58 -04:00
Ubaser
c812bd8ff4 Partially revert light tube sprites (#29091)
* add

* reduce contrast
2024-08-10 11:00:21 -04:00
TakoDragon
9bc1fabdb3 Added suitskirt for psychologist (#30709)
* Added jumpskirt

* added locale

* Added spaces in code

* Updated the meta
2024-08-10 08:51:54 -04:00
Ko4ergaPunk
1fe46a7210 Changed chemistry airlock color (#30666)
* chem

* re-check

* re-check. again

* checks just die. last try

* re-check :blessrng:
2024-08-09 23:23:46 -04:00
Ubaser
ed3ec4dc5f Crowbar variants (#28988)
* add

* comma

* sprites

* yaml-ify

* add s

* lathe and engi belt

* yes

* fix maybe

* progress

* nearly there

* fix

* fix yaml linter having a stroke
2024-08-09 13:29:00 -06:00
MureixloI
3f4e093eaf [Sprites/Fix] In hand for BlueSpace beaker & CMO's equipped cloak (#28719)
* [Fix] CMO's equipped cloak

* [Fix] CMO's equipped cloak

* [Sprites] In hands for bluespace beaker

* [Sprites] In hands for bluespace beaker

* [Sprites] In hands for bluespace beaker

* [Sprites] In hands for bluespace beaker
2024-08-09 22:02:26 +10:00
Ubaser
c1797b769c Resprite the equipped gas canister suit slots (#30809)
* add

* red and generic

* add meta
2024-08-09 20:32:55 +10:00
Ko4ergaPunk
55d400b1b9 New decals for mapping (#30374)
* new decals

* license

* re-check
2024-08-09 17:06:37 +10:00
themias
8ebe105458 Add butter slices (#30789) 2024-08-09 09:32:42 +10:00
Nemanja
1b1008ad85 Scrap (#30762)
* jnk sprites

* scrap pt 2

* metal inhands

* hell yeah brudda

* Update meta.json

* Update scrap.yml

---------

Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com>
2024-08-09 09:31:53 +10:00
Ed
03745efc7f Thief beacons (try 2) (#29997)
content
2024-08-08 16:17:50 +03:00
Errant
6ccc10e240 Vox Medical Mask sprite fix (#30702)
vox medical mask
2024-08-06 23:41:40 -04:00
Flareguy
37e36bfa7c Vox head displacement map (#30699)
* head displacement for vox

* fixe
2024-08-06 16:12:14 +03:00
foboscheshir
1629e200cb Missing mime mask sprites for Vox (#30607)
mime-mask-vox
2024-08-05 09:09:35 +03:00
DrSmugleaf
54d5bd266c Add mapping editor (#23427)
* Add mapping editor (#757)

* Remove mapping actions, never again

* Cleanup actions system

* Jarvis, remove all references to CM14

* Fix InventoryUIController crashing when an InventoryGui is not found

* Rename mapping1 to mapping

* Clean up context calls

* Add doc comments

* Add delegate for hiding decals in the mapping screen

* Jarvis mission failed

* a

* Add test

* Fix not flushing save stream in mapping manager

* change

* Fix verbs

* fixes

* localise

---------

Co-authored-by: DrSmugleaf <DrSmugleaf@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: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
2024-08-04 13:31:45 +10:00
IProduceWidgets
7c7dfb48bb Greyscale Winter Coats and Hoods, some reorganizing of rsi. (#30314)
* reorganize coats, greyscale coats and hoods

* fix inhands

* make rsi validator happy

* even mo' hap'

* comma schmomma

* oops theres a recipe

* armor credits

* painflicts
2024-08-02 19:24:54 -04:00
Alzore
0689e16939 Recolor winter boots (#30350)
* Recolor winter boots

* fix inhands

* better colors

* FOOT
2024-08-02 19:05:18 -04:00
slarticodefast
577f30fb13 Add haloperidol, potassium iodide (#27454)
* add haloperidol, potassium iodide

* review fixes

* review and tuning

* shader review

* use timespan and AutoPausedField
2024-08-03 03:12:08 +10:00
Emisse
ac4086f984 apc touchup sprite (#30460)
* apc touchup

* darker borders ofjdsa fjoias
2024-08-02 17:19:25 +10:00
Tayrtahn
ed4ae1628c Add "fill levels" to spear in-hand/wielded/equipped sprites (#28865)
* Add fill level sprite support for equipped items

* Add fill sprites for held/equipped spears
2024-08-02 17:18:59 +10:00
slarticodefast
448f3804e6 Remove duplicate cartridge rsi (#30498)
remove duplicate cartridge rsi
2024-08-02 16:14:50 +10:00
Ko4ergaPunk
27f3bea46d Cutter machine & steel mozaic item tiles (#30431)
* no texture machine

* done

* delete wip

* bug fixes

* oops

* CutterMachineCircuitboard
Glass: 500
2024-08-01 13:26:32 +03:00
Repo
a72445c419 aHelp fixes and improvements (#28639)
* Clear search criteria on loading aHelp window

* Pinning technology.

* Relay to aHelp window and discord if a user disconnect/reconnect

* Fix pinning localization

* Log disconnect, reconnects, bans to relay and admin in aHelp

* Drop to 5min to hold active conversations

* Update Content.Server/Administration/Systems/BwoinkSystem.cs

Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>

* discord text styling if diconnect,reconnect,banned message.

* Pin icons instead of text

* Better Icons

* space

* Move button generation in to its own XAML

* List entry control

* Fix spaces

* Remove from active conversations on banned

* Discord if else block cleanup

* Better pin icons

* Move icons to stylesheet styleclass

* Better field order.

* PR review fixes

* fixes

---------

Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-07-30 18:28:32 +10:00
Alzore
517a62a6dd Recolor the defibrillator (#29964)
* tide-ification

* metajoson
2024-07-30 00:41:21 -04:00
Flareguy
0266ac029d Security biosuit sprite fix (#30151)
sec biosuit fix
2024-07-30 00:40:39 -04:00
Nemanja
c4c4a934af fix lathe screen animations (#30479) 2024-07-30 14:03:46 +10:00
themias
85e36266fa Add envelopes (#30298)
* Add envelopes

* oops

* Remove unused loc string

* comments and fixes
2024-07-29 21:49:05 -04:00
Moomoobeef
7761f86b99 added wearable lizard plushie (#30400) 2024-07-29 15:52:39 +03:00
Flareguy
9bd623a927 Makes security a bit brighter (#30369)
makes sec more red
2024-07-27 13:51:10 -06:00
BombasterDS
de7df2a760 Some plant mutations (#28993)
* Some new plants mutations

* glasstle inhand

* gapple trico increase ↑

1-10 to 3-16

* replace trico with doc delight
2024-07-27 18:08:49 +03:00
Golden Can
1149290825 Security Clown Mask (#30249)
Added Security Clown Mask available from hacked SecDrobes.
2024-07-27 00:09:23 -04:00
Ilya246
d5236d8236 give nukie reinforcements full operative gear (#30173)
* rebase master

* free fish

* introduce recommended changes

* fix prototypes

* fix protos yet again

* fkhsdjbhehbo;ehb

* rafle
2024-07-25 16:37:54 -07:00
mkanke-real
e1f3bdc748 Add spicy rock pizza (#30116)
* Added all the parts to implement spicy rock pizza

* Added sprites for pizza

* Fixed coma formatting in meta.json for pizzas

* Fix formatting and rebalance reagent quantities in pizza.yml

* Flipped Uranium and Radium values to be the correct ratio

* Updated meta.json file to have credit for sprite
2024-07-23 16:22:11 -07:00
Ed
918709cb47 Displacement maps big update (#30093)
* split logic into own system

* add support for different size displacement maps

* some clothes may not use displacement maps

* displacement maps spport hand sprites

* Update DisplacementMapSystem.cs

* rename things

* fuck stencilmask

* fix bugs

* no masks

* Update jumpsuits.yml

* fix species specific sprites

* Update ClothingSystem.cs

* shoes + ears displacement, some bugfix

* Update DisplacementMapSystem.cs
2024-07-23 12:04:09 +03:00
Flareguy
8376881cdf Minor vox headwear update (#30150)
* vox sprites minor updates

* the tax

* kid named paper sack
2024-07-23 12:18:32 +10:00
Sphiral
1e89c07573 The Shelfs Update (#27858)
* goofed up

* wip, mostly test sprites

* Nearly done, just need to fix storage locks

* everything done to my knowledge

* Alright, construction tested and working, and updated health spread

* remove a single comment I forgot. Pending sprite changes.

* Update sprites and add chemistry locked preset

* Forgot to remove a comment
2024-07-21 11:16:58 -06:00
IProduceWidgets
ac53e1d0a0 add an arabian lamp. (#27270)
* add an arabian lamp

* yoink solutionitemstatus since it already displays fuel remaining.

* add comments

* fix containerception?

* Yeah sure, pray- I mean rubable.

* fix one flame frame

* Fixed emag behavior

* me when lexidysia.

* limit capacity of entitystorage and add some more comments about why it be the way it do.

* test fake?

* Holy fuck its a bug fix now? Based.
2024-07-21 01:24:28 -06:00
Alzore
c8725825be Replace the machete and laser in the borg weapons module with an e-dagger and recharging viper (#26947)
* no more lasers for you, borg.

* downgrade

* echis

* echis

* itemtoggleupdate

* daggerparenting

* fixtypo

* more bullet per bullet
2024-07-21 17:04:33 +10:00
Nemanja
0b5fe2a9ac PA ui cleanup + bugfixes (#28750)
* ui and visual aspect + radio

* finish jank ui shit and finish radio

* remove radio

* send it

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-07-21 15:27:18 +10:00
SlamBamActionman
6972bc26a7 Directional Fans (#27772)
* Initial commit

* Description update

* Updated texture
2024-07-20 13:18:34 +10:00
Alzore
93dc22b67d Add the Syndicate Raid Suit (#29845)
* Syndicate Raid Suit

* Raid suit speed and whitelist

* Fix copyright for the syndicate raid helmet
2024-07-19 12:38:26 +03:00
Ed
d6e0114126 randomize iconSmoothing (#28158)
* randomize iconSmoothing

* Revert "randomize iconSmoothing"

This reverts commit 094356f975737c0af24ce39d849aec7852b9af6e.

* try 2

* trying work with client-server communication

* still dont work

* Tayrtahn good suggestion

* remove outdated code

* Fix!

* move data to Appearance

* Update RandomIconSmoothComponent.cs
2024-07-19 18:13:35 +10:00
Flareguy
b20fd4fbd0 Vox displacement updates (#29824)
* more vox displacement maps

* A

* remove vox insuls sprites

* sci magboots

* Update vox.yml

* Update meta.json

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
2024-07-17 10:43:11 +03:00
Nemanja
13bec7a0e9 Sign Resprite (#29806)
* Redone signage

* Signs

* ok this thing now

* alright ig?

* big data

* cryo sign

* new sign
2024-07-17 14:35:18 +10:00
SlamBamActionman
4f479b6c85 Fix RGB toys color when worn/in-hand (#30023)
rgbeeeeeeee
2024-07-14 20:26:34 +10:00
Ed
1b0c434a9f Shiny Diamonds (#25750)
* shiny

* add

* reresprite

* rereresprite

* Add files via upload

* Update ore.yml
2024-07-13 15:15:57 +03:00
Nemanja
49096cf14f Watches (#29550)
* watches

* rename

* add it into loot pools
2024-07-13 16:09:19 +10:00
Jonathan Argo
2e694f109d Centered hard hat sprites (#29953) 2024-07-12 18:00:40 +03:00
Jonathan Argo
00a2c6a234 Made musket wieldable. (#29910)
* Made musket wieldable.

* Updated musket rsi meta.json copyright.

* Copyright adjustment again.
2024-07-12 12:16:21 +03:00