diff --git a/Resources/Locale/en-US/Floof/station-events/events/cargo-gifts.ftl b/Resources/Locale/en-US/Floof/station-events/events/cargo-gifts.ftl new file mode 100644 index 00000000000..faa20ab707d --- /dev/null +++ b/Resources/Locale/en-US/Floof/station-events/events/cargo-gifts.ftl @@ -0,0 +1,5 @@ +cargo-gift-nt-lab = NT Biotech +cargo-gift-cc-lab = Central R&D +cargo-gift-trade-dest = Trade Depot + +cargo-gift-friendly-xenos = a Xeno Companion Crate diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml index b55bdd48322..cf50a99b040 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml @@ -303,4 +303,3 @@ - id: BoxDarts amount: 1 prob: 0.05 - diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xenopet.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xenopet.yml index 509f64b486f..10403af61dd 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/xenopet.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/xenopet.yml @@ -1,12 +1,17 @@ - type: entity - name: Neutral Rouny + name: Friendly NT Rouny id: MobXenoNeutralRouny parent: MobXenoRounyNPC - description: They mostly come at night. Mostly. + description: A friendly Rouny trained by Centcomm components: - type: NpcFactionMember factions: - - Passive + - PetsNT + - type: LayingDown + - type: Sprite + drawdepth: Mobs + sprite: Mobs/Aliens/FXS/rouny.rsi + scale: 0.6, 0.6 - type: PointLight radius: 2 energy: 1 @@ -23,82 +28,141 @@ understands: - Xeno - TauCetiBasic -# -#- type: entity -# name: Neutral Praetorian -# id: MobXenoNeutralPraetorian -# parent: MobXenoPraetorianNPC -# description: They mostly come at night. Mostly. -# components: -# - type: NpcFactionMember -# factions: -# - Passive -# - type: PointLight -# radius: 2 -# energy: 1 -# color: "#62B85E" -# - type: GhostRole -# name: ghost-role-information-friendlyxeno-name -# description: ghost-role-information-friendlyxeno-description -# rules: ghost-role-information-friendlyxeno-rules -# - type: GhostTakeoverAvailable -# - type: LanguageKnowledge -# speaks: -# - Xeno -# understands: -# - Xeno -# - TauCetiBasic -# -#- type: entity -# name: Neutral Drone -# id: MobXenoNeutralDrone -# parent: MobXenoDroneNPC -# description: They mostly come at night. Mostly. -# components: -# - type: NpcFactionMember -# factions: -# - Passive -# - type: PointLight -# radius: 2 -# energy: 1 -# color: "#8B5EB8" -# - type: GhostRole -# name: ghost-role-information-friendlyxeno-name -# description: ghost-role-information-friendlyxeno-description -# rules: ghost-role-information-friendlyxeno-rules -# - type: GhostTakeoverAvailable -# - type: LanguageKnowledge -# speaks: -# - Xeno -# understands: -# - Xeno -# - TauCetiBasic -# -#- type: entity -# name: Neutral Ravager -# id: MobXenoNeutralRavager -# parent: MobXenoRavagerNPC -# description: They mostly come at night. Mostly. -# components: -# - type: NpcFactionMember -# factions: -# - Passive -# - type: PointLight -# radius: 2 -# energy: 1 -# color: "#E3954D" -# - type: GhostRole -# name: ghost-role-information-friendlyxeno-name -# description: ghost-role-information-friendlyxeno-description -# rules: ghost-role-information-friendlyxeno-rules -# - type: GhostTakeoverAvailable -# - type: LanguageKnowledge -# speaks: -# - Xeno -# understands: -# - Xeno -# - TauCetiBasic -# + +- type: entity + name: Friendly NT Praetorian + id: MobXenoNeutralPraetorian + parent: MobXenoPraetorianNPC + description: A friendly Praetorian programmed by centcomm + components: + - type: NpcFactionMember + factions: + - PetsNT + - type: LayingDown + - type: Sprite + drawdepth: Mobs + sprite: Mobs/Aliens/FXS/praetorian.rsi + scale: 0.8, 0.8 + - type: PointLight + radius: 2 + energy: 1 + color: "#62B85E" + - type: GhostRole + name: ghost-role-information-friendlyxeno-name + description: ghost-role-information-friendlyxeno-description + rules: ghost-role-information-friendlyxeno-rules + - type: GhostTakeoverAvailable + - type: LanguageKnowledge + speaks: + - Xeno + understands: + - Xeno + - TauCetiBasic + +- type: entity + name: Friendly NT Drone + id: MobXenoNeutralDrone + parent: MobXenoDroneNPC + description: A friendly drone programmed by centcomm + components: + - type: NpcFactionMember + factions: + - PetsNT + - type: LayingDown + - type: Sprite + drawdepth: Mobs + sprite: Mobs/Aliens/FXS/drone.rsi + scale: 0.8, 0.8 + - type: PointLight + radius: 2 + energy: 1 + color: "#8B5EB8" + - type: GhostRole + name: ghost-role-information-friendlyxeno-name + description: ghost-role-information-friendlyxeno-description + rules: ghost-role-information-friendlyxeno-rules + - type: GhostTakeoverAvailable + - type: LanguageKnowledge + speaks: + - Xeno + understands: + - Xeno + - TauCetiBasic + +- type: entity + name: Friendly NT Ravager + id: MobXenoNeutralRavager + parent: MobXenoRavagerNPC + description: A friendly ravager programmed by centcomm + components: + - type: NpcFactionMember + factions: + - PetsNT + - type: LayingDown + - type: Sprite + drawdepth: Mobs + sprite: Mobs/Aliens/FXS/ravager.rsi + scale: 0.7, 0.7 + - type: PointLight + radius: 2 + energy: 1 + color: "#E3954D" + - type: GhostRole + name: ghost-role-information-friendlyxeno-name + description: ghost-role-information-friendlyxeno-description + rules: ghost-role-information-friendlyxeno-rules + - type: GhostTakeoverAvailable + - type: LanguageKnowledge + speaks: + - Xeno + understands: + - Xeno + - TauCetiBasic + +- type: entity + name: Friendly CC Rouny + id: MobXenoCCNeutralRouny + parent: MobXenoNeutralRouny + description: A friendly rouny programmed by centcomm + components: + - type: Sprite + drawdepth: Mobs + sprite: Mobs/Aliens/FXS/ccrouny.rsi + scale: 0.7, 0.7 + +- type: entity + name: Friendly CC Drone + id: MobXenoCCNeutralDrone + parent: MobXenoNeutralDrone + description: A friendly drone programmed by centcomm + components: + - type: Sprite + drawdepth: Mobs + sprite: Mobs/Aliens/FXS/ccdrone.rsi + scale: 0.7, 0.7 + +- type: entity + name: Friendly CC Praetorian + id: MobXenoCCNeutralPraetorian + parent: MobXenoNeutralPraetorian + description: A friendly Praetorian programmed by centcomm + components: + - type: Sprite + drawdepth: Mobs + sprite: Mobs/Aliens/FXS/ccpraetorian.rsi + scale: 0.7, 0.7 + +- type: entity + name: Friendly CC Ravager + id: MobXenoCCNeutralRavager + parent: MobXenoNeutralRavager + description: A friendly ravager programmed by centcomm + components: + - type: Sprite + drawdepth: Mobs + sprite: Mobs/Aliens/FXS/ccravager.rsi + scale: 0.7, 0.7 + - type: inventoryTemplate id: friendxeno slots: @@ -138,7 +202,7 @@ - Prying - type: Sprite drawdepth: Mobs - sprite: Mobs/Aliens/Xenos/rouny.rsi + sprite: Mobs/Aliens/FXS/rouny.rsi scale: 0.5, 0.5 - type: GhostRole - type: GhostTakeoverAvailable @@ -168,368 +232,123 @@ path: /Audio/Animals/lizard_happy.ogg # Floofstation - commented out for reasons unknown -#- type: entity -# name: Patriach -# parent: MobXenoNeutralPraetorian -# id: MobXenoPatriarch -# description: A not entirely clearly friend-shaped Xeno. -# components: -# - type: NpcFactionMember -# factions: -# - PetsNT -# - type: Tool -# speed: 3 -# qualities: -# - Prying -# - type: Sprite -# drawdepth: Mobs -# sprite: Mobs/Animals/patriarch.rsi -# layers: -# - map: ["enum.DamageStateVisualLayers.Base"] -# state: patriarch -# - type: DamageStateVisuals -# states: -# Alive: -# Base: patriarch -# Critical: -# Base: patriarch_crit -# Dead: -# Base: patriarch_dead -# - type: Inventory -# templateId: friendxeno -# - type: IdExaminable -# - type: InventorySlots -# - type: Strippable -# - type: UserInterface -# interfaces: -# - key: enum.StrippingUiKey.Key -# type: StrippableBoundUserInterface -# - type: Grammar -# attributes: -# proper: true -# gender: male -# - type: InteractionPopup -# successChance: 0.5 -# interactSuccessString: petting-success-reptile -# interactFailureString: petting-failure-generic -# interactSuccessSpawn: EffectHearts -# interactSuccessSound: -# path: /Audio/Animals/lizard_happy.ogg -# -#- type: entity -# name: FXES -# parent: MobXenoNeutralDrone -# id: MobXenoFXES -# description: A very clearly friend-shaped Xeno. -# components: -# - type: NpcFactionMember -# factions: -# - PetsNT -# - type: Tool -# speed: 3 -# qualities: -# - Prying -# - type: Inventory -# templateId: friendxeno -# - type: IdExaminable -# - type: InventorySlots -# - type: Strippable -# - type: UserInterface -# interfaces: -# - key: enum.StrippingUiKey.Key -# type: StrippableBoundUserInterface -# - type: Grammar -# attributes: -# proper: true -# gender: male -# - type: InteractionPopup -# successChance: 0.5 -# interactSuccessString: petting-success-reptile -# interactFailureString: petting-failure-generic -# interactSuccessSpawn: EffectHearts -# interactSuccessSound: -# path: /Audio/Animals/lizard_happy.ogg -# -#- type: entity -# name: Hell-Shaped -# parent: MobXenoNeutralRavager -# id: MobXenoHellShaped -# description: A very clearly friend-shaped Xeno. -# components: -# - type: NpcFactionMember -# factions: -# - PetsNT -# - type: Tool -# speed: 3 -# qualities: -# - Prying -# - type: Inventory -# templateId: friendxeno -# - type: IdExaminable -# - type: InventorySlots -# - type: Strippable -# - type: UserInterface -# interfaces: -# - key: enum.StrippingUiKey.Key -# type: StrippableBoundUserInterface -# - type: Grammar -# attributes: -# proper: true -# gender: male -# - type: InteractionPopup -# successChance: 0.5 -# interactSuccessString: petting-success-reptile -# interactFailureString: petting-failure-generic -# interactSuccessSpawn: EffectHearts -# interactSuccessSound: -# path: /Audio/Animals/lizard_happy.ogg -# -#- type: entity -# name: FXE Subject 7355 -# parent: MobXenoNeutralRavager -# id: MobXenoSubjectTess -# description: An extremely oddly coloured xeno, with glowing stripes. An odd mutation. -# components: -# - type: NpcFactionMember -# factions: -# - PetsNT -# - type: Tool -# speed: 3 -# qualities: -# - Prying -# - type: Sprite -# drawdepth: Mobs -# sprite: Mobs/Animals/subject7355.rsi -# layers: -# - map: ["enum.DamageStateVisualLayers.Base"] -# state: subject7355 -# - map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ] -# state: glow -# shader: unshaded -# - type: PointLight -# radius: 2 -# energy: 1 -# color: "#639fff" -# - type: DamageStateVisuals -# states: -# Alive: -# Base: subject7355 -# Critical: -# Base: subject7355_crit -# Dead: -# Base: subject7355_dead -# - type: Inventory -# templateId: friendxeno -# - type: IdExaminable -# - type: InventorySlots -# - type: Strippable -# - type: UserInterface -# interfaces: -# - key: enum.StrippingUiKey.Key -# type: StrippableBoundUserInterface -# - type: Grammar -# attributes: -# proper: true -# gender: male -# - type: InteractionPopup -# successChance: 0.5 -# interactSuccessString: petting-success-reptile -# interactFailureString: petting-failure-generic -# interactSuccessSpawn: EffectHearts -# interactSuccessSound: -# path: /Audio/Animals/lizard_happy.ogg -# -#- type: entity -# id: neutralXenoVents -# parent: BaseGameRule -# noSpawn: true -# components: -# - type: StationEvent -# startAnnouncement: true -# earliestStart: 20 -# reoccurrenceDelay: 12 -# minimumPlayers: 1 -# weight: 6 # Really weak compared to other critters -# duration: 60 -# - type: VentCrittersRule -# entries: -# - id: MobXenoNeutralRouny -# prob: 0.008 -# - id: MobXenoNeutralDrone -# prob: 0.008 -# - id: MobXenoNeutralPraetorian -# prob: 0.008 -# - id: MobXenoNeutralRavager -# prob: 0.008 -# -#- type: entity -# id: ArgocyteVents -# parent: BaseGameRule -# noSpawn: true -# components: -# - type: StationEvent -# startAnnouncement: true -# earliestStart: 20 -# reoccurrenceDelay: 12 -# minimumPlayers: 30 -# weight: 6 # Really weak compared to other critters -# duration: 60 -# - type: VentCrittersRule -# entries: -# - id: MobArgocyteSlurva -# prob: 0.003 -# - id: MobArgocyteBarrier -# prob: 0.003 -# - id: MobArgocyteSkitter -# prob: 0.003 -# - id: MobArgocyteSwiper -# prob: 0.003 -# - id: MobArgocyteMolder -# prob: 0.003 -# - id: MobArgocytePouncer -# prob: 0.003 -# - id: MobArgocyteGlider -# prob: 0.003 -# - id: MobArgocyteHarvester -# prob: 0.003 -# - id: MobArgocyteCrawler -# prob: 0.003 -# - id: MobArgocyteEnforcer -# prob: 0.003 -# - id: MobArgocyteFounder -# prob: 0.003 -# - id: MobArgocyteLeviathing -# prob: 0.001 -# -#- type: entity -# id: MeatVents -# parent: BaseGameRule -# noSpawn: true -# components: -# - type: StationEvent -# startAnnouncement: true -# earliestStart: 20 -# reoccurrenceDelay: 12 -# minimumPlayers: 20 -# weight: 6 # Really weak compared to other critters -# duration: 60 -# - type: VentCrittersRule -# entries: -# - id: MobFleshJared -# prob: 0.005 -# - id: MobFleshGolem -# prob: 0.005 -# - id: MobFleshClamp -# prob: 0.005 -# - id: MobFleshLover -# prob: 0.005 -# - id: MobAbomination -# prob: 0.005 -# -#- type: entity -# id: TickVents -# parent: BaseGameRule -# noSpawn: true -# components: -# - type: StationEvent -# startAnnouncement: true -# earliestStart: 20 -# reoccurrenceDelay: 12 -# minimumPlayers: 1 -# weight: 6 # Really weak compared to other critters -# duration: 60 -# - type: VentCrittersRule -# entries: -# - id: MobTick -# prob: 0.01 -# -#- type: entity -# id: CarpVents -# parent: BaseGameRule -# noSpawn: true -# components: -# - type: StationEvent -# startAnnouncement: true -# earliestStart: 20 -# reoccurrenceDelay: 12 -# minimumPlayers: 20 -# weight: 6 # Really weak compared to other critters -# duration: 60 -# - type: VentCrittersRule -# entries: -# - id: MobCarp -# prob: 0.01 -# - id: MobCarpMagic -# prob: 0.01 -# - id: MobCarpHolo -# prob: 0.008 -# - id: MobCarpRainbow -# prob: 0.01 -# - id: MobShark -# prob: 0.008 -# - id: MobCarpDragon -# prob: 0.01 -# -#- type: entity -# id: SpaceVents -# parent: BaseGameRule -# noSpawn: true -# components: -# - type: StationEvent -# startAnnouncement: true -# earliestStart: 20 -# reoccurrenceDelay: 12 -# minimumPlayers: 20 -# weight: 6 # Really weak compared to other critters -# duration: 60 -# - type: VentCrittersRule -# entries: -# - id: MobBearSpace -# prob: 0.01 -# - id: MobKangarooSpace -# prob: 0.01 -# - id: MobSpiderSpace -# prob: 0.01 -# - id: MobCobraSpace -# prob: 0.01 -# -#- type: entity -# id: LightVents -# parent: BaseGameRule -# noSpawn: true -# components: -# - type: StationEvent -# startAnnouncement: true -# earliestStart: 20 -# reoccurrenceDelay: 12 -# minimumPlayers: 20 -# weight: 6 # Really weak compared to other critters -# duration: 60 -# - type: VentCrittersRule -# entries: -# - id: MobLivingLight -# prob: 0.01 -# - id: MobLuminousPerson -# prob: 0.01 -# - id: MobLuminousObject -# prob: 0.01 -# - id: MobLuminousEntity -# prob: 0.01 -# -#- type: entity -# name: Friendly Xeno spawner -# id: friendlyxenoSpawner -# parent: MarkerBase -# components: -# - type: Sprite -# layers: -# - state: green -# - sprite: Mobs/Aliens/Xenos/drone.rsi -# state: sleeping -# - type: RandomSpawner -# prototypes: -# - MobXenoNeutralRouny -# - MobXenoNeutralPraetorian -# - MobXenoNeutralDrone -# - MobXenoNeutralRavager -# chance: 1 +- type: entity + name: Patriach + parent: MobXenoNeutralPraetorian + id: MobXenoPatriarch + description: A not entirely clearly friend-shaped Xeno. + components: + - type: NpcFactionMember + factions: + - PetsNT + - type: Tool + speed: 3 + qualities: + - Prying + - type: Sprite + drawdepth: Mobs + sprite: Mobs/Animals/patriarch.rsi + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: patriarch + - type: DamageStateVisuals + states: + Alive: + Base: patriarch + Critical: + Base: patriarch_crit + Dead: + Base: patriarch_dead + - type: Inventory + templateId: friendxeno + - type: IdExaminable + - type: InventorySlots + - type: Strippable + - type: UserInterface + interfaces: + - key: enum.StrippingUiKey.Key + type: StrippableBoundUserInterface + - type: Grammar + attributes: + proper: true + gender: male + - type: InteractionPopup + successChance: 0.5 + interactSuccessString: petting-success-reptile + interactFailureString: petting-failure-generic + interactSuccessSpawn: EffectHearts + interactSuccessSound: + path: /Audio/Animals/lizard_happy.ogg + +- type: entity + name: FXE Subject 7355 + parent: MobXenoNeutralRavager + id: MobXenoSubjectTess + description: An extremely oddly coloured xeno, with glowing stripes. An odd mutation. + components: + - type: NpcFactionMember + factions: + - PetsNT + - type: Tool + speed: 3 + qualities: + - Prying + - type: Sprite + drawdepth: Mobs + sprite: Mobs/Animals/subject7355.rsi + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: subject7355 + - map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ] + state: glow + shader: unshaded + - type: PointLight + radius: 2 + energy: 1 + color: "#639fff" + - type: DamageStateVisuals + states: + Alive: + Base: subject7355 + Critical: + Base: subject7355_crit + Dead: + Base: subject7355_dead + - type: Inventory + templateId: friendxeno + - type: IdExaminable + - type: InventorySlots + - type: Strippable + - type: UserInterface + interfaces: + - key: enum.StrippingUiKey.Key + type: StrippableBoundUserInterface + - type: Grammar + attributes: + proper: true + gender: male + - type: InteractionPopup + successChance: 0.5 + interactSuccessString: petting-success-reptile + interactFailureString: petting-failure-generic + interactSuccessSpawn: EffectHearts + interactSuccessSound: + path: /Audio/Animals/lizard_happy.ogg + +- type: entity + name: Friendly Xeno spawner + id: friendlyxenoSpawner + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - sprite: Mobs/Aliens/Xenos/drone.rsi + state: sleeping + - type: RandomSpawner + prototypes: + - MobXenoNeutralRouny + - MobXenoNeutralPraetorian + - MobXenoNeutralDrone + - MobXenoNeutralRavager + chance: 1 diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index fc771414b4a..2b0724a1214 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -1964,4 +1964,4 @@ components: - type: Sprite sprite: Objects/Fun/toys.rsi - state: shadowkin \ No newline at end of file + state: shadowkin diff --git a/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml b/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml index b51517786f0..d975caa643d 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml @@ -266,3 +266,5 @@ hard: false layer: - LowImpassable + + diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml index 1cf80836590..6a9c96a40c6 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml @@ -646,3 +646,4 @@ - type: StealthOnMove passiveVisibilityRate: -0.10 movementVisibilityRate: 0.10 + diff --git a/Resources/Prototypes/Floof/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/Floof/Catalog/Cargo/cargo_fun.yml index bda250c4540..6876470cbdc 100644 --- a/Resources/Prototypes/Floof/Catalog/Cargo/cargo_fun.yml +++ b/Resources/Prototypes/Floof/Catalog/Cargo/cargo_fun.yml @@ -7,3 +7,13 @@ cost: 5000 category: cargoproduct-category-name-fun group: market + +- type: cargoProduct + id: xenocompanions + icon: + sprite: Structures/Storage/Crates/xeno.rsi + state: icon + product: CrateNTxenos + cost: 100000 + category: cargoproduct-category-name-fun + group: market diff --git a/Resources/Prototypes/Floof/Catalog/Fills/Crates/xeno.yml b/Resources/Prototypes/Floof/Catalog/Fills/Crates/xeno.yml new file mode 100644 index 00000000000..fa9c56792e1 --- /dev/null +++ b/Resources/Prototypes/Floof/Catalog/Fills/Crates/xeno.yml @@ -0,0 +1,33 @@ +- type: entity + id: CrateNTxenos + parent: Cratexeno + suffix: Filled, Random + name: Xeno Companion Crate + description: Xeno Companion Crate + components: + - type: StorageFill + contents: + - id: DehydratedFRouny + prob: 0.25 + orGroup: XenosRouny + - id: DehydratedFPraetorian + prob: 0.25 + orGroup: XenosPraet + - id: DehydratedFRavager + prob: 0.25 + orGroup: XenosRavager + - id: DehydratedFDrone + prob: 0.25 + orGroup: XenosDrone + - id: DehydratedCCRouny + prob: 0.01 + orGroup: XenosRouny + - id: DehydratedCCPraetorian + prob: 0.01 + orGroup: XenosPraet + - id: DehydratedCCRavager + prob: 0.01 + orGroup: XenosRavager + - id: DehydratedCCDrone + prob: 0.01 + orGroup: XenosDrone diff --git a/Resources/Prototypes/Floof/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Floof/Entities/Objects/Fun/toys.yml new file mode 100644 index 00000000000..9d6aa3f60ef --- /dev/null +++ b/Resources/Prototypes/Floof/Entities/Objects/Fun/toys.yml @@ -0,0 +1,131 @@ +- type: entity + parent: BasePlushie + id: PlushieFRouny + name: blue rouny plush + description: An adorable stuffed toy that resembles a rouny with blue stripes. + components: + - type: Sprite + state: nrouny + - type: Item + storedRotation: -90 + - type: EmitSoundOnUse + sound: + path: /Audio/Weapons/Xeno/alien_spitacid.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/Weapons/Xeno/alien_spitacid.ogg + - type: EmitSoundOnActivate + sound: + path: /Audio/Weapons/Xeno/alien_spitacid.ogg + - type: EmitSoundOnTrigger + sound: + path: /Audio/Weapons/Xeno/alien_spitacid.ogg + - type: Food + requiresSpecialDigestion: true + useSound: + path: /Audio/Weapons/Xeno/alien_spitacid.ogg + - type: MeleeWeapon + wideAnimationRotation: -90 + soundHit: + path: /Audio/Weapons/Xeno/alien_spitacid.ogg + angle: 0 + animation: WeaponArcBite # Rrrr! + +- type: entity + parent: BasePlushie + id: PlushieFDrone + name: blue drone plush + description: An adorable stuffed toy that resembles a drone with blue stripes. + components: + - type: Sprite + state: ndrone + - type: Item + storedRotation: -90 + - type: EmitSoundOnUse + sound: + path: /Audio/Weapons/Xeno/alien_spitacid.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/Weapons/Xeno/alien_spitacid.ogg + - type: EmitSoundOnActivate + sound: + path: /Audio/Weapons/Xeno/alien_spitacid.ogg + - type: EmitSoundOnTrigger + sound: + path: /Audio/Weapons/Xeno/alien_spitacid.ogg + - type: Food + requiresSpecialDigestion: true + useSound: + path: /Audio/Weapons/Xeno/alien_spitacid.ogg + - type: MeleeWeapon + wideAnimationRotation: -90 + soundHit: + path: /Audio/Weapons/Xeno/alien_spitacid.ogg + angle: 0 + animation: WeaponArcBite # Rrrr! + +- type: entity + parent: BasePlushie + id: PlushieFPraetorian + name: blue Praetorian plush + description: An adorable stuffed toy that resembles a Praetorian with blue stripes. + components: + - type: Sprite + state: nPraetorian + - type: Item + storedRotation: -90 + - type: EmitSoundOnUse + sound: + path: /Audio/Weapons/Xeno/alien_spitacid.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/Weapons/Xeno/alien_spitacid.ogg + - type: EmitSoundOnActivate + sound: + path: /Audio/Weapons/Xeno/alien_spitacid.ogg + - type: EmitSoundOnTrigger + sound: + path: /Audio/Weapons/Xeno/alien_spitacid.ogg + - type: Food + requiresSpecialDigestion: true + useSound: + path: /Audio/Weapons/Xeno/alien_spitacid.ogg + - type: MeleeWeapon + wideAnimationRotation: -90 + soundHit: + path: /Audio/Weapons/Xeno/alien_spitacid.ogg + angle: 0 + animation: WeaponArcBite # Rrrr! + +- type: entity + parent: BasePlushie + id: PlushieFRavager + name: blue ravager plush + description: An adorable stuffed toy that resembles a ravager with blue stripes. + components: + - type: Sprite + state: nravager + - type: Item + storedRotation: -90 + - type: EmitSoundOnUse + sound: + path: /Audio/Weapons/Xeno/alien_spitacid.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/Weapons/Xeno/alien_spitacid.ogg + - type: EmitSoundOnActivate + sound: + path: /Audio/Weapons/Xeno/alien_spitacid.ogg + - type: EmitSoundOnTrigger + sound: + path: /Audio/Weapons/Xeno/alien_spitacid.ogg + - type: Food + requiresSpecialDigestion: true + useSound: + path: /Audio/Weapons/Xeno/alien_spitacid.ogg + - type: MeleeWeapon + wideAnimationRotation: -90 + soundHit: + path: /Audio/Weapons/Xeno/alien_spitacid.ogg + angle: 0 + animation: WeaponArcBite # Rrrr! diff --git a/Resources/Prototypes/Floof/Entities/Objects/Specific/Rehydrateable.yml b/Resources/Prototypes/Floof/Entities/Objects/Specific/Rehydrateable.yml new file mode 100644 index 00000000000..c7b017f3fb4 --- /dev/null +++ b/Resources/Prototypes/Floof/Entities/Objects/Specific/Rehydrateable.yml @@ -0,0 +1,259 @@ +- type: entity + parent: PlushieFRouny + id: DehydratedFRouny + name: dehydrated friendly rouny + description: Looks like a plush toy rouny with blue stripes, but just add water and it becomes a real-life xeno! + components: + - type: SolutionContainerManager + solutions: + plushie: + maxVol: 11 # needs room for water + reagents: + - ReagentId: Nutriment + Quantity: 10 + - type: RefillableSolution + solution: plushie + - type: Reactive + reactions: + - reagents: [Water] + methods: [Touch, Ingestion, Injection] + effects: + - !type:AddToSolutionReaction + solution: plushie + - type: Rehydratable + possibleSpawns: + - MobXenoNeutralRouny + - type: CollisionWake + enabled: false + - type: Physics + bodyType: KinematicController + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.3,-0.3,0.3,0.3" + density: 15 + mask: + - ItemMask + rehydrate: + shape: + !type:PhysShapeAabb + bounds: "-0.3,-0.3,0.3,0.3" + hard: false + layer: + - LowImpassable + # pet fish before rehydrating and he will be nice to you + - type: EmitSoundOnUse + handle: false + sound: + path: /Audio/Effects/bite.ogg + - type: Tag + tags: [] + +- type: entity + parent: PlushieFRavager + id: DehydratedFRavager + name: dehydrated friendly ravager + description: Looks like a plush toy ravager with blue stripes, but just add water and it becomes a real-life xeno! + components: + - type: SolutionContainerManager + solutions: + plushie: + maxVol: 11 # needs room for water + reagents: + - ReagentId: Nutriment + Quantity: 10 + - type: RefillableSolution + solution: plushie + - type: Reactive + reactions: + - reagents: [Water] + methods: [Touch, Ingestion, Injection] + effects: + - !type:AddToSolutionReaction + solution: plushie + - type: Rehydratable + possibleSpawns: + - MobXenoNeutralRavager + - type: CollisionWake + enabled: false + - type: Physics + bodyType: KinematicController + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.3,-0.3,0.3,0.3" + density: 15 + mask: + - ItemMask + rehydrate: + shape: + !type:PhysShapeAabb + bounds: "-0.3,-0.3,0.3,0.3" + hard: false + layer: + - LowImpassable + # pet fish before rehydrating and he will be nice to you + - type: EmitSoundOnUse + handle: false + sound: + path: /Audio/Effects/bite.ogg + - type: Tag + tags: [] + +- type: entity + parent: PlushieFDrone + id: DehydratedFDrone + name: dehydrated friendly drone + description: Looks like a plush toy xeno with blue stripes, but just add water and it becomes a real-life xeno! + components: + - type: SolutionContainerManager + solutions: + plushie: + maxVol: 11 # needs room for water + reagents: + - ReagentId: Nutriment + Quantity: 10 + - type: RefillableSolution + solution: plushie + - type: Reactive + reactions: + - reagents: [Water] + methods: [Touch, Ingestion, Injection] + effects: + - !type:AddToSolutionReaction + solution: plushie + - type: Rehydratable + possibleSpawns: + - MobXenoNeutralDrone + - type: CollisionWake + enabled: false + - type: Physics + bodyType: KinematicController + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.3,-0.3,0.3,0.3" + density: 15 + mask: + - ItemMask + rehydrate: + shape: + !type:PhysShapeAabb + bounds: "-0.3,-0.3,0.3,0.3" + hard: false + layer: + - LowImpassable + # pet fish before rehydrating and he will be nice to you + - type: EmitSoundOnUse + handle: false + sound: + path: /Audio/Effects/bite.ogg + - type: Tag + tags: [] + +- type: entity + parent: PlushieFPraetorian + id: DehydratedFPraetorian + name: dehydrated friendly praetorian + description: Looks like a plush toy praetorian, but just add water and it becomes a real-life xeno! + components: + - type: SolutionContainerManager + solutions: + plushie: + maxVol: 11 # needs room for water + reagents: + - ReagentId: Nutriment + Quantity: 10 + - type: RefillableSolution + solution: plushie + - type: Reactive + reactions: + - reagents: [Water] + methods: [Touch, Ingestion, Injection] + effects: + - !type:AddToSolutionReaction + solution: plushie + - type: Rehydratable + possibleSpawns: + - MobXenoNeutralPraetorian + - type: CollisionWake + enabled: false + - type: Physics + bodyType: KinematicController + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.3,-0.3,0.3,0.3" + density: 15 + mask: + - ItemMask + rehydrate: + shape: + !type:PhysShapeAabb + bounds: "-0.3,-0.3,0.3,0.3" + hard: false + layer: + - LowImpassable + # pet fish before rehydrating and he will be nice to you + - type: EmitSoundOnUse + handle: false + sound: + path: /Audio/Effects/bite.ogg + - type: Tag + tags: [] + +- type: entity + parent: DehydratedFRouny + id: DehydratedCCRouny + name: dehydrated friendly rouny + description: Looks like a plush toy rouny with green stripes, but just add water and it becomes a real-life xeno! + components: + - type: Sprite + state: CCrouny + - type: Rehydratable + possibleSpawns: + - MobXenoCCNeutralRouny + +- type: entity + parent: DehydratedFPraetorian + id: DehydratedCCPraetorian + name: dehydrated friendly praetorian + description: Looks like a plush toy praetorian with green stripes, but just add water and it becomes a real-life xeno! + components: + - type: Sprite + state: CCPraetorian + - type: Rehydratable + possibleSpawns: + - MobXenoCCNeutralPraetorian + +- type: entity + parent: DehydratedFDrone + id: DehydratedCCDrone + name: dehydrated friendly drone + description: Looks like a plush toy drone with green stripes, but just add water and it becomes a real-life xeno! + components: + - type: Sprite + state: CCDrone + - type: Rehydratable + possibleSpawns: + - MobXenoCCNeutralDrone + +- type: entity + parent: DehydratedFRavager + id: DehydratedCCRavager + name: dehydrated friendly ravager + description: Looks like a plush toy ravager with green stripes, but just add water and it becomes a real-life xeno! + components: + - type: Sprite + state: CCRavager + - type: Rehydratable + possibleSpawns: + - MobXenoCCNeutralRavager \ No newline at end of file diff --git a/Resources/Prototypes/Floof/Entities/Structures/Storage/crates.yml b/Resources/Prototypes/Floof/Entities/Structures/Storage/crates.yml new file mode 100644 index 00000000000..a992a409907 --- /dev/null +++ b/Resources/Prototypes/Floof/Entities/Structures/Storage/crates.yml @@ -0,0 +1,20 @@ +- type: entity + id: Cratexeno + parent: CratePlastic + name: Xeno Companion Crate + components: + - type: EntityStorage + airtight: false + - type: Sprite + sprite: Structures/Storage/Crates/xeno.rsi + layers: + - state: base + - state: closed + map: ["enum.StorageVisualLayers.Door"] + - state: paper + sprite: Structures/Storage/Crates/labels.rsi + offset: "-0.25,0.625" + map: ["enum.PaperLabelVisuals.Layer"] + - type: Icon + sprite: Structures/Storage/Crates/xeno.rsi + state: base diff --git a/Resources/Prototypes/Floof/Gamerules/Cargo_gifts.yml b/Resources/Prototypes/Floof/Gamerules/Cargo_gifts.yml new file mode 100644 index 00000000000..dcbcdb18adf --- /dev/null +++ b/Resources/Prototypes/Floof/Gamerules/Cargo_gifts.yml @@ -0,0 +1,17 @@ +- type: entity + id: giftsxenocompanions + parent: BaseGameRule + noSpawn: true + components: + - type: StationEvent + weight: 10 + startDelay: 10 + reoccurrenceDelay: 120 + duration: 120 + earliestStart: 10 + - type: CargoGiftsRule + description: cargo-gift-friendly-xenos + sender: cargo-gift-nt-lab + dest: cargo-gift-trade-dest + gifts: + xenocompanions: 1 \ No newline at end of file diff --git a/Resources/Prototypes/Floof/Gamerules/Events.yml b/Resources/Prototypes/Floof/Gamerules/Events.yml new file mode 100644 index 00000000000..42f9e652156 --- /dev/null +++ b/Resources/Prototypes/Floof/Gamerules/Events.yml @@ -0,0 +1,105 @@ +# - type: entity +# id: ArgocyteVents +# parent: BaseGameRule +# noSpawn: true +# components: +# - type: StationEvent +# startAnnouncement: true +# earliestStart: 20 +# reoccurrenceDelay: 12 +# minimumPlayers: 30 +# weight: 6 # Really weak compared to other critters +# duration: 60 +# - type: VentCrittersRule +# entries: +# - id: MobArgocyteSlurva +# prob: 0.003 +# - id: MobArgocyteBarrier +# prob: 0.001 +# - id: MobArgocyteSkitter +# prob: 0.001 +# - id: MobArgocyteSwiper +# prob: 0.001 +# - id: MobArgocyteMolder +# prob: 0.001 +# - id: MobArgocytePouncer +# prob: 0.001 +# - id: MobArgocyteGlider +# prob: 0.001 +# - id: MobArgocyteHarvester +# prob: 0.001 +# - id: MobArgocyteCrawler +# prob: 0.001 +# - id: MobArgocyteEnforcer +# prob: 0.001 +# - id: MobArgocyteFounder +# prob: 0.001 +# - id: MobArgocyteLeviathing +# prob: 0.0001 + +# - type: entity +# id: TickVents +# parent: BaseGameRule +# noSpawn: true +# components: +# - type: StationEvent +# startAnnouncement: true +# earliestStart: 20 +# reoccurrenceDelay: 12 +# minimumPlayers: 1 +# weight: 6 # Really weak compared to other critters +# duration: 60 +# - type: VentCrittersRule +# entries: +# - id: MobTick +# prob: 0.01 + +# - type: entity +# id: CarpVents +# parent: BaseGameRule +# noSpawn: true +# components: +# - type: StationEvent +# startAnnouncement: true +# earliestStart: 20 +# reoccurrenceDelay: 12 +# minimumPlayers: 20 +# weight: 6 # Really weak compared to other critters +# duration: 60 +# - type: VentCrittersRule +# entries: +# - id: MobCarp +# prob: 0.01 +# - id: MobCarpMagic +# prob: 0.01 +# - id: MobCarpHolo +# prob: 0.003 +# - id: MobCarpRainbow +# prob: 0.01 +# - id: MobShark +# prob: 0.003 +# - id: MobCarpDragon +# prob: 0.01 + +# - type: entity +# id: SpaceVents +# parent: BaseGameRule +# noSpawn: true +# components: +# - type: StationEvent +# startAnnouncement: true +# earliestStart: 20 +# reoccurrenceDelay: 12 +# minimumPlayers: 20 +# weight: 6 # Really weak compared to other critters +# duration: 60 +# - type: VentCrittersRule +# entries: +# - id: MobBearSpace +# prob: 0.01 +# - id: MobKangarooSpace +# prob: 0.01 +# - id: MobSpiderSpace +# prob: 0.01 +# - id: MobCobraSpace +# prob: 0.01 diff --git a/Resources/Prototypes/GameRules/cargo_gifts.yml b/Resources/Prototypes/GameRules/cargo_gifts.yml index 799805272d6..53f794dc544 100644 --- a/Resources/Prototypes/GameRules/cargo_gifts.yml +++ b/Resources/Prototypes/GameRules/cargo_gifts.yml @@ -208,3 +208,4 @@ SecurityRiot: 2 SecurityRestraints: 2 SecurityNonLethal: 2 + diff --git a/Resources/Textures/Mobs/Aliens/FXS/ccdrone.rsi/crit.png b/Resources/Textures/Mobs/Aliens/FXS/ccdrone.rsi/crit.png new file mode 100644 index 00000000000..2cb48361996 Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/FXS/ccdrone.rsi/crit.png differ diff --git a/Resources/Textures/Mobs/Aliens/FXS/ccdrone.rsi/dead.png b/Resources/Textures/Mobs/Aliens/FXS/ccdrone.rsi/dead.png new file mode 100644 index 00000000000..8cdfcf035a2 Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/FXS/ccdrone.rsi/dead.png differ diff --git a/Resources/Textures/Mobs/Aliens/FXS/ccdrone.rsi/meta.json b/Resources/Textures/Mobs/Aliens/FXS/ccdrone.rsi/meta.json new file mode 100644 index 00000000000..abfd239f028 --- /dev/null +++ b/Resources/Textures/Mobs/Aliens/FXS/ccdrone.rsi/meta.json @@ -0,0 +1,24 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://gitlab.com/cmdevs/colonial-warfare/-/tree/dev/icons/mob/xenonids", + "size": { + "x": 48, + "y": 48 + }, + "states": [ + { + "name": "running", + "directions": 4 + }, + { + "name": "sleeping" + }, + { + "name": "crit" + }, + { + "name": "dead" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Mobs/Aliens/FXS/ccdrone.rsi/running.png b/Resources/Textures/Mobs/Aliens/FXS/ccdrone.rsi/running.png new file mode 100644 index 00000000000..db898e3a4d5 Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/FXS/ccdrone.rsi/running.png differ diff --git a/Resources/Textures/Mobs/Aliens/FXS/ccdrone.rsi/sleeping.png b/Resources/Textures/Mobs/Aliens/FXS/ccdrone.rsi/sleeping.png new file mode 100644 index 00000000000..b0289d19873 Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/FXS/ccdrone.rsi/sleeping.png differ diff --git a/Resources/Textures/Mobs/Aliens/FXS/ccpraetorian.rsi/crit.png b/Resources/Textures/Mobs/Aliens/FXS/ccpraetorian.rsi/crit.png new file mode 100644 index 00000000000..c6c440830b9 Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/FXS/ccpraetorian.rsi/crit.png differ diff --git a/Resources/Textures/Mobs/Aliens/FXS/ccpraetorian.rsi/dead.png b/Resources/Textures/Mobs/Aliens/FXS/ccpraetorian.rsi/dead.png new file mode 100644 index 00000000000..7c22082338a Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/FXS/ccpraetorian.rsi/dead.png differ diff --git a/Resources/Textures/Mobs/Aliens/FXS/ccpraetorian.rsi/meta.json b/Resources/Textures/Mobs/Aliens/FXS/ccpraetorian.rsi/meta.json new file mode 100644 index 00000000000..bbc027670a4 --- /dev/null +++ b/Resources/Textures/Mobs/Aliens/FXS/ccpraetorian.rsi/meta.json @@ -0,0 +1,24 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://gitlab.com/cmdevs/colonial-warfare/-/blob/dev/icons/mob/xenonids/praetorian.dmi", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "running", + "directions": 4 + }, + { + "name": "sleeping" + }, + { + "name": "crit" + }, + { + "name": "dead" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Mobs/Aliens/FXS/ccpraetorian.rsi/running.png b/Resources/Textures/Mobs/Aliens/FXS/ccpraetorian.rsi/running.png new file mode 100644 index 00000000000..6fa63ca7a49 Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/FXS/ccpraetorian.rsi/running.png differ diff --git a/Resources/Textures/Mobs/Aliens/FXS/ccpraetorian.rsi/sleeping.png b/Resources/Textures/Mobs/Aliens/FXS/ccpraetorian.rsi/sleeping.png new file mode 100644 index 00000000000..f9cebcbf255 Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/FXS/ccpraetorian.rsi/sleeping.png differ diff --git a/Resources/Textures/Mobs/Aliens/FXS/ccravager.rsi/crit.png b/Resources/Textures/Mobs/Aliens/FXS/ccravager.rsi/crit.png new file mode 100644 index 00000000000..157be67bb14 Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/FXS/ccravager.rsi/crit.png differ diff --git a/Resources/Textures/Mobs/Aliens/FXS/ccravager.rsi/dead.png b/Resources/Textures/Mobs/Aliens/FXS/ccravager.rsi/dead.png new file mode 100644 index 00000000000..56970c9ca79 Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/FXS/ccravager.rsi/dead.png differ diff --git a/Resources/Textures/Mobs/Aliens/FXS/ccravager.rsi/meta.json b/Resources/Textures/Mobs/Aliens/FXS/ccravager.rsi/meta.json new file mode 100644 index 00000000000..0ec800291c3 --- /dev/null +++ b/Resources/Textures/Mobs/Aliens/FXS/ccravager.rsi/meta.json @@ -0,0 +1,24 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://gitlab.com/cmdevs/colonial-warfare/-/tree/dev/icons/mob/xenonids", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "running", + "directions": 4 + }, + { + "name": "sleeping" + }, + { + "name": "crit" + }, + { + "name": "dead" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Mobs/Aliens/FXS/ccravager.rsi/running.png b/Resources/Textures/Mobs/Aliens/FXS/ccravager.rsi/running.png new file mode 100644 index 00000000000..c4fd0a6832a Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/FXS/ccravager.rsi/running.png differ diff --git a/Resources/Textures/Mobs/Aliens/FXS/ccravager.rsi/sleeping.png b/Resources/Textures/Mobs/Aliens/FXS/ccravager.rsi/sleeping.png new file mode 100644 index 00000000000..0f6a9b87e19 Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/FXS/ccravager.rsi/sleeping.png differ diff --git a/Resources/Textures/Mobs/Aliens/FXS/ccrouny.rsi/crit.png b/Resources/Textures/Mobs/Aliens/FXS/ccrouny.rsi/crit.png new file mode 100644 index 00000000000..c2a34704d99 Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/FXS/ccrouny.rsi/crit.png differ diff --git a/Resources/Textures/Mobs/Aliens/FXS/ccrouny.rsi/dead.png b/Resources/Textures/Mobs/Aliens/FXS/ccrouny.rsi/dead.png new file mode 100644 index 00000000000..7845b327bd8 Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/FXS/ccrouny.rsi/dead.png differ diff --git a/Resources/Textures/Mobs/Aliens/FXS/ccrouny.rsi/meta.json b/Resources/Textures/Mobs/Aliens/FXS/ccrouny.rsi/meta.json new file mode 100644 index 00000000000..4e6aea97c62 --- /dev/null +++ b/Resources/Textures/Mobs/Aliens/FXS/ccrouny.rsi/meta.json @@ -0,0 +1,24 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by Fenndragon, discord ID: 190763499276861440", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "running", + "directions": 4 + }, + { + "name": "sleeping" + }, + { + "name": "dead" + }, + { + "name": "crit" + } + ] +} diff --git a/Resources/Textures/Mobs/Aliens/FXS/ccrouny.rsi/running.png b/Resources/Textures/Mobs/Aliens/FXS/ccrouny.rsi/running.png new file mode 100644 index 00000000000..da0a19cf0e2 Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/FXS/ccrouny.rsi/running.png differ diff --git a/Resources/Textures/Mobs/Aliens/FXS/ccrouny.rsi/sleeping.png b/Resources/Textures/Mobs/Aliens/FXS/ccrouny.rsi/sleeping.png new file mode 100644 index 00000000000..0103d6cb100 Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/FXS/ccrouny.rsi/sleeping.png differ diff --git a/Resources/Textures/Mobs/Aliens/FXS/drone.rsi/crit.png b/Resources/Textures/Mobs/Aliens/FXS/drone.rsi/crit.png new file mode 100644 index 00000000000..fbabd27dbe9 Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/FXS/drone.rsi/crit.png differ diff --git a/Resources/Textures/Mobs/Aliens/FXS/drone.rsi/dead.png b/Resources/Textures/Mobs/Aliens/FXS/drone.rsi/dead.png new file mode 100644 index 00000000000..b5511651b92 Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/FXS/drone.rsi/dead.png differ diff --git a/Resources/Textures/Mobs/Aliens/FXS/drone.rsi/meta.json b/Resources/Textures/Mobs/Aliens/FXS/drone.rsi/meta.json new file mode 100644 index 00000000000..abfd239f028 --- /dev/null +++ b/Resources/Textures/Mobs/Aliens/FXS/drone.rsi/meta.json @@ -0,0 +1,24 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://gitlab.com/cmdevs/colonial-warfare/-/tree/dev/icons/mob/xenonids", + "size": { + "x": 48, + "y": 48 + }, + "states": [ + { + "name": "running", + "directions": 4 + }, + { + "name": "sleeping" + }, + { + "name": "crit" + }, + { + "name": "dead" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Mobs/Aliens/FXS/drone.rsi/running.png b/Resources/Textures/Mobs/Aliens/FXS/drone.rsi/running.png new file mode 100644 index 00000000000..dee9b85f9be Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/FXS/drone.rsi/running.png differ diff --git a/Resources/Textures/Mobs/Aliens/FXS/drone.rsi/sleeping.png b/Resources/Textures/Mobs/Aliens/FXS/drone.rsi/sleeping.png new file mode 100644 index 00000000000..2a222eda398 Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/FXS/drone.rsi/sleeping.png differ diff --git a/Resources/Textures/Mobs/Aliens/FXS/praetorian.rsi/crit.png b/Resources/Textures/Mobs/Aliens/FXS/praetorian.rsi/crit.png new file mode 100644 index 00000000000..124fd3b69a6 Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/FXS/praetorian.rsi/crit.png differ diff --git a/Resources/Textures/Mobs/Aliens/FXS/praetorian.rsi/dead.png b/Resources/Textures/Mobs/Aliens/FXS/praetorian.rsi/dead.png new file mode 100644 index 00000000000..683e78595e6 Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/FXS/praetorian.rsi/dead.png differ diff --git a/Resources/Textures/Mobs/Aliens/FXS/praetorian.rsi/meta.json b/Resources/Textures/Mobs/Aliens/FXS/praetorian.rsi/meta.json new file mode 100644 index 00000000000..bbc027670a4 --- /dev/null +++ b/Resources/Textures/Mobs/Aliens/FXS/praetorian.rsi/meta.json @@ -0,0 +1,24 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://gitlab.com/cmdevs/colonial-warfare/-/blob/dev/icons/mob/xenonids/praetorian.dmi", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "running", + "directions": 4 + }, + { + "name": "sleeping" + }, + { + "name": "crit" + }, + { + "name": "dead" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Mobs/Aliens/FXS/praetorian.rsi/running.png b/Resources/Textures/Mobs/Aliens/FXS/praetorian.rsi/running.png new file mode 100644 index 00000000000..0fb9f3374e6 Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/FXS/praetorian.rsi/running.png differ diff --git a/Resources/Textures/Mobs/Aliens/FXS/praetorian.rsi/sleeping.png b/Resources/Textures/Mobs/Aliens/FXS/praetorian.rsi/sleeping.png new file mode 100644 index 00000000000..cdbb2e632c6 Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/FXS/praetorian.rsi/sleeping.png differ diff --git a/Resources/Textures/Mobs/Aliens/FXS/ravager.rsi/crit.png b/Resources/Textures/Mobs/Aliens/FXS/ravager.rsi/crit.png new file mode 100644 index 00000000000..c4bd2a230da Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/FXS/ravager.rsi/crit.png differ diff --git a/Resources/Textures/Mobs/Aliens/FXS/ravager.rsi/dead.png b/Resources/Textures/Mobs/Aliens/FXS/ravager.rsi/dead.png new file mode 100644 index 00000000000..3daebf52c33 Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/FXS/ravager.rsi/dead.png differ diff --git a/Resources/Textures/Mobs/Aliens/FXS/ravager.rsi/meta.json b/Resources/Textures/Mobs/Aliens/FXS/ravager.rsi/meta.json new file mode 100644 index 00000000000..0ec800291c3 --- /dev/null +++ b/Resources/Textures/Mobs/Aliens/FXS/ravager.rsi/meta.json @@ -0,0 +1,24 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://gitlab.com/cmdevs/colonial-warfare/-/tree/dev/icons/mob/xenonids", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "running", + "directions": 4 + }, + { + "name": "sleeping" + }, + { + "name": "crit" + }, + { + "name": "dead" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Mobs/Aliens/FXS/ravager.rsi/running.png b/Resources/Textures/Mobs/Aliens/FXS/ravager.rsi/running.png new file mode 100644 index 00000000000..f809317a9d4 Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/FXS/ravager.rsi/running.png differ diff --git a/Resources/Textures/Mobs/Aliens/FXS/ravager.rsi/sleeping.png b/Resources/Textures/Mobs/Aliens/FXS/ravager.rsi/sleeping.png new file mode 100644 index 00000000000..38f93b3c6ab Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/FXS/ravager.rsi/sleeping.png differ diff --git a/Resources/Textures/Mobs/Aliens/FXS/rouny.rsi/crit.png b/Resources/Textures/Mobs/Aliens/FXS/rouny.rsi/crit.png new file mode 100644 index 00000000000..44f958b130f Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/FXS/rouny.rsi/crit.png differ diff --git a/Resources/Textures/Mobs/Aliens/FXS/rouny.rsi/dead.png b/Resources/Textures/Mobs/Aliens/FXS/rouny.rsi/dead.png new file mode 100644 index 00000000000..3d453f5780b Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/FXS/rouny.rsi/dead.png differ diff --git a/Resources/Textures/Mobs/Aliens/FXS/rouny.rsi/meta.json b/Resources/Textures/Mobs/Aliens/FXS/rouny.rsi/meta.json new file mode 100644 index 00000000000..4e6aea97c62 --- /dev/null +++ b/Resources/Textures/Mobs/Aliens/FXS/rouny.rsi/meta.json @@ -0,0 +1,24 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by Fenndragon, discord ID: 190763499276861440", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "running", + "directions": 4 + }, + { + "name": "sleeping" + }, + { + "name": "dead" + }, + { + "name": "crit" + } + ] +} diff --git a/Resources/Textures/Mobs/Aliens/FXS/rouny.rsi/running.png b/Resources/Textures/Mobs/Aliens/FXS/rouny.rsi/running.png new file mode 100644 index 00000000000..b458377f807 Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/FXS/rouny.rsi/running.png differ diff --git a/Resources/Textures/Mobs/Aliens/FXS/rouny.rsi/sleeping.png b/Resources/Textures/Mobs/Aliens/FXS/rouny.rsi/sleeping.png new file mode 100644 index 00000000000..4281dbf7c5e Binary files /dev/null and b/Resources/Textures/Mobs/Aliens/FXS/rouny.rsi/sleeping.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/CCDrone.png b/Resources/Textures/Objects/Fun/toys.rsi/CCDrone.png new file mode 100644 index 00000000000..f1af4a8100b Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/CCDrone.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/CCPraetorian.png b/Resources/Textures/Objects/Fun/toys.rsi/CCPraetorian.png new file mode 100644 index 00000000000..ef91dbc31e7 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/CCPraetorian.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/CCRavager.png b/Resources/Textures/Objects/Fun/toys.rsi/CCRavager.png new file mode 100644 index 00000000000..1c5a59f3859 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/CCRavager.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/CCrouny.png b/Resources/Textures/Objects/Fun/toys.rsi/CCrouny.png new file mode 100644 index 00000000000..8ebc3a78733 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/CCrouny.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/Objects/Fun/toys.rsi/meta.json index cc03557e0b4..3adaa4ff3af 100644 --- a/Resources/Textures/Objects/Fun/toys.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/toys.rsi/meta.json @@ -9,6 +9,30 @@ "states": [ { "name": "plushie_jester" + }, + { + "name": "nrouny" + }, + { + "name": "nravager" + }, + { + "name": "ndrone" + }, + { + "name": "nPraetorian" + }, + { + "name": "CCrouny" + }, + { + "name": "CCPraetorian" + }, + { + "name": "CCDrone" + }, + { + "name": "CCRavager" }, { "name": "plushie_slips" @@ -391,4 +415,4 @@ "name": "shadowkin" } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Objects/Fun/toys.rsi/nPraetorian.png b/Resources/Textures/Objects/Fun/toys.rsi/nPraetorian.png new file mode 100644 index 00000000000..b7c9da73e7b Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/nPraetorian.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/ndrone.png b/Resources/Textures/Objects/Fun/toys.rsi/ndrone.png new file mode 100644 index 00000000000..cb6c57e1e75 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/ndrone.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/nravager.png b/Resources/Textures/Objects/Fun/toys.rsi/nravager.png new file mode 100644 index 00000000000..4f678fd5578 Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/nravager.png differ diff --git a/Resources/Textures/Objects/Fun/toys.rsi/nrouny.png b/Resources/Textures/Objects/Fun/toys.rsi/nrouny.png new file mode 100644 index 00000000000..28271d8d76b Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/nrouny.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/medical.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/medical.rsi/welded.png index 311739a2701..b9c6757c164 100644 Binary files a/Resources/Textures/Structures/Storage/Crates/medical.rsi/welded.png and b/Resources/Textures/Structures/Storage/Crates/medical.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/xeno.rsi/base.png b/Resources/Textures/Structures/Storage/Crates/xeno.rsi/base.png new file mode 100644 index 00000000000..3c45df1737c Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/xeno.rsi/base.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/xeno.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/xeno.rsi/closed.png new file mode 100644 index 00000000000..fb4846835c5 Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/xeno.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/xeno.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/xeno.rsi/icon.png new file mode 100644 index 00000000000..72a2794f810 Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/xeno.rsi/icon.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/xeno.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/xeno.rsi/meta.json new file mode 100644 index 00000000000..521260b0be8 --- /dev/null +++ b/Resources/Textures/Structures/Storage/Crates/xeno.rsi/meta.json @@ -0,0 +1,39 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by EmoGarbage404 (github) for Space Station 14. edited by Fenndragon", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "closed" + }, + { + "name": "open" + }, + { + "name": "welded" + }, + { + "name": "sparking", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Structures/Storage/Crates/xeno.rsi/open.png b/Resources/Textures/Structures/Storage/Crates/xeno.rsi/open.png new file mode 100644 index 00000000000..9d026db30bd Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/xeno.rsi/open.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/xeno.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/xeno.rsi/sparking.png new file mode 100644 index 00000000000..87b78b9b465 Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/xeno.rsi/sparking.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/xeno.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/xeno.rsi/welded.png new file mode 100644 index 00000000000..b9c6757c164 Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/xeno.rsi/welded.png differ