Merge branch 'master' into 2020-08-19-firelocks

2020-08-21 16:51:50 +02:00
parent d7ced7a45c 1f1e95f535
commit 68fb5d4257
212 changed files with 3718 additions and 462 deletions
--- a/Resources/Prototypes/Entities/Constructible/Ground/table.yml
+++ b/Resources/Prototypes/Entities/Constructible/Ground/table.yml
@@ -22,6 +22,7 @@
  - type: IconSmooth
    key: generic
    base: solid_
+  - type: Climbable
  - type: Destructible
    maxHP: 50
    spawnOnDestroy: SteelSheet1
--- a/Resources/Prototypes/Entities/Constructible/disposal.yml
+++ b/Resources/Prototypes/Entities/Constructible/disposal.yml
@@ -44,6 +44,31 @@
      state_anchored: pipe-s
      state_broken: pipe-b

+- type: entity
+  id: DisposalTagger
+  parent: DisposalPipeBase
+  name: disposal pipe tagger
+  description: A pipe that tags entities for routing
+  components:
+  - type: Sprite
+    drawdepth: BelowFloor
+    sprite: Constructible/Power/disposal.rsi
+    state: conpipe-tagger
+  - type: Icon
+    sprite: Constructible/Power/disposal.rsi
+    state: conpipe-tagger
+  - type: DisposalTagger
+  - type: Appearance
+    visuals:
+    - type: DisposalVisualizer
+      state_free: conpipe-tagger
+      state_anchored: pipe-tagger
+      state_broken: pipe-b
+  - type: UserInterface
+    interfaces:
+    - key: enum.DisposalTaggerUiKey.Key
+      type: DisposalTaggerBoundUserInterface
+
 - type: entity
  id: DisposalTrunk
  parent: DisposalPipeBase
@@ -131,6 +156,63 @@
    - key: enum.DisposalUnitUiKey.Key
      type: DisposalUnitBoundUserInterface

+- type: entity
+  id: DisposalRouter
+  parent: DisposalPipeBase
+  name: disposal router
+  description: A three-way router. Entities with matching tags get routed to the side
+  components:
+  - type: Sprite
+    drawdepth: BelowFloor
+    sprite: Constructible/Power/disposal.rsi
+    state: conpipe-j1s
+  - type: Icon
+    sprite: Constructible/Power/disposal.rsi
+    state: conpipe-j1s
+  - type: DisposalRouter
+    degrees:
+    - 0
+    - -90
+    - 180
+  - type: Appearance
+    visuals:
+    - type: DisposalVisualizer
+      state_free: conpipe-j1s
+      state_anchored: pipe-j1s
+      state_broken: pipe-b
+  - type: Flippable
+    entity: DisposalRouterFlipped
+  - type: UserInterface
+    interfaces:
+    - key: enum.DisposalRouterUiKey.Key
+      type: DisposalRouterBoundUserInterface
+
+- type: entity
+  id: DisposalRouterFlipped
+  parent: DisposalRouter
+  name: flipped router junction
+  components:
+  - type: Sprite
+    drawdepth: BelowFloor
+    sprite: Constructible/Power/disposal.rsi
+    state: conpipe-j2s
+  - type: Icon
+    sprite: Constructible/Power/disposal.rsi
+    state: conpipe-j2s
+  - type: DisposalRouter
+    degrees:
+    - 0
+    - 90
+    - 180
+  - type: Appearance
+    visuals:
+    - type: DisposalVisualizer
+      state_free: conpipe-j2s
+      state_anchored: pipe-j2s
+      state_broken: pipe-b
+  - type: Flippable
+    entity: DisposalRouter
+
 - type: entity
  id: DisposalJunction
  parent: DisposalPipeBase
--- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
@@ -50,7 +50,7 @@
    range: 1.5
    arcwidth: 0
    arc: claw
-    damage: 90
+    damage: 10
  - type: Appearance
    visuals:
    - type: DamageStateVisualizer
--- a/Resources/Prototypes/Entities/Mobs/Species/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/human.yml
@@ -141,6 +141,7 @@
    - type: RotationVisualizer
    - type: BuckleVisualizer
  - type: CombatMode
+  - type: Climbing
  - type: Teleportable
  - type: CharacterInfo
  - type: FootstepSound
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -21,7 +21,6 @@
      type: PDABoundUserInterface
  - type: LoopingSound

-
 - type: entity
  name: Assistant PDA
  parent: BasePDA
