From: coolmankid12345 <55817627+coolmankid12345@users.noreply.github.com> Date: Mon, 16 Oct 2023 05:31:48 +0000 (-0400) Subject: Less charges for Sci flash (#20959) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=f7fbabadac1db5309f54e40aae7a31246b0ecf85;p=space-station-14.git Less charges for Sci flash (#20959) * Flash * Okay not plant based anymore --------- Co-authored-by: coolmankid12345 --- diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/robotics.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/robotics.yml index 06a7398a23..e64acaa9f2 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/robotics.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/robotics.yml @@ -2,7 +2,7 @@ id: RoboticsInventory startingInventory: CableApcStack: 4 - Flash: 4 + SciFlash: 4 ProximitySensor: 3 RemoteSignaller: 3 Igniter: 3 # its more ordnance but yeah diff --git a/Resources/Prototypes/Entities/Objects/Weapons/security.yml b/Resources/Prototypes/Entities/Objects/Weapons/security.yml index dc5c052639..8d30935b04 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/security.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/security.yml @@ -138,6 +138,15 @@ guides: - Security +- type: entity + name: flash + parent: Flash + id: SciFlash + components: + - type: LimitedCharges + maxCharges: 2 + charges: 2 + - type: entity name: portable flasher parent: BaseStructure diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 045ee40556..37932f87ca 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -398,7 +398,7 @@ staticRecipes: - MMI - PositronicBrain - - Flash + - SciFlash - BorgModuleCable - BorgModuleFireExtinguisher - BorgModuleGPS diff --git a/Resources/Prototypes/Recipes/Lathes/robotics.yml b/Resources/Prototypes/Recipes/Lathes/robotics.yml index 4825adbe49..f9f00daf43 100644 --- a/Resources/Prototypes/Recipes/Lathes/robotics.yml +++ b/Resources/Prototypes/Recipes/Lathes/robotics.yml @@ -6,6 +6,15 @@ Steel: 200 Glass: 300 +- type: latheRecipe + id: SciFlash + result: SciFlash + completetime: 2 + materials: + Glass: 100 + Plastic: 200 + Steel: 100 + - type: latheRecipe id: CyborgEndoskeleton result: CyborgEndoskeleton