Commit Graph

7142 Commits

Author SHA1 Message Date
MACMAN2003
24fd1a93ff Fix air not existing in corner window tiles (#25926)
let there be air

air time
2024-03-08 18:50:34 +11:00
AlexUm & XGabriel08X
7af183ec72 Barber scissors in uplink and chameleon bundle. (#25920)
scissors

uplink catalog localization and just catalog update, with adding scissors to the chameleon set
2024-03-07 17:55:24 -06:00
Ed
faed7a3746 Remove Hamlet, Smile and Pun Pun from Thief objective (#25921)
* Update thief.yml

* Update stealTargetGroups.yml

* Update objectiveGroups.yml

* Update pets.yml
2024-03-07 17:53:36 -06:00
Admiral-Obvious-001
0000f1b899 Buff zombie resists (#25876)
* Buff zombie resists

Tweaks zombies to be tankier but still have a similar damage grouping for a specific weakness

* Removed unnecessary values of 1
2024-03-07 16:02:49 -05:00
NakataRin
77f969af0e Green alert shuttle time change (#25906)
green alert shuttle time change
2024-03-07 16:01:52 -05:00
Nim
a846966515 Slimes can drink fourteenloko (#25889)
* fourteenloko

* inverse
2024-03-07 15:50:10 -05:00
Alzore
5f61380209 Vegan Meatball (#24650)
* veganmeatball

* testedthis

* moreplant
2024-03-07 22:37:57 +03:00
beck-thompson
4b359466cc Lawdrobe update (#25299)
* Minor lawdrobe changes

* Updates to advertisements, thank you messages, and emaged / contraband inventory

* Removed the 9th lawdrobe advertisement as it was unused

* Removed soap

---------

Co-authored-by: beck <beck3629@uw.edu>
2024-03-07 22:18:39 +03:00
Doctor-Cpu
2033dd0337 remove cargo pallet from cargo request (#25882) 2024-03-07 12:53:57 -05:00
shamp
90063db717 Fix body bags sliding under doors (#25325) 2024-03-06 22:35:48 -08:00
slarticodefast
87c89eacd4 Fix datafield name (#25651) 2024-03-06 18:31:10 -08:00
Mr. 27
2c2be09956 Monkeys can wear all types of masks, not just breath/gas masks (#25816)
* clown mask real

* Update masks.yml
2024-03-07 02:02:06 +03:00
Tayrtahn
56454b6c16 Make flasks fit in dispensers again (#25883)
Added FitsInDispenser to FlaskBase
2024-03-06 18:19:01 +01:00
Brandon Hu
974c4b9219 adds barber scissors to hristov bundle (#25695)
bald update

Co-authored-by: Kadeo64 <108914677+Kadeo64@users.noreply.github.com>
2024-03-06 05:03:07 +03:00
Арт
2ba28cc3d2 New cloth & hair (#25772)
* Clothing sprites & meta

* Changing prototypes & sprites

Rename sprites folder, edit prototypes and meta

* Hair_sprites_&_prototype

Add hair sprites and change prototype

* Update meta.json

* Rename added hair

* Revert "Changing prototypes & sprites"

This reverts commit 801cadbdaa90cfb5e7ae43cd7d017e20b40cdc98.

* Revert "Clothing sprites & meta"

This reverts commit 73442163fd8bc8f49207e616b415dc0f26d6ef32.
2024-03-06 04:42:05 +03:00
I.K
091332787e Update wideswing rotations (#25868)
* Added appropriate wideAnimationRotation fields to items that needed it

* Modified some wideAnimationRotation
2024-03-06 12:40:03 +11:00
Ko4ergaPunk
0ab4acedeb Post light update (#25814)
* penis

* done
2024-03-06 04:39:47 +03:00
Froffy025
8e8156a6a7 Add water to water tiles. (#25825)
* update

* rename tank to pool. bigger arbitrary #. remove bad copy paste part.
2024-03-06 04:37:24 +03:00
Ps3Moira
8a154d3fd7 Separate Certain Walls (#25674)
Separate Walls
2024-03-06 12:36:04 +11:00
lzk
907403759c Allow livestock and artifact crate to go under plastic flaps (#25862) 2024-03-06 04:33:20 +03:00
deepdarkdepths
d3b981f354 Fixes glowsticks being unable to be inserted into trashbags (#25863)
Glowstick now garbo
2024-03-06 02:29:02 +01:00
deepdarkdepths
7e9c3b8814 Adds paramedic cap to the uniform printer (#25861)
Update lathe+clothing.yml
2024-03-06 12:17:50 +11:00
MACMAN2003
f0e8695a91 Clockwork structures and furniture (#24673)
* sprites

something something strength and certainty of steel (except this is brass)

* test1

* commas it was commas

* commas and brackets

* LET THERE BE BRASS

* brass-glass-etc-windows-thindows-floors-lattice

* ALL THE STRUCTURES!!

"Which structures did you add?"
"all."

* buyable brass

and on the first day the quartermaster said "let there be brass" and all the cargo techs stopped inve$ting in awe

* Update windoor.yml

i forgor 💀

* Update tiles.ftl

* i hate random capital letters

* linter fix 1

whew, thank god for linters

* fix 2

* maybe this

shot in the dark, idk what the hell i'm doing hopefully this fixes it?

* fix attempt 1

weather to true, maybe the thingy got confused?

* remove clockwork lattice

it's fixed the test fail... but at what cost?

* changes 1

* fix clockwork windoor

* FLOORS

HAHAHA LET THERE BE FLOORS

* try linter fix 1

i love linters they find things i'd never catch myself

* tweaks fixes 1

fixes merge conflict and does more stuff part two later because i'm tired

* tweaks fixes 2

i should probably do this stuff during the day when i have more energy but eh

* Update assembly.yml

* Update chairs.yml

* fix door sprites

somehow the deny_unlit was broken for all the clockwork doors

* fix glass.yml
2024-03-06 03:25:59 +03:00
Jay
b66bad25ca Add nutribricks to other survival boxes (#25749) 2024-03-05 13:01:41 -08:00
Whisper
4d0ec65f35 the bladed flatcap (#25780) 2024-03-05 12:57:54 -08:00
Lawdog
f4754febb1 Shot glass max volume decrease (#25847)
Lower Volume
2024-03-04 16:51:12 -07:00
Ed
bdcf144442 Frozen hydroponic dungeon (#25837)
+dungen
2024-03-04 16:13:34 -07:00
Nairod
7944badd00 Lathe-able Welding Masks (#25842)
* Lathe-able Welding Masks

* Fix Composition Tests
2024-03-05 09:36:06 +11:00
lzk
da9775709b Suffix for boxes of hugs (#25829) 2024-03-05 00:45:45 +11:00
Ed
ace8285440 Mineshaft (#25733)
* content

* catwalks

* fix fucking icons

* finish PR

* +1 room

* fix
2024-03-03 23:32:33 -07:00
Mr. 27
540c819602 Blood-red monkey hardsuit (#22273) 2024-03-03 23:56:17 -04:00
Julian Giebel
1ed63d43b0 System for single device net server per station functionality (#23946) 2024-03-03 20:45:37 -04:00
SlamBamActionman
094f30e228 Fix arachnids being unable to clean pie stains (#25713)
fixed it
2024-03-03 00:54:36 -08:00
metalgearsloth
c5486873db Shuttle console + FTL rework (#24430)
* Add shuttle interior drawing back

Just do it per-tile she'll be right, at least it's done with 1 draw call.

* Revamp shuttle console

* Bunch of cleanup work

* Lables sortito

* dok

* Pixel alignment and colours

* Fix a bunch of drawing bugs

* Shuttle map drawing

* Drawing fixes

* Map parallax working finally

* weh

* Commit all my stuff

* mic

* deez

* Update everything

* Xamlify everything

* uh

* Rudimentary blocker range

* My enemies have succeeded

* Bunch of changes to FTL

* Heaps of cleanup

* Fix FTL bugs

* FTL

* weewoo

* FTL fallback

* wew

* weh

* Basic FTL working

* FTL working

* FTL destination fixes

* a

* Exclusion zones

* Fix drawing / FTL

* Beacons working

* Coordinates drawing

* Fix unknown map names

* Dorks beginning

* State + docking cleanup start

* Basic dock drawing

* Bunch of drawing fixes

* Batching / color fixes

* Cleanup and beacons support

* weh

* weh

* Begin pings

* First draft at map objects

* Map fixup

* Faster drawing

* Fix perf + FTL

* Cached drawing

* Fix drawing

* Best I got

* strips

* Back to lists but with caching

* Final optimisation

* Fix dock bounds

* Docking work

* stinker

* kobolds

* Btns

* Docking vis working

* Fix docking pre-vis

* canasses

* Helldivers 2

* a

* Array life

* Fix

* Fix TODOs

* liltenhead feature club

* dorking

* Merge artifacts

* Last-minute touchup
2024-03-03 18:39:19 +11:00
deltanedas
f2f1c0b0ad Revert "make galoshes obtainable and slowing you" (#25795)
Revert "Make galoshes obtainable and slowing you (#25484)"

This reverts commit 65687375ee.
2024-03-03 00:07:57 -07:00
LordCarve
06d755a860 Make ItemSlots more verbose + AME proof of concept (#25779)
* Make itemslots more verbose with AME proof of concept.

* Remove unnecessary [DataField] strings and use null coalescing in whitelist checks.

* Change optional popup fields into LocId.
2024-03-03 16:37:34 +11:00
Plykiya
a0b33def48 Curadrobe Additions (#25732)
Librarian drip

Co-authored-by: Plykiya <plykiya@protonmail.com>
2024-03-02 20:31:39 -05:00
FungiFellow
8d83efd254 Moved Grapple to T1 Industrial (#25782) 2024-03-03 11:36:01 +11:00
Emisse
d80e488883 reenable revs (#25704) 2024-03-03 11:30:22 +11:00
Nairod
67f4802fe4 Service and External Cadet Access (#25784) 2024-03-03 11:29:59 +11:00
MACMAN2003
862ab5ca9f Cleanup chairs.yml (#25682)
cleanup chairs.yml

not sure if i did this correctly
2024-03-03 03:06:15 +03:00
deltanedas
7f060eb129 make thief a subgamemode (#25740)
* add SubGamemodes comp/sys

* remove RuleChance from thief rule

* use SubGamemodes for adding thief rule instead of adding ThiefRule component to random gamemodes

* clean up thief rule prototype

* add better logging + end rule if it fails to start

* march 1st incident

* preset ops

* the dreaded

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-03-02 11:33:24 -05:00
Waylon Cude
2e60d3300b Make the MRE wrapper count as trash (#25760)
This is a trash item for the most part, and should get picked up by the
janitor's trash bag
2024-03-03 01:23:00 +11:00
Errant
ecd2d5a644 Alerts for breathing plasma/tritium (#24484)
* Alert autoremove v0

* Code cleanup and timing

* comment

* Tritium, code compression

* not resolving manually

* reduced lookups, new comp

* fix-fix yes

* use RemCompDeferred, handle OnUnpaused

* missed a todo

* entitysystem resolve

* remove unnecessary component updates

* remove AlertState from comp, move EntityUnpausedEvent actions to AlertStateComponent's Timespan

* Code cleanup

* comments

* combines AutoRemove input into Clear

* minor logic adjustment that does not really change anything but is less ambiguous
2024-03-03 01:07:05 +11:00
Flareguy
a5200cc185 removes the free syndicate headset from the syndicate footsoldier (#25764) 2024-03-01 23:45:04 -07:00
Nemanja
9cdffb7b6e move space heaters into cargo (#25735)
* move space heaters into cargo

* AAA!!! the indentation1!!!

* remove crate
2024-03-01 23:43:29 -07:00
rosieposie
55b0cb1934 Additional Signage (#25766)
initial commit
2024-03-01 23:42:06 -07:00
Nairod
c38b44ea69 Security Belts for Cadets (#25753) 2024-03-01 18:24:13 -05:00
IlyaElDunaev
81b016433f Detective's rubber stamp (#25676)
Stamp Detective
2024-03-01 17:50:17 -05:00
Tunguso4ka
8dedbf22a4 New item: Expensive coat (#25724)
Expensive coat
2024-03-01 16:22:52 -05:00