Commit Graph

4830 Commits

Author SHA1 Message Date
Kara
d6f6cc7fdf You can pet the recycler (#22640) 2023-12-17 00:44:37 -07:00
Emisse
8c1eecffd4 Svalinn Experimental Battery Ammo Research [T3] (#22045) 2023-12-16 19:43:49 -08:00
Ilya246
b836fd28f2 evil pen (#22598) 2023-12-16 15:23:07 -07:00
lzk
d63a064682 fix some pdas (#22617) 2023-12-16 15:21:28 -07:00
brainfood1183
f262aaaac0 crystals drop shards and ore crab tweaks. (#20930)
* crystals drop shards and ore crab tweaks

* crystals drop shards, shards can be crafted into colored light tubes and silver ore crab.

* crystals can now be unanchored.

* added silver crab to rock anom spawn

* fixes

* sorted out the parenting for crystal light tubes.
2023-12-16 15:20:14 -07:00
Flareguy
b3fc3b9361 Standardizes / nerfs material sheets to 10u, no more lead in steel sheets (#22569)
* standardizes / nerfs material sheets to 10u, no more lead in steel sheets, also radium in uranium i guess

* plastic into oil

* adds phosphurous to plastic too

* OIL

* fix tests now? maybe? emo you better not be LYING... or else...
2023-12-16 15:52:11 -05:00
deltanedas
d8ee36d7b0 add power sensor (#20400)
* clean up logic gate / edge detector components

* logic gate usedelay support

* new codersprite

* PowerSensor component and system

* add power sensor

* port locale

* fix

* minecraft

* fixy

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-12-16 11:32:42 -07:00
deltanedas
5bdc16e4e4 fix explosion resistance applying from bag (#22609)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-12-16 10:17:09 -07:00
Vasilis
96539f955b Change opossum sprites | Add new pet poppy the safety opossum (#21672)
* Its better then what we have at least?

* weh2

* oops

* Last of it

* among us
2023-12-16 09:34:54 -05:00
Ubaser
db74ca0e2c Add vials (#22587)
* vial

* yea

* s

* fix something

* yaml

* fixer

* aaaaaaaaaaa

* update

* sprite changes

* a

* fix'd
2023-12-16 09:29:53 -05:00
NkoKirkto
3e0f3bd198 Added urn (#22488)
* Changes Stuff( ͡° ͜ʖ ͡°)

* Changes Suff(Fucked Sprites)

* Chages Stuff(New Sprite)

* Changes Stuff(Hope this works)

* Changes Stuff(Renamed the Urn.rsi)

---------

Co-authored-by: NkoKirkto <halloleute640mail.com>
2023-12-16 03:31:12 -07:00
Ed
088d39f7ac Bread dog (#22548)
* add content

* add new bark accent
2023-12-16 01:30:20 -07:00
Kara
c97abe92d7 Change gas canisters to use ItemSlots (#22561) 2023-12-16 01:28:27 -07:00
Kara
949eea9660 flare guy (#22584) 2023-12-16 01:24:00 -07:00
Ubaser
6e38fed896 Luxury pens (#22542)
* add

* spawns

* fix

* spacing

* cut down a bit

* componenets sdsstsdsds
2023-12-16 01:21:24 -07:00
Kara
8399d0a9eb Faux astro-tiles for science & mappers (#22586)
* Faux astro-tiles for science

* didnt mean to commit dode
2023-12-16 01:20:57 -07:00
lzk
afe93e4eb0 Rename corgi burger to corger (#22585) 2023-12-15 23:48:58 -08:00
Flareguy
e31cf20871 Ports the /tg/ shotgun sprites (#22539)
* ports the /tg/ shotgun sprites

* webedit fail

* i'm wario and my furniture is broken

* hopefully finally actually fix tests? maybe? my couch is broken

* update shotgun cabinet

* update shotgun cabinet MORE

* ohhhhhh my god...
2023-12-15 23:23:57 -05:00
Ubaser
57c6e503d1 Crayon boxes get white crayons (#22553) 2023-12-15 19:20:39 -08:00
deltanedas
7dd472c934 smoke grenades (#20996)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-12-15 17:49:30 -08:00
deltanedas
b4a6b0f532 let borgs wear hat (#22555)
* let borgs wear hat

* special borg offset

* attack of the short people

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-12-15 15:33:51 -07:00
lzk
a88730fcfa cleanup PDA yaml (#22470)
* Update pda.yml

* Update pda.yml

* :trollface:
2023-12-15 15:46:56 -05:00
Ilya246
e9ad56ec5e posibrain as default (#22545) 2023-12-15 15:45:31 -05:00
Ubaser
d9db53f167 Artistic toolbox fill (#22552)
* add

* spawn

* Update toolboxes.yml

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2023-12-15 15:44:41 -05:00
Flareguy
90bcbc160b Makes MORE raw materials grindable (#22550)
* makes MORE raw materials grindable (and adds cellulose fibers)

* meat sheets + cable coil + idk + dode

* uhhh uhhh um

* i have a disease and its called DODE
2023-12-15 15:37:07 -05:00
Kara
e4a227ff0d Explosion SFX juicing + higher persistence (#22544) 2023-12-16 03:57:46 +11: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
MendaxxDev
e301378114 Make flare gun explode, damage and stun the player when used with the wrong ammo (#22349)
* Flare gun can now only be loaded with actual flares

* Make flare gun loadable with other shells, but destroy it and damage and stun the user when used

* tweak

* Logic fix + QOL add-ons

* damageOnWrongAmmo in gun component

* cleanup
2023-12-15 02:57:59 -07:00
Ed
0a8a6693a8 add content (#22518) 2023-12-15 02:55:57 -07:00
themias
9cc4a50692 Add more DNA interactions (#21989)
* Add more DNA interactions

* remove unused import

* update based on feedback

* Add event for chemistrysystem.injector

* move event to shared; transfer dna to implanter

* doafter and interaction event fixes

* add BreakOnHandChange

* doh

* use events instead of updating component directly

* Add DataFields to ForensicScannerComponent fields

* Convert most events to system api call
2023-12-15 02:52:55 -07:00
Nemanja
2455980090 Electrolysis and Centrifuge (#22517)
* electrolysis and centrifuge

* sprote

* final

* bomp!

* COUGH COUGH SPROTE

* boarsd
2023-12-15 02:52:46 -07:00
brainfood1183
2933024fe8 Acidifier Effect Sprite (#22425) 2023-12-14 20:56:42 -05:00
deltanedas
fce18f43da add glaive to salv weapons (#22514)
* refactor ops

* add recipe

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-12-14 20:34:36 -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
Nemanja
0917a9d380 Gas Condensers (#22436)
Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>
2023-12-13 19:35:44 -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
7a63c78f5b "Uneven" hair (#22454)
* add

* comma

* yay

* hair
2023-12-13 14:34:28 -07:00
deltanedas
e1ff79b4b1 let cyberpen edit stamped papers (#22457)
* let cyberpen edit stamped papers

* desc

* little more desc

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-12-13 14:33:31 -07:00
Dakamakat
1821bbd546 Let bee corpses be put into garbage bags, wielded, etc (#22451) 2023-12-13 14:32:40 -07:00
Ubaser
0552cd2e10 New pinpointer sprites (#22435)
* add

* fix?

* a

* maybe

* aaa
2023-12-13 01:53:05 -07:00
Ubaser
9e46b35207 Jetpack buff (#22444)
* add

* tweak
2023-12-13 01:51:09 -07:00
Ubaser
9a1f845d97 add (#22441) 2023-12-13 01:51:00 -07:00
Emisse
6419f3d5d9 smartfridge semi functional (#22443)
* smartfridge

* leftovers from when it was powered

* real
2023-12-13 01:19:40 -07:00
TsjipTsjip
7a12f1fcfb Remove paramedic windoor (#22400) 2023-12-12 17:07:34 -07:00
Errant
21be01acdf Blood-red medic armor ID change (#22422)
* Rename blood-red medic hardsuit prototype

* Update guidebook

* Migration
2023-12-12 17:02:29 -07:00
themias
e7de7fa075 Add fill layers to Hot Cocoa drink (#22419) 2023-12-12 17:01:24 -07:00
IProduceWidgets
90a3a35572 Make ERT PDAs and give them to the right presets. (#22392)
* Pdas made

* ID cards

* Role fills

* Trim Item heldPrefix overrides.

* Sorta funky parenting.
2023-12-12 01:38:42 -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
39fb2639c9 Mops and Defibs larger, Pinpointers desc, Monkeycube fix, appraisal sidearm, chemistry documents. (#22397)
* Pinpointer desc

* The game breaking ability to put documents in chem bags

* mops bigger

* Defib Large

* fix monkey cube size bug.

* appraisal gun pew pew
2023-12-12 01:02:44 -07:00
IProduceWidgets
5e5ad464ce Make syndicate discarding boxes tiny like their contents. (#22396)
* fix hypopenbox size bug

* fix pen bomb box size bug

* fix edagger box size bug.
2023-12-12 01:01:33 -07:00