Commit Graph

4660 Commits

Author SHA1 Message Date
metalgearsloth
269c93245d Unrevert audio (#21330)
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2023-11-27 22:12:34 +11:00
Nyranu
f173b6a710 Cat cake. A small update. (#21805)
* Cat cake. A small update.

* up1

* up2
2023-11-22 17:41:48 -07:00
themias
c7c49df357 Fix cyborg locking (#21809)
* Fix cyborg locking

* Revert "Fix cyborg locking"

This reverts commit bd5bbbb8b46edb720a9d479772f7931f5f497907.

* create generic component

* update submodules

* Revert "update submodules"

This reverts commit 303200f298f1c56660955d13caa8218b02e306ad.
2023-11-22 12:16:02 -05: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
LankLTE
45f781a8f6 Gave freelance to ghosts (#21764) 2023-11-21 20:02:42 -05:00
Velcroboy
a698a85f34 Make shuttle walls/windows constructable (#19255) 2023-11-20 17:20:24 -08:00
nikthechampiongr
99cdff2b87 Tiny mobs can no longer pass on the zombie disease (#21676)
This reverts f391ff28 and implements an alternate messure where mice and other small animals can no longer infect people as zombies.

This is done through a component which if present cancels the check that would cause zombie components to be added on people that get infected due to a bite.

This still allows other special stuff that happens in that function that may affect already infected individuals.
This is a compromise between what's discussed in discord which would much rather see mice and other animals just die from the infection and people on github which would see no change happen.

Since bats can't go under doors it may not be necessary to make them non spreaders.
If someone disagrees please tell me to just add it back.
2023-11-19 14:28:05 -08:00
Velcroboy
808555ade6 Adds slices for banana cream pie and mime tart (#21043) 2023-11-19 12:15:02 -08:00
metalgearsloth
db76d85f36 Add PlacementReplacement to AsteroidRock (#21784) 2023-11-19 23:27:44 +11:00
metalgearsloth
1ef2fde502 Align windoor bounds with thindow (#21771) 2023-11-19 17:44:36 +11:00
Justin Pfeifler
e45d16e9d9 Borgs No Longer Take Structural Damage (#21716) 2023-11-19 17:44:22 +11:00
Leon Friedrich
69af567269 Add item sprite test (#21599) 2023-11-18 17:26:08 +11:00
lzk
5c2e7d8ca6 Update welding.yml (#21722) 2023-11-17 23:32:17 -05:00
deltanedas
1ba6cad880 moths can eat goat wool (#21704)
* add Wooly system

* add RequireDead to Food

* minor fix+cleanup and fix repeating

* minor fix+cleanup and fix repeating

* make goat wooly

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-11-17 01:51:51 -07:00
Velcroboy
86f1977a64 Access/Airlock Revamp (#21701)
* Access/Airlock Revamp

* Fix migration error, and update IDCardConsoleComp

* Goofed on that one

* Requested changes

* Ooops

* Undo migration

---------

Co-authored-by: Jeff <velcroboy333@hotmail.com>
2023-11-16 15:20:48 -07:00
liltenhead
51c8389078 lower ied intensity (#21694) 2023-11-16 11:13:23 -05:00
Ed
d6870f4a49 Cak Upgrade (#21678)
* added fun

* change recipe, add OwO

* fix?

* upgrade
2023-11-16 01:12:56 -07:00
Emisse
ca8d53b4e5 janiborg cleaning module starts with trashbag now (#21680)
* burger king

* fixe

* nightmare blunt rotation
2023-11-15 20:41:12 -07:00
Emisse
0c70e95f5f give supply bot cargo access (#21679) 2023-11-16 13:28:27 +11:00
liltenhead
8343e04ff4 Remove remote signal from ieds (#21660) 2023-11-15 21:02:37 +11:00
metalgearsloth
816ee2e1ab Gateway destinations (#21040)
* Gateway generation

* Gateway stuff

* gatewehs

* mercenaries

* play area

* Range fixes and tweaks

* weh

* Gateway UI polish

* Lots of fixes

* Knock some items off

* Fix dungeon spawning

Realistically we should probably be using a salvage job.

* wahwah

* wehvs

* expression

* weh

* eee

* a

* a

* WEH

* frfr

* Gatwey

* Fix gateway windows

* Fix gateway windows

* a

* a

* Better layer masking

* a

* a

* Noise fixes

* a

* Fix fractal calculations

* a

* More fixes

* Fixes

* Add layers back in

* Fixes

* namespaces and ftl

* Other TODO

* Fix distance

* Cleanup

* Fix test
2023-11-14 19:23:40 -07:00
deltanedas
efc9d93c2f signal router (#20802)
* add signal router sprite

* DisposalSignalRouter logic

* add disposal signal router

* add disposal signal router

* how did it work without this

* death

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-11-14 16:30:43 -07:00
themias
276f25fe23 Allow mid-round borgs to emote (#21653)
* Allow mid-round borgs to emote

* a

* rerun tests
2023-11-14 16:27:27 -07: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
63ba40d396 Cak (#21639)
* added fun

* change recipe, add OwO

* fix?
2023-11-13 16:23:03 -07:00
Tunguso4ka
aeceea0ff3 space cleaner and fuel dispensers (#21610)
* cleaner and oil wall dispensers

* fuel

* meta jason

* yaml

* fixed error

* suggest

Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com>

* fuck webedit

---------

Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com>
2023-11-13 16:00:51 -07:00
metalgearsloth
dc5739a6c3 Add shadow biome (#21276) 2023-11-13 23:41:35 +11:00
Nim
9bbdbb9212 Space Sharkminnow (#20658)
* sharkminnow

* fix

* salvage
2023-11-12 17:42:48 -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
Leon Friedrich
355e16f470 fix implant action icon bug (#21597) 2023-11-12 16:29:46 -07:00
Vasilis
1a676bdbfa Puppy Ian. Awwww (And a puppy crate) (#21508)
* Awwww

* May as well add a crate

* forgor

* Im dumb

* Ok im done being dumb

* You monster...
2023-11-12 16:24:07 -07:00
deltanedas
60c19853cd egg rework (#21606)
* egg and raw egg

* add DamageEntity

* boiling and exploding eggs

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-11-12 16:18:48 -07:00
deltanedas
a2b2c56979 remove toxin from spider bread (#21604)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-11-12 03:08:20 -07:00
Vasilis
e4ec03f9e2 Disallow bee zombification (#21507) 2023-11-11 11:15:58 -08: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
Vasilis
909621ee5f stasis bed and microwave qol(#21572) 2023-11-10 23:42:59 -07:00
Nemanja
df11de08c5 cheaper borg parts and modules (#21557) 2023-11-09 18:31:04 -07:00
Nemanja
ac5e9cd70b Fix borg mobstates (#21307)
* Add dead states to borgs

* this?

* ack
2023-11-09 16:14:06 -07:00
Emisse
5d46bbb615 Minor Borg Qol (#21548)
* boirg stuff

* gaming

* modules shits

* mini welder is too lmao

* pro

* cheaper recipes, fix mob state thresholds, remove silly crayon, rename module

* generic borg 6 module

* literacy module shityourself
2023-11-09 15:22:50 -07:00
themias
5cc157e594 Mark space glue and lube TrashOnSolutionEmpty (#21550) 2023-11-09 17:10:20 -05:00
ravage
c2de7ec5b3 Adding a kitten (#20726)
* Update animals.yml

* Update

* ANOTHER UPDATE

change mobcat meleeweapon from brute to piercing, deleting extra lines

* oops

* Update npc.yml

* Update npc.yml

* Update animals.yml
2023-11-09 05:24:00 -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
brainfood1183
8be97a20c5 Roller Skates fixes (#21542) 2023-11-08 18:43:27 -07:00
KingFroozy
3f4d9983e3 nitrile gloves (#21509) 2023-11-08 13:31:24 -07:00
Brandon Hu
52508a64cc Fixed typo "tranexmic -> tranexamic" (#21537) 2023-11-08 13:23:58 -07:00
Morb
55c6c35aed Fix O id prototype (#21534) 2023-11-08 13:23:02 -07:00
Vasilis
6550f42732 Common spelling mistake (#21535) 2023-11-08 13:22:46 -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
Gotimanga
8f72e0a415 Add Spawners (#20495) 2023-11-07 18:36:44 -07:00
Darkie
b5e88901eb Adding damage visuals for directional windows (#21194)
* Added a crack overlay for directional windows. Added directional window crack components to windows, reinforced windows, plasma windows and reinforced plasma windows.

* Changed the copyright information with the files I actually used.

* Updated the copyright further.
2023-11-07 18:31:45 -07:00