Morbo
|
a3760d5656
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Resources/Server Info/Guidebook/Science/Xenoarchaeology.xml
# Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/icon.png
# Resources/Textures/Objects/Storage/boxes.rsi/box_security.png
# Resources/Textures/Objects/Storage/boxes.rsi/meta.json
|
2023-04-02 09:15:19 +03:00 |
|
metalgearsloth
|
cefc37903e
|
Random emergency shuttle time (#10047)
* Random emergency shuttle time
60 to 180 seconds. Rounds up to nearest 10.
All other FTL will go to the default of 30s.
* fix
|
2023-03-30 22:20:43 -06:00 |
|
Morbo
|
c58729755f
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Content.Server/Chat/Managers/ChatManager.cs
# Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
# Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/equipped-BACKPACK.png
# Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon-on.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/on-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/on-inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/meta.json
|
2023-03-24 05:48:43 +03:00 |
|
metalgearsloth
|
448165ffda
|
Escape pods (#14809)
* Namespace adjustments for days
* pod
* thanks rider
* Fix the oop launch
* Fixes
* Fix stuff
* eeeeeeeee
* Fix
* access
* map
* forgor
* thing
* Genericise escape pod fill
|
2023-03-23 19:54:41 -06:00 |
|