Commit Graph

1155 Commits

Author SHA1 Message Date
deltanedas
7dd472c934 smoke grenades (#20996)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-12-15 17:49:30 -08:00
deltanedas
81b4276b0a blood-red phone (#22538)
* add blood-red phone

* add to nukie planet

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-12-15 04:59:10 -07:00
Ed
0a8a6693a8 add content (#22518) 2023-12-15 02:55:57 -07:00
themias
6ef2673c8a Add mining drill inhand sprites (#22494) 2023-12-14 11:47:48 -05:00
Danger Revolution!
78c67a4d91 Add extended/double emergency nitrogen tanks (#22354)
Co-authored-by: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com>
Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>
2023-12-13 20:35:38 -08:00
Arendian
3e766402b9 Cluster grenades for uplink and security (#22029)
* clustergrenades go boom

* Small tweaks

* Some tweaks and soaplet

* clustergrenadesystem changes and launcher types

* small tweaks

* typo

* whitespace

* rsi edit

* another typo

* add containers

* Some changes related to merge

* Forgot to change name

* Made changes based on review

* Removed new china lake ammo based on feedback in other PR

* Unneeded nested loop moment

* Nested loop needed after all moment
2023-12-13 22:30:42 -05:00
Ubaser
0552cd2e10 New pinpointer sprites (#22435)
* add

* fix?

* a

* maybe

* aaa
2023-12-13 01:53:05 -07:00
themias
e7de7fa075 Add fill layers to Hot Cocoa drink (#22419) 2023-12-12 17:01:24 -07:00
IProduceWidgets
6ab7ecdd53 Instruments, plushies, gunpet, and bibles. (#22398)
* Some instrument sizes and gunpet sidearm

* Cello

* bagpipe

* Crippling balance PR made bananium horn Small not Tiny

* plushie and toy sizes.

* Scroll bigger

* Make bible same size as other books.

* size rgb staff to other staffs.

* add sprite update json
2023-12-12 01:03:47 -07:00
IProduceWidgets
b279f5c910 Jar now fills (#22384)
* Jar

* jar rsi
2023-12-12 00:54:15 -07:00
Flareguy
ae1a1b9e07 adds lime tiles (#22235) 2023-12-08 12:49:07 -06:00
Nim
460bfdc73c Space cobra 1.1 (#20298)
* space cobra again

* didn't see

* fix

* Dirty

* space spider

* license

* component

* sprite update

* visibility

* fix

* fix visibility
2023-12-06 20:25:57 -05:00
Nemanja
8000428e6a tweak crowbar storage sprites (#22202)
* grid inventory sprite rotation

* eek
2023-12-06 20:04:30 -05:00
Nemanja
c047f19fdc Inventory sprite rotation (#22201) 2023-12-07 11:59:16 +11:00
Danger Revolution!
3ad5bbe6ae Adds Emergency Nitrogen Tanks (#22142)
* Added Emergency Nitrogen tanks and added both variants to the Emergency Closet loot pool.

* Restored O2 tank I deleted :)

* Fixed accident with extended emergency oxygen tanks

* Fixed an issue with emergency oxygen tanks

---------

Co-authored-by: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com>
2023-12-05 02:41:39 -07:00
SaveliyM360
fe2672744f Decorative Flags (also handheld flags) (#19670)
Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com>
Co-authored-by: Kara <lunarautomaton6@gmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-12-04 17:27:02 +11:00
Nemanja
e2eb80c0fe RNG timers for IEDs + small tweaks (#22099) 2023-12-03 13:21:51 +11:00
Velcroboy
c4ec57e4d3 adjust sprite offsets for paper bins and hotplates (#22075)
Co-authored-by: Jeff <velcroboy333@hotmail.com>
2023-12-02 18:14:17 -05:00
Boaz1111
a263a17f72 Cryostasis syringe (#22021)
* Added cryo syringe, sprite courtesy of Ubaser

* I failed to put a comma in meta.json file because I was so shocked by jeneral that I couldn't think clearly

* IN MY DEFENSE JENERAL IS SCARY I THINK THE FORMATTING IS FIXED NOW

* added canReact at the wrong place, fixed now

* made the transfer good

* more issues with the sprites

* not much to say, one must imagine sisyphus happy

* mmm yes give me 0 of layers

* I oughta double check shit more

* Should be all done!

* I didn't add it to the lathe, I am le stupide

* Forgot to add the recipe somewhere

* final touches, can actually be made at the medlathe now

* added the recipe to the protolathe as well
2023-11-30 19:40:34 -05:00
DoubleRiceEddiedd
33fb768791 New mutation species plant, Lemoon Tree (#22023)
* Adding Lemoon as lemon's mutation

* Adding lemoon cake

* remove tag that forget to delete
2023-11-30 16:44:23 -05:00
Ubaser
1aa07dbb56 add custom PDA for nukie medic (#22016) 2023-11-30 16:39:08 -05:00
Ubaser
de601208ea Add metamorphic "Blood" sprite (#21596)
* add

* forgot to remove

* maybe fix
2023-11-28 00:09:55 -07:00
NULL882
f268e626a7 Mining things (#21909)
* mining-doors

* mining-tiles

* mining-window

* Change copyright in meta.json

* Change license in attributions.yml
2023-11-27 14:25:15 -07:00
Feluk6174
0da68ddc6c Added Bananadine (#21759)
* added bananadine and its functionallity (and backed banana peel)

* added baked banana peals sprites

* fixed typos and changed the sprite used by backed banan peel to the right one

* Changed the cooktime and now grinded baked banana leaves have carbon

* Updated bananadine description

* Ficed typo in ragent-desc-bananadine

* Reverted actidental change to nocturine
2023-11-21 20:08:53 -05:00
Velcroboy
808555ade6 Adds slices for banana cream pie and mime tart (#21043) 2023-11-19 12:15:02 -08:00
Ed
786bb79ebc Pet Carrier (Zookeeper gameplay?) (#21545)
* add visual

* fix item + entityStorage problem, add generation in maints

* make pet carrier two-handed

* added to cargo

* add resistlocker component
2023-11-13 16:55:47 -07:00
Ed
c99e265435 Thief stuff: Gloves, Spy Crew Monitor, Invisible Crate, Toy (#21551)
* add some stuff

* finish pack

* Update encryption_keys.yml

* revert secret channels

* revert spy key

* add spy crew monitor

* add invisible crate

* add void cloak
2023-11-12 16:41:45 -07:00
Doru991
d7810e6d6a Borg QOL, part 3 (#21567)
* Basic and advanced cleaning modules

* Roundstart entry level modules

* Oops forgot recipe

* Gold
2023-11-10 23:43:13 -07:00
DoubleRiceEddiedd
2ef29fb222 New crop: Cotton (#21536)
* Add cotton plant

* Adddescription and tag to cotton bal allow moth eat it

* Fix typo. Add cotton seed into MegaSeed

* Fix typo

* Fix typo

* Fix cottonbol component typo

* Fix the amount of cotton that bol gives

* Adding correct component to make cotton bol edible

* Change cotton bol parent to see if it is edible

* Adding flavor to cotton bol, and fix typo

* Replace image

* fixing plant image position

* Increase the Megaseed restock crate price to avoid money farming loop hole
2023-11-08 18:54:07 -07:00
Boaz1111
4220b098a3 Sling Resprites (#21538)
* DB texture on back changed

* cheese

* test

* CR20 Syndie Sling

* NT slings implemented

* finished SMGS, starting on Laser Weapons

* added more laser slings

* laser weapons done

* small changes to laser weapons and pie cannon slings

* added chinalake and l6 slings

* finished launcher catagory, almost finished rifle catagory

* almost done, just missing the heavy sniper

* Replaced L6, Chinalake and Heavy Sniper resprite because my old heavy sling was ugly af

* all slings done

* added copyright to the .meta files

* Revert "cheese"

This reverts commit a1f7ac7b70709a6789a7b6fc0dc00a2c0734b83a.

* fixed sln file, in theory at least
2023-11-08 14:18:33 -07:00
KingFroozy
3f4d9983e3 nitrile gloves (#21509) 2023-11-08 13:31:24 -07:00
PixelTK
52af546267 Arachnid 2: Episode 2 (#19984)
* Shield

* minor sprite changes and buffs

* structure buff

* Crafting stuff

* tweaks

* 88-88

* Better web pocket sprites.

* yeah it's fine now.
2023-11-08 12:18:52 -08:00
deltanedas
96e27810cf add ied (#20966)
* MinSolution and SolutionEmpty construction conditions

* make ied sprites

* add ied

* ied crafting stuff

* deconstruct give cable yes

* fix

* tags

* tag

* 3x3

* sharing is caring

* buff damage

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-11-05 20:04:47 -07:00
Whisper
71ec51b003 Replicate the PDA belt slot sprite in the IDSLOT (#21457)
* Adds a sprite for the PDA in the IDSLOT

* Update meta.json
2023-11-05 20:00:31 -07:00
KISS
4cacb7b9e3 Ice anomaly spawns ice underneath it (#21227)
* added TileAnomalySystem to AnomalyIce

* added FloorIce for station

* created ice crust entity to spawn under ice anomaly

* update draw depth for ice crust

* uh oh, added ice-sliding but at what cost

* resolved mispredicts

* updated sprite alpha, removed appearance component (not used)

* fixed function not reflecting event name, left datafield attributes blank, added one comment about saving data (?)

---------

Co-authored-by: Yurii Kis <yurii.kis@smartteksas.com>
2023-11-05 19:41:42 -07:00
brainfood1183
5af97da997 diagonal window glass and pirate shuttle improvements (#21174)
* shuttle and priate improvements

* fix

* fix damn ubuntu

* darkened syndi airlocks

* fix

* fix ruranium

* added prison cell to pirate ship
2023-11-05 19:38:02 -07:00
Ubaser
fd7db8004e sprite change (#21423) 2023-11-05 19:21:41 -07:00
Ed
aa713ea7e6 Candles (#21087)
Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
2023-11-03 22:53:51 -07:00
CMDR-Piboy314
5a5e39f47d Added a penguin plushie! (#21097) 2023-11-03 22:07:16 -07:00
Nairod
3b10c88c8c Command Styled QM Card (#21368) 2023-10-31 16:42:00 -04:00
Psychpsyo
6a18bdc023 Soapy Water & Edible Soap (#20364)
* soap reagent and soapy water

* make soapy water recognizable

* Fix tile cleaning bug

CleanDecalsReaction was able to take more than the reactVolume it was given.

* make soapy water an evaporating reagent

* Tile reactions when mopping

* Fix indescribably soap flavor

* Adjust soap flavours

Soap and soapy water now taste clean and syndie soap tastes like punishment.

* Better soap numbers & DeleteOnSolutionEmpty

* Changed TrashOnEmpty to TrashOnSolutionEmpty

* Last TrashOnSolutionEmpty change

* Fix merged code not compiling

* Requested changes.
2023-10-31 13:39:12 -07:00
Bixkitts
74f1098008 Candy Bucket for Halloween (#21257)
* Added candy bucket and component to update appearance of held containers akin to it

* cleanup newline

* newline was load-bearing

* moved component to Shared, cleanup

* newline is spooky

* You build and run without errors, stop pretending otherwise

* Updated for new storage system in master branch
2023-10-31 11:54:41 -04:00
ZeroDayDaemon
a302775ac0 Pea Plants (#20504)
* Add Pea Plants

* Pea soup

* Update flavor-profiles.ftl

* Update seeds.yml

* Add seeds to vendors

* Make things more expensive to fix free money exploit

* Update textures

* Revert "Update textures"

This reverts commit b1b7046504afc7468742b0722f601d98684a1c89.

Vines dont grow straight into the air.

* Shift up 4 pixels

* Fuck autofix conflitcs

* Shift up 3 more pizels

* I finally got byond working so I made sure they were EXACTLY the same

* Address Reviews? I think?

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2023-10-31 00:09:13 -04:00
Doru991
e1440cb493 Pumpkins, jack o' lanterns and pumpkin hat resprite (#21176)
* Pumpkin textures

* Pumpkin prototypes

* Jack o lantern prototypes and pumpkin cake

* Finishing touches

* Arbitrageloose

* Restore old pumpkin helmet sprites (God I hope it works)
2023-10-30 23:12:23 -04:00
Psychpsyo
e22d3a4cb0 Space Asshole Gear (#21243)
* Add Space Asshole Coat

* Add sledgehammer

* Adjust sledgehammer damage values

* Add copyright string to sledgehammer
2023-10-29 20:09:18 -04:00
Ubaser
d08a9e2b94 Wearable bee plush (#20623)
* add

* fix

* temporary change, needs fixing

* mayb fix

* actually fix FR

* yes
2023-10-28 20:55:15 -07:00
Artjom
6ce75ccec9 Health analyzer UI improve (#17280) 2023-10-28 16:54:18 +11:00
Ed
354d999c8e Cave Decoration pack (#21265)
* add chromite chasm

* add desert chasm

* snow chasm

* finish
2023-10-26 21:58:27 -04:00
Doru991
6b04aaf964 Potato battery update + potato AI (#21142)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-10-26 00:52:49 +11:00
Ed
94cda6a253 Shadow Dimension visual pack (#21237)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2023-10-26 00:36:22 +11:00