Commit Graph

8176 Commits

Author SHA1 Message Date
IProduceWidgets
0ae5426fe4 Event scheduler setting tweaks (#31018)
tweaks
2024-08-15 13:33:17 -06: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
FATFSAAM2
b17f1c336b Figurine voicelines (#30865)
* initial commit

* tweaks to the new voice lines

capitalizations of I's and the Y on hos 3 voice lines
also changed the captain figuring voice line 2 to something completely different

* capitalized one letter

man i really suck at capitalization

* more capitalization

i never thought this pr would need so many changes

* changed one comma to a dot

* Update Resources/Locale/en-US/datasets/figurines.ftl

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

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-08-15 22:34:41 +10: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
Eris
e5d2738a26 Sedin (#27110)
* Sedin

* almost forgot this.

* what

* Did a few fixes, tried to readd popup

* Fix popup, ready for merge

* minor change

* Generalize seed removal/destruction system, add popups in general.

* fix

* fix (again)

* deadcode is no more

* Sedin buff (nerfing the recipe soon)

* godont

* webedit moment

ok listen I had to nuke my setup because my computer was being Dumb As Shit so let me do this ONE webedit

* CRIKEY

* Revert "CRIKEY"

This reverts commit 1c6959ffd9ba8bb1e97ccf2eb0b37b3ff4ec82ee.

I was not supposed to commit that >:/

* Alright, it should be good now but I havent tested it

* ready for merge/review

* prob -> probability

* Requested changes nodoc

* Review nodoc

* documento

* thumb up emoji
2024-08-15 10:38:21 +10:00
Pieter-Jan Briers
6c008be126 Fix creator prefix for Cog (#30995)
Now uses the same one as Atlas.
2024-08-14 13:48:16 -06: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
Alzore
1ded394ffb Add a saline syringe to the combat medical kit (#29954)
saline
2024-08-14 16:25:54 +10:00
IProduceWidgets
07ec00ed05 refactor event schedulers to use explicit game rules (#29320)
* works, still has testing values, im sure I did stupid shit.

* shitvent crapfactor

* snap extra word out of existence

* shit I died of old

* remove useless inaccurate design comments

* Oopsie, handle requirement params in RandomRuleSystem too

* I'm a slash slinging hasher

* Address reviews, add admin alerts I forgor

* EntityMan saves the day

* address reviews 1

* eh, I actually don't care about the cargo gifts thing.

* started

* Do reviews

* you actually meant 1.2 lmao

* dependency inheritance is a fickle bitch

* I have no idea.

* Threads are for sheets not computers.

* fix traitor rule test

* fix round type tattling

* break things

* It worky

* Toolshed makes we want to drink depresso.

* Finished?

* remove debug values

* timings

* use defaults

* alphabetize

* bobby drop tables

* Float required fr fr

* continue

* more continence

* uno mas

* obsolution

* cleanup and documentations

* Yell at self

* use the right value defaults

* housekeeping
2024-08-14 15:21:01 +10:00
NotSoDamn
381e0d6f93 No weather on concrete tiles (#30952)
* concrete weather

* miss
2024-08-13 15:39:25 -06:00
IgorAnt028
204f3e6ae3 Fix bug with rotating shelves (#30978)
* Main

* Update shelfs.yml

* Little bug fix
2024-08-13 15:38:28 -06:00
TheWaffleJesus
1e029efd2a cleaning up bounty descriptions (#30981)
fixed up dumb text
2024-08-13 15:37:28 -06:00
PoorMansDreams
02521d59dd Throngler Plushie Sprite (#30969)
Throngonkler Plush sprite
2024-08-13 23:32:53 +03:00
Spessmann
208b1d23b8 Added Cog(map) and its own evac shuttle (#30840)
* Added new map Cog and its own evac shuttle

* removed cog from default.yml so all checks will pass

I added cog here because i thought it might need to be here for map choosing??????????? ill add it back if needed

* updated cog and fixed a bunch of stuff that was not visable in the image, also nerfed the singo so it no longer solos

* added renault spawner that was missing and changed some minor stuff

* moved a escape pod from med/sci hallway to northern maints

* added shutters to the brig and added vents and scrubbers where they were missing in the halls

* extended salv's docking port so they can dock

* Fixed according to cog review thread

* fix pools

* fix PostMapInitTest

* Update MapLoadBenchmark.cs

* added cap and hop spawn that i just forgot to add???????????????????

* fixed again

---------

Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com>
2024-08-13 13:27:24 -06:00
pigeonpeas
7153e43946 Fixes the grey mantle (#30971)
add the thing i missed
2024-08-13 22:13:50 +10: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
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
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