Commit Graph

6216 Commits

Author SHA1 Message Date
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
116b8a218a Chefs start with pepper packets in their locker (#22572) 2023-12-15 19:20:50 -08: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
Nemanja
267c44fffd add mixing categories to chem guidebook (#22566) 2023-12-15 16:59:54 -07:00
Kara
32d76956f9 Remove chasm from lava planetgen (#22560)
* Remove chasm from lava planetgen

* REmove chasm from lava planetgen real

* Revert "Remove chasm from lava planetgen"

This reverts commit f432334b43e8b1dd17f15b19e50c2ba3d80df297.
2023-12-15 15:34:09 -07: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
Ed
98b7194e68 add 2 new artifact effects (#22551)
* add content

* t3 to t1
2023-12-15 10:39:24 -05: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
Ubaser
0349c53d0c Holy water (#22524)
* add

* flavour

* id

* reaction id fix

* maybe fix error

* yay

* notes

* below 50
2023-12-15 02:52:21 -07:00
keronshb
2d692f47da Action Upgrade System (#22277)
* Adds uses before delay so actions can be used multiple times before cooldown

* adds methods to get remaining charges, to set uses before delay, and to set use delay

* adds method to change action name

* moves set usedelay

* action upgrade ECS

* adds method to reset remaining uses

* adds upgrade events

* refactors action upgrade event and adds logic to parse it

* fix serialization issue

* adds level up draft method

* adds action commands and a command to upgrade an action

* more warning lines to help

* Gets action to upgrade properly

* Removes unneeded fields from the action upgrade component and now properly raises the level of the new action

* Cleans up dead code and comments

* Fixes punctuation in actions-commands and adds a TryUpgradeAction method.

* removes TODO comment

* robust fix

* removes RT

* readds RT

* update RT to 190

* removes change name method

* removes remaining uses & related fields and adds that functionality to charges

* Adds Charges to action tooltips that require it
2023-12-15 02:41:44 -07:00
Ubaser
9b22ae3a6c add (#22531) 2023-12-15 02:37:17 -07:00
ninruB
1a5c235ddc troll (#22473) 2023-12-15 02:37:04 -07:00
Ubaser
c1bc32de14 add (#22525) 2023-12-15 02:28:12 -07:00
Emisse
d8781f161f Meta shuttle (#22526)
* meta shuttle

* Update meta.yml

* amogus floor
2023-12-14 23:43:21 -07:00
Emisse
652b6812b8 Reach (#22519)
* reach update

* proto

* minor fixes

* poolz

* e shuttle fixe

* webedit ops

* Update PostMapInitTest.cs

* gay
2023-12-14 22:38:05 -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
Emisse
d8638a8814 atlas update (#22513)
* jobs adjuste

* -paramedic

* atlas update
2023-12-14 16:49:03 -07:00
Kevin Zheng
68171cdacf Increase gas leak event weight (#22508) 2023-12-15 10:41:01 +11:00
Ubaser
2346d609e3 add (#22450) 2023-12-14 13:58:38 -07:00
Minty642
aa956c0897 Add Taco Recipe to Guidebook (#22491) 2023-12-14 13:50:01 -07: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
qwerltaz
cd58be1034 Fix frezon intoxication (#22453) 2023-12-13 12:17:48 -08: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
Velcroboy
2fe4772f92 Add proper suffix (#22417)
Co-authored-by: Jeff <velcroboy333@hotmail.com>
2023-12-12 17:02:43 -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
9257703ef9 Fix construction graph ghost examine message (#22424) 2023-12-12 17:01:51 -07:00
themias
e7de7fa075 Add fill layers to Hot Cocoa drink (#22419) 2023-12-12 17:01:24 -07:00