diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml index c3a8a38a57..ff33f7f9eb 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml @@ -189,3 +189,15 @@ - type: StorageFill contents: - id: ClothingOuterHardsuitSyndie + +- type: entity + parent: ClothingBackpackDuffelSyndicate + id: ClothingBackpackDuffelSyndicateOperative + name: operative duffelbag + components: + - type: StorageFill + contents: + - id: BoxSurvivalSyndicate + - id: SurvivalKnife + - id: PistolClarissa + - id: BaseUplinkRadio40TC diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml index dcdecfc68b..a6dde8ea74 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml @@ -91,3 +91,21 @@ - id: EmergencyMedipen - id: Flare - id: FoodSnackChocolate + +- type: entity + name: extended-capacity survival box + parent: BoxCardboard + id: BoxSurvivalSyndicate + description: It's a box with basic internals inside. This one is labelled to contain an extended-capacity tank. + components: + - type: StorageFill + contents: + - id: ClothingMaskGasSyndicate + - id: ExtendedEmergencyOxygenTankFilled + - id: EmergencyMedipen + - id: Flare + - id: FoodSnackChocolate + - type: Sprite + layers: + - state: internals + - state: extendedtank \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 6b97f83f53..97b16ecfea 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -261,6 +261,13 @@ description: The Syndicate's well known armored blood red hardsuit, capable of space walks and bullet resistant. price: 8 +- type: uplinkListing + id: UplinkClothingShoesBootsMagSyndie + category: Armor + itemId: ClothingShoesBootsMagSyndie + description: A pair of magnetic boots that will keep you on the ground if the gravity fails or is sabotaged, giving you a mobility advantage. If activated with gravity they will protect from slips, but they will slow you down. + price: 2 + - type: uplinkListing id: UplinkEVASyndie category: Armor @@ -268,6 +275,8 @@ description: A simple EVA suit that offers no protection other than what's needed to survive in space. price: 4 + + # Misc - type: uplinkListing diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml index 925ebe4ce7..32a6290a5a 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml @@ -41,3 +41,14 @@ sprite: Clothing/Shoes/Boots/performer.rsi - type: Clothing sprite: Clothing/Shoes/Boots/performer.rsi + +- type: entity + parent: ClothingShoesBase + id: ClothingShoesBootsCombat + name: combat boots + description: Robust combat boots for combat scenarios or combat situations. All combat, all the time. + components: + - type: Sprite + sprite: Clothing/Shoes/Boots/jackboots.rsi + - type: Clothing + sprite: Clothing/Shoes/Boots/jackboots.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml index aa33d60255..c161e81029 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml @@ -46,3 +46,27 @@ sprintModifier: 1 enabled: false - type: NoSlip + +- type: entity + parent: ClothingShoesBase + id: ClothingShoesBootsMagSyndie + name: blood-red magboots + description: Reverse-engineered magnetic boots that have a heavy magnetic pull. Property of Gorlex Marauders. + components: + - type: Sprite + sprite: Clothing/Shoes/Boots/magboots-syndicate.rsi + state: icon + - type: Clothing + sprite: Clothing/Shoes/Boots/magboots-syndicate.rsi + - type: Magboots + toggleAction: + icon: Clothing/Shoes/Boots/magboots-syndicate.rsi/icon.png + iconOn: Clothing/Shoes/Boots/magboots-syndicate.rsi/icon-on.png + name: action-name-magboot-toggle + description: action-decription-magboot-toggle + itemIconStyle: NoItem + event: !type:ToggleActionEvent + - type: ClothingSpeedModifier + walkModifier: 0.85 + sprintModifier: 0.8 + enabled: false diff --git a/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml b/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml index c9cfbc3c6c..f490d8a631 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml @@ -73,6 +73,26 @@ presetInfo: balance: 20 + +#Default Nuclear Operative amount, not considering crew count +- type: entity + parent: BaseUplinkRadio + id: BaseUplinkRadio25TC + suffix: 25 TC + components: + - type: Uplink + presetInfo: + balance: 25 + +- type: entity + parent: BaseUplinkRadio + id: BaseUplinkRadio40TC + suffix: 40 TC + components: + - type: Uplink + presetInfo: + balance: 40 + - type: entity parent: BaseUplinkRadio id: BaseUplinkRadioDebug diff --git a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml index a55d3d772a..29eabf370a 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml @@ -64,3 +64,37 @@ innerclothingskirt: ClothingUniformJumpskirtColorBlack satchel: ClothingBackpackDuffelSyndicateAmmo duffelbag: ClothingBackpackDuffelSyndicateAmmo + +#Syndicate Operative Outfit - Basic +- type: startingGear + id: SyndicateOperativeGearBasic + equipment: + jumpsuit: ClothingUniformJumpsuitOperative + back: ClothingBackpackDuffelSyndicateOperative + ears: ClothingHeadsetAltSyndicate + gloves: ClothingHandsGlovesCombat + shoes: ClothingShoesBootsCombat + id: AgentIDCard + innerclothingskirt: ClothingUniformJumpsuitOperative + satchel: ClothingBackpackDuffelSyndicateOperative + duffelbag: ClothingBackpackDuffelSyndicateOperative + +#Syndicate Operative Outfit - Full Kit +- type: startingGear + id: SyndicateOperativeGearFull + equipment: + jumpsuit: ClothingUniformJumpsuitOperative + back: ClothingBackpackDuffelSyndicateOperative + mask: ClothingMaskGasSyndicate + # eyes: Night Vision Goggles whenever they're made + eyes: ClothingEyesGlassesMeson + ears: ClothingHeadsetAltSyndicate + gloves: ClothingHandsGlovesCombat + outerClothing: ClothingOuterHardsuitSyndie + shoes: ClothingShoesBootsCombat + id: AgentIDCard + pocket1: ExtendedEmergencyOxygenTankFilled + belt: ClothingBeltMilitaryWebbing + innerclothingskirt: ClothingUniformJumpsuitOperative + satchel: ClothingBackpackDuffelSyndicateOperative + duffelbag: ClothingBackpackDuffelSyndicateOperative diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/equipped-FEET.png new file mode 100644 index 0000000000..f83edfab43 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/icon-on.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/icon-on.png new file mode 100644 index 0000000000..68fd67a438 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/icon-on.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/icon.png new file mode 100644 index 0000000000..ef258167a2 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/inhand-left.png new file mode 100644 index 0000000000..7c279de231 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/inhand-right.png new file mode 100644 index 0000000000..c069f28203 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/meta.json new file mode 100644 index 0000000000..ead74d8896 --- /dev/null +++ b/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/debf90acfcafa4fb8d6723a37e0b8ac556c0702b", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-FEET", + "directions": 4 + }, + { + "name": "on-equipped-FEET", + "directions": 4 + }, + { + "name": "icon" + }, + { + "name": "icon-on" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "on-inhand-left", + "directions": 4 + }, + { + "name": "on-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/on-equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/on-equipped-FEET.png new file mode 100644 index 0000000000..9ed90aed55 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/on-equipped-FEET.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/on-inhand-left.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/on-inhand-left.png new file mode 100644 index 0000000000..36ea8a7a3e Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/on-inhand-right.png b/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/on-inhand-right.png new file mode 100644 index 0000000000..29b824f637 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/on-inhand-right.png differ