Merge branch 'master' of https://github.com/Park-Station/Parkstation …

…into IPCs

Resources/Changelog/SimpleStationChangelog.yml

@@ -766,69 +766,69 @@ Entries:
         Added a new examine verb to open a UI showing an 6x scale sprite view of
         any humanoid.
   id: 60
-  time: '2023-04-02T00:57:38Z'
+  time: '2023-04-02T00:57:38.0000000+00:00'
 - author: Pspritechologist
   changes:
     - message: Several minor additions and tweaks to ParkStation.
       type: Tweak
   id: 61
-  time: '2023-04-03T05:31:40Z'
+  time: '2023-04-03T05:31:40.0000000+00:00'
 - author: BlitzGunner225
   changes:
     - type: tweak
       message: Changed Syndicate reinforcement radio cost from 12TC to 13TC
   id: 62
-  time: '2023-04-07T00:04:42Z'
+  time: '2023-04-07T00:04:42.0000000+00:00'
 - author: Pixel
   changes:
     - type: add
       message: Added node scanner to loadout
   id: 63
-  time: '2023-04-07T00:25:51Z'
+  time: '2023-04-07T00:25:51.0000000+00:00'
 - author: Pspritechologist
   changes:
     - message: Recovered Walter from his own ashes.
       type: Tweak
   id: 64
-  time: '2023-04-07T18:26:04Z'
+  time: '2023-04-07T18:26:04.0000000+00:00'
 - author: DEATHB4DEFEAT
   changes:
     - type: fix
       message: Fixed cloning not applying traits.
   id: 65
-  time: '2023-04-09T03:42:37Z'
+  time: '2023-04-09T03:42:37.0000000+00:00'
 - author: DEATHB4DEFEAT
   changes:
     - type: add
       message: Added pickup/drop/throw sounds to tons of items
   id: 66
-  time: '2023-04-09T05:28:16Z'
+  time: '2023-04-09T05:28:16.0000000+00:00'
 - author: DEATHB4DEFEAT
   changes:
     - type: tweak
       message: Changes to the lists of controlled substances and items
   id: 67
-  time: '2023-04-09T06:32:50Z'
+  time: '2023-04-09T06:32:50.0000000+00:00'
 - author: DEATHB4DEFEAT
   changes:
     - type: add
       message: Announcers are now random every round.
     - type: add
       message: Added 3 new announcer voices.
   id: 68
-  time: '2023-04-09T06:50:03Z'
+  time: '2023-04-09T06:50:03.0000000+00:00'
 - author: DEATHB4DEFEAT
   changes:
     - type: tweak
       message: Changed some trait point costs.
   id: 69
-  time: '2023-04-09T06:50:51Z'
+  time: '2023-04-09T06:50:51.0000000+00:00'
 - author: Cabbage
   changes:
     - type: add
       message: Added head of personnel's plated hardsuit.
   id: 70
-  time: '2023-04-22T22:53:43Z'
+  time: '2023-04-22T22:53:43.0000000+00:00'
 - author: DEATHB4DEFEAT
   changes:
     - type: fix
@@ -842,27 +842,27 @@ Entries:
     - type: tweak
       message: Fugitives send a command report announcement
   id: 71
-  time: '2023-04-23T13:57:10Z'
+  time: '2023-04-23T13:57:10.0000000+00:00'
 - author: SomeCabbage
   changes:
     - type: tweak
       message: HoP's hardsuit helmet now looks more like the hat and less boring
   id: 72
-  time: '2023-04-28T10:06:30Z'
+  time: '2023-04-28T10:06:30.0000000+00:00'
 - author: DEATHB4DEFEAT
   changes:
     - type: tweak
       message: >-
         The chemists have suddenly decided to greatly improve the look of their
         pills, making patients much happier to ingest them.
   id: 73
-  time: '2023-04-30T02:23:55Z'
+  time: '2023-04-30T02:23:55.0000000+00:00'
 - author: DEATHB4DEFEAT
   changes:
     - type: tweak
       message: Airlocks now check your belt slot for accesses
   id: 74
