Commit Graph

1963 Commits

Author SHA1 Message Date
LordCarve
7d69055291 Use different chatbox placeholder when dependent keys unbound (#22747) 2023-12-22 11:39:29 -08:00
Ed
5a1e317e0f It's time to build a barbershop! (#22565)
* barber!

* 5% change to maintenance
2023-12-22 02:54:00 -07:00
2013HORSEMEATSCANDAL
af753c13a5 Glossary (#22840)
* Added a glossary to the guidebook to help new players understand slang.

🆑 2013HORSEMEATSCANDAL
- add: What's a Greytide ? The new edition of your employee guidebook now has a glossary !

* added one more definition
2023-12-22 00:25:56 -07:00
RiceMar1244
c7052f5a6c Adds top surgery scar markings to the character creator (#22806)
* Adds top surgery scar markings to the character creator

* Darkens scars and adds new short and long variants
2023-12-21 21:20:21 -07:00
Guilherme Ornel
456deea19e Makes sabre sheathe use ItemSlots (#22792)
* added item slot

* fixed filled

* localized verbs

* github check was acting up
2023-12-21 14:16:42 -08:00
Boaz1111
4c081aab04 Uranium Ammo (#22406)
* working on depleted uranium shotgun ammo

* added depleted uranium to more ammo

* Last changes and additions

* Forgot something, theoretically resolved the merge conflict too

* Nerfed the DU munitions, renamed em to uranium because it's not really DU

* made the ammo more expensive, also fixing the crash at the same time

* Fixed the last error, theoretically at least

* Revert "Fixed the last error, theoretically at least"

This reverts commit a875d2ac320478e4cb407564d704d915d0ef158b.

* copyright changes, small sprite changes, last references of depleted uranium removed

* Revert "copyright changes, small sprite changes, last references of depleted uranium removed"

This reverts commit 93a12bf20bc72581a0bdc32a3cdc7d887f50de3f.

* Update meta.json

* Update meta.json

* Update lathe.yml

* Update arsenal.yml
2023-12-21 12:07:44 -05:00
Kara
fdf718e586 Reimplement smart equipping (#22815)
* Reimplement smart equipping

* inv prediction fix

* oops
2023-12-22 01:17:09 +11:00
themias
59c8f23857 Cleanup forensic cleaning (#22715)
* Cleanup forensic cleaning

* move cleandelay to new component; buff syndiesoap

* updated based on feedback

* remove tag
2023-12-21 01:54:52 -07:00
KittenColony
eac8796fad Gauze Markings 2 - Medical Boogaloo (#22452)
* renamed leg wrap to thigh wrap

* gauze species rework pt. 1

attempt 73

I hate it here please god get me out

* fixing lizard foot wraps part 80

* Attempt 80 to get lizard markings to work

i fucking hate it here

someone help me D:

* attempt 82

im crying please work now

* made gauze eye pads actually tape on

* Handwraps added

* fixed lizard foot wraps (again)

84.

* attempt 83.5

* attempt 84

please work

* added blindfold gauze

* fixed boxerwrap_r

:greenfrog:

* fixed @ubaserB's eye scars

* Revert "fixed @ubaserB's eye scars"

This reverts commit eb364e1e61c03c2b8567fec8c1a5c6c78c9a333c.

* Revert "Revert "fixed @ubaserB's eye scars""

This reverts commit ac1ee343ae2a8adb2569f88b81cc4afc6915f220.
2023-12-21 00:35:47 -07:00
CrigCrag
e9516fc43e add Fresium, a chillingly complex chemical to prank your friends with (#22527)
* everything

* tweakeroo

* maintspill

* some balancing and tweaking

* adds ice tags and gives it to ice crust

* fix code because im smart im the smart guy yeah that's me

* yeah

* oops

* do you wanna try that again

* conserve matter

* im rather smart
2023-12-20 22:35:22 -07:00
Kara
ad97580727 Rename Miasma to Ammonia (#22791)
* Rename Miasma to Ammonia

* Namespace changes

* Map change????? why
2023-12-20 21:19:50 -07:00
Moomoobeef
b8583ed573 fixed nocturine locale (#22737)
* removed nocturine from the uplink catalog

* fixed nocturine locale, added back to catalog for 6tc
2023-12-20 16:43:17 -07:00
qwerltaz
289aab768f Improve gas analyzer interface (#22779) 2023-12-20 09:56:57 -08:00
TGODiamond
53e2cfb9b5 Fix item size misinterpretation (#22711)
* Fix item size misinterpretation

* We do this instead
2023-12-19 19:31:39 -05:00
Nemanja
5eb1a1ce8c Remove RCD from tech and make it a crate (#22720) 2023-12-18 21:40:55 -05:00
nikthechampiongr
bf2b441192 Super Bonk Smite (#22413)
* Added the Super Bonk smite. It teleports the player from table to table
in the game and bonk their head into them. Also smashes them into glass
tables.

* Stopped using a timer and now instead use Comp + System. Also added proper logging impact.

* Fixed name inconsistency

* Admin CL which I forgot

* Made it funnier

* Moved basically all logic to the system and added a light version that stops when you die

* Hopefully made YAML Linter stop bullying me

* Removed fun(Glass tables no longer get smashed when the target is bonked over them)

General opinion seems that it would cause too much collateral damage. I kinda agree.

* Adressed reviews
2023-12-18 14:39:23 -05:00
Velcroboy
27308915f1 Adds coal (#22559)
* Adds coal

* Fix stack splitting spawn

* Convert size

* Ahhh, it's a reagent tooo....

* ore.rsi

* Adjust recipes, add reagent extraction

* solution name

* Adjust reagents to prevent reactions

* Adjust reagents for standard of 10u

---------

Co-authored-by: Jeff <velcroboy333@hotmail.com>
2023-12-18 14:38:11 -05:00
Ubaser
dd2343b573 Rubber gloves for janitors (#22668)
* add

* fix

* formatting..
2023-12-17 20:11:18 -07:00
Ubaser
d172988a8d Chemical Synthesis Kit (#22631)
* add

* locale

* probably fix

* fix stuffs

* oversight

* uh yea

* i beg

* tag

* i pray to god this fixes it

* update

* fix

* vestine

* fix note

* balancing

* fix

* toxin wipe
2023-12-17 19:40:28 -07:00
Kara
d6f6cc7fdf You can pet the recycler (#22640) 2023-12-17 00:44:37 -07:00
deltanedas
cce7aa777c start of persistence support (#20770)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-12-16 19:55:19 -08:00
Emisse
8c1eecffd4 Svalinn Experimental Battery Ammo Research [T3] (#22045) 2023-12-16 19:43:49 -08:00
Nemanja
0a81038a17 mild reagent prototype cleanup + other misc garbage (#22630) 2023-12-16 19:34:13 -08:00
Justin
07f87f93d2 Add description in lathe recipe mouseover tooltip (#22621)
* Add description in lathe recipe mouseover tooltip

* Remove old tooltip
2023-12-16 21:06:38 -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
chromiumboy
aa08cc3e53 Added pop up message for single-use UI (#22573) 2023-12-16 09:40:24 -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
Ed
088d39f7ac Bread dog (#22548)
* add content

* add new bark accent
2023-12-16 01:30:20 -07:00
Nemanja
4967bd21c3 Add electrolysis/centrifuge breakdown recipes (#22571)
* first pass

* chemical breakdowns !!!!

* mintemp salt because why not

* we don't really need this, no?

* if at first we don't succeed...

* ...then run debug tests again
2023-12-16 01:26:11 -07:00
Ed
6e692180ca 9 new cargo bounties (#22579)
* add content

* 9

* warm 6000

* food -> meat food

* swap lamps task to organs task

* fix naming
2023-12-16 01:23:35 -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
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
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
Nemanja
46b59329b0 Small item text tweak (#22205) 2023-12-16 03:54:31 +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
LankLTE
94628d6ab1 Relay custom votes to a webhook (#18561)
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com>
2023-12-14 20:03:32 -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
Nemanja
500675ba8a show multiple recipes in the guidebook (#22463) 2023-12-13 15:17:38 -07: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
Vasilis
3cb6b2c3b8 Add generic settings tab and move a bunch of settings over (And add the ability to toggle Discord RPC) (#22430) 2023-12-12 17:58:20 -08:00