Commit Graph

1836 Commits

Author SHA1 Message Date
CrigCrag
f4cfa192c3 Overrun Outpost Arm (#24656)
* add every

* remove 2 crusher spawns

(cherry picked from commit 572347af5d1dc7a0a25d5afeafa823ac5ea8ace7)
2024-02-08 11:59:13 +01:00
Hanz
c6d3377853 Drink tastes touchup (#24700)
* Actual tastebuds

yup

* Grape Soda, can't forget them too

Grape Soda, my beloved

(cherry picked from commit 61516e82537877248a033c6988eda7e963cc0992)
2024-02-08 11:57:01 +01:00
Kara
9d138e943b Improve rotting examine text (#24689)
(cherry picked from commit 1a74311c9fc91e600f260f521176fc9d5fffe754)
2024-02-08 11:56:14 +01:00
Vyacheslav Kovalevsky
870cae9db8 Store ninja objectives in conditions 2 (#20894)
* move spider charge target from role

* shorter field names

* remove ninja role comment

* remove unused systems in SpaceNinjaSystem

* GenericAntagObjectivesAddedEvent

* check if warp point is on same map

* remove unnecessary import

* add missing loc when spider charge has no target

* a

* remove spider charge target requirement comp

* inline SpiderChargeTitle

* allow planting charge without objective

* remove map check

* fix role check when planting

* obj.Target

* Fix merge

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit 7311ce671fe29d81c662b2313e28c275c4f868cb)
2024-02-08 11:54:40 +01:00
metalgearsloth
ac052e4666 Revert "Make flare gun explode, damage and stun the player when used … (#24679)
* Revert "Make flare gun explode, damage and stun the player when used with the wrong ammo (#22349)"

This reverts commit e301378114b245fa6927372f83c19868cb90b13c.

# Conflicts:
#	Content.Shared/Weapons/Ranged/Components/GunComponent.cs
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml

* Fix revert conflicts

* Update Content.Shared/Weapons/Ranged/Components/GunComponent.cs

(cherry picked from commit e1901aa6b602516f0f7cc3f29844c77e90c77977)
2024-02-08 11:52:32 +01:00
shamp
fc3197e13a Added new All at once game preset (#23171)
* Update game_presets.yml

* Create preset-allatonce.ftl

* Update game_presets.yml

* Update game_presets.yml

the game rule has been removed:
- pirates

* Update game_presets.yml

Pascal case/Camel case fix

* Update preset-allatonce.ftl

Camel case fix

(cherry picked from commit 4920d5f7dfe0df8f8e45ec7d6a91cd3514d680c4)
2024-02-08 11:51:00 +01:00
themias
8497ef8002 Add cowboy hats and boots (#24299)
* Add cowboy hats and boots

* oops

* audio fix and attribution

(cherry picked from commit 5c75117749ce959accb936cffd6bc1d481137a13)
2024-02-08 11:50:35 +01:00
Adrian16199
babe5b3bcc Alternative wagging tail for felinids. (#593)
* Alternative wagging tail for felinids.

More options for felinids.

Ported from TG station.

* Deletes that one line that appeard for some reason.

---------

Signed-off-by: Adrian16199 <144424013+Adrian16199@users.noreply.github.com>
2024-02-01 19:32:54 +01:00
leo
45735bf860 Nerfing Health Code Violation (#714)
make HCV less immediately lethal but still fun
2024-01-31 11:34:16 +01:00
avery
1075c2e999 Hallway textscreens (#24189)
* hallway screen refactor pending comms console support

* comms console broadcasts

* screen and timer localization

(cherry picked from commit 7e16ee0b55fdef2ce77b13cd72dbc00b63d776c4)
2024-01-28 00:33:40 +01:00
Ubaser
7f37d098c8 Add more advertising messages (#24219)
(cherry picked from commit 6b5788ed2ae465a886acfd00e8465accf915b069)
2024-01-28 00:33:32 +01:00
Pieter-Jan Briers
942563e582 Make PACMANs a little better (#24604)
* PACMAN generators show network load/supply.

This gives more feedback to players that their PACMAN is properly connected and what the network status is (i.e. you don't have enough generators).

* Buff JRPACMAN to 8 kW.

Shifted all power values up by +3 kW.

They're frequently too weak to power even single rooms so they deserve a buff.

* Change unit format helpers number format.

Always displays one digit of precision. This avoids jumping around when a value is changing live.

(cherry picked from commit f855cb2b0065083447128778c31c2a93bcd70a6a)
2024-01-28 00:32:20 +01:00
Tayrtahn
deb0362420 Make EscapeInventorySystem respect Unremovable (fix glued hamster deletion) (#24488)
* Made EscapeInventorySystem respect Unremovable

* Oh look, there's a helper method

* Let's fix this too

(cherry picked from commit 060fbcfbc890d57ee95917655f11e4b65e1226e6)
2024-01-28 00:27:36 +01:00
Alzore
2a20a97b76 Meatball Salvage (#23127)
* SpaceproofMeat

* Meatball

* M
2024-01-28 00:16:18 +01:00
Emisse
467b398b7d double bun long hair (#24493)
* new hair

* turn my swag on

(cherry picked from commit ce46281e3996af00d4384f489a13a896e9cb695f)
2024-01-27 23:54:33 +01:00
Krunklehorn
61f93fac92 Added beacon prototype for cryosleepers, relabeled medical's "Cryo" area to "Cryopods" (#24473)
Added beacons for cryosleepers, renamed med cryos to "Cryopods"

(cherry picked from commit a100a0a1d24eb5c6c79ad4a9d8467aece9a2f98f)
2024-01-27 23:54:30 +01:00
Tayrtahn
7141b1ff32 Fix sloshing electricity & enable SpeechVerb masking (#24238)
* Implemented electricity speech verb masking

* Handle speech verb override elsewhere in the system, even though we're not using it

* Fix that protoId business

* No nullable component fields

* Use ProtoId, and try going back to a nullable.
Specifiy DataFields on VoiceMaskComponent.

(cherry picked from commit b4046bc2bb498bd525b8a40c7839a543c92ca18c)
2024-01-27 23:51:27 +01:00
Errant
42ac528eda Suffocation alerts for nitrogen breathers (#24373)
* Respiratorsystem namespace

* WIP gas alert update, does not work

* Finally

(cherry picked from commit 2737c80169853223660948931aadba894723fcaf)
2024-01-27 23:50:55 +01:00
icekot8
afb27f793d remove the bounty on briefcases (#24392)
bounty removal for briefcase

(cherry picked from commit 17c82824cae19c3d0065224371ca7beafddc355f)
2024-01-27 23:50:53 +01:00
Hmeister-real
571cd605f1 Minor tweaks to job descriptions (#24398)
* Minor tweaks to department descriptions

* Tweaks to job-descriptions

Especially doctors, they still talk about cloning lol. Also removed Brigmedic entirely

* Add back brigmed to see if its the reason for the error

* ShuEd's edit

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>

* Rainbeon edits (thanks)

* .

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>

(cherry picked from commit 8921ae7cd07b310b0fb61b66d5cef1bf101d3232)
2024-01-27 23:48:00 +01:00
Nemanja
7573dba496 Rip out remaining machine upgrades (#24413)
* Rip out remaining machine upgrades

* eek

(cherry picked from commit a9e89ab37221c4f5eff5a9e1d42e97c6f3e0753b)
2024-01-27 23:43:49 +01:00
lzk
48a00bcd22 Remove more shitty prototypes locale (#24416)
(cherry picked from commit 759be53235bbe26ccaa2c074841d27ac7c9755e5)
2024-01-27 23:43:03 +01:00
Nairod
2fb7db8189 Vent Critter Alert (#24383)
(cherry picked from commit 778deb14a12b0d4ab3ee90b99a172432347674bf)
2024-01-27 23:41:27 +01:00
Ed
145c2158ca Star Wars 14: Shuttle weapon update (#23644)
* setup codebase

* make auto-fire, but its broken

* collider problem

* fix rate, add toggle port

* add laser

* power cages

* ginormous cells

* fix inhand

* add pirate cannon

* salvage gun

* functional Nuke cannon

* rewrite to standart grenade

* fix naming, add emp sprite

* grenade cartridge

* thruster fix

* nuke cannon

* audio + visual polish

* balance tweak

* tweaks

* laser balance tweak: new Electronic damage modifier set, reduce structural cannon damage

* resprite energy cages, start implementing in game

* fix cage recharger craft

* add small laser gun

* fix colliders

* add  lasers and ptk to research and crafting

* finish implementing weapon to rnd and sec

* some fixes

* splitted grenades and cannon balls

* integrate new cannon balls

* tweaks stick

* move circuits to sectechfab, fix

* fix?

* add ability to E shoot, without signals

* fix!

* fix?!?! and naming tweak

* go!

* Lank fix

* oh

* mornings don't start with coffee.

* the morning starts with bug fixes.

* fucking bugs!

* finally

* it is now possible to craft projectiles separately from cartridges

* +2 fix

* refactor

* piu

* More weight

* add AutoShootGunComponent

* move autoshoot to partial

* SetEnabled()

* some fixes

* remove CanShootWithoutUser field

* remove null-checks ToCoordinates from AttemptShoot()

* war without reason

* return to home

* ?

* forgot remove it

* review

* Fix formatting and update path

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>

(cherry picked from commit a2d5d74b46060d330e5aa14e166692f32dcce7a9)
2024-01-27 23:40:06 +01:00
Debug
aea2326ecc Revert "Unrevivable trait (#24226)"
This reverts commit 7a2e500f689738b64abc24929e8d4a387749ba64.
2024-01-26 23:42:54 +01:00
Ilya246
0c55bddcb9 fix scram implant uplink desc (#24336)
fix

(cherry picked from commit bd4a0b93c8f7ff40a52c56a2ee442b1357c290f9)
2024-01-26 23:17:45 +01:00
Errant
41eef79cd0 Beacon localization (#24138)
* localize beacons

* No not like that

* Tesla beacons were already depreciated, time to give the reaper their due

* Entity name fallback

* The real treasure was the far easier solution we missed along the way

* weh

* Shared mapinit

* fix RT version

* a single line break

(cherry picked from commit efdc6f8d4c5dc8c593b6403c6592f0ddc6212266)
2024-01-26 23:17:32 +01:00
Scribbles0
830ae5579f Unrevivable trait (#24226)
* unrevivable trait + remove unclonable remnants

* cleanup

* change to hascomp

(cherry picked from commit 7a2e500f689738b64abc24929e8d4a387749ba64)
2024-01-26 23:13:01 +01:00
Nemanja
40f7e0b53e Lathe Categories (#24247)
* Lathe Categories

* serilog my beloathed

(cherry picked from commit 73e94dfa92e0afe3ad0decd1d7248d13fa4f208c)
2024-01-26 23:12:38 +01:00
Ubaser
d511f31243 Mustard, ketchup and mayonnaise now tastes distinct (#24297)
add

(cherry picked from commit a6e16d99610120d086105de867d7e82712964109)
2024-01-26 23:11:15 +01:00
SpeltIncorrectyl
46b8eaad4b Can emag artifact crusher (#23957)
* initial commit

* made it emaggable

* removed OnAttemptEmagEvent

* moved emagging to shared

* added local file to git

(cherry picked from commit fd673cf6e30599f5895d58c3281eba2901301401)
2024-01-26 23:11:10 +01:00
Repo
13d79489a9 Restart votes check player count and ghost levels (#23453)
* Restarts have max player count

* Now counts ingame ghosts to determine if restart can be called

* consistant cvar name

* Added a player count with state conditional

(cherry picked from commit 7bf62f1d1904b591580b17b2b5079f0dfe769e4b)
2024-01-26 23:07:50 +01:00
Ubaser
9392f73772 Fix salvage wreck names (#24256)
add

(cherry picked from commit 4b77d5519a0b637740521ac9cd4e656bfee03f37)
2024-01-26 23:07:22 +01:00
IlyaElDunaev
b67dcf5a02 Botany guide chemicals (#24194)
(cherry picked from commit 09b3a4489c4a042f40ee3ab0060ebc8c9c9e0a2f)
2024-01-26 23:07:20 +01:00
Kevin Zheng
25499c5c07 Fix drink examine text (#24241)
(cherry picked from commit 3506e67e88082ca22dc7b720f52748df36de4ab4)
2024-01-26 23:05:39 +01:00
Ubaser
9fa4e84c65 Add pacifism description and clean up traits a little (#24216)
add

(cherry picked from commit da7ed4b27bf596015e2d37bfea102771911ce9c5)
2024-01-26 23:05:32 +01:00
lzk
df30ede473 localize shuttle timer eta etd (#24204)
(cherry picked from commit 89e765c9cbdb2c6c14480e1b9f7cd98c129e72bf)
2024-01-26 23:04:17 +01:00
TurboTrackerss14
37c32f5776 Add Mothroach Burger (#24156)
* Add Mothroach Burger

* append copyright

* fix whitespace and metajson ordering

(cherry picked from commit c32d19cf5ca49bf583054a72eb229f93dfc5b303)
2024-01-26 23:01:01 +01:00
Veritius
92695c274c Executions (#24150)
* Execution (you monster)
not done

* woops

* more stuff

* Melee executions

* Prevent executing those who can interact

* Better checks for if you can execute

* Scale the execution time of a knife with its attack speed

* Translations for fucking up an execution

* rename some functions

* Properly scale execution speed of melee weapons

* Fix checks in CanExecuteWithAny

* Allow executing yourself (funny)

* More versatile localisation

* Suicide with guns

* Popups for successful gun executions

* whoops

* Stop flare guns crashing the game on executions

* Various tweaks

* Remove some old usings

* Pacifists can no longer execute

* Remove unnecessary check

* Use CanShoot in gunsystem

* Capitalisation in ftl string

* Fix melee executions not playing a sound

* localisation tweaks

(cherry picked from commit 2e83f5a0ecc5fea0177acd94e22133de0d614588)
2024-01-26 22:58:32 +01:00
LankLTE
ab5cc6b25e Follow command and ahelp menu follow (#24142)
* Command & ahelp rename

* Reviews

* remove tpto

(cherry picked from commit 44abe3e54d8522fe795a59a0b302a0f1f858cbbc)
2024-01-26 22:58:09 +01:00
lzk
fd30703d24 Remove prototypes locale (#24159)
(cherry picked from commit 1db42e048b8f05100f820c9728a0753681ef9cd0)
2024-01-26 22:57:41 +01:00
Arkanic
80665d94b0 qol tweak: More context about how to access traitor uplink in character menu (#24163)
Update preset-traitor.ftl

(cherry picked from commit 294c4bb3cee0ca8ae9da8fce908968262408bb87)
2024-01-26 22:56:50 +01:00
Skye
4d83cff795 Cleanup Medicine Descriptions (#24141)
Medicine Cleanup TIme

(cherry picked from commit 7e101f6e19a061a445e7e174fa462ce908866d89)
2024-01-26 22:55:48 +01:00
Nemanja
e624317d37 Cryogenic Sleep Units (#24096)
* Cryogenic sleep units

* pause map support

* no more body deletion

* Cryogenic Storage Units

* boowomp

* no more emag, no more dropping present people

(cherry picked from commit 736b9dd7df6e35f07fed88686c7c863ac61af846)
2024-01-26 22:51:41 +01:00
Skye
be33bad257 Cryo Burn Chem - Aloxadone (#23980)
Aloxadone (accidentally exploded first pr oops)

(cherry picked from commit 9c277bd0e23fb805522f0943cf880c5028eb4f61)
2024-01-26 22:51:19 +01:00
themias
a83c773c3c Grave digging and decomposition (#23646)
* Grave digging and decomposition

* fix

* update based on review comments

* code review

* remove unused field

(cherry picked from commit fd7ff690b1ad7b1cf6cd62deba3076684e3e9282)
2024-01-26 22:50:50 +01:00
Morb
781657f44d Tail wagging (#19573)
* MVP

* Uncomment animated prototypes

* Disable wagging on death

* Move component to server

* Looped tail animation

* Apply front tail template

* Disable animated markings globally

* Add emote sending

* Update documentation

* Move locale

* Use static instantAction & remove action on comp del

* Use fluent POSS-ADJ

* Update docs

* Add copyright

* Update copyright

* Update license & copyright

* Move to main directory & format meta.json

* Fix path

* Change namespace

* Remove empty meta.json

* Update

* REMOVE unnecessary IsNullOrWhiteSpace check

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>

* Move animated markings to main file

* Use emotes

* new

* fix

* fix

* Tests, pls

* fix dixel

* Remove networked from wagging comp

* Remove unused import

* Remove unused imports

* Move wagging comp to shared

* Revert the emotes

If we're getting it the action is better.

---------

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit 9063cfe454263e2616d4d948648d6c73cbc039f9)
2024-01-26 22:38:24 +01:00
deltanedas
8f549d2cae Add greenshift preset (#24029)
Co-authored-by: deltanedas <@deltanedas:kde.org>
(cherry picked from commit 88db476d27a31083cf36276419e8b59530da08a6)
2024-01-26 22:38:22 +01:00
Pieter-Jan Briers
56fb80ad34 BUI bugfixes / improvements (#23881)
* Fix ActivatableUIRequiresPowerCellComponent stopping power draw when one of two people closes the UI.

Also fixes it to check UiKey properly.

* Remove unnecessary CrewManifestViewer on PDAs

This is for a pop-up crew manifest UI, which the PDA doesn't use.

* Fix BoundUIClosedEvents that didn't check UI key/not correctly at least.

Uses the new helper method in engine.

* Fix drone (cargo shuttle) pilot console UI breaking if two people open it and one person closes it.

* Fixes for disposal router/tagger UI.

Code was badly copy pasted without changing identifiers, never worked.

Also cleaned up some of the logic (text trimming, sounds).

Also removed the "refuse to work if you have something in your active hand" check like why.

* Avoid running most ActivatableUIComponent logic when closing a UI via toggle

Activating the UI while it's already open closes it via toggle. Except it still ran 99% of the "attempting to open" logic which makes no sense.

This probably fixes a bug or some other dumb behavior somewhere.

* Bitch

(cherry picked from commit 123a4147dea2945f6c60fe9e4e0a3aa2da75e1dc)
2024-01-26 22:38:21 +01:00
Tayrtahn
87d60504e3 Hackable intercoms (#23984)
* Enable wire interface for intercom

* Implement BlockListening component and system

* Implement ListenWireAction

* Added cooldown/overload to mic wire pulse

* Properly persist voicemask settings when user already has one.

* Addressed requested changes

* Added wire panel open/closed visuals

(cherry picked from commit 2d6d2aba0b1b2b41bbcafb9f60ead926e6b67d16)
2024-01-26 22:37:41 +01:00