Commit Graph

36638 Commits

Author SHA1 Message Date
rosieposie 14e247faaa
Subpatch 4-4-24: I Really Need To Get Better At Naming These Edition (#1058)
* initial commit

- improved park theatre
- moved bridge fireaxe
- gave reporter a fax machine
- secfab moved to armory counter per ramona's suggestion
- armory is less of a cramped PITA to be in
- gave hos a lecter safe instead
- made TEG instructions similarly indestructible and immovable like the med counter paper; at this point i should really just PR some kind of plaque or something,
- singulo room got the substation treatment :)

* canisters

* minor fixes

- fixed jani maints being AA (oops!)
- fixed ID console being in AA bridge counter (made door glass so its clearer its AA too)

* Update submarine.yml

* Update submarine.yml

- west wing of med was unlocked ????
- removed sec intercom in perma
- gave perma the substation :)
- service locked the service autolathe
- fixed space area east of hospital being hard to get into
2024-04-07 15:06:51 -05:00
Velcroboy 9b5b42b4c2
Map Edits: Lighthouse (#1065)
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
2024-04-07 15:06:10 -05:00
UnicornOnLSD f27e972c8d
Edge FIX: cursed steel (#1064)
FIX: cursed steel
2024-04-07 14:56:08 -05:00
deltanedas 52bfd9143d
lighthouse fixes (#1063)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-04-07 14:53:01 -05:00
NullWanderer 8335203b4c
Pro 2024-04-07 18:21:08 +02:00
NullWanderer bd47164e95
Merge remote-tracking branch 'upstream/master' into 2024/04/07-merge-master
# Conflicts:
#	Resources/Prototypes/Catalog/Fills/Books/lore.yml
2024-04-07 18:14:38 +02:00
deltanedas eb933084ae
Merge pull request #1062 from deltanedas/fishops-ops-ops
move fishops manual to deltav
2024-04-07 14:31:05 +00:00
deltanedas 5a262ae2b3 move fishops manual to deltav 2024-04-07 15:14:42 +01:00
NullWanderer b5a6229501
Final yaml fixes 2024-04-07 15:30:30 +02:00
NullWanderer aff5fec56c
Various fixes, I got lazy so its all one commit now 2024-04-07 15:13:36 +02:00
NullWanderer ed50b39ac9
Pro 2024-04-07 14:52:01 +02:00
NullWanderer 31dfe787a0
Possibly fix Syrinx 2024-04-07 14:51:51 +02:00
NullWanderer f86d455221
Mail fix part 2 2024-04-07 14:51:40 +02:00
NullWanderer 9d47ccb1b9
Thing 2024-04-07 14:44:39 +02:00
NullWanderer dea65a9899
Mail fix 1 2024-04-07 14:44:30 +02:00
NullWanderer c80e497cd9
Sake 2024-04-07 14:44:01 +02:00
PJBot a963276f71
Automatic changelog update
(cherry picked from commit 637526773f)
2024-04-07 14:38:28 +02:00
Verm e1f581c878
Fix Water cooler visuals (#26784)
Fix watercooler visuals

(cherry picked from commit 7face4638e)
2024-04-07 14:38:26 +02:00
PJBot a0597e90a0
Automatic changelog update
(cherry picked from commit 98d3ee293c)
2024-04-07 14:38:25 +02:00
osjarw 9f6cbe3869
temporarily remove broken anom behavior (#26775)
Removed `Moving` anom behavior

(cherry picked from commit 1b8fc71dd6)
2024-04-07 14:38:24 +02:00
PJBot 9c60e98f78
Automatic changelog update
(cherry picked from commit 53de870407)
2024-04-07 14:38:23 +02:00
PursuitInAshes c11c743db8
Add sake bottle (#26776)
(cherry picked from commit 8adfa19181)
2024-04-07 14:36:56 +02:00
PJBot 9ddc47ab4a
Automatic changelog update
(cherry picked from commit 813a0b7b7f)
2024-04-07 14:36:38 +02:00
Plykiya 3b1cc3aff7
Change speed threshold for barefeet walking on glass shards and D4 (#26763)
Allow walking over glass shards and D4

Co-authored-by: Plykiya <plykiya@protonmail.com>
(cherry picked from commit 265337d93f)
2024-04-07 14:36:37 +02:00
PJBot 4e88a38613
Automatic changelog update
(cherry picked from commit 47d4a0a411)
2024-04-07 14:36:36 +02:00
BITTERLYNX b4ccb1912c
Fire sprite change for mice (#26758)
* Add new fire sprite for mice that fits them better

* Add the sprite change to rats as well

* Moffroach and hamsters now also have more fitting fire sprites

* made the meta.json easier to read

(cherry picked from commit 78dd193c25)
2024-04-07 14:36:30 +02:00
PJBot 4cc15d7ebb
Automatic changelog update
(cherry picked from commit 5e20c18cb8)
2024-04-07 14:36:02 +02:00
osjarw 2f43089e71
made thin firelocks constructable/deconstructable (#26745)
(cherry picked from commit 107dc0e036)
2024-04-07 14:36:01 +02:00
metalgearsloth b0cf1237c7
Alerts crash fix (#26602)
- If the client tries to call ShowAlert while applying gamestates (e.g. initialising an entity) then this will cause problems. I need to double-check the initial PR before I'd be comfortable with this being merged.

(cherry picked from commit dd03612d80)
2024-04-07 14:36:00 +02:00
PJBot e1b2189bf7
Automatic changelog update
(cherry picked from commit 34980efdb5)
2024-04-07 14:35:56 +02:00
Alzore 9f8885dc48
Dionae now bleed sap, and this can be used to make syrup. (#25748)
* SapAndSyrup

* centrifug

* morewatervapor

* whyisitnotpushing

* nymphs

* lessrealmorefun

(cherry picked from commit 5523e016f4)
2024-04-07 14:35:55 +02:00
PJBot 07b4294c5c
Automatic changelog update
(cherry picked from commit d94eba8c52)
2024-04-07 14:35:22 +02:00
Golinth 20f177a962
Let Mindshields be effected by statusIcon shading (#26754)
Phone Webedit Ops

Original PR author forgot about mindshields for making status icons shaded.

This can be done with other antag icons as well, I remember people mentioning revs being able to see each other in the dark was lame.

(cherry picked from commit 26f41e9fd5)
2024-04-07 14:35:22 +02:00
PJBot 4b64e73c06
Automatic changelog update
(cherry picked from commit e0ac00b256)
2024-04-07 14:35:21 +02:00
superjj18 5f05bc1c67
-fixed Broadcast button never enabling (#26750)
(cherry picked from commit c5441a1b01)
2024-04-07 14:35:16 +02:00
PJBot 1b6ff50219
Automatic changelog update
(cherry picked from commit ec77a161d9)
2024-04-07 14:35:15 +02:00
deltanedas af58fc5b54
make fulton recipe faster and require cloth (#26747)
Co-authored-by: deltanedas <@deltanedas:kde.org>
(cherry picked from commit f433e2d9f8)
2024-04-07 14:35:15 +02:00
Verm c452e05d86
Make baseball bat crafting require a slicing tool (#26742)
Make baseball bat crafting harder

(cherry picked from commit d802928610)
2024-04-07 14:35:14 +02:00
TsjipTsjip 06f48a60fb
CCVars.cs: Minor inconsistency fixes. (#26744)
Update CCVars.cs

* Fixes one file format inconsistency.
* Adds missing </summary> closing tag.

(cherry picked from commit 3817133d92)
2024-04-07 14:35:10 +02:00
PJBot 79908ba0e7
Automatic changelog update
(cherry picked from commit 0afb3337b0)
2024-04-07 14:35:09 +02:00
Dae 08b1729e72
Damage popup type can now be changed with a left click if allowed via component boolean. (#26734)
* Update DamagePopupSystem.cs

* Update DamagePopupSystem.cs

* Add ability to allow or deny type change via component bool

(cherry picked from commit e7fda78a18)
2024-04-07 14:35:09 +02:00
osjarw 22b774344f
fix mopbucket water level (#26740)
(cherry picked from commit 25bcb0c880)
2024-04-07 14:35:08 +02:00
PJBot 1f3a0333dd
Automatic changelog update
(cherry picked from commit 3d88b8ced2)
2024-04-07 14:35:05 +02:00
Dae c1049f2d3a
Make practice projectiles consistent in damage (#26731)
* Make practice weapon damage consistent to 1

* Add book reference to description

(cherry picked from commit 77c4e40fc6)
2024-04-07 14:35:04 +02:00
Mephisto72 78751ead94
Rework Identifier Overrides to prevent showing Law Priority (#26680)
Does-The-Fix

Co-authored-by: Mephisto72 <Mephisto.Respectator@proton.me>
(cherry picked from commit ad0f046f0c)
2024-04-07 14:35:01 +02:00
PJBot aa1a9b22da
Automatic changelog update
(cherry picked from commit 38f9c1c316)
2024-04-07 14:35:00 +02:00
PrPleGoo 57f3f72724
Task/fix nightvision huds (#26726)
* StatusIcon: add field to set if icon should be rendered with shading

* set/unset shader based on icon field

* set new field to true for hud icons

* re-shade health bars

(cherry picked from commit d314a41e4f)
2024-04-07 14:34:58 +02:00
potato1234_x 0e12d02c61
Make the nutribrick one bite smaller (#26719)
Update snacks.yml

(cherry picked from commit bb1cb18aaf)
2024-04-07 14:34:57 +02:00
PJBot f42b4ebcaf
Automatic changelog update
(cherry picked from commit 6e2ab06edd)
2024-04-07 14:34:56 +02:00
Dae 86e9d5c859
Make ducks more viable as an alternative to chickens. (#26729)
Quick tweak to make ducks on par with chickens at cargo

(cherry picked from commit 57b16f5ba2)
2024-04-07 14:34:55 +02:00