Commit Graph

7032 Commits

Author SHA1 Message Date
wafehling
b30cda8b42 Added Survival to the secret rotation (#25568) 2024-02-25 13:15:35 -08:00
Whisper
1de102d08e Juice that makes you Weh! (but real!) (#25132)
* Juice that makes you Weh!

* Remove dupe

* updated the localization files

* try to fix error
2024-02-26 00:54:07 +11:00
Krunklehorn
902198d7e0 Fix candy bowls (#25514)
* Before SharedItemSystem

* Fixes mispredict, removed unused

* Fix physics
2024-02-26 00:08:14 +11:00
metalgearsloth
bb0776c496 Revert "Cleanup ExecutionSystem (#24382)" (#25555)
* Revert "Cleanup ExecutionSystem (#24382)"

This reverts commit bcbe2ec1af.

* Revert "Executions (#24150)"

This reverts commit 2e83f5a0ec.

# Conflicts:
#	Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
2024-02-25 22:36:17 +11:00
nikthechampiongr
bcbe2ec1af Cleanup ExecutionSystem (#24382)
* Creat Execution Component and add to sharp items

* Kill Server ExecutionSystem. Create ExecutionSystem in shared. Create ActiveExecution Component.
Transferred the Execution system into shared. Heavily re-wrote the system in order to reduce duplication,
and remove gun code from the system.
The melee weapon modifier which was dependant on swing rate was removed.

The ActiveExecutionComponent was created in order to apply the damage modifier to the shot from a gun execution.
It is added just before the gun fires and removed after an attempt is made.

* Fix bugs

The execution completed text will now only show up if the gun fires.

The client also no longer crashes because I forgot to network the component.

* Remove clumsy text

* Make BaseSword abstract

* Add ExecutionComponent to every weapon

* Fix bug

* Remove execution comp from battery weapons

Currently the gun system does not have a way to alter hitscan damage like it does with projectiles.

* Cleanup

* Revert "Remove clumsy text"

This reverts commit a46da6448d5d179a4e936f9213d5622bedb58a16.

* Actually fix the ExecutionSystem

Everything about the shot goes through the gun system now.
The Damage multiplier is only applied when a projectile impacts the target so people that get in the way don't get hit
with 9 times damage for no reason.

In order to make suicides work I needed to create fake EntityCoordinates because the gun system and the projectile
system do not play well with a projectile that has the same start and end position.

* Make launchers able to execute

* Fix prediction bug

The OnAmmoShotEvent is only raised on the server.

* Readd ability for clowns to accidentally shoot themselves while executing

* Cleanup

* Reset melee cooldown to initial value

* Address reviews fix bug

Addressed reviews on overriding messages.
Now I actually mark doafters as handled.
Return normal cooldown to some meleeweapons I forgot on the previous commit.

* Address Reviews

Remove duplication

* Exorcise codebase

Remove evil null coercion that I was sure I removed a while ago

* Address reviews again

* Remove melee weapon attack logic and rely on the system. Remove gun and
melee checks.

* Make system functional again and cleanup

* Remove code I forgot to remove

* Cleanup

* stalled

* Selectively revert gun penetration

The collision layer check doesn't work and I don't have time to fix it.

* Fixes

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-02-25 22:07:10 +11:00
metalgearsloth
ec5edc3626 Selectively revert gun penetration (#25551)
The collision layer check doesn't work and I don't have time to fix it.
2024-02-25 21:58:08 +11:00
lapatison
2a5eb86e22 Minor cookie fortune fix (#25503)
minor locale fix
2024-02-23 18:51:03 +03:00
lzk
7a37d4a013 Make cargo order unanchored thruster and gyroscope (#25497) 2024-02-23 16:49:27 +03:00
liltenhead
4ea1d21b5e Buff emergency welder (#25483)
fuel count
2024-02-23 17:53:38 +11:00
MACMAN2003
2458c87b62 Add Ratvar (#24958)
* Create ratvar.yml

* restore balance to the universe

* scale issues

mfw nar-sie is smaller

* spawner + spawn anim

a shitty spawn anim is better than no spawn anim

* undenseify

no longer as dense as a dying neutron star
2024-02-23 04:42:00 +03:00
lzk
65687375ee Make galoshes obtainable and slowing you (#25484)
* make galoshes obtainable and slowing you

* Update specific.yml
2024-02-23 12:05:11 +11:00
I.K
b7747596f1 Give "DO NOT MAP" suffix to handheld crew monitor (#25473)
don'
2024-02-22 16:40:46 -05:00
Whisper
f38a961a1b fix reagent slime role description being friendly (#25466) 2024-02-22 15:18:46 +03:00
Ps3Moira
83cd1089fe Add Large Wood Floors (#25462)
Large Wood Floors
2024-02-22 14:59:41 +03:00
lzk
35723ad22f Make even more items good looking in inventory + size changing (#25461)
* Make even more items good looking in inventory

* holoprojecrots
2024-02-22 22:28:03 +11:00
liltenhead
85ae40e0a4 Red flashlight color for assault borg (#25465)
assaultborglight
2024-02-22 22:15:10 +11:00
metalgearsloth
d0df5ed5fa Revert "Remove handheld crew monitor (#24761)" (#25439)
* Revert "Remove handheld crew monitor (#24761)"

This reverts commit bbc6d29d21.

# Conflicts:
#	Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
#	Resources/Prototypes/Entities/Structures/Machines/lathe.yml
#	Resources/Prototypes/Research/biochemical.yml
#	Resources/migration.yml

* changes

* zeweh

* dergs
2024-02-22 22:00:35 +11:00
metalgearsloth
7c7bca1d32 Remove obs kit (#24768)
Syndi handheld crew monitor got removed. Give them their own content instead of reskinning NT stuff.
2024-02-22 22:00:25 +11:00
Whisper
26417b76db Fix xeno and dragon blood levels (#25442) 2024-02-21 21:54:15 -05:00
lzk
326b890318 Little rework of existing yaml flatpacks (#24814)
* Little rework of existing yaml flatpacks

* comit 2

* 55

* 66

* 77

* WRAAAA

* done mr sloth

* Update flatpack.yml

* fix??
2024-02-21 21:44:22 -05:00
Killerqu00
ae110685ff Fix EVA helmets quickequip (#25448)
fix quickequip
2024-02-21 18:41:26 -05:00
MjrLandWhale
499aa71b5e Dispenser jug fix (#25450)
* Resprite of Nettle & Death Nettle. Corrected R & L hand locations for all orientations of both plants.

* Removes chemdispensible type from DrinkBase entity

* Updated drink jug names to differentiate from chem jugs

* Add FitsInDispenser type to DrinkGlassBase. Re-allows glasses into beaker slots
2024-02-21 16:26:28 -07:00
Velcroboy
128f5e8625 Adds random pill canister (#25316)
Co-authored-by: Jeff <velcroboy333@hotmail.com>
2024-02-21 15:53:12 -05:00
Fildrance
ef849a0156 fix: #25102 cryo pod now uses health-analyzer system to update body state in UI (#25109)
* fix: cryo pod now uses health-analyzer system to update body state in UI

* refactor: use EntityEventRefHandler instead ComponentEventRefHandler in CryoPodComponent subscribe on EntRemovedFromContainerMessage

---------

Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
2024-02-21 17:47:23 +03:00
Krunklehorn
f29575f43f Voice trigger fixes, death acidifier typos (#24941)
* Fixed length check, added attempt event, added popups on failure

* Fixed file name typo, fixed description

* Converted to else-if
2024-02-20 23:57:23 -07:00
FungiFellow
77e8930a72 Remove Acidifier from Syndie Uplink and Increase Price to 4tc (#25039)
* Blacklist Acidifier from Nukie Uplink and Increase Price to 4tc

* Removing Category to just disappear it from uplinks while keeping the item?

* Price 4, Nukie Uplink Only

* Update uplink_catalog.yml

* Added one backspace
2024-02-20 23:51:11 -07:00
Emisse
c4fc03226e Kill blumpkin donut (#25431) 2024-02-21 17:50:08 +11:00
potato1234_x
33153aaa2e Spaceman's Trumpet and Lily (#25090)
* trumpet + lily +polypy

* trumbet
2024-02-20 23:49:39 -07:00
EdenTheLiznerd
9674b793f4 Nerfs normal nettles to be weaker than their deathnettle counterparts (#25177)
Had an oopsie!
2024-02-20 23:42:52 -07:00
Sphiral
196145685e Adds a mask slot and moves adminPDA to new ID slot for aghost (#25402) 2024-02-20 23:41:37 -07:00
takemysoult
92e115fbe4 add syndicate hud to nukeops uplink (#25087) 2024-02-20 23:41:01 -07:00
Ben Velie
8f0b4694bf Add guidebook page for the RTG (#25040)
The Radioisotope Thermoelectric Generator (RTG) isa power source that
players may encounter in the game that doesn't have an entry in the
guidebook yet. This commit fixes that.
2024-02-20 23:38:29 -07:00
deltanedas
1eb6958ca0 add troll conducting gloves to uplink (#25227)
* add conducting gloves

* add conducting gloves to uplink

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-02-20 23:34:47 -07:00
AlexUm & XGabriel08X
d5e7637d21 Uplink hardsuit bundles rework (#25189)
Change of the hardsuit bundles to be better

Co-authored-by: AlexUm <alexum444@gmail.com>
2024-02-20 23:31:32 -07:00
Jessica M
435efd7cbe Upgrade trash bag max item size to Normal (#25241)
* Upgrade trash bag size to Normal

* let the belt and trash bag box hold the buffed trash bags

---------

Co-authored-by: Jessica M <jessica@maybe.sh>
2024-02-20 23:29:18 -07:00
Ko4ergaPunk
688c9ab817 Add new stairs (#25212)
* Add new stairs

* Resprite

* Resprite again

* empty
2024-02-20 23:28:26 -07:00
Hanz
4372e29c6c Dept. Head Dresser + Locker Fixup (#25206)
* standardized dresser and locker contents for heads

what it says on the tin

* No more 3 labcoats CMO

yup
2024-02-20 23:26:23 -07:00
Debug
8c6a8c3c5c Remove drones, fix InnateToolSystem (#25372)
* Fix drones

* They dont need a full bloodstream

* Incorrect indentation

* Nuke drones

* Fix ClothingHeadHatCatEars

* Remove last mention of drones

* Implement requested changes
2024-02-20 23:23:04 -07:00
Hanz
37a4f2db3a Hud Standardization (#25208)
* Standardization of the Eyepatches

what it says on the tin

* added the pun...

yea
2024-02-20 23:22:30 -07:00
potato1234_x
2cf29944e1 allow happy honk to hold medium sized items (#25245)
allow happy honk to hold medium
2024-02-20 23:21:45 -07:00
Tayrtahn
29cdb9cf4e Add fill level sprites for all the drinks (#25319)
* Fill levels for cuba libre

* Absinthe glass

* Acid Spit

* Ale glass

* Devil's kiss

* Doctor's delight (ugghh)

* Blue Curacao and Emerald Liquor glasses

* Allies cocktail, Martini, Vodka martini, Driest martini, Gildlager glass, Manhattan, Manhattan Project, Patron glass

* Aloe, Amasec, Andalusia, Antifreeze, Atomic Bomb

* Barefoot, B-52, Bahama Mama, Banana Honk, Beepsky Smash, Beer glass, Berry juice, Blood glass, Bloody Mary, Booger, Brave Bull, White Russian

* Whiskey Soda, Whiskey glass, Whiskey Cola, Vermouth glass, Tequila glass

* Cognac glass, Demon's Blood, Erika Surprise, Gargle Blaster, Gin Fizz, Gin & Tonic

* Grog glass, Hippies' Delight, Iced Beer, Irish Car Bomb, Irish Cream glass, Irish coffee

* Long Island Iced Tea, Manly Dorf, Margarita, Mead

* Merge beer steins

* More merging

* Tintable Demon's Blood, Absinthe, Barefoot, Bahama Mama, Beer, Bloody Mary, Booger, Devil's Kiss, Patron

* Sbiten, Coffee Liqueur, Cogchamp, Screwdriver, Rewriter

* Vodka glass, Gin Vodka glass, Wine glass, NT Cahors glass, Poison Wine glass, Rum glass, Dead Rum, Champagne

* Black Russian, Mojito, Neurotoxin, Silencer, Sui Dream, Snow White, Syndicate Bomb, Tequila Sunrise, The Martinez, Three Mile Island

* Green tea, Iced green tea, Iced tea, Grenadine, Iced coffee, Lemonade, Kira Special

* Cafe latte, Soy latte, Nuclear Cola, Singulo, Toxins Special, Vodka Tonic, Ice cream, Rootbeer, Rootbeer float

* Removed rogue pixel in Manhattan fill sprite.
2024-02-20 23:17:56 -07:00
EdenTheLiznerd
cb852296ef Updates The Deathnettle Nerf (#25286)
Bit of an oopsie
2024-02-20 23:16:25 -07:00
Errant
7e9bca9891 Food poisoning changes (#25418)
* Food poisoning

* description
2024-02-20 23:12:59 -07:00
Firewatch
16622f62d6 Additional Glass Doors + Secure Windoors (#25389)
* additional doors

because we all need a bit more in life

* virology isn't an access levl

oh and added detective too

* Update windoor.yml

virology bad
2024-02-20 23:12:35 -07:00
Holinka4ever
2c928817ea Remove sunglasses from ClothesMate. (#25221)
Removing sunglasses from ClothesMate.
2024-02-20 23:11:01 -07:00
Ubaser
573f9a3b46 New HUD theme: Ashen (#25408)
* add

* add

* add
2024-02-20 23:26:55 -06:00
takemysoult
89d0b47354 balance Explosive Technology (#25397)
* update arsenal yml

balance ExplosiveTechnology

* small changes in arsenal research

small changes in arsenal research

* Update arsenal.yml
2024-02-20 19:56:39 -05:00
Gotimanga
dfa59a4df6 Small Artifact Fixes (#25416)
* 20kw artifact fix

* Change that hopefully doesn't completely break storage artifacts without me realising
2024-02-20 17:28:03 -05:00
Golinth
79dc4e4d6f Mindshield outline flashes, (#25409)
* Add animation support to status icons

Animated like any other entity. Change the png to have all frames, add delays in meta.json, and you're good to go.

* Dirty "fix" for the crashing.

Still have no idea why files cannot be read without changing their path in the yaml.

* Sloth review ig

I still have no idea why it wont work with /Textures/ missing as a prefix.
2024-02-20 17:26:48 -05:00
Ed
f64a32990a Train station (#24927)
* some content

* some next content

* fixes

* remove stained window

* return bot message?

* woah! Full map added!

* map update

* big update

* camera server

* Corvax playtest feedback

* add mail system and 30$ meteor shield

* update

* updatik

* hardwork

* pipip

* update

* remove from mappool

* fixes

* sentipode

* e
2024-02-20 15:21:31 -07:00