Commit Graph

1824 Commits

Author SHA1 Message Date
Julian Giebel
0752acdc2c News UI overhaul and PDA notifications (#19610) 2024-02-26 21:38:00 -04:00
Zadeon
133bd0353a Adds minable salt "ore" (#25324)
* Added salt to ore.yml
Added salt to ores.yml
Added salt walls to asteroid.yml
Added salt to BaseAsteroidDebris' list of ores to generate in asteroids.yml
Added OreSalt to biome_ore_templates.yml
Added salt to guaranteed salvageLoot in salvage_loot.yml
Added salt entry under salvage-magnet-resources in salvage-magnet.ftl
Added WIP sprites for salt.

* Renamed salt's id to SaltOre inside Entities/Objects/Materials/ore.yml
Fixed salt not being grindable due to using an incorrect reagent name
Added salt to ore.rsi/meta.json and rock.rsi/meta.json

* Added chlorine to the list of solutions salt gives when used in the grinder.

* Gave salt ore and salt rock overlay unique sprites.

* Added raw salt to materials/materials.ftl
Updated SaltOre definition in ore.yml to have RawSalt under materialComposition

* Updated saltore definition to give 10 units of tablesalt and 5 units of iodine when ground.
2024-02-26 16:34:15 -07:00
Whisper
ff65cb7b0c Whisper bleed update v3 (#25434)
* Whisper bleed update v3

* missed a few

* Add bleeding message to health analyzer.

* Fix bleed notification not updating.

* Apparently this either doesnt exist
2024-02-26 16:26:46 -07:00
Ed
7a5f81ddb4 Handheld Mass Scanner (#25526)
* handheld

* Update meta.json

* Update meta.json

* Update cargo.yml

* research

* add to borg

* bruh

* borg to T2

* fix
2024-02-26 16:19:51 -07:00
SlamBamActionman
3af2928a25 Add nose customization to humans & dwarves (#25557)
Initial commit
2024-02-26 16:15:04 -07:00
botanySupremist
c6bfb657ad Fixed a few small typos in ghost role information. (#25613)
Co-authored-by: botanySupremist <definitelyrealBotSupremist@gmail.com>
2024-02-26 15:58:44 -07: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
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
Eris
39a2ff5c0a Fix a single grammar error (#25512)
Update food-component.ftl

why was I the only one that noticed it
2024-02-23 19:45:02 -06: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
Ps3Moira
83cd1089fe Add Large Wood Floors (#25462)
Large Wood Floors
2024-02-22 14:59:41 +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
dffdff2423
a3c93b0bd7 Add option for admins to disable bwoink (#25008)
* Add option for admins to disable bwoink

In a vain attempt to get people to ahelp more, provide the possibility
for admins to not play the bwoink sound if they don't want to scare the
player.

* Add silent indicator to discord relay

* Use string interpolation
2024-02-20 23:52:03 -07:00
potato1234_x
33153aaa2e Spaceman's Trumpet and Lily (#25090)
* trumpet + lily +polypy

* trumbet
2024-02-20 23:49:39 -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
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
Errant
7e9bca9891 Food poisoning changes (#25418)
* Food poisoning

* description
2024-02-20 23:12:59 -07:00
Ubaser
573f9a3b46 New HUD theme: Ashen (#25408)
* add

* add

* add
2024-02-20 23:26:55 -06:00
metalgearsloth
841de41a64 Ban loc fix (#25424)
At least I'm pretty sure this is cooked
2024-02-21 15:38:10 +11: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
James Simonson
99aa72e30d Vending UI facelift (#25377)
* Convert to fancy window + added footer + add list spacing

* margin add
2024-02-19 15:18:26 -07:00
LankLTE
1d7167b95b Small Nymph Changes (#25363)
* Emote sounds, accent & doorbump

* Oops

* Only non-brains can't talk
2024-02-19 09:11:20 -08:00
Ubaser
f72a1a0edb Clean up scars.yml and add a new chest scar (#25215)
add
2024-02-17 15:50:39 -05:00
Ubaser
22244b3055 Add "tailed" hair (#25216)
* add

* yes
2024-02-17 15:49:48 -05:00
Flesh
dab2c48849 Change plant clipping mechanics (#25326)
Make seeds from clipped plants inherit the decreased health from parents.
Also require one growth stage before clipping.
2024-02-16 21:02:12 -08:00
LankLTE
407d4aed58 Diona Nymphs & Splitting (#24630)
* Porting & implementation

* Fix two stupid errors

* Human not humans

* fix audio path

* Fix test fails & update cooldown

* Work on reviews & test fail

* Rework nymph organ system.

* Make the nymph organs nospawn.

* IsDeadIC
2024-02-16 18:54:44 -08:00
metalgearsloth
1a438e644f Re-organise main menu screen (#25173)
- The dummy control of 2px size has annoyed me for almost 5 years.
- Why is it in the top-right.
- Why is the server address not labelled.
2024-02-16 13:55:42 -05:00
Pieter-Jan Briers
3a45d519dc Nuke fancification (#25297)
Actually use more icon states for deployed/armed/about to explode

Also unlit layer.

Also examine text
2024-02-15 16:26:45 -08:00
wafehling
f4876bdb26 Artifact hemoglobin trigger now accepts all sentient blood types (#25240)
* Artifact blood trigger now accepts all sentient blood types

* Update artifact-hints.ftl
2024-02-15 15:56:22 -05:00
Pieter-Jan Briers
6d8be538c9 Predict Injector (syringes), cleanup (#25235)
At least the mode/transfer amount logic. Actual transfer logic needs Bloodstream which I didn't wanna move into shared.
2024-02-14 16:05:01 -07:00
k3yw
d2541d6c1f Update criminal-records.ftl (#25229) 2024-02-14 18:02:57 +01:00
Errant
5a9ab3b315 Vox names, species prototype cleanup, some cosmetic changes (#24994)
* voxnames

* New generator parameters, names are more readable

* bunch of missing vox stuff

* more names

* sad
2024-02-14 14:08:45 +11:00
Guilherme Ornel
ff92025026 Fax machines can print from text file (#23262)
* added

* checks tweaking

* fixed what sloth wanted

* fixed?

* dialog diposing fix

* checks tweaking

* more changes

* dispose streamreader

* Update Content.Client/Fax/UI/FaxBoundUi.cs

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* Update Content.Server/Fax/FaxSystem.cs

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* fix minor typo

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-02-14 12:14:51 +11:00
James Simonson
25f73f6406 Microwave UX enhancements (#24547)
* Facelift Microwave UI

Includes new background light in UI, Uses predictive input, UI now properly disables buttons when microwave is active

* Microwave now shows Elapsed time

* Fixed bad formatting

* Added new term for "BottomMargin"

* Change yellow color

* Update StyleNano.cs

just spacing fixed

* Cook time countdown now detached from server


Instead of the server constantly sending out messages for the cook countdown, it is now predicted client side using TimeSpan

* Update MicrowaveMenu.xaml

forgot to re-add item space
2024-02-13 17:16:00 -05:00
Ed
ae321151ca Shadow anomaly returns (#24629)
* content

* add cat

* ambient

* I FORGOT HEARTS!

* fix ambient

* some fixes

* canCollide: false

* connect to damageable

* pi

* remove fx

* some fixes

* *sad bruh*

* hazed

* Update base_shadow.yml
2024-02-13 17:12:32 -05:00
Tayrtahn
75e47fff9e Add verbs to Open/Close Openable containers, and add optional seals (#24780)
* Implement closing; add open/close verbs

* Add breakable seals

* Allow custom verb names; make condiment bottles closeable

* Remove pointless VV annotations and false defaults

* Split Sealable off into a new component

* Should have a Closed event too

* Oh hey, there are icons I could use

* Ternary operator

* Add support for seal visualizers

* Moved Sealable to Shared, added networking

* Replaced bottle_close1.ogg
2024-02-13 17:08:07 -05:00
Kevin Zheng
52f74fa39d Require plants to be harvestable before sampling (#24851) 2024-02-13 17:05:28 -05:00
lzk
4b9f1a47bb Split slime marking leg gradient (#24928)
* Split slime marking leg gradient

* up markings to 4
2024-02-13 17:03:41 -05:00
James Simonson
44ae7d234c Added "wink" and "tearfully smiles" emotes + more cry emote variations (#25129)
Added wink and tearfully smiles emote + more cries  variations
2024-02-13 16:43:20 +01:00
Plykiya
5f2cc18be7 Added display for amount of hits left in stun batons/stun prods. (#25141)
Added display for amount of hits left in stun batons/stunprods.

Co-authored-by: Plykiya <plykiya@protonmail.com>
2024-02-11 23:36:06 -07:00
Flareguy
a93466ac24 Shuttle floor resprite (#25127)
* resprites shuttle tiles

* resprites shuttle floor tiles & adds grey/black shuttle tiles

* attributions.yml update
2024-02-11 13:53:56 -07:00
SlamBamActionman
247be5b5c7 Add option for character name colors in chat & move coloration to clientside (#24625)
* Adds option to disable character names in chat/speechbubbles

* Moved the coloring of names to clientside

* Move string functions to SharedChatSystem to avoid duplicate code in SpeechBubble.cs

* Changed to be put under Accessibility section

* Cache CVar
2024-02-10 22:38:55 -08:00
Jajsha
402051c670 Fix borgs being able to emag themselves (#24748)
* Fix self emagging borgs

* Add popup on self emag failure.
2024-02-10 22:23:32 -08:00
YuNii
148e10207b Remove 'travis scott day' from the game (#25106)
* remove travis scott from the game

* KILL TRAVIS EVEN MORE
2024-02-10 10:25:14 -07:00
themias
f7a3ea6dcf Flipped caps real (#24961)
* Flipped caps real

* oops

* whoops

* flip not fold

* fix formatting

* cargosoft formatting
2024-02-10 00:44:19 -08:00
potato1234_x
667cebef52 Laughin' Peas (#25089)
* laughter

* make clownmobs bleed laughter

* laughin syrup and laughter recipe

* add laughin peas
2024-02-10 00:21:44 -08:00
Varen
b46944f80e Remove battery from crew observation kit, fix description (#25000)
-Remove battery from crew observation kit, fix description
2024-02-10 19:17:07 +11:00