diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml index 5e7a968ec20..1b4161e9e16 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml @@ -38,6 +38,35 @@ endSound: path: /Audio/_Sunrise/Medical/Surgery/cautery2.ogg - type: Cautery + +- type: entity + name: abductor's cautery + id: CauteryAbductor + parent: Cautery + components: + - type: Sprite + state: abductor + - type: SurgeryTool + speed: 0.5 + startSound: + path: /Audio/_Starlight/Medical/Surgery/cautery1.ogg + endSound: + path: /Audio/_Starlight/Medical/Surgery/cautery2.ogg + - type: Cautery + +- type: entity + name: abductor's cautery + id: CauteryAbductor + parent: Cautery + components: + - type: Sprite + state: abductor + - type: SurgeryTool + speed: 0.5 + startSound: + path: /Audio/_Starlight/Medical/Surgery/cautery1.ogg + endSound: + path: /Audio/_Starlight/Medical/Surgery/cautery2.ogg # Drill - type: entity @@ -67,6 +96,18 @@ path: /Audio/_Sunrise/Medical/Surgery/saw.ogg - type: SurgicalDrill +- type: entity + name: abductor's drill + id: DrillAbductor + parent: Drill + components: + - type: Sprite + state: abductor + - type: SurgeryTool + speed: 0.5 + startSound: + path: /Audio/_Starlight/Medical/Surgery/saw.ogg + # Scalpel - type: entity @@ -102,9 +143,23 @@ - type: Scalpel - type: SurgeryTool startSound: - path: /Audio/_Sunrise/Medical/Surgery/scalpel1.ogg + path: /Audio/_Starlight/Medical/Surgery/scalpel1.ogg endSound: - path: /Audio/_Sunrise/Medical/Surgery/scalpel2.ogg + path: /Audio/_Starlight/Medical/Surgery/scalpel2.ogg + +- type: entity + name: abductor's scalpel + id: ScalpelAbductor + parent: Scalpel + components: + - type: Sprite + state: abductor + - type: SurgeryTool + speed: 0.2 + startSound: + path: /Audio/_Starlight/Medical/Surgery/scalpel1.ogg + endSound: + path: /Audio/_Starlight/Medical/Surgery/scalpel2.ogg - type: entity name: shiv @@ -202,9 +257,27 @@ - type: SurgeryTool speed: 0.6 startSound: - path: /Audio/_Sunrise/Medical/Surgery/retractor1.ogg + path: /Audio/_Starlight/Medical/Surgery/retractor1.ogg endSound: - path: /Audio/_Sunrise/Medical/Surgery/retractor2.ogg + path: /Audio/_Starlight/Medical/Surgery/retractor2.ogg + +- type: entity + name: abductor's retractor + id: RetractorAbductor + parent: Retractor + description: A surgical tool used to hold open incisions. + components: + - type: Sprite + state: abductor-retractor + - type: Item + sprite: Objects/Specific/Medical/Surgery/scissors.rsi + storedRotation: 45 + - type: SurgeryTool + speed: 0.4 + startSound: + path: /Audio/_Starlight/Medical/Surgery/retractor1.ogg + endSound: + path: /Audio/_Starlight/Medical/Surgery/retractor2.ogg - type: entity name: hemostat @@ -233,7 +306,20 @@ - type: SurgeryTool speed: 0.6 startSound: - path: /Audio/_Sunrise/Medical/Surgery/hemostat1.ogg + path: /Audio/_Starlight/Medical/Surgery/hemostat1.ogg + +- type: entity + name: abductor's hemostat + id: HemostatAbductor + parent: Hemostat + description: A surgical tool used to compress blood vessels to prevent bleeding. + components: + - type: Sprite + state: abductor-hemostat + - type: SurgeryTool + speed: 0.4 + startSound: + path: /Audio/_Starlight/Medical/Surgery/hemostat1.ogg - type: entity name: bone setter @@ -271,6 +357,22 @@ startSound: path: /Audio/_Starlight/Medical/Surgery/bone_setter.ogg +- type: entity + name: abductor's bone setter + id: BoneSetterAbductor + parent: BoneSetter + description: A surgical tool used for setting bones. It also breaks them quite well. + components: + - type: Sprite + state: abductor-setter + - type: Item + heldPrefix: setter + storedRotation: 45 + - type: SurgeryTool + speed: 0.4 + startSound: + path: /Audio/_Starlight/Medical/Surgery/bone_setter.ogg + # Saws - type: entity @@ -366,6 +468,40 @@ speedModifier: 2.0 - type: SurgeryTool speed: 0.2 + startSound: + path: /Audio/_Starlight/Medical/Surgery/saw.ogg + endSound: + path: /Audio/Items/drill_hit.ogg + +- type: entity + name: abductor's circular saw + id: SawAbductor + parent: SawElectric + description: You think you can cut anything with it. + components: + - type: Sprite + state: abductor + - type: Tool + speedModifier: 0.4 + - type: SurgeryTool + speed: 0.1 + startSound: + path: /Audio/_Starlight/Medical/Surgery/saw.ogg + endSound: + path: /Audio/Items/drill_hit.ogg + +- type: entity + name: abductor's circular saw + id: SawAbductor + parent: SawElectric + description: You think you can cut anything with it. + components: + - type: Sprite + state: abductor + - type: Tool + speedModifier: 0.4 + - type: SurgeryTool + speed: 0.1 startSound: path: /Audio/_Sunrise/Medical/Surgery/saw.ogg endSound: @@ -382,3 +518,12 @@ sprite: Objects/Specific/Medical/Surgery/bone_gel.rsi state: bone-gel - type: BoneGel + +- type: entity + name: abductor's bottle of bone gel + id: BoneGelAbductor + parent: BoneGel + components: + - type: Sprite + sprite: Objects/Specific/Medical/Surgery/bone_gel.rsi + state: abductor diff --git a/Resources/Prototypes/Entities/Objects/Tools/crowbars.yml b/Resources/Prototypes/Entities/Objects/Tools/crowbars.yml index 5d63b2d1b55..ce5c0fbe05c 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/crowbars.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/crowbars.yml @@ -191,3 +191,23 @@ - state: equipped-BELT - state: cover-equipped-BELT color: "#968000" + +# Abductor's Crowbar +- type: entity + parent: BaseCrowbar + id: CrowbarAbductor + name: abductor's crowbar + description: A multipurpose tool to pry open doors and fight interdimensional invaders. + components: + - type: Sprite + state: abductor + - type: Item + storedSprite: + sprite: Objects/Tools/crowbar.rsi + state: abductor + - type: Tool + speedModifier: 2 + qualities: + - Prying + useSound: + path: /Audio/Items/crowbar.ogg \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml index 14cdd2eb25c..a86f4cd6989 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml @@ -51,6 +51,23 @@ Steel: 100 - type: StaticPrice price: 30 + +- type: entity + name: abductor's wirecutter + parent: Wirecutter + id: WirecutterAbductor + components: + - type: Sprite + sprite: Objects/Tools/wirecutters.rsi + layers: + - state: abductor + - type: Tool + speedModifier: 2 + qualities: + - Cutting + useSound: + path: /Audio/Items/wirecutter.ogg + - type: RandomSprite - type: entity name: screwdriver @@ -103,6 +120,27 @@ Steel: 100 - type: StaticPrice price: 30 + +- type: entity + name: abductor's screwdriver + parent: Screwdriver + id: ScrewdriverAbductor + components: + - type: Sprite + sprite: Objects/Tools/screwdriver.rsi + layers: + - state: abductor + - type: Tool + speedModifier: 2 + qualities: + - Screwing + useSound: + collection: Screwdriver + - type: RandomSprite + - type: Item + sprite: Objects/Tools/screwdriver.rsi + storedOffset: 2, 0 + storedRotation: 90 - type: entity name: wrench @@ -150,6 +188,27 @@ Steel: 100 - type: StaticPrice price: 22 + +- type: entity + name: abductor's wrench + parent: Wrench + id: WrenchAbductor + components: + - type: Sprite + sprite: Objects/Tools/wrench.rsi + state: abductor + - type: Item + sprite: Objects/Tools/wrench.rsi + storedRotation: 45 + storedSprite: + sprite: Objects/Tools/wrench.rsi + state: abductor + - type: Tool + speedModifier: 2 + qualities: + - Anchoring + useSound: + path: /Audio/Items/ratchet.ogg - type: entity name: multitool diff --git a/Resources/Prototypes/_StarLight/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/_StarLight/Catalog/Fills/Backpacks/duffelbag.yml new file mode 100644 index 00000000000..ea3272ccc23 --- /dev/null +++ b/Resources/Prototypes/_StarLight/Catalog/Fills/Backpacks/duffelbag.yml @@ -0,0 +1,15 @@ +- type: entity + parent: ClothingBackpackDuffelAbductorBundle + id: ClothingBackpackDuffelAbductorFilled + suffix: Filled + components: + - type: StorageFill + contents: + - id: HemostatAbductor + - id: SawAbductor + - id: DrillAbductor + - id: CauteryAbductor + - id: RetractorAbductor + - id: ScalpelAbductor + - id: BoneGelAbductor + - id: BoneSetterAbductor \ No newline at end of file diff --git a/Resources/Prototypes/_StarLight/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/_StarLight/Catalog/Fills/Items/belt.yml new file mode 100644 index 00000000000..6d068a26c98 --- /dev/null +++ b/Resources/Prototypes/_StarLight/Catalog/Fills/Items/belt.yml @@ -0,0 +1,12 @@ +- type: entity + id: ClothingAbductorBeltFilled + parent: ClothingAbductorBelt + suffix: Filled + components: + - type: StorageFill + contents: + - id: CrowbarAbductor + - id: WrenchAbductor + - id: ScrewdriverAbductor + - id: WirecutterAbductor + - id: WelderAbductor \ No newline at end of file diff --git a/Resources/Prototypes/_StarLight/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/_StarLight/Entities/Clothing/Back/duffel.yml new file mode 100644 index 00000000000..7aa802bc8f6 --- /dev/null +++ b/Resources/Prototypes/_StarLight/Entities/Clothing/Back/duffel.yml @@ -0,0 +1,21 @@ +- type: entity + parent: ClothingBackpackDuffel + id: ClothingBackpackDuffelAbductor + name: abductor's surgery duffel bag + description: A large duffel bag for holding various surgery goods. + components: + - type: Sprite + sprite: _StarLight/Clothing/Back/Duffels/abductor.rsi + - type: ExplosionResistance + damageCoefficient: 0.1 + - type: Storage + grid: + - 0,0,8,4 + +- type: entity + parent: ClothingBackpackDuffelAbductor + id: ClothingBackpackDuffelAbductorBundle + abstract: true + components: + - type: Tag + tags: [] \ No newline at end of file diff --git a/Resources/Prototypes/_StarLight/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/_StarLight/Entities/Clothing/Belt/belts.yml new file mode 100644 index 00000000000..186d1c306ea --- /dev/null +++ b/Resources/Prototypes/_StarLight/Entities/Clothing/Belt/belts.yml @@ -0,0 +1,151 @@ +- type: entity + parent: [ClothingBeltStorageBase, BaseSovietContraband] + id: ClothingSovietBelt + name: soviet belt + description: Can hold various OUR things. + components: + - type: Sprite + sprite: _Starlight/Clothing/Belt/soviet.rsi + - type: Clothing + sprite: _Starlight/Clothing/Belt/soviet.rsi + - type: Storage + grid: + - 0,0,9,1 + whitelist: + tags: + - Powerdrill + - Wirecutter + - Crowbar + - Screwdriver + - Flashlight + - Wrench + - GeigerCounter + - Flare + - CableCoil + - CigPack + - Radio + - Knife + - Multitool + - AppraisalTool + - JawsOfLife + - GPS + - WeldingMask + components: + - SprayPainter + - NetworkConfigurator + - Welder + - PowerCell + - Geiger + - TrayScanner + - GasAnalyzer + - HandLabeler + - Stunbaton + - FlashOnTrigger + - SmokeOnTrigger + - Flash + - Handcuff + - BallisticAmmoProvider + - Ammo + - type: ItemMapper + mapLayers: + flashbang: + whitelist: + components: + - FlashOnTrigger + stunbaton: + whitelist: + components: + - Stunbaton + tear_gas_grenade: + whitelist: + components: + - SmokeOnTrigger + drill: + whitelist: + tags: + - Powerdrill + cutters_red: + whitelist: + tags: + - Wirecutter + crowbar: + whitelist: + tags: + - Crowbar + crowbar_red: + whitelist: + tags: + - CrowbarRed + jaws: + whitelist: + tags: + - JawsOfLife + screwdriver_nuke: + whitelist: + tags: + - Screwdriver + wrench: + whitelist: + tags: + - Wrench + multitool: + whitelist: + tags: + - Multitool + sprite: Clothing/Belt/belt_overlay.rsi + - type: Appearance + - type: StaticPrice + price: 1000 + +- type: entity + parent: ClothingBeltStorageBase + id: ClothingAbductorBelt + name: abductor belt + description: Can hold various OUR things. + components: + - type: Sprite + sprite: _Starlight/Clothing/Belt/abductor.rsi + - type: Clothing + sprite: _Starlight/Clothing/Belt/abductor.rsi + - type: Storage + maxItemSize: Normal + grid: + - 0,0,9,1 + whitelist: + tags: + - Powerdrill + - Wirecutter + - Crowbar + - Screwdriver + - Flashlight + - Wrench + - GeigerCounter + - Flare + - CableCoil + - CigPack + - Radio + - Knife + - Multitool + - AppraisalTool + - JawsOfLife + - GPS + - WeldingMask + components: + - SprayPainter + - NetworkConfigurator + - Welder + - PowerCell + - Geiger + - TrayScanner + - GasAnalyzer + - HandLabeler + - Stunbaton + - FlashOnTrigger + - SmokeOnTrigger + - Flash + - Handcuff + - BallisticAmmoProvider + - Ammo + - type: Appearance + - type: StaticPrice + price: 1000 diff --git a/Resources/Prototypes/_StarLight/Entities/Clothing/Ears/headsets_alt.yml b/Resources/Prototypes/_StarLight/Entities/Clothing/Ears/headsets_alt.yml new file mode 100644 index 00000000000..78bf475715f --- /dev/null +++ b/Resources/Prototypes/_StarLight/Entities/Clothing/Ears/headsets_alt.yml @@ -0,0 +1,13 @@ +- type: entity + parent: ClothingHeadsetAlt + id: ClothingHeadsetAltAbductor + name: abductor over-ear headset + components: + - type: ContainerFill + containers: + key_slots: + - EncryptionKeyStationMaster + - type: Sprite + sprite: _StarLight/Clothing/Ears/Headsets/abductor.rsi + - type: Clothing + sprite: _StarLight/Clothing/Ears/Headsets/abductor.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_StarLight/Entities/Objects/Tools/welders.yml b/Resources/Prototypes/_StarLight/Entities/Objects/Tools/welders.yml new file mode 100644 index 00000000000..a5e35728200 --- /dev/null +++ b/Resources/Prototypes/_StarLight/Entities/Objects/Tools/welders.yml @@ -0,0 +1,32 @@ +- type: entity + name: abductor's welding tool + parent: Welder + id: WelderAbductor + description: "An experimental welder capable of self-fuel generation and less harmful to the eyes." + components: + - type: Sprite + sprite: _StarLight/Objects/Tools/welder_abductor.rsi + - type: Item + sprite: _StarLight/Objects/Tools/welder_abductor.rsi + - type: SolutionContainerManager + solutions: + Welder: + reagents: + - ReagentId: WeldingFuel + Quantity: 1000 + maxVol: 1000 + - type: PointLight + enabled: false + radius: 1.5 + color: lightblue + - type: SolutionRegeneration + solution: Welder + generated: + reagents: + - ReagentId: WeldingFuel + Quantity: 1 + - type: Tool + speedModifier: 2.0 + useSound: + collection: Welder + qualities: Welding \ No newline at end of file diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/bone_gel.rsi/abductor.png b/Resources/Textures/Objects/Specific/Medical/Surgery/bone_gel.rsi/abductor.png new file mode 100644 index 00000000000..8409c74669e Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/Surgery/bone_gel.rsi/abductor.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/bone_gel.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/Surgery/bone_gel.rsi/meta.json index 63819432233..1dd6dccdd68 100644 --- a/Resources/Textures/Objects/Specific/Medical/Surgery/bone_gel.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Medical/Surgery/bone_gel.rsi/meta.json @@ -10,6 +10,9 @@ { "name": "bone-gel" }, + { + "name": "abductor" + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/cautery.rsi/abductor.png b/Resources/Textures/Objects/Specific/Medical/Surgery/cautery.rsi/abductor.png new file mode 100644 index 00000000000..0ea717465ba Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/Surgery/cautery.rsi/abductor.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/cautery.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/Surgery/cautery.rsi/meta.json index cb2fe31f9ba..f0afebd615a 100644 --- a/Resources/Textures/Objects/Specific/Medical/Surgery/cautery.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Medical/Surgery/cautery.rsi/meta.json @@ -10,6 +10,9 @@ { "name": "cautery" }, + { + "name": "abductor" + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/drill.rsi/abductor.png b/Resources/Textures/Objects/Specific/Medical/Surgery/drill.rsi/abductor.png new file mode 100644 index 00000000000..9e2ea895c42 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/Surgery/drill.rsi/abductor.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/drill.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/Surgery/drill.rsi/meta.json index b97c800777b..65c8c637075 100644 --- a/Resources/Textures/Objects/Specific/Medical/Surgery/drill.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Medical/Surgery/drill.rsi/meta.json @@ -10,6 +10,9 @@ { "name": "drill" }, + { + "name": "abductor" + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/saw.rsi/abductor.png b/Resources/Textures/Objects/Specific/Medical/Surgery/saw.rsi/abductor.png new file mode 100644 index 00000000000..6fa9d3b6b4f Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/Surgery/saw.rsi/abductor.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/saw.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/Surgery/saw.rsi/meta.json index 39fcbe5a477..fdcf60962ed 100644 --- a/Resources/Textures/Objects/Specific/Medical/Surgery/saw.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Medical/Surgery/saw.rsi/meta.json @@ -13,6 +13,9 @@ { "name": "saw" }, + { + "name": "abductor" + }, { "name": "electric" }, diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/scalpel.rsi/abductor.png b/Resources/Textures/Objects/Specific/Medical/Surgery/scalpel.rsi/abductor.png new file mode 100644 index 00000000000..35736e8c4b8 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/Surgery/scalpel.rsi/abductor.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/scalpel.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/Surgery/scalpel.rsi/meta.json index d72a4496791..1372db515c8 100644 --- a/Resources/Textures/Objects/Specific/Medical/Surgery/scalpel.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Medical/Surgery/scalpel.rsi/meta.json @@ -10,6 +10,9 @@ { "name": "shiv" }, + { + "name": "abductor" + }, { "name": "scalpel" }, diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/scissors.rsi/abductor-hemostat.png b/Resources/Textures/Objects/Specific/Medical/Surgery/scissors.rsi/abductor-hemostat.png new file mode 100644 index 00000000000..bfbd114aa99 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/Surgery/scissors.rsi/abductor-hemostat.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/scissors.rsi/abductor-retractor.png b/Resources/Textures/Objects/Specific/Medical/Surgery/scissors.rsi/abductor-retractor.png new file mode 100644 index 00000000000..36c48ea2997 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/Surgery/scissors.rsi/abductor-retractor.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/scissors.rsi/abductor-setter.png b/Resources/Textures/Objects/Specific/Medical/Surgery/scissors.rsi/abductor-setter.png new file mode 100644 index 00000000000..015059426d0 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/Surgery/scissors.rsi/abductor-setter.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/Surgery/scissors.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/Surgery/scissors.rsi/meta.json index 9127f1909d6..8a8c1085b70 100644 --- a/Resources/Textures/Objects/Specific/Medical/Surgery/scissors.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Medical/Surgery/scissors.rsi/meta.json @@ -13,18 +13,27 @@ { "name": "advanced-retractor" }, + { + "name": "abductor-retractor" + }, { "name": "hemostat" }, { "name": "advanced-hemostat" }, + { + "name": "abductor-hemostat" + }, { "name": "setter" }, { "name": "advanced-setter" }, + { + "name": "abductor-setter" + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Objects/Tools/crowbar.rsi/abductor.png b/Resources/Textures/Objects/Tools/crowbar.rsi/abductor.png new file mode 100644 index 00000000000..fd1dc741c40 Binary files /dev/null and b/Resources/Textures/Objects/Tools/crowbar.rsi/abductor.png differ diff --git a/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json b/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json index 17935e8d63f..5d07a1a0637 100644 --- a/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json @@ -1,56 +1,73 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from skyrat-tg at https://github.com/Skyrat-SS13/Skyrat-tg/commit/31156a1fcd48d67a717e7b63c11513172b28eeb1, storage and red-storage by SonicHDC, other storage colors based on red-storage", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "icon" - }, - { - "name": "equipped-BELT", - "directions": 4 - }, - { - "name": "storage" - }, - { - "name": "cover-inhand-left", - "directions": 4 - }, - { - "name": "cover-inhand-right", - "directions": 4 - }, - { - "name": "cover-icon" - }, - { - "name": "cover-equipped-BELT", - "directions": 4 - }, - { - "name": "red-storage" - }, - { - "name": "green-storage" - }, - { - "name": "orange-storage" - }, - { - "name": "yellow-storage" - } - ] + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/eea0599511b088fdab9d43e562210cdbd51c6a98, cover is edited by Ubaser.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "icon" + }, + { + "name": "abductor", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "storage" + }, + { + "name": "cover-inhand-left", + "directions": 4 + }, + { + "name": "cover-inhand-right", + "directions": 4 + }, + { + "name": "cover-icon" + }, + { + "name": "cover-equipped-BELT", + "directions": 4 + }, + { + "name": "red-storage" + }, + { + "name": "green-storage" + }, + { + "name": "orange-storage" + }, + { + "name": "yellow-storage" + } + ] } diff --git a/Resources/Textures/Objects/Tools/screwdriver.rsi/abductor.png b/Resources/Textures/Objects/Tools/screwdriver.rsi/abductor.png new file mode 100644 index 00000000000..194e737d73a Binary files /dev/null and b/Resources/Textures/Objects/Tools/screwdriver.rsi/abductor.png differ diff --git a/Resources/Textures/Objects/Tools/screwdriver.rsi/meta.json b/Resources/Textures/Objects/Tools/screwdriver.rsi/meta.json index ec6d67d8e36..c9624dc00f2 100644 --- a/Resources/Textures/Objects/Tools/screwdriver.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/screwdriver.rsi/meta.json @@ -10,6 +10,18 @@ { "name": "screwdriver" }, + { + "name": "abductor", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, { "name": "screwdriver-map" }, diff --git a/Resources/Textures/Objects/Tools/wirecutters.rsi/abductor.png b/Resources/Textures/Objects/Tools/wirecutters.rsi/abductor.png new file mode 100644 index 00000000000..40f2e50b173 Binary files /dev/null and b/Resources/Textures/Objects/Tools/wirecutters.rsi/abductor.png differ diff --git a/Resources/Textures/Objects/Tools/wirecutters.rsi/meta.json b/Resources/Textures/Objects/Tools/wirecutters.rsi/meta.json index 88669b83867..3f61643cca2 100644 --- a/Resources/Textures/Objects/Tools/wirecutters.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/wirecutters.rsi/meta.json @@ -10,6 +10,9 @@ { "name": "cutters" }, + { + "name": "abductor" + }, { "name": "cutters-cutty-thingy" }, diff --git a/Resources/Textures/Objects/Tools/wrench.rsi/abductor-equipped-BELT.png b/Resources/Textures/Objects/Tools/wrench.rsi/abductor-equipped-BELT.png new file mode 100644 index 00000000000..1098786fe96 Binary files /dev/null and b/Resources/Textures/Objects/Tools/wrench.rsi/abductor-equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Tools/wrench.rsi/abductor-inhand-left.png b/Resources/Textures/Objects/Tools/wrench.rsi/abductor-inhand-left.png new file mode 100644 index 00000000000..de88d4cb2ae Binary files /dev/null and b/Resources/Textures/Objects/Tools/wrench.rsi/abductor-inhand-left.png differ diff --git a/Resources/Textures/Objects/Tools/wrench.rsi/abductor-inhand-right.png b/Resources/Textures/Objects/Tools/wrench.rsi/abductor-inhand-right.png new file mode 100644 index 00000000000..a9c34665f69 Binary files /dev/null and b/Resources/Textures/Objects/Tools/wrench.rsi/abductor-inhand-right.png differ diff --git a/Resources/Textures/Objects/Tools/wrench.rsi/abductor.png b/Resources/Textures/Objects/Tools/wrench.rsi/abductor.png new file mode 100644 index 00000000000..ffcfa99b3b5 Binary files /dev/null and b/Resources/Textures/Objects/Tools/wrench.rsi/abductor.png differ diff --git a/Resources/Textures/Objects/Tools/wrench.rsi/meta.json b/Resources/Textures/Objects/Tools/wrench.rsi/meta.json index ff330f3aaa4..80ab8075ede 100644 --- a/Resources/Textures/Objects/Tools/wrench.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/wrench.rsi/meta.json @@ -10,6 +10,15 @@ { "name": "icon" }, + { + "name": "abductor", + "delays": [ + [ + 0.2, + 0.2 + ] + ] + }, { "name": "inhand-left", "directions": 4 @@ -22,6 +31,18 @@ "name": "equipped-BELT", "directions": 4 }, + { + "name": "abductor-inhand-left", + "directions": 4 + }, + { + "name": "abductor-inhand-right", + "directions": 4 + }, + { + "name": "abductor-equipped-BELT", + "directions": 4 + }, { "name": "storage" } diff --git a/Resources/Textures/_Starlight/Clothing/Back/Duffels/abductor.rsi/equipped-BACKPACK.png b/Resources/Textures/_Starlight/Clothing/Back/Duffels/abductor.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..f581c4466f1 Binary files /dev/null and b/Resources/Textures/_Starlight/Clothing/Back/Duffels/abductor.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_Starlight/Clothing/Back/Duffels/abductor.rsi/icon.png b/Resources/Textures/_Starlight/Clothing/Back/Duffels/abductor.rsi/icon.png new file mode 100644 index 00000000000..d0624cb256c Binary files /dev/null and b/Resources/Textures/_Starlight/Clothing/Back/Duffels/abductor.rsi/icon.png differ diff --git a/Resources/Textures/_Starlight/Clothing/Back/Duffels/abductor.rsi/inhand-left.png b/Resources/Textures/_Starlight/Clothing/Back/Duffels/abductor.rsi/inhand-left.png new file mode 100644 index 00000000000..ceeab5463d5 Binary files /dev/null and b/Resources/Textures/_Starlight/Clothing/Back/Duffels/abductor.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Starlight/Clothing/Back/Duffels/abductor.rsi/inhand-right.png b/Resources/Textures/_Starlight/Clothing/Back/Duffels/abductor.rsi/inhand-right.png new file mode 100644 index 00000000000..1d9a614b165 Binary files /dev/null and b/Resources/Textures/_Starlight/Clothing/Back/Duffels/abductor.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Starlight/Clothing/Back/Duffels/abductor.rsi/meta.json b/Resources/Textures/_Starlight/Clothing/Back/Duffels/abductor.rsi/meta.json new file mode 100644 index 00000000000..fce8c90ce86 --- /dev/null +++ b/Resources/Textures/_Starlight/Clothing/Back/Duffels/abductor.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Starlight/Clothing/Belt/abductor.rsi/equipped-BELT.png b/Resources/Textures/_Starlight/Clothing/Belt/abductor.rsi/equipped-BELT.png new file mode 100644 index 00000000000..11943a5f1ec Binary files /dev/null and b/Resources/Textures/_Starlight/Clothing/Belt/abductor.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/_Starlight/Clothing/Belt/abductor.rsi/icon.png b/Resources/Textures/_Starlight/Clothing/Belt/abductor.rsi/icon.png new file mode 100644 index 00000000000..6ff630277a9 Binary files /dev/null and b/Resources/Textures/_Starlight/Clothing/Belt/abductor.rsi/icon.png differ diff --git a/Resources/Textures/_Starlight/Clothing/Belt/abductor.rsi/inhand-left.png b/Resources/Textures/_Starlight/Clothing/Belt/abductor.rsi/inhand-left.png new file mode 100644 index 00000000000..680ef7b80d6 Binary files /dev/null and b/Resources/Textures/_Starlight/Clothing/Belt/abductor.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Starlight/Clothing/Belt/abductor.rsi/inhand-right.png b/Resources/Textures/_Starlight/Clothing/Belt/abductor.rsi/inhand-right.png new file mode 100644 index 00000000000..93d18816407 Binary files /dev/null and b/Resources/Textures/_Starlight/Clothing/Belt/abductor.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Starlight/Clothing/Belt/abductor.rsi/meta.json b/Resources/Textures/_Starlight/Clothing/Belt/abductor.rsi/meta.json new file mode 100644 index 00000000000..4b328a42419 --- /dev/null +++ b/Resources/Textures/_Starlight/Clothing/Belt/abductor.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Paradise Station", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Starlight/Clothing/Ears/Headsets/abductor.rsi/alt-equipped-EARS.png b/Resources/Textures/_Starlight/Clothing/Ears/Headsets/abductor.rsi/alt-equipped-EARS.png new file mode 100644 index 00000000000..a910737357f Binary files /dev/null and b/Resources/Textures/_Starlight/Clothing/Ears/Headsets/abductor.rsi/alt-equipped-EARS.png differ diff --git a/Resources/Textures/_Starlight/Clothing/Ears/Headsets/abductor.rsi/icon_alt.png b/Resources/Textures/_Starlight/Clothing/Ears/Headsets/abductor.rsi/icon_alt.png new file mode 100644 index 00000000000..cfef3f9aa73 Binary files /dev/null and b/Resources/Textures/_Starlight/Clothing/Ears/Headsets/abductor.rsi/icon_alt.png differ diff --git a/Resources/Textures/_Starlight/Clothing/Ears/Headsets/abductor.rsi/meta.json b/Resources/Textures/_Starlight/Clothing/Ears/Headsets/abductor.rsi/meta.json new file mode 100644 index 00000000000..a36cd58203e --- /dev/null +++ b/Resources/Textures/_Starlight/Clothing/Ears/Headsets/abductor.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon_alt" + }, + { + "name": "alt-equipped-EARS", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Starlight/Objects/Tools/welder_abductor.rsi/icon.png b/Resources/Textures/_Starlight/Objects/Tools/welder_abductor.rsi/icon.png new file mode 100644 index 00000000000..f52d7758625 Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Tools/welder_abductor.rsi/icon.png differ diff --git a/Resources/Textures/_Starlight/Objects/Tools/welder_abductor.rsi/inhand-left-flame.png b/Resources/Textures/_Starlight/Objects/Tools/welder_abductor.rsi/inhand-left-flame.png new file mode 100644 index 00000000000..2975c479be7 Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Tools/welder_abductor.rsi/inhand-left-flame.png differ diff --git a/Resources/Textures/_Starlight/Objects/Tools/welder_abductor.rsi/inhand-right-flame.png b/Resources/Textures/_Starlight/Objects/Tools/welder_abductor.rsi/inhand-right-flame.png new file mode 100644 index 00000000000..2975c479be7 Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Tools/welder_abductor.rsi/inhand-right-flame.png differ diff --git a/Resources/Textures/_Starlight/Objects/Tools/welder_abductor.rsi/meta.json b/Resources/Textures/_Starlight/Objects/Tools/welder_abductor.rsi/meta.json new file mode 100644 index 00000000000..1e04e76c506 --- /dev/null +++ b/Resources/Textures/_Starlight/Objects/Tools/welder_abductor.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/199fffd989d6f7fd6ea9c5188c875137df4f34b8", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "welder_flame", + "delays": [ + [ + 0.2, + 0.1 + ] + ] + }, + { + "name": "inhand-left-flame", + "directions": 4 + }, + { + "name": "inhand-right-flame", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Starlight/Objects/Tools/welder_abductor.rsi/welder_flame.png b/Resources/Textures/_Starlight/Objects/Tools/welder_abductor.rsi/welder_flame.png new file mode 100644 index 00000000000..de3b96a5df3 Binary files /dev/null and b/Resources/Textures/_Starlight/Objects/Tools/welder_abductor.rsi/welder_flame.png differ