Merge branch 'master' into kitchen

This commit is contained in:
Pieter-Jan Briers
2020-05-05 11:35:20 +02:00
committed by GitHub
112 changed files with 2184 additions and 408 deletions

Binary file not shown.

View File

@@ -134,3 +134,4 @@
- gc_mode
CanViewVar: true
CanAdminPlace: true
CanScript: true

View File

@@ -0,0 +1,19 @@
# Example Dutch translations
- msgid: Wrench
msgstr: Moersleutel
- msgid: Welding Tool
msgstr: Lasapparaat
- msgid: Crowbar
msgstr: Koevoet
- msgid: Screwdriver
msgstr: Schroevendraaier
- msgid: Wirecutters
msgstr: Draadtang
- msgid: Multitool
msgstr: Multi Tool # This is what google translate gives me idk.

File diff suppressed because it is too large Load Diff

View File

@@ -117,3 +117,26 @@
- type: Icon
sprite: Buildings/Doors/airlock_command_glass.rsi
- type: entity
parent: Airlock
id: AirlockSecurity
name: Security Airlock
components:
- type: Sprite
sprite: Buildings/Doors/airlock_security.rsi
- type: Icon
sprite: Buildings/Doors/airlock_security.rsi
- type: entity
parent: AirlockGlass
id: AirlockSecurityGlass
name: Glass Security Airlock
components:
- type: Sprite
sprite: Buildings/Doors/airlock_security_glass.rsi
- type: Icon
sprite: Buildings/Doors/airlock_security_glass.rsi

View File

@@ -0,0 +1,36 @@
- type: entity
id: GravityGenerator
name: Gravity Generator
description: It's what keeps you to the floor.
components:
- type: Sprite
sprite: Buildings/gravity_generator.rsi
layers:
- state: on
- sprite: Buildings/gravity_generator_core.rsi
state: activated
shader: unshaded
- type: Icon
sprite: Buildings/gravity_generator.rsi
state: on
- type: SnapGrid
offset: Center
- type: PowerDevice
load: 500
- type: Collidable
shapes:
- !type:PhysShapeAabb
bounds: "-1.5,-1.5,1.5,1.5"
layer: 15
- type: Clickable
- type: InteractionOutline
- type: Damageable
- type: Breakable
threshold: 150
- type: GravityGenerator
- type: UserInterface
interfaces:
- key: enum.GravityGeneratorUiKey.Key
type: GravityGeneratorBoundUserInterface
placement:
mode: AlignTileAny

View File

@@ -36,7 +36,6 @@
- type: Appearance
visuals:
- type: MedicalScannerVisualizer2D
- type: PowerDevice
- type: UserInterface
interfaces:
- key: enum.MedicalScannerUiKey.Key

View File

@@ -21,6 +21,7 @@
state: utilitybelt
- type: Clothing
Size: 50
QuickEquip: false
sprite: Clothing/belt_utility.rsi
- type: Storage
Capacity: 40 # Full tool loadout is 35, plus an extra

View File

@@ -23,6 +23,18 @@
- type: Icon
texture: Objects/Instruments/musician.rsi/h_synthesizer.png
- type: entity
name: Acoustic Guitar
parent: BaseHandheldInstrument
id: AcousticGuitarInstrument
components:
- type: Instrument
program: 25
- type: Sprite
texture: Objects/Instruments/musician.rsi/guitar.png
- type: Icon
texture: Objects/Instruments/musician.rsi/guitar.png
- type: entity
name: Violin
parent: BaseHandheldInstrument

View File

@@ -20,6 +20,7 @@
- type: Sound
- type: EmitSoundOnUse
sound: /Audio/items/bikehorn.ogg
variation: 0.2
- type: UseDelay
delay: 0.5

View File

@@ -42,6 +42,3 @@
- type: Item
Size: 24
sprite: Objects/Guns/SMGs/c20r.rsi
- type: Item
Size: 24
sprite: Objects/Guns/SMGs/wt550.rsi

View File