@@ -39,9 +38,9 @@
    layers:
    - state: pda
      map: ["enum.PDAVisualLayers.Base"]
-    - state: unlit_pda_screen
+    - state: light_overlay
      shader: unshaded
-      map: ["enum.PDAVisualLayers.Unlit"]
+      map: ["enum.PDAVisualLayers.Flashlight"]

 - type: entity
  name: Chef PDA
@@ -53,16 +52,16 @@
    idCard: ChefIDCard
  - type: Icon
    sprite: Objects/Devices/pda.rsi
-    state: pda-chef
+    state: pda-cook
  - type: Sprite
    sprite: Objects/Devices/pda.rsi
    netsync: false
    layers:
-    - state: pda-chef
+    - state: pda-cook
      map: ["enum.PDAVisualLayers.Base"]
-    - state: unlit_pda_screen
+    - state: light_overlay
      shader: unshaded
-      map: ["enum.PDAVisualLayers.Unlit"]
+      map: ["enum.PDAVisualLayers.Flashlight"]

 - type: entity
  name: Clown PDA
@@ -81,9 +80,9 @@
    layers:
    - state: pda-clown
      map: ["enum.PDAVisualLayers.Base"]
-    - state: unlit_pda_screen
+    - state: light_overlay
      shader: unshaded
-      map: ["enum.PDAVisualLayers.Unlit"]
+      map: ["enum.PDAVisualLayers.Flashlight"]
  - type: Slippery
    paralyzeTime: 4

@@ -104,9 +103,9 @@
    layers:
    - state: pda-cargo
      map: ["enum.PDAVisualLayers.Base"]
-    - state: unlit_pda_screen
+    - state: light_overlay
      shader: unshaded
-      map: ["enum.PDAVisualLayers.Unlit"]
+      map: ["enum.PDAVisualLayers.Flashlight"]

 - type: entity
  name: Bartender PDA
@@ -118,16 +117,16 @@
    idCard: BartenderIDCard
  - type: Icon
    sprite: Objects/Devices/pda.rsi
-    state: pda-bar
+    state: pda-bartender
  - type: Sprite
    sprite: Objects/Devices/pda.rsi
    netsync: false
    layers:
-    - state: pda-bar
+    - state: pda-bartender
      map: ["enum.PDAVisualLayers.Base"]
-    - state: unlit_pda_screen
+    - state: light_overlay
      shader: unshaded
-      map: ["enum.PDAVisualLayers.Unlit"]
+      map: ["enum.PDAVisualLayers.Flashlight"]


 - type: entity
@@ -140,16 +139,16 @@
    idCard: JanitorIDCard
  - type: Icon
    sprite: Objects/Devices/pda.rsi
-    state: pda-j
+    state: pda-janitor
  - type: Sprite
    sprite: Objects/Devices/pda.rsi
    netsync: false
    layers:
-    - state: pda-j
+    - state: pda-janitor
      map: ["enum.PDAVisualLayers.Base"]
-    - state: unlit_pda_screen
+    - state: light_overlay
      shader: unshaded
-      map: ["enum.PDAVisualLayers.Unlit"]
+      map: ["enum.PDAVisualLayers.Flashlight"]

 - type: entity
  name: Captain PDA
@@ -161,16 +160,16 @@
    idCard: CaptainIDCard
  - type: Icon
    sprite: Objects/Devices/pda.rsi
-    state: pda-c
+    state: pda-captain
  - type: Sprite
    sprite: Objects/Devices/pda.rsi
    netsync: false
    layers:
-    - state: pda-c
+    - state: pda-captain
      map: ["enum.PDAVisualLayers.Base"]
-    - state: unlit_pda_screen
+    - state: light_overlay
      shader: unshaded
-      map: ["enum.PDAVisualLayers.Unlit"]
+      map: ["enum.PDAVisualLayers.Flashlight"]

 - type: entity
  name: HoP PDA
@@ -188,9 +187,9 @@
    layers:
    - state: pda-hop
      map: ["enum.PDAVisualLayers.Base"]
-    - state: unlit_pda_screen
+    - state: light_overlay
      shader: unshaded
-      map: ["enum.PDAVisualLayers.Unlit"]
+      map: ["enum.PDAVisualLayers.Flashlight"]

 - type: entity
  name: CE PDA
@@ -208,9 +207,9 @@
    layers:
    - state: pda-ce
      map: ["enum.PDAVisualLayers.Base"]
