Merge pull request #863 from starlighthowls/master

Cruise 2 playtest!

Resources/Locale/en-US/_Impstation/interaction/interaction-popup-component.ftl

@@ -15,6 +15,8 @@ petting-failure-cargorilla = You try to give {THE($target)} a hug, but you strug
 petting-success-disgustingpig = You insult {THE($target)}, as it deserves.
 petting-failure-disgustingpig = You think about insulting {THE($target)}, but hold your tongue.
 
+petting-success-ray = You Pet {$target}, it wiggles glowing pincers at you happily.
+
 ## Petting silicons
 
 petting-success-cargo-cyborg = You pet {THE($target)} on {POSS-ADJ($target)} scratched metal head.

Resources/Prototypes/Entities/Objects/Decoration/jackolantern.yml

@@ -62,19 +62,4 @@
     - type: Sprite
       scale: 1.5, 1.5
 
-- type: entity
-  parent: PumpkinLantern
-  id: PumpkinLanternReallyLarge
-  suffix: Large
-  components:
-    - type: Sprite
-      scale: 4, 4
-    - type: GhostTakeoverAvailable
-    - type: GhostRole
-      allowMovement: false
-      allowSpeech: true
-      makeSentient: true
-      name: jack
-      description: this holiday is for YOU and everyone better act like it
-      raffle:
-        settings: default
+

Resources/Prototypes/_Impstation/Entities/Markers/Spawners/mobs.yml

@@ -170,4 +170,18 @@
           sprite: _Impstation/Mobs/Aliens/Dinos/trike.rsi
     - type: ConditionalSpawner
       prototypes:
-      - MobDinosaurTrike
+      - MobDinosaurTrike
+
+- type: entity
+  name: ray spawner
+  suffix: UraniumCrab
+  id: UraniumCrabSpawnerRay
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: green
+        - state: ai
+    - type: ConditionalSpawner
+      prototypes:
+        - MobRay

Resources/Prototypes/_Impstation/Entities/Mobs/NPCs/miscellaneous.yml

@@ -168,3 +168,25 @@
     interactSuccessSound:
       path: /Audio/_Impstation/Animals/mwah.ogg
     interactSuccessSpawn: EffectHearts
+
+- type: entity
+  parent: MobUraniumCrab
+  id: MobRay
+  name: ray
+  description: A giant ore crab. It has a sticker on it's carapace reading "PLEASE HANDLE WITH CARE".
+  components:
+  - type: Sprite
+    scale: 3, 3
+  - type: PointLight
+    radius: 3
+    energy: 4
+    color: "#06DF24"
+  - type: InteractionPopup
+    successChance: 1
+    interactSuccessString: petting-success-ray
+    interactSuccessSpawn: EffectHearts
+  - type: DamageOnInteract
+    damage:
+      types:
+        Radiation: 5
+        Cellular: 5

Resources/Prototypes/_Impstation/Entities/Objects/Decorations/jackolantern.yml

@@ -0,0 +1,16 @@
+- type: entity
+  parent: PumpkinLantern
+  id: PumpkinLanternReallyLarge
+  suffix: ReallyLarge
+  components:
+    - type: Sprite
+      scale: 4, 4
+    - type: GhostTakeoverAvailable
+    - type: GhostRole
+      allowMovement: false
+      allowSpeech: true
+      makeSentient: true
+      name: jack
+      description: this holiday is for YOU and everyone better act like it
+      raffle:
+        settings: default

Resources/Prototypes/_Impstation/Entities/Structures/Storage/wash.yml

@@ -0,0 +1,51 @@
+- type: entity
+  parent: [ CrateBaseWeldable, BaseMachinePowered ]
+  id: WashingMachine
+  name: washing machine
+  components:
+  - type: Icon
+    sprite: _Impstation/Structures/Storage/Wash.rsi
+  - type: Sprite
+    sprite: _Impstation/Structures/Storage/Wash.rsi
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+    - state: closed
+      map: ["enum.StorageVisualLayers.Door"]
+    - map: ["enum.EntityHeaterVisuals.Setting"]
+      shader: unshaded
+      visible: false
+  - type: ApcPowerReceiver
+    powerDisabled: true
+  - type: WiredNetworkConnection
+  - type: PowerSwitch
+  - type: GenericVisualizer
+    visuals:
+      enum.EntityHeaterVisuals.Setting:
+        enum.EntityHeaterVisuals.Setting:
+          Off: { visible: true, state: washOff }
+          On: { visible: true, state: washOn }
+  - type: LitOnPowered
+  - type: PointLight
+    radius: 1.5
+    energy: 1.5
+    color: "#47bfff"
+  - type: AmbientSound
+    enabled: false
+    volume: -5
+    range: 5
+    sound:
+     path: /Audio/Ambience/Objects/portable_scrubber.ogg
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+        - ReagentId: Water
+          Quantity: 10000
+        maxVol: 10000
+  - type: ExaminableSolution
+    solution: tank
+  - type: ReagentTank
+    transferAmount: 100
+  - type: Transform
+    anchored: true

