Commit Graph

6030 Commits

Author SHA1 Message Date
MACMAN2003
ca3e09b6cc greenified the cap cap (#22013) 2023-11-30 00:20:45 -07:00
lzk
76d091dc86 some lil brrrr (#21955) 2023-11-29 19:21:35 -08:00
lzk
1ff83ee67a skele-zombie brrrrr (#21996) 2023-11-29 21:40:39 -05:00
NULL882
bb6091a76c Mining things [part 2] (#21953)
* mining-window (Diagonal)

* mining-airlock "glass"
2023-11-29 17:57:29 -07:00
Boaz1111
4ed0913c7a upped the bandolier slots to 14 and made it function like an ammo box (#21903) 2023-11-30 09:53:50 +11:00
Ubaser
de601208ea Add metamorphic "Blood" sprite (#21596)
* add

* forgot to remove

* maybe fix
2023-11-28 00:09:55 -07:00
Ubaser
89d94a3e3b add (#21939) 2023-11-28 02:08:26 -05:00
Ubaser
8b666fabd5 Add papercut-proof gloves for the HoP (#21915)
* add

* fix fr

* resolve error

* maybe now..?

* step 1

* step 2

* fix fiber
2023-11-27 23:21:06 -07:00
Ubaser
0357e41a54 add (#21935) 2023-11-27 22:45:55 -07:00
Emisse
0a26fe1aad disable hijack objective (#21928) 2023-11-28 00:21:27 -05:00
M3739
a8446074e5 Guidebook entry for Cyborgs (#21832)
* Work for today, base work done for guidebook entries, try to fix parsing error for document.

* Finished Cyborg entry, fixed locale.

* Minor corrections.

* Final revision.

* Minor grammatical correction.

* Another minor grammatical correction.

* Grammatical corrections, along with further clarification.

* Apply suggestions from code review

Proofread and revision from EmoGarbage404, which I am thankful.

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

* Added GuideHelpComponent linking to cyborg guidebook entry to related prototypes. Corrected endoskeleton prototype's GuideHelpComponent. Added text link in robotics guidebook entry to the cyborg guidebook entry.

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2023-11-27 22:18:21 -05:00
Velcroboy
e0dd5e1b52 Food/Bev updates and fixes (#21824)
* Food/Bev updates and fixes

* Remove some unnessesary

* Indentation oops

* No forensics on null item

* Missing whole ass file :)

* Oh, found it

* Remove redundant -type: drink

* Adds more hot cocoa

---------

Co-authored-by: Jeff <velcroboy333@hotmail.com>
2023-11-27 15:19:17 -07:00
Velcroboy
b509a17c56 Fixes jani items not being storable on jani trolley (#21836)
* Fixes jani items not being storable on jani trolley

* Let's see if it likes this better

* Ok, then, that'll do

---------

Co-authored-by: Jeff <velcroboy333@hotmail.com>
2023-11-27 15:16:16 -07:00
Velcroboy
da2e99ce69 Add anti-rot to cold cart (#21923)
* Add whitelist to food carts and anti-rot to cold cart

* Remove whitelist

---------

Co-authored-by: Jeff <velcroboy333@hotmail.com>
2023-11-27 15:10:50 -07:00
Vasilis
94f67f86dd weh (#21855) 2023-11-27 14:42:53 -07:00
deltanedas
ab645fb77b revenant emag whitelist (#21849)
* add MalfunctionWhitelist

* whitelist a few things

* locutus of borg

* support blacklist

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-11-27 14:39:29 -07:00
Rainfey
ca81cfb8cf Add chameleon functionality to Agent ID (#21878)
Co-authored-by: Rainfall <rainfey0+git@gmail.com>
2023-11-27 14:34:29 -07:00
Tryded
99b2ac2c79 Update cargo_armory.yml (#21880) 2023-11-27 14:33:04 -07:00
ninruB
a8f9fd813f remove slowdown from parent (#21872) 2023-11-27 14:29:29 -07:00
lzk
440de19e30 Moth accent (#21910)
* :trollface:

* :trollface:

* :trollface:

* Update moth.yml

* Update animals.yml
2023-11-27 14:28:43 -07:00
NULL882
f268e626a7 Mining things (#21909)
* mining-doors

* mining-tiles

* mining-window

* Change copyright in meta.json

* Change license in attributions.yml
2023-11-27 14:25:15 -07:00
Ilya246
dc36eca140 the fridging (#21896) 2023-11-27 14:24:43 -07:00
Brandon Hu
ecf976b5a1 allow mothroaches to use VIM (#21886) 2023-11-27 14:21:57 -07:00
lzk
71800e2824 Update buckleable.yml (#21924) 2023-11-27 14:20:52 -07:00
metalgearsloth
269c93245d Unrevert audio (#21330)
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2023-11-27 22:12:34 +11:00
lzk
808ed846d1 Update Operation_suffix.yml (#21882) 2023-11-24 14:53:18 -05: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
metalgearsloth
6fa144b465 Update desert planet walls to WallRockSand (#21783)
* Update desert planet walls to WallRockSand

* This
2023-11-21 20:01:30 -05:00
lzk
358de9b7df Remove extra pumpkinds from autodrobe (#21822) 2023-11-21 19:53:04 -05:00
Velcroboy
a698a85f34 Make shuttle walls/windows constructable (#19255) 2023-11-20 17:20:24 -08:00
Kadeo64
d614fdb386 Ripley APLU is now T1 Industrial. (#21787)
* Add files via upload

* Updates industrial.yml with ripley changes
2023-11-19 19:58:06 -05:00
Whisper
5362ba3009 Add vibe ace to the lobby playlist (#21751) 2023-11-19 14:49:33 -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
deltanedas
f25773ffec explosion minor rework + fix (#21718) 2023-11-20 04:44:42 +11: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
824ada11e1 change artifact recipe to use material (#21728)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-11-17 23:31:50 -05:00
Emisse
8fd7abb2c0 Update lawyer.yml (#21736) 2023-11-17 23:31:10 -05:00
lzk
605e7f7dda :trollface: (#21724) 2023-11-17 10:44:21 -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
Flareguy
6e8ed007b8 Adds damaged plating (#21711)
* adds damaged & burnt plating tiles, corrects a miscrediting in attributions.yml

* placeholder BEGONE

* fix those attributions
2023-11-16 22:57:00 -07:00
lzk
28ca873ce3 Return service access to librarian (#21710)
* Update librarian.yml

* return brig line where it belongs to be
2023-11-16 15:36:07 -07:00
deltanedas
db8c3476e8 revive atlas real (#21600)
* atlas gaming

* rotate

* :trollface:

* adjust job numbers

* more change

* :trollface:

* :trollface:

* :trollface:

* test

* cause of death: trollage

* address most issues

* job slot

* borg spawn

* notice board, comms expansion and meteor shielding

* reroute disposals

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-11-16 15:35:33 -07:00