Commit Graph

8473 Commits

Author SHA1 Message Date
Nim
34f90f1bce clothing and armour package (#408)
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
2024-08-19 18:41:35 +03:00
Ed
4cb93fc965 Food update (#412)
* meat refactor

* document and remove verb

* cooking table

* cutlets

* dough and cheese update

* flat dough

* size edit, egg added

* Update test-ship.yml

* meat and cheese randomsprite
2024-08-19 18:39:47 +03:00
c4llv07e
df6dbd2ac7 Add reaction randomization. (#308)
* Add random products datafield to the reaciton prototype.

One of the items in the list will be used as additional products as a
result of the reaction and will be persistent per round.

Resolves #245

* Another try

Add getter and setter for the reaction products field and
add random products there.

* There is no such product as CP14BasicEffectHealHeat

* Try to visualize random products in the guidebook

* experimental recipes

* fix

* file restructurization

* Guidebook alchemy update

* Update Alchemy.xml

* fix

* Update mixing_simple.yml

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
2024-08-19 18:04:12 +03:00
Ed
6db3ccb342 Merge pull request #387 from crystallpunk-14/ed-05-08-2024-upstream
Ed 05 08 2024 upstream
2024-08-12 15:07:14 +03:00
Gagarinten-Noverdo
7491c6874d Вода теперь не в папке флоры, а в папке Floor. Вода теперь тушит. (#410) 2024-08-12 15:01:56 +03:00
Ed
5af5aaa651 fix 2024-08-12 14:52:40 +03:00
Ed
d9336781f1 Merge remote-tracking branch 'upstream/master' into ed-05-08-2024-upstream
# Conflicts:
#	Content.Shared/Inventory/InventorySystem.Equip.cs
#	Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
2024-08-12 14:40:15 +03:00
Chief-Engineer
691e37c0db Update space law for contraband upate (#30937)
* update space law

* missed a thing
2024-08-12 04:58:20 -05: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
Brandon Hu
46f631fa11 tweak(AgeRequirement): Make the requiredAge more sensible (#30913) 2024-08-11 21:47:26 +03:00
Killerqu00
65521696c8 Remove rest of Geras files (#30912)
remove remaining geras stuff
2024-08-11 14:01:00 -04:00
Ed
8ecae1288f Merge branch 'master' into ed-05-08-2024-upstream 2024-08-11 18:13:17 +03: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
osjarw
456410239e Reorder priorities in MeleeCombatCompound (#30066)
Reordered MeleeCombatCompound to improve unpulling
2024-08-11 19:22:46 +10:00
Token
ad71d8cb2f Pax now refresh instead of stacking pacified forever (#30778)
Pax refreshes instead of stacking pacified forever
2024-08-11 19:19:00 +10:00
Plykiya
b6d04f884c EntityTables for sec belts and webbing (#30900)
* EntityTables for sec belts and webbing

* update name

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
2024-08-11 19:16:46 +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
Plykiya
8d72e7d932 Make head of department lockers use EntityTables (#30854)
* EntityTables for head of department lockers

* I hope this works

* even smaller

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
2024-08-11 13:12:26 +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
lzk
9ba038d04f Standartize clothing recipes (#29315) 2024-08-11 04:16:56 +10: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
Unkn0wn_Gh0st
d340c5c844 ERT Chaplain Loadout fixer (#30855)
Chaplain fixy
2024-08-10 15:55:20 +03: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
Nim
bf256b25e9 Two new spells of light (#404)
* light spell

* fix
2024-08-10 13:08:14 +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
Tornado Tech
9f4932a8af Remove day cycle shit (#400) 2024-08-10 01:12:13 +03:00
Jaraten
32ce8f2164 directional window (#401)
* pu-pu-piri-pu

* fx remove
2024-08-10 01:10:22 +03: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
Ed
e3e142592a add art (#402) 2024-08-09 11:03:39 +03:00
Ko4ergaPunk
55d400b1b9 New decals for mapping (#30374)
* new decals

* license

* re-check
2024-08-09 17:06:37 +10:00
Ilya246
3c6df0e39f add ghost role raffle to sentient artifact (#30746)
arti raffle
2024-08-09 16:57:43 +10: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