tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,608 Commits 3 Branches 5 Tags
0bbe335a3aec216e55e901b9d043de8b0d0c4db1
Commit Graph

1231 Commits

Author SHA1 Message Date
mhamster
e26e662023 Small json files fixes (#30907) 
Small json fixes

Resources/Textures/Interface/Default/meta.json: trailing comma
Resources/Textures/Objects/Specific/Hydroponics/attribution.json: proper json
Resources/Textures/Tiles/Planet/Snow/meta.json: trailing commas
 2024-08-11 23:26:45 +10:00
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
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
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
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
Alzore
517a62a6dd Recolor the defibrillator (#29964) 
* tide-ification

* metajoson
 2024-07-30 00:41:21 -04: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
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
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
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
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
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
Boaz1111
d3495fc51c made the guitars be able to be worn on suitstorage (#29048) 
* made the guitars be able to be worn on suitstorage

* minor fix
 2024-07-10 09:28:10 +10:00
Nemanja
21d0f85cc2 metal foam grenades (#29428) 
* metal foam grenades

* wow okay

* meh

* bruh

* test

* push
 2024-07-08 00:26:58 +10:00
AndreyCamper
24c47c805d Fire Axe resprite 45 degrees v3 (#28866) 
Rotating Fire Axe 45 deg
 2024-07-06 00:37:29 +03:00
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