diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml index 432a8ce11f..bfc952ab7e 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml @@ -2199,7 +2199,7 @@ - state: full map: ["enum.SolutionContainerLayers.Fill"] visible: true - # Parkstation-Betterjug-End +# Parkstation-Betterjug-End - type: entity parent: DrinkGlass diff --git a/Resources/Prototypes/Parkstation/Entities/Markers/Spawners/mobs.yml b/Resources/Prototypes/Parkstation/Entities/Markers/Spawners/mobs.yml index 6c07e61ff5..524270057e 100644 --- a/Resources/Prototypes/Parkstation/Entities/Markers/Spawners/mobs.yml +++ b/Resources/Prototypes/Parkstation/Entities/Markers/Spawners/mobs.yml @@ -1,4 +1,3 @@ - - type: entity name: Lois Spawner id: SpawnMobLizardLois diff --git a/Resources/Prototypes/SimpleStation14/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/SimpleStation14/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index de01b448c0..30fecd221e 100644 --- a/Resources/Prototypes/SimpleStation14/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/SimpleStation14/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -20,4 +20,3 @@ steps: 2 zeroVisible: true - type: Appearance - \ No newline at end of file diff --git a/Resources/Textures/SimpleStation14/Objects/Devices/pinpointer.rsi/meta.json b/Resources/Textures/SimpleStation14/Objects/Devices/pinpointer.rsi/meta.json index ecf016565e..8babd3d64a 100644 --- a/Resources/Textures/SimpleStation14/Objects/Devices/pinpointer.rsi/meta.json +++ b/Resources/Textures/SimpleStation14/Objects/Devices/pinpointer.rsi/meta.json @@ -10,48 +10,31 @@ { "name": "pinonclose", "delays": [ - [ - 0.2, - 0.2 - ] + [ 0.2, 0.2 ] ] }, { "name": "pinondirect", "delays": [ - [ - 0.2, - 0.2 - ] + [ 0.2, 0.2 ] ] }, { "name": "pinonfar", "delays": [ - [ - 0.6, - 0.2 - ] + [ 0.6, 0.2 ] ] }, { "name": "pinonmedium", "delays": [ - [ - 0.4, - 0.2 - ] + [ 0.4, 0.2 ] ] }, { "name": "pinonnull", "delays": [ - [ - 0.7, - 0.7, - 0.7, - 0.7 - ] + [ 0.7, 0.7, 0.7, 0.7 ] ] }, { diff --git a/Resources/Textures/SimpleStation14/Objects/Weapons/Guns/Pistols/pv3mini.rsi/meta.json b/Resources/Textures/SimpleStation14/Objects/Weapons/Guns/Pistols/pv3mini.rsi/meta.json index 97300bd246..480b59e5bc 100644 --- a/Resources/Textures/SimpleStation14/Objects/Weapons/Guns/Pistols/pv3mini.rsi/meta.json +++ b/Resources/Textures/SimpleStation14/Objects/Weapons/Guns/Pistols/pv3mini.rsi/meta.json @@ -7,119 +7,119 @@ "y": 32 }, "states": [ - { - "name": "icon" - }, - { - "name": "base", - "delays": [ - [ - 0.8, - 0.4 - ] - ] - }, - { - "name": "mag-unshaded-0", - "delays": [ - [ - 0.8, - 0.4 - ] - ] - }, - { - "name": "mag-unshaded-1", - "delays": [ - [ - 0.8, - 0.4 - ] - ] - }, - { - "name": "mag-unshaded-2", - "delays": [ - [ - 0.8, - 0.4 - ] - ] - }, - { - "name": "mag-unshaded-3", - "delays": [ - [ - 0.6, - 0.4 - ] - ] - }, - { - "name": "mag-unshaded-4", - "delays": [ - [ - 0.6, - 0.4 - ] - ] - }, - { - "name": "mag-unshaded-5", - "delays": [ - [ - 0.6, - 0.4 - ] - ] - }, - { - "name": "mag-unshaded-6", - "delays": [ - [ - 0.4, - 0.4 - ] - ] - }, - { - "name": "mag-unshaded-7", - "delays": [ - [ - 0.4, - 0.4 - ] - ] - }, - { - "name": "mag-unshaded-8", - "delays": [ - [ - 0.4, - 0.4 - ] - ] - }, - { - "name": "mag-unshaded-9", - "delays": [ - [ - 0.4, - 0.4 - ] - ] - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-BELT", - "directions": 4 - } + { + "name": "icon" + }, + { + "name": "base", + "delays": [ + [ + 0.8, + 0.4 + ] + ] + }, + { + "name": "mag-unshaded-0", + "delays": [ + [ + 0.8, + 0.4 + ] + ] + }, + { + "name": "mag-unshaded-1", + "delays": [ + [ + 0.8, + 0.4 + ] + ] + }, + { + "name": "mag-unshaded-2", + "delays": [ + [ + 0.8, + 0.4 + ] + ] + }, + { + "name": "mag-unshaded-3", + "delays": [ + [ + 0.6, + 0.4 + ] + ] + }, + { + "name": "mag-unshaded-4", + "delays": [ + [ + 0.6, + 0.4 + ] + ] + }, + { + "name": "mag-unshaded-5", + "delays": [ + [ + 0.6, + 0.4 + ] + ] + }, + { + "name": "mag-unshaded-6", + "delays": [ + [ + 0.4, + 0.4 + ] + ] + }, + { + "name": "mag-unshaded-7", + "delays": [ + [ + 0.4, + 0.4 + ] + ] + }, + { + "name": "mag-unshaded-8", + "delays": [ + [ + 0.4, + 0.4 + ] + ] + }, + { + "name": "mag-unshaded-9", + "delays": [ + [ + 0.4, + 0.4 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + } ] } diff --git a/Resources/Textures/SimpleStation14/Objects/Weapons/Guns/Projectiles/projectiles.rsi/meta.json b/Resources/Textures/SimpleStation14/Objects/Weapons/Guns/Projectiles/projectiles.rsi/meta.json index 7f921b6e6b..8cafbfbeb3 100644 --- a/Resources/Textures/SimpleStation14/Objects/Weapons/Guns/Projectiles/projectiles.rsi/meta.json +++ b/Resources/Textures/SimpleStation14/Objects/Weapons/Guns/Projectiles/projectiles.rsi/meta.json @@ -1,59 +1,59 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken and modified from cev-eris at https://github.com/discordia-space/CEV-Eris/tree/7ff8f28ea4de734f3cc3cb70f2d4e4b4263a988d", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "muzzle_laser", - "delays": [ - [ - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.07, - 0.09, - 0.11 - ] - ] + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken and modified from cev-eris at https://github.com/discordia-space/CEV-Eris/tree/7ff8f28ea4de734f3cc3cb70f2d4e4b4263a988d", + "size": { + "x": 32, + "y": 32 }, - { - "name": "beam", - "delays": [ - [ - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.07, - 0.09, - 0.11 - ] - ] - }, - { - "name": "impact_laser", - "delays": [ - [ - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.07, - 0.09, - 0.11 - ] - ] - } - ] -} \ No newline at end of file + "states": [ + { + "name": "muzzle_laser", + "delays": [ + [ + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.07, + 0.09, + 0.11 + ] + ] + }, + { + "name": "beam", + "delays": [ + [ + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.07, + 0.09, + 0.11 + ] + ] + }, + { + "name": "impact_laser", + "delays": [ + [ + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.07, + 0.09, + 0.11 + ] + ] + } + ] +} diff --git a/Resources/Textures/SimpleStation14/Objects/Weapons/Guns/SMGs/k12compact.rsi/meta.json b/Resources/Textures/SimpleStation14/Objects/Weapons/Guns/SMGs/k12compact.rsi/meta.json index fe8f1c00ea..30cbf6faf9 100644 --- a/Resources/Textures/SimpleStation14/Objects/Weapons/Guns/SMGs/k12compact.rsi/meta.json +++ b/Resources/Textures/SimpleStation14/Objects/Weapons/Guns/SMGs/k12compact.rsi/meta.json @@ -7,32 +7,32 @@ "y": 32 }, "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "bolt-open" - }, - { - "name": "mag-0" - }, - { - "name": "mag-1" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-BACKPACK", - "directions": 4 - } + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "mag-0" + }, + { + "name": "mag-1" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } ] } diff --git a/Resources/Textures/SimpleStation14/Objects/Weapons/Guns/SMGs/pv3compact.rsi/meta.json b/Resources/Textures/SimpleStation14/Objects/Weapons/Guns/SMGs/pv3compact.rsi/meta.json index b6e9579cb5..92a3b3777a 100644 --- a/Resources/Textures/SimpleStation14/Objects/Weapons/Guns/SMGs/pv3compact.rsi/meta.json +++ b/Resources/Textures/SimpleStation14/Objects/Weapons/Guns/SMGs/pv3compact.rsi/meta.json @@ -7,119 +7,119 @@ "y": 32 }, "states": [ - { - "name": "icon" - }, - { - "name": "base", - "delays": [ - [ - 0.8, - 0.4 - ] - ] - }, - { - "name": "mag-unshaded-0", - "delays": [ - [ - 0.8, - 0.4 - ] - ] - }, - { - "name": "mag-unshaded-1", - "delays": [ - [ - 0.8, - 0.4 - ] - ] - }, - { - "name": "mag-unshaded-2", - "delays": [ - [ - 0.8, - 0.4 - ] - ] - }, - { - "name": "mag-unshaded-3", - "delays": [ - [ - 0.6, - 0.4 - ] - ] - }, - { - "name": "mag-unshaded-4", - "delays": [ - [ - 0.6, - 0.4 - ] - ] - }, - { - "name": "mag-unshaded-5", - "delays": [ - [ - 0.6, - 0.4 - ] - ] - }, - { - "name": "mag-unshaded-6", - "delays": [ - [ - 0.4, - 0.4 - ] - ] - }, - { - "name": "mag-unshaded-7", - "delays": [ - [ - 0.4, - 0.4 - ] - ] - }, - { - "name": "mag-unshaded-8", - "delays": [ - [ - 0.4, - 0.4 - ] - ] - }, - { - "name": "mag-unshaded-9", - "delays": [ - [ - 0.4, - 0.4 - ] - ] - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "equipped-BACKPACK", - "directions": 4 - } + { + "name": "icon" + }, + { + "name": "base", + "delays": [ + [ + 0.8, + 0.4 + ] + ] + }, + { + "name": "mag-unshaded-0", + "delays": [ + [ + 0.8, + 0.4 + ] + ] + }, + { + "name": "mag-unshaded-1", + "delays": [ + [ + 0.8, + 0.4 + ] + ] + }, + { + "name": "mag-unshaded-2", + "delays": [ + [ + 0.8, + 0.4 + ] + ] + }, + { + "name": "mag-unshaded-3", + "delays": [ + [ + 0.6, + 0.4 + ] + ] + }, + { + "name": "mag-unshaded-4", + "delays": [ + [ + 0.6, + 0.4 + ] + ] + }, + { + "name": "mag-unshaded-5", + "delays": [ + [ + 0.6, + 0.4 + ] + ] + }, + { + "name": "mag-unshaded-6", + "delays": [ + [ + 0.4, + 0.4 + ] + ] + }, + { + "name": "mag-unshaded-7", + "delays": [ + [ + 0.4, + 0.4 + ] + ] + }, + { + "name": "mag-unshaded-8", + "delays": [ + [ + 0.4, + 0.4 + ] + ] + }, + { + "name": "mag-unshaded-9", + "delays": [ + [ + 0.4, + 0.4 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } ] }