]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
cargo can now order fax machines (#28968)
authorMoomoobeef <62638182+Moomoobeef@users.noreply.github.com>
Fri, 14 Jun 2024 06:24:18 +0000 (23:24 -0700)
committerGitHub <noreply@github.com>
Fri, 14 Jun 2024 06:24:18 +0000 (16:24 +1000)
* cargo can now order fax machines

* removed fax manual

Resources/Prototypes/Catalog/Cargo/cargo_service.yml
Resources/Prototypes/Catalog/Fills/Crates/service.yml
Resources/Prototypes/Entities/Objects/Devices/flatpack.yml
Resources/Textures/Objects/Devices/flatpack.rsi/fax-machine.png [new file with mode: 0644]
Resources/Textures/Objects/Devices/flatpack.rsi/meta.json

index d2ca08e1166d26e2b09f71b17b01c11e9807b6bc..0f930ddfd6a21eb9d0344c3a23d8e96f98ca73b8 100644 (file)
   category: cargoproduct-category-name-service
   group: market
 
+- type: cargoProduct
+  id: ServiceFaxMachine
+  icon:
+    sprite: Structures/Machines/fax_machine.rsi
+    state: icon
+  product: CrateServiceFaxMachine
+  cost: 2000
+  category: cargoproduct-category-name-service
+  group: market
+
 - type: cargoProduct
   id: ServicePersonnel
   icon:
index 5b16b91f8b484ef2e8fa1b834b5163a4a5fc1af2..1876de6a53bae4f1fe961a022cdd5358e907a92a 100644 (file)
     - id: BoxFolderYellow
     - id: NewtonCradle
 
+- type: entity
+  id: CrateServiceFaxMachine
+  parent: CrateGenericSteel
+  name: fax machine crate
+  description: A fax machine and a screwdriver to set the name with.
+  components:
+  - type: StorageFill
+    contents:
+    - id: Screwdriver
+    - id: FaxMachineFlatpack
+
 - type: entity
   id: CrateServicePersonnel
   parent: CrateCommandSecure
index b9c2b752dba4d77d50c8a2004bf83448975669d1..5fb81aa6d4815eb78bad302623466ac26c087c96 100644 (file)
   components:
   - type: Flatpack
     entity: SpaceHeaterAnchored
+
+- type: entity
+  parent: BaseFlatpack
+  id: FaxMachineFlatpack
+  name: fax machine flatpack
+  description: A flatpack used for constructing a fax machine.
+  components:
+  - type: Sprite
+    layers:
+    - state: fax-machine
+  - type: Flatpack
+    entity: FaxMachineBase
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/fax-machine.png b/Resources/Textures/Objects/Devices/flatpack.rsi/fax-machine.png
new file mode 100644 (file)
index 0000000..428918e
Binary files /dev/null and b/Resources/Textures/Objects/Devices/flatpack.rsi/fax-machine.png differ
index 8f46a0ca53be59bb31c7c4df01ec01a251a17587..bb5b49e18505c8eb946b21c53a285b497a900a04 100644 (file)
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC0-1.0",
-    "copyright": "Created by EmoGarbage404 (github) for SS14, solar-assembly-part taken from tgstation and modified at https://tgstation13.org/wiki/Guide_to_construction#Solar_Panels_and_Trackers, ame-part taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1b7952787c06c21ef1623e494dcfe7cb1f46e041; singularity-generator, tesla-generator, radiation-collector, containment-field-generator, tesla-coil, grounding-rod inner icons made by lzk228; emitter made by pigeonpeas",
+    "copyright": "Created by EmoGarbage404 (github) for SS14, solar-assembly-part taken from tgstation and modified at https://tgstation13.org/wiki/Guide_to_construction#Solar_Panels_and_Trackers, ame-part taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1b7952787c06c21ef1623e494dcfe7cb1f46e041; singularity-generator, tesla-generator, radiation-collector, containment-field-generator, tesla-coil, grounding-rod inner icons made by lzk228; emitter made by pigeonpeas. fax-machine made by moomoobeef",
     "size": {
         "x": 32,
         "y": 32
@@ -42,6 +42,9 @@
         },
                {
             "name": "emitter"
+        },
+        {
+            "name": "fax-machine"
         }
     ]
 }