Arthur
|
85694b8513
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
|
2022-02-07 01:38:12 +03:00 |
|
ScalyChimp
|
3c9328ff99
|
Adds portable flasher (#4523)
Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
|
2022-02-07 02:59:41 +11:00 |
|
metalgearsloth
|
627cbba2b6
|
Crayons ECS (#6364)
|
2022-02-06 23:32:32 +11:00 |
|
mirrorcult
|
d5b8449edb
|
Global usings (#6472)
|
2022-02-05 11:39:36 -07:00 |
|
WlarusFromDaSpace
|
11eb591c54
|
Adds door remotes from SS13 (#6335)
|
2022-02-06 00:33:24 +11:00 |
|
Arthur
|
01af9d9e15
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
# Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
|
2022-02-05 12:20:28 +03:00 |
|
Willhelm53
|
4d3a381962
|
Mopping Puddle Dilution and Wet Floor Sparkles (#6273)
|
2022-02-04 19:26:11 -07:00 |
|
Arthur
|
d2c978f009
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# .github/CODEOWNERS
# Resources/Prototypes/Maps/game.yml
|
2022-02-02 21:04:06 +03:00 |
|
metalgearsloth
|
80727f7fa4
|
ECS cluster nades (#6368)
|
2022-02-02 18:04:38 +11:00 |
|
metalgearsloth
|
2e5808085d
|
Set mover velocity via system (#6288)
|
2022-02-02 17:34:25 +11:00 |
|
wrexbe
|
17db0775c8
|
Auto comp (#6416)
|
2022-02-02 14:35:40 +11:00 |
|
Ygg01
|
340158483b
|
Change width of dispensers (#6419)
|
2022-01-31 16:55:38 -07:00 |
|
Arthur
|
9b1ac3a997
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Resources/Prototypes/Maps/game.yml
|
2022-01-31 22:13:14 +03:00 |
|
Leon Friedrich
|
4614bb9877
|
Move static container helper functions to container system (#6382)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
|
2022-01-31 18:08:53 +11:00 |
|
mirrorcult
|
a055ec3514
|
Port the Mass Scanner from OR14 (#6172)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
|
2022-01-31 16:38:11 +11:00 |
|
Fishfish458
|
b837b186a5
|
Attempted Small Vending Machine Refactor (#6157)
Co-authored-by: fishfish458 <fishfish458>
|
2022-01-31 15:16:41 +11:00 |
|
Julian Giebel
|
305cff2659
|
Implement ECS alternative for IDragDropOn and fully ECS disposal units (#6380)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
|
2022-01-31 03:53:22 +11:00 |
|
Leon Friedrich
|
d40bcc9168
|
Fix some mispredict reconciliation issues. (#6319)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
|
2022-01-31 03:34:48 +11:00 |
|
Rane
|
8070fce5e7
|
Gives Chaplain their Bible 🙏 (#6269)
|
2022-01-31 02:20:22 +11:00 |
|
Rane
|
b360f80da5
|
Fixed inconsistent tiles, rebalanced explosives (#6339)
|
2022-01-31 01:34:11 +11:00 |
|
ScalyChimp
|
004c678853
|
Incediary Shells (#6208)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
|
2022-01-31 00:44:45 +11:00 |
|
metalgearsloth
|
b5724feb27
|
ECS guns (#6229)
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
|
2022-01-30 17:39:46 +11:00 |
|
Leon Friedrich
|
47e597ca47
|
Predict inventory slot interactions. (#6033)
|
2022-01-30 11:50:10 +11:00 |
|
Leon Friedrich
|
c465715273
|
ECS Doors (#5887)
|
2022-01-30 11:49:56 +11:00 |
|
Arthur
|
7fbaf3ee95
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
|
2022-01-29 21:52:08 +03:00 |
|
Alex Evgrashin
|
2a68023143
|
Move WindowComponent to ECS (#6267)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
|
2022-01-29 16:21:38 +11:00 |
|
Aaron Mell
|
f77ac6c4f3
|
Removed SetSize from Window Size in Admin and AdminRank (#6362)
|
2022-01-29 16:20:26 +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 |
|
Leon Friedrich
|
79243d1379
|
Fix smoothing error (#6352)
|
2022-01-28 19:25:49 +01:00 |
|
wrexbe
|
b2229a951d
|
Test ignored component names (#6308)
|
2022-01-26 16:41:28 +11:00 |
|
Arthur
|
b8b48c7c3b
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Content.Client/Links/UILinks.cs
|
2022-01-25 12:00:32 +03:00 |
|
Júlio César Ueti
|
6d5eee0d4c
|
Add ESwords (now Inventory refactor compliant!) (#6000)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
|
2022-01-24 23:55:48 +11:00 |
|
Vera Aguilera Puerto
|
4a1949d7f0
|
Add simple wiki button to lobby (#6230)
|
2022-01-23 10:47:10 -07:00 |
|
Arthur
|
cda6bb26f1
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
|
2022-01-22 22:07:12 +03:00 |
|
Alex Evgrashin
|
8d6565ea42
|
Xenoarchaeology artifacts (#6069)
Co-authored-by: Alexander Evgrashin <evgrashin.adl@gmail.com>
|
2022-01-22 23:55:11 +11:00 |
|
Jack Fox
|
90a5c6ea54
|
Disposal Pipe Crafting (#6188)
|
2022-01-22 23:54:26 +11:00 |
|
mirrorcult
|
1880db9c75
|
Glass tables break when climbed on (#6246)
|
2022-01-22 23:52:35 +11: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 |
|
Alex Evgrashin
|
16a532137d
|
Muzzle (#6194)
Co-authored-by: mirrorcult <lunarautomaton6@gmail.com>
|
2022-01-18 15:18:22 -07:00 |
|
Leon Friedrich
|
ac36f15a70
|
Extend RgbLightController (#6179)
|
2022-01-18 15:18:16 -07:00 |
|
Arthur
|
b278ab0437
|
Merge remote-tracking branch 'upstream/master' into upstream
|
2022-01-18 12:13:44 +03:00 |
|
ShadowCommander
|
7d30bff5ea
|
Temp fix table clickable bounds (#6206)
* Temp fix table clickable bounds
* Fix single instance clickable data
* Consolidate table clickable bounds
|
2022-01-17 18:02:20 -08:00 |
|
metalgearsloth
|
167e6e5cb6
|
Sort ghost warps (#6210)
|
2022-01-17 12:22:17 -07:00 |
|
Morbo
|
9897bf62e1
|
Move some strings to ftl files (#6203)
|
2022-01-16 18:59:05 -07:00 |
|
Arthur
|
45666b956f
|
Merge remote-tracking branch 'upstream/master' into fork-sync
|
2022-01-17 03:13:32 +03:00 |
|
ShadowCommander
|
fc8da53fba
|
Stops InteractionOutline when the mouse is off screen. (#6191)
|
2022-01-17 07:21:08 +11:00 |
|
ShadowCommander
|
df63fe615f
|
Fix VV Verb on entities that don't exist on the client (#6187)
|
2022-01-16 20:43:54 +01:00 |
|
Vera Aguilera Puerto
|
748dfb2ecb
|
Changes required for VirtualController EntitySystems (#6161)
|
2022-01-16 18:48:11 +11: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 |
|