Commit graph

137 commits

Author SHA1 Message Date
Arthur
c98bc0e967 Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-02-27 00:56:06 +03:00
Moony
0898c8a837
More events (#6894)
* Implements bureaucratic error and random sentience.

* Adds the Vent Critters event.

* bug moment

* forgot ignores.

* undo something i included in the PR by mistake.

* address review
2022-02-25 23:10:09 -06:00
Arthur
11b1fad3c5 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Server/GameTicking/GameTicker.RoundFlow.cs
#	Resources/Maps/infiltrator.yml
#	Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
2022-02-23 15:34:15 +03:00
metalgearsloth
b87806f7ed
Fix some build warnings (#6832)
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
2022-02-21 14:41:50 +11:00
Arthur
0a782deced Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-02-17 01:05:48 +03:00
mirrorcult
ec4d4688c7
Seal/abstract/virtual everything (#6739) 2022-02-16 18:23:23 +11:00
Arthur
e52523e9e1 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Resources/Server Info/Rules.txt
2022-01-29 06:58:08 +03:00
metalgearsloth
efc4bef3b4
Remove LOOC range limit for ghosts (#6322) 2022-01-26 14:18:56 +01:00
Arthur
ba706abea0 Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-01-25 23:04:52 +03:00
Clyybber
107806775e
Apply smiley filter on me-command (#6153) 2022-01-25 20:38:52 +11:00
Arthur
cda6bb26f1 Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-01-22 22:07:12 +03:00
wrexbe
cea1b21832
Fixing some warnings (#6250)
Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>
2022-01-21 10:38:35 +01:00
Arthur
bea5d6a7be Merge remote-tracking branch 'upstream/master' into upstream 2022-01-20 02:24:29 +03:00
metalgearsloth
a1b67bc505
Chat adminlogs (#6209) 2022-01-18 19:35:31 -07:00
Alex Evgrashin
16a532137d
Muzzle (#6194)
Co-authored-by: mirrorcult <lunarautomaton6@gmail.com>
2022-01-18 15:18:22 -07:00
Arthur
9416940054 Merge remote-tracking branch 'upstream/master' into fork-sync
# Conflicts:
#	.github/CODEOWNERS
#	Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
2022-01-16 01:04:09 +03:00
Michael Phillips
e1c3fc727b
Fixes issue of smiling over the radio (#6148) 2022-01-14 01:26:57 +11:00
Arthur
ecf20dfdc3 Merge remote-tracking branch 'upstream/master' into fork-sync
# Conflicts:
#	.github/CODEOWNERS
2022-01-13 07:35:23 +03:00
Michael Phillips
ffa19077b7
Fixed Obfuscated messages for ghosts (#6133) 2022-01-12 10:51:49 +11:00
Michael Phillips
86812c1ad7
Added Whisper system for talking with players 2 tiles away. (#5994)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-01-12 01:48:18 +11:00
Morbo
62221d7b92
Add LOOC and change OOC color (#5841) 2022-01-12 00:29:55 +11:00
Arthur
c639a47ddf Merge remote-tracking branch 'upstream/master' into fork-sync
# Conflicts:
#	.github/CODEOWNERS
2022-01-10 19:28:26 +03:00
wrexbe
5ceb2372bf
Clean up some warnings (#6088)
* Clean up some warnings

* Remove nullable enable

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

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
2022-01-09 22:10:36 -06:00
Arthur
3c85584ba9 Merge remote-tracking branch 'upstream/master' into sync-fork
# Conflicts:
#	Content.Server/Chat/Managers/ChatSanitizationManager.cs
#	Resources/Prototypes/Maps/game.yml
2022-01-07 22:55:32 +03:00
Morbo
946f01ac05
Revert "Fork sync (#40)" (#43)
This reverts commit fe139a9e93.
2022-01-07 20:28:59 +03:00
Morbo
fe139a9e93
Fork sync (#40)
* Fix use delay (#6031)

* Add small railing corner (#6036)

* Add more chat filters (#6034)

* Xeno improvements (#6032)

* Automatic changelog update

* Removed capsaicin oil from the chem dispenser (#6042)

* Automatic changelog update

* 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>

* Automatic changelog update

* Make smoking cool again. (#6046)

* Automatic changelog update

* Fixes minor issues with Reach and Dart. (#6035)

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* Automatic changelog update

* Adds filled versions of coloured wardrobes (#6012)

* Automatic changelog update

* Add content to radiation closets and medicine lockers (#6006)

* Automatic changelog update

* Interrupt do-afters when the user gets incapacitated. (#6059)

* Fix foldable-pickup interactions. (#6057)

Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Co-authored-by: Delete69 <95458399+Delete69@users.noreply.github.com>
Co-authored-by: ZeroDayDaemon <60460608+ZeroDayDaemon@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
Co-authored-by: Rane <60792108+Elijahrane@users.noreply.github.com>
Co-authored-by: JustinTime <41876089+JustinTether@users.noreply.github.com>
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Co-authored-by: LittleBuilderJane <63973502+LittleBuilderJane@users.noreply.github.com>
Co-authored-by: Lamrr <96937466+Lamrr@users.noreply.github.com>
2022-01-07 20:25:22 +03:00
router
6b094aac8c
Add some cyrillic emoticon equivalents for conversion (#32)
* Add some cyrillic equivalents of emoji for conversion

* Fix dementia

* Update sanitizer-replacements.ftl
2022-01-06 19:13:48 +03:00
ZeroDayDaemon
de0c94414a
Add more chat filters (#6034) 2022-01-05 18:51:48 -07:00
router
e4cd2944cf
o7 -> @salutes (#6026) 2022-01-05 00:05:21 +11: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
Paul
97e47178d7 Revert "fixes a bunch of warnings"
This reverts commit d4d85b663f.
2021-12-20 15:20:27 +01:00
Paul
d4d85b663f fixes a bunch of warnings 2021-12-20 13:58:30 +01:00
Paul Ritter
cc57d1380c
Revert Rich text (#5848) 2021-12-20 12:42:42 +01:00
Vera Aguilera Puerto
a51b102949
Add setooc command for +SERVER admins. (#5818) 2021-12-19 23:25:16 +01:00
Venomii
3c35cb1154
Added phrases "lmao" and "lol" to ChatSanitizationManager (#5774) 2021-12-14 12:33:46 +11:00
Leon Friedrich
7f81f0b8b8
Add more pretty strings to logs (#5768) 2021-12-13 12:22:58 +01:00
metalgearsloth
f110e28021
Fix openahelp and quit command perms (#5763)
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
2021-12-12 22:45:49 -07:00
E F R
b2da936848
Everything: Rich text redux (#5625)
* lord save me

* UI/ChatBox: Use the new `defStyle` param for `RenderMarkup`

The previous iteration didn't work because `AddMessage` can't inherit
its color from the PushColor (since we're not doing actual tag stacks
anymore).

* rebase touchup
2021-12-12 18:25:42 -08:00
Vera Aguilera Puerto
c57b07a4d0 Goes in-game now 2021-12-06 15:34:46 +01:00
DrSmugleaf
af4eb3c7cd Fix more errors, client and server now build 2021-12-06 14:00:39 +01:00
metalgearsloth
525297c5fe A bunch of AttachedEntity bullshit 2021-12-06 15:39:46 +11:00
DrSmugleaf
ab9d0cc6d8 Fix errors 2021-12-05 21:02:04 +01:00
DrSmugleaf
2a3b7d809d Fix 3000 errors 2021-12-05 18:09:01 +01:00
Vera Aguilera Puerto
5cd42c9ad6 Inline UID 2021-12-03 15:53:09 +01:00
Vera Aguilera Puerto
ee4ff9cfe8 Inline Name 2021-12-03 15:25:51 +01:00
Vera Aguilera Puerto
a5b57c8e10 Inline Transform 2021-12-03 14:20:34 +01:00
Vera Aguilera Puerto
69b270017b Inline TryGetComponent completely, for real 2021-12-03 14:17:01 +01:00
Vera Aguilera Puerto
0feebbff00 Inline HasComponent entirely 2021-12-03 12:23:18 +01:00
Vera Aguilera Puerto
b835bea086 Inline GetComponent 2021-12-03 11:55:25 +01:00
Vera Aguilera Puerto
f10ed6c0c3 Inline GetAllComponents 2021-12-03 11:42:24 +01:00