Resources/Prototypes/_Impstation/Maps/boat.yml

@@ -1,6 +1,6 @@
 - type: gameMap
   id: Boat
-  mapName: 'Spooky Whale'
+  mapName: 'NTAS Whale'
   mapPath: /Maps/_Impstation/boat.yml
   minPlayers: 50
   maxPlayers: 100
@@ -10,10 +10,10 @@
       stationProto: StandardNanotrasenStation
       components:
         - type: StationNameSetup
-          mapNameTemplate:  '{0} Spooky Whale {1}'
+          mapNameTemplate:  '{0} Whale {1}'
           nameGenerator:
             !type:NanotrasenNameGenerator
-            prefixCreator: 'SW'
+            prefixCreator: 'AS'
         - type: StationEmergencyShuttle
           emergencyShuttlePath: /Maps/Shuttles/emergency_cluster.yml
         - type: StationCargoShuttle
@@ -25,45 +25,44 @@
             Captain: [ 1, 1 ]
             HeadOfPersonnel: [ 1, 1 ]
             Bartender: [ 1, 1 ]
-            Botanist: [ 2, 2 ]
+            Botanist: [ 3, 3 ]
             Chef: [ 2, 2 ]
             Janitor: [ 3, 3 ]
             Chaplain: [ 1, 1 ]
             Librarian: [ 1, 1 ]
-            ServiceWorker: [ 4, 4 ]
+            ServiceWorker: [ 3, 3 ]
             Detective: [ 1, 1 ]
             #engineering
             ChiefEngineer: [ 1, 1 ]
             AtmosphericTechnician: [ 3, 3 ]
-            StationEngineer: [ 4, 4 ]
+            StationEngineer: [ 3, 3 ]
             TechnicalAssistant: [ 3, 3 ]
             #medical
             ChiefMedicalOfficer: [ 1, 1 ]
             Chemist: [ 2, 2 ]
             MedicalDoctor: [ 3, 3 ]
-            MedicalIntern: [ 2, 2 ]
+            MedicalIntern: [ 3, 3 ]
             Paramedic: [ 1, 1 ]
             Psychologist: [ 1, 1 ]
             #science
             ResearchDirector: [ 1, 1 ]
-            Scientist: [ 4, 4 ]
-            ResearchAssistant: [ 2, 2 ]
+            Scientist: [ 3, 3 ]
+            ResearchAssistant: [ 3, 3 ]
             #security
             HeadOfSecurity: [ 1, 1 ]
             Warden: [ 1, 1 ]
-            SecurityOfficer: [ 5, 5 ]
-            SecurityCadet: [ 2, 2 ]
+            SecurityOfficer: [ 3, 3 ]
+            SecurityCadet: [ 3, 3 ]
             Lawyer: [ 1, 1 ]
             Brigmedic: [ 1, 1 ]
             #supply
             Quartermaster: [ 1, 1 ]
             SalvageSpecialist: [ 3, 3 ]
-            CargoTechnician: [ 3, 3 ]
+            CargoTechnician: [ 4, 4 ]
             #civilian
             Passenger: [ -1, -1 ]
             Clown: [ 2, 2 ]
             Mime: [ 2, 2 ]
             Musician: [ 2, 2 ]
-            Borg: [ 3, 3 ]
+            Borg: [ 4, 4 ]
             Reporter: [ 1, 1 ]
-            Boxer: [ 2, 2 ]

Resources/Textures/_Impstation/Structures/Storage/Wash.rsi/meta.json

@@ -0,0 +1,29 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by by AftrLite (GitHub)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "base"
+    },
+    {
+      "name": "open"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "icon"
+    },
+    {
+      "name": "washOn"
+    },
+    {
+      "name": "washOff"
+    }
+  ]
+}