Commit Graph

24767 Commits

Author SHA1 Message Date
PJBot
757d59cbdd Automatic changelog update 2024-04-29 02:46:00 +00:00
Plykiya
4416a21dd5 Make Smile the Slime grabbable like geras (#27458)
Make smile grabbable like geras

Co-authored-by: Plykiya <plykiya@protonmail.com>
2024-04-29 12:44:54 +10:00
beck-thompson
2135cbdb23 Fixed some mop .ftl capitalization (#27447) 2024-04-29 02:26:44 +02:00
PJBot
f89133b3ad Automatic changelog update 2024-04-28 11:08:42 +00:00
Ubaser
008935f6ec New plant mutation: Pyrotton (#27200)
* WIP

* sprites n stuff

* flavour

* maybe fix

* add stack

* fix parent
2024-04-28 13:07:36 +02:00
PJBot
5476daf64e Automatic changelog update 2024-04-28 09:29:21 +00:00
osjarw
f3e9db0141 DelayedForce and Rapid anom behaviors fixed (#27435) 2024-04-28 12:28:16 +03:00
PJBot
ab66ae9ab0 Automatic changelog update 2024-04-28 08:24:34 +00:00
FungiFellow
1efdf4a40a Bows fit on Airtank Slot (#27433)
Update bow.yml
2024-04-28 18:23:28 +10:00
PJBot
18fa8bf633 Automatic changelog update 2024-04-28 07:12:52 +00:00
Plykiya
0efcd30ac6 Hardsuits, EVA suits, Firesuits, and others now protect your feet from Glass Shards (#26764)
* Hardsuits and softsuits count as having shoes for step triggers

* Add softsuit tag prototype

* Change to suitEVA tag

* Get rid of softsuit tag, found suitEVA tag

* Full pass of ShoesRequiredStepTriggerImmune

* Adds check to outerClothing for ShoesRequiredStepTriggerImmune

* return

* fuck Dionas

* Convert to comp, space dragons immune as well

* Merge conflict

* Merge conflict

* fix leftover tags

* empty spaces

* turns out the dragon didn't need it

* minor optimization

* Add access for system, add comp to baseShoes, check slotflags for every slot besides pockets

* fix

* fuck it we ball

---------

Co-authored-by: Plykiya <plykiya@protonmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-04-28 17:11:46 +10:00
Plykiya
db200faf11 yml fix for locker deconstruction (#27430)
Actual fix for lockers and deconstruction

Co-authored-by: Plykiya <plykiya@protonmail.com>
2024-04-28 16:22:10 +10:00
PJBot
cbb2554c94 Automatic changelog update 2024-04-28 06:13:51 +00:00
exincore
faa7f3461c feat(fax): Fax machines print, copy, and send paper labels (#25979)
* feat(fax): Client fax file-print parses and stores label

* feat(fax): Fax machines print, copy, and send paper labels

* style(Fax): Comments and formatting

* feat(fax): Make fax admin logging more consistent and clear

* refactor(fax): Replace ternary with a simpler null coalescing

* refactor(fax): Make FaxSystem Send method signature consistent with Copy, PrintFile

* refactor(fax): Read entire file and process later instead of peeking first

* refactor(fax): Remove local variables only used for style

* style(fax): Fix some nearby style errors

* fix(fax): Undo an inaccurate change to admin log formatting

* refactor(fax): Separate `firstLine` variable

* fix(fax): Use Environment.NewLine

* bienvenidos

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-04-28 16:12:45 +10:00
PJBot
5c817ddfc1 Automatic changelog update 2024-04-28 05:50:09 +00:00
Boaz1111
a8c297a374 Hyperconvection Circuit Imprinter (#27283)
* not done yet

* i may be stupid

* Update electronics.yml

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-04-28 15:49:03 +10:00
PJBot
47c5f0dba3 Automatic changelog update 2024-04-28 05:47:59 +00:00
Boaz1111
fe8ad485f2 Circuit imprinter now uses less glass (#27310)
* moved from 9 sheets of glass to 5 sheets of glass for all circuit recipes

* Revert "moved from 9 sheets of glass to 5 sheets of glass for all circuit recipes"

This reverts commit 45bb8d40150cddbbe005f5d66d34532b79143f98.

* adresses merge conflict

* fixed error

* parents base computer board to base machine board

* Revert "parents base computer board to base machine board"

This reverts commit dec3a799a90b4a0cb121b6694ecf65d9a0abd6a3.

* other thing was causing errors, guess it's this now
2024-04-28 15:46:53 +10:00
SlamBamActionman
f544c91298 Revert Exterminator pending newmed/redesign (#26978)
* Reverts Exterminator

* Includes commented out parts + sprites

* Readd stuff, comment out yaml

* Popup ads

* review

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-04-28 15:45:54 +10:00
PJBot
d90cba6eed Automatic changelog update 2024-04-28 05:28:02 +00:00
Nemanja
783d3a9aa8 Actual fix for lockers and deconstruction (#27431)
actual actual locker construction fix
2024-04-28 15:26:55 +10:00
PJBot
ee35fb12a7 Automatic changelog update 2024-04-28 05:05:54 +00:00
Keer-Sar
9f747485e9 Medal case whitelist (#27428)
* Create Medal tag and assign tag to medals

* Update Resources/Prototypes/tags.yml

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-04-28 15:04:49 +10:00
PJBot
afbbcd35fa Automatic changelog update 2024-04-28 04:49:25 +00:00
KrasnoshchekovPavel
3fcbbc0732 Added localization of groups and types: damage, metabolism (#27368)
* Added localization of groups and types: damage, metabolism (displayed in the guide book). The text for the health analyzer, weapon damage inspection is now taken from damage prototypes

* fix damage tests

* fix damage test yml

* fix damage test prototypes

* Update Content.Shared/Damage/Prototypes/DamageGroupPrototype.cs

* Update Content.Shared/Damage/Prototypes/DamageTypePrototype.cs

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-04-28 14:48:19 +10:00
RumiTiger
f5b8b5fbdc Sprites for drinks without sprite (attempt 2) (#27227)
* A beer can and a wine can

* fix wrong file locations


---------

Signed-off-by: c4llv07e <kseandi@gmail.com>
Co-authored-by: c4llv07e <kseandi@gmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-04-28 14:43:45 +10:00
PJBot
f88b6f6154 Automatic changelog update 2024-04-28 04:41:13 +00:00
NotSoDana
f5aa5f1f22 Several new bartender tools (#27406)
* added bar specs

* specs in boozeomat

* added jigger in bartender guide

* fixed ice bucket

* cdn

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-04-28 14:40:07 +10:00
metalgearsloth
72f790844f Fix recharger (#27426) 2024-04-28 14:39:42 +10:00
metalgearsloth
d66ad739ee Fix godmode serialization (#27427)
IDK
2024-04-28 14:30:39 +10:00
PJBot
09379a5c77 Automatic changelog update 2024-04-28 04:20:36 +00:00
osjarw
a4504e2fef Fix handlabeler/utility belt misprediction (#26660)
* Fix handlabeler/utility belt misprediction

* Partly moved HandLabelerSystem to shared
And cleaned up HandLabelerComponent

* WIP format the files so later commits look clearer
Doesn't change individual code lines, but may move
functions to another file

* WIP some more code movement

* Hand Labeler is now mostly predicted
Only the UI isn't

* WIP: Formatting and moved stuff

* Using componentstates for prediction correction

* review

* Update label on label change

* Don't overwrite label while editing

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
2024-04-28 14:19:30 +10:00
PJBot
1c78f60bc3 Automatic changelog update 2024-04-28 03:20:39 +00:00
icekot8
a7ad59f6ba Portable Recharger: Arsenal T3 (#26655)
* sys

* item

* ahm.

* Update Content.Server/Power/Components/ChargerComponent.cs

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-04-28 13:19:33 +10:00
PJBot
49d8fe33a3 Automatic changelog update 2024-04-28 03:04:02 +00:00
Plykiya
a478446e5a Printable Special and Empty Mags for Autolathes (#27396)
* Change emag recipes to print mags instead of single ammo

* Get rid of useless single ammo printing recipes

* Add in submachine gun mags

* missing magazine shotgun beanbag in nonlethal research

* Sort lathes that use ammo crafting recipes alphabetically

---------

Co-authored-by: Plykiya <plykiya@protonmail.com>
2024-04-28 13:02:56 +10:00
Ed
f079e77554 Displacement maps now works on any layers (#27405)
* try

* pipupi

* Update ClientClothingSystem.cs

* Update vox.yml

* Update ClientClothingSystem.cs
2024-04-28 12:35:40 +10:00
PJBot
599a66230b Automatic changelog update 2024-04-28 02:26:25 +00:00
Plykiya
be09520aa5 Reduce selection of traitor max from 12 to 8 (#27415)
TOO MANY DAMN SYNDIES

Co-authored-by: Plykiya <plykiya@protonmail.com>
2024-04-28 12:25:19 +10:00
github-actions[bot]
02d2611d94 Update Credits (#27413)
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
2024-04-27 18:21:52 -07:00
PJBot
9ccf95e333 Automatic changelog update 2024-04-27 19:11:52 +00:00
SlamBamActionman
2cb421bc43 Fix suit baldness (#27404)
Initial commit
2024-04-27 13:10:47 -06:00
PJBot
1d2335699d Automatic changelog update 2024-04-27 19:09:44 +00:00
RiceMar1244
8869fc3bb2 Resprite antique laser pistol (#27037)
* Resprites the captain's antique laser pistol

* Adds artist credit

* Improves icon outline and shading

* Replaces new sprites with something more resembling the in-game version
2024-04-27 13:08:38 -06:00
Terraspark4941
34ab1e760d The Honored Quran (Sprite addition) (#27400)
The Honored Quran
2024-04-28 02:36:04 +10:00
PJBot
7c2ea18088 Automatic changelog update 2024-04-27 16:34:03 +00:00
metalgearsloth
74041cf66f Fix literally every single activatable UI bug (#27401)
* Fix all activatable bugs

Apparently this was a load-bearing nullable enum.

* build
2024-04-28 02:32:57 +10:00
nao fujiwara
8a59e9e1f8 repositioned spooky long hair to its proper place in the alphabet (tweak) (#27370)
* repositioned spooky long hair to its proper place in the alphabet

* forgot the meta.json for hairstyles oopsie
2024-04-27 16:58:14 +02:00
Ed
2cefd0ee10 Displacement Map Visualizer QoL (#27392)
* Update Displacement Map Visualizer.lua

* Add files via upload

* Fix background layer being offset

This was caused by not taking the cel's own bounds into account.
Aseprite doesn't make an image layer "full size" if it only covers a
small part of the sprite.

---------

Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
2024-04-27 16:55:28 +02:00
PJBot
2621e31343 Automatic changelog update 2024-04-27 13:54:22 +00:00