]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
CuraDrobe + Misc Librarian Stuff (#19469)
authorpotato1234_x <79580518+potato1234x@users.noreply.github.com>
Tue, 10 Oct 2023 16:55:30 +0000 (02:55 +1000)
committerGitHub <noreply@github.com>
Tue, 10 Oct 2023 16:55:30 +0000 (11:55 -0500)
* sprites

* stuff

* jumpsuit sprites

* jumpskirt sprites

* fix 2

* CLOTHING FIX 2 IM LOSING MY MIND

* contrast 2

* update 239

44 files changed:
Resources/Locale/en-US/advertisements/vending/curadrobe.ftl [new file with mode: 0644]
Resources/Prototypes/Catalog/VendingMachines/Advertisements/curadrobe.yml [new file with mode: 0644]
Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml [new file with mode: 0644]
Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml
Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
Resources/Textures/Clothing/Eyes/Glasses/jamjar.rsi/equipped-EYES-hamster.png [new file with mode: 0644]
Resources/Textures/Clothing/Eyes/Glasses/jamjar.rsi/equipped-EYES.png [new file with mode: 0644]
Resources/Textures/Clothing/Eyes/Glasses/jamjar.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/Eyes/Glasses/jamjar.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/Eyes/Glasses/jamjar.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Clothing/Eyes/Glasses/jamjar.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpskirt/curator.rsi/equipped-INNERCLOTHING-monkey.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpskirt/curator.rsi/equipped-INNERCLOTHING.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpskirt/curator.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpskirt/curator.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpskirt/curator.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpskirt/curator.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/equipped-INNERCLOTHING-monkey.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/equipped-INNERCLOTHING.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpsuit/curator.rsi/equipped-INNERCLOTHING-monkey.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpsuit/curator.rsi/equipped-INNERCLOTHING.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpsuit/curator.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpsuit/curator.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpsuit/curator.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpsuit/curator.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/equipped-INNERCLOTHING-monkey.png
Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/equipped-INNERCLOTHING.png
Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/icon.png
Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-left.png
Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-right.png
Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/meta.json
Resources/Textures/Structures/Machines/VendingMachines/curadrobe.rsi/broken.png [new file with mode: 0644]
Resources/Textures/Structures/Machines/VendingMachines/curadrobe.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Structures/Machines/VendingMachines/curadrobe.rsi/normal-unshaded.png [new file with mode: 0644]
Resources/Textures/Structures/Machines/VendingMachines/curadrobe.rsi/off.png [new file with mode: 0644]
Resources/Textures/Structures/Machines/VendingMachines/curadrobe.rsi/panel.png [new file with mode: 0644]

diff --git a/Resources/Locale/en-US/advertisements/vending/curadrobe.ftl b/Resources/Locale/en-US/advertisements/vending/curadrobe.ftl
new file mode 100644 (file)
index 0000000..d749574
--- /dev/null
@@ -0,0 +1,2 @@
+advertisement-curadrobe-1 = Glasses for your eyes and literature for your soul, CuraDrobe has it all!
+advertisement-curadrobe-2 = Impress & enthrall your library guests with CuraDrobe's extended line of pens!
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/curadrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/curadrobe.yml
new file mode 100644 (file)
index 0000000..71cc123
--- /dev/null
@@ -0,0 +1,5 @@
+- type: advertisementsPack
+  id: CuraDrobeAds
+  advertisements:
+    - advertisement-curadrobe-1
+    - advertisement-curadrobe-2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml
new file mode 100644 (file)
index 0000000..b083c62
--- /dev/null
@@ -0,0 +1,14 @@
+- type: vendingMachineInventory
+  id: CuraDrobeInventory
+  startingInventory:
+    BooksBag: 1
+    HandLabeler: 2
+    ClothingEyesGlasses: 2
+    ClothingEyesGlassesJamjar: 2
+    ClothingUniformJumpsuitCurator: 3
+    ClothingUniformJumpskirtCurator: 3
+    ClothingUniformJumpsuitLibrarian: 3
+    ClothingUniformJumpskirtLibrarian: 3
+    ClothingShoesBootsLaceup: 2
+    ClothingHeadsetService: 2
+    
index c97290fdaaace8117f569c951ddea113b09edfad..2323db881e810ab18e153f60c886c4bb616b67d4 100644 (file)
     - HamsterWearable
     - WhitelistChameleon
 
+- type: entity
+  parent: ClothingEyesBase
+  id: ClothingEyesGlassesJamjar
+  name: jamjar glasses
+  description: Also known as Virginity Protectors.
+  components:
+  - type: Sprite
+    sprite: Clothing/Eyes/Glasses/jamjar.rsi
+  - type: Clothing
+    sprite: Clothing/Eyes/Glasses/jamjar.rsi
+  - type: VisionCorrection
+  - type: Tag
+    tags:
+    - HamsterWearable
+    - WhitelistChameleon
+
 - type: entity
   parent: ClothingEyesBase
   id: ClothingEyesGlassesOutlawGlasses
index bbfec42bea9fb33e6f64a3a3ec9d2844a100e295..d0eeb5b64b9f99373d4ddaec0776f5c0cc355cd1 100644 (file)
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpskirt/Color/maroon.rsi
 
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtLibrarian
+  name: librarian jumpskirt
+  description: A cosy green jumper fit for a curator of books.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/librarian.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/librarian.rsi
+
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtCurator
+  name: sensible skirt
+  description: It's sensible. Too sensible...
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/curator.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/curator.rsi
+
 - type: entity
   parent: ClothingUniformSkirtBase
   id: ClothingUniformJumpskirtPerformer
index 8d3bee7b1908ab3015a687cb8726e777d0615f88..5e857141b858aa97e96c0551520d9be4e40d64e1 100644 (file)
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpsuit/librarian.rsi
 
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitCurator
+  name: sensible suit
+  description: It's sensible. Too sensible...
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/curator.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/curator.rsi
+
 - type: entity
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitLawyerRed
 - type: entity
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitCossack
-  name: Cossack suit
+  name: cossack suit
   description: the good old pants and brigantine.
   components:
   - type: Sprite
index 3324e7d2c31621bff8140149dc76219429d60c61..6ada51176c9c17a005cc77bc7155ebf8d6a15eb1 100644 (file)
     - SecDrobeInventory
     - ViroDrobeInventory
     - WinterDrobeInventory
+    - CuraDrobeInventory
   - type: Sprite
     layers:
     - state: base
index 3e8f6a9b6b19e3ce2ab31def1a8288c9ad3c72ed..8e06d23ee76e036d7e04c059a35e79866994d13b 100644 (file)
   - type: AccessReader
     access: [["Chemistry"]]
 
+- type: entity
+  parent: VendingMachine
+  id: VendingMachineCuraDrobe
+  name: CuraDrobe
+  description: A lowstock vendor only capable of vending clothing for curators and librarians.
+  components:
+  - type: VendingMachine
+    pack: CuraDrobeInventory
+    offState: off
+    brokenState: broken
+    normalState: normal-unshaded
+  - type: Advertise
+    pack: CuraDrobeAds
+  - type: Sprite
+    sprite: Structures/Machines/VendingMachines/curadrobe.rsi
+    layers:
+    - state: "off"
+      map: ["enum.VendingMachineVisualLayers.Base"]
+    - state: "off"
+      map: ["enum.VendingMachineVisualLayers.BaseUnshaded"]
+      shader: unshaded
+    - state: panel
+      map: ["enum.WiresVisualLayers.MaintenancePanel"]
+  - type: AccessReader
+    access: [["Service"]]
+
 - type: entity
   parent: VendingMachine
   id: VendingMachineAtmosDrobe
index 8a3e2adaa377a474f039dcfde8270949e7e4f993..68d075f89fc63c32822146c622d3e676f30f6cff 100644 (file)
     id: LibrarianPDA
     ears: ClothingHeadsetService
     pocket1: d10Dice
-    belt: BooksBag
     pocket2: HandLabeler # for making named bestsellers
-  inhand:
-    right hand: BriefcaseBrownFilled
-  innerclothingskirt: ClothingUniformJumpskirtColorLightBrown
+  innerclothingskirt: ClothingUniformJumpskirtLibrarian
   satchel: ClothingBackpackSatchelLibrarianFilled
   duffelbag: ClothingBackpackDuffelLibrarianFilled
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/jamjar.rsi/equipped-EYES-hamster.png b/Resources/Textures/Clothing/Eyes/Glasses/jamjar.rsi/equipped-EYES-hamster.png
new file mode 100644 (file)
index 0000000..1d7042d
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Glasses/jamjar.rsi/equipped-EYES-hamster.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/jamjar.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Glasses/jamjar.rsi/equipped-EYES.png
new file mode 100644 (file)
index 0000000..f285e3c
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Glasses/jamjar.rsi/equipped-EYES.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/jamjar.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Glasses/jamjar.rsi/icon.png
new file mode 100644 (file)
index 0000000..6783921
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Glasses/jamjar.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/jamjar.rsi/inhand-left.png b/Resources/Textures/Clothing/Eyes/Glasses/jamjar.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..36e283a
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Glasses/jamjar.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/jamjar.rsi/inhand-right.png b/Resources/Textures/Clothing/Eyes/Glasses/jamjar.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..b02a6b8
Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Glasses/jamjar.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/jamjar.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Glasses/jamjar.rsi/meta.json
new file mode 100644 (file)
index 0000000..1d659ee
--- /dev/null
@@ -0,0 +1,30 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-EYES",
+      "directions": 4
+    },
+    {
+      "name": "equipped-EYES-hamster",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/curator.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/curator.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644 (file)
index 0000000..f57dadc
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/curator.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/curator.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/curator.rsi/equipped-INNERCLOTHING.png
new file mode 100644 (file)
index 0000000..f494309
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/curator.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/curator.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/curator.rsi/icon.png
new file mode 100644 (file)
index 0000000..0142dcb
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/curator.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/curator.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/curator.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..a4ee3cd
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/curator.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/curator.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/curator.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..8adcb37
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/curator.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/curator.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/curator.rsi/meta.json
new file mode 100644 (file)
index 0000000..0a48ac3
--- /dev/null
@@ -0,0 +1,30 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/47718914e47c6fbf23d6dc97f073a9daa11b23cb and modified by potato1234x (github) for ss14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "equipped-INNERCLOTHING-monkey",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644 (file)
index 0000000..2462daf
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/equipped-INNERCLOTHING.png
new file mode 100644 (file)
index 0000000..56b9646
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/icon.png
new file mode 100644 (file)
index 0000000..2400ac8
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..9feaebd
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..6b8fccf
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/librarian.rsi/meta.json
new file mode 100644 (file)
index 0000000..0a48ac3
--- /dev/null
@@ -0,0 +1,30 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/47718914e47c6fbf23d6dc97f073a9daa11b23cb and modified by potato1234x (github) for ss14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "equipped-INNERCLOTHING-monkey",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/curator.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/curator.rsi/equipped-INNERCLOTHING-monkey.png
new file mode 100644 (file)
index 0000000..272ad29
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/curator.rsi/equipped-INNERCLOTHING-monkey.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/curator.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/curator.rsi/equipped-INNERCLOTHING.png
new file mode 100644 (file)
index 0000000..1112b8a
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/curator.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/curator.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/curator.rsi/icon.png
new file mode 100644 (file)
index 0000000..d84a33f
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/curator.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/curator.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/curator.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..a4ee3cd
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/curator.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/curator.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/curator.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..8adcb37
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/curator.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/curator.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/curator.rsi/meta.json
new file mode 100644 (file)
index 0000000..0a48ac3
--- /dev/null
@@ -0,0 +1,30 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/47718914e47c6fbf23d6dc97f073a9daa11b23cb and modified by potato1234x (github) for ss14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "equipped-INNERCLOTHING-monkey",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
index 066cdfe77df77d13c7902ca854c584a0825d330a..7f424f1d8829494abe553cc8f1a324bb201358be 100644 (file)
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/equipped-INNERCLOTHING-monkey.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/equipped-INNERCLOTHING-monkey.png differ
index bc33eb92a9fd8feaa059928714286d894ee7b70b..8aa89ef44ed16a5520995d456bdccf81f5dc0096 100644 (file)
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/equipped-INNERCLOTHING.png differ
index 2ba9f54bd9fac2a1c9a298c4dff0c4c457471477..36cb47ba89b49944cb3b0ff0938c3fe6777d13bd 100644 (file)
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/icon.png differ
index 48053d29482bd32d1a8c266f0d9ca8e484adc18d..9feaebdb55a104eaa0ec59dfdc73ffcf1cd1c044 100644 (file)
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-left.png differ
index b026a2421e9ef8dab15374db3256ffcca29a7110..6b8fccf1f47aa2e8242a03b3db30eee46060e119 100644 (file)
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-right.png differ
index 2e1a43d61a055df6485e9708345aa04f822816a4..0a48ac3e373c8b4c6e1f14c41d911b9196b45d3e 100644 (file)
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Based on blacksuit from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/4daf5d1a1b45fc3fcc4fd9703222159e6c1f38c8, modified by Peptide, monkey made by brainfood1183 (github) for ss14",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/47718914e47c6fbf23d6dc97f073a9daa11b23cb and modified by potato1234x (github) for ss14",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/curadrobe.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/curadrobe.rsi/broken.png
new file mode 100644 (file)
index 0000000..dc955af
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/curadrobe.rsi/broken.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/curadrobe.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/curadrobe.rsi/meta.json
new file mode 100644 (file)
index 0000000..fe9047c
--- /dev/null
@@ -0,0 +1,31 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/a879151ef04192ae2a791278ee882c1bce7c5062 and modified by potato1234x",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "broken"
+    },
+    {
+      "name": "off"
+    },
+    {
+      "name": "panel"
+    },
+    {
+      "name": "normal-unshaded",
+      "delays": [
+        [
+          1.5,
+          0.1,
+          1.5,
+          0.1
+        ]
+      ]
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/curadrobe.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/curadrobe.rsi/normal-unshaded.png
new file mode 100644 (file)
index 0000000..f336fd2
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/curadrobe.rsi/normal-unshaded.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/curadrobe.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/curadrobe.rsi/off.png
new file mode 100644 (file)
index 0000000..06e2276
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/curadrobe.rsi/off.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/curadrobe.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/curadrobe.rsi/panel.png
new file mode 100644 (file)
index 0000000..0032751
Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/curadrobe.rsi/panel.png differ