-    - state: unlit_pda_screen
+    - state: light_overlay
      shader: unshaded
-      map: ["enum.PDAVisualLayers.Unlit"]
+      map: ["enum.PDAVisualLayers.Flashlight"]


 - type: entity
@@ -222,16 +221,16 @@
    idCard: EngineeringIDCard
  - type: Icon
    sprite: Objects/Devices/pda.rsi
-    state: pda-e
+    state: pda-engineer
  - type: Sprite
    sprite: Objects/Devices/pda.rsi
    netsync: false
    layers:
-    - state: pda-e
+    - state: pda-engineer
      map: ["enum.PDAVisualLayers.Base"]
-    - state: unlit_pda_screen
+    - state: light_overlay
      shader: unshaded
-      map: ["enum.PDAVisualLayers.Unlit"]
+      map: ["enum.PDAVisualLayers.Flashlight"]

 - type: entity
  name: CMO PDA
@@ -249,10 +248,9 @@
    layers:
    - state: pda-cmo
      map: ["enum.PDAVisualLayers.Base"]
-    - state: unlit_pda_screen
+    - state: light_overlay
      shader: unshaded
-      map: ["enum.PDAVisualLayers.Unlit"]
-
+      map: ["enum.PDAVisualLayers.Flashlight"]

 - type: entity
  name: Medical PDA
@@ -263,16 +261,16 @@
    idCard: MedicalIDCard
  - type: Icon
    sprite: Objects/Devices/pda.rsi
-    state: pda-m
+    state: pda-medical
  - type: Sprite
    sprite: Objects/Devices/pda.rsi
    netsync: false
    layers:
-    - state: pda-m
+    - state: pda-medical
      map: ["enum.PDAVisualLayers.Base"]
-    - state: unlit_pda_screen
+    - state: light_overlay
      shader: unshaded
-      map: ["enum.PDAVisualLayers.Unlit"]
+      map: ["enum.PDAVisualLayers.Flashlight"]

 - type: entity
  name: RnD PDA
@@ -290,9 +288,9 @@
    layers:
    - state: pda-rd
      map: ["enum.PDAVisualLayers.Base"]
-    - state: unlit_pda_screen
+    - state: light_overlay
      shader: unshaded
-      map: ["enum.PDAVisualLayers.Unlit"]
+      map: ["enum.PDAVisualLayers.Flashlight"]

 - type: entity
  name: Science PDA
@@ -310,9 +308,9 @@
    layers:
    - state: pda-rd
      map: ["enum.PDAVisualLayers.Base"]
-    - state: unlit_pda_screen
+    - state: light_overlay
      shader: unshaded
-      map: ["enum.PDAVisualLayers.Unlit"]
+      map: ["enum.PDAVisualLayers.Flashlight"]

 - type: entity
  name: HoS PDA
@@ -330,9 +328,9 @@
    layers:
    - state: pda-hos
      map: ["enum.PDAVisualLayers.Base"]
-    - state: unlit_pda_screen
+    - state: light_overlay
      shader: unshaded
-      map: ["enum.PDAVisualLayers.Unlit"]
+      map: ["enum.PDAVisualLayers.Flashlight"]

 - type: entity
  name: Security PDA
@@ -343,13 +341,13 @@
    idCard: SecurityIDCard
  - type: Icon
    sprite: Objects/Devices/pda.rsi
-    state: pda-s
+    state: pda-security
  - type: Sprite
    sprite: Objects/Devices/pda.rsi
    netsync: false
    layers:
-    - state: pda-s
+    - state: pda-security
      map: ["enum.PDAVisualLayers.Base"]
-    - state: unlit_pda_screen
+    - state: light_overlay
      shader: unshaded
-      map: ["enum.PDAVisualLayers.Unlit"]
+      map: ["enum.PDAVisualLayers.Flashlight"]
--- a/Resources/Prototypes/SoundCollections/toy_squeak.yml
+++ b/Resources/Prototypes/SoundCollections/toy_squeak.yml
@@ -1,6 +1,6 @@
 - type: soundCollection
  id: ToySqueak
  files:
-  - /Audio/Items/toys/toysqueak1.ogg
-  - /Audio/Items/toys/toysqueak2.ogg
-  - /Audio/Items/toys/toysqueak3.ogg
+  - /Audio/Items/Toys/toysqueak1.ogg
+  - /Audio/Items/Toys/toysqueak2.ogg
+  - /Audio/Items/Toys/toysqueak3.ogg