From 7d4849ab17bee96bca00dafaa03dcee3ccbc52db Mon Sep 17 00:00:00 2001 From: Ilya246 Date: Sun, 7 Jul 2024 21:45:33 +0400 Subject: [PATCH 1/7] rebase master --- .../Locale/en-US/ghost/roles/ghost-role-component.ftl | 3 +++ Resources/Locale/en-US/store/uplink-catalog.ftl | 5 +++-- Resources/Prototypes/Catalog/uplink_catalog.yml | 8 ++++---- Resources/Prototypes/Entities/Mobs/Player/human.yml | 6 ++++++ .../Syndicate_Gadgets/reinforcement_teleporter.yml | 8 +++++--- Resources/Prototypes/Roles/Antags/nukeops.yml | 11 ++++++++--- 6 files changed, 29 insertions(+), 12 deletions(-) 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 b2082f772805..6dc214fc108e 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 85a64c71ae18..07edd8f00751 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 fe8b038dd924..530c01be8f4e 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,8 +916,8 @@ - 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 } @@ -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 0b718746e13e..215d28a67bf4 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/human.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/human.yml @@ -65,6 +65,12 @@ - type: Loadout prototypes: [SyndicateOperativeGearReinforcementNukeOps] - type: NukeOperative + - type: RandomMetadata + nameSegments: + - SyndicateNamesPrefix + - SyndicateNamesNormal + - type: Loadout + prototypes: [SyndicateOperativeGearNoUplink] # 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 6aa2686fa617..3f19a81da557 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,14 @@ - 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 - type: GhostRoleMobSpawner prototype: MobHumanSyndicateAgentNukeops diff --git a/Resources/Prototypes/Roles/Antags/nukeops.yml b/Resources/Prototypes/Roles/Antags/nukeops.yml index 7cfed348f183..d59fe5e505e0 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: SyndicateOperativeGearNoUplink equipment: jumpsuit: ClothingUniformJumpsuitOperative back: ClothingBackpackDuffelSyndicate @@ -52,7 +51,6 @@ shoes: ClothingShoesBootsCombatFilled id: SyndiPDA pocket1: DoubleEmergencyOxygenTankFilled - pocket2: BaseUplinkRadio40TC belt: ClothingBeltMilitaryWebbing storage: back: @@ -61,6 +59,13 @@ - PinpointerSyndicateNuclear - DeathAcidifierImplanter +#Nuclear Operative Gear +- type: startingGear + id: SyndicateOperativeGearFull + parent: SyndicateOperativeGearNoUplink + equipment: + pocket2: BaseUplinkRadio40TC + #Nuclear Operative Commander Gear - type: startingGear id: SyndicateCommanderGearFull From 2bd55f6e2bc6363d7dc245efacf3fcf0f1e975fb Mon Sep 17 00:00:00 2001 From: Ilya246 Date: Fri, 19 Jul 2024 20:51:22 +0400 Subject: [PATCH 2/7] free fish --- Resources/Prototypes/Roles/Antags/nukeops.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/Roles/Antags/nukeops.yml b/Resources/Prototypes/Roles/Antags/nukeops.yml index d59fe5e505e0..019ab0f89d94 100644 --- a/Resources/Prototypes/Roles/Antags/nukeops.yml +++ b/Resources/Prototypes/Roles/Antags/nukeops.yml @@ -51,6 +51,7 @@ shoes: ClothingShoesBootsCombatFilled id: SyndiPDA pocket1: DoubleEmergencyOxygenTankFilled + pocket2: PlushieCarp belt: ClothingBeltMilitaryWebbing storage: back: From 679fe286e71ee13c9f1526b581e26c947b2dbcc6 Mon Sep 17 00:00:00 2001 From: Ilya246 Date: Fri, 19 Jul 2024 22:25:15 +0400 Subject: [PATCH 3/7] introduce recommended changes --- Resources/Prototypes/Catalog/uplink_catalog.yml | 2 +- .../Prototypes/Entities/Mobs/Player/human.yml | 2 +- .../Objects/Devices/communication.rsi/meta.json | 3 +++ .../communication.rsi/old-radio-nukeop.png | Bin 0 -> 1578 bytes 4 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/Objects/Devices/communication.rsi/old-radio-nukeop.png diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 530c01be8f4e..5a92bc77f81c 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -920,7 +920,7 @@ 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: diff --git a/Resources/Prototypes/Entities/Mobs/Player/human.yml b/Resources/Prototypes/Entities/Mobs/Player/human.yml index 215d28a67bf4..4e853e4d2a3e 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/human.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/human.yml @@ -67,7 +67,7 @@ - type: NukeOperative - type: RandomMetadata nameSegments: - - SyndicateNamesPrefix + - nukeops-role-operator - SyndicateNamesNormal - type: Loadout prototypes: [SyndicateOperativeGearNoUplink] diff --git a/Resources/Textures/Objects/Devices/communication.rsi/meta.json b/Resources/Textures/Objects/Devices/communication.rsi/meta.json index 328747df09aa..784e509c1d3b 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 From 6ea27df676e0bac399130f7165b42eef3301bf8c Mon Sep 17 00:00:00 2001 From: Ilya246 Date: Sun, 21 Jul 2024 18:57:16 +0400 Subject: [PATCH 4/7] fix prototypes --- Resources/Prototypes/Entities/Mobs/Player/human.yml | 2 -- Resources/Prototypes/Roles/Antags/nukeops.yml | 2 +- Resources/Prototypes/Roles/Antags/traitor.yml | 8 -------- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/Player/human.yml b/Resources/Prototypes/Entities/Mobs/Player/human.yml index 4e853e4d2a3e..5f20dc32e537 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/human.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/human.yml @@ -62,8 +62,6 @@ id: MobHumanSyndicateAgentNukeops # Reinforcement exclusive to nukeops uplink suffix: Human, NukeOps components: - - type: Loadout - prototypes: [SyndicateOperativeGearReinforcementNukeOps] - type: NukeOperative - type: RandomMetadata nameSegments: diff --git a/Resources/Prototypes/Roles/Antags/nukeops.yml b/Resources/Prototypes/Roles/Antags/nukeops.yml index 019ab0f89d94..a46d85815f47 100644 --- a/Resources/Prototypes/Roles/Antags/nukeops.yml +++ b/Resources/Prototypes/Roles/Antags/nukeops.yml @@ -39,7 +39,7 @@ guides: [ NuclearOperatives ] - type: startingGear - id: SyndicateOperativeGearNoUplink + id: SyndicateOperativeGearFullNoUplink equipment: jumpsuit: ClothingUniformJumpsuitOperative back: ClothingBackpackDuffelSyndicate diff --git a/Resources/Prototypes/Roles/Antags/traitor.yml b/Resources/Prototypes/Roles/Antags/traitor.yml index feb810973905..e40466d57fe0 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 From ba0480125642a480050c3523648baf13583d8816 Mon Sep 17 00:00:00 2001 From: Ilya246 Date: Sun, 21 Jul 2024 18:58:25 +0400 Subject: [PATCH 5/7] fix protos yet again --- Resources/Prototypes/Entities/Mobs/Player/human.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Mobs/Player/human.yml b/Resources/Prototypes/Entities/Mobs/Player/human.yml index 5f20dc32e537..9538300b0623 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/human.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/human.yml @@ -68,7 +68,7 @@ - nukeops-role-operator - SyndicateNamesNormal - type: Loadout - prototypes: [SyndicateOperativeGearNoUplink] + prototypes: [SyndicateOperativeGearFullNoUplink] # Nuclear Operative - type: entity From 4e37c1d2ab7387f90a3e363f3f54ccad06a64a11 Mon Sep 17 00:00:00 2001 From: Ilya246 Date: Sun, 21 Jul 2024 19:02:49 +0400 Subject: [PATCH 6/7] fkhsdjbhehbo;ehb --- Resources/Prototypes/Roles/Antags/nukeops.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Roles/Antags/nukeops.yml b/Resources/Prototypes/Roles/Antags/nukeops.yml index a46d85815f47..8dec692ee56d 100644 --- a/Resources/Prototypes/Roles/Antags/nukeops.yml +++ b/Resources/Prototypes/Roles/Antags/nukeops.yml @@ -63,7 +63,7 @@ #Nuclear Operative Gear - type: startingGear id: SyndicateOperativeGearFull - parent: SyndicateOperativeGearNoUplink + parent: SyndicateOperativeGearFullNoUplink equipment: pocket2: BaseUplinkRadio40TC From 773d717af25100c8305c16aaefd4f2f57ae134e7 Mon Sep 17 00:00:00 2001 From: Ilya246 Date: Sun, 21 Jul 2024 19:09:38 +0400 Subject: [PATCH 7/7] rafle --- .../Devices/Syndicate_Gadgets/reinforcement_teleporter.yml | 2 ++ 1 file changed, 2 insertions(+) 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 3f19a81da557..e4bca7706929 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml @@ -43,6 +43,8 @@ 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