From ae5dcbabeef10352ea0b8c52beefd69523d6d88f Mon Sep 17 00:00:00 2001 From: brainfood1183 <113240905+brainfood1183@users.noreply.github.com> Date: Sun, 13 Aug 2023 08:18:09 +0100 Subject: [PATCH] Holoclown (clown only) syndicate uplink item. (#18966) * Holoclown (clown only) syndicate uplink item. * added clumsy to holoclown * holoclown now uses clown names, holoclown kits box now counts as boxhugs for crafting. * gibs holoparasite on death if has hands (this will cause the items in hands and pockets to drop. --- Content.Server/Guardian/GuardianSystem.cs | 7 ++ .../ghost/roles/ghost-role-component.ftl | 3 + .../Locale/en-US/store/uplink-catalog.ftl | 4 + .../Prototypes/Catalog/uplink_catalog.yml | 15 ++++ .../Entities/Mobs/Player/guardian.yml | 73 ++++++++++++++++++ .../Entities/Mobs/Player/humanoid.yml | 1 - .../Syndicate_Gadgets/guardian_activators.yml | 28 +++++++ .../Entities/Objects/Fun/figurines.yml | 12 ++- .../holoclown_inventory_template.yml | 22 ++++++ .../Prototypes/Roles/Jobs/Fun/cluwne.yml | 6 ++ .../Guardians/guardians.rsi/holoclown.png | Bin 0 -> 23383 bytes .../guardians.rsi/holoclown_base.png | Bin 0 -> 23383 bytes .../guardians.rsi/holoclown_flare.png | Bin 0 -> 20840 bytes .../Aliens/Guardians/guardians.rsi/meta.json | 32 +++++++- .../Objects/Fun/figurines.rsi/holoclown.png | Bin 0 -> 18279 bytes .../Objects/Fun/figurines.rsi/meta.json | 5 +- 16 files changed, 204 insertions(+), 4 deletions(-) create mode 100644 Resources/Prototypes/InventoryTemplates/holoclown_inventory_template.yml create mode 100644 Resources/Textures/Mobs/Aliens/Guardians/guardians.rsi/holoclown.png create mode 100644 Resources/Textures/Mobs/Aliens/Guardians/guardians.rsi/holoclown_base.png create mode 100644 Resources/Textures/Mobs/Aliens/Guardians/guardians.rsi/holoclown_flare.png create mode 100644 Resources/Textures/Objects/Fun/figurines.rsi/holoclown.png diff --git a/Content.Server/Guardian/GuardianSystem.cs b/Content.Server/Guardian/GuardianSystem.cs index ed6811449b..24d7a7e838 100644 --- a/Content.Server/Guardian/GuardianSystem.cs +++ b/Content.Server/Guardian/GuardianSystem.cs @@ -1,4 +1,6 @@ +using Content.Server.Inventory; using Content.Server.Popups; +using Content.Server.Body.Systems; using Content.Shared.Actions; using Content.Shared.Audio; using Content.Shared.Damage; @@ -14,6 +16,7 @@ using Robust.Server.GameObjects; using Robust.Shared.Containers; using Robust.Shared.Player; using Robust.Shared.Utility; +using Content.Shared.Hands.Components; namespace Content.Server.Guardian { @@ -28,6 +31,7 @@ namespace Content.Server.Guardian [Dependency] private readonly SharedActionsSystem _actionSystem = default!; [Dependency] private readonly SharedHandsSystem _handsSystem = default!; [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private readonly BodySystem _bodySystem = default!; public override void Initialize() { @@ -94,6 +98,9 @@ namespace Content.Server.Guardian if (component.HostedGuardian == null) return; + if (HasComp(component.HostedGuardian.Value)) + _bodySystem.GibBody(component.HostedGuardian.Value); + EntityManager.QueueDeleteEntity(component.HostedGuardian.Value); _actionSystem.RemoveAction(uid, component.Action); } 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 11a8437b8a..5a05b713fe 100644 --- a/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl +++ b/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl @@ -94,6 +94,9 @@ ghost-role-information-guardian-description = Listen to your owner. Don't tank d ghost-role-information-holoparasite-name = Holoparasite ghost-role-information-holoparasite-description = Listen to your owner. Don't tank damage. Punch people hard. +ghost-role-information-holoclown-name = Holoclown +ghost-role-information-holoclown-description = Listen to your owner. Utilize your pockets and hand to help your owner. + ghost-role-information-ifrit-name = Ifrit ghost-role-information-ifrit-description = Listen to your owner. Don't tank damage. Punch people hard. diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index fc301e482c..1011d44fff 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -84,6 +84,10 @@ uplink-holopara-kit-name = Holoparasite Kit uplink-holopara-kit-desc = The pride and joy of Cybersun. Contains an injector that hosts a sentient metaphysical guardian made of hard light which resides in the user's body when not active. The guardian can punch rapidly and is immune to hazardous environments while being resistant to direct trauma, but shares any damage it takes with the user. +uplink-holoclown-kit-name = Holoclown Kit +uplink-holoclown-kit-desc = A joint venture between Cybersun and Honk.co. Contains an injector that hosts a sentient metaphysical clown made of hard light which resides in the user's body when not active. + The holoclown has pockets to store things, a hardlight hand it can manipulate the environment with and is immune to hazardous environments while being resistant to direct trauma, but shares any damage it takes with the user. + uplink-holster-name = Shoulder Holster uplink-holster-desc = A deep shoulder holster capable of holding many types of ballistics. diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index b3abfad1b2..3dd2f0f993 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -922,6 +922,21 @@ whitelist: - Clown +- type: listing + id: UplinkHoloclownKit + name: uplink-holoclown-kit-name + description: uplink-holoclown-kit-desc + icon: { sprite: /Textures/Objects/Fun/figurines.rsi, state: holoclown } + productEntity: BoxHoloclown + cost: + Telecrystal: 12 + categories: + - UplinkJob + conditions: + - !type:BuyerJobCondition + whitelist: + - Clown + - type: listing id: uplinkHotPotato name: uplink-hot-potato-name diff --git a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml index d7aec292d2..74ceea1cac 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml @@ -151,3 +151,76 @@ map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ] color: "#40a7d7" shader: unshaded + +- type: entity + name: HoloClown + id: MobHoloClownGuardian + parent: MobGuardianBase + description: A mesmerising whirl of hard-light patterns weaves a blue colored clown of dubious origin. + components: + - type: GhostRole + allowMovement: true + allowSpeech: true + makeSentient: true + name: ghost-role-information-holoclown-name + description: ghost-role-information-holoclown-description + - type: GhostTakeoverAvailable + - type: NameIdentifier + group: Holoparasite + - type: FootstepModifier + footstepSoundCollection: + collection: FootstepClown + - type: TypingIndicator + proto: holo + - type: RandomSprite + available: + - enum.DamageStateVisualLayers.Base: + holoclown_base: "" + enum.DamageStateVisualLayers.BaseUnshaded: + holoclown_flare: Sixteen + - enum.DamageStateVisualLayers.Base: + holoclown_base: "" + enum.DamageStateVisualLayers.BaseUnshaded: + holoclown_flare: Sixteen + - enum.DamageStateVisualLayers.Base: + holoclown_base: "" + enum.DamageStateVisualLayers.BaseUnshaded: + holoclown_flare: Sixteen + - type: Sprite + layers: + - state: holoclown_base + map: [ "enum.DamageStateVisualLayers.Base" ] + - state: holoclown_flare + map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ] + color: "#8adaff" + shader: unshaded + - type: Body + prototype: Primate + - type: Tag + tags: + - CannotSuicide + - FootstepSound + - type: Inventory + templateId: holoclown + - type: Hands + - type: Clumsy + clumsyDamage: + types: + Blunt: 5 + Piercing: 4 + groups: + Burn: 3 + - type: InventorySlots + - type: MeleeWeapon + hidden: true + angle: 30 + animation: WeaponArcFist + attackRate: 1.8 + damage: + types: + Blunt: 5 + - type: Loadout + prototypes: [ HoloClownGear ] + - type: RandomMetadata + nameSegments: + - names_clown diff --git a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml index 7040bfb29e..6aa53f6875 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml @@ -371,7 +371,6 @@ - names_first - names_last - - type: randomHumanoidSettings id: Cluwne randomizeName: false diff --git a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/guardian_activators.yml b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/guardian_activators.yml index 188e98d316..0b1769a3da 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/guardian_activators.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/guardian_activators.yml @@ -10,6 +10,15 @@ - type: GuardianCreator guardianProto: MobHoloparasiteGuardian +- type: entity + name: holoclown injector + parent: HoloparasiteInjector + id: HoloClownInjector + description: A complex artwork of handheld machinery allowing the user to host a holoclown guardian. + components: + - type: GuardianCreator + guardianProto: MobHoloClownGuardian + - type: entity name: magical lamp id: MagicalLamp @@ -38,3 +47,22 @@ layers: - state: box - state: holo + +- type: entity + name: holoclown box + parent: BoxCardboard + id: BoxHoloclown + description: A box containing a holoclown injector + components: + - type: StorageFill + contents: + - id: HoloClownInjector + - id: ToyFigurineHoloClown + - id: ToyHammer + - type: Sprite + layers: + - state: box_hug + - state: holo + - type: Tag + tags: + - BoxHug diff --git a/Resources/Prototypes/Entities/Objects/Fun/figurines.yml b/Resources/Prototypes/Entities/Objects/Fun/figurines.yml index 8aa71731fa..06db6e5212 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/figurines.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/figurines.yml @@ -53,7 +53,17 @@ components: - type: Sprite state: clown - + +- type: entity + parent: BaseFigurine + id: ToyFigurineHoloClown + name: holoclown figure + description: A figurine depicting a holoclown. Even more annoying than a clown and no less real. + components: + - type: Sprite + state: holoclown + + - type: entity parent: BaseFigurine id: ToyFigurineMime diff --git a/Resources/Prototypes/InventoryTemplates/holoclown_inventory_template.yml b/Resources/Prototypes/InventoryTemplates/holoclown_inventory_template.yml new file mode 100644 index 0000000000..57dce506ea --- /dev/null +++ b/Resources/Prototypes/InventoryTemplates/holoclown_inventory_template.yml @@ -0,0 +1,22 @@ +- type: inventoryTemplate + id: holoclown + slots: + - name: pocket1 + slotTexture: pocket + slotFlags: POCKET + slotGroup: MainHotbar + stripTime: 3 + uiWindowPos: 0,3 + strippingWindowPos: 0,4 + displayName: Pocket 1 + stripHidden: true + - name: pocket2 + slotTexture: pocket + slotFlags: POCKET + slotGroup: MainHotbar + stripTime: 3 + uiWindowPos: 2,3 + strippingWindowPos: 1,4 + displayName: Pocket 2 + stripHidden: true + diff --git a/Resources/Prototypes/Roles/Jobs/Fun/cluwne.yml b/Resources/Prototypes/Roles/Jobs/Fun/cluwne.yml index 41360479d1..a797208c32 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/cluwne.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/cluwne.yml @@ -8,3 +8,9 @@ id: CluwnePDA gloves: ClothingHandsGlovesCluwne pocket1: CluwneHorn + +- type: startingGear + id: HoloClownGear + equipment: + pocket1: BikeHorn + diff --git a/Resources/Textures/Mobs/Aliens/Guardians/guardians.rsi/holoclown.png b/Resources/Textures/Mobs/Aliens/Guardians/guardians.rsi/holoclown.png new file mode 100644 index 0000000000000000000000000000000000000000..112eec5e8b6749fb5ff9b0eb8ac31ea6b104bb84 GIT binary patch literal 23383 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Aliens/Guardians/guardians.rsi/holoclown_base.png b/Resources/Textures/Mobs/Aliens/Guardians/guardians.rsi/holoclown_base.png new file mode 100644 index 0000000000000000000000000000000000000000..112eec5e8b6749fb5ff9b0eb8ac31ea6b104bb84 GIT binary patch literal 23383 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Aliens/Guardians/guardians.rsi/holoclown_flare.png b/Resources/Textures/Mobs/Aliens/Guardians/guardians.rsi/holoclown_flare.png new file mode 100644 index 0000000000000000000000000000000000000000..89f927bc48ef36c5bfffd317bf126a331ef14e81 GIT binary patch literal 20840 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 at19$C$9w$gY=?3nLeBP+?DA}9Fa95dPY8Pe literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Aliens/Guardians/guardians.rsi/meta.json b/Resources/Textures/Mobs/Aliens/Guardians/guardians.rsi/meta.json index b8d7bcd6c9..57b81f4f1e 100644 --- a/Resources/Textures/Mobs/Aliens/Guardians/guardians.rsi/meta.json +++ b/Resources/Textures/Mobs/Aliens/Guardians/guardians.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-3.0", - "copyright": "taken from /tg/ station at commit https://github.com/tgstation/tgstation/commit/02756c2bc2cf3000080d030955e994242bab39b5", + "copyright": "taken from /tg/ station at commit https://github.com/tgstation/tgstation/commit/02756c2bc2cf3000080d030955e994242bab39b5, holoclown made by brainfood1183 (github)", "size": { "x": 32, "y": 32 @@ -27,6 +27,36 @@ "name": "magic_base", "directions": 4 }, + { + "name": "holoclown", + "directions": 4 + }, + { + "name": "holoclown_base", + "directions": 4 + }, + { + "name": "holoclown_flare", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ] + ] + }, { "name": "miner_flare", "directions": 4 diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/holoclown.png b/Resources/Textures/Objects/Fun/figurines.rsi/holoclown.png new file mode 100644 index 0000000000000000000000000000000000000000..0997719aee97cfb8b73d543460974e914ab8237f GIT binary patch literal 18279 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Fun/figurines.rsi/meta.json b/Resources/Textures/Objects/Fun/figurines.rsi/meta.json index ab656e28a3..f6e93b64fc 100644 --- a/Resources/Textures/Objects/Fun/figurines.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/figurines.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprites made by Flareguy for Space Station 14. Griffinprize, skeletonprize, and owlprize taken from /tg/station at commit https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. Figurine_spawner sprite made using parts found in spawner_icons.dmi from Paradise Station at commit https://github.com/ParadiseSS13/Paradise/commit/813f0a3ae556d86dddd7c4ef93a52880de8d2e37. Head sprites excluding Captain, Medical exluding doctor, non-human excluding queen and slime, and service jobs excluding librarian done by tacobeller.", + "copyright": "Sprites made by Flareguy for Space Station 14. Griffinprize, skeletonprize, and owlprize taken from /tg/station at commit https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. Figurine_spawner sprite made using parts found in spawner_icons.dmi from Paradise Station at commit https://github.com/ParadiseSS13/Paradise/commit/813f0a3ae556d86dddd7c4ef93a52880de8d2e37. Head sprites excluding Captain, Medical exluding doctor, non-human excluding queen and slime, and service jobs excluding librarian done by tacobeller and holoclown done by brainfood1183.", "size": { "x": 32, "y": 32 @@ -19,6 +19,9 @@ { "name": "passenger" }, + { + "name": "holoclown" + }, { "name": "passenger_greytide" },