-  time: '2023-05-01T04:08:37Z'
+  time: '2023-05-01T04:08:37.0000000+00:00'
 - author: DEATHB4DEFEAT
   changes:
     - type: tweak
@@ -874,7 +874,7 @@ Entries:
     - type: fix
       message: SAI no longer has a body :) -Psprite
   id: 75
-  time: '2023-05-01T04:13:49Z'
+  time: '2023-05-01T04:13:49.0000000+00:00'
 - author: SomeCabbage
   changes:
     - type: tweak
@@ -885,41 +885,41 @@ Entries:
         up. AI core now has telecom servers. Salvage now has 3 pre-placed GPSs.
         HoP locker is better now and contains cool stuff.
   id: 76
-  time: '2023-05-03T14:41:38Z'
+  time: '2023-05-03T14:41:38.0000000+00:00'
 - author: DEATHB4DEFEAT
   changes:
     - type: add
       message: Added chocolate milk, made with 5 Milk and 1 Theobromine.
   id: 77
-  time: '2023-05-06T22:47:18Z'
+  time: '2023-05-06T22:47:18.0000000+00:00'
 - author: DEATHB4DEFEAT
   changes:
     - type: fix
       message: Station AI and CSS are now whitelisted jobs.
   id: 78
-  time: '2023-05-07T00:27:35Z'
+  time: '2023-05-07T00:27:35.0000000+00:00'
 - author: JasperStingtail
   changes:
     - type: add
       message: Added Ohio
   id: 79
-  time: '2023-05-11T17:46:12Z'
+  time: '2023-05-11T17:46:12.0000000+00:00'
 - author: DEATHB4DEFEAT
   changes:
     - type: fix
       message: >-
         The spirits from beyond have decided to stop repairing catatonic beings'
         eyesight
   id: 80
-  time: '2023-05-11T18:55:51Z'
+  time: '2023-05-11T18:55:51.0000000+00:00'
 - author: SomeCabbage
   changes:
     - type: add
       message: >-
         Added Shiro's Delight, a fun drink that is time consuming and somewhat
         difficult to make, but provides funny buffs. Ask Shiro for the recipe
   id: 81
-  time: '2023-05-11T19:01:57Z'
+  time: '2023-05-11T19:01:57.0000000+00:00'
 - author: JasperStingtail
   changes:
     - type: fix
@@ -943,7 +943,7 @@ Entries:
     - type: fix
       message: East and west evac have been fixed to dock properly
   id: 82
-  time: '2023-05-17T21:54:03Z'
+  time: '2023-05-17T21:54:03.0000000+00:00'
 - author: Pspritechologist
   changes:
     - type: add
@@ -953,13 +953,13 @@ Entries:
         interesting stats at the end of the shift regarding things you may have,
         or may have not done well!
   id: 83
-  time: '2023-05-19T19:04:52Z'
+  time: '2023-05-19T19:04:52.0000000+00:00'
 - author: Pspritechologist
   changes:
     - type: remove
       message: Removes Ohiostation from the map pool until further notice.
   id: 84
-  time: '2023-05-20T04:24:27Z'
+  time: '2023-05-20T04:24:27.0000000+00:00'
 - author: SomeCabbage
   changes:
     - type: add
@@ -969,27 +969,27 @@ Entries:
     - type: add
       message: Cabbages can now be cut into leaves (request by Pspritechologist)
   id: 85
-  time: '2023-05-21T05:35:18Z'
+  time: '2023-05-21T05:35:18.0000000+00:00'
 - author: Devianartaro
   changes:
     - type: add
       message: 'Added pride pins to loadout '
   id: 86
-  time: '2023-05-22T23:39:12Z'
+  time: '2023-05-22T23:39:12.0000000+00:00'
 - author: DEATHB4DEFEAT
   changes:
     - type: fix
       message: Fixed reagents having roughly 2.5x the advertised damage effects
   id: 87
-  time: '2023-06-06T03:15:24Z'
+  time: '2023-06-06T03:15:24.0000000+00:00'
 - author: Pspritechologist
   changes:
     - type: add
       message: >-
         Nanotrasen have disabled the unneeded safeties on your guns- Make sure
         you're carful with them!
   id: 88
