Commit Graph

6231 Commits

Author SHA1 Message Date
Nemanja
ada6455b17 Make printing from ore procecssors slightly more bearable (#31074)
* Make printing from ore procecssors slightly more bearable

* Update sheet.yml
2024-08-17 15:12:55 +10:00
Preston Smith
7066b4a3e0 Modified bone-spear to correctly break into 1-2 bones when breaking (#30951) 2024-08-17 00:54:53 -04:00
Alzore
9775975c53 Disabler SMG no longer fits in boots (#31110) 2024-08-16 21:00:21 -04:00
themias
79ae2cceb4 Add sound for turning on grill (#31099)
* Add sound for turning on grill

* remove view variable
2024-08-16 20:41:55 -04:00
Velcroboy
cc445e07b8 Update some food spawners w/ entity tables (#30957)
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
2024-08-16 10:47:37 -04:00
Nemanja
3cdd62b0dd Mining Rebalance (#30920)
* first pass

* this shit too

* ok fix that shit

* buff

* actually fix that
2024-08-16 11:43:54 +10:00
themias
f06176ac39 Cook-able cutlets for kebabs/tacos (#31048) 2024-08-15 13:30:08 -06:00
Nemanja
c41fe93040 Salvage Spawners (#31020)
* treasure entities and spawners

* no more smiles
2024-08-15 13:26:02 -06:00
Nim
84af71eb7c Golden toilet (#31049)
* golden toilet

* Destructible

* sprite

* fix

* copyright
2024-08-15 13:23:59 -06:00
Plykiya
dc66386e5f Contraband Review Pass - The Threequel (#30970)
Contraband pass number three
2024-08-15 20:52:46 +02:00
Plykiya
f523df821a Contra Review Passs - Round 2 (#30942)
* Contra pass round two

* command too

* Stamps

* oopsied a bracket
2024-08-15 19:35:06 +02:00
to4no_fix
6567fa36e4 Adding shock collar and electropack (#30529)
* Adding shock collar with the new ShockOnTrigger

* Cleaning and updating the shock collar

* Add StripDelay datafield to ClothingComponent

* Adding SelfUnremovableClothingComponent

* ShockCollar Update

* Correction of the shock collar

* Correction of the shock collar 2

* Renaming the DamageSpecifier DataField to Damage

* Fixing the damage field in ShockCollar

* Cleaning the ShockCollar

* Renaming ShockCollar to ClothingNeckShockCollar

* Adding ClothingNeckShockCollar as a stealTarget to a thief

* Fixing a typo of the sprite path in ClothingNeckShockCollar

* Cleaning the ShockOnTriggerComponent

* Revision of SelfUnremovableClothing

* Adding a ClothingBackpackElectropack

* Sprite fix

* Code review

* Shock Collar sprite update

* add commit hash

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2024-08-15 10:30:39 -04:00
lzk
bc5bc37346 Fix top bun desc (#31019)
FIX
2024-08-15 09:38:28 +03:00
PoorMansDreams
793eb87f31 Adds a Dinky Star Sticker for security officers (#29767)
* Sec-Star-TASTIC

* fix license

* now counts as trash

* Sticks to people + wearable

* no more sticky

* no more sticky

* mystery-space

* Update Loadout Yaml
2024-08-15 11:50:55 +10:00
Velcroboy
890c0eeb99 Adds a random smokable spawner (#30870)
* Textures to make lamps mappable to East/West.

* Adds a random smokable spawner

* remove double derma

* Increase chance for just basic cig

* Update to enitity tables

* Tweak values

* Remove space

---------

Co-authored-by: Jeff <velcroboy333@hotmail.com>
2024-08-14 09:44:21 -04:00
Ed
e659eb992f Custom Taco & Kebabs - FoodSequence 2 (#30905)
* control layer ordering

* sprite update

* taco!

* taco naming gen

* fix separator naming

* some proto fixes

* default naming separation

* fix taco naming

* rat update

* hamsterburger

* organs taco

* remove from spawners

* fixes

* fix separators and lemons

* Update food-sequence.ftl

* randomization offset

* fix

* kebabs refactor

* fix

* skewer weapon

* Update food_single.yml

* Update migration.yml

* suppermatter

* hamlet centered

* hamsburger

* Update dead-0.png

* 20 -> 4 burger layers max

* Update burger.yml

* canReact: false

* capfruit update

* Update burger.yml

* Update burger.yml

* Update produce.yml

* some fixes

* Update Resources/Textures/Objects/Consumable/Food/taco.rsi/meta.json

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* chicken

* Update food-sequence.ftl

* documentation

* fixes

* Update meat.yml

* Update meat.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-08-14 15:04:00 +02:00
IgorAnt028
204f3e6ae3 Fix bug with rotating shelves (#30978)
* Main

* Update shelfs.yml

* Little bug fix
2024-08-13 15:38:28 -06:00
PoorMansDreams
02521d59dd Throngler Plushie Sprite (#30969)
Throngonkler Plush sprite
2024-08-13 23:32:53 +03:00
Ubaser
135d52406a Add capfruit, a gatfruit mutation. (#30850)
* add base

* add fake suffix and flavor fix

* address some reviews

* parent it

* fix test fail

* add FoodSequence support and address small review
2024-08-13 13:08:40 +02:00
pigeonpeas
329a0a875b Grey mantle in winterdrobe (#29774)
* add the mantle

* fix a few things

* fix merge conflict stuff, remove from winterdrobe and lathe.

* Add mantle to loadouts (20 hour requirement)
2024-08-13 19:20:12 +10:00
Ubaser
c02aeebdf1 Add conducting gloves to the maintenance loot table (#30904)
* add

* lower weight
2024-08-12 03:06:55 -06:00
Plykiya
883dc998e6 First Review Pass Contraband Fixes (#30930)
* First pass contra fix

* bam

* More

* Security crates are now marked as security restricted

* Syndicate raid suit is contra

* damn I forgot gatfruit
2024-08-12 02:17:26 -06:00
Ubaser
c6209cc725 Make mantles loadout only. (#30929)
* remove cloaks and mantles from dresser

* remove mantles from lathe

* add role timer loadout thing

* add back cloak dresser

* fix test fail

* potentially fix test fail (?)
2024-08-12 01:14:45 -06:00
Kara
485caa4553 Contraband marking & examining (#28688)
* System & loc strings

* pass over syndie contraband

* fixes

* grand theft pass

* contrabandexamine -> contraband

* examine text generation update

* all composition parents necessary

* bring back minor contra so it has a less confusing message

* minor

* weapon pass

* jumpsuit pass

* feet pass

* AUUUUUUUUUGHHHHHHHHHHHHHHHHHH

* head

* AUUUUGH

* ear

* belt

* back

* fix

* bro

* rename for more clarity

* do da review

* add cvar for contraband examine

---------

Co-authored-by: EmoGarbage404 <retron404@gmail.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2024-08-11 23:57:49 -04:00
Nemanja
a0a1421da4 give trash a reusable entity table (#30921) 2024-08-12 12:07:39 +10:00
Alzore
bcd7085a3e Add diamond mining drills, buff regular mining drills (#30814)
* why do I have to change so much just to add drills

* diamon
2024-08-12 11:49:09 +10:00
Brandon Hu
dea9a637fb chore(grammar): correct some mistakes (#30916) 2024-08-12 08:25:45 +10:00
Plykiya
c688da00a0 Add execution component to all energy sword weapons (#30909)
Co-authored-by: plykiya <plykiya@protonmail.com>
2024-08-12 08:12:31 +10:00
Killerqu00
65521696c8 Remove rest of Geras files (#30912)
remove remaining geras stuff
2024-08-11 14:01:00 -04:00
Ubaser
58fd50c369 fix a capitalisation mistake (#30908)
ad
2024-08-11 22:51:19 +10:00
Moomoobeef
28efd76e82 adds a throngler plushie, and adds it to the grand lotto (#29978)
* adds a throngler plushie, and adds it to the grand lotto

* this was supposed to be in the initial commit but I apparently forgot to save so anyway here it is

* make throngler plushie more rare

how about I split the difference:
original throngler: 0.0001
other plushies: 0.01
thongler plushie: 0.0005

* removed inheritied soundhit
2024-08-11 20:26:37 +10:00
lzk
f93fe05f4c Make RCD ui activateable only in hand (#30861) 2024-08-11 19:15:28 +10:00
Plykiya
6aed90ed75 Rename cooking shelf, improve content whitelist (#30858)
Rename cooking shelf to kitchen shelf

Co-authored-by: plykiya <plykiya@protonmail.com>
2024-08-11 16:21:34 +10:00
Scribbles0
220aff21eb Melee Executions (#30104)
* melee executions

* fix damage bug

* cleanup

* address reviews hopefully

* resistance bypass mechanic

* component changes

* self executions (not finished yet)

* self execs part two

* ok i fixed things (still not finished)

* finish everything

* review stuff

* nuke if (kind = special)

* more review stuffs

* Make suicide system much less hardcoded and make much more use of events

* Fix a dumb bug I introduced

* self execution popups

* Integration tests

* Why did they even take 0.5 blunt damage?

* More consistent integration tests

* Destructive equals true

* Allow it to dirty-dispose

* IS THIS WHAT YOU WANT?

* FRESH AND CLEAN

* modifier to multiplier

* don't jinx the integration tests

* no file-scoped namespace

* Move the rest of execution to shared, create SuicideGhostEvent

* handled

* Get rid of unused code and add a comment

* ghost before suicide

* stop cat suicides

* popup fix + small suicide change

* make it a bit better

---------

Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com>
2024-08-11 13:05:54 +10:00
beck-thompson
09c8d4abd4 Torch no longer gives errors (#30884)
First commit
2024-08-10 20:05:35 -04:00
Ed
4d75cb54c8 Custom burgers - FoodSequence system (#30755)
* setup foodsequence

* name generation and max layers limit

* move to nutrition

* move code to serverside

* move to appearance data

* marked fields as required

* Update foodsequence.yml

* b

* burgeers!

* Update produce.yml

* Update meat.yml

* Update burger.yml

* fix duplicate naming

* Update Resources/Locale/en-US/nutrition/components/food-sequence.ftl

Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>

* merge flavor profiles

* make food trash List<>

* merge trash

* Update FoodComponent.cs

* Update FoodComponent.cs

* organs and cannabis support

---------

Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>
2024-08-10 22:31:32 +03:00
Nemanja
fc1446e73a Cursed Mask (#29659)
* Cursed Mask

* extra expressions

* block ingestion

* mind returning

* okay fix the removal shit
2024-08-10 11:14:58 -04:00
Nemanja
fdbf2a229e Infer type for EntSelector (#30856)
Infer type for EntSelector.cs
2024-08-10 10:17:45 -04:00
TakoDragon
9bc1fabdb3 Added suitskirt for psychologist (#30709)
* Added jumpskirt

* added locale

* Added spaces in code

* Updated the meta
2024-08-10 08:51:54 -04:00
shamp
563190f4d8 Add Rat Kings wideswinging (#30808)
Update regalrat.yml
2024-08-10 15:47:55 +03:00
Unkn0wn_Gh0st
bf2bd9a33e Change siren.ogg to gamma.ogg (#30836) 2024-08-10 15:31:28 +03:00
Alzore
4c678e4955 Bent pipes deal 8 thrown damage (#30634)
8 pipe throw damage
2024-08-09 23:30:43 -04:00
Ko4ergaPunk
1fe46a7210 Changed chemistry airlock color (#30666)
* chem

* re-check

* re-check. again

* checks just die. last try

* re-check :blessrng:
2024-08-09 23:23:46 -04:00
Nemanja
437c861622 Entity Tables (EntitySpawnEntry replacement) (#30579)
* Entity table code

* entity table examples

* fix dat shit

* access

* tests tests tests

* sloth review
2024-08-09 22:12:40 -04:00
lzk
45a2327ef5 Revert "Make hotplate and grill anchorable on table part 2" (#30830)
Revert "Make hotplate and grill anchorable on table part 2 (#29454)"

This reverts commit 268cab97f5.
2024-08-10 11:10:39 +10:00
lzk
c80c26221b Crowbars fix (#30828)
* Crowbars fix

* oops
2024-08-09 14:19:04 -06:00
Ubaser
ed3ec4dc5f Crowbar variants (#28988)
* add

* comma

* sprites

* yaml-ify

* add s

* lathe and engi belt

* yes

* fix maybe

* progress

* nearly there

* fix

* fix yaml linter having a stroke
2024-08-09 13:29:00 -06:00
lzk
268cab97f5 Make hotplate and grill anchorable on table part 2 (#29454)
* Make hotplate and grill anchorable on table part 2

* Update hotplate.yml
2024-08-09 16:28:45 +10:00
Stalen
60b63b58dd Head bandana ingestion blocking fix (#28910) 2024-08-09 16:17:51 +10:00
slarticodefast
e0d30aff4e Add tooltips to the agent ID job icons and improve status icon prototypes (#28575)
* add tooltips to agentid job icons

* forgot to stage this

* make StatusIconPrototype abstract

* minor visual improvements

* cleanup

* use currentculture to sort job names

* review
2024-08-09 16:14:07 +10:00