From: Moomoobeef <62638182+Moomoobeef@users.noreply.github.com> Date: Fri, 14 Jun 2024 06:24:18 +0000 (-0700) Subject: cargo can now order fax machines (#28968) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=adad6b2b0434416327337b57816dc412b97d4963;p=space-station-14.git cargo can now order fax machines (#28968) * cargo can now order fax machines * removed fax manual --- diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_service.yml b/Resources/Prototypes/Catalog/Cargo/cargo_service.yml index d2ca08e116..0f930ddfd6 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_service.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_service.yml @@ -68,6 +68,16 @@ 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: diff --git a/Resources/Prototypes/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Catalog/Fills/Crates/service.yml index 5b16b91f8b..1876de6a53 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/service.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/service.yml @@ -129,6 +129,17 @@ - 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 diff --git a/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml b/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml index b9c2b752db..5fb81aa6d4 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml @@ -204,3 +204,15 @@ 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 index 0000000000..428918e731 Binary files /dev/null and b/Resources/Textures/Objects/Devices/flatpack.rsi/fax-machine.png differ diff --git a/Resources/Textures/Objects/Devices/flatpack.rsi/meta.json b/Resources/Textures/Objects/Devices/flatpack.rsi/meta.json index 8f46a0ca53..bb5b49e185 100644 --- a/Resources/Textures/Objects/Devices/flatpack.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/flatpack.rsi/meta.json @@ -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" } ] }