Commit Graph

20815 Commits

Author SHA1 Message Date
DeltaV-Bot d126ed2cd7 Automatic Changelog Update (#435) 2023-11-11 16:37:26 +00:00
Velcroboy ef89695780
Hive five (#435)
* The Hive Rebase

* Remove un-merged maps from files

---------

Co-authored-by: Jeff <>
2023-11-11 10:37:11 -06:00
DeltaV-Bot 648cb3eb54 Automatic Changelog Update (#434) 2023-11-11 01:25:49 +00:00
Colin-Tel 86994b536b
Added Head ID cards to lockers (#434)
Because sometimes you have the locker, but not the guy who owns it.
2023-11-10 19:25:32 -06:00
DeltaV-Bot 7626f30e69 Automatic Changelog Update (#413) 2023-11-10 15:08:40 +00:00
Colin-Tel c60178f721
Set max head revs to 1 (#413)
* Update RevolutionaryRuleComponent.cs

* Revert cs change & change prototype

passed tests locally
2023-11-10 16:08:25 +01:00
DeltaV-Bot db9fe5b19e Automatic Changelog Update (#426) 2023-11-10 15:08:18 +00:00
Echo 3a803a6f35
Expand valid character names (#426) 2023-11-10 16:08:01 +01:00
Fluffiest Floofers c90b38bdf4
Removes Security Gear from Salvage Corpses (#431)
* Removes corpsmangear from corpses

* Prevent sec corpses
2023-11-09 19:25:36 -06:00
Velcroboy 29233c7150
Map Edits (#432)
* Map Edits

* Fixgridatmos

---------

Co-authored-by: Jeff <>
2023-11-09 19:23:24 -06:00
DeltaV-Bot 4e032a3391 Automatic Changelog Update (#430) 2023-11-09 19:01:45 +00:00
VMSolidus dd4cb7f203
Laika is Smart Doggo (#430) 2023-11-09 13:01:30 -06:00
DeltaV-Bot 6b15012a8e Automatic Changelog Update (#429) 2023-11-09 04:22:37 +00:00
Colin-Tel 2e0181858f
Fix custom round end sounds (#429)
* Update announcements.yml

* Update announcements.yml

oops I missed a couple

* Update announcements.yml

:trollface:
2023-11-09 04:22:23 +00:00
Colin-Tel 6563ebaa3d
Update asterisk.yml (#427)
* Update asterisk.yml

Fixed unpowered maint hatch
Added YouTool and mini-jetpack to engineering

* Update asterisk.yml

Gave Salvage a pair of insuls

* Update asterisk.yml

gave security a secway, water bottles, and the corpsman gets a microwave and donk pockets
2023-11-09 03:04:53 +00:00
DeltaV-Bot 645818cf1c Automatic Changelog Update (#421) 2023-11-08 22:44:52 +00:00
leo 5ef7a9ea38
Reskin Glimmer Machines (Prober and Drain) (#421)
* glimmer machines reskin

* Update glimmer_prober.yml

add comments

Signed-off-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>

---------

Signed-off-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
2023-11-08 22:44:38 +00:00
Fluffiest Floofers 2edfb06970
readds that (#415) 2023-11-08 16:32:39 -06:00
CodedCrow 9c6ddd7515
Shiva as ghost role (#416)
* Update pets.yml

* Added proper description in locale folder

* Double checking my grammer

Boy is it going to be weird if this needs to be fixed later and only gets reverted

* using their instead of his/her/their

* Update pets.yml

added comment

Signed-off-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>

---------

Signed-off-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
2023-11-08 16:31:53 -06:00
Carolyn3114 d994e292b6
fixes warden + sec hardsuits (#420) 2023-11-08 16:31:22 -06:00
DeltaV-Bot 833a85360c Automatic Changelog Update (#419) 2023-11-08 22:30:53 +00:00
VMSolidus 07382cda5e
Trimming the bird emotes (#419)
* Trimming the bird emotes

* Guh
2023-11-08 16:30:39 -06:00
Fluffiest Floofers de7f97b8fe
Fix Mass Sleep being Telegnosis (#418)
* fix

* add icons for actions with target
2023-11-08 16:29:33 -06:00
Velcroboy cc0575a85f
Arena Hotfix 2 (#425)
Co-authored-by: Jeff <>
2023-11-08 18:26:06 +00:00
Debug 771f5b6b86
Update theater.yml (#424)
Signed-off-by: Debug <49997488+DebugOk@users.noreply.github.com>
2023-11-08 18:23:24 +00:00
Velcroboy 55d00bfcef
CRITICAL Hotfix (#422)
Co-authored-by: Jeff <>
2023-11-08 18:51:56 +01:00
DeltaV-Bot 677f68ed81 Automatic Changelog Update (#407) 2023-11-07 19:33:07 +00:00
deltanedas 0d83a6d44d
add carp suit to autodrobe (#407)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-11-07 13:32:52 -06:00
DeltaV-Bot 5677e4f3ca Automatic Changelog Update (#397) 2023-11-07 19:32:09 +00:00
Velcroboy 9103743e8e
Arena Rebase (#397)
* Arena Rebase

* Updates proto file

---------

Co-authored-by: Jeff <>
2023-11-07 13:31:54 -06:00
DeltaV-Bot 8696d52c55 Automatic Changelog Update (#408) 2023-11-07 19:31:17 +00:00
Fluffiest Floofers 85d8d4106b
Reverse Engineering guidebook + fixes (#408)
* Reverse engineering guidebook

* Make it so upgrades actually increase scan bonus

* i love when uncommenting creates spaces

* the code checks for capacitor

* Revert capacitor changes and change code

* fix the guidebook still using scanning module

* woops
2023-11-07 13:31:01 -06:00
Fluffiest Floofers c5debff3fe
buh plz pr fried eggs graph soon (#409) 2023-11-07 13:29:06 -06:00
Fluffiest Floofers 6aa5c82082
Merge MailDrobe and CourierDrobe (#412)
* merge maildrobe and courierdrobe

* combine the sprite
2023-11-07 13:28:33 -06:00
Colin-Tel ef74ef7c5b
Hotfix Asterisk (#414)
fixed cargo shuttle not having room to dock
changed maintenance hatch access where it should have been maints locked
2023-11-07 13:27:10 -06:00
DeltaV-Bot 3af6dcd73d Automatic Changelog Update (#411) 2023-11-07 13:37:05 +00:00
Colin-Tel 623fb89b25
Add the Salvage Expedition board to research (#411)
* Expedition board is now researchable

Adds the Salvage Expedition Computer board recipe
Adds the board recipe to the Salvage Equipment research

* Update Rules.txt

Updated the rules since expeditions are coming back.
2023-11-07 07:36:49 -06:00
DeltaV-Bot 16cb7ca473 Automatic Changelog Update (#388) 2023-11-06 15:47:12 +00:00
Fluffiest Floofers e1dfcdeef1
Mediborg Candy Frabication (#388)
* whynot

* buh
2023-11-06 09:46:56 -06:00
DeltaV-Bot ff00cf5044 Automatic Changelog Update (#406) 2023-11-06 15:25:41 +00:00
Colin-Tel ac4be63537
Update asterisk.yml (#406)
* Update asterisk.yml

Added meteor netting to prevent evac from docking at cargo
Changed layout of Epi's park to prevent getting stuck
Added a plasma canister to TEG area
Named all substations and SMESs
Minor changes to courtroom
Changed Command maintenance hatch at EVA room to EVA airlock
Moved CE's fireaxe into TEG area for more use
Fixed lack of power to alternate evac

* Update asterisk.yml

made some lattice into plating to prevent easy removal
2023-11-06 09:25:24 -06:00
Fluffiest Floofers 17ff511e1c
Ombre and Crewcut haircuts classic variants (#402)
* Ombre and Crewcut

* Update hair.ftl

untouched line

Signed-off-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>

---------

Signed-off-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
2023-11-06 15:19:57 +00:00
DeltaV-Bot 11651ccb3e Automatic Changelog Update (#404) 2023-11-06 14:54:25 +00:00
Fluffiest Floofers 84ebcae6e8
Update uplink_catalog.yml (#404) 2023-11-06 15:54:09 +01:00
DeltaV-Bot a29a4947aa Automatic Changelog Update (#405) 2023-11-06 14:40:17 +00:00
Fluffiest Floofers b236a3ec98
move cat ears (#405) 2023-11-06 15:39:49 +01:00
DeltaV-Bot fbcbf53526 Automatic Changelog Update (#401) 2023-11-05 19:25:06 +00:00
Fluffiest Floofers 69bc13d58c
comment out starvation damage (#401) 2023-11-05 20:24:51 +01:00
Velcroboy 617b24c7ca
Updates mob spawners for Arena (#393)
* Updates mob spawners for Arena

* Remove test notes

* Adjusts sprite states to not be dead

---------

Co-authored-by: Jeff <>
2023-11-04 01:48:37 +01:00
Carolyn3114 bbfc7d00b5
space.yml (#391) 2023-11-04 01:48:23 +01:00