Commit Graph

36638 Commits

Author SHA1 Message Date
takemysoult 74f8e725ef
add syndicate hud to nukeops uplink (#25087)
(cherry picked from commit 92e115fbe4)
2024-03-05 09:43:14 +01:00
PJBot 9ee282eaee
Automatic changelog update
(cherry picked from commit bc9c31aacc)
2024-03-05 09:43:10 +01:00
Debug 9822e6f6e1
Fix CarryingSystem 2024-03-05 09:42:54 +01:00
metalgearsloth 345cb0f96d
Remove contests (#25425)
- Not mentioned anywhere ingame.
- Stupid.

(cherry picked from commit 012e6e6c86)
2024-03-05 09:39:03 +01:00
PoorMansDreams 9e2288726d
No More DMCA over pirate_start (#25153)
ARRG!

(cherry picked from commit b98450a3ef)
2024-03-05 09:37:25 +01:00
Ben Velie a9d353ac57
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.

(cherry picked from commit 8f0b4694bf)
2024-03-05 09:37:18 +01:00
PJBot 32193a8dca
Automatic changelog update
(cherry picked from commit 80fa454f99)
2024-03-05 09:36:59 +01:00
deltanedas c731c62a5c
add troll conducting gloves to uplink (#25227)
* add conducting gloves

* add conducting gloves to uplink

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
(cherry picked from commit 1eb6958ca0)
2024-03-05 09:36:48 +01:00
AlexUm & XGabriel08X 64de7c31c9
Uplink hardsuit bundles rework (#25189)
Change of the hardsuit bundles to be better

Co-authored-by: AlexUm <alexum444@gmail.com>
(cherry picked from commit d5e7637d21)
2024-03-05 09:36:44 +01:00
Jessica M 428cdce609
Upgrade trash bag max item size to Normal (#25241)
* Upgrade trash bag size to Normal

* let the belt and trash bag box hold the buffed trash bags

---------

Co-authored-by: Jessica M <jessica@maybe.sh>
(cherry picked from commit 435efd7cbe)
2024-03-05 09:36:40 +01:00
Ko4ergaPunk 73249e78bf
Add new stairs (#25212)
* Add new stairs

* Resprite

* Resprite again

* empty

(cherry picked from commit 688c9ab817)
2024-03-05 09:36:37 +01:00
PJBot bff7e071fd
Automatic changelog update
(cherry picked from commit 44d7c4c4bc)
2024-03-05 09:36:34 +01:00
Hanz fefb3dea92
Dept. Head Dresser + Locker Fixup (#25206)
* standardized dresser and locker contents for heads

what it says on the tin

* No more 3 labcoats CMO

yup

(cherry picked from commit 4372e29c6c)
2024-03-05 09:36:29 +01:00
PJBot 46755a9a0b
Automatic changelog update
(cherry picked from commit 390ca2a7b2)
2024-03-05 09:35:13 +01:00
Debug 9a246f9527
Remove drones, fix InnateToolSystem (#25372) 2024-03-05 09:34:57 +01:00
Hanz f5596cf166
Hud Standardization (#25208)
* Standardization of the Eyepatches

what it says on the tin

* added the pun...

yea

(cherry picked from commit 37a4f2db3a)
2024-03-05 09:31:47 +01:00
potato1234_x 63616af932
allow happy honk to hold medium sized items (#25245)
allow happy honk to hold medium

(cherry picked from commit 2cf29944e1)
2024-03-05 09:31:27 +01:00
Tayrtahn ae6b5434fd
Add fill level sprites for all the drinks (#25319)
* Fill levels for cuba libre

* Absinthe glass

* Acid Spit

* Ale glass

* Devil's kiss

* Doctor's delight (ugghh)

* Blue Curacao and Emerald Liquor glasses

* Allies cocktail, Martini, Vodka martini, Driest martini, Gildlager glass, Manhattan, Manhattan Project, Patron glass

* Aloe, Amasec, Andalusia, Antifreeze, Atomic Bomb

* Barefoot, B-52, Bahama Mama, Banana Honk, Beepsky Smash, Beer glass, Berry juice, Blood glass, Bloody Mary, Booger, Brave Bull, White Russian

* Whiskey Soda, Whiskey glass, Whiskey Cola, Vermouth glass, Tequila glass

* Cognac glass, Demon's Blood, Erika Surprise, Gargle Blaster, Gin Fizz, Gin & Tonic

* Grog glass, Hippies' Delight, Iced Beer, Irish Car Bomb, Irish Cream glass, Irish coffee

* Long Island Iced Tea, Manly Dorf, Margarita, Mead

* Merge beer steins

* More merging

* Tintable Demon's Blood, Absinthe, Barefoot, Bahama Mama, Beer, Bloody Mary, Booger, Devil's Kiss, Patron

* Sbiten, Coffee Liqueur, Cogchamp, Screwdriver, Rewriter

* Vodka glass, Gin Vodka glass, Wine glass, NT Cahors glass, Poison Wine glass, Rum glass, Dead Rum, Champagne

* Black Russian, Mojito, Neurotoxin, Silencer, Sui Dream, Snow White, Syndicate Bomb, Tequila Sunrise, The Martinez, Three Mile Island

* Green tea, Iced green tea, Iced tea, Grenadine, Iced coffee, Lemonade, Kira Special

* Cafe latte, Soy latte, Nuclear Cola, Singulo, Toxins Special, Vodka Tonic, Ice cream, Rootbeer, Rootbeer float

* Removed rogue pixel in Manhattan fill sprite.

(cherry picked from commit 29cdb9cf4e)
2024-03-05 09:31:25 +01:00
PJBot a30b6fee0f
Automatic changelog update
(cherry picked from commit d1d4651bfb)
2024-03-05 09:31:19 +01:00
EdenTheLiznerd 887a1c1d7f
Updates The Deathnettle Nerf (#25286)
Bit of an oopsie

(cherry picked from commit cb852296ef)
2024-03-05 09:31:17 +01:00
PJBot c2f9048e20
Automatic changelog update
(cherry picked from commit 1de06bd8f7)
2024-03-05 09:31:15 +01:00
Errant bf08589ec6
Food poisoning changes (#25418)
* Food poisoning

* description

(cherry picked from commit 7e9bca9891)
2024-03-05 09:31:11 +01:00
Firewatch ba8d24d15a
Additional Glass Doors + Secure Windoors (#25389)
* additional doors

because we all need a bit more in life

* virology isn't an access levl

oh and added detective too

* Update windoor.yml

virology bad

(cherry picked from commit 16622f62d6)
2024-03-05 09:31:03 +01:00
PJBot 044b262cc6
Automatic changelog update
(cherry picked from commit 1e0b62a38c)
2024-03-05 09:30:29 +01:00
Holinka4ever 5c88eb6c64
Remove sunglasses from ClothesMate. (#25221)
Removing sunglasses from ClothesMate.

(cherry picked from commit 2c928817ea)
2024-03-05 09:30:26 +01:00
PJBot 06728b8b83
Automatic changelog update
(cherry picked from commit 254d144cf6)
2024-03-05 09:30:22 +01:00
Ubaser 64c2bb867f
New HUD theme: Ashen (#25408)
* add

* add

* add

(cherry picked from commit 573f9a3b46)
2024-03-05 09:30:18 +01:00
metalgearsloth 2fba4ff6d7
Ban loc fix (#25424)
At least I'm pretty sure this is cooked

(cherry picked from commit 841de41a64)
2024-03-05 09:30:08 +01:00
PJBot 80940164ff
Automatic changelog update
(cherry picked from commit 7a2546cad8)
2024-03-05 09:29:50 +01:00
UnicornOnLSD b06e894014
Pebble minor update (#922)
* catch up to recent additions (+ psych office, better med, EPI cams, cryo)

* Fixed more cams, named APCs, colored distro and waste

* named ALL apcs after testing

* more cams fix, betterer cryosleepTM
2024-03-04 12:09:55 -06:00
Velcroboy 4f85c05568
Hurve (#927)
* Map Hotfix: The Hive

* yeet cloning board

* Whatever

---------

Co-authored-by: Velcroboy <>
2024-03-04 17:19:16 +00:00
Velcroboy 83c5db9f68
Adjust suffix for red light (#843)
Co-authored-by: Velcroboy <>
2024-03-04 10:59:24 -06:00
DeltaV-Bot b3daeff6ac Automatic Changelog Update (#925) 2024-03-02 23:00:20 +00:00
Tad "Taddy" Johnson 2ba468d712
Warden whitelist (#925)
Make the warden whitelisted, increase playtime requirements.
No more redshirts with RPGs, show a little class.
2024-03-02 23:00:07 +00:00
DeltaV-Bot b1eef8dbde Automatic Changelog Update (#924) 2024-03-02 22:41:26 +00:00
Debug f0232420f9
1984 rat kings (#924)
Unanimous admin vote

Signed-off-by: Debug <49997488+DebugOk@users.noreply.github.com>
2024-03-02 22:41:12 +00:00
DeltaV-Bot 148996ffe1 Automatic Changelog Update (#919) 2024-03-02 22:27:28 +00:00
deltanedas 1d24249d49
make midround antag spawn code better (#919)
* kill shitcode

* give each midround antag its own spawn rule

* using

* break test real

* typographical error

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-03-02 23:27:13 +01:00
DeltaV-Bot 81830857a0 Automatic Changelog Update (#859) 2024-03-01 23:41:25 +00:00
Adrian16199 a79d53c7f0
Adds Prescription huds (#859)
* Adds prescription huds.

THATS RIGHT.
TO THOSE 3 PLAYERS THAT USE NEARSIGHTED.
YOU CAN NOW SMASH TOGETHER A BRAND NEW TOOL TO HELP YOUR AID DURING WORKING HOURS.
*WOW, SO AMAZING.*

(For legal reasons, said advertisement was not trying to cause any mental or physical harm or legal obligations with medical and security industry who made said huds.)

* forgot to delete these

* Update Resources/Prototypes/DeltaV/Entities/Clothing/Eyes/hud.yml

Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Signed-off-by: Adrian16199 <144424013+Adrian16199@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Signed-off-by: Adrian16199 <144424013+Adrian16199@users.noreply.github.com>

---------

Signed-off-by: Adrian16199 <144424013+Adrian16199@users.noreply.github.com>
Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
2024-03-01 18:41:10 -05:00
Debug 2083d8897a
Update CODEOWNERS
Signed-off-by: Debug <49997488+DebugOk@users.noreply.github.com>
2024-03-02 00:00:16 +01:00
Debug 813db18871
Re-enable AnyCommand on acts 2024-03-01 01:04:24 +01:00
Velcroboy bc9ee3f925
Map Hotfixes (#920)
Co-authored-by: Velcroboy <>
2024-02-29 17:42:51 -06:00
Adrian16199 896732946b
A quick patch for shoukou. (#917)
Gives a cell charger to medical with 2 rollerbeds
Also gave a medical locker to the break room in medical aswell as a small treat.
2024-02-29 11:56:08 -06:00
DeltaV-Bot 972ce3fdb2 Automatic Changelog Update (#912) 2024-02-28 16:55:01 +00:00
Debug f03e28a694
Disable psionic invisibility (#912)
Update psionicPowers.yml

Signed-off-by: Debug <49997488+DebugOk@users.noreply.github.com>
2024-02-28 16:54:47 +00:00
Adrian16199 a8701ca682
Expands Shoukou's medical (#898)
* Expands Shoukou's medical

Everything from the right of medical,
From the right of medical up to the bridge needs to be checked because I moved ALL OF IT.

* Update shoukou.yml

* Update shoukou.yml
2024-02-28 09:26:55 -06:00
Velcroboy 45d69b072f
Map Edits (#911)
Co-authored-by: Velcroboy <>
2024-02-27 18:11:40 -06:00
Velcroboy dd3560eca7
Map Hotfix: The Hive (#910)
Co-authored-by: Velcroboy <>
2024-02-27 01:47:10 -06:00
Velcroboy 7b95d4b0d2
Replaces romerol pill w/ ambuzol (#906)
Co-authored-by: Velcroboy <>
2024-02-26 16:39:41 -06:00