NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-25 01:31:18 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 15
7242 commits 14 branches 0 tags 3 GiB
Commit graph

3089 commits

Author SHA1 Message Date
Leon Friedrich
33f5294e2a Power Cell Refactor (#5943) 
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
 2022-01-05 15:39:29 +03:00
Morbo
33b0ebd504
Merge branch 'space-wizards:master' into master 2022-01-05 04:24:58 +03:00
wrexbe
4571dca1eb
Tiles Name->ID, DisplayName->Name (#5991) 2022-01-04 17:26:07 -07:00
metalgearsloth
4fdedc880d
Add type serializer for udders (#6027) 2022-01-04 14:57:26 +01:00
mirrorcult
af785f873f
Optional server whitelists (#5979) 2022-01-05 00:37:06 +11:00
Leon Friedrich
f13f743c51
Make use-in-hand default to activation interactions. (#5951) 2022-01-05 00:23:01 +11:00
router
e4cd2944cf
o7 -> @salutes (#6026) 2022-01-05 00:05:21 +11:00
Arthur
6246bc3829 Merge remote-tracking branch 'upstream/master' 2022-01-04 16:04:26 +03:00
Vera Aguilera Puerto
675a29ed33
ECS MindComponent (#5917) 2022-01-04 13:37:50 +01:00
ShadowCommander
b335ef5e7f
Prevent Holoparasites from attacking their host (#6019) 2022-01-04 10:22:28 +01:00
mirrorcult
5249ea057a
Kill bobby 2.0 (#6023) 2022-01-04 10:17:39 +01:00
Arthur
a0d2ea8284 Merge remote-tracking branch 'upstream/master' 2022-01-04 02:02:28 +03:00
Alex Evgrashin
c5a98129ff
Sync station rotation with a spawned salvage rotation (#5998) 
Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>
Co-authored-by: Alexander Evgrashin <evgrashin.adl@gmail.com>
 2022-01-03 14:32:16 -07:00
Morbo
7fa5226713
Merge branch 'space-wizards:master' into master 2022-01-03 20:29:11 +03:00
ShadowCommander
92d70b0587
Add teleport verbs (#5954) 
* Add teleport verbs

* Add ftl file

* Make the verbs run the command serverside
 2022-01-03 01:07:33 -08:00
Morbo
40de02cbb5
Merge branch 'space-wizards:master' into master 2022-01-02 09:10:27 +03:00
ShadowCommander
cd865b9aaa
Remove crit and dead mobs from GhostRole list (#5992) 2022-01-01 23:00:21 -07:00
wrexbe
332ff89609
Convert RandomPlant to entity system (#5952) 
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
 2022-01-01 22:27:54 -07: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
Morbo
b3ba023573
Merge branch 'space-wizards:master' into master 2022-01-02 06:36:37 +03:00
Rane
37b510901f
Makes the uplink purchase sound much quieter (#5989) 2022-01-01 19:00:01 -07:00
Morbo
9509d94bbf
Merge branch 'space-wizards:master' into master 2022-01-02 03:29:23 +03:00
Rane
e3de9bcd72
Rebalance traitor objective difficulty (#5988) 
* Adjusted traitor steal objectives

* Added theft target to cargo

* Rebalanced difficulty
 2022-01-01 23:46:00 +01:00
Morbo
c29c89fa22
Merge branch 'space-wizards:master' into master 2022-01-02 01:26:00 +03:00
Leon Friedrich
4acb8c12af
fix stripping (#5983) 2022-01-01 18:03:29 +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
ShadowCommander
81607d0327
Reregister ghost role when player ghosts while alive (#5956) 
* Reregister ghost role when player ghosts while alive

* Add ReregisterOnGhost property
 2022-01-01 17:48:45 +01:00
wrexbe
936c2f1d54
Refactored barsign (#5929) 
* Refactored barsign

* Check barsign for signs of life.

* TryComp the sprite component

* TryGetBarSignPrototype
 2022-01-01 17:45:52 +01:00
Morbo
8a991c1ae8
Merge pull request #22 from space-wizards/master 
[AUTO] Fork Sync
 2022-01-01 18:45:26 +03:00
ShadowCommander
04be14e057
Prevent equipping HandVirtualItems (#5982) 2022-01-02 00:20:32 +11:00
Arthur
8c2e71e0f3 Merge remote-tracking branch 'upstream/master' 
# Conflicts:
#	Resources/Changelog/Changelog.yml
#	Resources/Prototypes/Catalog/Cargo/cargo_service.yml
#	Resources/Prototypes/Catalog/Fills/Crates/service.yml
 2021-12-31 19:24:05 +03:00
Paul Ritter
c5a3515322 fixes stripping of stunned/dead people 
fixes magboots alert
 2021-12-31 10:41:08 +01:00
wrexbe
abba1e1c2c
Make held entity nullable (#5923) 2021-12-30 19:27:15 -07:00
E F R
a5cd3784bf
Rotatable: Allow specifying the rotation increment on the component (#5948) 2021-12-30 19:20:22 -07:00
Michael Phillips
5ddd3a8022
Fixed issue with beaker not displaying liquid content after grind (#5960) 2021-12-30 19:12:37 -07:00
Morbo
c1a1c0ef29
Merge branch 'space-wizards:master' into master 2021-12-31 04:04:14 +03:00
ShadowCommander
dc1ca30f7c
Add context menu to AdminMenu PlayerTab entries (#5904) 
* XAML PlayerTab entries

* Move command execution to PlayerTab

* Move command logic to the AdminSystem

* Clean up

* Add examine and context menu keybind handling to PlayerTab

* Fix remote admin verbs

* Remove examine for now

* Add server verbs

* Fix requests of verb by non-admins

* Clean up AdminSystem.Menu
 2021-12-30 14:11:30 -08: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
ShadowCommander
9d70bdde9c
Keep players in the PlayerTab until round end (#5921) 
* Rework AdminSystem to keep players in the PlayerTab until round end

* Prevent sending PlayerStatus to deadminned admins

* Change _playerList to non-nullable

* Clean up unused usings

* Consolidate duplicate foreach loop code
 2021-12-30 16:12:28 +01:00
Vera Aguilera Puerto
c9ac29b8dc Fixes holoparasite injector being usable on anything 2021-12-30 11:55:22 +01:00
wrexbe
6ed0b23cc6
Probably fix cloning (#5953) 2021-12-29 19:36:43 -08:00
Morbo
3e01be2fa7
Merge branch 'space-wizards:master' into master 2021-12-30 06:11:11 +03:00
Paul Ritter
84e0011ba7
fixes up the ahelp relay a bit (#5866) 
* fixes up the ahelp relay a bit

* Update Content.Server/Administration/BwoinkSystem.cs
 2021-12-29 21:12:07 +01:00
Pieter-Jan Briers
2da3cc299e Configure ACZ correctly with new engine API. 2021-12-29 20:28:17 +01:00
metalgearsloth
88bdf0ce61
Add some more prototype serializers (#5934) 2021-12-30 00:48:18 +11:00
Morbo
62fca1fe07
Merge branch 'space-wizards:master' into master 2021-12-29 15:27:56 +03:00
metalgearsloth
39e42899ca
Reduce MaxBuckleDistance (#5938) 2021-12-29 23:14:21 +11:00
AJCM-git
45bfc0b96b
Adds posters (for mapping) (#5812) 2021-12-29 20:24:51 +11:00
ShadowCommander
ca8d673fad
Add ShowRules commmand (#5908) 2021-12-29 18:31:18 +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