Commit Graph

36638 Commits

Author SHA1 Message Date
Plykiya 9d9d86dda4
Changed door remote to trigger based on vision occlusion(#25093)
Changed door remote to trigger based on vision occlusion rather than opaque collision targeting check. Ian's butt will no longer absorb your 5G signals.

Co-authored-by: Plykiya <plykiya@protonmail.com>
(cherry picked from commit 7a04acc851)
2024-02-18 22:43:26 +01:00
PJBot 8a51130584
Automatic changelog update
(cherry picked from commit b59dc2911c)
2024-02-18 22:43:17 +01:00
themias d899831a23
Fix crew manifest department bugs (#24975)
(cherry picked from commit 543cd6a236)
2024-02-18 22:43:16 +01:00
PJBot 244658a311
Automatic changelog update
(cherry picked from commit 21e2289d2b)
2024-02-18 22:43:15 +01:00
metalgearsloth 464e4d4b60
Fix screenspace popups (#24987)
* Fix screenspace popups

Never got around to it earlier but need to draw it above UI controls.

* Minor null change

(cherry picked from commit 560ea9775a)
2024-02-18 22:43:01 +01:00
PJBot 8e7b7823a3
Automatic changelog update
(cherry picked from commit 98015a4523)
2024-02-18 22:42:43 +01:00
Alzore 6faa6f4c6e
Nerf Beanbags (#24653)
Lowers beanbag damage from 55 stam to 30 stam

(cherry picked from commit cc5f45bb16)
2024-02-18 22:42:42 +01:00
PJBot fc32b7d4a8
Automatic changelog update
(cherry picked from commit 1be7865661)
2024-02-18 22:42:40 +01:00
themias c39df888d2
Flipped caps real (#24961)
* Flipped caps real

* oops

* whoops

* flip not fold

* fix formatting

* cargosoft formatting

(cherry picked from commit f7a3ea6dcf)
2024-02-18 22:42:29 +01:00
Ubaser 33a715c9cb
EMT Belt Part 2 (#24289)
* add

* fix

* aaaa

(cherry picked from commit b07e8abedb)
2024-02-18 22:40:34 +01:00
Hanz 6ef8f014f4
QM drip DLC (#24477)
* New Drip for the QM

QM beret and QM formal uniform

* Asd

Asd

* Adds the new clothing to the uniform printer

what it says on the tin

* I always forget to update the copyright RAAAAAH

yup

(cherry picked from commit 400036b962)
2024-02-18 22:39:57 +01:00
PJBot d2fda03ab8
Automatic changelog update
(cherry picked from commit 83be2131a0)
2024-02-18 22:39:47 +01:00
potato1234_x 321df5db54
Laughin' Peas (#25089)
* laughter

* make clownmobs bleed laughter

* laughin syrup and laughter recipe

* add laughin peas

(cherry picked from commit 667cebef52)
2024-02-18 22:39:46 +01:00
Nemanja 1efd153b83
prevent opening debug menus without perms (#25091)
prevent people without permissions from opening the tile, entityspawn, or decal menus

(cherry picked from commit 2293f46bca)
2024-02-18 22:38:55 +01:00
lapatison 8d7e6ec58b
Minor airlock assembly clean up (#25073)
1

(cherry picked from commit 39b01fda09)
2024-02-18 22:38:23 +01:00
PJBot a626ecb246
Automatic changelog update
(cherry picked from commit d6c6c1d982)
2024-02-18 22:38:14 +01:00
PoorMansDreams aa482a50b2
Added Tourniquets to stop bleeds (#23198)
* Fixed Error with RobustToolbox Edits. Removed the addition of secbelt tag from assault belt.

* Resprite of the monstrosity

* Resprite of the tourniquet NO LONGER PHALLUS SHAPED

* too bright, now darker and edgier

* Tourniquet resprite

* metajson yay

(cherry picked from commit bd4e2c35ec)
2024-02-18 22:38:05 +01:00
Kevin Zheng d1561c874d
Fix hybridization seedless probability (#25084)
Fix comparison

Hybrids (different plants being crossed) are supposed to have a high
chance of becoming seedless to balance overpowered plants.

However, a logic error in the comparison gave seedless to plants when
they were from the same seed (not hybrids) rather than the other way
around.

Reported by:    @genderGeometries

(cherry picked from commit 28755f5405)
2024-02-18 22:38:04 +01:00
Armok 15a31fff9b
Syndicate key grammar fix (#25085)
* Syndicate encryption key grammar fix

An encryption key used by... wait... Who is owner of this chip? > An encryption key used by... wait... Who is the owner of this chip?

* Syndicate key grammar fix

An encryption key used by... wait... Who is owner of this chip? > An encryption key used by... wait... Who is the owner of this chip?

(cherry picked from commit de0d5e4af6)
2024-02-18 22:38:03 +01:00
Debug dd5e666d94
Revert "Straw hat (#527)"
This reverts commit 1959db69
2024-02-18 22:37:41 +01:00
PJBot a096be29e7
Automatic changelog update
(cherry picked from commit 9e79a26830)
2024-02-18 22:36:05 +01:00
Sk1tch 510d06eac6
Alphabetically sorted guidebook entries (#24963)
* - Renamed GetSortedRootEntries to GetSortedEntries and added child sorting logic
- Removed unessesary Tree.SetAllExpanded(true) call in RepopulateTree

* Adding back deleted setallexpanded call to check if test passes

---------

Co-authored-by: Your Name <you@example.com>
(cherry picked from commit 3b2921a3cc)
2024-02-18 22:36:04 +01:00
PJBot 78767f27e8
Automatic changelog update
(cherry picked from commit a81ce947a1)
2024-02-18 22:36:02 +01:00
Adrian16199 471f2ac24b
Straw hat. (#24997)
* Straw hat.

A craftable, flammable straw hat.

Thats it.

* seems to made it go in flames!

(cherry picked from commit 007adfc8a6)
2024-02-18 22:35:47 +01:00
PJBot 98ce6dac27
Automatic changelog update
(cherry picked from commit a6de63cfd0)
2024-02-18 22:35:17 +01:00
Vero 6c559d9ce2
Fixes indestructible mop buckets (#25001)
* destructible mop buckets

* remove wwod

* spacing

---------

Co-authored-by: doom <ghostrecon5123@gmail.com>
(cherry picked from commit 717d4230e2)
2024-02-18 22:35:16 +01:00
PJBot 3872c7a6e3
Automatic changelog update
(cherry picked from commit 8422216f3f)
2024-02-18 22:35:15 +01:00
crazybrain23 9a5206051b
fix follow comannd help locale (#25032)
(cherry picked from commit f77550dc83)
2024-02-18 22:35:13 +01:00
nikthechampiongr 5c93eca7d8
Fix brig timer labels to displaying correctly. (#25033)
* Fix brig timer labels to displaying correctly.

The TextScreenSystem was expecting a string, but the value inputted for
the label was an array of strings.

* Address nitpick

This should do the exact same thing but it is semantically clearer I guess.

(cherry picked from commit 1a3ce6cf2c)
2024-02-18 22:35:12 +01:00
PJBot c3fd1a5f38
Automatic changelog update
(cherry picked from commit e57cfea9f6)
2024-02-18 22:35:11 +01:00
Ubaser 8a14ecf215
Small t-ray scanner resprite (#25047)
add

(cherry picked from commit 601da0c3a3)
2024-02-18 22:35:09 +01:00
PJBot 6b225dd84c
Automatic changelog update
(cherry picked from commit 3f0572b4e6)
2024-02-18 22:35:08 +01:00
Krunklehorn 47855327c3
Remove tail wag emote text (#25054)
Removed emote text

(cherry picked from commit af21657cc3)
2024-02-18 22:35:07 +01:00
Ilya246 df7894cde6
allow building atmos devices on lattice or thindow tiles (#25057)
do

(cherry picked from commit 5380f64cca)
2024-02-18 22:35:06 +01:00
Tunguso4ka db3ed7c35c
Paper is now bad food (#25065)
(cherry picked from commit 6c20938c46)
2024-02-18 22:34:59 +01:00
deltanedas a8ff692f81
fix fish labeler crafting (#822)
* fix fish labeler crafting

* hand labeler tag

* remove dupe tag

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-02-18 22:17:06 +01:00
DeltaV-Bot c089507be5 Automatic Changelog Update (#685) 2024-02-18 02:36:31 +00:00
VMSolidus 8df7cc309e
Metempsychosis Returns (#685)
* Metempsychosis Returns

* Last updates

* Fixin the linter

* Update lathe.yml

* Update CloningSystem.cs

* Fixing the random name bug

* Fugitive, rough but functional

* Update fugitive.yml

* Update humanoid.yml

* Checking if its the floortile

* Guh

* Update EntityTest.cs

* Revert "Update EntityTest.cs"

This reverts commit 82375acd67.

* Revert "Guh"

This reverts commit bc98f0f858.

* Revert "Checking if its the floortile"

This reverts commit 51d3355cc1.

* Revert "Update humanoid.yml"

This reverts commit 5af8fbdabe.

* Revert "Update fugitive.yml"

This reverts commit 13124dbc77.

* Revert "Fugitive, rough but functional"

This reverts commit 47586c3b15.

* Update Content.Server/Medical/Components/MedicalScannerComponent.cs

Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Signed-off-by: VMSolidus <evilexecutive@gmail.com>

* Update Content.Server/Nyanotrasen/Cloning/MetempsychosisKarmaComponent.cs

Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Signed-off-by: VMSolidus <evilexecutive@gmail.com>

* Update Content.Server/Nyanotrasen/Cloning/MetempsychoticMachineComponent.cs

Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Signed-off-by: VMSolidus <evilexecutive@gmail.com>

* Update Content.Server/Nyanotrasen/Cloning/MetempsychoticMachineSystem.cs

Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Signed-off-by: VMSolidus <evilexecutive@gmail.com>

* Update Content.Server/Nyanotrasen/Cloning/MetempsychoticMachineSystem.cs

Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Signed-off-by: VMSolidus <evilexecutive@gmail.com>

* Update Content.Server/Nyanotrasen/Cloning/MetempsychoticMachineSystem.cs

Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Signed-off-by: VMSolidus <evilexecutive@gmail.com>

* Update Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/metempsychoticMachine.yml

Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Signed-off-by: VMSolidus <evilexecutive@gmail.com>

* Update Resources/Prototypes/Nyanotrasen/Research/biochemical.yml.yml

Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Signed-off-by: VMSolidus <evilexecutive@gmail.com>

* Update Resources/Textures/Nyanotrasen/Structures/Machines/metempsychotic.rsi/meta.json

Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Signed-off-by: VMSolidus <evilexecutive@gmail.com>

* Update CloningSystem.cs

Signed-off-by: VMSolidus <evilexecutive@gmail.com>

* Update CloningSystem.cs

* Update Content.Server/Nyanotrasen/Cloning/MetempsychoticMachineSystem.cs

Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Signed-off-by: VMSolidus <evilexecutive@gmail.com>

* Update MetempsychoticMachineSystem.cs

* Cleaning up some of the Metem code

* Update CloningConsoleSystem.cs

reordering for less merge conflict

Signed-off-by: VMSolidus <evilexecutive@gmail.com>

* Reordering usings for less merge conflicts

Signed-off-by: VMSolidus <evilexecutive@gmail.com>

* Update HumanoidAppearanceComponent.cs

Signed-off-by: VMSolidus <evilexecutive@gmail.com>

* Update CloningSystem.cs

Signed-off-by: VMSolidus <evilexecutive@gmail.com>

* Apply suggestions from code review

Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Signed-off-by: VMSolidus <evilexecutive@gmail.com>

* Update CloningConsoleSystem.cs

Somehow this got removed during cleanup

Signed-off-by: VMSolidus <evilexecutive@gmail.com>

* Update CloningConsoleSystem.cs

Signed-off-by: VMSolidus <evilexecutive@gmail.com>

* Update CloningSystem.cs

I put it back in the wrong file...

Signed-off-by: VMSolidus <evilexecutive@gmail.com>

* Update CloningConsoleSystem.cs

Signed-off-by: VMSolidus <evilexecutive@gmail.com>

* Apply suggestions from code review

Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Signed-off-by: VMSolidus <evilexecutive@gmail.com>

* Requested changes but need assistance with test fail

* biochem is gone apparently

* Update experimental.yml

Signed-off-by: VMSolidus <evilexecutive@gmail.com>

* Update MetempsychosisTest.cs

* Update CloningSystem.cs

---------

Signed-off-by: VMSolidus <evilexecutive@gmail.com>
Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
2024-02-18 03:36:16 +01:00
Debug 1e83a0ed6e
Update MARKERS.md
Signed-off-by: Debug <49997488+DebugOk@users.noreply.github.com>
2024-02-18 03:14:03 +01:00
Debug 2489bbfab5
Relicense future content under APGLv3 2024-02-18 03:11:47 +01:00
Debug 87c70a89a6
Update CODEOWNERS
Removes invalid warning, takes care of last unowned files

Signed-off-by: Debug <49997488+DebugOk@users.noreply.github.com>
2024-02-17 22:48:01 +01:00
DeltaV-Bot e598e90893 Automatic Changelog Update (#838) 2024-02-17 03:38:28 +00:00
Fluffiest Floofers 9a2f0e695d
Glimmer Drain requires 5 crystal again (#838)
5 normality crystals
2024-02-16 22:38:14 -05:00
Guess-My-Name 5ba1e6cb04
Glimmer Mite change (#845)
fix
2024-02-16 22:38:00 -05:00
Debug 330e0e37d9
*Properly* fix salvage strings (#840)
Me when the maps
2024-02-17 01:48:04 +01:00
DeltaV-Bot 77c4a5a67e Automatic Changelog Update (#837) 2024-02-15 17:27:40 +00:00
Fluffiest Floofers a98b4ebaaa
Vulpkanin's Deuteranopia (#837)
* Everyone loves dog vision

Updated to match the the harpy code

* change locale name
2024-02-15 18:27:23 +01:00
Velcroboy de0917200f
Map Edits: Shoukou (#833)
Co-authored-by: Velcroboy <>
2024-02-13 23:29:18 +00:00
Adrian16199 0798ea3ec3
Shoukou small patch (#816)
* Shoukou small patch

Deletes plasma miner
Deletes command cryo
Replaces cryo in prison with cryo with prisoners included edition
Ensures techmaints are under robotics and cryo
Fixes shutters in robotics
Provides medical with a singular cryo

* gets rid of invalid

* Update shoukou.yml

---------

Co-authored-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
2024-02-13 17:17:22 -06:00
Debug 6687a3187f
Prevent action runners from being wasted on DeltaV-Bot (#831)
Stop actions from running on our bot
2024-02-13 16:12:37 +00:00