From 4460b5ffb39feb6ff7dbe98a06f15254486a8da4 Mon Sep 17 00:00:00 2001 From: BlitzTheSquishy <73762869+BlitzTheSquishy@users.noreply.github.com> Date: Fri, 23 Aug 2024 16:18:38 +1000 Subject: [PATCH 01/55] creating a race, even a base on is a living hell --- .../Prototypes/DeltaV/Body/Organs/feroxi.yml | 22 +++ .../Prototypes/DeltaV/Body/Parts/feroxi.yml | 119 ++++++++++++++ .../DeltaV/Body/Prototypes/feroxi.yml | 49 ++++++ .../DeltaV/Entities/Mobs/Player/feroxi.yml | 33 ++++ .../DeltaV/Entities/Mobs/Species/feroxi.yml | 102 ++++++++++++ .../Prototypes/DeltaV/Species/feroxi.yml | 148 ++++++++++++++++++ .../Prototypes/Species/species_weights.yml | 1 + .../Effects/creampie.rsi/creampie_feroxi.png | Bin 0 -> 522 bytes .../Mobs/Species/Feroxi/parts.rsi/full.png | Bin 0 -> 692 bytes .../Mobs/Species/Feroxi/parts.rsi/head_f.png | Bin 0 -> 757 bytes .../Mobs/Species/Feroxi/parts.rsi/head_m.png | Bin 0 -> 784 bytes .../Mobs/Species/Feroxi/parts.rsi/icon.png | Bin 0 -> 83 bytes .../Mobs/Species/Feroxi/parts.rsi/l_arm.png | Bin 0 -> 438 bytes .../Mobs/Species/Feroxi/parts.rsi/l_foot.png | Bin 0 -> 419 bytes .../Mobs/Species/Feroxi/parts.rsi/l_hand.png | Bin 0 -> 443 bytes .../Mobs/Species/Feroxi/parts.rsi/l_leg.png | Bin 0 -> 366 bytes .../Mobs/Species/Feroxi/parts.rsi/meta.json | 69 ++++++++ .../Species/Feroxi/parts.rsi/overlay_husk.png | Bin 0 -> 803 bytes .../Mobs/Species/Feroxi/parts.rsi/r_arm.png | Bin 0 -> 470 bytes .../Mobs/Species/Feroxi/parts.rsi/r_foot.png | Bin 0 -> 412 bytes .../Mobs/Species/Feroxi/parts.rsi/r_hand.png | Bin 0 -> 415 bytes .../Mobs/Species/Feroxi/parts.rsi/r_leg.png | Bin 0 -> 375 bytes .../Mobs/Species/Feroxi/parts.rsi/torso_f.png | Bin 0 -> 885 bytes .../Mobs/Species/Feroxi/parts.rsi/torso_m.png | Bin 0 -> 823 bytes 24 files changed, 543 insertions(+) create mode 100644 Resources/Prototypes/DeltaV/Body/Organs/feroxi.yml create mode 100644 Resources/Prototypes/DeltaV/Body/Parts/feroxi.yml create mode 100644 Resources/Prototypes/DeltaV/Body/Prototypes/feroxi.yml create mode 100644 Resources/Prototypes/DeltaV/Entities/Mobs/Player/feroxi.yml create mode 100644 Resources/Prototypes/DeltaV/Entities/Mobs/Species/feroxi.yml create mode 100644 Resources/Prototypes/DeltaV/Species/feroxi.yml create mode 100644 Resources/Textures/DeltaV/Effects/creampie.rsi/creampie_feroxi.png create mode 100644 Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/full.png create mode 100644 Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/head_f.png create mode 100644 Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/head_m.png create mode 100644 Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/l_arm.png create mode 100644 Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/l_foot.png create mode 100644 Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/l_hand.png create mode 100644 Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/l_leg.png create mode 100644 Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/overlay_husk.png create mode 100644 Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/r_arm.png create mode 100644 Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/r_foot.png create mode 100644 Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/r_hand.png create mode 100644 Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/r_leg.png create mode 100644 Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/torso_f.png create mode 100644 Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/torso_m.png diff --git a/Resources/Prototypes/DeltaV/Body/Organs/feroxi.yml b/Resources/Prototypes/DeltaV/Body/Organs/feroxi.yml new file mode 100644 index 00000000000..a7d4d45643d --- /dev/null +++ b/Resources/Prototypes/DeltaV/Body/Organs/feroxi.yml @@ -0,0 +1,22 @@ +- type: entity + id: OrganFeroxiStomach + parent: OrganAnimalStomach + categories: [ HideSpawnMenu ] + components: + - type: Stomach + specialDigestible: + tags: + - ReptilianFood + - Meat + - Pill + - Crayon + - Paper + - type: SolutionContainerManager + solutions: + stomach: + maxVol: 50 + food: + maxVol: 5 + reagents: + - ReagentId: UncookedAnimalProteins + Quantity: 5 diff --git a/Resources/Prototypes/DeltaV/Body/Parts/feroxi.yml b/Resources/Prototypes/DeltaV/Body/Parts/feroxi.yml new file mode 100644 index 00000000000..064b1aff5b9 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Body/Parts/feroxi.yml @@ -0,0 +1,119 @@ +# TODO: Add descriptions (many) +# TODO BODY: Part damage +- type: entity + id: PartFeroxi + parent: [BaseItem, BasePart] + name: "feroxi body part" + abstract: true + components: + - type: Extractable + juiceSolution: + reagents: + - ReagentId: Fat + Quantity: 3 + - ReagentId: Blood + Quantity: 10 + +- type: entity + id: TorsoFeroxi + name: "feroxi torso" + parent: [PartFeroxi, BaseTorso] + components: + - type: Sprite + sprite: Mobs/Species/Feroxi/parts.rsi + state: "torso_m" + - type: Extractable + juiceSolution: + reagents: + - ReagentId: Fat + Quantity: 10 + - ReagentId: Blood + Quantity: 20 + +- type: entity + id: HeadFeroxi + name: "feroxi head" + parent: [PartFeroxi, BaseHead] + components: + - type: Sprite + sprite: Mobs/Species/Feroxi/parts.rsi + state: "head_m" + - type: Extractable + juiceSolution: + reagents: + - ReagentId: Fat + Quantity: 5 + - ReagentId: Blood + Quantity: 10 + +- type: entity + id: LeftArmFeroxi + name: "left feroxi arm" + parent: [PartFeroxi, BaseLeftArm] + components: + - type: Sprite + sprite: Mobs/Species/Feroxi/parts.rsi + state: "l_arm" + +- type: entity + id: RightArmFeroxi + name: "right feroxi arm" + parent: [PartFeroxi, BaseRightArm] + components: + - type: Sprite + sprite: Mobs/Species/Feroxi/parts.rsi + state: "r_arm" + +- type: entity + id: LeftHandFeroxi + name: "left feroxi hand" + parent: [PartFeroxi, BaseLeftHand] + components: + - type: Sprite + sprite: Mobs/Species/Feroxi/parts.rsi + state: "l_hand" + +- type: entity + id: RightHandFeroxi + name: "right feroxi hand" + parent: [PartFeroxi, BaseRightHand] + components: + - type: Sprite + sprite: Mobs/Species/Feroxi/parts.rsi + state: "r_hand" + +- type: entity + id: LeftLegFeroxi + name: "left feroxi leg" + parent: [PartFeroxi, BaseLeftLeg] + components: + - type: Sprite + sprite: Mobs/Species/Feroxi/parts.rsi + state: "l_leg" + +- type: entity + id: RightLegFeroxi + name: "right feroxi leg" + parent: [PartFeroxi, BaseRightLeg] + components: + - type: Sprite + sprite: Mobs/Species/Feroxi/parts.rsi + state: "r_leg" + +- type: entity + id: LeftFootFeroxi + name: "left feroxi foot" + parent: [PartFeroxi, BaseLeftFoot] + components: + - type: Sprite + sprite: Mobs/Species/Feroxi/parts.rsi + state: "l_foot" + +- type: entity + id: RightFootFeroxi + name: "right feroxi foot" + parent: [PartFeroxi, BaseRightFoot] + components: + - type: Sprite + sprite: Mobs/Species/Feroxi/parts.rsi + state: "r_foot" diff --git a/Resources/Prototypes/DeltaV/Body/Prototypes/feroxi.yml b/Resources/Prototypes/DeltaV/Body/Prototypes/feroxi.yml new file mode 100644 index 00000000000..12efec291e2 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Body/Prototypes/feroxi.yml @@ -0,0 +1,49 @@ +- type: body + name: "feroxi" + id: Feroxi + root: torso + slots: + head: + part: HeadFeroxi + connections: + - torso + organs: + brain: OrganHumanBrain + eyes: OrganHumanEyes + torso: + part: TorsoFeroxi + organs: + heart: OrganAnimalHeart + lungs: OrganHumanLungs + stomach: OrganFeroxiStomach + liver: OrganAnimalLiver + kidneys: OrganHumanKidneys + connections: + - right arm + - left arm + - right leg + - left leg + right arm: + part: RightArmFeroxi + connections: + - right hand + left arm: + part: LeftArmFeroxi + connections: + - left hand + right hand: + part: RightHandFeroxi + left hand: + part: LeftHandFeroxi + right leg: + part: RightLegFeroxi + connections: + - right foot + left leg: + part: LeftLegFeroxi + connections: + - left foot + right foot: + part: RightFootFeroxi + left foot: + part: LeftFootFeroxi diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/feroxi.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/feroxi.yml new file mode 100644 index 00000000000..2d67f4d1781 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/feroxi.yml @@ -0,0 +1,33 @@ +- type: entity + save: false + name: Urist McFin + parent: BaseMobFeroxi + id: MobFeroxi + components: + - type: CombatMode + - type: InteractionPopup + successChance: 1 + interactSuccessString: hugging-success-generic + interactSuccessSound: /Audio/Effects/thudswoosh.ogg + messagePerceivedByOthers: hugging-success-generic-others + - type: MindContainer + showExamineInfo: true + - type: Input + context: "human" + - type: MobMover + - type: InputMover + - type: Alerts + - type: Eye + - type: CameraRecoil + - type: Examiner + - type: CanHostGuardian + - type: NpcFactionMember + factions: + - NanoTrasen + - type: Respirator + damage: + types: + Asphyxiation: 1.0 + damageRecovery: + types: + Asphyxiation: -1.0 diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/feroxi.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/feroxi.yml new file mode 100644 index 00000000000..26e252c430b --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/feroxi.yml @@ -0,0 +1,102 @@ +- type: entity + save: false + name: Urist McFin + parent: BaseMobSpeciesOrganic + id: BaseMobFeroxi + abstract: true + components: + - type: HumanoidAppearance + species: Feroxi + - type: Hunger + - type: Carriable # Carrying system from nyanotrasen. + - type: Inventory # Allows vulps to wear properly shaped helmets + speciesId: feroxi + - type: Thirst + - type: Icon + sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi + state: full + - type: Body + prototype: Feroxi + requiredLegs: 2 + - type: Speech + speechSounds: Feroxi + speechVerb: Feroxi + - type: Sprite + netsync: false + noRot: true + drawdepth: Mobs + layers: + - map: [ "enum.HumanoidVisualLayers.Chest" ] + - map: [ "enum.HumanoidVisualLayers.Head" ] + - map: [ "enum.HumanoidVisualLayers.Snout" ] + - map: [ "enum.HumanoidVisualLayers.Eyes" ] + - map: [ "enum.HumanoidVisualLayers.RArm" ] + - map: [ "enum.HumanoidVisualLayers.LArm" ] + - map: [ "enum.HumanoidVisualLayers.RLeg" ] + - map: [ "enum.HumanoidVisualLayers.LLeg" ] + - shader: StencilClear + sprite: Mobs/Species/Human/parts.rsi #PJB on stencil clear being on the left leg: "...this is 'fine'" -https://github.com/space-wizards/space-station-14/pull/12217#issuecomment-1291677115 + # its fine, but its still very stupid that it has to be done like this instead of allowing sprites to just directly insert a stencil clear. + # sprite refactor when + state: l_leg + - shader: StencilMask + map: [ "enum.HumanoidVisualLayers.StencilMask" ] + sprite: DeltaV/Mobs/Customization/Feroxi/masking_helpers.rsi + state: female_full + visible: false + - map: [ "jumpsuit" ] + - map: [ "enum.HumanoidVisualLayers.LHand" ] + - map: [ "enum.HumanoidVisualLayers.RHand" ] + - map: [ "enum.HumanoidVisualLayers.LFoot" ] + - map: [ "enum.HumanoidVisualLayers.RFoot" ] + - map: [ "enum.HumanoidVisualLayers.Handcuffs" ] + color: "#ffffff" + sprite: Objects/Misc/handcuffs.rsi + state: body-overlay-2 + visible: false + - map: [ "id" ] + - map: [ "gloves" ] + - map: [ "shoes" ] + - map: [ "ears" ] + - map: [ "outerClothing" ] + - map: [ "eyes" ] + - map: [ "belt" ] + - map: [ "neck" ] + - map: [ "back" ] + - map: [ "enum.HumanoidVisualLayers.FacialHair" ] + - map: [ "enum.HumanoidVisualLayers.Hair" ] + - map: [ "enum.HumanoidVisualLayers.HeadSide" ] + - map: [ "enum.HumanoidVisualLayers.HeadTop" ] + - map: [ "enum.HumanoidVisualLayers.Tail" ] + - map: [ "mask" ] + - map: [ "head" ] + - map: [ "pocket1" ] + - map: [ "pocket2" ] + - map: [ "clownedon" ] # Dynamically generated + sprite: "DeltaV/Effects/creampie.rsi" + state: "creampie_feroxi" + visible: false + - type: MeleeWeapon + hidden: true + soundHit: + path: /Audio/Effects/bite.ogg + angle: 30 + animation: WeaponArcBite + damage: + types: + Pierce: 5 + - type: Perishable + - type: Damageable + damageModifierSet: Feroxi + - type: TemperatureProtection + coefficient: 0.1 + +- type: entity + save: false + name: Feroxi Dummy + parent: MobHumanDummy + id: MobFeroxiDummy + description: A dummy feroxi meant to be used in character setup. + components: + - type: HumanoidAppearance + species: Feroxi diff --git a/Resources/Prototypes/DeltaV/Species/feroxi.yml b/Resources/Prototypes/DeltaV/Species/feroxi.yml new file mode 100644 index 00000000000..8cd191f94ab --- /dev/null +++ b/Resources/Prototypes/DeltaV/Species/feroxi.yml @@ -0,0 +1,148 @@ +- type: species + id: Feroxi + name: species-name-feroxo + roundStart: true + prototype: MobFeroxi + sprites: MobFeroxiSprites + defaultSkinTone: "#985629" + markingLimits: MobFeroxiMarkingLimits + dollPrototype: MobFeroxiDummy + skinColoration: Hues + maleFirstNames: names_human_male + femaleFirstNames: names_human_female + lastNames: names_human_last + +- type: speciesBaseSprites + id: MobFeroxiSprites + sprites: + Head: MobFeroxiHead + Hair: MobHumanoidAnyMarking + FacialHair: MobHumanoidAnyMarking + Snout: MobHumanoidAnyMarking + Chest: MobFeroxiTorso + HeadTop: MobHumanoidAnyMarking + HeadSide: MobHumanoidAnyMarking + Tail: MobHumanoidAnyMarking + Eyes: MobHumanoidEyes + LArm: MobFeroxiLArm + RArm: MobFeroxiRArm + LHand: MobFeroxiLHand + RHand: MobFeroxiRHand + LLeg: MobFeroxiLLeg + RLeg: MobFeroxiRLeg + LFoot: MobFeroxiLFoot + RFoot: MobFeroxiRFoot + +- type: markingPoints + id: MobFeroxiMarkingLimits + points: + Hair: + points: 1 + required: false + FacialHair: + points: 1 + required: false + Tail: + points: 1 + required: true + defaultMarkings: [ VulpTail ] + Head: + points: 3 + required: false + Legs: + points: 1 + required: false + Arms: + points: 1 + required: false + Snout: + points: 1 + required: false + HeadTop: + points: 1 + required: true + defaultMarkings: [ VulpEar ] + +- type: humanoidBaseSprite + id: MobFeroxiHead + baseSprite: + sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi + state: head_m + +- type: humanoidBaseSprite + id: MobFeroxiHeadMale + baseSprite: + sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi + state: head_m + +- type: humanoidBaseSprite + id: MobFeroxiHeadFemale + baseSprite: + sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi + state: head_f + +- type: humanoidBaseSprite + id: MobFeroxiTorso + baseSprite: + sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi + state: torso_m + +- type: humanoidBaseSprite + id: MobFeroxiTorsoMale + baseSprite: + sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi + state: torso_m + +- type: humanoidBaseSprite + id: MobFeroxiTorsoFemale + baseSprite: + sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi + state: torso_f + +- type: humanoidBaseSprite + id: MobFeroxiLLeg + baseSprite: + sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi + state: l_leg + +- type: humanoidBaseSprite + id: MobFeroxiLHand + baseSprite: + sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi + state: l_hand + +- type: humanoidBaseSprite + id: MobFeroxiLArm + baseSprite: + sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi + state: l_arm + +- type: humanoidBaseSprite + id: MobFeroxiLFoot + baseSprite: + sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi + state: l_foot + +- type: humanoidBaseSprite + id: MobFeroxiRLeg + baseSprite: + sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi + state: r_leg + +- type: humanoidBaseSprite + id: MobFeroxiRHand + baseSprite: + sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi + state: r_hand + +- type: humanoidBaseSprite + id: MobFeroxiRArm + baseSprite: + sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi + state: r_arm + +- type: humanoidBaseSprite + id: MobFeroxiRFoot + baseSprite: + sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi + state: r_foot diff --git a/Resources/Prototypes/Species/species_weights.yml b/Resources/Prototypes/Species/species_weights.yml index 990a8ccecfa..6ae72ab206f 100644 --- a/Resources/Prototypes/Species/species_weights.yml +++ b/Resources/Prototypes/Species/species_weights.yml @@ -8,4 +8,5 @@ Oni: 3 #Nyanotrasen Oni, see Prototypes/Nyanotrasen/Entities/Mobs/Species/Oni.yml Felinid: 4 # Nyanotrasen - Felinid, see Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml Vulpkanin: 3 # DeltaV - Vulpkanin, see Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml + Feroxi: 3 # DeltaV - Feroxi, see Prototypes/DeltaV/Entities/Mobs/Species/Feroxi.yml Diona: 2 diff --git a/Resources/Textures/DeltaV/Effects/creampie.rsi/creampie_feroxi.png b/Resources/Textures/DeltaV/Effects/creampie.rsi/creampie_feroxi.png new file mode 100644 index 0000000000000000000000000000000000000000..53369c158dd5f43162840b5396b08c4656a794f9 GIT binary patch literal 522 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+7}t2ZIEGZ*dNa$=@34VLTkZ=sQQ3(TA|y_QSTOEo2v2y* zG^e>yFl^lcR;!In!m<$)v<$@CHc731gyxDTMaam1jGG|8AA??(Lj(XWI-8*|W&G+S8@#Aan z-lX_rdd@3YAAGEe5L~}d;K}Fu`Haz@%|HMAn3A?#d}?4{xnYj1u%Pgq`|~XYwb@oE zx@kxnSXkuW<%u?T6kHD!_0WSuTrgO=i{agxD zJ3c8Ksb>TR3oh^?!Mi|+m^d>-|zc-EMvLVBoI_H(N59IxhVMZ z^UjHN3(fpfc|ygsqOMPids0vyvu3_edPZc;ix1boNpJR?((wOn#iPSBA6;A;+csee zyNB1mnHB4qYB`F|8Z6tiV&VNf`_}t<@mF#-vYPELI(uqs)}8<5v!8}W%C+KhU&EY7 b-VKZl88*t9@)B3KfV|-8>gTe~DWM4fsjAHM literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/full.png b/Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/full.png new file mode 100644 index 0000000000000000000000000000000000000000..d78a1ae1134fb88fe7758c68ec4d0da33abecb9e GIT binary patch literal 692 zcmV;l0!#ggP)1e1DcbDGz$) zYQR&7;Nx)h^?GH0U*BX8K9kAtFfrg%wfg8I)2Z<-ko&1ZyJm zfI!iqQ|I&f59K$TjWXz#k~|U*K>2h!mERq7tJQip4<6%~haBjrDxoM83hH~K2!U?5 z+foTN@EFHD02=GC-n$fIvs;97J?L~8Jcqm<#=d#Y(1F2Ms?e}}}NV#bQ zjIlZ?5QQ*G; zUv7ZavwXE$A>9O(=8sCY_H46GMJo?LIdUB};8B$$9`lg1xrUv8OteSm9qIfAD2^|dvr>GB5M zYv>dAn5dK**SflbO=@04)1wzJ0#sW33S70cj_-f!$jn~;DQmA)XZ@0?H@|ky{QvpJ zz2uy^#m}a_ZQfb9yOKdZ_+N#MoV>mHY+u{*H)XrmT747#|0&T#>M8Srqu+o3ef&4a ztoUDKszBS}g{!Y-9shm!A%jGj(ab0FnUwBzi+xl(#L#l;=;23uKi5_=W_+yw_s`(> zU%M@$P6Zz-Pky+Q-f(&sTgT$O?b&ksY-d&N&6C?_Kg(@#;yTu8hs|dDeps8lDocDr z_faK__a#=(UQgeB;gQ_=uSru*zA3TVd!zAr^T7jY@yr4&LHG1+p1u4TpYd2^Luikk zi_@AOt6Pg6OJ*z{MB=g`1*OV>MDO_|eXDHu+dotHn{h16xc=HS z>+3?Z4(_W;FHh^r?K`5MFLKq*#~ZNPAu?aILN@X?)Ulm1ydLO_`ZI=-m)4C z7RLD1S6?ORtV|2;KY3Ck`QF2rhIN;_6)n!V%kOYy-PvM#;NX1!kK(c#6W*0sD}S~x zl@dF}z{1=vu%2JtVTV|J*ty5MKg|8~H_9f-AwGuVb9zHcvT*GFDO>bBVr|9avjW#+UVly|XGGyBNLo5yqxX|{L|Ev-WEi##66Rxm! Q0n;&qr>mdKI;Vst0FE3_oB#j- literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/head_m.png b/Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/head_m.png new file mode 100644 index 0000000000000000000000000000000000000000..d68944135059d9014f4f352d0b5604ba1448fdce GIT binary patch literal 784 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+m^OL3IEGZ*dNXU|Dk(>iwsJl3EglLNrF(?7ZQi``hWZA< z&unIn@(Qk9Qz{!oG(R!?5=%;+nZ@0$`&LCm$iP)Fd;5&>j`-gPIcA%$_et@v#R<>%TmJmV;)@;?m214 zT1KTh3mLZfx_#!4E*|>M$auMK|NZoP&h;|KZ&mU(+_;)0`sYW1L7l#Zg#2G4?U>tT zyLq#=-fFFg_h)3C__pk}&+hVkc^_{1znQTCdaa9ZoPGZJO!bTYMIJlZ5?q{gxX!P? zU+=?h&*S_w`OELW`x+G%_lep4>aK}@x18ac#XN?UFFvzhezl&ZrC*(Kn!_~H*}mHu zKFn$LRhxX~_v4Q{L>lel&vP@LXbPD2N3C`Gz{Om#>e(OH4*NEa1_rEX z-p;%BPoLEMu{@=EKsDgPB$bPWGPh$-J&%9+9DbM}?`I%B?ah8O zpO}vAkE9N7+bPbl(nC07Z`^Fz#GKBDSte3(3Jx|&o-t1vV&u+qJvTjIr`Yti&{Dmi zX@Pv)-UFdsFU;4+XLTG_O&1n0)}Fp+T6MZd8iU)y+i&CET<$)(a^m^jZt1T7UiZGFLt&yZ0~R|Eg&$)?eJ9a$4ly4HpFm wk2~3Y$DgcYtPxgWU{b(^8lLCXvq~`h(QM$ATwSvgn8X=8UHx3vIVCg!05NA%hyVZp literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/icon.png b/Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..016d8ba5a76c0112a48860254da8e5f54a1767d7 GIT binary patch literal 83 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzDNh&2kcif|2N@ZGye5VJ>+?Ju bK+N}S0tyU_?u-jMfE)%-S3j3^P6v)FbB-MZJPSw>$^VuIyHN5v*6WMxsOryKZG_FkrdiAYQ-+qgIN#?HdgVz|=6WkdZ7I^=SS&(}>elKJ8+hW1V!6}w@<>zK5SS`q$^+2An znC;>HHH_=)rW95;Jihbcs&hzL(;JqX9E`|jF)&`6&cMu2`7JB;qLh#tNXpaI&t;uc GLK6T>53bk% literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/l_foot.png b/Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/l_foot.png new file mode 100644 index 0000000000000000000000000000000000000000..6b1db8f631bf4a663c7f0c3a6dc140fa37a5c39c GIT binary patch literal 419 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+7+pPG978H@y}5O;v)Mu9*vFZwwiSZf9~N}j-e^;eY*ekd zD&?{#qOsy*0`KPEZ9X0xJ6(Ds|JZX(RQz%5eogyXY<^5~^7oKTNP-jJ%z^nZ@I3 z>EHK43o4yk{xjlr55w~n+tZsr#WhGroZ7G{Q!4VBYoN`aJc+hgv$)Wyo|B$ji+|Qu zIq$WzkizVaMIL(gMj2Duzt{dZ)3sA!ylisQ|9WY=%k{7E(fgTr7!>}Ll%G^nxeBt; M)78&qol`;+0MPiF1ONa4 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/l_hand.png b/Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/l_hand.png new file mode 100644 index 0000000000000000000000000000000000000000..645ec58d5b27fa4116b5a20bb7cedc3e846c7fc1 GIT binary patch literal 443 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+7-KzM978H@y}7-yx7k3XA#s23vjj#jw*^a*6uDkRGzqSV zF=AZQ%qk!xYHaaC#BZmXV5g_UAOA%PLG#|czbUrKvB&V$nU9P82zPi?~6~3 zj(pv=qhp1M@Ber6b)(KF<*wWM_a@7O*&Dan+i)-{11+wByUX>kaE(+u89h z%e-|}>ch*+fh%9%;yL``k~Pbr@MIfynDGqiy{j3R8FVzt!}@FwO#lgdy85}Sb4q9e E0IR957ytkO literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/l_leg.png b/Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/l_leg.png new file mode 100644 index 0000000000000000000000000000000000000000..6511227d74a0f98f39a75a443b2e150ae6a7d08a GIT binary patch literal 366 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+7zI3C978H@y}7lQx7k3T?V<81wskier&aD{vsPeXWmb?9 z7c;h)!$7PdE z@5J}N%DKI5wtftsBa*Spm^CKjr&|AJuvf{B9cCoLAoP-63|(hP)<2wHN+ok8wb$4Utj~liyx+qj!SH=r Vfb}`)iA5muJzf1=);T3K0RS3Bgctw- literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/meta.json new file mode 100644 index 00000000000..026fc8b64c9 --- /dev/null +++ b/Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/meta.json @@ -0,0 +1,69 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/ParadiseSS13/Paradise edited by Floofers", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "full" + }, + { + "name": "icon" + }, + { + "name": "head_f", + "directions": 4 + }, + { + "name": "head_m", + "directions": 4 + }, + { + "name": "l_arm", + "directions": 4 + }, + { + "name": "l_foot", + "directions": 4 + }, + { + "name": "l_hand", + "directions": 4 + }, + { + "name": "l_leg", + "directions": 4 + }, + { + "name": "r_arm", + "directions": 4 + }, + { + "name": "r_foot", + "directions": 4 + }, + { + "name": "r_hand", + "directions": 4 + }, + { + "name": "r_leg", + "directions": 4 + }, + { + "name": "torso_f", + "directions": 4 + }, + { + "name": "torso_m", + "directions": 4 + }, + { + "name": "overlay_husk", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/overlay_husk.png b/Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/overlay_husk.png new file mode 100644 index 0000000000000000000000000000000000000000..ba3fc107bc847d535ec946357b61c8a9122b6096 GIT binary patch literal 803 zcmV+;1Kj+HP)qwhB`(h_ezU7+!rncfOyV!pJcR03*jFfb@sA06)(FC)9#5 za`B44Ye`Yak693z0Ge>M%M2!Ocx~i(5`=WqlRl#btg2(y%@46_8sNPzG82%I+l2Tx? zSZtpxk|8PP;Pq1p>-w5LFUzts=Q;oNMFBV80Iy}awFB*u@Fxj?H~%WjZO=<0tUoGv zt=pF~fcNiiJ4EE4*H0W@BQFANfSo-&0%DQe2~r1i#oohw>)Lq&I*DmO*UMe>Nt{QB z>wxE-^3+;F>TDB|1@Nx=_CacwI0gD7f@>*k2`YWV3eS95+zS+aIU_JhfIftN8-J>e z(E@mFf}|p~kBSz6Pe6tsLhN^wQlQUHOEIWUunSBAz{sHzfGBiGdSbW`i69)Cv?S&=?soxE z1n^xK?*o%sWUB)_4oc>@muOKGoWUzV*K>jdkMMUJ2AhaS)dz&(=jC|Yv7K0mQ()hL zWeY)?&M3`526Z2R@tb%mmXL4C+`V7=rH>a_wGp*B>P0>FVdQ&MBb@0DY0YtN;K2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/r_foot.png b/Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/r_foot.png new file mode 100644 index 0000000000000000000000000000000000000000..9174095ab38fe80c10758f7918a868e965d2b6a2 GIT binary patch literal 412 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+80|b=978H@y}5Oev)MqT;o*`JX8yP%oHj2GO4?XEsTHWW ze|W|B=q%@vZuWGK-%h$gRT^v8w*KKiBBk^GX*H)vQ104LyW^gfazG35f(M>+;wv*H z*shk&wRS!G`A%=_{HM#VKVR(hitBJdYUHw8+hW_d8m8GZcq$3=HaX~?UUaPR&u%}j z*r3H%%+7B%@qW*?;pLC`W2J}Q{kkPq5%cOb*MudWlVtX?ekse&d;K|$wI*o(GkK*y ze0ZI~@Im?9`Wg`u{oN^Ls&YMmB~AZ?gA0)^~0M+3D%(=d#Wz Gp$PzcM3>V5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/r_hand.png b/Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/r_hand.png new file mode 100644 index 0000000000000000000000000000000000000000..e461d8a7b54f3830aafa462623ff5eccb5e2e333 GIT binary patch literal 415 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+7#%%b978H@y}7+Hx7k7D*vD$YWCgJWDJ)i2Vv81}aD**b zoXnzigh{02%!fmplTHQ-O}5}DeDq&MC1uIy-S=ycolx&ywM+Z@?A;ZNKr7L}_0Y8T&(#{%?z`&F zzopr0AbUgqW}N^ literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/r_leg.png b/Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/r_leg.png new file mode 100644 index 0000000000000000000000000000000000000000..d563bd072a3edd0d4fdb5fa646175e8ea9afe5b4 GIT binary patch literal 375 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+7$rSj978H@y}7lQv(-SP?cwBZ>5kU9%u7nyub)U+_mEF1 z%AzSDHFst<%fq7GEcFNW#3wISv6Jg9ShQxVP_dm*CD0;lpkc?PA9G@^Z(X~}Yg+2W zZMjD!7CW)Y9{;#S`o^=w?nM)HPB%UK(!~{VJ@k^vQ&F%9A9_FK_MQ8@NB(Zmimi2j z*tRXLwBPmgrt0}(tp}I59!O)e1|sH=!r*TFh}V;8{pP&Mhc8afpXGLHQ%Jero!p)u zch_uml}ui@zQNq~uR=rp(|zwB|K-^A>GdwZWtl&f@92-=#f`d(M2)v&h2u^W2kXEILbM z+-r=59-ThOV!-IbAbbEs9r*qzd_w%T+~}#jQ@vc@lv(HB-K4WIM(^tRxqj}mg32sp zsy=PLxn_Hv)m)pOdMUf__RV9ExSwI-qBi;CHLsLUP|u zd91nLzr^Gjql4AluwzL+YLoekKM7s#IP{fS*kL8B=K8SJokcr!qSj86GCXd@pxpSgZ?e-2}`7g2 zSzbP}y+O+5chHyedV?2x4?HZWkZL)>&DGiz$RD92mbE5qb&}D{ij_0>FuZo-e9*=L zi2-Otpi&3y`y6Z!*6r6X+Bs+P`R7-A1)`ElZ0%;BH8_#BIWr_tbE!oCalgHB;l+1Y z7RqjqTD!tt;zgs20{?|x_Ahw`BAawhSJdZjzFBeXwUvYVi)V*A-*Oya_Sw(*Ls-H3 z&D#K_o{tQ-F1RrL`f_EZDeEro2A{0PcEyKly9MW%XSqJUEATA9=l#XmOeuFB_fGOX z=G=b6rlCju!JojG4(9VuewKFG@*b=7m0P;z#OnqH%@_N%T3*B)Yt%?pU1T%8@K{5? z(1Uu8Ru7+xH@4+IW_j@`?qy0BL*>qxI*sNm9?P2#gm<#bDtOl~c4)|RysyQ+ido>n z9Vhnptg`jz`cGE)Py6TB_+Z+h#{AtstLFShPOIA)m>D{^G^}qvwZ9pdj~F~%{an^L HB{Ts5yjYT@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/torso_m.png b/Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/torso_m.png new file mode 100644 index 0000000000000000000000000000000000000000..dfe4705aa37208fa273566b9217f5cb011bd1736 GIT binary patch literal 823 zcmV-71IYY|P)2{0aplRPq<-vb~b zC%}lz00J5Nt}O*V>VDgQCb9<{kH;sY>3a2C0({mLX;)4F);*^GbUJ#IK>~Bnv8zjF^B$SOoLYIKa4R#+7>-9S6 zbUM!U3P2_PK2^FO_N@)=T3u>9FeLEcm?QyS_P_8fDZfpp3Vn@3M3k#g2{M*7e+ja zC$d<^1CUK;krkVS Date: Fri, 23 Aug 2024 16:28:16 +1000 Subject: [PATCH 02/55] creating a race, even a base on is a living hell --- Resources/Locale/en-US/deltav/species/species.ftl | 3 ++- Resources/Prototypes/DeltaV/Species/feroxi.yml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Resources/Locale/en-US/deltav/species/species.ftl b/Resources/Locale/en-US/deltav/species/species.ftl index 83437bd651f..5e2108ab000 100644 --- a/Resources/Locale/en-US/deltav/species/species.ftl +++ b/Resources/Locale/en-US/deltav/species/species.ftl @@ -1,4 +1,5 @@ -## Species Names +## Species Names species-name-vulpkanin = Vulpkanin species-name-harpy = Harpy +species-name-feroxi = Feroxi diff --git a/Resources/Prototypes/DeltaV/Species/feroxi.yml b/Resources/Prototypes/DeltaV/Species/feroxi.yml index 8cd191f94ab..5856e59de7f 100644 --- a/Resources/Prototypes/DeltaV/Species/feroxi.yml +++ b/Resources/Prototypes/DeltaV/Species/feroxi.yml @@ -1,6 +1,6 @@ - type: species id: Feroxi - name: species-name-feroxo + name: species-name-feroxi roundStart: true prototype: MobFeroxi sprites: MobFeroxiSprites From 184ebf067a39cf1d9c7b3508dcfc6532eee388f8 Mon Sep 17 00:00:00 2001 From: BlitzTheSquishy <73762869+BlitzTheSquishy@users.noreply.github.com> Date: Fri, 23 Aug 2024 16:34:13 +1000 Subject: [PATCH 03/55] correcting some things --- .../DeltaV/Entities/Mobs/Species/feroxi.yml | 2 +- .../DeltaV/Effects/creampie.rsi/meta.json | 20 ++++++++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/feroxi.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/feroxi.yml index 26e252c430b..1f81d86d9dd 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/feroxi.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/feroxi.yml @@ -74,7 +74,7 @@ - map: [ "pocket2" ] - map: [ "clownedon" ] # Dynamically generated sprite: "DeltaV/Effects/creampie.rsi" - state: "creampie_feroxi" + state: "creampie_vulpkanin" visible: false - type: MeleeWeapon hidden: true diff --git a/Resources/Textures/DeltaV/Effects/creampie.rsi/meta.json b/Resources/Textures/DeltaV/Effects/creampie.rsi/meta.json index c81a1a0b820..6663ef4c3fd 100644 --- a/Resources/Textures/DeltaV/Effects/creampie.rsi/meta.json +++ b/Resources/Textures/DeltaV/Effects/creampie.rsi/meta.json @@ -1 +1,19 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Edited by Floofers", "states": [{"name": "creampie_vulpkanin", "directions": 4}]} +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Edited by Floofers", + "states": [ + { + "name": "creampie_vulpkanin", + "directions": 4 + }, + { + "name": "creampie_feroxi", + "directions": 4 + } + ] +} From 11641362141b8d4a6c48bb4be6ed0b8621655a5d Mon Sep 17 00:00:00 2001 From: BlitzTheSquishy <73762869+BlitzTheSquishy@users.noreply.github.com> Date: Sat, 24 Aug 2024 10:55:41 +1000 Subject: [PATCH 04/55] added damage vauln and resistances (only slightly blunt and cold resistant while slash vaulnerable --- Resources/Prototypes/DeltaV/Damage/modifier_sets.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Resources/Prototypes/DeltaV/Damage/modifier_sets.yml b/Resources/Prototypes/DeltaV/Damage/modifier_sets.yml index 893b7d32782..568ae784e2e 100644 --- a/Resources/Prototypes/DeltaV/Damage/modifier_sets.yml +++ b/Resources/Prototypes/DeltaV/Damage/modifier_sets.yml @@ -10,6 +10,13 @@ Slash: 1.15 Piercing: 1.15 +- type: damageModifierSet + id: Feroxi + coefficients: + Cold: 0.9 + Blunt: 0.9 + Slash: 1.1 + - type: damageModifierSet id: StorageTank coefficients: From 2e633dcb1053e1d62ab2fd8a872fc7bb30292bce Mon Sep 17 00:00:00 2001 From: BlitzTheSquishy <73762869+BlitzTheSquishy@users.noreply.github.com> Date: Tue, 27 Aug 2024 12:51:52 +1000 Subject: [PATCH 05/55] thorsty fimshy --- Resources/Prototypes/DeltaV/Entities/Mobs/Species/feroxi.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/feroxi.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/feroxi.yml index 1f81d86d9dd..f239837a534 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/feroxi.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/feroxi.yml @@ -12,6 +12,7 @@ - type: Inventory # Allows vulps to wear properly shaped helmets speciesId: feroxi - type: Thirst + baseDecayRate: 0.15 - type: Icon sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi state: full From e01319e63d6df63d338ff98fa5a9fb54b7651027 Mon Sep 17 00:00:00 2001 From: BlitzTheSquishy <73762869+BlitzTheSquishy@users.noreply.github.com> Date: Tue, 27 Aug 2024 18:21:14 +1000 Subject: [PATCH 06/55] A bunch of things, theres an error sitting here with water --- .../deltav/metabolism/metabolizer-types.ftl | 1 + .../Prototypes/DeltaV/Body/Organs/feroxi.yml | 36 +++++ .../Prototypes/DeltaV/Body/Parts/feroxi.yml | 153 +++++++++++++----- .../DeltaV/Chemistry/metabolizer_types.yml | 6 + .../Mobs/Customization/Markings/feroxi.yml | 2 + .../Prototypes/DeltaV/Guidebook/species.yml | 5 + .../DeltaV/QuickPhrases/Species/crew.yml | 5 + .../Reagents/Consumable/Drink/drinks.yml | 14 ++ .../Guidebook/Mobs/DeltaV/Feroxi.xml | 29 ++++ .../masking_helpers.rsi/female_full.png | Bin 0 -> 1539 bytes .../masking_helpers.rsi/female_none.png | Bin 0 -> 99 bytes .../Feroxi/masking_helpers.rsi/female_top.png | Bin 0 -> 1539 bytes .../Feroxi/masking_helpers.rsi/full.png | Bin 0 -> 1625 bytes .../Feroxi/masking_helpers.rsi/male_full.png | Bin 0 -> 1625 bytes .../Feroxi/masking_helpers.rsi/male_none.png | Bin 0 -> 1568 bytes .../Feroxi/masking_helpers.rsi/male_top.png | Bin 0 -> 1568 bytes .../Feroxi/masking_helpers.rsi/meta.json | 100 ++++++++++++ .../Feroxi/masking_helpers.rsi/none.png | Bin 0 -> 83 bytes .../Feroxi/masking_helpers.rsi/top.png | Bin 0 -> 1625 bytes .../masking_helpers.rsi/unisex_full.png | Bin 0 -> 1625 bytes .../masking_helpers.rsi/unisex_none.png | Bin 0 -> 1568 bytes .../Feroxi/masking_helpers.rsi/unisex_top.png | Bin 0 -> 1568 bytes 22 files changed, 309 insertions(+), 42 deletions(-) create mode 100644 Resources/Locale/en-US/deltav/metabolism/metabolizer-types.ftl create mode 100644 Resources/Prototypes/DeltaV/Chemistry/metabolizer_types.yml create mode 100644 Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/feroxi.yml create mode 100644 Resources/ServerInfo/Guidebook/Mobs/DeltaV/Feroxi.xml create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Feroxi/masking_helpers.rsi/female_full.png create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Feroxi/masking_helpers.rsi/female_none.png create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Feroxi/masking_helpers.rsi/female_top.png create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Feroxi/masking_helpers.rsi/full.png create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Feroxi/masking_helpers.rsi/male_full.png create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Feroxi/masking_helpers.rsi/male_none.png create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Feroxi/masking_helpers.rsi/male_top.png create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Feroxi/masking_helpers.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Feroxi/masking_helpers.rsi/none.png create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Feroxi/masking_helpers.rsi/top.png create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Feroxi/masking_helpers.rsi/unisex_full.png create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Feroxi/masking_helpers.rsi/unisex_none.png create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Feroxi/masking_helpers.rsi/unisex_top.png diff --git a/Resources/Locale/en-US/deltav/metabolism/metabolizer-types.ftl b/Resources/Locale/en-US/deltav/metabolism/metabolizer-types.ftl new file mode 100644 index 00000000000..bef912d33e6 --- /dev/null +++ b/Resources/Locale/en-US/deltav/metabolism/metabolizer-types.ftl @@ -0,0 +1 @@ +metabolizer-type-aquatic = Aquatic diff --git a/Resources/Prototypes/DeltaV/Body/Organs/feroxi.yml b/Resources/Prototypes/DeltaV/Body/Organs/feroxi.yml index a7d4d45643d..7ab39f0e536 100644 --- a/Resources/Prototypes/DeltaV/Body/Organs/feroxi.yml +++ b/Resources/Prototypes/DeltaV/Body/Organs/feroxi.yml @@ -20,3 +20,39 @@ reagents: - ReagentId: UncookedAnimalProteins Quantity: 5 + +- type: entity + id: OrganFeroxiLungs + parent: BaseHumanOrgan + name: lungs + description: "A pair of amphibious lungs, filtering oxygen out of the air continuously." + components: + - type: Sprite + sprite: Mobs/Species/Human/organs.rsi + layers: + - state: lung-l + - state: lung-r + - type: Lung + - type: Metabolizer + removeEmpty: true + solutionOnBody: false + solution: "Lung" + metabolizerTypes: [ Aquatic ] + groups: + - id: Gas + rateModifier: 100.0 + - type: SolutionContainerManager + solutions: + organ: + maxVol: 10 + reagents: + - ReagentId: Nutriment + Quantity: 10 + Lung: + maxVol: 100 + canReact: False + food: + maxVol: 5 + reagents: + - ReagentId: UncookedAnimalProteins + Quantity: 5 diff --git a/Resources/Prototypes/DeltaV/Body/Parts/feroxi.yml b/Resources/Prototypes/DeltaV/Body/Parts/feroxi.yml index 064b1aff5b9..04f514b6041 100644 --- a/Resources/Prototypes/DeltaV/Body/Parts/feroxi.yml +++ b/Resources/Prototypes/DeltaV/Body/Parts/feroxi.yml @@ -2,118 +2,187 @@ # TODO BODY: Part damage - type: entity id: PartFeroxi - parent: [BaseItem, BasePart] + parent: BaseItem name: "feroxi body part" abstract: true components: - - type: Extractable - juiceSolution: - reagents: - - ReagentId: Fat - Quantity: 3 - - ReagentId: Blood - Quantity: 10 + - type: Damageable + damageContainer: Biological + - type: BodyPart + - type: ContainerContainer + containers: + bodypart: !type:Container + ents: [] + - type: StaticPrice #DynamicPrice + price: 100 + - type: Tag + tags: + - Trash - type: entity id: TorsoFeroxi name: "feroxi torso" - parent: [PartFeroxi, BaseTorso] + parent: PartFeroxi components: - type: Sprite - sprite: Mobs/Species/Feroxi/parts.rsi + netsync: false + sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi state: "torso_m" - - type: Extractable - juiceSolution: - reagents: - - ReagentId: Fat - Quantity: 10 - - ReagentId: Blood - Quantity: 20 + - type: Icon + sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi + state: "torso_m" + - type: BodyPart + partType: Torso - type: entity id: HeadFeroxi name: "feroxi head" - parent: [PartFeroxi, BaseHead] + parent: PartFeroxi components: - type: Sprite - sprite: Mobs/Species/Feroxi/parts.rsi + netsync: false + sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi + state: "head_m" + - type: Icon + sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi state: "head_m" - - type: Extractable - juiceSolution: - reagents: - - ReagentId: Fat - Quantity: 5 - - ReagentId: Blood - Quantity: 10 + - type: BodyPart + partType: Head + vital: true + - type: Input + context: "ghost" + - type: InputMover + - type: GhostOnMove + - type: Tag + tags: + - Head - type: entity id: LeftArmFeroxi name: "left feroxi arm" - parent: [PartFeroxi, BaseLeftArm] + parent: PartFeroxi components: - type: Sprite - sprite: Mobs/Species/Feroxi/parts.rsi + netsync: false + sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi + state: "l_arm" + - type: Icon + sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi state: "l_arm" + - type: BodyPart + partType: Arm + symmetry: Left - type: entity id: RightArmFeroxi name: "right feroxi arm" - parent: [PartFeroxi, BaseRightArm] + parent: PartFeroxi components: - type: Sprite - sprite: Mobs/Species/Feroxi/parts.rsi + netsync: false + sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi state: "r_arm" + - type: Icon + sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi + state: "r_arm" + - type: BodyPart + partType: Arm + symmetry: Right - type: entity id: LeftHandFeroxi name: "left feroxi hand" - parent: [PartFeroxi, BaseLeftHand] + parent: PartFeroxi components: - type: Sprite - sprite: Mobs/Species/Feroxi/parts.rsi + netsync: false + sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi + state: "l_hand" + - type: Icon + sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi state: "l_hand" + - type: BodyPart + partType: Hand + symmetry: Left - type: entity id: RightHandFeroxi name: "right feroxi hand" - parent: [PartFeroxi, BaseRightHand] + parent: PartFeroxi components: - type: Sprite - sprite: Mobs/Species/Feroxi/parts.rsi + netsync: false + sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi state: "r_hand" + - type: Icon + sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi + state: "r_hand" + - type: BodyPart + partType: Hand + symmetry: Right - type: entity id: LeftLegFeroxi name: "left feroxi leg" - parent: [PartFeroxi, BaseLeftLeg] + parent: PartFeroxi components: - type: Sprite - sprite: Mobs/Species/Feroxi/parts.rsi + netsync: false + sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi + state: "l_leg" + - type: Icon + sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi state: "l_leg" + - type: BodyPart + partType: Leg + symmetry: Left + - type: MovementBodyPart - type: entity id: RightLegFeroxi name: "right feroxi leg" - parent: [PartFeroxi, BaseRightLeg] + parent: PartFeroxi components: - type: Sprite - sprite: Mobs/Species/Feroxi/parts.rsi + netsync: false + sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi + state: "r_leg" + - type: Icon + sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi state: "r_leg" + - type: BodyPart + partType: Leg + symmetry: Right + - type: MovementBodyPart - type: entity id: LeftFootFeroxi name: "left feroxi foot" - parent: [PartFeroxi, BaseLeftFoot] + parent: PartFeroxi components: - type: Sprite - sprite: Mobs/Species/Feroxi/parts.rsi + netsync: false + sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi state: "l_foot" + - type: Icon + sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi + state: "l_foot" + - type: BodyPart + partType: Foot + symmetry: Left - type: entity id: RightFootFeroxi name: "right feroxi foot" - parent: [PartFeroxi, BaseRightFoot] + parent: PartFeroxi components: - type: Sprite - sprite: Mobs/Species/Feroxi/parts.rsi + netsync: false + sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi + state: "r_foot" + - type: Icon + sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi state: "r_foot" + - type: BodyPart + partType: Foot + symmetry: Right diff --git a/Resources/Prototypes/DeltaV/Chemistry/metabolizer_types.yml b/Resources/Prototypes/DeltaV/Chemistry/metabolizer_types.yml new file mode 100644 index 00000000000..0afca094318 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Chemistry/metabolizer_types.yml @@ -0,0 +1,6 @@ +# If your species wants to metabolize stuff differently, +# you'll likely have to tag its metabolizers with something other than Human. + +- type: metabolizerType + id: Aquatic + name: metabolizer-type-aquatic diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/feroxi.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/feroxi.yml new file mode 100644 index 00000000000..3b4dd4bd1b1 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/feroxi.yml @@ -0,0 +1,2 @@ +# All the Feroxi customization +# TBD after sprites diff --git a/Resources/Prototypes/DeltaV/Guidebook/species.yml b/Resources/Prototypes/DeltaV/Guidebook/species.yml index 627e6e4f4d4..32872bd0911 100644 --- a/Resources/Prototypes/DeltaV/Guidebook/species.yml +++ b/Resources/Prototypes/DeltaV/Guidebook/species.yml @@ -17,3 +17,8 @@ id: Oni name: species-name-oni text: "/ServerInfo/Guidebook/Mobs/DeltaV/Oni.xml" + +- type: guideEntry + id: Feroxi + name: species-name-feroxi + text: "/ServerInfo/Guidebook/Mobs/Deltav/Feroxi.xml" diff --git a/Resources/Prototypes/DeltaV/QuickPhrases/Species/crew.yml b/Resources/Prototypes/DeltaV/QuickPhrases/Species/crew.yml index 1f93d7bf46a..763bdd3f993 100644 --- a/Resources/Prototypes/DeltaV/QuickPhrases/Species/crew.yml +++ b/Resources/Prototypes/DeltaV/QuickPhrases/Species/crew.yml @@ -63,3 +63,8 @@ id: SpeciesVoxPhrase parent: BaseCrewSpeciesPhrase text: species-name-vox + +- type: quickPhrase + id: SpeciesFeroxiPhrase + parent: BaseCrewSpeciesPhrase + text: species-name-feroxi diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml index 3f9fb7b53d2..e2e413fbd1c 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml @@ -447,6 +447,20 @@ effects: - !type:SatiateThirst factor: 4 + Gas: # Feroxi get to breathe with this too + effects: + - !type:Oxygenate + conditions: + - !type:OrganType + type: Aquatic + # Converts H2O into CO2 + - !type:ModifyLungGas + conditions: + - !type:OrganType + type: Aquatic + ratios: # no duplicating O2 >:3 + CarbonDioxide: 1.0 + Water: -2.0 - type: reagent id: Ice diff --git a/Resources/ServerInfo/Guidebook/Mobs/DeltaV/Feroxi.xml b/Resources/ServerInfo/Guidebook/Mobs/DeltaV/Feroxi.xml new file mode 100644 index 00000000000..3cefd917d09 --- /dev/null +++ b/Resources/ServerInfo/Guidebook/Mobs/DeltaV/Feroxi.xml @@ -0,0 +1,29 @@ + + # Feroxi + + + + + + The Feroxi (fer-ox-i) are a race of humanoid shark-like beings. + + ## Diet + + - Can ONLY eat meat. + - Will get poisoned by Theobromine (Chocolate, Tea, Coffee) and Allicin (Onion, Garlic). + + ## Benefits + + - Uses their jaws to do piercing damage + - Their cartilaginous skeleton allows them to resist blunt force trauma more easily. + - Their adaptation to native environments allows them to resist the cold more easily. + + ## Special + + - Comes with the Deuteranopia trait by default. This can be disabled via accessibility options. + + ## Drawbacks + + - They take 10% more Slash damage. + + diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/masking_helpers.rsi/female_full.png b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/masking_helpers.rsi/female_full.png new file mode 100644 index 0000000000000000000000000000000000000000..ed04708fd81e8ae3c7cf84d77bb102f201a2b38f GIT binary patch literal 1539 zcmbVM$&Ut-XO*pu@S*{L(uX?H2w@OvL?e~7){+$~i+qbfBW1k=hD+{Cf z2^a^HZ|M^FU-OT@f?-)SdYB2q^3}=LBV3$YF9?g?`Nb(dXmK1ZY9n zxw{czcbagqL@Iu0OYiSJltkaNr9;~t&54Fd)gPUW$>i)<(Vd-kEl=9LOWfH&KoAg) z#YRvI8EV*4ix*;Xa71>w`SG?WMwr<`$dn8rlRD!S}ynkHr~1?RG+Ub41{hGyuh zX2C0K8ZxuU%!!>x0&%fdMicqH9bvGtr7GtUQq_9BuGCG1#uZh!EFdsc!;k?Xvu4O~ zLk?MgmmyD>8~YLWX(%R)xI|~TErF_S8-ggM4Oz!e;4!sc?SMrypPvS^r!CT>3DhaRo7Eni(AdCZ9|LDWoH8<2Ia zXz0kuABr$a( z8m2WGgJ96kY-!;*s1P!aLzfitwgfgSzV9K^b907emSsF(5IL94U^%CgvYgR9BV%pX zvj(=h_w&@9Ng~_5@BQQb1F;XKg=_!KlN4N%5@^(C5UggWA|}c4&aCE(tt>#;O|sjT z+$5~TlRDe}e|w-!Tdxuz{Y|*rFhP3o|1hx)yVt+TIcwhM3+u+N-n#S`>@RjbT0N3kb@IUlg(PjdFfx|EvFF(7FXYAL AzyJUM literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/masking_helpers.rsi/female_none.png b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/masking_helpers.rsi/female_none.png new file mode 100644 index 0000000000000000000000000000000000000000..8a925761fb4867f2364c476dd4b0c7fa3e212862 GIT binary patch literal 99 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0P3?wHke>@jRF$egBxB}_rRkpW)6k|z{UoeBi svm0qZ4xgusV~B)gvIOhm1||juCI<$_4>OwP0A(0FUHx3vIVCg!0NOAXHUIzs literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/masking_helpers.rsi/female_top.png b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/masking_helpers.rsi/female_top.png new file mode 100644 index 0000000000000000000000000000000000000000..7f924cd879d2df32ac1b5670c72b11e5919d2a50 GIT binary patch literal 1539 zcmbVMO>fjj7 z@8>>Ak~SB|3sW!-r{9M4@V_3M{u_pk@%RZYNt?E&UypQoai=8x@FpnDh#B_?_E@M9 zpOvZB2xCA?(!K+Yn0Rwk$YojyB1d_9|B)gGzM~u;bdej6(rPfikkILciITT4=h?n; zV86Vtfq@{Tg2;`q7IEBglol_BdAhADatk8n9AzXGD9^Z)@+eEFoYxH1LkP)vTO&hx z%P8A>WfPf(j%;{Ugs_#z){xwJ6cCsAvv{g-s3Qzkj#3pO#=2gw*R{H(v819KwhaWP zZkj3}RNjmPX{ZtJ?=lo9_mUtM0gL36k(AlIa1>CrZ9^Dmv=Q(42|T7ZNUR$gN^NQZ zeJ{hs^GU5G-1l@^qalq12dt4{<0=!3SJ`K%v*T3)z_+fO$yigDFw8`7F?I&b=s09e zG%qz{s!vhQ<`a*OodGrbQ)^;8nouHGQev#ujnrgUW!bbeB=0&NL_VwY-Je{b1tO@U zK-4T1M}o=ZT=T(V$;GVS_Ori@rfW`1^XVJWl2cD;2e}9kux{qQC4FK2nOw}mKLsyixC$j@@TQ(C}6V|1U@DtPYjatRb=O=nj-_2Y7Y(O zRXaz>plMiTnj7lgFEDRDjcoV6|Bd&LCIOTdseLz3T5xGf;PHS%u$rBUn5L&Yvsxgx zvH%k=&2C5W(y&rr>1+qz?SVFJy-I=f3*m0VIGYu9lF*R~cUXcE4B{DK!>f|8c9YcjQOuSpSEA^p*3A zzwvV?ACxQi&hPzc>Di6D(XaeP@8#ZVkK1$S?2>eHcv@1g?moNy`L^Lr)xN9i2G%|Q z*5l^;ckJnt2fyriv9x^g(L3>U;nmE_wUr$c%eSxm5B8V)A8#ES*z)_sOBzkvba8B= KaP#1)a~}cApyu@e literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/masking_helpers.rsi/full.png b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/masking_helpers.rsi/full.png new file mode 100644 index 0000000000000000000000000000000000000000..f78008f58a26fea7acd3c9fce0f5eb8280549e6a GIT binary patch literal 1625 zcmV-f2B!ImP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|ca^pA*{O2k52n0azaU8x-H8J213q+{qsxli z!;N!9Xm8CkdOvETScR6yvm8LCe1S?kM=-yKiWn3NeW{3N)ya(cFEf4i^JY zPUx9C%bv@UxNsLQB*96LK*mXm49UXMd5U0`FJEY{TlR9DG8P^LOD2F3p4iQugMZuJ z1TyO@Lkgq&vW8dwD@vfCN~rFlP{~z8w%v>3434+d>Nr z6@54!PU8lE5MgbFGbB*JM-rt-J~1aE#4$sk3eQJte^ocWSI#ZzzC$^;q=QW0R@ z*A0r^g0~#83nkek?Pk%{gql#rT97$xDt@*O=q52PK#SC*;LaF~8}m<2yN_AmtiE`l zx*SYSA{PzU)?2`*Sm5R44I1u_$1-`2$A_w2l-6mxDCKccS{`kGnopb59Ha zT7|Ks+nEKHt0=bf$U4d*T+4b@MH6RV&&UVj?zzL}1@XtSj8`}tu7JXfal^o7z0VDu zo`U-I^>pvnAZ`A0$j%92_%qr#=BU~c($}f^kWcPRs3-I3E;(PFB40axet^CUNRUni ze+&KrpXr8K1+H=f0004lX+uL$Nkc;*aB^>EX>4Tx0C=2zkv&MmKpe$i(@I4u4(%Y~ zkfC+5AS&W0RV;#q(pG5I!Q|2}Xws0RxHt-~1qVMCs}3&Cx;nTDg5U>;tBaGOi0F(9}L zw41j5eQew96TtrrTxnf@y#>sElHTlU(Ia4J8@RacYVsa%xdRM8>5?HilAoqfDgp0j z^i2gIdpp00001bW%=J06^y0W&i*H0b)x>L;#2d9Y_EG010qNS#tmY z3ljhU3ljkVnw%H_000McNliru=K~V}2m}o+O)3BY01`<=K~y-)V_+BsqhJ(_0`dR= X1V8`*DUIP(00000NkvXXu0mjfh;rUK literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/masking_helpers.rsi/male_full.png b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/masking_helpers.rsi/male_full.png new file mode 100644 index 0000000000000000000000000000000000000000..f78008f58a26fea7acd3c9fce0f5eb8280549e6a GIT binary patch literal 1625 zcmV-f2B!ImP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|ca^pA*{O2k52n0azaU8x-H8J213q+{qsxli z!;N!9Xm8CkdOvETScR6yvm8LCe1S?kM=-yKiWn3NeW{3N)ya(cFEf4i^JY zPUx9C%bv@UxNsLQB*96LK*mXm49UXMd5U0`FJEY{TlR9DG8P^LOD2F3p4iQugMZuJ z1TyO@Lkgq&vW8dwD@vfCN~rFlP{~z8w%v>3434+d>Nr z6@54!PU8lE5MgbFGbB*JM-rt-J~1aE#4$sk3eQJte^ocWSI#ZzzC$^;q=QW0R@ z*A0r^g0~#83nkek?Pk%{gql#rT97$xDt@*O=q52PK#SC*;LaF~8}m<2yN_AmtiE`l zx*SYSA{PzU)?2`*Sm5R44I1u_$1-`2$A_w2l-6mxDCKccS{`kGnopb59Ha zT7|Ks+nEKHt0=bf$U4d*T+4b@MH6RV&&UVj?zzL}1@XtSj8`}tu7JXfal^o7z0VDu zo`U-I^>pvnAZ`A0$j%92_%qr#=BU~c($}f^kWcPRs3-I3E;(PFB40axet^CUNRUni ze+&KrpXr8K1+H=f0004lX+uL$Nkc;*aB^>EX>4Tx0C=2zkv&MmKpe$i(@I4u4(%Y~ zkfC+5AS&W0RV;#q(pG5I!Q|2}Xws0RxHt-~1qVMCs}3&Cx;nTDg5U>;tBaGOi0F(9}L zw41j5eQew96TtrrTxnf@y#>sElHTlU(Ia4J8@RacYVsa%xdRM8>5?HilAoqfDgp0j z^i2gIdpp00001bW%=J06^y0W&i*H0b)x>L;#2d9Y_EG010qNS#tmY z3ljhU3ljkVnw%H_000McNliru=K~V}2m}o+O)3BY01`<=K~y-)V_+BsqhJ(_0`dR= X1V8`*DUIP(00000NkvXXu0mjfh;rUK literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/masking_helpers.rsi/male_none.png b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/masking_helpers.rsi/male_none.png new file mode 100644 index 0000000000000000000000000000000000000000..44e0c1358d805be4b575d5a9acf1fd4f0e4ff5bf GIT binary patch literal 1568 zcmV+*2H*LKP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-_Zk|ZY#{pS=u0+Im1ao7~$8~FHskV|hh?XLFx zOhhM91xbphW2 z3Gqp%Q^g- zb7$FmS(FQR@j?=u1PNrUQe;RLmd;ZIyL{V1TW{IwI%Oyx1W6`<5l-ykuEqZy4}r}3 z3K7BkD^{?JdC@>Cin9J81wzQKJc>KO*LZ({SbzjbtuSXeSbaMnTBMiU61RyK2u94| zIIQCYK!~6_!Wa@T;1fxtL|&Pd2yx8dr^0d;7r21}ijfDbXOy-qM?SVu zLLeea5(PCyD!2+E2Gp8{j2x;_Vu&%Os4>S9YmyXFOetwvwOCa&Xw;;tS&P;zIpmmA z)|_+6)fFy+T8$+YExD9ZE0k6sSDdc7Vxw`B7FuknY0Is&+L1mz^w?9^o_p!l4IVPW zh$9Uhd6ZEnO{CHcGtM-1=2>Pnq?(BZi;IDRYZoBagj4pZwpE5Js9sQh5SY1gh6F!1yJrvl z0R34&ZFrefw1;7qqYCn65O#8;`4XbSDXjXX~NO!xA~*MjhPalAhUPsh|^Pu ze*Ha~-LD>a_z7zSh6ux=(Z;%`YDXmBr=~m7>3iAqDlx&@XPiDU{{a0KAVELG*T%nv zTU}7`>gR|600Dz(LqkwWLqi~Na&Km7Y-Iodc$|HaJxIeq9K~PLN<}IT?I7Zip>?t# zD&i2R|084ld5RI=Bjg;0K7Si<6>@l=#1-&?3fz z<9@um_qclp2(21Z&AMYAac;(;P(-OGqIN5i%O6q6Q0b zS~XHkWN1I(;U97QX>!Trs)CVY0d=U596$IU{O;B)O-;H<3+`T*pptK}Qu;1C!qQ}(*YyZd{4`}a(zzaK9ea*XFW7M%b900~e`R7C&) zH2?qr|NsAahD9d;0004WQchCF6XU=)l3@&Et?KmY+L Sjp0=Q0000 zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-_Zk|ZY#{pS=u0+Im1ao7~$8~FHskV|hh?XLFx zOhhM91xbphW2 z3Gqp%Q^g- zb7$FmS(FQR@j?=u1PNrUQe;RLmd;ZIyL{V1TW{IwI%Oyx1W6`<5l-ykuEqZy4}r}3 z3K7BkD^{?JdC@>Cin9J81wzQKJc>KO*LZ({SbzjbtuSXeSbaMnTBMiU61RyK2u94| zIIQCYK!~6_!Wa@T;1fxtL|&Pd2yx8dr^0d;7r21}ijfDbXOy-qM?SVu zLLeea5(PCyD!2+E2Gp8{j2x;_Vu&%Os4>S9YmyXFOetwvwOCa&Xw;;tS&P;zIpmmA z)|_+6)fFy+T8$+YExD9ZE0k6sSDdc7Vxw`B7FuknY0Is&+L1mz^w?9^o_p!l4IVPW zh$9Uhd6ZEnO{CHcGtM-1=2>Pnq?(BZi;IDRYZoBagj4pZwpE5Js9sQh5SY1gh6F!1yJrvl z0R34&ZFrefw1;7qqYCn65O#8;`4XbSDXjXX~NO!xA~*MjhPalAhUPsh|^Pu ze*Ha~-LD>a_z7zSh6ux=(Z;%`YDXmBr=~m7>3iAqDlx&@XPiDU{{a0KAVELG*T%nv zTU}7`>gR|600Dz(LqkwWLqi~Na&Km7Y-Iodc$|HaJxIeq9K~PLN<}IT?I7Zip>?t# zD&i2R|084ld5RI=Bjg;0K7Si<6>@l=#1-&?3fz z<9@um_qclp2(21Z&AMYAac;(;P(-OGqIN5i%O6q6Q0b zS~XHkWN1I(;U97QX>!Trs)CVY0d=U596$IU{O;B)O-;H<3+`T*pptK}Qu;1C!qQ}(*YyZd{4`}a(zzaK9ea*XFW7M%b900~e`R7C&) zZU6uP|NsA3RQPHD0004WQchCF6XU=)l3@&Et?KmY+L Sjp0=Q0000B?Wc})uc*XMaS bfSB*u1QZw;C7n&)0XYnwu6{1-oD!M zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|ca^pA*{O2k52n0azaU8x-H8J213q+{qsxli z!;N!9Xm8CkdOvETScR6yvm8LCe1S?kM=-yKiWn3NeW{3N)ya(cFEf4i^JY zPUx9C%bv@UxNsLQB*96LK*mXm49UXMd5U0`FJEY{TlR9DG8P^LOD2F3p4iQugMZuJ z1TyO@Lkgq&vW8dwD@vfCN~rFlP{~z8w%v>3434+d>Nr z6@54!PU8lE5MgbFGbB*JM-rt-J~1aE#4$sk3eQJte^ocWSI#ZzzC$^;q=QW0R@ z*A0r^g0~#83nkek?Pk%{gql#rT97$xDt@*O=q52PK#SC*;LaF~8}m<2yN_AmtiE`l zx*SYSA{PzU)?2`*Sm5R44I1u_$1-`2$A_w2l-6mxDCKccS{`kGnopb59Ha zT7|Ks+nEKHt0=bf$U4d*T+4b@MH6RV&&UVj?zzL}1@XtSj8`}tu7JXfal^o7z0VDu zo`U-I^>pvnAZ`A0$j%92_%qr#=BU~c($}f^kWcPRs3-I3E;(PFB40axet^CUNRUni ze+&KrpXr8K1+H=f0004lX+uL$Nkc;*aB^>EX>4Tx0C=2zkv&MmKpe$i(@I4u4(%Y~ zkfC+5AS&W0RV;#q(pG5I!Q|2}Xws0RxHt-~1qVMCs}3&Cx;nTDg5U>;tBaGOi0F(9}L zw41j5eQew96TtrrTxnf@y#>sElHTlU(Ia4J8@RacYVsa%xdRM8>5?HilAoqfDgp0j z^i2gIdpp00001bW%=J06^y0W&i*H0b)x>L;#2d9Y_EG010qNS#tmY z3ljhU3ljkVnw%H_000McNliru=K~V}2m}o+O)3BY01`<=K~y-)V_+BsqhJ(_0`dR= X1V8`*DUIP(00000NkvXXu0mjfh;rUK literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/masking_helpers.rsi/unisex_full.png b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/masking_helpers.rsi/unisex_full.png new file mode 100644 index 0000000000000000000000000000000000000000..1b69c04a7a3fef8e75bd6a789149a9bac380174f GIT binary patch literal 1625 zcmV-f2B!ImP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|ca^pA*{O2k52n0azaU8x-H8J213q+{qsxli z!;N!9Xm8CkdOvETScR6yvm8LCe1S?kM=-yKiWn3NeW{3N)ya(cFEf4i^JY zPUx9C%bv@UxNsLQB*96LK*mXm49UXMd5U0`FJEY{TlR9DG8P^LOD2F3p4iQugMZuJ z1TyO@Lkgq&vW8dwD@vfCN~rFlP{~z8w%v>3434+d>Nr z6@54!PU8lE5MgbFGbB*JM-rt-J~1aE#4$sk3eQJte^ocWSI#ZzzC$^;q=QW0R@ z*A0r^g0~#83nkek?Pk%{gql#rT97$xDt@*O=q52PK#SC*;LaF~8}m<2yN_AmtiE`l zx*SYSA{PzU)?2`*Sm5R44I1u_$1-`2$A_w2l-6mxDCKccS{`kGnopb59Ha zT7|Ks+nEKHt0=bf$U4d*T+4b@MH6RV&&UVj?zzL}1@XtSj8`}tu7JXfal^o7z0VDu zo`U-I^>pvnAZ`A0$j%92_%qr#=BU~c($}f^kWcPRs3-I3E;(PFB40axet^CUNRUni ze+&KrpXr8K1+H=f0004lX+uL$Nkc;*aB^>EX>4Tx0C=2zkv&MmKpe$i(@I4u4(%Y~ zkfC+5AS&W0RV;#q(pG5I!Q|2}Xws0RxHt-~1qVMCs}3&Cx;nTDg5U>;tBaGOi0F(9}L zw41j5eQew96TtrrTxnf@y#>sElHTlU(Ia4J8@RacYVsa%xdRM8>5?HilAoqfDgp0j z^i2gIdL;#2d9Y_EG010qNS#tmY z3ljhU3ljkVnw%H_000McNliru=K~V}2oCM|q%;5k01`<=K~y-)V_+BsqhJ(_0`dR= X1V8`*DUIP(00000NkvXXu0mjfT3g>8 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/masking_helpers.rsi/unisex_none.png b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/masking_helpers.rsi/unisex_none.png new file mode 100644 index 0000000000000000000000000000000000000000..44e0c1358d805be4b575d5a9acf1fd4f0e4ff5bf GIT binary patch literal 1568 zcmV+*2H*LKP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-_Zk|ZY#{pS=u0+Im1ao7~$8~FHskV|hh?XLFx zOhhM91xbphW2 z3Gqp%Q^g- zb7$FmS(FQR@j?=u1PNrUQe;RLmd;ZIyL{V1TW{IwI%Oyx1W6`<5l-ykuEqZy4}r}3 z3K7BkD^{?JdC@>Cin9J81wzQKJc>KO*LZ({SbzjbtuSXeSbaMnTBMiU61RyK2u94| zIIQCYK!~6_!Wa@T;1fxtL|&Pd2yx8dr^0d;7r21}ijfDbXOy-qM?SVu zLLeea5(PCyD!2+E2Gp8{j2x;_Vu&%Os4>S9YmyXFOetwvwOCa&Xw;;tS&P;zIpmmA z)|_+6)fFy+T8$+YExD9ZE0k6sSDdc7Vxw`B7FuknY0Is&+L1mz^w?9^o_p!l4IVPW zh$9Uhd6ZEnO{CHcGtM-1=2>Pnq?(BZi;IDRYZoBagj4pZwpE5Js9sQh5SY1gh6F!1yJrvl z0R34&ZFrefw1;7qqYCn65O#8;`4XbSDXjXX~NO!xA~*MjhPalAhUPsh|^Pu ze*Ha~-LD>a_z7zSh6ux=(Z;%`YDXmBr=~m7>3iAqDlx&@XPiDU{{a0KAVELG*T%nv zTU}7`>gR|600Dz(LqkwWLqi~Na&Km7Y-Iodc$|HaJxIeq9K~PLN<}IT?I7Zip>?t# zD&i2R|084ld5RI=Bjg;0K7Si<6>@l=#1-&?3fz z<9@um_qclp2(21Z&AMYAac;(;P(-OGqIN5i%O6q6Q0b zS~XHkWN1I(;U97QX>!Trs)CVY0d=U596$IU{O;B)O-;H<3+`T*pptK}Qu;1C!qQ}(*YyZd{4`}a(zzaK9ea*XFW7M%b900~e`R7C&) zH2?qr|NsAahD9d;0004WQchCF6XU=)l3@&Et?KmY+L Sjp0=Q0000 zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-_Zk|ZY#{pS=u0+Im1ao7~$8~FHskV|hh?XLFx zOhhM91xbphW2 z3Gqp%Q^g- zb7$FmS(FQR@j?=u1PNrUQe;RLmd;ZIyL{V1TW{IwI%Oyx1W6`<5l-ykuEqZy4}r}3 z3K7BkD^{?JdC@>Cin9J81wzQKJc>KO*LZ({SbzjbtuSXeSbaMnTBMiU61RyK2u94| zIIQCYK!~6_!Wa@T;1fxtL|&Pd2yx8dr^0d;7r21}ijfDbXOy-qM?SVu zLLeea5(PCyD!2+E2Gp8{j2x;_Vu&%Os4>S9YmyXFOetwvwOCa&Xw;;tS&P;zIpmmA z)|_+6)fFy+T8$+YExD9ZE0k6sSDdc7Vxw`B7FuknY0Is&+L1mz^w?9^o_p!l4IVPW zh$9Uhd6ZEnO{CHcGtM-1=2>Pnq?(BZi;IDRYZoBagj4pZwpE5Js9sQh5SY1gh6F!1yJrvl z0R34&ZFrefw1;7qqYCn65O#8;`4XbSDXjXX~NO!xA~*MjhPalAhUPsh|^Pu ze*Ha~-LD>a_z7zSh6ux=(Z;%`YDXmBr=~m7>3iAqDlx&@XPiDU{{a0KAVELG*T%nv zTU}7`>gR|600Dz(LqkwWLqi~Na&Km7Y-Iodc$|HaJxIeq9K~PLN<}IT?I7Zip>?t# zD&i2R|084ld5RI=Bjg;0K7Si<6>@l=#1-&?3fz z<9@um_qclp2(21Z&AMYAac;(;P(-OGqIN5i%O6q6Q0b zS~XHkWN1I(;U97QX>!Trs)CVY0d=U596$IU{O;B)O-;H<3+`T*pptK}Qu;1C!qQ}(*YyZd{4`}a(zzaK9ea*XFW7M%b900~e`R7C&) zH2?qr|NsAahD9d;0004WQchCF6XU=)l3@&Et?KmY+L Sjp0=Q0000 Date: Tue, 27 Aug 2024 19:19:43 +1000 Subject: [PATCH 07/55] BREATHING WATERgit push origin shark-race-realgit push origin shark-race-real --- Resources/Prototypes/DeltaV/Body/Prototypes/feroxi.yml | 2 +- Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml | 4 ++-- Resources/Prototypes/Reagents/gases.yml | 4 ++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Body/Prototypes/feroxi.yml b/Resources/Prototypes/DeltaV/Body/Prototypes/feroxi.yml index 12efec291e2..3c61f079cb2 100644 --- a/Resources/Prototypes/DeltaV/Body/Prototypes/feroxi.yml +++ b/Resources/Prototypes/DeltaV/Body/Prototypes/feroxi.yml @@ -14,7 +14,7 @@ part: TorsoFeroxi organs: heart: OrganAnimalHeart - lungs: OrganHumanLungs + lungs: OrganFeroxiLungs stomach: OrganFeroxiStomach liver: OrganAnimalLiver kidneys: OrganHumanKidneys diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml index e2e413fbd1c..295dca0ad8c 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml @@ -447,7 +447,7 @@ effects: - !type:SatiateThirst factor: 4 - Gas: # Feroxi get to breathe with this too + Gas: # DV - Feroxi get to breathe with this too effects: - !type:Oxygenate conditions: @@ -460,7 +460,7 @@ type: Aquatic ratios: # no duplicating O2 >:3 CarbonDioxide: 1.0 - Water: -2.0 + WaterVapor: -2.0 - type: reagent id: Ice diff --git a/Resources/Prototypes/Reagents/gases.yml b/Resources/Prototypes/Reagents/gases.yml index 9ef508feead..3aac521bde3 100644 --- a/Resources/Prototypes/Reagents/gases.yml +++ b/Resources/Prototypes/Reagents/gases.yml @@ -26,6 +26,10 @@ conditions: - !type:OrganType type: Plant + - !type:Oxygenate + conditions: + - !type:OrganType + type: Aquatic # DV - Feroxi Still need to breathe # Convert Oxygen into CO2. - !type:ModifyLungGas conditions: From 6a7dcf9022a13c97c0ce868e1dd999e86bcc2f2e Mon Sep 17 00:00:00 2001 From: BlitzTheSquishy <73762869+BlitzTheSquishy@users.noreply.github.com> Date: Wed, 28 Aug 2024 13:23:15 +1000 Subject: [PATCH 08/55] Speech verbs, Typing indicatorm Entities and enabling certain markings --- .../deltav/chat/managers/chat_manager.ftl | 6 ++ .../Mobs/Customization/Markings/makeup.yml | 6 +- .../DeltaV/Entities/Mobs/Species/feroxi.yml | 6 +- .../Prototypes/DeltaV/Species/feroxi.yml | 2 +- .../DeltaV/Voice/speech_emote_sounds.yml | 56 ++++++++++++++++++ .../Prototypes/DeltaV/Voice/speech_sounds.yml | 9 +++ .../Prototypes/DeltaV/Voice/speech_verbs.yml | 11 +++- .../Prototypes/DeltaV/typing_indicator.yml | 6 +- .../DeltaV/Effects/speech.rsi/feroxi0.png | Bin 0 -> 732 bytes .../DeltaV/Effects/speech.rsi/feroxi1.png | Bin 0 -> 605 bytes .../DeltaV/Effects/speech.rsi/feroxi2.png | Bin 0 -> 598 bytes .../DeltaV/Effects/speech.rsi/meta.json | 21 ++++++- 12 files changed, 112 insertions(+), 11 deletions(-) create mode 100644 Resources/Textures/DeltaV/Effects/speech.rsi/feroxi0.png create mode 100644 Resources/Textures/DeltaV/Effects/speech.rsi/feroxi1.png create mode 100644 Resources/Textures/DeltaV/Effects/speech.rsi/feroxi2.png diff --git a/Resources/Locale/en-US/deltav/chat/managers/chat_manager.ftl b/Resources/Locale/en-US/deltav/chat/managers/chat_manager.ftl index 22cc34b2714..37d4df69aa7 100644 --- a/Resources/Locale/en-US/deltav/chat/managers/chat_manager.ftl +++ b/Resources/Locale/en-US/deltav/chat/managers/chat_manager.ftl @@ -15,3 +15,9 @@ chat-speech-verb-harpy-1 = chirps chat-speech-verb-harpy-2 = tweets chat-speech-verb-harpy-3 = caws chat-speech-verb-harpy-4 = trills + +chat-speech-verb-name-feroxi = Feroxi +chat-speech-verb-feroxi-1 = blubs +chat-speech-verb-feroxi-2 = swishes +chat-speech-verb-feroxi-3 = gnashes +chat-speech-verb-feroxi-4 = growls diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/makeup.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/makeup.yml index 9e780ed4133..7b3fbdf5c4d 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/makeup.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/makeup.yml @@ -16,7 +16,7 @@ id: MakeupBlush bodyPart: Head markingCategory: Head - speciesRestriction: [Dwarf, Human, Reptilian, SlimePerson, Felinid, Oni, Vulpkanin, Harpy] # Delta V - Felinid, Oni, Vulpkanin, Harpy + speciesRestriction: [Dwarf, Human, Reptilian, SlimePerson, Felinid, Oni, Vulpkanin, Harpy, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Harpy, Feroxi coloring: default: type: @@ -30,7 +30,7 @@ id: MakeupNailPolishRight bodyPart: RHand markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Feroxi coloring: default: type: @@ -44,7 +44,7 @@ id: MakeupNailPolishLeft bodyPart: LHand markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Feroxi coloring: default: type: diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/feroxi.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/feroxi.yml index f239837a534..0112a56e6d8 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/feroxi.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/feroxi.yml @@ -85,12 +85,12 @@ animation: WeaponArcBite damage: types: - Pierce: 5 + Piercing: 5 - type: Perishable - type: Damageable damageModifierSet: Feroxi - - type: TemperatureProtection - coefficient: 0.1 + - type: TypingIndicator + proto: feroxi - type: entity save: false diff --git a/Resources/Prototypes/DeltaV/Species/feroxi.yml b/Resources/Prototypes/DeltaV/Species/feroxi.yml index 5856e59de7f..fad76d0761e 100644 --- a/Resources/Prototypes/DeltaV/Species/feroxi.yml +++ b/Resources/Prototypes/DeltaV/Species/feroxi.yml @@ -4,7 +4,7 @@ roundStart: true prototype: MobFeroxi sprites: MobFeroxiSprites - defaultSkinTone: "#985629" + defaultSkinTone: "#8DB9D6" markingLimits: MobFeroxiMarkingLimits dollPrototype: MobFeroxiDummy skinColoration: Hues diff --git a/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml b/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml index 3dbd0092995..f7555d17d84 100644 --- a/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml +++ b/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml @@ -162,3 +162,59 @@ collection: VulpkaninHowls Awoo: collection: VulpkaninHowls + +- type: emoteSounds + id: FemaleFeroxi + params: + variation: 0.125 + sounds: + Scream: + collection: FemaleScreams + Laugh: + collection: FemaleLaugh + Sneeze: + collection: FemaleSneezes + Cough: + collection: FemaleCoughs + Yawn: + collection: FemaleYawn + Snore: + collection: Snores + Honk: + collection: CluwneHorn + Sigh: + collection: FemaleSigh + Crying: + collection: FemaleCry + Whistle: + collection: Whistles + Weh: + collection: Weh + +- type: emoteSounds + id: MaleFeroxi + params: + variation: 0.125 + sounds: + Scream: + collection: MaleScreams + Laugh: + collection: MaleLaugh + Sneeze: + collection: MaleSneezes + Cough: + collection: MaleCoughs + Yawn: + collection: MaleYawn + Snore: + collection: Snores + Honk: + collection: BikeHorn + Sigh: + collection: MaleSigh + Crying: + collection: MaleCry + Whistle: + collection: Whistles + Weh: + collection: Weh diff --git a/Resources/Prototypes/DeltaV/Voice/speech_sounds.yml b/Resources/Prototypes/DeltaV/Voice/speech_sounds.yml index 89db03d2fcc..077f33fc695 100644 --- a/Resources/Prototypes/DeltaV/Voice/speech_sounds.yml +++ b/Resources/Prototypes/DeltaV/Voice/speech_sounds.yml @@ -15,3 +15,12 @@ path: /Audio/DeltaV/Voice/Harpy/chirp1.ogg exclaimSound: path: /Audio/DeltaV/Voice/Harpy/chirp1.ogg + +- type: speechSounds + id: Feroxi + saySound: + path: /Audio/DeltaV/Voice/Talk/feroxi.ogg + askSound: + path: /Audio/DeltaV/Voice/Talk/feroxi_ask.ogg + exclaimSound: + path: /Audio/DeltaV/Voice/Talk/feroxi_ask.ogg diff --git a/Resources/Prototypes/DeltaV/Voice/speech_verbs.yml b/Resources/Prototypes/DeltaV/Voice/speech_verbs.yml index 26156fb82db..3e2389f37a1 100644 --- a/Resources/Prototypes/DeltaV/Voice/speech_verbs.yml +++ b/Resources/Prototypes/DeltaV/Voice/speech_verbs.yml @@ -23,4 +23,13 @@ - chat-speech-verb-harpy-1 - chat-speech-verb-harpy-2 - chat-speech-verb-harpy-3 - - chat-speech-verb-harpy-4 + - chat-speech-verb-harpy- + +- type: speechVerb + id: Feroxi + name: chat-speech-verb-name-feroxi + speechVerbStrings: + - chat-speech-verb-feroxi-1 + - chat-speech-verb-feroxi-2 + - chat-speech-verb-feroxi-3 + - chat-speech-verb-feroxi-4 diff --git a/Resources/Prototypes/DeltaV/typing_indicator.yml b/Resources/Prototypes/DeltaV/typing_indicator.yml index 7cfca9cc95f..7edb26a9266 100644 --- a/Resources/Prototypes/DeltaV/typing_indicator.yml +++ b/Resources/Prototypes/DeltaV/typing_indicator.yml @@ -1,6 +1,10 @@ -- type: typingIndicator +- type: typingIndicator id: felinid spritePath: /Textures/DeltaV/Effects/speech.rsi typingState: felinid0 offset: 0, 0.2 # 0625 +- type: typingIndicator + id: feroxi + spritePath: /Textures/DeltaV/Effects/speech.rsi + typingState: feroxi0 diff --git a/Resources/Textures/DeltaV/Effects/speech.rsi/feroxi0.png b/Resources/Textures/DeltaV/Effects/speech.rsi/feroxi0.png new file mode 100644 index 0000000000000000000000000000000000000000..a171bdb2da44285057bab39b59f9950647eb96f8 GIT binary patch literal 732 zcmV<20wev2P)4Tx04UFukvU5PQ51zg6E|Wcg%%PlQm9xch=N#31Z|>462YyRnQTIqVP=8^ zTfxR6U?JML75)Ql1zQC{Py`W6Yqv&Zye|nPh!(!#&HXrU&gH%{;E807oZUPLxx8aV zXTqU{#idZ&Gah^dXeFo_wmBP{j`QdGxTQ(en_<<9|E-Qh(l(%}U3lCuEk{_UA+qL} zinoNjjf|EMJ`f(VWI*9drR!CGQk<^xn_?>-oszq$o}qLD>kVvVteo(ma9=K4G-~sx zoA{IY`Iyw8>|Si5%n&AoPLWlzI1Ee8OJ=|OMk>BJ3gR*3ZBoJ#N1BXyheRz(*QC^x z=t+69lvM6N^R!cAqt)*IFtj|n?rT4^ZNpdDbw3YX_v;9}4{)BZ`wNoO#JlL_y4JT3 zfekplsB8KToNYqSy{TDRMe@q_q*Cy50-cM{bq&7dYF4##j_)A8F2CpscK2XFz7MQ? z1JOBW^w>}-VE_OC32;bRa{vGf5dZ)S5dnW>Uy%R+0S!q+K~#8N?b=HY!Y~X)(Uwio z{SOeVs^mp>2sRLRj#+Sf zFCrF^ny(YE+kW=Iz1qc6^Zg3cp#ITZtqk0R#C!k%00000008jwrs)lQ#k;l*?aVX) O00004Tx04UFukvmHRK@^2QqY}|*3N1t|Qm9xch=OP*5lj;;Vgz5!W|B>WJeJ)A z3ATcbMZiL|@m2T_v=wX>1VIr*EUkSt64pCLNDwWYW%hoY*>kyb7Chm!$~X-Zkjdul zNGKSXUsw!ypYYI(k2b~)E%xdOfIn@xRp)PdEzdnuJG{W#@%u8p5l2 zOY^31he{c7;eFu&TLu)q(0Z)GkD8Mee${M8Ba?DB-7}D^;aCl;l${ao7w*ZV3+j6w zeG^|IJ2xw}OLjL75kdqB5Tn2fY4Qw8%}Qp!`-Z-JGvvgh$^ndrT9akD+w|+OME_sgl+AIY+k;U6WsQ2|K&cC*S** zKLH;QXc(2}e-How010qNS#tmY3lRVS3lRZ-WM7d00050iL_t(oN9~e94uv2LM8Qkx z{TIf6D(q{DA9M?DoR>6(&SEBooc4Tx04UFukvmHRK@^2QqY}|*3N1t|Qm9xch=OP*5lj;;Vgz5!W|B>WJeJ)A z3ATcbMZiL|@m2T_v=wX>1VIr*EUkSt64pCLNDwWYW%hoY*>kyb7Chm!$~X-Zkjdul zNGKSXUsw!ypYYI(k2b~)E%xdOfIn@xRp)PdEzdnuJG{W#@%u8p5l2 zOY^31he{c7;eFu&TLu)q(0Z)GkD8Mee${M8Ba?DB-7}D^;aCl;l${ao7w*ZV3+j6w zeG^|IJ2xw}OLjL75kdqB5Tn2fY4Qw8%}Qp!`-Z-JGvvgh$^ndrT9akD+w|+OME_sgl+AIY+k;U6WsQ2|K&cC*S** zKLH;QXc(2}e-How010qNS#tmY3lRVS3lRZ-WM7d0004$bL_t(oN9~e94uBvG1i??q z{|^RVg8YO%ZbACX|38=puwMY|2(byhiREB`@!EX@+IwUX*ao_2eCYM$ kgCPhZgb+dqA%7;N3n%O}6Y_e;rT_o{07*qoM6N<$f=cT9qyPW_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Effects/speech.rsi/meta.json b/Resources/Textures/DeltaV/Effects/speech.rsi/meta.json index 1d4b09fbffe..d5fdac5acd5 100644 --- a/Resources/Textures/DeltaV/Effects/speech.rsi/meta.json +++ b/Resources/Textures/DeltaV/Effects/speech.rsi/meta.json @@ -1,11 +1,11 @@ -{ +{ "version": 1, "size": { "x": 32, "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Felinid sprites made by Adrian16199 (Github)", + "copyright": "Felinid sprites made by Adrian16199 (Github) | Feroxi sprites made by BlitzTheSquishy", "states": [ { "name": "felinid0", @@ -23,6 +23,23 @@ }, { "name": "felinid2" + }, + { + "name": "feroxi0", + "delays": [ + [ + 0.2, + 0.3, + 0.3, + 0.5 + ] + ] + }, + { + "name": "feroxi1" + }, + { + "name": "feroxi2" } ] } From cf1332f4a43c474f2d38e2bfc0b69ff125f9ad2c Mon Sep 17 00:00:00 2001 From: BlitzTheSquishy <73762869+BlitzTheSquishy@users.noreply.github.com> Date: Sat, 31 Aug 2024 16:36:07 +1000 Subject: [PATCH 09/55] Water Vapour minorly hydrates, much slower than water due to how breathing works over drinking --- .../Prototypes/Reagents/Consumable/Drink/drinks.yml | 9 +++++++-- Resources/ServerInfo/Guidebook/Mobs/Species.xml | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml index 295dca0ad8c..3d567c2def8 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml @@ -453,14 +453,19 @@ conditions: - !type:OrganType type: Aquatic + - !type:SatiateThirst + conditions: + - !type:OrganType + type: Aquatic + factor: 2 # Converts H2O into CO2 - !type:ModifyLungGas conditions: - !type:OrganType type: Aquatic ratios: # no duplicating O2 >:3 - CarbonDioxide: 1.0 - WaterVapor: -2.0 + CarbonDioxide: 0.5 + WaterVapor: -1.0 - type: reagent id: Ice diff --git a/Resources/ServerInfo/Guidebook/Mobs/Species.xml b/Resources/ServerInfo/Guidebook/Mobs/Species.xml index e6b489817fe..ed9d7f8b411 100644 --- a/Resources/ServerInfo/Guidebook/Mobs/Species.xml +++ b/Resources/ServerInfo/Guidebook/Mobs/Species.xml @@ -22,6 +22,7 @@ + From ffc50ab1c1086a7c605b004087793595698672c4 Mon Sep 17 00:00:00 2001 From: BlitzTheSquishy <73762869+BlitzTheSquishy@users.noreply.github.com> Date: Sat, 31 Aug 2024 16:44:49 +1000 Subject: [PATCH 10/55] slightly more damage to the bite, shorm have strong jaw --- Resources/Prototypes/DeltaV/Entities/Mobs/Species/feroxi.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/feroxi.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/feroxi.yml index 0112a56e6d8..aafe437fa4e 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/feroxi.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/feroxi.yml @@ -85,7 +85,7 @@ animation: WeaponArcBite damage: types: - Piercing: 5 + Piercing: 7 - type: Perishable - type: Damageable damageModifierSet: Feroxi From b4ff550d73ab46d0147874d273b61a478d01dbab Mon Sep 17 00:00:00 2001 From: BlitzTheSquishy <73762869+BlitzTheSquishy@users.noreply.github.com> Date: Tue, 10 Sep 2024 18:18:19 +1000 Subject: [PATCH 11/55] i hate rsi --- .../Textures/DeltaV/Effects/creampie.rsi/meta.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Textures/DeltaV/Effects/creampie.rsi/meta.json b/Resources/Textures/DeltaV/Effects/creampie.rsi/meta.json index 113f363e202..3d11dcb4ba2 100644 --- a/Resources/Textures/DeltaV/Effects/creampie.rsi/meta.json +++ b/Resources/Textures/DeltaV/Effects/creampie.rsi/meta.json @@ -15,10 +15,10 @@ { "name": "creampie_rodentia", "directions": 4 - } - { - "name": "creampie_feroxi", - "directions": 4 - } + }, + { + "name": "creampie_feroxi", + "directions": 4 + } ] } From 5f0d94d0a8f3220bf5aeb0feaea015cbd7e757dc Mon Sep 17 00:00:00 2001 From: BlitzTheSquishy <73762869+BlitzTheSquishy@users.noreply.github.com> Date: Mon, 16 Sep 2024 09:00:40 +1000 Subject: [PATCH 12/55] i forgot to remove some ======= somewhere when rodentia were added --- Resources/Textures/DeltaV/Effects/creampie.rsi/meta.json | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Textures/DeltaV/Effects/creampie.rsi/meta.json b/Resources/Textures/DeltaV/Effects/creampie.rsi/meta.json index 3d11dcb4ba2..062627a1bff 100644 --- a/Resources/Textures/DeltaV/Effects/creampie.rsi/meta.json +++ b/Resources/Textures/DeltaV/Effects/creampie.rsi/meta.json @@ -1,5 +1,4 @@ { -======= "version": 1, "size": { "x": 32, From c4734e2fed75aecec8f6688c0ac6f344254cb094 Mon Sep 17 00:00:00 2001 From: BlitzTheSquishy <73762869+BlitzTheSquishy@users.noreply.github.com> Date: Mon, 16 Sep 2024 09:49:50 +1000 Subject: [PATCH 13/55] funny --- Resources/Locale/en-US/deltav/species/species.ftl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Resources/Locale/en-US/deltav/species/species.ftl b/Resources/Locale/en-US/deltav/species/species.ftl index e2cd85d3923..545858ef4ab 100644 --- a/Resources/Locale/en-US/deltav/species/species.ftl +++ b/Resources/Locale/en-US/deltav/species/species.ftl @@ -1,6 +1,5 @@ -## Species Names +## Species Names species-name-vulpkanin = Vulpkanin species-name-harpy = Harpy species-name-rodentia = Rodentia -species-name-feroxi = Feroxi From b9d26d82d3874772a95d7cb68876e8554ccc3fc6 Mon Sep 17 00:00:00 2001 From: BlitzTheSquishy <73762869+BlitzTheSquishy@users.noreply.github.com> Date: Mon, 16 Sep 2024 09:51:04 +1000 Subject: [PATCH 14/55] and now fixing what i did --- Resources/Locale/en-US/deltav/species/species.ftl | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Locale/en-US/deltav/species/species.ftl b/Resources/Locale/en-US/deltav/species/species.ftl index 545858ef4ab..fad56282acd 100644 --- a/Resources/Locale/en-US/deltav/species/species.ftl +++ b/Resources/Locale/en-US/deltav/species/species.ftl @@ -3,3 +3,4 @@ species-name-vulpkanin = Vulpkanin species-name-harpy = Harpy species-name-rodentia = Rodentia +species-name-feroxi = Feroxi From 4cadc29d0d62565edeef8f7cb39e1e976a4cc7c7 Mon Sep 17 00:00:00 2001 From: BlitzTheSquishy <73762869+BlitzTheSquishy@users.noreply.github.com> Date: Mon, 16 Sep 2024 10:54:11 +1000 Subject: [PATCH 15/55] stuff! --- .../Locale/en-US/deltav/phrases/species.ftl | 1 + .../DeltaV/Entities/Mobs/Species/feroxi.yml | 4 +-- .../QuickPhrases/Species/generic_species.yml | 5 ++++ .../DeltaV/SoundCollections/feroxi.yml | 4 +++ .../DeltaV/Voice/speech_emote_sounds.yml | 10 +++++--- .../Prototypes/DeltaV/Voice/speech_emotes.yml | 25 +++++++++++++++++++ .../Guidebook/Mobs/DeltaV/Feroxi.xml | 9 +++---- 7 files changed, 48 insertions(+), 10 deletions(-) create mode 100644 Resources/Prototypes/DeltaV/SoundCollections/feroxi.yml diff --git a/Resources/Locale/en-US/deltav/phrases/species.ftl b/Resources/Locale/en-US/deltav/phrases/species.ftl index 29f21cf7b32..a4c1f173dcf 100644 --- a/Resources/Locale/en-US/deltav/phrases/species.ftl +++ b/Resources/Locale/en-US/deltav/phrases/species.ftl @@ -40,3 +40,4 @@ phrase-species-ghost = ghost phrase-species-pest = pest phrase-species-insect = insect phrase-species-pet = pet +phrase-species-fish = fish diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/feroxi.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/feroxi.yml index aafe437fa4e..1984ed259ac 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/feroxi.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/feroxi.yml @@ -75,7 +75,7 @@ - map: [ "pocket2" ] - map: [ "clownedon" ] # Dynamically generated sprite: "DeltaV/Effects/creampie.rsi" - state: "creampie_vulpkanin" + state: "creampie_feroxi" visible: false - type: MeleeWeapon hidden: true @@ -85,7 +85,7 @@ animation: WeaponArcBite damage: types: - Piercing: 7 + Piercing: 7 # oooh scary extra damage~ - type: Perishable - type: Damageable damageModifierSet: Feroxi diff --git a/Resources/Prototypes/DeltaV/QuickPhrases/Species/generic_species.yml b/Resources/Prototypes/DeltaV/QuickPhrases/Species/generic_species.yml index 6a12736cc6e..1d51e1e4381 100644 --- a/Resources/Prototypes/DeltaV/QuickPhrases/Species/generic_species.yml +++ b/Resources/Prototypes/DeltaV/QuickPhrases/Species/generic_species.yml @@ -53,3 +53,8 @@ id: SpeciesPetPhrase parent: BaseGenericSpeciesPhrase text: phrase-species-pet + +- type: quickPhrase + id: SpeciesFishPhrase + parent: BaseGenericSpeciesPhrase + text: phrase-species-fish diff --git a/Resources/Prototypes/DeltaV/SoundCollections/feroxi.yml b/Resources/Prototypes/DeltaV/SoundCollections/feroxi.yml new file mode 100644 index 00000000000..67e8c474b8c --- /dev/null +++ b/Resources/Prototypes/DeltaV/SoundCollections/feroxi.yml @@ -0,0 +1,4 @@ +- type: soundCollection + id: FeroxiGnashes + files: + - /Audio/Effects/bite.ogg diff --git a/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml b/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml index bd10b476451..2401b63e03d 100644 --- a/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml +++ b/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml @@ -190,7 +190,7 @@ collection: Whistles Weh: collection: Weh - Squeak: + Squeak: path: /Audio/Animals/mouse_squeak.ogg - type: emoteSounds @@ -220,7 +220,7 @@ collection: Whistles Weh: collection: Weh - Squeak: + Squeak: path: /Audio/Animals/mouse_squeak.ogg - type: emoteSounds @@ -250,6 +250,8 @@ collection: Whistles Weh: collection: Weh + Gnash: + collection: Gnash - type: emoteSounds id: FemaleFeroxi @@ -277,4 +279,6 @@ Whistle: collection: Whistles Weh: - collection: Weh \ No newline at end of file + collection: Weh + Gnash: + collection: Gnash diff --git a/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml b/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml index ea80b295a79..33a213f3414 100644 --- a/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml +++ b/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml @@ -215,3 +215,28 @@ - awoos - awooing - awooed + +- type: emote + id: Gnash + name: delta-chat-emote-name-gnash + category: Gnash + available: false + whitelist: + components: + - Vocal + blacklist: + components: + - BorgChassis + chatMessages: [gnashes.] + chatTriggers: + - gnash + - gnashes + - gnashing + - gnashed + - gnash teeth + - gnashes teeth + - gnashes their teeth + - gnashing teeth + - gnashing their teeth + - gnashed teeth + - gnashed their teeth diff --git a/Resources/ServerInfo/Guidebook/Mobs/DeltaV/Feroxi.xml b/Resources/ServerInfo/Guidebook/Mobs/DeltaV/Feroxi.xml index 3cefd917d09..2b14aaf3ab0 100644 --- a/Resources/ServerInfo/Guidebook/Mobs/DeltaV/Feroxi.xml +++ b/Resources/ServerInfo/Guidebook/Mobs/DeltaV/Feroxi.xml @@ -14,16 +14,15 @@ ## Benefits - - Uses their jaws to do piercing damage + - Uses their jaws to do piercing damage, and harder than other species. - Their cartilaginous skeleton allows them to resist blunt force trauma more easily. - Their adaptation to native environments allows them to resist the cold more easily. - - ## Special - - - Comes with the Deuteranopia trait by default. This can be disabled via accessibility options. + - Their gills allow them to breathe water vapour ## Drawbacks - They take 10% more Slash damage. + - When thirst falls to "Parched" they begin to suffocate. Have water handy! + - Gets hungry 15% faster. From 7955b33a410ac34d91315483a1bd0a8cae50937e Mon Sep 17 00:00:00 2001 From: BlitzTheSquishy <73762869+BlitzTheSquishy@users.noreply.github.com> Date: Mon, 16 Sep 2024 12:43:51 +1000 Subject: [PATCH 16/55] PAIN AGONY RAH! --- Resources/Prototypes/DeltaV/Guidebook/species.yml | 3 ++- Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml | 4 ++-- Resources/Prototypes/DeltaV/Voice/speech_emotes.yml | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Guidebook/species.yml b/Resources/Prototypes/DeltaV/Guidebook/species.yml index c656276e1e0..798fc9e75ca 100644 --- a/Resources/Prototypes/DeltaV/Guidebook/species.yml +++ b/Resources/Prototypes/DeltaV/Guidebook/species.yml @@ -18,7 +18,8 @@ name: species-name-oni text: "/ServerInfo/Guidebook/Mobs/DeltaV/Oni.xml" -- id: Rodentia +- type: guideEntry + id: Rodentia name: species-name-rodentia text: "/ServerInfo/Guidebook/Mobs/DeltaV/Rodentia.xml" diff --git a/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml b/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml index 2401b63e03d..2d2389bf375 100644 --- a/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml +++ b/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml @@ -251,7 +251,7 @@ Weh: collection: Weh Gnash: - collection: Gnash + collection: FeroxiGnash - type: emoteSounds id: FemaleFeroxi @@ -281,4 +281,4 @@ Weh: collection: Weh Gnash: - collection: Gnash + collection: FeroxiGnash diff --git a/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml b/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml index 33a213f3414..8d27bfbe48e 100644 --- a/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml +++ b/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml @@ -219,7 +219,7 @@ - type: emote id: Gnash name: delta-chat-emote-name-gnash - category: Gnash + category: Vocal available: false whitelist: components: From bc4b8c07cb522f823a581540b9e842e164efa916 Mon Sep 17 00:00:00 2001 From: BlitzTheSquishy <73762869+BlitzTheSquishy@users.noreply.github.com> Date: Mon, 16 Sep 2024 17:22:01 +1000 Subject: [PATCH 17/55] Tweaks + new organ, setting up for C# --- .../Prototypes/DeltaV/Body/Organs/feroxi.yml | 40 ++++++++++++++++++- .../DeltaV/SoundCollections/feroxi.yml | 2 +- .../Reagents/Consumable/Drink/drinks.yml | 20 +++++++++- 3 files changed, 58 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Body/Organs/feroxi.yml b/Resources/Prototypes/DeltaV/Body/Organs/feroxi.yml index 7ab39f0e536..6bea9f3e422 100644 --- a/Resources/Prototypes/DeltaV/Body/Organs/feroxi.yml +++ b/Resources/Prototypes/DeltaV/Body/Organs/feroxi.yml @@ -24,7 +24,7 @@ - type: entity id: OrganFeroxiLungs parent: BaseHumanOrgan - name: lungs + name: Aquatic Lungs description: "A pair of amphibious lungs, filtering oxygen out of the air continuously." components: - type: Sprite @@ -32,7 +32,7 @@ layers: - state: lung-l - state: lung-r - - type: Lung + - type: Lung - type: Metabolizer removeEmpty: true solutionOnBody: false @@ -56,3 +56,39 @@ reagents: - ReagentId: UncookedAnimalProteins Quantity: 5 + +- type: entity + id: OrganFeroxiLungsDehydrated + parent: BaseHumanOrgan + name: Dehydrated Aquatic Lungs + description: "A pair of amphibious lungs, filtering oxygen out of the air continuously." + components: + - type: Sprite + sprite: Mobs/Species/Human/organs.rsi + layers: + - state: lung-l + - state: lung-r + - type: Lung + - type: Metabolizer + removeEmpty: true + solutionOnBody: false + solution: "Lung" + metabolizerTypes: [ AquaticDehydrate ] + groups: + - id: Gas + rateModifier: 100.0 + - type: SolutionContainerManager + solutions: + organ: + maxVol: 10 + reagents: + - ReagentId: Nutriment + Quantity: 10 + Lung: + maxVol: 100 + canReact: False + food: + maxVol: 5 + reagents: + - ReagentId: UncookedAnimalProteins + Quantity: 5 diff --git a/Resources/Prototypes/DeltaV/SoundCollections/feroxi.yml b/Resources/Prototypes/DeltaV/SoundCollections/feroxi.yml index 67e8c474b8c..d4c648614e4 100644 --- a/Resources/Prototypes/DeltaV/SoundCollections/feroxi.yml +++ b/Resources/Prototypes/DeltaV/SoundCollections/feroxi.yml @@ -1,4 +1,4 @@ - type: soundCollection - id: FeroxiGnashes + id: FeroxiGnash files: - /Audio/Effects/bite.ogg diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml index 3d567c2def8..1b75f493ec3 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml @@ -447,7 +447,7 @@ effects: - !type:SatiateThirst factor: 4 - Gas: # DV - Feroxi get to breathe with this too + Gas: # DV - Feroxi get to breathe with this too! effects: - !type:Oxygenate conditions: @@ -458,6 +458,17 @@ - !type:OrganType type: Aquatic factor: 2 + - !type:Oxygenate + - !type:Oxygenate + conditions: + - !type:OrganType + type: AquaticDehydrate + - !type:Oxygenate + - !type:SatiateThirst + conditions: + - !type:OrganType + type: AquaticDehydrate + factor: 2 # Converts H2O into CO2 - !type:ModifyLungGas conditions: @@ -466,6 +477,13 @@ ratios: # no duplicating O2 >:3 CarbonDioxide: 0.5 WaterVapor: -1.0 + - !type:ModifyLungGas + conditions: + - !type:OrganType + type: AquaticDehydrate + ratios: # no duplicating O2 >:3 + CarbonDioxide: 0.5 + WaterVapor: -1.0 - type: reagent id: Ice From 402bf58deb8ddd4f9b00025eef1628efe692ecd5 Mon Sep 17 00:00:00 2001 From: BlitzTheSquishy <73762869+BlitzTheSquishy@users.noreply.github.com> Date: Tue, 17 Sep 2024 14:36:31 +1000 Subject: [PATCH 18/55] So uh, C# is a bitch, but PROGRESS! WOO! --- .../DeltaV/Feroxi/FeroxiDehydrateComponent.cs | 16 +++++++++ .../DeltaV/Feroxi/FeroxiDehydrateSystem.cs | 21 +++++++++++ .../deltav/metabolism/metabolizer-types.ftl | 1 + .../Prototypes/DeltaV/Body/Organs/feroxi.yml | 36 ------------------- .../DeltaV/Chemistry/metabolizer_types.yml | 4 +++ .../DeltaV/Entities/Mobs/Species/feroxi.yml | 6 +++- Resources/Prototypes/Guidebook/species.yml | 1 + .../Nyanotrasen/metempsychoticHumanoids.yml | 1 + .../Reagents/Consumable/Drink/drinks.yml | 8 ++--- 9 files changed, 52 insertions(+), 42 deletions(-) create mode 100644 Content.Server/DeltaV/Feroxi/FeroxiDehydrateComponent.cs create mode 100644 Content.Server/DeltaV/Feroxi/FeroxiDehydrateSystem.cs diff --git a/Content.Server/DeltaV/Feroxi/FeroxiDehydrateComponent.cs b/Content.Server/DeltaV/Feroxi/FeroxiDehydrateComponent.cs new file mode 100644 index 00000000000..36de718f32b --- /dev/null +++ b/Content.Server/DeltaV/Feroxi/FeroxiDehydrateComponent.cs @@ -0,0 +1,16 @@ +using Content.Shared.Body.Prototypes; +using Robust.Shared.Prototypes; + +namespace Content.Server.DeltaV.Feroxi; + +[RegisterComponent, Access(typeof(FeroxiDehydrateSystem))] +public sealed partial class FeroxiDehydrateComponent : Component +{ + [DataField("HydratedMetabolizer")] + [Access(typeof(FeroxiDehydrateSystem), Other = AccessPermissions.ReadExecute)] + public HashSet>? HydratedMetabolizer = null; + + [DataField("DehydratedMetabolizer")] + [Access(typeof(FeroxiDehydrateSystem), Other = AccessPermissions.ReadExecute)] + public HashSet>? DehydratedMetabolizer = null; +} diff --git a/Content.Server/DeltaV/Feroxi/FeroxiDehydrateSystem.cs b/Content.Server/DeltaV/Feroxi/FeroxiDehydrateSystem.cs new file mode 100644 index 00000000000..93d8cec41b8 --- /dev/null +++ b/Content.Server/DeltaV/Feroxi/FeroxiDehydrateSystem.cs @@ -0,0 +1,21 @@ +using System.Diagnostics; +using Content.Shared.Nutrition.Components; + +namespace Content.Server.DeltaV.Feroxi; + +public sealed class FeroxiDehydrateSystem : EntitySystem +{ + public override void Update(float frameTime) + { + var query = EntityQueryEnumerator(); + + while (query.MoveNext(out var uid, out var feroxiDehydrate, out var thirst)) + { + if(thirst.CurrentThirstThreshold != thirst.LastThirstThreshold) + { + + } + } + } +} + diff --git a/Resources/Locale/en-US/deltav/metabolism/metabolizer-types.ftl b/Resources/Locale/en-US/deltav/metabolism/metabolizer-types.ftl index bef912d33e6..22a08616bcc 100644 --- a/Resources/Locale/en-US/deltav/metabolism/metabolizer-types.ftl +++ b/Resources/Locale/en-US/deltav/metabolism/metabolizer-types.ftl @@ -1 +1,2 @@ metabolizer-type-aquatic = Aquatic +metabolizer-type-aquatic-dehydrated = Dehydrated Aquatic diff --git a/Resources/Prototypes/DeltaV/Body/Organs/feroxi.yml b/Resources/Prototypes/DeltaV/Body/Organs/feroxi.yml index 6bea9f3e422..85ef23d1ae4 100644 --- a/Resources/Prototypes/DeltaV/Body/Organs/feroxi.yml +++ b/Resources/Prototypes/DeltaV/Body/Organs/feroxi.yml @@ -56,39 +56,3 @@ reagents: - ReagentId: UncookedAnimalProteins Quantity: 5 - -- type: entity - id: OrganFeroxiLungsDehydrated - parent: BaseHumanOrgan - name: Dehydrated Aquatic Lungs - description: "A pair of amphibious lungs, filtering oxygen out of the air continuously." - components: - - type: Sprite - sprite: Mobs/Species/Human/organs.rsi - layers: - - state: lung-l - - state: lung-r - - type: Lung - - type: Metabolizer - removeEmpty: true - solutionOnBody: false - solution: "Lung" - metabolizerTypes: [ AquaticDehydrate ] - groups: - - id: Gas - rateModifier: 100.0 - - type: SolutionContainerManager - solutions: - organ: - maxVol: 10 - reagents: - - ReagentId: Nutriment - Quantity: 10 - Lung: - maxVol: 100 - canReact: False - food: - maxVol: 5 - reagents: - - ReagentId: UncookedAnimalProteins - Quantity: 5 diff --git a/Resources/Prototypes/DeltaV/Chemistry/metabolizer_types.yml b/Resources/Prototypes/DeltaV/Chemistry/metabolizer_types.yml index 0afca094318..5e74b6c26b9 100644 --- a/Resources/Prototypes/DeltaV/Chemistry/metabolizer_types.yml +++ b/Resources/Prototypes/DeltaV/Chemistry/metabolizer_types.yml @@ -4,3 +4,7 @@ - type: metabolizerType id: Aquatic name: metabolizer-type-aquatic + +- type: metabolizerType + id: AquaticDehydrated + name: metabolizer-type-aquatic-dehydrated diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/feroxi.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/feroxi.yml index 1984ed259ac..6aa41477496 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/feroxi.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/feroxi.yml @@ -18,10 +18,10 @@ state: full - type: Body prototype: Feroxi - requiredLegs: 2 - type: Speech speechSounds: Feroxi speechVerb: Feroxi + allowedEmotes: ['Gnash'] - type: Sprite netsync: false noRot: true @@ -91,12 +91,16 @@ damageModifierSet: Feroxi - type: TypingIndicator proto: feroxi + - type: FeroxiDehydrate + HydratedMetabolizer: Aquatic + DehydratedMetabolizer: AquaticDehydrated - type: entity save: false name: Feroxi Dummy parent: MobHumanDummy id: MobFeroxiDummy + noSpawn: true description: A dummy feroxi meant to be used in character setup. components: - type: HumanoidAppearance diff --git a/Resources/Prototypes/Guidebook/species.yml b/Resources/Prototypes/Guidebook/species.yml index 73e9056c01d..c09d4cd65da 100644 --- a/Resources/Prototypes/Guidebook/species.yml +++ b/Resources/Prototypes/Guidebook/species.yml @@ -17,6 +17,7 @@ - Felinid - Oni - Rodentia + - Feroxi - type: guideEntry id: Arachnid diff --git a/Resources/Prototypes/Nyanotrasen/metempsychoticHumanoids.yml b/Resources/Prototypes/Nyanotrasen/metempsychoticHumanoids.yml index a4d96c109e8..b23b5c6431e 100644 --- a/Resources/Prototypes/Nyanotrasen/metempsychoticHumanoids.yml +++ b/Resources/Prototypes/Nyanotrasen/metempsychoticHumanoids.yml @@ -12,3 +12,4 @@ SlimePerson: 0.5 Vulpkanin: 0.5 Rodentia: 0.5 + Feroxi: 0.5 diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml index 1b75f493ec3..6c00681e955 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml @@ -459,15 +459,13 @@ type: Aquatic factor: 2 - !type:Oxygenate - - !type:Oxygenate conditions: - !type:OrganType - type: AquaticDehydrate - - !type:Oxygenate + type: AquaticDehydrated - !type:SatiateThirst conditions: - !type:OrganType - type: AquaticDehydrate + type: AquaticDehydrated factor: 2 # Converts H2O into CO2 - !type:ModifyLungGas @@ -480,7 +478,7 @@ - !type:ModifyLungGas conditions: - !type:OrganType - type: AquaticDehydrate + type: AquaticDehydrated ratios: # no duplicating O2 >:3 CarbonDioxide: 0.5 WaterVapor: -1.0 From 9bf310519fde0ac5556c368a19f3f661719088e4 Mon Sep 17 00:00:00 2001 From: BlitzTheSquishy <73762869+BlitzTheSquishy@users.noreply.github.com> Date: Wed, 18 Sep 2024 17:42:37 +1000 Subject: [PATCH 19/55] Emotes stuff --- Resources/Locale/en-US/deltav/chat/emotes.ftl | 1 + .../Prototypes/DeltaV/Body/Parts/feroxi.yml | 2 -- .../DeltaV/Body/Prototypes/feroxi.yml | 2 +- .../DeltaV/Entities/Mobs/Player/feroxi.yml | 28 ------------------- .../DeltaV/Entities/Mobs/Species/feroxi.yml | 2 +- .../DeltaV/Entities/Mobs/Species/harpy.yml | 2 +- .../DeltaV/SoundCollections/feroxi.yml | 2 +- .../DeltaV/Voice/speech_emote_sounds.yml | 4 +-- .../Prototypes/DeltaV/Voice/speech_emotes.yml | 1 + .../Prototypes/DeltaV/Voice/speech_sounds.yml | 9 ------ 10 files changed, 8 insertions(+), 45 deletions(-) diff --git a/Resources/Locale/en-US/deltav/chat/emotes.ftl b/Resources/Locale/en-US/deltav/chat/emotes.ftl index 6676ad49b82..15701522005 100644 --- a/Resources/Locale/en-US/deltav/chat/emotes.ftl +++ b/Resources/Locale/en-US/deltav/chat/emotes.ftl @@ -11,3 +11,4 @@ delta-chat-emote-name-snarl = Snarl delta-chat-emote-name-whine = Whine delta-chat-emote-name-howl = Howl delta-chat-emote-name-awoo = Awoo +delta-chat-emote-name-gnash = Gnash diff --git a/Resources/Prototypes/DeltaV/Body/Parts/feroxi.yml b/Resources/Prototypes/DeltaV/Body/Parts/feroxi.yml index 04f514b6041..c9c04dd9524 100644 --- a/Resources/Prototypes/DeltaV/Body/Parts/feroxi.yml +++ b/Resources/Prototypes/DeltaV/Body/Parts/feroxi.yml @@ -1,5 +1,3 @@ -# TODO: Add descriptions (many) -# TODO BODY: Part damage - type: entity id: PartFeroxi parent: BaseItem diff --git a/Resources/Prototypes/DeltaV/Body/Prototypes/feroxi.yml b/Resources/Prototypes/DeltaV/Body/Prototypes/feroxi.yml index 3c61f079cb2..3984c2bbd3d 100644 --- a/Resources/Prototypes/DeltaV/Body/Prototypes/feroxi.yml +++ b/Resources/Prototypes/DeltaV/Body/Prototypes/feroxi.yml @@ -1,5 +1,5 @@ - type: body - name: "feroxi" + name: species-name-feroxi id: Feroxi root: torso slots: diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/feroxi.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/feroxi.yml index 2d67f4d1781..8184ca5b5f1 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/feroxi.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/feroxi.yml @@ -3,31 +3,3 @@ name: Urist McFin parent: BaseMobFeroxi id: MobFeroxi - components: - - type: CombatMode - - type: InteractionPopup - successChance: 1 - interactSuccessString: hugging-success-generic - interactSuccessSound: /Audio/Effects/thudswoosh.ogg - messagePerceivedByOthers: hugging-success-generic-others - - type: MindContainer - showExamineInfo: true - - type: Input - context: "human" - - type: MobMover - - type: InputMover - - type: Alerts - - type: Eye - - type: CameraRecoil - - type: Examiner - - type: CanHostGuardian - - type: NpcFactionMember - factions: - - NanoTrasen - - type: Respirator - damage: - types: - Asphyxiation: 1.0 - damageRecovery: - types: - Asphyxiation: -1.0 diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/feroxi.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/feroxi.yml index 6aa41477496..8ed516e0a4b 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/feroxi.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/feroxi.yml @@ -19,7 +19,7 @@ - type: Body prototype: Feroxi - type: Speech - speechSounds: Feroxi + speechSounds: Tenor speechVerb: Feroxi allowedEmotes: ['Gnash'] - type: Sprite diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml index c537364dbc5..5be205390d5 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml @@ -111,7 +111,7 @@ - type: Speech speechSounds: Harpy speechVerb: Harpy - allowedEmotes: ['Meow', 'Hiss', 'Mew', 'Purr', 'Growl', 'Bark', 'Snarl', 'Whine', 'Howl', 'Awoo', 'HarpyHonk', 'HarpyRing', 'HarpyPew', 'HarpyBang', 'HarpyBeep', 'HarpyRev', 'HarpyCaw', 'Squish', 'Chitter', 'Squeak', 'Click', ] + allowedEmotes: ['Meow', 'Hiss', 'Mew', 'Purr', 'Growl', 'Bark', 'Snarl', 'Whine', 'Howl', 'Awoo', 'HarpyHonk', 'HarpyRing', 'HarpyPew', 'HarpyBang', 'HarpyBeep', 'HarpyRev', 'HarpyCaw', 'Squish', 'Chitter', 'Squeak', 'Click', 'Gnash',] - type: Vocal sounds: Male: SoundsHarpy diff --git a/Resources/Prototypes/DeltaV/SoundCollections/feroxi.yml b/Resources/Prototypes/DeltaV/SoundCollections/feroxi.yml index d4c648614e4..67e8c474b8c 100644 --- a/Resources/Prototypes/DeltaV/SoundCollections/feroxi.yml +++ b/Resources/Prototypes/DeltaV/SoundCollections/feroxi.yml @@ -1,4 +1,4 @@ - type: soundCollection - id: FeroxiGnash + id: FeroxiGnashes files: - /Audio/Effects/bite.ogg diff --git a/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml b/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml index 2d2389bf375..ecaa5e39846 100644 --- a/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml +++ b/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml @@ -251,7 +251,7 @@ Weh: collection: Weh Gnash: - collection: FeroxiGnash + collection: FeroxiGnashes - type: emoteSounds id: FemaleFeroxi @@ -281,4 +281,4 @@ Weh: collection: Weh Gnash: - collection: FeroxiGnash + collection: FeroxiGnashes diff --git a/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml b/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml index 8d27bfbe48e..da01a783cf1 100644 --- a/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml +++ b/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml @@ -216,6 +216,7 @@ - awooing - awooed +# Feroxi - type: emote id: Gnash name: delta-chat-emote-name-gnash diff --git a/Resources/Prototypes/DeltaV/Voice/speech_sounds.yml b/Resources/Prototypes/DeltaV/Voice/speech_sounds.yml index 077f33fc695..89db03d2fcc 100644 --- a/Resources/Prototypes/DeltaV/Voice/speech_sounds.yml +++ b/Resources/Prototypes/DeltaV/Voice/speech_sounds.yml @@ -15,12 +15,3 @@ path: /Audio/DeltaV/Voice/Harpy/chirp1.ogg exclaimSound: path: /Audio/DeltaV/Voice/Harpy/chirp1.ogg - -- type: speechSounds - id: Feroxi - saySound: - path: /Audio/DeltaV/Voice/Talk/feroxi.ogg - askSound: - path: /Audio/DeltaV/Voice/Talk/feroxi_ask.ogg - exclaimSound: - path: /Audio/DeltaV/Voice/Talk/feroxi_ask.ogg From bf4f75a86bfdfa03a051bd26d521d7d234f3d9ce Mon Sep 17 00:00:00 2001 From: BlitzTheSquishy <73762869+BlitzTheSquishy@users.noreply.github.com> Date: Wed, 18 Sep 2024 17:43:19 +1000 Subject: [PATCH 20/55] C# time, not 100% working but it does (somewhat) function! --- .../Body/Components/MetabolizerComponent.cs | 2 +- .../DeltaV/Feroxi/FeroxiDehydrateComponent.cs | 16 ++++++---- .../DeltaV/Feroxi/FeroxiDehydrateSystem.cs | 29 +++++++++++++++++-- 3 files changed, 37 insertions(+), 10 deletions(-) diff --git a/Content.Server/Body/Components/MetabolizerComponent.cs b/Content.Server/Body/Components/MetabolizerComponent.cs index 90c99df7db2..7492cfcebc3 100644 --- a/Content.Server/Body/Components/MetabolizerComponent.cs +++ b/Content.Server/Body/Components/MetabolizerComponent.cs @@ -44,7 +44,7 @@ public sealed partial class MetabolizerComponent : Component /// List of metabolizer types that this organ is. ex. Human, Slime, Felinid, w/e. /// [DataField] - [Access(typeof(MetabolizerSystem), Other = AccessPermissions.ReadExecute)] // FIXME Friends + [Access(typeof(MetabolizerSystem), Other = AccessPermissions.ReadWriteExecute)] // FIXME Friends - DV - I need to touch this for shark people!!! public HashSet>? MetabolizerTypes = null; /// diff --git a/Content.Server/DeltaV/Feroxi/FeroxiDehydrateComponent.cs b/Content.Server/DeltaV/Feroxi/FeroxiDehydrateComponent.cs index 36de718f32b..5538d680407 100644 --- a/Content.Server/DeltaV/Feroxi/FeroxiDehydrateComponent.cs +++ b/Content.Server/DeltaV/Feroxi/FeroxiDehydrateComponent.cs @@ -6,11 +6,15 @@ namespace Content.Server.DeltaV.Feroxi; [RegisterComponent, Access(typeof(FeroxiDehydrateSystem))] public sealed partial class FeroxiDehydrateComponent : Component { - [DataField("HydratedMetabolizer")] - [Access(typeof(FeroxiDehydrateSystem), Other = AccessPermissions.ReadExecute)] - public HashSet>? HydratedMetabolizer = null; + [DataField] + [Access(Other = AccessPermissions.ReadExecute)] + public ProtoId HydratedMetabolizer; - [DataField("DehydratedMetabolizer")] - [Access(typeof(FeroxiDehydrateSystem), Other = AccessPermissions.ReadExecute)] - public HashSet>? DehydratedMetabolizer = null; + [DataField] + [Access(Other = AccessPermissions.ReadExecute)] + public ProtoId DehydratedMetabolizer; + + [DataField] + [Access(Other = AccessPermissions.ReadWriteExecute)] + public bool Dehydrated = false; } diff --git a/Content.Server/DeltaV/Feroxi/FeroxiDehydrateSystem.cs b/Content.Server/DeltaV/Feroxi/FeroxiDehydrateSystem.cs index 93d8cec41b8..b316c12dc4c 100644 --- a/Content.Server/DeltaV/Feroxi/FeroxiDehydrateSystem.cs +++ b/Content.Server/DeltaV/Feroxi/FeroxiDehydrateSystem.cs @@ -1,19 +1,42 @@ -using System.Diagnostics; +using Content.Server.Body.Components; +using Content.Server.Body.Systems; +using Content.Shared.Body.Prototypes; using Content.Shared.Nutrition.Components; +using Robust.Shared.Prototypes; namespace Content.Server.DeltaV.Feroxi; public sealed class FeroxiDehydrateSystem : EntitySystem { + [Dependency] private readonly BodySystem _bodySystem = default!; public override void Update(float frameTime) { var query = EntityQueryEnumerator(); while (query.MoveNext(out var uid, out var feroxiDehydrate, out var thirst)) { - if(thirst.CurrentThirstThreshold != thirst.LastThirstThreshold) + if (thirst.CurrentThirstThreshold == thirst.LastThirstThreshold) { - + return; + } + foreach (var entity in _bodySystem.GetBodyOrganEntityComps(uid)) + { + if (!TryComp(entity, out var metabolizer)) + { + return; + } + if (thirst.CurrentThirst <= thirst.ThirstThresholds[ThirstThreshold.Parched] && feroxiDehydrate.Dehydrated == false) + { + feroxiDehydrate.Dehydrated = true; + metabolizer.MetabolizerTypes = new HashSet>(); + metabolizer.MetabolizerTypes.Add(feroxiDehydrate.DehydratedMetabolizer); + } + if (thirst.CurrentThirst > thirst.ThirstThresholds[ThirstThreshold.Parched] && feroxiDehydrate.Dehydrated == true) + { + feroxiDehydrate.Dehydrated = false; + metabolizer.MetabolizerTypes = new HashSet>(); + metabolizer.MetabolizerTypes.Add(feroxiDehydrate.HydratedMetabolizer); + } } } } From 1040cda95fcdc27d6b4854ad601c30d690964286 Mon Sep 17 00:00:00 2001 From: BlitzTheSquishy <73762869+BlitzTheSquishy@users.noreply.github.com> Date: Wed, 18 Sep 2024 19:56:06 +1000 Subject: [PATCH 21/55] Fixed feroxi dehydration! Now onto more minor things and sprites. With help of Milon and Orks! --- .../Body/Components/MetabolizerComponent.cs | 2 +- .../DeltaV/Feroxi/FeroxiDehydrateComponent.cs | 7 +-- .../DeltaV/Feroxi/FeroxiDehydrateSystem.cs | 43 +++++++++---------- 3 files changed, 24 insertions(+), 28 deletions(-) diff --git a/Content.Server/Body/Components/MetabolizerComponent.cs b/Content.Server/Body/Components/MetabolizerComponent.cs index 7492cfcebc3..90c99df7db2 100644 --- a/Content.Server/Body/Components/MetabolizerComponent.cs +++ b/Content.Server/Body/Components/MetabolizerComponent.cs @@ -44,7 +44,7 @@ public sealed partial class MetabolizerComponent : Component /// List of metabolizer types that this organ is. ex. Human, Slime, Felinid, w/e. /// [DataField] - [Access(typeof(MetabolizerSystem), Other = AccessPermissions.ReadWriteExecute)] // FIXME Friends - DV - I need to touch this for shark people!!! + [Access(typeof(MetabolizerSystem), Other = AccessPermissions.ReadExecute)] // FIXME Friends public HashSet>? MetabolizerTypes = null; /// diff --git a/Content.Server/DeltaV/Feroxi/FeroxiDehydrateComponent.cs b/Content.Server/DeltaV/Feroxi/FeroxiDehydrateComponent.cs index 5538d680407..9a5b37fb914 100644 --- a/Content.Server/DeltaV/Feroxi/FeroxiDehydrateComponent.cs +++ b/Content.Server/DeltaV/Feroxi/FeroxiDehydrateComponent.cs @@ -7,14 +7,11 @@ namespace Content.Server.DeltaV.Feroxi; public sealed partial class FeroxiDehydrateComponent : Component { [DataField] - [Access(Other = AccessPermissions.ReadExecute)] - public ProtoId HydratedMetabolizer; + public ProtoId HydratedMetabolizer = "Aquatic"; [DataField] - [Access(Other = AccessPermissions.ReadExecute)] - public ProtoId DehydratedMetabolizer; + public ProtoId DehydratedMetabolizer = "AquaticDehydrated"; [DataField] - [Access(Other = AccessPermissions.ReadWriteExecute)] public bool Dehydrated = false; } diff --git a/Content.Server/DeltaV/Feroxi/FeroxiDehydrateSystem.cs b/Content.Server/DeltaV/Feroxi/FeroxiDehydrateSystem.cs index b316c12dc4c..47fad692d32 100644 --- a/Content.Server/DeltaV/Feroxi/FeroxiDehydrateSystem.cs +++ b/Content.Server/DeltaV/Feroxi/FeroxiDehydrateSystem.cs @@ -1,44 +1,43 @@ using Content.Server.Body.Components; using Content.Server.Body.Systems; -using Content.Shared.Body.Prototypes; using Content.Shared.Nutrition.Components; -using Robust.Shared.Prototypes; namespace Content.Server.DeltaV.Feroxi; public sealed class FeroxiDehydrateSystem : EntitySystem { [Dependency] private readonly BodySystem _bodySystem = default!; + + private const float DehydrationThreshold = 150f; + public override void Update(float frameTime) { var query = EntityQueryEnumerator(); while (query.MoveNext(out var uid, out var feroxiDehydrate, out var thirst)) { - if (thirst.CurrentThirstThreshold == thirst.LastThirstThreshold) + var currentThirst = thirst.CurrentThirst; + var shouldBeDehydrated = currentThirst <= DehydrationThreshold; + + if (feroxiDehydrate.Dehydrated != shouldBeDehydrated) { - return; + UpdateDehydrationStatus(uid, feroxiDehydrate, shouldBeDehydrated); } - foreach (var entity in _bodySystem.GetBodyOrganEntityComps(uid)) + } + } + + private void UpdateDehydrationStatus(EntityUid uid, FeroxiDehydrateComponent feroxiDehydrate, bool shouldBeDehydrated) + { + feroxiDehydrate.Dehydrated = shouldBeDehydrated; + + foreach (var entity in _bodySystem.GetBodyOrganEntityComps(uid)) + { + if (TryComp(entity, out var metabolizer)) { - if (!TryComp(entity, out var metabolizer)) - { - return; - } - if (thirst.CurrentThirst <= thirst.ThirstThresholds[ThirstThreshold.Parched] && feroxiDehydrate.Dehydrated == false) - { - feroxiDehydrate.Dehydrated = true; - metabolizer.MetabolizerTypes = new HashSet>(); - metabolizer.MetabolizerTypes.Add(feroxiDehydrate.DehydratedMetabolizer); - } - if (thirst.CurrentThirst > thirst.ThirstThresholds[ThirstThreshold.Parched] && feroxiDehydrate.Dehydrated == true) - { - feroxiDehydrate.Dehydrated = false; - metabolizer.MetabolizerTypes = new HashSet>(); - metabolizer.MetabolizerTypes.Add(feroxiDehydrate.HydratedMetabolizer); - } + var newMetabolizer = shouldBeDehydrated ? feroxiDehydrate.DehydratedMetabolizer : feroxiDehydrate.HydratedMetabolizer; + metabolizer.MetabolizerTypes!.Clear(); + metabolizer.MetabolizerTypes.Add(newMetabolizer); } } } } - From 22e6f4ce074c34baa067317c25ceaf8f0b15cb80 Mon Sep 17 00:00:00 2001 From: BlitzTheSquishy <73762869+BlitzTheSquishy@users.noreply.github.com> Date: Sat, 21 Sep 2024 23:32:59 +1000 Subject: [PATCH 22/55] shark spriting progress! Please give me tips and tricks for this shit, cause i have no fucking clue with spriting --- .../Prototypes/DeltaV/Body/Parts/feroxi.yml | 135 +++++------------- .../Mobs/Customization/Markings/feroxi.yml | 60 +++++++- .../DeltaV/Entities/Mobs/Species/feroxi.yml | 2 - .../Prototypes/DeltaV/Species/feroxi.yml | 20 +-- .../DeltaV/Voice/speech_emote_sounds.yml | 2 +- .../Mobs/Customization/Markings/gauze.yml | 32 ++--- .../Mobs/Customization/Markings/tattoos.yml | 4 +- .../ear_markings.rsi/feroxi-inner-ears.png | Bin 0 -> 211 bytes .../ear_markings.rsi/feroxi-plain-ears.png | Bin 0 -> 274 bytes .../ear_markings.rsi/feroxi-plain-fin.png | Bin 0 -> 325 bytes .../ear_markings.rsi/feroxi-tips-ears.png | Bin 0 -> 233 bytes .../Feroxi/ear_markings.rsi/meta.json | 24 ++++ .../snout_markings.rsi/feroxi-plain-snout.png | Bin 0 -> 280 bytes .../Feroxi/snout_markings.rsi/meta.json | 13 ++ .../tail_markings.rsi/feroxi-plain-tail.png | Bin 0 -> 2234 bytes .../Feroxi/tail_markings.rsi/meta.json | 13 ++ .../Mobs/Species/Feroxi/parts.rsi/full.png | Bin 692 -> 394 bytes .../Mobs/Species/Feroxi/parts.rsi/head_f.png | Bin 757 -> 2226 bytes .../Mobs/Species/Feroxi/parts.rsi/head_m.png | Bin 784 -> 2226 bytes .../Mobs/Species/Feroxi/parts.rsi/icon.png | Bin 83 -> 0 bytes .../Mobs/Species/Feroxi/parts.rsi/l_arm.png | Bin 438 -> 2223 bytes .../Mobs/Species/Feroxi/parts.rsi/l_foot.png | Bin 419 -> 2238 bytes .../Mobs/Species/Feroxi/parts.rsi/l_hand.png | Bin 443 -> 2226 bytes .../Mobs/Species/Feroxi/parts.rsi/l_leg.png | Bin 366 -> 2238 bytes .../Mobs/Species/Feroxi/parts.rsi/meta.json | 127 ++++++++-------- .../Species/Feroxi/parts.rsi/overlay_husk.png | Bin 803 -> 0 bytes .../Mobs/Species/Feroxi/parts.rsi/r_arm.png | Bin 470 -> 2223 bytes .../Mobs/Species/Feroxi/parts.rsi/r_foot.png | Bin 412 -> 2238 bytes .../Mobs/Species/Feroxi/parts.rsi/r_hand.png | Bin 415 -> 2226 bytes .../Mobs/Species/Feroxi/parts.rsi/r_leg.png | Bin 375 -> 2238 bytes .../Mobs/Species/Feroxi/parts.rsi/torso_f.png | Bin 885 -> 411 bytes .../Mobs/Species/Feroxi/parts.rsi/torso_m.png | Bin 823 -> 367 bytes 32 files changed, 233 insertions(+), 199 deletions(-) create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi/feroxi-inner-ears.png create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi/feroxi-plain-ears.png create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi/feroxi-plain-fin.png create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi/feroxi-tips-ears.png create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Feroxi/snout_markings.rsi/feroxi-plain-snout.png create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Feroxi/snout_markings.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-plain-tail.png create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi/meta.json delete mode 100644 Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/icon.png delete mode 100644 Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/overlay_husk.png diff --git a/Resources/Prototypes/DeltaV/Body/Parts/feroxi.yml b/Resources/Prototypes/DeltaV/Body/Parts/feroxi.yml index c9c04dd9524..5c449d363e6 100644 --- a/Resources/Prototypes/DeltaV/Body/Parts/feroxi.yml +++ b/Resources/Prototypes/DeltaV/Body/Parts/feroxi.yml @@ -1,186 +1,119 @@ +# TODO: Add descriptions (many) +# TODO BODY: Part damage - type: entity id: PartFeroxi - parent: BaseItem + parent: [BaseItem, BasePart] name: "feroxi body part" abstract: true components: - - type: Damageable - damageContainer: Biological - - type: BodyPart - - type: ContainerContainer - containers: - bodypart: !type:Container - ents: [] - - type: StaticPrice #DynamicPrice - price: 100 - - type: Tag - tags: - - Trash + - type: Extractable + juiceSolution: + reagents: + - ReagentId: Fat + Quantity: 3 + - ReagentId: Blood + Quantity: 10 - type: entity id: TorsoFeroxi name: "feroxi torso" - parent: PartFeroxi + parent: [PartFeroxi, BaseTorso] components: - type: Sprite - netsync: false sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi state: "torso_m" - - type: Icon - sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi - state: "torso_m" - - type: BodyPart - partType: Torso + - type: Extractable + juiceSolution: + reagents: + - ReagentId: Fat + Quantity: 10 + - ReagentId: Blood + Quantity: 20 - type: entity id: HeadFeroxi name: "feroxi head" - parent: PartFeroxi + parent: [PartFeroxi, BaseHead] components: - type: Sprite - netsync: false sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi state: "head_m" - - type: Icon - sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi - state: "head_m" - - type: BodyPart - partType: Head - vital: true - - type: Input - context: "ghost" - - type: InputMover - - type: GhostOnMove - - type: Tag - tags: - - Head + - type: Extractable + juiceSolution: + reagents: + - ReagentId: Fat + Quantity: 5 + - ReagentId: Blood + Quantity: 10 - type: entity id: LeftArmFeroxi name: "left feroxi arm" - parent: PartFeroxi + parent: [PartFeroxi, BaseLeftArm] components: - type: Sprite - netsync: false - sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi - state: "l_arm" - - type: Icon sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi state: "l_arm" - - type: BodyPart - partType: Arm - symmetry: Left - type: entity id: RightArmFeroxi name: "right feroxi arm" - parent: PartFeroxi + parent: [PartFeroxi, BaseRightArm] components: - type: Sprite - netsync: false - sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi - state: "r_arm" - - type: Icon sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi state: "r_arm" - - type: BodyPart - partType: Arm - symmetry: Right - type: entity id: LeftHandFeroxi name: "left feroxi hand" - parent: PartFeroxi + parent: [PartFeroxi, BaseLeftHand] components: - type: Sprite - netsync: false - sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi - state: "l_hand" - - type: Icon sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi state: "l_hand" - - type: BodyPart - partType: Hand - symmetry: Left - type: entity id: RightHandFeroxi name: "right feroxi hand" - parent: PartFeroxi + parent: [PartFeroxi, BaseRightHand] components: - type: Sprite - netsync: false sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi state: "r_hand" - - type: Icon - sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi - state: "r_hand" - - type: BodyPart - partType: Hand - symmetry: Right - type: entity id: LeftLegFeroxi name: "left feroxi leg" - parent: PartFeroxi + parent: [PartFeroxi, BaseLeftLeg] components: - type: Sprite - netsync: false sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi state: "l_leg" - - type: Icon - sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi - state: "l_leg" - - type: BodyPart - partType: Leg - symmetry: Left - - type: MovementBodyPart - type: entity id: RightLegFeroxi name: "right feroxi leg" - parent: PartFeroxi + parent: [PartFeroxi, BaseRightLeg] components: - type: Sprite - netsync: false - sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi - state: "r_leg" - - type: Icon sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi state: "r_leg" - - type: BodyPart - partType: Leg - symmetry: Right - - type: MovementBodyPart - type: entity id: LeftFootFeroxi name: "left feroxi foot" - parent: PartFeroxi + parent: [PartFeroxi, BaseLeftFoot] components: - type: Sprite - netsync: false - sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi - state: "l_foot" - - type: Icon sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi state: "l_foot" - - type: BodyPart - partType: Foot - symmetry: Left - type: entity id: RightFootFeroxi name: "right feroxi foot" - parent: PartFeroxi + parent: [PartFeroxi, BaseRightFoot] components: - type: Sprite - netsync: false - sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi - state: "r_foot" - - type: Icon sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi state: "r_foot" - - type: BodyPart - partType: Foot - symmetry: Right diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/feroxi.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/feroxi.yml index 3b4dd4bd1b1..73086ba8c5c 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/feroxi.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/feroxi.yml @@ -1,2 +1,58 @@ -# All the Feroxi customization -# TBD after sprites +# Default +- type: marking + id: FeroxiPlainEars + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [Feroxi] + sprites: + - sprite: DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi + state: feroxi-plain-ears + - sprite: DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi + state: feroxi-inner-ears + +- type: marking + id: FeroxiPlainTail + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Feroxi] + sprites: + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-plain-tail + +- type: marking + id: FeroxiPlainSnout + bodyPart: Snout + markingCategory: Snout + speciesRestriction: [Feroxi] + sprites: + - sprite: DeltaV/Mobs/Customization/Feroxi/snout_markings.rsi + state: feroxi-plain-snout + + +# Ears Markings +- type: marking + id: FeroxiTipEars + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [Feroxi] + sprites: + - sprite: DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi + state: feroxi-plain-ears + - sprite: DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi + state: feroxi-inner-ears + - sprite: DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi + state: feroxi-tips-ears + +- type: marking + id: FeroxiPlainFin + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [Feroxi] + sprites: + - sprite: DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi + state: feroxi-plain-fin + + + +# Tail markings + diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/feroxi.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/feroxi.yml index 8ed516e0a4b..1891d24cd67 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/feroxi.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/feroxi.yml @@ -92,8 +92,6 @@ - type: TypingIndicator proto: feroxi - type: FeroxiDehydrate - HydratedMetabolizer: Aquatic - DehydratedMetabolizer: AquaticDehydrated - type: entity save: false diff --git a/Resources/Prototypes/DeltaV/Species/feroxi.yml b/Resources/Prototypes/DeltaV/Species/feroxi.yml index fad76d0761e..6ac34e1887f 100644 --- a/Resources/Prototypes/DeltaV/Species/feroxi.yml +++ b/Resources/Prototypes/DeltaV/Species/feroxi.yml @@ -42,26 +42,30 @@ FacialHair: points: 1 required: false - Tail: - points: 1 - required: true - defaultMarkings: [ VulpTail ] Head: points: 3 required: false - Legs: + HeadTop: + points: 1 + required: true + defaultMarkings: [ FeroxiPlainEars ] + Snout: points: 1 + required: true + defaultMarkings: [ FeroxiPlainSnout ] + Chest: + points: 3 required: false Arms: points: 1 required: false - Snout: + Legs: points: 1 required: false - HeadTop: + Tail: points: 1 required: true - defaultMarkings: [ VulpEar ] + defaultMarkings: [ FeroxiPlainTail ] - type: humanoidBaseSprite id: MobFeroxiHead diff --git a/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml b/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml index ecaa5e39846..5f800bf429d 100644 --- a/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml +++ b/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml @@ -251,7 +251,7 @@ Weh: collection: Weh Gnash: - collection: FeroxiGnashes + path: /Audio/Effects/bite.ogg - type: emoteSounds id: FemaleFeroxi diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml index 7fda98e7640..c6488e64948 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml @@ -2,7 +2,7 @@ id: GauzeLefteyePatch bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Rodentia] # Delta V - Felinid, Oni, Vulpkanin, Rodentia + speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Feroxi coloring: default: type: @@ -16,7 +16,7 @@ id: GauzeLefteyePad bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia] # Delta V - Felinid, Oni, Vulpkanin, Rodentia + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Feroxi coloring: default: type: @@ -30,7 +30,7 @@ id: GauzeRighteyePatch bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Rodentia] # Delta V - Felinid, Oni, Vulpkanin, Rodentia + speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Feroxi coloring: default: type: @@ -44,7 +44,7 @@ id: GauzeRighteyePad bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia] # Delta V - Felinid, Oni, Vulpkanin, Rodentia + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Feroxi coloring: default: type: @@ -58,7 +58,7 @@ id: GauzeBlindfold bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Harpy, Vulpkanin, Rodentia] # Delta V - Felinid, Oni, Harpy, Vulpkanin, Rodentia + speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Harpy, Vulpkanin, Rodentia, Feroxi] # Delta V - Felinid, Oni, Harpy, Vulpkanin, Rodentia, Feroxi coloring: default: type: @@ -72,7 +72,7 @@ id: GauzeShoulder bodyPart: Chest markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia] # Delta V - Felinid, Oni, Vulpkanin, Rodentia + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Feroxi coloring: default: type: @@ -86,7 +86,7 @@ id: GauzeStomach bodyPart: Chest markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia] # Delta V - Felinid, Oni, Vulpkanin, Rodentia + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Feroxi coloring: default: type: @@ -100,7 +100,7 @@ id: GauzeUpperArmRight bodyPart: RArm markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Rodentia] # Delta V - Felinid, Oni, Vulpkanin, Rodentia + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Rodentia, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Feroxi coloring: default: type: @@ -114,7 +114,7 @@ id: GauzeLowerArmRight bodyPart: RArm, RHand markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Rodentia] # Delta V - Felinid, Oni, Vulpkanin, Rodentia + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Rodentia, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Feroxi coloring: default: type: @@ -128,7 +128,7 @@ id: GauzeLeftArm bodyPart: LArm, LHand markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia] # Delta V - Felinid, Oni, Vulpkanin, Rodentia + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Feroxi coloring: default: type: @@ -142,7 +142,7 @@ id: GauzeLowerLegLeft bodyPart: LFoot markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Rodentia] # Delta V - Felinid, Oni, Vulpkanin, Rodentia + speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Feroxi coloring: default: type: @@ -156,7 +156,7 @@ id: GauzeUpperLegLeft bodyPart: LLeg markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia] # Delta V - Felinid, Oni, Vulpkanin, Rodentia + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Feroxi coloring: default: type: @@ -170,7 +170,7 @@ id: GauzeUpperLegRight bodyPart: RLeg markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia] # Delta V - Felinid, Oni, Vulpkanin, Rodentia + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Feroxi coloring: default: type: @@ -184,7 +184,7 @@ id: GauzeLowerLegRight bodyPart: RFoot markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Rodentia] # Delta V - Felinid, Oni, Vulpkanin, Rodentia + speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Rodentia, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Feroxi coloring: default: type: @@ -198,7 +198,7 @@ id: GauzeBoxerWrapRight bodyPart: RHand markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Rodentia] # Delta V - Felinid, Oni, Vulpkanin, Rodentia + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Rodentia, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Feroxi coloring: default: type: @@ -212,7 +212,7 @@ id: GauzeBoxerWrapLeft bodyPart: LHand markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Rodentia] # Delta V - Felinid, Oni, Vulpkanin, Rodentia + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Rodentia, Feroxi] # Delta V - Felinid, Oni, Vulpkanin, Rodentia, Feroxi coloring: default: type: diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml index 345115bf5aa..10997d79cee 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml @@ -114,7 +114,7 @@ id: TattooEyeRight bodyPart: Eyes markingCategory: Head - speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf, Felinid, Vulpkanin, Oni, Harpy, Rodentia] # Delta V - Felinid, Vulpkanin, Oni, Harpy, Rodentia + speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf, Felinid, Vulpkanin, Oni, Harpy, Rodentia, Feroxi] # Delta V - Felinid, Vulpkanin, Oni, Harpy, Rodentia coloring: default: type: @@ -128,7 +128,7 @@ id: TattooEyeLeft bodyPart: Eyes markingCategory: Head - speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf, Felinid, Vulpkanin, Oni, Harpy, Rodentia] # Delta V - Felinid, Vulpkanin, Oni, Harpy, Rodentia + speciesRestriction: [Human, SlimePerson, Reptilian, Dwarf, Felinid, Vulpkanin, Oni, Harpy, Rodentia, Feroxi] # Delta V - Felinid, Vulpkanin, Oni, Harpy, Rodentia coloring: default: type: diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi/feroxi-inner-ears.png b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi/feroxi-inner-ears.png new file mode 100644 index 0000000000000000000000000000000000000000..e05811cd9a401861789c83203d1c49d4d52da8b0 GIT binary patch literal 211 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufG}g$wN6f;V1}oQV@O5Z+gpxY4GIDb4li%oop~?X6x+0h zCAoEG_o73)-WB?8Xq)r--m=*I^K-YE=`Eac$@g7medX3&<(}8RuD{9-GzAD6y5q8~ wCaui<^rHX6Y57K}gsKUQf$u@~0^P`?DZBZwnR;aJ4+jw6)78&qol`;+07a8X761SM literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi/feroxi-plain-ears.png b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi/feroxi-plain-ears.png new file mode 100644 index 0000000000000000000000000000000000000000..8a4ca1aa0ee2fbed69a3b767b2a153a81a10b9f0 GIT binary patch literal 274 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0h2Ka=yR#jDP+qMnJ`;om*2S_oO1o;L3|Icv!6faOM180FpWHAE+-$4*& z+%YlxEl{x8)5S3)!u{91uv@z1D6JaNB~2f>VyZ|4>-z)u3Yzopr0B5vaY5)KL literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi/feroxi-plain-fin.png b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi/feroxi-plain-fin.png new file mode 100644 index 0000000000000000000000000000000000000000..227231f7f66fa90a8ba764e97a194a65fcd883df GIT binary patch literal 325 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0L3?#3!&-4XSoB=)|t_KbrsH&=Z_wL=6QjbkQ zLB^6GzhDN3XE)M-oU*Erh!U67;^d;tf|AVqJO+k}Il*BCMWx@r1Q&e#`b5iHSL@uF z^T8WJ4K5l#c%*aQNAn~@QBUs<3*#W;%f?;`a~@4PGATqMSkv5Yt%kAsatphS8%zxE zT|DaD*=?-4d4)s@gLryWU{an|NA8KGYaYCM&a{n*;lwMs*;x`Zw*p;|;pyTSV$qwN zpul9nq-b>Zz|#ZQ7#7WxxuL+6!5=t93 zN-!S~xhyiHA%fY(Mp$hEXQ(x|+6Er4mdKI;Vst0I{QZL;wH) literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi/feroxi-tips-ears.png b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi/feroxi-tips-ears.png new file mode 100644 index 0000000000000000000000000000000000000000..c38913dd67d63c6b642751c2c88cf46f2e6a1d6d GIT binary patch literal 233 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sEXgD|57Yp@DXu+G!PF{C2y?X6g@76k!@gzd$ZM*I)9avyA! zTeR%fTlRhYF0QF;wKBqvOQ&qyY8NYVv-ryXNBn#FPg;JzxM}Uz&3V1@dvEU52O0$e z2UzX)#+$DHaV^R@{oN+>>mU9%gjMIiJ^A$gwA<$A=T`^c{qMVz38FUKBa>;BkNzCy Re?mvv4FO#s5QP}l$f literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi/meta.json new file mode 100644 index 00000000000..32677b72f94 --- /dev/null +++ b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi/meta.json @@ -0,0 +1,24 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by BlitzTheSquishy", + "size": {"x": 32, "y": 32}, + "states": [ + { + "name": "feroxi-plain-ears", + "directions": 4 + }, + { + "name": "feroxi-tips-ears", + "directions": 4 + }, + { + "name": "feroxi-inner-ears", + "directions": 4 + }, + { + "name": "feroxi-plain-fin", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/snout_markings.rsi/feroxi-plain-snout.png b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/snout_markings.rsi/feroxi-plain-snout.png new file mode 100644 index 0000000000000000000000000000000000000000..00944e52a8229c1766664f9c7c4f4caf2e82cbf5 GIT binary patch literal 280 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`212l#}zZriqP$&w{iRaH}_OaY21eVHf*q*zOW{DS`j0mJWYe8E5g&H|6f zVg?4j!ywFfJby(BP_WU{#W5tp{p~bwt^*1@F3Dg1rLSvdz9!|Ud3Q>sf?AziVd|Pa zE=~L_#}7SpGMX^sts#fa&Z`G=`ZuPq_n2GOeHP|aVG#0QP?^B+CnVt``)fJ5XEld) zjyL68%seOiMPeg^b&vHyuehxoaoGtsW`>DRz-vw=m3fzxXzL&awMSWn}5 RRzSxvc)I$ztaD0e0swi#U%~(Y literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/snout_markings.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/snout_markings.rsi/meta.json new file mode 100644 index 00000000000..414cf1f009a --- /dev/null +++ b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/snout_markings.rsi/meta.json @@ -0,0 +1,13 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/Skyrat-SS13/Skyrat-tg/tree/40e3cdbb15b8bc0d5ef2fb46133adf805bda5297, modified by BlitzTheSquishy", + "size": {"x": 32, "y": 32}, + "states": + [ + { + "name": "feroxi-plain-snout", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-plain-tail.png b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-plain-tail.png new file mode 100644 index 0000000000000000000000000000000000000000..9753267fb0e6f716cda8d3cd0bfa96e2fd3af0fa GIT binary patch literal 2234 zcmcIlYj6|S6<#~!1tFw{x`g0lXNkdNvf5o~wbE`aY$ExgV%f5#8k006S9h=EttG9x zyS8OHbxcAsh6zj|K&CE96EF>J10i4@DKt(XhNPx}Aye~8gUPG37#JRfkPanxCCeo< z{K`ysq}{zo-}&x2-#Pbak-xfP{MadD34$2!t@PC4XQ}zU;}(2>dHaH4g2-8*xZQrQ z+fDj4HLOGtK@=TWxol36r*`Vzr}ZV3GRV(s{!zoP^OhI7y|o{|x-0+epW*Y}?Y=7? z$?*5lmCx@S{G-G9EVqH@Fb+Lis+%iY?CTgaYq6CR!Cn6azq zlfG304}JQ>r40k+bzfKQ7+5)OY)R4IAHML%&y07w|MJ3)z#?$6Ytt(hxaEZn=y3ko ziSe3aOTTEcl~q49e{M8#Veo+KZ{tqCwECakbpuhff}7s87A}uGcbB+kv$Q7ppj=Y_ z-if@gKmW|yzxA2Ir9Y^Di_0zf*MyGN)9X_0i@pEm)^}XKcIEE%N1xxl>fF->S36El z{=+Lnhh|=#I{^&2FKt*p*g-70FVXSSL;DMM99j6)zBf)zSr9A?%vm>dCisq$-yMH7 z{?3u(2WHK&N6;i*#6q?olOJn|G8Lo@PW6~kBhX(xy2uC#x=?FR|U(q zZQHhD#fnra)zi}>%Q7|>$lj&+ahp+B9k^~@#FoCEK5V%&Q8`a1h;b9mZw}GDdNM)W zx>E@@7!AHE392y*kkt^fBx4DTCWzvaWCFk@WRM{gQQ|J@+|E9VRAd)5*Y0C|2{&p~ zDpMK?q^g53)dWSEDw#EYY;jV;3^8N?G8v1;bt&nh(!>&eH_Z%1rXfa?i)!%sNw=yY zlDF^{mM%*wEmjJXkYuqYhow4C`3MPKxu{0NNJtFR+S+PqwOLdx!f>J}GOU%cT4{`+ z^|rVHl5||3mLVCT@gN;)O2SaoIBC*?klJjxC>%#7z*xfP8)c8{BRXJ3m?TIroP}j# zF*E8kS~tpCu=7YPH%05gwgh78kghgs5S6u{xG^p3F2hmZM6(u6XCXrdMNtgHbi5lk zx>beO=O0CzSx1yuBJF_{9z_{S_cboklLvD+x$caYgUO&}IS@~E)cjK}M7 zQRb$StU^VW(y!2Jb#md5Ks$iU(Y%0lcS1HqvsMUfVFZM*46{7mxNd+rL?#brwkVjy zVMnqk11HVfc`MC}$VLMIL>h%T843tGp)6 zqI>|7HGvUxP>G>{0ZipM!Ol5&o_7fNyxV20!jBZx;3KC`%8G8W|~B@snI=Iy{i18WGE6xk5%XNQx(-H}d$EXv3>GYf2OM5ZPzKAWtK=7b<8NLHt0bJDCsVzElh|0fw+ zD9qVKfuo_|fHV(7kOrd7M#C`VkznIxj_Ue{AbC# z#`yD2U3>GBd%FsM{@8B)H%Ge$uTFTJUv+rTgTEqPEX}RTJzlzO&9>g*oC}iZz|IUgzTZ4~Ta$oD}=*ro2|M10d4dEX| z=Py_1Ca<#7OXf^pV7uqP@UlZH-Lv-O@kV#=nBU%R>#zS{ zc)jQKX?sskn%a3aJW$s2C;BNOPTswro?3d&@#A?tZSN763Xi?sdE9r3*tfMe@j$Ln uyRVeF+_otYsl3E2JXAjXO?hg=R!3l&Pj6{`_MrI(aYT>9Sy zx}VmH{dlW5>Saf?;ezFRE-}3Ll++RTs)RveQHQFtl=8=GGM%c;iEkN>e&FGFmQ=B? zxaq)Ih7ZyQZYIo-%aOSAhK+eM-}7mSiQ4*!r~5M*lEkh~n}3OsPvMz?C-Vh6p5M>a zq&6jYe35v*tnH1hbeSaefwW^{L9a%BKPWN%_+AW3auXJt}l zVPtu6$z?nM00LG?L_t(|+U!>`i()YlP8Pu{wm9@aY(x-$fQZ$VHlmfS&0^&r5IgS& z_$TxlTPwxJ@+z^?LJ%7fL=N3z8?AEh3r@&JmrY(CY;zxk%zq@4%w*ooB##Rrm<>4R zY&;%I;aaW6&3S#!c2D4mIU<+KIgNh`SZmX8!u5JBE|-g-)9R1e1DcbDGz$)YQR&7;Nx)h^?GH0U*BX8 zK9kAtFfrg%wfg8I)2Z<-ko&1b=HH^MF9np;PDc`48ncn~gH) zmXbUY4?y{JI+foYbgR{RHxC};n1>wbs4Af-6bkBlqX>a+x7$()HSie6JOCQ&u->~A zW3yX?b3N#E7(9o(9;99dn96kM!RNBh*#oImitYD%@kqI81mqwenFk1z*Jkk9$axt+ z70=A;cz-<327`g@jhgXpo$qzbQG|#_RO8!{d(-JOI~)#@r*9s3K&`3Q>)fjlJ-Q1j zm5Ry?+zHgf0Mr22yTJK2)G->3m@m8x=ytnzE_OM+w*gV$zX4xvfYq~nwOS$F1eNBG zO1AcFvra`T4?sC`9W~%ll_MVWkh8gloqtTUMO0vW?q9iy!t)x7$D3!r6B|j-u!8128JvAsbF{QHb zWU37V1JiU*7srr_TW@Aa1Tf_2$?5&YAx|-?*2YGq?EJw71PW z3wKvC$Or$cu#uCuH=pfmTmGhO_gbrO!v8-dnn*omUU2mL@4t`#=9m@#i%b=0JG^l9 z)vV*c4?kp(C^MS*WImJ9y>79OYKItFP8~h`Xz%CRO2&+j_5c1E{QhgVMbxR_L*>a2 zchVb9?_%p%oVPt&Zl7)atg5|va{KIOxh+my$2#q>*=*krYm--HiErpWs$}uL#Om4W z>ANpHk~{x3Y0AkrC02WHG(K-WcpxpFS%4+zp1#eqmp|h(9*b-U?Xh!lTGL~7Ytf_0 z%NfEd&lGkXJ*9ts>yJ(4P2RU>b%=8Ov)i&ZOuN=3IIi`nt%8%qOJ}i=pL+EQi@u7i zcw@`plq!A3^waxKz8`Ek_idB-RL{tyz*p6O_J$$CeP=slmLZXu2SjYXJAlMRzopT&Dacu&%mUl zgk%5%1BN3}WJfupAut*OM1}xb&SF64GdZJYcM}B^qg9NJosb34`3x#)CPBywRGrgM zGyoN#6e++01YH4Ii2^KwP)z_j5=B787|oGP&Zq+Dd}Q~HvPVN;kcYt5Dv{<`<$1F} O&h&Kkb6Mw<&;$Tx894a> delta 772 zcmdlaIDu_~L_G%^0|UdV%))y>O0vW?q9iy!t)x7$D3!r6B|j-u!8128JvAsbF{QHb zWU37V1Jfo?7srr_TW@AFIJ2pPCatyTNYFDI!lePW&U;k`fVG2RjX`yj_`^YuO{9=15)`F_iv|5$v{W2VX!u1|WIp-b2tYSv%3{@s1_ zkao-Ck1MpNcD7GJl| z{L#fj-x(P%*X_Tbe$TnSUgr3%O5TPWSF=R_{3tM})3=b2|7)ZjbGvLeZ`RgZtrhY9 zjI0yimfiN*U7j!R!!7?eGd4i4b@7d}&p)53e$l_kV<%gJi<1u5`SthfeYov;oS!Ct z`Tciaqr&1oF}q*gHSzD3GhDNn$FTCnXZFjl*0Z$qt20h>m}WZLcRRy}IrXi+YLn0W ze*AHVNTXf+d2YrNO##z>{NH*ut@z>gsI^WXxR@(eJ^SO@Vc*8lz64m2 zmZww?s0Lh^q;j!P=639<=kbrf{cO=c{c7FwzoG%b*i+j}6i z>xKFH_^gh@s_DW4#@f^OOsh`!NMmqYc>8VKo6FrNS57=X-%jg|!gSMDkxm<}_r&Nu zZ8-LG&xFfL9VsdbLJTZD9X_st@z=H-FR%UkE%r2Hk3lWZ*_kXimE3Kt)vq&zNS)~6 zXi?^j5yt&swZ&K^8zh36br)2m3Mf_hijm7$l8&pn<{JY_z;NWp5yYKju pb&NH_Dhx~txKP9Myn0p%hCiAOyppSHRsz#GgQu&X%Q~loCIFnKRU`la diff --git a/Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/icon.png b/Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/icon.png deleted file mode 100644 index 016d8ba5a76c0112a48860254da8e5f54a1767d7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 83 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzDNh&2kcif|2N@ZGye5VJ>+?Ju bK+N}S0tyU_?u-jMfE)%-S3j3^P6@B`E{-7{yo?SU`@aL_MgiSJKmlPR5)&cFU<79~ z8Nivy3}XctPZ_%cWrPAa3#J83tHA7FGQqBZ39bOfK+(^@Ku`gi`cdv^2#kgR4MM=! yBmlpu%7hd!5mewpzzV`95V8Wl7e-|VWeBYK%63_4<<3Ho<2+scT-G@yGywpp>L*kH delta 407 zcmZ24xQ%&&L_G%^0|UdV%))y>O0vW?q9iy!t)x7$D3!r6B|j-u!8128JvAsbF{QHb zWU37V17n1zi(^Q|tv9z0=C&9Jv?j_dWwIz(%-*u%fVsE}^A{)14sKBe7s)vbSlb;> zYaP#!oTU2C-Ko0TXg>SnsfPD{YdrbY!K4qg4GiiT8WLUyTW?sGeKUIYB8`yZ5eZ?#~R*3XZ(8$$ErisWyuO5O6G=j`Vs`qkvQ#T4Xlsln7zhtxS!awVUD1RFzJzzBTIG zZ?P}Q+*N+?8l$S(=}ntAr)_(FUnchJiMsc-2flB+D)Hf}YyoG(GoO>MzjVz^*XEg+ zD3b25AoYje1b2pp1>S#S7UbTJ-^-Z&wpeg-aEhf}`MH@1Rtqv`J&Kszm^oHdo2P4eKV4CsTbOvUI%5Pbz7o~*MKti6belF{r5}E)^xUeh$ diff --git a/Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/l_foot.png b/Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/l_foot.png index 6b1db8f631bf4a663c7f0c3a6dc140fa37a5c39c..ce0d6b70b97897f44f9e7fa2e113199e11e43cda 100644 GIT binary patch literal 2238 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#Q>iWS0D`p2M!#ls;b(yZQGP7 zQh4RyRxq#*-%_6c`(0DuBz5GDbsSGz5lJ2$*`I xI(MlnTK+Z-U5TuMJv0^K|udS?83{1OVTnE=2$U delta 365 zcmdldxR`l@L_G%^0|UdV%))y>O0vW?q9iy!t)x7$D3!r6B|j-u!8128JvAsbF{QHb zWU37V1EZ^_i(^Q|tv9z0b~ZbR9Q!y^)wV)V`@@0`+Z%1Fk&UVqSEXF`L^M`>OyJ%8 zyUoXgW2Z}RK)YlRY?uh^d6{3)(MI^xuZO_@@W*IWZ_{^Uut#hS&1PW7Dh@t&@J JF6*2UngFqAoMZq1 diff --git a/Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/l_hand.png b/Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/l_hand.png index 645ec58d5b27fa4116b5a20bb7cedc3e846c7fc1..bc206249ea5d1c35816dc86d8d6a4733101afc24 100644 GIT binary patch literal 2226 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e(Ey(i*TkHH0|yRNRaH%yGG*Jg zZA+FcNl8fwUH-WrsDQB~$S;_|;n|He1_lmqPZ!4!4_-zGj{V<(a-(201ZWci%1%&o znVc1{+F%M-;A((XfeI+Og8);A0+>c8nBc-n=u)Hn(GVC7fx#RC2`G+JF+<^kIH-k! t38sPs6fMe_3Q*)3m{8TDN{;f#2!YIrtPy&fKQw~0db;|#taD0e0s!d1D2)IB delta 409 zcmdlaxSM%`L_G%^0|UdV%))y>O0vW?q9iy!t)x7$D3!r6B|j-u!8128JvAsbF{QHb zWU37V17obGi(^Q|tv9zf_BI=cG$ig1ewM)K<+fl+k|NiOh$g`mF-DAwnpp*eM2#(e zi1_VP6YTVK_~XAwA!y#4_cz5hIrbR7I`eU{pB&Ia28Mbt2_p{teDugFaayVx2h-Ea zd9Qxo`==5pvUiGicJ3jAkkHVT%QEYVRXsm_u+J{vF^BoaxqQLsr=@nRc~hfS{V&st zuC<;uZO?A@8QQAbHh!BWt*2KsHFf19i)qel7`GkV_E695;H1-i4ZklwH9GQj+m4PE zCcghg-p$vII-iugZtLHhEDvUH+-7gX!8kEdylQ#ZX+f#V{g+=?U7x9WK*XYAPxXe! zH7rjm^PXjI=F49D|E{=e;;}-L+}l#W^A25Sths-G%cIkdFY~T9tb1)|$Ga@^)>Www yFE0nKe0_`O@P|v*EQi9AZP;NxWl-;3&A`l{qfs8#XM1P@NZ8ZW&t;ucLK6UWEUiWS0D`p2M!#ls;b(yZQGP7 zQr5)Z;OLs1Zhsldb-Ne?y?j8RMo#$p1B0uxLH1l@q-f>GvZ2#kgR zwL-wu8Py~cSG3$ovI0{K6OeO1&^E460#O6UL_G%^0|UdV%))y>O0vW?q9iy!t)x7$D3!r6B|j-u!8128JvAsbF{QHb zWU37V1EYYai(^Q|tv9#!@-`a?v^`Wl#kTH77DrgS2?%0 zZJhQ!ZdvB96``S_RSj1HUsTTHk2UEBYd$dTQP0VXg);t?%Jss}WA02#t?d8b5F%dp z+Pa~9VxeUEf%z%lH~gs9d*FA|*ygU-elpm|BNF%c#A^ZeV>TT;cs5772#$(*mr|Nlz>S OIl$A^&t;ucLK6UK35JUR diff --git a/Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/meta.json index 026fc8b64c9..cdf0d802fea 100644 --- a/Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/meta.json +++ b/Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/meta.json @@ -1,69 +1,62 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/ParadiseSS13/Paradise edited by Floofers", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "full" - }, - { - "name": "icon" - }, - { - "name": "head_f", - "directions": 4 - }, - { - "name": "head_m", - "directions": 4 - }, - { - "name": "l_arm", - "directions": 4 - }, - { - "name": "l_foot", - "directions": 4 - }, - { - "name": "l_hand", - "directions": 4 - }, - { - "name": "l_leg", - "directions": 4 - }, - { - "name": "r_arm", - "directions": 4 - }, - { - "name": "r_foot", - "directions": 4 - }, - { - "name": "r_hand", - "directions": 4 - }, - { - "name": "r_leg", - "directions": 4 - }, - { - "name": "torso_f", - "directions": 4 - }, - { - "name": "torso_m", - "directions": 4 - }, - { - "name": "overlay_husk", - "directions": 4 - } - ] + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/tgstation/blob/8024397cc81c5f47f74cf4279e35728487d0a1a7/icons/mob/human_parts_greyscale.dmi, modified by BlitzTheSquishy", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "full" + }, + { + "name": "head_f", + "directions": 4 + }, + { + "name": "head_m", + "directions": 4 + }, + { + "name": "l_arm", + "directions": 4 + }, + { + "name": "l_foot", + "directions": 4 + }, + { + "name": "l_hand", + "directions": 4 + }, + { + "name": "l_leg", + "directions": 4 + }, + { + "name": "r_arm", + "directions": 4 + }, + { + "name": "r_foot", + "directions": 4 + }, + { + "name": "r_hand", + "directions": 4 + }, + { + "name": "r_leg", + "directions": 4 + }, + { + "name": "torso_f", + "directions": 4 + }, + { + "name": "torso_m", + "directions": 4 + } + ] } diff --git a/Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/overlay_husk.png b/Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/overlay_husk.png deleted file mode 100644 index ba3fc107bc847d535ec946357b61c8a9122b6096..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 803 zcmV+;1Kj+HP)qwhB`(h_ezU7+!rncfOyV!pJcR03*jFfb@sA06)(FC)9#5 za`B44Ye`Yak693z0Ge>M%M2!Ocx~i(5`=WqlRl#btg2(y%@46_8sNPzG82%I+l2Tx? zSZtpxk|8PP;Pq1p>-w5LFUzts=Q;oNMFBV80Iy}awFB*u@Fxj?H~%WjZO=<0tUoGv zt=pF~fcNiiJ4EE4*H0W@BQFANfSo-&0%DQe2~r1i#oohw>)Lq&I*DmO*UMe>Nt{QB z>wxE-^3+;F>TDB|1@Nx=_CacwI0gD7f@>*k2`YWV3eS95+zS+aIU_JhfIftN8-J>e z(E@mFf}|p~kBSz6Pe6tsLhN^wQlQUHOEIWUunSBAz{sHzfGBiGdSbW`i69)Cv?S&=?soxE z1n^xK?*o%sWUB)_4oc>@muOKGoWUzV*K>jdkMMUJ2AhaS)dz&(=jC|Yv7K0mQ()hL zWeY)?&M3`526Z2R@B`E{-7{yo?SU`@aL_MgcuTKmnU&NPlOt30Yf!o0ZXCdilU_b~XSU41*2#<0`Ltr!ns1^dO&c^u7 zVs*xzf8n}VofY70tPEBcLJA0)Ku7^rdq)L_TnL;KVtqWZ{_iZ1!#!R7T-G@yGywp# CTP9=x delta 456 zcmZ24c#V02L_G%^0|UdV%))y>O0vW?q9iy!t)x7$D3!r6B|j-u!8128JvAsbF{QHb zWU37V17n4!i(^Q|tv9z1u5EGS>oqqJ|qV#Zky+&EjfMFnO(;M0AR z+#!+FvtWYFx3~7S=f9cqoXtBR<(TnPaua1{Z_PR8#=Zc!oaMJjEvF+184i;6MXO8wi&T#Se zo;T@z$R4{~o(av@O5cjO7FIHx{5*N`R@Md03I%P623ZM{YgF@3{x4uZaq!l*smo7I z_;uCxe(^HL^PhX_=iH0AZp-T6E4yIY=J_fopK^b%tv|P0$J;cP?NtH$m)iU{O6mUM zcfPHiWS0H`lXZ?W#2db*7rc9Z# zZQHgbOP090y4u^@YiVhvq@)O>7*zumF_r}R1v5B2yOGAgz~Sxb;uzw=%jm$d|2t4_ z6pV(zXb2455HLEGm;QU171*5Fd5Eu=CAsYhB zu3o5aU+Rp?XLfNZKo*(hf~J6L)hbj4t5!kPEAQlayfvvI55)C!^>bP0l+XkKs9Q1j delta 346 zcmV-g0j2)F5u5{%7=H)`00020X>r~F000?uMObuGZ)S9NVRB^vL1b@YWgtmyVP|Dh zWnpA_ami&o0003#Nkl`)f ziw9>&`$8>JdMK@}h5Qf18Z7VSdkGX$ZLL*4$4Pk}000000FibZYT!wnUwLU52Gw<) zJ4Ma&+>KqI<)+u?qeAKm!%$^errNe$hqWb%707*qoM6N<$f)7uc82|tP diff --git a/Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/r_hand.png b/Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/r_hand.png index e461d8a7b54f3830aafa462623ff5eccb5e2e333..8f292ffe0d2b00cd9b6a620766c7640e7989ddc2 100644 GIT binary patch literal 2226 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e(Ey(i*Hi|E0|yRNRaI@FK1!M^rTN#x6AwUVnK%towP`IO<(GVC7fx#F8De$Zgb{!jr w8&gbBgji5`AWn)CiV&s=Yzim}MmaPH0b_BN%XgZcSAmT7boFyt=akR{0Nej3m;e9( delta 374 zcmdlaIG=ffL_G%^0|UdV%))y>O0vW?q9iy!t)x7$D3!r6B|j-u!8128JvAsbF{QHb zWU37V1EZs-i(^Q|tv9zf<~BQs9Q#-;n5-bSAce)sN^H@B6ppY3i<4QjjxdRoocVBQ zbJEE`p~)5;g^&KLsH80Uy!(Fbu@maut9EH$pS`<+5ol#S5F>-@s~_Avx-HkVOUc}K z^6TIC;wCN9@UvaGNypSvX!^31uXmkGja1vMa)9mY!hg4(t2M0Mch#NAFaFx{rPsp# zo7=KWUr&{N@^AIZib)Kav)tZ4|Ihj%?NLAHiO(@|mwy`_sAB#pvUu}-hW)QEKKoEo zy8RnBtIHm)1JiHKlIM4tm?)QEKlSZ?{=*AC+hoUHFO#{J6B@cpZg-#Lk1bJ!GV`A+ zZ_qjYkm0e#JG*DvoIBp`Z%?eSwzpv1y?_3P^@jUcVIFDdzP6iznW2iWS0H`lXZ?W#2db*7rc9Z# zZQHgbOP090y4u^@YiVhvq@)O>7*zumF_r}R1v5B2yOGAgz~Sxb;uzw=%jm$d|2t4_ z6pV(z$P58yR|9m9n>r(lFuP$WFhf;filG3_1ZNBd#;7J>af2~QZa`K%${r1Y(GZ|o z2r#<_qnd@9xfvLUP=J!#85l53a9MzAg$bGlW>+)?7$y)>fNDNBjL_G%^0|UdV%))y>O0vW?q9iy!t)x7$D3!r6B|j-u!8128JvAsbF{QHb zWU37V1EZv;i(^Q|tv9#!a<&?Xv^|{ME#1*Nmw8Dk`}Gqk>mKqcMOic@q~^}dW_eh& zo2CB1p7`X&Dt2B`Y|Ww`qs6pyr!j2+?IP(VzCpO z?D3CVq;EV+>|QiM=XBGvFI`*_*F!IvJQW4&{m}an+a diff --git a/Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/torso_f.png b/Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/torso_f.png index db8a63bbd92e773be4144d70f5f3071018e747fd..8bfe93d38680720494663d7e96c5c188acd749fb 100644 GIT binary patch delta 396 zcmV;70dxNK2Aczr8Gi!+005o0f$RVP00DDSM?wIu&K&6g000DMK}|sb0I`n?{9y$E z000tDOjJdBdU~X!q?DADwzjr^e}4b~0Gb?-A^-pY26R$RQ~&?}|Nj89zofqa000Sa zNLh0L01m?d01m?e$8V@)00031Nklu z$qs$uvZU-cwEzpCdK6F!F*6keRli365R_Ug5y?F#6meUM^8=s@0lq>2<*Nt)*nCC+ zO;CtS_$i;jjior!o5fL9g6I1{Cc!Vk2%)}Xl+JL_w1PJP+D5qnAeNmdd)4A71?YtV zRlWpf{2ImIqJQs$E{o1mZwo%ozNiIQ0M!C4fa+y{_TL^N^@tyx3+LaySCZkz{rraK zLYj~O@FJ{7nE~!rfS*q@9tBJZneSlDp8{|NMH|V`M>_RZlg3NH{e`HtAb1H4FnV4I qLqKZ~YzTD9nB>p30Dl13_Yd(DN;7;yOHBX(002ovP6b4+LSTaZ*Q1;O delta 873 zcmV-v1D5=o1N8=w8Gi-<0063Kaozv`02y>eSaefwW^{L9a%BKPWN%_+AW3auXJt}l zVPtu6$z?nM00S3EL_t(|+U#1rswy!MPUK?kABYIs`2ZGnR@#WQFQAQ&V&N0mxG!L< z*l1;EA!2DKh*q{fC zj(w8^$m8)S=JUDe^?G778j0KOrbf)Mj(ztmnhJsv9`?#etly8MH0A+7I-OR=VoWBJ z4|DPo(}=?L0~0{01u3sqtBG>CELyFW8ZpN@056C-1ApApYb0?hvO&y=LmwYmhkzPH`%?6Ge=z91z~OLs8idFT z3Wb7E4}VxJ7HX_kt70;lc&VAZ0P98x;D!hjzyvS>OaK$W1TXF=hcl6T4HoPKAX)j$Y!%?RADKl7>~zJypDOu=zr$IiR}o$15CdO_!A&I?Cnq@jPU^4 z&_n|I^wg;}1-c7>OlpCLA>ply5u7(_MdRHN=1@%U(VGHf+~bXsO~ylq*gSxYC*b^1 zT!;hDwxfhc7qqCA&z#(<9!;C~2(NKDb#wr%4C z=wk9->12ukdAVGED1&MYIoaS7xd$B}OMjz4fNnwGDhH|q5a8TG2k!+Pf6kA|cu$u8 zPJ!T-!hvtQ`FfoD0ZafBzyvS>Ou+Zzw*UhGiL`*PgUY{y00000NkvXXu0mjfD4mqv diff --git a/Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/torso_m.png b/Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/torso_m.png index dfe4705aa37208fa273566b9217f5cb011bd1736..396a20064e65f70ceaa1eb3676dbdc88dfe4cb57 100644 GIT binary patch delta 351 zcmdna_MT~iWIZzj1H;_yjcNS%G|^0G|-o zs;a6bOO{NTGG*JgZT0o_K;c<36O@1yTS<^#@P80s*t~zqexL|vfk$L90|Vb-5N14{ zzaj-Fc*WDjF(ktM?X-h@Eebp?w-^1d|9|>6(`<*A3p%R}X7?StaOTH@h9E0>Ek;g* zzakDtln%8lcqaaypLJ@`jL7+hjaSxAJXzkL#`1%UamjBchK2S_IgM&;4HxDg%jMd@ z@Id_l^DDPXhJ=fAS5$Ak9>=ypnz^fvQz=2&?Ei;*fp@l$Xl-5I*W&~leSaefwW^{L9a%BKPWN%_+AW3auXJt}l zVPtu6$z?nM00P-bL_t(|+U#3Bj_N=R&Y&mJLy-n?2MX>$OG^h07vMZVMN3P=2`Fgj z=nxX3fGgzX8{v@|!EPqRv-@8BNfDXJDz?A*u`~9XEX$HQqkoaq97=!^paduZN`Mle z1k@LQLjHKMSlF0t7Y$3tCa`|Fdl}JJTjc$10W(Nz=+HM0vY?REd@U6e%pU0 zvIiWG$0wuddVlp?0({mLX;)4F);*^GbUJ2x~I^$Z3BBTNWlfsD(5 z*Wu5__W&44BXB;S?KK<@W5xm|*TK!ghfYuJpqGUtMvO7|DsycZ4`3EZ`)l@9_-(up zWK$>s|9=8PY|`<5}=`Q0X$BGvNTPT zUa#j)gOMDOstb4p=zv-Us#Aat`~9BI2ZIVE8li&8cz_p1Jc=i>SjGd8O=pqN3A%;q z@X-?50M?s78nNNa^mP&?;8hwb zW{torSngTyWK`px=LA<5kRp)3{)wr6ajuJ8g7VOQH(f% z%X_Dj6amIdN4roIDe}+~wURK9MTHt16bg%d3osHgp9pTe Date: Sat, 19 Oct 2024 22:27:15 +1100 Subject: [PATCH 23/55] SHARK TAILS, LETS FUCKING GOOOOOOOOOOOOOOOOOOOOOOO --- .../Mobs/Customization/Markings/feroxi.yml | 122 ++++++++++++++++-- .../DeltaV/Entities/Mobs/Species/feroxi.yml | 4 +- .../Prototypes/DeltaV/Species/feroxi.yml | 2 +- Resources/Prototypes/Reagents/medicine.yml | 12 +- .../Guidebook/Mobs/DeltaV/Feroxi.xml | 7 +- .../feroxi-dorsal-stripes.png | Bin 0 -> 216 bytes .../tail_markings.rsi/feroxi-dorsal-tip.png | Bin 0 -> 207 bytes .../tail_markings.rsi/feroxi-dorsal.png | Bin 0 -> 273 bytes .../feroxi-tail-bottom-tip.png | Bin 0 -> 238 bytes .../feroxi-tail-second-dorsal-tip.png | Bin 0 -> 203 bytes .../tail_markings.rsi/feroxi-tail-stripes.png | Bin 0 -> 254 bytes .../tail_markings.rsi/feroxi-tail-top-tip.png | Bin 0 -> 217 bytes ...{feroxi-plain-tail.png => feroxi-tail.png} | Bin 2234 -> 2278 bytes .../Feroxi/tail_markings.rsi/meta.json | 30 ++++- .../Mobs/Species/Feroxi/parts.rsi/full.png | Bin 394 -> 427 bytes 15 files changed, 160 insertions(+), 17 deletions(-) create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-dorsal-stripes.png create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-dorsal-tip.png create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-dorsal.png create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-tail-bottom-tip.png create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-tail-second-dorsal-tip.png create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-tail-stripes.png create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-tail-top-tip.png rename Resources/Textures/DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi/{feroxi-plain-tail.png => feroxi-tail.png} (78%) diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/feroxi.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/feroxi.yml index 73086ba8c5c..2fb844a22e7 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/feroxi.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/feroxi.yml @@ -11,13 +11,15 @@ state: feroxi-inner-ears - type: marking - id: FeroxiPlainTail + id: FeroxiPlainTailAndDorsal bodyPart: Tail markingCategory: Tail speciesRestriction: [Feroxi] sprites: - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi - state: feroxi-plain-tail + state: feroxi-tail + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-dorsal - type: marking id: FeroxiPlainSnout @@ -28,7 +30,6 @@ - sprite: DeltaV/Mobs/Customization/Feroxi/snout_markings.rsi state: feroxi-plain-snout - # Ears Markings - type: marking id: FeroxiTipEars @@ -43,16 +44,119 @@ - sprite: DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi state: feroxi-tips-ears +# Tail markings - type: marking - id: FeroxiPlainFin - bodyPart: HeadTop - markingCategory: HeadTop + id: FeroxiPlainTail + bodyPart: Tail + markingCategory: Tail speciesRestriction: [Feroxi] sprites: - - sprite: DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi - state: feroxi-plain-fin + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail +- type: marking + id: FeroxiStripedTail + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Feroxi] + sprites: + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-stripes +- type: marking + id: FeroxiStripedTailAndDorsal + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Feroxi] + sprites: + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-stripes + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-dorsal + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-dorsal-stripes -# Tail markings +- type: marking + id: FeroxiTwoTipTail + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Feroxi] + sprites: + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-top-tip + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-bottom-tip +- type: marking + id: FeroxiTwoTipTailWithDorsal + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Feroxi] + sprites: + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-top-tip + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-bottom-tip + +- type: marking + id: FeroxiThreeTipTail + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Feroxi] + sprites: + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-top-tip + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-bottom-tip + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-second-dorsal-tip + +- type: marking + id: FeroxiThreeTipTailWithDorsal + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Feroxi] + sprites: + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-top-tip + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-bottom-tip + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-second-dorsal-tip + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-dorsal + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-dorsal-tip + +- type: marking + id: FeroxiBlitz + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Feroxi] + sprites: + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-stripes + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-top-tip + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-bottom-tip + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-stripes + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-dorsal + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-dorsal-stripes diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/feroxi.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/feroxi.yml index 1891d24cd67..eb4ed3dbd12 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/feroxi.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/feroxi.yml @@ -12,7 +12,7 @@ - type: Inventory # Allows vulps to wear properly shaped helmets speciesId: feroxi - type: Thirst - baseDecayRate: 0.15 + baseDecayRate: 0.2 - type: Icon sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi state: full @@ -98,7 +98,7 @@ name: Feroxi Dummy parent: MobHumanDummy id: MobFeroxiDummy - noSpawn: true + categories: [ HideSpawnMenu ] description: A dummy feroxi meant to be used in character setup. components: - type: HumanoidAppearance diff --git a/Resources/Prototypes/DeltaV/Species/feroxi.yml b/Resources/Prototypes/DeltaV/Species/feroxi.yml index 6ac34e1887f..3289d4dac48 100644 --- a/Resources/Prototypes/DeltaV/Species/feroxi.yml +++ b/Resources/Prototypes/DeltaV/Species/feroxi.yml @@ -65,7 +65,7 @@ Tail: points: 1 required: true - defaultMarkings: [ FeroxiPlainTail ] + defaultMarkings: [ FeroxiPlainTailAndDorsal ] - type: humanoidBaseSprite id: MobFeroxiHead diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml index 21640c7aebe..d6f9080bbf5 100644 --- a/Resources/Prototypes/Reagents/medicine.yml +++ b/Resources/Prototypes/Reagents/medicine.yml @@ -664,10 +664,20 @@ Drink: effects: - !type:SatiateThirst + conditions: + - !type:OrganType + type: Aquatic + shouldHave: false factor: 6 + - !type:SatiateThirst # Delta-V nerf of saline for Feroxi + conditions: + - !type:OrganType + type: Aquatic + factor: 2 - !type:ModifyBloodLevel amount: 6 + - type: reagent id: Siderlac name: reagent-name-siderlac @@ -1132,7 +1142,7 @@ conditions: - !type:ReagentThreshold min: 12 - + - type: reagent id: Opporozidone #Name based of an altered version of the startreck chem "Opporozine" name: reagent-name-opporozidone diff --git a/Resources/ServerInfo/Guidebook/Mobs/DeltaV/Feroxi.xml b/Resources/ServerInfo/Guidebook/Mobs/DeltaV/Feroxi.xml index 2b14aaf3ab0..cec5fe7f129 100644 --- a/Resources/ServerInfo/Guidebook/Mobs/DeltaV/Feroxi.xml +++ b/Resources/ServerInfo/Guidebook/Mobs/DeltaV/Feroxi.xml @@ -14,15 +14,16 @@ ## Benefits - - Uses their jaws to do piercing damage, and harder than other species. + - Uses their jaws to do piercing damage, and harder than other species, rivaling Oni. - Their cartilaginous skeleton allows them to resist blunt force trauma more easily. - Their adaptation to native environments allows them to resist the cold more easily. - - Their gills allow them to breathe water vapour + - Their biology allow them to breathe water vapour ## Drawbacks - They take 10% more Slash damage. + - Gets thirsty 100% faster. That's faster than a Diona! - When thirst falls to "Parched" they begin to suffocate. Have water handy! - - Gets hungry 15% faster. + - Saline is too salty! It hydrates you much less! diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-dorsal-stripes.png b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-dorsal-stripes.png new file mode 100644 index 0000000000000000000000000000000000000000..9914b9d80eef8be5ec190951738f7009fe9d36b4 GIT binary patch literal 216 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1enFxS(?F{C2y?X8WxM-_Nj9sZk2Ol6$WA}P^n z`YE+jEq992w0Ba*eRqwwR6@ISxsPKN{(Xg3!xP_jV$BYQ`a%E{~i#s471p00i_>zopr0Hwi3 AIsgCw literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-dorsal-tip.png b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-dorsal-tip.png new file mode 100644 index 0000000000000000000000000000000000000000..0a6bc46fff7821a727ec5c6e0bc9c1a93df04cea GIT binary patch literal 207 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!4yvy$B>G+x3@O(HW=`*I2@LcG-Xa{Iy1x6 zVd5nv6@k{HvB}f(uge3K{<*L%&1&nl#Z!cmdotE8-TQdz&z7xBKnW1AG3Msj`+bXQ t%gn#)TsE$+%nS?IbZU+)14F}mmpNXaBvq~Et~v`+=;`X`vd$@?2>_6tL(2dF literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-dorsal.png b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-dorsal.png new file mode 100644 index 0000000000000000000000000000000000000000..866e58f9782886fdd1f2a5758ee4502486ab2cc5 GIT binary patch literal 273 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`212l#}zPMI>Ls;X++wrxw6ECGsDUb$ulq*zOW{DS`j0mJWYe8E5g&H|6f zVg?4j!ywFfJby(BP_W9=#W5tp{q41ld z9tMWD)eaW(SvoR(HtSqi?V!!{>5f0MA_Id77;UL%e7JvSzU3>1uZA*P_6YGTIG1eI z5j*3+-uXY7#CbBN>}0NADKR19`kOuRk4`f%Tws{OIFUOb!+x>@>zivpS1@?G`njxg HN@xNAmJnVo literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-tail-bottom-tip.png b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-tail-bottom-tip.png new file mode 100644 index 0000000000000000000000000000000000000000..624f4b4d3556371018722f07500feb5d4b65737c GIT binary patch literal 238 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufG}g$wN6f;V6&%-V@O5Z+gk^DnG^+B1GeyZEoJap%FCOU zbZ4qG+x3?U*4k+-jIJ_*bNwT{y^dTbS zU`58lFR47H?w@9IcH5uHws-2Ts#ME5&B)KQoKY~f p^4P4u%kS9ARC%Aj*=XJJfpPv(FQ(ebRTL zu=_)7a^OGbbSa=R28R~IV?XCc_NBM|YCor=xTisK+xLHS@;=Y`D|G1Xfu~K(AVmxe zmRkDi>EE`>t&cc#ZV%UrZS&_x-nZux&97fQN0uSuEz_p;8iJl#oZ29@p00i_>zopr E0Q|8=j{pDw literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-plain-tail.png b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-tail.png similarity index 78% rename from Resources/Textures/DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-plain-tail.png rename to Resources/Textures/DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-tail.png index 9753267fb0e6f716cda8d3cd0bfa96e2fd3af0fa..8e6b276ba88b92365272acfc0817ce8ff3656b92 100644 GIT binary patch delta 359 zcmV-t0hs=}5#|xFu>mO$P)t-sdU|@cwzia%l%%Aj0002nyq_BY000GaQchF<|Ns90 z`?d~Kv)%#T1%Ck;Nkli+?@Twy+M09+$1)rY1jz%l^%pR%0m)2T7Qm$f4SkPh$gjuG!Q-2n%0#wfD{ zKUy^GVhnyCyXX$k7LCevHLjX90#xVk0O~W4@=5us?td@P1EjiSjYi83+!)o!RYL&c z)#w1~F%U8e9s<7dFFy^L12j92SWT}LfB;Yd2mloT0A3Ovvc4)f`NLEn!+$ zJ&biO$pV5Egzn7#y8xC7yqLe~Q`$uePO2`};<^a;0s^~H{-?hy9v-AUvsj^lm&}6H zh=ts&Z7>j^W8jAN4-{6_8noi)zI{8@O!^AH>!rPvQa%hNJXm}Vo&Ep-002ovPDHLk FV1jB9oqzxU delta 314 zcmV-A0mc625xNnuu>ma-P)t-swzjsEl$3gUdZeVJWMpIj0013iNsa&j00wkYPE-H? z|Ns90v%jRjv)TdP1%CkONkl4zU8HgonTf%dj*@)Kp4_!2t z*TW=`0FyuhOaj|Lk)pP=>;du=(0UWDfY|Xzv`T#lT({tWe*N-I$F;O@9|AT}$3QRkd9YJwNc1m+(njq1MtZHaH&c;Kb9Q%w&;S4c M07*qoM6N<$f^t@i_5c6? diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi/meta.json index 6d69a1e5e22..afc570d082d 100644 --- a/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi/meta.json +++ b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi/meta.json @@ -6,7 +6,35 @@ "states": [ { - "name": "feroxi-plain-tail", + "name": "feroxi-tail", + "directions": 4 + }, + { + "name": "feroxi-tail-top-tip", + "directions": 4 + }, + { + "name": "feroxi-tail-bottom-tip", + "directions": 4 + }, + { + "name": "feroxi-tail-second-dorsal-tip", + "directions": 4 + }, + { + "name": "feroxi-tail-stripes", + "directions": 4 + }, + { + "name": "feroxi-dorsal", + "directions": 4 + }, + { + "name": "feroxi-dorsal-tip", + "directions": 4 + }, + { + "name": "feroxi-dorsal-stripes", "directions": 4 } ] diff --git a/Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/full.png b/Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/full.png index 11c6100a6d9831d70d791dca43c2ed9f16bdd9dd..6c0d126afa28a1f0eea82de4f991277d9eecee9c 100644 GIT binary patch delta 295 zcmV+?0oeYE1FHj&jeh|MNklku-Y}#{F3z*rHSs}6Hp41dvYfkwHJGR_+qYSI`J zU6dmlpd8BZ43J_2&navjVA%tJPXYQ+wfjQI76vA^EhfpV&#RO(EEnon+(tQG^`Fb1U>R6@Sq2GG97974s;Wl%!YBj;Wf?0|AogSQ%q{?wpe6^u2i0BmvK teseNzV7%<*03iAh4fy2)aGk#Ey57fp67}7`-va;u002ovPDHLkV1ixeh5i5l delta 261 zcmV+g0s8){1BwHXjeh{=Nkl Date: Sun, 20 Oct 2024 01:05:45 +1100 Subject: [PATCH 24/55] Shark tails are DONE also some ftl, fuck you localization! I hate making things legible!! --- .../Locale/en-US/deltav/markings/feroxi.ftl | 58 ++++++++++++++++++ .../Mobs/Customization/Markings/feroxi.yml | 57 +++++++---------- .../Prototypes/DeltaV/Species/feroxi.yml | 6 +- ...i-inner-ears.png => feroxi-ears-inner.png} | Bin ...oxi-tips-ears.png => feroxi-ears-tips.png} | Bin ...{feroxi-plain-ears.png => feroxi-ears.png} | Bin .../ear_markings.rsi/feroxi-plain-fin.png | Bin 325 -> 0 bytes .../Feroxi/ear_markings.rsi/meta.json | 10 +-- ...eroxi-plain-snout.png => feroxi-snout.png} | Bin .../Feroxi/snout_markings.rsi/meta.json | 2 +- 10 files changed, 88 insertions(+), 45 deletions(-) create mode 100644 Resources/Locale/en-US/deltav/markings/feroxi.ftl rename Resources/Textures/DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi/{feroxi-inner-ears.png => feroxi-ears-inner.png} (100%) rename Resources/Textures/DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi/{feroxi-tips-ears.png => feroxi-ears-tips.png} (100%) rename Resources/Textures/DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi/{feroxi-plain-ears.png => feroxi-ears.png} (100%) delete mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi/feroxi-plain-fin.png rename Resources/Textures/DeltaV/Mobs/Customization/Feroxi/snout_markings.rsi/{feroxi-plain-snout.png => feroxi-snout.png} (100%) diff --git a/Resources/Locale/en-US/deltav/markings/feroxi.ftl b/Resources/Locale/en-US/deltav/markings/feroxi.ftl new file mode 100644 index 00000000000..b4d54039d48 --- /dev/null +++ b/Resources/Locale/en-US/deltav/markings/feroxi.ftl @@ -0,0 +1,58 @@ +marking-FeroxiEars = Ears +marking-FeroxiEars-feroxi-ears = Base Ears +marking-FeroxiEars-feroxi-ears-inner = Inner Ear + +marking-FeroxiEarsTips = Tipped Ears +marking-FeroxiEarsTips-feroxi-ears = Base Ears +marking-FeroxiEarsTips-feroxi-ears-inner = Inner Ear +marking-FeroxiEarsTips-feroxi-ears-tips = Ear Tips + +marking-FeroxiSnout = Snout (Unfinished) +marking-FeroxiSnout-feroxi-snout = Base Snout + +marking-FeroxiBlitz = Striped Tail with Fin Tips and Dorsal +marking-FeroxiBlitz-feroxi-tail = Base Tail +marking-FeroxiBlitz-feroxi-tail-stripes = Tail Stripes +marking-FeroxiBlitz-feroxi-tail-top-tip = Upper Tail Fin Tip +marking-FeroxiBlitz-feroxi-tail-bottom-tip = Lower Tail Fin Tip +marking-FeroxiBlitz-feroxi-dorsal = Base Dorsal +marking-FeroxiBlitz-feroxi-dorsal-stripes = Dorsal Stripes + +marking-FeroxiBlitzNoDorsal = Striped Tail with Fin Tips +marking-FeroxiBlitzNoDorsal-feroxi-tail = Base Tail +marking-FeroxiBlitzNoDorsal-feroxi-tail-stripes = Tail Stripes +marking-FeroxiBlitzNoDorsal-feroxi-tail-top-tip = Upper Tail Fin Tip +marking-FeroxiBlitzNoDorsal-feroxi-tail-bottom-tip = Lower Tail Fin Tip + +marking-FeroxiStripedTail = Striped Tail +marking-FeroxiStripedTail-feroxi-tail = Base Tail +marking-FeroxiStripedTail-feroxi-tail-stripes = Tail Stripes + +marking-FeroxiStripedTailAndDorsal = Striped Tail with Dorsal +marking-FeroxiStripedTailAndDorsal-feroxi-tail = Base Tail +marking-FeroxiStripedTailAndDorsal-feroxi-tail-stripes = Tail Stripes +marking-FeroxiStripedTailAndDorsal-feroxi-dorsal = Base Dorsal +marking-FeroxiStripedTailAndDorsal-feroxi-dorsal-stripes = Dorsal Stripes + +marking-FeroxiTail = Tail +marking-FeroxiTail-feroxi-tail = Base Tail + +marking-FeroxiTailAndDorsal = Tail & Dorsal +marking-FeroxiTailAndDorsal-feroxi-tail = Base Tail +marking-FeroxiTailAndDorsal-feroxi-dorsal = Base Dorsal + +marking-FeroxiTipTail = Tail with Tips +marking-FeroxiTipTail-feroxi-tail = Base Tail +marking-FeroxiTipTail-feroxi-tail-top-tip = Upper Tail Fin Tip +marking-FeroxiTipTail-feroxi-tail-bottom-tip = Lower Tail Fin Tip +marking-FeroxiTipTail-feroxi-second-dorsal-tip = Secondary Dorsal Fin Tip +marking-FeroxiTipTail-feroxi-dorsal = Base Dorsal + +marking-FeroxiTipTailAndDorsal = Tail with Tips and Dorsal +marking-FeroxiTipTailAndDorsal-feroxi-tail = Base Tail +marking-FeroxiTipTailAndDorsal-feroxi-tail-top-tip = Upper Tail Fin Tip +marking-FeroxiTipTailAndDorsal-feroxi-tail-bottom-tip = Lower Tail Fin Tip +marking-FeroxiTipTailAndDorsal-feroxi-second-dorsal-tip = Secondary Dorsal Fin Tip +marking-FeroxiTipTailAndDorsal-feroxi-dorsal = Base Dorsal +marking-FeroxiTipTailAndDorsal-feroxi-dorsal-tip = Dorsal Tip + diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/feroxi.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/feroxi.yml index 2fb844a22e7..35022ac3892 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/feroxi.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/feroxi.yml @@ -1,17 +1,17 @@ # Default - type: marking - id: FeroxiPlainEars + id: FeroxiEars bodyPart: HeadTop markingCategory: HeadTop speciesRestriction: [Feroxi] sprites: - sprite: DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi - state: feroxi-plain-ears + state: feroxi-ears - sprite: DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi - state: feroxi-inner-ears + state: feroxi-ears-inner - type: marking - id: FeroxiPlainTailAndDorsal + id: FeroxiTailAndDorsal bodyPart: Tail markingCategory: Tail speciesRestriction: [Feroxi] @@ -22,31 +22,31 @@ state: feroxi-dorsal - type: marking - id: FeroxiPlainSnout + id: FeroxiSnout bodyPart: Snout markingCategory: Snout speciesRestriction: [Feroxi] sprites: - sprite: DeltaV/Mobs/Customization/Feroxi/snout_markings.rsi - state: feroxi-plain-snout + state: feroxi-snout # Ears Markings - type: marking - id: FeroxiTipEars + id: FeroxiEarsTips bodyPart: HeadTop markingCategory: HeadTop speciesRestriction: [Feroxi] sprites: - sprite: DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi - state: feroxi-plain-ears + state: feroxi-ears - sprite: DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi - state: feroxi-inner-ears + state: feroxi-ears-inner - sprite: DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi - state: feroxi-tips-ears + state: feroxi-ears-tips # Tail markings - type: marking - id: FeroxiPlainTail + id: FeroxiTail bodyPart: Tail markingCategory: Tail speciesRestriction: [Feroxi] @@ -81,7 +81,7 @@ state: feroxi-dorsal-stripes - type: marking - id: FeroxiTwoTipTail + id: FeroxiTipTail bodyPart: Tail markingCategory: Tail speciesRestriction: [Feroxi] @@ -92,22 +92,11 @@ state: feroxi-tail-top-tip - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi state: feroxi-tail-bottom-tip - -- type: marking - id: FeroxiTwoTipTailWithDorsal - bodyPart: Tail - markingCategory: Tail - speciesRestriction: [Feroxi] - sprites: - - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi - state: feroxi-tail - - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi - state: feroxi-tail-top-tip - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi - state: feroxi-tail-bottom-tip + state: feroxi-tail-second-dorsal-tip - type: marking - id: FeroxiThreeTipTail + id: FeroxiTipTailAndDorsal bodyPart: Tail markingCategory: Tail speciesRestriction: [Feroxi] @@ -120,28 +109,32 @@ state: feroxi-tail-bottom-tip - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi state: feroxi-tail-second-dorsal-tip + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-dorsal + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-dorsal-tip - type: marking - id: FeroxiThreeTipTailWithDorsal + id: FeroxiBlitz bodyPart: Tail markingCategory: Tail speciesRestriction: [Feroxi] sprites: - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi state: feroxi-tail + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-stripes - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi state: feroxi-tail-top-tip - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi state: feroxi-tail-bottom-tip - - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi - state: feroxi-tail-second-dorsal-tip - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi state: feroxi-dorsal - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi - state: feroxi-dorsal-tip + state: feroxi-dorsal-stripes - type: marking - id: FeroxiBlitz + id: FeroxiBlitzNoDorsal bodyPart: Tail markingCategory: Tail speciesRestriction: [Feroxi] @@ -156,7 +149,3 @@ state: feroxi-tail-bottom-tip - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi state: feroxi-tail-stripes - - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi - state: feroxi-dorsal - - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi - state: feroxi-dorsal-stripes diff --git a/Resources/Prototypes/DeltaV/Species/feroxi.yml b/Resources/Prototypes/DeltaV/Species/feroxi.yml index 3289d4dac48..54ccd085f9e 100644 --- a/Resources/Prototypes/DeltaV/Species/feroxi.yml +++ b/Resources/Prototypes/DeltaV/Species/feroxi.yml @@ -48,11 +48,11 @@ HeadTop: points: 1 required: true - defaultMarkings: [ FeroxiPlainEars ] + defaultMarkings: [ FeroxiEars ] Snout: points: 1 required: true - defaultMarkings: [ FeroxiPlainSnout ] + defaultMarkings: [ FeroxiSnout ] Chest: points: 3 required: false @@ -65,7 +65,7 @@ Tail: points: 1 required: true - defaultMarkings: [ FeroxiPlainTailAndDorsal ] + defaultMarkings: [ FeroxiTailAndDorsal ] - type: humanoidBaseSprite id: MobFeroxiHead diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi/feroxi-inner-ears.png b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi/feroxi-ears-inner.png similarity index 100% rename from Resources/Textures/DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi/feroxi-inner-ears.png rename to Resources/Textures/DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi/feroxi-ears-inner.png diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi/feroxi-tips-ears.png b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi/feroxi-ears-tips.png similarity index 100% rename from Resources/Textures/DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi/feroxi-tips-ears.png rename to Resources/Textures/DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi/feroxi-ears-tips.png diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi/feroxi-plain-ears.png b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi/feroxi-ears.png similarity index 100% rename from Resources/Textures/DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi/feroxi-plain-ears.png rename to Resources/Textures/DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi/feroxi-ears.png diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi/feroxi-plain-fin.png b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi/feroxi-plain-fin.png deleted file mode 100644 index 227231f7f66fa90a8ba764e97a194a65fcd883df..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 325 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0L3?#3!&-4XSoB=)|t_KbrsH&=Z_wL=6QjbkQ zLB^6GzhDN3XE)M-oU*Erh!U67;^d;tf|AVqJO+k}Il*BCMWx@r1Q&e#`b5iHSL@uF z^T8WJ4K5l#c%*aQNAn~@QBUs<3*#W;%f?;`a~@4PGATqMSkv5Yt%kAsatphS8%zxE zT|DaD*=?-4d4)s@gLryWU{an|NA8KGYaYCM&a{n*;lwMs*;x`Zw*p;|;pyTSV$qwN zpul9nq-b>Zz|#ZQ7#7WxxuL+6!5=t93 zN-!S~xhyiHA%fY(Mp$hEXQ(x|+6Er4mdKI;Vst0I{QZL;wH) diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi/meta.json index 32677b72f94..2415368aa0a 100644 --- a/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi/meta.json +++ b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi/meta.json @@ -5,20 +5,16 @@ "size": {"x": 32, "y": 32}, "states": [ { - "name": "feroxi-plain-ears", + "name": "feroxi-ears", "directions": 4 }, { - "name": "feroxi-tips-ears", + "name": "feroxi-ears-inner", "directions": 4 }, { - "name": "feroxi-inner-ears", + "name": "feroxi-ears-tips", "directions": 4 - }, - { - "name": "feroxi-plain-fin", - "directions": 4 } ] } diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/snout_markings.rsi/feroxi-plain-snout.png b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/snout_markings.rsi/feroxi-snout.png similarity index 100% rename from Resources/Textures/DeltaV/Mobs/Customization/Feroxi/snout_markings.rsi/feroxi-plain-snout.png rename to Resources/Textures/DeltaV/Mobs/Customization/Feroxi/snout_markings.rsi/feroxi-snout.png diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/snout_markings.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/snout_markings.rsi/meta.json index 414cf1f009a..7f6d6974c35 100644 --- a/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/snout_markings.rsi/meta.json +++ b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/snout_markings.rsi/meta.json @@ -6,7 +6,7 @@ "states": [ { - "name": "feroxi-plain-snout", + "name": "feroxi-snout", "directions": 4 } ] From 9c4143fed1ae2a1aad2a97ae7611decaa1a4cf85 Mon Sep 17 00:00:00 2001 From: BlitzTheSquishy <73762869+BlitzTheSquishy@users.noreply.github.com> Date: Sun, 20 Oct 2024 17:15:55 +1100 Subject: [PATCH 25/55] BASE SHARK TEXTURES ARE DONE, Now I just need to do markings. --- .../Locale/en-US/deltav/markings/feroxi.ftl | 91 ++++++++--- .../Mobs/Customization/Markings/feroxi.yml | 142 +++++++++++++++++- .../Prototypes/DeltaV/Species/feroxi.yml | 6 +- .../feroxi-arm-stripes-blitz.png | Bin 0 -> 213 bytes .../feroxi-leg-stripes-blitz.png | Bin 0 -> 226 bytes .../feroxi-torso-stripes-blitz.png | Bin 0 -> 218 bytes .../Feroxi/body_markings.rsi/meta.json | 21 +++ .../feroxi-snout-stripe.png | Bin 0 -> 172 bytes .../snout_markings.rsi/feroxi-snout.png | Bin 280 -> 288 bytes .../Feroxi/snout_markings.rsi/meta.json | 6 +- .../tail_markings.rsi/feroxi-tail-under.png | Bin 0 -> 2134 bytes .../Feroxi/tail_markings.rsi/meta.json | 5 + .../Mobs/Species/Feroxi/parts.rsi/full.png | Bin 427 -> 411 bytes .../Mobs/Species/Feroxi/parts.rsi/head_f.png | Bin 2226 -> 346 bytes .../Mobs/Species/Feroxi/parts.rsi/head_m.png | Bin 2226 -> 337 bytes .../Mobs/Species/Feroxi/parts.rsi/l_arm.png | Bin 2223 -> 256 bytes .../Mobs/Species/Feroxi/parts.rsi/l_foot.png | Bin 2238 -> 249 bytes .../Mobs/Species/Feroxi/parts.rsi/l_hand.png | Bin 2226 -> 261 bytes .../Mobs/Species/Feroxi/parts.rsi/l_leg.png | Bin 2238 -> 226 bytes .../Mobs/Species/Feroxi/parts.rsi/r_arm.png | Bin 2223 -> 266 bytes .../Mobs/Species/Feroxi/parts.rsi/r_foot.png | Bin 2238 -> 255 bytes .../Mobs/Species/Feroxi/parts.rsi/r_hand.png | Bin 2226 -> 263 bytes .../Mobs/Species/Feroxi/parts.rsi/r_leg.png | Bin 2238 -> 226 bytes 23 files changed, 246 insertions(+), 25 deletions(-) create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-arm-stripes-blitz.png create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-leg-stripes-blitz.png create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-torso-stripes-blitz.png create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Feroxi/body_markings.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Feroxi/snout_markings.rsi/feroxi-snout-stripe.png create mode 100644 Resources/Textures/DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-tail-under.png diff --git a/Resources/Locale/en-US/deltav/markings/feroxi.ftl b/Resources/Locale/en-US/deltav/markings/feroxi.ftl index b4d54039d48..2265598e6fb 100644 --- a/Resources/Locale/en-US/deltav/markings/feroxi.ftl +++ b/Resources/Locale/en-US/deltav/markings/feroxi.ftl @@ -2,27 +2,40 @@ marking-FeroxiEars = Ears marking-FeroxiEars-feroxi-ears = Base Ears marking-FeroxiEars-feroxi-ears-inner = Inner Ear +marking-FeroxiTailAndDorsal = Tail and Dorsal +marking-FeroxiTailAndDorsal-feroxi-tail = Base Tail +marking-FeroxiTailAndDorsal-feroxi-dorsal = Base Dorsal + +marking-FeroxiSnout = Snout +marking-FeroxiSnout-feroxi-snout = Base Snout + + marking-FeroxiEarsTips = Tipped Ears marking-FeroxiEarsTips-feroxi-ears = Base Ears marking-FeroxiEarsTips-feroxi-ears-inner = Inner Ear marking-FeroxiEarsTips-feroxi-ears-tips = Ear Tips -marking-FeroxiSnout = Snout (Unfinished) -marking-FeroxiSnout-feroxi-snout = Base Snout -marking-FeroxiBlitz = Striped Tail with Fin Tips and Dorsal -marking-FeroxiBlitz-feroxi-tail = Base Tail -marking-FeroxiBlitz-feroxi-tail-stripes = Tail Stripes -marking-FeroxiBlitz-feroxi-tail-top-tip = Upper Tail Fin Tip -marking-FeroxiBlitz-feroxi-tail-bottom-tip = Lower Tail Fin Tip -marking-FeroxiBlitz-feroxi-dorsal = Base Dorsal -marking-FeroxiBlitz-feroxi-dorsal-stripes = Dorsal Stripes +marking-FeroxiSnoutStripe = Striped Snout +marking-FeroxiSnoutStripe-feroxi-snout = Base Snout +marking-FeroxiSnoutStripe-feroxi-snout-stripe = Stripe + + +marking-FeroxiTailBlitz = Striped Tail with Fin Tips and Dorsal +marking-FeroxiTailBlitz-feroxi-tail = Base Tail +marking-FeroxiTailBlitz-feroxi-tail-stripes = Tail Stripes +marking-FeroxiTailBlitz-feroxi-tail-top-tip = Upper Tail Fin Tip +marking-FeroxiTailBlitz-feroxi-tail-bottom-tip = Lower Tail Fin Tip +marking-FeroxiTailBlitz-feroxi-tail-under = Under Tail +marking-FeroxiTailBlitz-feroxi-dorsal = Base Dorsal +marking-FeroxiTailBlitz-feroxi-dorsal-stripes = Dorsal Stripes -marking-FeroxiBlitzNoDorsal = Striped Tail with Fin Tips -marking-FeroxiBlitzNoDorsal-feroxi-tail = Base Tail -marking-FeroxiBlitzNoDorsal-feroxi-tail-stripes = Tail Stripes -marking-FeroxiBlitzNoDorsal-feroxi-tail-top-tip = Upper Tail Fin Tip -marking-FeroxiBlitzNoDorsal-feroxi-tail-bottom-tip = Lower Tail Fin Tip +marking-FeroxiTailBlitzNoDorsal = Striped Tail with Fin Tips +marking-FeroxiTailBlitzNoDorsal-feroxi-tail = Base Tail +marking-FeroxiTailBlitzNoDorsal-feroxi-tail-stripes = Tail Stripes +marking-FeroxiTailBlitzNoDorsal-feroxi-tail-top-tip = Upper Tail Fin Tip +marking-FeroxiTailBlitzNoDorsal-feroxi-tail-bottom-tip = Lower Tail Fin Tip +marking-FeroxiTailBlitzNoDorsal-feroxi-tail-under = Under Tail marking-FeroxiStripedTail = Striped Tail marking-FeroxiStripedTail-feroxi-tail = Base Tail @@ -37,10 +50,6 @@ marking-FeroxiStripedTailAndDorsal-feroxi-dorsal-stripes = Dorsal Stripes marking-FeroxiTail = Tail marking-FeroxiTail-feroxi-tail = Base Tail -marking-FeroxiTailAndDorsal = Tail & Dorsal -marking-FeroxiTailAndDorsal-feroxi-tail = Base Tail -marking-FeroxiTailAndDorsal-feroxi-dorsal = Base Dorsal - marking-FeroxiTipTail = Tail with Tips marking-FeroxiTipTail-feroxi-tail = Base Tail marking-FeroxiTipTail-feroxi-tail-top-tip = Upper Tail Fin Tip @@ -56,3 +65,49 @@ marking-FeroxiTipTailAndDorsal-feroxi-second-dorsal-tip = Secondary Dorsal Fin T marking-FeroxiTipTailAndDorsal-feroxi-dorsal = Base Dorsal marking-FeroxiTipTailAndDorsal-feroxi-dorsal-tip = Dorsal Tip +marking-FeroxiTwoToneTail = Two Tone Tail +marking-FeroxiTwoToneTail-feroxi-tail = Base Tail +marking-FeroxiTwoToneTail-feroxi-tail-under = Under Tail + +marking-FeroxiTwoToneTailAndDorsal = Two Tone Tail and Dorsal +marking-FeroxiTwoToneTailAndDorsal-feroxi-tail = Base Tail +marking-FeroxiTwoToneTailAndDorsal-feroxi-tail-under = Under Tail +marking-FeroxiTwoToneTailAndDorsal-feroxi-dorsal = Base Dorsal + +marking-FeroxiStripeTwoToneTail = Two Tone Tail with Stripes +marking-FeroxiStripeTwoToneTail-feroxi-tail = Base Tail +marking-FeroxiStripeTwoToneTail-feroxi-tail-stripes = Tail Stripes +marking-FeroxiStripeTwoToneTail-feroxi-tail-under = Under Tail + +marking-FeroxiStripeTwoToneTailAndDorsal = Two Tone Tail with Stripes and Dorsal +marking-FeroxiStripeTwoToneTailAndDorsal-feroxi-tail = Base Tail +marking-FeroxiStripeTwoToneTailAndDorsal-feroxi-tail-stripes = Tail Stripes +marking-FeroxiStripeTwoToneTailAndDorsal-feroxi-tail-under = Under Tail +marking-FeroxiStripeTwoToneTailAndDorsal-feroxi-dorsal = Base Dorsal +marking-FeroxiStripeTwoToneTailAndDorsal-feroxi-dorsal-stripes = Dorsal Stripes + +marking-FeroxiTipTwoToneTail = Two Tone Tail with Tips +marking-FeroxiTipTwoToneTail-feroxi-tail = Base Tail +marking-FeroxiTipTwoToneTail-feroxi-tail-top-tip = Upper Tail Fin Tip +marking-FeroxiTipTwoToneTail-feroxi-tail-bottom-tip = Lower Tail Fin Tip +marking-FeroxiTipTwoToneTail-feroxi-tail-under = Under Tail + +marking-FeroxiTipTwoToneTailAndDorsal = Two Tone Tail with Tips and Dorsal +marking-FeroxiTipTwoToneTailAndDorsal-feroxi-tail = Base Tail +marking-FeroxiTipTwoToneTailAndDorsal-feroxi-tail-top-tip = Upper Tail Fin Tip +marking-FeroxiTipTwoToneTailAndDorsal-feroxi-tail-bottom-tip = Lower Tail Fin Tip +marking-FeroxiTipTwoToneTailAndDorsal-feroxi-tail-under = Under Tail +marking-FeroxiTipTwoToneTailAndDorsal-feroxi-dorsal = Base Dorsal +marking-FeroxiTipTwoToneTailAndDorsal-feroxi-dorsal-tip = Dorsal Tip + + +marking-FeroxiTorsoStripesBlitz = Small Under Arm Stripes +marking-FeroxiTorsoStripesBlitz-feroxi-torso-stripes-blitz = Stripes + + +marking-FeroxiLegStripesBlitz = Calf Stripes +marking-FeroxiLegStripesBlitz-feroxi-leg-stripes-blitz = Stripes + + +marking-FeroxiArmStripesBlitz = Shoulder Stripes +marking-FeroxiArmStripesBlitz-feroxi-arm-stripes-blitz = Stripes diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/feroxi.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/feroxi.yml index 35022ac3892..338cf731c7b 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/feroxi.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/feroxi.yml @@ -44,7 +44,19 @@ - sprite: DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi state: feroxi-ears-tips -# Tail markings +# Snout Markings +- type: marking + id: FeroxiSnoutStripe + bodyPart: Snout + markingCategory: Snout + speciesRestriction: [Feroxi] + sprites: + - sprite: DeltaV/Mobs/Customization/Feroxi/snout_markings.rsi + state: feroxi-snout + - sprite: DeltaV/Mobs/Customization/Feroxi/snout_markings.rsi + state: feroxi-snout-stripe + +# Tail Markings - type: marking id: FeroxiTail bodyPart: Tail @@ -115,7 +127,7 @@ state: feroxi-dorsal-tip - type: marking - id: FeroxiBlitz + id: FeroxiTailBlitz bodyPart: Tail markingCategory: Tail speciesRestriction: [Feroxi] @@ -128,13 +140,15 @@ state: feroxi-tail-top-tip - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi state: feroxi-tail-bottom-tip + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-under - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi state: feroxi-dorsal - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi state: feroxi-dorsal-stripes - type: marking - id: FeroxiBlitzNoDorsal + id: FeroxiTailBlitzNoDorsal bodyPart: Tail markingCategory: Tail speciesRestriction: [Feroxi] @@ -147,5 +161,127 @@ state: feroxi-tail-top-tip - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi state: feroxi-tail-bottom-tip + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-under + +- type: marking + id: FeroxiTwoToneTail + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Feroxi] + sprites: + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-under + +- type: marking + id: FeroxiTwoToneTailAndDorsal + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Feroxi] + sprites: + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-under + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-dorsal + +- type: marking + id: FeroxiStripeTwoToneTail + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Feroxi] + sprites: + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi state: feroxi-tail-stripes + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-under + +- type: marking + id: FeroxiStripeTwoToneTailAndDorsal + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Feroxi] + sprites: + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-stripes + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-under + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-dorsal + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-dorsal-stripes + +- type: marking + id: FeroxiTipTwoToneTail + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Feroxi] + sprites: + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-top-tip + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-bottom-tip + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-second-dorsal-tip + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-under + +- type: marking + id: FeroxiTipTwoToneTailAndDorsal + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Feroxi] + sprites: + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-top-tip + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-bottom-tip + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-second-dorsal-tip + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-tail-under + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-dorsal + - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi + state: feroxi-dorsal-tip + +# Body Markings +- type: marking + id: FeroxiTorsoStripesBlitz + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [Feroxi] + sprites: + - sprite: DeltaV/Mobs/Customization/Feroxi/body_markings.rsi + state: feroxi-torso-stripes-blitz + +# Leg Markings +- type: marking + id: FeroxiLegStripesBlitz + bodyPart: LLeg + markingCategory: Legs + speciesRestriction: [Feroxi] + sprites: + - sprite: DeltaV/Mobs/Customization/Feroxi/body_markings.rsi + state: feroxi-leg-stripes-blitz + +# Arm Markings +- type: marking + id: FeroxiArmStripesBlitz + bodyPart: LArm + markingCategory: Arms + speciesRestriction: [Feroxi] + sprites: + - sprite: DeltaV/Mobs/Customization/Feroxi/body_markings.rsi + state: feroxi-arm-stripes-blitz diff --git a/Resources/Prototypes/DeltaV/Species/feroxi.yml b/Resources/Prototypes/DeltaV/Species/feroxi.yml index 54ccd085f9e..d42d70ac958 100644 --- a/Resources/Prototypes/DeltaV/Species/feroxi.yml +++ b/Resources/Prototypes/DeltaV/Species/feroxi.yml @@ -8,9 +8,9 @@ markingLimits: MobFeroxiMarkingLimits dollPrototype: MobFeroxiDummy skinColoration: Hues - maleFirstNames: names_human_male - femaleFirstNames: names_human_female - lastNames: names_human_last + maleFirstNames: names_first_male + femaleFirstNames: names_first_female + lastNames: names_last - type: speciesBaseSprites id: MobFeroxiSprites diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-arm-stripes-blitz.png b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-arm-stripes-blitz.png new file mode 100644 index 0000000000000000000000000000000000000000..eb2b8391b7dcd49b29a2b23ebc594090e0b01c7f GIT binary patch literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1enFw4`$F{C2y?X82nhZT4j9Ck4!8!}He;5Rl9 z(+&u{7%#tak%q>u-#4b^++?-@s{i1unY!iLF)jX?e~a^`F2A!^9w-O`au2pXO5A!) yF!|3D&87RFumA8@{>9$*IiJPM8G*7JmJ8fl9H?j|eb3$rq}tQf&t;ucLK6T|K17)S literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-leg-stripes-blitz.png b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-leg-stripes-blitz.png new file mode 100644 index 0000000000000000000000000000000000000000..5ae825cc12a86b1f781dc3ca27f89923afb60c9d GIT binary patch literal 226 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!E#R*$B>G+x3@O(GAr`125jOpHsoYB;50Vi zO5SkDwa;mCNM})(U)B1bZHLPEIe|KWpdvWiR;l{^@pa0N_q;x_+2z0CvE+NN|Lm}@ zwu2~Oh`I81ru@zKA1t4Tc>P>;eEpIA4O_!z6)(GXE54j@o!V0CPxFl<6xIeD1*!LR L^>bP0l+XkKm%~lq literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-torso-stripes-blitz.png b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-torso-stripes-blitz.png new file mode 100644 index 0000000000000000000000000000000000000000..ee93064e4a523bcf72ebfd09df1b1391b1f3d4e7 GIT binary patch literal 218 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1enFyGU~F{C2y?akf1hYfgG9jbVzO1Ud%GW0Gf z49Vh^=Il{Ooujnz;qJDaA1~v9>KX2w-E_VGO4Ri!K~Lr^p7Lqd+r8_Pdu9~7Wxu^} zPWfN0JV*@?=)GF4^LOI$_iry(hyC|X|H;h2(2(7EgMn+F3iDNG`$mu&Pgg&ebxsLQ E0R5FpYybcN literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/body_markings.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/body_markings.rsi/meta.json new file mode 100644 index 00000000000..c1d43fffad2 --- /dev/null +++ b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/body_markings.rsi/meta.json @@ -0,0 +1,21 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by BlitzTheSquishy", + "size": {"x": 32, "y": 32}, + "states": + [ + { + "name": "feroxi-torso-stripes-blitz", + "directions": 4 + }, + { + "name": "feroxi-arm-stripes-blitz", + "directions": 4 + }, + { + "name": "feroxi-leg-stripes-blitz", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/snout_markings.rsi/feroxi-snout-stripe.png b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/snout_markings.rsi/feroxi-snout-stripe.png new file mode 100644 index 0000000000000000000000000000000000000000..23af628a684e614907431435ee220fe65576be99 GIT binary patch literal 172 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1en(9zSyF{C2y?U{vw3<^9f2YE`DZZhFlV^wHM zEIYe@7f=NRG*pLf{oPl6F>Y_N(dPSmrssl%ACwESy9l$n?q%eV0ttA!`njxgN@xNA Dy3H*U literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/snout_markings.rsi/feroxi-snout.png b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/snout_markings.rsi/feroxi-snout.png index 00944e52a8229c1766664f9c7c4f4caf2e82cbf5..2055e21c35ef9d3bff445d240aa3062ea75a5370 100644 GIT binary patch delta 231 zcmbQiw18=XW4%y-Pl)TbZQGVCSyEM1HD$__o}L~C28RA_Zh0WZRubeF{2v4uHt%1u zA1K0E;1OBOz`%D1gc(IOyc&Rlt)4E9ArbCxr(Wbbpupj}e%HVM)2AzjoNiBglX}NF zAWL@5^nf_0gX~So4@(>va-fN zJ{`W6vdi)rBf~V#HDXD&8rKIkUrc_w5jxhZ9|!=oXe>Ce caKRMm-KYHiRc^V<4s;QNr>mdKI;Vst09ce-@Bjb+ delta 223 zcmZ3$G=ph^V?BR>Pl)TbZQGVCSyEM1HD$^a1_lPDFB8Rp6l+P4U+{k*VEDa_FBmAm zS>O>_%)r2R7=#&*=dVZs3O0JWIEF;Hzn$jIbwGi~CHc$0^mWb5*Q6XZ?@p;yP^*(G zOkK0brHP;A_@ReRMiXYdHRQ0_dG%mU|Hc&d9`gvxy3fL#Dhxs%3@Q^C{)8laWPdFu z_pIiy&he(4i<#$SzesFkuBQ87P#>_CWujWjL*Vwo)aW=3BF>reAWT@C| VAM0s6&kE=o22WQ%mvv4FO#ry{RK@@R diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/snout_markings.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/snout_markings.rsi/meta.json index 7f6d6974c35..8d0f63038a9 100644 --- a/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/snout_markings.rsi/meta.json +++ b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/snout_markings.rsi/meta.json @@ -1,13 +1,17 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/Skyrat-SS13/Skyrat-tg/tree/40e3cdbb15b8bc0d5ef2fb46133adf805bda5297, modified by BlitzTheSquishy", + "copyright": "Made by BlitzTheSquishy", "size": {"x": 32, "y": 32}, "states": [ { "name": "feroxi-snout", "directions": 4 + }, + { + "name": "feroxi-snout-stripe", + "directions": 4 } ] } diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-tail-under.png b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-tail-under.png new file mode 100644 index 0000000000000000000000000000000000000000..471867639c5e69ec56f50fe7411777f91a133087 GIT binary patch literal 2134 zcmcIld2G{G7&nYbE9WSqV=y+$P$+1Q?Zk0nt7!*Gj|fsi6H1xH@$&o zG!P()7%H%JfEdTb7$7L;LySF6>qJy*0QH-CT>)-d@!S}^mr`#flR#Oza-R-p7Nw*sDD?vmMSxxi5 z8I=q_U$bL@Zj;? zCH<}qt=m*b3AO89{j%I&ynK)1V4xZB zr+2Ndzva%(DQdVkzMydJ)}iwoUgg`>-#3yg+I9M3gr#qN*4dp48vCE`I;XTTzxe6k zZH@EWwav{s_u2iQFKfGM_s`zunF%hb82x#UuTm4etal+8?f+cf5+I z?h&mTcH}_MZ709}W8a!f-KTgnJ%d(WyzSkgWYmV2hIgDi)0ETq37a{xdi0+2Iogkz z6Mopey{vJeZ3SY#FEge1BkQOZ*5hI9pUG#4&qIOX?4BD=EOSMwhUx$aZSf#L1MV`tcFRUzsqDK-*F-%28g`vV^h^PUE6Gf3>jf~MqV+0)=AJ#ye4##>WNt$UKCwpzu;vmX!29^nh^r#c)n3gvVJ2%JjR&>leK8l!P z6pNIr5ao?SVXarnU4|{b(Q-AI$U=q;3Zf8(#qe%i%T@(Wm%9b6XB|*N(S!$9xCNyt z{(rT3BOd*iMEI%Av0Dq@8^~0iIuMH?IU=xJkH_h-QTnEm9D#}~C0?P?XyyDqfwlmd zqj>@AZiTFmW{nV-{0Ins8K!ug;g|-(5a~Ra*`Qz&iy6tH46HP7=8ZHjA`=Y&5NYJ+ zWGEnLg|eLTAEGL_^+53Tcyt~a^YA|2%=v&oLo2@VR>4PGW!XoI5V5>yHClMHK#?+( z@*`>p;F2jJ5I{^c9H2;DS!saVX`_q=wt49e0?m)1Hp&GcImFX!_9`Ld(SWWTCzv@4 z&+`@me=H`x8Bv1N7;Y_{i(?HY%%=-4;n=Z)K<_&2n#f49s|aWj)f@T2cZqxm65|Ls-D15sn4n0K#V$w@cEZ zyrm?fD9F4SSZHAM;gTW~qOCkD(41@*SyAM98RC*A{bLcoRsmErAb_*ON#O2CBtd2+ zW$Tv$R*XfuCM-Uitcm6XFDFPwt7Nj$tVLq6O3eS0jLGNc%%Z^2P_RInhdxLH(PW~b zAM!{r@iNC5Q!)OhWXv>c_OeFF%u6QWZOLRa`jmOSTG`Co3Y)~eHl31_FX4?xA6{X< z)HKysEfX1qaYAj~z^ z?^?b2e&@8_M0z37doGdP_1hB%^O@^Sri?w}#3>C|#T%apC9S$z(+uWfTj%Tnt*LzQ6vr=kVhpBlcDcWt*6@J3Btsy3}7= dzO?3}=dW_VJXZI?MEwuMnOEdkH*n0ihrz literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi/meta.json index afc570d082d..1eb99cfa2c6 100644 --- a/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi/meta.json +++ b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi/meta.json @@ -21,6 +21,11 @@ "name": "feroxi-tail-second-dorsal-tip", "directions": 4 }, + + { + "name": "feroxi-tail-under", + "directions": 4 + }, { "name": "feroxi-tail-stripes", "directions": 4 diff --git a/Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/full.png b/Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/full.png index 6c0d126afa28a1f0eea82de4f991277d9eecee9c..9ccc38350deb9c99da122a137b668197b0bb63a4 100644 GIT binary patch delta 355 zcmV-p0i6D;1DgYoL4OrcOjJdBdV03Dwxpz_|NsA#l$4B&i~s-t_o!m~00007bW%=J z|NsC0|Nj6QO9Ms#000SaNLh0L01m?d01m?e$8V@)0002|Nkl_#als$L2&E(gGN~8Z-?jviA~wSAjl$MGC~YrkblIl#|8lm#TubQK|WaT z3QGk7qOSxnOl;;S0gUgFpCzDRP?)M|0rsehOT5g1`9eRImU$i~VB5L0AS{cdSRZD2 z7^1&|@`Hig2g@Rahr+1w^<82RSc4Uw2~aKqHyQ5)-Gtu8O+ayD4+@2SNmL65E_^ji zlCM?MW-vU*5?s85S(E2|(Gb_wqmVDcn* zVQ)1GJre-mqlr$yt%|TCoxou`p$&Qx9Ay&M^#dVR5IEixBOw3)002ovPDHLkV1hNW Bm<|8{ delta 371 zcmV-(0gV2e1FHj&L4O!fOjJdBdV03Dwv?2V|NsA_q@+bfMJg&P0002&X#c+e000Pd zQchF<|NsC0|Nj8qgS}Y*000SaNLh0L01m?d01m?e$8V@)00039Nkl5(*h66CMG20$#n z=K45c{_uT2VHg?aw66dJ1@w3am;jP?N?nd&Yc11}UKNZrssL?J{d!9Z~!V36`=b^{7=7I;J!GcfQS z24TkI`72U@g1bFk977`9-%fMnV^*x^aAjQi-M+{%mV@ucmf3n0en!rAdtA)`t{RZ(GM^3K=Qx>pz0V#{dJO5XHI+M#;axd1pYU@Pl$oB_le3zB>-zjXMyfwn* z0>{jJCPjlD`JQfv=ts^o_G@$|Na>|NNV={g`|*#-gL_G&H0|Ud{?Tv4M6k~CayA#8@b22Z19F}xPUq=Rpjs4tz5?O(K(Ey(i z*Q%?J{d!9Z~!V36`=b^{7=7I;J!GcfQS z24TkI`72U@f}1>D977`9-(EY&$E;Y-!4eSg`hR`V!CNi?H`2aeI()|L=7h+&M<;{o zXY6P0C@Osa*5}L|&h~pfM_lJcT&UGwGxMyK|R;H z^5AOK-MKRPLRKl9RK z4%V{rF$|L&X4D(3YfSjBt#ZJ|nMdZ8Y{&Qh+D~8ef%=&l8rU4(=Vwfh5o!2+>K@Sj N44$rjF6*2UngCR|iVgq( literal 2226 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e(Ey(iSCbru0|yRNRaI@XJAlMRzopT&Dacu&%mUl zgk%5%1BN3}WJfupAut*OM1}xb&SF64GdZJYcM}B^qg9NJosb34`3x#)CPBywRGrgM zGyoN#6e++01YH4Ii2^KwP)z_j5=B787|oGP&Zq+Dd}Q~HvPVN;kcYt5Dv{<`<$1F} O&h&Kkb6Mw<&;$Tx894a> diff --git a/Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/l_arm.png b/Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/l_arm.png index a0e2c96fda69c62f14f2059328841d665d119a50..90352d9f23a6acda9805b9ac3565ee244d270949 100644 GIT binary patch delta 240 zcmZ24*uXSFqMn19fq`M}_Qp3rim^Dz-HBn{IhmJ04okYDuOkD)#(wTUiL5|APk>K| zYgJX%wr$&%ELj2+SS`G>1f;Gc$S?T+|NjgQS}VT*`J4qFk;M!Qe1}1p@p%4<6rf

U z$|rCzfT4$}_K4>T7{U|^gHMmK*mY_Qv$n($A!>VU|uhWff@y#nus e1|J9M4vC%~{mkxP65>Fc89ZJ6T-G@yGywnyR#e6S literal 2223 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|ep#Yx{S0H`hz=5i&s%_i0O_?$! zB_*XKVg6pAC}T;GUoeBivm0p)3>@B`E{-7{yo?SU`@aL_MgiSJKmlPR5)&cFU<79~ z8Nivy3}XctPZ_%cWrPAa3#J83tHA7FGQqBZ39bOfK+(^@Ku`gi`cdv^2#kgR4MM=! yBmlpu%7hd!5mewpzzV`95V8Wl7e-|VWeBYK%63_4<<3Ho<2+scT-G@yGywpp>L*kH diff --git a/Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/l_foot.png b/Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/l_foot.png index ce0d6b70b97897f44f9e7fa2e113199e11e43cda..7a40a74ec1c9b02344cc899ad7be4964b55deb96 100644 GIT binary patch delta 233 zcmdld_>*yhL_G&H0|Ud{?Tv4M6k~CayA#8@b22Z19F}xPUq=Rpjs4tz5?O(Ko&cW^ z*Q%3?EOEt^hndJz$B6F|KEF^x~*nd$HuULfkA|!fyuxjr8Qhx z>-Q0c$fqqUPK6)1_RpfsxFFu16{aHNK$Yx`yLOlR?9WSo(3m0pkn4wX!nI?`I@;URI>m8 literal 2238 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#Q>iWS0D`p2M!#ls;b(yZQGP7 zQh4RyRxq#*-%_6c`(0DuBz5GDbsSGz5lJ2$*`I xI(MlnTK+Z-U5TuMJv0^K|udS?83{1OVTnE=2$U diff --git a/Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/l_hand.png b/Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/l_hand.png index bc206249ea5d1c35816dc86d8d6a4733101afc24..ab5c98c5e497c782837e9f58102cf270b8914ced 100644 GIT binary patch delta 245 zcmdla*vd3PqMn19fq`M}_Qp3rim^Dz-HBn{IhmJ04okYDuOkD)#(wTUiL5|Ae}GSj zYgJX%wr$&%ELk#T$`qhjZ}7VuAjMh|;UN`ysO~QX#c*9H1 nJq$kH_FS(Wyc!s`aJtON6R^+gec8nBc-n=u)Hn(GVC7fx#RC2`G+JF+<^kIH-k! t38sPs6fMe_3Q*)3m{8TDN{;f#2!YIrtPy&fKQw~0db;|#taD0e0s!d1D2)IB diff --git a/Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/l_leg.png b/Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/l_leg.png index 34cafa2269d49d5ad060f0f194b237e76a10c64c..a3bc415fc05f3dd3212673473e70df447e63a26c 100644 GIT binary patch delta 210 zcmdld_=s_WL_G&H0|Ud{?Tv4M6k~CayA#8@b22Z19F}xPUq=Rpjs4tz5?O(Ko&cW^ z*Q%*6FMLih1M%G@HTG)z4*}Q$iB} Dt@ue+ literal 2238 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#Q>iWS0D`p2M!#ls;b(yZQGP7 zQr5)Z;OLs1Zhsldb-Ne?y?j8RMo#$p1B0uxLH1l@q-f>GvZ2#kgR zwL-wu8Py~cSG3$ovI0{K6OeO1&^E460#K| zYgJX%wr$&%ELj2+SS`G>1f;Gc$S?T+|NjgQS}VT*`J4qFk;M!Qe1}1p@p%4<6rfaJU9e`2YX;G#BPsYQ@B`E{-7{yo?SU`@aL_MgcuTKmnU&NPlOt30Yf!o0ZXCdilU_b~XSU41*2#<0`Ltr!ns1^dO&c^u7 zVs*xzf8n}VofY70tPEBcLJA0)Ku7^rdq)L_TnL;KVtqWZ{_iZ1!#!R7T-G@yGywp# CTP9=x diff --git a/Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/r_foot.png b/Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/r_foot.png index d39a9244c05764d409e152f9f7d88ad174c40173..d5e1985ef5986ec27bbd3ffb5736c158d63fe317 100644 GIT binary patch delta 239 zcmdld_@8ltL_G&H0|Ud{?Tv4M6k~CayA#8@b22Z19F}xPUq=Rpjs4tz5?O(Ko&cW^ z*Q%-a<97a{D|SZSjWb&fPq1Tp@GSQQ7|%F zUn|+JbdB<6JI1M&|I2KCXXWp)d4Bv_ybcpX00RRTg9D?*h4%k8yYydjCH&^w!&M&6 h!JP9W`uf{zX3o|6(T}?t?SK|Dc)I$ztaD0e0syueR8s%| literal 2238 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#Q>iWS0H`lXZ?W#2db*7rc9Z# zZQHgbOP090y4u^@YiVhvq@)O>7*zumF_r}R1v5B2yOGAgz~Sxb;uzw=%jm$d|2t4_ z6pV(zXb2455HLEGm;QU171*5Fd5Eu=CAsYhB zu3o5aU+Rp?XLfNZKo*(hf~J6L)hbj4t5!kPEAQlayfvvI55)C!^>bP0l+XkKs9Q1j diff --git a/Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/r_hand.png b/Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/r_hand.png index 8f292ffe0d2b00cd9b6a620766c7640e7989ddc2..0d5957e191fa210d03e54a60d2d4dc9f21f102ae 100644 GIT binary patch delta 247 zcmdla*v>RTqMn19fq`M}_Qp3rim^Dz-HBn{IhmJ04okYDuOkD)#(wTUiL5|Ae}GSj zYgJX%wr$&%ELk#T$`qhjZ}7VuAjMh|yw}CA@?Vp?QOKxlJG6_be4hF_Ak_v0z zM*rKuyk-Bo%OV#J@qXc*@#Z{#yLNIW3x@&|ivT0ji~NTFuho{`S2BneTK7+e>p+QT p#Qg=^RBW!QJF##qa6a&cEn~HPp2=&0-$2V5JYD@<);T3K0RT?;S>gZy literal 2226 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e(Ey(i*Hi|E0|yRNRaI@FK1!M^rTN#x6AwUVnK%towP`IO<(GVC7fx#F8De$Zgb{!jr w8&gbBgji5`AWn)CiV&s=Yzim}MmaPH0b_BN%XgZcSAmT7boFyt=akR{0Nej3m;e9( diff --git a/Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/r_leg.png b/Resources/Textures/DeltaV/Mobs/Species/Feroxi/parts.rsi/r_leg.png index e761dd9250c38819546820ab15338bbc1270bf2b..a17d4299060b2728e4f4d9dd80b9d3e85da36abd 100644 GIT binary patch delta 210 zcmdld_=s_WL_G&H0|Ud{?Tv4M6k~CayA#8@b22Z19F}xPUq=Rpjs4tz5?O(Ko&cW^ z*Q%iWS0H`lXZ?W#2db*7rc9Z# zZQHgbOP090y4u^@YiVhvq@)O>7*zumF_r}R1v5B2yOGAgz~Sxb;uzw=%jm$d|2t4_ z6pV(z$P58yR|9m9n>r(lFuP$WFhf;filG3_1ZNBd#;7J>af2~QZa`K%${r1Y(GZ|o z2r#<_qnd@9xfvLUP=J!#85l53a9MzAg$bGlW>+)?7$y)>fNDN Date: Sun, 20 Oct 2024 17:29:24 +1100 Subject: [PATCH 26/55] Minor edit --- .../tail_markings.rsi/feroxi-dorsal-tip.png | Bin 207 -> 208 bytes .../Feroxi/tail_markings.rsi/feroxi-dorsal.png | Bin 273 -> 274 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-dorsal-tip.png b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-dorsal-tip.png index 0a6bc46fff7821a727ec5c6e0bc9c1a93df04cea..6f4cea1fdcf43f1ce4a6927c4edd11fb298b16c1 100644 GIT binary patch delta 109 zcmX@lc!6<(C*L6k2EId#q8eTe3=9mZ6T?+QwwD1}2ma@*UKX5f>!oRUtm9hLEz7u> z-VwS$2@v>jVbA{W_b%Uikp6AAd{gaJ@6XK2tIynIWMKH=cZBoOJ4w}c%E^BC*NTP2EN0L$MaXDFfcHrObk~IzAg`B{kgC$&1&nl#Z!cmdotE8-TQdz z&z7xBKnW1AG3Msj`+bXQ%gn#)TsE$+%nS?IbZU+)14F}mmpNXaBvq~Et~v`+=;`X` Jvd$@?2>|$QDq{cu diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-dorsal.png b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-dorsal.png index 866e58f9782886fdd1f2a5758ee4502486ab2cc5..6f44074629e3ca47f7004756a971157f6ed6ba3e 100644 GIT binary patch delta 165 zcmV;W09yZ%0+Irdb$`MD01m}2Pm^NY;CUEX&zQ6?o8fEUle>4n8tZR1OFCOt>003wJ%7DlL?^QpG TrtOtK00000NkvXXu0mjf_^Cs~ delta 164 zcmV;V09*f(0+9lcb$`PE01m?e$8V@)0001bNkl2t`pr{{Nd>5(QIY zB4ujx?!+J`jZ1A(3;+P_dq6m!1c+%&vnHzgI9JIU=44}?qI*47Ez`dXO0v8Nul(_?csTh!0*X+Ds;vLHX0MG!G0g($(Xg`xc S1?<)U0000 Date: Thu, 21 Nov 2024 13:18:21 +1100 Subject: [PATCH 27/55] pushing this before starting miniproject --- .../Mobs/Customization/Feroxi/body_markings.rsi/meta.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/body_markings.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/body_markings.rsi/meta.json index c1d43fffad2..6d062fdc990 100644 --- a/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/body_markings.rsi/meta.json +++ b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/body_markings.rsi/meta.json @@ -16,6 +16,10 @@ { "name": "feroxi-leg-stripes-blitz", "directions": 4 + }, + { + "name": "feroxi-torso-countershade", + "directions": 4 } ] } From 554a427f54d195798b5b54428ddc4b20f053648c Mon Sep 17 00:00:00 2001 From: Blitz <73762869+BlitzTheSquishy@users.noreply.github.com> Date: Thu, 21 Nov 2024 21:34:17 +1100 Subject: [PATCH 28/55] end of file line Signed-off-by: Blitz <73762869+BlitzTheSquishy@users.noreply.github.com> --- Resources/Locale/en-US/deltav/chat/managers/chat_manager.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/deltav/chat/managers/chat_manager.ftl b/Resources/Locale/en-US/deltav/chat/managers/chat_manager.ftl index 91c2a288965..9392676a2b7 100644 --- a/Resources/Locale/en-US/deltav/chat/managers/chat_manager.ftl +++ b/Resources/Locale/en-US/deltav/chat/managers/chat_manager.ftl @@ -26,4 +26,4 @@ chat-speech-verb-name-feroxi = Feroxi chat-speech-verb-feroxi-1 = blubs chat-speech-verb-feroxi-2 = swishes chat-speech-verb-feroxi-3 = gnashes -chat-speech-verb-feroxi-4 = growls \ No newline at end of file +chat-speech-verb-feroxi-4 = growls From 647990d6e3b32c971d2885add83ecdfe813c1f1c Mon Sep 17 00:00:00 2001 From: Blitz <73762869+BlitzTheSquishy@users.noreply.github.com> Date: Thu, 21 Nov 2024 21:39:20 +1100 Subject: [PATCH 29/55] untouch Signed-off-by: Blitz <73762869+BlitzTheSquishy@users.noreply.github.com> --- Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml b/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml index 5f800bf429d..4b4aae299a0 100644 --- a/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml +++ b/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml @@ -190,7 +190,7 @@ collection: Whistles Weh: collection: Weh - Squeak: + Squeak: path: /Audio/Animals/mouse_squeak.ogg - type: emoteSounds @@ -220,7 +220,7 @@ collection: Whistles Weh: collection: Weh - Squeak: + Squeak: path: /Audio/Animals/mouse_squeak.ogg - type: emoteSounds From 3e5820302d21af0148aeb6798166e427ddce0dbb Mon Sep 17 00:00:00 2001 From: Blitz <73762869+BlitzTheSquishy@users.noreply.github.com> Date: Thu, 21 Nov 2024 21:40:54 +1100 Subject: [PATCH 30/55] cleanup Signed-off-by: Blitz <73762869+BlitzTheSquishy@users.noreply.github.com> --- Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml index 6c00681e955..97a1954f3da 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml @@ -447,7 +447,7 @@ effects: - !type:SatiateThirst factor: 4 - Gas: # DV - Feroxi get to breathe with this too! + Gas: # Delta-V - Feroxi get to breathe with this too! effects: - !type:Oxygenate conditions: From 82c043581de5564376ecb8fe94934a85e0e745b9 Mon Sep 17 00:00:00 2001 From: Blitz <73762869+BlitzTheSquishy@users.noreply.github.com> Date: Thu, 21 Nov 2024 21:41:53 +1100 Subject: [PATCH 31/55] cleanup Signed-off-by: Blitz <73762869+BlitzTheSquishy@users.noreply.github.com> --- Resources/Prototypes/Reagents/gases.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Reagents/gases.yml b/Resources/Prototypes/Reagents/gases.yml index 3aac521bde3..cba9a50ab58 100644 --- a/Resources/Prototypes/Reagents/gases.yml +++ b/Resources/Prototypes/Reagents/gases.yml @@ -26,10 +26,10 @@ conditions: - !type:OrganType type: Plant - - !type:Oxygenate + - !type:Oxygenate # Delta-V - Feroxi Still need to breathe conditions: - !type:OrganType - type: Aquatic # DV - Feroxi Still need to breathe + type: Aquatic # Convert Oxygen into CO2. - !type:ModifyLungGas conditions: From 867b2c07bca2839f2a65f9f2d11e113d4b761c3b Mon Sep 17 00:00:00 2001 From: Blitz <73762869+BlitzTheSquishy@users.noreply.github.com> Date: Thu, 21 Nov 2024 21:42:28 +1100 Subject: [PATCH 32/55] cleanup Signed-off-by: Blitz <73762869+BlitzTheSquishy@users.noreply.github.com> --- Resources/Prototypes/Reagents/medicine.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml index d6f9080bbf5..c55fb5275ac 100644 --- a/Resources/Prototypes/Reagents/medicine.yml +++ b/Resources/Prototypes/Reagents/medicine.yml @@ -664,7 +664,7 @@ Drink: effects: - !type:SatiateThirst - conditions: + conditions: # Delta-V nerf of saline for Feroxi - !type:OrganType type: Aquatic shouldHave: false From ffd86cc36802d894832baf3d0c8c0e1c3b7d79e6 Mon Sep 17 00:00:00 2001 From: Blitz <73762869+BlitzTheSquishy@users.noreply.github.com> Date: Thu, 21 Nov 2024 21:47:39 +1100 Subject: [PATCH 33/55] spaces Signed-off-by: Blitz <73762869+BlitzTheSquishy@users.noreply.github.com> --- .../Mobs/Customization/Markings/feroxi.yml | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/feroxi.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/feroxi.yml index 338cf731c7b..b626add4896 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/feroxi.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/feroxi.yml @@ -3,7 +3,7 @@ id: FeroxiEars bodyPart: HeadTop markingCategory: HeadTop - speciesRestriction: [Feroxi] + speciesRestriction: [ Feroxi ] sprites: - sprite: DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi state: feroxi-ears @@ -14,7 +14,7 @@ id: FeroxiTailAndDorsal bodyPart: Tail markingCategory: Tail - speciesRestriction: [Feroxi] + speciesRestriction: [ Feroxi ] sprites: - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi state: feroxi-tail @@ -25,7 +25,7 @@ id: FeroxiSnout bodyPart: Snout markingCategory: Snout - speciesRestriction: [Feroxi] + speciesRestriction: [ Feroxi ] sprites: - sprite: DeltaV/Mobs/Customization/Feroxi/snout_markings.rsi state: feroxi-snout @@ -35,7 +35,7 @@ id: FeroxiEarsTips bodyPart: HeadTop markingCategory: HeadTop - speciesRestriction: [Feroxi] + speciesRestriction: [ Feroxi ] sprites: - sprite: DeltaV/Mobs/Customization/Feroxi/ear_markings.rsi state: feroxi-ears @@ -49,7 +49,7 @@ id: FeroxiSnoutStripe bodyPart: Snout markingCategory: Snout - speciesRestriction: [Feroxi] + speciesRestriction: [ Feroxi ] sprites: - sprite: DeltaV/Mobs/Customization/Feroxi/snout_markings.rsi state: feroxi-snout @@ -61,7 +61,7 @@ id: FeroxiTail bodyPart: Tail markingCategory: Tail - speciesRestriction: [Feroxi] + speciesRestriction: [ Feroxi ] sprites: - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi state: feroxi-tail @@ -70,7 +70,7 @@ id: FeroxiStripedTail bodyPart: Tail markingCategory: Tail - speciesRestriction: [Feroxi] + speciesRestriction: [ Feroxi ] sprites: - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi state: feroxi-tail @@ -81,7 +81,7 @@ id: FeroxiStripedTailAndDorsal bodyPart: Tail markingCategory: Tail - speciesRestriction: [Feroxi] + speciesRestriction: [ Feroxi ] sprites: - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi state: feroxi-tail @@ -96,7 +96,7 @@ id: FeroxiTipTail bodyPart: Tail markingCategory: Tail - speciesRestriction: [Feroxi] + speciesRestriction: [ Feroxi ] sprites: - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi state: feroxi-tail @@ -111,7 +111,7 @@ id: FeroxiTipTailAndDorsal bodyPart: Tail markingCategory: Tail - speciesRestriction: [Feroxi] + speciesRestriction: [ Feroxi ] sprites: - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi state: feroxi-tail @@ -130,7 +130,7 @@ id: FeroxiTailBlitz bodyPart: Tail markingCategory: Tail - speciesRestriction: [Feroxi] + speciesRestriction: [ Feroxi ] sprites: - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi state: feroxi-tail @@ -151,7 +151,7 @@ id: FeroxiTailBlitzNoDorsal bodyPart: Tail markingCategory: Tail - speciesRestriction: [Feroxi] + speciesRestriction: [ Feroxi ] sprites: - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi state: feroxi-tail @@ -168,7 +168,7 @@ id: FeroxiTwoToneTail bodyPart: Tail markingCategory: Tail - speciesRestriction: [Feroxi] + speciesRestriction: [ Feroxi ] sprites: - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi state: feroxi-tail @@ -179,7 +179,7 @@ id: FeroxiTwoToneTailAndDorsal bodyPart: Tail markingCategory: Tail - speciesRestriction: [Feroxi] + speciesRestriction: [ Feroxi ] sprites: - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi state: feroxi-tail @@ -192,7 +192,7 @@ id: FeroxiStripeTwoToneTail bodyPart: Tail markingCategory: Tail - speciesRestriction: [Feroxi] + speciesRestriction: [ Feroxi ] sprites: - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi state: feroxi-tail @@ -205,7 +205,7 @@ id: FeroxiStripeTwoToneTailAndDorsal bodyPart: Tail markingCategory: Tail - speciesRestriction: [Feroxi] + speciesRestriction: [ Feroxi ] sprites: - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi state: feroxi-tail @@ -222,7 +222,7 @@ id: FeroxiTipTwoToneTail bodyPart: Tail markingCategory: Tail - speciesRestriction: [Feroxi] + speciesRestriction: [ Feroxi ] sprites: - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi state: feroxi-tail @@ -239,7 +239,7 @@ id: FeroxiTipTwoToneTailAndDorsal bodyPart: Tail markingCategory: Tail - speciesRestriction: [Feroxi] + speciesRestriction: [ Feroxi ] sprites: - sprite: DeltaV/Mobs/Customization/Feroxi/tail_markings.rsi state: feroxi-tail @@ -261,7 +261,7 @@ id: FeroxiTorsoStripesBlitz bodyPart: Chest markingCategory: Chest - speciesRestriction: [Feroxi] + speciesRestriction: [ Feroxi ] sprites: - sprite: DeltaV/Mobs/Customization/Feroxi/body_markings.rsi state: feroxi-torso-stripes-blitz @@ -271,7 +271,7 @@ id: FeroxiLegStripesBlitz bodyPart: LLeg markingCategory: Legs - speciesRestriction: [Feroxi] + speciesRestriction: [ Feroxi ] sprites: - sprite: DeltaV/Mobs/Customization/Feroxi/body_markings.rsi state: feroxi-leg-stripes-blitz @@ -281,7 +281,7 @@ id: FeroxiArmStripesBlitz bodyPart: LArm markingCategory: Arms - speciesRestriction: [Feroxi] + speciesRestriction: [ Feroxi ] sprites: - sprite: DeltaV/Mobs/Customization/Feroxi/body_markings.rsi state: feroxi-arm-stripes-blitz From 635b3ef24c8b85077b0894f941af2f9dc23ac2e2 Mon Sep 17 00:00:00 2001 From: Blitz <73762869+BlitzTheSquishy@users.noreply.github.com> Date: Thu, 21 Nov 2024 21:49:50 +1100 Subject: [PATCH 34/55] whatever milon is yapping about Signed-off-by: Blitz <73762869+BlitzTheSquishy@users.noreply.github.com> --- Content.Server/DeltaV/Feroxi/FeroxiDehydrateSystem.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content.Server/DeltaV/Feroxi/FeroxiDehydrateSystem.cs b/Content.Server/DeltaV/Feroxi/FeroxiDehydrateSystem.cs index 47fad692d32..1933db0a681 100644 --- a/Content.Server/DeltaV/Feroxi/FeroxiDehydrateSystem.cs +++ b/Content.Server/DeltaV/Feroxi/FeroxiDehydrateSystem.cs @@ -6,9 +6,9 @@ namespace Content.Server.DeltaV.Feroxi; public sealed class FeroxiDehydrateSystem : EntitySystem { - [Dependency] private readonly BodySystem _bodySystem = default!; + [Dependency] private readonly BodySystem _body = default!; - private const float DehydrationThreshold = 150f; + private const float DehydrationThreshold; public override void Update(float frameTime) { From b1e41166bf3d5232fb141b30fc4a059451dc260c Mon Sep 17 00:00:00 2001 From: BlitzTheSquishy <73762869+BlitzTheSquishy@users.noreply.github.com> Date: Thu, 21 Nov 2024 21:57:29 +1100 Subject: [PATCH 35/55] pain --- Content.Server/DeltaV/Feroxi/FeroxiDehydrateComponent.cs | 5 ++++- Content.Server/DeltaV/Feroxi/FeroxiDehydrateSystem.cs | 4 +--- Resources/Prototypes/DeltaV/Entities/Mobs/Species/feroxi.yml | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Content.Server/DeltaV/Feroxi/FeroxiDehydrateComponent.cs b/Content.Server/DeltaV/Feroxi/FeroxiDehydrateComponent.cs index 9a5b37fb914..7cbf618d710 100644 --- a/Content.Server/DeltaV/Feroxi/FeroxiDehydrateComponent.cs +++ b/Content.Server/DeltaV/Feroxi/FeroxiDehydrateComponent.cs @@ -13,5 +13,8 @@ public sealed partial class FeroxiDehydrateComponent : Component public ProtoId DehydratedMetabolizer = "AquaticDehydrated"; [DataField] - public bool Dehydrated = false; + public bool Dehydrated; + + [DataField] + public float DehydrationThreshold; } diff --git a/Content.Server/DeltaV/Feroxi/FeroxiDehydrateSystem.cs b/Content.Server/DeltaV/Feroxi/FeroxiDehydrateSystem.cs index 47fad692d32..a4b4884e821 100644 --- a/Content.Server/DeltaV/Feroxi/FeroxiDehydrateSystem.cs +++ b/Content.Server/DeltaV/Feroxi/FeroxiDehydrateSystem.cs @@ -8,8 +8,6 @@ public sealed class FeroxiDehydrateSystem : EntitySystem { [Dependency] private readonly BodySystem _bodySystem = default!; - private const float DehydrationThreshold = 150f; - public override void Update(float frameTime) { var query = EntityQueryEnumerator(); @@ -17,7 +15,7 @@ public override void Update(float frameTime) while (query.MoveNext(out var uid, out var feroxiDehydrate, out var thirst)) { var currentThirst = thirst.CurrentThirst; - var shouldBeDehydrated = currentThirst <= DehydrationThreshold; + var shouldBeDehydrated = currentThirst <= feroxiDehydrate.DehydrationThreshold; if (feroxiDehydrate.Dehydrated != shouldBeDehydrated) { diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/feroxi.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/feroxi.yml index eb4ed3dbd12..fdf5cf95597 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/feroxi.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/feroxi.yml @@ -92,6 +92,7 @@ - type: TypingIndicator proto: feroxi - type: FeroxiDehydrate + dehydrationThreshold: 150 - type: entity save: false From c01843280c9bc27748f15ddec86be5e090690ecc Mon Sep 17 00:00:00 2001 From: Blitz <73762869+BlitzTheSquishy@users.noreply.github.com> Date: Thu, 21 Nov 2024 22:12:46 +1100 Subject: [PATCH 36/55] Update speech_verbs.yml Signed-off-by: Blitz <73762869+BlitzTheSquishy@users.noreply.github.com> --- Resources/Prototypes/DeltaV/Voice/speech_verbs.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Voice/speech_verbs.yml b/Resources/Prototypes/DeltaV/Voice/speech_verbs.yml index 65ea332f27d..7f9b781122c 100644 --- a/Resources/Prototypes/DeltaV/Voice/speech_verbs.yml +++ b/Resources/Prototypes/DeltaV/Voice/speech_verbs.yml @@ -41,4 +41,5 @@ - chat-speech-verb-feroxi-1 - chat-speech-verb-feroxi-2 - chat-speech-verb-feroxi-3 - - chat-speech-verb-feroxi-4 \ No newline at end of file + - chat-speech-verb-feroxi-4 + From a5a0fa29ee77ee8bfea82e1f64d77acdd1af358a Mon Sep 17 00:00:00 2001 From: BlitzTheSquishy <73762869+BlitzTheSquishy@users.noreply.github.com> Date: Thu, 21 Nov 2024 22:19:09 +1100 Subject: [PATCH 37/55] cleaning --- .../Prototypes/DeltaV/Body/Organs/feroxi.yml | 4 +- .../Prototypes/DeltaV/Body/Parts/feroxi.yml | 44 +++++++++---------- .../DeltaV/Entities/Mobs/Species/feroxi.yml | 8 ++-- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Body/Organs/feroxi.yml b/Resources/Prototypes/DeltaV/Body/Organs/feroxi.yml index 85ef23d1ae4..23606224b21 100644 --- a/Resources/Prototypes/DeltaV/Body/Organs/feroxi.yml +++ b/Resources/Prototypes/DeltaV/Body/Organs/feroxi.yml @@ -1,6 +1,6 @@ - type: entity - id: OrganFeroxiStomach parent: OrganAnimalStomach + id: OrganFeroxiStomach categories: [ HideSpawnMenu ] components: - type: Stomach @@ -22,8 +22,8 @@ Quantity: 5 - type: entity - id: OrganFeroxiLungs parent: BaseHumanOrgan + id: OrganFeroxiLungs name: Aquatic Lungs description: "A pair of amphibious lungs, filtering oxygen out of the air continuously." components: diff --git a/Resources/Prototypes/DeltaV/Body/Parts/feroxi.yml b/Resources/Prototypes/DeltaV/Body/Parts/feroxi.yml index 5c449d363e6..554df45cc3d 100644 --- a/Resources/Prototypes/DeltaV/Body/Parts/feroxi.yml +++ b/Resources/Prototypes/DeltaV/Body/Parts/feroxi.yml @@ -1,9 +1,9 @@ # TODO: Add descriptions (many) # TODO BODY: Part damage - type: entity - id: PartFeroxi parent: [BaseItem, BasePart] - name: "feroxi body part" + id: PartFeroxi + name: feroxi body part abstract: true components: - type: Extractable @@ -15,9 +15,9 @@ Quantity: 10 - type: entity - id: TorsoFeroxi - name: "feroxi torso" parent: [PartFeroxi, BaseTorso] + id: TorsoFeroxi + name: feroxi torso components: - type: Sprite sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi @@ -31,9 +31,9 @@ Quantity: 20 - type: entity - id: HeadFeroxi - name: "feroxi head" parent: [PartFeroxi, BaseHead] + id: HeadFeroxi + name: feroxi head components: - type: Sprite sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi @@ -47,72 +47,72 @@ Quantity: 10 - type: entity - id: LeftArmFeroxi - name: "left feroxi arm" parent: [PartFeroxi, BaseLeftArm] + id: LeftArmFeroxi + name: left feroxi arm components: - type: Sprite sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi state: "l_arm" - type: entity - id: RightArmFeroxi - name: "right feroxi arm" parent: [PartFeroxi, BaseRightArm] + id: RightArmFeroxi + name: right feroxi arm components: - type: Sprite sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi state: "r_arm" - type: entity - id: LeftHandFeroxi - name: "left feroxi hand" parent: [PartFeroxi, BaseLeftHand] + id: LeftHandFeroxi + name: left feroxi hand components: - type: Sprite sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi state: "l_hand" - type: entity - id: RightHandFeroxi - name: "right feroxi hand" parent: [PartFeroxi, BaseRightHand] + id: RightHandFeroxi + name: right feroxi hand components: - type: Sprite sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi state: "r_hand" - type: entity - id: LeftLegFeroxi - name: "left feroxi leg" parent: [PartFeroxi, BaseLeftLeg] + id: LeftLegFeroxi + name: left feroxi leg components: - type: Sprite sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi state: "l_leg" - type: entity - id: RightLegFeroxi - name: "right feroxi leg" parent: [PartFeroxi, BaseRightLeg] + id: RightLegFeroxi + name: right feroxi leg components: - type: Sprite sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi state: "r_leg" - type: entity - id: LeftFootFeroxi - name: "left feroxi foot" parent: [PartFeroxi, BaseLeftFoot] + id: LeftFootFeroxi + name: left feroxi foot components: - type: Sprite sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi state: "l_foot" - type: entity - id: RightFootFeroxi - name: "right feroxi foot" parent: [PartFeroxi, BaseRightFoot] + id: RightFootFeroxi + name: right feroxi foot components: - type: Sprite sprite: DeltaV/Mobs/Species/Feroxi/parts.rsi diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/feroxi.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/feroxi.yml index fdf5cf95597..ba03775400e 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/feroxi.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/feroxi.yml @@ -1,8 +1,8 @@ - type: entity - save: false - name: Urist McFin parent: BaseMobSpeciesOrganic id: BaseMobFeroxi + name: Urist McFin + save: false abstract: true components: - type: HumanoidAppearance @@ -95,10 +95,10 @@ dehydrationThreshold: 150 - type: entity - save: false - name: Feroxi Dummy parent: MobHumanDummy id: MobFeroxiDummy + name: Feroxi Dummy + save: false categories: [ HideSpawnMenu ] description: A dummy feroxi meant to be used in character setup. components: From b5cfa6d61b96e85765d7f6f74fd7eace3e1ae4e8 Mon Sep 17 00:00:00 2001 From: BlitzTheSquishy <73762869+BlitzTheSquishy@users.noreply.github.com> Date: Fri, 22 Nov 2024 08:00:18 +1100 Subject: [PATCH 38/55] Cleanup --- Content.Server/DeltaV/Feroxi/FeroxiDehydrateSystem.cs | 9 +++++---- Resources/Prototypes/DeltaV/typing_indicator.yml | 1 - Resources/Prototypes/Reagents/medicine.yml | 1 - 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Content.Server/DeltaV/Feroxi/FeroxiDehydrateSystem.cs b/Content.Server/DeltaV/Feroxi/FeroxiDehydrateSystem.cs index c73704674b9..18bdc3f676c 100644 --- a/Content.Server/DeltaV/Feroxi/FeroxiDehydrateSystem.cs +++ b/Content.Server/DeltaV/Feroxi/FeroxiDehydrateSystem.cs @@ -30,12 +30,13 @@ private void UpdateDehydrationStatus(EntityUid uid, FeroxiDehydrateComponent fer foreach (var entity in _body.GetBodyOrganEntityComps(uid)) { - if (TryComp(entity, out var metabolizer)) + if (!TryComp(entity, out var metabolizer) || metabolizer.MetabolizerTypes == null) { - var newMetabolizer = shouldBeDehydrated ? feroxiDehydrate.DehydratedMetabolizer : feroxiDehydrate.HydratedMetabolizer; - metabolizer.MetabolizerTypes!.Clear(); - metabolizer.MetabolizerTypes.Add(newMetabolizer); + continue; } + var newMetabolizer = shouldBeDehydrated ? feroxiDehydrate.DehydratedMetabolizer : feroxiDehydrate.HydratedMetabolizer; + metabolizer.MetabolizerTypes!.Clear(); + metabolizer.MetabolizerTypes.Add(newMetabolizer); } } } diff --git a/Resources/Prototypes/DeltaV/typing_indicator.yml b/Resources/Prototypes/DeltaV/typing_indicator.yml index ad97915e8fb..84958c11c37 100644 --- a/Resources/Prototypes/DeltaV/typing_indicator.yml +++ b/Resources/Prototypes/DeltaV/typing_indicator.yml @@ -14,4 +14,3 @@ id: feroxi spritePath: /Textures/DeltaV/Effects/speech.rsi typingState: feroxi0 - diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml index c55fb5275ac..c6468cce0a5 100644 --- a/Resources/Prototypes/Reagents/medicine.yml +++ b/Resources/Prototypes/Reagents/medicine.yml @@ -677,7 +677,6 @@ - !type:ModifyBloodLevel amount: 6 - - type: reagent id: Siderlac name: reagent-name-siderlac From e762e4db9758790b6137407d9ee39f39a0cb59f3 Mon Sep 17 00:00:00 2001 From: BlitzTheSquishy <73762869+BlitzTheSquishy@users.noreply.github.com> Date: Fri, 22 Nov 2024 08:05:19 +1100 Subject: [PATCH 39/55] fix --- Resources/Prototypes/DeltaV/typing_indicator.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/typing_indicator.yml b/Resources/Prototypes/DeltaV/typing_indicator.yml index 84958c11c37..6323c844f76 100644 --- a/Resources/Prototypes/DeltaV/typing_indicator.yml +++ b/Resources/Prototypes/DeltaV/typing_indicator.yml @@ -1,4 +1,4 @@ -- type: typingIndicator +- type: typingIndicator id: felinid spritePath: /Textures/DeltaV/Effects/speech.rsi typingState: felinid0 From 61d29e817538a91086fe4c5e6355436b3825a754 Mon Sep 17 00:00:00 2001 From: Blitz <73762869+BlitzTheSquishy@users.noreply.github.com> Date: Fri, 22 Nov 2024 08:10:37 +1100 Subject: [PATCH 40/55] Update medicine.yml Signed-off-by: Blitz <73762869+BlitzTheSquishy@users.noreply.github.com> --- Resources/Prototypes/Reagents/medicine.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml index c6468cce0a5..f34965279ca 100644 --- a/Resources/Prototypes/Reagents/medicine.yml +++ b/Resources/Prototypes/Reagents/medicine.yml @@ -1141,7 +1141,7 @@ conditions: - !type:ReagentThreshold min: 12 - + - type: reagent id: Opporozidone #Name based of an altered version of the startreck chem "Opporozine" name: reagent-name-opporozidone From a775f2354cc12f02683b3080595c71fe90380050 Mon Sep 17 00:00:00 2001 From: BlitzTheSquishy <73762869+BlitzTheSquishy@users.noreply.github.com> Date: Fri, 22 Nov 2024 08:19:48 +1100 Subject: [PATCH 41/55] AAAA --- .../Feroxi/body_markings.rsi/meta.json | 4 -- .../Feroxi/masking_helpers.rsi/meta.json | 42 ------------------- 2 files changed, 46 deletions(-) diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/body_markings.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/body_markings.rsi/meta.json index 6d062fdc990..c1d43fffad2 100644 --- a/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/body_markings.rsi/meta.json +++ b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/body_markings.rsi/meta.json @@ -16,10 +16,6 @@ { "name": "feroxi-leg-stripes-blitz", "directions": 4 - }, - { - "name": "feroxi-torso-countershade", - "directions": 4 } ] } diff --git a/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/masking_helpers.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/masking_helpers.rsi/meta.json index 25e9aa3002d..619e5774b8f 100644 --- a/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/masking_helpers.rsi/meta.json +++ b/Resources/Textures/DeltaV/Mobs/Customization/Feroxi/masking_helpers.rsi/meta.json @@ -7,56 +7,14 @@ }, "states": [ { - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ], "directions": 4, "name": "female_none" }, { - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ], "directions": 4, "name": "female_full" }, { - "delays": [ - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ], - [ - 1.0 - ] - ], "directions": 4, "name": "female_top" }, From 572f1d454dd30baeaf5cb94d944ccdb7a7b86f32 Mon Sep 17 00:00:00 2001 From: BlitzTheSquishy <73762869+BlitzTheSquishy@users.noreply.github.com> Date: Fri, 22 Nov 2024 08:23:46 +1100 Subject: [PATCH 42/55] a --- .../Prototypes/DeltaV/Body/Parts/feroxi.yml | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Body/Parts/feroxi.yml b/Resources/Prototypes/DeltaV/Body/Parts/feroxi.yml index 554df45cc3d..21c7b5b4bf1 100644 --- a/Resources/Prototypes/DeltaV/Body/Parts/feroxi.yml +++ b/Resources/Prototypes/DeltaV/Body/Parts/feroxi.yml @@ -1,7 +1,7 @@ # TODO: Add descriptions (many) # TODO BODY: Part damage - type: entity - parent: [BaseItem, BasePart] + parent: [ BasePart ] id: PartFeroxi name: feroxi body part abstract: true @@ -15,7 +15,7 @@ Quantity: 10 - type: entity - parent: [PartFeroxi, BaseTorso] + parent: [ PartFeroxi, BaseTorso ] id: TorsoFeroxi name: feroxi torso components: @@ -31,7 +31,7 @@ Quantity: 20 - type: entity - parent: [PartFeroxi, BaseHead] + parent: [ PartFeroxi, BaseHead ] id: HeadFeroxi name: feroxi head components: @@ -47,7 +47,7 @@ Quantity: 10 - type: entity - parent: [PartFeroxi, BaseLeftArm] + parent: [ PartFeroxi, BaseLeftArm ] id: LeftArmFeroxi name: left feroxi arm components: @@ -56,7 +56,7 @@ state: "l_arm" - type: entity - parent: [PartFeroxi, BaseRightArm] + parent: [ PartFeroxi, BaseRightArm ] id: RightArmFeroxi name: right feroxi arm components: @@ -65,7 +65,7 @@ state: "r_arm" - type: entity - parent: [PartFeroxi, BaseLeftHand] + parent: [ PartFeroxi, BaseLeftHand ] id: LeftHandFeroxi name: left feroxi hand components: @@ -74,7 +74,7 @@ state: "l_hand" - type: entity - parent: [PartFeroxi, BaseRightHand] + parent: [ PartFeroxi, BaseRightHand ] id: RightHandFeroxi name: right feroxi hand components: @@ -83,7 +83,7 @@ state: "r_hand" - type: entity - parent: [PartFeroxi, BaseLeftLeg] + parent: [ PartFeroxi, BaseLeftLeg ] id: LeftLegFeroxi name: left feroxi leg components: @@ -92,7 +92,7 @@ state: "l_leg" - type: entity - parent: [PartFeroxi, BaseRightLeg] + parent: [ PartFeroxi, BaseRightLeg ] id: RightLegFeroxi name: right feroxi leg components: @@ -101,7 +101,7 @@ state: "r_leg" - type: entity - parent: [PartFeroxi, BaseLeftFoot] + parent: [ PartFeroxi, BaseLeftFoot ] id: LeftFootFeroxi name: left feroxi foot components: @@ -110,7 +110,7 @@ state: "l_foot" - type: entity - parent: [PartFeroxi, BaseRightFoot] + parent: [ PartFeroxi, BaseRightFoot ] id: RightFootFeroxi name: right feroxi foot components: From 22ff19b05b0b677e73100241b09f3f2f924fad74 Mon Sep 17 00:00:00 2001 From: BlitzTheSquishy <73762869+BlitzTheSquishy@users.noreply.github.com> Date: Fri, 22 Nov 2024 08:46:42 +1100 Subject: [PATCH 43/55] ow --- Resources/Prototypes/Reagents/medicine.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml index f34965279ca..21640c7aebe 100644 --- a/Resources/Prototypes/Reagents/medicine.yml +++ b/Resources/Prototypes/Reagents/medicine.yml @@ -664,16 +664,7 @@ Drink: effects: - !type:SatiateThirst - conditions: # Delta-V nerf of saline for Feroxi - - !type:OrganType - type: Aquatic - shouldHave: false factor: 6 - - !type:SatiateThirst # Delta-V nerf of saline for Feroxi - conditions: - - !type:OrganType - type: Aquatic - factor: 2 - !type:ModifyBloodLevel amount: 6 From 3ee7032143dd5d32d91655da1e7a7f4fbf72359e Mon Sep 17 00:00:00 2001 From: BlitzTheSquishy <73762869+BlitzTheSquishy@users.noreply.github.com> Date: Fri, 22 Nov 2024 08:55:17 +1100 Subject: [PATCH 44/55] revert that --- Resources/Prototypes/Reagents/medicine.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml index 21640c7aebe..f34965279ca 100644 --- a/Resources/Prototypes/Reagents/medicine.yml +++ b/Resources/Prototypes/Reagents/medicine.yml @@ -664,7 +664,16 @@ Drink: effects: - !type:SatiateThirst + conditions: # Delta-V nerf of saline for Feroxi + - !type:OrganType + type: Aquatic + shouldHave: false factor: 6 + - !type:SatiateThirst # Delta-V nerf of saline for Feroxi + conditions: + - !type:OrganType + type: Aquatic + factor: 2 - !type:ModifyBloodLevel amount: 6 From db065ac2292c20dd18122c0c67949d1239a92417 Mon Sep 17 00:00:00 2001 From: BlitzTheSquishy <73762869+BlitzTheSquishy@users.noreply.github.com> Date: Fri, 29 Nov 2024 09:58:10 +1100 Subject: [PATCH 45/55] Small edit --- Content.Server/DeltaV/Feroxi/FeroxiDehydrateSystem.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Content.Server/DeltaV/Feroxi/FeroxiDehydrateSystem.cs b/Content.Server/DeltaV/Feroxi/FeroxiDehydrateSystem.cs index 18bdc3f676c..1ffc721a88e 100644 --- a/Content.Server/DeltaV/Feroxi/FeroxiDehydrateSystem.cs +++ b/Content.Server/DeltaV/Feroxi/FeroxiDehydrateSystem.cs @@ -19,22 +19,22 @@ public override void Update(float frameTime) if (feroxiDehydrate.Dehydrated != shouldBeDehydrated) { - UpdateDehydrationStatus(uid, feroxiDehydrate, shouldBeDehydrated); + UpdateDehydrationStatus((uid, feroxiDehydrate), shouldBeDehydrated); } } } - private void UpdateDehydrationStatus(EntityUid uid, FeroxiDehydrateComponent feroxiDehydrate, bool shouldBeDehydrated) + private void UpdateDehydrationStatus(Entity ent, bool shouldBeDehydrated) { - feroxiDehydrate.Dehydrated = shouldBeDehydrated; + ent.Comp.Dehydrated = shouldBeDehydrated; - foreach (var entity in _body.GetBodyOrganEntityComps(uid)) + foreach (var entity in _body.GetBodyOrganEntityComps(ent.Owner)) { if (!TryComp(entity, out var metabolizer) || metabolizer.MetabolizerTypes == null) { continue; } - var newMetabolizer = shouldBeDehydrated ? feroxiDehydrate.DehydratedMetabolizer : feroxiDehydrate.HydratedMetabolizer; + var newMetabolizer = shouldBeDehydrated ? ent.Comp.DehydratedMetabolizer : ent.Comp.HydratedMetabolizer; metabolizer.MetabolizerTypes!.Clear(); metabolizer.MetabolizerTypes.Add(newMetabolizer); } From 3b53d425db60dbcc355299fec6b1969291bb5972 Mon Sep 17 00:00:00 2001 From: BlitzTheSquishy <73762869+BlitzTheSquishy@users.noreply.github.com> Date: Fri, 29 Nov 2024 13:47:58 +1100 Subject: [PATCH 46/55] weh --- Resources/Prototypes/DeltaV/Guidebook/species.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Guidebook/species.yml b/Resources/Prototypes/DeltaV/Guidebook/species.yml index 798fc9e75ca..11fc183fac7 100644 --- a/Resources/Prototypes/DeltaV/Guidebook/species.yml +++ b/Resources/Prototypes/DeltaV/Guidebook/species.yml @@ -26,4 +26,4 @@ - type: guideEntry id: Feroxi name: species-name-feroxi - text: "/ServerInfo/Guidebook/Mobs/Deltav/Feroxi.xml" + text: "/ServerInfo/Guidebook/Mobs/DeltaV/Feroxi.xml" From 17440b2874f81ea60310f8e516e6b4f297ebe42a Mon Sep 17 00:00:00 2001 From: deltanedas <@deltanedas:kde.org> Date: Wed, 1 Jan 2025 15:14:30 +0000 Subject: [PATCH 47/55] DeltaV -> _DV for system --- .../{DeltaV => _DV}/Feroxi/FeroxiDehydrateComponent.cs | 2 +- Content.Server/{DeltaV => _DV}/Feroxi/FeroxiDehydrateSystem.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename Content.Server/{DeltaV => _DV}/Feroxi/FeroxiDehydrateComponent.cs (92%) rename Content.Server/{DeltaV => _DV}/Feroxi/FeroxiDehydrateSystem.cs (97%) diff --git a/Content.Server/DeltaV/Feroxi/FeroxiDehydrateComponent.cs b/Content.Server/_DV/Feroxi/FeroxiDehydrateComponent.cs similarity index 92% rename from Content.Server/DeltaV/Feroxi/FeroxiDehydrateComponent.cs rename to Content.Server/_DV/Feroxi/FeroxiDehydrateComponent.cs index 7cbf618d710..4fc4b6b3191 100644 --- a/Content.Server/DeltaV/Feroxi/FeroxiDehydrateComponent.cs +++ b/Content.Server/_DV/Feroxi/FeroxiDehydrateComponent.cs @@ -1,7 +1,7 @@ using Content.Shared.Body.Prototypes; using Robust.Shared.Prototypes; -namespace Content.Server.DeltaV.Feroxi; +namespace Content.Server._DV.Feroxi; [RegisterComponent, Access(typeof(FeroxiDehydrateSystem))] public sealed partial class FeroxiDehydrateComponent : Component diff --git a/Content.Server/DeltaV/Feroxi/FeroxiDehydrateSystem.cs b/Content.Server/_DV/Feroxi/FeroxiDehydrateSystem.cs similarity index 97% rename from Content.Server/DeltaV/Feroxi/FeroxiDehydrateSystem.cs rename to Content.Server/_DV/Feroxi/FeroxiDehydrateSystem.cs index 1ffc721a88e..35c4d9ba027 100644 --- a/Content.Server/DeltaV/Feroxi/FeroxiDehydrateSystem.cs +++ b/Content.Server/_DV/Feroxi/FeroxiDehydrateSystem.cs @@ -2,7 +2,7 @@ using Content.Server.Body.Systems; using Content.Shared.Nutrition.Components; -namespace Content.Server.DeltaV.Feroxi; +namespace Content.Server._DV.Feroxi; public sealed class FeroxiDehydrateSystem : EntitySystem { From 1f545ae37bb05bee745fa2bdaea011e26b1b4ec2 Mon Sep 17 00:00:00 2001 From: BlitzTheSquishy <73762869+BlitzTheSquishy@users.noreply.github.com> Date: Mon, 27 Jan 2025 17:12:08 +1100 Subject: [PATCH 48/55] wups --- Resources/Locale/en-US/_DV/species/species.ftl | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Locale/en-US/_DV/species/species.ftl b/Resources/Locale/en-US/_DV/species/species.ftl index 1d615fd5593..ce488d4fa07 100644 --- a/Resources/Locale/en-US/_DV/species/species.ftl +++ b/Resources/Locale/en-US/_DV/species/species.ftl @@ -3,6 +3,5 @@ species-name-vulpkanin = Vulpkanin species-name-harpy = Harpy species-name-rodentia = Rodentia -species-name-feroxi = Feroxi species-name-chitinid = Chitinid species-name-feroxi = Feroxi From 7eedcc01b9b4ef1dcb2fb99ecf34f46b28d52d82 Mon Sep 17 00:00:00 2001 From: BlitzTheSquishy <73762869+BlitzTheSquishy@users.noreply.github.com> Date: Tue, 4 Feb 2025 16:45:36 +1100 Subject: [PATCH 49/55] Shitmed fixes, Tail tweaks, XML tweaks --- Content.Shared/Body/Organ/OrganComponent.cs | 6 + .../_Shitmed/Surgery/SharedSurgerySystem.cs | 5 + .../Locale/en-US/_DV/markings/feroxi.ftl | 9 +- .../Prototypes/_DV/Body/Organs/feroxi.yml | 6 +- .../Mobs/Customization/Markings/feroxi.yml | 18 +++ .../_DV/Loadouts/Miscellaneous/survival.yml | 104 ++++++++++++++++++ .../ServerInfo/Guidebook/Mobs/_DV/Feroxi.xml | 3 +- .../feroxi-torso-countershading-f.png | Bin 0 -> 378 bytes .../feroxi-torso-countershading-m.png | Bin 0 -> 353 bytes .../Feroxi/body_markings.rsi/meta.json | 10 +- .../Feroxi/tail_markings.rsi/feroxi-tail.png | Bin 2278 -> 800 bytes 11 files changed, 154 insertions(+), 7 deletions(-) create mode 100644 Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-torso-countershading-f.png create mode 100644 Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-torso-countershading-m.png diff --git a/Content.Shared/Body/Organ/OrganComponent.cs b/Content.Shared/Body/Organ/OrganComponent.cs index 2f575952e9c..ac7b3f5f541 100644 --- a/Content.Shared/Body/Organ/OrganComponent.cs +++ b/Content.Shared/Body/Organ/OrganComponent.cs @@ -69,5 +69,11 @@ public sealed partial class OrganComponent : Component, ISurgeryToolComponent // ///

[DataField] public bool CanEnable = true; + + /// + /// DV - Yknow I like being able to just say that an organ can also just, not be removed :blunt: + /// + [DataField] + public bool Removable = true; // Shitmed Change End } diff --git a/Content.Shared/_Shitmed/Surgery/SharedSurgerySystem.cs b/Content.Shared/_Shitmed/Surgery/SharedSurgerySystem.cs index de32ebb4dc0..a480f62baea 100644 --- a/Content.Shared/_Shitmed/Surgery/SharedSurgerySystem.cs +++ b/Content.Shared/_Shitmed/Surgery/SharedSurgerySystem.cs @@ -27,6 +27,7 @@ using Robust.Shared.Network; using Robust.Shared.Prototypes; using Robust.Shared.Timing; +using Content.Shared.Body.Organ; namespace Content.Shared._Shitmed.Medical.Surgery; @@ -266,6 +267,10 @@ private void OnOrganConditionValid(Entity ent, r || ent.Comp.Reattaching && !organs.Any(organ => HasComp(organ.Id)))) args.Cancelled = true; + // DV - allowing unremovability to shitmed + if (!organs.Any(organ => !TryComp(organ.Id, out var organComp) + || organComp.Removable)) + args.Cancelled = true; } else if (!ent.Comp.Inverse) args.Cancelled = true; diff --git a/Resources/Locale/en-US/_DV/markings/feroxi.ftl b/Resources/Locale/en-US/_DV/markings/feroxi.ftl index 2265598e6fb..b1f81e87728 100644 --- a/Resources/Locale/en-US/_DV/markings/feroxi.ftl +++ b/Resources/Locale/en-US/_DV/markings/feroxi.ftl @@ -100,14 +100,17 @@ marking-FeroxiTipTwoToneTailAndDorsal-feroxi-tail-under = Under Tail marking-FeroxiTipTwoToneTailAndDorsal-feroxi-dorsal = Base Dorsal marking-FeroxiTipTwoToneTailAndDorsal-feroxi-dorsal-tip = Dorsal Tip - marking-FeroxiTorsoStripesBlitz = Small Under Arm Stripes marking-FeroxiTorsoStripesBlitz-feroxi-torso-stripes-blitz = Stripes - marking-FeroxiLegStripesBlitz = Calf Stripes marking-FeroxiLegStripesBlitz-feroxi-leg-stripes-blitz = Stripes - marking-FeroxiArmStripesBlitz = Shoulder Stripes marking-FeroxiArmStripesBlitz-feroxi-arm-stripes-blitz = Stripes + +marking-FeroxiTorsoCountershadingF = Countershading (Feminine) +marking-FeroxiTorsoCountershadingF-feroxi-torso-countershading-f = Countershading + +marking-FeroxiTorsoCountershadingM = Countershading (Masculine) +marking-FeroxiTorsoCountershadingM-feroxi-torso-countershading-m = Countershading diff --git a/Resources/Prototypes/_DV/Body/Organs/feroxi.yml b/Resources/Prototypes/_DV/Body/Organs/feroxi.yml index 23606224b21..ecdf44fa132 100644 --- a/Resources/Prototypes/_DV/Body/Organs/feroxi.yml +++ b/Resources/Prototypes/_DV/Body/Organs/feroxi.yml @@ -24,14 +24,16 @@ - type: entity parent: BaseHumanOrgan id: OrganFeroxiLungs - name: Aquatic Lungs - description: "A pair of amphibious lungs, filtering oxygen out of the air continuously." + name: Aquatic Lungs and Gills + description: "A pair of amphibious lungs along with gills, filtering oxygen out of the air continuously." components: - type: Sprite sprite: Mobs/Species/Human/organs.rsi layers: - state: lung-l - state: lung-r + - type: Organ + removable: false - type: Lung - type: Metabolizer removeEmpty: true diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/feroxi.yml b/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/feroxi.yml index e6a2cddca98..1936334cbd9 100644 --- a/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/feroxi.yml +++ b/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/feroxi.yml @@ -266,6 +266,24 @@ - sprite: _DV/Mobs/Customization/Feroxi/body_markings.rsi state: feroxi-torso-stripes-blitz +- type: marking + id: FeroxiTorsoCountershadingF + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/body_markings.rsi + state: feroxi-torso-countershading-f + +- type: marking + id: FeroxiTorsoCountershadingM + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/body_markings.rsi + state: feroxi-torso-countershading-m + # Leg Markings - type: marking id: FeroxiLegStripesBlitz diff --git a/Resources/Prototypes/_DV/Loadouts/Miscellaneous/survival.yml b/Resources/Prototypes/_DV/Loadouts/Miscellaneous/survival.yml index dceacb043cf..a8f9b34bc7a 100644 --- a/Resources/Prototypes/_DV/Loadouts/Miscellaneous/survival.yml +++ b/Resources/Prototypes/_DV/Loadouts/Miscellaneous/survival.yml @@ -1,3 +1,99 @@ +# Species +- type: loadoutEffectGroup + id: WaterBreather + effects: + - !type:SpeciesLoadoutEffect + species: + - Feroxi + +# Basic +- type: loadout + id: EmergencyWater + effects: + - !type:GroupLoadoutEffect + proto: WaterBreather + storage: + back: + - BoxSurvivalWater + +# Clown +- type: loadout + id: EmergencyWaterClown + effects: + - !type:GroupLoadoutEffect + proto: WaterBreather + storage: + back: + - BoxHugWater + +# Mime +- type: loadout + id: EmergencyWaterMime + effects: + - !type:GroupLoadoutEffect + proto: WaterBreather + storage: + back: + - BoxMimeWater + +# Engineering / Extended +- type: loadout + id: EmergencyWaterExtended + effects: + - !type:GroupLoadoutEffect + proto: WaterBreather + storage: + back: + - BoxSurvivalEngineeringWater + +# Medical +- type: loadout + id: EmergencyWaterMedical + effects: + - !type:GroupLoadoutEffect + proto: WaterBreather + storage: + back: + - BoxSurvivalMedicalWater + +# Security +- type: loadout + id: EmergencyWaterSecurity + effects: + - !type:GroupLoadoutEffect + proto: WaterBreather + storage: + back: + - BoxSurvivalSecurityWater + +# Syndicate +- type: loadout + id: EmergencyWaterSyndicate + effects: + - !type:GroupLoadoutEffect + proto: WaterBreather + storage: + back: + - BoxSurvivalWater + +# Full EVA Tank, Any Species +- type: loadout + id: LoadoutSpeciesEVAWater + effects: + - !type:GroupLoadoutEffect + proto: WaterBreather + equipment: + suitstorage: WaterTankFilled + +# Species-appropriate Double Emergency Tank in Pocket 1 +- type: loadout + id: LoadoutSpeciesPocketDoubleWater + effects: + - !type:GroupLoadoutEffect + proto: WaterBreather + equipment: + pocket1: DoubleEmergencyWaterTankFilled + # Corpsman - type: loadout id: EmergencyOxygenCorpsman @@ -17,6 +113,14 @@ back: - BoxSurvivalBrigmedicNitrogen +- type: loadout + id: EmergencyNitrogenCorpsman + effects: + - !type:GroupLoadoutEffect + proto: WaterBreather + equipment: + mask: BoxSurvivalBrigmedicWater + - type: loadout id: LoadoutSpeciesBreathToolCorpsman effects: diff --git a/Resources/ServerInfo/Guidebook/Mobs/_DV/Feroxi.xml b/Resources/ServerInfo/Guidebook/Mobs/_DV/Feroxi.xml index cec5fe7f129..7ed6575db66 100644 --- a/Resources/ServerInfo/Guidebook/Mobs/_DV/Feroxi.xml +++ b/Resources/ServerInfo/Guidebook/Mobs/_DV/Feroxi.xml @@ -17,7 +17,7 @@ - Uses their jaws to do piercing damage, and harder than other species, rivaling Oni. - Their cartilaginous skeleton allows them to resist blunt force trauma more easily. - Their adaptation to native environments allows them to resist the cold more easily. - - Their biology allow them to breathe water vapour + - Their biology allow them to breathe water vapour. ## Drawbacks @@ -25,5 +25,6 @@ - Gets thirsty 100% faster. That's faster than a Diona! - When thirst falls to "Parched" they begin to suffocate. Have water handy! - Saline is too salty! It hydrates you much less! + - Your lungs are unremovable as theyre intergrated with your gills. diff --git a/Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-torso-countershading-f.png b/Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-torso-countershading-f.png new file mode 100644 index 0000000000000000000000000000000000000000..dfd82e0f2ab9cff07ecf686588877e84a2ee9ed6 GIT binary patch literal 378 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e#^NA%C&rs6b?Si}&H|6fVg?4j zBOuH;Rhv&5C@2)*6XFV_mn>N_Wy+Lo+qP9zRn^zmFZnO{2`I`|666=m@E-)KDj)m< zid^+{aSW-L^Y-#yz9s_!_78DyeHJI0X58o%b7$wYTem*p3FDs!tSvj5rP3Wdc|803 z%~Y&T^2)xe%lvOH(y?p-`&q2{Mn4 zRdRMsIV-uJ-C;{kB-5#fZNHTG4K^rDd4A=b6Uzy;uc-&Zo{2SId*#Sq$1;um%J;HR z1)lg>#;=1|&xQWm`|fiDv%>y|wyzw@4>v95v3be!MX@v?W3jGZInSNH8Er;A%EreU zmb$Fl+V7b9N72GL`Y&e%vuBC3<5h`0#y}79rABzB`T8N_Wy+Lo+qTu$*H=|lG2F6M0*bPg1o;Is{0D)m$_M{| zB6~bt978JRB&R4aNVtnmSke&q@qcX%*9_iwhMIGZu4eFf5PTrz#DNe0W$er)j1B(m zZSZg0#BlgF`wtNY*~Yt^B_RhgzPz`IWA*vd^FH86@4r}wP=)gq{E_oKU*5MBVdYu4 z-&{dE;p@L$(xHrg2CEW67<)w|7N+Gr-Ti{AC(uZL^210T*8VtUO^zB9A5o4~bKHUi z_Pn=U)pX#iQ`w1|vqPWldyyT&x@N!R1jhqxA*>mf1XNe#9bk3qU}Bi7>*+Y*Tm%o$ hAAG41o@u_m3|c@o2M~k6rQpdR%G1@)Wt~$(69AUMeb4{^ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/meta.json b/Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/meta.json index c1d43fffad2..6e9edab6dc3 100644 --- a/Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/meta.json +++ b/Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by BlitzTheSquishy", + "copyright": "Stripes made by BlitzTheSquishy, Countershading made by Emily9031", "size": {"x": 32, "y": 32}, "states": [ @@ -16,6 +16,14 @@ { "name": "feroxi-leg-stripes-blitz", "directions": 4 + }, + { + "name": "feroxi-torso-countershading-m", + "directions": 4 + }, + { + "name": "feroxi-torso-countershading-f", + "directions": 4 } ] } diff --git a/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-tail.png b/Resources/Textures/_DV/Mobs/Customization/Feroxi/tail_markings.rsi/feroxi-tail.png index 8e6b276ba88b92365272acfc0817ce8ff3656b92..00570d0e22dee61d063e538dc831afdfb24fb843 100644 GIT binary patch delta 719 zcmV;=0x}lQmYzkRv3kBZ@~%_QO^D?FD~ST&B2I zu*5OWDmF&JkAM1u-`#qtf&OArQyA)=egC~1>bK!L@B3dzzW;p;wNG&Al>MuRF#I8U zzN~c}K+7haUzIg;2QIdt?J;Y(MnS5Tsijizb}HXA3#~WMIA83ow9m;s#HFjqHSFy} zPg=4Us=T|QvbR6al=}Mt(dQe}?z~qk+&`Ha3bDrfQ_#8=$>J9Y8w< zJwqgZGuYv8{*m%*pu5kE+3h*fAPtB#NCP4brhnQ~e3=%@&=5TwmaR?&N8mXyq0v0Y z(UJjz2}0kT{;LLz3cNVKl^Qs93-=PK_h8?$2MA^lAN(zlEI@l^SfRkfi)V;2J>0{^ zG1>+VbPU|k`hfzTHI(A^pVGRVI7K0f{)(4!;sYEjJURmW6$$_V002ovPDHLkV1ifB BOtb(1 literal 2278 zcmcIleQ*@z8Q%mu#Xu5_P0E1c&S4}__ilG@Z|`=^CE{H^Zp?*C?hGemW8ZuCy<;bL zx7WQ5IYJv6Dij?;EfYX9K~aJqRHz1x)I@@Gg4IxAq(Mb6A^iXekT$jgG9`WYE|=mA ze>u~g+pp(-&+mPn-}AiBKIy5h$j+LVMG!=`tI}DE?+@zd%o+H)?^qZF5J+u#(m`@ z3BDTMy8itm4FLY>>#VHOqBHkT{B~43)bZh_1KuaW*^RG1XN3DV?M0syT)s29 z?9}GJHkiw*m((v0hbB%Qvk%Q0+ur%5YxiInwKMl^+y%FU*3TAR>=s{4+$)vVy*He9 z^)I9Bz+3AIH{VhB29sHOA-APzYI`E0}CZR2b2zSeSf?w;pH zK3;rnc`g`n{A=%)lPyHs{8-B)A0NH@z^70A{r%U@&TI7*dLQ0Ba>;j4F6fBvj2`^- z^J688uF!=)ZhQO>UzBJs6|Q;VaBsuln(JRx9lz%dDKWy{oGW+dl7mem=f^Pphr=PU3^O-jn0ShTCJ6kH!gN)}8v9L3DJ^#h_l<=hyu1 zDiJCXBaoB;GA1H1j3$WU(nJiv2BeVz6q2KM!+3AMfs`e?VY$UkyJHTtQm$-Pk+-?p z2b&w9AQ?(ava^a4B4&sn4UmaQI2sodc0-a_#Lv3fWFV6et-)^ayFH{sQ4z@*IU`M# zCFE7C0h5qqu_^_{T4(tb34XI1R%%*IG?|*3nv6|mqoRgPj35Xmnl-U3g%MPIbyNch zDjHvyBAKFbqBvCLm?kSxQl|w0rBSmRa2%-sBQdvonmrny(g7=CN`RP&G18_;M2|X& zj%#JBu=7+bw?xN%t7FJii{eV73Q^fA6x9}{-6c5f8*5a<$t)yjLSYoausB|gnO>^G z<@QXY^{hj3B$o8R3QwanIru+qz7>!DPcr=U;@EAP?_0=po;nbVAvzV5+7A63A3fl06v+)7S zCP@KGfQaS<8*Ak(yn&RUSgxoMfJ-JvKnR&)(U5`El@*tITy_I%q^DjzVW0&u)NXJC zNG|hEnSF8uc{QLb$M6=$%5j{P$3Lr?n?lqfHI7?L=VEB18T0AFi#T?yAke!GyCyRd z9V!BvqWTmiY&YmZkh)L0S#i6jWJ`(wrk09> zRR{~1GQyQ08bWx_;&w?{%0I3I zwI-mVr6HUhP6BsFG6}LMCEMaOuxTaIHKFm|q|Fq=`xstiZKBym(N>YhDw+O2$(RE{ z#vYJ?ovEA>s*OtsKEcX8_XU7fwgXSu$cJ6!VC+q$T Date: Tue, 4 Feb 2025 20:14:09 +1100 Subject: [PATCH 50/55] WAter TANKS --- .../_DV/Catalog/Fills/Boxes/emergency.yml | 117 ++++++++++++++++++ .../_DV/Catalog/Fills/Items/gas_tanks.yml | 75 +++++++++++ .../_DV/Entities/Objects/Tools/gas_tank.yml | 52 ++++++++ .../_DV/Loadouts/Miscellaneous/survival.yml | 2 +- .../Tanks/emergency_red.rsi/equipped-BELT.png | Bin 0 -> 430 bytes .../equipped-SUITSTORAGE-cat.png | Bin 0 -> 441 bytes .../equipped-SUITSTORAGE-dog.png | Bin 0 -> 443 bytes .../equipped-SUITSTORAGE-fox.png | Bin 0 -> 425 bytes .../equipped-SUITSTORAGE-hamster.png | Bin 0 -> 345 bytes .../equipped-SUITSTORAGE-kangaroo.png | Bin 0 -> 450 bytes .../equipped-SUITSTORAGE-pig.png | Bin 0 -> 449 bytes .../equipped-SUITSTORAGE-possum.png | Bin 0 -> 447 bytes .../equipped-SUITSTORAGE-puppy.png | Bin 0 -> 429 bytes .../equipped-SUITSTORAGE-sloth.png | Bin 0 -> 444 bytes .../equipped-SUITSTORAGE.png | Bin 0 -> 430 bytes .../Objects/Tanks/emergency_red.rsi/icon.png | Bin 0 -> 318 bytes .../Tanks/emergency_red.rsi/inhand-left.png | Bin 0 -> 341 bytes .../Tanks/emergency_red.rsi/inhand-right.png | Bin 0 -> 329 bytes .../Objects/Tanks/emergency_red.rsi/meta.json | 75 +++++++++++ 19 files changed, 320 insertions(+), 1 deletion(-) create mode 100644 Resources/Prototypes/_DV/Catalog/Fills/Items/gas_tanks.yml create mode 100644 Resources/Prototypes/_DV/Entities/Objects/Tools/gas_tank.yml create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/equipped-BELT.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-cat.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-dog.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-fox.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-hamster.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-kangaroo.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-pig.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-possum.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-puppy.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-sloth.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/icon.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/inhand-left.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/inhand-right.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/meta.json diff --git a/Resources/Prototypes/_DV/Catalog/Fills/Boxes/emergency.yml b/Resources/Prototypes/_DV/Catalog/Fills/Boxes/emergency.yml index 48fcf3bbe01..72c738055c5 100644 --- a/Resources/Prototypes/_DV/Catalog/Fills/Boxes/emergency.yml +++ b/Resources/Prototypes/_DV/Catalog/Fills/Boxes/emergency.yml @@ -30,3 +30,120 @@ # Intentionally wrong picture on the box. NT did not care enough to change it. - type: Label currentLabel: reagent-name-nitrogen + +- type: entity + parent: BoxSurvival + id: BoxSurvivalWaterVapor + suffix: Standard H2O + components: + - type: StorageFill + contents: + - id: ClothingMaskBreath + - id: EmergencyWaterVaporTankFilled + - id: EmergencyMedipen + - id: SpaceMedipen # DeltaV - keep spacepen + - id: Flare + - id: FoodPSB # DeltaV - replace nutribrick with PSB + - id: DrinkWaterBottleFull + - type: Label + currentLabel: reagent-name-water + +- type: entity + parent: BoxSurvivalEngineering + id: BoxSurvivalEngineeringWaterVapor + suffix: Extended H2O + components: + - type: StorageFill + contents: + - id: ClothingMaskBreath + - id: ExtendedEmergencyWaterVaporTankFilled + - id: EmergencyMedipen + - id: SpaceMedipen # DeltaV - keep spacepen + - id: Flare + - id: FoodPSB # DeltaV - replace nutribrick with PSB + - id: DrinkWaterBottleFull + - type: Label + currentLabel: reagent-name-water + +- type: entity + parent: BoxSurvivalSecurity + id: BoxSurvivalSecurityWaterVapor + suffix: Security H2O + components: + - type: StorageFill + contents: + - id: ClothingMaskGasSecurity + - id: EmergencyWaterVaporTankFilled + - id: EmergencyMedipen + - id: SpaceMedipen # DeltaV - keep spacepen + - id: Flare + - id: FoodPSB # DeltaV - replace nutribrick with PSB + - id: DrinkWaterBottleFull + - type: Label + currentLabel: reagent-name-water + +- type: entity + parent: BoxSurvivalMedical + id: BoxSurvivalMedicalWaterVapor + suffix: Medical H2O + components: + - type: StorageFill + contents: + - id: ClothingMaskBreathMedical + - id: EmergencyWaterVaporTankFilled + - id: EmergencyMedipen + - id: SpaceMedipen # DeltaV - keep spacepen + - id: Flare + - id: FoodPSB # DeltaV - replace nutribrick with PSB + - id: DrinkWaterBottleFull + - type: Label + currentLabel: reagent-name-water + +- type: entity + parent: BoxHug + id: BoxHugWaterVapor + suffix: Emergency H2O + components: + - type: StorageFill + contents: + - id: ClothingMaskBreath + - id: EmergencyWaterVaporTankFilled + - id: EmergencyMedipen + - id: SpaceMedipen # DeltaV - keep spacepen + - id: Flare + - id: FoodPSB # DeltaV - replace nutribrick with PSB + - id: DrinkWaterBottleFull + - type: Label + currentLabel: reagent-name-water + +- type: entity + parent: BoxSurvivalWaterVapor + id: BoxMimeWaterVapor + suffix: Mime, Emergency H2O + components: + - type: StorageFill + contents: + - id: SpaceMedipen # DeltaV - keep spacepen, replaces breath mask + - id: EmergencyWaterVaporTankFilled + - id: EmergencyMedipen + - id: Flare + - id: FoodBreadBaguette + - id: DrinkWaterBottleFull + - type: Label + currentLabel: reagent-name-water + +- type: entity + parent: BoxSurvivalSyndicate + id: BoxSurvivalSyndicateWaterVapor + suffix: Syndicate H2O + components: + - type: StorageFill + contents: + - id: ClothingMaskGasSyndicate + - id: ExtendedEmergencyWaterVaporTankFilled + - id: EmergencyMedipen + - id: SpaceMedipen # DeltaV - keep spacepen, replaces flare for space + - id: FoodPSB # DeltaV - replace nutribrick with PSB + - id: DrinkWaterBottleFull # DeltaV - why didnt they get water??? + - type: Label + currentLabel: reagent-name-water diff --git a/Resources/Prototypes/_DV/Catalog/Fills/Items/gas_tanks.yml b/Resources/Prototypes/_DV/Catalog/Fills/Items/gas_tanks.yml new file mode 100644 index 00000000000..216193e9e1e --- /dev/null +++ b/Resources/Prototypes/_DV/Catalog/Fills/Items/gas_tanks.yml @@ -0,0 +1,75 @@ +- type: entity + id: WaterVaporTankFilled + parent: WaterVaporTank + suffix: Filled + components: + - type: GasTank + outputPressure: 21.3 + air: + # 31 minutes + volume: 5 + moles: + - 0 # oxygen + - 0 # nitrogen + - 0 # CO2 + - 0 # plasma + - 0 # tritium + - 2.051379050 # water vapor + temperature: 293.15 + +- type: entity + id: EmergencyWaterVaporTankFilled + parent: EmergencyWaterVaporTank + suffix: Filled + components: + - type: GasTank + outputPressure: 21.3 + air: + # 4 minutes + volume: 0.66 + moles: + - 0 # oxygen + - 0 # nitrogen + - 0 # CO2 + - 0 # plasma + - 0 # tritium + - 0.270782035 # water vapor + temperature: 293.15 + +- type: entity + id: ExtendedEmergencyWaterVaporTankFilled + parent: ExtendedEmergencyWaterVaporTank + suffix: Filled + components: + - type: GasTank + outputPressure: 21.3 + air: + # 9 minutes + volume: 1.5 + moles: + - 0 # oxygen + - 0 # nitrogen + - 0 # CO2 + - 0 # plasma + - 0 # tritium + - 0.615413715 # water vapor + temperature: 293.15 + +- type: entity + id: DoubleEmergencyWaterVaporTankFilled + parent: DoubleEmergencyWaterVaporTank + suffix: Filled + components: + - type: GasTank + outputPressure: 21.3 + air: + # 15 minutes + volume: 2.5 + moles: + - 0 # oxygen + - 0 # nitrogen + - 0 # CO2 + - 0 # plasma + - 0 # tritium + - 1.025689525 # water vapor + temperature: 293.15 diff --git a/Resources/Prototypes/_DV/Entities/Objects/Tools/gas_tank.yml b/Resources/Prototypes/_DV/Entities/Objects/Tools/gas_tank.yml new file mode 100644 index 00000000000..722b40d895f --- /dev/null +++ b/Resources/Prototypes/_DV/Entities/Objects/Tools/gas_tank.yml @@ -0,0 +1,52 @@ +- type: entity + parent: OxygenTank + id: WaterVaporTank + name: water vapor tank + description: A standard cylindrical gas tank for water vapor. It can hold 5 L of gas. + components: + - type: Sprite + sprite: _DV/Objects/Tanks/water_vapor.rsi + - type: Item + sprite: _DV/Objects/Tanks/water_vapor.rsi + - type: Clothing + sprite: _DV/Objects/Tanks/water_vapor.rsi + +- type: entity + parent: EmergencyOxygenTank + id: EmergencyWaterVaporTank + name: emergency water vapor tank + description: An easily portable tank for emergencies. Contains very little water vapor, rated for survival use only. It can hold 0.66 L of gas. + components: + - type: Sprite + sprite: _DV/Objects/Tanks/emergency_water_vapor.rsi + - type: Item + sprite: _DV/Objects/Tanks/emergency_water_vapor.rsi + - type: Clothing + sprite: _DV/Objects/Tanks/emergency_water_vapor.rsi + +- type: entity + parent: ExtendedEmergencyOxygenTank + id: ExtendedEmergencyWaterVaporTank + name: extended-capacity emergency water vapor tank + description: An emergency tank with extended capacity. Technically rated for prolonged use. It can hold 1.5 L of gas. + components: + - type: Sprite + sprite: _DV/Objects/Tanks/emergency_extended_water_vapor.rsi + - type: Item + sprite: _DV/Objects/Tanks/emergency_extended_water_vapor.rsi + - type: Clothing + sprite: _DV/Objects/Tanks/emergency_extended_water_vapor.rsi + +- type: entity + parent: DoubleEmergencyOxygenTank + id: DoubleEmergencyWaterVaporTank + name: double emergency water vapor tank + description: A high-grade dual-tank emergency life support container. It holds a decent amount of water vapor for its small size. It can hold 2.5 L of gas. + components: + - type: Sprite + sprite: _DV/Objects/Tanks/emergency_double_water_vapor.rsi + - type: Item + sprite: _DV/Objects/Tanks/emergency_double_water_vapor.rsi + - type: Clothing + sprite: _DV/Objects/Tanks/emergency_double_water_vapor.rsi + diff --git a/Resources/Prototypes/_DV/Loadouts/Miscellaneous/survival.yml b/Resources/Prototypes/_DV/Loadouts/Miscellaneous/survival.yml index a8f9b34bc7a..b24417d95de 100644 --- a/Resources/Prototypes/_DV/Loadouts/Miscellaneous/survival.yml +++ b/Resources/Prototypes/_DV/Loadouts/Miscellaneous/survival.yml @@ -114,7 +114,7 @@ - BoxSurvivalBrigmedicNitrogen - type: loadout - id: EmergencyNitrogenCorpsman + id: EmergencyWaterVaporCorpsman effects: - !type:GroupLoadoutEffect proto: WaterBreather diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/equipped-BELT.png b/Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..0da6de00a074346da4242702006d657e776a614a GIT binary patch literal 430 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1engR`fLV@O5Z+gpZRtp*~j7hX3gG)o6aYjb-a zy!NhHdq(dWzcfj`165`VxII!+6K5wRKMXNj|Kowbz~|@lKDGY%pq2TFK?wvlUHx9G zo?ZT3k=yLlrYTEr7fUttOElc7HkX}OPd}){cQ7J zDEglF{qM1}mQ}}Iub#E+w~6oE_3{5cT#^@PQ(UBR$be`0xBC}YItOTq*8HnWzHPSi z$=YB>h6CSzINsj2>CM{9j4pvKmGe?>MlWZ+5S1J$ma+EfrT>L8Z7xW_ZsWeYQ;nIu zG+(FN1&bVgx9RxH)rKoqX-OncNR{j{EV^lV-F6ML#BsqwndI1T6;Gw*^>ZY5Y!Vj~yeR#fIWQ^z%c<33uYh69 N;OXk;vd$@?2>`a0ucrV2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-cat.png b/Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-cat.png new file mode 100644 index 0000000000000000000000000000000000000000..7bbe6010c8ec82c78cc7db77610bdbd28d3afae6 GIT binary patch literal 441 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~e1o(uws;Q|-NlBTSntFJ6XlrZ7#>U#&*%>^W84?m=Y;2sDm-qYBsXyn> z8*6GlnLQh*DQltcA0Q=A666>B9~Ce>P>z)Z%5fHWL>4nJ@ErnSMo|r~2B6?KPZ!6K z2=}+sUh_38@VI&JjQDWq_x`s`j826I1*iRuurLgKeLcBXjj2v3gL|>gK_QkpT?PS$ zHR%BlSQjO<8ZvSy9#Gc4s@~raa;qU_>8~d&Sy|SblFj&zYvq zu$VVrQsl=oXF2gZ5lyNbAd~)iFnrt6sdn(h%*)e`ZBed$(XsemfQ#O;KB3dr&bt?P zJmlu+3(`ut0LwF@&T}kIc>>1aol{Hf4tzTw$UGrjeY@Rz!N;y|_RiR{$Ma&y zsslT|W*Yw~`_b9pF2%Ts^@??hY2AX#2ge!nCgyWn7P2mI6nz9!@+AoVw Q14Dqp)78&qol`;+0I?LXeEk44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~e1o(uws;Q|-NlBTSntFJ6XlrZ7#>U#&*%>^W84?m=Y;2sDmuIZ0`TNwV zKj+UsnLQh*>A`%(k3dSGB*-uLKPq5&pd2d+l;bS$h%9Dc;5!7ujG`J|4M4#ko-U3d z5$D5GAmEDTwT0y%Qnr@YY{g! z->&u3*wwIrLow-CRcsx9=mNc|l0FB1FlrWGjqsh${N}%mE<2rEQ7>}@uG?7oY=PUeBw&us}G*tkB+CT~mNR?`1DgTe~DWM4fhK#E{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-fox.png b/Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-fox.png new file mode 100644 index 0000000000000000000000000000000000000000..b4c88309b1ce458621194cb67167b2f07e86a16a GIT binary patch literal 425 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1^2Ka=ys;Q|-NlBTSntFJ6XlrZR+1VL9n;8-kl9!iftf~3?)G1?Q<3H!m zKbbunsNk44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1k1^9%xN=Zo>8ykm&gyiMrX=`i$K6UEP`SW&mc4}&BKqYTZ7GwY^u96_X z;Quhdu<4A>d7vm~fk$L90|Vb75M~tB@M-`GuJd$p42f`md-Wn;vjR`+!%NIg_y4y} z*HgQ+iFJ16_J8JCt@_8LJ?eV?C`2)FX4G@&yqMj!)?2&>bwAeEYX4xBixAr}?fQA9^=lR9x0A0@D>FVdQ&MBb@026hCssI20 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-kangaroo.png b/Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-kangaroo.png new file mode 100644 index 0000000000000000000000000000000000000000..232f2c9b3e51f8dd972844cea9714f4e8b95f9ab GIT binary patch literal 450 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1^2Ka=ys;Q|-NlBTSntFJ6XlrYSgoN1H*%>^WnU|Mm393 z*|UKXO5dC-A{ZKiGhEp1m*wQ-bm?7C#To zh?UL@6j~Z4dp*6%*Vr88u~_1sdcpdm6H>S8F}kr%b7MU=L$EPwdu_D4nBks7-{)U+ zocxUW#@;DUZ5RJi4sWVkmcV5LGV(rWLU?tMT2WHc*36halWzJp1vaxzPNGwqQn{_JoT$)8AKbo5z|uT{j}bjw@pF`X6U+u<#c+iYA1-^}29c#HaB& ZvuMEeubGjhw!koA@O1TaS?83{1OTK7uz~;p literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-pig.png b/Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-pig.png new file mode 100644 index 0000000000000000000000000000000000000000..23a6da6f4481adce983f2c5291fdb667304727c7 GIT binary patch literal 449 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1^2Ka=ys;Q|-NlBTSntFJ6XlrYSgoN1H*%>^WnU|Mm393 z*|UKU7;BnQTYP6v5|NouRvI!Y?4+worEI-uQ8Ki$)$d~1~!iCnjWe?=J7??XO=QbS{ zkPLhwd_bbP*=41S$-$(XiGoXuE<8)LWevgKK?1_66;HQcg_iA>Xu*qgk#NDeoK1vP0cNNWy89~ zedkUbzv$0mw1`E;Ea3h|k+<_#u$oKnaIK3DsATRu)|19<_2D~9RgE+ImmRY;e{dWW Z=X-x6=7Y*ALtqdwc)I$ztaD0e0sy%9v$X&K literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-possum.png b/Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-possum.png new file mode 100644 index 0000000000000000000000000000000000000000..b0e61db129e66c54d1cad2718377199f92be9301 GIT binary patch literal 447 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1^2Ka=y8Uul*rka{sNJvOtUf!Sc=e4!9f1f&KXJ;oRCFSAaVeo9`li9OP zO-+G1mfdl<2&DK+g8YL2qX330cV;XEN^ur=L>4nJ@ErnSMo|r~2B0GtJY5_^BHZ6j zyUW*Pz~gq@Dq+Fh-}dVy4I=-WxUBQ>-*aJ`rC-`7(<${KF z-kOFyYrS865neLakkQ!1_@qaWW{Jov>5k@SH4u1^wD)j%i;7i=WP1xv|(`HE^c=AQhM-odCR@bkRDZ|48kYb+aNcEl#!YhV?RImWtl a4}(eN_4u$Z9|>RpF?hQAxvXk44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1^2Ka=ys;Q|-NlBTSntFJ6XlrZR+1VL9n;8-kl9!iftf~3?)G1?Q<3H!m zKbbunsNt=`Ln7SY zPP@q0tia>y&B*=g&;RqWR*t$-o`(;|Rc+c)z@2X4tC7>}Ae~{@$SEN_qal#1VPdDm z*TNSm3xperH!SQqvV#4Gz`@fVJ-d7w7x_$Kk`Q%~5?x}VcH;A#)I}mZ_nD5|SQEgt z?V0N}?z|ZXSb8{p4$N@Sjo_+W$$i>fXXmwbpYxX-nzdrxo%K_$1+8jLcj9ny$y`=- zK*Vv0Wnrs^nQqU4pPWjcE&Wz#J;->T%g(TMzh#=~|D$c&H^27EoFH)C?&XX)r#H6Z ze`@{KUA}!w`Ny@TTaT*$N&Vd;vLNT7TxQ+k;^Vdd^nWn5I^106s^pai^f`m4tDnm{ Hr-UW|9iXlq literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-sloth.png b/Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-sloth.png new file mode 100644 index 0000000000000000000000000000000000000000..07e69b227209e94d7d8e377ecec2d683f60589bb GIT binary patch literal 444 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~e1o(uws;Q|-NlBTSntFJ6XlrZ7#>U#&*%>^W84?m=Y;2sDmuIZ0`TNwV zKj+UsnLQh*>A`%(k3dSGB*-uLKPq5&pd2d+l;bS$h%9Dc;5!7ujG`J|4M4%4o-U3d z5$1ol)FkvcyP}A@Mqk+o{llk66ylzc=yJ zl7vd8fS`-hJRM)iJ*hm{t9zsAgxH^{3_Zp(^&B-M)3cK8GAd8CTwT0y%Qnr@YY~c7HkX}OPd}){cQ7J zDEglF{qM1}mQ}}Iub#E+w~6oE_3{5cT#^@PQ(UBR$be`0xBC}YItOTq*8HnWzHPSi z$=YB>h6CSzINsj2>CM{9j4pvKmGe?>MlWZ+5S1J$ma+EfrT>L8Z7xW_ZsWeYQ;nIu zG+(FN1&bVgx9RxH)rKoqX-OncNR{j{EV^lV-F6ML#BsqwndI1T6;Gw*^>ZY5Y!Vj~yeR#fIWQ^z%c<33uYh69 N;OXk;vd$@?2>`a0ucrV2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/icon.png b/Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..d83da2df0e45accba6ae6dd277dd9826023104e3 GIT binary patch literal 318 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCilI0(?ST)zs9aq@+ANJhHR1O-)TBBO|r7we9TeLPA0ep3O8iHqOh-i;ay1 zDmPeo<}#4tD+%%o{*Me8To2qi0hHk^@Q5r1DmVnfjG`J|4M4$WPZ!4!3;(AV5Arc7 z@~~XcJYA-B;{X437mr*h%ifdSZ_FRWbZxpL-={x%4gC5H5tm|SG4e4kd2hiu=h9aZ zb)yOEt~`6^;UJaK^2S!_0Phy@h#*E8FVjz#jgN=S%6wrfarw-pO8!@M%?CG?Klpd& u|0QdKlZ*JRLuxBre?0ph5;?=3kw2JE|3mZZE02KAVeoYIb6Mw<&;$Uv+;=tr literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/inhand-left.png b/Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..901127b514fbe60cebc1f3c4394c81e7fac7ff5a GIT binary patch literal 341 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`032l#}znwpxbsi{dxNri-j7#kaFYirxt+2!Ts0p;cA_Rj%QoFzei!T+Iv zA=tk{2qakG5n0T@z;_6Q8AUa`8i0c9JY5_^BHZ6jJIHrffydc7A@|?^Zf%FlE=k*0 zm(5(YXR)FG(~$1J9X}rEX?i%Sv-XQF=wUj=nldLsEKq)~AZwaSK&^p8Q(lH%*0)1( z8U}a2UA^$C@4ay2%WdDbPWtV`FwY^OX}zZ-mlasMzt{u`nU;irB|kERwmWmMtzzOo zP}X3(c>kpxvJ)0;4fy?FJG0ORO@oWOa@Z9f+_#V1&LnU_^TV@GoZCGP+H>%oI9s>) TDwh%?(B%xCu6{1-oD!Mk44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`031o(uwnwpxbsi{dxN!i)i85iJ zy^%mM&H|6fVg?4jLmx!Ml?Z_BnFpO=mfMVVl7*j{y6N+$`||Z{E(yyY?sbP%_ZP44$rj JF6*2UngG+la#{cY literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/meta.json b/Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/meta.json new file mode 100644 index 00000000000..245f1eb1523 --- /dev/null +++ b/Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/meta.json @@ -0,0 +1,75 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Edited by BlitzTheSquishy, Adapted by DangerRevolution from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE-dog", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-kangaroo", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-puppy", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-fox", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-cat", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-sloth", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-possum", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-pig", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-hamster", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} From c34adc87e2f439d6e787f57d068247475f7a7ee8 Mon Sep 17 00:00:00 2001 From: BlitzTheSquishy <73762869+BlitzTheSquishy@users.noreply.github.com> Date: Wed, 5 Feb 2025 13:34:59 +1100 Subject: [PATCH 51/55] Sprites for water vapor tanks. --- .../_DV/Catalog/Fills/Boxes/emergency.yml | 18 ++++ .../_DV/Loadouts/Miscellaneous/survival.yml | 20 ++--- .../equipped-BELT.png | Bin 0 -> 634 bytes .../equipped-SUITSTORAGE-cat.png | Bin 0 -> 448 bytes .../equipped-SUITSTORAGE-dog.png | Bin 0 -> 489 bytes .../equipped-SUITSTORAGE-fox.png | Bin 0 -> 443 bytes .../equipped-SUITSTORAGE-hamster.png | Bin 0 -> 358 bytes .../equipped-SUITSTORAGE-kangaroo.png | Bin 0 -> 484 bytes .../equipped-SUITSTORAGE-pig.png | Bin 0 -> 459 bytes .../equipped-SUITSTORAGE-possum.png | Bin 0 -> 460 bytes .../equipped-SUITSTORAGE-puppy.png | Bin 0 -> 438 bytes .../equipped-SUITSTORAGE-sloth.png | Bin 0 -> 448 bytes .../equipped-SUITSTORAGE.png | Bin 0 -> 634 bytes .../emergency_double_water_vapor.rsi/icon.png | Bin 0 -> 392 bytes .../inhand-left.png | Bin 0 -> 377 bytes .../inhand-right.png | Bin 0 -> 363 bytes .../meta.json | 75 ++++++++++++++++ .../equipped-BELT.png | Bin .../equipped-SUITSTORAGE-cat.png | Bin .../equipped-SUITSTORAGE-dog.png | Bin .../equipped-SUITSTORAGE-fox.png | Bin .../equipped-SUITSTORAGE-hamster.png | Bin .../equipped-SUITSTORAGE-kangaroo.png | Bin .../equipped-SUITSTORAGE-pig.png | Bin .../equipped-SUITSTORAGE-possum.png | Bin .../equipped-SUITSTORAGE-puppy.png | Bin .../equipped-SUITSTORAGE-sloth.png | Bin .../equipped-SUITSTORAGE.png | Bin .../icon.png | Bin .../inhand-left.png | Bin .../inhand-right.png | Bin .../meta.json | 0 .../equipped-BELT.png | Bin 0 -> 430 bytes .../equipped-SUITSTORAGE-cat.png | Bin 0 -> 441 bytes .../equipped-SUITSTORAGE-dog.png | Bin 0 -> 443 bytes .../equipped-SUITSTORAGE-fox.png | Bin 0 -> 425 bytes .../equipped-SUITSTORAGE-hamster.png | Bin 0 -> 345 bytes .../equipped-SUITSTORAGE-kangaroo.png | Bin 0 -> 450 bytes .../equipped-SUITSTORAGE-pig.png | Bin 0 -> 449 bytes .../equipped-SUITSTORAGE-possum.png | Bin 0 -> 447 bytes .../equipped-SUITSTORAGE-puppy.png | Bin 0 -> 429 bytes .../equipped-SUITSTORAGE-sloth.png | Bin 0 -> 444 bytes .../equipped-SUITSTORAGE.png | Bin 0 -> 430 bytes .../Tanks/emergency_water_vapor.rsi/icon.png | Bin 0 -> 318 bytes .../emergency_water_vapor.rsi/inhand-left.png | Bin 0 -> 341 bytes .../inhand-right.png | Bin 0 -> 329 bytes .../Tanks/emergency_water_vapor.rsi/meta.json | 75 ++++++++++++++++ .../water_vapor.rsi/equipped-BACKPACK.png | Bin 0 -> 432 bytes .../equipped-SUITSTORAGE-cat.png | Bin 0 -> 811 bytes .../equipped-SUITSTORAGE-dog.png | Bin 0 -> 814 bytes .../equipped-SUITSTORAGE-fox.png | Bin 0 -> 801 bytes .../equipped-SUITSTORAGE-hamster.png | Bin 0 -> 358 bytes .../equipped-SUITSTORAGE-kangaroo.png | Bin 0 -> 450 bytes .../equipped-SUITSTORAGE-pig.png | Bin 0 -> 449 bytes .../equipped-SUITSTORAGE-possum.png | Bin 0 -> 821 bytes .../equipped-SUITSTORAGE-puppy.png | Bin 0 -> 799 bytes .../equipped-SUITSTORAGE-secdog.png | Bin 0 -> 1108 bytes .../equipped-SUITSTORAGE-sloth.png | Bin 0 -> 814 bytes .../water_vapor.rsi/equipped-SUITSTORAGE.png | Bin 0 -> 432 bytes .../Objects/Tanks/water_vapor.rsi/icon.png | Bin 0 -> 406 bytes .../Tanks/water_vapor.rsi/inhand-left.png | Bin 0 -> 482 bytes .../Tanks/water_vapor.rsi/inhand-right.png | Bin 0 -> 484 bytes .../Objects/Tanks/water_vapor.rsi/meta.json | 80 ++++++++++++++++++ 63 files changed, 258 insertions(+), 10 deletions(-) create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-BELT.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-cat.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-dog.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-fox.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-hamster.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-kangaroo.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-pig.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-possum.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-puppy.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-sloth.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/icon.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/inhand-left.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/inhand-right.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/meta.json rename Resources/Textures/_DV/Objects/Tanks/{emergency_red.rsi => emergency_extended_water_vapor.rsi}/equipped-BELT.png (100%) rename Resources/Textures/_DV/Objects/Tanks/{emergency_red.rsi => emergency_extended_water_vapor.rsi}/equipped-SUITSTORAGE-cat.png (100%) rename Resources/Textures/_DV/Objects/Tanks/{emergency_red.rsi => emergency_extended_water_vapor.rsi}/equipped-SUITSTORAGE-dog.png (100%) rename Resources/Textures/_DV/Objects/Tanks/{emergency_red.rsi => emergency_extended_water_vapor.rsi}/equipped-SUITSTORAGE-fox.png (100%) rename Resources/Textures/_DV/Objects/Tanks/{emergency_red.rsi => emergency_extended_water_vapor.rsi}/equipped-SUITSTORAGE-hamster.png (100%) rename Resources/Textures/_DV/Objects/Tanks/{emergency_red.rsi => emergency_extended_water_vapor.rsi}/equipped-SUITSTORAGE-kangaroo.png (100%) rename Resources/Textures/_DV/Objects/Tanks/{emergency_red.rsi => emergency_extended_water_vapor.rsi}/equipped-SUITSTORAGE-pig.png (100%) rename Resources/Textures/_DV/Objects/Tanks/{emergency_red.rsi => emergency_extended_water_vapor.rsi}/equipped-SUITSTORAGE-possum.png (100%) rename Resources/Textures/_DV/Objects/Tanks/{emergency_red.rsi => emergency_extended_water_vapor.rsi}/equipped-SUITSTORAGE-puppy.png (100%) rename Resources/Textures/_DV/Objects/Tanks/{emergency_red.rsi => emergency_extended_water_vapor.rsi}/equipped-SUITSTORAGE-sloth.png (100%) rename Resources/Textures/_DV/Objects/Tanks/{emergency_red.rsi => emergency_extended_water_vapor.rsi}/equipped-SUITSTORAGE.png (100%) rename Resources/Textures/_DV/Objects/Tanks/{emergency_red.rsi => emergency_extended_water_vapor.rsi}/icon.png (100%) rename Resources/Textures/_DV/Objects/Tanks/{emergency_red.rsi => emergency_extended_water_vapor.rsi}/inhand-left.png (100%) rename Resources/Textures/_DV/Objects/Tanks/{emergency_red.rsi => emergency_extended_water_vapor.rsi}/inhand-right.png (100%) rename Resources/Textures/_DV/Objects/Tanks/{emergency_red.rsi => emergency_extended_water_vapor.rsi}/meta.json (100%) create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-BELT.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-cat.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-dog.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-fox.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-hamster.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-kangaroo.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-pig.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-possum.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-puppy.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-sloth.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/icon.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/inhand-left.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/inhand-right.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/meta.json create mode 100644 Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-cat.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-dog.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-fox.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-hamster.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-kangaroo.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-pig.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-possum.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-puppy.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-secdog.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-sloth.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/icon.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/inhand-left.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/inhand-right.png create mode 100644 Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/meta.json diff --git a/Resources/Prototypes/_DV/Catalog/Fills/Boxes/emergency.yml b/Resources/Prototypes/_DV/Catalog/Fills/Boxes/emergency.yml index 72c738055c5..056b421b8fa 100644 --- a/Resources/Prototypes/_DV/Catalog/Fills/Boxes/emergency.yml +++ b/Resources/Prototypes/_DV/Catalog/Fills/Boxes/emergency.yml @@ -31,6 +31,24 @@ - type: Label currentLabel: reagent-name-nitrogen +- type: entity + parent: BoxSurvivalBrigmedic + id: BoxSurvivalBrigmedicWaterVapor + suffix: MedSec H2O + components: + - type: StorageFill + contents: + - id: ClothingMaskBreathMedicalSecurity + - id: EmergencyWaterVaporTankFilled + - id: EmergencyMedipen + - id: SpaceMedipen # DeltaV - keep spacepen + - id: Flare + - id: FoodPSB # DeltaV - replace nutribrick with PSB + - id: DrinkWaterBottleFull + # Intentionally wrong picture on the box. NT did not care enough to change it. + - type: Label + currentLabel: reagent-name-water + - type: entity parent: BoxSurvival id: BoxSurvivalWaterVapor diff --git a/Resources/Prototypes/_DV/Loadouts/Miscellaneous/survival.yml b/Resources/Prototypes/_DV/Loadouts/Miscellaneous/survival.yml index b24417d95de..1b18fad6d6a 100644 --- a/Resources/Prototypes/_DV/Loadouts/Miscellaneous/survival.yml +++ b/Resources/Prototypes/_DV/Loadouts/Miscellaneous/survival.yml @@ -14,7 +14,7 @@ proto: WaterBreather storage: back: - - BoxSurvivalWater + - BoxSurvivalWaterVapor # Clown - type: loadout @@ -24,7 +24,7 @@ proto: WaterBreather storage: back: - - BoxHugWater + - BoxHugWaterVapor # Mime - type: loadout @@ -34,7 +34,7 @@ proto: WaterBreather storage: back: - - BoxMimeWater + - BoxMimeWaterVapor # Engineering / Extended - type: loadout @@ -44,7 +44,7 @@ proto: WaterBreather storage: back: - - BoxSurvivalEngineeringWater + - BoxSurvivalEngineeringWaterVapor # Medical - type: loadout @@ -54,7 +54,7 @@ proto: WaterBreather storage: back: - - BoxSurvivalMedicalWater + - BoxSurvivalMedicalWaterVapor # Security - type: loadout @@ -64,7 +64,7 @@ proto: WaterBreather storage: back: - - BoxSurvivalSecurityWater + - BoxSurvivalSecurityWaterVapor # Syndicate - type: loadout @@ -74,7 +74,7 @@ proto: WaterBreather storage: back: - - BoxSurvivalWater + - BoxSurvivalWaterVapor # Full EVA Tank, Any Species - type: loadout @@ -83,7 +83,7 @@ - !type:GroupLoadoutEffect proto: WaterBreather equipment: - suitstorage: WaterTankFilled + suitstorage: WaterVaporTankFilled # Species-appropriate Double Emergency Tank in Pocket 1 - type: loadout @@ -92,7 +92,7 @@ - !type:GroupLoadoutEffect proto: WaterBreather equipment: - pocket1: DoubleEmergencyWaterTankFilled + pocket1: DoubleEmergencyWaterVaporTankFilled # Corpsman - type: loadout @@ -119,7 +119,7 @@ - !type:GroupLoadoutEffect proto: WaterBreather equipment: - mask: BoxSurvivalBrigmedicWater + mask: BoxSurvivalBrigmedicWaterVapor - type: loadout id: LoadoutSpeciesBreathToolCorpsman diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-BELT.png b/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..26672b7c9d7e806188306c29e091f7b6b756aaa2 GIT binary patch literal 634 zcmV-=0)_pFP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!Tn#0RWtHn5GE;n9XLD?BSh@i`UX6r{%ui?^>26 zT-OzrWeGnBy2twFGY72zUDsh421cXNUe}k=-kV_U<2!7(TL>ZK)M;xp8sd2}5!u+j zx)Pq}?cKn#(d59-v|6q6YPEX(>G2U^7~(VM`10_8!C>$~o_lO^y}{{px=WG-Q4}Ff zQv^W(P0Q80(#zEVynOn?Fhm^3ST2`Xtyc1s)8{yj_;DnJ5JCtcgb+dqA%qY@$p3{g zCKzMFvMiDPJ^qta*U0^6=vUh9HaO?7Z5y0(Ijx-P8igA$9*<#~CN`T5Y}=O8N_9FN zO?8dJ4ZzEpf!%H=hm{)+hlw2fr?RsG&1UoanE`o@YOd=ltx;$N7>0rOcXu!h18;9{ zQK{ABDWzAa0RS+c&mn}sVzH1@%6Xo5CZ3+~Jeeq41qU~PF=oVZj3|l_$1&FHwelTW z*6a1sI8E{9=0;8(tk5Yh$8k&m>m*5DX`1%c_x(cm%cEYepX<85{TsCiA%vW|Z;4gM UH8N*c?*IS*07*qoM6N<$g4*>S3;+NC literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-cat.png b/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-cat.png new file mode 100644 index 0000000000000000000000000000000000000000..1a477780f7abca57e089623cc4050e3e79d807f2 GIT binary patch literal 448 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1^2Ka=ys;a6=NJyBNn0R=2XlZGMhKAbN*%>^WnV+9;WMuT`{CQ(d&EKa^ zJ()clsAHeh{F6Y6za+>n_&*9@xN>L4LZB39fk$L90|Vb75M~tB@M-`$g3;5(F(ktM z?X-(|hZT5Sdz)ACYX1MfQ@F>#N6qNSmiErYUY>Ve2fMFi5)g0PXK-39$MMm6Rt7eQ zuRdIh98Fdks52zEX<=%>CsWV+d)mRh$&T_~oWJ-Ld>S*y-G9)!< zLk;(X6ECNEI==aL;&YR9^aj>W-5X6u?1dUy6qJNq_HVT=atPXHHjR1X_cLeaWtxb5 zOn;?aCMz@7M{>EjfK+zwsSlCU+qDYv!zFwY`oy1{*?lbQm({_#rx}bp%G9^-lMwto z-J;4MwK{mw(kl%=jhCH&G5_#3T#|3%)9!iMN4+gY2{3k>fYrg3jm b_{hlf>LyRjl80A-A;jS6>gTe~DWM4fP2sd^ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-dog.png b/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-dog.png new file mode 100644 index 0000000000000000000000000000000000000000..9fc2615cc096fada80d7fe605dc9dbf4b39056d3 GIT binary patch literal 489 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0p1o(uws;a6=NJyBNm^eB*rlh2}ySvxc*7|rSwYRr>czC40+MJh{7Z(?2 zWMrhJrS<3h`OwhN{QUgir%u_~*%@nUKAAn+;Mq)|VN zfND4kJR*x382Ao>Fr%o3R|C+YY@RNTArbCxrzPe$D+simf4%F~En&YmKmPwOX;ge# za8PhoT}DOHqIvIalT4UyxGCsgxx^a#pkgaS0)v3W$zC{7*4VRBg>U0HF6>-$W z9lLDO31pqQUb<)EiV&`Zuw9-Gv!q$i+)<0Ta!D+|o_2H;Y}2KXR#?^Ym;1-lZ&GqG#GD=ePeC zJmI0{u(9D+x2EJik44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1^2Ka=ys;a6=NJyBNn0R=2XlZGMhKAbN*%>^WnV+9;WMuT`{CQ(d&EKa^ zJ()clsAHeh{F6Y6za+>n_&*9@xN>L4LZB39fk$L90|Vb75M~tB@M-`G{_%8i42f`m zJMDE}ivo|E_fj8jzW4ukNJpe-<`r=KSDQ0q#n;CX`hg01Otp#AbZ;~r5zBE*3SvlL zxH7}j(WJvo^chP+Ph-cbEAMQW+Ev-xwYFNH-=i~m#i=C>YvP4DbjuXZ>`~!ZZr{Ah zhijTXql~3(N|3;A@yfV@WbSPW8(E_#{7_=_;80R>{1U!fnO!CI^?^-F-{#G{Y1}(Y z>7Vc4qwA(Fo~-%!3yV|oT3<=K*Y6i{-MKBwCOhLXtL5i)8)xk^+wi}53q#E2$+ve% z2!3{yv7KSGSMy>})`2}eFO7ed{OELWw_;qyd8J;)_jl*JCVA-{u59IRjQ2TwV4kFX W)8Xwwk9c4>FnGH9xvXk44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1k1^9%xN=Qf;85xC!hUVwzYiViyIe-4i?Adm9cB-nXKqVI5T?Rmkt0c%T z_&*FVY&xTJ9w^FL;1OBOz`%D1gc(IOyc&RlyFFbTLn7SYPCLkVSb?KWkmc>~{T~i( zTFP-&CX(O!L+q;kKW0`rTGX-BOjycNugP(cE&Tq1wT;TJVw+mBA9S$0JavD>Xz8fF zY@eH?|_y?>D l4+u_sFP;K6?2bYO!v*0!)sC6I@j!1dc)I$ztaD0e0sxX@f=2)V literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-kangaroo.png b/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-kangaroo.png new file mode 100644 index 0000000000000000000000000000000000000000..0b5ffd48560a4b15693bfb8cbe8557c36ac65d78 GIT binary patch literal 484 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0J2Ka=ys;a6=NJyBNn0R=2XlZGMhKAbN*#*8>k)NM$WMq_`o&D$h`HYMV zGcz+|P0in@PCc1D+u+$upl%HfR&F3AToU9L{2v1_Y^uG(0hHz}@Q5sCVBk9h!i=IC zUJXD;iF&#?hD5l(oq9L#umX?U+5EQ~C-!}>zrh*BBq7wfakl52*(TqPb1I5DM6gsO zPSd^7bi!VkfrG&;$xEPRO4C#|7OoZnfh9qurA`74naK+!?bJE=d)p#%y*@0wJL|z^ zopTSk1;bfR$-n!c-R<#GwC=wob42n_hBE!s>hmxDotT?24`ilTj^mT}EDraC1uGv( zm%C;K`%EkRnRUU^#ijjOQJCQrqtF+7qKX%IM$|RU=U7|n^B}P7xzYyz-_MHJoNArD zY`j;reAd62e^;_$&+G4pFU|b$=+|k7lObCt$LzI?W}Emcv$^cF#s!~pkrfi#Zhx=c z{*E#K`~v literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-pig.png b/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-pig.png new file mode 100644 index 0000000000000000000000000000000000000000..91dabfcb3d08686f68792f1c8d6fa9368bf29b94 GIT binary patch literal 459 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1^2Ka=ys;a6=NJyBNn0R=2XlZGMhKAbN*%>^WnV+9;WMuT`{CQ(d&EKa^ zJ()clsAHeh{F6Y6za+>n_&*9@xN>L4LZB39fk$L90|Vb75M~tB@M-`$g2&UvF(ktM z?X}IOLa&8%D`0&GLswhdN#5A4`4`OI5Nla zV4^^;Mi1u!31;@LAnP5hX0L5>7G2?cR~b>Hqt(o`A<^$Z-X>C_iuIDX=cOys_;qLv3Vqt&N%FBa(NVA|;ytT`=s z{f)|xdFsAhE%&M{w6-Y3@Zxg;ofy-CtP zp=$nRGWlLxrbrpo|9a8$$MTPhg0fe`BZjYiYcuT^iq+gcp!(@{(>Y;_oiht>H}Ui^0>?&t;ucLK6UXqqgDz literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-possum.png b/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-possum.png new file mode 100644 index 0000000000000000000000000000000000000000..5048181bff92fd7cc335bc3e60108becf3726484 GIT binary patch literal 460 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1^2Ka=y8W|ZGYig>hs)mM!=I7`CIe%VDOY8TkQ+9TC5)u*~9v%kIWs-apxl#Td z3l7*a7QFn;dXOzE<`(BVBi3LAkOTgE8oc`7mQeTN>fwLuCo0X6uVY>OZ@p#H&xe{4 zU+R5L>}}#JF8nvW_-Dbsh&v!U!M^gsf5vde>Sw?0A8-Xc_+|g#8T+5?dpZZi@90Uq ib71EVD4404@s|73lIw1XJ-VRqWbkzLb6Mw<&;$Ti$G&3# literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-puppy.png b/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-puppy.png new file mode 100644 index 0000000000000000000000000000000000000000..6b5deece8cebcaea15d43a6230bed349f936c037 GIT binary patch literal 438 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1^2Ka=ys;a6=NJyBNn0R=2XlZHL+1VL9n;9A!YGh=TpPz56srmcVsXyn> zKbbunsAJvqRmXr7e@T#E@P8D*aOKX7g+M9J0*}aI1_r)EAj~ML;ne^X{O;-E7!u+B zcG|^t%?dni-mP0*pZ~Uh=V@NJ%~-jmyZEwxcia9Cy}rU+zf~SI2RaEbsj?^ru(2+< zair&$ijSFuu!Glz#l2@%ueGoMW|ATY)-+^>DHy4*cpa5%q%q?jWj}6{Xg0lpMHJnVn?Sx zUp$|GQ9g37_~7;Dhf8;@zuUBbmr4AdL`TyMi80Kl-Jbc{4 RUk?}r44$rjF6*2UngHPWwSoWu literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-sloth.png b/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/equipped-SUITSTORAGE-sloth.png new file mode 100644 index 0000000000000000000000000000000000000000..dfb17c0a0a2607794c41f42cf5ceaff680fe2610 GIT binary patch literal 448 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1^2Ka=ys;a6=NJyBNn0R=2XlZGMhKAbN*%>^WnV+9;WMuT`{Q2LfP8n-z zKAAlmsAJoX+SNdcza+>n_&*9@xN>L4LZB39fk$L90|Vb75M~tB@M-`$g3;5(F(ktM z?X-uh4lD4uC9g6IeE!@1UBH^_H@f#ey3ya=?sWal=}fP7zDG(I#M5pz>3Y;eGb~_m zIln|f%SDx|m?^-^(IqfTU#`(vn!8Lydc+cVquNeF(P zZc$~Jnyr5^DCgDPlXB_h{;s0ZCK=)JT!3VrCXUcm(UdeIn a$$z-!#t&V-N(W#FF?hQAxvXPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!Tn#0RWtHn5GE;n9XLD?BSh@i`UX6r{%ui?^>26 zT-OzrWeGnBy2twFGY72zUDsh421cXNUe}k=-kV_U<2!7(TL>ZK)M;xp8sd2}5!u+j zx)Pq}?cKn#(d59-v|6q6YPEX(>G2U^7~(VM`10_8!C>$~o_lO^y}{{px=WG-Q4}Ff zQv^W(P0Q80(#zEVynOn?Fhm^3ST2`Xtyc1s)8{yj_;DnJ5JCtcgb+dqA%qY@$p3{g zCKzMFvMiDPJ^qta*U0^6=vUh9HaO?7Z5y0(Ijx-P8igA$9*<#~CN`T5Y}=O8N_9FN zO?8dJ4ZzEpf!%H=hm{)+hlw2fr?RsG&1UoanE`o@YOd=ltx;$N7>0rOcXu!h18;9{ zQK{ABDWzAa0RS+c&mn}sVzH1@%6Xo5CZ3+~Jeeq41qU~PF=oVZj3|l_$1&FHwelTW z*6a1sI8E{9=0;8(tk5Yh$8k&m>m*5DX`1%c_x(cm%cEYepX<85{TsCiA%vW|Z;4gM UH8N*c?*IS*07*qoM6N<$g4*>S3;+NC literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/icon.png b/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..38b79ca0e778e2369b5d7bbac81b436ea162abf9 GIT binary patch literal 392 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCik#1AIbURaI3bBqTgMJaTe!OiWCoqM{6*&9t(z%FoZYv$M0%)eQ{|{e9}x zpY!L9H8r2io(k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1E2l#}znwXfVs;WvzNZ8rgnVFesX=&x>=ZA)dhJ}UY<>gsfS$TMPfXtJ7 zp9G|MOM?7@|04kg+ZRf0KnczQkH}&M2EIce%qXhi)c_Pcj9ruzOTQ>wL~kS-+6IaVCXzq;oq)_qLcWYckP(Pz_fz%K|bS^os5UgFZ|qi*k#S? z%@Gbq7$@mP2?VsRS*26{#>v5AYT${b4{F&3{Jiy_s9OG(Q?SYDS*|FzK+iG$q@Z|( zIU`GeumgiB;~#?uR~|HKMs*bM|C9B(c&LZE4EnkNf8WeZ%1C>gTe~DWM4f DWYCCR literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/inhand-right.png b/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..90b5b348d1abc116e4955e2f1e2980918bfdbd25 GIT binary patch literal 363 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~u2Ka=ynwXfVs;WvzNZ8rg85tRAX=&x>=f}mxg@%S&Sy=&9`F`H_4oGpA z1o;L3hXV#Lf5uNhVa@`N$YKTtzC$3)D5~Mr02JKg>Eaj?;r@2oZN9?_91glxyFdPy z-xHC|)Ub%fNp$xn-vUN*Dr@qED?7W1H~iCa#6he~o&Yt0!aRsp>`jhrWbPVhMA zJAvmf$NHf7o2;70f7ZD~6dQ*)R?Yq;sJL$TLaqZh{H<-fZ#v75Cw5mj&rM_b%I8wBPbGs* sX-0(56ecq!OMm5mO`_s|96qp?OV7QzZ2kFopg$NqUHx3vIVCg!0P>uHN&o-= literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/meta.json b/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/meta.json new file mode 100644 index 00000000000..20f4e7c5aa8 --- /dev/null +++ b/Resources/Textures/_DV/Objects/Tanks/emergency_double_water_vapor.rsi/meta.json @@ -0,0 +1,75 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Edited by BlitzTHeSquishy, Adapted by DangerRevolution from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE-dog", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-puppy", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-fox", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-cat", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-sloth", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-hamster", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-kangaroo", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-possum", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-pig", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/equipped-BELT.png b/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/equipped-BELT.png rename to Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-BELT.png diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-cat.png b/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-cat.png similarity index 100% rename from Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-cat.png rename to Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-cat.png diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-dog.png b/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-dog.png similarity index 100% rename from Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-dog.png rename to Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-dog.png diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-fox.png b/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-fox.png similarity index 100% rename from Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-fox.png rename to Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-fox.png diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-hamster.png b/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-hamster.png similarity index 100% rename from Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-hamster.png rename to Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-hamster.png diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-kangaroo.png b/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-kangaroo.png similarity index 100% rename from Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-kangaroo.png rename to Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-kangaroo.png diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-pig.png b/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-pig.png similarity index 100% rename from Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-pig.png rename to Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-pig.png diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-possum.png b/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-possum.png similarity index 100% rename from Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-possum.png rename to Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-possum.png diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-puppy.png b/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-puppy.png similarity index 100% rename from Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-puppy.png rename to Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-puppy.png diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-sloth.png b/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-sloth.png similarity index 100% rename from Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE-sloth.png rename to Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE-sloth.png diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE.png similarity index 100% rename from Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE.png rename to Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/equipped-SUITSTORAGE.png diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/icon.png b/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/icon.png similarity index 100% rename from Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/icon.png rename to Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/icon.png diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/inhand-left.png b/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/inhand-left.png rename to Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/inhand-left.png diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/inhand-right.png b/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/inhand-right.png rename to Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/inhand-right.png diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/meta.json b/Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/meta.json similarity index 100% rename from Resources/Textures/_DV/Objects/Tanks/emergency_red.rsi/meta.json rename to Resources/Textures/_DV/Objects/Tanks/emergency_extended_water_vapor.rsi/meta.json diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-BELT.png b/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..0da6de00a074346da4242702006d657e776a614a GIT binary patch literal 430 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1engR`fLV@O5Z+gpZRtp*~j7hX3gG)o6aYjb-a zy!NhHdq(dWzcfj`165`VxII!+6K5wRKMXNj|Kowbz~|@lKDGY%pq2TFK?wvlUHx9G zo?ZT3k=yLlrYTEr7fUttOElc7HkX}OPd}){cQ7J zDEglF{qM1}mQ}}Iub#E+w~6oE_3{5cT#^@PQ(UBR$be`0xBC}YItOTq*8HnWzHPSi z$=YB>h6CSzINsj2>CM{9j4pvKmGe?>MlWZ+5S1J$ma+EfrT>L8Z7xW_ZsWeYQ;nIu zG+(FN1&bVgx9RxH)rKoqX-OncNR{j{EV^lV-F6ML#BsqwndI1T6;Gw*^>ZY5Y!Vj~yeR#fIWQ^z%c<33uYh69 N;OXk;vd$@?2>`a0ucrV2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-cat.png b/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-cat.png new file mode 100644 index 0000000000000000000000000000000000000000..7bbe6010c8ec82c78cc7db77610bdbd28d3afae6 GIT binary patch literal 441 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~e1o(uws;Q|-NlBTSntFJ6XlrZ7#>U#&*%>^W84?m=Y;2sDm-qYBsXyn> z8*6GlnLQh*DQltcA0Q=A666>B9~Ce>P>z)Z%5fHWL>4nJ@ErnSMo|r~2B6?KPZ!6K z2=}+sUh_38@VI&JjQDWq_x`s`j826I1*iRuurLgKeLcBXjj2v3gL|>gK_QkpT?PS$ zHR%BlSQjO<8ZvSy9#Gc4s@~raa;qU_>8~d&Sy|SblFj&zYvq zu$VVrQsl=oXF2gZ5lyNbAd~)iFnrt6sdn(h%*)e`ZBed$(XsemfQ#O;KB3dr&bt?P zJmlu+3(`ut0LwF@&T}kIc>>1aol{Hf4tzTw$UGrjeY@Rz!N;y|_RiR{$Ma&y zsslT|W*Yw~`_b9pF2%Ts^@??hY2AX#2ge!nCgyWn7P2mI6nz9!@+AoVw Q14Dqp)78&qol`;+0I?LXeEk44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~e1o(uws;Q|-NlBTSntFJ6XlrZ7#>U#&*%>^W84?m=Y;2sDmuIZ0`TNwV zKj+UsnLQh*>A`%(k3dSGB*-uLKPq5&pd2d+l;bS$h%9Dc;5!7ujG`J|4M4#ko-U3d z5$D5GAmEDTwT0y%Qnr@YY{g! z->&u3*wwIrLow-CRcsx9=mNc|l0FB1FlrWGjqsh${N}%mE<2rEQ7>}@uG?7oY=PUeBw&us}G*tkB+CT~mNR?`1DgTe~DWM4fhK#E{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-fox.png b/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-fox.png new file mode 100644 index 0000000000000000000000000000000000000000..b4c88309b1ce458621194cb67167b2f07e86a16a GIT binary patch literal 425 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1^2Ka=ys;Q|-NlBTSntFJ6XlrZR+1VL9n;8-kl9!iftf~3?)G1?Q<3H!m zKbbunsNk44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1k1^9%xN=Zo>8ykm&gyiMrX=`i$K6UEP`SW&mc4}&BKqYTZ7GwY^u96_X z;Quhdu<4A>d7vm~fk$L90|Vb75M~tB@M-`GuJd$p42f`md-Wn;vjR`+!%NIg_y4y} z*HgQ+iFJ16_J8JCt@_8LJ?eV?C`2)FX4G@&yqMj!)?2&>bwAeEYX4xBixAr}?fQA9^=lR9x0A0@D>FVdQ&MBb@026hCssI20 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-kangaroo.png b/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-kangaroo.png new file mode 100644 index 0000000000000000000000000000000000000000..232f2c9b3e51f8dd972844cea9714f4e8b95f9ab GIT binary patch literal 450 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1^2Ka=ys;Q|-NlBTSntFJ6XlrYSgoN1H*%>^WnU|Mm393 z*|UKXO5dC-A{ZKiGhEp1m*wQ-bm?7C#To zh?UL@6j~Z4dp*6%*Vr88u~_1sdcpdm6H>S8F}kr%b7MU=L$EPwdu_D4nBks7-{)U+ zocxUW#@;DUZ5RJi4sWVkmcV5LGV(rWLU?tMT2WHc*36halWzJp1vaxzPNGwqQn{_JoT$)8AKbo5z|uT{j}bjw@pF`X6U+u<#c+iYA1-^}29c#HaB& ZvuMEeubGjhw!koA@O1TaS?83{1OTK7uz~;p literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-pig.png b/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-pig.png new file mode 100644 index 0000000000000000000000000000000000000000..23a6da6f4481adce983f2c5291fdb667304727c7 GIT binary patch literal 449 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1^2Ka=ys;Q|-NlBTSntFJ6XlrYSgoN1H*%>^WnU|Mm393 z*|UKU7;BnQTYP6v5|NouRvI!Y?4+worEI-uQ8Ki$)$d~1~!iCnjWe?=J7??XO=QbS{ zkPLhwd_bbP*=41S$-$(XiGoXuE<8)LWevgKK?1_66;HQcg_iA>Xu*qgk#NDeoK1vP0cNNWy89~ zedkUbzv$0mw1`E;Ea3h|k+<_#u$oKnaIK3DsATRu)|19<_2D~9RgE+ImmRY;e{dWW Z=X-x6=7Y*ALtqdwc)I$ztaD0e0sy%9v$X&K literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-possum.png b/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-possum.png new file mode 100644 index 0000000000000000000000000000000000000000..b0e61db129e66c54d1cad2718377199f92be9301 GIT binary patch literal 447 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1^2Ka=y8Uul*rka{sNJvOtUf!Sc=e4!9f1f&KXJ;oRCFSAaVeo9`li9OP zO-+G1mfdl<2&DK+g8YL2qX330cV;XEN^ur=L>4nJ@ErnSMo|r~2B0GtJY5_^BHZ6j zyUW*Pz~gq@Dq+Fh-}dVy4I=-WxUBQ>-*aJ`rC-`7(<${KF z-kOFyYrS865neLakkQ!1_@qaWW{Jov>5k@SH4u1^wD)j%i;7i=WP1xv|(`HE^c=AQhM-odCR@bkRDZ|48kYb+aNcEl#!YhV?RImWtl a4}(eN_4u$Z9|>RpF?hQAxvXk44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1^2Ka=ys;Q|-NlBTSntFJ6XlrZR+1VL9n;8-kl9!iftf~3?)G1?Q<3H!m zKbbunsNt=`Ln7SY zPP@q0tia>y&B*=g&;RqWR*t$-o`(;|Rc+c)z@2X4tC7>}Ae~{@$SEN_qal#1VPdDm z*TNSm3xperH!SQqvV#4Gz`@fVJ-d7w7x_$Kk`Q%~5?x}VcH;A#)I}mZ_nD5|SQEgt z?V0N}?z|ZXSb8{p4$N@Sjo_+W$$i>fXXmwbpYxX-nzdrxo%K_$1+8jLcj9ny$y`=- zK*Vv0Wnrs^nQqU4pPWjcE&Wz#J;->T%g(TMzh#=~|D$c&H^27EoFH)C?&XX)r#H6Z ze`@{KUA}!w`Ny@TTaT*$N&Vd;vLNT7TxQ+k;^Vdd^nWn5I^106s^pai^f`m4tDnm{ Hr-UW|9iXlq literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-sloth.png b/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/equipped-SUITSTORAGE-sloth.png new file mode 100644 index 0000000000000000000000000000000000000000..07e69b227209e94d7d8e377ecec2d683f60589bb GIT binary patch literal 444 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~e1o(uws;Q|-NlBTSntFJ6XlrZ7#>U#&*%>^W84?m=Y;2sDmuIZ0`TNwV zKj+UsnLQh*>A`%(k3dSGB*-uLKPq5&pd2d+l;bS$h%9Dc;5!7ujG`J|4M4%4o-U3d z5$1ol)FkvcyP}A@Mqk+o{llk66ylzc=yJ zl7vd8fS`-hJRM)iJ*hm{t9zsAgxH^{3_Zp(^&B-M)3cK8GAd8CTwT0y%Qnr@YY~c7HkX}OPd}){cQ7J zDEglF{qM1}mQ}}Iub#E+w~6oE_3{5cT#^@PQ(UBR$be`0xBC}YItOTq*8HnWzHPSi z$=YB>h6CSzINsj2>CM{9j4pvKmGe?>MlWZ+5S1J$ma+EfrT>L8Z7xW_ZsWeYQ;nIu zG+(FN1&bVgx9RxH)rKoqX-OncNR{j{EV^lV-F6ML#BsqwndI1T6;Gw*^>ZY5Y!Vj~yeR#fIWQ^z%c<33uYh69 N;OXk;vd$@?2>`a0ucrV2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/icon.png b/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..d83da2df0e45accba6ae6dd277dd9826023104e3 GIT binary patch literal 318 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCilI0(?ST)zs9aq@+ANJhHR1O-)TBBO|r7we9TeLPA0ep3O8iHqOh-i;ay1 zDmPeo<}#4tD+%%o{*Me8To2qi0hHk^@Q5r1DmVnfjG`J|4M4$WPZ!4!3;(AV5Arc7 z@~~XcJYA-B;{X437mr*h%ifdSZ_FRWbZxpL-={x%4gC5H5tm|SG4e4kd2hiu=h9aZ zb)yOEt~`6^;UJaK^2S!_0Phy@h#*E8FVjz#jgN=S%6wrfarw-pO8!@M%?CG?Klpd& u|0QdKlZ*JRLuxBre?0ph5;?=3kw2JE|3mZZE02KAVeoYIb6Mw<&;$Uv+;=tr literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/inhand-left.png b/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..901127b514fbe60cebc1f3c4394c81e7fac7ff5a GIT binary patch literal 341 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`032l#}znwpxbsi{dxNri-j7#kaFYirxt+2!Ts0p;cA_Rj%QoFzei!T+Iv zA=tk{2qakG5n0T@z;_6Q8AUa`8i0c9JY5_^BHZ6jJIHrffydc7A@|?^Zf%FlE=k*0 zm(5(YXR)FG(~$1J9X}rEX?i%Sv-XQF=wUj=nldLsEKq)~AZwaSK&^p8Q(lH%*0)1( z8U}a2UA^$C@4ay2%WdDbPWtV`FwY^OX}zZ-mlasMzt{u`nU;irB|kERwmWmMtzzOo zP}X3(c>kpxvJ)0;4fy?FJG0ORO@oWOa@Z9f+_#V1&LnU_^TV@GoZCGP+H>%oI9s>) TDwh%?(B%xCu6{1-oD!Mk44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`031o(uwnwpxbsi{dxN!i)i85iJ zy^%mM&H|6fVg?4jLmx!Ml?Z_BnFpO=mfMVVl7*j{y6N+$`||Z{E(yyY?sbP%_ZP44$rj JF6*2UngG+la#{cY literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/meta.json b/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/meta.json new file mode 100644 index 00000000000..245f1eb1523 --- /dev/null +++ b/Resources/Textures/_DV/Objects/Tanks/emergency_water_vapor.rsi/meta.json @@ -0,0 +1,75 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Edited by BlitzTheSquishy, Adapted by DangerRevolution from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE-dog", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-kangaroo", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-puppy", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-fox", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-cat", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-sloth", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-possum", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-pig", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-hamster", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-BACKPACK.png b/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..a77c79467016a98ed252a9a98dedfda3844a344c GIT binary patch literal 432 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~e1o(uws;a7*n3#BYcxY&7NJvN+sH+&`>Qct+=?j zKj+Vfg@pk%)kVZe0V#o!Aiv=MsDR;ta;zj!jEaj? z;r@1-w@|YJkAtvxuvF&W|GCx+7PTy?d$sCtw1?d}X*C^&HhIQK3ol_4$0Y(ioo}!F zy3SSb_3DLR)44Wyd#6ioU}kCA6wh%)EAY2F%l1rD*5Vx5=3Dlgn9J3bn%bkq`R6o! z_D_4Z@BQ_*Pa+J~mQPv5;}VYunGUjSc+c%S1$9^fcwP$;zHqXH#cxt zEU~Z?d^SsEpIneYgkZ(I!?{~zd7hN4Tx04UFukv&MmKpe$i(@I4v4t9{@kfAzR6cusQDionYs1;guFuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|=;Wm6A|?JWDYOU`JUH&hyL*qjcYshYGtCN&1DbA| zsYG1NWLL%DD|+Ea01=GI%rfRADT$8b>mEM7-oMD5y92^28 z1kfk;3`R@2Sn$I8 zzwH76LUF+nmi<^bF;VN+V~r*PeiCR4qb$J^1b!_55CE)aP~ZikV1+RO2qC~DE7d2D zfK=LmWTpD#nN5+ltTHG7<>mxd>si6<1pBei31%k%qYZBv6!_*t9v9qLf+Ywn!4d@i zNC5V4Tx04UFukv&MmKpe$iQ>CI6K?{mFWT=8*K~%(1t5Adrp;l;qmz@Ois^Fr;eVrB%~%ZZiNv$aFm2)u;^|G> z;Ji;9VtH95J|`YC>4LwAiI9>Klt6Pm7SdMl7dm7{l#%UhJnB?P^&o3_p#&DP5}QiaHTi=r7AGizuyT%vNGdkTGA0000mP)t-sCMG5t8X7e~(TmB;n;gxh229(SK0|MZp9pBA6ChbYy@NO7 sN4f`o9N-rDwqWoE3iBOfwqOe)FZq<{Q<6^UrT_o{07*qoM6N<$f*|f^?EnA( literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-fox.png b/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-fox.png new file mode 100644 index 0000000000000000000000000000000000000000..c466744d3a88b1f505d9a0840dbc61ea7613d0fc GIT binary patch literal 801 zcmV++1K#|JP)4Tx04UFukv&MmKpe$i(@I4v4t9{@kfAzR6cusQDionYs1;guFuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|=;Wm6A|?JWDYOU`JUH&hyL*qjcYshYGtCN&1DbA| zsYG1NWLL%DD|+Ea01=GI%rfRADT$8b>mEM7-oMD5y92^28 z1k5P*5Jt!G(x~P8KklNd z;@Dy<{tFL5IenhA0)?;$^o3crU<)E!umzDx0e}EteI^A#APQEP6Mzr`0UWV9!pFnj~SQA))O`MNw*fw@d(FajYDNSUj~ zYPwutzjCwyl-)^Yp7SJ00000NkvXXu0mjfkY8RA literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-hamster.png b/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-hamster.png new file mode 100644 index 0000000000000000000000000000000000000000..bdc52b7f90d7b39fd1694ab73cc5e23503d31580 GIT binary patch literal 358 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~u2Ka=ys;a6Q85xC!hQ`IkX=!QY=jZ=Eb?VRg^LBQ25)u+XRb1P(cL6Ex zk|4j}|8T(I<4?LrugR?J7lnR!AK*1R_-nCD8AGLpLy}R~f?4YyI0*;?=Z;49obYx0h~x-TWYYhhk2iMl_?i!UHjf lcV9m{Y+(_aAXLFn!5DgMp2&3eevlU!JYD@<);T3K0RXivfkOZQ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-kangaroo.png b/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-kangaroo.png new file mode 100644 index 0000000000000000000000000000000000000000..12ba6b71923d0d168826388bd4f8d0063fb6cdfc GIT binary patch literal 450 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1^2Ka=ys;Q|-NlBTSntFJ6XlrYSgoN1H*%>^WnU|Mm393 z*|UKO=u<5X=vX`myRJzX3_BHZ6j zy~x+BAiyI2L1V?!|MuG*T^=|Hd&SQ((7(1j)g^}^PvC=-ey{=SJbPgVrUd0(EPfuE z5i6Y+D6}+8_Ii4iudzAGW3j|N^@8$TQQM`HKOmCfO7{H@viF@h)?5l ZX3>D_Uo#_1ZGmCL;OXk;vd$@?2>^(fuxJ1P literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-pig.png b/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-pig.png new file mode 100644 index 0000000000000000000000000000000000000000..0c1e5d6c94fe22f55b40c09c42394ae50484d5e5 GIT binary patch literal 449 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1^2Ka=ys;Q|-NlBTSntFJ6XlrYSgoN1H*%>^WnU|Mm393 z*|UK_H z(%^y>{5#_dlDU>WNCDy}%`6<*9V=QCQm;)=KPLS9?*0c}!4D*E73<8E$)Be`=Z*tM z!dhG7y3_mHbqf5&SC%A9V_$d1`1q%wORO*L-8mMc&R|!D=qO!?i9tppv=sSWg=?EwDJG| literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-possum.png b/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/equipped-SUITSTORAGE-possum.png new file mode 100644 index 0000000000000000000000000000000000000000..8f5fe6a29d02b1c47ba6fbd6fc646fdb2edaec03 GIT binary patch literal 821 zcmV-51Iqk~P)4Tx04UFukv&MmKpe$iQ>CJn4t5Z62w0sgh>D1lR-p(LLaorMgUO{|(4-+r zad8w}3l4rPRvlcNb#-tR1i=pwM<*vm7b)?7Nufok;K6Y}-ralLy#s_=iD_2H7@+C4 znT*H8bY@iyyrKtwgfN34nOVl1Bqh*xeBHyx*Sjds!v99Enzb0<6NzV;VcNtS#8aEL z!FiuJ%nGtfd`>)S(glehxvqHp#yRh@z%#>UDmhOaCKmH8th6vIm>TgUaYWU0$`{fe ztDLtuYo!Wn+>^gBnAKO7xlVHsaV%m95=1DdpokJ|L}}GYv5=(wSR4O<>zBx-kgEtr zjs=vVL3aJ%fAG6oD>pIjB?V(Z=ZoWf3 zEBngIK0ZDg8X8DQNHFG^PY+pTPT6-?e34O8$c&Z-SJnhjEk> zx8pUY?bSo+N&!wVWE%yme*8*GD^yS*z5x*J`vuAcwurV6T*U+?D44(mg?|$C@}HsX z4|Tem{|se+cnf;@&rtS4Tx04UFukv&MmKpe$i(@I4v4t9{@kfAzR6cusQDionYs1;guFuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|=;Wm6A|?JWDYOU`JUH&hyL*qjcYshYGtCN&1DbA| zsYG1NWLL%DD|+Ea01=GI%rfRADT$8b>mEM7-oMD5y92^28 z1Mej70000FbW%=J|NsC0|NsC0|NsC0|Nj8g z+?b&N000SaNLh0L01FcU01FcV0GgZ_0002)Nkls#?Pztu@Mb-;$n7{;#2~5D4KrL7bd8rG_ zH!Qi|@QmTb#LI^}eX{LI>6hWjpafK*0EsVhV2_o}3PN*v2XyfPDQCGYp+^1z? z3E?B*F+&b0e693&onI8E>-?eEh=k_Au6laYEgWxQEo0<_M}>X4Y)NaJN8QAe%rAwd z4$2(DBt!r|UgDHkCrgoWsd>rlZ{I}Cw@5)en*4Rj7~)8i5$~9&CFz=!ni4%JUzW1U z{db;bYHG6H-Qx%6vt_*xgKHP670dcQwyf$2IG*4#-}DzGr?LV0)kDGH2k|KQ0sIu=r$`LF0wh2JBtQZrKmsH{0wh2J{~>{uxYz7#-geh+q()`D z|L`$XO`)7eSuS}}c=*7*d(V;P;dfbEy{6QB`|?>n9e#~vJytmHAH8z73y)kp0RVy^ zPxkhd4HNKc80V6GMN-u+YxI3i9|w5rINtfj@SZN`SV+9wVGry8D(*8Gh+R-p}+l6c-Y^6 z8(7>!0wh2JBtQZrKmsH{0wh2JBtQZrKmsH{0wh2JBtQZ&ClJ^d!2j;4^^KWIESJlH zv1SSq!l_s+&eRJ${&5u8Gnm*NM)8H+$Ex$ziLiE zo8vf2TRNSVZnrz83v0MvsZ<2oyfIPRL;%>;@AqM(Ua!kwFwnu&8s1KWE5BbS$D{RS zPmt@~+XMANuI-&IUrIDgp|98L`RG|YXzxp_>*cXPoD$aQD)mK?m? zl2z}V!1*F^oy+BX>sB(%{@XH8vm{$2i1WI1>}guHpS3j;m~-oZb8a*>nDaTq25;Aiv<>!N?p>`x+pyWJ4@e+k z6b>apgKhC)VU77;O42a}XBYEmv3>&1(#Lyd4d7((GcuLWqs1CPWU8kS5+DH*AORAv aCh!*kgyTYeTv5;f00004Tx04UFukv&MmKpe$i(@I4v4t9{@kfAzR6cusQDionYs1;guFuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|=;Wm6A|?JWDYOU`JUH&hyL*qjcYshYGtCN&1DbA| zsYG1NWLL%DD|+Ea01=GI%rfRADT$8b>mEM7-oMD5y92^28 z1k7jl3`S$T)LZNO zzwJ;|j2(93*pK01&^7&XmeHbxun6>pS+-ycBEJ>@FaXjsDF_Uak;0q+7-JBSl-iR= zfD5UBlTv%~%ptTiq%tW0Vb=sk%2mPQ1kRt{k;+*U(UwU;=pN*G!Hq50g2)#9 zl>m%0nJz&n8E0x^K4^K$gw>;=w6-aA)>t_x?X6BIx_MHB5HVxDE=yw-s7qxA6EJ>2 z%3L*8)8z~Ht7Z#8*_m&BAt0uUIJz-;YtPYKYQXdv(`V?<;U@wb=>$k#9^S#5@gvk44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~e1o(uws;a7*n3#BYcxY&7NJvN+sH+&`>Qct+=?j zKj+Vfg@pk%)kVZe0V#o!Aiv=MsDR;ta;zj!jEaj? z;r@1-w@|YJkAtvxuvF&W|GCx+7PTy?d$sCtw1?d}X*C^&HhIQK3ol_4$0Y(ioo}!F zy3SSb_3DLR)44Wyd#6ioU}kCA6wh%)EAY2F%l1rD*5Vx5=3Dlgn9J3bn%bkq`R6o! z_D_4Z@BQ_*Pa+J~mQPv5;}VYunGUjSc+c%S1$9^fcwP$;zHqXH#cxt zEU~Z?d^SsEpIneYgkZ(I!?{~zd7hNYiWqiTU} z%x7c9tXdTYnG7xo4g*DobLtnFbS&0$izO>O*dsKns7>qwgK%SGxx7~cyMeLbqef-M zWnYiJOyk-;_mA5K>G&VZ6P`Y~b82tE_wqgBF%K`j&&qz@oNk44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~e2l#}znwXfVs;WvzNO*X7*xA`>X=xcen;9A!YGh;-7Z;bGpKqY9{`=Ia zKj+UsnLS%fNC>EJJztVHkP<8j@(cct1{hS=&P)PIau#?*7BevL9R^{>*%2%*8B+vc%o0f{A&Aj)5Ztw+^oB%`|c3h zkdvCP7njiZuJpgboG<5Dyh`IuAO5!&s5t|)-HOOA?FD`)zX;mnczY zV%s6R;K4qFqYvs2-98vEtE1#|K0Jl>9$&zLLvLQQ-QtTlAo=xS*@33XcDMKf3O=cs z?|R$7(pk44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~e2l#}znwXfVs;WvzNO*X77(AP)rKM$OXBQe8YGh;-7Z;bGpKqY9{`=Ia zKj+UsnLS%fNC>EpdE@ujKuWMA$S?Rm8emXeJ2MF=$ywkLSEi|d*d1Y8oM)0b}D_5c4?^N6*xMY+E0`*FZVKz63EL-Mhc_D|PbT*ddI zVa003x&tpeKA&5C+e(w+ZpST7t^#?7dt2W*ot2;A==3Yo?QlhmHiN{9&Ta)6mc2CELazI=v?d1BUYyQgKQ zX*j5CdEz?FcE9|ii2eVzXVmkqmA~gHdx0?!gr~EptXVVrgR$yC>-t%{PVJgG>4EG; z-Jj35HI#T3oD*)_T^N3I<;zJ9P6={7yH7C{sWvjSnJ(5*h!)aV!0{taNMj1a(n$_E zb5}42=y7^BF-`Gy>RPugAW%q%rMBa&s^Y6JQqfl#!x{cCmUI1ZGc1eq1cn}ir>mdK II;Vst0Opv&k^lez literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/meta.json b/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/meta.json new file mode 100644 index 00000000000..3480614cac2 --- /dev/null +++ b/Resources/Textures/_DV/Objects/Tanks/water_vapor.rsi/meta.json @@ -0,0 +1,80 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Edited by BlitzTheSquishy, Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. Suit and back storages drawn by Ubaser. equipped-SUITSTORAGE-secdog taken from generic.rsi.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE-dog", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-secdog", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-puppy", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-fox", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-cat", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-sloth", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-hamster", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-kangaroo", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-possum", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "equipped-SUITSTORAGE-pig", + "directions": 4, + "delays": [[1],[1],[1],[1]] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} From d49162d6929432f641969130bfe2f3a4c7752e44 Mon Sep 17 00:00:00 2001 From: BlitzTheSquishy <73762869+BlitzTheSquishy@users.noreply.github.com> Date: Thu, 6 Feb 2025 09:52:22 +1100 Subject: [PATCH 52/55] More --- Resources/Prototypes/Loadouts/loadout_groups.yml | 9 +++++++++ Resources/ServerInfo/Guidebook/Mobs/_DV/Feroxi.xml | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 1990ca020f5..45c9b6e2149 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -84,6 +84,7 @@ - EmergencyNitrogen - EmergencyOxygen - LoadoutSpeciesVoxNitrogen + - EmergencyWaterVapor # DeltaV - type: loadoutGroup id: GroupEVATank @@ -92,6 +93,7 @@ loadouts: - LoadoutSpeciesEVANitrogen - LoadoutSpeciesEVAOxygen + - LoadoutSpeciesEVAWaterVapor # DeltaV - type: loadoutGroup id: GroupPocketTankDouble @@ -100,6 +102,7 @@ loadouts: - LoadoutSpeciesPocketDoubleNitrogen - LoadoutSpeciesPocketDoubleOxygen + - LoadoutSpeciesPocketDoubleWaterVapor # Command - type: loadoutGroup @@ -530,6 +533,7 @@ - EmergencyNitrogenClown - EmergencyOxygenClown - LoadoutSpeciesVoxNitrogen + - EmergancyWaterVaporClown # DeltaV - type: loadoutGroup id: MimeHead @@ -587,6 +591,7 @@ - EmergencyNitrogenMime - EmergencyOxygenMime - LoadoutSpeciesVoxNitrogen + - EmergancyWaterVaporMime # DeltaV - type: loadoutGroup id: MusicianJumpsuit @@ -892,6 +897,7 @@ - EmergencyNitrogenExtended - EmergencyOxygenExtended - LoadoutSpeciesVoxNitrogen + - EmergancyWaterVaporExtended # DeltaV # Science - type: loadoutGroup @@ -1221,6 +1227,7 @@ - EmergencyNitrogenSecurity - EmergencyOxygenSecurity - LoadoutSpeciesVoxNitrogen + - EmergancyWaterVaporSecurity # DeltaV - type: loadoutGroup id: SecurityStar @@ -1418,6 +1425,7 @@ - EmergencyNitrogenMedical - EmergencyOxygenMedical - LoadoutSpeciesVoxNitrogen + - EmergancyWaterVaporMedical # DeltaV # Wildcards - type: loadoutGroup @@ -1462,6 +1470,7 @@ - EmergencyNitrogenSyndicate - EmergencyOxygenSyndicate - LoadoutSpeciesVoxNitrogen + - EmergancyWaterVaporSyndicate # DeltaV - type: loadoutGroup id: GroupSpeciesBreathTool diff --git a/Resources/ServerInfo/Guidebook/Mobs/_DV/Feroxi.xml b/Resources/ServerInfo/Guidebook/Mobs/_DV/Feroxi.xml index 7ed6575db66..161b636cd30 100644 --- a/Resources/ServerInfo/Guidebook/Mobs/_DV/Feroxi.xml +++ b/Resources/ServerInfo/Guidebook/Mobs/_DV/Feroxi.xml @@ -5,7 +5,7 @@ - The Feroxi (fer-ox-i) are a race of humanoid shark-like beings. + The Feroxi (fer-ox-i) are a race of humanoid shark-like beings. Carnivourous in nature with a strong bite force. ## Diet From 648e276562b327510a845ab301ee6ea74a65859e Mon Sep 17 00:00:00 2001 From: BlitzTheSquishy <73762869+BlitzTheSquishy@users.noreply.github.com> Date: Thu, 6 Feb 2025 10:40:03 +1100 Subject: [PATCH 53/55] Normal water vapor survival boxes work now! --- Resources/Prototypes/_DV/Loadouts/Miscellaneous/survival.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_DV/Loadouts/Miscellaneous/survival.yml b/Resources/Prototypes/_DV/Loadouts/Miscellaneous/survival.yml index 1b18fad6d6a..fee1ad1661d 100644 --- a/Resources/Prototypes/_DV/Loadouts/Miscellaneous/survival.yml +++ b/Resources/Prototypes/_DV/Loadouts/Miscellaneous/survival.yml @@ -8,7 +8,7 @@ # Basic - type: loadout - id: EmergencyWater + id: EmergencyWaterVapor effects: - !type:GroupLoadoutEffect proto: WaterBreather From 66d380731d11ce3a646338eb2cb883d879fdbf22 Mon Sep 17 00:00:00 2001 From: BlitzTheSquishy <73762869+BlitzTheSquishy@users.noreply.github.com> Date: Thu, 6 Feb 2025 13:08:26 +1100 Subject: [PATCH 54/55] Holy shit am I done (I still need to fix *gnashes) --- .../Locale/en-US/_DV/markings/feroxi.ftl | 9 ++++++- .../Prototypes/Loadouts/loadout_groups.yml | 12 ++++----- .../Mobs/Customization/Markings/feroxi.yml | 24 ++++++++++++++++++ .../_DV/Loadouts/Miscellaneous/survival.yml | 16 ++++++------ .../feroxi-torso-countershading-m.png | Bin 353 -> 315 bytes .../feroxi-snout-countershading.png | Bin 0 -> 265 bytes .../snout_markings.rsi/feroxi-snout.png | Bin 288 -> 296 bytes .../Feroxi/snout_markings.rsi/meta.json | 4 +++ 8 files changed, 50 insertions(+), 15 deletions(-) create mode 100644 Resources/Textures/_DV/Mobs/Customization/Feroxi/snout_markings.rsi/feroxi-snout-countershading.png diff --git a/Resources/Locale/en-US/_DV/markings/feroxi.ftl b/Resources/Locale/en-US/_DV/markings/feroxi.ftl index b1f81e87728..9a1ca56ec1d 100644 --- a/Resources/Locale/en-US/_DV/markings/feroxi.ftl +++ b/Resources/Locale/en-US/_DV/markings/feroxi.ftl @@ -9,7 +9,6 @@ marking-FeroxiTailAndDorsal-feroxi-dorsal = Base Dorsal marking-FeroxiSnout = Snout marking-FeroxiSnout-feroxi-snout = Base Snout - marking-FeroxiEarsTips = Tipped Ears marking-FeroxiEarsTips-feroxi-ears = Base Ears marking-FeroxiEarsTips-feroxi-ears-inner = Inner Ear @@ -20,6 +19,14 @@ marking-FeroxiSnoutStripe = Striped Snout marking-FeroxiSnoutStripe-feroxi-snout = Base Snout marking-FeroxiSnoutStripe-feroxi-snout-stripe = Stripe +marking-FeroxiSnoutCountershading = Countershaded Snout +marking-FeroxiSnoutCountershading-feroxi-snout = Base Snout +marking-FeroxiSnoutCountershading-feroxi-snout-Countershading = Countershading + +marking-FeroxiSnoutCountershadingStripe = Striped and Countershaded Snout with +marking-FeroxiSnoutCountershadingStripe-feroxi-snout = Base Snout +marking-FeroxiSnoutCountershadingStripe-feroxi-snout-countershading = Countershading +marking-FeroxiSnoutCountershadingStripe-feroxi-snout-stripe = Stripe marking-FeroxiTailBlitz = Striped Tail with Fin Tips and Dorsal marking-FeroxiTailBlitz-feroxi-tail = Base Tail diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 45c9b6e2149..e0ca7e7b811 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -533,7 +533,7 @@ - EmergencyNitrogenClown - EmergencyOxygenClown - LoadoutSpeciesVoxNitrogen - - EmergancyWaterVaporClown # DeltaV + - EmergencyWaterVaporClown # DeltaV - type: loadoutGroup id: MimeHead @@ -591,7 +591,7 @@ - EmergencyNitrogenMime - EmergencyOxygenMime - LoadoutSpeciesVoxNitrogen - - EmergancyWaterVaporMime # DeltaV + - EmergencyWaterVaporMime # DeltaV - type: loadoutGroup id: MusicianJumpsuit @@ -897,7 +897,7 @@ - EmergencyNitrogenExtended - EmergencyOxygenExtended - LoadoutSpeciesVoxNitrogen - - EmergancyWaterVaporExtended # DeltaV + - EmergencyWaterVaporExtended # DeltaV # Science - type: loadoutGroup @@ -1227,7 +1227,7 @@ - EmergencyNitrogenSecurity - EmergencyOxygenSecurity - LoadoutSpeciesVoxNitrogen - - EmergancyWaterVaporSecurity # DeltaV + - EmergencyWaterVaporSecurity # DeltaV - type: loadoutGroup id: SecurityStar @@ -1425,7 +1425,7 @@ - EmergencyNitrogenMedical - EmergencyOxygenMedical - LoadoutSpeciesVoxNitrogen - - EmergancyWaterVaporMedical # DeltaV + - EmergencyWaterVaporMedical # DeltaV # Wildcards - type: loadoutGroup @@ -1470,7 +1470,7 @@ - EmergencyNitrogenSyndicate - EmergencyOxygenSyndicate - LoadoutSpeciesVoxNitrogen - - EmergancyWaterVaporSyndicate # DeltaV + - EmergencyWaterVaporSyndicate # DeltaV - type: loadoutGroup id: GroupSpeciesBreathTool diff --git a/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/feroxi.yml b/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/feroxi.yml index 1936334cbd9..88baca7eeeb 100644 --- a/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/feroxi.yml +++ b/Resources/Prototypes/_DV/Entities/Mobs/Customization/Markings/feroxi.yml @@ -56,6 +56,30 @@ - sprite: _DV/Mobs/Customization/Feroxi/snout_markings.rsi state: feroxi-snout-stripe +- type: marking + id: FeroxiSnoutCountershading + bodyPart: Snout + markingCategory: Snout + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/snout_markings.rsi + state: feroxi-snout + - sprite: _DV/Mobs/Customization/Feroxi/snout_markings.rsi + state: feroxi-snout-countershading + +- type: marking + id: FeroxiSnoutCountershadingStripe + bodyPart: Snout + markingCategory: Snout + speciesRestriction: [ Feroxi ] + sprites: + - sprite: _DV/Mobs/Customization/Feroxi/snout_markings.rsi + state: feroxi-snout + - sprite: _DV/Mobs/Customization/Feroxi/snout_markings.rsi + state: feroxi-snout-countershading + - sprite: _DV/Mobs/Customization/Feroxi/snout_markings.rsi + state: feroxi-snout-stripe + # Tail Markings - type: marking id: FeroxiTail diff --git a/Resources/Prototypes/_DV/Loadouts/Miscellaneous/survival.yml b/Resources/Prototypes/_DV/Loadouts/Miscellaneous/survival.yml index fee1ad1661d..ea4cf2c266e 100644 --- a/Resources/Prototypes/_DV/Loadouts/Miscellaneous/survival.yml +++ b/Resources/Prototypes/_DV/Loadouts/Miscellaneous/survival.yml @@ -18,7 +18,7 @@ # Clown - type: loadout - id: EmergencyWaterClown + id: EmergencyWaterVaporClown effects: - !type:GroupLoadoutEffect proto: WaterBreather @@ -28,7 +28,7 @@ # Mime - type: loadout - id: EmergencyWaterMime + id: EmergencyWaterVaporMime effects: - !type:GroupLoadoutEffect proto: WaterBreather @@ -38,7 +38,7 @@ # Engineering / Extended - type: loadout - id: EmergencyWaterExtended + id: EmergencyWaterVaporExtended effects: - !type:GroupLoadoutEffect proto: WaterBreather @@ -48,7 +48,7 @@ # Medical - type: loadout - id: EmergencyWaterMedical + id: EmergencyWaterVaporMedical effects: - !type:GroupLoadoutEffect proto: WaterBreather @@ -58,7 +58,7 @@ # Security - type: loadout - id: EmergencyWaterSecurity + id: EmergencyWaterVaporSecurity effects: - !type:GroupLoadoutEffect proto: WaterBreather @@ -68,7 +68,7 @@ # Syndicate - type: loadout - id: EmergencyWaterSyndicate + id: EmergencyWaterVaporSyndicate effects: - !type:GroupLoadoutEffect proto: WaterBreather @@ -78,7 +78,7 @@ # Full EVA Tank, Any Species - type: loadout - id: LoadoutSpeciesEVAWater + id: LoadoutSpeciesEVAWaterVapor effects: - !type:GroupLoadoutEffect proto: WaterBreather @@ -87,7 +87,7 @@ # Species-appropriate Double Emergency Tank in Pocket 1 - type: loadout - id: LoadoutSpeciesPocketDoubleWater + id: LoadoutSpeciesPocketDoubleWaterVapor effects: - !type:GroupLoadoutEffect proto: WaterBreather diff --git a/Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-torso-countershading-m.png b/Resources/Textures/_DV/Mobs/Customization/Feroxi/body_markings.rsi/feroxi-torso-countershading-m.png index 340c10e3c92295573e8a574ab586885efdbf359a..329a6e88a4918c18d8c57c4a2b11c23f9f4882ba 100644 GIT binary patch delta 279 zcmaFJw3}&yL=Xov0|Ud{?Tv4M6k~CayA#8@b22Z19F}xPUq=Rpjs4tz5?O(K{s5m4 z*Ck7qOqnue+qP|0RaHPSo2-*6K#H{_$S?Rm5HS4S#uq$MPojQ_r;B4qg!|j62l<#4 zIb6~k{{Mg0mcy^{TI$u(+=}CZ@diSzvQ3sNE;Wf+EM`#YJ{6&-#NeWm60LU7^~5$8 z#{0h|H|ZYkw9iNoiP4=RH6w4~y#xO_Yr6QI+Eu?_S5OM{0)wZkpUXO@geCyIFL6Zx delta 338 zcmdnZ^pI(SL_G^L0|P^Zd(K-R#aJBV?!Du!FONFRKmM<+;hMqw&QNpC(bWtd^$&s%q?|bL;lGTXxrDL7pS=zKjhh$_-)8?I z!XVptm$M|~K*pE%HgT*ze|p{r9O?ZR>kz7NzJfn;p6AQ^wj!)N3-_BVXeWIAw@W&d z(a&I2LI`88h{VFQyr;WgaPx0QW8x#qv1*Q6kieezwyT;Be03^2 zanpNt=(BwWaJrtZp4l40Clo9VeWN-~sxCFEzq5&DWPf Y3&`dGVi33#JQ+lJy85}Sb4q9e0Kh7K1ONa4 diff --git a/Resources/Textures/_DV/Mobs/Customization/Feroxi/snout_markings.rsi/feroxi-snout-countershading.png b/Resources/Textures/_DV/Mobs/Customization/Feroxi/snout_markings.rsi/feroxi-snout-countershading.png new file mode 100644 index 0000000000000000000000000000000000000000..ac58aa3e010ac85283aeb1c69855009cd440c865 GIT binary patch literal 265 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~O1^9%xPMI=g+qP|0RaHxtEa~a#0qJ>q{ST00D+%%o{tp5SoA)o-4;0}n z@Q5sCVBk9d!i-thIyr%Yd7dtgArbCxuR8KIIB+-zauxm8o~_4j$d;b$^MBJt@tDk= zGp{DjYT##TTe-vTePN6K>Ey3Ww|75qWnwX4WSYUi_-1>9>HduUm0S3DUN9{1Tf@k7 wm(hkXa66yD_iulFzCSZwcN(J5$Ke_0tLgsL4^J(d1+Px# literal 0 HcmV?d00001 diff --git a/Resources/Textures/_DV/Mobs/Customization/Feroxi/snout_markings.rsi/feroxi-snout.png b/Resources/Textures/_DV/Mobs/Customization/Feroxi/snout_markings.rsi/feroxi-snout.png index 2055e21c35ef9d3bff445d240aa3062ea75a5370..a46c41813db8276184524300324e60e5257243b7 100644 GIT binary patch delta 183 zcmZ3$w1R0uW&J@02EK!gJ0@noWnf_F^>lFziEw{AZ6n_i0}kh2%YXl;`X$9S^yA$U1>+mvu`P|p1!{nya{QkuWE2GE7H|_UZ8ee~K;_D?f zv4{&1369B)tY_=F9J=gvJR@zIwHQ{iaISbISz^C{<$U){Ek}bBjPnGYrkr08l(#@} j=Y6@dgQ`${j#tGqpZWcGz{P$J=rRURS3j3^P6NX$~v_b@(BqM19tp(W;SSb1ePAyn0JFDOj3Mg Date: Thu, 6 Feb 2025 14:25:44 +1100 Subject: [PATCH 55/55] bleh --- Resources/Prototypes/_DV/Voice/speech_emote_sounds.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/_DV/Voice/speech_emote_sounds.yml b/Resources/Prototypes/_DV/Voice/speech_emote_sounds.yml index a60d4e9c8ce..9aa8c54ca61 100644 --- a/Resources/Prototypes/_DV/Voice/speech_emote_sounds.yml +++ b/Resources/Prototypes/_DV/Voice/speech_emote_sounds.yml @@ -307,11 +307,11 @@ Yawn: collection: MaleYawn Gnash: - path: /Audio/Effects/bite.ogg + collection: FeroxiGnashes Gasp: - collection: FemaleGasp + collection: MaleGasp DefaultDeathgasp: - collection: FemaleDeathGasp + collection: MaleDeathGasp - type: emoteSounds id: FemaleFeroxi