-  time: '2023-06-06T23:02:30Z'
+  time: '2023-06-06T23:02:30.0000000+00:00'
 - author: DEATHB4DEFEAT
   changes:
     - type: tweak
@@ -1022,3 +1022,19 @@ Entries:
         nothing.
   id: 92
   time: '2023-06-09T22:12:40.0000000+00:00'
+- author: SomeCabbage
+  changes:
+    - type: fix
+      message: >-
+        Nanotrasen fixed up a typo in their paperwork, meaning robots (cyborgs)
+        can once again be present on station!
+  id: 93
+  time: '2023-06-16T04:25:43.0000000+00:00'
+- author: SomeCabbage
+  changes:
+    - type: tweak
+      message: >-
+        Resprited the paramedic voidsuit to make it look less saturated and hard
+        on the eyes
+  id: 94
+  time: '2023-06-16T06:46:39.0000000+00:00'

Resources/Prototypes/Entities/Mobs/Player/observer.yml

@@ -53,7 +53,7 @@
     drawdepth: Ghosts
     sprite: Mobs/Ghosts/ghost_human.rsi
     state: animated
-    color: "#fff8"
+    color: "#ffff"
     layers:
       - state: animated
         shader: unshaded
@@ -63,3 +63,11 @@
   - type: MovementIgnoreGravity
   - type: Pullable
   - type: Speech
+  - type: UserInterface
+    interfaces:
+      - key: enum.StrippingUiKey.Key
+        type: StrippableBoundUserInterface
+  - type: Strippable
+  - type: Inventory
+    templateId: observer
+  - type: InventorySlots

Resources/Prototypes/Maps/parkstation.yml

@@ -1,4 +1,4 @@
-- type: gameMap
+- type: gameMap
   id: ParkStation
   mapName: 'ParkStation'
   mapPath: /Maps/parkstation.yml
@@ -21,7 +21,7 @@
         Boxer: [ 1, 2 ]
         Chef: [ 1, 1 ]
         Clown: [ 1, 1 ]
-        Cyborg: [ 2, 2 ]
+        Robot: [ 2, 2 ]
         Janitor: [ 2, 3 ]
         Mime: [ 1, 1 ]
         HeadOfPersonnel: [ 1, 1 ]
@@ -30,7 +30,7 @@
         ChiefMedicalOfficer: [ 1, 1 ]
         MailCarrier: [ 1, 2 ]
         MedicalDoctor: [ 3, 6 ]
-        MedicalCyborg: [ 1, 2 ]
+        MedicalRobot: [ 1, 2 ]
         Mystagogue: [ 1, 1 ]
         Epistemologist: [ 2, 5 ]
         HeadOfSecurity: [ 1, 1 ]

Resources/Prototypes/SimpleStation14/Entities/Mobs/NPCs/pets.yml

@@ -10,6 +10,11 @@
     - map: ["enum.DamageStateVisualLayers.Base"]
       state: monkey
       sprite: SimpleStation14/Mobs/Pets/punpun.rsi
+    - map: [ "enum.HumanoidVisualLayers.Handcuffs" ]
+      color: "#ffffff"
+      sprite: Objects/Misc/handcuffs.rsi
+      state: body-overlay-2
+      visible: false
   - type: Faction
     factions:
     - Pet

Resources/Prototypes/SimpleStation14/InventoryTemplates/observer_inventory_template.yml

@@ -0,0 +1,10 @@
+- type: inventoryTemplate
+  id: observer
+  slots:
+    - name: head
+      slotTexture: head
+      slotFlags: HEAD
+      slotGroup: MainHotbar
+      uiWindowPos: 1,0
+      strippingWindowPos: 1,0
+      displayName: Head

Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/meta.json

@@ -1,26 +1,27 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from paradise station at commit https://github.com/ParadiseSS13/Paradise/commit/e5e584804b4b0b373a6a69d23afb73fd3c094365",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by DSC@cababge#9633 (561159087765848084)",
+
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-HELMET",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }