From 76286cb241576d800e90b7f722982a1285617bf5 Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Thu, 25 Jan 2024 09:11:03 +0000 Subject: [PATCH 01/72] Create borg_chassis.yml --- .../Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml new file mode 100644 index 00000000000..20d37bf5c37 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml @@ -0,0 +1 @@ +#Just to upload to Github to get this ball rolling :O \ No newline at end of file From 2d4b6a71c8476c3590513ec64298700601631dd9 Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Thu, 25 Jan 2024 16:48:09 +0000 Subject: [PATCH 02/72] Make da Borg --- .../Entities/Mobs/Cyborgs/borg_chassis.yml | 45 +++++++++- .../Objects/Specific/Robotics/borg_parts.yml | 90 +++++++++++++++++++ .../Objects/Specific/Security/security.yml | 26 ++++++ .../Weapons/Guns/Projectiles/projectiles.yml | 48 ++++++++++ Resources/Prototypes/DeltaV/tags.yml | 3 + .../Mobs/Cyborgs/base_borg_chassis.yml | 2 +- 6 files changed, 212 insertions(+), 2 deletions(-) create mode 100644 Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_parts.yml create mode 100644 Resources/Prototypes/DeltaV/Entities/Objects/Specific/Security/security.yml create mode 100644 Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml index 20d37bf5c37..6d9feff5f1c 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml @@ -1 +1,44 @@ -#Just to upload to Github to get this ball rolling :O \ No newline at end of file +- type: entity + id: BorgChassisSecurity + parent: BorgChassisGeneric + name: security cyborg + components: + - type: BorgChassis + maxModules: 4 + moduleWhitelist: + tags: + - BorgModuleGeneric + - BorgModuleSecurity + hasMindState: peace_e + noMindState: peace_e_r + - type: Sprite + layers: + - state: peace + - state: peace_e_r + map: ["enum.BorgVisualLayers.Light"] + shader: unshaded + visible: false + - state: peace_l + shader: unshaded + map: ["light"] + visible: false + - type: Construction + node: security + - type: IntrinsicRadioReceiver + - type: IntrinsicRadioTransmitter + channels: + - Binary + - Common + - Science + - Security + - type: ActiveRadio + channels: + - Binary + - Common + - Science + - Security + - type: AccessReader + access: [["Cargo"], ["Securtiy"], ["Command"], ["Research"]] + - type: ShowSecurityIcons + #- type: SiliconLawProvider + # laws: SiliconPolice \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_parts.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_parts.yml new file mode 100644 index 00000000000..40b0c4eaf2e --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_parts.yml @@ -0,0 +1,90 @@ +# Security + +- type: entity + id: LeftArmBorgSecurity + parent: BaseBorgArmLeft + name: security cyborg left arm + components: + - type: Sprite + state: service_l_arm + - type: Icon + state: service_l_arm + - type: Tag + tags: + - Trash + - BorgArm + - BorgServiceLArm + +- type: entity + id: RightArmBorgSecurity + parent: BaseBorgArmRight + name: security cyborg right arm + components: + - type: Sprite + state: service_r_arm + - type: Icon + state: service_r_arm + - type: Tag + tags: + - Trash + - BorgArm + - BorgServiceRArm + +- type: entity + id: LeftLegBorgSecurity + parent: BaseBorgLegLeft + name: security cyborg left leg + components: + - type: Sprite + state: service_l_leg + - type: Icon + state: service_l_leg + - type: Tag + tags: + - Trash + - BorgLeg + - BorgServiceLLeg + +- type: entity + id: RightLegBorgSecurity + parent: BaseBorgLegRight + name: security cyborg right leg + components: + - type: Sprite + state: service_r_leg + - type: Icon + state: service_r_leg + - type: Tag + tags: + - Trash + - BorgLeg + - BorgServiceRLeg + +- type: entity + id: HeadBorgSecurity + parent: BaseBorgHead + name: security cyborg head + components: + - type: Sprite + state: service_head + - type: Icon + state: service_head + - type: Tag + tags: + - Trash + - BorgHead + - BorgServiceHead + +- type: entity + id: TorsoBorgSecurity + parent: BaseBorgTorso + name: security cyborg torso + components: + - type: Sprite + state: service_chest + - type: Icon + state: service_chest + - type: Tag + tags: + - Trash + - BorgServiceTorso \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Security/security.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Security/security.yml new file mode 100644 index 00000000000..483a96f8d30 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Security/security.yml @@ -0,0 +1,26 @@ +- type: entity + parent: Stunbaton + id: StunBatonSelfCharging + suffix: Recharging, Do Not Map + components: + - type: BatterySelfRecharger + autoRecharge: true + autoRechargeRate: 50 + +- type: entity + parent: Flash + id: FlashRecharging + suffix: Recharging, Do Not Map + components: + - type: AutoRecharge + rechargeDuration: 120 + +#- type: entity - This is dumb, can't figure it out, will come back when more patient +# parent: Handcuffs +# id: Handcuffs2Lingering +# suffix: 0, Lingering +# components: +# - type: Stack +# lingering: true +# count: 0 +# stackType: Handcuffs \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml new file mode 100644 index 00000000000..7155e0e3699 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -0,0 +1,48 @@ +#- type: entity +# parent: BaseBulletTrigger +# id: ProjectileBola +# name: bola +# noSpawn: true +# components: +#- type: Item +# size: Normal +# - type: Sprite +# sprite: Objects/Weapons/Throwable/bola.rsi +# state: icon +# #- type: EmitSoundOnThrow +# # sound: /Audio/Weapons/bolathrow.ogg +# - type: EmitSoundOnLand +# sound: /Audio/Effects/snap.ogg +# #- type: Construction +# # graph: Bola +# # node: bola +# - type: Damageable +# damageContainer: Inorganic +# - type: Destructible +# thresholds: +# - trigger: +# !type:DamageTrigger +# damage: 75 +# behaviors: +# - !type:DoActsBehavior +# acts: [ "Destruction" ] +# - trigger: +# !type:DamageTrigger +# damage: 15 +# behaviors: +# - !type:PlaySoundBehavior +# sound: /Audio/Effects/metalbreak.ogg +# - !type:DoActsBehavior +# acts: [ "Destruction" ] +# - type: DamageOnLand +# damage: +# types: +# Blunt: 5 +# - type: Ensnaring +# freeTime: 2.0 +# breakoutTime: 3.5 #all bola should generally be fast to remove +# walkSpeed: 0.7 #makeshift bola shouldn't slow too much +# sprintSpeed: 0.7 +# staminaDamage: 55 # Sudden weight increase sapping stamina +# canThrowTrigger: true +# canMoveBreakout: true \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/tags.yml b/Resources/Prototypes/DeltaV/tags.yml index d636db0146d..1be2d11310d 100644 --- a/Resources/Prototypes/DeltaV/tags.yml +++ b/Resources/Prototypes/DeltaV/tags.yml @@ -38,3 +38,6 @@ - type: Tag id: PaperSlip + +- type: Tag + id: BorgModuleSecurity \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml index 292ffacacb1..f4b39e272db 100644 --- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml +++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml @@ -226,4 +226,4 @@ - type: ActivatableUIRequiresLock - type: AccessReader access: [["Command"], ["Research"]] - - type: ShowSecurityIcons + - type: ShowSecurityIcons \ No newline at end of file From 31a5fa67e4d7a71f36f7039ed5ba1a0c1d824f42 Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Thu, 25 Jan 2024 16:48:24 +0000 Subject: [PATCH 03/72] Make da Borg craftable --- .../Construction/Graphs/machines/cyborg.yml | 0 .../Construction/Graphs/machines/cyborg.yml | 31 +++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 Resources/Prototypes/DeltaV/Recipes/Construction/Graphs/machines/cyborg.yml diff --git a/Resources/Prototypes/DeltaV/Recipes/Construction/Graphs/machines/cyborg.yml b/Resources/Prototypes/DeltaV/Recipes/Construction/Graphs/machines/cyborg.yml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/machines/cyborg.yml b/Resources/Prototypes/Recipes/Construction/Graphs/machines/cyborg.yml index 6f65937c961..b811677acb6 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/machines/cyborg.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/machines/cyborg.yml @@ -179,6 +179,34 @@ - tool: Screwing doAfter: 0.5 + + - to: security # Delta-V Security Borg Start + steps: + - assemblyId: security + guideString: borg-construction-guide-string + + - material: Cable + amount: 1 + doAfter: 1 + store: part-container + + - component: Flash + name: flash + store: part-container + icon: + sprite: Objects/Weapons/Melee/flash.rsi + state: flash + + - component: Flash + name: second flash + store: part-container + icon: + sprite: Objects/Weapons/Melee/flash.rsi + state: flash + + - tool: Screwing + doAfter: 0.5 # Delta-V Security Borg End + - node: cyborg entity: BorgChassisGeneric @@ -196,3 +224,6 @@ - node: service entity: BorgChassisService + + - node: security # Delta-V Security Borg + entity: BorgChassisSecurity # Delta-V Security Borg \ No newline at end of file From 6f2e548b5f21737916b76a16bed59651de4f3ce8 Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Thu, 25 Jan 2024 16:48:35 +0000 Subject: [PATCH 04/72] modules, most of which don't work --- .../Specific/Robotics/borg_modules.yml | 52 +++++++++++++++++++ .../Weapons/Guns/Launchers/launchers.yml | 31 +++++++++++ .../DeltaV/Stacks/security_stacks.yml | 7 +++ 3 files changed, 90 insertions(+) create mode 100644 Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml create mode 100644 Resources/Prototypes/DeltaV/Stacks/security_stacks.yml diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml new file mode 100644 index 00000000000..c0143697e07 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -0,0 +1,52 @@ +- type: entity + id: BaseBorgModuleSecurity + parent: BaseBorgModule + abstract: true + components: + - type: Tag + tags: + - BorgModuleSecurity + +# Security Modules + +- type: entity + id: BorgModuleSecurityDetain + parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ] + name: detainment cyborg module + components: + - type: Sprite + layers: + - state: generic + - state: icon-tools + - type: ItemBorgModule + items: + - StunBatonSelfCharging + - FlashRecharging + #- Handcuffs2Lingering + +- type: entity + id: BorgModuleSecurityPatrol + parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ] + name: patrol cyborg module + components: + - type: Sprite + layers: + - state: generic + - state: icon-tools + - type: ItemBorgModule + items: + - FlashlightSeclite + #- whistle - Not merged here yet + +#- type: entity +# id: BorgModuleSecurityChase +# parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ] +# name: chase cyborg module +# components: +# - type: Sprite +# layers: +# - state: generic +# - state: icon-tools +# - type: ItemBorgModule +# items: +# - WeaponLauncherBolaBorg \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml index 0775b414aba..c8ac9087dbf 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -28,3 +28,34 @@ - type: BatterySelfRecharger autoRecharge: true autoRechargeRate: 2 + +#- type: entity +# name: bola launcher +# parent: BaseWeaponLauncher +# id: WeaponLauncherBolaBorg +# suffix: Do Not Map +# description: please work +# components: +# - type: Sprite +# sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi +# layers: +# - state: icon +# map: ["enum.GunVisualLayers.Base"] +# - type: Clothing +# sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi +# - type: Gun +# fireRate: 1 +# selectedMode: SemiAuto +# availableModes: +# - SemiAuto +# soundGunshot: +# path: /Audio/Weapons/Guns/Gunshots/grenade_launcher.ogg +# - type: Battery +# maxCharge: 600 +# startingCharge: 300 +# - type: ProjectileBatteryAmmoProvider +# proto: ProjectileBola +# fireCost: 300 +# - type: BatterySelfRecharger +# autoRecharge: true +# autoRechargeRate: 50 \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Stacks/security_stacks.yml b/Resources/Prototypes/DeltaV/Stacks/security_stacks.yml new file mode 100644 index 00000000000..9e7f1090f6a --- /dev/null +++ b/Resources/Prototypes/DeltaV/Stacks/security_stacks.yml @@ -0,0 +1,7 @@ +- type: stack + id: Handcuffs + name: handcuffs + icon: { sprite: "/Textures/Objects/Specific/Medical/medical.rsi", state: ointment } + spawn: Handcuffs + maxCount: 10 + itemSize: 1 \ No newline at end of file From 09cfdb4cf86d1f7c1576b2a45299b6eede6bed2c Mon Sep 17 00:00:00 2001 From: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Date: Thu, 25 Jan 2024 17:39:11 +0000 Subject: [PATCH 05/72] Apply suggestions from death review Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> --- .../Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml | 4 ++-- .../Entities/Objects/Specific/Robotics/borg_modules.yml | 2 +- .../DeltaV/Entities/Objects/Specific/Robotics/borg_parts.yml | 2 +- .../DeltaV/Entities/Objects/Specific/Security/security.yml | 2 +- .../Entities/Objects/Weapons/Guns/Launchers/launchers.yml | 2 +- .../Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml | 2 +- Resources/Prototypes/DeltaV/Stacks/security_stacks.yml | 2 +- Resources/Prototypes/DeltaV/tags.yml | 2 +- .../Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml | 2 +- .../Recipes/Construction/Graphs/machines/cyborg.yml | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml index 6d9feff5f1c..6528393c7e3 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml @@ -38,7 +38,7 @@ - Science - Security - type: AccessReader - access: [["Cargo"], ["Securtiy"], ["Command"], ["Research"]] + access: [["Cargo"], ["Security"], ["Command"], ["Research"]] - type: ShowSecurityIcons #- type: SiliconLawProvider - # laws: SiliconPolice \ No newline at end of file + # laws: SiliconPolice diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml index c0143697e07..14491ef6c0e 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -49,4 +49,4 @@ # - state: icon-tools # - type: ItemBorgModule # items: -# - WeaponLauncherBolaBorg \ No newline at end of file +# - WeaponLauncherBolaBorg diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_parts.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_parts.yml index 40b0c4eaf2e..c0540afd383 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_parts.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_parts.yml @@ -87,4 +87,4 @@ - type: Tag tags: - Trash - - BorgServiceTorso \ No newline at end of file + - BorgServiceTorso diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Security/security.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Security/security.yml index 483a96f8d30..e948716e2e9 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Security/security.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Security/security.yml @@ -23,4 +23,4 @@ # - type: Stack # lingering: true # count: 0 -# stackType: Handcuffs \ No newline at end of file +# stackType: Handcuffs diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml index c8ac9087dbf..4c8da1fa4eb 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -58,4 +58,4 @@ # fireCost: 300 # - type: BatterySelfRecharger # autoRecharge: true -# autoRechargeRate: 50 \ No newline at end of file +# autoRechargeRate: 50 diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 7155e0e3699..2e7419a424c 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -45,4 +45,4 @@ # sprintSpeed: 0.7 # staminaDamage: 55 # Sudden weight increase sapping stamina # canThrowTrigger: true -# canMoveBreakout: true \ No newline at end of file +# canMoveBreakout: true diff --git a/Resources/Prototypes/DeltaV/Stacks/security_stacks.yml b/Resources/Prototypes/DeltaV/Stacks/security_stacks.yml index 9e7f1090f6a..11be3cd360a 100644 --- a/Resources/Prototypes/DeltaV/Stacks/security_stacks.yml +++ b/Resources/Prototypes/DeltaV/Stacks/security_stacks.yml @@ -4,4 +4,4 @@ icon: { sprite: "/Textures/Objects/Specific/Medical/medical.rsi", state: ointment } spawn: Handcuffs maxCount: 10 - itemSize: 1 \ No newline at end of file + itemSize: 1 diff --git a/Resources/Prototypes/DeltaV/tags.yml b/Resources/Prototypes/DeltaV/tags.yml index 1be2d11310d..d9d6b47fe79 100644 --- a/Resources/Prototypes/DeltaV/tags.yml +++ b/Resources/Prototypes/DeltaV/tags.yml @@ -40,4 +40,4 @@ id: PaperSlip - type: Tag - id: BorgModuleSecurity \ No newline at end of file + id: BorgModuleSecurity diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml index f4b39e272db..292ffacacb1 100644 --- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml +++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml @@ -226,4 +226,4 @@ - type: ActivatableUIRequiresLock - type: AccessReader access: [["Command"], ["Research"]] - - type: ShowSecurityIcons \ No newline at end of file + - type: ShowSecurityIcons diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/machines/cyborg.yml b/Resources/Prototypes/Recipes/Construction/Graphs/machines/cyborg.yml index b811677acb6..f5d644291b4 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/machines/cyborg.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/machines/cyborg.yml @@ -226,4 +226,4 @@ entity: BorgChassisService - node: security # Delta-V Security Borg - entity: BorgChassisSecurity # Delta-V Security Borg \ No newline at end of file + entity: BorgChassisSecurity # Delta-V Security Borg From 8d0fa5b489bdaefbc791ab53eea7260fc2a7a83f Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Thu, 25 Jan 2024 22:44:40 +0000 Subject: [PATCH 06/72] we're so fucking back chat --- Content.Shared/Cuffs/SharedCuffableSystem.cs | 65 +++++++++++++++++--- 1 file changed, 58 insertions(+), 7 deletions(-) diff --git a/Content.Shared/Cuffs/SharedCuffableSystem.cs b/Content.Shared/Cuffs/SharedCuffableSystem.cs index 93ef4e42134..14e2381ee66 100644 --- a/Content.Shared/Cuffs/SharedCuffableSystem.cs +++ b/Content.Shared/Cuffs/SharedCuffableSystem.cs @@ -26,6 +26,7 @@ using Content.Shared.Pulling.Components; using Content.Shared.Pulling.Events; using Content.Shared.Rejuvenate; +using Content.Shared.Stacks; using Content.Shared.Stunnable; using Content.Shared.Verbs; using Content.Shared.Weapons.Melee.Events; @@ -35,6 +36,7 @@ using Robust.Shared.Network; using Robust.Shared.Player; using Robust.Shared.Serialization; +using System.Diagnostics.CodeAnalysis; namespace Content.Shared.Cuffs { @@ -57,6 +59,7 @@ public abstract partial class SharedCuffableSystem : EntitySystem [Dependency] private readonly SharedInteractionSystem _interaction = default!; [Dependency] private readonly SharedPopupSystem _popup = default!; [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private readonly SharedStackSystem _stacks = default!; public override void Initialize() { @@ -434,6 +437,49 @@ private void UpdateHeldItems(EntityUid uid, EntityUid handcuff, CuffableComponen EnsureComp(virtItem2.Value); } + /// + /// Checks if the handcuff is stackable, and creates a new handcuff entity if the stack requires it. + /// + /// + public bool TrySpawnCuffSplitStack(EntityUid handcuff, EntityUid user, EntityUid target, [NotNullWhen(true)] out EntityUid? handcuffsplit) + { + if (!HasComp(handcuff)) + { + handcuffsplit = null; + return false; + } + if (TryComp(handcuff, out var stackComp)) + { + if (_stacks.GetCount(handcuff, stackComp) >= 1) + { + _stacks.Use(handcuff, 1, stackComp); + + if (_net.IsServer) /// let the server spawn because client mispredicts + { + var pos = Transform(target).Coordinates; + handcuffsplit = Spawn("Zipties", pos); /// This should somehow get the proto ID instead of zipties, but fuck if I know how. + return true; + } + else + { + handcuffsplit = null; + return false; + } + } + else + { + handcuffsplit = null; + return false; + } + } + else + { + handcuffsplit = handcuff; + _hands.TryDrop(user, handcuff); + return true; + } + } + /// /// Add a set of cuffs to an existing CuffedComponent. /// @@ -446,13 +492,18 @@ public bool TryAddNewCuffs(EntityUid target, EntityUid user, EntityUid handcuff, return false; // Success! - _hands.TryDrop(user, handcuff); + bool success = TrySpawnCuffSplitStack(handcuff, user, target, out EntityUid? handcuffsplit); - component.Container.Insert(handcuff); - UpdateHeldItems(target, handcuff, component); - return true; + if (success) + { + component.Container.Insert((EntityUid)handcuffsplit); + UpdateHeldItems(target, (EntityUid)handcuffsplit, component); + } + + return success; } + /// False if the target entity isn't cuffable. public bool TryCuffing(EntityUid user, EntityUid target, EntityUid handcuff, HandcuffComponent? handcuffComponent = null, CuffableComponent? cuffable = null) { @@ -596,8 +647,8 @@ public void TryUncuff(EntityUid target, EntityUid user, EntityUid? cuffsToRemove if (_net.IsServer) { _popup.PopupEntity(Loc.GetString("cuffable-component-start-uncuffing-observer", - ("user", Identity.Name(user, EntityManager)), ("target", Identity.Name(target, EntityManager))), - target, Filter.Pvs(target, entityManager: EntityManager) + ("user", Identity.Name(user, EntityManager)), ("target", Identity.Name(target, EntityManager))), + target, Filter.Pvs(target, entityManager: EntityManager) .RemoveWhere(e => e.AttachedEntity == target || e.AttachedEntity == user), true); if (target == user) @@ -729,4 +780,4 @@ private sealed partial class AddCuffDoAfterEvent : SimpleDoAfterEvent { } } -} +} \ No newline at end of file From 4d6d23529c4bafc91eebfa3be333c4385fed4811 Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Thu, 25 Jan 2024 22:55:57 +0000 Subject: [PATCH 07/72] okay bola launcher is off the table --- .../Specific/Robotics/borg_modules.yml | 7 ++- .../Weapons/Guns/Launchers/launchers.yml | 33 +------------ .../Weapons/Guns/Projectiles/projectiles.yml | 48 ------------------- 3 files changed, 4 insertions(+), 84 deletions(-) delete mode 100644 Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml index 14491ef6c0e..b8f35665163 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -22,7 +22,7 @@ items: - StunBatonSelfCharging - FlashRecharging - #- Handcuffs2Lingering + - Zipties5Lingering - type: entity id: BorgModuleSecurityPatrol @@ -35,7 +35,7 @@ - state: icon-tools - type: ItemBorgModule items: - - FlashlightSeclite + - FlashlightSecliteBorg #- whistle - Not merged here yet #- type: entity @@ -48,5 +48,4 @@ # - state: generic # - state: icon-tools # - type: ItemBorgModule -# items: -# - WeaponLauncherBolaBorg +# items: \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml index 4c8da1fa4eb..7ad7a721796 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -27,35 +27,4 @@ fireCost: 300 - type: BatterySelfRecharger autoRecharge: true - autoRechargeRate: 2 - -#- type: entity -# name: bola launcher -# parent: BaseWeaponLauncher -# id: WeaponLauncherBolaBorg -# suffix: Do Not Map -# description: please work -# components: -# - type: Sprite -# sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi -# layers: -# - state: icon -# map: ["enum.GunVisualLayers.Base"] -# - type: Clothing -# sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi -# - type: Gun -# fireRate: 1 -# selectedMode: SemiAuto -# availableModes: -# - SemiAuto -# soundGunshot: -# path: /Audio/Weapons/Guns/Gunshots/grenade_launcher.ogg -# - type: Battery -# maxCharge: 600 -# startingCharge: 300 -# - type: ProjectileBatteryAmmoProvider -# proto: ProjectileBola -# fireCost: 300 -# - type: BatterySelfRecharger -# autoRecharge: true -# autoRechargeRate: 50 + autoRechargeRate: 2 \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml deleted file mode 100644 index 2e7419a424c..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ /dev/null @@ -1,48 +0,0 @@ -#- type: entity -# parent: BaseBulletTrigger -# id: ProjectileBola -# name: bola -# noSpawn: true -# components: -#- type: Item -# size: Normal -# - type: Sprite -# sprite: Objects/Weapons/Throwable/bola.rsi -# state: icon -# #- type: EmitSoundOnThrow -# # sound: /Audio/Weapons/bolathrow.ogg -# - type: EmitSoundOnLand -# sound: /Audio/Effects/snap.ogg -# #- type: Construction -# # graph: Bola -# # node: bola -# - type: Damageable -# damageContainer: Inorganic -# - type: Destructible -# thresholds: -# - trigger: -# !type:DamageTrigger -# damage: 75 -# behaviors: -# - !type:DoActsBehavior -# acts: [ "Destruction" ] -# - trigger: -# !type:DamageTrigger -# damage: 15 -# behaviors: -# - !type:PlaySoundBehavior -# sound: /Audio/Effects/metalbreak.ogg -# - !type:DoActsBehavior -# acts: [ "Destruction" ] -# - type: DamageOnLand -# damage: -# types: -# Blunt: 5 -# - type: Ensnaring -# freeTime: 2.0 -# breakoutTime: 3.5 #all bola should generally be fast to remove -# walkSpeed: 0.7 #makeshift bola shouldn't slow too much -# sprintSpeed: 0.7 -# staminaDamage: 55 # Sudden weight increase sapping stamina -# canThrowTrigger: true -# canMoveBreakout: true From 105433e7237e2075eadf04d2083ead58368eabec Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Thu, 25 Jan 2024 22:56:05 +0000 Subject: [PATCH 08/72] cuffs part 2!! --- .../DeltaV/Stacks/security_stacks.yml | 33 +++++++++++++++---- .../Entities/Objects/Misc/handcuffs.yml | 4 +++ 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Stacks/security_stacks.yml b/Resources/Prototypes/DeltaV/Stacks/security_stacks.yml index 11be3cd360a..35627b0b4ad 100644 --- a/Resources/Prototypes/DeltaV/Stacks/security_stacks.yml +++ b/Resources/Prototypes/DeltaV/Stacks/security_stacks.yml @@ -1,7 +1,28 @@ +- type: entity # huge thanks to IProduceWidgets on Github for figuring this shit out in his PR earlier + id: Zipties5 + parent: Zipties + suffix: 5 + components: + - type: Item + size: 10 + - type: Stack + stackType: Zipties + count: 5 + +- type: entity + id: Zipties5Lingering + parent: Zipties5 + suffix: 5, Lingering + components: + - type: Stack + stackType: Zipties + lingering: true + count: 5 + - type: stack - id: Handcuffs - name: handcuffs - icon: { sprite: "/Textures/Objects/Specific/Medical/medical.rsi", state: ointment } - spawn: Handcuffs - maxCount: 10 - itemSize: 1 + id: Zipties + name: zipties + icon: { sprite: "/Textures/Objects/Misc/zipties.rsi", state: cuff } + spawn: Zipties + maxCount: 5 + itemSize: 2 \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml b/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml index f2fbab04a0e..683ffde3ff4 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml @@ -3,6 +3,7 @@ description: Used to detain criminals and other assholes. id: Handcuffs parent: BaseItem + suffix: single #Delta-V makes cuffs stackable components: - type: Item size: Small @@ -16,6 +17,9 @@ - type: Tag tags: - Handcuffs + - type: Stack # Delta-V makes cuffs stackable + stackType: Zipties + count: 1 - type: MeleeWeapon resetOnHandSelected: false animation: WeaponArcDisarm From 9a989b7e6467e76dc64ce891e67426f26e277d89 Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Thu, 25 Jan 2024 22:56:12 +0000 Subject: [PATCH 09/72] flashlight --- .../Entities/Objects/Power/powercells.yml | 12 ++++++++++++ .../Objects/Specific/Security/security.yml | 17 +++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 Resources/Prototypes/DeltaV/Entities/Objects/Power/powercells.yml diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Power/powercells.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Power/powercells.yml new file mode 100644 index 00000000000..73ea03b0376 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Power/powercells.yml @@ -0,0 +1,12 @@ +- type: entity + name: self-recharging powercell + parent: PowerCellAntiqueProto + id: PowerCellSelfChargingBorg + suffix: slow + components: + - type: Battery + maxCharge: 1000 + startingCharge: 1000 + - type: BatterySelfRecharger + autoRecharge: true + autoRechargeRate: 10 \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Security/security.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Security/security.yml index e948716e2e9..4bb2ab96caa 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Security/security.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Security/security.yml @@ -14,6 +14,23 @@ components: - type: AutoRecharge rechargeDuration: 120 + +- type: entity + name: seclite + parent: FlashlightSeclite + id: FlashlightSecliteBorg + description: A robust flashlight used by security. + suffix: Do Not Map + components: + - type: ItemSlots + slots: + cell_slot: + name: power-cell-slot-component-slot-name-default + startingItem: PowerCellSelfChargingBorg + - type: MeleeWeapon + damage: + types: + Blunt: 10 #- type: entity - This is dumb, can't figure it out, will come back when more patient # parent: Handcuffs From b7932facb8dafc17ce481dc34ac8f3d6e82de354 Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Thu, 25 Jan 2024 23:12:58 +0000 Subject: [PATCH 10/72] Rename --- .../Prototypes/DeltaV/Entities/Objects/Power/powercells.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Power/powercells.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Power/powercells.yml index 73ea03b0376..1a0643e72a0 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Power/powercells.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Power/powercells.yml @@ -2,7 +2,7 @@ name: self-recharging powercell parent: PowerCellAntiqueProto id: PowerCellSelfChargingBorg - suffix: slow + suffix: Recharging, Do Not Map components: - type: Battery maxCharge: 1000 From 8aa2fa12a6470514c5eb792f025bacc0975c3e33 Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Thu, 25 Jan 2024 23:13:21 +0000 Subject: [PATCH 11/72] Unparents NoSlip from BaseBorgChassis so SecBorgs can slip --- .../Entities/Mobs/Cyborgs/borg_chassis.yml | 21 +++++++++++++++++-- .../Mobs/Cyborgs/base_borg_chassis.yml | 2 +- .../Entities/Mobs/Cyborgs/borg_chassis.yml | 6 ++++++ 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml index 6528393c7e3..b64676ab520 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml @@ -1,6 +1,6 @@ - type: entity id: BorgChassisSecurity - parent: BorgChassisGeneric + parent: BaseBorgChassisNT name: security cyborg components: - type: BorgChassis @@ -41,4 +41,21 @@ access: [["Cargo"], ["Security"], ["Command"], ["Research"]] - type: ShowSecurityIcons #- type: SiliconLawProvider - # laws: SiliconPolice + # laws: SiliconPolice # Other PR + #- type: EmagSiliconLaw + # stunTime: 5 + # emagLaws: SyndicateStatic # TODO: THINK OF A COOL SYNDICATE SECURITY LAW + # THAT DOESN'T GIVE AN ANTAG LICENSE TO STUNMETA BORG + #- type: StatusEffects + # allowed: + # - Stun + # - KnockedDown + # - SlowedDown + #- type: MobThresholds + # thresholds: + # 0: Alive + # 100: Critical + # 200: Dead + #- type: NoSlip - This mf slips + - type: Speech + speechVerb: Robotic \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml index 292ffacacb1..625fd6bb5d6 100644 --- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml +++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml @@ -16,7 +16,7 @@ soundHit: path: /Audio/Effects/hit_kick.ogg - type: CombatMode - - type: NoSlip + #- type: NoSlip # Delta-V , Unparents NoSlip component - type: StaticPrice price: 1250 - type: Fixtures diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml index 218414e6108..9359a29818c 100644 --- a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml +++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml @@ -24,6 +24,7 @@ node: cyborg - type: Speech speechVerb: Robotic + - type: NoSlip # Delta-V , Unparents NoSlip component - type: entity id: BorgChassisMining @@ -67,6 +68,7 @@ access: [["Cargo"], ["Salvage"], ["Command"], ["Research"]] - type: Inventory templateId: borgTall + - type: NoSlip # Delta-V , Unparents NoSlip component - type: entity id: BorgChassisEngineer @@ -110,6 +112,7 @@ access: [["Engineering"], ["Command"], ["Research"]] - type: Inventory templateId: borgShort + - type: NoSlip # Delta-V , Unparents NoSlip component - type: entity id: BorgChassisJanitor @@ -153,6 +156,7 @@ access: [["Service"], ["Command"], ["Research"]] - type: Inventory templateId: borgShort + - type: NoSlip # Delta-V , Unparents NoSlip component - type: entity id: BorgChassisMedical @@ -197,6 +201,7 @@ - type: Inventory templateId: borgDutch - type: FabricateCandy # Nyanotrasen - The medical cyborg can generate candies filled with medicine. + - type: NoSlip # Delta-V , Unparents NoSlip component - type: entity id: BorgChassisService @@ -240,3 +245,4 @@ access: [["Service"], ["Command"], ["Research"]] - type: Inventory templateId: borgTall + - type: NoSlip # Delta-V , Unparents NoSlip component From d3b2e9e401e64090eb18e464a7711b79ffac4f3f Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Thu, 25 Jan 2024 23:13:46 +0000 Subject: [PATCH 12/72] Gonna add PeaceKeeper modules as roundstart, lock the SecOff modules to research --- .../Objects/Specific/Robotics/borg_modules.yml | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml index b8f35665163..a225419908c 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -10,7 +10,20 @@ # Security Modules - type: entity - id: BorgModuleSecurityDetain + id: BorgModuleSecurityDetain # Peacekeeper Set, Available on Round Start + parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ] + name: detainment cyborg module + components: + - type: Sprite + layers: + - state: generic + - state: icon-tools + - type: ItemBorgModule + items: + - Truncheon # Placeholder while I make a non-lethal stunning thing, no cuffs on round start + +- type: entity + id: BorgModuleSecurityDetain # Research Locked parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ] name: detainment cyborg module components: @@ -25,7 +38,7 @@ - Zipties5Lingering - type: entity - id: BorgModuleSecurityPatrol + id: BorgModuleSecurityPatrol # Peacekeeper Set, Available on Round Start parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ] name: patrol cyborg module components: From ee44d8de70a3fc40d732e036604b209282360734 Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Thu, 25 Jan 2024 23:23:18 +0000 Subject: [PATCH 13/72] notes and a little less parentage --- .../DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml index b64676ab520..a87749ed3bd 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml @@ -41,16 +41,12 @@ access: [["Cargo"], ["Security"], ["Command"], ["Research"]] - type: ShowSecurityIcons #- type: SiliconLawProvider - # laws: SiliconPolice # Other PR + # laws: SiliconPolice # PR-706 #- type: EmagSiliconLaw # stunTime: 5 # emagLaws: SyndicateStatic # TODO: THINK OF A COOL SYNDICATE SECURITY LAW # THAT DOESN'T GIVE AN ANTAG LICENSE TO STUNMETA BORG - #- type: StatusEffects - # allowed: - # - Stun - # - KnockedDown - # - SlowedDown + # NOTE TO FUTURE SELF: LAW 0 IS ADDED TO WHATEVER EMAG LAW IS PUT HERE (EmagSiliconLawComponent.cs) #- type: MobThresholds # thresholds: # 0: Alive @@ -58,4 +54,8 @@ # 200: Dead #- type: NoSlip - This mf slips - type: Speech - speechVerb: Robotic \ No newline at end of file + speechVerb: Robotic + #- type: Access + # enabled: false + # groups: + # - AllAccessBorg # Is it worth removing some access from the Borg? \ No newline at end of file From 80b3ca91fe73bf662fa5e22be39bcb2871b96311 Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Thu, 25 Jan 2024 23:23:26 +0000 Subject: [PATCH 14/72] planning out what modules we want --- .../Specific/Robotics/borg_modules.yml | 51 ++++++++++++------- 1 file changed, 33 insertions(+), 18 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml index a225419908c..3b1bae6c807 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -10,9 +10,9 @@ # Security Modules - type: entity - id: BorgModuleSecurityDetain # Peacekeeper Set, Available on Round Start + id: BorgModuleSecurityPeacekeeper # Peacekeeper Set, Available on Round Start parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ] - name: detainment cyborg module + name: peacekeeper cyborg module components: - type: Sprite layers: @@ -21,11 +21,26 @@ - type: ItemBorgModule items: - Truncheon # Placeholder while I make a non-lethal stunning thing, no cuffs on round start + - TelescopicShield + +- type: entity + id: BorgModuleSecurityPatrol # Peacekeeper Set, Available on Round Start + parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ] + name: patrol security cyborg module + components: + - type: Sprite + layers: + - state: generic + - state: icon-tools + - type: ItemBorgModule + items: + - FlashlightSecliteBorg + #- SecurityWhistle - Not merged here yet - type: entity id: BorgModuleSecurityDetain # Research Locked parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ] - name: detainment cyborg module + name: control security cyborg module components: - type: Sprite layers: @@ -38,9 +53,9 @@ - Zipties5Lingering - type: entity - id: BorgModuleSecurityPatrol # Peacekeeper Set, Available on Round Start + id: BorgModuleSecurityControl # Research Locked parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ] - name: patrol cyborg module + name: control security cyborg module components: - type: Sprite layers: @@ -48,17 +63,17 @@ - state: icon-tools - type: ItemBorgModule items: - - FlashlightSecliteBorg - #- whistle - Not merged here yet + - FlashRecharging -#- type: entity -# id: BorgModuleSecurityChase -# parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ] -# name: chase cyborg module -# components: -# - type: Sprite -# layers: -# - state: generic -# - state: icon-tools -# - type: ItemBorgModule -# items: \ No newline at end of file +- type: entity + id: BorgModuleSecurityChase # Research Locked + parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ] + name: chase security cyborg module + components: + - type: Sprite + layers: + - state: generic + - state: icon-tools + - type: ItemBorgModule + items: + - Disabler \ No newline at end of file From f40a699d5238af873e49a05ff13d4cae3d43a1d2 Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Thu, 25 Jan 2024 23:33:26 +0000 Subject: [PATCH 15/72] modules --- .../Objects/Specific/Robotics/borg_modules.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml index 3b1bae6c807..b920388d6fc 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -12,7 +12,7 @@ - type: entity id: BorgModuleSecurityPeacekeeper # Peacekeeper Set, Available on Round Start parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ] - name: peacekeeper cyborg module + name: peacekeeper security cyborg module components: - type: Sprite layers: @@ -37,10 +37,12 @@ - FlashlightSecliteBorg #- SecurityWhistle - Not merged here yet + + - type: entity id: BorgModuleSecurityDetain # Research Locked parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ] - name: control security cyborg module + name: detain security cyborg module components: - type: Sprite layers: @@ -55,7 +57,7 @@ - type: entity id: BorgModuleSecurityControl # Research Locked parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ] - name: control security cyborg module + name: riot control security cyborg module components: - type: Sprite layers: @@ -76,4 +78,7 @@ - state: icon-tools - type: ItemBorgModule items: - - Disabler \ No newline at end of file + - Disabler + + +#MAYBE I COULD TAKE THE PNEUMATIC CANNON, STICK A POWERCELL ON IT & THE BORG POWER CELL TO MAKE A BOLA LAUNCHER?!?!? \ No newline at end of file From 2611c3bfeaf9678544d1fae60e3e333be0490dcd Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Thu, 25 Jan 2024 23:33:51 +0000 Subject: [PATCH 16/72] Update borg_modules.yml --- .../Entities/Objects/Specific/Robotics/borg_modules.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml index b920388d6fc..d9c022d96da 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -78,7 +78,4 @@ - state: icon-tools - type: ItemBorgModule items: - - Disabler - - -#MAYBE I COULD TAKE THE PNEUMATIC CANNON, STICK A POWERCELL ON IT & THE BORG POWER CELL TO MAKE A BOLA LAUNCHER?!?!? \ No newline at end of file + - Disabler \ No newline at end of file From 70797d339d1ccbf375e4d2f8bf4684f119ad1a81 Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Thu, 25 Jan 2024 23:48:15 +0000 Subject: [PATCH 17/72] more planning, more comments --- .../Entities/Objects/Specific/Robotics/borg_modules.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml index d9c022d96da..9364b179122 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -21,7 +21,8 @@ - type: ItemBorgModule items: - Truncheon # Placeholder while I make a non-lethal stunning thing, no cuffs on round start - - TelescopicShield + - TelescopicShield # + #- BorgSecurityHypospray # Pax or Chloral Hydrate Injector - type: entity id: BorgModuleSecurityPatrol # Peacekeeper Set, Available on Round Start @@ -51,8 +52,7 @@ - type: ItemBorgModule items: - StunBatonSelfCharging - - FlashRecharging - - Zipties5Lingering + - Zipties5Lingering # This might go in it's own module to be honest to avoid Laika Syndrome - type: entity id: BorgModuleSecurityControl # Research Locked @@ -78,4 +78,5 @@ - state: icon-tools - type: ItemBorgModule items: - - Disabler \ No newline at end of file + - Disabler + #- BorgBolaLauncher # I should look into bootstrapping a powercell slot onto a pneumatic cannon and giving it the borg battery \ No newline at end of file From 7912686df22b8b81dedb422d6c5e4311288dc31a Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Fri, 26 Jan 2024 11:38:20 +0000 Subject: [PATCH 18/72] lowered health --- .../DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml index a87749ed3bd..0b6a729de3c 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml @@ -38,7 +38,7 @@ - Science - Security - type: AccessReader - access: [["Cargo"], ["Security"], ["Command"], ["Research"]] + access: ["Security"], ["Command"], ["Research"]] - type: ShowSecurityIcons #- type: SiliconLawProvider # laws: SiliconPolice # PR-706 @@ -47,11 +47,11 @@ # emagLaws: SyndicateStatic # TODO: THINK OF A COOL SYNDICATE SECURITY LAW # THAT DOESN'T GIVE AN ANTAG LICENSE TO STUNMETA BORG # NOTE TO FUTURE SELF: LAW 0 IS ADDED TO WHATEVER EMAG LAW IS PUT HERE (EmagSiliconLawComponent.cs) - #- type: MobThresholds - # thresholds: - # 0: Alive - # 100: Critical - # 200: Dead + - type: MobThresholds + thresholds: + 0: Alive + 80: Critical # -20 to Crit Threshold + 150: Dead # -50 to Dead Threshold #- type: NoSlip - This mf slips - type: Speech speechVerb: Robotic From 02b2129248821a5ef7aa57bb14b0cd0c018bc41d Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Fri, 26 Jan 2024 11:38:44 +0000 Subject: [PATCH 19/72] buff power cell & add holobarrier --- .../Entities/Objects/Power/powercells.yml | 2 +- .../Objects/Specific/Security/security.yml | 61 +++++++++++++++---- 2 files changed, 49 insertions(+), 14 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Power/powercells.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Power/powercells.yml index 1a0643e72a0..e367e7f57c4 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Power/powercells.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Power/powercells.yml @@ -9,4 +9,4 @@ startingCharge: 1000 - type: BatterySelfRecharger autoRecharge: true - autoRechargeRate: 10 \ No newline at end of file + autoRechargeRate: 20 \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Security/security.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Security/security.yml index 4bb2ab96caa..0136abbeb4c 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Security/security.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Security/security.yml @@ -6,6 +6,9 @@ - type: BatterySelfRecharger autoRecharge: true autoRechargeRate: 50 + - type: GuideHelp + guides: + - Security - type: entity parent: Flash @@ -14,6 +17,9 @@ components: - type: AutoRecharge rechargeDuration: 120 + - type: GuideHelp + guides: + - Security - type: entity name: seclite @@ -27,17 +33,46 @@ cell_slot: name: power-cell-slot-component-slot-name-default startingItem: PowerCellSelfChargingBorg - - type: MeleeWeapon - damage: - types: - Blunt: 10 + - type: GuideHelp + guides: + - Security -#- type: entity - This is dumb, can't figure it out, will come back when more patient -# parent: Handcuffs -# id: Handcuffs2Lingering -# suffix: 0, Lingering -# components: -# - type: Stack -# lingering: true -# count: 0 -# stackType: Handcuffs +- type: entity + name: non-lethal baton + parent: BaseItem + id: PoliceBatonNonLethal + description: First, do no harm. + components: + - type: MeleeWeapon + damage: + types: + Blunt: 0 + - type: StaminaDamageOnHit + damage: 15 + sound: /Audio/Weapons/click.ogg + - type: Sprite + sprite: Objects/Weapons/Melee/truncheon.rsi + state: icon + - type: GuideHelp + guides: + - Security + +- type: entity + parent: WeaponEnergyGunMini + id: WeaponEnergyGunMiniBorg + suffix: Do Not Map + components: + - type: BatterySelfRecharger + autoRecharge: true + autoRechargeRate: 25 + +- type: entity + parent: HoloprojectorSecurity + id: HoloprojectorSecurityBorg + suffix: Do Not Map + components: + - type: ItemSlots + slots: + cell_slot: + name: power-cell-slot-component-slot-name-default + startingItem: PowerCellSelfChargingBorg \ No newline at end of file From ae62c11e3a778ffdbdff1476ea162bdde52cd91b Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Fri, 26 Jan 2024 11:39:26 +0000 Subject: [PATCH 20/72] add to lathe & research --- .../DeltaV/Recipes/Lathes/robotics.yml | 59 +++++++++++++++++++ .../Prototypes/DeltaV/Research/arsenal.yml | 1 + .../Entities/Structures/Machines/lathe.yml | 8 +++ Resources/Prototypes/Research/arsenal.yml | 2 + 4 files changed, 70 insertions(+) create mode 100644 Resources/Prototypes/DeltaV/Recipes/Lathes/robotics.yml diff --git a/Resources/Prototypes/DeltaV/Recipes/Lathes/robotics.yml b/Resources/Prototypes/DeltaV/Recipes/Lathes/robotics.yml new file mode 100644 index 00000000000..9bc84c5e404 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Recipes/Lathes/robotics.yml @@ -0,0 +1,59 @@ +- type: latheRecipe + id: BorgModuleSecurityPeacekeeper + result: BorgModuleSecurityPeacekeeper + completetime: 3 + materials: + Steel: 500 + Glass: 500 + Plastic: 500 + +- type: latheRecipe + id: BorgModuleSecurityPatrol + result: BorgModuleSecurityPatrol + completetime: 3 + materials: + Steel: 500 + Glass: 500 + Plastic: 500 + +- type: latheRecipe + id: BorgModuleSecurityHold + result: BorgModuleSecurityHold + completetime: 3 + materials: + Steel: 500 + Glass: 500 + Plastic: 500 + +- type: latheRecipe + id: BorgModuleSecurityDetain + result: BorgModuleSecurityDetain + completetime: 3 + materials: + Steel: 1000 + Glass: 1000 + Plastic: 750 + Gold: 200 + Plasma: 100 + +- type: latheRecipe + id: BorgModuleSecurityControl + result: BorgModuleSecurityControl + completetime: 3 + materials: + Steel: 1000 + Glass: 1000 + Plastic: 750 + Gold: 200 + Plasma: 100 + +- type: latheRecipe + id: BorgModuleSecurityChase + result: BorgModuleSecurityChase + completetime: 3 + materials: + Steel: 1000 + Glass: 1000 + Plastic: 750 + Gold: 200 + Plasma: 100 \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Research/arsenal.yml b/Resources/Prototypes/DeltaV/Research/arsenal.yml index 82cbde7ed7e..22723470ce1 100644 --- a/Resources/Prototypes/DeltaV/Research/arsenal.yml +++ b/Resources/Prototypes/DeltaV/Research/arsenal.yml @@ -38,6 +38,7 @@ cost: 7500 recipeUnlocks: - WeaponEnergyGunPistol + - BorgModuleSecurityChase # DeltaV SecBorg research - type: technology id: Advanced Laser Manipulation diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 2014ec0d283..ed294ff35bb 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -536,6 +536,14 @@ - JetpackBlue - JetpackMini # End Nyano additions + # DeltaV Start + - BorgModuleSecurityPeacekeeper + - BorgModuleSecurityPatrol + - BorgModuleSecurityHold + - BorgModuleSecurityDetain + - BorgModuleSecurityControl + - BorgModuleSecurityChase + # DeltaV End - type: MaterialStorage whitelist: tags: diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 05ba1c96aa6..e09dc7d4c61 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -149,6 +149,8 @@ - Truncheon - TelescopicShield - HoloprojectorSecurity + - BorgModuleSecurityControl # DeltaV SecBorg Research + - BorgModuleSecurityDetain # DeltaV SecBorg Research # Tier 3 From 5970d8b70454ddcf293acc1fef913dfaf63a49e3 Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Fri, 26 Jan 2024 11:39:42 +0000 Subject: [PATCH 21/72] add new module & implement new baton --- .../Specific/Robotics/borg_modules.yml | 29 ++++++++++++------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml index 9364b179122..758bd596fd0 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -20,9 +20,7 @@ - state: icon-tools - type: ItemBorgModule items: - - Truncheon # Placeholder while I make a non-lethal stunning thing, no cuffs on round start - - TelescopicShield # - #- BorgSecurityHypospray # Pax or Chloral Hydrate Injector + - PoliceBatonNonLethal - type: entity id: BorgModuleSecurityPatrol # Peacekeeper Set, Available on Round Start @@ -38,10 +36,21 @@ - FlashlightSecliteBorg #- SecurityWhistle - Not merged here yet - +- type: entity + id: BorgModuleSecurityHold # Peacekeeper Set, Available on Round Start + parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ] + name: hold security cyborg module + components: + - type: Sprite + layers: + - state: generic + - state: icon-tools + - type: ItemBorgModule + items: + - HoloprojectorSecurityBorg - type: entity - id: BorgModuleSecurityDetain # Research Locked + id: BorgModuleSecurityDetain # Research Locked - AdvancedRiotControl parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ] name: detain security cyborg module components: @@ -52,10 +61,10 @@ - type: ItemBorgModule items: - StunBatonSelfCharging - - Zipties5Lingering # This might go in it's own module to be honest to avoid Laika Syndrome + - Zipties5Lingering - type: entity - id: BorgModuleSecurityControl # Research Locked + id: BorgModuleSecurityControl # Research Locked - AdvancedRiotControl parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ] name: riot control security cyborg module components: @@ -66,9 +75,10 @@ - type: ItemBorgModule items: - FlashRecharging + - HoloprojectorSecurityBorg - type: entity - id: BorgModuleSecurityChase # Research Locked + id: BorgModuleSecurityChase # Research Locked - EnergyGunsAdvanced parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ] name: chase security cyborg module components: @@ -78,5 +88,4 @@ - state: icon-tools - type: ItemBorgModule items: - - Disabler - #- BorgBolaLauncher # I should look into bootstrapping a powercell slot onto a pneumatic cannon and giving it the borg battery \ No newline at end of file + - WeaponEnergyGunMiniBorg \ No newline at end of file From dd7ba41cb1fafaa9d4aa9da2680292b081e5fb2b Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Sun, 28 Jan 2024 17:05:21 +0000 Subject: [PATCH 22/72] added the whistle :O --- .../DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml index 758bd596fd0..4e5c88f1c2e 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -34,7 +34,7 @@ - type: ItemBorgModule items: - FlashlightSecliteBorg - #- SecurityWhistle - Not merged here yet + - SecurityWhistle - type: entity id: BorgModuleSecurityHold # Peacekeeper Set, Available on Round Start From 79006df0f061bbcb5e832fc772f29afdf18ee344 Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Sun, 28 Jan 2024 22:43:44 +0000 Subject: [PATCH 23/72] sprites --- .../DeltaV/Mobs/Silicon/chassis.rsi/meta.json | 28 +++++++++++++ .../Mobs/Silicon/chassis.rsi/security.png | Bin 0 -> 2479 bytes .../Mobs/Silicon/chassis.rsi/security_e.png | Bin 0 -> 308 bytes .../Mobs/Silicon/chassis.rsi/security_e_r.png | Bin 0 -> 299 bytes .../Mobs/Silicon/chassis.rsi/security_l.png | Bin 0 -> 429 bytes .../Robotics/borgmodule.rsi/icon-chase.png | Bin 0 -> 203 bytes .../Robotics/borgmodule.rsi/icon-control.png | Bin 0 -> 204 bytes .../Robotics/borgmodule.rsi/icon-detain.png | Bin 0 -> 242 bytes .../Robotics/borgmodule.rsi/icon-hold.png | Bin 0 -> 192 bytes .../Robotics/borgmodule.rsi/icon-patrol.png | Bin 0 -> 211 bytes .../borgmodule.rsi/icon-peacekeeper.png | Bin 0 -> 220 bytes .../Robotics/borgmodule.rsi/meta.json | 33 +++++++++++++++ .../Robotics/borgmodule.rsi/security.png | Bin 0 -> 601 bytes .../Robotics/cyborg_parts.rsi/meta.json | 38 +++++++++++++++++- .../cyborg_parts.rsi/security_chest+o.png | Bin 0 -> 542 bytes .../cyborg_parts.rsi/security_chest.png | Bin 0 -> 542 bytes .../cyborg_parts.rsi/security_head+o.png | Bin 0 -> 441 bytes .../cyborg_parts.rsi/security_head.png | Bin 0 -> 441 bytes .../cyborg_parts.rsi/security_l_arm+o.png | Bin 0 -> 309 bytes .../cyborg_parts.rsi/security_l_arm.png | Bin 0 -> 314 bytes .../cyborg_parts.rsi/security_l_leg+o.png | Bin 0 -> 194 bytes .../cyborg_parts.rsi/security_l_leg.png | Bin 0 -> 192 bytes .../cyborg_parts.rsi/security_r_arm+o.png | Bin 0 -> 304 bytes .../cyborg_parts.rsi/security_r_arm.png | Bin 0 -> 310 bytes .../cyborg_parts.rsi/security_r_leg+o.png | Bin 0 -> 191 bytes .../cyborg_parts.rsi/security_r_leg.png | Bin 0 -> 192 bytes 26 files changed, 98 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/DeltaV/Mobs/Silicon/chassis.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Mobs/Silicon/chassis.rsi/security.png create mode 100644 Resources/Textures/DeltaV/Mobs/Silicon/chassis.rsi/security_e.png create mode 100644 Resources/Textures/DeltaV/Mobs/Silicon/chassis.rsi/security_e_r.png create mode 100644 Resources/Textures/DeltaV/Mobs/Silicon/chassis.rsi/security_l.png create mode 100644 Resources/Textures/DeltaV/Objects/Specific/Robotics/borgmodule.rsi/icon-chase.png create mode 100644 Resources/Textures/DeltaV/Objects/Specific/Robotics/borgmodule.rsi/icon-control.png create mode 100644 Resources/Textures/DeltaV/Objects/Specific/Robotics/borgmodule.rsi/icon-detain.png create mode 100644 Resources/Textures/DeltaV/Objects/Specific/Robotics/borgmodule.rsi/icon-hold.png create mode 100644 Resources/Textures/DeltaV/Objects/Specific/Robotics/borgmodule.rsi/icon-patrol.png create mode 100644 Resources/Textures/DeltaV/Objects/Specific/Robotics/borgmodule.rsi/icon-peacekeeper.png create mode 100644 Resources/Textures/DeltaV/Objects/Specific/Robotics/borgmodule.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Objects/Specific/Robotics/borgmodule.rsi/security.png create mode 100644 Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/security_chest+o.png create mode 100644 Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/security_chest.png create mode 100644 Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/security_head+o.png create mode 100644 Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/security_head.png create mode 100644 Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/security_l_arm+o.png create mode 100644 Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/security_l_arm.png create mode 100644 Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/security_l_leg+o.png create mode 100644 Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/security_l_leg.png create mode 100644 Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/security_r_arm+o.png create mode 100644 Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/security_r_arm.png create mode 100644 Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/security_r_leg+o.png create mode 100644 Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/security_r_leg.png diff --git a/Resources/Textures/DeltaV/Mobs/Silicon/chassis.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Silicon/chassis.rsi/meta.json new file mode 100644 index 00000000000..18d8b3c4426 --- /dev/null +++ b/Resources/Textures/DeltaV/Mobs/Silicon/chassis.rsi/meta.json @@ -0,0 +1,28 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Resprited by DangerRevolution (github), with great help from jimbobbythe19th (discord) and noctrnal (github), from Peacekeeper Borg taken from tgstation at https://github.com/tgstation/tgstation/commit/faf6db214927874c19b8fa8585d26b5d40de1acc", + "states": [ + { + "name": "security", + "directions": 4 + }, + { + "name": "security_e", + "directions": 4 + }, + { + "name": "security_e_r", + "directions": 4 + }, + { + "name": "security_l", + "directions": 4 + } + + ] +} diff --git a/Resources/Textures/DeltaV/Mobs/Silicon/chassis.rsi/security.png b/Resources/Textures/DeltaV/Mobs/Silicon/chassis.rsi/security.png new file mode 100644 index 0000000000000000000000000000000000000000..531cc32b6374d19f5400efa075cccf44a0fcfc97 GIT binary patch literal 2479 zcmV;g2~hTlP)Px;Pf0{URCr$PT3t+3M-)ClTh_k>tAZFXfUPNMZT+K_lnOB#Y2*P-Oo)kE+CtJ) zpEUMC@ImN9jXX43n_#20CWgcWdC(N2QP$FEi&k4pFtj3(jRLHrnPBi2v>e)(XKFy<^kx@GJ@F8{HyiUIa|90HBlVPah>z;`P-<6TF z5jq3n1K%+L1qB7hi4!Mi$@KJy0c*a}O{-V0rjCvd$9+4=0GWhH_q)wJM@H`7 zzu#E7awQE74Vl?cBN3QU6W|fDL>0>>&g}wnKf^E%}ZN zR0&|`b8>P7es6DY7zthy0DR!6L9iq4^y$;o+1cqR08t6pym_rS`Jjnn%d>wgi@grsc*avvYx%^#;ZBh-rgQH z({#>^1-@efVBpdhU!a=7+rqilN#o3Hfb*sI9to1_)2GtOfBqHz;Mgky;)U;s0FKUw zQ(hKdu@b~`^UAcz;`p^&cM1Cgti;gv-TBK5s22pp6Wy_% z6ciZ}j|@OYd5s^DfTE%zBk7M`0h*VbY(^g`-Wv>B9A_dp3wlOJAA1Ol1->f+kos~f z@A_RFw&cHIIS&%zL4b;{n>caK4ZcYLX57%y6{{|sH&(4$MYn$ZIV=P0fEiqThB9E< zyKhr-b2CnfKJh7GnO!9cUl0KBnwlD_udk<`o*rQ^oJRuzXgmz$DCjbP+2=U`1fX%B zd3kxnSiDz=6<-$!xA+zUu*oPaEEIoi@ZjJetzW;Mt~Y#X;>qKmPhtYh@%hYqc-_Dm z07B26Jxg6(U1BpM?-iJUMBs~bL_{uLyhvNNY@t9PU?Bh=frQ+^P2nJ%-*xFcZJfK% zG6~kTout~5rRF^+haZT3|;nVD&TNG9#rv18(UBJl+Q9UUDsIx<2NCrqG+!5|yNB#74`94aU%5C-G^ zy?ghH@7$`Ysw~&}nNaj`n}Od4#`}D9|G@)FPD!!cpD28j02nr9>Qw3r1Z)Z5;Q%s_ z&T_-Bk+0hkke!u9cW&PnM9YLG3g1Ei9MWWfh#vmQ21}7;9t`EWCH>_LU>uczMBs}w z$Jm@bd$wgf>Kv3K9LsfN4dZlocbjufBJs`14n}|h=?!2>@lXbcd+dJl#!u&wu5%`Z zI=1XX5``brFEwGzJjExT6YvxV&lA(1XF#kp>dMt_%F<5?ZcG{ApEK8@4w0RKW*{kR zV@&-`T<0qH3F)^tQkm}_@?WAqd6~DV}V@;YZ27@SsUP1 zq2k)mNHzLI>H}iMc0~X$bVe@!Y8$YH>pl?I8XFs3^&Kq(s;jHTusi?Vx3;&Y%y~;( zbE8dgY@|*jz?SH=0$!HKv18q^VS|9BUvY) zGn@^1obosqN6|kEGgK_rC8&1c7{wV+2~fcS0L=gvA!>;n=b;nuf&lI-XPnQ1gB2+- zxE!yu@39C#1kkBkBA0<+08}BeRzMa?fB-bNG8q|L6=tA65Dv8pUz2T;E7Q@iZHE91 zsH>|JubGC123rzXEh1+CKsh=fVAG~eq7SDe0Gpoy`J83!I6gtRtV&@5WarTbUemR; zwYJ!<2;j*DpR!;A$7-b*S-?ZU3j(+*t-}F69OrS5PbNMl0eLg zL>6$vt|jxon!!~KcWu;*m=|<@rOPk08s_p76PJa1rQP4TR|m($3Krn5TNP; zR6}^pj}klU6qo??qa#5l$ilrU0gOFw-n=jpToJ$#lZS#j8S7L%=Wo>N~=e_52_m;kj_zhJ=vx^UrwS^Q)I_^klLcoydGDgml4 zz%B#OC+ie+1gJPH#o^Rv=hSxTDVGdQ0fX0>I_cF4?5*5)|^7Srp z?bIh5g^U(Li30}?m>Hnz0(1ndSh2zsT|i#L1V9}EJ%SDgOYR>A0;Wx{0nT%~apQ*Q z2g3?Y-6C5EC@wBGP^U)=4i5{x5Nd^ThnxwRWLP5r~S0HbfFm8xtUF19SxFu$^MCO*#Tl zk+#DQBLILf1Udmb0yN?Ww$qRez)3k{-e11l6h`QV07wP)_s5T$DXr_zt~8IVv?G9h zf=x2{Ve0^{)ypZUMnTE|-BLQNXu|hn{K>iiwO_`@JQN|zw3v~yk~2_;t=$W#wfeHM zGGkz1fU>i*sjsh(GBPsg=+UFL`v{x++23eC!wCY*%F4(COkf!-=TXF8!k+&C7b%iO trxn*N0000EWmrjOO-%qQ00008000000002eQKL6bI!pgghryf23dCnwO^7!Xl*)7i23v~9C z?_~Z~w?n6Yp-gkG&vL%E4fDkJofHJ=MKT5pb6r$JSUzjk`CwIt)!Ui&&sctoFXL<2 zf^RlEnX~>ZxfHVg!r+=(}*RTl4x%J(QN71oI_x4dcZeucuqj S>#zcS%;4$j=d#Wzp$Py=Xm=6- literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Mobs/Silicon/chassis.rsi/security_e_r.png b/Resources/Textures/DeltaV/Mobs/Silicon/chassis.rsi/security_e_r.png new file mode 100644 index 0000000000000000000000000000000000000000..d523e5ea19a7e461d69b23d74d6edfde5dab763d GIT binary patch literal 299 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fAQ1Gs& zi(^Q|oVT|Y@-jJ!usz(_;%3mWT%3o~HGp{*(*zC{DQESP;*{te)!R>|{_{_K(0cOS zs_l+?j1#;Wo(M7QWO2v~Yq&r8mBnXu1h6e^;OZN&fp literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Mobs/Silicon/chassis.rsi/security_l.png b/Resources/Textures/DeltaV/Mobs/Silicon/chassis.rsi/security_l.png new file mode 100644 index 0000000000000000000000000000000000000000..996cf0e21114c5aaff97c7f686ecc30efe610a41 GIT binary patch literal 429 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|R5c zr;B4q#hkaZY_kqK2(-#8vWSH1IeEn^v}%7}SIZ%qLgT~F0V=tKDD@`%TuAE*BR@+WKiUC)eLENg$> zyJ%?f^tjp9+^&9^oV&NLY@c2DYyZs~KP-9wSMnQVai-q=U*q0>R(kU^2i=7{b64DB z?(t$`J7(^<`1!H=i<&@(Fg)>KI5Cl7f-<9mJCj2nO9RY>3{Q4&o;bx-alKG*!c@_Y z6_<4sw6z67k1Hz)&lBxf^H^{q=UFb7>xH*jHg96OS6aezuGRpkAa?oB^A~&8IHb&d zrV7%x>hUJ_lvGxwS37c>A|n~!TUoK9+5)luGcObOlLl_~OK!mMXYh3Ob6Mw<&;$TP CJgidy literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Specific/Robotics/borgmodule.rsi/icon-chase.png b/Resources/Textures/DeltaV/Objects/Specific/Robotics/borgmodule.rsi/icon-chase.png new file mode 100644 index 0000000000000000000000000000000000000000..c35fc7e315a9d6957c94f43cedea0c9b02202999 GIT binary patch literal 203 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!V1lQMV@QO1vIOhm1d*PmKm#r|DFdg>MF&}V zd;bThu^H?rY)<(+W5JgTj28qP4k{SdC^qv?kY)Nao3Fu;1e1+z)36 oIZR{L*jfTH#_gbn0|OfyLtcimT!=)~SD;-Cp00i_>zopr0Mvy#9{>OV literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Specific/Robotics/borgmodule.rsi/icon-control.png b/Resources/Textures/DeltaV/Objects/Specific/Robotics/borgmodule.rsi/icon-control.png new file mode 100644 index 0000000000000000000000000000000000000000..b7821e950bc260e7b087384e2f2dce94ae87609c GIT binary patch literal 204 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!V4|msV@QO1vIOhm1d*PmKm#r|DFdg>MF&}V zd;bThu^H?rY)<(+W5JgO#!a#hs=w>W1T$%HHU4k+Ua0el(UtE3e>_*}M1GB;1IyFT sFVOjPu;Dq#5VwOG60FLy1_lfawx30mI6Vy0fR-_My85}Sb4q9e0E4JJWB>pF literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Specific/Robotics/borgmodule.rsi/icon-detain.png b/Resources/Textures/DeltaV/Objects/Specific/Robotics/borgmodule.rsi/icon-detain.png new file mode 100644 index 0000000000000000000000000000000000000000..15de1ae963122d361950abcba0f7c9e1563e47a9 GIT binary patch literal 242 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!V7sS_V@QO1vIOhm1d*PmKm#r|DFdg>MF&}V zd;cp$?SH9w_^4Io1_>UCJ3AaVRjOqF*x&W}zbmVm20zCmm4!T?WDc+_?PNQ#&&=RA zN9sg=k1__H13K)#q!lvI6;>1s;*b3=DjSL74G){)!Z!V5p~yV@QPi+slT03<5l@4~wK0|DJ#7g;~i9 zH6dRQ_W#?jJX%`m#K6!oEk`bUDUY>Y*86vRa*Ta`Fugmq<^NmZj2YJFYaMgN1Kx{s j!lvI6;>1s;*b3=DjSL74G){)!Z!V1}oQV@QO1vIOhm1d*PmKm#r|DFdg>MF&}V zd;bThu^H?rY)<(+W5Jh(#)YpN%v4nk;*Ou;IrfBUlMKVA9k1@$8n87k*k6Cp#IoUy z3r7(P#{n5erV`(l6Jq@!!`u#PNU%O(W@BSm5-Wa?bFFh3&`t(VS3j3^P6!lvI6;>1s;*b3=DjSL74G){)!Z!V4Ome8TTEk@7p)ZXvNFj~6AH}K{TxdrDs z6@GWDOVD0wwf5?k8EPAjb-eksrg}zrf%#XH@OAbNa{XLfRFsMsicYF^M^t~f1GJpM M)78&qol`;+0J{87_5c6? literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Specific/Robotics/borgmodule.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Specific/Robotics/borgmodule.rsi/meta.json new file mode 100644 index 00000000000..f2caa4caa84 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Specific/Robotics/borgmodule.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Resprited by DangerRevolution (github) (excluding the security.png) from EmoGarbage404 (github) for Space Station 14. icon-construction.png created by deltanedas (github).", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "security" + }, + { + "name": "icon-chase" + }, + { + "name": "icon-control" + }, + { + "name": "icon-detain" + }, + { + "name": "icon-hold" + }, + { + "name": "icon-patrol" + }, + { + "name": "icon-peacekeeper" + } + + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Specific/Robotics/borgmodule.rsi/security.png b/Resources/Textures/DeltaV/Objects/Specific/Robotics/borgmodule.rsi/security.png new file mode 100644 index 0000000000000000000000000000000000000000..a8862aa59615981910eb5d43080ad1e96c7cead1 GIT binary patch literal 601 zcmV-f0;c_mP)Px%6G=otR9J=Wluc_BQ51%smQk8OLTZO%M%pnjNegNeDxtcVZU(nq2_mj_B`QLH zgo|nsU3I5_AOu|0xafdXL(@POevknPNNR16d{ZT5T$CA-P9`6V(#<@p`|;j;&VBFU zfQN^N$0;**(g9?7-n7QW;x|V;VVFxaO*1>^_x}8HXx^SX-!;$Wa(1xkaG2k_yFKrA zO<-;Ax|wd@LK8Mv-`gV|kK21o!JtF`-siK&hGB3s^uW}F4OR~tJbdz)CG`e!c-nE! z^$WHxT{JUok%Um@{&)aIQP6eWO>U#ADy341yOl!{LYX^_3EP38zTn;MYe#l}sjzy` z04A^=EJ+f6zuz@@tJSi{3874;Edu==7(c$CtpriuEZFn;%UAon*B#3}fS1o-pf0LC zbq)v8&uT!HLR+L+{XzC)n(&M?assKD5Gg`X_}N$INI+W&^6yHN$%PN3E(FN5Mb`N{ zQgBHcK4C{uST#_{3$}$;5gLXuum+x8Ok9Xs!6s_w6y*1|SxTne}>|NF)OEZ^iX`y=%Q$-DgwZqFLP^nEZ(# nhNet0G-VD}dU$wvoD%;5wxGGV?Hv`G00000NkvXXu0mjfTdNXu literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/meta.json b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/meta.json index 8cab41943fe..9d919b50bea 100644 --- a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/cf45322c7ee16f9d7e43d5260daf24ceb77c1b25", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/cf45322c7ee16f9d7e43d5260daf24ceb77c1b25, security sprites sprited by DangerRevolution (github)", "size": { "x": 32, "y": 32 @@ -213,6 +213,42 @@ }, { "name": "service_r_leg+o" + }, + { + "name": "security_chest" + }, + { + "name": "security_chest+o" + }, + { + "name": "security_head" + }, + { + "name": "security_head+o" + }, + { + "name": "security_l_arm" + }, + { + "name": "security_l_arm+o" + }, + { + "name": "security_l_leg" + }, + { + "name": "security_l_leg+o" + }, + { + "name": "security_r_arm" + }, + { + "name": "security_r_arm+o" + }, + { + "name": "security_r_leg" + }, + { + "name": "security_r_leg+o" } ] } diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/security_chest+o.png b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/security_chest+o.png new file mode 100644 index 0000000000000000000000000000000000000000..de21d9bd220196719bfffe17d4f214c1df6234a2 GIT binary patch literal 542 zcmV+(0^$9MP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0kcU&K~z{r?UcPr z13?hSC#Qmif}baXh!+qPY-3{-0~VG(fkp5U0u~k)<_#T{0Kue4BeAd$ERL!Gu|T zh7;`8zrBP2K4SO=4YaaI6@Zn%DlMDR(^IrFGE6J)HE+A&BZhC#2)zta1z<(6i;qvL z*fz%w#>cn_7<_QsXs|};Wr(~3$z;-rJy&_MxYn*UKBQ6p=a;I@rkD7<{>3f&*a3h- z2YLqpk^^ivlI=Y`vcVU{2#qX}YF*b|uZ>up;AVA=%}-DhoFj--xqJcLv-cx*AV@cD z7(ENX8SZC~*~i2 gSym_%ivL0M2QzKv+!i9izyJUM07*qoM6N<$f*&X9`Tzg` literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/security_chest.png b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/security_chest.png new file mode 100644 index 0000000000000000000000000000000000000000..de21d9bd220196719bfffe17d4f214c1df6234a2 GIT binary patch literal 542 zcmV+(0^$9MP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0kcU&K~z{r?UcPr z13?hSC#Qmif}baXh!+qPY-3{-0~VG(fkp5U0u~k)<_#T{0Kue4BeAd$ERL!Gu|T zh7;`8zrBP2K4SO=4YaaI6@Zn%DlMDR(^IrFGE6J)HE+A&BZhC#2)zta1z<(6i;qvL z*fz%w#>cn_7<_QsXs|};Wr(~3$z;-rJy&_MxYn*UKBQ6p=a;I@rkD7<{>3f&*a3h- z2YLqpk^^ivlI=Y`vcVU{2#qX}YF*b|uZ>up;AVA=%}-DhoFj--xqJcLv-cx*AV@cD z7(ENX8SZC~*~i2 gSym_%ivL0M2QzKv+!i9izyJUM07*qoM6N<$f*&X9`Tzg` literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/security_head+o.png b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/security_head+o.png new file mode 100644 index 0000000000000000000000000000000000000000..a2cd70d9d33e506eb07be3b7f4e2cdac7c278485 GIT binary patch literal 441 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!20u?1$B+p3WQmLe97{dfHgakGU+7~H@#g_w zWZJ|voGFD|`utPcxt`VhbK2zG5!Q1yY4_WcJUmR_c-nOyFHjP2=yIO1z{IiO>rv$m z2fzRO$Nc&2vU|+Y=RQ1CXyIj1u$&+@Au5T{^I+Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0ZvIoK~z{rV;BXa zU=)mkfd-6Fnq&~GpzjoVd84BB)^Bw{Kv}&;9sCa?}z8rlzLHNV^z;xkpXfAz3}BWkC@6sOjvYIo zGNc2dLI4z`yLaz~hXBX{4h{}rHVkaoumQ?~fY8uThSR4{(l$Qw%^30cAN-vmI3d$l?LB jd=!j=Q7{Uq0~i!lvI6;>1s;*b3=DjSL74G){)!Z!;3-cR$B+p3x05&WHX8`I>SuQN?7FaHOUoWc z3f!RA2D+)=^kTIM#=Zam>o$P;eWB=&imy~Er1fqXk>t4^%-*0N0 zv2WdK=e4h;dij?=e}gPdAx! zax(T9UNGUElKRsB(rjhL1_7qLNVfC)*w>oMP1H#+X{w%gc(F!}`{DCK`=%WYH)*ka zeEqXO|7DZ6ztn!pxv)tvmCj2SnWUQH$Ckj{-0mDb=c%eF&{qteu6{1-oD!M!lvI6;>1s;*b3=DjSL74G){)!Z!;CW9M$B+p3x0ercHXDerJ-8mHb1Qmp1y6@` zN{f!djwWG?mJ*3@j=V|HdSaU#Z>7&)`sIqr)u4*|PyLl<$O|_b9=mb>^{#W5KbT%` zpKblzCN1{*j*pXWM{r3b*94063w>X%9c^|!s#^2uan^5B?1f_;I2dzppL?7rVNmw@ ziEkk5l%NYHyi-y=wG(GAUcr<(>yV=7gFD{?LPhmh;}5)0wn&ql^Jz}n!+k}Z`j=f6 z7aUCg##3+m>x)6(<2mMz?|ZZwHn1$)DyICaw#RUrVS{#SsB`qp>0fMtUSsfd^>bP0 Hl+XkKqi1@h literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/security_l_leg+o.png b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/security_l_leg+o.png new file mode 100644 index 0000000000000000000000000000000000000000..550cf65584986b23baf68ca96c860545f36432e3 GIT binary patch literal 194 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!V7RA?V@QPi+smgp85DV3FZR?f>G=}x(DmtX zigELb?l*hbpX?Nz#168xV6S@7Qn!C|_uRFTI&kLEucGgQn#@y9sD}QX<748$d|UU| jx6AoAq8Bu_u(?R}td^>;fALKYsE@(Z)z4*}Q$iB}Ku|*? literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/security_l_leg.png b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/security_l_leg.png new file mode 100644 index 0000000000000000000000000000000000000000..5c4c3fb733459771b752372aff18530139ecbf74 GIT binary patch literal 192 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!V5p~yV@QPi+slr84uU+c7k~YJVYKT%Ye}H| zMNY#&=kF??dZgk67!G{)N;xLK(`r^_DT8tM+XwG#`_k$rYOb!lvI6;>1s;*b3=DjSL74G){)!Z!;89N($B+p3w^w%aHX8`AJy7PI=qWDc<=w%% zBDRvzd(8nBo<<`c?G5ePR^~3B*!tcvs75~MnDU#eCVj#?aeV@SOD+aA8C zw0K^Sa7eWMxJ2gNbDtJG3=LhH8hMWQ!nWL5&wpwkY1Ok7bZ^L+rKa_3ANyLXFo}WMc4A4Uip00i_>zopr0MhMr6aWAK literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/security_r_arm.png b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/security_r_arm.png new file mode 100644 index 0000000000000000000000000000000000000000..560fb6fc98b90dd1034e63a0ff53794684c82adc GIT binary patch literal 310 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!;Au}6$B+p3w^w%aHX8`AJy7PI=qWBW-Q$FG z!0t~>9%~+ON-(8LgeCBYm*jOEVe6|YTr#DwM`7YS?H!vZ?ug&hAmDVuzWDvt_rI@K z$>-kw)p#!4z9u$&&H2s04?LVxY<~XpM#fpo3NM?~iaru~l^Dd7^4KD2@z%Cgt2Xpc ztztK-U-4RM*E;5=~X~XmXtT&GEskcm!XZXPI!lvI6;>1s;*b3=DjSL74G){)!Z!V2G!SV@QPi+sg-e85B8O0pXpi!zk z-Bd{b&bR$Xc+5+LK-z!oRo~>*e`jg+DgA^rL%nzZ+;%N@ofdfY{LY1pQX07l`~Lml fP3Jb5@J3LQQD3UwGW2H)P#1%ztDnm{r-UW|NyI#g literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/security_r_leg.png b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/security_r_leg.png new file mode 100644 index 0000000000000000000000000000000000000000..5c4c3fb733459771b752372aff18530139ecbf74 GIT binary patch literal 192 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!V5p~yV@QPi+slr84uU+c7k~YJVYKT%Ye}H| zMNY#&=kF??dZgk67!G{)N;xLK(`r^_DT8tM+XwG#`_k$rYOb Date: Sun, 28 Jan 2024 22:44:07 +0000 Subject: [PATCH 24/72] adds to lathe, updates module lathe to wizden standards --- .../DeltaV/Recipes/Lathes/robotics.yml | 101 ++++++++++++++---- .../Entities/Structures/Machines/lathe.yml | 12 ++- 2 files changed, 89 insertions(+), 24 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Recipes/Lathes/robotics.yml b/Resources/Prototypes/DeltaV/Recipes/Lathes/robotics.yml index 9bc84c5e404..ebc85d701da 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Lathes/robotics.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Lathes/robotics.yml @@ -1,59 +1,116 @@ - type: latheRecipe id: BorgModuleSecurityPeacekeeper result: BorgModuleSecurityPeacekeeper + category: Robotics completetime: 3 materials: - Steel: 500 - Glass: 500 - Plastic: 500 + Steel: 250 + Glass: 250 + Plastic: 250 - type: latheRecipe id: BorgModuleSecurityPatrol result: BorgModuleSecurityPatrol completetime: 3 + category: Robotics materials: - Steel: 500 - Glass: 500 - Plastic: 500 + Steel: 250 + Glass: 250 + Plastic: 250 - type: latheRecipe id: BorgModuleSecurityHold result: BorgModuleSecurityHold completetime: 3 + category: Robotics materials: Steel: 500 Glass: 500 - Plastic: 500 + Plastic: 250 - type: latheRecipe id: BorgModuleSecurityDetain result: BorgModuleSecurityDetain completetime: 3 + category: Robotics materials: - Steel: 1000 - Glass: 1000 - Plastic: 750 - Gold: 200 - Plasma: 100 + Steel: 500 + Glass: 500 + Plastic: 250 + Gold: 50 - type: latheRecipe id: BorgModuleSecurityControl result: BorgModuleSecurityControl completetime: 3 + category: Robotics materials: - Steel: 1000 - Glass: 1000 - Plastic: 750 - Gold: 200 - Plasma: 100 + Steel: 500 + Glass: 500 + Plastic: 250 + Gold: 50 - type: latheRecipe id: BorgModuleSecurityChase result: BorgModuleSecurityChase completetime: 3 + category: Robotics + materials: + Steel: 500 + Glass: 500 + Plastic: 250 + Gold: 50 + +- type: latheRecipe + id: LeftArmBorgSecurity + result: LeftArmBorgSecurity + category: Robotics + completetime: 2 + materials: + Steel: 250 + Glass: 100 + +- type: latheRecipe + id: RightArmBorgSecurity + result: RightArmBorgSecurity + category: Robotics + completetime: 2 + materials: + Steel: 250 + Glass: 100 + +- type: latheRecipe + id: LeftLegBorgSecurity + result: LeftLegBorgSecurity + category: Robotics + completetime: 2 + materials: + Steel: 250 + Glass: 100 + +- type: latheRecipe + id: RightLegBorgSecurity + result: RightLegBorgSecurity + category: Robotics + completetime: 2 + materials: + Steel: 250 + Glass: 100 + +- type: latheRecipe + id: HeadBorgSecurity + result: HeadBorgSecurity + category: Robotics + completetime: 2 + materials: + Steel: 250 + Glass: 100 + +- type: latheRecipe + id: TorsoBorgSecurity + result: TorsoBorgSecurity + category: Robotics + completetime: 2 materials: - Steel: 1000 - Glass: 1000 - Plastic: 750 - Gold: 200 - Plasma: 100 \ No newline at end of file + Steel: 250 + Glass: 100 \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 611d7a2f923..04ea41d700a 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -512,6 +512,8 @@ - BorgModuleService - BorgModuleTreatment - BorgModuleCleaning + - BorgModuleSecurityPeacekeeper + - BorgModuleSecurityPatrol - CyborgEndoskeleton - LeftArmBorg - RightArmBorg @@ -547,6 +549,14 @@ - RightLegBorgService - HeadBorgService - TorsoBorgService + # DeltaV Start + - LeftArmBorgSecurity + - RightArmBorgSecurity + - LeftLegBorgSecurity + - RightLegBorgSecurity + - HeadBorgSecurity + - TorsoBorgSecurity + # DeltaV end dynamicRecipes: - ProximitySensor - BorgModuleLightReplacer @@ -591,8 +601,6 @@ - JetpackMini # End Nyano additions # DeltaV Start - - BorgModuleSecurityPeacekeeper - - BorgModuleSecurityPatrol - BorgModuleSecurityHold - BorgModuleSecurityDetain - BorgModuleSecurityControl From bf3b5bc70d7e978ef2d3432852228d23ffb19fe4 Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Sun, 28 Jan 2024 22:44:31 +0000 Subject: [PATCH 25/72] i fucking hate construction --- Resources/Prototypes/DeltaV/tags.yml | 18 +++++++++++ .../Specific/Robotics/endoskeleton.yml | 31 +++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/Resources/Prototypes/DeltaV/tags.yml b/Resources/Prototypes/DeltaV/tags.yml index d9d6b47fe79..87cc5d5fb5c 100644 --- a/Resources/Prototypes/DeltaV/tags.yml +++ b/Resources/Prototypes/DeltaV/tags.yml @@ -41,3 +41,21 @@ - type: Tag id: BorgModuleSecurity + +- type: Tag + id: BorgSecurityHead + +- type: Tag + id: BorgSecurityTorso + +- type: Tag + id: BorgSecurityRLeg + +- type: Tag + id: BorgSecurityLLeg + +- type: Tag + id: BorgSecurityRArm + +- type: Tag + id: BorgSecurityLArm \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/endoskeleton.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/endoskeleton.yml index 98f953f6824..7a9bec1c95f 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/endoskeleton.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/endoskeleton.yml @@ -166,6 +166,30 @@ whitelist: tags: - BorgJanitorTorso + security_l_arm+o: + whitelist: + tags: + - BorgSecurityLArm + security_r_arm+o: + whitelist: + tags: + - BorgSecurityRArm + security_l_leg+o: + whitelist: + tags: + - BorgSecurityLLeg + security_r_leg+o: + whitelist: + tags: + - BorgSecurityRLeg + security_head+o: + whitelist: + tags: + - BorgSecurityHead + security_chest+o: + whitelist: + tags: + - BorgSecurityTorso - type: ContainerContainer containers: part-container: !type:Container @@ -212,6 +236,13 @@ - BorgMiningRLeg - BorgMiningHead - BorgMiningTorso + security: + - BorgSecurityLArm + - BorgSecurityRArm + - BorgSecurityLLeg + - BorgSecurityRLeg + - BorgSecurityHead + - BorgSecurityTorso - type: Construction graph: Cyborg node: start From cb7b0250050eb7f3ebc4b9a9a5c1fe0f1a6fb675 Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Sun, 28 Jan 2024 22:44:43 +0000 Subject: [PATCH 26/72] balancing --- .../Prototypes/DeltaV/Entities/Objects/Power/powercells.yml | 2 +- .../DeltaV/Entities/Objects/Specific/Security/security.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Power/powercells.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Power/powercells.yml index e367e7f57c4..37dbd83a208 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Power/powercells.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Power/powercells.yml @@ -9,4 +9,4 @@ startingCharge: 1000 - type: BatterySelfRecharger autoRecharge: true - autoRechargeRate: 20 \ No newline at end of file + autoRechargeRate: 5 \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Security/security.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Security/security.yml index 0136abbeb4c..ea0391fa72d 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Security/security.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Security/security.yml @@ -5,7 +5,7 @@ components: - type: BatterySelfRecharger autoRecharge: true - autoRechargeRate: 50 + autoRechargeRate: 10 - type: GuideHelp guides: - Security @@ -48,7 +48,7 @@ types: Blunt: 0 - type: StaminaDamageOnHit - damage: 15 + damage: 17 sound: /Audio/Weapons/click.ogg - type: Sprite sprite: Objects/Weapons/Melee/truncheon.rsi @@ -64,7 +64,7 @@ components: - type: BatterySelfRecharger autoRecharge: true - autoRechargeRate: 25 + autoRechargeRate: 10 - type: entity parent: HoloprojectorSecurity From 2cbf8f51f5b64a713c55ffefe0ec926738912cbc Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Sun, 28 Jan 2024 22:44:56 +0000 Subject: [PATCH 27/72] i still hate construction. --- .../DeltaV/Recipes/Construction/Graphs/machines/cyborg.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Resources/Prototypes/DeltaV/Recipes/Construction/Graphs/machines/cyborg.yml diff --git a/Resources/Prototypes/DeltaV/Recipes/Construction/Graphs/machines/cyborg.yml b/Resources/Prototypes/DeltaV/Recipes/Construction/Graphs/machines/cyborg.yml deleted file mode 100644 index e69de29bb2d..00000000000 From fa60220d91ccc05270a3b396d90257cfcc1af35b Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Sun, 28 Jan 2024 22:45:14 +0000 Subject: [PATCH 28/72] locations of sprites --- .../Entities/Mobs/Cyborgs/borg_chassis.yml | 31 ++++++------ .../Specific/Robotics/borg_modules.yml | 38 ++++++++------- .../Objects/Specific/Robotics/borg_parts.yml | 48 ++++++++++++------- 3 files changed, 64 insertions(+), 53 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml index 0b6a729de3c..cd80bf862e3 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml @@ -3,25 +3,26 @@ parent: BaseBorgChassisNT name: security cyborg components: - - type: BorgChassis - maxModules: 4 - moduleWhitelist: - tags: - - BorgModuleGeneric - - BorgModuleSecurity - hasMindState: peace_e - noMindState: peace_e_r - type: Sprite + sprite: DeltaV/Mobs/Silicon/chassis.rsi layers: - - state: peace - - state: peace_e_r + - state: security + - state: security_e_r map: ["enum.BorgVisualLayers.Light"] shader: unshaded visible: false - - state: peace_l + - state: security_l shader: unshaded map: ["light"] visible: false + - type: BorgChassis + maxModules: 4 + moduleWhitelist: + tags: + - BorgModuleGeneric + - BorgModuleSecurity + hasMindState: security_e + noMindState: security_e_r - type: Construction node: security - type: IntrinsicRadioReceiver @@ -38,7 +39,7 @@ - Science - Security - type: AccessReader - access: ["Security"], ["Command"], ["Research"]] + access: [["Security"], ["Command"], ["Research"]] - type: ShowSecurityIcons #- type: SiliconLawProvider # laws: SiliconPolice # PR-706 @@ -54,8 +55,4 @@ 150: Dead # -50 to Dead Threshold #- type: NoSlip - This mf slips - type: Speech - speechVerb: Robotic - #- type: Access - # enabled: false - # groups: - # - AllAccessBorg # Is it worth removing some access from the Borg? \ No newline at end of file + speechVerb: Robotic \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml index 4e5c88f1c2e..16e64150f2f 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -6,18 +6,20 @@ - type: Tag tags: - BorgModuleSecurity + - type: Sprite + sprite: DeltaV/Objects/Specific/Robotics/borgmodule.rsi # Security Modules - type: entity id: BorgModuleSecurityPeacekeeper # Peacekeeper Set, Available on Round Start parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ] - name: peacekeeper security cyborg module + name: peacekeeper cyborg module components: - type: Sprite layers: - - state: generic - - state: icon-tools + - state: security + - state: icon-peacekeeper - type: ItemBorgModule items: - PoliceBatonNonLethal @@ -25,12 +27,12 @@ - type: entity id: BorgModuleSecurityPatrol # Peacekeeper Set, Available on Round Start parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ] - name: patrol security cyborg module + name: patrol cyborg module components: - type: Sprite layers: - - state: generic - - state: icon-tools + - state: security + - state: icon-patrol - type: ItemBorgModule items: - FlashlightSecliteBorg @@ -39,12 +41,12 @@ - type: entity id: BorgModuleSecurityHold # Peacekeeper Set, Available on Round Start parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ] - name: hold security cyborg module + name: holding cyborg module components: - type: Sprite layers: - - state: generic - - state: icon-tools + - state: security + - state: icon-hold - type: ItemBorgModule items: - HoloprojectorSecurityBorg @@ -52,12 +54,12 @@ - type: entity id: BorgModuleSecurityDetain # Research Locked - AdvancedRiotControl parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ] - name: detain security cyborg module + name: detainment cyborg module components: - type: Sprite layers: - - state: generic - - state: icon-tools + - state: security + - state: icon-detain - type: ItemBorgModule items: - StunBatonSelfCharging @@ -66,12 +68,12 @@ - type: entity id: BorgModuleSecurityControl # Research Locked - AdvancedRiotControl parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ] - name: riot control security cyborg module + name: riot control cyborg module components: - type: Sprite layers: - - state: generic - - state: icon-tools + - state: security + - state: icon-control - type: ItemBorgModule items: - FlashRecharging @@ -80,12 +82,12 @@ - type: entity id: BorgModuleSecurityChase # Research Locked - EnergyGunsAdvanced parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ] - name: chase security cyborg module + name: chase cyborg module components: - type: Sprite layers: - - state: generic - - state: icon-tools + - state: security + - state: icon-chase - type: ItemBorgModule items: - WeaponEnergyGunMiniBorg \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_parts.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_parts.yml index c0540afd383..18616e3ac45 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_parts.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_parts.yml @@ -6,14 +6,16 @@ name: security cyborg left arm components: - type: Sprite - state: service_l_arm + sprite: Objects/Specific/Robotics/cyborg_parts.rsi + state: security_l_arm - type: Icon - state: service_l_arm + sprite: Objects/Specific/Robotics/cyborg_parts.rsi + state: security_l_arm - type: Tag tags: - Trash - BorgArm - - BorgServiceLArm + - BorgSecurityLArm - type: entity id: RightArmBorgSecurity @@ -21,14 +23,16 @@ name: security cyborg right arm components: - type: Sprite - state: service_r_arm + sprite: Objects/Specific/Robotics/cyborg_parts.rsi + state: security_r_arm - type: Icon - state: service_r_arm + sprite: Objects/Specific/Robotics/cyborg_parts.rsi + state: security_r_arm - type: Tag tags: - Trash - BorgArm - - BorgServiceRArm + - BorgSecurityRArm - type: entity id: LeftLegBorgSecurity @@ -36,14 +40,16 @@ name: security cyborg left leg components: - type: Sprite - state: service_l_leg + sprite: Objects/Specific/Robotics/cyborg_parts.rsi + state: security_l_leg - type: Icon - state: service_l_leg + sprite: Objects/Specific/Robotics/cyborg_parts.rsi + state: security_l_leg - type: Tag tags: - Trash - BorgLeg - - BorgServiceLLeg + - BorgSecurityLLeg - type: entity id: RightLegBorgSecurity @@ -51,14 +57,16 @@ name: security cyborg right leg components: - type: Sprite - state: service_r_leg + sprite: Objects/Specific/Robotics/cyborg_parts.rsi + state: security_r_leg - type: Icon - state: service_r_leg + sprite: Objects/Specific/Robotics/cyborg_parts.rsi + state: security_r_leg - type: Tag tags: - Trash - BorgLeg - - BorgServiceRLeg + - BorgSecurityRLeg - type: entity id: HeadBorgSecurity @@ -66,14 +74,16 @@ name: security cyborg head components: - type: Sprite - state: service_head + sprite: Objects/Specific/Robotics/cyborg_parts.rsi + state: security_head - type: Icon - state: service_head + sprite: Objects/Specific/Robotics/cyborg_parts.rsi + state: security_head - type: Tag tags: - Trash - BorgHead - - BorgServiceHead + - BorgSecurityHead - type: entity id: TorsoBorgSecurity @@ -81,10 +91,12 @@ name: security cyborg torso components: - type: Sprite - state: service_chest + sprite: Objects/Specific/Robotics/cyborg_parts.rsi + state: security_chest - type: Icon - state: service_chest + sprite: Objects/Specific/Robotics/cyborg_parts.rsi + state: security_chest - type: Tag tags: - Trash - - BorgServiceTorso + - BorgSecurityTorso From 809a3b0826cf0cb13435520f40ed989ea6d60bc5 Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Sun, 28 Jan 2024 22:47:20 +0000 Subject: [PATCH 29/72] put the research into the wrong place. --- Resources/Prototypes/DeltaV/Research/arsenal.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Research/arsenal.yml b/Resources/Prototypes/DeltaV/Research/arsenal.yml index 22723470ce1..60244421aa5 100644 --- a/Resources/Prototypes/DeltaV/Research/arsenal.yml +++ b/Resources/Prototypes/DeltaV/Research/arsenal.yml @@ -26,7 +26,8 @@ recipeUnlocks: - WeaponEnergyGun - WeaponEnergyGunMini - + - BorgModuleSecurityChase # DeltaV SecBorg research + - type: technology id: EnergyGunsAdvanced name: research-technology-energy-gun-advance @@ -38,7 +39,6 @@ cost: 7500 recipeUnlocks: - WeaponEnergyGunPistol - - BorgModuleSecurityChase # DeltaV SecBorg research - type: technology id: Advanced Laser Manipulation From b818062945e710b53e2472f4d67cd54c6bf188ae Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Sun, 28 Jan 2024 23:00:07 +0000 Subject: [PATCH 30/72] renames --- .../DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml | 2 +- .../Objects/Specific/Robotics/borg_modules.yml | 2 +- .../Objects/Specific/Robotics/borg_parts.yml | 12 ++++++------ .../Entities/Structures/Machines/lathe.yml | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml index cd80bf862e3..386e8dd9849 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml @@ -1,7 +1,7 @@ - type: entity id: BorgChassisSecurity parent: BaseBorgChassisNT - name: security cyborg + name: peace enforcement cyborg components: - type: Sprite sprite: DeltaV/Mobs/Silicon/chassis.rsi diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml index 16e64150f2f..539fad90a12 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -41,7 +41,7 @@ - type: entity id: BorgModuleSecurityHold # Peacekeeper Set, Available on Round Start parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ] - name: holding cyborg module + name: blockade cyborg module components: - type: Sprite layers: diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_parts.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_parts.yml index 18616e3ac45..a0df63f43fa 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_parts.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_parts.yml @@ -3,7 +3,7 @@ - type: entity id: LeftArmBorgSecurity parent: BaseBorgArmLeft - name: security cyborg left arm + name: peace enforcement cyborg left arm components: - type: Sprite sprite: Objects/Specific/Robotics/cyborg_parts.rsi @@ -20,7 +20,7 @@ - type: entity id: RightArmBorgSecurity parent: BaseBorgArmRight - name: security cyborg right arm + name: peace enforcement cyborg right arm components: - type: Sprite sprite: Objects/Specific/Robotics/cyborg_parts.rsi @@ -37,7 +37,7 @@ - type: entity id: LeftLegBorgSecurity parent: BaseBorgLegLeft - name: security cyborg left leg + name: peace enforcement cyborg left leg components: - type: Sprite sprite: Objects/Specific/Robotics/cyborg_parts.rsi @@ -54,7 +54,7 @@ - type: entity id: RightLegBorgSecurity parent: BaseBorgLegRight - name: security cyborg right leg + name: peace enforcement cyborg right leg components: - type: Sprite sprite: Objects/Specific/Robotics/cyborg_parts.rsi @@ -71,7 +71,7 @@ - type: entity id: HeadBorgSecurity parent: BaseBorgHead - name: security cyborg head + name: peace enforcement cyborg head components: - type: Sprite sprite: Objects/Specific/Robotics/cyborg_parts.rsi @@ -88,7 +88,7 @@ - type: entity id: TorsoBorgSecurity parent: BaseBorgTorso - name: security cyborg torso + name: peace enforcement cyborg torso components: - type: Sprite sprite: Objects/Specific/Robotics/cyborg_parts.rsi diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 04ea41d700a..22a4c620f2a 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -512,8 +512,6 @@ - BorgModuleService - BorgModuleTreatment - BorgModuleCleaning - - BorgModuleSecurityPeacekeeper - - BorgModuleSecurityPatrol - CyborgEndoskeleton - LeftArmBorg - RightArmBorg @@ -550,6 +548,9 @@ - HeadBorgService - TorsoBorgService # DeltaV Start + - BorgModuleSecurityPeacekeeper + - BorgModuleSecurityPatrol + - BorgModuleSecurityHold - LeftArmBorgSecurity - RightArmBorgSecurity - LeftLegBorgSecurity @@ -601,7 +602,6 @@ - JetpackMini # End Nyano additions # DeltaV Start - - BorgModuleSecurityHold - BorgModuleSecurityDetain - BorgModuleSecurityControl - BorgModuleSecurityChase From 7608426d593afb80903fb3c1c80ae94e5cc9c3e0 Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Sun, 28 Jan 2024 23:16:37 +0000 Subject: [PATCH 31/72] baton change --- .../DeltaV/Entities/Objects/Specific/Security/security.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Security/security.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Security/security.yml index ea0391fa72d..6ff2126aed9 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Security/security.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Security/security.yml @@ -44,6 +44,7 @@ description: First, do no harm. components: - type: MeleeWeapon + wideAnimationRotation: -135 damage: types: Blunt: 0 From 59c753726fb16fe09fa16a6cd03e571b1f5539cb Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Sun, 28 Jan 2024 23:16:47 +0000 Subject: [PATCH 32/72] gonna try make the inventory fit. --- .../Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml index 386e8dd9849..83edddb80bd 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml @@ -55,4 +55,6 @@ 150: Dead # -50 to Dead Threshold #- type: NoSlip - This mf slips - type: Speech - speechVerb: Robotic \ No newline at end of file + speechVerb: Robotic + - type: Inventory + templateId: borgDutch \ No newline at end of file From dc1e9d8219bc7ccdbe92d614d09c82526a7696ff Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Sun, 28 Jan 2024 23:39:44 +0000 Subject: [PATCH 33/72] linter fix --- Resources/Prototypes/DeltaV/Stacks/security_stacks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Stacks/security_stacks.yml b/Resources/Prototypes/DeltaV/Stacks/security_stacks.yml index 35627b0b4ad..b5de8cbce45 100644 --- a/Resources/Prototypes/DeltaV/Stacks/security_stacks.yml +++ b/Resources/Prototypes/DeltaV/Stacks/security_stacks.yml @@ -4,7 +4,7 @@ suffix: 5 components: - type: Item - size: 10 + itemSize: Small - type: Stack stackType: Zipties count: 5 From b5410084850d2399922a871e01589a37952cda94 Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Sun, 28 Jan 2024 23:42:48 +0000 Subject: [PATCH 34/72] handcuff fix thank you vmsolidus --- Content.Shared/Cuffs/SharedCuffableSystem.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Content.Shared/Cuffs/SharedCuffableSystem.cs b/Content.Shared/Cuffs/SharedCuffableSystem.cs index f82b91e6615..e97ffb4d37e 100644 --- a/Content.Shared/Cuffs/SharedCuffableSystem.cs +++ b/Content.Shared/Cuffs/SharedCuffableSystem.cs @@ -495,6 +495,9 @@ public bool TryAddNewCuffs(EntityUid target, EntityUid user, EntityUid handcuff, // Success! bool success = TrySpawnCuffSplitStack(handcuff, user, target, out EntityUid? handcuffsplit); + if (handcuffsplit == null) + return false; + if (success) { component.Container.Insert((EntityUid)handcuffsplit); From 03c457e3f18160bd2179461bea7efc2c2079f05d Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Sun, 28 Jan 2024 23:52:34 +0000 Subject: [PATCH 35/72] linter >:( --- Resources/Prototypes/DeltaV/Stacks/security_stacks.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Stacks/security_stacks.yml b/Resources/Prototypes/DeltaV/Stacks/security_stacks.yml index b5de8cbce45..bb4aaa04202 100644 --- a/Resources/Prototypes/DeltaV/Stacks/security_stacks.yml +++ b/Resources/Prototypes/DeltaV/Stacks/security_stacks.yml @@ -3,8 +3,6 @@ parent: Zipties suffix: 5 components: - - type: Item - itemSize: Small - type: Stack stackType: Zipties count: 5 From cc49ae9cad332c0ad062f24b615700745928c95f Mon Sep 17 00:00:00 2001 From: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Date: Wed, 31 Jan 2024 22:02:21 +0000 Subject: [PATCH 36/72] Update Content.Shared/Cuffs/SharedCuffableSystem.cs Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> --- Content.Shared/Cuffs/SharedCuffableSystem.cs | 38 +++++++------------- 1 file changed, 13 insertions(+), 25 deletions(-) diff --git a/Content.Shared/Cuffs/SharedCuffableSystem.cs b/Content.Shared/Cuffs/SharedCuffableSystem.cs index e97ffb4d37e..fbd0d493bb7 100644 --- a/Content.Shared/Cuffs/SharedCuffableSystem.cs +++ b/Content.Shared/Cuffs/SharedCuffableSystem.cs @@ -449,36 +449,24 @@ public bool TrySpawnCuffSplitStack(EntityUid handcuff, EntityUid user, EntityUid handcuffsplit = null; return false; } - if (TryComp(handcuff, out var stackComp)) - { - if (_stacks.GetCount(handcuff, stackComp) >= 1) - { - _stacks.Use(handcuff, 1, stackComp); - - if (_net.IsServer) /// let the server spawn because client mispredicts - { - var pos = Transform(target).Coordinates; - handcuffsplit = Spawn("Zipties", pos); /// This should somehow get the proto ID instead of zipties, but fuck if I know how. - return true; - } - else - { - handcuffsplit = null; - return false; - } - } - else - { - handcuffsplit = null; - return false; - } - } - else + if (!TryComp(handcuff, out var stackComp)) { handcuffsplit = handcuff; _hands.TryDrop(user, handcuff); return true; } + + if (_stacks.GetCount(handcuff, stackComp) >= 1) + { + _stacks.Use(handcuff, 1, stackComp); + + var pos = Transform(target).Coordinates; + handcuffsplit = _net.IsServer ? Spawn("Zipties", pos) : null; + } + else + handcuffsplit = null; + + return handcuffsplit != null; } /// From f17b9ef151fa52858d1e455b1c4f176ea2c7a055 Mon Sep 17 00:00:00 2001 From: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Date: Wed, 31 Jan 2024 22:03:40 +0000 Subject: [PATCH 37/72] death suggestions Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> --- .../Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml | 2 +- .../Prototypes/DeltaV/Entities/Objects/Power/powercells.yml | 2 +- .../DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml | 2 +- .../DeltaV/Entities/Objects/Specific/Security/security.yml | 2 +- .../Entities/Objects/Weapons/Guns/Launchers/launchers.yml | 2 +- Resources/Prototypes/DeltaV/Recipes/Lathes/robotics.yml | 2 +- Resources/Prototypes/DeltaV/Stacks/security_stacks.yml | 2 +- Resources/Prototypes/DeltaV/tags.yml | 2 +- Resources/Textures/DeltaV/Mobs/Silicon/chassis.rsi/meta.json | 2 +- .../DeltaV/Objects/Specific/Robotics/borgmodule.rsi/meta.json | 2 +- .../Objects/Specific/Robotics/cyborg_parts.rsi/meta.json | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml index 83edddb80bd..3f0f2fb2242 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml @@ -57,4 +57,4 @@ - type: Speech speechVerb: Robotic - type: Inventory - templateId: borgDutch \ No newline at end of file + templateId: borgDutch diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Power/powercells.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Power/powercells.yml index 37dbd83a208..c763b2e1094 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Power/powercells.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Power/powercells.yml @@ -9,4 +9,4 @@ startingCharge: 1000 - type: BatterySelfRecharger autoRecharge: true - autoRechargeRate: 5 \ No newline at end of file + autoRechargeRate: 5 diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml index 539fad90a12..5398b05bc6d 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -90,4 +90,4 @@ - state: icon-chase - type: ItemBorgModule items: - - WeaponEnergyGunMiniBorg \ No newline at end of file + - WeaponEnergyGunMiniBorg diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Security/security.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Security/security.yml index 6ff2126aed9..a6104bf2c48 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Security/security.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Security/security.yml @@ -76,4 +76,4 @@ slots: cell_slot: name: power-cell-slot-component-slot-name-default - startingItem: PowerCellSelfChargingBorg \ No newline at end of file + startingItem: PowerCellSelfChargingBorg diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml index 7ad7a721796..0775b414aba 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -27,4 +27,4 @@ fireCost: 300 - type: BatterySelfRecharger autoRecharge: true - autoRechargeRate: 2 \ No newline at end of file + autoRechargeRate: 2 diff --git a/Resources/Prototypes/DeltaV/Recipes/Lathes/robotics.yml b/Resources/Prototypes/DeltaV/Recipes/Lathes/robotics.yml index ebc85d701da..53528ff040f 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Lathes/robotics.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Lathes/robotics.yml @@ -113,4 +113,4 @@ completetime: 2 materials: Steel: 250 - Glass: 100 \ No newline at end of file + Glass: 100 diff --git a/Resources/Prototypes/DeltaV/Stacks/security_stacks.yml b/Resources/Prototypes/DeltaV/Stacks/security_stacks.yml index bb4aaa04202..1b0d7a9ac72 100644 --- a/Resources/Prototypes/DeltaV/Stacks/security_stacks.yml +++ b/Resources/Prototypes/DeltaV/Stacks/security_stacks.yml @@ -23,4 +23,4 @@ icon: { sprite: "/Textures/Objects/Misc/zipties.rsi", state: cuff } spawn: Zipties maxCount: 5 - itemSize: 2 \ No newline at end of file + itemSize: 2 diff --git a/Resources/Prototypes/DeltaV/tags.yml b/Resources/Prototypes/DeltaV/tags.yml index 87cc5d5fb5c..a023d2c667b 100644 --- a/Resources/Prototypes/DeltaV/tags.yml +++ b/Resources/Prototypes/DeltaV/tags.yml @@ -58,4 +58,4 @@ id: BorgSecurityRArm - type: Tag - id: BorgSecurityLArm \ No newline at end of file + id: BorgSecurityLArm diff --git a/Resources/Textures/DeltaV/Mobs/Silicon/chassis.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Silicon/chassis.rsi/meta.json index 18d8b3c4426..8a42dd66d2c 100644 --- a/Resources/Textures/DeltaV/Mobs/Silicon/chassis.rsi/meta.json +++ b/Resources/Textures/DeltaV/Mobs/Silicon/chassis.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Resprited by DangerRevolution (github), with great help from jimbobbythe19th (discord) and noctrnal (github), from Peacekeeper Borg taken from tgstation at https://github.com/tgstation/tgstation/commit/faf6db214927874c19b8fa8585d26b5d40de1acc", + "copyright": "Resprited by DangerRevolution (GitHub), with great help from jimbobbythe19th (Discord) and noctrnal (GitHub), from Peacekeeper Borg taken from tgstation at https://github.com/tgstation/tgstation/commit/faf6db214927874c19b8fa8585d26b5d40de1acc", "states": [ { "name": "security", diff --git a/Resources/Textures/DeltaV/Objects/Specific/Robotics/borgmodule.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Specific/Robotics/borgmodule.rsi/meta.json index f2caa4caa84..4c0750d5b42 100644 --- a/Resources/Textures/DeltaV/Objects/Specific/Robotics/borgmodule.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Specific/Robotics/borgmodule.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC0-1.0", - "copyright": "Resprited by DangerRevolution (github) (excluding the security.png) from EmoGarbage404 (github) for Space Station 14. icon-construction.png created by deltanedas (github).", + "copyright": "Resprited by DangerRevolution (GitHub) (excluding the security.png) from EmoGarbage404 (GitHub) for Space Station 14. icon-construction.png created by deltanedas (github).", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/meta.json b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/meta.json index 9d919b50bea..fd7dbbcc583 100644 --- a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/cf45322c7ee16f9d7e43d5260daf24ceb77c1b25, security sprites sprited by DangerRevolution (github)", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/cf45322c7ee16f9d7e43d5260daf24ceb77c1b25, security sprites sprited by DangerRevolution (GitHub)", "size": { "x": 32, "y": 32 From 8e1d3ea7a2ee5420c8b2292dbfce4f694cc74c2c Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Thu, 14 Mar 2024 16:33:32 +0000 Subject: [PATCH 38/72] Update security.png --- .../Mobs/Silicon/chassis.rsi/security.png | Bin 2479 -> 2390 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/DeltaV/Mobs/Silicon/chassis.rsi/security.png b/Resources/Textures/DeltaV/Mobs/Silicon/chassis.rsi/security.png index 531cc32b6374d19f5400efa075cccf44a0fcfc97..f539f7038b9fbdf70b28c0463fe6770359d7e574 100644 GIT binary patch delta 2367 zcmV-F3BdNR6V?)tFn<69XF*Lt006O%3;baP00009a7bBm000id000id0mpBsWB>pN z>q$gGRCr$Pnq7z%RT#(5u14kuY-!4d${L$>Z*L0VxH9we^MBHL)7@U)521}cJd5PtJKfSrI_pAEs?p9IEdns~u?7)A%;yB)AdY_B zb+zzOpgw?oGi>sXg3Jwf?b=m3{QkQ}gK+rT@8OwB&P|+TIyyQE55Ux^Q%lVkFN8;x zXmAP-0G(g5WQpnS?lvF1_`KA8aps(9ZEcnP1q&9))_-RE_U&fdwrzz40Uvhk*kO(w zIU;`eP~Y;5zRYug^680_QRkbQnxq^$bSOMq8|XaSw9W&*QE0z$~6469p`96+oGwJex?8r zNeVANt4BX!UVUV!dG4?4=9RhgrLa#O=V+tti+>_XpN>=dqn{}NM3nN?wZG*}i}!uL z30~^$mC`h9nACBOHrl=@Z2j|r9-vRhDf)d zuiOF9S7aRJF7#&(NYY2Iv!^HOIKc;w^Xg|B0gA8lDz5n26ouL**xGquUyt+ZN3E?l zr+;WWcI?=2w~R*D#&!hUHldA}ZA&YnT78$i`Vs&tHf`D@+oemFQl(o#CZO=yb8$xi zxNU8lww9a>=#RdSJo>TmvVQ$~bNu*mxnSSEeNx9WwDOaWWFNykf1CciD#xHBfI7~p zxIGJF3!B(RJn5A-tG+Mj)K#NjuMs(Y`hRrnf2+a}+P!;sWRUH*XMU9qBTAue&xvEP zHs|W^nI~UesLkDcci0y>yhzi@{ zdL0H7&e=|D00vUOjz1k89j5o*Ju`B|2y;6aLVSM*=*t5JWg-cLq=NQ=nCvTS)~t!0 z*J}bIJA9uH58fJY-nwP#hYX3eAAczQXbwPp^q4W>k)H_@CP;zJn>WV_*yoc#11*<< z(vMAo*RJ0G_hwNSM$%lmbV&+axpJk>F7A0J`Vk2l!a(TP^OMopvu9=KS;Nmo4D}UZ z=X`~@t;0Ur1Fau5(#a=?CYy?jA$Vq_P4J9Wbw0qJlwxfLT7Qs126;H?*MCId%f!|y zHLfIOf2-B4>LPW*{V@bsGf+4Fotgxpbn};zy%s^yFT-krkojv+q4Q*iy`9%J1GU0g zi=g03HERPPSHx5xEjM4QwEQy+uO0RRnxLj9ppkA+8Z)R7{R zqu>T!VO@aFFUS&rTyp@1?SjDDx9&!1YMfz9=gHL<1-7thYf#X}2iLDWq~00s09!Xj zZ9_huRT;oLIco)IM}Ivq0wC`wu(d%JKlJuW;=@kI`2tNl0+U5MaRlJNmMvS%h7B9U z5C%2xW}}@4b&M3X?HD$+Ls_6L*C^Q1w72~YVrwgQ=dnQ_(zJ6u0vZHgAV9y$YDtoY z`h|~q@CJa%kL{c}bL2P}LeX$SAZaxCz7T=8NKm_JXdAu8#eb)v9oNp|D?WqvAxXO; z05l|9J8jxD$*$lCTe7qo1m*)@q?7Ir*JBU6X+dzcefTu+MJGRe#8=z*H0{JkfY(nq zS8wB+ZIeboU+V&FXhU1B@!`|(`GU{*jvalK_7Mw!-hrfCJ#=3EBX;-gB`JD$sMG%f zikp`Yt0So69Di+SYa^?}LLGYq*xLA{Bh-by&?nz0$TbNvw5Be4O@t8Cc>qT!{7|9) z0(o(v9kXz?a4j~lg-vXup?aXtzYcv$9=rjVG-(n)K*&BrY08u--p2r8z0+)U-v{=v z+ZVRB4_k+=JsK6)=QQn#0O&_gb94EJ4-DxRgA}6tQ-9ZGsn@&1>JSS1)VZC|Va*Uv zLeII60Jf5J0AKJ){j+@r`a+*vyAXRr3cjC9Qpo_YL338 zr6uaHy-&^_8XFtU!vNk@HheMNix`0-}gqmN3Rt6kv) z3kb-eUw;ZZuTHo|gD*6`^1_C+|ctq$O<3w5eZTdo10y?_ecw6r;>cAt=@=5DYJ4!tG(MyL3QwWVl#%dQvI z4t8w~xA;hFFPcf(55h<0GZ l6rf3aIxcO3{y5hg^B+x delta 2457 zcmV;K31;@z60Z}GFnttn}3{iBtX3NadK z2R-Lef;9H12x=wq zZ)pp+`KEhr=FZODy?4FKYIG9Vy?^ta^PMwuXZCza^o+NpXMfy(dQL#B8L&3z6+?dZ zVDFz}N~Tx%u8jup$CD;%dHd$xeTp{`UgJ9^KnJ||`;Umyis?+@ItwB3AR?0EYBb#7 zJ0@Vh?LHrnPBi2v>e)(XKFy<^kx@GJ@F8{HyiUIa|90HB zlVPah>z;`P-+z^nvJpB1;^jPJ#RK0l0R;sG#)%UrXvy^ShyiQ9(oL&ZucnTU4##~v z$pD#zNcX$VJV!?E-@o5jxpE~94Go#tX=!QH)YK%7OG`_`Y}&nhH|^ZH(^3CU2!IWH z_Us`9LAFDE)-Cyt3{(kV=W}v$1b%OCZx{()5&(SQsDDAQBkuI+)7077=_mkE3D~@O zv*GvqEzE;}l9Cb&eoIS>B9A_dp z3wlOJAA1Ol1->f+kos~f@A_RFw&cHIIS&%zL4b;{n>caK4ZcYLX57%y6{{|sH&(4$ zMYn$ZIV=P0fEiqThB9E1dRaaMsInNVdW@e`7W7)E0;yF135``}az;+i6j(@FL zvjzmnuSc;L=P?Wi&}1Umah&JKhh}~zQaqEHnQ4GXChgd_LU>uczMBs}w$Jm@bd$wgf>Kv3K9LsfN4dZlocbjufBJs`14n}|h z=?!2>@lXbcd+dJl#!u&wu5%`ZI=1XX5``brFEwGzJjExT6YvxV&lA(1XMaGfH0sLL zZpzY63T{jp;GZ+sq7IRrfo32nYhz6PMkB?z|C^y|5#(ozFJE$v>-qsio;3oh!K@ib zn)s&cexo@rR%3x(25S-2`&k>{R-xkB&`34k_aP9wmU=(GY}mdCMU-LPSUfa7{(MMZ^H zCjeWH963Ujm6eWsb99pv=haGaJP3gEGL9D{L?s|vc{-9-zzY)O=$Dt5ThhO+t<5$I z@T-#(eS#+h*l7j4CcsSwcuIhi`n*mn;57mA9H7%B;rf{A12`9D!GDCDpKOSm8Cf^I z^P49c4nGTF1{&)VqKPzISBGUIStp<~oDF%L@;Dbq(LW0_R4mpdsCMBP#TictP{9EJ z%>Wi5YKa`@p%d_e0PZVioX>)T6)7;d9IvzQu?Ro}(5YG?mw{jaR3WlfKo&}X05rEU z85vs@W}rV14z&tjlYecJE7Q@iZHE91sH>|JubGC123rzXEh1+CKsh=fVAG~eq7SDe z0Gpoy`J83!I6gtRtV&@5WarTbUemR;wYJ!<2;j*DpR!;A$7-b*S-?ZU3j(+*t-}F6 z9OrS5PbNMl0eLgL>6$%Qi|uyUVHpsqR*xz%&j&mKMv4q)Kze#Q>2v|=q@`jro=kvUrpdBA;Gsp* zBrvuu0d}=|CV+=Qq{uJH>5GVAF%N&Ck!LS+iyd!kuIQr$3?(0@!)fBJqbl zAplVY+!g|&X@3O}5#3usC4t93k3|rm>H<_lc+HOzJL?pf0Q93HK_|$~S0HbfFm8xtUF19SxFu$^MCO*#Tlk+#DQBLILf1Udmb0yN?Ww$qRez)3k{ z-e11l6h`QV07wP)_s5T$DXr_zt~8IVv?G9hf`3gi`C;n-uGPyas767`0NqkLtZ2gb zWBkdw0JUGn#yk`u%e0u0vXV1UhppWUsI~gCvNB^}V1Tl-v#GDIk1{ec=;+a-w)+U1 z``O=UKf?(E%gV~g1598UEay?gU&5aM02e8eMW+?lEdT%j4rN$LW=%~1DgXcg2mk;8 X01^NI0Mb*F00000NkvXXu0mjfiWP9r From cf085b32102345356ddbe6d4b0b48a7b691874e0 Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Thu, 14 Mar 2024 16:41:13 +0000 Subject: [PATCH 39/72] nuke the cuff system because i don't know how to fix it --- Content.Shared/Cuffs/SharedCuffableSystem.cs | 64 ++------------------ 1 file changed, 5 insertions(+), 59 deletions(-) diff --git a/Content.Shared/Cuffs/SharedCuffableSystem.cs b/Content.Shared/Cuffs/SharedCuffableSystem.cs index c4c06c2dae4..fc005fd30fa 100644 --- a/Content.Shared/Cuffs/SharedCuffableSystem.cs +++ b/Content.Shared/Cuffs/SharedCuffableSystem.cs @@ -26,7 +26,6 @@ using Content.Shared.Pulling.Components; using Content.Shared.Pulling.Events; using Content.Shared.Rejuvenate; -using Content.Shared.Stacks; using Content.Shared.Stunnable; using Content.Shared.Timing; using Content.Shared.Verbs; @@ -37,7 +36,6 @@ using Robust.Shared.Network; using Robust.Shared.Player; using Robust.Shared.Serialization; -using System.Diagnostics.CodeAnalysis; namespace Content.Shared.Cuffs { @@ -59,7 +57,6 @@ public abstract partial class SharedCuffableSystem : EntitySystem [Dependency] private readonly SharedInteractionSystem _interaction = default!; [Dependency] private readonly SharedPopupSystem _popup = default!; [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly SharedStackSystem _stacks = default!; [Dependency] private readonly UseDelaySystem _delay = default!; public override void Initialize() @@ -433,37 +430,6 @@ private void UpdateHeldItems(EntityUid uid, EntityUid handcuff, CuffableComponen EnsureComp(virtItem2.Value); } - /// - /// Checks if the handcuff is stackable, and creates a new handcuff entity if the stack requires it. - /// - /// - public bool TrySpawnCuffSplitStack(EntityUid handcuff, EntityUid user, EntityUid target, [NotNullWhen(true)] out EntityUid? handcuffsplit) - { - if (!HasComp(handcuff)) - { - handcuffsplit = null; - return false; - } - if (!TryComp(handcuff, out var stackComp)) - { - handcuffsplit = handcuff; - _hands.TryDrop(user, handcuff); - return true; - } - - if (_stacks.GetCount(handcuff, stackComp) >= 1) - { - _stacks.Use(handcuff, 1, stackComp); - - var pos = Transform(target).Coordinates; - handcuffsplit = _net.IsServer ? Spawn("Zipties", pos) : null; - } - else - handcuffsplit = null; - - return handcuffsplit != null; - } - /// /// Add a set of cuffs to an existing CuffedComponent. /// @@ -476,21 +442,13 @@ public bool TryAddNewCuffs(EntityUid target, EntityUid user, EntityUid handcuff, return false; // Success! - bool success = TrySpawnCuffSplitStack(handcuff, user, target, out EntityUid? handcuffsplit); - - if (handcuffsplit == null) - return false; - - if (success) - { - component.Container.Insert((EntityUid)handcuffsplit); - UpdateHeldItems(target, (EntityUid)handcuffsplit, component); - } + _hands.TryDrop(user, handcuff); - return success; + _container.Insert(handcuff, component.Container); + UpdateHeldItems(target, handcuff, component); + return true; } - /// False if the target entity isn't cuffable. public bool TryCuffing(EntityUid user, EntityUid target, EntityUid handcuff, HandcuffComponent? handcuffComponent = null, CuffableComponent? cuffable = null) { @@ -639,18 +597,6 @@ public void TryUncuff(EntityUid target, EntityUid user, EntityUid? cuffsToRemove } else { - _popup.PopupEntity(Loc.GetString("cuffable-component-start-uncuffing-observer", - ("user", Identity.Name(user, EntityManager)), ("target", Identity.Name(target, EntityManager))), - target, Filter.Pvs(target, entityManager: EntityManager) - .RemoveWhere(e => e.AttachedEntity == target || e.AttachedEntity == user), true); - - if (target == user) - { - _color.RaiseEffect(Color.Red, new List() { user }, Filter.Pvs(user, entityManager: EntityManager)); - _popup.PopupEntity(Loc.GetString("cuffable-component-start-uncuffing-self"), user, user); - } - else - { _popup.PopupClient(Loc.GetString("cuffable-component-start-uncuffing-target-message", ("targetName", Identity.Name(target, EntityManager, user))), user, user); _popup.PopupClient(Loc.GetString("cuffable-component-start-uncuffing-by-other-message", @@ -777,4 +723,4 @@ private sealed partial class AddCuffDoAfterEvent : SimpleDoAfterEvent { } } -} \ No newline at end of file +} From 495696b8b7694cad96dcee6947cfdc1af93a5641 Mon Sep 17 00:00:00 2001 From: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Date: Thu, 14 Mar 2024 16:42:07 +0000 Subject: [PATCH 40/72] Delete Resources/Prototypes/DeltaV/Stacks/security_stacks.yml Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> --- .../DeltaV/Stacks/security_stacks.yml | 26 ------------------- 1 file changed, 26 deletions(-) delete mode 100644 Resources/Prototypes/DeltaV/Stacks/security_stacks.yml diff --git a/Resources/Prototypes/DeltaV/Stacks/security_stacks.yml b/Resources/Prototypes/DeltaV/Stacks/security_stacks.yml deleted file mode 100644 index 1b0d7a9ac72..00000000000 --- a/Resources/Prototypes/DeltaV/Stacks/security_stacks.yml +++ /dev/null @@ -1,26 +0,0 @@ -- type: entity # huge thanks to IProduceWidgets on Github for figuring this shit out in his PR earlier - id: Zipties5 - parent: Zipties - suffix: 5 - components: - - type: Stack - stackType: Zipties - count: 5 - -- type: entity - id: Zipties5Lingering - parent: Zipties5 - suffix: 5, Lingering - components: - - type: Stack - stackType: Zipties - lingering: true - count: 5 - -- type: stack - id: Zipties - name: zipties - icon: { sprite: "/Textures/Objects/Misc/zipties.rsi", state: cuff } - spawn: Zipties - maxCount: 5 - itemSize: 2 From 260eb443c6bc618967c5529e9158a0d31f18f031 Mon Sep 17 00:00:00 2001 From: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Date: Thu, 14 Mar 2024 16:42:53 +0000 Subject: [PATCH 41/72] Update borg_chassis.yml Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> --- .../Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml index 3f0f2fb2242..d6641eb1df9 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml @@ -41,8 +41,8 @@ - type: AccessReader access: [["Security"], ["Command"], ["Research"]] - type: ShowSecurityIcons - #- type: SiliconLawProvider - # laws: SiliconPolice # PR-706 + - type: SiliconLawProvider + laws: SiliconPolice # PR-706 #- type: EmagSiliconLaw # stunTime: 5 # emagLaws: SyndicateStatic # TODO: THINK OF A COOL SYNDICATE SECURITY LAW From ae01210401a0611bf79c1da8673f5c4b518c0be8 Mon Sep 17 00:00:00 2001 From: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Date: Thu, 14 Mar 2024 16:45:05 +0000 Subject: [PATCH 42/72] Update borg_modules.yml Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> --- .../DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml index 5398b05bc6d..c3986a3fa30 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -63,7 +63,6 @@ - type: ItemBorgModule items: - StunBatonSelfCharging - - Zipties5Lingering - type: entity id: BorgModuleSecurityControl # Research Locked - AdvancedRiotControl From 81ace7e06fb79c046e49b19147876161632c7e56 Mon Sep 17 00:00:00 2001 From: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Date: Thu, 14 Mar 2024 16:53:31 +0000 Subject: [PATCH 43/72] Update borg_chassis.yml Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> --- .../Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml index d6641eb1df9..639ba190ffb 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml @@ -42,7 +42,7 @@ access: [["Security"], ["Command"], ["Research"]] - type: ShowSecurityIcons - type: SiliconLawProvider - laws: SiliconPolice # PR-706 + laws: SiliconPolice1 # PR-706 #- type: EmagSiliconLaw # stunTime: 5 # emagLaws: SyndicateStatic # TODO: THINK OF A COOL SYNDICATE SECURITY LAW From 2947f30f57078572ec469850814cbb96f2868ccc Mon Sep 17 00:00:00 2001 From: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Date: Thu, 14 Mar 2024 16:57:32 +0000 Subject: [PATCH 44/72] Update borg_chassis.yml Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> --- .../DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml index 639ba190ffb..4f533a94ff2 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml @@ -42,17 +42,12 @@ access: [["Security"], ["Command"], ["Research"]] - type: ShowSecurityIcons - type: SiliconLawProvider - laws: SiliconPolice1 # PR-706 - #- type: EmagSiliconLaw - # stunTime: 5 - # emagLaws: SyndicateStatic # TODO: THINK OF A COOL SYNDICATE SECURITY LAW - # THAT DOESN'T GIVE AN ANTAG LICENSE TO STUNMETA BORG - # NOTE TO FUTURE SELF: LAW 0 IS ADDED TO WHATEVER EMAG LAW IS PUT HERE (EmagSiliconLawComponent.cs) + laws: SiliconPolice1 - type: MobThresholds thresholds: 0: Alive 80: Critical # -20 to Crit Threshold - 150: Dead # -50 to Dead Threshold + 200: Dead #- type: NoSlip - This mf slips - type: Speech speechVerb: Robotic From 484fa68d145a38dc3fa953c6108489fdc7e33994 Mon Sep 17 00:00:00 2001 From: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Date: Thu, 14 Mar 2024 17:00:39 +0000 Subject: [PATCH 45/72] Update security.yml Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> --- .../Objects/Specific/Security/security.yml | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Security/security.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Security/security.yml index a6104bf2c48..4cdd2c58070 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Security/security.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Security/security.yml @@ -1,7 +1,7 @@ - type: entity parent: Stunbaton - id: StunBatonSelfCharging - suffix: Recharging, Do Not Map + id: StunbatonSelfCharging + suffix: Do Not Map, Recharging components: - type: BatterySelfRecharger autoRecharge: true @@ -13,7 +13,7 @@ - type: entity parent: Flash id: FlashRecharging - suffix: Recharging, Do Not Map + suffix: Do Not Map, Recharging components: - type: AutoRecharge rechargeDuration: 120 @@ -24,9 +24,9 @@ - type: entity name: seclite parent: FlashlightSeclite - id: FlashlightSecliteBorg + id: FlashlightSecliteRecharging description: A robust flashlight used by security. - suffix: Do Not Map + suffix: Do Not Map , Recharging components: - type: ItemSlots slots: @@ -38,10 +38,10 @@ - Security - type: entity - name: non-lethal baton + name: non-lethal wooden baton parent: BaseItem - id: PoliceBatonNonLethal - description: First, do no harm. + id: WoodBaton + description: First, do no crime. components: - type: MeleeWeapon wideAnimationRotation: -135 @@ -49,7 +49,7 @@ types: Blunt: 0 - type: StaminaDamageOnHit - damage: 17 + damage: 17 # Stuns in 6 sound: /Audio/Weapons/click.ogg - type: Sprite sprite: Objects/Weapons/Melee/truncheon.rsi @@ -60,8 +60,8 @@ - type: entity parent: WeaponEnergyGunMini - id: WeaponEnergyGunMiniBorg - suffix: Do Not Map + id: WeaponEnergyGunMiniRecharging + suffix: Recharging, Do Not Map components: - type: BatterySelfRecharger autoRecharge: true @@ -69,8 +69,8 @@ - type: entity parent: HoloprojectorSecurity - id: HoloprojectorSecurityBorg - suffix: Do Not Map + id: HoloprojectorSecurityRecharging + suffix: Recharging, Do Not Map components: - type: ItemSlots slots: From f6bbc59e04404f40ed103a0c6a8fd8b63d20cf78 Mon Sep 17 00:00:00 2001 From: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Date: Thu, 14 Mar 2024 17:01:19 +0000 Subject: [PATCH 46/72] rename to security cyborg Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> --- .../Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml index 4f533a94ff2..5a22f662ae3 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml @@ -1,7 +1,7 @@ - type: entity id: BorgChassisSecurity parent: BaseBorgChassisNT - name: peace enforcement cyborg + name: security cyborg components: - type: Sprite sprite: DeltaV/Mobs/Silicon/chassis.rsi From e55ca4cb0fec987e20d5ae445e4ddd8fbec0e401 Mon Sep 17 00:00:00 2001 From: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Date: Thu, 14 Mar 2024 17:02:00 +0000 Subject: [PATCH 47/72] Update borg_chassis.yml Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> --- .../Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml index 5a22f662ae3..812857b15c6 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml @@ -51,5 +51,3 @@ #- type: NoSlip - This mf slips - type: Speech speechVerb: Robotic - - type: Inventory - templateId: borgDutch From dcd896624b1536439f580063b3ab0d9973cc1f85 Mon Sep 17 00:00:00 2001 From: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Date: Thu, 14 Mar 2024 17:02:54 +0000 Subject: [PATCH 48/72] Update powercells.yml Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> --- .../Prototypes/DeltaV/Entities/Objects/Power/powercells.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Power/powercells.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Power/powercells.yml index c763b2e1094..4e88724de42 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Power/powercells.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Power/powercells.yml @@ -1,7 +1,7 @@ - type: entity name: self-recharging powercell parent: PowerCellAntiqueProto - id: PowerCellSelfChargingBorg + id: PowerCellSelfAntiqueProtoRecharging suffix: Recharging, Do Not Map components: - type: Battery From 1d4f2a7e241245d1c9045c10f3d1dcefbd920907 Mon Sep 17 00:00:00 2001 From: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Date: Thu, 14 Mar 2024 17:04:17 +0000 Subject: [PATCH 49/72] Update security.yml Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> --- .../DeltaV/Entities/Objects/Specific/Security/security.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Security/security.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Security/security.yml index 4cdd2c58070..15e471c0b42 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Security/security.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Security/security.yml @@ -76,4 +76,4 @@ slots: cell_slot: name: power-cell-slot-component-slot-name-default - startingItem: PowerCellSelfChargingBorg + startingItem: PowerCellSelfAntiqueProtoRecharging From 85ffcf34034807e8f98de64cf2f63fdbb4e3ce95 Mon Sep 17 00:00:00 2001 From: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Date: Thu, 14 Mar 2024 17:05:29 +0000 Subject: [PATCH 50/72] remove more handcuff stacking Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> --- Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml b/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml index e25c1ffd3e5..5f970da1840 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml @@ -3,7 +3,6 @@ description: Used to detain criminals and other assholes. id: Handcuffs parent: BaseItem - suffix: single #Delta-V makes cuffs stackable components: - type: Item size: Small @@ -17,9 +16,6 @@ - type: Tag tags: - Handcuffs - - type: Stack # Delta-V makes cuffs stackable - stackType: Zipties - count: 1 - type: MeleeWeapon wideAnimationRotation: 90 resetOnHandSelected: false From 894b81632b189d0557cf367fea69d3a745839b88 Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Thu, 14 Mar 2024 17:08:41 +0000 Subject: [PATCH 51/72] rename of certain items to be more general --- .../Objects/Specific/Robotics/borg_modules.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml index c3986a3fa30..cf693e5a2ac 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -22,7 +22,7 @@ - state: icon-peacekeeper - type: ItemBorgModule items: - - PoliceBatonNonLethal + - WoodBaton - type: entity id: BorgModuleSecurityPatrol # Peacekeeper Set, Available on Round Start @@ -35,7 +35,7 @@ - state: icon-patrol - type: ItemBorgModule items: - - FlashlightSecliteBorg + - FlashlightSecliteRecharging - SecurityWhistle - type: entity @@ -49,7 +49,7 @@ - state: icon-hold - type: ItemBorgModule items: - - HoloprojectorSecurityBorg + - HoloprojectorSecurityRecharging - type: entity id: BorgModuleSecurityDetain # Research Locked - AdvancedRiotControl @@ -76,7 +76,7 @@ - type: ItemBorgModule items: - FlashRecharging - - HoloprojectorSecurityBorg + - HoloprojectorSecurityRecharging - type: entity id: BorgModuleSecurityChase # Research Locked - EnergyGunsAdvanced @@ -89,4 +89,4 @@ - state: icon-chase - type: ItemBorgModule items: - - WeaponEnergyGunMiniBorg + - WeaponEnergyGunMiniRecharging From 3743ffc7ded591766bee1504c42ef9b24b5b9044 Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Thu, 14 Mar 2024 17:10:36 +0000 Subject: [PATCH 52/72] parents noslip to syndie chassis --- .../Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml | 1 + Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml index f171ee30568..1bb81d08249 100644 --- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml +++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml @@ -255,3 +255,4 @@ - Syndicate - type: ShowSyndicateIcons - type: MovementAlwaysTouching + - type: NoSlip # Delta-V , Unparents NoSlip component diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml index 2e1b4b72c06..f1c885161c0 100644 --- a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml +++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml @@ -307,7 +307,6 @@ noMindState: synd_sec - type: Construction node: syndicateassault - - type: NoSlip # Delta-V , Unparents NoSlip component - type: entity id: BorgChassisSyndicateMedical @@ -337,7 +336,6 @@ noMindState: synd_medical - type: Construction node: syndicatemedical - - type: NoSlip # Delta-V , Unparents NoSlip component - type: entity id: BorgChassisSyndicateSaboteur @@ -367,4 +365,3 @@ noMindState: synd_engi - type: Construction node: syndicatesaboteur - - type: NoSlip # Delta-V , Unparents NoSlip component From b08e2ed2ab9c11dcf641f94a1514ea21e4826eb9 Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Thu, 14 Mar 2024 19:09:36 +0000 Subject: [PATCH 53/72] resprite --- .../Mobs/Silicon/chassis.rsi/security.png | Bin 2390 -> 2457 bytes .../Mobs/Silicon/chassis.rsi/security_e.png | Bin 308 -> 310 bytes .../Mobs/Silicon/chassis.rsi/security_e_r.png | Bin 299 -> 294 bytes .../Mobs/Silicon/chassis.rsi/security_l.png | Bin 429 -> 491 bytes .../cyborg_parts.rsi/security_chest+o.png | Bin 542 -> 475 bytes .../cyborg_parts.rsi/security_chest.png | Bin 542 -> 475 bytes .../cyborg_parts.rsi/security_head+o.png | Bin 441 -> 386 bytes .../cyborg_parts.rsi/security_head.png | Bin 441 -> 387 bytes .../cyborg_parts.rsi/security_l_arm+o.png | Bin 309 -> 323 bytes .../cyborg_parts.rsi/security_l_arm.png | Bin 314 -> 319 bytes .../cyborg_parts.rsi/security_l_leg+o.png | Bin 194 -> 306 bytes .../cyborg_parts.rsi/security_l_leg.png | Bin 192 -> 305 bytes .../cyborg_parts.rsi/security_r_arm+o.png | Bin 304 -> 317 bytes .../cyborg_parts.rsi/security_r_arm.png | Bin 310 -> 315 bytes .../cyborg_parts.rsi/security_r_leg+o.png | Bin 191 -> 299 bytes .../cyborg_parts.rsi/security_r_leg.png | Bin 192 -> 300 bytes 16 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/DeltaV/Mobs/Silicon/chassis.rsi/security.png b/Resources/Textures/DeltaV/Mobs/Silicon/chassis.rsi/security.png index f539f7038b9fbdf70b28c0463fe6770359d7e574..52590572fe71175ef5aca28a614d965eb181035e 100644 GIT binary patch delta 2447 zcmV;A32^q-5}6Z_B!3BTNLh0L01m_e01m_fl`9S#000R~Nklx>{4HZkj*YR@4WN7$Tr*C4;=uC?3jwI4*2+!51cJy51C9F3k!K+n^LKO zdcA>peFAsZ?te*7LYALC4`5c<<`tf>&$9ed0{Hlo4;+0#$ESb!8+3gcs+thCv+W}o z#s>cQr$4|b8RsSh;wKm-16#(Pr_H=R0e>4A{#Zxg!;e<**U#7bknHuGI{;|4j!`VGm%WO@|+w61caUn2?FxxH5@5lGg4m{t-CMSgLI`InykjbQ#VsTw)9%y3xf&rjb zt3p*19%&oKnXWL+va}8`&9b6tbBupp4=yg3TYvR@7abFxKa)ud`9pU=GC7EJDg^*& zSQhH_23sV6P-m!Cs|x$a1>b+itO6P^oE(qtrhp-{lHxSNmSRDh1;`OT=#tU_m2xve-c9Vpu`-aS9pT4(aC^-WcVYMpl#b{gP{FZ z0Dte+;z7SRo2Q;Jx`m(r>A(MpvC&EPo#sJDOmziMifG$LBlWSH$FxQz^DR|MleWXjoR@?f0_%a$3QW@$p{fZyuYddl z0C08YCf;;okwAZLJt7FBL4Vv|EUq)@lQ8_-lgQ{TXxf}Zw%W}TNXG*d_mibDjE%1N zb$uBCpsERMZ$A|BOCJFu9~iiTdcDDR2ail9jb!pAcqit(&@X;zS6J7V@w`&Tk4HZ- zFOYT!7jPh*NF;o{&8Jlzki>>^ZUI(!uIw<4?n@Sk9u>3bGg-kPwf}b(9mVn z>ka%eG0OVzj!`eJu!!F;AXQC7@`t&?LNi#eH`s)EpP$ZIp>P+reFRlaKvfg4?IRW( z@rsA~##uZeir?>X^3O#4y1uN02LtY8FVl6)W7P-5t`MOhh=)Hc?kB?BYk%H4i7ryY&`|(X zm@uzTumXf)v3)ns+ue&afBa(osd4vTIx4-@2T)-`?ZpX3-rz4E4G%ewu(GEfL}ZfO4s9bIWeyT)yfG}Riz?@el4D$B$I>A#P~RD+s4@B zB{rAcr_TVK-5k|koPR)H&^rntatH7g7l+M#Jh;EbG(HtBj7?s`j=7J4fh+8Jl;hD0 zh?}oR@XzVi%DhJiogk$IY4N^-19ms3X~4+H7)qsr)5jwKxR#(+JG%hMWNh%o6c6sN zdxX#lv8;fo;NW%m{-U^~Q$0Z#B0WJ-J&tW3q18GLBq#Z2{eM8c-eB2ko;RwPBC4K< z5NikUTAw$8uM@hy9GdTwL6iWL>OqB>9e=@tzgEC7HjvA$D!oib0!p#C&f_ z;I7KMGlKvyHae+P4=N6SC$Fk1U|IOhTfg#5;vzwuG>5(YeW0x|RDy046_8>&m4az* zVmNahGuPgeCOc2eTze10nd_jdasi~waqM6SXrHrmDuw5jG7jr!B`g>4_8E4cegWII zkxr$A*Bm>=!6*$_s$ET-KdO>_ALf0H#?6DLH!Es+vG9w~FoUhcvmk{L93Wa?V2xS-C2iAJg2V`kk&PBa3G9Q~}`d z<#XMln;qb>0D%PDHLkV1nQM$#Vbz delta 2379 zcmV-R3AFZ^6V?)tB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000id z000id0mpBsWB>pN>q$gGRCr$Pnq7z%RT#(5u14kuY-!4d${L$>Z zGqW@A&g&BH56;fanKRG-InSIqJM%ur3^K^WOsXg3Jwf?b=m3{QkQ}gK+rT@8OwB&P|+TIyyQE z55Ux^Q%lVkFN8;xXmAP-0G(g5WQpnS?lvF1_`KA8aewBVX>Dzl{RIma$kt~2_U&fd zwrzz40Uvhk*kO(wIU;`eP~Y;5zRYug^680_QRkbQnxq^$bSOMq8|XaSw9W&*QE0z$ z~646 z9p`96+oGwJex?8rNeVANt4BX!UVUV!dG4?4=6{vB^QEv)9p`AH?TaEwpN>=dqn{}N zM3nN?wZG*}i}!uL30~^$mC`h9nACBOHrl=@Z2j|r9-vRhDf)duiOF9S7aRJF7#&(NYY2Iv!^HOIKc;w^Xg|B0gA8lDz5n26ouL* z*nir2U|)~(>PM}uH>YSjcI?=2w~R*D#&!hUHldA}ZA&YnT78$i`Vs&tHf`D@+oemF zQl(o#CZO=yb8$xixNU8lww9a>=#RdSJo>TmvVQ$~bNu*mxnSSEeNx9WwDOaWWFNyk zf1CciD#xHBfI7~pxIGJF3!B(RJn5A-tAD;P=+srCU#}54efo6lf2+a}+P!;sWRUH* zXMU9qBTAue&xvEPHs|W^nI~Ues zLkDcci0y>yhzi@{dL0H7&e=|D00vUOjz1k89j5o*Ju`B|2y;6aLVSM*=*t5JWg-cL zq=NQ=nCvTS)~t!0*J}bIJA9uH4}aboZ{E6P>W2)8wI3+`XbwPp^q4W>k)H_@CP;zJ zn>WV_*yoc#11*<<(vMAo*RJ0G_hwNSM$%lmbV&+axpJk>F7A0J`Vk2l!a(TP^OMop zvu9=KS;Nmo4D}UZ=X`~@t;0Ur1Fau5(#a=?CYy?jA$Vq_P4J9Wbw0qJlz(Dv23miR zK?Zp^>DNTy%f!|yHLfIOf2-B4>LPW*{V@bsGf+4Fotgxpbn};zy%s^yFT-krkojv+ zq4Q*iy`9%J1GU0gi=g03HERPPSHx5xEjM4QwEQy+uO0RRnx zLj9ppkA+8Z)R7{Rqu>T!VO@aFFUS&rTyp@1?SjDDx9&!1YMfz9=gHL<1-7thYf#X} z2iLDWq~00s09!XjZGS^Po>dvZJ2`6wXh%IT0wC`wu(d%JKlJuW;=@kI`2tNl0+U5M zaRlJNmMvS%h7B9U5C%2xW}}@4b&M3X?HD$+Ls_6L*C^Q1w72~YVrwgQ=dnQ_(zJ6u z0vZHgAV9y$YDtoY`h|~q@CJa%kL{c}bL2P}LeX$SAZaxCzJCybw@6UCX=oe0#>JqT!{7|9)0(o(v9kXz?a4j~lg-vXup?aXtzYcv$9=rjVG-(n)K*&BrY08u- z-p2r8z0+)U-v{=v+ZVRB4_k+=JsK6)=QQn#0O&_gbANOBhYt+t7K0R`{8QIusn@&1 z>JSS1)VZC|Va*UvLeII60Jf5J0AKJ){j+@r`a+*vyAXRr3cjC9Qpo_YL338r6uaHy-&^_8XFtU!vNk@HheMNix z`0-}gqkoS|ovU5p1PchrpC+|ctq$O<3w5eZTdo10y?_ecw6r;>cAt=@=5DYJ4!tG( zMyL3QwWVl#%dQvI4t8w~xA;hFFPcf(55h<0GZ6rf3aIxcO3{y5hg^B+RyyDmptgO)tt} zGK1~pYq|Nax7Ev9Gw-!t@XzAg_n2xm+jrZ;yjCvNkw1R!z!&R;U(Oqz*(VeUIdEr? zgcGi`_f^Sn$oqX^_nwK?4_4fMxbSt!UjB;Xf$y2)Uh5oIdQuiaqLDx+%nJz6OV delta 259 zcmdnSw1sJcW&JZx7srr_Id5-m!sk0tdk9yxKmn6dKkD3Tqktv zOpxGy{crUhm1+LlwC7LoW_TjRu#?3>k8y&v$b+JtYu8_&eEzxZg_U<1Pd$46^PEYn zs^B|2gyhnb6r$JSUzjk z`CwIt)!Ui&&sctoFXL<2f^RlEnX~>ZxfHVg!r+=(}*RTl4x%J(QN71oI_x4dcZeucuqj>##Bafv2mV%Q~loCIG11a9jWY diff --git a/Resources/Textures/DeltaV/Mobs/Silicon/chassis.rsi/security_e_r.png b/Resources/Textures/DeltaV/Mobs/Silicon/chassis.rsi/security_e_r.png index d523e5ea19a7e461d69b23d74d6edfde5dab763d..a6df52696992051909b4fdf3484d7a4ec5ca8e01 100644 GIT binary patch literal 294 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fAQ1FJQ zi(^Q|oVT|Qu52-oV0ifCYy33dicM2;nEAz2ekfWO^Q@Ts(4OODOm=VlGk@+3u7cMq zlh+lVd7rKS;2q1K?U%p5t-Hfh5SKjn`uDBo7g#bF&%UvLa9p!N?1G2`Q27E@6V?k% zvzRg%eHphjEMtgr2xib-fFYezeL46$bKlOdI{D98Y)Y;6e6_yKWK(MYV9&8@oG(fu fh&Ksh(KF^?FQt1mno4{?KQef_`njxgN@xNA*t}?{ delta 250 zcmZ3+w3=yxW&K@G7srr_Id5+*NX~)^LCF$B&J_XE#orC9~k~&%a`Q);s1& zT$f6`##vDtxpxm^@cxP&23xW(*v-%Xaj#*SYr@kaR*3#$paDo`p)$3(FJy-=sPgk{ zh}+HNeMZxoac>#xs^?F5SNxcWD#E2Oo#BKkLlI{~3=^C=$L@gqwUfpR@9j1`%m4(Q Lu6{1-oD!M<2*qaY diff --git a/Resources/Textures/DeltaV/Mobs/Silicon/chassis.rsi/security_l.png b/Resources/Textures/DeltaV/Mobs/Silicon/chassis.rsi/security_l.png index 996cf0e21114c5aaff97c7f686ecc30efe610a41..b099c8610a01ae1f638e4011f4f8f32b22b71561 100644 GIT binary patch literal 491 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|Vn+ zPZ!6KiaBp*8D=mwMTfY(&FiN93I@2^=dLG z(hjZrm;Jm}z<~ewulwyite5g6*p?LTjPKlH%1~}o_a~s*zeaER@;mk&TfWx)4`N>7 zdh6t^s1rg3*;`iKo3-F!gs<{yuJbF++j_&+&u8HCy&lWR@OajDTLz2X1I3ed7#cqB zJ6?Xdec9`E>F=xA6~c-)tA{GNH=J#7pU>!^pqOJ47R`M!zVX5A_e#CTvQ{g+HkR=6 zSo61flekl2@%Gmdxw>!uZ4&WIUhMsFZ6ebR#v3yj${5Vl8e|)KITP3ul5q(&?37cv zr1g#~{+<2AVBI3Ftkg3~2`fJ{N<9|gj(AnmaLvM%=~z13p@O3)#iZ2Bi%ZU2>D#Ey zyX}g_()9%OS6&enK&3`FGuz zHj#BX&Z{yGv2F8EetYJ?v%UO1YmO$(=>IGD<8HGICxfLBLy^jYrw?yGtxdk3xY2e| za2mJ9+4ZNs=c%3%3NYQT?c5%x>LV6l{{O>{JGXCK|C%#hPt~Vh=tKDD@`%TuAE*BR z@+WKiUC)eLENg$>yJ%?f^tjp9+^&9^oV&NLY@c2DYyZs~KP-9wSMnQVai-q=U*q0> zR(kU^2i=7{b64DB?(t$`J7(^<`1!H=i<&@}Fg)>KI5Cl7f-<9mJCj2nO9RY_3{Q4& zo;bx-alKG*!c@_+jun@66tuMkLXRse3C|PlSo2tLBIj8ym+OVMSvGHCx>s7lbFS6^ zs33Ov&+`|1);OfheWnW3*s<#ICiaw6R;5=va+@L}8Q)u3v7%Z7vHvqK6Zew_ZuU!V P3_#%N>gTe~DWM4fZtkW< diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/security_chest+o.png b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/security_chest+o.png index de21d9bd220196719bfffe17d4f214c1df6234a2..a378e9ef0c06fe39f19d847b3cc23e1a76d0b1c0 100644 GIT binary patch delta 399 zcmV;A0dW4F1lt3UR)26wL_t(oN9~odN&`Ui11+=+$u%}2NiDXTganLNSSbHwC+w+kJ4-Bt{b1O+-MgE)fA9XIKp^n1Xtz&3 z5$5m*MeDz@Va7sm<5uh391(T97rARYoy%3>em|jJ@7C$w>VF0ni+9ShH>%b4&B~JT z_=Tcqhsxz`RRf!5EMzj7auETI*dgE?oa>6S0`>aQO5$eo)MR-EgBz0(jYjwD-2yaF zscdmRpMUW99eaK44FEKOr^o(3K3tpGB?pIREI(9mEe@RD0bw}2<3cDHMG=P-$C?(E z0zkH6uUh5eAb-m;n$Bh_=>@d{pwT$yrxuW7&Ih#uaUAp400nHI07%pHZxtw&c3JAD z=hs|d4r^M}3fPt`1_bv58V3~A3W&?0I4l_D%PDHLkV1nt1wr2nU delta 466 zcmV;@0WJR91D*tsR)4ceL_t(oN9~loN&`U<$0w(Pg@T_af`}Io6l`N-6ayBPK7mE> z5dsz#7Um5s6(!hM`T)VCNF%YZ5G<5ju(1%$K_mt=ck-Xy9+x9`SwqVG!LYM)|J|AW zxFv-`p-}W9lgT)na|=!)kzjMfp$HwuV5}PsCFZtW!31|#*MGDc$CnPEJ$<Sym_%ivL0M2QzKv+!i9izyJUM07*qo IM6N<$g27+hcmMzZ diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/security_chest.png b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/security_chest.png index de21d9bd220196719bfffe17d4f214c1df6234a2..43d6a8cce4152333fe03a44841e4d14c33c69e25 100644 GIT binary patch delta 399 zcmV;A0dW4F1lt3UR)26wL_t(oN9~odN&`Ui11+=+$u%}2NiDXTganLNSSbHwC+w+kJ4-Bt{b1O+-MgE)fA9XIKp+tKSG3zF zp9pjKgQE4{*f3)uxN)m>ZjOk$-HY6{ozCT|aKE2WuXpQoZ+~?Ii^V%-*&Eer`(|ay zc>F?9v_s|cwyJ?mGZr$LOu2}FM(hx94$gJOS%G@}XeDv8d1|segTal-h(@FP^=<(g zs8qH%pU*#d{Eof8_67i&z|&*@A0MvG?2?1SGnOAJxE2S_?|?8I-fD%PDHLkV1irww$=au delta 466 zcmV;@0WJR91D*tsR)4ceL_t(oN9~loN&`U<$0w(Pg@T_af`}Io6l`N-6ayBPK7mE> z5dsz#7Um5s6(!hM`T)VCNF%YZ5G<5ju(1%$K_mt=ck-Xy9+x9`SwqVG!LYM)|J|AW zxFv-`p-}W9lgT)na|=!)kzjMfp$HwuV5}PsCFZtW!31|#*MGDc$CnPEJ$<Sym_%ivL0M2QzKv+!i9izyJUM07*qo IM6N<$g27+hcmMzZ diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/security_head+o.png b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/security_head+o.png index a2cd70d9d33e506eb07be3b7f4e2cdac7c278485..18ed6d4e1b15f551088be257323c91edf7b303e3 100644 GIT binary patch delta 309 zcmV-50m}Zl1A+sPR(}^sL_t(oM`IZAfDuX)4eadP|G$0v4$4CX!oorfhYsx|$xMxKNF&sIvkt9bjL1}^@DJ=l(bC3lfi?Csk97qjFEmRvpK$HVO z23p%#gV`Dymf#S;hCy;508&e=BZv+G5QvKpU^seoE5rBiUw@z?2mlfT$$`|60*Hz$ zkZ;sgOu_8;AD=U9-f$AkMhCtD<_v=Tl3@1DJEs}u&DucFe4;`CW)R475HPovX5i;% zWzf=)17i>yBnAR7HN;pB0z{|Qit3#I9j#Nq>b12^|0~Lig2iFr{=?S{SFfH1%Ok5L z1c-J3IsiEW$}R*0nB}8j6pVsVFbYP&C>RB!U=$27z`y_i;~Q_@Zzg^i00000NkvXX Hu0mjf{{~s6_$N+QzR0J6M0s;&xR;&QCJv=eXOA2*83KISqh(4g$pZ9t4PX01RMr z2ndjBF~tDn5KxvQHQP}YfGi#`%SXW|7zLwX6pVsVFbb#x7#IKr-;8g2J!|j)0000< KMNUMnLSTYNGLY*4 diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/security_head.png b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/security_head.png index 17e8de5f45f32cd97dbc68b858be743fb9837043..a0da2baba86ba5d4a13ab3371c9bc21e9b9cce05 100644 GIT binary patch delta 310 zcmV-60m=Tk1A_yQR(}{tL_t(oM`IWTqhJ(_f>AKgfDuX)4eadP|G$0v4$4CX!oorf zhYsx|$xMxKNF&sIvkt9bjL1}^@DJ=l(bC3lfi?Csk97qjF zEmRvpK$HVO23p%#gV`Dymf#S;hCy;508&e=BZv+G5QvKpV1GDzbSuO6?_Z!I2mlfT z$$`|60*Hz$kZ;sgOu_8;AD=U9-f$AkMhCtD<_v=Tl3@1DJEs}u&DucFe4;`CW)R47 z5HPovX5i;%Wzf=)17i>yBnAR7HN;pB0z{|Qit3#I9j#Nq>b12^|0~Lig2iFr{=?S{ zSFfH1%Ok5L1TTno06G9U0?GsfnB}8j6pVsVFbYNiX@G$N0CXX5-nbxX)c^nh07*qo IM6N<$f_TJ#@&Et; delta 364 zcmV-y0h9iN1Gxi`R)0=OL_t(oM`IWTqhJ(_f`JB%P?}^AtDy29$^?VO5AKj<7Rj1G z7N_v?KzXQO&gU;AJA`P(*etf&p3J}?V9#*KG7c&N0i-yD2}%OHXK3?B|c*gyc11E~S2B^HnrTt*yh|FtFL7@WAcpdzSX-+#AnV9U?__(gKm5(K8E zrvE>D`0yX(2z>a#g9raXYN6T)0-{_xfByXcfq{VxKnFlYfT1rSz_4P)3NYKl!vjns zgDF#{F!c2F5Hz3YG=L0XmMbVIfbotUJD@V81EN9z6r{U%?}mo}$N>%x4q!G6Y}l{? z%7TE<&`^fcr)5vmCImnrBO`;MqoV_iL2PmX(Ww=duvV{L4d#OYEa;Kb0LbScK#cD} zfM^H605*q!0I3#J3_uP6WjRu_9aRCy;sLXK6pVsVFbb#x7#IM_HjHm1b-tzm0000< KMNUMnLSTZc*qSo{ diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/security_l_arm+o.png b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/security_l_arm+o.png index 5ca20c156ead3c5e9bb68eff4bff0dda82eef1b4..f91807f884938acdbcb388dc3e1291517a6bb94e 100644 GIT binary patch delta 245 zcmVc83R)5$@L_t(oNA1)x3xYrt0N_{9U=E7X9L>%y&i;pfXJe~~OS5w{ zhoYc4G!*Z6L4n>y_`2nNaNN5?&d1&3fe^yB1}zFgI4+dJ*d&)A9) vwqq-;_#X^4(AjIn=)E0twPGQJungb{N^?o~n%Lo`00000NkvXXu0mjf`#W=_ delta 231 zcmVG{4d`b7=~dOhGG7SuIrpHzcoE*zOJi7t?L?%52fJ< zV6Amh$`Imno0!9V97k7G6={I0*VBjsD5aon+r1u!0p+qc31A5Uj4{wO4U}c+Ptuzs zA%GA9ZdnG;z6Y%}9+50yG=h7c!=osCN5jt&zLv#TG=w?h*Yi&g(=_e+Cixyj1{eZ$ ho@W%2C1g$pU;~4PLtC8XB^3Yw002ovPDHLkV1gYWVIKeh diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/security_l_arm.png b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/security_l_arm.png index 7cce44e76e562ab3b1d15f85f1e90a4da931a358..1f746edb6c9815b8a73d8cea2f1c4d2d0c442545 100644 GIT binary patch delta 241 zcmV1)~R)5qrCqb#_>rrd+Y${8=`4iTA7Z01ymY!eYM_?b!q}}yn(}hX9m_T*jFHg zFvFFnH=wDq=OsYfb)b}TdQV;gq)7r&%D)FW6*~au_z^q6?fx*M?_acH$4e_l*p6pu r#atfVz%XAcM!)UYr4Ef6M-?t*x&2A&eQNU*N2-s=R9Uz*SPVL+gJ)1 zV|-B*j}rH%D_b_#T6-zw#|8G3KNDR*2mx)|&f{SiFn06gO=VF9lv2<%4U}a`D`A_X zr~+x4!XZiE-1ksb6)pu|!0015W*MCFoMz#^atSZfM5A!QXZ8$#J^J)8j^ms+LGO$z mfUpFnwH71#eT*@-F@P(DRYO~um-IaV0000AIEM!_f;1w#gCYn%RuGN}rfpfo|i z&(BH|M-c4*AprpfYin;Pk9vS;2f#pneh*bcfoKQ3`|ttEVqmDMn)aVs(Lt00tgNj5 z>*%;KaB}iMMW_dea=^!rzrpnP?_a?5*RS8eG&KMtl*S1_zFmho02y4pdYYhKVgOMg zpeQejfJFeq{5 ecj_cU1_l6E_b-Or=Dg?t0000S~1R%};EL_t(oNA1(g2>>AsMbV6Xq>S`mK#KCiWHW=Pi|o7yYpn-%2L>i2% V8h?N2_8tHL002ovPDHLkV1mO2Gd%zR diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/security_l_leg.png b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/security_l_leg.png index 5c4c3fb733459771b752372aff18530139ecbf74..78bf9ff1252f0968bc395f40780a674375cf6cc1 100644 GIT binary patch delta 227 zcmV<90383o0kHy*R)5AxL_t(oM`IWTqhJ(_f>A&T(AGBn4`q@Kn4mOSfS;e0VnG?>>BhvKSbus;2!XCpyS>fR&Zie;pk+22M^M zs0ew0YzKV&_!~@r|NaF`fBpImOp^*2p)^SVnhVGZHeC6goJ2SZM!_f; d1p^Ei7yvQQFNXENM7aO}002ovPDHLkV1k~}RC)ja delta 113 zcmV-%0FM8$0>A-~R%%sAL_t(oNA1%=4nPqMMbY~E=rX$h1$0p#(Frk8L-!=|j2d1L z0KoG~WX2!4I+}TP05gm2;O;$+W`2<=syeL<8lZu61MT+PZ`fL(ftz;)0M8Mrn8X@? TmAUQ)00000NkvXXu0mjf0h}=j diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/security_r_arm+o.png b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/security_r_arm+o.png index 13c67f5651be90305538472fbf3a148157a2d5e8..a82735dd7f13729458e4717e9e6d6c3827a58e27 100644 GIT binary patch delta 239 zcmVmU(5Xdm7U#|`p>%chIemxDS)40w zqN}vD(3-)aa^VDrrgrd})yr(}P`i z-4pWs=nS!-nFSU%rls95mH>F{Q;H+DH;^Pd`vyK{zk(=Q!f1B0wgcBLtZyI;Lp#Q> z1~A6Z%8f06);g%_ns#n%0hChxDvoLA#(D))umxzE7hG=-IA8AcWf*HK#%6@Pwc;sQ p0(`gPU+s97Ry_7Q7D5Qm0Ny8dPxsP~RRjP4002ovPDHLkV1g1paC86w delta 226 zcmV<803H9m02n>1;plld=Wt-c6^F+dY2D89 zpy5?jrDa*p4bZl2n&mU(5Xdm7U#|`p>%chIemxDU7Ra! zqN}vDV9nrAxp0E(<$_u6gOH>{@23e@P)fy?(Cn?M_A}01*F)Q$*zXesz~W_jaO-J$ zL0uo&Ar>@?U~y}owBr#4z|Srzj>LDMD0c1+eEt0hvTO<4&1TvSTyq7v18JJN;Uh=@ zYb~w#!~vS7N%~=+9iKRWF=k%nIqmp@9D#&5z&O6)dV9e6a;GOeL0U03BNVL_ONave nwqoCQ9JCet{En4UDl&i%q-Rg}ve__I00000NkvXXu0mjf-B5D& delta 232 zcmVR)5P$L_t(oNA1+R4TCTc2H+zNkx3UCmq^GPP`mO1NUY!q7y@M& zR$vcTbZ&^m29A7jq?B=tAd&7XxU-SCU%Y@2LdZXJ@3rsy*Lojq+xmgdS3i7RSFF#o z`@rFxb2rcPu>qQ; i1=z$6Cxnn60Pq0#-bP!6FlROZ0000AIEM!_f;1;Y|(Yn%RuG6@1EC`~m0 zvYelv70M$FsO|u3Yi|Z20RbqFFrcaf^7DI$4tf}%iUUBwUR5;>Zuz?pAD}G4fa+1e z$;rc@qvOV4Wo1QFXi&`oU%!3>)8D^;0n;Bp{sz;803(#97*=4*dZ65J?AS59c2F$@ zK$a=Wi=tp+0M$YO1kmH1kncf&s)-O3@1O(-!^D(`G|2@ZOe~;jA_Re}S5M=ygMk46 XLOv{pSm^^p00000NkvXXu0mjfp&VKK delta 112 zcmV-$0FVEx0>1%}R%uj8L_t(oNA1(W4FDksL{Zj0D1-hBpeS`Cmo*YE-1fi33^#NV z1poj5_`N5xN{`&7d&)0hW-%`A{zkf|MV3+3&$*!i8YpdGzW(?PXA3lt>=79OFB*S2 SRr!Pf0000(_5!`uq1UVEW_7-(Z?lzzC&D2H3J5C^sBCc2|rfGszACkY$SUq9~Xg zKz0a#0D8QW>U$8NC=r6<9h3lJn4A)kD!BlJ$putRgdlMB>S>Cibrg((Q7{Td8em`m Y0BpT1hIJZO;{X5v07*qoM6N<$f+`MNCjbBd delta 113 zcmV-%0FM8x0>A-~R%%sAL_t(oNA1%=4nPqMMbY~E=rX$h1$0p#(Frk8L-!=|j2d1L z0KoG~WX2!4I+}TP05gm2;O;$+W`2<=syeL<8lZu61MT+PZ`fL(ftz;)0M8Mrn8X@? TmAUQ)00000NkvXXu0mjf|5z~u From 5cb1085f799490e94e5a0c56d5e714f1b796fa7f Mon Sep 17 00:00:00 2001 From: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com> Date: Thu, 14 Mar 2024 19:10:42 +0000 Subject: [PATCH 54/72] rename --- .../Objects/Specific/Robotics/borg_parts.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_parts.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_parts.yml index a0df63f43fa..18616e3ac45 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_parts.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_parts.yml @@ -3,7 +3,7 @@ - type: entity id: LeftArmBorgSecurity parent: BaseBorgArmLeft - name: peace enforcement cyborg left arm + name: security cyborg left arm components: - type: Sprite sprite: Objects/Specific/Robotics/cyborg_parts.rsi @@ -20,7 +20,7 @@ - type: entity id: RightArmBorgSecurity parent: BaseBorgArmRight - name: peace enforcement cyborg right arm + name: security cyborg right arm components: - type: Sprite sprite: Objects/Specific/Robotics/cyborg_parts.rsi @@ -37,7 +37,7 @@ - type: entity id: LeftLegBorgSecurity parent: BaseBorgLegLeft - name: peace enforcement cyborg left leg + name: security cyborg left leg components: - type: Sprite sprite: Objects/Specific/Robotics/cyborg_parts.rsi @@ -54,7 +54,7 @@ - type: entity id: RightLegBorgSecurity parent: BaseBorgLegRight - name: peace enforcement cyborg right leg + name: security cyborg right leg components: - type: Sprite sprite: Objects/Specific/Robotics/cyborg_parts.rsi @@ -71,7 +71,7 @@ - type: entity id: HeadBorgSecurity parent: BaseBorgHead - name: peace enforcement cyborg head + name: security cyborg head components: - type: Sprite sprite: Objects/Specific/Robotics/cyborg_parts.rsi @@ -88,7 +88,7 @@ - type: entity id: TorsoBorgSecurity parent: BaseBorgTorso - name: peace enforcement cyborg torso + name: security cyborg torso components: - type: Sprite sprite: Objects/Specific/Robotics/cyborg_parts.rsi From e3d6522a73013b4432d90a5233a69100b881d0d8 Mon Sep 17 00:00:00 2001 From: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Date: Sat, 6 Jul 2024 14:40:10 +0100 Subject: [PATCH 55/72] Revert "resprite" This reverts commit b08e2ed2ab9c11dcf641f94a1514ea21e4826eb9. --- .../Mobs/Silicon/chassis.rsi/security.png | Bin 2457 -> 2390 bytes .../Mobs/Silicon/chassis.rsi/security_e.png | Bin 310 -> 308 bytes .../Mobs/Silicon/chassis.rsi/security_e_r.png | Bin 294 -> 299 bytes .../Mobs/Silicon/chassis.rsi/security_l.png | Bin 491 -> 429 bytes .../cyborg_parts.rsi/security_chest+o.png | Bin 475 -> 542 bytes .../cyborg_parts.rsi/security_chest.png | Bin 475 -> 542 bytes .../cyborg_parts.rsi/security_head+o.png | Bin 386 -> 441 bytes .../cyborg_parts.rsi/security_head.png | Bin 387 -> 441 bytes .../cyborg_parts.rsi/security_l_arm+o.png | Bin 323 -> 309 bytes .../cyborg_parts.rsi/security_l_arm.png | Bin 319 -> 314 bytes .../cyborg_parts.rsi/security_l_leg+o.png | Bin 306 -> 194 bytes .../cyborg_parts.rsi/security_l_leg.png | Bin 305 -> 192 bytes .../cyborg_parts.rsi/security_r_arm+o.png | Bin 317 -> 304 bytes .../cyborg_parts.rsi/security_r_arm.png | Bin 315 -> 310 bytes .../cyborg_parts.rsi/security_r_leg+o.png | Bin 299 -> 191 bytes .../cyborg_parts.rsi/security_r_leg.png | Bin 300 -> 192 bytes 16 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/DeltaV/Mobs/Silicon/chassis.rsi/security.png b/Resources/Textures/DeltaV/Mobs/Silicon/chassis.rsi/security.png index 52590572fe71175ef5aca28a614d965eb181035e..f539f7038b9fbdf70b28c0463fe6770359d7e574 100644 GIT binary patch delta 2379 zcmV-R3AFZ^6V?)tB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000id z000id0mpBsWB>pN>q$gGRCr$Pnq7z%RT#(5u14kuY-!4d${L$>Z zGqW@A&g&BH56;fanKRG-InSIqJM%ur3^K^WOsXg3Jwf?b=m3{QkQ}gK+rT@8OwB&P|+TIyyQE z55Ux^Q%lVkFN8;xXmAP-0G(g5WQpnS?lvF1_`KA8aewBVX>Dzl{RIma$kt~2_U&fd zwrzz40Uvhk*kO(wIU;`eP~Y;5zRYug^680_QRkbQnxq^$bSOMq8|XaSw9W&*QE0z$ z~646 z9p`96+oGwJex?8rNeVANt4BX!UVUV!dG4?4=6{vB^QEv)9p`AH?TaEwpN>=dqn{}N zM3nN?wZG*}i}!uL30~^$mC`h9nACBOHrl=@Z2j|r9-vRhDf)duiOF9S7aRJF7#&(NYY2Iv!^HOIKc;w^Xg|B0gA8lDz5n26ouL* z*nir2U|)~(>PM}uH>YSjcI?=2w~R*D#&!hUHldA}ZA&YnT78$i`Vs&tHf`D@+oemF zQl(o#CZO=yb8$xixNU8lww9a>=#RdSJo>TmvVQ$~bNu*mxnSSEeNx9WwDOaWWFNyk zf1CciD#xHBfI7~pxIGJF3!B(RJn5A-tAD;P=+srCU#}54efo6lf2+a}+P!;sWRUH* zXMU9qBTAue&xvEPHs|W^nI~Ues zLkDcci0y>yhzi@{dL0H7&e=|D00vUOjz1k89j5o*Ju`B|2y;6aLVSM*=*t5JWg-cL zq=NQ=nCvTS)~t!0*J}bIJA9uH4}aboZ{E6P>W2)8wI3+`XbwPp^q4W>k)H_@CP;zJ zn>WV_*yoc#11*<<(vMAo*RJ0G_hwNSM$%lmbV&+axpJk>F7A0J`Vk2l!a(TP^OMop zvu9=KS;Nmo4D}UZ=X`~@t;0Ur1Fau5(#a=?CYy?jA$Vq_P4J9Wbw0qJlz(Dv23miR zK?Zp^>DNTy%f!|yHLfIOf2-B4>LPW*{V@bsGf+4Fotgxpbn};zy%s^yFT-krkojv+ zq4Q*iy`9%J1GU0gi=g03HERPPSHx5xEjM4QwEQy+uO0RRnx zLj9ppkA+8Z)R7{Rqu>T!VO@aFFUS&rTyp@1?SjDDx9&!1YMfz9=gHL<1-7thYf#X} z2iLDWq~00s09!XjZGS^Po>dvZJ2`6wXh%IT0wC`wu(d%JKlJuW;=@kI`2tNl0+U5M zaRlJNmMvS%h7B9U5C%2xW}}@4b&M3X?HD$+Ls_6L*C^Q1w72~YVrwgQ=dnQ_(zJ6u z0vZHgAV9y$YDtoY`h|~q@CJa%kL{c}bL2P}LeX$SAZaxCzJCybw@6UCX=oe0#>JqT!{7|9)0(o(v9kXz?a4j~lg-vXup?aXtzYcv$9=rjVG-(n)K*&BrY08u- z-p2r8z0+)U-v{=v+ZVRB4_k+=JsK6)=QQn#0O&_gbANOBhYt+t7K0R`{8QIusn@&1 z>JSS1)VZC|Va*UvLeII60Jf5J0AKJ){j+@r`a+*vyAXRr3cjC9Qpo_YL338r6uaHy-&^_8XFtU!vNk@HheMNix z`0-}gqkoS|ovU5p1PchrpC+|ctq$O<3w5eZTdo10y?_ecw6r;>cAt=@=5DYJ4!tG( zMyL3QwWVl#%dQvI4t8w~xA;hFFPcf(55h<0GZ6rf3aIxcO3{y5hg^B+x>{4HZkj*YR@4WN7$Tr*C4;=uC?3jwI4*2+!51cJy51C9F3k!K+n^LKO zdcA>peFAsZ?te*7LYALC4`5c<<`tf>&$9ed0{Hlo4;+0#$ESb!8+3gcs+thCv+W}o z#s>cQr$4|b8RsSh;wKm-16#(Pr_H=R0e>4A{#Zxg!;e<**U#7bknHuGI{;|4j!`VGm%WO@|+w61caUn2?FxxH5@5lGg4m{t-CMSgLI`InykjbQ#VsTw)9%y3xf&rjb zt3p*19%&oKnXWL+va}8`&9b6tbBupp4=yg3TYvR@7abFxKa)ud`9pU=GC7EJDg^*& zSQhH_23sV6P-m!Cs|x$a1>b+itO6P^oE(qtrhp-{lHxSNmSRDh1;`OT=#tU_m2xve-c9Vpu`-aS9pT4(aC^-WcVYMpl#b{gP{FZ z0Dte+;z7SRo2Q;Jx`m(r>A(MpvC&EPo#sJDOmziMifG$LBlWSH$FxQz^DR|MleWXjoR@?f0_%a$3QW@$p{fZyuYddl z0C08YCf;;okwAZLJt7FBL4Vv|EUq)@lQ8_-lgQ{TXxf}Zw%W}TNXG*d_mibDjE%1N zb$uBCpsERMZ$A|BOCJFu9~iiTdcDDR2ail9jb!pAcqit(&@X;zS6J7V@w`&Tk4HZ- zFOYT!7jPh*NF;o{&8Jlzki>>^ZUI(!uIw<4?n@Sk9u>3bGg-kPwf}b(9mVn z>ka%eG0OVzj!`eJu!!F;AXQC7@`t&?LNi#eH`s)EpP$ZIp>P+reFRlaKvfg4?IRW( z@rsA~##uZeir?>X^3O#4y1uN02LtY8FVl6)W7P-5t`MOhh=)Hc?kB?BYk%H4i7ryY&`|(X zm@uzTumXf)v3)ns+ue&afBa(osd4vTIx4-@2T)-`?ZpX3-rz4E4G%ewu(GEfL}ZfO4s9bIWeyT)yfG}Riz?@el4D$B$I>A#P~RD+s4@B zB{rAcr_TVK-5k|koPR)H&^rntatH7g7l+M#Jh;EbG(HtBj7?s`j=7J4fh+8Jl;hD0 zh?}oR@XzVi%DhJiogk$IY4N^-19ms3X~4+H7)qsr)5jwKxR#(+JG%hMWNh%o6c6sN zdxX#lv8;fo;NW%m{-U^~Q$0Z#B0WJ-J&tW3q18GLBq#Z2{eM8c-eB2ko;RwPBC4K< z5NikUTAw$8uM@hy9GdTwL6iWL>OqB>9e=@tzgEC7HjvA$D!oib0!p#C&f_ z;I7KMGlKvyHae+P4=N6SC$Fk1U|IOhTfg#5;vzwuG>5(YeW0x|RDy046_8>&m4az* zVmNahGuPgeCOc2eTze10nd_jdasi~waqM6SXrHrmDuw5jG7jr!B`g>4_8E4cegWII zkxr$A*Bm>=!6*$_s$ET-KdO>_ALf0H#?6DLH!Es+vG9w~FoUhcvmk{L93Wa?V2xS-C2iAJg2V`kk&PBa3G9Q~}`d z<#XMln;qb>0D%PDHLkV1nQM$#Vbz diff --git a/Resources/Textures/DeltaV/Mobs/Silicon/chassis.rsi/security_e.png b/Resources/Textures/DeltaV/Mobs/Silicon/chassis.rsi/security_e.png index 7d0039083cce57ae58822923f040daeef40083e3..3c7d9924e55b68d2a69658d51a3d298c0e9c4efd 100644 GIT binary patch delta 259 zcmdnSw1sJcW&JZx7srr_Id5-m!sk0tdk9yxKmn6dKkD3Tqktv zOpxGy{crUhm1+LlwC7LoW_TjRu#?3>k8y&v$b+JtYu8_&eEzxZg_U<1Pd$46^PEYn zs^B|2gyhnb6r$JSUzjk z`CwIt)!Ui&&sctoFXL<2f^RlEnX~>ZxfHVg!r+=(}*RTl4x%J(QN71oI_x4dcZeucuqj>##Bafv2mV%Q~loCIG11a9jWY literal 310 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fAQ1FGP zi(^Q|oVT|OxehBZxFzcDby#-iKZ9jtyTkJ)*RyyDmptgO)tt} zGK1~pYq|Nax7Ev9Gw-!t@XzAg_n2xm+jrZ;yjCvNkw1R!z!&R;U(Oqz*(VeUIdEr? zgcGi`_f^Sn$oqX^_nwK?4_4fMxbSt!UjB;Xf$y2)Uh5oIdQuiaqLDx+%nJz6OV diff --git a/Resources/Textures/DeltaV/Mobs/Silicon/chassis.rsi/security_e_r.png b/Resources/Textures/DeltaV/Mobs/Silicon/chassis.rsi/security_e_r.png index a6df52696992051909b4fdf3484d7a4ec5ca8e01..d523e5ea19a7e461d69b23d74d6edfde5dab763d 100644 GIT binary patch delta 250 zcmZ3+w3=yxW&K@G7srr_Id5+*NX~)^LCF$B&J_XE#orC9~k~&%a`Q);s1& zT$f6`##vDtxpxm^@cxP&23xW(*v-%Xaj#*SYr@kaR*3#$paDo`p)$3(FJy-=sPgk{ zh}+HNeMZxoac>#xs^?F5SNxcWD#E2Oo#BKkLlI{~3=^C=$L@gqwUfpR@9j1`%m4(Q Lu6{1-oD!M<2*qaY literal 294 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fAQ1FJQ zi(^Q|oVT|Qu52-oV0ifCYy33dicM2;nEAz2ekfWO^Q@Ts(4OODOm=VlGk@+3u7cMq zlh+lVd7rKS;2q1K?U%p5t-Hfh5SKjn`uDBo7g#bF&%UvLa9p!N?1G2`Q27E@6V?k% zvzRg%eHphjEMtgr2xib-fFYezeL46$bKlOdI{D98Y)Y;6e6_yKWK(MYV9&8@oG(fu fh&Ksh(KF^?FQt1mno4{?KQef_`njxgN@xNA*t}?{ diff --git a/Resources/Textures/DeltaV/Mobs/Silicon/chassis.rsi/security_l.png b/Resources/Textures/DeltaV/Mobs/Silicon/chassis.rsi/security_l.png index b099c8610a01ae1f638e4011f4f8f32b22b71561..996cf0e21114c5aaff97c7f686ecc30efe610a41 100644 GIT binary patch delta 381 zcmaFOyq0-_WqrJ-i(^Q|oVT-Vvkp55w8|^8h=l7odBrQVYJXo>%OS6&enK&3`FGuz zHj#BX&Z{yGv2F8EetYJ?v%UO1YmO$(=>IGD<8HGICxfLBLy^jYrw?yGtxdk3xY2e| za2mJ9+4ZNs=c%3%3NYQT?c5%x>LV6l{{O>{JGXCK|C%#hPt~Vh=tKDD@`%TuAE*BR z@+WKiUC)eLENg$>yJ%?f^tjp9+^&9^oV&NLY@c2DYyZs~KP-9wSMnQVai-q=U*q0> zR(kU^2i=7{b64DB?(t$`J7(^<`1!H=i<&@}Fg)>KI5Cl7f-<9mJCj2nO9RY_3{Q4& zo;bx-alKG*!c@_+jun@66tuMkLXRse3C|PlSo2tLBIj8ym+OVMSvGHCx>s7lbFS6^ zs33Ov&+`|1);OfheWnW3*s<#ICiaw6R;5=va+@L}8Q)u3v7%Z7vHvqK6Zew_ZuU!V P3_#%N>gTe~DWM4fZtkW< literal 491 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|Vn+ zPZ!6KiaBp*8D=mwMTfY(&FiN93I@2^=dLG z(hjZrm;Jm}z<~ewulwyite5g6*p?LTjPKlH%1~}o_a~s*zeaER@;mk&TfWx)4`N>7 zdh6t^s1rg3*;`iKo3-F!gs<{yuJbF++j_&+&u8HCy&lWR@OajDTLz2X1I3ed7#cqB zJ6?Xdec9`E>F=xA6~c-)tA{GNH=J#7pU>!^pqOJ47R`M!zVX5A_e#CTvQ{g+HkR=6 zSo61flekl2@%Gmdxw>!uZ4&WIUhMsFZ6ebR#v3yj${5Vl8e|)KITP3ul5q(&?37cv zr1g#~{+<2AVBI3Ftkg3~2`fJ{N<9|gj(AnmaLvM%=~z13p@O3)#iZ2Bi%ZU2>D#Ey zyX}g_()9 z5dsz#7Um5s6(!hM`T)VCNF%YZ5G<5ju(1%$K_mt=ck-Xy9+x9`SwqVG!LYM)|J|AW zxFv-`p-}W9lgT)na|=!)kzjMfp$HwuV5}PsCFZtW!31|#*MGDc$CnPEJ$<Sym_%ivL0M2QzKv+!i9izyJUM07*qo IM6N<$g27+hcmMzZ delta 399 zcmV;A0dW4F1lt3UR)26wL_t(oN9~odN&`Ui11+=+$u%}2NiDXTganLNSSbHwC+w+kJ4-Bt{b1O+-MgE)fA9XIKp^n1Xtz&3 z5$5m*MeDz@Va7sm<5uh391(T97rARYoy%3>em|jJ@7C$w>VF0ni+9ShH>%b4&B~JT z_=Tcqhsxz`RRf!5EMzj7auETI*dgE?oa>6S0`>aQO5$eo)MR-EgBz0(jYjwD-2yaF zscdmRpMUW99eaK44FEKOr^o(3K3tpGB?pIREI(9mEe@RD0bw}2<3cDHMG=P-$C?(E z0zkH6uUh5eAb-m;n$Bh_=>@d{pwT$yrxuW7&Ih#uaUAp400nHI07%pHZxtw&c3JAD z=hs|d4r^M}3fPt`1_bv58V3~A3W&?0I4l_D%PDHLkV1nt1wr2nU diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/security_chest.png b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/security_chest.png index 43d6a8cce4152333fe03a44841e4d14c33c69e25..de21d9bd220196719bfffe17d4f214c1df6234a2 100644 GIT binary patch delta 466 zcmV;@0WJR91D*tsR)4ceL_t(oN9~loN&`U<$0w(Pg@T_af`}Io6l`N-6ayBPK7mE> z5dsz#7Um5s6(!hM`T)VCNF%YZ5G<5ju(1%$K_mt=ck-Xy9+x9`SwqVG!LYM)|J|AW zxFv-`p-}W9lgT)na|=!)kzjMfp$HwuV5}PsCFZtW!31|#*MGDc$CnPEJ$<Sym_%ivL0M2QzKv+!i9izyJUM07*qo IM6N<$g27+hcmMzZ delta 399 zcmV;A0dW4F1lt3UR)26wL_t(oN9~odN&`Ui11+=+$u%}2NiDXTganLNSSbHwC+w+kJ4-Bt{b1O+-MgE)fA9XIKp+tKSG3zF zp9pjKgQE4{*f3)uxN)m>ZjOk$-HY6{ozCT|aKE2WuXpQoZ+~?Ii^V%-*&Eer`(|ay zc>F?9v_s|cwyJ?mGZr$LOu2}FM(hx94$gJOS%G@}XeDv8d1|segTal-h(@FP^=<(g zs8qH%pU*#d{Eof8_67i&z|&*@A0MvG?2?1SGnOAJxE2S_?|?8I-fD%PDHLkV1irww$=au diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/security_head+o.png b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/security_head+o.png index 18ed6d4e1b15f551088be257323c91edf7b303e3..a2cd70d9d33e506eb07be3b7f4e2cdac7c278485 100644 GIT binary patch delta 364 zcmV-y0h9iM1Gxi`R)0=OL_t(oM`IXhzzC&D2C)h%|DjAUSp47)S!R)}31o2!FAtQ5 z3g&$NLb5}MR*cPJyY0yg3{{~s6_$N+QzR0J6M0s;&xR;&QCJv=eXOA2*83KISqh(4g$pZ9t4PX01RMr z2ndjBF~tDn5KxvQHQP}YfGi#`%SXW|7zLwX6pVsVFbb#x7#IKr-;8g2J!|j)0000< KMNUMnLSTYNGLY*4 delta 309 zcmV-50m}Zl1A+sPR(}^sL_t(oM`IZAfDuX)4eadP|G$0v4$4CX!oorfhYsx|$xMxKNF&sIvkt9bjL1}^@DJ=l(bC3lfi?Csk97qjFEmRvpK$HVO z23p%#gV`Dymf#S;hCy;508&e=BZv+G5QvKpU^seoE5rBiUw@z?2mlfT$$`|60*Hz$ zkZ;sgOu_8;AD=U9-f$AkMhCtD<_v=Tl3@1DJEs}u&DucFe4;`CW)R475HPovX5i;% zWzf=)17i>yBnAR7HN;pB0z{|Qit3#I9j#Nq>b12^|0~Lig2iFr{=?S{SFfH1%Ok5L z1c-J3IsiEW$}R*0nB}8j6pVsVFbYP&C>RB!U=$27z`y_i;~Q_@Zzg^i00000NkvXX Hu0mjfOHXK3?B|c*gyc11E~S2B^HnrTt*yh|FtFL7@WAcpdzSX-+#AnV9U?__(gKm5(K8E zrvE>D`0yX(2z>a#g9raXYN6T)0-{_xfByXcfq{VxKnFlYfT1rSz_4P)3NYKl!vjns zgDF#{F!c2F5Hz3YG=L0XmMbVIfbotUJD@V81EN9z6r{U%?}mo}$N>%x4q!G6Y}l{? z%7TE<&`^fcr)5vmCImnrBO`;MqoV_iL2PmX(Ww=duvV{L4d#OYEa;Kb0LbScK#cD} zfM^H605*q!0I3#J3_uP6WjRu_9aRCy;sLXK6pVsVFbb#x7#IM_HjHm1b-tzm0000< KMNUMnLSTZc*qSo{ delta 310 zcmV-60m=Tk1A_yQR(}{tL_t(oM`IWTqhJ(_f>AKgfDuX)4eadP|G$0v4$4CX!oorf zhYsx|$xMxKNF&sIvkt9bjL1}^@DJ=l(bC3lfi?Csk97qjF zEmRvpK$HVO23p%#gV`Dymf#S;hCy;508&e=BZv+G5QvKpV1GDzbSuO6?_Z!I2mlfT z$$`|60*Hz$kZ;sgOu_8;AD=U9-f$AkMhCtD<_v=Tl3@1DJEs}u&DucFe4;`CW)R47 z5HPovX5i;%Wzf=)17i>yBnAR7HN;pB0z{|Qit3#I9j#Nq>b12^|0~Lig2iFr{=?S{ zSFfH1%Ok5L1TTno06G9U0?GsfnB}8j6pVsVFbYNiX@G$N0CXX5-nbxX)c^nh07*qo IM6N<$f_TJ#@&Et; diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/security_l_arm+o.png b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/security_l_arm+o.png index f91807f884938acdbcb388dc3e1291517a6bb94e..5ca20c156ead3c5e9bb68eff4bff0dda82eef1b4 100644 GIT binary patch delta 231 zcmVG{4d`b7=~dOhGG7SuIrpHzcoE*zOJi7t?L?%52fJ< zV6Amh$`Imno0!9V97k7G6={I0*VBjsD5aon+r1u!0p+qc31A5Uj4{wO4U}c+Ptuzs zA%GA9ZdnG;z6Y%}9+50yG=h7c!=osCN5jt&zLv#TG=w?h*Yi&g(=_e+Cixyj1{eZ$ ho@W%2C1g$pU;~4PLtC8XB^3Yw002ovPDHLkV1gYWVIKeh delta 245 zcmVc83R)5$@L_t(oNA1)x3xYrt0N_{9U=E7X9L>%y&i;pfXJe~~OS5w{ zhoYc4G!*Z6L4n>y_`2nNaNN5?&d1&3fe^yB1}zFgI4+dJ*d&)A9) vwqq-;_#X^4(AjIn=)E0twPGQJungb{N^?o~n%Lo`00000NkvXXu0mjf`#W=_ diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/security_l_arm.png b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/security_l_arm.png index 1f746edb6c9815b8a73d8cea2f1c4d2d0c442545..7cce44e76e562ab3b1d15f85f1e90a4da931a358 100644 GIT binary patch delta 236 zcmVEf6M-?t*x&2A&eQNU*N2-s=R9Uz*SPVL+gJ)1 zV|-B*j}rH%D_b_#T6-zw#|8G3KNDR*2mx)|&f{SiFn06gO=VF9lv2<%4U}a`D`A_X zr~+x4!XZiE-1ksb6)pu|!0015W*MCFoMz#^atSZfM5A!QXZ8$#J^J)8j^ms+LGO$z mfUpFnwH71#eT*@-F@P(DRYO~um-IaV00001)~R)5qrCqb#_>rrd+Y${8=`4iTA7Z01ymY!eYM_?b!q}}yn(}hX9m_T*jFHg zFvFFnH=wDq=OsYfb)b}TdQV;gq)7r&%D)FW6*~au_z^q6?fx*M?_acH$4e_l*p6pu r#atfVz%XAcM!)UYr4S~1R%};EL_t(oNA1(g2>>AsMbV6Xq>S`mK#KCiWHW=Pi|o7yYpn-%2L>i2% V8h?N2_8tHL002ovPDHLkV1mO2Gd%zR delta 228 zcmVAIEM!_f;1w#gCYn%RuGN}rfpfo|i z&(BH|M-c4*AprpfYin;Pk9vS;2f#pneh*bcfoKQ3`|ttEVqmDMn)aVs(Lt00tgNj5 z>*%;KaB}iMMW_dea=^!rzrpnP?_a?5*RS8eG&KMtl*S1_zFmho02y4pdYYhKVgOMg zpeQejfJFeq{5 ecj_cU1_l6E_b-Or=Dg?t0000A-~R%%sAL_t(oNA1%=4nPqMMbY~E=rX$h1$0p#(Frk8L-!=|j2d1L z0KoG~WX2!4I+}TP05gm2;O;$+W`2<=syeL<8lZu61MT+PZ`fL(ftz;)0M8Mrn8X@? TmAUQ)00000NkvXXu0mjf0h}=j delta 227 zcmV<90383o0kHy*R)5AxL_t(oM`IWTqhJ(_f>A&T(AGBn4`q@Kn4mOSfS;e0VnG?>>BhvKSbus;2!XCpyS>fR&Zie;pk+22M^M zs0ew0YzKV&_!~@r|NaF`fBpImOp^*2p)^SVnhVGZHeC6goJ2SZM!_f; d1p^Ei7yvQQFNXENM7aO}002ovPDHLkV1k~}RC)ja diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/security_r_arm+o.png b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/security_r_arm+o.png index a82735dd7f13729458e4717e9e6d6c3827a58e27..13c67f5651be90305538472fbf3a148157a2d5e8 100644 GIT binary patch delta 226 zcmV<803H9m02n>1;plld=Wt-c6^F+dY2D89 zpy5?jrDa*p4bZl2n&mU(5Xdm7U#|`p>%chIemxDS)40w zqN}vD(3-)aa^VDrrgrd})yr(}P`i z-4pWs=nS!-nFSU%rls95mH>F{Q;H+DH;^Pd`vyK{zk(=Q!f1B0wgcBLtZyI;Lp#Q> z1~A6Z%8f06);g%_ns#n%0hChxDvoLA#(D))umxzE7hG=-IA8AcWf*HK#%6@Pwc;sQ p0(`gPU+s97Ry_7Q7D5Qm0Ny8dPxsP~RRjP4002ovPDHLkV1g1paC86w diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/security_r_arm.png b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/security_r_arm.png index 0a5a947ef6620a3d434eb67e82634db8a6d23122..560fb6fc98b90dd1034e63a0ff53794684c82adc 100644 GIT binary patch delta 232 zcmVR)5P$L_t(oNA1+R4TCTc2H+zNkx3UCmq^GPP`mO1NUY!q7y@M& zR$vcTbZ&^m29A7jq?B=tAd&7XxU-SCU%Y@2LdZXJ@3rsy*Lojq+xmgdS3i7RSFF#o z`@rFxb2rcPu>qQ; i1=z$6Cxnn60Pq0#-bP!6FlROZ0000mU(5Xdm7U#|`p>%chIemxDU7Ra! zqN}vDV9nrAxp0E(<$_u6gOH>{@23e@P)fy?(Cn?M_A}01*F)Q$*zXesz~W_jaO-J$ zL0uo&Ar>@?U~y}owBr#4z|Srzj>LDMD0c1+eEt0hvTO<4&1TvSTyq7v18JJN;Uh=@ zYb~w#!~vS7N%~=+9iKRWF=k%nIqmp@9D#&5z&O6)dV9e6a;GOeL0U03BNVL_ONave nwqoCQ9JCet{En4UDl&i%q-Rg}ve__I00000NkvXXu0mjf-B5D& diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/security_r_leg+o.png b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/security_r_leg+o.png index 51d3d2ba1d7e0630ac1a63b70e41c71381c17254..8907499866e217e7c3b25f7bb988f50c5c78e7e5 100644 GIT binary patch delta 112 zcmV-$0FVEx0>1%}R%uj8L_t(oNA1(W4FDksL{Zj0D1-hBpeS`Cmo*YE-1fi33^#NV z1poj5_`N5xN{`&7d&)0hW-%`A{zkf|MV3+3&$*!i8YpdGzW(?PXA3lt>=79OFB*S2 SRr!Pf0000AIEM!_f;1;Y|(Yn%RuG6@1EC`~m0 zvYelv70M$FsO|u3Yi|Z20RbqFFrcaf^7DI$4tf}%iUUBwUR5;>Zuz?pAD}G4fa+1e z$;rc@qvOV4Wo1QFXi&`oU%!3>)8D^;0n;Bp{sz;803(#97*=4*dZ65J?AS59c2F$@ zK$a=Wi=tp+0M$YO1kmH1kncf&s)-O3@1O(-!^D(`G|2@ZOe~;jA_Re}S5M=ygMk46 XLOv{pSm^^p00000NkvXXu0mjfp&VKK diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/security_r_leg.png b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/security_r_leg.png index 9b873bbc72b8cfc95aace409999b14ec3bfc5877..5c4c3fb733459771b752372aff18530139ecbf74 100644 GIT binary patch delta 113 zcmV-%0FM8x0>A-~R%%sAL_t(oNA1%=4nPqMMbY~E=rX$h1$0p#(Frk8L-!=|j2d1L z0KoG~WX2!4I+}TP05gm2;O;$+W`2<=syeL<8lZu61MT+PZ`fL(ftz;)0M8Mrn8X@? TmAUQ)00000NkvXXu0mjf|5z~u delta 222 zcmV<403rXt0jvU$R)4`sL_t(oM`IWTqhJ(_f?)x)wN3v+nIr=yC`~p1S(_5!`uq1UVEW_7-(Z?lzzC&D2H3J5C^sBCc2|rfGszACkY$SUq9~Xg zKz0a#0D8QW>U$8NC=r6<9h3lJn4A)kD!BlJ$putRgdlMB>S>Cibrg((Q7{Td8em`m Y0BpT1hIJZO;{X5v07*qoM6N<$f+`MNCjbBd From 2fffc0c62b51d872e4d5157776c6ced48d053438 Mon Sep 17 00:00:00 2001 From: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Date: Sat, 6 Jul 2024 14:54:12 +0100 Subject: [PATCH 56/72] Update meta.json Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> --- .../DeltaV/Objects/Specific/Robotics/borgmodule.rsi/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/DeltaV/Objects/Specific/Robotics/borgmodule.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Specific/Robotics/borgmodule.rsi/meta.json index 4c0750d5b42..faa27a4d7c2 100644 --- a/Resources/Textures/DeltaV/Objects/Specific/Robotics/borgmodule.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Specific/Robotics/borgmodule.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC0-1.0", - "copyright": "Resprited by DangerRevolution (GitHub) (excluding the security.png) from EmoGarbage404 (GitHub) for Space Station 14. icon-construction.png created by deltanedas (github).", + "copyright": "Resprited by DangerRevolution (GitHub) (excluding the security.png) from EmoGarbage404 (GitHub) for Space Station 14.", "size": { "x": 32, "y": 32 From 504c98b82e9399027478482f83b01ac259b98e15 Mon Sep 17 00:00:00 2001 From: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Date: Sat, 6 Jul 2024 14:54:52 +0100 Subject: [PATCH 57/72] Update tags.yml Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> --- Resources/Prototypes/DeltaV/tags.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/Resources/Prototypes/DeltaV/tags.yml b/Resources/Prototypes/DeltaV/tags.yml index b444e15f0d2..dc7f88ae19c 100644 --- a/Resources/Prototypes/DeltaV/tags.yml +++ b/Resources/Prototypes/DeltaV/tags.yml @@ -60,9 +60,6 @@ - type: Tag id: PaperSlip -- type: Tag - id: PaperSlip - - type: Tag id: BorgModuleSecurity From 648064edfa6ed08ac04f84faaaec5db95fcfbe35 Mon Sep 17 00:00:00 2001 From: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Date: Sat, 6 Jul 2024 14:57:01 +0100 Subject: [PATCH 58/72] Update arsenal.yml Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> --- Resources/Prototypes/Research/arsenal.yml | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 4aefa2a8041..7051d39d43e 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -112,6 +112,8 @@ - TelescopicShield - HoloprojectorSecurity - WeaponDisablerSMG + - BorgModuleSecurityControl # DeltaV SecBorg Research + - BorgModuleSecurityDetain # DeltaV SecBorg Research # Tier 2 @@ -157,24 +159,6 @@ recipeUnlocks: - WeaponXrayCannon -- type: technology - id: AdvancedRiotControl - name: research-technology-advanced-riot-control - icon: - sprite: Objects/Weapons/Melee/truncheon.rsi - state: icon - discipline: Arsenal - tier: 2 - cost: 8000 - recipeUnlocks: - - ClothingEyesGlassesSecurity - - Truncheon - - TelescopicShield - - HoloprojectorSecurity - - WeaponDisablerSMG - - BorgModuleSecurityControl # DeltaV SecBorg Research - - BorgModuleSecurityDetain # DeltaV SecBorg Research - - type: technology id: BasicShuttleArmament name: research-technology-basic-shuttle-armament From 0c87114b4c6c7abbd73597547c2122c5614e17f6 Mon Sep 17 00:00:00 2001 From: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Date: Sat, 6 Jul 2024 15:00:52 +0100 Subject: [PATCH 59/72] Update Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> --- .../Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml index 812857b15c6..6cbf9d91881 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml @@ -40,7 +40,9 @@ - Security - type: AccessReader access: [["Security"], ["Command"], ["Research"]] - - type: ShowSecurityIcons + - type: ShowJobIcons + - type: ShowMindShieldIcons + - type: ShowCriminalRecordIcons - type: SiliconLawProvider laws: SiliconPolice1 - type: MobThresholds From 43e499f19cd1d1f3dd0a75584b7417834e46ecaf Mon Sep 17 00:00:00 2001 From: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Date: Sat, 6 Jul 2024 15:05:50 +0100 Subject: [PATCH 60/72] Using WebEdit like a Sigma Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> --- .../Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml index 6cbf9d91881..80b7fd64b2d 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml @@ -53,3 +53,7 @@ #- type: NoSlip - This mf slips - type: Speech speechVerb: Robotic + - type: BorgTransponder + sprite: + sprite: Mobs/Silicon/chassis.rsi + state: peace From d336655d2ae0570bf36a66b42a30ec0331681e94 Mon Sep 17 00:00:00 2001 From: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Date: Sat, 6 Jul 2024 15:43:17 +0100 Subject: [PATCH 61/72] finally fixed the fucking transponder --- .../DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml index 80b7fd64b2d..7968f705c34 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml @@ -44,7 +44,7 @@ - type: ShowMindShieldIcons - type: ShowCriminalRecordIcons - type: SiliconLawProvider - laws: SiliconPolice1 + laws: SiliconPolice - type: MobThresholds thresholds: 0: Alive @@ -54,6 +54,6 @@ - type: Speech speechVerb: Robotic - type: BorgTransponder - sprite: - sprite: Mobs/Silicon/chassis.rsi - state: peace + sprite: Mobs/Silicon/chassis.rsi + state: peace + name: Security Cyborg From 8ab96871d86fe54f41873b555c19e3122ab969ef Mon Sep 17 00:00:00 2001 From: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Date: Sat, 6 Jul 2024 15:50:45 +0100 Subject: [PATCH 62/72] transponder please work --- .../Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml index 7968f705c34..e0f86675d19 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml @@ -54,6 +54,7 @@ - type: Speech speechVerb: Robotic - type: BorgTransponder - sprite: Mobs/Silicon/chassis.rsi - state: peace + sprite: + sprite: Mobs/Silicon/chassis.rsi + state: peace name: Security Cyborg From f0e443aa8c089dbddea3442c95283def642eae3d Mon Sep 17 00:00:00 2001 From: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Date: Sat, 6 Jul 2024 15:57:14 +0100 Subject: [PATCH 63/72] Update security.yml Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> --- .../DeltaV/Entities/Objects/Specific/Security/security.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Security/security.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Security/security.yml index 15e471c0b42..ea6aabffb0b 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Security/security.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Security/security.yml @@ -32,7 +32,7 @@ slots: cell_slot: name: power-cell-slot-component-slot-name-default - startingItem: PowerCellSelfChargingBorg + startingItem: PowerCellSelfAntiqueProtoRecharging - type: GuideHelp guides: - Security From b79dce483c5e4eac538b26ec0b90744433772d9b Mon Sep 17 00:00:00 2001 From: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Date: Sat, 6 Jul 2024 15:57:41 +0100 Subject: [PATCH 64/72] Update security.yml Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> --- .../DeltaV/Entities/Objects/Specific/Security/security.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Security/security.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Security/security.yml index ea6aabffb0b..ee1cfeb27c6 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Security/security.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Security/security.yml @@ -1,6 +1,6 @@ - type: entity parent: Stunbaton - id: StunbatonSelfCharging + id: StunBatonSelfCharging suffix: Do Not Map, Recharging components: - type: BatterySelfRecharger From e6e4a47314d0496e41944cf36ce704c03d6228df Mon Sep 17 00:00:00 2001 From: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Date: Thu, 18 Jul 2024 23:42:51 +0100 Subject: [PATCH 65/72] lyndomen suggestions --- .../Entities/Mobs/Cyborgs/borg_chassis.yml | 1 + .../Entities/Objects/Power/powercells.yml | 12 ------- .../Specific/Robotics/borg_modules.yml | 30 +++++----------- .../Objects/Specific/Security/security.yml | 34 ++++++++++++------- .../DeltaV/Recipes/Lathes/robotics.yml | 29 +++++----------- .../Entities/Structures/Machines/lathe.yml | 5 ++- .../Construction/Graphs/machines/cyborg.yml | 18 ++++++++-- Resources/Prototypes/Research/arsenal.yml | 3 +- 8 files changed, 59 insertions(+), 73 deletions(-) delete mode 100644 Resources/Prototypes/DeltaV/Entities/Objects/Power/powercells.yml diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml index e0f86675d19..fa9355be17d 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml @@ -51,6 +51,7 @@ 80: Critical # -20 to Crit Threshold 200: Dead #- type: NoSlip - This mf slips + - type: FlashImmunity - type: Speech speechVerb: Robotic - type: BorgTransponder diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Power/powercells.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Power/powercells.yml deleted file mode 100644 index 4e88724de42..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Power/powercells.yml +++ /dev/null @@ -1,12 +0,0 @@ -- type: entity - name: self-recharging powercell - parent: PowerCellAntiqueProto - id: PowerCellSelfAntiqueProtoRecharging - suffix: Recharging, Do Not Map - components: - - type: Battery - maxCharge: 1000 - startingCharge: 1000 - - type: BatterySelfRecharger - autoRecharge: true - autoRechargeRate: 5 diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml index cf693e5a2ac..53ad6b13ad6 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -8,7 +8,7 @@ - BorgModuleSecurity - type: Sprite sprite: DeltaV/Objects/Specific/Robotics/borgmodule.rsi - + # Security Modules - type: entity @@ -23,6 +23,7 @@ - type: ItemBorgModule items: - WoodBaton + - SecurityWhistle - type: entity id: BorgModuleSecurityPatrol # Peacekeeper Set, Available on Round Start @@ -35,13 +36,13 @@ - state: icon-patrol - type: ItemBorgModule items: - - FlashlightSecliteRecharging + - FlashlightSecliteRecharging - SecurityWhistle - type: entity - id: BorgModuleSecurityHold # Peacekeeper Set, Available on Round Start + id: BorgModuleSecurityBastion # Peacekeeper Set, Available on Round Start parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ] - name: blockade cyborg module + name: bastion cyborg module components: - type: Sprite layers: @@ -52,9 +53,9 @@ - HoloprojectorSecurityRecharging - type: entity - id: BorgModuleSecurityDetain # Research Locked - AdvancedRiotControl + id: BorgModuleSecurityDeEscalate # Research Locked - AdvancedRiotControl parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ] - name: detainment cyborg module + name: de-escalation cyborg module components: - type: Sprite layers: @@ -62,22 +63,9 @@ - state: icon-detain - type: ItemBorgModule items: - - StunBatonSelfCharging - -- type: entity - id: BorgModuleSecurityControl # Research Locked - AdvancedRiotControl - parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ] - name: riot control cyborg module - components: - - type: Sprite - layers: - - state: security - - state: icon-control - - type: ItemBorgModule - items: + - StunbatonSelfCharging - FlashRecharging - - HoloprojectorSecurityRecharging - + - type: entity id: BorgModuleSecurityChase # Research Locked - EnergyGunsAdvanced parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ] diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Security/security.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Security/security.yml index 15e471c0b42..2a2645f494d 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Security/security.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Security/security.yml @@ -1,11 +1,12 @@ - type: entity parent: Stunbaton - id: StunbatonSelfCharging - suffix: Do Not Map, Recharging + id: StunbatonSelfCharging # Someone not capitalising the B in Stun`B`aton has wasted over an hour of my life trying to fix the error. + suffix: Do Not Map , Recharging , Cyborg + noSpawn: true components: - type: BatterySelfRecharger autoRecharge: true - autoRechargeRate: 10 + autoRechargeRate: 12 - type: GuideHelp guides: - Security @@ -13,26 +14,29 @@ - type: entity parent: Flash id: FlashRecharging - suffix: Do Not Map, Recharging + suffix: Do Not Map , Recharging , Cyborg + noSpawn: true components: - type: AutoRecharge rechargeDuration: 120 - type: GuideHelp guides: - Security - + - type: entity name: seclite parent: FlashlightSeclite id: FlashlightSecliteRecharging description: A robust flashlight used by security. suffix: Do Not Map , Recharging + noSpawn: true components: - type: ItemSlots slots: cell_slot: name: power-cell-slot-component-slot-name-default - startingItem: PowerCellSelfChargingBorg + startingItem: PowerCellMicroreactor + disableEject: true - type: GuideHelp guides: - Security @@ -42,6 +46,7 @@ parent: BaseItem id: WoodBaton description: First, do no crime. + noSpawn: true components: - type: MeleeWeapon wideAnimationRotation: -135 @@ -49,31 +54,34 @@ types: Blunt: 0 - type: StaminaDamageOnHit - damage: 17 # Stuns in 6 - sound: /Audio/Weapons/click.ogg + damage: 20 # Stuns in 5 + sound: /Audio/Nyanotrasen/Weapons/club.ogg # TODO: Find a free-to-use thwacking sound effect. This isn't perfect but this works. - type: Sprite - sprite: Objects/Weapons/Melee/truncheon.rsi + sprite: DeltaV/Objects/Weapons/Melee/wood_baton.rsi state: icon - type: GuideHelp guides: - Security - + - type: entity parent: WeaponEnergyGunMini id: WeaponEnergyGunMiniRecharging suffix: Recharging, Do Not Map + noSpawn: true components: - type: BatterySelfRecharger autoRecharge: true - autoRechargeRate: 10 - + autoRechargeRate: 12 + - type: entity parent: HoloprojectorSecurity id: HoloprojectorSecurityRecharging suffix: Recharging, Do Not Map + noSpawn: true components: - type: ItemSlots slots: cell_slot: name: power-cell-slot-component-slot-name-default - startingItem: PowerCellSelfAntiqueProtoRecharging + startingItem: PowerCellMicroreactor + disableEject: true diff --git a/Resources/Prototypes/DeltaV/Recipes/Lathes/robotics.yml b/Resources/Prototypes/DeltaV/Recipes/Lathes/robotics.yml index 53528ff040f..a38317db2bb 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Lathes/robotics.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Lathes/robotics.yml @@ -7,7 +7,7 @@ Steel: 250 Glass: 250 Plastic: 250 - + - type: latheRecipe id: BorgModuleSecurityPatrol result: BorgModuleSecurityPatrol @@ -17,31 +17,20 @@ Steel: 250 Glass: 250 Plastic: 250 - -- type: latheRecipe - id: BorgModuleSecurityHold - result: BorgModuleSecurityHold - completetime: 3 - category: Robotics - materials: - Steel: 500 - Glass: 500 - Plastic: 250 - + - type: latheRecipe - id: BorgModuleSecurityDetain - result: BorgModuleSecurityDetain + id: BorgModuleSecurityBastion + result: BorgModuleSecurityBastion completetime: 3 category: Robotics materials: Steel: 500 Glass: 500 Plastic: 250 - Gold: 50 - + - type: latheRecipe - id: BorgModuleSecurityControl - result: BorgModuleSecurityControl + id: BorgModuleSecurityDeEscalate + result: BorgModuleSecurityDeEscalate completetime: 3 category: Robotics materials: @@ -49,7 +38,7 @@ Glass: 500 Plastic: 250 Gold: 50 - + - type: latheRecipe id: BorgModuleSecurityChase result: BorgModuleSecurityChase @@ -60,7 +49,7 @@ Glass: 500 Plastic: 250 Gold: 50 - + - type: latheRecipe id: LeftArmBorgSecurity result: LeftArmBorgSecurity diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index d2500001fb7..b6815a26aa0 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -607,7 +607,7 @@ # DeltaV Start - BorgModuleSecurityPeacekeeper - BorgModuleSecurityPatrol - - BorgModuleSecurityHold + - BorgModuleSecurityBastion - LeftArmBorgSecurity - RightArmBorgSecurity - LeftLegBorgSecurity @@ -659,8 +659,7 @@ - JetpackMini # End Nyano additions # DeltaV Start - - BorgModuleSecurityDetain - - BorgModuleSecurityControl + - BorgModuleSecurityDeEscalate - BorgModuleSecurityChase - JetpackVoid # DeltaV End diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/machines/cyborg.yml b/Resources/Prototypes/Recipes/Construction/Graphs/machines/cyborg.yml index 719c2d4d909..346c49c8572 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/machines/cyborg.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/machines/cyborg.yml @@ -43,7 +43,7 @@ - tool: Screwing doAfter: 0.5 - + - to: engineer steps: - assemblyId: engineer @@ -204,8 +204,22 @@ sprite: Objects/Weapons/Melee/flash.rsi state: flash + - component: ClothingHeadHelmetBasic + name: basic protection # this is funny because Sec Borg has less health than regular borgs. + store: part-container + icon: + sprite: Clothing/Head/Helmets/security.rsi + state: icon + + - component: ClothingShoesBootsJack # This makes no sense; but headset is meta-gameable by taking keys out before putting it- + name: advanced protection # inside the borg, and baton makes no sense as this doesn't start with a Baton. + store: part-container + icon: + sprite: Clothing/Shoes/Boots/jackboots.rsi + state: icon + - tool: Screwing - doAfter: 0.5 # Delta-V Security Borg End + doAfter: 2 # Delta-V Security Borg End - node: cyborg entity: BorgChassisGeneric diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 7051d39d43e..b0ee95e14e0 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -112,8 +112,7 @@ - TelescopicShield - HoloprojectorSecurity - WeaponDisablerSMG - - BorgModuleSecurityControl # DeltaV SecBorg Research - - BorgModuleSecurityDetain # DeltaV SecBorg Research + - BorgModuleSecurityDeEscalate # DeltaV SecBorg Research # Tier 2 From fd959d18d997d086585f686a66fc76f68335fd71 Mon Sep 17 00:00:00 2001 From: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Date: Thu, 18 Jul 2024 23:43:19 +0100 Subject: [PATCH 66/72] Add meta.json for wood baton texture in DeltaV weapons --- .../Objects/Weapons/Melee/wood_baton.rsi/icon.png | Bin 0 -> 362 bytes .../Weapons/Melee/wood_baton.rsi/meta.json | 14 ++++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Melee/wood_baton.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Melee/wood_baton.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/wood_baton.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Weapons/Melee/wood_baton.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..aee997931ea68a0b19279fa3113371400821e45f GIT binary patch literal 362 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv(mfq_xR z)5S5QV$R#EhFpgXL>eB7#jvurD`~va>C?L#b0>CBm-`2;xI<@;-n`i)_A;PAfEAyPDJcs$n zk8cHG>#SKt9)EoMu+#s&NP=)V+lF3i#*oft=2gcW8A~4}H0&y5Jy5Q_tIK*?_YRhb zzFR*RXn3y8`)8)dSTTdI=aRK_UKO`MA*TcTk>x!{(;wfnev~N~P{?_Jy~T0zg@q!H z%C0OaF-#p3j95xyxD6B+JYL!WWZvPp0A$KDb~|>TQLim~rj0%Ig>m4liYR^R@VZF!w|osmO18vw?xf;OXk;vd$@? F2>@EFjJp5; literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/wood_baton.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Melee/wood_baton.rsi/meta.json new file mode 100644 index 00000000000..4afab1584c4 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Weapons/Melee/wood_baton.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation from commit 293577ab8a85e1306b8c00be45e0da9c2c4e55fe at https://github.com/tgstation/tgstation/commits/470cff519e57263dc0f7adcbbf04febd90de0088/icons/obj/weapons/baton.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + } + ] +} From b7a17924fa8297a33860ce3ec2dedf75568f8008 Mon Sep 17 00:00:00 2001 From: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Date: Fri, 19 Jul 2024 08:03:59 +0100 Subject: [PATCH 67/72] Revert additional construction steps; as they do not work. --- .../Construction/Graphs/machines/cyborg.yml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/machines/cyborg.yml b/Resources/Prototypes/Recipes/Construction/Graphs/machines/cyborg.yml index 346c49c8572..c193da2ab7d 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/machines/cyborg.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/machines/cyborg.yml @@ -204,20 +204,6 @@ sprite: Objects/Weapons/Melee/flash.rsi state: flash - - component: ClothingHeadHelmetBasic - name: basic protection # this is funny because Sec Borg has less health than regular borgs. - store: part-container - icon: - sprite: Clothing/Head/Helmets/security.rsi - state: icon - - - component: ClothingShoesBootsJack # This makes no sense; but headset is meta-gameable by taking keys out before putting it- - name: advanced protection # inside the borg, and baton makes no sense as this doesn't start with a Baton. - store: part-container - icon: - sprite: Clothing/Shoes/Boots/jackboots.rsi - state: icon - - tool: Screwing doAfter: 2 # Delta-V Security Borg End From 06cd3eee694680c0981cfa4a3dcaf5caa8fdef18 Mon Sep 17 00:00:00 2001 From: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Date: Fri, 19 Jul 2024 21:59:14 +0100 Subject: [PATCH 68/72] Update Resources/Prototypes/DeltaV/Entities/Objects/Specific/Security/security.yml Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> --- .../DeltaV/Entities/Objects/Specific/Security/security.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Security/security.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Security/security.yml index 2a2645f494d..3a663fda531 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Security/security.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Security/security.yml @@ -1,7 +1,7 @@ - type: entity parent: Stunbaton id: StunbatonSelfCharging # Someone not capitalising the B in Stun`B`aton has wasted over an hour of my life trying to fix the error. - suffix: Do Not Map , Recharging , Cyborg + suffix: Do Not Map, Recharging, Cyborg noSpawn: true components: - type: BatterySelfRecharger From 728ab70c0d2f35d9c16ddb3c4fa57332e2d2d63a Mon Sep 17 00:00:00 2001 From: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Date: Fri, 19 Jul 2024 21:59:31 +0100 Subject: [PATCH 69/72] Update Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> --- .../DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml index 53ad6b13ad6..9ca98a18ac3 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -53,7 +53,7 @@ - HoloprojectorSecurityRecharging - type: entity - id: BorgModuleSecurityDeEscalate # Research Locked - AdvancedRiotControl + id: BorgModuleSecurityDeescalate # Research Locked - AdvancedRiotControl parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ] name: de-escalation cyborg module components: From 25e56153f04aff77ba0e40f487a17a86ce451a56 Mon Sep 17 00:00:00 2001 From: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Date: Mon, 22 Jul 2024 07:38:13 +0100 Subject: [PATCH 70/72] Apply suggestions from code review Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> --- Resources/Prototypes/DeltaV/Recipes/Lathes/robotics.yml | 4 ++-- Resources/Prototypes/Entities/Structures/Machines/lathe.yml | 2 +- Resources/Prototypes/Research/arsenal.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Recipes/Lathes/robotics.yml b/Resources/Prototypes/DeltaV/Recipes/Lathes/robotics.yml index a38317db2bb..4591bc038f6 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Lathes/robotics.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Lathes/robotics.yml @@ -29,8 +29,8 @@ Plastic: 250 - type: latheRecipe - id: BorgModuleSecurityDeEscalate - result: BorgModuleSecurityDeEscalate + id: BorgModuleSecurityDeescalate + result: BorgModuleSecurityDeescalate completetime: 3 category: Robotics materials: diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 2a061f9e77e..c92a5f2c208 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -659,7 +659,7 @@ - JetpackMini # End Nyano additions # DeltaV Start - - BorgModuleSecurityDeEscalate + - BorgModuleSecurityDeescalate - BorgModuleSecurityChase - JetpackVoid # DeltaV End diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index b0ee95e14e0..8a0db00673f 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -112,7 +112,7 @@ - TelescopicShield - HoloprojectorSecurity - WeaponDisablerSMG - - BorgModuleSecurityDeEscalate # DeltaV SecBorg Research + - BorgModuleSecurityDeescalate # DeltaV SecBorg Research # Tier 2 From 3b2c9da30678b63bf644871a40947cfac478dec0 Mon Sep 17 00:00:00 2001 From: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Date: Mon, 22 Jul 2024 08:58:49 +0100 Subject: [PATCH 71/72] Apply suggestions from code review Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> --- .../DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml | 1 - .../Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml | 3 +-- Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml | 6 ------ 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml index fa9355be17d..e8b79da9308 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis.yml @@ -50,7 +50,6 @@ 0: Alive 80: Critical # -20 to Crit Threshold 200: Dead - #- type: NoSlip - This mf slips - type: FlashImmunity - type: Speech speechVerb: Robotic diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml index c51418db3e3..5449e3e19d9 100644 --- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml +++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml @@ -16,7 +16,7 @@ soundHit: collection: MetalThud - type: CombatMode - #- type: NoSlip # Delta-V , Unparents NoSlip component + - type: NoSlip - type: StaticPrice price: 1250 - type: Fixtures @@ -288,4 +288,3 @@ Unsexed: UnisexSiliconSyndicate - type: PointLight color: "#dd200b" - - type: NoSlip # Delta-V : Unparents NoSlip from Base Chassis diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml index 8f04f3d9618..04d94469c1a 100644 --- a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml +++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml @@ -29,7 +29,6 @@ node: cyborg - type: Speech speechVerb: Robotic - - type: NoSlip # Delta-V , Unparents NoSlip component - type: entity id: BorgChassisMining @@ -86,7 +85,6 @@ access: [["Cargo"], ["Salvage"], ["Command"], ["Research"]] - type: Inventory templateId: borgTall - - type: NoSlip # Delta-V , Unparents NoSlip component - type: entity id: BorgChassisEngineer @@ -135,7 +133,6 @@ access: [["Engineering"], ["Command"], ["Research"]] - type: Inventory templateId: borgShort - - type: NoSlip # Delta-V , Unparents NoSlip component - type: SiliconLawProvider # Delta-V - Adds custom lawset for Engineering Cyborg laws: Engineer @@ -194,7 +191,6 @@ access: [["Service"], ["Command"], ["Research"]] - type: Inventory templateId: borgShort - - type: NoSlip # Delta-V , Unparents NoSlip component - type: SiliconLawProvider # Delta-V Adds custom lawset for Janitor Cyborg laws: Janitor @@ -254,7 +250,6 @@ - type: Inventory templateId: borgDutch - type: FabricateCandy # Nyanotrasen - The medical cyborg can generate candies filled with medicine. - - type: NoSlip # Delta-V , Unparents NoSlip component - type: SiliconLawProvider # Delta-V - Adds custom lawset for Medical cyborg laws: Medical - type: FootstepModifier @@ -308,7 +303,6 @@ access: [["Service"], ["Command"], ["Research"]] - type: Inventory templateId: borgTall - - type: NoSlip # Delta-V , Unparents NoSlip component - type: entity id: BorgChassisSyndicateAssault From 8578f80c120919b5f799abce54c84fcee26051e2 Mon Sep 17 00:00:00 2001 From: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Date: Mon, 22 Jul 2024 10:10:20 +0100 Subject: [PATCH 72/72] add delta-v comments per null Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> --- .../Entities/Objects/Specific/Robotics/endoskeleton.yml | 8 ++++---- .../Prototypes/Entities/Structures/Machines/lathe.yml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/endoskeleton.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/endoskeleton.yml index 7a9bec1c95f..40698792d96 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/endoskeleton.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/endoskeleton.yml @@ -166,7 +166,7 @@ whitelist: tags: - BorgJanitorTorso - security_l_arm+o: + security_l_arm+o: # Delta-V : Start whitelist: tags: - BorgSecurityLArm @@ -189,7 +189,7 @@ security_chest+o: whitelist: tags: - - BorgSecurityTorso + - BorgSecurityTorso # Delta-V : End - type: ContainerContainer containers: part-container: !type:Container @@ -236,13 +236,13 @@ - BorgMiningRLeg - BorgMiningHead - BorgMiningTorso - security: + security: # Delta-V : Start - BorgSecurityLArm - BorgSecurityRArm - BorgSecurityLLeg - BorgSecurityRLeg - BorgSecurityHead - - BorgSecurityTorso + - BorgSecurityTorso # Delta-V : End - type: Construction graph: Cyborg node: start diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index c92a5f2c208..e9d192bc6b0 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -604,7 +604,7 @@ - RightLegBorgService - HeadBorgService - TorsoBorgService - # DeltaV Start + # Delta-V : Start - BorgModuleSecurityPeacekeeper - BorgModuleSecurityPatrol - BorgModuleSecurityBastion @@ -614,7 +614,7 @@ - RightLegBorgSecurity - HeadBorgSecurity - TorsoBorgSecurity - # DeltaV end + # Delta-V : End dynamicRecipes: - ProximitySensor - BorgModuleLightReplacer