Commit Graph

5505 Commits

Author SHA1 Message Date
DrSmugleaf
0527d2e719 Fix barriers not working (#19774) 2023-09-04 15:33:40 -07:00
Fromoriss
b50e5651a1 Add moth plushie (#19828)
* Add moth plushie

Moth plushie. It's cute, don't mind, merge it.

* Update toys.yml
2023-09-04 13:18:03 -07:00
Doru991
c6869c89d0 Add plant phalanximine, fix slippery fruits (#19820) 2023-09-04 12:11:40 -08:00
PixelTK
74bd86af2f Arachnid RE-REWORK (#19138)
* tasty silk and webby crates

* winter coat

* fuck

* Move some files around and stuff

* FUCK

* Web closet finished

* what the fuck

* brain empty

* loss

* loss 2

* fuck

* web typing indicators

* minor spelling mistake, I lost.

* hiss

* changed

* And they said "Let's remove pockets", funniest shit I've ever heard.

* 2 seconds of stun

* fuck it we pr

* resprite

* dummy

* arachnid creampie sprite

* different + more "natural" crate sprites

* Webbing suits and webbing dresses.

* and other stuff I forgot to commit.

* and gone.

* no

* Cloth.

* I forgot to commit this? What???

* Eyes.

* Comment trimming

* winter coat resprite
2023-09-04 13:02:54 -07:00
lzk
33cdcf34dd NPC/silicon.yml cleaning (#19731) 2023-09-05 00:21:52 +10:00
deltanedas
04cd014179 nuke lights code change (#19315)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-04 17:14:10 +03:00
chromiumboy
05e9d2e33a Plasma fueled radiation collectors (#19598)
* Fixes issue with solution regenerators

* Update Solution.cs

Removed excess whitespace

* Undid file scoping to make this easier to review

* Initial prototype

* Adjusted coefficients

* Removed unintentional changes from another PR

* Undid unintentional change

* Undid unintentional change

* Added temperature modifier to power production

* Guidebook entry and radiation collector low pressure warning

* Reviewer requested changes
2023-09-04 16:11:57 +03:00
liltenhead
e7ea597c51 Rebalance Ore Conversions (#19814) 2023-09-04 22:57:51 +10:00
TNE
52ef8f9b70 Allow drag-and-drop insertion of reagents into the ChemMaster (#19796)
* Add DumpableSolutionComponent

Separates out the component from "DrainComponent" that allows one to drag a bucket/any reagent container onto a drain/sink/toilet to empty it and allows other reagent containers to reuse the code effortlessly.

* Give the ChemMaster 4000 the DumpableSolution Component

Allows drag and dropping solutions into the ChemMaster much like you used to be able to do exclusively with drains. This also allows dumping jugs into them.
2023-09-04 15:53:13 +03:00
AlexMorgan3817
61b0e6abcd Hot Fix of Gravity Grenades (#19414)
* Supermatter grenade fix

* taking out the trash

* Removing debug Console.Log() in twostage

* More fixes

* Better to put LoadComponents on Update, else it will modify list of other untriggered components
2023-09-04 15:23:48 +03:00
deltanedas
91cfabd6f6 light refactoring/rework (#19314)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-03 22:31:10 -07:00
deltanedas
d8effa6150 carpsuit and iansuit revival (#19728)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-03 22:16:36 -07:00
lzk
ba65dab94d [Fix] Steel stack sprite (#19785) 2023-09-03 21:48:00 -07:00
qwerltaz
21b898afcd Add vent welding (#19759) 2023-09-03 21:23:38 -07:00
Flareguy
7b69395061 Blindy changes a bunch of event spawnrates in hopes that it does something. (#19803)
* blindly changes some event rates in hopes it does something cool

* emergent game play
2023-09-03 23:38:22 -04:00
Nemanja
445ed9e9d5 argocytes (#19801) 2023-09-03 22:02:00 -04:00
FinnishPaladin
53637c9a39 Bartender aprons! (#19794)
* Adds a new apron to the bar clothing vendor.

* quick fix

* quick edits to the sprites

* another sprite edit.

* more tweaks...

* darkened sprites a bit, moved the apron's location in the bardrobe

* improved the item suffix
2023-09-03 17:27:19 -04:00
KingFroozy
5d4c8998ad Chief Engineer's Turtleneck (#19737)
* Add chief engineer's turtleneck

* Printable now
2023-09-03 14:38:28 -04:00
metalgearsloth
8d513a3bce Make portable generators noRot (#19779)
Matches fuel tanks and the likes and looks better IMO.
2023-09-03 13:55:42 -04:00
lzk
c729e580ce Add fork & spoon to dinnerware (#19784)
* some utensils clean

* add utensils to dinnerware
2023-09-03 10:22:28 -04:00
metalgearsloth
0c42533433 Fulton tweaks (#19786) 2023-09-03 22:18:09 +10:00
deltanedas
79394e7e70 mech air overhaul (#19140)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-03 16:30:26 +10:00
/ʊniɹɑː/
b52b063d6f refactor checkerboard (#18359) 2023-09-03 16:16:09 +10:00
Nemanja
1282d3eb68 bloody microwaves (#19647) 2023-09-03 00:03:05 -04:00
LankLTE
76218caaab make tech disks sell for 100 spesos (#19770) 2023-09-02 22:31:52 -04:00
Kevin Zheng
5ca7d257cc Adjust chair buckle offset (#19767) 2023-09-02 20:07:31 -05:00
Gotimanga
45c7cc4f5b Hoods for Winter Coats (#19541)
* First few wintercoat hoods

* More Coat Hoods

* Cleaning up and organizing

* Maybe the coat hoods don't need their own YML file

* Tweaks and resprites

* licenses and removing pixels

* Final changes before PR

* Added sound, plus rearanging base hood

* Fixing changes I shouldn't have made while I was tired + adding custom action name

* Forgot to name the base wintercoat with hood

* Please fix the YAML test fail

* Changing a few pixels on the hoods

* Hopefully fixing testfail

* Test Fail Fix
2023-09-02 07:33:32 -07:00
potato1234_x
25d4a26c8e More Petting Sounds and Popups (#19686)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2023-09-02 15:54:05 +10:00
IProduceWidgets
bc00a635b9 Makes Plant-B-Gone available to cargo, and Diona vulnerable. (#19555)
* Adds WeekKiller storage tanks and allows Cargo to purchase them.

* Delete CellMemberRoll.cs

Woops, this template file snuck in after I reset my local. It doesn't do anything, just empty classes.

* Switched from WeedKiller to PlantBeGone because WeedKiller is too deadly. Honestly is probably shouldn't be in Botany so readily.
Made Diona take damage from PlantBeGone and WeedKiller.
Adjusted waterguns to use less reagent per shot.
Added admeme watergun.
Adjusted watergun cargo crate.

* Fixing small .yml formatting hiccups.

* Fixing small .yml formatting.

* Fix Typo.

* watergun min solution match shot size

Makes watergun's minimum solution transfer match shot size (5u).

* I pass tests now, please?

Nothing.

* Lower Diona herbicide damages
Remove slime changes
Lower super water blaster size to 500u (100 shots)
2023-09-01 22:32:08 -07:00
Nemanja
c07d936b97 hot potato buff (#19318) 2023-09-01 17:08:24 -07:00
Tony
c764a40a69 Toggleable clothing changes (#19680)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-09-01 21:12:59 +10:00
Nemanja
6695ac2ad6 Show materials as sheets, tweak lathe ui (#19709) 2023-08-31 22:28:08 -07:00
Nairod
44b166788b More Speech Verbs (#19626) 2023-08-31 20:15:31 -07:00
Kara
16dba2f707 Give animal parts & organs sprites (#19719) 2023-08-31 19:09:22 -08:00
Kara
d4792acdbd Give spears blade sound (#19720) 2023-08-31 19:08:02 -08:00
Kara
ec20ab530e Give supplybots/borgs speechverbs (#19715) 2023-08-31 19:12:03 -07:00
Kara
cd9ceb2378 Ice & snow tile modernization (#19689)
* Add snow tile edges

* Changes for edge tile prio

* Add support for tile weightlessness

* Add weightlessness to ice

* snow duggy moments

* fix ice thing yeah

* actually why even use weightless movement

* upd8 nukieplanet

* i have no idea what im doing

* sprite modifications
2023-08-31 15:31:23 -06:00
Thom
31282a3fc6 Adds Supplybot, a cargo-focused deliverybot with internal storage. (#19638) 2023-08-31 12:46:49 -07:00
deltanedas
acb1bcef58 fish 2tc again (#19694)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-08-31 22:41:34 +10:00
potato1234_x
7d988e5dd5 give cap laceup shoes (#19678) 2023-08-30 20:33:40 -06:00
deltanedas
5171004bfb food doesnt come with plate (#19472)
* no plates from eating cooked meat

* no more plate

* no plate sprite

* already food

* -

* pro

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-08-30 22:14:53 -04:00
Sailor
5fefd5b718 Turn dionas into trees if they overdose on robust too hard (#19451)
* Add polymorph reactioneffect, make dionas polymorph into trees

* Actually they'll probably die before they get to 60 so there's that.

* Generalize effect loc

* Huh so that works

* Wow

* oh god the tabulation

* what

how

* Review

* Why did it happen again?!?!?!

* Parent adminhypo from an already existing one.

* Since were no longer checking protoname
2023-08-30 22:01:56 -04:00
Leon Friedrich
102c6a441c Tweak outline changes (#18599) 2023-08-30 21:23:36 -04:00
Nemanja
4d677f0685 1v1 me first to 31 no powerups [Deathmatch Gamemode] (#19467)
Co-authored-by: Kara <lunarautomaton6@gmail.com>
2023-08-30 18:06:15 -07:00
lzk
6bbdbc9a9f Reuse backpack parent on duffel/satchel (#19664)
Reuses ClothingBackpack to simplify duffel/satchel
2023-08-30 14:36:12 -07:00
Morb
c99e365ce7 Give nukies the ability to declare war for a TC boost (#19291)
Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>
2023-08-29 23:56:20 -08:00
Alekshhh
0454fb9d81 Monkey Ear Slot (#19410) 2023-08-30 16:07:22 +10:00
deltanedas
7870d02254 stealth clothing (#19397)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-08-30 12:34:58 +10:00
metalgearsloth
cae574cbda Add tile entity occlusion (#14626) 2023-08-30 12:32:35 +10:00
Nemanja
f4503864d5 Concrete and asphalt tiles (#19642)
* concrete and asphalt

* los decals
2023-08-29 17:50:11 -05:00