From 0f0b141f218008b41d95945355720f9fcb082622 Mon Sep 17 00:00:00 2001 From: ThatGuyUSA Date: Thu, 21 Nov 2024 05:22:57 -0800 Subject: [PATCH] Syndicate item fix ups (#33435) tweaks and fixes --- Resources/Locale/en-US/contraband/contraband-severity.ftl | 2 +- Resources/Locale/en-US/store/uplink-catalog.ftl | 6 +++--- Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml | 2 +- Resources/Prototypes/Entities/Mobs/Player/silicon.yml | 2 +- Resources/Prototypes/Entities/Objects/Fun/darts.yml | 2 +- .../Entities/Objects/Specific/Medical/hypospray.yml | 2 +- .../Entities/Objects/Specific/Robotics/borg_modules.yml | 6 +++--- .../Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Resources/Locale/en-US/contraband/contraband-severity.ftl b/Resources/Locale/en-US/contraband/contraband-severity.ftl index 37d83c4575..303cb7c1d5 100644 --- a/Resources/Locale/en-US/contraband/contraband-severity.ftl +++ b/Resources/Locale/en-US/contraband/contraband-severity.ftl @@ -1,4 +1,4 @@ -contraband-examine-text-Minor = [color=yellow]This item is considered minor contraband.[/color] +contraband-examine-text-Minor = [color=yellow]This item is considered minor contraband.[/color] contraband-examine-text-Restricted = [color=yellow]This item is departmentally restricted.[/color] contraband-examine-text-Restricted-department = [color=yellow]This item is restricted to {$departments}, and may be considered contraband.[/color] contraband-examine-text-Major = [color=red]This item is considered major contraband.[/color] diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index a78f39d569..82c80dab1f 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -28,7 +28,7 @@ uplink-gloves-north-star-desc = A pair of gloves that reduce your punching coold # Explosives uplink-explosive-grenade-name = Explosive Grenade -uplink-explosive-grenade-desc = A simplistic grenade with a three-and-a-half-second long fuse that is geared towards injuring personnel. Causes minimal hull damage. +uplink-explosive-grenade-desc = A simplistic grenade with a 3.5 second long fuse that is geared towards injuring personnel. Causes minimal hull damage. uplink-flash-grenade-name = Flashbang uplink-flash-grenade-desc = A standard-issue flashbang, capable of blinding and slowing down anyone without proper protection. This, of course, includes you; make sure you're properly equipped before using it. @@ -37,7 +37,7 @@ uplink-smoke-grenade-name = Smoke Grenade uplink-smoke-grenade-desc = A grenade that releases a huge cloud of smoke, perfect for killing someone in the shadows or making a sneaky getaway. uplink-mini-bomb-name = Minibomb -uplink-mini-bomb-desc = A low-yield, high-impact precision sabotage explosive with a five-second long fuse. Perfect for quickly destroying a machine, dead body, or whatever else needs to go. +uplink-mini-bomb-desc = A low-yield, high-impact precision sabotage explosive with a 5 second long fuse. Perfect for quickly destroying a machine, dead body, or whatever else needs to go. uplink-supermatter-grenade-name = Supermatter Grenade uplink-supermatter-grenade-desc = Grenade that simulates delamination of a suppermatter engine, generates powerful gravity well. Explosion comparable to a Mini Bomb. @@ -405,7 +405,7 @@ uplink-outlaw-glasses-name = Outlaw Glasses uplink-outlaw-glasses-desc = A must for every self-respecting undercover agent. uplink-costume-pyjama-name = Syndicate Pyjama Duffel Bag -uplink-costume-pyjama-desc = Contains 3 pairs of syndicate pyjamas and 3 plushies for the ultimate sleepover. +uplink-costume-pyjama-desc = Contains 3 pairs of syndicate pyjamas and 4 plushies for the ultimate sleepover. uplink-costume-clown-name = Clown Costume Duffel Bag uplink-costume-clown-desc = Contains a complete Clown outfit. Includes PDA and service radio. diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml index 75b3a29065..bc4b6411d1 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml @@ -159,7 +159,7 @@ parent: ClothingBackpackDuffelSyndicateBundle id: ClothingBackpackDuffelSyndicatePyjamaBundle name: syndicate pyjama duffel bag - description: Contains 3 pairs of syndicate pyjamas and 3 plushies for the ultimate sleepover. + description: Contains 3 pairs of syndicate pyjamas and 4 plushies for the ultimate sleepover. components: - type: Storage grid: diff --git a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml index bcac46ed84..611f73a3dd 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml @@ -251,7 +251,7 @@ - type: entity id: AntimovCircuitBoard - parent: BaseElectronics + parent: [BaseElectronics, BaseSyndicateContraband] name: law board (Antimov) description: An electronics board containing the Antimov lawset. components: diff --git a/Resources/Prototypes/Entities/Objects/Fun/darts.yml b/Resources/Prototypes/Entities/Objects/Fun/darts.yml index a127930fea..4230a36108 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/darts.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/darts.yml @@ -195,7 +195,7 @@ id: HypoDartBox name: hypodart box suffix: HypoDart - description: A small box containing an hypodart. Packaging disintegrates when opened, leaving no evidence behind. + description: A small box containing a hypodart. Packaging disintegrates when opened, leaving no evidence behind. components: - type: Sprite sprite: Objects/Fun/Darts/dartbox.rsi diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml index 93eeef2073..067d40bbff 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml @@ -448,7 +448,7 @@ name: hyperzine microinjector parent: [ChemicalMedipen, BaseSyndicateContraband] id: StimpackMini - description: A microinjector of hyperzine that give you about fifteen seconds of the chemical's effects. + description: A microinjector of hyperzine that give you about 15 seconds of the chemical's effects. components: - type: Sprite sprite: Objects/Specific/Medical/medipen.rsi diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml index 0ac1171c5d..5cc3adef90 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -568,7 +568,7 @@ - type: entity id: BorgModuleOperative - parent: [ BaseBorgModuleSyndicate, BaseProviderBorgModule ] + parent: [ BaseBorgModuleSyndicate, BaseProviderBorgModule, BaseSyndicateContraband ] name: operative cyborg module description: A module that comes with a crowbar, an Emag and a syndicate pinpointer. components: @@ -586,7 +586,7 @@ - type: entity id: BorgModuleEsword - parent: [ BaseBorgModuleSyndicate, BaseProviderBorgModule ] + parent: [ BaseBorgModuleSyndicate, BaseProviderBorgModule, BaseSyndicateContraband ] name: energy sword cyborg module description: A module that comes with a double energy sword. components: @@ -603,7 +603,7 @@ - type: entity id: BorgModuleL6C - parent: [ BaseBorgModuleSyndicateAssault, BaseProviderBorgModule ] + parent: [ BaseBorgModuleSyndicateAssault, BaseProviderBorgModule, BaseSyndicateContraband ] name: L6C ROW cyborg module description: A module that comes with a L6C. components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index 5140a358e1..d23e34a1ec 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -82,7 +82,7 @@ - type: Appearance - type: entity - name: C-20r sub machine gun + name: C-20r submachine gun parent: [BaseWeaponSubMachineGun, BaseSyndicateContraband] id: WeaponSubMachineGunC20r description: A firearm that is often used by the infamous nuclear operatives. Uses .35 auto ammo. -- 2.51.2