Commit Graph

1821 Commits

Author SHA1 Message Date
Peptide90
990a929aee Adds trash tag to more items (#6183) 2022-01-16 12:37:48 -07:00
Peptide90
89db6ea339 fixed metal table construction menu icon (#6184) 2022-01-15 13:07:16 -07:00
mirrorcult
1fcc484a12 ECS APCs (#6118) 2022-01-15 11:32:46 -07:00
wrexbe
94207a42e9 Make manual valves work (#6121)
* Make manual valves work

* Change some GasValveSystem lookups
2022-01-15 05:18:45 -08:00
Rane
0280b81eb4 Rebalanced traitor objective difficulty (#6173) 2022-01-14 22:02:16 -07:00
Leon Friedrich
737da76b65 Make wires only electrocute when cut or attacked (#6047) 2022-01-15 13:34:43 +11:00
Peptide90
01a844610b Pressure nerf (#6164) 2022-01-14 17:18:36 -07:00
Peptide90
47c1f826be adds box of IDs to HoP locker (#6165) 2022-01-14 12:42:01 -06:00
Rane
053674645a Added Syndicate Smokes (#6149)
* Added Syndicate Smokes

* Removed BOM (maybe?)
2022-01-13 17:06:31 -08:00
Peptide90
962f90e6f5 Adds Librarian and Lawyer roles (#6056) 2022-01-14 02:11:09 +11:00
Peptide90
7af7a1092e Added AME shielding deconstruction (#5796) 2022-01-14 02:06:43 +11:00
Peptide90
3b9b2c6a01 Personnel crate (ID cards and PDAs) (#6111) 2022-01-14 02:04:30 +11:00
Rane
b5f03f4682 New Objective: Ensure another traitor stays alive. (#6020)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-01-14 01:53:50 +11:00
Michael Phillips
a8cd34ad11 Updated Smart Fridge Graphics and Fixed Naming (#5947) 2022-01-14 01:32:16 +11:00
BubblegumBlue
a95ddcbdd0 Shuttle console construction (#6010)
Co-authored-by: Starm4ncer <63939723+Starm4ncer@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2022-01-14 01:21:41 +11:00
Peptide90
4ce9c94cd4 Whitelist for trashbags (#6143) 2022-01-13 23:53:13 +11:00
Pancake
414225f463 Update centcom_official.yml (#6136)
Fixed a dang typo in the prototype id.
2022-01-12 00:57:49 -08:00
mirrorcult
abd4eac921 ECS AsteroidRock and add a doafter to mining (#6120)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-01-12 13:12:08 +11:00
Lamrr
951bdabcd0 Removes LowWall. (#6063) 2022-01-11 18:03:27 +11:00
Lamrr
44d849d3f6 (Re)adds captain's sabre (#6101) 2022-01-11 17:50:10 +11:00
Pancake
61da69ee74 Singulo/Radiation Tweaks (#6045)
Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
2022-01-11 17:30:17 +11:00
TaralGit
76043e3b43 Increased damage for laser weapons (#5930)
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
2022-01-10 21:11:47 -07:00
metalgearsloth
6f7cd29fb5 Fix ghost role exceptions (#6106) 2022-01-11 14:12:19 +11:00
Rane
092b94ecbb Added body bag boxes, fixed some folded body bag behavior (#6044)
* Added body bag boxes, fixed some folded body bag behavior

* Added item component to body bags

* Fixed tag
2022-01-10 18:32:52 -08:00
Peptide90
3a7d98bfee Plastic autolathe recipes fix (#6107) 2022-01-10 20:20:35 -06:00
Zymem
e9e8c8e1e5 Added cursed chair (#6052) 2022-01-10 20:17:22 -06:00
Leon Friedrich
0cf8ba39bb Fix kudzu cold damage (#6105) 2022-01-10 13:25:27 +01:00
Jack Fox
1b4958c9f1 Add SMES Recipe (#5967)
Co-authored-by: Moony <moonheart08@users.noreply.github.com>
2022-01-09 01:31:07 -06:00
Jack Fox
65aa0dcdf4 Add substation crafting recipe (#5942)
Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>
2022-01-08 23:05:54 -07:00
Lamrr
e6d3db6015 Adds warning cone hat (#6076)
* Adds warning cone

* Adds chance to spawn in maint lockers.
2022-01-08 23:34:46 -06:00
Leon Friedrich
59cdb3c866 allow chaplain to spawn with other bag options (#6078) 2022-01-08 23:32:54 -06:00
BubblegumBlue
cce072d50f Rebalance of YouTool and Salvage crate (#6053)
* Quick inventory changes

* Fully removed the Salvage Crate from Cargo's order list

Co-authored-by: Starm4ncer <63939723+Starm4ncer@users.noreply.github.com>
2022-01-08 21:20:30 -06:00
Rane
4de0d7ecf8 Adjusted Botanist starting items, fucked doctor duffels and satchels (#6040)
Co-authored-by: Moony <moonheart08@users.noreply.github.com>
2022-01-08 20:49:48 -06:00
Moony
ca984036d6 Upstream species (#6066)
* Step 1 of porting; grabbed most of the files via patches.

* Add species field to the DB

* Appearance patches for slimes.

* Fix the db test.

* Add slime's biocompat.

* slimby

* Fixes, allow specifying if a species is playable or not.

* Update Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs

Co-authored-by: Javier Guardia Fernández <DrSmugleaf@users.noreply.github.com>

* Update Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs

Co-authored-by: Javier Guardia Fernández <DrSmugleaf@users.noreply.github.com>

* Update Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs

Co-authored-by: Javier Guardia Fernández <DrSmugleaf@users.noreply.github.com>

* Address reviews.

* Address reviews.

* make an if-case.

* Fix a goof where species wouldn't get shown in the editor correctly (it'd always default to human)

Co-authored-by: Javier Guardia Fernández <DrSmugleaf@users.noreply.github.com>
2022-01-08 19:53:14 -06:00
Rane
b7cd247f13 Disabled Nonfunctional Bulldog Bundle (#6070) 2022-01-08 16:21:51 -07:00
Peptide90
a5839e5ae8 Added toxin damage to ingesting welder fuel (#6061) 2022-01-07 19:44:14 -07:00
Leon Friedrich
db95ab53d7 Fix outer clothing (#6060) 2022-01-08 02:58:55 +11:00
Lamrr
0fc3c3dafc Add content to radiation closets and medicine lockers (#6006) 2022-01-07 15:03:19 +11:00
Lamrr
d84049f728 Adds filled versions of coloured wardrobes (#6012) 2022-01-07 14:58:41 +11:00
LittleBuilderJane
596c7d29ba Fixes minor issues with Reach and Dart. (#6035)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2022-01-07 00:31:37 +11:00
JustinTime
7d0b06f551 Add ability to resist out of welded lockers and locked closets (#5958)
* Enable lighting of Cigars with IsHotEvent

Subscribed to IsHotEvent in ThrusterSystem, added AfterInteractEvent to SmokingSystem.Cigar which will set SmokableState to Lit if IsHotEvent returns true

This should mean that cigs/Cigars should light on anything hot

* Revert "Enable lighting of Cigars with IsHotEvent"

This reverts commit db896e1f80940892a87d34aa7182b9c605fa53bc.

* Add the ability to kick your way out of welded or locked closets

Added a ResistLocker component/system that hooks into OnRelayMove to begin resisting out of lockers so that players aren't stuck in lockers forever

Also added check to EntityStorageComponent to not print out welded shut message if the entity attempting to open the locker is inside of it.

* Changes based on review

minor formatting changes

make components passed into AttemptResist nullable and resolve them inside of the function

Remove incorrectly named .ftl file

* Changes based on review

Ditched async DoAfter
Used PopupSystem over User.PopupMessage

Added Cancel token to ResistLockerComponent

Subscribed to EntRemovedFromContainer event to cancel DoAfter if the player is removed from a container

* I am in formatting hell, apparently

* Changes based on review

Added TryComp for the EntityStorageComponent instead of the event passed one

* Changes based on review

* Apply suggestions from code review

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>

* Formatting changes based on review

* Shuffle functions around in LockSystem to properly trigger visualizer

Moved all the unlocking logic to a Lock method inside of LockSystem and TryUnlock calls this method if the user passes all of the access checks

* Formatting, replacing Resolve with TryComp and making AttemptResist arguments optional

Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>

* Check if the player is inside THE container not A container

me no read good

* ok ok I give my code is bad

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
2022-01-05 22:18:48 -08:00
Rane
8b0ae40125 Removed capsaicin oil from the chem dispenser (#6042) 2022-01-05 21:50:38 -07:00
metalgearsloth
4aaa85f84d Xeno improvements (#6032) 2022-01-05 18:51:53 -07:00
Delete69
80753a70ea Add small railing corner (#6036) 2022-01-05 18:51:41 -07:00
Matz05
919053c5f1 Light bulb brightness (and other settings) change clientside PointLights (#5869)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2022-01-05 16:25:37 +11:00
Leon Friedrich
0aa4f9efbe Power Cell Refactor (#5943)
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
2022-01-05 15:20:25 +11:00
wrexbe
4571dca1eb Tiles Name->ID, DisplayName->Name (#5991) 2022-01-04 17:26:07 -07:00
Peptide90
45a1e57ee4 Quick fixes (firefightercrate fill and rollerbed size) (#6029) 2022-01-04 17:25:51 -07:00
Peptide90
ace591117f Removed more copyright materials (bar signs) (#5984) 2022-01-05 00:56:40 +11:00
Michael Phillips
b36c9395d6 Additional Hydroponics vegetables - Chili + Recipes (#5966) 2022-01-05 00:51:22 +11:00