wafehling
c0bbbc33c1
Trading Outpost now has half buy-only and half sell-only pallets ( #25955 )
...
* Added new Buy & Sell specific cargo pallets
* Remapped trading outpost with new pallets, tweaked texture
* Removed debug message
* Fixed/Compacted conditional checking to let old pallets still work for backwards compatability
* Update Content.Server/Cargo/Components/CargoPalletComponent.cs
Alright, updating all the references to it.
Co-authored-by: Tayrtahn <tayrtahn@gmail.com >
* Changed textures, changed to enum instead of string for pallet type check
* Few minor code tweaks/formatting fixes
* Missed the prototype change
* Update Content.Server/Cargo/Components/CargoPalletComponent.cs
* Update Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs
---------
Co-authored-by: Tayrtahn <tayrtahn@gmail.com >
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com >
2024-03-14 10:26:25 +11:00
lzk
91aa644571
More good looking inventory part 2.2 (instruments version) ( #26090 )
2024-03-13 22:03:34 +03:00
lzk
2b5a75ba66
Some more whitelists for belts ( #26085 )
...
* Allow surgery tools in medbelt
* add lil more changes
2024-03-13 21:55:26 +03:00
Gyrandola
6574681bcb
Make fireaxe & shotgun cabinets destructible ( #25962 )
...
* Update fireaxe_cabinet.yml
* added min(75) and max (100) dmg threshold
100 dmg destroys the axe as well.
* made the cabinet tougher
2024-03-13 18:09:06 +03:00
Errant
8a77722f91
Fix vox custom sprites ( #25989 )
...
fix vox specific sprites
2024-03-13 18:06:37 +03:00
Mangohydra
61b3eb4de0
The lawyer finally gets a stamp ( #26012 )
...
lawyer stamp
2024-03-13 18:05:39 +03:00
icekot8
86ab7a1074
foxes are now neutral 🦊 ( #25992 )
...
foxes became neutral
2024-03-13 18:02:48 +03:00
Velcroboy
bcc147634a
Fix placement mode on chairs ( #26041 )
...
Co-authored-by: Jeff <velcroboy333@hotmail.com >
2024-03-13 17:45:28 +03:00
PursuitInAshes
49c8193739
Contraband Storage Crate ( #25974 )
...
* Contraband Storage Crate
* Better description
* Better Communication of Purpose
* Update Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com >
2024-03-13 21:10:12 +11:00
Krunklehorn
674b42b3a0
Fix Butcherable handling, ItemSlots for clown shoes ( #25661 )
...
* Fix butcherable handling
* ItemSlots for clown shoes
* Return if handled
* Handle if popup
* Whitespace, spoons are metal
* Zero damage plastic utensils, blacklist by metal+melee
* Hmmm truthy
* Plastic knives are knives too, just use that
* Delete unused tag
* Always true if doAfter
* Raw rat meat should be sliceable too
2024-03-13 21:03:14 +11:00
FungiFellow
471dfed445
Grey Matter Addition and Slime Organ Tweak ( #25464 )
...
* Added Grey Matter
* Update diona.yml
* Update human.yml
* Update slime.yml
* Update flavors.yml
* Update biological.yml
* Update physical-desc.ftl
* Update biological.ftl
* Make Slime Brain Grindable
* Slime Organs Grind into Slime
* Update flavor-profiles.ftl
* Added Brain to Blacklist
2024-03-13 20:06:03 +11:00
Cojoke
af57006427
Adds Senior role drip to the Uniform Printer. ( #25668 )
...
Adds Senior role drip to the Uniform Printer.
2024-03-13 19:45:33 +11:00
Vyacheslav Kovalevsky
0d0edbba4a
Fix cream pie bomb when eaten or sliced ( #25928 )
...
* fix bomb activation when eaten
* no swap / no eject
* activate when sliced
2024-03-13 19:36:08 +11:00
Velcroboy
f5f5eebeee
Add fancy table spawner ( #26044 )
...
* Add fancy table spawner
* fix icon
---------
Co-authored-by: Jeff <velcroboy333@hotmail.com >
2024-03-13 09:21:51 +03:00
Gyrandola
559d7ac593
Fix Sky Blue carpet making red tables ( #26049 )
...
* created and added CarpetSBlue tag
* reverting unnecessary de-indentation
* Update carpets.yml
2024-03-12 19:03:04 -07:00
SlamBamActionman
a8e1489ddb
Remove recycling for Syndicate implanters ( #26047 )
...
Removes the Trash tag
2024-03-12 19:02:36 -07:00
FungiFellow
6260e4b35b
Improvised shell crafting recipe ( #25545 )
...
* Changed Projectile Sprite to Shard
* Removed Notes on Recipe
* Made Recipe
* Added a space
* Update improvised.yml
* Update shotgun.yml
* Removed Note
* Reduced needed matches from 8->6
* Update improvised_shotgun_shell.yml
* Matchbox fix didn't work
* Reduced glass needed from 5-4
* Added backspace
* Update Resources/Prototypes/Recipes/Crafting/Graphs/improvised/improvised_shotgun_shell.yml
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com >
2024-03-13 10:52:32 +11:00
UnicornOnLSD
76db710a1c
new haircut alternative (brought back old one) ( #25935 )
...
added crew cut 2 wew
2024-03-12 14:47:29 -04:00
Mr. 27
ad99564b3e
kobolds no longer die at 40 hp ( #25984 )
...
* me
* change
2024-03-12 14:43:21 -04:00
Ubaser
c2d52e4540
Space damage now causes heat along with blunt ( #25770 )
...
* add
* heat not burn?
2024-03-12 13:38:39 +11:00
SlamBamActionman
6d1f07a375
Add "Juice that makes you Weh" to moths eating Lizard plushies ( #26003 )
...
Weh
2024-03-12 02:05:25 +03:00
Ed
d3d9898d2a
Recolor detective stamp ( #25945 )
...
* Add files via upload
* Update rubber_stamp.yml
2024-03-11 12:57:20 +11:00
Plykiya
5cb48c922f
Syringes that spawn with content start in inject mode ( #25881 )
...
* Remove unnecessary datafield names, syringes with stuff in them start in inject mode
* No trash tag
* Remove ViewVariables since DataField has them implicitly
* Revert "No trash tag"
This reverts commit 2c42172653d2cc70d58bd5bedf61a880b939bf20.
* Get rid of tags entirely for PrefilledSyringes
---------
Co-authored-by: Plykiya <plykiya@protonmail.com >
2024-03-09 11:19:03 +01:00
nikthechampiongr
dbc27b57c8
Remove unecessary easy pry prototypes ( #25893 )
...
* Remove unecessary prototypes
* Put unecessary prototypes in migration.yml
2024-03-09 12:45:35 +11:00
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
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
shamp
90063db717
Fix body bags sliding under doors ( #25325 )
2024-03-06 22:35:48 -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
Арт
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
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
Nairod
7944badd00
Lathe-able Welding Masks ( #25842 )
...
* Lathe-able Welding Masks
* Fix Composition Tests
2024-03-05 09:36:06 +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
MACMAN2003
862ab5ca9f
Cleanup chairs.yml ( #25682 )
...
cleanup chairs.yml
not sure if i did this correctly
2024-03-03 03:06:15 +03: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
