diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Silicons/borg_chassis.yml b/Resources/Prototypes/ADT/Entities/Mobs/Silicons/borg_chassis.yml index a845663a5aa..17427d23dc7 100644 --- a/Resources/Prototypes/ADT/Entities/Mobs/Silicons/borg_chassis.yml +++ b/Resources/Prototypes/ADT/Entities/Mobs/Silicons/borg_chassis.yml @@ -32,7 +32,7 @@ - type: Construction node: security - type: AccessReader - access: [["Secutity"], ["Command"], ["Research"]] + access: [["Security"], ["Command"], ["Research"]] - type: Inventory templateId: borgTall - type: InteractionPopup diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/handcuffs.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/handcuffs.yml index 0e2fa411fcf..7bdea345865 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Misc/handcuffs.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/handcuffs.yml @@ -1,7 +1,7 @@ - type: entity id: ADTInfCablecuffs parent: Zipties - sufix: lingering, 1 + suffix: lingering, 1 components: - type: Handcuff breakoutTime: 3 @@ -31,4 +31,3 @@ icon: { sprite: "/Textures/Objects/Misc/zipties.rsi", state: cuff } spawn: Zipties maxCount: 5 - itemSize: 2 diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/Robotics/borg_modules.yml index db30157ca2d..1fa0c4c7cd3 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -17,7 +17,6 @@ - state: security - state: icons-detentions - type: ItemBorgModule - handCounher: 2 items: - ADTInfCablecuffs - ADTtelescopicBaton @@ -33,7 +32,6 @@ - state: security - state: icons-harm - type: ItemBorgModule - handCounher: 2 items: - Truncheon - ADTWeaponLaserCarbineBorg @@ -48,7 +46,6 @@ - state: security - state: icons-disabler - type: ItemBorgModule - handCounher: 2 items: - ADTInfCablecuffs - ADTWeaponDisablerBorg diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/Robotics/borg_parts.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/Robotics/borg_parts.yml index 7f9423a79e9..60bda2ceb73 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Specific/Robotics/borg_parts.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Specific/Robotics/borg_parts.yml @@ -6,8 +6,6 @@ - type: Sprite sprite: Objects/Specific/Robotics/cyborg_parts.rsi state: security_l_arm - - type: Icon - state: security_l_arm - type: Tag tags: - Trash @@ -22,8 +20,6 @@ - type: Sprite sprite: Objects/Specific/Robotics/cyborg_parts.rsi state: security_r_arm - - type: Icon - state: security_r_arm - type: Tag tags: - Trash @@ -38,8 +34,6 @@ - type: Sprite sprite: Objects/Specific/Robotics/cyborg_parts.rsi state: security_l_leg - - type: Icon - state: securityy_l_leg - type: Tag tags: - Trash @@ -54,8 +48,6 @@ - type: Sprite sprite: Objects/Specific/Robotics/cyborg_parts.rsi state: security_r_leg - - type: Icon - state: security_r_leg - type: Tag tags: - Trash @@ -70,8 +62,6 @@ - type: Sprite sprite: Objects/Specific/Robotics/cyborg_parts.rsi state: security_head - - type: Icon - state: security_head - type: Tag tags: - Trash @@ -86,8 +76,6 @@ - type: Sprite sprite: Objects/Specific/Robotics/cyborg_parts.rsi state: security_chest - - type: Icon - state: security_chest - type: Tag tags: - Trash diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml index 47d6ab683d6..9c1bb5296a5 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml @@ -18,7 +18,7 @@ Zipties: 12 RiotShield: 2 RiotLaserShield: 2 - RiotBulletShield: 2 + # RiotBulletShield: 2 ADT no nullet shield RadioHandheldSecurity: 5 Bola: 5 #ADT tweak # security officers need to follow a diet regimen! diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/security.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/security.yml index f5585a5e32f..c3889707b85 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/security.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/security.yml @@ -1,4 +1,4 @@ -# Security +# Security - type: entity name: security loot spawner suffix: Gear, Simple @@ -52,7 +52,7 @@ - SecurityWhistle - Tourniquet chance: 0.85 - + # Armory loot spawner # Automatics are a complete mess right now, so the AK-MS And WT-550 have been commented out for consistency's sake. I have no idea what role these guns are supposed to fufill. - type: entity @@ -76,7 +76,7 @@ rareChance: 0.05 prototypes: - RiotShield - - RiotBulletShield + # - RiotBulletShield ADT no nullet shield - RiotLaserShield - ClothingHeadHelmetBasic - ClothingHeadHelmetRiot @@ -137,7 +137,7 @@ rareChance: 0.05 prototypes: - RiotShield - - RiotBulletShield + # - RiotBulletShield ADT no nullet shield - RiotLaserShield - ClothingHeadHelmetBasic - ClothingHeadHelmetRiot @@ -145,4 +145,4 @@ - ClothingOuterArmorRiot - ClothingOuterArmorBulletproof chance: 0.95 - offset: 0.0 \ No newline at end of file + offset: 0.0 diff --git a/Resources/Prototypes/Entities/Objects/Shields/shields.yml b/Resources/Prototypes/Entities/Objects/Shields/shields.yml index ceaa766aa02..b59e430a23b 100644 --- a/Resources/Prototypes/Entities/Objects/Shields/shields.yml +++ b/Resources/Prototypes/Entities/Objects/Shields/shields.yml @@ -126,13 +126,13 @@ - type: Blocking passiveBlockModifier: coefficients: - Blunt: 3.6 - Slash: 3.6 + Blunt: 1.3 + Slash: 1.3 Piercing: 0.7 activeBlockModifier: coefficients: - Blunt: 3.6 - Slash: 3.6 + Blunt: 1.3 + Slash: 1.3 Piercing: 0.5 flatReductions: Piercing: 1 diff --git a/Resources/Prototypes/Entities/Objects/Tools/emag.yml b/Resources/Prototypes/Entities/Objects/Tools/emag.yml index e10ecd05d99..b011a70793c 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/emag.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/emag.yml @@ -39,5 +39,5 @@ id: Emag suffix: Limited components: - - type: LimitedCharges - - type: AutoRecharge + - type: LimitedCharges + - type: AutoRecharge diff --git a/Resources/Textures/Objects/Weapons/Melee/shields.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/shields.rsi/meta.json index 2d2663c1580..a98cee17040 100644 --- a/Resources/Textures/Objects/Weapons/Melee/shields.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/shields.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/Citadel-Station-13/Citadel-Station-13/commit/84223c65f5caf667a84f3c0f49bc2a41cdc6c4e3", + "copyright": "Taken from https://github.com/Citadel-Station-13/Citadel-Station-13/commit/84223c65f5caf667a84f3c0f49bc2a41cdc6c4e3, riot taken from https://github.com/tgstation/tgstation/commit/6323ee68d9c893bd096b17a86470695038826143", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Weapons/Melee/shields.rsi/riot-icon.png b/Resources/Textures/Objects/Weapons/Melee/shields.rsi/riot-icon.png index 29b2087910c..553a225f865 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/shields.rsi/riot-icon.png and b/Resources/Textures/Objects/Weapons/Melee/shields.rsi/riot-icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/shields.rsi/riot-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/shields.rsi/riot-inhand-left.png index f4d5743d0d5..7ef28e77953 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/shields.rsi/riot-inhand-left.png and b/Resources/Textures/Objects/Weapons/Melee/shields.rsi/riot-inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/shields.rsi/riot-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/shields.rsi/riot-inhand-right.png index 2765e99f209..48d8de05297 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/shields.rsi/riot-inhand-right.png and b/Resources/Textures/Objects/Weapons/Melee/shields.rsi/riot-inhand-right.png differ diff --git a/Resources/migration.yml b/Resources/migration.yml index 996914b3b54..60553c42ecc 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -469,4 +469,8 @@ LGBTQFlag: DrinkBottleVodka ClothingOuterArmorHeavy: null ClothingOuterArmorHeavyRed: null ClothingOuterArmorHeavyGreen: null + +#2024-09-06 + +RiotBulletShield: #ADT end