From d5236d8236d3638a4dcd54a4a219c4b9a44d34c4 Mon Sep 17 00:00:00 2001 From: Ilya246 <57039557+Ilya246@users.noreply.github.com> Date: Fri, 26 Jul 2024 03:37:54 +0400 Subject: [PATCH] give nukie reinforcements full operative gear (#30173) * rebase master * free fish * introduce recommended changes * fix prototypes * fix protos yet again * fkhsdjbhehbo;ehb * rafle --- .../en-US/ghost/roles/ghost-role-component.ftl | 3 +++ Resources/Locale/en-US/store/uplink-catalog.ftl | 5 +++-- Resources/Prototypes/Catalog/uplink_catalog.yml | 10 +++++----- .../Prototypes/Entities/Mobs/Player/human.yml | 8 ++++++-- .../reinforcement_teleporter.yml | 10 +++++++--- Resources/Prototypes/Roles/Antags/nukeops.yml | 12 +++++++++--- Resources/Prototypes/Roles/Antags/traitor.yml | 8 -------- .../Objects/Devices/communication.rsi/meta.json | 3 +++ .../communication.rsi/old-radio-nukeop.png | Bin 0 -> 1578 bytes 9 files changed, 36 insertions(+), 23 deletions(-) create mode 100644 Resources/Textures/Objects/Devices/communication.rsi/old-radio-nukeop.png diff --git a/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl b/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl index b2082f7728..6dc214fc10 100644 --- a/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl +++ b/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl @@ -206,6 +206,9 @@ ghost-role-information-syndicate-reinforcement-spy-description = Someone needs r ghost-role-information-syndicate-reinforcement-thief-name = Syndicate Thief ghost-role-information-syndicate-reinforcement-thief-description = Someone needs reinforcements. Your job is to break in and retrieve something valuable for your agent. +ghost-role-information-nukeop-reinforcement-name = Nuclear Operative +ghost-role-information-nukeop-reinforcement-description = The nuclear operatives need reinforcements. You, a reserve agent, will help them. +ghost-role-information-nukeop-reinforcement-rules = You are a [color=red][bold]Team Antagonist[/bold][/color] with the nuclear operatives who summoned you. ghost-role-information-syndicate-monkey-reinforcement-name = Syndicate Monkey Agent ghost-role-information-syndicate-monkey-reinforcement-description = Someone needs reinforcements. You, a trained monkey, will help them. diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index 85a64c71ae..07edd8f007 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -124,10 +124,11 @@ uplink-black-jetpack-desc = A black jetpack. It allows you to fly around in spac uplink-reinforcement-radio-ancestor-name = Genetic Ancestor Reinforcement Teleporter uplink-reinforcement-radio-ancestor-desc = Call in a trained ancestor of your choosing to assist you. Comes with a single syndicate cigarette. - uplink-reinforcement-radio-name = Reinforcement Teleporter uplink-reinforcement-radio-traitor-desc = Radio in a reinforcement agent of extremely questionable quality. No off button, buy this if you're ready to party. Call in a medic or spy or thief to help you out. Good luck. -uplink-reinforcement-radio-nukeops-desc = Radio in a reinforcement agent of extremely questionable quality. No off button, buy this if you're ready to party. They have a pistol with no reserve ammo, and a knife. That's it. + +uplink-reinforcement-radio-nukeops-name = Nuclear Operative Teleporter +uplink-reinforcement-radio-nukeops-desc = Radio in a nuclear operative of extremely questionable quality. No off button, buy this if you're ready to party. They have basic nuclear operative gear. uplink-reinforcement-radio-cyborg-assault-name = Syndicate Assault Cyborg Teleporter uplink-reinforcement-radio-cyborg-assault-desc = A lean, mean killing machine with access to an Energy Sword, LMG, Cryptographic Sequencer, and a Pinpointer. diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index fe8b038dd9..5a92bc77f8 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -122,7 +122,7 @@ name: uplink-sniper-bundle-name description: uplink-sniper-bundle-desc icon: { sprite: /Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi, state: base } - productEntity: BriefcaseSyndieSniperBundleFilled + productEntity: BriefcaseSyndieSniperBundleFilled cost: Telecrystal: 12 categories: @@ -916,11 +916,11 @@ - NukeOpsUplink - type: listing - id: UplinkReinforcementRadioSyndicateNukeops # Version for Nukeops that spawns an agent with the NukeOperative component. - name: uplink-reinforcement-radio-name + id: UplinkReinforcementRadioSyndicateNukeops # Version for Nukeops that spawns another nuclear operative without the uplink. + name: uplink-reinforcement-radio-nukeops-name description: uplink-reinforcement-radio-nukeops-desc productEntity: ReinforcementRadioSyndicateNukeops - icon: { sprite: Objects/Devices/communication.rsi, state: old-radio-urist } + icon: { sprite: Objects/Devices/communication.rsi, state: old-radio-nukeop } cost: Telecrystal: 35 categories: @@ -1004,7 +1004,7 @@ Telecrystal: 6 categories: - UplinkAllies - + - type: listing id: UplinkSyndicatePersonalAI name: uplink-syndicate-pai-name diff --git a/Resources/Prototypes/Entities/Mobs/Player/human.yml b/Resources/Prototypes/Entities/Mobs/Player/human.yml index ad72f2e065..e07ce9c5b4 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/human.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/human.yml @@ -62,9 +62,13 @@ id: MobHumanSyndicateAgentNukeops # Reinforcement exclusive to nukeops uplink suffix: Human, NukeOps components: - - type: Loadout - prototypes: [SyndicateOperativeGearReinforcementNukeOps] - type: NukeOperative + - type: RandomMetadata + nameSegments: + - nukeops-role-operator + - SyndicateNamesNormal + - type: Loadout + prototypes: [SyndicateOperativeGearFullNoUplink] # Nuclear Operative - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml index 6aa2686fa6..e4bca77069 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml @@ -35,12 +35,16 @@ - type: entity parent: ReinforcementRadio id: ReinforcementRadioSyndicateNukeops # Reinforcement radio exclusive to nukeops uplink + name: nuclear operative radio + description: Call in a nuclear operative of questionable quality, instantly! Basic nukeop equipment provided. suffix: NukeOps components: - type: GhostRole - name: ghost-role-information-syndicate-reinforcement-name - description: ghost-role-information-syndicate-reinforcement-description - rules: ghost-role-information-syndicate-reinforcement-rules + name: ghost-role-information-nukeop-reinforcement-name + description: ghost-role-information-nukeop-reinforcement-description + rules: ghost-role-information-nukeop-reinforcement-rules + raffle: + settings: default - type: GhostRoleMobSpawner prototype: MobHumanSyndicateAgentNukeops diff --git a/Resources/Prototypes/Roles/Antags/nukeops.yml b/Resources/Prototypes/Roles/Antags/nukeops.yml index 7cfed348f1..8dec692ee5 100644 --- a/Resources/Prototypes/Roles/Antags/nukeops.yml +++ b/Resources/Prototypes/Roles/Antags/nukeops.yml @@ -38,9 +38,8 @@ # should be changed to nukie playtime when thats tracked (wyci) guides: [ NuclearOperatives ] -#Nuclear Operative Gear - type: startingGear - id: SyndicateOperativeGearFull + id: SyndicateOperativeGearFullNoUplink equipment: jumpsuit: ClothingUniformJumpsuitOperative back: ClothingBackpackDuffelSyndicate @@ -52,7 +51,7 @@ shoes: ClothingShoesBootsCombatFilled id: SyndiPDA pocket1: DoubleEmergencyOxygenTankFilled - pocket2: BaseUplinkRadio40TC + pocket2: PlushieCarp belt: ClothingBeltMilitaryWebbing storage: back: @@ -61,6 +60,13 @@ - PinpointerSyndicateNuclear - DeathAcidifierImplanter +#Nuclear Operative Gear +- type: startingGear + id: SyndicateOperativeGearFull + parent: SyndicateOperativeGearFullNoUplink + equipment: + pocket2: BaseUplinkRadio40TC + #Nuclear Operative Commander Gear - type: startingGear id: SyndicateCommanderGearFull diff --git a/Resources/Prototypes/Roles/Antags/traitor.yml b/Resources/Prototypes/Roles/Antags/traitor.yml index feb8109739..e40466d57f 100644 --- a/Resources/Prototypes/Roles/Antags/traitor.yml +++ b/Resources/Prototypes/Roles/Antags/traitor.yml @@ -78,14 +78,6 @@ - BoxSurvivalSyndicate - SyndicateJawsOfLife -# Syndicate Reinforcement NukeOps -- type: startingGear - id: SyndicateOperativeGearReinforcementNukeOps - parent: SyndicateOperativeGearExtremelyBasic - equipment: - id: SyndiPDA #Do not give a PDA to the normal Reinforcement - it will spawn with a 20TC uplink - - #Syndicate Operative Outfit - Basic - type: startingGear id: SyndicateOperativeGearBasic diff --git a/Resources/Textures/Objects/Devices/communication.rsi/meta.json b/Resources/Textures/Objects/Devices/communication.rsi/meta.json index 328747df09..784e509c1d 100644 --- a/Resources/Textures/Objects/Devices/communication.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/communication.rsi/meta.json @@ -86,6 +86,9 @@ { "name": "old-radio-urist" }, + { + "name": "old-radio-nukeop" + }, { "name": "old-radio-ancestor" }, diff --git a/Resources/Textures/Objects/Devices/communication.rsi/old-radio-nukeop.png b/Resources/Textures/Objects/Devices/communication.rsi/old-radio-nukeop.png new file mode 100644 index 0000000000000000000000000000000000000000..b5befcf26db4cfb01b6dec2fc540e0b9e8cf1465 GIT binary patch literal 1578 zcmV+_2G#kAP)c9Ugyg9KZ_#zL?V zZG08}18oIc1wl{*5ld@djfC}%8;FRRW%hoYnRA&r1EIL7TW;MTSUJy0OvR!Li%Ze) z3t`%5WsD|GckPLpnK)I)=N&bw-VUf<)%X27no@?VLrsJ5h;BQc@VIb%&9fD63AgK6 zEhT&?-0#Q%g|C#J4ER}bCg69)&Rk*=LaJvp^NW+eSkF3^aG!9uWft`EdDKmsjokdK z)J~aQxFnb&MwBE4Rx$AykeZXs{`U?3_@>E=N0+}%5l0*uvf}L*wIE#$scF#-`Amu` z_rH0%>EWTEdvgrxpM3wV2f{m0+V=ggBi}C_L+vA6IZ%!|N%uEJE82G%g2OmDf4Bhq-lmqHEaOhhEtqS@{MA!DtN) zJD?H(000SaNLh0L01FZT01FZU(%pXi000DGNkl&3-mnJYWG9o*jPSxk$(P-p*X7djF8-W0R*xHf` z7J+;uIy*aMy^+#SwyB+)$ zqY39OyuB-dIf@TS2=sjgT)6_H zp#;Ti>j+VbPu8TKo%iKFhy*xkA(OxT!W;K|BdOR+t1YOlDC594ZB3~yb=pf{!~DBJqg#>5-^%l zCmU%Rlg$3^N$r4B?U{aEhTQw(1Nd;G1PiPtbS&H?l!{N~AZ{!zU`z!|mB7Y&Qq|k) z`etQb>8JBg)s0p=K8VcmG;A6e39SK_=DffObIu5Ax1aA!$rSdNl}T1u^N&+sL`Pls zd4xX3t`XSn4#*{zTD$y>(S{n+F(fQ&!0-?fXWH;nSt%BRt9-ZM-=<(M zLSUgZ7!_V(y*%&wf)WU+cp1v!c|kr%gq&vKzpF{&>!wq_U?3>+2B=X74JG$8&K1 ci~oE12cs__^f>bMRR91007*qoM6N<$g1>w5zyJUM literal 0 HcmV?d00001 -- 2.52.0