diff --git a/Content.Shared/_RMC14/Guidebook/GuideEntryPrototype.cs b/Content.Shared/_RMC14/Guidebook/GuideEntryPrototype.cs new file mode 100644 index 00000000000..def6394cb8f --- /dev/null +++ b/Content.Shared/_RMC14/Guidebook/GuideEntryPrototype.cs @@ -0,0 +1,19 @@ +using Content.Shared._RMC14.Prototypes; +using Robust.Shared.Prototypes; +using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Array; + +// ReSharper disable once CheckNamespace +namespace Content.Shared.Guidebook; + +public sealed partial class GuideEntryPrototype : IInheritingPrototype, ICMSpecific +{ + [ParentDataField(typeof(AbstractPrototypeIdArraySerializer))] + public string[]? Parents { get; } + + [NeverPushInheritance] + [AbstractDataField] + public bool Abstract { get; } + + [DataField] + public bool IsCM { get; } +} diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml index e0dc4a0ad43..f05ddf96652 100644 --- a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml +++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml @@ -3,6 +3,7 @@ parent: BaseBorgChassisNT components: - type: Sprite + scale: 0.5, 0.5 layers: - state: robot - state: robot_e_r @@ -29,6 +30,43 @@ node: cyborg - type: Speech speechVerb: Robotic + +- type: entity + id: BorgChassisQuad + parent: BaseBorgChassisNT + components: + - type: Sprite + scale: 0.6, 0.6 + layers: + - state: quadsprite + map: ["movement"] + - state: quadspritel + map: ["enum.BorgVisualLayers.Light"] + shader: unshaded + visible: false + - state: quadspritel + shader: unshaded + map: ["light"] + visible: false + - type: BorgChassis + maxModules: 6 + moduleWhitelist: + tags: + - BorgModuleGeneric + - BorgModuleSecurity + hasMindState: quadsprite + noMindState: quadspritel + - type: AccessReader + access: [["Security"], ["Armory"], ["Command"]] + - type: BorgTransponder + sprite: + sprite: Mobs/Silicon/chassis.rsi + state: quadsprite + name: cyborg + - type: Construction + node: cyborg + - type: Speech + speechVerb: Robotic - type: entity id: BorgChassisMining @@ -36,6 +74,7 @@ name: salvage cyborg components: - type: Sprite + scale: 0.5, 0.5 layers: - state: miner map: ["movement"] @@ -92,6 +131,7 @@ name: engineer cyborg components: - type: Sprite + scale: 0.5, 0.5 layers: - state: engineer - state: engineer_e_r @@ -142,6 +182,7 @@ name: janitor cyborg components: - type: Sprite + scale: 0.5, 0.5 layers: - state: janitor map: ["movement"] @@ -200,6 +241,7 @@ name: medical cyborg components: - type: Sprite + scale: 0.5, 0.5 layers: - state: medical map: ["movement"] @@ -265,6 +307,7 @@ name: service cyborg components: - type: Sprite + scale: 0.5, 0.5 layers: - state: service - state: service_e_r @@ -314,6 +357,7 @@ description: A lean, mean killing machine with access to a variety of deadly modules. components: - type: Sprite + scale: 0.5, 0.5 layers: - state: synd_sec - state: synd_sec_e @@ -345,6 +389,7 @@ description: A combat medical cyborg. Has limited offensive potential, but makes more than up for it with its support capabilities. components: - type: Sprite + scale: 0.5, 0.5 layers: - state: synd_medical - state: synd_medical_e @@ -374,6 +419,7 @@ description: A streamlined engineering cyborg, equipped with covert modules. Its chameleon projector lets it disguise itself as a Nanotrasen cyborg. components: - type: Sprite + scale: 0.5, 0.5 layers: - state: synd_engi - state: synd_engi_e diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml index 960e37a6ccc..866c7aad804 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -48,6 +48,15 @@ tags: - BorgModuleCargo +- type: entity + id: BaseBorgModuleSecurity + parent: BaseBorgModule + abstract: true + components: + - type: Tag + tags: + - BorgModuleSecurity + - type: entity id: BaseBorgModuleEngineering parent: BaseBorgModule @@ -299,6 +308,36 @@ - type: ItemBorgModule items: - RCDRecharging + +- type: entity + id: BorgModuleStun + parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ] + name: Disabler cyborg module + components: + - type: Sprite + layers: + - state: security + - state: icon-stun + - type: ItemBorgModule + items: + - WeaponBorgDisabler + - WeaponborgTaser + - BorgStunbaton + +- type: entity + id: BorgModuleKill + parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ] + name: combat cyborg module + components: + - type: Sprite + layers: + - state: security + - state: icon-kill + - type: ItemBorgModule + items: + - WeaponAntiqueLaser + - WeaponborgPistolMk58 + - CombatKnife # janitorial modules (this gets its own unique things because janis are epic) - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 8f062a8620b..9c19a0cde0b 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -457,6 +457,49 @@ - type: GuideHelp guides: - Security + +- type: entity + name: borg disabler + parent: BaseWeaponBatterySmall + id: WeaponBorgDisabler + description: A self-defense weapon that exhausts organic targets, weakening them until they collapse. + components: + - type: Tag + tags: + - Taser + - Sidearm + - type: Sprite + sprite: Objects/Weapons/Guns/Battery/disabler.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-unshaded-0 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: Clothing + sprite: Objects/Weapons/Guns/Battery/disabler.rsi + quickEquip: false + slots: + - suitStorage + - Belt + - type: Gun + fireRate: 2 + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/taser2.ogg + - type: ProjectileBatteryAmmoProvider + proto: BulletDisabler + fireCost: 100 + - type: BatterySelfRecharger + autoRecharge: true + autoRechargeRate: 30 + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: true + - type: Appearance + - type: GuideHelp + guides: + - Security - type: entity name: disabler SMG @@ -557,6 +600,88 @@ zeroVisible: true - type: Appearance +- type: entity + name: borg taser + parent: BaseWeaponBatterySmall + id: WeaponborgTaser + description: A low-capacity, energy-based stun gun used by security teams to subdue targets at range. + components: + - type: Tag + tags: + - Taser + - Sidearm + - type: Sprite + sprite: Objects/Weapons/Guns/Battery/taser.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-unshaded-0 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: Item + heldPrefix: taser4 + - type: Clothing + quickEquip: false + slots: + - Belt + - type: Gun + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/taser.ogg + - type: ProjectileBatteryAmmoProvider + proto: BulletTaser + fireCost: 200 + - type: BatterySelfRecharger + autoRecharge: true + autoRechargeRate: 40 + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: true + - type: Appearance + +- type: entity + name: Borg mk 58 + parent: BaseWeaponBatterySmall + id: WeaponborgPistolMk58 + description: This is an antique laser pistol. All craftsmanship is of the highest quality. It is decorated with assistant leather and chrome. The object menaces with spikes of energy. + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Pistols/mk58.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - type: Clothing + sprite: Objects/Weapons/Guns/Pistols/mk58.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - type: Gun + fireRate: 5 + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/mk58.ogg + fireOnDropChance: 0.5 + - type: ProjectileBatteryAmmoProvider + proto: BulletKineticShuttle + fireCost: 100 + - type: BatterySelfRecharger + autoRecharge: true + autoRechargeRate: 40 + - type: Battery + maxCharge: 1000 + startingCharge: 1000 + - type: Appearance + - type: Tag + tags: + - HighRiskItem + - Sidearm + - WeaponAntiqueLaser + - type: StaticPrice + price: 750 + - type: StealTarget + stealGroup: WeaponAntiqueLaser + - type: entity name: antique laser pistol parent: BaseWeaponBatterySmall diff --git a/Resources/Prototypes/Entities/Objects/Weapons/security.yml b/Resources/Prototypes/Entities/Objects/Weapons/security.yml index 1b07eab9faf..3c0cfa6e6ba 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/security.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/security.yml @@ -88,6 +88,99 @@ guides: - Security +- type: entity + name: borg stun baton + parent: BaseItem + id: BorgStunbaton + description: A stun baton for incapacitating people with. Actively harming with this is considered bad tone. + components: + - type: Sprite + sprite: Objects/Weapons/Melee/stunbaton.rsi + layers: + - state: stunbaton_off + map: [ "enum.ToggleVisuals.Layer" ] + - type: Stunbaton + energyPerUse: 50 + - type: BatterySelfRecharger + autoRecharge: true + autoRechargeRate: 40 + - type: ItemToggle + predictable: false + soundActivate: + collection: sparks + params: + variation: 0.250 + soundDeactivate: + collection: sparks + params: + variation: 0.250 + soundFailToActivate: + path: /Audio/Machines/button.ogg + params: + variation: 0.250 + - type: ItemToggleMeleeWeapon + activatedDamage: + types: + Blunt: 0 + - type: MeleeWeapon + wideAnimationRotation: -135 + damage: + types: + Blunt: 7 + bluntStaminaDamageFactor: 2.5 + heavyRateModifier: 0.75 + heavyDamageBaseModifier: 1.75 + heavyStaminaCost: 1 + animation: WeaponArcSlash + - type: StaminaDamageOnHit + damage: 35 + sound: /Audio/Weapons/egloves.ogg + - type: StaminaDamageOnCollide + damage: 35 + sound: /Audio/Weapons/egloves.ogg + - type: Battery + maxCharge: 1000 + startingCharge: 1000 + - type: Item + heldPrefix: off + size: Normal + - type: Clothing + sprite: Objects/Weapons/Melee/stunbaton.rsi + quickEquip: false + slots: + - Belt + - type: DisarmMalus + malus: 0.225 + - type: Appearance + - type: GenericVisualizer + visuals: + enum.ToggleVisuals.Toggled: + enum.ToggleVisuals.Layer: + True: {state: stunbaton_on} + False: {state: stunbaton_off} + - type: StaticPrice + price: 80 + - type: Riggable + - type: SolutionContainerManager + solutions: + battery: + maxVol: 5 + - type: InjectableSolution + solution: battery + - type: DrawableSolution + solution: battery + - type: Explosive + explosionType: Default + intensitySlope: 1.5 + maxIntensity: 200 + - type: PhysicalComposition + materialComposition: + Steel: 100 + Plastic: 100 + - type: GuideHelp + guides: + - Security + - type: entity name: truncheon parent: BaseItem diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index e475144c539..7e0d7a94696 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -172,6 +172,9 @@ - type: Tag id: BorgModuleEngineering +- type: Tag + id: BorgModuleSecurity + - type: Tag id: BorgModuleGeneric diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/clown.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/clown.png index b70cacbab45..260f7b5776a 100644 Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/clown.png and b/Resources/Textures/Mobs/Silicon/chassis.rsi/clown.png differ diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/clown_e.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/clown_e.png index 3c7d9924e55..a97f5836725 100644 Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/clown_e.png and b/Resources/Textures/Mobs/Silicon/chassis.rsi/clown_e.png differ diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/clown_e_r.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/clown_e_r.png index d523e5ea19a..c3624bbf1b4 100644 Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/clown_e_r.png and b/Resources/Textures/Mobs/Silicon/chassis.rsi/clown_e_r.png differ diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/clown_l.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/clown_l.png index 996cf0e2111..d7de5a41a0f 100644 Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/clown_l.png and b/Resources/Textures/Mobs/Silicon/chassis.rsi/clown_l.png differ diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/engineer.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/engineer.png index e558622fded..4ec1be2a61d 100644 Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/engineer.png and b/Resources/Textures/Mobs/Silicon/chassis.rsi/engineer.png differ diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/engineer_e.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/engineer_e.png index 71fdbca19d1..a658c5379cf 100644 Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/engineer_e.png and b/Resources/Textures/Mobs/Silicon/chassis.rsi/engineer_e.png differ diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/engineer_e_r.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/engineer_e_r.png index cdb9d02c899..0e0bf5d930e 100644 Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/engineer_e_r.png and b/Resources/Textures/Mobs/Silicon/chassis.rsi/engineer_e_r.png differ diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/engineer_l.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/engineer_l.png index 045cd27a356..f2a94af8cf5 100644 Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/engineer_l.png and b/Resources/Textures/Mobs/Silicon/chassis.rsi/engineer_l.png differ diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/janitor.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/janitor.png index 83275f949bf..8bcb1f621ee 100644 Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/janitor.png and b/Resources/Textures/Mobs/Silicon/chassis.rsi/janitor.png differ diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/janitor_e.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/janitor_e.png index db3beec154f..fa96040bd14 100644 Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/janitor_e.png and b/Resources/Textures/Mobs/Silicon/chassis.rsi/janitor_e.png differ diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/janitor_e_r.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/janitor_e_r.png index 01ddc00968e..a55dd1364e9 100644 Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/janitor_e_r.png and b/Resources/Textures/Mobs/Silicon/chassis.rsi/janitor_e_r.png differ diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/janitor_l.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/janitor_l.png index cbe49f1a7a7..457eea4123b 100644 Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/janitor_l.png and b/Resources/Textures/Mobs/Silicon/chassis.rsi/janitor_l.png differ diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/janitor_moving.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/janitor_moving.png index ff7d4eb483a..53f8f8f33ca 100644 Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/janitor_moving.png and b/Resources/Textures/Mobs/Silicon/chassis.rsi/janitor_moving.png differ diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/medical.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/medical.png index 86f26f52cf2..e953da8fd42 100644 Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/medical.png and b/Resources/Textures/Mobs/Silicon/chassis.rsi/medical.png differ diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/medical_e.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/medical_e.png index 2c70d3d3468..acd9c3fce88 100644 Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/medical_e.png and b/Resources/Textures/Mobs/Silicon/chassis.rsi/medical_e.png differ diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/medical_e_r.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/medical_e_r.png index 4def2d26336..c78232a81bd 100644 Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/medical_e_r.png and b/Resources/Textures/Mobs/Silicon/chassis.rsi/medical_e_r.png differ diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/medical_l.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/medical_l.png index f17bb44b737..1c8bf82b968 100644 Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/medical_l.png and b/Resources/Textures/Mobs/Silicon/chassis.rsi/medical_l.png differ diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/medical_moving.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/medical_moving.png index 4be26cce2f4..5d932812741 100644 Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/medical_moving.png and b/Resources/Textures/Mobs/Silicon/chassis.rsi/medical_moving.png differ diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/meta.json b/Resources/Textures/Mobs/Silicon/chassis.rsi/meta.json index 68fbf1985e7..24b2647eb51 100644 --- a/Resources/Textures/Mobs/Silicon/chassis.rsi/meta.json +++ b/Resources/Textures/Mobs/Silicon/chassis.rsi/meta.json @@ -1,8 +1,8 @@ { "version": 1, "size": { - "x": 32, - "y": 32 + "x": 64, + "y": 64 }, "license": "CC-BY-SA-3.0", "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/faf6db214927874c19b8fa8585d26b5d40de1acc", @@ -11,6 +11,14 @@ "name": "clown", "directions": 4 }, + { + "name": "quadsprite", + "directions": 4 + }, + { + "name": "quadspritel", + "directions": 4 + }, { "name": "clown_e", "directions": 4 diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/miner.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/miner.png index 93da33c7b4c..4e231f23ff5 100644 Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/miner.png and b/Resources/Textures/Mobs/Silicon/chassis.rsi/miner.png differ diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/miner_e.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/miner_e.png index a3839526dd7..886e212e2f0 100644 Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/miner_e.png and b/Resources/Textures/Mobs/Silicon/chassis.rsi/miner_e.png differ diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/miner_e_r.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/miner_e_r.png index ce0804bfc84..9da30dd829b 100644 Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/miner_e_r.png and b/Resources/Textures/Mobs/Silicon/chassis.rsi/miner_e_r.png differ diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/miner_l.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/miner_l.png index 6d8c96cf1d6..0b8117e6099 100644 Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/miner_l.png and b/Resources/Textures/Mobs/Silicon/chassis.rsi/miner_l.png differ diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/miner_moving.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/miner_moving.png index f4a6ca49a3f..6d2d379e859 100644 Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/miner_moving.png and b/Resources/Textures/Mobs/Silicon/chassis.rsi/miner_moving.png differ diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/peace.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/peace.png index 15a75518da7..a6d0e8b9c98 100644 Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/peace.png and b/Resources/Textures/Mobs/Silicon/chassis.rsi/peace.png differ diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/peace_e.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/peace_e.png index 3c7d9924e55..a97f5836725 100644 Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/peace_e.png and b/Resources/Textures/Mobs/Silicon/chassis.rsi/peace_e.png differ diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/peace_e_r.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/peace_e_r.png index d523e5ea19a..c3624bbf1b4 100644 Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/peace_e_r.png and b/Resources/Textures/Mobs/Silicon/chassis.rsi/peace_e_r.png differ diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/peace_l.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/peace_l.png index 996cf0e2111..d7de5a41a0f 100644 Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/peace_l.png and b/Resources/Textures/Mobs/Silicon/chassis.rsi/peace_l.png differ diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/quadsprite.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/quadsprite.png new file mode 100644 index 00000000000..9dd891e7b08 Binary files /dev/null and b/Resources/Textures/Mobs/Silicon/chassis.rsi/quadsprite.png differ diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/quadspritel.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/quadspritel.png new file mode 100644 index 00000000000..425f739dc8b Binary files /dev/null and b/Resources/Textures/Mobs/Silicon/chassis.rsi/quadspritel.png differ diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/robot.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/robot.png index a18a9978e54..e39d257ddb8 100644 Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/robot.png and b/Resources/Textures/Mobs/Silicon/chassis.rsi/robot.png differ diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/robot_e.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/robot_e.png index 3fe4b86946a..362ece55af9 100644 Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/robot_e.png and b/Resources/Textures/Mobs/Silicon/chassis.rsi/robot_e.png differ diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/robot_e_r.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/robot_e_r.png index 7f73680c4c2..6f190fed30c 100644 Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/robot_e_r.png and b/Resources/Textures/Mobs/Silicon/chassis.rsi/robot_e_r.png differ diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/robot_l.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/robot_l.png index e88a451a55b..28b611c4ac3 100644 Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/robot_l.png and b/Resources/Textures/Mobs/Silicon/chassis.rsi/robot_l.png differ diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/service.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/service.png index 0551dd94fd4..80301cb7625 100644 Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/service.png and b/Resources/Textures/Mobs/Silicon/chassis.rsi/service.png differ diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/service_e.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/service_e.png index b7c4f2e3da1..67ef1f7ce23 100644 Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/service_e.png and b/Resources/Textures/Mobs/Silicon/chassis.rsi/service_e.png differ diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/service_e_r.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/service_e_r.png index a9cf0cacad4..8f79b8fd1a1 100644 Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/service_e_r.png and b/Resources/Textures/Mobs/Silicon/chassis.rsi/service_e_r.png differ diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/service_l.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/service_l.png index 819b3d824e4..bba3a9cbaa6 100644 Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/service_l.png and b/Resources/Textures/Mobs/Silicon/chassis.rsi/service_l.png differ diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/synd_engi.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/synd_engi.png index 961f0172309..3db6ce37338 100644 Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/synd_engi.png and b/Resources/Textures/Mobs/Silicon/chassis.rsi/synd_engi.png differ diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/synd_engi_e.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/synd_engi_e.png index 1c062b2489e..19e646f23f0 100644 Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/synd_engi_e.png and b/Resources/Textures/Mobs/Silicon/chassis.rsi/synd_engi_e.png differ diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/synd_engi_l.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/synd_engi_l.png index 6061ca87a01..18ad46f5785 100644 Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/synd_engi_l.png and b/Resources/Textures/Mobs/Silicon/chassis.rsi/synd_engi_l.png differ diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/synd_medical.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/synd_medical.png index 9f6a546a69d..dc3f4739d97 100644 Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/synd_medical.png and b/Resources/Textures/Mobs/Silicon/chassis.rsi/synd_medical.png differ diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/synd_medical_e.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/synd_medical_e.png index 3e84a86ff68..f9f2c64c1e3 100644 Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/synd_medical_e.png and b/Resources/Textures/Mobs/Silicon/chassis.rsi/synd_medical_e.png differ diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/synd_medical_l.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/synd_medical_l.png index 3e84a86ff68..f9f2c64c1e3 100644 Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/synd_medical_l.png and b/Resources/Textures/Mobs/Silicon/chassis.rsi/synd_medical_l.png differ diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/synd_sec.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/synd_sec.png index bfff2654879..544cdc0215b 100644 Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/synd_sec.png and b/Resources/Textures/Mobs/Silicon/chassis.rsi/synd_sec.png differ diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/synd_sec_e.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/synd_sec_e.png index d881e3d2c90..19b4a27eed2 100644 Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/synd_sec_e.png and b/Resources/Textures/Mobs/Silicon/chassis.rsi/synd_sec_e.png differ diff --git a/Resources/Textures/Mobs/Silicon/chassis.rsi/synd_sec_l.png b/Resources/Textures/Mobs/Silicon/chassis.rsi/synd_sec_l.png index 3168a0ac72c..4e300e09a71 100644 Binary files a/Resources/Textures/Mobs/Silicon/chassis.rsi/synd_sec_l.png and b/Resources/Textures/Mobs/Silicon/chassis.rsi/synd_sec_l.png differ diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-Advmeasures.png b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-Advmeasures.png new file mode 100644 index 00000000000..54eff4948d1 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-Advmeasures.png differ diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-capture.png b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-capture.png new file mode 100644 index 00000000000..1d9aa78388b Binary files /dev/null and b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-capture.png differ diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-explosive.png b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-explosive.png new file mode 100644 index 00000000000..7c15bb26e4e Binary files /dev/null and b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-explosive.png differ diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-investigation.png b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-investigation.png new file mode 100644 index 00000000000..0b3aacfdec5 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-investigation.png differ diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-kill.png b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-kill.png new file mode 100644 index 00000000000..27d3248fb31 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-kill.png differ diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-stun.png b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-stun.png new file mode 100644 index 00000000000..d8df063aab4 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-stun.png differ diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json index 1b3eba668d1..60c7dcd54e0 100644 --- a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json @@ -127,6 +127,24 @@ { "name": "service" }, + { + "name": "icon-Advmeasures" + }, + { + "name": "icon-stun" + }, + { + "name": "icon-kill" + }, + { + "name": "icon-capture" + }, + { + "name": "icon-investigation" + }, + { + "name": "icon-explosive" + }, { "name": "syndicateborgbomb" },