Commit Graph

1786 Commits

Author SHA1 Message Date
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
LittleBuilderJane
66deacc322 New Game Map: Reach Transport Shuttle (#5671)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2022-01-05 00:36:37 +11:00
LittleBuilderJane
93cdda6cb4 New Spawnable Map: Boarding Shuttle Dart (#5728) 2022-01-05 00:23:12 +11:00
Rane
9603e47096 Added difficulty overrides for several traitor objectives (#6018) 2022-01-04 13:05:05 +01:00
mirrorcult
5249ea057a Kill bobby 2.0 (#6023) 2022-01-04 10:17:39 +01:00
Rane
b73f8918f7 Fire & Air Alarm Electronics now constructable (#6015) 2022-01-03 14:32:28 -07:00
mirrorcult
72dcef4203 Reduce locker/crate hp and resistances, add spear wielding (#6001) 2022-01-03 10:53:09 +01:00
ZeroDayDaemon
b45bd3b396 Adds Ducks (#5997)
* Add Ducks

* Update cargo_livestock.yml
2022-01-02 23:47:35 -08:00
Rane
8049be06ad Tweaks doctor and CMO starting items (#6007) 2022-01-02 23:38:37 -08:00
T-Stalker
70209f5895 Weh! (#6005) 2022-01-02 22:51:42 -07:00
Lamrr
85297d11b6 Changes tile crafting recipe to make four floor tiles per unit of material used. (#5993) 2022-01-01 22:57:46 -07:00
Delete69
a09509b385 Small Bar Salvage (#5936) 2022-01-02 16:40:44 +11:00
Neith
b8b1bb45b2 Added a new salvage map depicting an emergency shuttle. (#5949) 2022-01-02 16:39:44 +11:00
Flipp Syder
b1584793bf Adds fire/air alarms (#5018)
Co-authored-by: Vera Aguilera Puerto <6766154+Zumorica@users.noreply.github.com>
Co-authored-by: E F R <602406+Efruit@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-01-02 15:56:24 +11:00
Charlese2
02ea48330c Lower the damage of flash bullets and make the damage blunt. (#5932)
* Lower the damage of flash bullets and make the damage blunt.

* Shotgun flash bullets still do a lot of damage

* Make base flash bullet blunt to match the others.
2022-01-01 23:54:43 +01:00
Rane
f186ffe571 Added filled wardrobes for most jobs (#5946)
* Added filled wardrobes for most jobs

* Updated based on feedback from mirrorcult

* Readded accidentally deleted cult helmet and maybe test won't fail now 🙏

* Added PietyVend

* Fixed stray pixel

Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
2022-01-01 18:08:57 +01:00
Rane
ab28be3c54 Adjusted traitor steal objectives (#5974)
* Adjusted traitor steal objectives

* Added theft target to cargo
2022-01-01 17:56:25 +01:00
Peptide90
f88358a12a Substations now explode when destroyed (#5729)
* Substation destructible component

Substations now explode and create a destroyed machine which can be deconstructed.

* construction graph test failed

Does not need a path from start to finish but adding anyway to fix tests

* railing to structures

* Fixed Review

Updated parent to fix most comments.
Updated node to camelcase

* Updated target node graph

Still recovering...

* Final fix of graph

I swear

* Altered destroyed machine spawns

Removed HV cable and reduced steel sheets.
2022-01-01 17:51:56 +01:00
Kara D
995f9b20f4 Uncomment singularity rads 2021-12-31 20:26:40 -07:00
Michael Phillips
d164229637 Minor fixes to bodybag handling and fixes #5955 (#5962) 2021-12-31 01:19:42 -07:00
Fishfish458
2aad04ccb9 Cardboard box, weight changes, bureaucracy crate (#5903)
Co-authored-by: fishfish458 <fishfish458>
2021-12-30 19:28:38 -07:00
Rane
c5ce019764 Containers with access readers have properly restrictive access (#5927) 2021-12-30 19:27:28 -07:00
Paul Ritter
512d6a38c3 get that crap outta here (completely rewrites inventorysystem) (#5807)
* some work

* equip: done
unequip: todo

* unequipping done & refactored events

* workin

* movin

* reee namespaces

* stun

* mobstate

* fixes

* some work on events

* removes serverside itemcomp & misc fixes

* work

* smol merge fix

* ports template to prototype & finishes ui

* moves relay & adds containerenumerator

* actions & cuffs

* my god what is actioncode

* more fixes

* im loosing my grasp on reality

* more fixes

* more work

* explosions

* yes

* more work

* more fixes

* merge master & misc fixed because i forgot to commit before merging master

* more fixes

* fixes

* moar

* more work

* moar fixes

* suffixmap

* more work on client

* motivation low

* no. no containers

* mirroring client to server

* fixes

* move serverinvcomp

* serverinventorycomponent is dead

* gaming

* only strippable & ai left...

* only ai and richtext left

* fixes ai

* fixes

* fixes sprite layers

* more fixes

* resolves optional

* yes

* stable™️

* fixes

* moar fixes

* moar

* fix some tests

* lmao

* no comment

* good to merge™️

* fixes build but for real

* adresses some reviews

* adresses some more reviews

* nullables, yo

* fixes lobbyscreen

* timid refactor to differentiate actor & target

* adresses more reviews

* more

* my god what a mess

* removed the rest of duplicates

* removed duplicate slotflags and renamed shoes to feet

* removes another unused one

* yes

* fixes lobby & makes tryunequip return unequipped item

* fixes

* some funny renames

* fixes

* misc improvements to attemptevents

* fixes

* merge fixes

Co-authored-by: Paul Ritter <ritter.paul1@gmail.com>
2021-12-30 22:56:10 +01:00
Rane
2466e4bdf3 The reagent grinder is now constructable (#5925) 2021-12-30 19:07:14 +01:00
Vera Aguilera Puerto
c9ac29b8dc Fixes holoparasite injector being usable on anything 2021-12-30 11:55:22 +01:00
Leon Friedrich
2a7c84a8dd Fix some lathe recipes (#5941) 2021-12-30 01:19:49 +11:00
metalgearsloth
88bdf0ce61 Add some more prototype serializers (#5934) 2021-12-30 00:48:18 +11:00
AJCM-git
45bfc0b96b Adds posters (for mapping) (#5812) 2021-12-29 20:24:51 +11:00
Rane
dc4b549b90 Pill Canister Tweaks (#5928) 2021-12-29 17:21:17 +11:00
Alex Evgrashin
1705eae96c Suit sensor and crew monitoring (#5521)
Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2021-12-29 16:19:00 +11:00
metalgearsloth
e5e144d99c Rollerbeds (#5681) 2021-12-29 15:57:20 +11:00
CrudeWax
299c4be328 Guardians (Holoparasites) (#5140)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
2021-12-29 14:58:48 +11:00
Rane
3d099998a4 Fixed empty chaplain backpack [1 LINE] (#5926) 2021-12-29 13:48:58 +11:00
Neith
186d5443fe Added a new Salvage map containing a desolate concert. (#5894) 2021-12-27 19:41:14 +01:00
Elijahrane
0906400e85 Ultravasculine, a new advanced antitoxin. (#5877)
* Adds ultravasculine, a new advanced antitoxin

* Reduced yield in ultravasc. reaction
2021-12-27 13:45:16 +01:00
Pancake
6619c79a45 Add Filled Mechanical Toolbox (#5911)
* Add Filled Mechanical Toolbox

* Wirecutters I Guess
2021-12-27 13:29:44 +01:00