Commit Graph

7059 Commits

Author SHA1 Message Date
rosieposie
8dd1748cec Lockable Buttons & Button Frames (#25631)
initial commit
2024-02-27 00:57:17 -07:00
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
Velcroboy
32a440b487 Adjusts wallmount arcs and partially fix nanomed issues (#25451)
* Adjusts wallmount arcs and partially fix nanomed issues

* wall closets

* Guess it wants this

* Adjust arc to 175

---------

Co-authored-by: Jeff <velcroboy333@hotmail.com>
2024-02-26 16:28:55 -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
Sphiral
88ae71715b More windoors (starring directional window) (#25501)
* Added Plasma and Uranium Windoors, plus uranium directional windows

* I forgor the locked proto's too ;-;

* Skill issue, forgot to remove something that was a test

* Please dear git tests, let me sleep (ShardGlassRUranium indeed does not exist)

* No more static prices for windows/windoors

* I wish I knew how to run the tests locally ;-;
2024-02-26 16:25:44 -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
MACMAN2003
0536ce6f95 add NanoTrasen balloon (#25543)
nt balloon

surprised one didn't exist already
2024-02-26 16:15:53 -07:00
SlamBamActionman
3af2928a25 Add nose customization to humans & dwarves (#25557)
Initial commit
2024-02-26 16:15:04 -07:00
Ed
84cbcb93ca Fancy table (#25562)
* blue

* others

* add white table

* add crafting carpets

* finish carpets

* tags

* crafting

* pip

* finish
2024-02-26 16:11:20 -07:00
GNF54
b7b6f61f2a Added several cosmetic items to the Medidrobe (#25582)
Update medidrobe.yml
2024-02-26 16:07:06 -07:00
PoorMansDreams
25deede839 Behonker Lobby Art (#25455)
* Behonker Lobby

* Change to WebP

* More PostProcessing!
2024-02-26 16:06:08 -07:00
Whisper
74232f9831 handcuff replacements are faster to escape from (#25601)
makeshift handcuffs are easier to escape from
2024-02-26 16:05:16 -07:00
Ilya246
849dc43365 macrobomb 20->13 TC (#25585)
Update uplink_catalog.yml
2024-02-26 16:04:26 -07:00
Brandon Hu
5367d99545 fix(cooktime): mushroom pizza are set to the proper cook time of 30 seconds (#25614) 2024-02-26 16:01:21 -07:00
Hanz
6b00f592b6 ERT PDA Fixup (#25606)
meat and potatoes

ayup
2024-02-26 16:00:51 -07:00
CyberDuck
c0290d18f2 Buff/Nerf Gases Cost (#25608)
* Nerf/Buff Gases cost

* Nerf/Buff Gases cost

* Nerf/Buff Gases cost

---------

Co-authored-by: CyberDuck <tsyaslovscky.dima@yandex.by>
2024-02-26 16:00:13 -07:00
Whisper
30e09af2a4 Add weh to: Anomalies, Artifacts, random puddles (#25611)
* Add weh to: Anomalies, Artifacts, random puddles

* also change weh to wehs!
2024-02-26 15:59:15 -07:00
MACMAN2003
89c8226380 Lathe-able LED light tubes and LED bulbs (#25616)
let there be (led) light
2024-02-26 15:58:01 -07:00
Velcroboy
19ce9edf10 Fix inconsistency in onions (#25619)
Co-authored-by: Jeff <velcroboy333@hotmail.com>
2024-02-26 15:57:19 -07:00
Velcroboy
2efad4f3c5 Cleans up base crates for mapping clarity (#25618)
* Cleans up base crates for mapping clarity

* migration

---------

Co-authored-by: Jeff <velcroboy333@hotmail.com>
2024-02-26 15:56:41 -07:00
Boaz1111
76823cc522 swapped icons for RCD crates (#25600)
swapped icons for crates
2024-02-26 07:37:49 -05:00
deltanedas
002b8d8871 add crew monitor as traitor steal objective (#25563) 2024-02-25 22:40:48 -05:00
SlamBamActionman
485fb4cb65 Remove self-uncuff spam suicide, damage changes (#25161)
* Initial commit

* Remove damage from cuffs entirely

* Changed from Action uncuffing cooldown to UseDelay cooldown

* Minor merge conflict fix

* Edit the actual correct line

* Submodule fix
2024-02-26 13:41:20 +11:00
OctoRocket
b7be6932f3 [Tweak] Everything can read (#25580)
Everything can read (kinda)
2024-02-26 13:40:22 +11:00
Ed
656679cb54 Flora anomaly nerf (#25499)
* Update kudzu.yml

* Update living_light.yml

* files

* Update flora.yml

* Update kudzu.yml

* bul

* Update kudzu.yml

* Update living_light.yml

* bullet immune
2024-02-25 15:41:24 -08:00
hiucko
97d41cf945 add "missing spacepen" poster (#25502)
* add missing spacepen poster

adds missing spacepen poster

* Update meta.json

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
2024-02-26 02:33:12 +03:00
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