@@ -34,7 +34,6 @@
drawdepth: Objects
- type: Icon
texture: Objects/Janitorial/mopbucket.png
- type: Clickable
- type: InteractionOutline
- type: Bucket
- type: Sound
@@ -51,7 +50,6 @@
- type: Physics
mass: 5
Anchored: false
- type: Sound
- type: entity
parent: BaseItem

View File

@@ -8,7 +8,9 @@
- type: latheRecipe
id: Screwdriver
icon: Objects/Tools/screwdriver.png
icon:
sprite: Objects/Tools/screwdriver.rsi
state: screwdriver
result: Screwdriver
completetime: 500
materials:
@@ -16,7 +18,9 @@
- type: latheRecipe
id: Welder
icon: Objects/Tools/autolathe_welder.png
icon:
sprite: Objects/Tools/welder.rsi
state: welder
result: Welder
completetime: 500
materials:
@@ -51,7 +55,9 @@
- type: latheRecipe
id: Multitool
icon: Objects/Tools/multitool.png
icon:
sprite: Objects/Tools/multitool.rsi
state: multitool
result: Multitool
completetime: 500
materials:

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 165 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 316 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@@ -0,0 +1,220 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/doors/Dooreng.dmi",
"states": [
{
"name": "closed",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "closed_unlit",
"directions": 1
},
{
"name": "closing",
"directions": 1,
"delays": [
[
0.2,
0.2,
0.1,
0.1,
0.1,
0.1,
0.1,
0.3
]
]
},
{
"name": "closing_unlit",
"directions": 1,
"delays": [
[
0.5,
0.1,
0.1,
0.1,
0.1,
0.3
]
]
},
{
"name": "deny",
"directions": 1,
"delays": [
[
0.1,
0.1,
0.1
]
]
},
{
"name": "locked",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "panel_closing",
"directions": 1,
"delays": [
[
0.2,
0.2,
0.1,
0.1,
0.1,
0.1,
0.1,
0.3
]
]
},
{
"name": "panel_opening",
"directions": 1,
"delays": [
[
0.2,
0.2,
0.1,
0.1,
0.1,
0.1,
0.1,
0.3
]
]
},
{
"name": "open",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "opening",
"directions": 1,
"delays": [
[
0.2,
0.2,
0.1,
0.1,
0.1,
0.1,
0.1,
0.3
]
]
},
{
"name": "opening_unlit",
"directions": 1,
"delays": [
[
0.2,
0.2,
0.1,
0.1,
0.1,
0.5
]
]
},
{
"name": "panel_open",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "spark",
"directions": 1,
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
]
},
{
"name": "sparks_broken",
"directions": 1,
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
]
},
{
"name": "sparks_damaged",
"directions": 1,
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
1.7
]
]
},
{
"name": "sparks_open",
"directions": 1,
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
]
},
{
"name": "welded",
"directions": 1,
"delays": [
[
1.0
]
]
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 291 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 368 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 193 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 348 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 226 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 238 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 215 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 225 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 165 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 316 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

View File

@@ -0,0 +1,220 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/doors/Dooreng.dmi",
"states": [
{
"name": "closed",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "closed_unlit",
"directions": 1
},
{
"name": "closing",
"directions": 1,
"delays": [
[
0.2,
0.2,
0.1,
0.1,
0.1,
0.1,
0.1,
0.3
]
]
},
{
"name": "closing_unlit",
"directions": 1,
"delays": [
[
0.5,
0.1,
0.1,
0.1,
0.1,
0.3
]
]
},
{
"name": "deny",
"directions": 1,
"delays": [
[
0.1,
0.1,
0.1
]
]
},
{
"name": "locked",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "panel_closing",
"directions": 1,
"delays": [
[
0.2,
0.2,
0.1,
0.1,
0.1,
0.1,
0.1,
0.3
]
]
},
{
"name": "panel_opening",
"directions": 1,
"delays": [
[
0.2,
0.2,
0.1,
0.1,
0.1,
0.1,
0.1,
0.3
]
]
},
{
"name": "open",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "opening",
"directions": 1,
"delays": [
[
0.2,
0.2,
0.1,
0.1,
0.1,
0.1,
0.1,
0.3
]
]
},
{
"name": "opening_unlit",
"directions": 1,
"delays": [
[
0.2,
0.2,
0.1,
0.1,
0.1,
0.5
]
]
},
{
"name": "panel_open",
"directions": 1,
"delays": [
[
1.0
]
]
},
{
"name": "spark",
"directions": 1,
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
]
},
{
"name": "sparks_broken",
"directions": 1,
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
]
},
{
"name": "sparks_damaged",
"directions": 1,
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
1.7
]
]
},
{
"name": "sparks_open",
"directions": 1,
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
]
},
{
"name": "welded",
"directions": 1,
"delays": [
[
1.0
]
]
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 291 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 368 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 193 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 348 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 226 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 238 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 215 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 225 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

View File

@@ -0,0 +1,23 @@
{
"version":1,
"size":{
"x":96,
"y":96
},
"license":"CC-BY-SA-3.0",
"copyright":"Taken from https://github.com/tgstation/tgstation",
"states":[
{
"name":"on",
"directions": 1
},
{
"name": "off",
"directions": 1
},
{
"name": "broken",
"directions": 1
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 684 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@@ -0,0 +1,20 @@
{
"version":1,
"size":{
"x":32,
"y":32
},
"license":"CC-BY-SA-3.0",
"copyright":"Taken from https://github.com/tgstation/tgstation",
"states":[
{
"name": "activated",
"directions": 1,
"delays": [
[0.1,
0.1,
0.1]
]
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 330 B

View File

@@ -1,9 +1,12 @@
version: 1 # Not used right now, whatever.
binds:
- function: UseOrAttack
- function: Use
type: state
key: MouseLeft
canFocus: true
- function: WideAttack
type: state
key: Space
- function: ShowDebugMonitors
type: Toggle
key: F3
@@ -65,6 +68,14 @@ binds:
- function: OpenCharacterMenu
type: State
key: C
- function: TextCursorSelect
# TextCursorSelect HAS to be above ExamineEntity
# So that LineEdit receives it correctly.
# TODO: Make it so that UI keybinds are somehow prioritized so this ordering stuff isn't necessary.
type: state
key: MouseLeft
mod1: Shift
canFocus: true
- function: ExamineEntity
type: State
key: MouseLeft
@@ -94,6 +105,14 @@ binds:
- function: OpenInventoryMenu
type: state
key: I
- function: SmartEquipBackpack
type: State
key: B
mod1: Shift
- function: SmartEquipBelt
type: State
key: E
mod1: Shift
- function: ShowDebugConsole
type: state
key: Tilde
@@ -109,6 +128,16 @@ binds:
type: state
key: Right
canRepeat: true
- function: TextCursorWordLeft
type: state
key: Left
mod1: Control
canRepeat: true
- function: TextCursorWordRight
type: state
key: Right
mod1: Control
canRepeat: true
- function: TextCursorBegin
type: state
key: Home
@@ -116,6 +145,37 @@ binds:
type: state
key: End
canRepeat: true
- function: TextCursorSelectLeft
type: state
key: Left
mod1: Shift
canRepeat: true
- function: TextCursorSelectRight
type: state
key: Right
mod1: Shift
canRepeat: true
- function: TextCursorSelectWordLeft
type: state
key: Left
mod1: Shift
mod2: Control
canRepeat: true
- function: TextCursorSelectWordRight
type: state
key: Right
mod1: Shift
mod2: Control
canRepeat: true
- function: TextCursorSelectBegin
type: state
mod1: Shift
key: Home
- function: TextCursorSelectEnd
type: state
mod1: Shift
key: End
canRepeat: true
- function: TextBackspace
type: state
key: BackSpace
@@ -126,6 +186,18 @@ binds:
- function: TextSubmit
type: state
key: NumpadEnter
- function: TextSelectAll
type: state
key: A
mod1: Control
- function: TextCopy
type: state
key: C
mod1: Control
- function: TextCut
type: state
key: X
mod1: Control
- function: TextPaste
type: state
key: V
@@ -155,3 +227,10 @@ binds:
- function: OpenSandboxWindow
type: state
key: B
- function: TakeScreenshot
type: state
key: F2
- function: TakeScreenshotNoUI
type: state
key: F2
mod1: Shift