Morbo
|
f0cf42aab3
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Resources/Prototypes/Maps/pillar.yml
|
2022-12-12 18:59:08 +03:00 |
|
Leon Friedrich
|
77683a95df
|
Add point light to burning entities (#12959)
|
2022-12-12 14:35:33 +11:00 |
|
Morb
|
6ad4a10b29
|
Repository cleanup (#631)
|
2022-12-10 12:10:27 -08:00 |
|
Morbo
|
513e6cf6ef
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# .github/CODEOWNERS
# Content.Server/Chat/Managers/ChatManager.cs
|
2022-11-25 04:31:52 +03:00 |
|
metalgearsloth
|
6c76061887
|
Content changes for mapgrid kill (#12567)
|
2022-11-22 13:12:04 +11:00 |
|
Leon Friedrich
|
6917b0fe17
|
Misc audio and related changes for replays (#12578)
|
2022-11-22 11:49:48 +11:00 |
|
Morbo
|
a1416bc4f7
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
|
2022-11-15 22:24:03 +03:00 |
|
DrSmugleaf
|
da29a01846
|
Add ban list window (#12574)
|
2022-11-14 20:06:55 +01:00 |
|
metalgearsloth
|
6ab864fcda
|
Update content to mapsystem (#12387)
|
2022-11-13 17:47:48 +11:00 |
|
Morbo
|
62afe06195
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
|
2022-11-12 16:22:30 +03:00 |
|
Pieter-Jan Briers
|
7e886a56b0
|
Cache HTTP client in player locator (#12555)
Also add user agent
|
2022-11-11 19:56:47 -06:00 |
|
Morbo
|
c6d529d512
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Content.Server/GameTicking/GameTicker.Spawning.cs
|
2022-11-09 05:38:09 +03:00 |
|
Nemanja
|
9428d4b341
|
stack cleanup and mild refactoring (#11717)
* stack cleanup
* fix tests and ulong
* somehow did half a commit
* ulong got usmall. (it's ints now)
* sussy baka cleanup
* mirror's review
* make da tests pass again
* shadowcommander review
* sloth por favor
* Update StoreSystem.Ui.cs
|
2022-11-08 20:24:23 -06:00 |
|
Morbo
|
d7d2dd96c0
|
Merge remote-tracking branch 'upstream/master' into upstream-sync2
# Conflicts:
# Content.Client/PDA/PDAMenu.xaml
# Content.Server/GameTicking/GameTicker.RoundFlow.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Shared/Humanoid/NamingSystem.cs
# Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
# Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/meta.json
|
2022-11-09 03:02:01 +03:00 |
|
eclips_e
|
e09f0ffef0
|
Prayers Again (#10960)
* prayer system
* verbs
* localize
* Praying changes
* praying + cleanup
* Revert "praying + cleanup"
This reverts commit e8ee90f9f0be9a2eeb4d660359f0913c9e82aba3.
* Prayers (actually)
* forgot to remove this
* slight fixes
* veritius reviews
* I did it
* less HD images
Co-authored-by: Just-a-Unity-Dev <just-a-unity-dev@users.noreply.github.com>
|
2022-11-08 15:02:14 -06:00 |
|
Morbo
|
bfa402a3e6
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
|
2022-11-05 06:14:39 +03:00 |
|
metalgearsloth
|
c0abea8047
|
Content side for removing IMap / IMapGrid comps (#12357)
|
2022-11-04 10:12:25 +11:00 |
|
Morbo
|
2f11da37e8
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
|
2022-10-29 10:36:00 +03:00 |
|
Jacob Tong
|
dfd72c5db2
|
Fix aghost when aghosting from a ghost (#12252)
|
2022-10-28 19:38:53 -07:00 |
|
Morbo
|
a93a3fb752
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Resources/Textures/Tiles/attributions.yml
# Resources/Textures/Tiles/bar.png
# Resources/Textures/Tiles/clown.png
# Resources/Textures/Tiles/dark.png
# Resources/Textures/Tiles/hydro.png
# Resources/Textures/Tiles/kitchen.png
# Resources/Textures/Tiles/laundry.png
# Resources/Textures/Tiles/steel.png
# Resources/Textures/Tiles/steel_dirty.png
# Resources/Textures/Tiles/white.png
|
2022-10-23 17:55:21 +03:00 |
|
DrSmugleaf
|
f323fb7644
|
ECS and cleanup body system, merge body templates and presets into body prototypes (#11991)
Co-authored-by: Jezithyr <Jezithyr@gmail.com>
|
2022-10-22 15:46:28 -07:00 |
|
Leon Friedrich
|
7d276d1101
|
Remove server/client clothing components. (#11981)
|
2022-10-22 15:30:37 -07:00 |
|
Morbo
|
8ffba84896
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
|
2022-10-21 19:51:57 +03:00 |
|
Kara
|
7ad867fa0f
|
Slight localization func cleanup (#11380)
|
2022-10-18 19:51:18 -07:00 |
|
Morbo
|
3af5b83703
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Resources/Prototypes/Maps/cluster.yml
|
2022-10-18 21:23:46 +03:00 |
|
Paul Ritter
|
8b1580ee30
|
Pools admin log lists (#11462)
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
|
2022-10-17 00:00:30 +02:00 |
|
Leon Friedrich
|
c44f173f5e
|
Fix aghost parenting issues. (#11936)
|
2022-10-16 10:26:24 +11:00 |
|
Morbo
|
57d8a459bb
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Content.Shared/Humanoid/Sex.cs
# Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
|
2022-10-16 02:03:26 +03:00 |
|
Leon Friedrich
|
fd5b624a76
|
Ahelp / player list changes (#11392)
|
2022-10-15 14:26:29 -07:00 |
|
Morb
|
5af82ebe9b
|
Add briefcase in hand & update setoutfit (#11634)
|
2022-10-15 14:22:27 -07:00 |
|
Morbo
|
ee06a9e19a
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Content.Shared/Interaction/SharedInteractionSystem.cs
# Resources/Locale/en-US/job/job-names.ftl
# Resources/Prototypes/Datasets/Names/revenant.yml
# Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml
|
2022-10-07 18:01:36 +03:00 |
|
Nemanja
|
f6234c7920
|
view ghosts on round end (#11680)
* view ghosts on round end
* now make it good
* it toggles now i hope
|
2022-10-05 21:55:11 -05:00 |
|
Morbo
|
143d408c81
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Content.Client/Entry/EntryPoint.cs
# Content.Shared/CCVar/CCVars.cs
# Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
# Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
|
2022-09-16 19:22:52 +03:00 |
|
Kara
|
db1dfc8958
|
Command perm modifications (#11273)
* Command perm modifications
* actually not this one
* string
|
2022-09-14 19:02:38 -05:00 |
|
Visne
|
356a6b8d2e
|
Event-ify Rejuvenate (#11145)
|
2022-09-15 03:30:56 +10:00 |
|
Visne
|
81eee73995
|
BwoinkSystem improvements (#11258)
* stuff
* style
* cleanup & fix
* Bold
|
2022-09-14 12:19:32 -05:00 |
|
metalgearsloth
|
1e30848cf7
|
Add a debug overlay for accessreaders (#9681)
> didnt pjb have issues with doing the control stuff in an overlay and just wanted direct texture draw
I ended up doing dis.
|
2022-09-14 19:33:25 +10:00 |
|
metalgearsloth
|
78a4ab6eb2
|
Update for collision events by-ref (#10933)
|
2022-09-14 17:26:26 +10:00 |
|
metalgearsloth
|
b3581d11c6
|
Update maploader to support loading onto an existing map (#10748)
|
2022-09-14 14:05:48 +10:00 |
|
Visne
|
e6f4f158d7
|
Display "lobby" if round ID is 0 for Discord AHelp embeds (#11197)
|
2022-09-11 20:52:27 -07:00 |
|
Visne
|
0a3cf8325f
|
Add embeds to AHelp relay (#11184)
|
2022-09-11 08:43:38 -07:00 |
|
Morbo
|
9aa9539fe8
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Content.Client/Entry/EntryPoint.cs
|
2022-09-11 14:26:08 +03:00 |
|
Visne
|
e1782ec22b
|
Disable re-adminning infinitely (#11174)
|
2022-09-10 06:07:35 -07:00 |
|
Visne
|
6fbac12ac3
|
Makes ahelp relay messages a little less disgusting to look at (#11149)
* Makes ahelp relay messages a little less disgusting to look at
* Improve title
|
2022-09-10 01:43:46 -05:00 |
|
metalgearsloth
|
72bc05e3ac
|
Add department bans (#11085)
* Add department bans
Also localised some stuff while I was there.
* loc
|
2022-09-08 17:06:21 -05:00 |
|
Leon Friedrich
|
d320ad950b
|
Fix AdminTestArenaSystem (#11082)
|
2022-09-06 21:19:26 -05:00 |
|
Morbo
|
59de757713
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Content.Client/Doors/AirlockVisualizer.cs
# Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml
# Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/closed_unlit.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closed_unlit.png
|
2022-09-06 22:21:16 +03:00 |
|
Leon Friedrich
|
414f32a4ee
|
Make ghost warp use AttachToGridOrMap() (#11069)
|
2022-09-05 22:36:52 -07:00 |
|
0x6273
|
29fd76c45d
|
Make Licoxide bypass insulated gloves (#10949)
|
2022-09-05 19:48:35 -07:00 |
|
20kdc
|
44945b6da6
|
Hopefully prevent interactions between admins without AHelp access and AHelps. (#11041)
|
2022-09-05 10:50:52 -05:00 |
|