juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,761 Commits 57 Branches 0 Tags
c0bbbc33c19eafcc8defaa7f1ec2df42e485b435
Commit Graph

7176 Commits

Author SHA1 Message Date
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
SlamBamActionman
aabf030515 Changed names of uplink categories and swapped around items (#25079) 
* Changed names of uplink categories and swapped around items

* sloth feedback
 2024-03-13 20:47:17 +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
NakataRin
b49f77f9cd skeleton minplayers restriction (#26050) 2024-03-13 12:00:15 +11: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
Baptr0b0t
7bdfd4cfc0 FIX Criminal SecHud icon Rsi path BUG (#26001) 
FIX BUG
 2024-03-11 10:45:30 -04:00
pigeonpeas
5364bd4af0 New salvage expedition ambience. (#25983) 
adds the stuff!!

adds the OGG file, makes it play in game, and adds the attributions.
 2024-03-11 17:56:01 +11:00
deltanedas
88f8da465b buff cargo hydroponics crate (#25878) 
buff hydroponics crate

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2024-03-10 23:52:22 -05:00
LankLTE
88d424e877 Return Detective to Security (#25986) 
* Revert "detective patch (#24739)"

This reverts commit 8ef69ff2e1.

* Revert "Detectives gain independency (#23114)"

This reverts commit 807f5facbb.
 2024-03-11 14:33:08 +11:00
Arendian
60b9d89e4d Criminal record hud icons (#25192) 
* Security hud shows icon based on criminal record status

* Criminal status now linked to name instead of identity

* parole loc

* Test fix

* review changes

* Check station records instead of storing names on criminal record consoles.

* cleanup

* more cleanup

* review changes

* change outdated comments

* rename

* review changes

* remove event subscription

* replaced event with trycomp

* default value
 2024-03-11 14:12:52 +11:00
Errant
84a07315dd Species info in Guidebook and at chargen (#25844) 
* guidebook pages defined

* species info button in character profile editor

* if current species has no guidebook page then open the parent page

* skrek

* destroying evidence of secret vox plot

* icon size adjustment, no icon if guidebook page for species does not exist

* finished pages

* additional info

* weh
 2024-03-10 20:01:32 -07: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
MODERN
6e38b992cf CargoConsoleMenu localization (#25931) 
- every category of type "cargoProduct" was edited to "cargoproduct-category-name-{categoryName}"
- file "cargoproduct-categories.ftl" was added to english localization to localize categories of cargoProduct
- CargoConsoleMenu.xaml.cs got tweaks which prevent issues with strings comparisons
 2024-03-09 17:56:39 +11: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
he1acdvv
806c0d162f New Nukie Song (#25765) 
made a new nukie song lel.
 2024-03-09 12:44:54 +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
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